Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2011-03-27 01:02:16 -0400
committerAnthony G. Basile <blueness@gentoo.org>2011-03-27 01:02:16 -0400
commit4802553f8fbc2c8cb194877001872fc4a56578d2 (patch)
treede5594ea87be6b23e30858f528a855c2d430a463
parentAdded experimental grsec patches for 2.6.38 (diff)
downloadhardened-patchset-4802553f8fbc2c8cb194877001872fc4a56578d2.tar.gz
hardened-patchset-4802553f8fbc2c8cb194877001872fc4a56578d2.tar.bz2
hardened-patchset-4802553f8fbc2c8cb194877001872fc4a56578d2.zip
Update Grsec/PaX20110326
2.2.2-2.6.32.35-201103262020 2.2.2-2.6.38.1-201103262052
Diffstat
-rw-r--r--2.6.32/0000_README2
-rw-r--r--2.6.32/4420_grsecurity-2.2.2-2.6.32.35-201103262020.patch (renamed from 2.6.32/4420_grsecurity-2.2.1-2.6.32.33-201103211735.patch)8162
-rw-r--r--2.6.38/0000_README6
-rw-r--r--2.6.38/1000_linux-2.6.38.1.patch2781
-rw-r--r--2.6.38/4420_grsecurity-2.2.2-2.6.38.1-201103262052.patch (renamed from 2.6.38/4420_grsec-2.2.1-2.6.38-test.patch)7484
5 files changed, 10852 insertions, 7583 deletions
diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index 6d017a3..7983cb7 100644
--- a/2.6.32/0000_README
+++ b/2.6.32/0000_README
@@ -3,7 +3,7 @@ README
Individual Patch Descriptions:
-----------------------------------------------------------------------------
-Patch: 4420_grsecurity-2.2.1-2.6.32.33-201103211735.patch
+Patch: 4420_grsecurity-2.2.2-2.6.32.35-201103262020.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/2.6.32/4420_grsecurity-2.2.1-2.6.32.33-201103211735.patch b/2.6.32/4420_grsecurity-2.2.2-2.6.32.35-201103262020.patch
index 04862b1..420fa57 100644
--- a/2.6.32/4420_grsecurity-2.2.1-2.6.32.33-201103211735.patch
+++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.35-201103262020.patch
@@ -1,6 +1,6 @@
-diff -urNp linux-2.6.32.33/arch/alpha/include/asm/elf.h linux-2.6.32.33/arch/alpha/include/asm/elf.h
---- linux-2.6.32.33/arch/alpha/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/alpha/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/alpha/include/asm/elf.h linux-2.6.32.35/arch/alpha/include/asm/elf.h
+--- linux-2.6.32.35/arch/alpha/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/alpha/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
@@ -15,9 +15,9 @@ diff -urNp linux-2.6.32.33/arch/alpha/include/asm/elf.h linux-2.6.32.33/arch/alp
/* $0 is set by ld.so to a pointer to a function which might be
registered using atexit. This provides a mean for the dynamic
linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-2.6.32.33/arch/alpha/include/asm/pgtable.h linux-2.6.32.33/arch/alpha/include/asm/pgtable.h
---- linux-2.6.32.33/arch/alpha/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/alpha/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/alpha/include/asm/pgtable.h linux-2.6.32.35/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.32.35/arch/alpha/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/alpha/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
@@ -101,6 +101,17 @@ struct vm_area_struct;
#define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
#define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -36,9 +36,9 @@ diff -urNp linux-2.6.32.33/arch/alpha/include/asm/pgtable.h linux-2.6.32.33/arch
#define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
#define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-2.6.32.33/arch/alpha/kernel/module.c linux-2.6.32.33/arch/alpha/kernel/module.c
---- linux-2.6.32.33/arch/alpha/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/alpha/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/alpha/kernel/module.c linux-2.6.32.35/arch/alpha/kernel/module.c
+--- linux-2.6.32.35/arch/alpha/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/alpha/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -48,9 +48,9 @@ diff -urNp linux-2.6.32.33/arch/alpha/kernel/module.c linux-2.6.32.33/arch/alpha
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.32.33/arch/alpha/kernel/osf_sys.c linux-2.6.32.33/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32.33/arch/alpha/kernel/osf_sys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/alpha/kernel/osf_sys.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/alpha/kernel/osf_sys.c linux-2.6.32.35/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.32.35/arch/alpha/kernel/osf_sys.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/alpha/kernel/osf_sys.c 2010-12-31 14:46:53.000000000 -0500
@@ -1169,7 +1169,7 @@ arch_get_unmapped_area_1(unsigned long a
/* At this point: (!vma || addr < vma->vm_end). */
if (limit - len < addr)
@@ -82,9 +82,9 @@ diff -urNp linux-2.6.32.33/arch/alpha/kernel/osf_sys.c linux-2.6.32.33/arch/alph
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-2.6.32.33/arch/alpha/mm/fault.c linux-2.6.32.33/arch/alpha/mm/fault.c
---- linux-2.6.32.33/arch/alpha/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/alpha/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/alpha/mm/fault.c linux-2.6.32.35/arch/alpha/mm/fault.c
+--- linux-2.6.32.35/arch/alpha/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/alpha/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
@@ -241,9 +241,9 @@ diff -urNp linux-2.6.32.33/arch/alpha/mm/fault.c linux-2.6.32.33/arch/alpha/mm/f
} else if (!cause) {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.32.33/arch/arm/include/asm/elf.h linux-2.6.32.33/arch/arm/include/asm/elf.h
---- linux-2.6.32.33/arch/arm/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/arm/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/arm/include/asm/elf.h linux-2.6.32.35/arch/arm/include/asm/elf.h
+--- linux-2.6.32.35/arch/arm/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/arm/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -260,9 +260,9 @@ diff -urNp linux-2.6.32.33/arch/arm/include/asm/elf.h linux-2.6.32.33/arch/arm/i
/* When the program starts, a1 contains a pointer to a function to be
registered with atexit, as per the SVR4 ABI. A value of 0 means we
-diff -urNp linux-2.6.32.33/arch/arm/include/asm/kmap_types.h linux-2.6.32.33/arch/arm/include/asm/kmap_types.h
---- linux-2.6.32.33/arch/arm/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/arm/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/arm/include/asm/kmap_types.h linux-2.6.32.35/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.32.35/arch/arm/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/arm/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -19,6 +19,7 @@ enum km_type {
KM_SOFTIRQ0,
KM_SOFTIRQ1,
@@ -271,9 +271,9 @@ diff -urNp linux-2.6.32.33/arch/arm/include/asm/kmap_types.h linux-2.6.32.33/arc
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.33/arch/arm/include/asm/uaccess.h linux-2.6.32.33/arch/arm/include/asm/uaccess.h
---- linux-2.6.32.33/arch/arm/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/arm/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/arm/include/asm/uaccess.h linux-2.6.32.35/arch/arm/include/asm/uaccess.h
+--- linux-2.6.32.35/arch/arm/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/arm/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -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)
@@ -294,9 +294,9 @@ diff -urNp linux-2.6.32.33/arch/arm/include/asm/uaccess.h linux-2.6.32.33/arch/a
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
-diff -urNp linux-2.6.32.33/arch/arm/kernel/kgdb.c linux-2.6.32.33/arch/arm/kernel/kgdb.c
---- linux-2.6.32.33/arch/arm/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/arm/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/arm/kernel/kgdb.c linux-2.6.32.35/arch/arm/kernel/kgdb.c
+--- linux-2.6.32.35/arch/arm/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/arm/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
* and we handle the normal undef case within the do_undefinstr
* handler.
@@ -306,9 +306,9 @@ diff -urNp linux-2.6.32.33/arch/arm/kernel/kgdb.c linux-2.6.32.33/arch/arm/kerne
#ifndef __ARMEB__
.gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
#else /* ! __ARMEB__ */
-diff -urNp linux-2.6.32.33/arch/arm/mach-at91/pm.c linux-2.6.32.33/arch/arm/mach-at91/pm.c
---- linux-2.6.32.33/arch/arm/mach-at91/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/arm/mach-at91/pm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/arm/mach-at91/pm.c linux-2.6.32.35/arch/arm/mach-at91/pm.c
+--- linux-2.6.32.35/arch/arm/mach-at91/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/arm/mach-at91/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -348,7 +348,7 @@ static void at91_pm_end(void)
}
@@ -318,9 +318,9 @@ diff -urNp linux-2.6.32.33/arch/arm/mach-at91/pm.c linux-2.6.32.33/arch/arm/mach
.valid = at91_pm_valid_state,
.begin = at91_pm_begin,
.enter = at91_pm_enter,
-diff -urNp linux-2.6.32.33/arch/arm/mach-omap1/pm.c linux-2.6.32.33/arch/arm/mach-omap1/pm.c
---- linux-2.6.32.33/arch/arm/mach-omap1/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/arm/mach-omap1/pm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/arm/mach-omap1/pm.c linux-2.6.32.35/arch/arm/mach-omap1/pm.c
+--- linux-2.6.32.35/arch/arm/mach-omap1/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/arm/mach-omap1/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
@@ -330,9 +330,9 @@ diff -urNp linux-2.6.32.33/arch/arm/mach-omap1/pm.c linux-2.6.32.33/arch/arm/mac
.prepare = omap_pm_prepare,
.enter = omap_pm_enter,
.finish = omap_pm_finish,
-diff -urNp linux-2.6.32.33/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.33/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.32.33/arch/arm/mach-omap2/pm24xx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/arm/mach-omap2/pm24xx.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.35/arch/arm/mach-omap2/pm24xx.c
+--- linux-2.6.32.35/arch/arm/mach-omap2/pm24xx.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/arm/mach-omap2/pm24xx.c 2010-12-31 14:46:53.000000000 -0500
@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
enable_hlt();
}
@@ -342,9 +342,9 @@ diff -urNp linux-2.6.32.33/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.33/arch/arm
.prepare = omap2_pm_prepare,
.enter = omap2_pm_enter,
.finish = omap2_pm_finish,
-diff -urNp linux-2.6.32.33/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.33/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.32.33/arch/arm/mach-omap2/pm34xx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/arm/mach-omap2/pm34xx.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.35/arch/arm/mach-omap2/pm34xx.c
+--- linux-2.6.32.35/arch/arm/mach-omap2/pm34xx.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/arm/mach-omap2/pm34xx.c 2010-12-31 14:46:53.000000000 -0500
@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
return;
}
@@ -354,9 +354,9 @@ diff -urNp linux-2.6.32.33/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.33/arch/arm
.begin = omap3_pm_begin,
.end = omap3_pm_end,
.prepare = omap3_pm_prepare,
-diff -urNp linux-2.6.32.33/arch/arm/mach-pnx4008/pm.c linux-2.6.32.33/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.32.33/arch/arm/mach-pnx4008/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/arm/mach-pnx4008/pm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/arm/mach-pnx4008/pm.c linux-2.6.32.35/arch/arm/mach-pnx4008/pm.c
+--- linux-2.6.32.35/arch/arm/mach-pnx4008/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/arm/mach-pnx4008/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
(state == PM_SUSPEND_MEM);
}
@@ -366,9 +366,9 @@ diff -urNp linux-2.6.32.33/arch/arm/mach-pnx4008/pm.c linux-2.6.32.33/arch/arm/m
.enter = pnx4008_pm_enter,
.valid = pnx4008_pm_valid,
};
-diff -urNp linux-2.6.32.33/arch/arm/mach-pxa/pm.c linux-2.6.32.33/arch/arm/mach-pxa/pm.c
---- linux-2.6.32.33/arch/arm/mach-pxa/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/arm/mach-pxa/pm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/arm/mach-pxa/pm.c linux-2.6.32.35/arch/arm/mach-pxa/pm.c
+--- linux-2.6.32.35/arch/arm/mach-pxa/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/arm/mach-pxa/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
pxa_cpu_pm_fns->finish();
}
@@ -378,9 +378,9 @@ diff -urNp linux-2.6.32.33/arch/arm/mach-pxa/pm.c linux-2.6.32.33/arch/arm/mach-
.valid = pxa_pm_valid,
.enter = pxa_pm_enter,
.prepare = pxa_pm_prepare,
-diff -urNp linux-2.6.32.33/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.33/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.32.33/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/arm/mach-pxa/sharpsl_pm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.35/arch/arm/mach-pxa/sharpsl_pm.c
+--- linux-2.6.32.35/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/arm/mach-pxa/sharpsl_pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
}
@@ -390,9 +390,9 @@ diff -urNp linux-2.6.32.33/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.33/arch/a
.prepare = pxa_pm_prepare,
.finish = pxa_pm_finish,
.enter = corgi_pxa_pm_enter,
-diff -urNp linux-2.6.32.33/arch/arm/mach-sa1100/pm.c linux-2.6.32.33/arch/arm/mach-sa1100/pm.c
---- linux-2.6.32.33/arch/arm/mach-sa1100/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/arm/mach-sa1100/pm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/arm/mach-sa1100/pm.c linux-2.6.32.35/arch/arm/mach-sa1100/pm.c
+--- linux-2.6.32.35/arch/arm/mach-sa1100/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/arm/mach-sa1100/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
return virt_to_phys(sp);
}
@@ -402,9 +402,9 @@ diff -urNp linux-2.6.32.33/arch/arm/mach-sa1100/pm.c linux-2.6.32.33/arch/arm/ma
.enter = sa11x0_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.32.33/arch/arm/mm/fault.c linux-2.6.32.33/arch/arm/mm/fault.c
---- linux-2.6.32.33/arch/arm/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/arm/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/arm/mm/fault.c linux-2.6.32.35/arch/arm/mm/fault.c
+--- linux-2.6.32.35/arch/arm/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/arm/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
}
#endif
@@ -453,9 +453,9 @@ diff -urNp linux-2.6.32.33/arch/arm/mm/fault.c linux-2.6.32.33/arch/arm/mm/fault
/*
* First Level Translation Fault Handler
*
-diff -urNp linux-2.6.32.33/arch/arm/mm/mmap.c linux-2.6.32.33/arch/arm/mm/mmap.c
---- linux-2.6.32.33/arch/arm/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/arm/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/arm/mm/mmap.c linux-2.6.32.35/arch/arm/mm/mmap.c
+--- linux-2.6.32.35/arch/arm/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/arm/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -505,9 +505,9 @@ diff -urNp linux-2.6.32.33/arch/arm/mm/mmap.c linux-2.6.32.33/arch/arm/mm/mmap.c
/*
* Remember the place where we stopped the search:
*/
-diff -urNp linux-2.6.32.33/arch/arm/plat-s3c/pm.c linux-2.6.32.33/arch/arm/plat-s3c/pm.c
---- linux-2.6.32.33/arch/arm/plat-s3c/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/arm/plat-s3c/pm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/arm/plat-s3c/pm.c linux-2.6.32.35/arch/arm/plat-s3c/pm.c
+--- linux-2.6.32.35/arch/arm/plat-s3c/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/arm/plat-s3c/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
s3c_pm_check_cleanup();
}
@@ -517,9 +517,9 @@ diff -urNp linux-2.6.32.33/arch/arm/plat-s3c/pm.c linux-2.6.32.33/arch/arm/plat-
.enter = s3c_pm_enter,
.prepare = s3c_pm_prepare,
.finish = s3c_pm_finish,
-diff -urNp linux-2.6.32.33/arch/avr32/include/asm/elf.h linux-2.6.32.33/arch/avr32/include/asm/elf.h
---- linux-2.6.32.33/arch/avr32/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/avr32/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/avr32/include/asm/elf.h linux-2.6.32.35/arch/avr32/include/asm/elf.h
+--- linux-2.6.32.35/arch/avr32/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/avr32/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -536,9 +536,9 @@ diff -urNp linux-2.6.32.33/arch/avr32/include/asm/elf.h linux-2.6.32.33/arch/avr
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. This could be done in user space,
-diff -urNp linux-2.6.32.33/arch/avr32/include/asm/kmap_types.h linux-2.6.32.33/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.32.33/arch/avr32/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/avr32/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/avr32/include/asm/kmap_types.h linux-2.6.32.35/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.32.35/arch/avr32/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/avr32/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
@@ -549,9 +549,9 @@ diff -urNp linux-2.6.32.33/arch/avr32/include/asm/kmap_types.h linux-2.6.32.33/a
};
#undef D
-diff -urNp linux-2.6.32.33/arch/avr32/mach-at32ap/pm.c linux-2.6.32.33/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.32.33/arch/avr32/mach-at32ap/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/avr32/mach-at32ap/pm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/avr32/mach-at32ap/pm.c linux-2.6.32.35/arch/avr32/mach-at32ap/pm.c
+--- linux-2.6.32.35/arch/avr32/mach-at32ap/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/avr32/mach-at32ap/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -176,7 +176,7 @@ out:
return 0;
}
@@ -561,9 +561,9 @@ diff -urNp linux-2.6.32.33/arch/avr32/mach-at32ap/pm.c linux-2.6.32.33/arch/avr3
.valid = avr32_pm_valid_state,
.enter = avr32_pm_enter,
};
-diff -urNp linux-2.6.32.33/arch/avr32/mm/fault.c linux-2.6.32.33/arch/avr32/mm/fault.c
---- linux-2.6.32.33/arch/avr32/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/avr32/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/avr32/mm/fault.c linux-2.6.32.35/arch/avr32/mm/fault.c
+--- linux-2.6.32.35/arch/avr32/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/avr32/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -605,9 +605,9 @@ diff -urNp linux-2.6.32.33/arch/avr32/mm/fault.c linux-2.6.32.33/arch/avr32/mm/f
if (exception_trace && printk_ratelimit())
printk("%s%s[%d]: segfault at %08lx pc %08lx "
"sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.32.33/arch/blackfin/kernel/kgdb.c linux-2.6.32.33/arch/blackfin/kernel/kgdb.c
---- linux-2.6.32.33/arch/blackfin/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/blackfin/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/blackfin/kernel/kgdb.c linux-2.6.32.35/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.32.35/arch/blackfin/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/blackfin/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
return -1; /* this means that we do not want to exit from the handler */
}
@@ -617,9 +617,9 @@ diff -urNp linux-2.6.32.33/arch/blackfin/kernel/kgdb.c linux-2.6.32.33/arch/blac
.gdb_bpt_instr = {0xa1},
#ifdef CONFIG_SMP
.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.32.33/arch/blackfin/mach-common/pm.c linux-2.6.32.33/arch/blackfin/mach-common/pm.c
---- linux-2.6.32.33/arch/blackfin/mach-common/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/blackfin/mach-common/pm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/blackfin/mach-common/pm.c linux-2.6.32.35/arch/blackfin/mach-common/pm.c
+--- linux-2.6.32.35/arch/blackfin/mach-common/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/blackfin/mach-common/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
return 0;
}
@@ -629,9 +629,9 @@ diff -urNp linux-2.6.32.33/arch/blackfin/mach-common/pm.c linux-2.6.32.33/arch/b
.enter = bfin_pm_enter,
.valid = bfin_pm_valid,
};
-diff -urNp linux-2.6.32.33/arch/frv/include/asm/kmap_types.h linux-2.6.32.33/arch/frv/include/asm/kmap_types.h
---- linux-2.6.32.33/arch/frv/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/frv/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/frv/include/asm/kmap_types.h linux-2.6.32.35/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.32.35/arch/frv/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/frv/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -640,9 +640,9 @@ diff -urNp linux-2.6.32.33/arch/frv/include/asm/kmap_types.h linux-2.6.32.33/arc
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.33/arch/frv/mm/elf-fdpic.c linux-2.6.32.33/arch/frv/mm/elf-fdpic.c
---- linux-2.6.32.33/arch/frv/mm/elf-fdpic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/frv/mm/elf-fdpic.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/frv/mm/elf-fdpic.c linux-2.6.32.35/arch/frv/mm/elf-fdpic.c
+--- linux-2.6.32.35/arch/frv/mm/elf-fdpic.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/frv/mm/elf-fdpic.c 2010-12-31 14:46:53.000000000 -0500
@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
if (addr) {
addr = PAGE_ALIGN(addr);
@@ -671,9 +671,9 @@ diff -urNp linux-2.6.32.33/arch/frv/mm/elf-fdpic.c linux-2.6.32.33/arch/frv/mm/e
goto success;
addr = vma->vm_end;
}
-diff -urNp linux-2.6.32.33/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.33/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.32.33/arch/ia64/hp/common/hwsw_iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/hp/common/hwsw_iommu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.35/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.32.35/arch/ia64/hp/common/hwsw_iommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/hp/common/hwsw_iommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -17,7 +17,7 @@
#include <linux/swiotlb.h>
#include <asm/machvec.h>
@@ -692,9 +692,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.33/arch
{
if (use_swiotlb(dev))
return &swiotlb_dma_ops;
-diff -urNp linux-2.6.32.33/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.33/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.32.33/arch/ia64/hp/common/sba_iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/hp/common/sba_iommu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.35/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.32.35/arch/ia64/hp/common/sba_iommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/hp/common/sba_iommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
},
};
@@ -713,9 +713,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.33/arch/
.alloc_coherent = sba_alloc_coherent,
.free_coherent = sba_free_coherent,
.map_page = sba_map_page,
-diff -urNp linux-2.6.32.33/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.33/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.32.33/arch/ia64/ia32/binfmt_elf32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/ia32/binfmt_elf32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.35/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.32.35/arch/ia64/ia32/binfmt_elf32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/ia32/binfmt_elf32.c 2010-12-31 14:46:53.000000000 -0500
@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
#define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack))
@@ -730,9 +730,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.33/arch/ia
/* Ugly but avoids duplication */
#include "../../../fs/binfmt_elf.c"
-diff -urNp linux-2.6.32.33/arch/ia64/ia32/ia32priv.h linux-2.6.32.33/arch/ia64/ia32/ia32priv.h
---- linux-2.6.32.33/arch/ia64/ia32/ia32priv.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/ia32/ia32priv.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/ia32/ia32priv.h linux-2.6.32.35/arch/ia64/ia32/ia32priv.h
+--- linux-2.6.32.35/arch/ia64/ia32/ia32priv.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/ia32/ia32priv.h 2010-12-31 14:46:53.000000000 -0500
@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
#define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_386
@@ -749,9 +749,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/ia32/ia32priv.h linux-2.6.32.33/arch/ia64/i
#define IA32_GATE_OFFSET IA32_PAGE_OFFSET
#define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
-diff -urNp linux-2.6.32.33/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.33/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.32.33/arch/ia64/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.35/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.32.35/arch/ia64/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
@@ -12,7 +12,7 @@
#define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -795,9 +795,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.33/a
return ops->dma_supported(dev, mask);
}
-diff -urNp linux-2.6.32.33/arch/ia64/include/asm/elf.h linux-2.6.32.33/arch/ia64/include/asm/elf.h
---- linux-2.6.32.33/arch/ia64/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/include/asm/elf.h linux-2.6.32.35/arch/ia64/include/asm/elf.h
+--- linux-2.6.32.35/arch/ia64/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -43,6 +43,13 @@
*/
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -812,9 +812,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/include/asm/elf.h linux-2.6.32.33/arch/ia64
#define PT_IA_64_UNWIND 0x70000001
/* IA-64 relocations: */
-diff -urNp linux-2.6.32.33/arch/ia64/include/asm/machvec.h linux-2.6.32.33/arch/ia64/include/asm/machvec.h
---- linux-2.6.32.33/arch/ia64/include/asm/machvec.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/include/asm/machvec.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/include/asm/machvec.h linux-2.6.32.35/arch/ia64/include/asm/machvec.h
+--- linux-2.6.32.35/arch/ia64/include/asm/machvec.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/include/asm/machvec.h 2010-12-31 14:46:53.000000000 -0500
@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
/* DMA-mapping interface: */
typedef void ia64_mv_dma_init (void);
@@ -833,9 +833,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/include/asm/machvec.h linux-2.6.32.33/arch/
/*
* Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.32.33/arch/ia64/include/asm/pgtable.h linux-2.6.32.33/arch/ia64/include/asm/pgtable.h
---- linux-2.6.32.33/arch/ia64/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/include/asm/pgtable.h linux-2.6.32.35/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.32.35/arch/ia64/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
@@ -12,7 +12,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
@@ -863,9 +863,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/include/asm/pgtable.h linux-2.6.32.33/arch/
#define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
#define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
#define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
-diff -urNp linux-2.6.32.33/arch/ia64/include/asm/spinlock.h linux-2.6.32.33/arch/ia64/include/asm/spinlock.h
---- linux-2.6.32.33/arch/ia64/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/include/asm/spinlock.h 2011-02-27 14:53:10.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/include/asm/spinlock.h linux-2.6.32.35/arch/ia64/include/asm/spinlock.h
+--- linux-2.6.32.35/arch/ia64/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/include/asm/spinlock.h 2011-02-27 14:53:10.000000000 -0500
@@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
@@ -875,9 +875,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/include/asm/spinlock.h linux-2.6.32.33/arch
}
static __always_inline void __ticket_spin_unlock_wait(raw_spinlock_t *lock)
-diff -urNp linux-2.6.32.33/arch/ia64/include/asm/uaccess.h linux-2.6.32.33/arch/ia64/include/asm/uaccess.h
---- linux-2.6.32.33/arch/ia64/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/include/asm/uaccess.h linux-2.6.32.35/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.32.35/arch/ia64/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
const void *__cu_from = (from); \
long __cu_len = (n); \
@@ -896,9 +896,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/include/asm/uaccess.h linux-2.6.32.33/arch/
__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
__cu_len; \
})
-diff -urNp linux-2.6.32.33/arch/ia64/kernel/dma-mapping.c linux-2.6.32.33/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.32.33/arch/ia64/kernel/dma-mapping.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/kernel/dma-mapping.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/kernel/dma-mapping.c linux-2.6.32.35/arch/ia64/kernel/dma-mapping.c
+--- linux-2.6.32.35/arch/ia64/kernel/dma-mapping.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/kernel/dma-mapping.c 2010-12-31 14:46:53.000000000 -0500
@@ -3,7 +3,7 @@
/* Set this to 1 if there is a HW IOMMU in the system */
int iommu_detected __read_mostly;
@@ -917,9 +917,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/kernel/dma-mapping.c linux-2.6.32.33/arch/i
{
return dma_ops;
}
-diff -urNp linux-2.6.32.33/arch/ia64/kernel/module.c linux-2.6.32.33/arch/ia64/kernel/module.c
---- linux-2.6.32.33/arch/ia64/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/kernel/module.c linux-2.6.32.35/arch/ia64/kernel/module.c
+--- linux-2.6.32.35/arch/ia64/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
void
module_free (struct module *mod, void *module_region)
@@ -1008,9 +1008,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/kernel/module.c linux-2.6.32.33/arch/ia64/k
mod->arch.gp = gp;
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
-diff -urNp linux-2.6.32.33/arch/ia64/kernel/pci-dma.c linux-2.6.32.33/arch/ia64/kernel/pci-dma.c
---- linux-2.6.32.33/arch/ia64/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/kernel/pci-dma.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/kernel/pci-dma.c linux-2.6.32.35/arch/ia64/kernel/pci-dma.c
+--- linux-2.6.32.35/arch/ia64/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/kernel/pci-dma.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,7 +43,7 @@ struct device fallback_dev = {
.dma_mask = &fallback_dev.coherent_dma_mask,
};
@@ -1062,9 +1062,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/kernel/pci-dma.c linux-2.6.32.33/arch/ia64/
/*
* The order of these functions is important for
-diff -urNp linux-2.6.32.33/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.33/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.32.33/arch/ia64/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/kernel/pci-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.35/arch/ia64/kernel/pci-swiotlb.c
+--- linux-2.6.32.35/arch/ia64/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/kernel/pci-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
}
@@ -1074,9 +1074,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.33/arch/i
.alloc_coherent = ia64_swiotlb_alloc_coherent,
.free_coherent = swiotlb_free_coherent,
.map_page = swiotlb_map_page,
-diff -urNp linux-2.6.32.33/arch/ia64/kernel/sys_ia64.c linux-2.6.32.33/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.32.33/arch/ia64/kernel/sys_ia64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/kernel/sys_ia64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/kernel/sys_ia64.c linux-2.6.32.35/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.32.35/arch/ia64/kernel/sys_ia64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/kernel/sys_ia64.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
@@ -1109,9 +1109,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/kernel/sys_ia64.c linux-2.6.32.33/arch/ia64
/* Remember the address where we stopped this search: */
mm->free_area_cache = addr + len;
return addr;
-diff -urNp linux-2.6.32.33/arch/ia64/kernel/topology.c linux-2.6.32.33/arch/ia64/kernel/topology.c
---- linux-2.6.32.33/arch/ia64/kernel/topology.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/kernel/topology.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/kernel/topology.c linux-2.6.32.35/arch/ia64/kernel/topology.c
+--- linux-2.6.32.35/arch/ia64/kernel/topology.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/kernel/topology.c 2010-12-31 14:46:53.000000000 -0500
@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
return ret;
}
@@ -1121,9 +1121,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/kernel/topology.c linux-2.6.32.33/arch/ia64
.show = cache_show
};
-diff -urNp linux-2.6.32.33/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.33/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.32.33/arch/ia64/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/kernel/vmlinux.lds.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.35/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.32.35/arch/ia64/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/kernel/vmlinux.lds.S 2010-12-31 14:46:53.000000000 -0500
@@ -190,7 +190,7 @@ SECTIONS
/* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE);
@@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.33/arch/i
. = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
* into percpu page size
*/
-diff -urNp linux-2.6.32.33/arch/ia64/mm/fault.c linux-2.6.32.33/arch/ia64/mm/fault.c
---- linux-2.6.32.33/arch/ia64/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/mm/fault.c linux-2.6.32.35/arch/ia64/mm/fault.c
+--- linux-2.6.32.35/arch/ia64/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
return pte_present(pte);
}
@@ -1185,9 +1185,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/mm/fault.c linux-2.6.32.33/arch/ia64/mm/fau
survive:
/*
* If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.32.33/arch/ia64/mm/hugetlbpage.c linux-2.6.32.33/arch/ia64/mm/hugetlbpage.c
---- linux-2.6.32.33/arch/ia64/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/mm/hugetlbpage.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/mm/hugetlbpage.c linux-2.6.32.35/arch/ia64/mm/hugetlbpage.c
+--- linux-2.6.32.35/arch/ia64/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/mm/hugetlbpage.c 2010-12-31 14:46:53.000000000 -0500
@@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area(
/* At this point: (!vmm || addr < vmm->vm_end). */
if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
@@ -1197,9 +1197,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/mm/hugetlbpage.c linux-2.6.32.33/arch/ia64/
return addr;
addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
}
-diff -urNp linux-2.6.32.33/arch/ia64/mm/init.c linux-2.6.32.33/arch/ia64/mm/init.c
---- linux-2.6.32.33/arch/ia64/mm/init.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/mm/init.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/mm/init.c linux-2.6.32.35/arch/ia64/mm/init.c
+--- linux-2.6.32.35/arch/ia64/mm/init.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/mm/init.c 2010-12-31 14:46:53.000000000 -0500
@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1220,9 +1220,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/mm/init.c linux-2.6.32.33/arch/ia64/mm/init
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
down_write(&current->mm->mmap_sem);
if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-2.6.32.33/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.33/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.32.33/arch/ia64/sn/pci/pci_dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/ia64/sn/pci/pci_dma.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.35/arch/ia64/sn/pci/pci_dma.c
+--- linux-2.6.32.35/arch/ia64/sn/pci/pci_dma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/ia64/sn/pci/pci_dma.c 2010-12-31 14:46:53.000000000 -0500
@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
return ret;
}
@@ -1232,9 +1232,9 @@ diff -urNp linux-2.6.32.33/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.33/arch/ia64/
.alloc_coherent = sn_dma_alloc_coherent,
.free_coherent = sn_dma_free_coherent,
.map_page = sn_dma_map_page,
-diff -urNp linux-2.6.32.33/arch/m32r/lib/usercopy.c linux-2.6.32.33/arch/m32r/lib/usercopy.c
---- linux-2.6.32.33/arch/m32r/lib/usercopy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/m32r/lib/usercopy.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/m32r/lib/usercopy.c linux-2.6.32.35/arch/m32r/lib/usercopy.c
+--- linux-2.6.32.35/arch/m32r/lib/usercopy.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/m32r/lib/usercopy.c 2010-12-31 14:46:53.000000000 -0500
@@ -14,6 +14,9 @@
unsigned long
__generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1255,9 +1255,9 @@ diff -urNp linux-2.6.32.33/arch/m32r/lib/usercopy.c linux-2.6.32.33/arch/m32r/li
prefetchw(to);
if (access_ok(VERIFY_READ, from, n))
__copy_user_zeroing(to,from,n);
-diff -urNp linux-2.6.32.33/arch/mips/alchemy/devboards/pm.c linux-2.6.32.33/arch/mips/alchemy/devboards/pm.c
---- linux-2.6.32.33/arch/mips/alchemy/devboards/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/mips/alchemy/devboards/pm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/mips/alchemy/devboards/pm.c linux-2.6.32.35/arch/mips/alchemy/devboards/pm.c
+--- linux-2.6.32.35/arch/mips/alchemy/devboards/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/mips/alchemy/devboards/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
}
@@ -1267,9 +1267,9 @@ diff -urNp linux-2.6.32.33/arch/mips/alchemy/devboards/pm.c linux-2.6.32.33/arch
.valid = suspend_valid_only_mem,
.begin = db1x_pm_begin,
.enter = db1x_pm_enter,
-diff -urNp linux-2.6.32.33/arch/mips/include/asm/elf.h linux-2.6.32.33/arch/mips/include/asm/elf.h
---- linux-2.6.32.33/arch/mips/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/mips/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/mips/include/asm/elf.h linux-2.6.32.35/arch/mips/include/asm/elf.h
+--- linux-2.6.32.35/arch/mips/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/mips/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
#endif
@@ -1282,9 +1282,9 @@ diff -urNp linux-2.6.32.33/arch/mips/include/asm/elf.h linux-2.6.32.33/arch/mips
+#endif
+
#endif /* _ASM_ELF_H */
-diff -urNp linux-2.6.32.33/arch/mips/include/asm/page.h linux-2.6.32.33/arch/mips/include/asm/page.h
---- linux-2.6.32.33/arch/mips/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/mips/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/mips/include/asm/page.h linux-2.6.32.35/arch/mips/include/asm/page.h
+--- linux-2.6.32.35/arch/mips/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/mips/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
#ifdef CONFIG_CPU_MIPS32
typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1294,9 +1294,9 @@ diff -urNp linux-2.6.32.33/arch/mips/include/asm/page.h linux-2.6.32.33/arch/mip
#else
typedef struct { unsigned long long pte; } pte_t;
#define pte_val(x) ((x).pte)
-diff -urNp linux-2.6.32.33/arch/mips/include/asm/system.h linux-2.6.32.33/arch/mips/include/asm/system.h
---- linux-2.6.32.33/arch/mips/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/mips/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/mips/include/asm/system.h linux-2.6.32.35/arch/mips/include/asm/system.h
+--- linux-2.6.32.35/arch/mips/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/mips/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
@@ -23,6 +23,7 @@
#include <asm/dsp.h>
#include <asm/watch.h>
@@ -1313,9 +1313,9 @@ diff -urNp linux-2.6.32.33/arch/mips/include/asm/system.h linux-2.6.32.33/arch/m
+#define arch_align_stack(x) ((x) & ALMASK)
#endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.32.33/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.33/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.32.33/arch/mips/kernel/binfmt_elfn32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/mips/kernel/binfmt_elfn32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.35/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.32.35/arch/mips/kernel/binfmt_elfn32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/mips/kernel/binfmt_elfn32.c 2010-12-31 14:46:53.000000000 -0500
@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1330,9 +1330,9 @@ diff -urNp linux-2.6.32.33/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.33/arch
#include <asm/processor.h>
#include <linux/module.h>
#include <linux/elfcore.h>
-diff -urNp linux-2.6.32.33/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.33/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.32.33/arch/mips/kernel/binfmt_elfo32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/mips/kernel/binfmt_elfo32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.35/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.32.35/arch/mips/kernel/binfmt_elfo32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/mips/kernel/binfmt_elfo32.c 2010-12-31 14:46:53.000000000 -0500
@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1347,9 +1347,9 @@ diff -urNp linux-2.6.32.33/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.33/arch
#include <asm/processor.h>
/*
-diff -urNp linux-2.6.32.33/arch/mips/kernel/kgdb.c linux-2.6.32.33/arch/mips/kernel/kgdb.c
---- linux-2.6.32.33/arch/mips/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/mips/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/mips/kernel/kgdb.c linux-2.6.32.35/arch/mips/kernel/kgdb.c
+--- linux-2.6.32.35/arch/mips/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/mips/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
return -1;
}
@@ -1358,9 +1358,9 @@ diff -urNp linux-2.6.32.33/arch/mips/kernel/kgdb.c linux-2.6.32.33/arch/mips/ker
struct kgdb_arch arch_kgdb_ops;
/*
-diff -urNp linux-2.6.32.33/arch/mips/kernel/process.c linux-2.6.32.33/arch/mips/kernel/process.c
---- linux-2.6.32.33/arch/mips/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/mips/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/mips/kernel/process.c linux-2.6.32.35/arch/mips/kernel/process.c
+--- linux-2.6.32.35/arch/mips/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/mips/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
out:
return pc;
@@ -1377,9 +1377,9 @@ diff -urNp linux-2.6.32.33/arch/mips/kernel/process.c linux-2.6.32.33/arch/mips/
-
- return sp & ALMASK;
-}
-diff -urNp linux-2.6.32.33/arch/mips/kernel/syscall.c linux-2.6.32.33/arch/mips/kernel/syscall.c
---- linux-2.6.32.33/arch/mips/kernel/syscall.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/mips/kernel/syscall.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/mips/kernel/syscall.c linux-2.6.32.35/arch/mips/kernel/syscall.c
+--- linux-2.6.32.35/arch/mips/kernel/syscall.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/mips/kernel/syscall.c 2010-12-31 14:46:53.000000000 -0500
@@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str
do_color_align = 0;
if (filp || (flags & MAP_SHARED))
@@ -1414,9 +1414,9 @@ diff -urNp linux-2.6.32.33/arch/mips/kernel/syscall.c linux-2.6.32.33/arch/mips/
return addr;
addr = vmm->vm_end;
if (do_color_align)
-diff -urNp linux-2.6.32.33/arch/mips/mm/fault.c linux-2.6.32.33/arch/mips/mm/fault.c
---- linux-2.6.32.33/arch/mips/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/mips/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/mips/mm/fault.c linux-2.6.32.35/arch/mips/mm/fault.c
+--- linux-2.6.32.35/arch/mips/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/mips/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
@@ -26,6 +26,23 @@
#include <asm/ptrace.h>
#include <asm/highmem.h> /* For VMALLOC_END */
@@ -1441,9 +1441,9 @@ diff -urNp linux-2.6.32.33/arch/mips/mm/fault.c linux-2.6.32.33/arch/mips/mm/fau
/*
* This routine handles page faults. It determines the address,
* and the problem, and then passes it off to one of the appropriate
-diff -urNp linux-2.6.32.33/arch/parisc/include/asm/elf.h linux-2.6.32.33/arch/parisc/include/asm/elf.h
---- linux-2.6.32.33/arch/parisc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/parisc/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/parisc/include/asm/elf.h linux-2.6.32.35/arch/parisc/include/asm/elf.h
+--- linux-2.6.32.35/arch/parisc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/parisc/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1458,9 +1458,9 @@ diff -urNp linux-2.6.32.33/arch/parisc/include/asm/elf.h linux-2.6.32.33/arch/pa
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. This could be done in user space,
but it's not easy, and we've already done it here. */
-diff -urNp linux-2.6.32.33/arch/parisc/include/asm/pgtable.h linux-2.6.32.33/arch/parisc/include/asm/pgtable.h
---- linux-2.6.32.33/arch/parisc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/parisc/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/parisc/include/asm/pgtable.h linux-2.6.32.35/arch/parisc/include/asm/pgtable.h
+--- linux-2.6.32.35/arch/parisc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/parisc/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
@@ -207,6 +207,17 @@
#define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
#define PAGE_COPY PAGE_EXECREAD
@@ -1479,9 +1479,9 @@ diff -urNp linux-2.6.32.33/arch/parisc/include/asm/pgtable.h linux-2.6.32.33/arc
#define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
#define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
#define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
-diff -urNp linux-2.6.32.33/arch/parisc/kernel/module.c linux-2.6.32.33/arch/parisc/kernel/module.c
---- linux-2.6.32.33/arch/parisc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/parisc/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/parisc/kernel/module.c linux-2.6.32.35/arch/parisc/kernel/module.c
+--- linux-2.6.32.35/arch/parisc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/parisc/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
@@ -95,16 +95,38 @@
/* three functions to determine where in the module core
@@ -1582,9 +1582,9 @@ diff -urNp linux-2.6.32.33/arch/parisc/kernel/module.c linux-2.6.32.33/arch/pari
DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
me->arch.unwind_section, table, end, gp);
-diff -urNp linux-2.6.32.33/arch/parisc/kernel/sys_parisc.c linux-2.6.32.33/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.32.33/arch/parisc/kernel/sys_parisc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/parisc/kernel/sys_parisc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/parisc/kernel/sys_parisc.c linux-2.6.32.35/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.32.35/arch/parisc/kernel/sys_parisc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/parisc/kernel/sys_parisc.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
/* At this point: (!vma || addr < vma->vm_end). */
if (TASK_SIZE - len < addr)
@@ -1612,9 +1612,9 @@ diff -urNp linux-2.6.32.33/arch/parisc/kernel/sys_parisc.c linux-2.6.32.33/arch/
if (filp) {
addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.32.33/arch/parisc/kernel/traps.c linux-2.6.32.33/arch/parisc/kernel/traps.c
---- linux-2.6.32.33/arch/parisc/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/parisc/kernel/traps.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/parisc/kernel/traps.c linux-2.6.32.35/arch/parisc/kernel/traps.c
+--- linux-2.6.32.35/arch/parisc/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/parisc/kernel/traps.c 2010-12-31 14:46:53.000000000 -0500
@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
down_read(&current->mm->mmap_sem);
@@ -1626,9 +1626,9 @@ diff -urNp linux-2.6.32.33/arch/parisc/kernel/traps.c linux-2.6.32.33/arch/paris
fault_address = regs->iaoq[0];
fault_space = regs->iasq[0];
-diff -urNp linux-2.6.32.33/arch/parisc/mm/fault.c linux-2.6.32.33/arch/parisc/mm/fault.c
---- linux-2.6.32.33/arch/parisc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/parisc/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/parisc/mm/fault.c linux-2.6.32.35/arch/parisc/mm/fault.c
+--- linux-2.6.32.35/arch/parisc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/parisc/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
@@ -15,6 +15,7 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -1798,9 +1798,9 @@ diff -urNp linux-2.6.32.33/arch/parisc/mm/fault.c linux-2.6.32.33/arch/parisc/mm
/*
* If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/device.h linux-2.6.32.33/arch/powerpc/include/asm/device.h
---- linux-2.6.32.33/arch/powerpc/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/include/asm/device.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/include/asm/device.h linux-2.6.32.35/arch/powerpc/include/asm/device.h
+--- linux-2.6.32.35/arch/powerpc/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/include/asm/device.h 2010-12-31 14:46:53.000000000 -0500
@@ -14,7 +14,7 @@ struct dev_archdata {
struct device_node *of_node;
@@ -1810,9 +1810,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/device.h linux-2.6.32.33/arc
/*
* When an iommu is in use, dma_data is used as a ptr to the base of the
-diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.33/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.32.33/arch/powerpc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.35/arch/powerpc/include/asm/dma-mapping.h
+--- linux-2.6.32.35/arch/powerpc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
#ifdef CONFIG_PPC64
extern struct dma_map_ops dma_iommu_ops;
@@ -1879,9 +1879,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.3
if (dma_ops->mapping_error)
return dma_ops->mapping_error(dev, dma_addr);
-diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/elf.h linux-2.6.32.33/arch/powerpc/include/asm/elf.h
---- linux-2.6.32.33/arch/powerpc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/include/asm/elf.h linux-2.6.32.35/arch/powerpc/include/asm/elf.h
+--- linux-2.6.32.35/arch/powerpc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -1914,9 +1914,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/elf.h linux-2.6.32.33/arch/p
#endif /* __KERNEL__ */
/*
-diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/iommu.h linux-2.6.32.33/arch/powerpc/include/asm/iommu.h
---- linux-2.6.32.33/arch/powerpc/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/include/asm/iommu.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/include/asm/iommu.h linux-2.6.32.35/arch/powerpc/include/asm/iommu.h
+--- linux-2.6.32.35/arch/powerpc/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/include/asm/iommu.h 2010-12-31 14:46:53.000000000 -0500
@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
extern void iommu_init_early_dart(void);
extern void iommu_init_early_pasemi(void);
@@ -1927,9 +1927,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/iommu.h linux-2.6.32.33/arch
#ifdef CONFIG_PCI
extern void pci_iommu_init(void);
extern void pci_direct_iommu_init(void);
-diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.33/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.32.33/arch/powerpc/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.35/arch/powerpc/include/asm/kmap_types.h
+--- linux-2.6.32.35/arch/powerpc/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -26,6 +26,7 @@ enum km_type {
KM_SOFTIRQ1,
KM_PPC_SYNC_PAGE,
@@ -1938,9 +1938,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.33
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/page_64.h linux-2.6.32.33/arch/powerpc/include/asm/page_64.h
---- linux-2.6.32.33/arch/powerpc/include/asm/page_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/include/asm/page_64.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/include/asm/page_64.h linux-2.6.32.35/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.32.35/arch/powerpc/include/asm/page_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/include/asm/page_64.h 2010-12-31 14:46:53.000000000 -0500
@@ -180,15 +180,18 @@ do { \
* stack by default, so in the absense of a PT_GNU_STACK program header
* we turn execute permission off.
@@ -1962,9 +1962,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/page_64.h linux-2.6.32.33/ar
#include <asm-generic/getorder.h>
-diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/page.h linux-2.6.32.33/arch/powerpc/include/asm/page.h
---- linux-2.6.32.33/arch/powerpc/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/include/asm/page.h linux-2.6.32.35/arch/powerpc/include/asm/page.h
+--- linux-2.6.32.35/arch/powerpc/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
* and needs to be executable. This means the whole heap ends
* up being executable.
@@ -1987,9 +1987,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/page.h linux-2.6.32.33/arch/
#ifndef __ASSEMBLY__
#undef STRICT_MM_TYPECHECKS
-diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/pci.h linux-2.6.32.33/arch/powerpc/include/asm/pci.h
---- linux-2.6.32.33/arch/powerpc/include/asm/pci.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/include/asm/pci.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/include/asm/pci.h linux-2.6.32.35/arch/powerpc/include/asm/pci.h
+--- linux-2.6.32.35/arch/powerpc/include/asm/pci.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/include/asm/pci.h 2010-12-31 14:46:53.000000000 -0500
@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
}
@@ -2001,9 +2001,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/pci.h linux-2.6.32.33/arch/p
#else /* CONFIG_PCI */
#define set_pci_dma_ops(d)
#define get_pci_dma_ops() NULL
-diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/pgtable.h linux-2.6.32.33/arch/powerpc/include/asm/pgtable.h
---- linux-2.6.32.33/arch/powerpc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/include/asm/pgtable.h 2011-02-27 14:53:10.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/include/asm/pgtable.h linux-2.6.32.35/arch/powerpc/include/asm/pgtable.h
+--- linux-2.6.32.35/arch/powerpc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/include/asm/pgtable.h 2011-02-27 14:53:10.000000000 -0500
@@ -2,6 +2,7 @@
#define _ASM_POWERPC_PGTABLE_H
#ifdef __KERNEL__
@@ -2012,9 +2012,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/pgtable.h linux-2.6.32.33/ar
#ifndef __ASSEMBLY__
#include <asm/processor.h> /* For TASK_SIZE */
#include <asm/mmu.h>
-diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.33/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.32.33/arch/powerpc/include/asm/pte-hash32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/include/asm/pte-hash32.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.35/arch/powerpc/include/asm/pte-hash32.h
+--- linux-2.6.32.35/arch/powerpc/include/asm/pte-hash32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/include/asm/pte-hash32.h 2010-12-31 14:46:53.000000000 -0500
@@ -21,6 +21,7 @@
#define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
#define _PAGE_USER 0x004 /* usermode access allowed */
@@ -2023,9 +2023,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.33
#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.33/arch/powerpc/include/asm/reg.h linux-2.6.32.33/arch/powerpc/include/asm/reg.h
---- linux-2.6.32.33/arch/powerpc/include/asm/reg.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/include/asm/reg.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/include/asm/reg.h linux-2.6.32.35/arch/powerpc/include/asm/reg.h
+--- linux-2.6.32.35/arch/powerpc/include/asm/reg.h 2011-03-23 19:00:31.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/include/asm/reg.h 2011-03-23 19:01:00.000000000 -0400
@@ -191,6 +191,7 @@
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -2034,9 +2034,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/reg.h linux-2.6.32.33/arch/p
#define DSISR_PROTFAULT 0x08000000 /* protection fault */
#define DSISR_ISSTORE 0x02000000 /* access was a store */
#define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
-diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.33/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.32.33/arch/powerpc/include/asm/swiotlb.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/include/asm/swiotlb.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.35/arch/powerpc/include/asm/swiotlb.h
+--- linux-2.6.32.35/arch/powerpc/include/asm/swiotlb.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/include/asm/swiotlb.h 2010-12-31 14:46:53.000000000 -0500
@@ -13,7 +13,7 @@
#include <linux/swiotlb.h>
@@ -2046,9 +2046,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.33/ar
static inline void dma_mark_clean(void *addr, size_t size) {}
-diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/system.h linux-2.6.32.33/arch/powerpc/include/asm/system.h
---- linux-2.6.32.33/arch/powerpc/include/asm/system.h 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/arch/powerpc/include/asm/system.h 2011-02-22 15:57:23.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/include/asm/system.h linux-2.6.32.35/arch/powerpc/include/asm/system.h
+--- linux-2.6.32.35/arch/powerpc/include/asm/system.h 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/arch/powerpc/include/asm/system.h 2011-02-22 15:57:23.000000000 -0500
@@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi
#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
#endif
@@ -2058,9 +2058,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/system.h linux-2.6.32.33/arc
/* Used in very early kernel initialization. */
extern unsigned long reloc_offset(void);
-diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/uaccess.h linux-2.6.32.33/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.32.33/arch/powerpc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/include/asm/uaccess.h linux-2.6.32.35/arch/powerpc/include/asm/uaccess.h
+--- linux-2.6.32.35/arch/powerpc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
@@ -13,6 +13,8 @@
#define VERIFY_READ 0
#define VERIFY_WRITE 1
@@ -2238,9 +2238,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/include/asm/uaccess.h linux-2.6.32.33/ar
extern unsigned long __clear_user(void __user *addr, unsigned long size);
static inline unsigned long clear_user(void __user *addr, unsigned long size)
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.33/arch/powerpc/kernel/cacheinfo.c
---- linux-2.6.32.33/arch/powerpc/kernel/cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/cacheinfo.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.35/arch/powerpc/kernel/cacheinfo.c
+--- linux-2.6.32.35/arch/powerpc/kernel/cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/cacheinfo.c 2010-12-31 14:46:53.000000000 -0500
@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
&cache_assoc_attr,
};
@@ -2250,9 +2250,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.33/arch/
.show = cache_index_show,
};
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/dma.c linux-2.6.32.33/arch/powerpc/kernel/dma.c
---- linux-2.6.32.33/arch/powerpc/kernel/dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/dma.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/dma.c linux-2.6.32.35/arch/powerpc/kernel/dma.c
+--- linux-2.6.32.35/arch/powerpc/kernel/dma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/dma.c 2010-12-31 14:46:53.000000000 -0500
@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
}
#endif
@@ -2262,9 +2262,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/dma.c linux-2.6.32.33/arch/powerp
.alloc_coherent = dma_direct_alloc_coherent,
.free_coherent = dma_direct_free_coherent,
.map_sg = dma_direct_map_sg,
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.33/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.32.33/arch/powerpc/kernel/dma-iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/dma-iommu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.35/arch/powerpc/kernel/dma-iommu.c
+--- linux-2.6.32.35/arch/powerpc/kernel/dma-iommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/dma-iommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
}
@@ -2274,9 +2274,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.33/arch/
{
struct iommu_table *tbl = get_iommu_table_base(dev);
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.33/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.32.33/arch/powerpc/kernel/dma-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/dma-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.35/arch/powerpc/kernel/dma-swiotlb.c
+--- linux-2.6.32.35/arch/powerpc/kernel/dma-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/dma-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
* map_page, and unmap_page on highmem, use normal dma_ops
* for everything else.
@@ -2286,9 +2286,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.33/arc
.alloc_coherent = dma_direct_alloc_coherent,
.free_coherent = dma_direct_free_coherent,
.map_sg = swiotlb_map_sg_attrs,
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.33/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.32.33/arch/powerpc/kernel/exceptions-64e.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/exceptions-64e.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.35/arch/powerpc/kernel/exceptions-64e.S
+--- linux-2.6.32.35/arch/powerpc/kernel/exceptions-64e.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/exceptions-64e.S 2010-12-31 14:46:53.000000000 -0500
@@ -455,6 +455,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
@@ -2307,9 +2307,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.33/
addi r3,r1,STACK_FRAME_OVERHEAD
ld r4,_DAR(r1)
bl .bad_page_fault
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.33/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.32.33/arch/powerpc/kernel/exceptions-64s.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/exceptions-64s.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.35/arch/powerpc/kernel/exceptions-64s.S
+--- linux-2.6.32.35/arch/powerpc/kernel/exceptions-64s.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/exceptions-64s.S 2010-12-31 14:46:53.000000000 -0500
@@ -818,10 +818,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
@@ -2322,9 +2322,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.33/
mr r5,r3
addi r3,r1,STACK_FRAME_OVERHEAD
lwz r4,_DAR(r1)
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/ibmebus.c linux-2.6.32.33/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.32.33/arch/powerpc/kernel/ibmebus.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/ibmebus.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/ibmebus.c linux-2.6.32.35/arch/powerpc/kernel/ibmebus.c
+--- linux-2.6.32.35/arch/powerpc/kernel/ibmebus.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/ibmebus.c 2010-12-31 14:46:53.000000000 -0500
@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
return 1;
}
@@ -2334,9 +2334,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/ibmebus.c linux-2.6.32.33/arch/po
.alloc_coherent = ibmebus_alloc_coherent,
.free_coherent = ibmebus_free_coherent,
.map_sg = ibmebus_map_sg,
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/kgdb.c linux-2.6.32.33/arch/powerpc/kernel/kgdb.c
---- linux-2.6.32.33/arch/powerpc/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/kgdb.c linux-2.6.32.35/arch/powerpc/kernel/kgdb.c
+--- linux-2.6.32.35/arch/powerpc/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
return 0;
@@ -2355,9 +2355,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/kgdb.c linux-2.6.32.33/arch/power
.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
};
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/module_32.c linux-2.6.32.33/arch/powerpc/kernel/module_32.c
---- linux-2.6.32.33/arch/powerpc/kernel/module_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/module_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/module_32.c linux-2.6.32.35/arch/powerpc/kernel/module_32.c
+--- linux-2.6.32.35/arch/powerpc/kernel/module_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/module_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
me->arch.core_plt_section = i;
}
@@ -2387,9 +2387,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/module_32.c linux-2.6.32.33/arch/
/* Find this entry, or if that fails, the next avail. entry */
while (entry->jump[0]) {
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/module.c linux-2.6.32.33/arch/powerpc/kernel/module.c
---- linux-2.6.32.33/arch/powerpc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/module.c linux-2.6.32.35/arch/powerpc/kernel/module.c
+--- linux-2.6.32.35/arch/powerpc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
@@ -31,11 +31,24 @@
LIST_HEAD(module_bug_list);
@@ -2429,9 +2429,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/module.c linux-2.6.32.33/arch/pow
static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs,
const char *name)
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/pci-common.c linux-2.6.32.33/arch/powerpc/kernel/pci-common.c
---- linux-2.6.32.33/arch/powerpc/kernel/pci-common.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/pci-common.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/pci-common.c linux-2.6.32.35/arch/powerpc/kernel/pci-common.c
+--- linux-2.6.32.35/arch/powerpc/kernel/pci-common.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/pci-common.c 2010-12-31 14:46:53.000000000 -0500
@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
unsigned int ppc_pci_flags = 0;
@@ -2450,9 +2450,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/pci-common.c linux-2.6.32.33/arch
{
return pci_dma_ops;
}
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/process.c linux-2.6.32.33/arch/powerpc/kernel/process.c
---- linux-2.6.32.33/arch/powerpc/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/process.c linux-2.6.32.35/arch/powerpc/kernel/process.c
+--- linux-2.6.32.35/arch/powerpc/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
@@ -539,8 +539,8 @@ void show_regs(struct pt_regs * regs)
* Lookup NIP late so we have the best change of getting the
* above info out without failing
@@ -2545,9 +2545,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/process.c linux-2.6.32.33/arch/po
-
- return ret;
-}
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/signal_32.c linux-2.6.32.33/arch/powerpc/kernel/signal_32.c
---- linux-2.6.32.33/arch/powerpc/kernel/signal_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/signal_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/signal_32.c linux-2.6.32.35/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.32.35/arch/powerpc/kernel/signal_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/signal_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
@@ -2557,9 +2557,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/signal_32.c linux-2.6.32.33/arch/
if (save_user_regs(regs, frame, 0, 1))
goto badframe;
regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/signal_64.c linux-2.6.32.33/arch/powerpc/kernel/signal_64.c
---- linux-2.6.32.33/arch/powerpc/kernel/signal_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/signal_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/signal_64.c linux-2.6.32.35/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.32.35/arch/powerpc/kernel/signal_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/signal_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
current->thread.fpscr.val = 0;
@@ -2569,9 +2569,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/signal_64.c linux-2.6.32.33/arch/
regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
} else {
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.33/arch/powerpc/kernel/sys_ppc32.c
---- linux-2.6.32.33/arch/powerpc/kernel/sys_ppc32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/sys_ppc32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.35/arch/powerpc/kernel/sys_ppc32.c
+--- linux-2.6.32.35/arch/powerpc/kernel/sys_ppc32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/sys_ppc32.c 2010-12-31 14:46:53.000000000 -0500
@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
if (oldlenp) {
if (!error) {
@@ -2585,9 +2585,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.33/arch/
}
return error;
}
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/vdso.c linux-2.6.32.33/arch/powerpc/kernel/vdso.c
---- linux-2.6.32.33/arch/powerpc/kernel/vdso.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/vdso.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/vdso.c linux-2.6.32.35/arch/powerpc/kernel/vdso.c
+--- linux-2.6.32.35/arch/powerpc/kernel/vdso.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/vdso.c 2010-12-31 14:46:53.000000000 -0500
@@ -36,6 +36,7 @@
#include <asm/firmware.h>
#include <asm/vdso.h>
@@ -2614,9 +2614,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/vdso.c linux-2.6.32.33/arch/power
if (IS_ERR_VALUE(vdso_base)) {
rc = vdso_base;
goto fail_mmapsem;
-diff -urNp linux-2.6.32.33/arch/powerpc/kernel/vio.c linux-2.6.32.33/arch/powerpc/kernel/vio.c
---- linux-2.6.32.33/arch/powerpc/kernel/vio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/kernel/vio.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/kernel/vio.c linux-2.6.32.35/arch/powerpc/kernel/vio.c
+--- linux-2.6.32.35/arch/powerpc/kernel/vio.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/kernel/vio.c 2010-12-31 14:46:53.000000000 -0500
@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
vio_cmo_dealloc(viodev, alloc_size);
}
@@ -2639,9 +2639,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/kernel/vio.c linux-2.6.32.33/arch/powerp
viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
}
-diff -urNp linux-2.6.32.33/arch/powerpc/lib/usercopy_64.c linux-2.6.32.33/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.32.33/arch/powerpc/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/lib/usercopy_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/lib/usercopy_64.c linux-2.6.32.35/arch/powerpc/lib/usercopy_64.c
+--- linux-2.6.32.35/arch/powerpc/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/lib/usercopy_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -9,22 +9,6 @@
#include <linux/module.h>
#include <asm/uaccess.h>
@@ -2673,9 +2673,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/lib/usercopy_64.c linux-2.6.32.33/arch/p
-EXPORT_SYMBOL(copy_to_user);
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-2.6.32.33/arch/powerpc/mm/fault.c linux-2.6.32.33/arch/powerpc/mm/fault.c
---- linux-2.6.32.33/arch/powerpc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/mm/fault.c linux-2.6.32.35/arch/powerpc/mm/fault.c
+--- linux-2.6.32.35/arch/powerpc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/mm/fault.c 2010-12-31 14:46:53.000000000 -0500
@@ -30,6 +30,10 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -2780,9 +2780,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/mm/fault.c linux-2.6.32.33/arch/powerpc/
_exception(SIGSEGV, regs, code, address);
return 0;
}
-diff -urNp linux-2.6.32.33/arch/powerpc/mm/mmap_64.c linux-2.6.32.33/arch/powerpc/mm/mmap_64.c
---- linux-2.6.32.33/arch/powerpc/mm/mmap_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/mm/mmap_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/mm/mmap_64.c linux-2.6.32.35/arch/powerpc/mm/mmap_64.c
+--- linux-2.6.32.35/arch/powerpc/mm/mmap_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/mm/mmap_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -2806,9 +2806,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/mm/mmap_64.c linux-2.6.32.33/arch/powerp
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.32.33/arch/powerpc/mm/slice.c linux-2.6.32.33/arch/powerpc/mm/slice.c
---- linux-2.6.32.33/arch/powerpc/mm/slice.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/mm/slice.c 2011-03-21 17:34:54.000000000 -0400
+diff -urNp linux-2.6.32.35/arch/powerpc/mm/slice.c linux-2.6.32.35/arch/powerpc/mm/slice.c
+--- linux-2.6.32.35/arch/powerpc/mm/slice.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/mm/slice.c 2011-03-21 17:34:54.000000000 -0400
@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
if ((mm->task_size - len) < addr)
return 0;
@@ -2875,9 +2875,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/mm/slice.c linux-2.6.32.33/arch/powerpc/
/* If hint, make sure it matches our alignment restrictions */
if (!fixed && addr) {
addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-2.6.32.33/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.33/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.32.33/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.35/arch/powerpc/platforms/52xx/lite5200_pm.c
+--- linux-2.6.32.35/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
lite5200_pm_target_state = PM_SUSPEND_ON;
}
@@ -2887,9 +2887,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3
.valid = lite5200_pm_valid,
.begin = lite5200_pm_begin,
.prepare = lite5200_pm_prepare,
-diff -urNp linux-2.6.32.33/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.33/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.32.33/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.35/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+--- linux-2.6.32.35/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
iounmap(mbar);
}
@@ -2899,9 +2899,9 @@ diff -urNp linux-2.6.32.33/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.33/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.33/arch/powerpc/platforms/83xx/suspend.c
---- linux-2.6.32.33/arch/powerpc/platforms/83xx/suspend.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/platforms/83xx/suspend.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.35/arch/powerpc/platforms/83xx/suspend.c
+--- linux-2.6.32.35/arch/powerpc/platforms/83xx/suspend.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/platforms/83xx/suspend.c 2010-12-31 14:46:53.000000000 -0500
@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
return ret;
}
@@ -2911,9 +2911,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.33
.valid = mpc83xx_suspend_valid,
.begin = mpc83xx_suspend_begin,
.enter = mpc83xx_suspend_enter,
-diff -urNp linux-2.6.32.33/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.33/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.32.33/arch/powerpc/platforms/cell/iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/platforms/cell/iommu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.35/arch/powerpc/platforms/cell/iommu.c
+--- linux-2.6.32.35/arch/powerpc/platforms/cell/iommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/platforms/cell/iommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -2923,9 +2923,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.33/a
.alloc_coherent = dma_fixed_alloc_coherent,
.free_coherent = dma_fixed_free_coherent,
.map_sg = dma_fixed_map_sg,
-diff -urNp linux-2.6.32.33/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.33/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.32.33/arch/powerpc/platforms/ps3/system-bus.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/platforms/ps3/system-bus.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.35/arch/powerpc/platforms/ps3/system-bus.c
+--- linux-2.6.32.35/arch/powerpc/platforms/ps3/system-bus.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/platforms/ps3/system-bus.c 2010-12-31 14:46:53.000000000 -0500
@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
return mask >= DMA_BIT_MASK(32);
}
@@ -2944,9 +2944,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
.alloc_coherent = ps3_alloc_coherent,
.free_coherent = ps3_free_coherent,
.map_sg = ps3_ioc0_map_sg,
-diff -urNp linux-2.6.32.33/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.33/arch/powerpc/platforms/pseries/Kconfig
---- linux-2.6.32.33/arch/powerpc/platforms/pseries/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/powerpc/platforms/pseries/Kconfig 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.35/arch/powerpc/platforms/pseries/Kconfig
+--- linux-2.6.32.35/arch/powerpc/platforms/pseries/Kconfig 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/powerpc/platforms/pseries/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -2,6 +2,8 @@ config PPC_PSERIES
depends on PPC64 && PPC_BOOK3S
bool "IBM pSeries & new (POWER5-based) iSeries"
@@ -2956,9 +2956,9 @@ diff -urNp linux-2.6.32.33/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.3
select PPC_I8259
select PPC_RTAS
select RTAS_ERROR_LOGGING
-diff -urNp linux-2.6.32.33/arch/s390/include/asm/elf.h linux-2.6.32.33/arch/s390/include/asm/elf.h
---- linux-2.6.32.33/arch/s390/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/s390/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/s390/include/asm/elf.h linux-2.6.32.35/arch/s390/include/asm/elf.h
+--- linux-2.6.32.35/arch/s390/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/s390/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
that it will "exec", and that there is sufficient room for the brk. */
#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
@@ -2973,9 +2973,9 @@ diff -urNp linux-2.6.32.33/arch/s390/include/asm/elf.h linux-2.6.32.33/arch/s390
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. */
-diff -urNp linux-2.6.32.33/arch/s390/include/asm/setup.h linux-2.6.32.33/arch/s390/include/asm/setup.h
---- linux-2.6.32.33/arch/s390/include/asm/setup.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/s390/include/asm/setup.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/s390/include/asm/setup.h linux-2.6.32.35/arch/s390/include/asm/setup.h
+--- linux-2.6.32.35/arch/s390/include/asm/setup.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/s390/include/asm/setup.h 2010-12-31 14:46:53.000000000 -0500
@@ -50,13 +50,13 @@ extern unsigned long memory_end;
void detect_memory_layout(struct mem_chunk chunk[]);
@@ -2992,9 +2992,9 @@ diff -urNp linux-2.6.32.33/arch/s390/include/asm/setup.h linux-2.6.32.33/arch/s3
#else
#define s390_noexec (0)
#endif
-diff -urNp linux-2.6.32.33/arch/s390/include/asm/uaccess.h linux-2.6.32.33/arch/s390/include/asm/uaccess.h
---- linux-2.6.32.33/arch/s390/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/s390/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/s390/include/asm/uaccess.h linux-2.6.32.35/arch/s390/include/asm/uaccess.h
+--- linux-2.6.32.35/arch/s390/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/s390/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
@@ -232,6 +232,10 @@ static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long n)
{
@@ -3027,9 +3027,9 @@ diff -urNp linux-2.6.32.33/arch/s390/include/asm/uaccess.h linux-2.6.32.33/arch/
if (access_ok(VERIFY_READ, from, n))
n = __copy_from_user(to, from, n);
else
-diff -urNp linux-2.6.32.33/arch/s390/Kconfig linux-2.6.32.33/arch/s390/Kconfig
---- linux-2.6.32.33/arch/s390/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/s390/Kconfig 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/s390/Kconfig linux-2.6.32.35/arch/s390/Kconfig
+--- linux-2.6.32.35/arch/s390/Kconfig 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/s390/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -194,28 +194,26 @@ config AUDIT_ARCH
config S390_SWITCH_AMODE
@@ -3067,9 +3067,9 @@ diff -urNp linux-2.6.32.33/arch/s390/Kconfig linux-2.6.32.33/arch/s390/Kconfig
comment "Code generation options"
-diff -urNp linux-2.6.32.33/arch/s390/kernel/module.c linux-2.6.32.33/arch/s390/kernel/module.c
---- linux-2.6.32.33/arch/s390/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/s390/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/s390/kernel/module.c linux-2.6.32.35/arch/s390/kernel/module.c
+--- linux-2.6.32.35/arch/s390/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/s390/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
/* Increase core size by size of got & plt and set start
@@ -3141,9 +3141,9 @@ diff -urNp linux-2.6.32.33/arch/s390/kernel/module.c linux-2.6.32.33/arch/s390/k
rela->r_addend - loc;
if (r_type == R_390_GOTPC)
*(unsigned int *) loc = val;
-diff -urNp linux-2.6.32.33/arch/s390/kernel/setup.c linux-2.6.32.33/arch/s390/kernel/setup.c
---- linux-2.6.32.33/arch/s390/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/s390/kernel/setup.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/s390/kernel/setup.c linux-2.6.32.35/arch/s390/kernel/setup.c
+--- linux-2.6.32.35/arch/s390/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/s390/kernel/setup.c 2010-12-31 14:46:53.000000000 -0500
@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
early_param("mem", early_parse_mem);
@@ -3197,9 +3197,9 @@ diff -urNp linux-2.6.32.33/arch/s390/kernel/setup.c linux-2.6.32.33/arch/s390/ke
static void setup_addressing_mode(void)
{
if (s390_noexec) {
-diff -urNp linux-2.6.32.33/arch/s390/mm/mmap.c linux-2.6.32.33/arch/s390/mm/mmap.c
---- linux-2.6.32.33/arch/s390/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/s390/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/s390/mm/mmap.c linux-2.6.32.35/arch/s390/mm/mmap.c
+--- linux-2.6.32.35/arch/s390/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/s390/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -3246,9 +3246,9 @@ diff -urNp linux-2.6.32.33/arch/s390/mm/mmap.c linux-2.6.32.33/arch/s390/mm/mmap
mm->get_unmapped_area = s390_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.32.33/arch/score/include/asm/system.h linux-2.6.32.33/arch/score/include/asm/system.h
---- linux-2.6.32.33/arch/score/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/score/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/score/include/asm/system.h linux-2.6.32.35/arch/score/include/asm/system.h
+--- linux-2.6.32.35/arch/score/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/score/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
@@ -17,7 +17,7 @@ do { \
#define finish_arch_switch(prev) do {} while (0)
@@ -3258,9 +3258,9 @@ diff -urNp linux-2.6.32.33/arch/score/include/asm/system.h linux-2.6.32.33/arch/
#define mb() barrier()
#define rmb() barrier()
-diff -urNp linux-2.6.32.33/arch/score/kernel/process.c linux-2.6.32.33/arch/score/kernel/process.c
---- linux-2.6.32.33/arch/score/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/score/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/score/kernel/process.c linux-2.6.32.35/arch/score/kernel/process.c
+--- linux-2.6.32.35/arch/score/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/score/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
return task_pt_regs(task)->cp0_epc;
@@ -3270,9 +3270,9 @@ diff -urNp linux-2.6.32.33/arch/score/kernel/process.c linux-2.6.32.33/arch/scor
-{
- return sp;
-}
-diff -urNp linux-2.6.32.33/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.33/arch/sh/boards/mach-hp6xx/pm.c
---- linux-2.6.32.33/arch/sh/boards/mach-hp6xx/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sh/boards/mach-hp6xx/pm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.35/arch/sh/boards/mach-hp6xx/pm.c
+--- linux-2.6.32.35/arch/sh/boards/mach-hp6xx/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sh/boards/mach-hp6xx/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
return 0;
}
@@ -3282,9 +3282,9 @@ diff -urNp linux-2.6.32.33/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.33/arch/s
.enter = hp6x0_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.32.33/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.33/arch/sh/kernel/cpu/sh4/sq.c
---- linux-2.6.32.33/arch/sh/kernel/cpu/sh4/sq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sh/kernel/cpu/sh4/sq.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.35/arch/sh/kernel/cpu/sh4/sq.c
+--- linux-2.6.32.35/arch/sh/kernel/cpu/sh4/sq.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sh/kernel/cpu/sh4/sq.c 2010-12-31 14:46:53.000000000 -0500
@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
NULL,
};
@@ -3294,9 +3294,9 @@ diff -urNp linux-2.6.32.33/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.33/arch/sh/k
.show = sq_sysfs_show,
.store = sq_sysfs_store,
};
-diff -urNp linux-2.6.32.33/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.33/arch/sh/kernel/cpu/shmobile/pm.c
---- linux-2.6.32.33/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sh/kernel/cpu/shmobile/pm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.35/arch/sh/kernel/cpu/shmobile/pm.c
+--- linux-2.6.32.35/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sh/kernel/cpu/shmobile/pm.c 2010-12-31 14:46:53.000000000 -0500
@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
return 0;
}
@@ -3306,9 +3306,9 @@ diff -urNp linux-2.6.32.33/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.33/arch
.enter = sh_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.32.33/arch/sh/kernel/kgdb.c linux-2.6.32.33/arch/sh/kernel/kgdb.c
---- linux-2.6.32.33/arch/sh/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sh/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sh/kernel/kgdb.c linux-2.6.32.35/arch/sh/kernel/kgdb.c
+--- linux-2.6.32.35/arch/sh/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sh/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3318,9 +3318,9 @@ diff -urNp linux-2.6.32.33/arch/sh/kernel/kgdb.c linux-2.6.32.33/arch/sh/kernel/
/* Breakpoint instruction: trapa #0x3c */
#ifdef CONFIG_CPU_LITTLE_ENDIAN
.gdb_bpt_instr = { 0x3c, 0xc3 },
-diff -urNp linux-2.6.32.33/arch/sh/mm/mmap.c linux-2.6.32.33/arch/sh/mm/mmap.c
---- linux-2.6.32.33/arch/sh/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sh/mm/mmap.c 2011-03-21 17:34:54.000000000 -0400
+diff -urNp linux-2.6.32.35/arch/sh/mm/mmap.c linux-2.6.32.35/arch/sh/mm/mmap.c
+--- linux-2.6.32.35/arch/sh/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sh/mm/mmap.c 2011-03-21 17:34:54.000000000 -0400
@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
addr = PAGE_ALIGN(addr);
@@ -3395,9 +3395,9 @@ diff -urNp linux-2.6.32.33/arch/sh/mm/mmap.c linux-2.6.32.33/arch/sh/mm/mmap.c
bottomup:
/*
-diff -urNp linux-2.6.32.33/arch/sparc/include/asm/atomic_64.h linux-2.6.32.33/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.32.33/arch/sparc/include/asm/atomic_64.h 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/include/asm/atomic_64.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/include/asm/atomic_64.h linux-2.6.32.35/arch/sparc/include/asm/atomic_64.h
+--- linux-2.6.32.35/arch/sparc/include/asm/atomic_64.h 2010-08-29 21:08:20.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/include/asm/atomic_64.h 2010-12-31 14:46:53.000000000 -0500
@@ -14,18 +14,40 @@
#define ATOMIC64_INIT(i) { (i) }
@@ -3548,9 +3548,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/include/asm/atomic_64.h linux-2.6.32.33/ar
}
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.32.33/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.33/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.32.33/arch/sparc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.35/arch/sparc/include/asm/dma-mapping.h
+--- linux-2.6.32.35/arch/sparc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
#define dma_is_consistent(d, h) (1)
@@ -3582,9 +3582,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.33/
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.33/arch/sparc/include/asm/elf_32.h linux-2.6.32.33/arch/sparc/include/asm/elf_32.h
---- linux-2.6.32.33/arch/sparc/include/asm/elf_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/include/asm/elf_32.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/include/asm/elf_32.h linux-2.6.32.35/arch/sparc/include/asm/elf_32.h
+--- linux-2.6.32.35/arch/sparc/include/asm/elf_32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/include/asm/elf_32.h 2010-12-31 14:46:53.000000000 -0500
@@ -116,6 +116,13 @@ typedef struct {
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -3599,9 +3599,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/include/asm/elf_32.h linux-2.6.32.33/arch/
/* This yields a mask that user programs can use to figure out what
instruction set this cpu supports. This can NOT be done in userspace
on Sparc. */
-diff -urNp linux-2.6.32.33/arch/sparc/include/asm/elf_64.h linux-2.6.32.33/arch/sparc/include/asm/elf_64.h
---- linux-2.6.32.33/arch/sparc/include/asm/elf_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/include/asm/elf_64.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/include/asm/elf_64.h linux-2.6.32.35/arch/sparc/include/asm/elf_64.h
+--- linux-2.6.32.35/arch/sparc/include/asm/elf_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/include/asm/elf_64.h 2010-12-31 14:46:53.000000000 -0500
@@ -163,6 +163,12 @@ typedef struct {
#define ELF_ET_DYN_BASE 0x0000010000000000UL
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -3615,9 +3615,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/include/asm/elf_64.h linux-2.6.32.33/arch/
/* This yields a mask that user programs can use to figure out what
instruction set this cpu supports. */
-diff -urNp linux-2.6.32.33/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.33/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.32.33/arch/sparc/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/include/asm/pgtable_32.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.35/arch/sparc/include/asm/pgtable_32.h
+--- linux-2.6.32.35/arch/sparc/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/include/asm/pgtable_32.h 2010-12-31 14:46:53.000000000 -0500
@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
BTFIXUPDEF_INT(page_none)
BTFIXUPDEF_INT(page_copy)
@@ -3649,9 +3649,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.33/a
extern unsigned long page_kernel;
#ifdef MODULE
-diff -urNp linux-2.6.32.33/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.33/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.32.33/arch/sparc/include/asm/pgtsrmmu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/include/asm/pgtsrmmu.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.35/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-2.6.32.35/arch/sparc/include/asm/pgtsrmmu.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/include/asm/pgtsrmmu.h 2010-12-31 14:46:53.000000000 -0500
@@ -115,6 +115,13 @@
SRMMU_EXEC | SRMMU_REF)
#define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3666,9 +3666,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.33/arc
#define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
SRMMU_DIRTY | SRMMU_REF)
-diff -urNp linux-2.6.32.33/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.33/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.32.33/arch/sparc/include/asm/spinlock_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/include/asm/spinlock_64.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.35/arch/sparc/include/asm/spinlock_64.h
+--- linux-2.6.32.35/arch/sparc/include/asm/spinlock_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/include/asm/spinlock_64.h 2010-12-31 14:46:53.000000000 -0500
@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
__asm__ __volatile__ (
"1: ldsw [%2], %0\n"
@@ -3720,9 +3720,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.33/
" cas [%2], %0, %1\n"
" cmp %0, %1\n"
" bne,pn %%xcc, 1b\n"
-diff -urNp linux-2.6.32.33/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.33/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.32.33/arch/sparc/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/include/asm/uaccess_32.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.35/arch/sparc/include/asm/uaccess_32.h
+--- linux-2.6.32.35/arch/sparc/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/include/asm/uaccess_32.h 2010-12-31 14:46:53.000000000 -0500
@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3774,9 +3774,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.33/a
return __copy_user((__force void __user *) to, from, n);
}
-diff -urNp linux-2.6.32.33/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.33/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.32.33/arch/sparc/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/include/asm/uaccess_64.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.35/arch/sparc/include/asm/uaccess_64.h
+--- linux-2.6.32.35/arch/sparc/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/include/asm/uaccess_64.h 2010-12-31 14:46:53.000000000 -0500
@@ -9,6 +9,7 @@
#include <linux/compiler.h>
#include <linux/string.h>
@@ -3819,9 +3819,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.33/a
if (unlikely(ret))
ret = copy_to_user_fixup(to, from, size);
return ret;
-diff -urNp linux-2.6.32.33/arch/sparc/include/asm/uaccess.h linux-2.6.32.33/arch/sparc/include/asm/uaccess.h
---- linux-2.6.32.33/arch/sparc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/include/asm/uaccess.h linux-2.6.32.35/arch/sparc/include/asm/uaccess.h
+--- linux-2.6.32.35/arch/sparc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/include/asm/uaccess.h 2010-12-31 14:46:53.000000000 -0500
@@ -1,5 +1,13 @@
#ifndef ___ASM_SPARC_UACCESS_H
#define ___ASM_SPARC_UACCESS_H
@@ -3836,9 +3836,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/include/asm/uaccess.h linux-2.6.32.33/arch
#if defined(__sparc__) && defined(__arch64__)
#include <asm/uaccess_64.h>
#else
-diff -urNp linux-2.6.32.33/arch/sparc/kernel/iommu.c linux-2.6.32.33/arch/sparc/kernel/iommu.c
---- linux-2.6.32.33/arch/sparc/kernel/iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/kernel/iommu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/kernel/iommu.c linux-2.6.32.35/arch/sparc/kernel/iommu.c
+--- linux-2.6.32.35/arch/sparc/kernel/iommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/kernel/iommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -3857,9 +3857,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/kernel/iommu.c linux-2.6.32.33/arch/sparc/
EXPORT_SYMBOL(dma_ops);
extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
-diff -urNp linux-2.6.32.33/arch/sparc/kernel/ioport.c linux-2.6.32.33/arch/sparc/kernel/ioport.c
---- linux-2.6.32.33/arch/sparc/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/kernel/ioport.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/kernel/ioport.c linux-2.6.32.35/arch/sparc/kernel/ioport.c
+--- linux-2.6.32.35/arch/sparc/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/kernel/ioport.c 2010-12-31 14:46:53.000000000 -0500
@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
BUG();
}
@@ -3887,9 +3887,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/kernel/ioport.c linux-2.6.32.33/arch/sparc
.alloc_coherent = pci32_alloc_coherent,
.free_coherent = pci32_free_coherent,
.map_page = pci32_map_page,
-diff -urNp linux-2.6.32.33/arch/sparc/kernel/kgdb_32.c linux-2.6.32.33/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.32.33/arch/sparc/kernel/kgdb_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/kernel/kgdb_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/kernel/kgdb_32.c linux-2.6.32.35/arch/sparc/kernel/kgdb_32.c
+--- linux-2.6.32.35/arch/sparc/kernel/kgdb_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/kernel/kgdb_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3899,9 +3899,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/kernel/kgdb_32.c linux-2.6.32.33/arch/spar
/* Breakpoint instruction: ta 0x7d */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
};
-diff -urNp linux-2.6.32.33/arch/sparc/kernel/kgdb_64.c linux-2.6.32.33/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.32.33/arch/sparc/kernel/kgdb_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/kernel/kgdb_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/kernel/kgdb_64.c linux-2.6.32.35/arch/sparc/kernel/kgdb_64.c
+--- linux-2.6.32.35/arch/sparc/kernel/kgdb_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/kernel/kgdb_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3911,9 +3911,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/kernel/kgdb_64.c linux-2.6.32.33/arch/spar
/* Breakpoint instruction: ta 0x72 */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
};
-diff -urNp linux-2.6.32.33/arch/sparc/kernel/Makefile linux-2.6.32.33/arch/sparc/kernel/Makefile
---- linux-2.6.32.33/arch/sparc/kernel/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/kernel/Makefile 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/kernel/Makefile linux-2.6.32.35/arch/sparc/kernel/Makefile
+--- linux-2.6.32.35/arch/sparc/kernel/Makefile 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/kernel/Makefile 2010-12-31 14:46:53.000000000 -0500
@@ -3,7 +3,7 @@
#
@@ -3923,9 +3923,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/kernel/Makefile linux-2.6.32.33/arch/sparc
extra-y := head_$(BITS).o
extra-y += init_task.o
-diff -urNp linux-2.6.32.33/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.33/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.32.33/arch/sparc/kernel/pci_sun4v.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/kernel/pci_sun4v.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.35/arch/sparc/kernel/pci_sun4v.c
+--- linux-2.6.32.35/arch/sparc/kernel/pci_sun4v.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/kernel/pci_sun4v.c 2010-12-31 14:46:53.000000000 -0500
@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -3935,9 +3935,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.33/arch/sp
.alloc_coherent = dma_4v_alloc_coherent,
.free_coherent = dma_4v_free_coherent,
.map_page = dma_4v_map_page,
-diff -urNp linux-2.6.32.33/arch/sparc/kernel/process_32.c linux-2.6.32.33/arch/sparc/kernel/process_32.c
---- linux-2.6.32.33/arch/sparc/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/kernel/process_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/kernel/process_32.c linux-2.6.32.35/arch/sparc/kernel/process_32.c
+--- linux-2.6.32.35/arch/sparc/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/kernel/process_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
rw->ins[4], rw->ins[5],
rw->ins[6],
@@ -3973,9 +3973,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/kernel/process_32.c linux-2.6.32.33/arch/s
fp = rw->ins[6];
} while (++count < 16);
printk("\n");
-diff -urNp linux-2.6.32.33/arch/sparc/kernel/process_64.c linux-2.6.32.33/arch/sparc/kernel/process_64.c
---- linux-2.6.32.33/arch/sparc/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/kernel/process_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/kernel/process_64.c linux-2.6.32.35/arch/sparc/kernel/process_64.c
+--- linux-2.6.32.35/arch/sparc/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/kernel/process_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
@@ -4011,9 +4011,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/kernel/process_64.c linux-2.6.32.33/arch/s
(void *) gp->tpc,
(void *) gp->o7,
(void *) gp->i7,
-diff -urNp linux-2.6.32.33/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.33/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.32.33/arch/sparc/kernel/sys_sparc_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/kernel/sys_sparc_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.35/arch/sparc/kernel/sys_sparc_32.c
+--- linux-2.6.32.35/arch/sparc/kernel/sys_sparc_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/kernel/sys_sparc_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
if (ARCH_SUN4C && len > 0x20000000)
return -ENOMEM;
@@ -4032,9 +4032,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.33/arch
return addr;
addr = vmm->vm_end;
if (flags & MAP_SHARED)
-diff -urNp linux-2.6.32.33/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.33/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.32.33/arch/sparc/kernel/sys_sparc_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/kernel/sys_sparc_64.c 2011-03-21 17:34:54.000000000 -0400
+diff -urNp linux-2.6.32.35/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.35/arch/sparc/kernel/sys_sparc_64.c
+--- linux-2.6.32.35/arch/sparc/kernel/sys_sparc_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/kernel/sys_sparc_64.c 2011-03-21 17:34:54.000000000 -0400
@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
/* We do not accept a shared mapping if it would violate
* cache aliasing constraints.
@@ -4182,9 +4182,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.33/arch
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.32.33/arch/sparc/kernel/traps_32.c linux-2.6.32.33/arch/sparc/kernel/traps_32.c
---- linux-2.6.32.33/arch/sparc/kernel/traps_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/kernel/traps_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/kernel/traps_32.c linux-2.6.32.35/arch/sparc/kernel/traps_32.c
+--- linux-2.6.32.35/arch/sparc/kernel/traps_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/kernel/traps_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_
count++ < 30 &&
(((unsigned long) rw) >= PAGE_OFFSET) &&
@@ -4194,9 +4194,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/kernel/traps_32.c linux-2.6.32.33/arch/spa
(void *) rw->ins[7]);
rw = (struct reg_window32 *)rw->ins[6];
}
-diff -urNp linux-2.6.32.33/arch/sparc/kernel/traps_64.c linux-2.6.32.33/arch/sparc/kernel/traps_64.c
---- linux-2.6.32.33/arch/sparc/kernel/traps_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/kernel/traps_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/kernel/traps_64.c linux-2.6.32.35/arch/sparc/kernel/traps_64.c
+--- linux-2.6.32.35/arch/sparc/kernel/traps_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/kernel/traps_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -73,7 +73,7 @@ static void dump_tl1_traplog(struct tl1_
i + 1,
p->trapstack[i].tstate, p->trapstack[i].tpc,
@@ -4306,9 +4306,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/kernel/traps_64.c linux-2.6.32.33/arch/spa
(void *) rw->ins[7]);
rw = kernel_stack_up(rw);
-diff -urNp linux-2.6.32.33/arch/sparc/kernel/unaligned_64.c linux-2.6.32.33/arch/sparc/kernel/unaligned_64.c
---- linux-2.6.32.33/arch/sparc/kernel/unaligned_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/kernel/unaligned_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/kernel/unaligned_64.c linux-2.6.32.35/arch/sparc/kernel/unaligned_64.c
+--- linux-2.6.32.35/arch/sparc/kernel/unaligned_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/kernel/unaligned_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -288,7 +288,7 @@ static void log_unaligned(struct pt_regs
if (count < 5) {
last_time = jiffies;
@@ -4318,9 +4318,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/kernel/unaligned_64.c linux-2.6.32.33/arch
regs->tpc, (void *) regs->tpc);
}
}
-diff -urNp linux-2.6.32.33/arch/sparc/lib/atomic_64.S linux-2.6.32.33/arch/sparc/lib/atomic_64.S
---- linux-2.6.32.33/arch/sparc/lib/atomic_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/lib/atomic_64.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/lib/atomic_64.S linux-2.6.32.35/arch/sparc/lib/atomic_64.S
+--- linux-2.6.32.35/arch/sparc/lib/atomic_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/lib/atomic_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -18,7 +18,12 @@
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
@@ -4555,9 +4555,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/lib/atomic_64.S linux-2.6.32.33/arch/sparc
casx [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %xcc, 2f
-diff -urNp linux-2.6.32.33/arch/sparc/lib/ksyms.c linux-2.6.32.33/arch/sparc/lib/ksyms.c
---- linux-2.6.32.33/arch/sparc/lib/ksyms.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/lib/ksyms.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/lib/ksyms.c linux-2.6.32.35/arch/sparc/lib/ksyms.c
+--- linux-2.6.32.35/arch/sparc/lib/ksyms.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/lib/ksyms.c 2010-12-31 14:46:53.000000000 -0500
@@ -144,12 +144,17 @@ EXPORT_SYMBOL(__downgrade_write);
/* Atomic counter implementation. */
@@ -4576,9 +4576,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/lib/ksyms.c linux-2.6.32.33/arch/sparc/lib
EXPORT_SYMBOL(atomic64_sub_ret);
/* Atomic bit operations. */
-diff -urNp linux-2.6.32.33/arch/sparc/lib/rwsem_64.S linux-2.6.32.33/arch/sparc/lib/rwsem_64.S
---- linux-2.6.32.33/arch/sparc/lib/rwsem_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/lib/rwsem_64.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/lib/rwsem_64.S linux-2.6.32.35/arch/sparc/lib/rwsem_64.S
+--- linux-2.6.32.35/arch/sparc/lib/rwsem_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/lib/rwsem_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -11,7 +11,12 @@
.globl __down_read
__down_read:
@@ -4677,9 +4677,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/lib/rwsem_64.S linux-2.6.32.33/arch/sparc/
cas [%o0], %g3, %g7
cmp %g3, %g7
bne,pn %icc, 1b
-diff -urNp linux-2.6.32.33/arch/sparc/Makefile linux-2.6.32.33/arch/sparc/Makefile
---- linux-2.6.32.33/arch/sparc/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/Makefile 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/Makefile linux-2.6.32.35/arch/sparc/Makefile
+--- linux-2.6.32.35/arch/sparc/Makefile 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/Makefile 2010-12-31 14:46:53.000000000 -0500
@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
# Export what is needed by arch/sparc/boot/Makefile
export VMLINUX_INIT VMLINUX_MAIN
@@ -4689,9 +4689,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/Makefile linux-2.6.32.33/arch/sparc/Makefi
VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
VMLINUX_MAIN += $(drivers-y) $(net-y)
-diff -urNp linux-2.6.32.33/arch/sparc/mm/fault_32.c linux-2.6.32.33/arch/sparc/mm/fault_32.c
---- linux-2.6.32.33/arch/sparc/mm/fault_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/mm/fault_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/mm/fault_32.c linux-2.6.32.35/arch/sparc/mm/fault_32.c
+--- linux-2.6.32.35/arch/sparc/mm/fault_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/mm/fault_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -21,6 +21,9 @@
#include <linux/interrupt.h>
#include <linux/module.h>
@@ -4995,9 +4995,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/mm/fault_32.c linux-2.6.32.33/arch/sparc/m
/* Allow reads even for write-only mappings */
if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
goto bad_area;
-diff -urNp linux-2.6.32.33/arch/sparc/mm/fault_64.c linux-2.6.32.33/arch/sparc/mm/fault_64.c
---- linux-2.6.32.33/arch/sparc/mm/fault_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/mm/fault_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/mm/fault_64.c linux-2.6.32.35/arch/sparc/mm/fault_64.c
+--- linux-2.6.32.35/arch/sparc/mm/fault_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/mm/fault_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -20,6 +20,9 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -5504,9 +5504,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/mm/fault_64.c linux-2.6.32.33/arch/sparc/m
/* Pure DTLB misses do not tell us whether the fault causing
* load/store/atomic was a write or not, it only says that there
* was no match. So in such a case we (carefully) read the
-diff -urNp linux-2.6.32.33/arch/sparc/mm/hugetlbpage.c linux-2.6.32.33/arch/sparc/mm/hugetlbpage.c
---- linux-2.6.32.33/arch/sparc/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/mm/hugetlbpage.c 2011-03-21 17:34:54.000000000 -0400
+diff -urNp linux-2.6.32.35/arch/sparc/mm/hugetlbpage.c linux-2.6.32.35/arch/sparc/mm/hugetlbpage.c
+--- linux-2.6.32.35/arch/sparc/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/mm/hugetlbpage.c 2011-03-21 17:34:54.000000000 -0400
@@ -69,7 +69,7 @@ full_search:
}
return -ENOMEM;
@@ -5566,9 +5566,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/mm/hugetlbpage.c linux-2.6.32.33/arch/spar
return addr;
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.32.33/arch/sparc/mm/init_32.c linux-2.6.32.33/arch/sparc/mm/init_32.c
---- linux-2.6.32.33/arch/sparc/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/mm/init_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/mm/init_32.c linux-2.6.32.35/arch/sparc/mm/init_32.c
+--- linux-2.6.32.35/arch/sparc/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/mm/init_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -317,6 +317,9 @@ extern void device_scan(void);
pgprot_t PAGE_SHARED __read_mostly;
EXPORT_SYMBOL(PAGE_SHARED);
@@ -5603,9 +5603,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/mm/init_32.c linux-2.6.32.33/arch/sparc/mm
protection_map[12] = PAGE_READONLY;
protection_map[13] = PAGE_READONLY;
protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.32.33/arch/sparc/mm/Makefile linux-2.6.32.33/arch/sparc/mm/Makefile
---- linux-2.6.32.33/arch/sparc/mm/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/mm/Makefile 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/mm/Makefile linux-2.6.32.35/arch/sparc/mm/Makefile
+--- linux-2.6.32.35/arch/sparc/mm/Makefile 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/mm/Makefile 2010-12-31 14:46:53.000000000 -0500
@@ -2,7 +2,7 @@
#
@@ -5615,9 +5615,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/mm/Makefile linux-2.6.32.33/arch/sparc/mm/
obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
obj-y += fault_$(BITS).o
-diff -urNp linux-2.6.32.33/arch/sparc/mm/srmmu.c linux-2.6.32.33/arch/sparc/mm/srmmu.c
---- linux-2.6.32.33/arch/sparc/mm/srmmu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/sparc/mm/srmmu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/sparc/mm/srmmu.c linux-2.6.32.35/arch/sparc/mm/srmmu.c
+--- linux-2.6.32.35/arch/sparc/mm/srmmu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/sparc/mm/srmmu.c 2010-12-31 14:46:53.000000000 -0500
@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -5632,9 +5632,9 @@ diff -urNp linux-2.6.32.33/arch/sparc/mm/srmmu.c linux-2.6.32.33/arch/sparc/mm/s
BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
-diff -urNp linux-2.6.32.33/arch/um/include/asm/kmap_types.h linux-2.6.32.33/arch/um/include/asm/kmap_types.h
---- linux-2.6.32.33/arch/um/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/um/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/um/include/asm/kmap_types.h linux-2.6.32.35/arch/um/include/asm/kmap_types.h
+--- linux-2.6.32.35/arch/um/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/um/include/asm/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -5643,9 +5643,9 @@ diff -urNp linux-2.6.32.33/arch/um/include/asm/kmap_types.h linux-2.6.32.33/arch
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.33/arch/um/include/asm/page.h linux-2.6.32.33/arch/um/include/asm/page.h
---- linux-2.6.32.33/arch/um/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/um/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/um/include/asm/page.h linux-2.6.32.35/arch/um/include/asm/page.h
+--- linux-2.6.32.35/arch/um/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/um/include/asm/page.h 2010-12-31 14:46:53.000000000 -0500
@@ -14,6 +14,9 @@
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
@@ -5656,9 +5656,9 @@ diff -urNp linux-2.6.32.33/arch/um/include/asm/page.h linux-2.6.32.33/arch/um/in
#ifndef __ASSEMBLY__
struct page;
-diff -urNp linux-2.6.32.33/arch/um/kernel/process.c linux-2.6.32.33/arch/um/kernel/process.c
---- linux-2.6.32.33/arch/um/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/um/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/um/kernel/process.c linux-2.6.32.35/arch/um/kernel/process.c
+--- linux-2.6.32.35/arch/um/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/um/kernel/process.c 2010-12-31 14:46:53.000000000 -0500
@@ -393,22 +393,6 @@ int singlestepping(void * t)
return 2;
}
@@ -5682,9 +5682,9 @@ diff -urNp linux-2.6.32.33/arch/um/kernel/process.c linux-2.6.32.33/arch/um/kern
unsigned long get_wchan(struct task_struct *p)
{
unsigned long stack_page, sp, ip;
-diff -urNp linux-2.6.32.33/arch/um/sys-i386/syscalls.c linux-2.6.32.33/arch/um/sys-i386/syscalls.c
---- linux-2.6.32.33/arch/um/sys-i386/syscalls.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/um/sys-i386/syscalls.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/um/sys-i386/syscalls.c linux-2.6.32.35/arch/um/sys-i386/syscalls.c
+--- linux-2.6.32.35/arch/um/sys-i386/syscalls.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/um/sys-i386/syscalls.c 2010-12-31 14:46:53.000000000 -0500
@@ -11,6 +11,21 @@
#include "asm/uaccess.h"
#include "asm/unistd.h"
@@ -5707,9 +5707,9 @@ diff -urNp linux-2.6.32.33/arch/um/sys-i386/syscalls.c linux-2.6.32.33/arch/um/s
/*
* Perform the select(nd, in, out, ex, tv) and mmap() system
* calls. Linux/i386 didn't use to be able to handle more than
-diff -urNp linux-2.6.32.33/arch/x86/boot/bitops.h linux-2.6.32.33/arch/x86/boot/bitops.h
---- linux-2.6.32.33/arch/x86/boot/bitops.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/boot/bitops.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/boot/bitops.h linux-2.6.32.35/arch/x86/boot/bitops.h
+--- linux-2.6.32.35/arch/x86/boot/bitops.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/boot/bitops.h 2010-12-31 14:46:53.000000000 -0500
@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
u8 v;
const u32 *p = (const u32 *)addr;
@@ -5728,9 +5728,9 @@ diff -urNp linux-2.6.32.33/arch/x86/boot/bitops.h linux-2.6.32.33/arch/x86/boot/
}
#endif /* BOOT_BITOPS_H */
-diff -urNp linux-2.6.32.33/arch/x86/boot/boot.h linux-2.6.32.33/arch/x86/boot/boot.h
---- linux-2.6.32.33/arch/x86/boot/boot.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/boot/boot.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/boot/boot.h linux-2.6.32.35/arch/x86/boot/boot.h
+--- linux-2.6.32.35/arch/x86/boot/boot.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/boot/boot.h 2010-12-31 14:46:53.000000000 -0500
@@ -82,7 +82,7 @@ static inline void io_delay(void)
static inline u16 ds(void)
{
@@ -5749,9 +5749,9 @@ diff -urNp linux-2.6.32.33/arch/x86/boot/boot.h linux-2.6.32.33/arch/x86/boot/bo
: "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
return diff;
}
-diff -urNp linux-2.6.32.33/arch/x86/boot/compressed/head_32.S linux-2.6.32.33/arch/x86/boot/compressed/head_32.S
---- linux-2.6.32.33/arch/x86/boot/compressed/head_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/boot/compressed/head_32.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/boot/compressed/head_32.S linux-2.6.32.35/arch/x86/boot/compressed/head_32.S
+--- linux-2.6.32.35/arch/x86/boot/compressed/head_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/boot/compressed/head_32.S 2010-12-31 14:46:53.000000000 -0500
@@ -76,7 +76,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -5780,9 +5780,9 @@ diff -urNp linux-2.6.32.33/arch/x86/boot/compressed/head_32.S linux-2.6.32.33/ar
addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
jmp 1b
2:
-diff -urNp linux-2.6.32.33/arch/x86/boot/compressed/head_64.S linux-2.6.32.33/arch/x86/boot/compressed/head_64.S
---- linux-2.6.32.33/arch/x86/boot/compressed/head_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/boot/compressed/head_64.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/boot/compressed/head_64.S linux-2.6.32.35/arch/x86/boot/compressed/head_64.S
+--- linux-2.6.32.35/arch/x86/boot/compressed/head_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/boot/compressed/head_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -91,7 +91,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -5801,9 +5801,9 @@ diff -urNp linux-2.6.32.33/arch/x86/boot/compressed/head_64.S linux-2.6.32.33/ar
#endif
/* Target address to relocate to for decompression */
-diff -urNp linux-2.6.32.33/arch/x86/boot/compressed/misc.c linux-2.6.32.33/arch/x86/boot/compressed/misc.c
---- linux-2.6.32.33/arch/x86/boot/compressed/misc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/boot/compressed/misc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/boot/compressed/misc.c linux-2.6.32.35/arch/x86/boot/compressed/misc.c
+--- linux-2.6.32.35/arch/x86/boot/compressed/misc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/boot/compressed/misc.c 2010-12-31 14:46:53.000000000 -0500
@@ -288,7 +288,7 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
@@ -5822,9 +5822,9 @@ diff -urNp linux-2.6.32.33/arch/x86/boot/compressed/misc.c linux-2.6.32.33/arch/
error("Wrong destination address");
#endif
-diff -urNp linux-2.6.32.33/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.33/arch/x86/boot/compressed/mkpiggy.c
---- linux-2.6.32.33/arch/x86/boot/compressed/mkpiggy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/boot/compressed/mkpiggy.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.35/arch/x86/boot/compressed/mkpiggy.c
+--- linux-2.6.32.35/arch/x86/boot/compressed/mkpiggy.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/boot/compressed/mkpiggy.c 2010-12-31 14:46:53.000000000 -0500
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
offs = (olen > ilen) ? olen - ilen : 0;
@@ -5834,9 +5834,9 @@ diff -urNp linux-2.6.32.33/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.33/ar
offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
printf(".section \".rodata.compressed\",\"a\",@progbits\n");
-diff -urNp linux-2.6.32.33/arch/x86/boot/compressed/relocs.c linux-2.6.32.33/arch/x86/boot/compressed/relocs.c
---- linux-2.6.32.33/arch/x86/boot/compressed/relocs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/boot/compressed/relocs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/boot/compressed/relocs.c linux-2.6.32.35/arch/x86/boot/compressed/relocs.c
+--- linux-2.6.32.35/arch/x86/boot/compressed/relocs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/boot/compressed/relocs.c 2010-12-31 14:46:53.000000000 -0500
@@ -10,8 +10,11 @@
#define USE_BSD
#include <endian.h>
@@ -6037,9 +6037,9 @@ diff -urNp linux-2.6.32.33/arch/x86/boot/compressed/relocs.c linux-2.6.32.33/arc
read_shdrs(fp);
read_strtabs(fp);
read_symtabs(fp);
-diff -urNp linux-2.6.32.33/arch/x86/boot/cpucheck.c linux-2.6.32.33/arch/x86/boot/cpucheck.c
---- linux-2.6.32.33/arch/x86/boot/cpucheck.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/boot/cpucheck.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/boot/cpucheck.c linux-2.6.32.35/arch/x86/boot/cpucheck.c
+--- linux-2.6.32.35/arch/x86/boot/cpucheck.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/boot/cpucheck.c 2010-12-31 14:46:53.000000000 -0500
@@ -74,7 +74,7 @@ static int has_fpu(void)
u16 fcw = -1, fsw = -1;
u32 cr0;
@@ -6135,9 +6135,9 @@ diff -urNp linux-2.6.32.33/arch/x86/boot/cpucheck.c linux-2.6.32.33/arch/x86/boo
err = check_flags();
}
-diff -urNp linux-2.6.32.33/arch/x86/boot/header.S linux-2.6.32.33/arch/x86/boot/header.S
---- linux-2.6.32.33/arch/x86/boot/header.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/boot/header.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/boot/header.S linux-2.6.32.35/arch/x86/boot/header.S
+--- linux-2.6.32.35/arch/x86/boot/header.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/boot/header.S 2010-12-31 14:46:53.000000000 -0500
@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
# single linked list of
# struct setup_data
@@ -6147,9 +6147,9 @@ diff -urNp linux-2.6.32.33/arch/x86/boot/header.S linux-2.6.32.33/arch/x86/boot/
#define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
#define VO_INIT_SIZE (VO__end - VO__text)
-diff -urNp linux-2.6.32.33/arch/x86/boot/memory.c linux-2.6.32.33/arch/x86/boot/memory.c
---- linux-2.6.32.33/arch/x86/boot/memory.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/boot/memory.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/boot/memory.c linux-2.6.32.35/arch/x86/boot/memory.c
+--- linux-2.6.32.35/arch/x86/boot/memory.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/boot/memory.c 2010-12-31 14:46:53.000000000 -0500
@@ -19,7 +19,7 @@
static int detect_memory_e820(void)
@@ -6159,9 +6159,9 @@ diff -urNp linux-2.6.32.33/arch/x86/boot/memory.c linux-2.6.32.33/arch/x86/boot/
struct biosregs ireg, oreg;
struct e820entry *desc = boot_params.e820_map;
static struct e820entry buf; /* static so it is zeroed */
-diff -urNp linux-2.6.32.33/arch/x86/boot/video.c linux-2.6.32.33/arch/x86/boot/video.c
---- linux-2.6.32.33/arch/x86/boot/video.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/boot/video.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/boot/video.c linux-2.6.32.35/arch/x86/boot/video.c
+--- linux-2.6.32.35/arch/x86/boot/video.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/boot/video.c 2010-12-31 14:46:53.000000000 -0500
@@ -90,7 +90,7 @@ static void store_mode_params(void)
static unsigned int get_entry(void)
{
@@ -6171,9 +6171,9 @@ diff -urNp linux-2.6.32.33/arch/x86/boot/video.c linux-2.6.32.33/arch/x86/boot/v
int key;
unsigned int v;
-diff -urNp linux-2.6.32.33/arch/x86/boot/video-vesa.c linux-2.6.32.33/arch/x86/boot/video-vesa.c
---- linux-2.6.32.33/arch/x86/boot/video-vesa.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/boot/video-vesa.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/boot/video-vesa.c linux-2.6.32.35/arch/x86/boot/video-vesa.c
+--- linux-2.6.32.35/arch/x86/boot/video-vesa.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/boot/video-vesa.c 2010-12-31 14:46:53.000000000 -0500
@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
boot_params.screen_info.vesapm_seg = oreg.es;
@@ -6182,9 +6182,9 @@ diff -urNp linux-2.6.32.33/arch/x86/boot/video-vesa.c linux-2.6.32.33/arch/x86/b
}
/*
-diff -urNp linux-2.6.32.33/arch/x86/ia32/ia32_aout.c linux-2.6.32.33/arch/x86/ia32/ia32_aout.c
---- linux-2.6.32.33/arch/x86/ia32/ia32_aout.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/ia32/ia32_aout.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/ia32/ia32_aout.c linux-2.6.32.35/arch/x86/ia32/ia32_aout.c
+--- linux-2.6.32.35/arch/x86/ia32/ia32_aout.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/ia32/ia32_aout.c 2010-12-31 14:46:53.000000000 -0500
@@ -169,6 +169,8 @@ static int aout_core_dump(long signr, st
unsigned long dump_start, dump_size;
struct user32 dump;
@@ -6207,9 +6207,9 @@ diff -urNp linux-2.6.32.33/arch/x86/ia32/ia32_aout.c linux-2.6.32.33/arch/x86/ia
end_coredump:
set_fs(fs);
return has_dumped;
-diff -urNp linux-2.6.32.33/arch/x86/ia32/ia32entry.S linux-2.6.32.33/arch/x86/ia32/ia32entry.S
---- linux-2.6.32.33/arch/x86/ia32/ia32entry.S 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/ia32/ia32entry.S 2011-02-27 14:53:10.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/ia32/ia32entry.S linux-2.6.32.35/arch/x86/ia32/ia32entry.S
+--- linux-2.6.32.35/arch/x86/ia32/ia32entry.S 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.35/arch/x86/ia32/ia32entry.S 2011-02-27 14:53:10.000000000 -0500
@@ -13,6 +13,7 @@
#include <asm/thread_info.h>
#include <asm/segment.h>
@@ -6307,9 +6307,9 @@ diff -urNp linux-2.6.32.33/arch/x86/ia32/ia32entry.S linux-2.6.32.33/arch/x86/ia
/*
* No need to follow this irqs on/off section: the syscall
* disabled irqs and here we enable it straight after entry:
-diff -urNp linux-2.6.32.33/arch/x86/ia32/ia32_signal.c linux-2.6.32.33/arch/x86/ia32/ia32_signal.c
---- linux-2.6.32.33/arch/x86/ia32/ia32_signal.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/ia32/ia32_signal.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/ia32/ia32_signal.c linux-2.6.32.35/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.32.35/arch/x86/ia32/ia32_signal.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/ia32/ia32_signal.c 2010-12-31 14:46:53.000000000 -0500
@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
sp -= frame_size;
/* Align the stack pointer according to the i386 ABI,
@@ -6359,9 +6359,9 @@ diff -urNp linux-2.6.32.33/arch/x86/ia32/ia32_signal.c linux-2.6.32.33/arch/x86/
} put_user_catch(err);
if (err)
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/alternative.h linux-2.6.32.33/arch/x86/include/asm/alternative.h
---- linux-2.6.32.33/arch/x86/include/asm/alternative.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/alternative.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/alternative.h linux-2.6.32.35/arch/x86/include/asm/alternative.h
+--- linux-2.6.32.35/arch/x86/include/asm/alternative.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/alternative.h 2010-12-31 14:46:53.000000000 -0500
@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
" .byte 662b-661b\n" /* sourcelen */ \
" .byte 664f-663f\n" /* replacementlen */ \
@@ -6371,9 +6371,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/alternative.h linux-2.6.32.33/ar
"663:\n\t" newinstr "\n664:\n" /* replacement */ \
".previous"
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/apm.h linux-2.6.32.33/arch/x86/include/asm/apm.h
---- linux-2.6.32.33/arch/x86/include/asm/apm.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/apm.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/apm.h linux-2.6.32.35/arch/x86/include/asm/apm.h
+--- linux-2.6.32.35/arch/x86/include/asm/apm.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/apm.h 2010-12-31 14:46:53.000000000 -0500
@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
__asm__ __volatile__(APM_DO_ZERO_SEGS
"pushl %%edi\n\t"
@@ -6392,9 +6392,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/apm.h linux-2.6.32.33/arch/x86/i
"setc %%bl\n\t"
"popl %%ebp\n\t"
"popl %%edi\n\t"
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/atomic_32.h linux-2.6.32.33/arch/x86/include/asm/atomic_32.h
---- linux-2.6.32.33/arch/x86/include/asm/atomic_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/atomic_32.h 2010-12-31 14:46:58.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/atomic_32.h linux-2.6.32.35/arch/x86/include/asm/atomic_32.h
+--- linux-2.6.32.35/arch/x86/include/asm/atomic_32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/atomic_32.h 2010-12-31 14:46:58.000000000 -0500
@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
}
@@ -6730,9 +6730,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/atomic_32.h linux-2.6.32.33/arch
#define ATOMIC64_INIT(val) { (val) }
extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/atomic_64.h linux-2.6.32.33/arch/x86/include/asm/atomic_64.h
---- linux-2.6.32.33/arch/x86/include/asm/atomic_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/atomic_64.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/atomic_64.h linux-2.6.32.35/arch/x86/include/asm/atomic_64.h
+--- linux-2.6.32.35/arch/x86/include/asm/atomic_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/atomic_64.h 2010-12-31 14:46:53.000000000 -0500
@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
}
@@ -7336,9 +7336,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/atomic_64.h linux-2.6.32.33/arch
}
/**
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/bitops.h linux-2.6.32.33/arch/x86/include/asm/bitops.h
---- linux-2.6.32.33/arch/x86/include/asm/bitops.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/bitops.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/bitops.h linux-2.6.32.35/arch/x86/include/asm/bitops.h
+--- linux-2.6.32.35/arch/x86/include/asm/bitops.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/bitops.h 2010-12-31 14:46:53.000000000 -0500
@@ -38,7 +38,7 @@
* a mask operation on a byte.
*/
@@ -7348,9 +7348,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/bitops.h linux-2.6.32.33/arch/x8
#define CONST_MASK(nr) (1 << ((nr) & 7))
/**
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/boot.h linux-2.6.32.33/arch/x86/include/asm/boot.h
---- linux-2.6.32.33/arch/x86/include/asm/boot.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/boot.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/boot.h linux-2.6.32.35/arch/x86/include/asm/boot.h
+--- linux-2.6.32.35/arch/x86/include/asm/boot.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/boot.h 2010-12-31 14:46:53.000000000 -0500
@@ -11,10 +11,15 @@
#include <asm/pgtable_types.h>
@@ -7368,9 +7368,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/boot.h linux-2.6.32.33/arch/x86/
/* Minimum kernel alignment, as a power of two */
#ifdef CONFIG_X86_64
#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/cacheflush.h linux-2.6.32.33/arch/x86/include/asm/cacheflush.h
---- linux-2.6.32.33/arch/x86/include/asm/cacheflush.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/cacheflush.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/cacheflush.h linux-2.6.32.35/arch/x86/include/asm/cacheflush.h
+--- linux-2.6.32.35/arch/x86/include/asm/cacheflush.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/cacheflush.h 2010-12-31 14:46:53.000000000 -0500
@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
static inline unsigned long get_page_memtype(struct page *pg)
{
@@ -7389,9 +7389,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/cacheflush.h linux-2.6.32.33/arc
ClearPageUncached(pg);
ClearPageWC(pg);
break;
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/cache.h linux-2.6.32.33/arch/x86/include/asm/cache.h
---- linux-2.6.32.33/arch/x86/include/asm/cache.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/cache.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/cache.h linux-2.6.32.35/arch/x86/include/asm/cache.h
+--- linux-2.6.32.35/arch/x86/include/asm/cache.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/cache.h 2010-12-31 14:46:53.000000000 -0500
@@ -8,6 +8,7 @@
#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
@@ -7400,9 +7400,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/cache.h linux-2.6.32.33/arch/x86
#ifdef CONFIG_X86_VSMP
/* vSMP Internode cacheline shift */
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/checksum_32.h linux-2.6.32.33/arch/x86/include/asm/checksum_32.h
---- linux-2.6.32.33/arch/x86/include/asm/checksum_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/checksum_32.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/checksum_32.h linux-2.6.32.35/arch/x86/include/asm/checksum_32.h
+--- linux-2.6.32.35/arch/x86/include/asm/checksum_32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/checksum_32.h 2010-12-31 14:46:53.000000000 -0500
@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
int len, __wsum sum,
int *src_err_ptr, int *dst_err_ptr);
@@ -7436,9 +7436,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/checksum_32.h linux-2.6.32.33/ar
len, sum, NULL, err_ptr);
if (len)
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/desc_defs.h linux-2.6.32.33/arch/x86/include/asm/desc_defs.h
---- linux-2.6.32.33/arch/x86/include/asm/desc_defs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/desc_defs.h 2011-02-27 14:53:10.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/desc_defs.h linux-2.6.32.35/arch/x86/include/asm/desc_defs.h
+--- linux-2.6.32.35/arch/x86/include/asm/desc_defs.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/desc_defs.h 2011-02-27 14:53:10.000000000 -0500
@@ -31,6 +31,12 @@ struct desc_struct {
unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
@@ -7452,9 +7452,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/desc_defs.h linux-2.6.32.33/arch
};
} __attribute__((packed));
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/desc.h linux-2.6.32.33/arch/x86/include/asm/desc.h
---- linux-2.6.32.33/arch/x86/include/asm/desc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/desc.h 2011-02-27 14:53:10.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/desc.h linux-2.6.32.35/arch/x86/include/asm/desc.h
+--- linux-2.6.32.35/arch/x86/include/asm/desc.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/desc.h 2011-02-27 14:53:10.000000000 -0500
@@ -4,6 +4,7 @@
#include <asm/desc_defs.h>
#include <asm/ldt.h>
@@ -7642,9 +7642,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/desc.h linux-2.6.32.33/arch/x86/
+#endif
+
#endif /* _ASM_X86_DESC_H */
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/device.h linux-2.6.32.33/arch/x86/include/asm/device.h
---- linux-2.6.32.33/arch/x86/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/device.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/device.h linux-2.6.32.35/arch/x86/include/asm/device.h
+--- linux-2.6.32.35/arch/x86/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/device.h 2010-12-31 14:46:53.000000000 -0500
@@ -6,7 +6,7 @@ struct dev_archdata {
void *acpi_handle;
#endif
@@ -7654,9 +7654,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/device.h linux-2.6.32.33/arch/x8
#endif
#ifdef CONFIG_DMAR
void *iommu; /* hook for IOMMU specific extension */
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/dma-mapping.h linux-2.6.32.33/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.32.33/arch/x86/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/dma-mapping.h linux-2.6.32.35/arch/x86/include/asm/dma-mapping.h
+--- linux-2.6.32.35/arch/x86/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
@@ -25,9 +25,9 @@ extern int iommu_merge;
extern struct device x86_dma_fallback_dev;
extern int panic_on_overflow;
@@ -7696,9 +7696,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/dma-mapping.h linux-2.6.32.33/ar
WARN_ON(irqs_disabled()); /* for portability */
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/e820.h linux-2.6.32.33/arch/x86/include/asm/e820.h
---- linux-2.6.32.33/arch/x86/include/asm/e820.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/e820.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/e820.h linux-2.6.32.35/arch/x86/include/asm/e820.h
+--- linux-2.6.32.35/arch/x86/include/asm/e820.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/e820.h 2010-12-31 14:46:53.000000000 -0500
@@ -133,7 +133,7 @@ extern char *default_machine_specific_me
#define ISA_END_ADDRESS 0x100000
#define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
@@ -7708,9 +7708,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/e820.h linux-2.6.32.33/arch/x86/
#define BIOS_END 0x00100000
#ifdef __KERNEL__
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/elf.h linux-2.6.32.33/arch/x86/include/asm/elf.h
---- linux-2.6.32.33/arch/x86/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/elf.h linux-2.6.32.35/arch/x86/include/asm/elf.h
+--- linux-2.6.32.35/arch/x86/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -257,7 +257,25 @@ extern int force_personality32;
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -7764,9 +7764,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/elf.h linux-2.6.32.33/arch/x86/i
-#define arch_randomize_brk arch_randomize_brk
-
#endif /* _ASM_X86_ELF_H */
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/futex.h linux-2.6.32.33/arch/x86/include/asm/futex.h
---- linux-2.6.32.33/arch/x86/include/asm/futex.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/futex.h 2011-03-12 22:50:36.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/futex.h linux-2.6.32.35/arch/x86/include/asm/futex.h
+--- linux-2.6.32.35/arch/x86/include/asm/futex.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/futex.h 2011-03-12 22:50:36.000000000 -0500
@@ -12,16 +12,18 @@
#include <asm/system.h>
@@ -7842,9 +7842,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/futex.h linux-2.6.32.33/arch/x86
: "i" (-EFAULT), "r" (newval), "0" (oldval)
: "memory"
);
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/i387.h linux-2.6.32.33/arch/x86/include/asm/i387.h
---- linux-2.6.32.33/arch/x86/include/asm/i387.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/i387.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/i387.h linux-2.6.32.35/arch/x86/include/asm/i387.h
+--- linux-2.6.32.35/arch/x86/include/asm/i387.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/i387.h 2010-12-31 14:46:53.000000000 -0500
@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
{
int err;
@@ -7885,9 +7885,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/i387.h linux-2.6.32.33/arch/x86/
/*
* These must be called with preempt disabled
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/io_32.h linux-2.6.32.33/arch/x86/include/asm/io_32.h
---- linux-2.6.32.33/arch/x86/include/asm/io_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/io_32.h 2011-01-27 22:39:52.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/io_32.h linux-2.6.32.35/arch/x86/include/asm/io_32.h
+--- linux-2.6.32.35/arch/x86/include/asm/io_32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/io_32.h 2011-01-27 22:39:52.000000000 -0500
@@ -3,6 +3,7 @@
#include <linux/string.h>
@@ -7914,9 +7914,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/io_32.h linux-2.6.32.33/arch/x86
#include <asm-generic/iomap.h>
#include <linux/vmalloc.h>
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/io_64.h linux-2.6.32.33/arch/x86/include/asm/io_64.h
---- linux-2.6.32.33/arch/x86/include/asm/io_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/io_64.h 2011-01-27 22:39:52.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/io_64.h linux-2.6.32.35/arch/x86/include/asm/io_64.h
+--- linux-2.6.32.35/arch/x86/include/asm/io_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/io_64.h 2011-01-27 22:39:52.000000000 -0500
@@ -140,6 +140,17 @@ __OUTS(l)
#include <linux/vmalloc.h>
@@ -7935,9 +7935,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/io_64.h linux-2.6.32.33/arch/x86
#include <asm-generic/iomap.h>
void __memcpy_fromio(void *, unsigned long, unsigned);
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/iommu.h linux-2.6.32.33/arch/x86/include/asm/iommu.h
---- linux-2.6.32.33/arch/x86/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/iommu.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/iommu.h linux-2.6.32.35/arch/x86/include/asm/iommu.h
+--- linux-2.6.32.35/arch/x86/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/iommu.h 2010-12-31 14:46:53.000000000 -0500
@@ -3,7 +3,7 @@
extern void pci_iommu_shutdown(void);
@@ -7947,9 +7947,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/iommu.h linux-2.6.32.33/arch/x86
extern int force_iommu, no_iommu;
extern int iommu_detected;
extern int iommu_pass_through;
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/irqflags.h linux-2.6.32.33/arch/x86/include/asm/irqflags.h
---- linux-2.6.32.33/arch/x86/include/asm/irqflags.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/irqflags.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/irqflags.h linux-2.6.32.35/arch/x86/include/asm/irqflags.h
+--- linux-2.6.32.35/arch/x86/include/asm/irqflags.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/irqflags.h 2010-12-31 14:46:53.000000000 -0500
@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
sti; \
sysexit
@@ -7962,9 +7962,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/irqflags.h linux-2.6.32.33/arch/
#else
#define INTERRUPT_RETURN iret
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/kvm_host.h linux-2.6.32.33/arch/x86/include/asm/kvm_host.h
---- linux-2.6.32.33/arch/x86/include/asm/kvm_host.h 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/include/asm/kvm_host.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/kvm_host.h linux-2.6.32.35/arch/x86/include/asm/kvm_host.h
+--- linux-2.6.32.35/arch/x86/include/asm/kvm_host.h 2010-11-26 18:22:29.000000000 -0500
++++ linux-2.6.32.35/arch/x86/include/asm/kvm_host.h 2010-12-31 14:46:53.000000000 -0500
@@ -533,7 +533,7 @@ struct kvm_x86_ops {
const struct trace_print_flags *exit_reasons_str;
};
@@ -7974,9 +7974,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/kvm_host.h linux-2.6.32.33/arch/
int kvm_mmu_module_init(void);
void kvm_mmu_module_exit(void);
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/local.h linux-2.6.32.33/arch/x86/include/asm/local.h
---- linux-2.6.32.33/arch/x86/include/asm/local.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/local.h 2010-12-31 14:47:00.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/local.h linux-2.6.32.35/arch/x86/include/asm/local.h
+--- linux-2.6.32.35/arch/x86/include/asm/local.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/local.h 2010-12-31 14:47:00.000000000 -0500
@@ -18,26 +18,58 @@ typedef struct {
static inline void local_inc(local_t *l)
@@ -8129,9 +8129,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/local.h linux-2.6.32.33/arch/x86
: "+r" (i), "+m" (l->a.counter)
: : "memory");
return i + __i;
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.33/arch/x86/include/asm/mc146818rtc.h
---- linux-2.6.32.33/arch/x86/include/asm/mc146818rtc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/mc146818rtc.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.35/arch/x86/include/asm/mc146818rtc.h
+--- linux-2.6.32.35/arch/x86/include/asm/mc146818rtc.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/mc146818rtc.h 2010-12-31 14:46:53.000000000 -0500
@@ -81,8 +81,8 @@ static inline unsigned char current_lock
#else
#define lock_cmos_prefix(reg) do {} while (0)
@@ -8143,9 +8143,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.33/ar
#define do_i_have_lock_cmos() 0
#define current_lock_cmos_reg() 0
#endif
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/microcode.h linux-2.6.32.33/arch/x86/include/asm/microcode.h
---- linux-2.6.32.33/arch/x86/include/asm/microcode.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/microcode.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/microcode.h linux-2.6.32.35/arch/x86/include/asm/microcode.h
+--- linux-2.6.32.35/arch/x86/include/asm/microcode.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/microcode.h 2010-12-31 14:46:53.000000000 -0500
@@ -12,13 +12,13 @@ struct device;
enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
@@ -8186,9 +8186,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/microcode.h linux-2.6.32.33/arch
{
return NULL;
}
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/mman.h linux-2.6.32.33/arch/x86/include/asm/mman.h
---- linux-2.6.32.33/arch/x86/include/asm/mman.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/mman.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/mman.h linux-2.6.32.35/arch/x86/include/asm/mman.h
+--- linux-2.6.32.35/arch/x86/include/asm/mman.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/mman.h 2010-12-31 14:46:53.000000000 -0500
@@ -5,4 +5,14 @@
#include <asm-generic/mman.h>
@@ -8204,9 +8204,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/mman.h linux-2.6.32.33/arch/x86/
+#endif
+
#endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/mmu_context.h linux-2.6.32.33/arch/x86/include/asm/mmu_context.h
---- linux-2.6.32.33/arch/x86/include/asm/mmu_context.h 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/include/asm/mmu_context.h 2011-02-22 15:57:23.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/mmu_context.h linux-2.6.32.35/arch/x86/include/asm/mmu_context.h
+--- linux-2.6.32.35/arch/x86/include/asm/mmu_context.h 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/arch/x86/include/asm/mmu_context.h 2011-02-22 15:57:23.000000000 -0500
@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -8331,9 +8331,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/mmu_context.h linux-2.6.32.33/ar
}
#define activate_mm(prev, next) \
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/mmu.h linux-2.6.32.33/arch/x86/include/asm/mmu.h
---- linux-2.6.32.33/arch/x86/include/asm/mmu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/mmu.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/mmu.h linux-2.6.32.35/arch/x86/include/asm/mmu.h
+--- linux-2.6.32.35/arch/x86/include/asm/mmu.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/mmu.h 2010-12-31 14:46:53.000000000 -0500
@@ -9,10 +9,23 @@
* we put the segment information here.
*/
@@ -8360,9 +8360,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/mmu.h linux-2.6.32.33/arch/x86/i
} mm_context_t;
#ifdef CONFIG_SMP
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/module.h linux-2.6.32.33/arch/x86/include/asm/module.h
---- linux-2.6.32.33/arch/x86/include/asm/module.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/module.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/module.h linux-2.6.32.35/arch/x86/include/asm/module.h
+--- linux-2.6.32.35/arch/x86/include/asm/module.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/module.h 2010-12-31 14:46:53.000000000 -0500
@@ -59,13 +59,31 @@
#error unknown processor family
#endif
@@ -8396,9 +8396,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/module.h linux-2.6.32.33/arch/x8
#endif
#endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/page_64_types.h linux-2.6.32.33/arch/x86/include/asm/page_64_types.h
---- linux-2.6.32.33/arch/x86/include/asm/page_64_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/page_64_types.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/page_64_types.h linux-2.6.32.35/arch/x86/include/asm/page_64_types.h
+--- linux-2.6.32.35/arch/x86/include/asm/page_64_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/page_64_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
/* duplicated to the one in bootmem.h */
@@ -8408,9 +8408,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/page_64_types.h linux-2.6.32.33/
extern unsigned long __phys_addr(unsigned long);
#define __phys_reloc_hide(x) (x)
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/paravirt.h linux-2.6.32.33/arch/x86/include/asm/paravirt.h
---- linux-2.6.32.33/arch/x86/include/asm/paravirt.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/paravirt.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/paravirt.h linux-2.6.32.35/arch/x86/include/asm/paravirt.h
+--- linux-2.6.32.35/arch/x86/include/asm/paravirt.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/paravirt.h 2010-12-31 14:46:53.000000000 -0500
@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
pv_mmu_ops.set_fixmap(idx, phys, flags);
}
@@ -8464,9 +8464,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/paravirt.h linux-2.6.32.33/arch/
#endif /* CONFIG_X86_32 */
#endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/paravirt_types.h linux-2.6.32.33/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.32.33/arch/x86/include/asm/paravirt_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/paravirt_types.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/paravirt_types.h linux-2.6.32.35/arch/x86/include/asm/paravirt_types.h
+--- linux-2.6.32.35/arch/x86/include/asm/paravirt_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/paravirt_types.h 2010-12-31 14:46:53.000000000 -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,
@@ -8480,9 +8480,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/paravirt_types.h linux-2.6.32.33
};
struct raw_spinlock;
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/pci_x86.h linux-2.6.32.33/arch/x86/include/asm/pci_x86.h
---- linux-2.6.32.33/arch/x86/include/asm/pci_x86.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/pci_x86.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/pci_x86.h linux-2.6.32.35/arch/x86/include/asm/pci_x86.h
+--- linux-2.6.32.35/arch/x86/include/asm/pci_x86.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/pci_x86.h 2010-12-31 14:46:53.000000000 -0500
@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
extern void (*pcibios_disable_irq)(struct pci_dev *dev);
@@ -8505,9 +8505,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/pci_x86.h linux-2.6.32.33/arch/x
extern bool port_cf9_safe;
/* arch_initcall level */
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgalloc.h linux-2.6.32.33/arch/x86/include/asm/pgalloc.h
---- linux-2.6.32.33/arch/x86/include/asm/pgalloc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/pgalloc.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/pgalloc.h linux-2.6.32.35/arch/x86/include/asm/pgalloc.h
+--- linux-2.6.32.35/arch/x86/include/asm/pgalloc.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/pgalloc.h 2010-12-31 14:46:53.000000000 -0500
@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
pmd_t *pmd, pte_t *pte)
{
@@ -8522,9 +8522,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgalloc.h linux-2.6.32.33/arch/x
set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
}
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.33/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.32.33/arch/x86/include/asm/pgtable-2level.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/pgtable-2level.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.35/arch/x86/include/asm/pgtable-2level.h
+--- linux-2.6.32.35/arch/x86/include/asm/pgtable-2level.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/pgtable-2level.h 2010-12-31 14:46:53.000000000 -0500
@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8535,9 +8535,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.33
}
static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable_32.h linux-2.6.32.33/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.32.33/arch/x86/include/asm/pgtable_32.h 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/include/asm/pgtable_32.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/pgtable_32.h linux-2.6.32.35/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.32.35/arch/x86/include/asm/pgtable_32.h 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/arch/x86/include/asm/pgtable_32.h 2010-12-31 14:46:53.000000000 -0500
@@ -26,9 +26,6 @@
struct mm_struct;
struct vm_area_struct;
@@ -8581,9 +8581,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable_32.h linux-2.6.32.33/arc
/*
* kern_addr_valid() is (1) for FLATMEM and (0) for
* SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.33/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.32.33/arch/x86/include/asm/pgtable_32_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/pgtable_32_types.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.35/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.32.35/arch/x86/include/asm/pgtable_32_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/pgtable_32_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -8,7 +8,7 @@
*/
#ifdef CONFIG_X86_PAE
@@ -8613,9 +8613,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.
#define MODULES_VADDR VMALLOC_START
#define MODULES_END VMALLOC_END
#define MODULES_LEN (MODULES_VADDR - MODULES_END)
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.33/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.32.33/arch/x86/include/asm/pgtable-3level.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/pgtable-3level.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.35/arch/x86/include/asm/pgtable-3level.h
+--- linux-2.6.32.35/arch/x86/include/asm/pgtable-3level.h 2011-03-23 19:00:31.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/pgtable-3level.h 2011-03-23 19:01:00.000000000 -0400
@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8633,9 +8633,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.33
}
/*
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable_64.h linux-2.6.32.33/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.32.33/arch/x86/include/asm/pgtable_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/pgtable_64.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/pgtable_64.h linux-2.6.32.35/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.32.35/arch/x86/include/asm/pgtable_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/pgtable_64.h 2010-12-31 14:46:53.000000000 -0500
@@ -16,10 +16,13 @@
extern pud_t level3_kernel_pgt[512];
@@ -8672,9 +8672,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable_64.h linux-2.6.32.33/arc
}
static inline void native_pgd_clear(pgd_t *pgd)
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.33/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.32.33/arch/x86/include/asm/pgtable_64_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/pgtable_64_types.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.35/arch/x86/include/asm/pgtable_64_types.h
+--- linux-2.6.32.35/arch/x86/include/asm/pgtable_64_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/pgtable_64_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
#define MODULES_VADDR _AC(0xffffffffa0000000, UL)
#define MODULES_END _AC(0xffffffffff000000, UL)
@@ -8686,9 +8686,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.
+#define ktva_ktla(addr) (addr)
#endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable.h linux-2.6.32.33/arch/x86/include/asm/pgtable.h
---- linux-2.6.32.33/arch/x86/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/pgtable.h linux-2.6.32.35/arch/x86/include/asm/pgtable.h
+--- linux-2.6.32.35/arch/x86/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/pgtable.h 2010-12-31 14:46:53.000000000 -0500
@@ -74,12 +74,51 @@ extern struct list_head pgd_list;
#define arch_end_context_switch(prev) do {} while(0)
@@ -8858,9 +8858,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable.h linux-2.6.32.33/arch/x
#include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable_types.h linux-2.6.32.33/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.32.33/arch/x86/include/asm/pgtable_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/pgtable_types.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/pgtable_types.h linux-2.6.32.35/arch/x86/include/asm/pgtable_types.h
+--- linux-2.6.32.35/arch/x86/include/asm/pgtable_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/pgtable_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -16,12 +16,11 @@
#define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
#define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -8981,9 +8981,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/pgtable_types.h linux-2.6.32.33/
#define pgprot_writecombine pgprot_writecombine
extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/processor.h linux-2.6.32.33/arch/x86/include/asm/processor.h
---- linux-2.6.32.33/arch/x86/include/asm/processor.h 2011-01-11 23:55:34.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/include/asm/processor.h 2011-01-11 23:56:03.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/processor.h linux-2.6.32.35/arch/x86/include/asm/processor.h
+--- linux-2.6.32.35/arch/x86/include/asm/processor.h 2011-01-11 23:55:34.000000000 -0500
++++ linux-2.6.32.35/arch/x86/include/asm/processor.h 2011-01-11 23:56:03.000000000 -0500
@@ -272,7 +272,7 @@ struct tss_struct {
} ____cacheline_aligned;
@@ -9068,9 +9068,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/processor.h linux-2.6.32.33/arch
#define KSTK_EIP(task) (task_pt_regs(task)->ip)
/* Get/set a process' ability to use the timestamp counter instruction */
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/ptrace.h linux-2.6.32.33/arch/x86/include/asm/ptrace.h
---- linux-2.6.32.33/arch/x86/include/asm/ptrace.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/ptrace.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/ptrace.h linux-2.6.32.35/arch/x86/include/asm/ptrace.h
+--- linux-2.6.32.35/arch/x86/include/asm/ptrace.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/ptrace.h 2010-12-31 14:46:53.000000000 -0500
@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
}
@@ -9107,9 +9107,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/ptrace.h linux-2.6.32.33/arch/x8
#endif
}
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/reboot.h linux-2.6.32.33/arch/x86/include/asm/reboot.h
---- linux-2.6.32.33/arch/x86/include/asm/reboot.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/reboot.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/reboot.h linux-2.6.32.35/arch/x86/include/asm/reboot.h
+--- linux-2.6.32.35/arch/x86/include/asm/reboot.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/reboot.h 2010-12-31 14:46:53.000000000 -0500
@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -9119,9 +9119,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/reboot.h linux-2.6.32.33/arch/x8
typedef void (*nmi_shootdown_cb)(int, struct die_args*);
void nmi_shootdown_cpus(nmi_shootdown_cb callback);
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/rwsem.h linux-2.6.32.33/arch/x86/include/asm/rwsem.h
---- linux-2.6.32.33/arch/x86/include/asm/rwsem.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/rwsem.h 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/rwsem.h linux-2.6.32.35/arch/x86/include/asm/rwsem.h
+--- linux-2.6.32.35/arch/x86/include/asm/rwsem.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/rwsem.h 2010-12-31 14:47:01.000000000 -0500
@@ -118,6 +118,14 @@ static inline void __down_read(struct rw
{
asm volatile("# beginning down_read\n\t"
@@ -9246,9 +9246,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/rwsem.h linux-2.6.32.33/arch/x86
: "+r" (tmp), "+m" (sem->count)
: : "memory");
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/segment.h linux-2.6.32.33/arch/x86/include/asm/segment.h
---- linux-2.6.32.33/arch/x86/include/asm/segment.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/segment.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/segment.h linux-2.6.32.35/arch/x86/include/asm/segment.h
+--- linux-2.6.32.35/arch/x86/include/asm/segment.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/segment.h 2010-12-31 14:46:53.000000000 -0500
@@ -62,8 +62,8 @@
* 26 - ESPFIX small SS
* 27 - per-cpu [ offset to per-cpu data area ]
@@ -9317,9 +9317,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/segment.h linux-2.6.32.33/arch/x
#define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/smp.h linux-2.6.32.33/arch/x86/include/asm/smp.h
---- linux-2.6.32.33/arch/x86/include/asm/smp.h 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/include/asm/smp.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/smp.h linux-2.6.32.35/arch/x86/include/asm/smp.h
+--- linux-2.6.32.35/arch/x86/include/asm/smp.h 2010-11-26 18:22:29.000000000 -0500
++++ linux-2.6.32.35/arch/x86/include/asm/smp.h 2010-12-31 14:46:53.000000000 -0500
@@ -24,7 +24,7 @@ extern unsigned int num_processors;
DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
@@ -9329,9 +9329,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/smp.h linux-2.6.32.33/arch/x86/i
static inline struct cpumask *cpu_sibling_mask(int cpu)
{
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/spinlock.h linux-2.6.32.33/arch/x86/include/asm/spinlock.h
---- linux-2.6.32.33/arch/x86/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/spinlock.h 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/spinlock.h linux-2.6.32.35/arch/x86/include/asm/spinlock.h
+--- linux-2.6.32.35/arch/x86/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/spinlock.h 2010-12-31 14:47:01.000000000 -0500
@@ -249,6 +249,14 @@ static inline int __raw_write_can_lock(r
static inline void __raw_read_lock(raw_rwlock_t *rw)
{
@@ -9394,9 +9394,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/spinlock.h linux-2.6.32.33/arch/
: "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
}
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/stackprotector.h linux-2.6.32.33/arch/x86/include/asm/stackprotector.h
---- linux-2.6.32.33/arch/x86/include/asm/stackprotector.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/stackprotector.h 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/stackprotector.h linux-2.6.32.35/arch/x86/include/asm/stackprotector.h
+--- linux-2.6.32.35/arch/x86/include/asm/stackprotector.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/stackprotector.h 2010-12-31 14:47:01.000000000 -0500
@@ -113,7 +113,7 @@ static inline void setup_stack_canary_se
static inline void load_stack_canary_segment(void)
@@ -9406,9 +9406,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/stackprotector.h linux-2.6.32.33
asm volatile ("mov %0, %%gs" : : "r" (0));
#endif
}
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/system.h linux-2.6.32.33/arch/x86/include/asm/system.h
---- linux-2.6.32.33/arch/x86/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/system.h linux-2.6.32.35/arch/x86/include/asm/system.h
+--- linux-2.6.32.35/arch/x86/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/system.h 2010-12-31 14:46:53.000000000 -0500
@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
{
unsigned long __limit;
@@ -9427,9 +9427,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/system.h linux-2.6.32.33/arch/x8
extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
void default_idle(void);
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/uaccess_32.h linux-2.6.32.33/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.32.33/arch/x86/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/uaccess_32.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/uaccess_32.h linux-2.6.32.35/arch/x86/include/asm/uaccess_32.h
+--- linux-2.6.32.35/arch/x86/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/uaccess_32.h 2010-12-31 14:46:53.000000000 -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)
@@ -9559,9 +9559,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/uaccess_32.h linux-2.6.32.33/arc
long __must_check strncpy_from_user(char *dst, const char __user *src,
long count);
long __must_check __strncpy_from_user(char *dst,
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/uaccess_64.h linux-2.6.32.33/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.32.33/arch/x86/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/uaccess_64.h 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/uaccess_64.h linux-2.6.32.35/arch/x86/include/asm/uaccess_64.h
+--- linux-2.6.32.35/arch/x86/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/uaccess_64.h 2010-12-31 14:47:01.000000000 -0500
@@ -9,6 +9,9 @@
#include <linux/prefetch.h>
#include <linux/lockdep.h>
@@ -9907,9 +9907,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/uaccess_64.h linux-2.6.32.33/arc
copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
#endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/uaccess.h linux-2.6.32.33/arch/x86/include/asm/uaccess.h
---- linux-2.6.32.33/arch/x86/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/uaccess.h 2011-03-12 22:50:36.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/uaccess.h linux-2.6.32.35/arch/x86/include/asm/uaccess.h
+--- linux-2.6.32.35/arch/x86/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/uaccess.h 2011-03-12 22:50:36.000000000 -0500
@@ -8,12 +8,15 @@
#include <linux/thread_info.h>
#include <linux/prefetch.h>
@@ -10128,9 +10128,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/uaccess.h linux-2.6.32.33/arch/x
#ifdef CONFIG_X86_32
# include "uaccess_32.h"
#else
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/vgtod.h linux-2.6.32.33/arch/x86/include/asm/vgtod.h
---- linux-2.6.32.33/arch/x86/include/asm/vgtod.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/vgtod.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/vgtod.h linux-2.6.32.35/arch/x86/include/asm/vgtod.h
+--- linux-2.6.32.35/arch/x86/include/asm/vgtod.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/vgtod.h 2010-12-31 14:46:53.000000000 -0500
@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
int sysctl_enabled;
struct timezone sys_tz;
@@ -10139,9 +10139,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/vgtod.h linux-2.6.32.33/arch/x86
cycle_t (*vread)(void);
cycle_t cycle_last;
cycle_t mask;
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/vmi.h linux-2.6.32.33/arch/x86/include/asm/vmi.h
---- linux-2.6.32.33/arch/x86/include/asm/vmi.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/vmi.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/vmi.h linux-2.6.32.35/arch/x86/include/asm/vmi.h
+--- linux-2.6.32.35/arch/x86/include/asm/vmi.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/vmi.h 2010-12-31 14:46:53.000000000 -0500
@@ -191,6 +191,7 @@ struct vrom_header {
u8 reserved[96]; /* Reserved for headers */
char vmi_init[8]; /* VMI_Init jump point */
@@ -10150,9 +10150,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/vmi.h linux-2.6.32.33/arch/x86/i
} __attribute__((packed));
struct pnp_header {
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/vsyscall.h linux-2.6.32.33/arch/x86/include/asm/vsyscall.h
---- linux-2.6.32.33/arch/x86/include/asm/vsyscall.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/vsyscall.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/vsyscall.h linux-2.6.32.35/arch/x86/include/asm/vsyscall.h
+--- linux-2.6.32.35/arch/x86/include/asm/vsyscall.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/vsyscall.h 2010-12-31 14:46:53.000000000 -0500
@@ -15,9 +15,10 @@ enum vsyscall_num {
#ifdef __KERNEL__
@@ -10183,9 +10183,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/vsyscall.h linux-2.6.32.33/arch/
#endif /* __KERNEL__ */
#endif /* _ASM_X86_VSYSCALL_H */
-diff -urNp linux-2.6.32.33/arch/x86/include/asm/xsave.h linux-2.6.32.33/arch/x86/include/asm/xsave.h
---- linux-2.6.32.33/arch/x86/include/asm/xsave.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/include/asm/xsave.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/include/asm/xsave.h linux-2.6.32.35/arch/x86/include/asm/xsave.h
+--- linux-2.6.32.35/arch/x86/include/asm/xsave.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/include/asm/xsave.h 2010-12-31 14:46:53.000000000 -0500
@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
static inline int xsave_user(struct xsave_struct __user *buf)
{
@@ -10211,9 +10211,9 @@ diff -urNp linux-2.6.32.33/arch/x86/include/asm/xsave.h linux-2.6.32.33/arch/x86
__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
"2:\n"
".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.32.33/arch/x86/Kconfig linux-2.6.32.33/arch/x86/Kconfig
---- linux-2.6.32.33/arch/x86/Kconfig 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/Kconfig 2011-02-22 15:57:23.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/Kconfig linux-2.6.32.35/arch/x86/Kconfig
+--- linux-2.6.32.35/arch/x86/Kconfig 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/arch/x86/Kconfig 2011-02-22 15:57:23.000000000 -0500
@@ -223,7 +223,7 @@ config X86_TRAMPOLINE
config X86_32_LAZY_GS
@@ -10295,9 +10295,9 @@ diff -urNp linux-2.6.32.33/arch/x86/Kconfig linux-2.6.32.33/arch/x86/Kconfig
---help---
Map the 32-bit VDSO to the predictable old-style address too.
---help---
-diff -urNp linux-2.6.32.33/arch/x86/Kconfig.cpu linux-2.6.32.33/arch/x86/Kconfig.cpu
---- linux-2.6.32.33/arch/x86/Kconfig.cpu 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/Kconfig.cpu 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/Kconfig.cpu linux-2.6.32.35/arch/x86/Kconfig.cpu
+--- linux-2.6.32.35/arch/x86/Kconfig.cpu 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/Kconfig.cpu 2010-12-31 14:46:53.000000000 -0500
@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -10325,9 +10325,9 @@ diff -urNp linux-2.6.32.33/arch/x86/Kconfig.cpu linux-2.6.32.33/arch/x86/Kconfig
config X86_MINIMUM_CPU_FAMILY
int
-diff -urNp linux-2.6.32.33/arch/x86/Kconfig.debug linux-2.6.32.33/arch/x86/Kconfig.debug
---- linux-2.6.32.33/arch/x86/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/Kconfig.debug 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/Kconfig.debug linux-2.6.32.35/arch/x86/Kconfig.debug
+--- linux-2.6.32.35/arch/x86/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/Kconfig.debug 2010-12-31 14:46:53.000000000 -0500
@@ -99,7 +99,7 @@ config X86_PTDUMP
config DEBUG_RODATA
bool "Write protect kernel read-only data structures"
@@ -10337,9 +10337,9 @@ diff -urNp linux-2.6.32.33/arch/x86/Kconfig.debug linux-2.6.32.33/arch/x86/Kconf
---help---
Mark the kernel read-only data as write-protected in the pagetables,
in order to catch accidental (and incorrect) writes to such const
-diff -urNp linux-2.6.32.33/arch/x86/kernel/acpi/boot.c linux-2.6.32.33/arch/x86/kernel/acpi/boot.c
---- linux-2.6.32.33/arch/x86/kernel/acpi/boot.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/kernel/acpi/boot.c 2011-03-02 17:25:17.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/acpi/boot.c linux-2.6.32.35/arch/x86/kernel/acpi/boot.c
+--- linux-2.6.32.35/arch/x86/kernel/acpi/boot.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/arch/x86/kernel/acpi/boot.c 2011-03-02 17:25:17.000000000 -0500
@@ -1508,7 +1508,7 @@ static struct dmi_system_id __initdata a
DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
},
@@ -10349,9 +10349,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/acpi/boot.c linux-2.6.32.33/arch/x86/
};
/*
-diff -urNp linux-2.6.32.33/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.33/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-2.6.32.33/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/acpi/realmode/wakeup.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.35/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-2.6.32.35/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/acpi/realmode/wakeup.S 2010-12-31 14:46:53.000000000 -0500
@@ -104,7 +104,7 @@ _start:
movl %eax, %ecx
orl %edx, %ecx
@@ -10361,9 +10361,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.3
wrmsr
1:
-diff -urNp linux-2.6.32.33/arch/x86/kernel/acpi/sleep.c linux-2.6.32.33/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.32.33/arch/x86/kernel/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/acpi/sleep.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/acpi/sleep.c linux-2.6.32.35/arch/x86/kernel/acpi/sleep.c
+--- linux-2.6.32.35/arch/x86/kernel/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/acpi/sleep.c 2010-12-31 14:46:53.000000000 -0500
@@ -11,11 +11,12 @@
#include <linux/cpumask.h>
#include <asm/segment.h>
@@ -10408,9 +10408,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/acpi/sleep.c linux-2.6.32.33/arch/x86
}
-diff -urNp linux-2.6.32.33/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.33/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.32.33/arch/x86/kernel/acpi/wakeup_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/acpi/wakeup_32.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.35/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-2.6.32.35/arch/x86/kernel/acpi/wakeup_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/acpi/wakeup_32.S 2010-12-31 14:46:53.000000000 -0500
@@ -30,13 +30,11 @@ wakeup_pmode_return:
# and restore the stack ... but you need gdt for this to work
movl saved_context_esp, %esp
@@ -10427,9 +10427,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.33/arch
bogus_magic:
jmp bogus_magic
-diff -urNp linux-2.6.32.33/arch/x86/kernel/alternative.c linux-2.6.32.33/arch/x86/kernel/alternative.c
---- linux-2.6.32.33/arch/x86/kernel/alternative.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/alternative.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/alternative.c linux-2.6.32.35/arch/x86/kernel/alternative.c
+--- linux-2.6.32.35/arch/x86/kernel/alternative.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/alternative.c 2010-12-31 14:46:53.000000000 -0500
@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
BUG_ON(p->len > MAX_PATCH_LEN);
@@ -10512,9 +10512,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/alternative.c linux-2.6.32.33/arch/x8
+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
return addr;
}
-diff -urNp linux-2.6.32.33/arch/x86/kernel/amd_iommu.c linux-2.6.32.33/arch/x86/kernel/amd_iommu.c
---- linux-2.6.32.33/arch/x86/kernel/amd_iommu.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/amd_iommu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/amd_iommu.c linux-2.6.32.35/arch/x86/kernel/amd_iommu.c
+--- linux-2.6.32.35/arch/x86/kernel/amd_iommu.c 2010-10-31 16:44:11.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/amd_iommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -2076,7 +2076,7 @@ static void prealloc_protection_domains(
}
}
@@ -10524,9 +10524,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/amd_iommu.c linux-2.6.32.33/arch/x86/
.alloc_coherent = alloc_coherent,
.free_coherent = free_coherent,
.map_page = map_page,
-diff -urNp linux-2.6.32.33/arch/x86/kernel/apic/io_apic.c linux-2.6.32.33/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.32.33/arch/x86/kernel/apic/io_apic.c 2011-01-11 23:55:35.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/kernel/apic/io_apic.c 2011-01-11 23:56:03.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/apic/io_apic.c linux-2.6.32.35/arch/x86/kernel/apic/io_apic.c
+--- linux-2.6.32.35/arch/x86/kernel/apic/io_apic.c 2011-01-11 23:55:35.000000000 -0500
++++ linux-2.6.32.35/arch/x86/kernel/apic/io_apic.c 2011-01-11 23:56:03.000000000 -0500
@@ -716,7 +716,7 @@ struct IO_APIC_route_entry **alloc_ioapi
ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
GFP_ATOMIC);
@@ -10563,9 +10563,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/apic/io_apic.c linux-2.6.32.33/arch/x
{
spin_unlock(&vector_lock);
}
-diff -urNp linux-2.6.32.33/arch/x86/kernel/apm_32.c linux-2.6.32.33/arch/x86/kernel/apm_32.c
---- linux-2.6.32.33/arch/x86/kernel/apm_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/apm_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/apm_32.c linux-2.6.32.35/arch/x86/kernel/apm_32.c
+--- linux-2.6.32.35/arch/x86/kernel/apm_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/apm_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
* This is for buggy BIOS's that refer to (real mode) segment 0x40
* even though they are called in protected mode.
@@ -10667,9 +10667,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/apm_32.c linux-2.6.32.33/arch/x86/ker
proc_create("apm", 0, NULL, &apm_file_ops);
-diff -urNp linux-2.6.32.33/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.33/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.32.33/arch/x86/kernel/asm-offsets_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/asm-offsets_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.35/arch/x86/kernel/asm-offsets_32.c
+--- linux-2.6.32.35/arch/x86/kernel/asm-offsets_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/asm-offsets_32.c 2010-12-31 14:46:53.000000000 -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);
@@ -10682,9 +10682,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.33/arch
#endif
#ifdef CONFIG_XEN
-diff -urNp linux-2.6.32.33/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.33/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.32.33/arch/x86/kernel/asm-offsets_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/asm-offsets_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.35/arch/x86/kernel/asm-offsets_64.c
+--- linux-2.6.32.35/arch/x86/kernel/asm-offsets_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/asm-offsets_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -63,6 +63,18 @@ int main(void)
OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
@@ -10712,9 +10712,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.33/arch
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.33/arch/x86/kernel/cpu/amd.c linux-2.6.32.33/arch/x86/kernel/cpu/amd.c
---- linux-2.6.32.33/arch/x86/kernel/cpu/amd.c 2011-01-11 23:55:35.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/amd.c 2011-02-27 14:53:10.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/amd.c linux-2.6.32.35/arch/x86/kernel/cpu/amd.c
+--- linux-2.6.32.35/arch/x86/kernel/cpu/amd.c 2011-01-11 23:55:35.000000000 -0500
++++ linux-2.6.32.35/arch/x86/kernel/cpu/amd.c 2011-02-27 14:53:10.000000000 -0500
@@ -573,7 +573,7 @@ static unsigned int __cpuinit amd_size_c
unsigned int size)
{
@@ -10724,9 +10724,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/amd.c linux-2.6.32.33/arch/x86/ke
/* Duron Rev A0 */
if (c->x86_model == 3 && c->x86_mask == 0)
size = 64;
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/common.c linux-2.6.32.33/arch/x86/kernel/cpu/common.c
---- linux-2.6.32.33/arch/x86/kernel/cpu/common.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/common.c 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/common.c linux-2.6.32.35/arch/x86/kernel/cpu/common.c
+--- linux-2.6.32.35/arch/x86/kernel/cpu/common.c 2010-10-31 16:44:11.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/cpu/common.c 2010-12-31 14:47:01.000000000 -0500
@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -10852,9 +10852,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/common.c linux-2.6.32.33/arch/x86
struct thread_struct *thread = &curr->thread;
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
---- linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.35/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+--- linux-2.6.32.35/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-12-31 14:46:53.000000000 -0500
@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
},
@@ -10864,9 +10864,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.
};
static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
---- linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.35/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
+--- linux-2.6.32.35/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-12-31 14:46:53.000000000 -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 },
@@ -10876,9 +10876,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu
};
#undef _BANIAS
#undef BANIAS
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/intel.c linux-2.6.32.33/arch/x86/kernel/cpu/intel.c
---- linux-2.6.32.33/arch/x86/kernel/cpu/intel.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/intel.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/intel.c linux-2.6.32.35/arch/x86/kernel/cpu/intel.c
+--- linux-2.6.32.35/arch/x86/kernel/cpu/intel.c 2010-10-31 16:44:11.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/cpu/intel.c 2010-12-31 14:46:53.000000000 -0500
@@ -162,7 +162,7 @@ static void __cpuinit trap_init_f00f_bug
* Update the IDT descriptor and reload the IDT so that
* it uses the read-only mapped virtual address.
@@ -10888,9 +10888,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/intel.c linux-2.6.32.33/arch/x86/
load_idt(&idt_descr);
}
#endif
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.33/arch/x86/kernel/cpu/intel_cacheinfo.c
---- linux-2.6.32.33/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.35/arch/x86/kernel/cpu/intel_cacheinfo.c
+--- linux-2.6.32.35/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-12-31 14:46:53.000000000 -0500
@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob
return ret;
}
@@ -10900,9 +10900,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.33
.show = show,
.store = store,
};
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/Makefile linux-2.6.32.33/arch/x86/kernel/cpu/Makefile
---- linux-2.6.32.33/arch/x86/kernel/cpu/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/Makefile 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/Makefile linux-2.6.32.35/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.32.35/arch/x86/kernel/cpu/Makefile 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/cpu/Makefile 2010-12-31 14:46:53.000000000 -0500
@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
CFLAGS_REMOVE_common.o = -pg
endif
@@ -10914,9 +10914,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/Makefile linux-2.6.32.33/arch/x86
obj-y := intel_cacheinfo.o addon_cpuid_features.o
obj-y += proc.o capflags.o powerflags.o common.o
obj-y += vmware.o hypervisor.o sched.o
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce_amd.c
---- linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.35/arch/x86/kernel/cpu/mcheck/mce_amd.c
+--- linux-2.6.32.35/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-10-31 16:44:11.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-12-31 14:46:53.000000000 -0500
@@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kob
return ret;
}
@@ -10926,9 +10926,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.33/
.show = show,
.store = store,
};
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-25 20:24:47.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.35/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-2.6.32.35/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-25 20:24:47.000000000 -0500
@@ -43,6 +43,7 @@
#include <asm/ipi.h>
#include <asm/mce.h>
@@ -10989,9 +10989,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.33/arch
};
/*
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/amd.c
---- linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/amd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/amd.c
+--- linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/amd.c 2010-12-31 14:46:53.000000000 -0500
@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
return 0;
}
@@ -11001,9 +11001,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.33/arch/x
.vendor = X86_VENDOR_AMD,
.set = amd_set_mtrr,
.get = amd_get_mtrr,
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/centaur.c
---- linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/centaur.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/centaur.c
+--- linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/centaur.c 2010-12-31 14:46:53.000000000 -0500
@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
return 0;
}
@@ -11013,9 +11013,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.33/ar
.vendor = X86_VENDOR_CENTAUR,
.set = centaur_set_mcr,
.get = centaur_get_mcr,
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/cyrix.c
---- linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/cyrix.c
+--- linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-12-31 14:46:53.000000000 -0500
@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
post_set();
}
@@ -11025,9 +11025,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.33/arch
.vendor = X86_VENDOR_CYRIX,
.set_all = cyrix_set_all,
.set = cyrix_set_arr,
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/generic.c
---- linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/generic.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/generic.c
+--- linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/generic.c 2010-12-31 14:46:53.000000000 -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 */
@@ -11046,9 +11046,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.33/ar
.use_intel_if = 1,
.set_all = generic_set_all,
.get = generic_get_mtrr,
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 15:57:23.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/main.c 2011-02-22 15:57:23.000000000 -0500
@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
u64 size_or_mask, size_and_mask;
static bool mtrr_aps_delayed_init;
@@ -11067,9 +11067,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.33/arch/
{
if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
mtrr_ops[ops->vendor] = ops;
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-12-31 14:46:53.000000000 -0500
@@ -12,19 +12,19 @@
extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
@@ -11120,9 +11120,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.33/arch/
#define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
#define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.33/arch/x86/kernel/cpu/perfctr-watchdog.c
---- linux-2.6.32.33/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.35/arch/x86/kernel/cpu/perfctr-watchdog.c
+--- linux-2.6.32.35/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-12-31 14:46:53.000000000 -0500
@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
/* Interface defining a CPU specific perfctr watchdog */
@@ -11156,9 +11156,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.3
static struct wd_ops intel_arch_wd_ops __read_mostly = {
.reserve = single_msr_reserve,
.unreserve = single_msr_unreserve,
-diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.33/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.32.33/arch/x86/kernel/cpu/perf_event.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/cpu/perf_event.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.35/arch/x86/kernel/cpu/perf_event.c
+--- linux-2.6.32.35/arch/x86/kernel/cpu/perf_event.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/cpu/perf_event.c 2010-12-31 14:46:53.000000000 -0500
@@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs
break;
@@ -11168,9 +11168,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.33/arch
}
}
-diff -urNp linux-2.6.32.33/arch/x86/kernel/crash.c linux-2.6.32.33/arch/x86/kernel/crash.c
---- linux-2.6.32.33/arch/x86/kernel/crash.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/crash.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/crash.c linux-2.6.32.35/arch/x86/kernel/crash.c
+--- linux-2.6.32.35/arch/x86/kernel/crash.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/crash.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,
regs = args->regs;
@@ -11180,9 +11180,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/crash.c linux-2.6.32.33/arch/x86/kern
crash_fixup_ss_esp(&fixed_regs, regs);
regs = &fixed_regs;
}
-diff -urNp linux-2.6.32.33/arch/x86/kernel/doublefault_32.c linux-2.6.32.33/arch/x86/kernel/doublefault_32.c
---- linux-2.6.32.33/arch/x86/kernel/doublefault_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/doublefault_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/doublefault_32.c linux-2.6.32.35/arch/x86/kernel/doublefault_32.c
+--- linux-2.6.32.35/arch/x86/kernel/doublefault_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/doublefault_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -11,7 +11,7 @@
#define DOUBLEFAULT_STACKSIZE (1024)
@@ -11214,9 +11214,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/doublefault_32.c linux-2.6.32.33/arch
.fs = __KERNEL_PERCPU,
.__cr3 = __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.32.33/arch/x86/kernel/dumpstack_32.c linux-2.6.32.33/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.32.33/arch/x86/kernel/dumpstack_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/dumpstack_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/dumpstack_32.c linux-2.6.32.35/arch/x86/kernel/dumpstack_32.c
+--- linux-2.6.32.35/arch/x86/kernel/dumpstack_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/dumpstack_32.c 2010-12-31 14:46:53.000000000 -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..
@@ -11261,9 +11261,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/dumpstack_32.c linux-2.6.32.33/arch/x
if (ip < PAGE_OFFSET)
return 0;
if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-2.6.32.33/arch/x86/kernel/dumpstack.c linux-2.6.32.33/arch/x86/kernel/dumpstack.c
---- linux-2.6.32.33/arch/x86/kernel/dumpstack.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/dumpstack.c 2010-12-31 14:52:58.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/dumpstack.c linux-2.6.32.35/arch/x86/kernel/dumpstack.c
+--- linux-2.6.32.35/arch/x86/kernel/dumpstack.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/dumpstack.c 2010-12-31 14:52:58.000000000 -0500
@@ -2,6 +2,9 @@
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -11310,9 +11310,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/dumpstack.c linux-2.6.32.33/arch/x86/
report_bug(regs->ip, regs);
if (__die(str, regs, err))
-diff -urNp linux-2.6.32.33/arch/x86/kernel/e820.c linux-2.6.32.33/arch/x86/kernel/e820.c
---- linux-2.6.32.33/arch/x86/kernel/e820.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/e820.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/e820.c linux-2.6.32.35/arch/x86/kernel/e820.c
+--- linux-2.6.32.35/arch/x86/kernel/e820.c 2011-03-23 19:00:31.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/e820.c 2011-03-23 19:01:00.000000000 -0400
@@ -733,7 +733,7 @@ struct early_res {
};
static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -11322,9 +11322,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/e820.c linux-2.6.32.33/arch/x86/kerne
};
static int __init find_overlapped_early(u64 start, u64 end)
-diff -urNp linux-2.6.32.33/arch/x86/kernel/efi_32.c linux-2.6.32.33/arch/x86/kernel/efi_32.c
---- linux-2.6.32.33/arch/x86/kernel/efi_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/efi_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/efi_32.c linux-2.6.32.35/arch/x86/kernel/efi_32.c
+--- linux-2.6.32.35/arch/x86/kernel/efi_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/efi_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -38,70 +38,38 @@
*/
@@ -11405,9 +11405,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/efi_32.c linux-2.6.32.33/arch/x86/ker
/*
* After the lock is released, the original page table is restored.
-diff -urNp linux-2.6.32.33/arch/x86/kernel/efi_stub_32.S linux-2.6.32.33/arch/x86/kernel/efi_stub_32.S
---- linux-2.6.32.33/arch/x86/kernel/efi_stub_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/efi_stub_32.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/efi_stub_32.S linux-2.6.32.35/arch/x86/kernel/efi_stub_32.S
+--- linux-2.6.32.35/arch/x86/kernel/efi_stub_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/efi_stub_32.S 2010-12-31 14:46:53.000000000 -0500
@@ -6,6 +6,7 @@
*/
@@ -11506,9 +11506,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/efi_stub_32.S linux-2.6.32.33/arch/x8
saved_return_addr:
.long 0
efi_rt_function_ptr:
-diff -urNp linux-2.6.32.33/arch/x86/kernel/entry_32.S linux-2.6.32.33/arch/x86/kernel/entry_32.S
---- linux-2.6.32.33/arch/x86/kernel/entry_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/entry_32.S 2011-01-04 17:42:43.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/entry_32.S linux-2.6.32.35/arch/x86/kernel/entry_32.S
+--- linux-2.6.32.35/arch/x86/kernel/entry_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/entry_32.S 2011-01-04 17:42:43.000000000 -0500
@@ -185,13 +185,81 @@
/*CFI_REL_OFFSET gs, PT_GS*/
.endm
@@ -11867,9 +11867,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/entry_32.S linux-2.6.32.33/arch/x86/k
RESTORE_REGS
lss 12+4(%esp), %esp # back to espfix stack
CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-2.6.32.33/arch/x86/kernel/entry_64.S linux-2.6.32.33/arch/x86/kernel/entry_64.S
---- linux-2.6.32.33/arch/x86/kernel/entry_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/entry_64.S 2011-02-27 14:53:10.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/entry_64.S linux-2.6.32.35/arch/x86/kernel/entry_64.S
+--- linux-2.6.32.35/arch/x86/kernel/entry_64.S 2011-03-23 19:00:31.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/entry_64.S 2011-03-23 19:01:00.000000000 -0400
@@ -53,6 +53,7 @@
#include <asm/paravirt.h>
#include <asm/ftrace.h>
@@ -12340,9 +12340,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/entry_64.S linux-2.6.32.33/arch/x86/k
RESTORE_ALL 8
jmp irq_return
nmi_userspace:
-diff -urNp linux-2.6.32.33/arch/x86/kernel/ftrace.c linux-2.6.32.33/arch/x86/kernel/ftrace.c
---- linux-2.6.32.33/arch/x86/kernel/ftrace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/ftrace.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/ftrace.c linux-2.6.32.35/arch/x86/kernel/ftrace.c
+--- linux-2.6.32.35/arch/x86/kernel/ftrace.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/ftrace.c 2010-12-31 14:46:53.000000000 -0500
@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
{
if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -12408,9 +12408,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/ftrace.c linux-2.6.32.33/arch/x86/ker
if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
return -EFAULT;
-diff -urNp linux-2.6.32.33/arch/x86/kernel/head32.c linux-2.6.32.33/arch/x86/kernel/head32.c
---- linux-2.6.32.33/arch/x86/kernel/head32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/head32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/head32.c linux-2.6.32.35/arch/x86/kernel/head32.c
+--- linux-2.6.32.35/arch/x86/kernel/head32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/head32.c 2010-12-31 14:46:53.000000000 -0500
@@ -16,6 +16,7 @@
#include <asm/apic.h>
#include <asm/io_apic.h>
@@ -12428,9 +12428,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/head32.c linux-2.6.32.33/arch/x86/ker
#ifdef CONFIG_BLK_DEV_INITRD
/* Reserve INITRD */
-diff -urNp linux-2.6.32.33/arch/x86/kernel/head_32.S linux-2.6.32.33/arch/x86/kernel/head_32.S
---- linux-2.6.32.33/arch/x86/kernel/head_32.S 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/kernel/head_32.S 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/head_32.S linux-2.6.32.35/arch/x86/kernel/head_32.S
+--- linux-2.6.32.35/arch/x86/kernel/head_32.S 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/arch/x86/kernel/head_32.S 2010-12-31 14:47:01.000000000 -0500
@@ -19,10 +19,17 @@
#include <asm/setup.h>
#include <asm/processor-flags.h>
@@ -12900,9 +12900,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/head_32.S linux-2.6.32.33/arch/x86/ke
+ /* Be sure this is zeroed to avoid false validations in Xen */
+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
+ .endr
-diff -urNp linux-2.6.32.33/arch/x86/kernel/head_64.S linux-2.6.32.33/arch/x86/kernel/head_64.S
---- linux-2.6.32.33/arch/x86/kernel/head_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/head_64.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/head_64.S linux-2.6.32.35/arch/x86/kernel/head_64.S
+--- linux-2.6.32.35/arch/x86/kernel/head_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/head_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -19,6 +19,7 @@
#include <asm/cache.h>
#include <asm/processor-flags.h>
@@ -13173,9 +13173,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/head_64.S linux-2.6.32.33/arch/x86/ke
__PAGE_ALIGNED_BSS
.align PAGE_SIZE
-diff -urNp linux-2.6.32.33/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.33/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.32.33/arch/x86/kernel/i386_ksyms_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/i386_ksyms_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.35/arch/x86/kernel/i386_ksyms_32.c
+--- linux-2.6.32.35/arch/x86/kernel/i386_ksyms_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/i386_ksyms_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
EXPORT_SYMBOL(cmpxchg8b_emu);
#endif
@@ -13197,9 +13197,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.33/arch/
+#ifdef CONFIG_PAX_KERNEXEC
+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
+#endif
-diff -urNp linux-2.6.32.33/arch/x86/kernel/init_task.c linux-2.6.32.33/arch/x86/kernel/init_task.c
---- linux-2.6.32.33/arch/x86/kernel/init_task.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/init_task.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/init_task.c linux-2.6.32.35/arch/x86/kernel/init_task.c
+--- linux-2.6.32.35/arch/x86/kernel/init_task.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/init_task.c 2010-12-31 14:46:53.000000000 -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.
@@ -13208,9 +13208,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/init_task.c linux-2.6.32.33/arch/x86/
-
+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
+EXPORT_SYMBOL(init_tss);
-diff -urNp linux-2.6.32.33/arch/x86/kernel/ioport.c linux-2.6.32.33/arch/x86/kernel/ioport.c
---- linux-2.6.32.33/arch/x86/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/ioport.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/ioport.c linux-2.6.32.35/arch/x86/kernel/ioport.c
+--- linux-2.6.32.35/arch/x86/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/ioport.c 2010-12-31 14:46:53.000000000 -0500
@@ -6,6 +6,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
@@ -13254,9 +13254,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/ioport.c linux-2.6.32.33/arch/x86/ker
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
}
-diff -urNp linux-2.6.32.33/arch/x86/kernel/irq_32.c linux-2.6.32.33/arch/x86/kernel/irq_32.c
---- linux-2.6.32.33/arch/x86/kernel/irq_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/irq_32.c 2010-12-31 14:58:57.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/irq_32.c linux-2.6.32.35/arch/x86/kernel/irq_32.c
+--- linux-2.6.32.35/arch/x86/kernel/irq_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/irq_32.c 2010-12-31 14:58:57.000000000 -0500
@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
return 0;
@@ -13309,9 +13309,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/irq_32.c linux-2.6.32.33/arch/x86/ker
/*
* Shouldnt happen, we returned above if in_interrupt():
*/
-diff -urNp linux-2.6.32.33/arch/x86/kernel/kgdb.c linux-2.6.32.33/arch/x86/kernel/kgdb.c
---- linux-2.6.32.33/arch/x86/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/kgdb.c linux-2.6.32.35/arch/x86/kernel/kgdb.c
+--- linux-2.6.32.35/arch/x86/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
return instruction_pointer(regs);
}
@@ -13321,9 +13321,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/kgdb.c linux-2.6.32.33/arch/x86/kerne
/* Breakpoint instruction: */
.gdb_bpt_instr = { 0xcc },
.flags = KGDB_HW_BREAKPOINT,
-diff -urNp linux-2.6.32.33/arch/x86/kernel/kprobes.c linux-2.6.32.33/arch/x86/kernel/kprobes.c
---- linux-2.6.32.33/arch/x86/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/kprobes.c 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/kprobes.c linux-2.6.32.35/arch/x86/kernel/kprobes.c
+--- linux-2.6.32.35/arch/x86/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/kprobes.c 2010-12-31 14:47:01.000000000 -0500
@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
char op;
s32 raddr;
@@ -13425,9 +13425,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/kprobes.c linux-2.6.32.33/arch/x86/ke
return ret;
switch (val) {
-diff -urNp linux-2.6.32.33/arch/x86/kernel/ldt.c linux-2.6.32.33/arch/x86/kernel/ldt.c
---- linux-2.6.32.33/arch/x86/kernel/ldt.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/ldt.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/ldt.c linux-2.6.32.35/arch/x86/kernel/ldt.c
+--- linux-2.6.32.35/arch/x86/kernel/ldt.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/ldt.c 2010-12-31 14:46:53.000000000 -0500
@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
if (reload) {
#ifdef CONFIG_SMP
@@ -13492,9 +13492,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/ldt.c linux-2.6.32.33/arch/x86/kernel
fill_ldt(&ldt, &ldt_info);
if (oldmode)
ldt.avl = 0;
-diff -urNp linux-2.6.32.33/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.33/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.32.33/arch/x86/kernel/machine_kexec_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/machine_kexec_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.35/arch/x86/kernel/machine_kexec_32.c
+--- linux-2.6.32.35/arch/x86/kernel/machine_kexec_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/machine_kexec_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -26,7 +26,7 @@
#include <asm/system.h>
#include <asm/cacheflush.h>
@@ -13522,9 +13522,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.33/ar
relocate_kernel_ptr = control_page;
page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-2.6.32.33/arch/x86/kernel/microcode_amd.c linux-2.6.32.33/arch/x86/kernel/microcode_amd.c
---- linux-2.6.32.33/arch/x86/kernel/microcode_amd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/microcode_amd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/microcode_amd.c linux-2.6.32.35/arch/x86/kernel/microcode_amd.c
+--- linux-2.6.32.35/arch/x86/kernel/microcode_amd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/microcode_amd.c 2010-12-31 14:46:53.000000000 -0500
@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
uci->mc = NULL;
}
@@ -13543,9 +13543,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/microcode_amd.c linux-2.6.32.33/arch/
{
return &microcode_amd_ops;
}
-diff -urNp linux-2.6.32.33/arch/x86/kernel/microcode_core.c linux-2.6.32.33/arch/x86/kernel/microcode_core.c
---- linux-2.6.32.33/arch/x86/kernel/microcode_core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/microcode_core.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/microcode_core.c linux-2.6.32.35/arch/x86/kernel/microcode_core.c
+--- linux-2.6.32.35/arch/x86/kernel/microcode_core.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/microcode_core.c 2010-12-31 14:46:53.000000000 -0500
@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
#define MICROCODE_VERSION "2.00"
@@ -13555,9 +13555,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/microcode_core.c linux-2.6.32.33/arch
/*
* Synchronization.
-diff -urNp linux-2.6.32.33/arch/x86/kernel/microcode_intel.c linux-2.6.32.33/arch/x86/kernel/microcode_intel.c
---- linux-2.6.32.33/arch/x86/kernel/microcode_intel.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/microcode_intel.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/microcode_intel.c linux-2.6.32.35/arch/x86/kernel/microcode_intel.c
+--- linux-2.6.32.35/arch/x86/kernel/microcode_intel.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/microcode_intel.c 2010-12-31 14:46:53.000000000 -0500
@@ -443,13 +443,13 @@ static enum ucode_state request_microcod
static int get_ucode_user(void *to, const void *from, size_t n)
@@ -13592,9 +13592,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/microcode_intel.c linux-2.6.32.33/arc
{
return &microcode_intel_ops;
}
-diff -urNp linux-2.6.32.33/arch/x86/kernel/module.c linux-2.6.32.33/arch/x86/kernel/module.c
---- linux-2.6.32.33/arch/x86/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/module.c linux-2.6.32.35/arch/x86/kernel/module.c
+--- linux-2.6.32.35/arch/x86/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/module.c 2010-12-31 14:46:53.000000000 -0500
@@ -34,7 +34,7 @@
#define DEBUGP(fmt...)
#endif
@@ -13735,9 +13735,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/module.c linux-2.6.32.33/arch/x86/ker
#if 0
if ((s64)val != *(s32 *)loc)
goto overflow;
-diff -urNp linux-2.6.32.33/arch/x86/kernel/paravirt.c linux-2.6.32.33/arch/x86/kernel/paravirt.c
---- linux-2.6.32.33/arch/x86/kernel/paravirt.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/paravirt.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/paravirt.c linux-2.6.32.35/arch/x86/kernel/paravirt.c
+--- linux-2.6.32.35/arch/x86/kernel/paravirt.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/paravirt.c 2010-12-31 14:46:53.000000000 -0500
@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
* corresponding structure. */
static void *get_call_destination(u8 type)
@@ -13841,9 +13841,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/paravirt.c linux-2.6.32.33/arch/x86/k
};
EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.32.33/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.33/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.32.33/arch/x86/kernel/paravirt-spinlocks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/paravirt-spinlocks.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.35/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.32.35/arch/x86/kernel/paravirt-spinlocks.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/paravirt-spinlocks.c 2010-12-31 14:46:53.000000000 -0500
@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
__raw_spin_lock(lock);
}
@@ -13853,9 +13853,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.33/
#ifdef CONFIG_SMP
.spin_is_locked = __ticket_spin_is_locked,
.spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-2.6.32.33/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.33/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.32.33/arch/x86/kernel/pci-calgary_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/pci-calgary_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.35/arch/x86/kernel/pci-calgary_64.c
+--- linux-2.6.32.35/arch/x86/kernel/pci-calgary_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/pci-calgary_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -477,7 +477,7 @@ static void calgary_free_coherent(struct
free_pages((unsigned long)vaddr, get_order(size));
}
@@ -13865,9 +13865,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.33/arch
.alloc_coherent = calgary_alloc_coherent,
.free_coherent = calgary_free_coherent,
.map_sg = calgary_map_sg,
-diff -urNp linux-2.6.32.33/arch/x86/kernel/pci-dma.c linux-2.6.32.33/arch/x86/kernel/pci-dma.c
---- linux-2.6.32.33/arch/x86/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/pci-dma.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/pci-dma.c linux-2.6.32.35/arch/x86/kernel/pci-dma.c
+--- linux-2.6.32.35/arch/x86/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/pci-dma.c 2010-12-31 14:46:53.000000000 -0500
@@ -14,7 +14,7 @@
static int forbid_dac __read_mostly;
@@ -13886,9 +13886,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/pci-dma.c linux-2.6.32.33/arch/x86/ke
#ifdef CONFIG_PCI
if (mask > 0xffffffff && forbid_dac > 0) {
-diff -urNp linux-2.6.32.33/arch/x86/kernel/pci-gart_64.c linux-2.6.32.33/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.32.33/arch/x86/kernel/pci-gart_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/pci-gart_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/pci-gart_64.c linux-2.6.32.35/arch/x86/kernel/pci-gart_64.c
+--- linux-2.6.32.35/arch/x86/kernel/pci-gart_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/pci-gart_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
return -1;
}
@@ -13898,9 +13898,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/pci-gart_64.c linux-2.6.32.33/arch/x8
.map_sg = gart_map_sg,
.unmap_sg = gart_unmap_sg,
.map_page = gart_map_page,
-diff -urNp linux-2.6.32.33/arch/x86/kernel/pci-nommu.c linux-2.6.32.33/arch/x86/kernel/pci-nommu.c
---- linux-2.6.32.33/arch/x86/kernel/pci-nommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/pci-nommu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/pci-nommu.c linux-2.6.32.35/arch/x86/kernel/pci-nommu.c
+--- linux-2.6.32.35/arch/x86/kernel/pci-nommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/pci-nommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
flush_write_buffers();
}
@@ -13910,9 +13910,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/pci-nommu.c linux-2.6.32.33/arch/x86/
.alloc_coherent = dma_generic_alloc_coherent,
.free_coherent = nommu_free_coherent,
.map_sg = nommu_map_sg,
-diff -urNp linux-2.6.32.33/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.33/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.32.33/arch/x86/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/pci-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.35/arch/x86/kernel/pci-swiotlb.c
+--- linux-2.6.32.35/arch/x86/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/pci-swiotlb.c 2010-12-31 14:46:53.000000000 -0500
@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
}
@@ -13922,9 +13922,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.33/arch/x8
.mapping_error = swiotlb_dma_mapping_error,
.alloc_coherent = x86_swiotlb_alloc_coherent,
.free_coherent = swiotlb_free_coherent,
-diff -urNp linux-2.6.32.33/arch/x86/kernel/process_32.c linux-2.6.32.33/arch/x86/kernel/process_32.c
---- linux-2.6.32.33/arch/x86/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/process_32.c 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/process_32.c linux-2.6.32.35/arch/x86/kernel/process_32.c
+--- linux-2.6.32.35/arch/x86/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/process_32.c 2010-12-31 14:47:01.000000000 -0500
@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
unsigned long thread_saved_pc(struct task_struct *tsk)
{
@@ -14022,9 +14022,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/process_32.c linux-2.6.32.33/arch/x86
+ load_sp0(init_tss + smp_processor_id(), thread);
+}
+#endif
-diff -urNp linux-2.6.32.33/arch/x86/kernel/process_64.c linux-2.6.32.33/arch/x86/kernel/process_64.c
---- linux-2.6.32.33/arch/x86/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/process_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/process_64.c linux-2.6.32.35/arch/x86/kernel/process_64.c
+--- linux-2.6.32.35/arch/x86/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/process_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -91,7 +91,7 @@ static void __exit_idle(void)
void exit_idle(void)
{
@@ -14067,9 +14067,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/process_64.c linux-2.6.32.33/arch/x86
return 0;
ip = *(u64 *)(fp+8);
if (!in_sched_functions(ip))
-diff -urNp linux-2.6.32.33/arch/x86/kernel/process.c linux-2.6.32.33/arch/x86/kernel/process.c
---- linux-2.6.32.33/arch/x86/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/process.c 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/process.c linux-2.6.32.35/arch/x86/kernel/process.c
+--- linux-2.6.32.35/arch/x86/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/process.c 2010-12-31 14:47:01.000000000 -0500
@@ -73,7 +73,7 @@ void exit_thread(void)
unsigned long *bp = t->io_bitmap_ptr;
@@ -14107,9 +14107,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/process.c linux-2.6.32.33/arch/x86/ke
- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
-}
-
-diff -urNp linux-2.6.32.33/arch/x86/kernel/ptrace.c linux-2.6.32.33/arch/x86/kernel/ptrace.c
---- linux-2.6.32.33/arch/x86/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/ptrace.c 2011-02-27 14:53:10.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/ptrace.c linux-2.6.32.35/arch/x86/kernel/ptrace.c
+--- linux-2.6.32.35/arch/x86/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/ptrace.c 2011-02-27 14:53:10.000000000 -0500
@@ -925,7 +925,7 @@ static const struct user_regset_view use
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
{
@@ -14196,9 +14196,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/ptrace.c linux-2.6.32.33/arch/x86/ker
{
if (unlikely(current->audit_context))
audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
-diff -urNp linux-2.6.32.33/arch/x86/kernel/reboot.c linux-2.6.32.33/arch/x86/kernel/reboot.c
---- linux-2.6.32.33/arch/x86/kernel/reboot.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/kernel/reboot.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/reboot.c linux-2.6.32.35/arch/x86/kernel/reboot.c
+--- linux-2.6.32.35/arch/x86/kernel/reboot.c 2010-11-26 18:22:29.000000000 -0500
++++ linux-2.6.32.35/arch/x86/kernel/reboot.c 2010-12-31 14:46:53.000000000 -0500
@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
@@ -14275,9 +14275,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/reboot.c linux-2.6.32.33/arch/x86/ker
/* Set up the IDT for real mode. */
load_idt(&real_mode_idt);
-diff -urNp linux-2.6.32.33/arch/x86/kernel/setup.c linux-2.6.32.33/arch/x86/kernel/setup.c
---- linux-2.6.32.33/arch/x86/kernel/setup.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/kernel/setup.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/setup.c linux-2.6.32.35/arch/x86/kernel/setup.c
+--- linux-2.6.32.35/arch/x86/kernel/setup.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/arch/x86/kernel/setup.c 2010-12-31 14:46:53.000000000 -0500
@@ -783,14 +783,14 @@ void __init setup_arch(char **cmdline_p)
if (!boot_params.hdr.root_flags)
@@ -14298,9 +14298,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/setup.c linux-2.6.32.33/arch/x86/kern
data_resource.end = virt_to_phys(_edata)-1;
bss_resource.start = virt_to_phys(&__bss_start);
bss_resource.end = virt_to_phys(&__bss_stop)-1;
-diff -urNp linux-2.6.32.33/arch/x86/kernel/setup_percpu.c linux-2.6.32.33/arch/x86/kernel/setup_percpu.c
---- linux-2.6.32.33/arch/x86/kernel/setup_percpu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/setup_percpu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/setup_percpu.c linux-2.6.32.35/arch/x86/kernel/setup_percpu.c
+--- linux-2.6.32.35/arch/x86/kernel/setup_percpu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/setup_percpu.c 2010-12-31 14:46:53.000000000 -0500
@@ -25,19 +25,17 @@
# define DBG(x...)
#endif
@@ -14364,9 +14364,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/setup_percpu.c linux-2.6.32.33/arch/x
/*
* Up to this point, the boot CPU has been using .data.init
* area. Reload any changed state for the boot CPU.
-diff -urNp linux-2.6.32.33/arch/x86/kernel/signal.c linux-2.6.32.33/arch/x86/kernel/signal.c
---- linux-2.6.32.33/arch/x86/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/signal.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/signal.c linux-2.6.32.35/arch/x86/kernel/signal.c
+--- linux-2.6.32.35/arch/x86/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/signal.c 2010-12-31 14:46:53.000000000 -0500
@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
* Align the stack pointer according to the i386 ABI,
* i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -14441,9 +14441,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/signal.c linux-2.6.32.33/arch/x86/ker
return;
if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-2.6.32.33/arch/x86/kernel/smpboot.c linux-2.6.32.33/arch/x86/kernel/smpboot.c
---- linux-2.6.32.33/arch/x86/kernel/smpboot.c 2011-01-11 23:55:35.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/kernel/smpboot.c 2011-01-11 23:56:03.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/smpboot.c linux-2.6.32.35/arch/x86/kernel/smpboot.c
+--- linux-2.6.32.35/arch/x86/kernel/smpboot.c 2011-01-11 23:55:35.000000000 -0500
++++ linux-2.6.32.35/arch/x86/kernel/smpboot.c 2011-01-11 23:56:03.000000000 -0500
@@ -94,14 +94,14 @@ static DEFINE_PER_CPU(struct task_struct
*/
static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex);
@@ -14488,9 +14488,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/smpboot.c linux-2.6.32.33/arch/x86/ke
err = do_boot_cpu(apicid, cpu);
if (err) {
-diff -urNp linux-2.6.32.33/arch/x86/kernel/step.c linux-2.6.32.33/arch/x86/kernel/step.c
---- linux-2.6.32.33/arch/x86/kernel/step.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/step.c 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/step.c linux-2.6.32.35/arch/x86/kernel/step.c
+--- linux-2.6.32.35/arch/x86/kernel/step.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/step.c 2010-12-31 14:47:01.000000000 -0500
@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
struct desc_struct *desc;
unsigned long base;
@@ -14533,17 +14533,17 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/step.c linux-2.6.32.33/arch/x86/kerne
/* 32-bit mode: register increment */
return 0;
/* 64-bit mode: REX prefix */
-diff -urNp linux-2.6.32.33/arch/x86/kernel/syscall_table_32.S linux-2.6.32.33/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.32.33/arch/x86/kernel/syscall_table_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/syscall_table_32.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/syscall_table_32.S linux-2.6.32.35/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.32.35/arch/x86/kernel/syscall_table_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/syscall_table_32.S 2010-12-31 14:46:53.000000000 -0500
@@ -1,3 +1,4 @@
+.section .rodata,"a",@progbits
ENTRY(sys_call_table)
.long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
.long sys_exit
-diff -urNp linux-2.6.32.33/arch/x86/kernel/sys_i386_32.c linux-2.6.32.33/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.32.33/arch/x86/kernel/sys_i386_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/sys_i386_32.c 2011-03-21 17:34:54.000000000 -0400
+diff -urNp linux-2.6.32.35/arch/x86/kernel/sys_i386_32.c linux-2.6.32.35/arch/x86/kernel/sys_i386_32.c
+--- linux-2.6.32.35/arch/x86/kernel/sys_i386_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/sys_i386_32.c 2011-03-21 17:34:54.000000000 -0400
@@ -24,6 +24,21 @@
#include <asm/syscalls.h>
@@ -14815,9 +14815,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/sys_i386_32.c linux-2.6.32.33/arch/x8
- : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory");
- return __res;
-}
-diff -urNp linux-2.6.32.33/arch/x86/kernel/sys_x86_64.c linux-2.6.32.33/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.32.33/arch/x86/kernel/sys_x86_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/sys_x86_64.c 2011-03-21 17:34:54.000000000 -0400
+diff -urNp linux-2.6.32.35/arch/x86/kernel/sys_x86_64.c linux-2.6.32.35/arch/x86/kernel/sys_x86_64.c
+--- linux-2.6.32.35/arch/x86/kernel/sys_x86_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/sys_x86_64.c 2011-03-21 17:34:54.000000000 -0400
@@ -32,8 +32,8 @@ out:
return error;
}
@@ -14955,9 +14955,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/sys_x86_64.c linux-2.6.32.33/arch/x86
mm->cached_hole_size = ~0UL;
return addr;
-diff -urNp linux-2.6.32.33/arch/x86/kernel/time.c linux-2.6.32.33/arch/x86/kernel/time.c
---- linux-2.6.32.33/arch/x86/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/time.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/time.c linux-2.6.32.35/arch/x86/kernel/time.c
+--- linux-2.6.32.35/arch/x86/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/time.c 2010-12-31 14:46:53.000000000 -0500
@@ -26,17 +26,13 @@
int timer_ack;
#endif
@@ -14996,9 +14996,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/time.c linux-2.6.32.33/arch/x86/kerne
}
return pc;
}
-diff -urNp linux-2.6.32.33/arch/x86/kernel/tls.c linux-2.6.32.33/arch/x86/kernel/tls.c
---- linux-2.6.32.33/arch/x86/kernel/tls.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/tls.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/tls.c linux-2.6.32.35/arch/x86/kernel/tls.c
+--- linux-2.6.32.35/arch/x86/kernel/tls.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/tls.c 2010-12-31 14:46:53.000000000 -0500
@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
return -EINVAL;
@@ -15011,9 +15011,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/tls.c linux-2.6.32.33/arch/x86/kernel
set_tls_desc(p, idx, &info, 1);
return 0;
-diff -urNp linux-2.6.32.33/arch/x86/kernel/trampoline_32.S linux-2.6.32.33/arch/x86/kernel/trampoline_32.S
---- linux-2.6.32.33/arch/x86/kernel/trampoline_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/trampoline_32.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/trampoline_32.S linux-2.6.32.35/arch/x86/kernel/trampoline_32.S
+--- linux-2.6.32.35/arch/x86/kernel/trampoline_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/trampoline_32.S 2010-12-31 14:46:53.000000000 -0500
@@ -32,6 +32,12 @@
#include <asm/segment.h>
#include <asm/page_types.h>
@@ -15036,9 +15036,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/trampoline_32.S linux-2.6.32.33/arch/
# These need to be in the same 64K segment as the above;
# hence we don't use the boot_gdt_descr defined in head.S
-diff -urNp linux-2.6.32.33/arch/x86/kernel/trampoline_64.S linux-2.6.32.33/arch/x86/kernel/trampoline_64.S
---- linux-2.6.32.33/arch/x86/kernel/trampoline_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/trampoline_64.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/trampoline_64.S linux-2.6.32.35/arch/x86/kernel/trampoline_64.S
+--- linux-2.6.32.35/arch/x86/kernel/trampoline_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/trampoline_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -91,7 +91,7 @@ startup_32:
movl $__KERNEL_DS, %eax # Initialize the %ds segment register
movl %eax, %ds
@@ -15057,9 +15057,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/trampoline_64.S linux-2.6.32.33/arch/
.long tgdt - r_base
.short 0
.quad 0x00cf9b000000ffff # __KERNEL32_CS
-diff -urNp linux-2.6.32.33/arch/x86/kernel/traps.c linux-2.6.32.33/arch/x86/kernel/traps.c
---- linux-2.6.32.33/arch/x86/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/traps.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/traps.c linux-2.6.32.35/arch/x86/kernel/traps.c
+--- linux-2.6.32.35/arch/x86/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/traps.c 2010-12-31 14:46:53.000000000 -0500
@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
/* Do we ignore FPU interrupts ? */
@@ -15209,9 +15209,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/traps.c linux-2.6.32.33/arch/x86/kern
handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
return;
}
-diff -urNp linux-2.6.32.33/arch/x86/kernel/tsc.c linux-2.6.32.33/arch/x86/kernel/tsc.c
---- linux-2.6.32.33/arch/x86/kernel/tsc.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/kernel/tsc.c 2011-02-22 15:57:23.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/tsc.c linux-2.6.32.35/arch/x86/kernel/tsc.c
+--- linux-2.6.32.35/arch/x86/kernel/tsc.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/arch/x86/kernel/tsc.c 2011-02-22 15:57:23.000000000 -0500
@@ -838,7 +838,7 @@ static struct dmi_system_id __initdata b
DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
},
@@ -15221,9 +15221,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/tsc.c linux-2.6.32.33/arch/x86/kernel
};
static void __init check_system_tsc_reliable(void)
-diff -urNp linux-2.6.32.33/arch/x86/kernel/vm86_32.c linux-2.6.32.33/arch/x86/kernel/vm86_32.c
---- linux-2.6.32.33/arch/x86/kernel/vm86_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/vm86_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/vm86_32.c linux-2.6.32.35/arch/x86/kernel/vm86_32.c
+--- linux-2.6.32.35/arch/x86/kernel/vm86_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/vm86_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,6 +41,7 @@
#include <linux/ptrace.h>
#include <linux/audit.h>
@@ -15288,9 +15288,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/vm86_32.c linux-2.6.32.33/arch/x86/ke
if (get_user(segoffs, intr_ptr))
goto cannot_handle;
if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-2.6.32.33/arch/x86/kernel/vmi_32.c linux-2.6.32.33/arch/x86/kernel/vmi_32.c
---- linux-2.6.32.33/arch/x86/kernel/vmi_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/vmi_32.c 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/vmi_32.c linux-2.6.32.35/arch/x86/kernel/vmi_32.c
+--- linux-2.6.32.35/arch/x86/kernel/vmi_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/vmi_32.c 2010-12-31 14:47:01.000000000 -0500
@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
@@ -15453,9 +15453,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/vmi_32.c linux-2.6.32.33/arch/x86/ker
return;
local_irq_save(flags);
-diff -urNp linux-2.6.32.33/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.33/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.32.33/arch/x86/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/vmlinux.lds.S 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.35/arch/x86/kernel/vmlinux.lds.S
+--- linux-2.6.32.35/arch/x86/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/vmlinux.lds.S 2010-12-31 14:47:01.000000000 -0500
@@ -26,6 +26,13 @@
#include <asm/page_types.h>
#include <asm/cache.h>
@@ -15748,9 +15748,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.33/arch/x8
"kernel image bigger than KERNEL_IMAGE_SIZE");
#ifdef CONFIG_SMP
-diff -urNp linux-2.6.32.33/arch/x86/kernel/vsyscall_64.c linux-2.6.32.33/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.32.33/arch/x86/kernel/vsyscall_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/vsyscall_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/vsyscall_64.c linux-2.6.32.35/arch/x86/kernel/vsyscall_64.c
+--- linux-2.6.32.35/arch/x86/kernel/vsyscall_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/vsyscall_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -15784,9 +15784,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/vsyscall_64.c linux-2.6.32.33/arch/x8
};
#endif
-diff -urNp linux-2.6.32.33/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.33/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.32.33/arch/x86/kernel/x8664_ksyms_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/x8664_ksyms_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.35/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-2.6.32.35/arch/x86/kernel/x8664_ksyms_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/x8664_ksyms_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
EXPORT_SYMBOL(copy_user_generic);
@@ -15796,9 +15796,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.33/arch
EXPORT_SYMBOL(__copy_from_user_inatomic);
EXPORT_SYMBOL(copy_page);
-diff -urNp linux-2.6.32.33/arch/x86/kernel/xsave.c linux-2.6.32.33/arch/x86/kernel/xsave.c
---- linux-2.6.32.33/arch/x86/kernel/xsave.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kernel/xsave.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kernel/xsave.c linux-2.6.32.35/arch/x86/kernel/xsave.c
+--- linux-2.6.32.35/arch/x86/kernel/xsave.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kernel/xsave.c 2010-12-31 14:46:53.000000000 -0500
@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
fx_sw_user->xstate_size > fx_sw_user->extended_size)
return -1;
@@ -15826,9 +15826,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kernel/xsave.c linux-2.6.32.33/arch/x86/kern
buf);
if (unlikely(err)) {
/*
-diff -urNp linux-2.6.32.33/arch/x86/kvm/emulate.c linux-2.6.32.33/arch/x86/kvm/emulate.c
---- linux-2.6.32.33/arch/x86/kvm/emulate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kvm/emulate.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kvm/emulate.c linux-2.6.32.35/arch/x86/kvm/emulate.c
+--- linux-2.6.32.35/arch/x86/kvm/emulate.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kvm/emulate.c 2010-12-31 14:46:53.000000000 -0500
@@ -81,8 +81,8 @@
#define Src2CL (1<<29)
#define Src2ImmByte (2<<29)
@@ -15865,9 +15865,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kvm/emulate.c linux-2.6.32.33/arch/x86/kvm/e
switch ((_dst).bytes) { \
case 1: \
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
-diff -urNp linux-2.6.32.33/arch/x86/kvm/lapic.c linux-2.6.32.33/arch/x86/kvm/lapic.c
---- linux-2.6.32.33/arch/x86/kvm/lapic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/kvm/lapic.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kvm/lapic.c linux-2.6.32.35/arch/x86/kvm/lapic.c
+--- linux-2.6.32.35/arch/x86/kvm/lapic.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/kvm/lapic.c 2010-12-31 14:46:53.000000000 -0500
@@ -52,7 +52,7 @@
#define APIC_BUS_CYCLE_NS 1
@@ -15877,9 +15877,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kvm/lapic.c linux-2.6.32.33/arch/x86/kvm/lap
#define APIC_LVT_NUM 6
/* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-2.6.32.33/arch/x86/kvm/svm.c linux-2.6.32.33/arch/x86/kvm/svm.c
---- linux-2.6.32.33/arch/x86/kvm/svm.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/kvm/svm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kvm/svm.c linux-2.6.32.35/arch/x86/kvm/svm.c
+--- linux-2.6.32.35/arch/x86/kvm/svm.c 2010-11-26 18:22:29.000000000 -0500
++++ linux-2.6.32.35/arch/x86/kvm/svm.c 2010-12-31 14:46:53.000000000 -0500
@@ -2483,9 +2483,12 @@ static int handle_exit(struct kvm_run *k
static void reload_tss(struct kvm_vcpu *vcpu)
{
@@ -15903,9 +15903,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kvm/svm.c linux-2.6.32.33/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.33/arch/x86/kvm/vmx.c linux-2.6.32.33/arch/x86/kvm/vmx.c
---- linux-2.6.32.33/arch/x86/kvm/vmx.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/kvm/vmx.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kvm/vmx.c linux-2.6.32.35/arch/x86/kvm/vmx.c
+--- linux-2.6.32.35/arch/x86/kvm/vmx.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/arch/x86/kvm/vmx.c 2010-12-31 14:46:53.000000000 -0500
@@ -570,7 +570,11 @@ static void reload_tss(void)
kvm_get_gdt(&gdt);
@@ -15987,9 +15987,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kvm/vmx.c linux-2.6.32.33/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.33/arch/x86/kvm/x86.c linux-2.6.32.33/arch/x86/kvm/x86.c
---- linux-2.6.32.33/arch/x86/kvm/x86.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/kvm/x86.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/kvm/x86.c linux-2.6.32.35/arch/x86/kvm/x86.c
+--- linux-2.6.32.35/arch/x86/kvm/x86.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/arch/x86/kvm/x86.c 2010-12-31 14:46:53.000000000 -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);
@@ -16091,9 +16091,9 @@ diff -urNp linux-2.6.32.33/arch/x86/kvm/x86.c linux-2.6.32.33/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.33/arch/x86/lib/checksum_32.S linux-2.6.32.33/arch/x86/lib/checksum_32.S
---- linux-2.6.32.33/arch/x86/lib/checksum_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/lib/checksum_32.S 2011-01-16 20:53:41.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/lib/checksum_32.S linux-2.6.32.35/arch/x86/lib/checksum_32.S
+--- linux-2.6.32.35/arch/x86/lib/checksum_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/lib/checksum_32.S 2011-01-16 20:53:41.000000000 -0500
@@ -28,7 +28,8 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
@@ -16354,9 +16354,9 @@ diff -urNp linux-2.6.32.33/arch/x86/lib/checksum_32.S linux-2.6.32.33/arch/x86/l
#undef ROUND
#undef ROUND1
-diff -urNp linux-2.6.32.33/arch/x86/lib/clear_page_64.S linux-2.6.32.33/arch/x86/lib/clear_page_64.S
---- linux-2.6.32.33/arch/x86/lib/clear_page_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/lib/clear_page_64.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/lib/clear_page_64.S linux-2.6.32.35/arch/x86/lib/clear_page_64.S
+--- linux-2.6.32.35/arch/x86/lib/clear_page_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/lib/clear_page_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -43,7 +43,7 @@ ENDPROC(clear_page)
#include <asm/cpufeature.h>
@@ -16366,9 +16366,9 @@ diff -urNp linux-2.6.32.33/arch/x86/lib/clear_page_64.S linux-2.6.32.33/arch/x86
1: .byte 0xeb /* jmp <disp8> */
.byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.32.33/arch/x86/lib/copy_page_64.S linux-2.6.32.33/arch/x86/lib/copy_page_64.S
---- linux-2.6.32.33/arch/x86/lib/copy_page_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/lib/copy_page_64.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/lib/copy_page_64.S linux-2.6.32.35/arch/x86/lib/copy_page_64.S
+--- linux-2.6.32.35/arch/x86/lib/copy_page_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/lib/copy_page_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -104,7 +104,7 @@ ENDPROC(copy_page)
#include <asm/cpufeature.h>
@@ -16378,9 +16378,9 @@ diff -urNp linux-2.6.32.33/arch/x86/lib/copy_page_64.S linux-2.6.32.33/arch/x86/
1: .byte 0xeb /* jmp <disp8> */
.byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.32.33/arch/x86/lib/copy_user_64.S linux-2.6.32.33/arch/x86/lib/copy_user_64.S
---- linux-2.6.32.33/arch/x86/lib/copy_user_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/lib/copy_user_64.S 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/lib/copy_user_64.S linux-2.6.32.35/arch/x86/lib/copy_user_64.S
+--- linux-2.6.32.35/arch/x86/lib/copy_user_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/lib/copy_user_64.S 2010-12-31 14:47:01.000000000 -0500
@@ -15,13 +15,14 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -16449,9 +16449,9 @@ diff -urNp linux-2.6.32.33/arch/x86/lib/copy_user_64.S linux-2.6.32.33/arch/x86/
movl %edx,%ecx
xorl %eax,%eax
rep
-diff -urNp linux-2.6.32.33/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.33/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.32.33/arch/x86/lib/copy_user_nocache_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/lib/copy_user_nocache_64.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.35/arch/x86/lib/copy_user_nocache_64.S
+--- linux-2.6.32.35/arch/x86/lib/copy_user_nocache_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/lib/copy_user_nocache_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -14,6 +14,7 @@
#include <asm/current.h>
#include <asm/asm-offsets.h>
@@ -16476,9 +16476,9 @@ diff -urNp linux-2.6.32.33/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.33/a
cmpl $8,%edx
jb 20f /* less then 8 bytes, go to byte copy loop */
ALIGN_DESTINATION
-diff -urNp linux-2.6.32.33/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.33/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.32.33/arch/x86/lib/csum-wrappers_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/lib/csum-wrappers_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.35/arch/x86/lib/csum-wrappers_64.c
+--- linux-2.6.32.35/arch/x86/lib/csum-wrappers_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/lib/csum-wrappers_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
len -= 2;
}
@@ -16497,9 +16497,9 @@ diff -urNp linux-2.6.32.33/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.33/arch/
return csum_partial_copy_generic(src, (void __force *)dst,
len, isum, NULL, errp);
}
-diff -urNp linux-2.6.32.33/arch/x86/lib/getuser.S linux-2.6.32.33/arch/x86/lib/getuser.S
---- linux-2.6.32.33/arch/x86/lib/getuser.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/lib/getuser.S 2011-03-12 22:50:36.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/lib/getuser.S linux-2.6.32.35/arch/x86/lib/getuser.S
+--- linux-2.6.32.35/arch/x86/lib/getuser.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/lib/getuser.S 2011-03-12 22:50:36.000000000 -0500
@@ -33,14 +33,35 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -16605,9 +16605,9 @@ diff -urNp linux-2.6.32.33/arch/x86/lib/getuser.S linux-2.6.32.33/arch/x86/lib/g
4: movq -7(%_ASM_AX),%_ASM_DX
xor %eax,%eax
ret
-diff -urNp linux-2.6.32.33/arch/x86/lib/memcpy_64.S linux-2.6.32.33/arch/x86/lib/memcpy_64.S
---- linux-2.6.32.33/arch/x86/lib/memcpy_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/lib/memcpy_64.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/lib/memcpy_64.S linux-2.6.32.35/arch/x86/lib/memcpy_64.S
+--- linux-2.6.32.35/arch/x86/lib/memcpy_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/lib/memcpy_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
* It is also a lot simpler. Use this when possible:
*/
@@ -16617,9 +16617,9 @@ diff -urNp linux-2.6.32.33/arch/x86/lib/memcpy_64.S linux-2.6.32.33/arch/x86/lib
1: .byte 0xeb /* jmp <disp8> */
.byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.32.33/arch/x86/lib/memset_64.S linux-2.6.32.33/arch/x86/lib/memset_64.S
---- linux-2.6.32.33/arch/x86/lib/memset_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/lib/memset_64.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/lib/memset_64.S linux-2.6.32.35/arch/x86/lib/memset_64.S
+--- linux-2.6.32.35/arch/x86/lib/memset_64.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/lib/memset_64.S 2010-12-31 14:46:53.000000000 -0500
@@ -118,7 +118,7 @@ ENDPROC(__memset)
#include <asm/cpufeature.h>
@@ -16629,9 +16629,9 @@ diff -urNp linux-2.6.32.33/arch/x86/lib/memset_64.S linux-2.6.32.33/arch/x86/lib
1: .byte 0xeb /* jmp <disp8> */
.byte (memset_c - memset) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.32.33/arch/x86/lib/mmx_32.c linux-2.6.32.33/arch/x86/lib/mmx_32.c
---- linux-2.6.32.33/arch/x86/lib/mmx_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/lib/mmx_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/lib/mmx_32.c linux-2.6.32.35/arch/x86/lib/mmx_32.c
+--- linux-2.6.32.35/arch/x86/lib/mmx_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/lib/mmx_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
{
void *p;
@@ -16947,9 +16947,9 @@ diff -urNp linux-2.6.32.33/arch/x86/lib/mmx_32.c linux-2.6.32.33/arch/x86/lib/mm
from += 64;
to += 64;
-diff -urNp linux-2.6.32.33/arch/x86/lib/putuser.S linux-2.6.32.33/arch/x86/lib/putuser.S
---- linux-2.6.32.33/arch/x86/lib/putuser.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/lib/putuser.S 2011-03-12 22:50:36.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/lib/putuser.S linux-2.6.32.35/arch/x86/lib/putuser.S
+--- linux-2.6.32.35/arch/x86/lib/putuser.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/lib/putuser.S 2011-03-12 22:50:36.000000000 -0500
@@ -15,7 +15,8 @@
#include <asm/thread_info.h>
#include <asm/errno.h>
@@ -17087,9 +17087,9 @@ diff -urNp linux-2.6.32.33/arch/x86/lib/putuser.S linux-2.6.32.33/arch/x86/lib/p
#endif
xor %eax,%eax
EXIT
-diff -urNp linux-2.6.32.33/arch/x86/lib/usercopy_32.c linux-2.6.32.33/arch/x86/lib/usercopy_32.c
---- linux-2.6.32.33/arch/x86/lib/usercopy_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/lib/usercopy_32.c 2011-03-12 22:50:36.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/lib/usercopy_32.c linux-2.6.32.35/arch/x86/lib/usercopy_32.c
+--- linux-2.6.32.35/arch/x86/lib/usercopy_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/lib/usercopy_32.c 2011-03-12 22:50:36.000000000 -0500
@@ -43,7 +43,7 @@ do { \
__asm__ __volatile__( \
" testl %1,%1\n" \
@@ -17694,9 +17694,9 @@ diff -urNp linux-2.6.32.33/arch/x86/lib/usercopy_32.c linux-2.6.32.33/arch/x86/l
-EXPORT_SYMBOL(copy_from_user);
+EXPORT_SYMBOL(set_fs);
+#endif
-diff -urNp linux-2.6.32.33/arch/x86/lib/usercopy_64.c linux-2.6.32.33/arch/x86/lib/usercopy_64.c
---- linux-2.6.32.33/arch/x86/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/lib/usercopy_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/lib/usercopy_64.c linux-2.6.32.35/arch/x86/lib/usercopy_64.c
+--- linux-2.6.32.35/arch/x86/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/lib/usercopy_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -42,6 +42,8 @@ long
__strncpy_from_user(char *dst, const char __user *src, long count)
{
@@ -17733,9 +17733,9 @@ diff -urNp linux-2.6.32.33/arch/x86/lib/usercopy_64.c linux-2.6.32.33/arch/x86/l
}
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-2.6.32.33/arch/x86/Makefile linux-2.6.32.33/arch/x86/Makefile
---- linux-2.6.32.33/arch/x86/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/Makefile 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/Makefile linux-2.6.32.35/arch/x86/Makefile
+--- linux-2.6.32.35/arch/x86/Makefile 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/Makefile 2010-12-31 14:46:53.000000000 -0500
@@ -189,3 +189,12 @@ define archhelp
echo ' FDARGS="..." arguments for the booted kernel'
echo ' FDINITRD=file initrd for the booted kernel'
@@ -17749,9 +17749,9 @@ diff -urNp linux-2.6.32.33/arch/x86/Makefile linux-2.6.32.33/arch/x86/Makefile
+
+archprepare:
+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-2.6.32.33/arch/x86/mm/extable.c linux-2.6.32.33/arch/x86/mm/extable.c
---- linux-2.6.32.33/arch/x86/mm/extable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/extable.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/extable.c linux-2.6.32.35/arch/x86/mm/extable.c
+--- linux-2.6.32.35/arch/x86/mm/extable.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/extable.c 2010-12-31 14:46:53.000000000 -0500
@@ -1,14 +1,71 @@
#include <linux/module.h>
#include <linux/spinlock.h>
@@ -17825,9 +17825,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/extable.c linux-2.6.32.33/arch/x86/mm/ext
extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
extern u32 pnp_bios_is_utter_crap;
pnp_bios_is_utter_crap = 1;
-diff -urNp linux-2.6.32.33/arch/x86/mm/fault.c linux-2.6.32.33/arch/x86/mm/fault.c
---- linux-2.6.32.33/arch/x86/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/fault.c 2011-03-12 22:50:36.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/fault.c linux-2.6.32.35/arch/x86/mm/fault.c
+--- linux-2.6.32.35/arch/x86/mm/fault.c 2011-03-23 19:00:31.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/fault.c 2011-03-23 19:01:00.000000000 -0400
@@ -11,10 +11,19 @@
#include <linux/kprobes.h> /* __kprobes, ... */
#include <linux/mmiotrace.h> /* kmmio_handler, ... */
@@ -18109,7 +18109,7 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/fault.c linux-2.6.32.33/arch/x86/mm/fault
/* User mode accesses just cause a SIGSEGV */
if (error_code & PF_USER) {
-@@ -850,6 +999,99 @@ static int spurious_fault_check(unsigned
+@@ -857,6 +1006,99 @@ static int spurious_fault_check(unsigned
return 1;
}
@@ -18209,7 +18209,7 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/fault.c linux-2.6.32.33/arch/x86/mm/fault
/*
* Handle a spurious fault caused by a stale TLB entry.
*
-@@ -916,6 +1158,9 @@ int show_unhandled_signals = 1;
+@@ -923,6 +1165,9 @@ int show_unhandled_signals = 1;
static inline int
access_error(unsigned long error_code, int write, struct vm_area_struct *vma)
{
@@ -18219,7 +18219,7 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/fault.c linux-2.6.32.33/arch/x86/mm/fault
if (write) {
/* write, present and write, not present: */
if (unlikely(!(vma->vm_flags & VM_WRITE)))
-@@ -949,17 +1194,31 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -956,17 +1201,31 @@ do_page_fault(struct pt_regs *regs, unsi
{
struct vm_area_struct *vma;
struct task_struct *tsk;
@@ -18255,7 +18255,7 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/fault.c linux-2.6.32.33/arch/x86/mm/fault
/*
* Detect and handle instructions that would cause a page fault for
* both a tracked kernel page and a userspace page.
-@@ -1019,7 +1278,7 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1026,7 +1285,7 @@ do_page_fault(struct pt_regs *regs, unsi
* User-mode registers count as a user access even for any
* potential system fault or CPU buglet:
*/
@@ -18264,7 +18264,7 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/fault.c linux-2.6.32.33/arch/x86/mm/fault
local_irq_enable();
error_code |= PF_USER;
} else {
-@@ -1073,6 +1332,11 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1080,6 +1339,11 @@ do_page_fault(struct pt_regs *regs, unsi
might_sleep();
}
@@ -18276,7 +18276,7 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/fault.c linux-2.6.32.33/arch/x86/mm/fault
vma = find_vma(mm, address);
if (unlikely(!vma)) {
bad_area(regs, error_code, address);
-@@ -1084,18 +1348,24 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1091,18 +1355,24 @@ do_page_fault(struct pt_regs *regs, unsi
bad_area(regs, error_code, address);
return;
}
@@ -18312,7 +18312,7 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/fault.c linux-2.6.32.33/arch/x86/mm/fault
if (unlikely(expand_stack(vma, address))) {
bad_area(regs, error_code, address);
return;
-@@ -1139,3 +1409,199 @@ good_area:
+@@ -1146,3 +1416,199 @@ good_area:
up_read(&mm->mmap_sem);
}
@@ -18512,9 +18512,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/fault.c linux-2.6.32.33/arch/x86/mm/fault
+
+ return ret ? -EFAULT : 0;
+}
-diff -urNp linux-2.6.32.33/arch/x86/mm/gup.c linux-2.6.32.33/arch/x86/mm/gup.c
---- linux-2.6.32.33/arch/x86/mm/gup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/gup.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/gup.c linux-2.6.32.35/arch/x86/mm/gup.c
+--- linux-2.6.32.35/arch/x86/mm/gup.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/gup.c 2010-12-31 14:46:53.000000000 -0500
@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
addr = start;
len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -18524,9 +18524,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/gup.c linux-2.6.32.33/arch/x86/mm/gup.c
(void __user *)start, len)))
return 0;
-diff -urNp linux-2.6.32.33/arch/x86/mm/highmem_32.c linux-2.6.32.33/arch/x86/mm/highmem_32.c
---- linux-2.6.32.33/arch/x86/mm/highmem_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/highmem_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/highmem_32.c linux-2.6.32.35/arch/x86/mm/highmem_32.c
+--- linux-2.6.32.35/arch/x86/mm/highmem_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/highmem_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
idx = type + KM_TYPE_NR*smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -18538,9 +18538,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/highmem_32.c linux-2.6.32.33/arch/x86/mm/
return (void *)vaddr;
}
-diff -urNp linux-2.6.32.33/arch/x86/mm/hugetlbpage.c linux-2.6.32.33/arch/x86/mm/hugetlbpage.c
---- linux-2.6.32.33/arch/x86/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/hugetlbpage.c 2011-03-21 17:34:54.000000000 -0400
+diff -urNp linux-2.6.32.35/arch/x86/mm/hugetlbpage.c linux-2.6.32.35/arch/x86/mm/hugetlbpage.c
+--- linux-2.6.32.35/arch/x86/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/hugetlbpage.c 2011-03-21 17:34:54.000000000 -0400
@@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmappe
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
@@ -18748,9 +18748,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/hugetlbpage.c linux-2.6.32.33/arch/x86/mm
return addr;
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.32.33/arch/x86/mm/init_32.c linux-2.6.32.33/arch/x86/mm/init_32.c
---- linux-2.6.32.33/arch/x86/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/init_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/init_32.c linux-2.6.32.35/arch/x86/mm/init_32.c
+--- linux-2.6.32.35/arch/x86/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/init_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
}
@@ -19054,9 +19054,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/init_32.c linux-2.6.32.33/arch/x86/mm/ini
set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
printk(KERN_INFO "Write protecting the kernel text: %luk\n",
size >> 10);
-diff -urNp linux-2.6.32.33/arch/x86/mm/init_64.c linux-2.6.32.33/arch/x86/mm/init_64.c
---- linux-2.6.32.33/arch/x86/mm/init_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/init_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/init_64.c linux-2.6.32.35/arch/x86/mm/init_64.c
+--- linux-2.6.32.35/arch/x86/mm/init_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/init_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
pmd = fill_pmd(pud, vaddr);
pte = fill_pte(pmd, vaddr);
@@ -19117,9 +19117,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/init_64.c linux-2.6.32.33/arch/x86/mm/ini
return "[vdso]";
if (vma == &gate_vma)
return "[vsyscall]";
-diff -urNp linux-2.6.32.33/arch/x86/mm/init.c linux-2.6.32.33/arch/x86/mm/init.c
---- linux-2.6.32.33/arch/x86/mm/init.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/init.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/init.c linux-2.6.32.35/arch/x86/mm/init.c
+--- linux-2.6.32.35/arch/x86/mm/init.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/init.c 2010-12-31 14:46:53.000000000 -0500
@@ -69,11 +69,7 @@ static void __init find_early_table_spac
* cause a hotspot and fill up ZONE_DMA. The page tables
* need roughly 0.5KB per GB.
@@ -19244,9 +19244,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/init.c linux-2.6.32.33/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.33/arch/x86/mm/iomap_32.c linux-2.6.32.33/arch/x86/mm/iomap_32.c
---- linux-2.6.32.33/arch/x86/mm/iomap_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/iomap_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/iomap_32.c linux-2.6.32.35/arch/x86/mm/iomap_32.c
+--- linux-2.6.32.35/arch/x86/mm/iomap_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/iomap_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
debug_kmap_atomic(type);
idx = type + KM_TYPE_NR * smp_processor_id();
@@ -19259,9 +19259,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/iomap_32.c linux-2.6.32.33/arch/x86/mm/io
arch_flush_lazy_mmu_mode();
return (void *)vaddr;
-diff -urNp linux-2.6.32.33/arch/x86/mm/ioremap.c linux-2.6.32.33/arch/x86/mm/ioremap.c
---- linux-2.6.32.33/arch/x86/mm/ioremap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/ioremap.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/ioremap.c linux-2.6.32.35/arch/x86/mm/ioremap.c
+--- linux-2.6.32.35/arch/x86/mm/ioremap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/ioremap.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
* Second special case: Some BIOSen report the PC BIOS
* area (640->1Mb) as ram even though it is not.
@@ -19308,9 +19308,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/ioremap.c linux-2.6.32.33/arch/x86/mm/ior
/*
* The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-2.6.32.33/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.33/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.32.33/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/kmemcheck/kmemcheck.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.35/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-2.6.32.35/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/kmemcheck/kmemcheck.c 2010-12-31 14:46:53.000000000 -0500
@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
* memory (e.g. tracked pages)? For now, we need this to avoid
* invoking kmemcheck for PnP BIOS calls.
@@ -19323,9 +19323,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.33/arc
return false;
pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-2.6.32.33/arch/x86/mm/mmap.c linux-2.6.32.33/arch/x86/mm/mmap.c
---- linux-2.6.32.33/arch/x86/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/mmap.c linux-2.6.32.35/arch/x86/mm/mmap.c
+--- linux-2.6.32.35/arch/x86/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/mmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
* Leave an at least ~128 MB hole with possible stack randomization.
*/
@@ -19407,9 +19407,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/mmap.c linux-2.6.32.33/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.33/arch/x86/mm/numa_32.c linux-2.6.32.33/arch/x86/mm/numa_32.c
---- linux-2.6.32.33/arch/x86/mm/numa_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/numa_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/numa_32.c linux-2.6.32.35/arch/x86/mm/numa_32.c
+--- linux-2.6.32.35/arch/x86/mm/numa_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/numa_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
}
#endif
@@ -19418,9 +19418,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/numa_32.c linux-2.6.32.33/arch/x86/mm/num
extern unsigned long highend_pfn, highstart_pfn;
#define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
-diff -urNp linux-2.6.32.33/arch/x86/mm/pageattr.c linux-2.6.32.33/arch/x86/mm/pageattr.c
---- linux-2.6.32.33/arch/x86/mm/pageattr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/pageattr.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/pageattr.c linux-2.6.32.35/arch/x86/mm/pageattr.c
+--- linux-2.6.32.35/arch/x86/mm/pageattr.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/pageattr.c 2010-12-31 14:46:53.000000000 -0500
@@ -261,16 +261,17 @@ static inline pgprot_t static_protection
* PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
*/
@@ -19497,9 +19497,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/pageattr.c linux-2.6.32.33/arch/x86/mm/pa
}
static int
-diff -urNp linux-2.6.32.33/arch/x86/mm/pageattr-test.c linux-2.6.32.33/arch/x86/mm/pageattr-test.c
---- linux-2.6.32.33/arch/x86/mm/pageattr-test.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/pageattr-test.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/pageattr-test.c linux-2.6.32.35/arch/x86/mm/pageattr-test.c
+--- linux-2.6.32.35/arch/x86/mm/pageattr-test.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/pageattr-test.c 2010-12-31 14:46:53.000000000 -0500
@@ -36,7 +36,7 @@ enum {
static int pte_testbit(pte_t pte)
@@ -19509,9 +19509,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/pageattr-test.c linux-2.6.32.33/arch/x86/
}
struct split_state {
-diff -urNp linux-2.6.32.33/arch/x86/mm/pat.c linux-2.6.32.33/arch/x86/mm/pat.c
---- linux-2.6.32.33/arch/x86/mm/pat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/pat.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/pat.c linux-2.6.32.35/arch/x86/mm/pat.c
+--- linux-2.6.32.35/arch/x86/mm/pat.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/pat.c 2010-12-31 14:46:53.000000000 -0500
@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
conflict:
@@ -19559,9 +19559,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/pat.c linux-2.6.32.33/arch/x86/mm/pat.c
cattr_name(want_flags),
(unsigned long long)paddr,
(unsigned long long)(paddr + size),
-diff -urNp linux-2.6.32.33/arch/x86/mm/pgtable_32.c linux-2.6.32.33/arch/x86/mm/pgtable_32.c
---- linux-2.6.32.33/arch/x86/mm/pgtable_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/pgtable_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/pgtable_32.c linux-2.6.32.35/arch/x86/mm/pgtable_32.c
+--- linux-2.6.32.35/arch/x86/mm/pgtable_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/pgtable_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
return;
}
@@ -19576,9 +19576,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/pgtable_32.c linux-2.6.32.33/arch/x86/mm/
/*
* It's enough to flush this one mapping.
-diff -urNp linux-2.6.32.33/arch/x86/mm/pgtable.c linux-2.6.32.33/arch/x86/mm/pgtable.c
---- linux-2.6.32.33/arch/x86/mm/pgtable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/pgtable.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/pgtable.c linux-2.6.32.35/arch/x86/mm/pgtable.c
+--- linux-2.6.32.35/arch/x86/mm/pgtable.c 2011-03-23 19:00:31.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/pgtable.c 2011-03-23 19:01:00.000000000 -0400
@@ -83,8 +83,58 @@ static inline void pgd_list_del(pgd_t *p
list_del(&page->lru);
}
@@ -19666,9 +19666,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/pgtable.c linux-2.6.32.33/arch/x86/mm/pgt
void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
{
-@@ -162,36 +213,38 @@ void pud_populate(struct mm_struct *mm,
- if (mm == current->active_mm)
- write_cr3(read_cr3());
+@@ -161,36 +212,38 @@ void pud_populate(struct mm_struct *mm,
+ */
+ flush_tlb_mm(mm);
}
+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
+#define PREALLOCATED_PXDS USER_PGD_PTRS
@@ -19716,7 +19716,7 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/pgtable.c linux-2.6.32.33/arch/x86/mm/pgt
return -ENOMEM;
}
-@@ -204,51 +257,56 @@ static int preallocate_pmds(pmd_t *pmds[
+@@ -203,51 +256,56 @@ static int preallocate_pmds(pmd_t *pmds[
* preallocate which never got a corresponding vma will need to be
* freed manually.
*/
@@ -19790,7 +19790,7 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/pgtable.c linux-2.6.32.33/arch/x86/mm/pgt
unsigned long flags;
pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
-@@ -258,11 +316,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -257,11 +315,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
mm->pgd = pgd;
@@ -19804,7 +19804,7 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/pgtable.c linux-2.6.32.33/arch/x86/mm/pgt
/*
* Make sure that pre-populating the pmds is atomic with
-@@ -272,14 +330,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -271,14 +329,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
spin_lock_irqsave(&pgd_lock, flags);
pgd_ctor(pgd);
@@ -19822,7 +19822,7 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/pgtable.c linux-2.6.32.33/arch/x86/mm/pgt
out_free_pgd:
free_page((unsigned long)pgd);
out:
-@@ -288,7 +346,7 @@ out:
+@@ -287,7 +345,7 @@ out:
void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{
@@ -19831,9 +19831,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/pgtable.c linux-2.6.32.33/arch/x86/mm/pgt
pgd_dtor(pgd);
paravirt_pgd_free(mm, pgd);
free_page((unsigned long)pgd);
-diff -urNp linux-2.6.32.33/arch/x86/mm/setup_nx.c linux-2.6.32.33/arch/x86/mm/setup_nx.c
---- linux-2.6.32.33/arch/x86/mm/setup_nx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/setup_nx.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/setup_nx.c linux-2.6.32.35/arch/x86/mm/setup_nx.c
+--- linux-2.6.32.35/arch/x86/mm/setup_nx.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/setup_nx.c 2010-12-31 14:46:53.000000000 -0500
@@ -4,11 +4,10 @@
#include <asm/pgtable.h>
@@ -19899,9 +19899,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/setup_nx.c linux-2.6.32.33/arch/x86/mm/se
__supported_pte_mask &= ~_PAGE_NX;
}
#endif
-diff -urNp linux-2.6.32.33/arch/x86/mm/tlb.c linux-2.6.32.33/arch/x86/mm/tlb.c
---- linux-2.6.32.33/arch/x86/mm/tlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/mm/tlb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/mm/tlb.c linux-2.6.32.35/arch/x86/mm/tlb.c
+--- linux-2.6.32.35/arch/x86/mm/tlb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/mm/tlb.c 2010-12-31 14:46:53.000000000 -0500
@@ -12,7 +12,7 @@
#include <asm/uv/uv.h>
@@ -19923,9 +19923,9 @@ diff -urNp linux-2.6.32.33/arch/x86/mm/tlb.c linux-2.6.32.33/arch/x86/mm/tlb.c
}
EXPORT_SYMBOL_GPL(leave_mm);
-diff -urNp linux-2.6.32.33/arch/x86/oprofile/backtrace.c linux-2.6.32.33/arch/x86/oprofile/backtrace.c
---- linux-2.6.32.33/arch/x86/oprofile/backtrace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/oprofile/backtrace.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/oprofile/backtrace.c linux-2.6.32.35/arch/x86/oprofile/backtrace.c
+--- linux-2.6.32.35/arch/x86/oprofile/backtrace.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/oprofile/backtrace.c 2010-12-31 14:46:53.000000000 -0500
@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
struct frame_head bufhead[2];
@@ -19944,9 +19944,9 @@ diff -urNp linux-2.6.32.33/arch/x86/oprofile/backtrace.c linux-2.6.32.33/arch/x8
unsigned long stack = kernel_stack_pointer(regs);
if (depth)
dump_trace(NULL, regs, (unsigned long *)stack, 0,
-diff -urNp linux-2.6.32.33/arch/x86/oprofile/op_model_p4.c linux-2.6.32.33/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.32.33/arch/x86/oprofile/op_model_p4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/oprofile/op_model_p4.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/oprofile/op_model_p4.c linux-2.6.32.35/arch/x86/oprofile/op_model_p4.c
+--- linux-2.6.32.35/arch/x86/oprofile/op_model_p4.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/oprofile/op_model_p4.c 2010-12-31 14:46:53.000000000 -0500
@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
#endif
}
@@ -19956,9 +19956,9 @@ diff -urNp linux-2.6.32.33/arch/x86/oprofile/op_model_p4.c linux-2.6.32.33/arch/
{
#ifdef CONFIG_SMP
return smp_num_siblings == 2 ? 2 : 1;
-diff -urNp linux-2.6.32.33/arch/x86/pci/common.c linux-2.6.32.33/arch/x86/pci/common.c
---- linux-2.6.32.33/arch/x86/pci/common.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/pci/common.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/pci/common.c linux-2.6.32.35/arch/x86/pci/common.c
+--- linux-2.6.32.35/arch/x86/pci/common.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/pci/common.c 2010-12-31 14:46:53.000000000 -0500
@@ -31,8 +31,8 @@ int noioapicreroute = 1;
int pcibios_last_bus = -1;
unsigned long pirq_table_addr;
@@ -19979,9 +19979,9 @@ diff -urNp linux-2.6.32.33/arch/x86/pci/common.c linux-2.6.32.33/arch/x86/pci/co
};
void __init dmi_check_pciprobe(void)
-diff -urNp linux-2.6.32.33/arch/x86/pci/direct.c linux-2.6.32.33/arch/x86/pci/direct.c
---- linux-2.6.32.33/arch/x86/pci/direct.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/pci/direct.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/pci/direct.c linux-2.6.32.35/arch/x86/pci/direct.c
+--- linux-2.6.32.35/arch/x86/pci/direct.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/pci/direct.c 2010-12-31 14:46:53.000000000 -0500
@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
#undef PCI_CONF1_ADDRESS
@@ -20009,9 +20009,9 @@ diff -urNp linux-2.6.32.33/arch/x86/pci/direct.c linux-2.6.32.33/arch/x86/pci/di
{
u32 x = 0;
int year, devfn;
-diff -urNp linux-2.6.32.33/arch/x86/pci/fixup.c linux-2.6.32.33/arch/x86/pci/fixup.c
---- linux-2.6.32.33/arch/x86/pci/fixup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/pci/fixup.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/pci/fixup.c linux-2.6.32.35/arch/x86/pci/fixup.c
+--- linux-2.6.32.35/arch/x86/pci/fixup.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/pci/fixup.c 2010-12-31 14:46:53.000000000 -0500
@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
},
@@ -20030,9 +20030,9 @@ diff -urNp linux-2.6.32.33/arch/x86/pci/fixup.c linux-2.6.32.33/arch/x86/pci/fix
};
static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
-diff -urNp linux-2.6.32.33/arch/x86/pci/irq.c linux-2.6.32.33/arch/x86/pci/irq.c
---- linux-2.6.32.33/arch/x86/pci/irq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/pci/irq.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/pci/irq.c linux-2.6.32.35/arch/x86/pci/irq.c
+--- linux-2.6.32.35/arch/x86/pci/irq.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/pci/irq.c 2010-12-31 14:46:53.000000000 -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) },
@@ -20051,9 +20051,9 @@ diff -urNp linux-2.6.32.33/arch/x86/pci/irq.c linux-2.6.32.33/arch/x86/pci/irq.c
};
int __init pcibios_irq_init(void)
-diff -urNp linux-2.6.32.33/arch/x86/pci/mmconfig_32.c linux-2.6.32.33/arch/x86/pci/mmconfig_32.c
---- linux-2.6.32.33/arch/x86/pci/mmconfig_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/pci/mmconfig_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/pci/mmconfig_32.c linux-2.6.32.35/arch/x86/pci/mmconfig_32.c
+--- linux-2.6.32.35/arch/x86/pci/mmconfig_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/pci/mmconfig_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -20063,9 +20063,9 @@ diff -urNp linux-2.6.32.33/arch/x86/pci/mmconfig_32.c linux-2.6.32.33/arch/x86/p
.read = pci_mmcfg_read,
.write = pci_mmcfg_write,
};
-diff -urNp linux-2.6.32.33/arch/x86/pci/mmconfig_64.c linux-2.6.32.33/arch/x86/pci/mmconfig_64.c
---- linux-2.6.32.33/arch/x86/pci/mmconfig_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/pci/mmconfig_64.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/pci/mmconfig_64.c linux-2.6.32.35/arch/x86/pci/mmconfig_64.c
+--- linux-2.6.32.35/arch/x86/pci/mmconfig_64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/pci/mmconfig_64.c 2010-12-31 14:46:53.000000000 -0500
@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -20075,9 +20075,9 @@ diff -urNp linux-2.6.32.33/arch/x86/pci/mmconfig_64.c linux-2.6.32.33/arch/x86/p
.read = pci_mmcfg_read,
.write = pci_mmcfg_write,
};
-diff -urNp linux-2.6.32.33/arch/x86/pci/numaq_32.c linux-2.6.32.33/arch/x86/pci/numaq_32.c
---- linux-2.6.32.33/arch/x86/pci/numaq_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/pci/numaq_32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/pci/numaq_32.c linux-2.6.32.35/arch/x86/pci/numaq_32.c
+--- linux-2.6.32.35/arch/x86/pci/numaq_32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/pci/numaq_32.c 2010-12-31 14:46:53.000000000 -0500
@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
#undef PCI_CONF1_MQ_ADDRESS
@@ -20087,9 +20087,9 @@ diff -urNp linux-2.6.32.33/arch/x86/pci/numaq_32.c linux-2.6.32.33/arch/x86/pci/
.read = pci_conf1_mq_read,
.write = pci_conf1_mq_write
};
-diff -urNp linux-2.6.32.33/arch/x86/pci/olpc.c linux-2.6.32.33/arch/x86/pci/olpc.c
---- linux-2.6.32.33/arch/x86/pci/olpc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/pci/olpc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/pci/olpc.c linux-2.6.32.35/arch/x86/pci/olpc.c
+--- linux-2.6.32.35/arch/x86/pci/olpc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/pci/olpc.c 2010-12-31 14:46:53.000000000 -0500
@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
return 0;
}
@@ -20099,9 +20099,9 @@ diff -urNp linux-2.6.32.33/arch/x86/pci/olpc.c linux-2.6.32.33/arch/x86/pci/olpc
.read = pci_olpc_read,
.write = pci_olpc_write,
};
-diff -urNp linux-2.6.32.33/arch/x86/pci/pcbios.c linux-2.6.32.33/arch/x86/pci/pcbios.c
---- linux-2.6.32.33/arch/x86/pci/pcbios.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/pci/pcbios.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/pci/pcbios.c linux-2.6.32.35/arch/x86/pci/pcbios.c
+--- linux-2.6.32.35/arch/x86/pci/pcbios.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/pci/pcbios.c 2010-12-31 14:46:53.000000000 -0500
@@ -56,50 +56,93 @@ union bios32 {
static struct {
unsigned long address;
@@ -20424,9 +20424,9 @@ diff -urNp linux-2.6.32.33/arch/x86/pci/pcbios.c linux-2.6.32.33/arch/x86/pci/pc
return !(ret & 0xff00);
}
EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-2.6.32.33/arch/x86/power/cpu.c linux-2.6.32.33/arch/x86/power/cpu.c
---- linux-2.6.32.33/arch/x86/power/cpu.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/power/cpu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/power/cpu.c linux-2.6.32.35/arch/x86/power/cpu.c
+--- linux-2.6.32.35/arch/x86/power/cpu.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.35/arch/x86/power/cpu.c 2010-12-31 14:46:53.000000000 -0500
@@ -129,7 +129,7 @@ static void do_fpu_end(void)
static void fix_processor_context(void)
{
@@ -20446,9 +20446,9 @@ diff -urNp linux-2.6.32.33/arch/x86/power/cpu.c linux-2.6.32.33/arch/x86/power/c
syscall_init(); /* This sets MSR_*STAR and related */
#endif
-diff -urNp linux-2.6.32.33/arch/x86/vdso/Makefile linux-2.6.32.33/arch/x86/vdso/Makefile
---- linux-2.6.32.33/arch/x86/vdso/Makefile 2011-01-11 23:55:35.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/vdso/Makefile 2011-01-11 23:56:03.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/vdso/Makefile linux-2.6.32.35/arch/x86/vdso/Makefile
+--- linux-2.6.32.35/arch/x86/vdso/Makefile 2011-01-11 23:55:35.000000000 -0500
++++ linux-2.6.32.35/arch/x86/vdso/Makefile 2011-01-11 23:56:03.000000000 -0500
@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -20458,9 +20458,9 @@ diff -urNp linux-2.6.32.33/arch/x86/vdso/Makefile linux-2.6.32.33/arch/x86/vdso/
GCOV_PROFILE := n
#
-diff -urNp linux-2.6.32.33/arch/x86/vdso/vclock_gettime.c linux-2.6.32.33/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.32.33/arch/x86/vdso/vclock_gettime.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/vdso/vclock_gettime.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/vdso/vclock_gettime.c linux-2.6.32.35/arch/x86/vdso/vclock_gettime.c
+--- linux-2.6.32.35/arch/x86/vdso/vclock_gettime.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/vdso/vclock_gettime.c 2010-12-31 14:46:53.000000000 -0500
@@ -22,24 +22,48 @@
#include <asm/hpet.h>
#include <asm/unistd.h>
@@ -20559,9 +20559,9 @@ diff -urNp linux-2.6.32.33/arch/x86/vdso/vclock_gettime.c linux-2.6.32.33/arch/x
}
int gettimeofday(struct timeval *, struct timezone *)
__attribute__((weak, alias("__vdso_gettimeofday")));
-diff -urNp linux-2.6.32.33/arch/x86/vdso/vdso32-setup.c linux-2.6.32.33/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.32.33/arch/x86/vdso/vdso32-setup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/vdso/vdso32-setup.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/vdso/vdso32-setup.c linux-2.6.32.35/arch/x86/vdso/vdso32-setup.c
+--- linux-2.6.32.35/arch/x86/vdso/vdso32-setup.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/vdso/vdso32-setup.c 2010-12-31 14:46:53.000000000 -0500
@@ -25,6 +25,7 @@
#include <asm/tlbflush.h>
#include <asm/vdso.h>
@@ -20662,9 +20662,9 @@ diff -urNp linux-2.6.32.33/arch/x86/vdso/vdso32-setup.c linux-2.6.32.33/arch/x86
return &gate_vma;
return NULL;
}
-diff -urNp linux-2.6.32.33/arch/x86/vdso/vdso.lds.S linux-2.6.32.33/arch/x86/vdso/vdso.lds.S
---- linux-2.6.32.33/arch/x86/vdso/vdso.lds.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/vdso/vdso.lds.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/vdso/vdso.lds.S linux-2.6.32.35/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.32.35/arch/x86/vdso/vdso.lds.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/vdso/vdso.lds.S 2010-12-31 14:46:53.000000000 -0500
@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
#define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
#include "vextern.h"
@@ -20675,9 +20675,9 @@ diff -urNp linux-2.6.32.33/arch/x86/vdso/vdso.lds.S linux-2.6.32.33/arch/x86/vds
+VEXTERN(fallback_time)
+VEXTERN(getcpu)
+#undef VEXTERN
-diff -urNp linux-2.6.32.33/arch/x86/vdso/vextern.h linux-2.6.32.33/arch/x86/vdso/vextern.h
---- linux-2.6.32.33/arch/x86/vdso/vextern.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/vdso/vextern.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/vdso/vextern.h linux-2.6.32.35/arch/x86/vdso/vextern.h
+--- linux-2.6.32.35/arch/x86/vdso/vextern.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/vdso/vextern.h 2010-12-31 14:46:53.000000000 -0500
@@ -11,6 +11,5 @@
put into vextern.h and be referenced as a pointer with vdso prefix.
The main kernel later fills in the values. */
@@ -20685,9 +20685,9 @@ diff -urNp linux-2.6.32.33/arch/x86/vdso/vextern.h linux-2.6.32.33/arch/x86/vdso
-VEXTERN(jiffies)
VEXTERN(vgetcpu_mode)
VEXTERN(vsyscall_gtod_data)
-diff -urNp linux-2.6.32.33/arch/x86/vdso/vma.c linux-2.6.32.33/arch/x86/vdso/vma.c
---- linux-2.6.32.33/arch/x86/vdso/vma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/vdso/vma.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/vdso/vma.c linux-2.6.32.35/arch/x86/vdso/vma.c
+--- linux-2.6.32.35/arch/x86/vdso/vma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/vdso/vma.c 2010-12-31 14:46:53.000000000 -0500
@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
if (!vbase)
goto oom;
@@ -20734,9 +20734,9 @@ diff -urNp linux-2.6.32.33/arch/x86/vdso/vma.c linux-2.6.32.33/arch/x86/vdso/vma
- return 0;
-}
-__setup("vdso=", vdso_setup);
-diff -urNp linux-2.6.32.33/arch/x86/xen/enlighten.c linux-2.6.32.33/arch/x86/xen/enlighten.c
---- linux-2.6.32.33/arch/x86/xen/enlighten.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/xen/enlighten.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/xen/enlighten.c linux-2.6.32.35/arch/x86/xen/enlighten.c
+--- linux-2.6.32.35/arch/x86/xen/enlighten.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/arch/x86/xen/enlighten.c 2010-12-31 14:46:53.000000000 -0500
@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
struct shared_info xen_dummy_shared_info;
@@ -20792,9 +20792,9 @@ diff -urNp linux-2.6.32.33/arch/x86/xen/enlighten.c linux-2.6.32.33/arch/x86/xen
xen_smp_init();
pgd = (pgd_t *)xen_start_info->pt_base;
-diff -urNp linux-2.6.32.33/arch/x86/xen/mmu.c linux-2.6.32.33/arch/x86/xen/mmu.c
---- linux-2.6.32.33/arch/x86/xen/mmu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/xen/mmu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/xen/mmu.c linux-2.6.32.35/arch/x86/xen/mmu.c
+--- linux-2.6.32.35/arch/x86/xen/mmu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/xen/mmu.c 2010-12-31 14:46:53.000000000 -0500
@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable
convert_pfn_mfn(init_level4_pgt);
convert_pfn_mfn(level3_ident_pgt);
@@ -20815,9 +20815,9 @@ diff -urNp linux-2.6.32.33/arch/x86/xen/mmu.c linux-2.6.32.33/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.33/arch/x86/xen/smp.c linux-2.6.32.33/arch/x86/xen/smp.c
---- linux-2.6.32.33/arch/x86/xen/smp.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.33/arch/x86/xen/smp.c 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/xen/smp.c linux-2.6.32.35/arch/x86/xen/smp.c
+--- linux-2.6.32.35/arch/x86/xen/smp.c 2010-11-26 18:22:29.000000000 -0500
++++ linux-2.6.32.35/arch/x86/xen/smp.c 2010-12-31 14:47:01.000000000 -0500
@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
{
BUG_ON(smp_processor_id() != 0);
@@ -20846,9 +20846,9 @@ diff -urNp linux-2.6.32.33/arch/x86/xen/smp.c linux-2.6.32.33/arch/x86/xen/smp.c
#else
ctxt->gs_base_kernel = per_cpu_offset(cpu);
#endif
-diff -urNp linux-2.6.32.33/arch/x86/xen/xen-head.S linux-2.6.32.33/arch/x86/xen/xen-head.S
---- linux-2.6.32.33/arch/x86/xen/xen-head.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/xen/xen-head.S 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/xen/xen-head.S linux-2.6.32.35/arch/x86/xen/xen-head.S
+--- linux-2.6.32.35/arch/x86/xen/xen-head.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/xen/xen-head.S 2010-12-31 14:46:53.000000000 -0500
@@ -19,6 +19,17 @@ ENTRY(startup_xen)
#ifdef CONFIG_X86_32
mov %esi,xen_start_info
@@ -20867,9 +20867,9 @@ diff -urNp linux-2.6.32.33/arch/x86/xen/xen-head.S linux-2.6.32.33/arch/x86/xen/
#else
mov %rsi,xen_start_info
mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-2.6.32.33/arch/x86/xen/xen-ops.h linux-2.6.32.33/arch/x86/xen/xen-ops.h
---- linux-2.6.32.33/arch/x86/xen/xen-ops.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/arch/x86/xen/xen-ops.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/arch/x86/xen/xen-ops.h linux-2.6.32.35/arch/x86/xen/xen-ops.h
+--- linux-2.6.32.35/arch/x86/xen/xen-ops.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/arch/x86/xen/xen-ops.h 2010-12-31 14:46:53.000000000 -0500
@@ -10,8 +10,6 @@
extern const char xen_hypervisor_callback[];
extern const char xen_failsafe_callback[];
@@ -20879,9 +20879,9 @@ diff -urNp linux-2.6.32.33/arch/x86/xen/xen-ops.h linux-2.6.32.33/arch/x86/xen/x
struct trap_info;
void xen_copy_trap_info(struct trap_info *traps);
-diff -urNp linux-2.6.32.33/block/blk-integrity.c linux-2.6.32.33/block/blk-integrity.c
---- linux-2.6.32.33/block/blk-integrity.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/block/blk-integrity.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/block/blk-integrity.c linux-2.6.32.35/block/blk-integrity.c
+--- linux-2.6.32.35/block/blk-integrity.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/block/blk-integrity.c 2010-12-31 14:46:53.000000000 -0500
@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
NULL,
};
@@ -20891,9 +20891,9 @@ diff -urNp linux-2.6.32.33/block/blk-integrity.c linux-2.6.32.33/block/blk-integ
.show = &integrity_attr_show,
.store = &integrity_attr_store,
};
-diff -urNp linux-2.6.32.33/block/blk-iopoll.c linux-2.6.32.33/block/blk-iopoll.c
---- linux-2.6.32.33/block/blk-iopoll.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/block/blk-iopoll.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/block/blk-iopoll.c linux-2.6.32.35/block/blk-iopoll.c
+--- linux-2.6.32.35/block/blk-iopoll.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/block/blk-iopoll.c 2010-12-31 14:46:53.000000000 -0500
@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
}
EXPORT_SYMBOL(blk_iopoll_complete);
@@ -20903,9 +20903,9 @@ diff -urNp linux-2.6.32.33/block/blk-iopoll.c linux-2.6.32.33/block/blk-iopoll.c
{
struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-2.6.32.33/block/blk-map.c linux-2.6.32.33/block/blk-map.c
---- linux-2.6.32.33/block/blk-map.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/block/blk-map.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/block/blk-map.c linux-2.6.32.35/block/blk-map.c
+--- linux-2.6.32.35/block/blk-map.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/block/blk-map.c 2010-12-31 14:46:53.000000000 -0500
@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
* direct dma. else, set up kernel bounce buffers
*/
@@ -20934,9 +20934,9 @@ diff -urNp linux-2.6.32.33/block/blk-map.c linux-2.6.32.33/block/blk-map.c
if (do_copy)
bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
else
-diff -urNp linux-2.6.32.33/block/blk-softirq.c linux-2.6.32.33/block/blk-softirq.c
---- linux-2.6.32.33/block/blk-softirq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/block/blk-softirq.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/block/blk-softirq.c linux-2.6.32.35/block/blk-softirq.c
+--- linux-2.6.32.35/block/blk-softirq.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/block/blk-softirq.c 2010-12-31 14:46:53.000000000 -0500
@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
* Softirq action handler - move entries to local list and loop over them
* while passing them to the queue registered handler.
@@ -20946,9 +20946,9 @@ diff -urNp linux-2.6.32.33/block/blk-softirq.c linux-2.6.32.33/block/blk-softirq
{
struct list_head *cpu_list, local_list;
-diff -urNp linux-2.6.32.33/block/blk-sysfs.c linux-2.6.32.33/block/blk-sysfs.c
---- linux-2.6.32.33/block/blk-sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/block/blk-sysfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/block/blk-sysfs.c linux-2.6.32.35/block/blk-sysfs.c
+--- linux-2.6.32.35/block/blk-sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/block/blk-sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
kmem_cache_free(blk_requestq_cachep, q);
}
@@ -20958,9 +20958,9 @@ diff -urNp linux-2.6.32.33/block/blk-sysfs.c linux-2.6.32.33/block/blk-sysfs.c
.show = queue_attr_show,
.store = queue_attr_store,
};
-diff -urNp linux-2.6.32.33/block/elevator.c linux-2.6.32.33/block/elevator.c
---- linux-2.6.32.33/block/elevator.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/block/elevator.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/block/elevator.c linux-2.6.32.35/block/elevator.c
+--- linux-2.6.32.35/block/elevator.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/block/elevator.c 2010-12-31 14:46:53.000000000 -0500
@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
return error;
}
@@ -20970,9 +20970,9 @@ diff -urNp linux-2.6.32.33/block/elevator.c linux-2.6.32.33/block/elevator.c
.show = elv_attr_show,
.store = elv_attr_store,
};
-diff -urNp linux-2.6.32.33/crypto/lrw.c linux-2.6.32.33/crypto/lrw.c
---- linux-2.6.32.33/crypto/lrw.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/crypto/lrw.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/crypto/lrw.c linux-2.6.32.35/crypto/lrw.c
+--- linux-2.6.32.35/crypto/lrw.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/crypto/lrw.c 2010-12-31 14:46:53.000000000 -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;
@@ -20982,9 +20982,9 @@ diff -urNp linux-2.6.32.33/crypto/lrw.c linux-2.6.32.33/crypto/lrw.c
int bsize = crypto_cipher_blocksize(child);
crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
-diff -urNp linux-2.6.32.33/Documentation/dontdiff linux-2.6.32.33/Documentation/dontdiff
---- linux-2.6.32.33/Documentation/dontdiff 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/Documentation/dontdiff 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/Documentation/dontdiff linux-2.6.32.35/Documentation/dontdiff
+--- linux-2.6.32.35/Documentation/dontdiff 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/Documentation/dontdiff 2010-12-31 14:46:53.000000000 -0500
@@ -3,6 +3,7 @@
*.bin
*.cpio
@@ -21102,9 +21102,9 @@ diff -urNp linux-2.6.32.33/Documentation/dontdiff linux-2.6.32.33/Documentation/
zImage*
zconf.hash.c
+zoffset.h
-diff -urNp linux-2.6.32.33/Documentation/kernel-parameters.txt linux-2.6.32.33/Documentation/kernel-parameters.txt
---- linux-2.6.32.33/Documentation/kernel-parameters.txt 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/Documentation/kernel-parameters.txt 2011-03-21 17:17:19.000000000 -0400
+diff -urNp linux-2.6.32.35/Documentation/kernel-parameters.txt linux-2.6.32.35/Documentation/kernel-parameters.txt
+--- linux-2.6.32.35/Documentation/kernel-parameters.txt 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/Documentation/kernel-parameters.txt 2011-03-21 17:17:19.000000000 -0400
@@ -1837,6 +1837,13 @@ and is between 256 and 4096 characters.
the specified number of seconds. This is to be used if
your oopses keep scrolling off the screen.
@@ -21119,9 +21119,9 @@ diff -urNp linux-2.6.32.33/Documentation/kernel-parameters.txt linux-2.6.32.33/D
pcbit= [HW,ISDN]
pcd. [PARIDE]
-diff -urNp linux-2.6.32.33/drivers/acpi/acpi_pad.c linux-2.6.32.33/drivers/acpi/acpi_pad.c
---- linux-2.6.32.33/drivers/acpi/acpi_pad.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/acpi/acpi_pad.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/acpi/acpi_pad.c linux-2.6.32.35/drivers/acpi/acpi_pad.c
+--- linux-2.6.32.35/drivers/acpi/acpi_pad.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/acpi/acpi_pad.c 2010-12-31 14:46:53.000000000 -0500
@@ -30,7 +30,7 @@
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
@@ -21131,9 +21131,9 @@ diff -urNp linux-2.6.32.33/drivers/acpi/acpi_pad.c linux-2.6.32.33/drivers/acpi/
#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80
static DEFINE_MUTEX(isolated_cpus_lock);
-diff -urNp linux-2.6.32.33/drivers/acpi/battery.c linux-2.6.32.33/drivers/acpi/battery.c
---- linux-2.6.32.33/drivers/acpi/battery.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/acpi/battery.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/acpi/battery.c linux-2.6.32.35/drivers/acpi/battery.c
+--- linux-2.6.32.35/drivers/acpi/battery.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/acpi/battery.c 2010-12-31 14:46:53.000000000 -0500
@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
}
@@ -21143,9 +21143,9 @@ diff -urNp linux-2.6.32.33/drivers/acpi/battery.c linux-2.6.32.33/drivers/acpi/b
mode_t mode;
const char *name;
} acpi_battery_file[] = {
-diff -urNp linux-2.6.32.33/drivers/acpi/blacklist.c linux-2.6.32.33/drivers/acpi/blacklist.c
---- linux-2.6.32.33/drivers/acpi/blacklist.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/drivers/acpi/blacklist.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/acpi/blacklist.c linux-2.6.32.35/drivers/acpi/blacklist.c
+--- linux-2.6.32.35/drivers/acpi/blacklist.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/drivers/acpi/blacklist.c 2010-12-31 14:46:53.000000000 -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},
@@ -21155,9 +21155,9 @@ diff -urNp linux-2.6.32.33/drivers/acpi/blacklist.c linux-2.6.32.33/drivers/acpi
};
#if CONFIG_ACPI_BLACKLIST_YEAR
-diff -urNp linux-2.6.32.33/drivers/acpi/dock.c linux-2.6.32.33/drivers/acpi/dock.c
---- linux-2.6.32.33/drivers/acpi/dock.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/acpi/dock.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/acpi/dock.c linux-2.6.32.35/drivers/acpi/dock.c
+--- linux-2.6.32.35/drivers/acpi/dock.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/acpi/dock.c 2010-12-31 14:46:53.000000000 -0500
@@ -77,7 +77,7 @@ struct dock_dependent_device {
struct list_head list;
struct list_head hotplug_list;
@@ -21176,9 +21176,9 @@ diff -urNp linux-2.6.32.33/drivers/acpi/dock.c linux-2.6.32.33/drivers/acpi/dock
void *context)
{
struct dock_dependent_device *dd;
-diff -urNp linux-2.6.32.33/drivers/acpi/osl.c linux-2.6.32.33/drivers/acpi/osl.c
---- linux-2.6.32.33/drivers/acpi/osl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/acpi/osl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/acpi/osl.c linux-2.6.32.35/drivers/acpi/osl.c
+--- linux-2.6.32.35/drivers/acpi/osl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/acpi/osl.c 2010-12-31 14:46:53.000000000 -0500
@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
void __iomem *virt_addr;
@@ -21197,9 +21197,9 @@ diff -urNp linux-2.6.32.33/drivers/acpi/osl.c linux-2.6.32.33/drivers/acpi/osl.c
switch (width) {
case 8:
-diff -urNp linux-2.6.32.33/drivers/acpi/power_meter.c linux-2.6.32.33/drivers/acpi/power_meter.c
---- linux-2.6.32.33/drivers/acpi/power_meter.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/acpi/power_meter.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/acpi/power_meter.c linux-2.6.32.35/drivers/acpi/power_meter.c
+--- linux-2.6.32.35/drivers/acpi/power_meter.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/acpi/power_meter.c 2010-12-31 14:46:53.000000000 -0500
@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
return res;
@@ -21209,9 +21209,9 @@ diff -urNp linux-2.6.32.33/drivers/acpi/power_meter.c linux-2.6.32.33/drivers/ac
mutex_lock(&resource->lock);
resource->trip[attr->index - 7] = temp;
-diff -urNp linux-2.6.32.33/drivers/acpi/proc.c linux-2.6.32.33/drivers/acpi/proc.c
---- linux-2.6.32.33/drivers/acpi/proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/acpi/proc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/acpi/proc.c linux-2.6.32.35/drivers/acpi/proc.c
+--- linux-2.6.32.35/drivers/acpi/proc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/acpi/proc.c 2010-12-31 14:46:53.000000000 -0500
@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
size_t count, loff_t * ppos)
{
@@ -21247,9 +21247,9 @@ diff -urNp linux-2.6.32.33/drivers/acpi/proc.c linux-2.6.32.33/drivers/acpi/proc
dev->wakeup.state.enabled =
dev->wakeup.state.enabled ? 0 : 1;
found_dev = dev;
-diff -urNp linux-2.6.32.33/drivers/acpi/processor_core.c linux-2.6.32.33/drivers/acpi/processor_core.c
---- linux-2.6.32.33/drivers/acpi/processor_core.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.33/drivers/acpi/processor_core.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/acpi/processor_core.c linux-2.6.32.35/drivers/acpi/processor_core.c
+--- linux-2.6.32.35/drivers/acpi/processor_core.c 2010-10-31 16:44:11.000000000 -0400
++++ linux-2.6.32.35/drivers/acpi/processor_core.c 2010-12-31 14:46:53.000000000 -0500
@@ -790,7 +790,7 @@ static int __cpuinit acpi_processor_add(
return 0;
}
@@ -21259,9 +21259,9 @@ diff -urNp linux-2.6.32.33/drivers/acpi/processor_core.c linux-2.6.32.33/drivers
/*
* Buggy BIOS check
-diff -urNp linux-2.6.32.33/drivers/acpi/processor_idle.c linux-2.6.32.33/drivers/acpi/processor_idle.c
---- linux-2.6.32.33/drivers/acpi/processor_idle.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/acpi/processor_idle.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/acpi/processor_idle.c linux-2.6.32.35/drivers/acpi/processor_idle.c
+--- linux-2.6.32.35/drivers/acpi/processor_idle.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/acpi/processor_idle.c 2010-12-31 14:46:53.000000000 -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")},
@@ -21271,9 +21271,9 @@ diff -urNp linux-2.6.32.33/drivers/acpi/processor_idle.c linux-2.6.32.33/drivers
};
-diff -urNp linux-2.6.32.33/drivers/acpi/sbshc.c linux-2.6.32.33/drivers/acpi/sbshc.c
---- linux-2.6.32.33/drivers/acpi/sbshc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/acpi/sbshc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/acpi/sbshc.c linux-2.6.32.35/drivers/acpi/sbshc.c
+--- linux-2.6.32.35/drivers/acpi/sbshc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/acpi/sbshc.c 2010-12-31 14:46:53.000000000 -0500
@@ -17,7 +17,7 @@
#define PREFIX "ACPI: "
@@ -21283,9 +21283,9 @@ diff -urNp linux-2.6.32.33/drivers/acpi/sbshc.c linux-2.6.32.33/drivers/acpi/sbs
#define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC"
struct acpi_smb_hc {
-diff -urNp linux-2.6.32.33/drivers/acpi/sleep.c linux-2.6.32.33/drivers/acpi/sleep.c
---- linux-2.6.32.33/drivers/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/acpi/sleep.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/acpi/sleep.c linux-2.6.32.35/drivers/acpi/sleep.c
+--- linux-2.6.32.35/drivers/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/acpi/sleep.c 2010-12-31 14:46:53.000000000 -0500
@@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp
}
}
@@ -21322,9 +21322,9 @@ diff -urNp linux-2.6.32.33/drivers/acpi/sleep.c linux-2.6.32.33/drivers/acpi/sle
.begin = acpi_hibernation_begin_old,
.end = acpi_pm_end,
.pre_snapshot = acpi_hibernation_pre_snapshot_old,
-diff -urNp linux-2.6.32.33/drivers/acpi/video.c linux-2.6.32.33/drivers/acpi/video.c
---- linux-2.6.32.33/drivers/acpi/video.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/acpi/video.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/acpi/video.c linux-2.6.32.35/drivers/acpi/video.c
+--- linux-2.6.32.35/drivers/acpi/video.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/acpi/video.c 2010-12-31 14:46:53.000000000 -0500
@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
vd->brightness->levels[request_level]);
}
@@ -21334,9 +21334,9 @@ diff -urNp linux-2.6.32.33/drivers/acpi/video.c linux-2.6.32.33/drivers/acpi/vid
.get_brightness = acpi_video_get_brightness,
.update_status = acpi_video_set_brightness,
};
-diff -urNp linux-2.6.32.33/drivers/ata/ahci.c linux-2.6.32.33/drivers/ata/ahci.c
---- linux-2.6.32.33/drivers/ata/ahci.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/drivers/ata/ahci.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/ahci.c linux-2.6.32.35/drivers/ata/ahci.c
+--- linux-2.6.32.35/drivers/ata/ahci.c 2011-03-23 19:00:31.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/ahci.c 2011-03-23 19:01:00.000000000 -0400
@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
.sdev_attrs = ahci_sdev_attrs,
};
@@ -21367,7 +21367,7 @@ diff -urNp linux-2.6.32.33/drivers/ata/ahci.c linux-2.6.32.33/drivers/ata/ahci.c
.inherits = &ahci_ops,
.softreset = ahci_sb600_softreset,
.pmp_softreset = ahci_sb600_softreset,
-@@ -687,7 +687,7 @@ static const struct pci_device_id ahci_p
+@@ -692,7 +692,7 @@ static const struct pci_device_id ahci_p
{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
@@ -21376,9 +21376,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/ahci.c linux-2.6.32.33/drivers/ata/ahci.c
};
-diff -urNp linux-2.6.32.33/drivers/ata/ata_generic.c linux-2.6.32.33/drivers/ata/ata_generic.c
---- linux-2.6.32.33/drivers/ata/ata_generic.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/drivers/ata/ata_generic.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/ata_generic.c linux-2.6.32.35/drivers/ata/ata_generic.c
+--- linux-2.6.32.35/drivers/ata/ata_generic.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/drivers/ata/ata_generic.c 2010-12-31 14:46:53.000000000 -0500
@@ -104,7 +104,7 @@ static struct scsi_host_template generic
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21388,9 +21388,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/ata_generic.c linux-2.6.32.33/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_unknown,
.set_mode = generic_set_mode,
-diff -urNp linux-2.6.32.33/drivers/ata/ata_piix.c linux-2.6.32.33/drivers/ata/ata_piix.c
---- linux-2.6.32.33/drivers/ata/ata_piix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/ata_piix.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/ata_piix.c linux-2.6.32.35/drivers/ata/ata_piix.c
+--- linux-2.6.32.35/drivers/ata/ata_piix.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/ata_piix.c 2010-12-31 14:46:53.000000000 -0500
@@ -300,7 +300,7 @@ static const struct pci_device_id piix_p
{ 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (CPT) */
@@ -21454,9 +21454,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/ata_piix.c linux-2.6.32.33/drivers/ata/at
};
static const char *oemstrs[] = {
"Tecra M3,",
-diff -urNp linux-2.6.32.33/drivers/ata/libata-acpi.c linux-2.6.32.33/drivers/ata/libata-acpi.c
---- linux-2.6.32.33/drivers/ata/libata-acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/libata-acpi.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/libata-acpi.c linux-2.6.32.35/drivers/ata/libata-acpi.c
+--- linux-2.6.32.35/drivers/ata/libata-acpi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/libata-acpi.c 2010-12-31 14:46:53.000000000 -0500
@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
ata_acpi_uevent(dev->link->ap, dev, event);
}
@@ -21472,9 +21472,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/libata-acpi.c linux-2.6.32.33/drivers/ata
.handler = ata_acpi_ap_notify_dock,
.uevent = ata_acpi_ap_uevent,
};
-diff -urNp linux-2.6.32.33/drivers/ata/libata-core.c linux-2.6.32.33/drivers/ata/libata-core.c
---- linux-2.6.32.33/drivers/ata/libata-core.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/libata-core.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/libata-core.c linux-2.6.32.35/drivers/ata/libata-core.c
+--- linux-2.6.32.35/drivers/ata/libata-core.c 2011-03-23 19:00:32.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/libata-core.c 2011-03-23 19:01:00.000000000 -0400
@@ -900,7 +900,7 @@ static const struct ata_xfer_ent {
{ ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
{ ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
@@ -21520,7 +21520,7 @@ diff -urNp linux-2.6.32.33/drivers/ata/libata-core.c linux-2.6.32.33/drivers/ata
WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
ap = qc->ap;
link = qc->dev->link;
-@@ -5981,7 +5981,7 @@ static void ata_host_stop(struct device
+@@ -5987,7 +5987,7 @@ static void ata_host_stop(struct device
* LOCKING:
* None.
*/
@@ -21529,7 +21529,7 @@ diff -urNp linux-2.6.32.33/drivers/ata/libata-core.c linux-2.6.32.33/drivers/ata
{
static DEFINE_SPINLOCK(lock);
const struct ata_port_operations *cur;
-@@ -5993,6 +5993,7 @@ static void ata_finalize_port_ops(struct
+@@ -5999,6 +5999,7 @@ static void ata_finalize_port_ops(struct
return;
spin_lock(&lock);
@@ -21537,7 +21537,7 @@ diff -urNp linux-2.6.32.33/drivers/ata/libata-core.c linux-2.6.32.33/drivers/ata
for (cur = ops->inherits; cur; cur = cur->inherits) {
void **inherit = (void **)cur;
-@@ -6006,8 +6007,9 @@ static void ata_finalize_port_ops(struct
+@@ -6012,8 +6013,9 @@ static void ata_finalize_port_ops(struct
if (IS_ERR(*pp))
*pp = NULL;
@@ -21548,7 +21548,7 @@ diff -urNp linux-2.6.32.33/drivers/ata/libata-core.c linux-2.6.32.33/drivers/ata
spin_unlock(&lock);
}
-@@ -6104,7 +6106,7 @@ int ata_host_start(struct ata_host *host
+@@ -6110,7 +6112,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,
@@ -21557,7 +21557,7 @@ diff -urNp linux-2.6.32.33/drivers/ata/libata-core.c linux-2.6.32.33/drivers/ata
{
spin_lock_init(&host->lock);
host->dev = dev;
-@@ -6767,7 +6769,7 @@ static void ata_dummy_error_handler(stru
+@@ -6773,7 +6775,7 @@ static void ata_dummy_error_handler(stru
/* truly dummy */
}
@@ -21566,9 +21566,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/libata-core.c linux-2.6.32.33/drivers/ata
.qc_prep = ata_noop_qc_prep,
.qc_issue = ata_dummy_qc_issue,
.error_handler = ata_dummy_error_handler,
-diff -urNp linux-2.6.32.33/drivers/ata/libata-eh.c linux-2.6.32.33/drivers/ata/libata-eh.c
---- linux-2.6.32.33/drivers/ata/libata-eh.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/libata-eh.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/libata-eh.c linux-2.6.32.35/drivers/ata/libata-eh.c
+--- linux-2.6.32.35/drivers/ata/libata-eh.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/libata-eh.c 2010-12-31 14:46:53.000000000 -0500
@@ -3590,7 +3590,7 @@ void ata_do_eh(struct ata_port *ap, ata_
*/
void ata_std_error_handler(struct ata_port *ap)
@@ -21578,9 +21578,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/libata-eh.c linux-2.6.32.33/drivers/ata/l
ata_reset_fn_t hardreset = ops->hardreset;
/* ignore built-in hardreset if SCR access is not available */
-diff -urNp linux-2.6.32.33/drivers/ata/libata-pmp.c linux-2.6.32.33/drivers/ata/libata-pmp.c
---- linux-2.6.32.33/drivers/ata/libata-pmp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/libata-pmp.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/libata-pmp.c linux-2.6.32.35/drivers/ata/libata-pmp.c
+--- linux-2.6.32.35/drivers/ata/libata-pmp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/libata-pmp.c 2010-12-31 14:46:53.000000000 -0500
@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
*/
static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -21590,9 +21590,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/libata-pmp.c linux-2.6.32.33/drivers/ata/
int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
struct ata_link *pmp_link = &ap->link;
struct ata_device *pmp_dev = pmp_link->device;
-diff -urNp linux-2.6.32.33/drivers/ata/pata_acpi.c linux-2.6.32.33/drivers/ata/pata_acpi.c
---- linux-2.6.32.33/drivers/ata/pata_acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_acpi.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_acpi.c linux-2.6.32.35/drivers/ata/pata_acpi.c
+--- linux-2.6.32.35/drivers/ata/pata_acpi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_acpi.c 2010-12-31 14:46:53.000000000 -0500
@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21602,9 +21602,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_acpi.c linux-2.6.32.33/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.qc_issue = pacpi_qc_issue,
.cable_detect = pacpi_cable_detect,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_ali.c linux-2.6.32.33/drivers/ata/pata_ali.c
---- linux-2.6.32.33/drivers/ata/pata_ali.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_ali.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_ali.c linux-2.6.32.35/drivers/ata/pata_ali.c
+--- linux-2.6.32.35/drivers/ata/pata_ali.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_ali.c 2010-12-31 14:46:53.000000000 -0500
@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
* Port operations for PIO only ALi
*/
@@ -21650,9 +21650,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_ali.c linux-2.6.32.33/drivers/ata/pa
.inherits = &ali_dma_base_ops,
.check_atapi_dma = ali_check_atapi_dma,
.dev_config = ali_warn_atapi_dma,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_amd.c linux-2.6.32.33/drivers/ata/pata_amd.c
---- linux-2.6.32.33/drivers/ata/pata_amd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_amd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_amd.c linux-2.6.32.35/drivers/ata/pata_amd.c
+--- linux-2.6.32.35/drivers/ata/pata_amd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_amd.c 2010-12-31 14:46:53.000000000 -0500
@@ -397,28 +397,28 @@ static const struct ata_port_operations
.prereset = amd_pre_reset,
};
@@ -21702,9 +21702,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_amd.c linux-2.6.32.33/drivers/ata/pa
.inherits = &nv_base_port_ops,
.set_piomode = nv133_set_piomode,
.set_dmamode = nv133_set_dmamode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_artop.c linux-2.6.32.33/drivers/ata/pata_artop.c
---- linux-2.6.32.33/drivers/ata/pata_artop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_artop.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_artop.c linux-2.6.32.35/drivers/ata/pata_artop.c
+--- linux-2.6.32.35/drivers/ata/pata_artop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_artop.c 2010-12-31 14:46:53.000000000 -0500
@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21723,9 +21723,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_artop.c linux-2.6.32.33/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.cable_detect = artop6260_cable_detect,
.set_piomode = artop6260_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_at32.c linux-2.6.32.33/drivers/ata/pata_at32.c
---- linux-2.6.32.33/drivers/ata/pata_at32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_at32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_at32.c linux-2.6.32.35/drivers/ata/pata_at32.c
+--- linux-2.6.32.35/drivers/ata/pata_at32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_at32.c 2010-12-31 14:46:53.000000000 -0500
@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -21735,9 +21735,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_at32.c linux-2.6.32.33/drivers/ata/p
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = pata_at32_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_at91.c linux-2.6.32.33/drivers/ata/pata_at91.c
---- linux-2.6.32.33/drivers/ata/pata_at91.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_at91.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_at91.c linux-2.6.32.35/drivers/ata/pata_at91.c
+--- linux-2.6.32.35/drivers/ata/pata_at91.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_at91.c 2010-12-31 14:46:53.000000000 -0500
@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
ATA_PIO_SHT(DRV_NAME),
};
@@ -21747,9 +21747,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_at91.c linux-2.6.32.33/drivers/ata/p
.inherits = &ata_sff_port_ops,
.sff_data_xfer = pata_at91_data_xfer_noirq,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_atiixp.c linux-2.6.32.33/drivers/ata/pata_atiixp.c
---- linux-2.6.32.33/drivers/ata/pata_atiixp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_atiixp.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_atiixp.c linux-2.6.32.35/drivers/ata/pata_atiixp.c
+--- linux-2.6.32.35/drivers/ata/pata_atiixp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_atiixp.c 2010-12-31 14:46:53.000000000 -0500
@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21759,9 +21759,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_atiixp.c linux-2.6.32.33/drivers/ata
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_sff_dumb_qc_prep,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_atp867x.c linux-2.6.32.33/drivers/ata/pata_atp867x.c
---- linux-2.6.32.33/drivers/ata/pata_atp867x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_atp867x.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_atp867x.c linux-2.6.32.35/drivers/ata/pata_atp867x.c
+--- linux-2.6.32.35/drivers/ata/pata_atp867x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_atp867x.c 2010-12-31 14:46:53.000000000 -0500
@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21771,9 +21771,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_atp867x.c linux-2.6.32.33/drivers/at
.inherits = &ata_bmdma_port_ops,
.cable_detect = atp867x_cable_detect,
.set_piomode = atp867x_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_bf54x.c linux-2.6.32.33/drivers/ata/pata_bf54x.c
---- linux-2.6.32.33/drivers/ata/pata_bf54x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_bf54x.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_bf54x.c linux-2.6.32.35/drivers/ata/pata_bf54x.c
+--- linux-2.6.32.35/drivers/ata/pata_bf54x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_bf54x.c 2010-12-31 14:46:53.000000000 -0500
@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -21783,9 +21783,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_bf54x.c linux-2.6.32.33/drivers/ata/
.inherits = &ata_sff_port_ops,
.set_piomode = bfin_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_cmd640.c linux-2.6.32.33/drivers/ata/pata_cmd640.c
---- linux-2.6.32.33/drivers/ata/pata_cmd640.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_cmd640.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_cmd640.c linux-2.6.32.35/drivers/ata/pata_cmd640.c
+--- linux-2.6.32.35/drivers/ata/pata_cmd640.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_cmd640.c 2010-12-31 14:46:53.000000000 -0500
@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21795,9 +21795,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_cmd640.c linux-2.6.32.33/drivers/ata
.inherits = &ata_bmdma_port_ops,
/* In theory xfer_noirq is not needed once we kill the prefetcher */
.sff_data_xfer = ata_sff_data_xfer_noirq,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_cmd64x.c linux-2.6.32.33/drivers/ata/pata_cmd64x.c
---- linux-2.6.32.33/drivers/ata/pata_cmd64x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_cmd64x.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_cmd64x.c linux-2.6.32.35/drivers/ata/pata_cmd64x.c
+--- linux-2.6.32.35/drivers/ata/pata_cmd64x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_cmd64x.c 2010-12-31 14:46:53.000000000 -0500
@@ -275,18 +275,18 @@ static const struct ata_port_operations
.set_dmamode = cmd64x_set_dmamode,
};
@@ -21820,9 +21820,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_cmd64x.c linux-2.6.32.33/drivers/ata
.inherits = &cmd64x_base_ops,
.bmdma_stop = cmd648_bmdma_stop,
.cable_detect = cmd648_cable_detect,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_cs5520.c linux-2.6.32.33/drivers/ata/pata_cs5520.c
---- linux-2.6.32.33/drivers/ata/pata_cs5520.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_cs5520.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_cs5520.c linux-2.6.32.35/drivers/ata/pata_cs5520.c
+--- linux-2.6.32.35/drivers/ata/pata_cs5520.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_cs5520.c 2010-12-31 14:46:53.000000000 -0500
@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21832,9 +21832,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_cs5520.c linux-2.6.32.33/drivers/ata
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_sff_dumb_qc_prep,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_cs5530.c linux-2.6.32.33/drivers/ata/pata_cs5530.c
---- linux-2.6.32.33/drivers/ata/pata_cs5530.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_cs5530.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_cs5530.c linux-2.6.32.35/drivers/ata/pata_cs5530.c
+--- linux-2.6.32.35/drivers/ata/pata_cs5530.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_cs5530.c 2010-12-31 14:46:53.000000000 -0500
@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21844,9 +21844,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_cs5530.c linux-2.6.32.33/drivers/ata
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_sff_dumb_qc_prep,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_cs5535.c linux-2.6.32.33/drivers/ata/pata_cs5535.c
---- linux-2.6.32.33/drivers/ata/pata_cs5535.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_cs5535.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_cs5535.c linux-2.6.32.35/drivers/ata/pata_cs5535.c
+--- linux-2.6.32.35/drivers/ata/pata_cs5535.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_cs5535.c 2010-12-31 14:46:53.000000000 -0500
@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21856,9 +21856,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_cs5535.c linux-2.6.32.33/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = cs5535_cable_detect,
.set_piomode = cs5535_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_cs5536.c linux-2.6.32.33/drivers/ata/pata_cs5536.c
---- linux-2.6.32.33/drivers/ata/pata_cs5536.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_cs5536.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_cs5536.c linux-2.6.32.35/drivers/ata/pata_cs5536.c
+--- linux-2.6.32.35/drivers/ata/pata_cs5536.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_cs5536.c 2010-12-31 14:46:53.000000000 -0500
@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21868,9 +21868,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_cs5536.c linux-2.6.32.33/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = cs5536_cable_detect,
.set_piomode = cs5536_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_cypress.c linux-2.6.32.33/drivers/ata/pata_cypress.c
---- linux-2.6.32.33/drivers/ata/pata_cypress.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_cypress.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_cypress.c linux-2.6.32.35/drivers/ata/pata_cypress.c
+--- linux-2.6.32.35/drivers/ata/pata_cypress.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_cypress.c 2010-12-31 14:46:53.000000000 -0500
@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21880,9 +21880,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_cypress.c linux-2.6.32.33/drivers/at
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = cy82c693_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_efar.c linux-2.6.32.33/drivers/ata/pata_efar.c
---- linux-2.6.32.33/drivers/ata/pata_efar.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_efar.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_efar.c linux-2.6.32.35/drivers/ata/pata_efar.c
+--- linux-2.6.32.35/drivers/ata/pata_efar.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_efar.c 2010-12-31 14:46:53.000000000 -0500
@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21892,9 +21892,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_efar.c linux-2.6.32.33/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.cable_detect = efar_cable_detect,
.set_piomode = efar_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_hpt366.c linux-2.6.32.33/drivers/ata/pata_hpt366.c
---- linux-2.6.32.33/drivers/ata/pata_hpt366.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_hpt366.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_hpt366.c linux-2.6.32.35/drivers/ata/pata_hpt366.c
+--- linux-2.6.32.35/drivers/ata/pata_hpt366.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_hpt366.c 2010-12-31 14:46:53.000000000 -0500
@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
* Configuration for HPT366/68
*/
@@ -21904,9 +21904,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_hpt366.c linux-2.6.32.33/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = hpt36x_cable_detect,
.mode_filter = hpt366_filter,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_hpt37x.c linux-2.6.32.33/drivers/ata/pata_hpt37x.c
---- linux-2.6.32.33/drivers/ata/pata_hpt37x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_hpt37x.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_hpt37x.c linux-2.6.32.35/drivers/ata/pata_hpt37x.c
+--- linux-2.6.32.35/drivers/ata/pata_hpt37x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_hpt37x.c 2010-12-31 14:46:53.000000000 -0500
@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
* Configuration for HPT370
*/
@@ -21943,9 +21943,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_hpt37x.c linux-2.6.32.33/drivers/ata
.inherits = &hpt372_port_ops,
.prereset = hpt374_fn1_pre_reset,
};
-diff -urNp linux-2.6.32.33/drivers/ata/pata_hpt3x2n.c linux-2.6.32.33/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.32.33/drivers/ata/pata_hpt3x2n.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_hpt3x2n.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_hpt3x2n.c linux-2.6.32.35/drivers/ata/pata_hpt3x2n.c
+--- linux-2.6.32.35/drivers/ata/pata_hpt3x2n.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_hpt3x2n.c 2010-12-31 14:46:53.000000000 -0500
@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
* Configuration for HPT3x2n.
*/
@@ -21955,9 +21955,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_hpt3x2n.c linux-2.6.32.33/drivers/at
.inherits = &ata_bmdma_port_ops,
.bmdma_stop = hpt3x2n_bmdma_stop,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_hpt3x3.c linux-2.6.32.33/drivers/ata/pata_hpt3x3.c
---- linux-2.6.32.33/drivers/ata/pata_hpt3x3.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_hpt3x3.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_hpt3x3.c linux-2.6.32.35/drivers/ata/pata_hpt3x3.c
+--- linux-2.6.32.35/drivers/ata/pata_hpt3x3.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_hpt3x3.c 2010-12-31 14:46:53.000000000 -0500
@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21967,9 +21967,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_hpt3x3.c linux-2.6.32.33/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = hpt3x3_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_icside.c linux-2.6.32.33/drivers/ata/pata_icside.c
---- linux-2.6.32.33/drivers/ata/pata_icside.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_icside.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_icside.c linux-2.6.32.35/drivers/ata/pata_icside.c
+--- linux-2.6.32.35/drivers/ata/pata_icside.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_icside.c 2010-12-31 14:46:53.000000000 -0500
@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
}
}
@@ -21979,9 +21979,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_icside.c linux-2.6.32.33/drivers/ata
.inherits = &ata_sff_port_ops,
/* no need to build any PRD tables for DMA */
.qc_prep = ata_noop_qc_prep,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_isapnp.c linux-2.6.32.33/drivers/ata/pata_isapnp.c
---- linux-2.6.32.33/drivers/ata/pata_isapnp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_isapnp.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_isapnp.c linux-2.6.32.35/drivers/ata/pata_isapnp.c
+--- linux-2.6.32.35/drivers/ata/pata_isapnp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_isapnp.c 2010-12-31 14:46:53.000000000 -0500
@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21997,9 +21997,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_isapnp.c linux-2.6.32.33/drivers/ata
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
/* No altstatus so we don't want to use the lost interrupt poll */
-diff -urNp linux-2.6.32.33/drivers/ata/pata_it8213.c linux-2.6.32.33/drivers/ata/pata_it8213.c
---- linux-2.6.32.33/drivers/ata/pata_it8213.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_it8213.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_it8213.c linux-2.6.32.35/drivers/ata/pata_it8213.c
+--- linux-2.6.32.35/drivers/ata/pata_it8213.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_it8213.c 2010-12-31 14:46:53.000000000 -0500
@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
};
@@ -22009,9 +22009,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_it8213.c linux-2.6.32.33/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = it8213_cable_detect,
.set_piomode = it8213_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_it821x.c linux-2.6.32.33/drivers/ata/pata_it821x.c
---- linux-2.6.32.33/drivers/ata/pata_it821x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_it821x.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_it821x.c linux-2.6.32.35/drivers/ata/pata_it821x.c
+--- linux-2.6.32.35/drivers/ata/pata_it821x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_it821x.c 2010-12-31 14:46:53.000000000 -0500
@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22039,9 +22039,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_it821x.c linux-2.6.32.33/drivers/ata
.inherits = &ata_bmdma_port_ops,
.check_atapi_dma= it821x_check_atapi_dma,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.33/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.32.33/drivers/ata/pata_ixp4xx_cf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_ixp4xx_cf.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.35/drivers/ata/pata_ixp4xx_cf.c
+--- linux-2.6.32.35/drivers/ata/pata_ixp4xx_cf.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_ixp4xx_cf.c 2010-12-31 14:46:53.000000000 -0500
@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
ATA_PIO_SHT(DRV_NAME),
};
@@ -22051,9 +22051,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.33/drivers/
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ixp4xx_mmio_data_xfer,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_jmicron.c linux-2.6.32.33/drivers/ata/pata_jmicron.c
---- linux-2.6.32.33/drivers/ata/pata_jmicron.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_jmicron.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_jmicron.c linux-2.6.32.35/drivers/ata/pata_jmicron.c
+--- linux-2.6.32.35/drivers/ata/pata_jmicron.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_jmicron.c 2010-12-31 14:46:53.000000000 -0500
@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22063,9 +22063,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_jmicron.c linux-2.6.32.33/drivers/at
.inherits = &ata_bmdma_port_ops,
.prereset = jmicron_pre_reset,
};
-diff -urNp linux-2.6.32.33/drivers/ata/pata_legacy.c linux-2.6.32.33/drivers/ata/pata_legacy.c
---- linux-2.6.32.33/drivers/ata/pata_legacy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_legacy.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_legacy.c linux-2.6.32.35/drivers/ata/pata_legacy.c
+--- linux-2.6.32.35/drivers/ata/pata_legacy.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_legacy.c 2010-12-31 14:46:53.000000000 -0500
@@ -106,7 +106,7 @@ struct legacy_probe {
struct legacy_controller {
@@ -22177,9 +22177,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_legacy.c linux-2.6.32.33/drivers/ata
struct legacy_data *ld = &legacy_data[probe->slot];
struct ata_host *host = NULL;
struct ata_port *ap;
-diff -urNp linux-2.6.32.33/drivers/ata/pata_marvell.c linux-2.6.32.33/drivers/ata/pata_marvell.c
---- linux-2.6.32.33/drivers/ata/pata_marvell.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_marvell.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_marvell.c linux-2.6.32.35/drivers/ata/pata_marvell.c
+--- linux-2.6.32.35/drivers/ata/pata_marvell.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_marvell.c 2010-12-31 14:46:53.000000000 -0500
@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22189,9 +22189,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_marvell.c linux-2.6.32.33/drivers/at
.inherits = &ata_bmdma_port_ops,
.cable_detect = marvell_cable_detect,
.prereset = marvell_pre_reset,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_mpc52xx.c linux-2.6.32.33/drivers/ata/pata_mpc52xx.c
---- linux-2.6.32.33/drivers/ata/pata_mpc52xx.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/ata/pata_mpc52xx.c 2011-02-22 16:03:07.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_mpc52xx.c linux-2.6.32.35/drivers/ata/pata_mpc52xx.c
+--- linux-2.6.32.35/drivers/ata/pata_mpc52xx.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/drivers/ata/pata_mpc52xx.c 2011-02-22 16:03:07.000000000 -0500
@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
ATA_PIO_SHT(DRV_NAME),
};
@@ -22201,9 +22201,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_mpc52xx.c linux-2.6.32.33/drivers/at
.inherits = &ata_bmdma_port_ops,
.sff_dev_select = mpc52xx_ata_dev_select,
.set_piomode = mpc52xx_ata_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_mpiix.c linux-2.6.32.33/drivers/ata/pata_mpiix.c
---- linux-2.6.32.33/drivers/ata/pata_mpiix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_mpiix.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_mpiix.c linux-2.6.32.35/drivers/ata/pata_mpiix.c
+--- linux-2.6.32.35/drivers/ata/pata_mpiix.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_mpiix.c 2010-12-31 14:46:53.000000000 -0500
@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
ATA_PIO_SHT(DRV_NAME),
};
@@ -22213,9 +22213,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_mpiix.c linux-2.6.32.33/drivers/ata/
.inherits = &ata_sff_port_ops,
.qc_issue = mpiix_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_netcell.c linux-2.6.32.33/drivers/ata/pata_netcell.c
---- linux-2.6.32.33/drivers/ata/pata_netcell.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_netcell.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_netcell.c linux-2.6.32.35/drivers/ata/pata_netcell.c
+--- linux-2.6.32.35/drivers/ata/pata_netcell.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_netcell.c 2010-12-31 14:46:53.000000000 -0500
@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22225,9 +22225,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_netcell.c linux-2.6.32.33/drivers/at
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_80wire,
.read_id = netcell_read_id,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_ninja32.c linux-2.6.32.33/drivers/ata/pata_ninja32.c
---- linux-2.6.32.33/drivers/ata/pata_ninja32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_ninja32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_ninja32.c linux-2.6.32.35/drivers/ata/pata_ninja32.c
+--- linux-2.6.32.35/drivers/ata/pata_ninja32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_ninja32.c 2010-12-31 14:46:53.000000000 -0500
@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22237,9 +22237,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_ninja32.c linux-2.6.32.33/drivers/at
.inherits = &ata_bmdma_port_ops,
.sff_dev_select = ninja32_dev_select,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_ns87410.c linux-2.6.32.33/drivers/ata/pata_ns87410.c
---- linux-2.6.32.33/drivers/ata/pata_ns87410.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_ns87410.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_ns87410.c linux-2.6.32.35/drivers/ata/pata_ns87410.c
+--- linux-2.6.32.35/drivers/ata/pata_ns87410.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_ns87410.c 2010-12-31 14:46:53.000000000 -0500
@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
ATA_PIO_SHT(DRV_NAME),
};
@@ -22249,9 +22249,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_ns87410.c linux-2.6.32.33/drivers/at
.inherits = &ata_sff_port_ops,
.qc_issue = ns87410_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_ns87415.c linux-2.6.32.33/drivers/ata/pata_ns87415.c
---- linux-2.6.32.33/drivers/ata/pata_ns87415.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_ns87415.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_ns87415.c linux-2.6.32.35/drivers/ata/pata_ns87415.c
+--- linux-2.6.32.35/drivers/ata/pata_ns87415.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_ns87415.c 2010-12-31 14:46:53.000000000 -0500
@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
}
#endif /* 87560 SuperIO Support */
@@ -22270,9 +22270,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_ns87415.c linux-2.6.32.33/drivers/at
.inherits = &ns87415_pata_ops,
.sff_tf_read = ns87560_tf_read,
.sff_check_status = ns87560_check_status,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_octeon_cf.c linux-2.6.32.33/drivers/ata/pata_octeon_cf.c
---- linux-2.6.32.33/drivers/ata/pata_octeon_cf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_octeon_cf.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_octeon_cf.c linux-2.6.32.35/drivers/ata/pata_octeon_cf.c
+--- linux-2.6.32.35/drivers/ata/pata_octeon_cf.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_octeon_cf.c 2010-12-31 14:46:53.000000000 -0500
@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
return 0;
}
@@ -22281,9 +22281,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_octeon_cf.c linux-2.6.32.33/drivers/
static struct ata_port_operations octeon_cf_ops = {
.inherits = &ata_sff_port_ops,
.check_atapi_dma = octeon_cf_check_atapi_dma,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_oldpiix.c linux-2.6.32.33/drivers/ata/pata_oldpiix.c
---- linux-2.6.32.33/drivers/ata/pata_oldpiix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_oldpiix.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_oldpiix.c linux-2.6.32.35/drivers/ata/pata_oldpiix.c
+--- linux-2.6.32.35/drivers/ata/pata_oldpiix.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_oldpiix.c 2010-12-31 14:46:53.000000000 -0500
@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22293,9 +22293,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_oldpiix.c linux-2.6.32.33/drivers/at
.inherits = &ata_bmdma_port_ops,
.qc_issue = oldpiix_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_opti.c linux-2.6.32.33/drivers/ata/pata_opti.c
---- linux-2.6.32.33/drivers/ata/pata_opti.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_opti.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_opti.c linux-2.6.32.35/drivers/ata/pata_opti.c
+--- linux-2.6.32.35/drivers/ata/pata_opti.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_opti.c 2010-12-31 14:46:53.000000000 -0500
@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -22305,9 +22305,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_opti.c linux-2.6.32.33/drivers/ata/p
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = opti_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_optidma.c linux-2.6.32.33/drivers/ata/pata_optidma.c
---- linux-2.6.32.33/drivers/ata/pata_optidma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_optidma.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_optidma.c linux-2.6.32.35/drivers/ata/pata_optidma.c
+--- linux-2.6.32.35/drivers/ata/pata_optidma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_optidma.c 2010-12-31 14:46:53.000000000 -0500
@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22326,9 +22326,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_optidma.c linux-2.6.32.33/drivers/at
.inherits = &optidma_port_ops,
.set_piomode = optiplus_set_pio_mode,
.set_dmamode = optiplus_set_dma_mode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_palmld.c linux-2.6.32.33/drivers/ata/pata_palmld.c
---- linux-2.6.32.33/drivers/ata/pata_palmld.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_palmld.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_palmld.c linux-2.6.32.35/drivers/ata/pata_palmld.c
+--- linux-2.6.32.35/drivers/ata/pata_palmld.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_palmld.c 2010-12-31 14:46:53.000000000 -0500
@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
ATA_PIO_SHT(DRV_NAME),
};
@@ -22338,9 +22338,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_palmld.c linux-2.6.32.33/drivers/ata
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ata_sff_data_xfer_noirq,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_pcmcia.c linux-2.6.32.33/drivers/ata/pata_pcmcia.c
---- linux-2.6.32.33/drivers/ata/pata_pcmcia.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_pcmcia.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_pcmcia.c linux-2.6.32.35/drivers/ata/pata_pcmcia.c
+--- linux-2.6.32.35/drivers/ata/pata_pcmcia.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_pcmcia.c 2010-12-31 14:46:53.000000000 -0500
@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
ATA_PIO_SHT(DRV_NAME),
};
@@ -22367,9 +22367,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_pcmcia.c linux-2.6.32.33/drivers/ata
info = kzalloc(sizeof(*info), GFP_KERNEL);
if (info == NULL)
-diff -urNp linux-2.6.32.33/drivers/ata/pata_pdc2027x.c linux-2.6.32.33/drivers/ata/pata_pdc2027x.c
---- linux-2.6.32.33/drivers/ata/pata_pdc2027x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_pdc2027x.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_pdc2027x.c linux-2.6.32.35/drivers/ata/pata_pdc2027x.c
+--- linux-2.6.32.35/drivers/ata/pata_pdc2027x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_pdc2027x.c 2010-12-31 14:46:53.000000000 -0500
@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22387,9 +22387,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_pdc2027x.c linux-2.6.32.33/drivers/a
.inherits = &pdc2027x_pata100_ops,
.mode_filter = pdc2027x_mode_filter,
.set_piomode = pdc2027x_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.33/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.32.33/drivers/ata/pata_pdc202xx_old.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_pdc202xx_old.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.35/drivers/ata/pata_pdc202xx_old.c
+--- linux-2.6.32.35/drivers/ata/pata_pdc202xx_old.c 2010-09-26 17:26:05.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_pdc202xx_old.c 2010-12-31 14:46:53.000000000 -0500
@@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22408,9 +22408,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.33/drive
.inherits = &pdc2024x_port_ops,
.check_atapi_dma = pdc2026x_check_atapi_dma,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_platform.c linux-2.6.32.33/drivers/ata/pata_platform.c
---- linux-2.6.32.33/drivers/ata/pata_platform.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_platform.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_platform.c linux-2.6.32.35/drivers/ata/pata_platform.c
+--- linux-2.6.32.35/drivers/ata/pata_platform.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_platform.c 2010-12-31 14:46:53.000000000 -0500
@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
ATA_PIO_SHT(DRV_NAME),
};
@@ -22420,9 +22420,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_platform.c linux-2.6.32.33/drivers/a
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ata_sff_data_xfer_noirq,
.cable_detect = ata_cable_unknown,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_qdi.c linux-2.6.32.33/drivers/ata/pata_qdi.c
---- linux-2.6.32.33/drivers/ata/pata_qdi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_qdi.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_qdi.c linux-2.6.32.35/drivers/ata/pata_qdi.c
+--- linux-2.6.32.35/drivers/ata/pata_qdi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_qdi.c 2010-12-31 14:46:53.000000000 -0500
@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
ATA_PIO_SHT(DRV_NAME),
};
@@ -22441,9 +22441,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_qdi.c linux-2.6.32.33/drivers/ata/pa
.inherits = &qdi6500_port_ops,
.set_piomode = qdi6580_set_piomode,
};
-diff -urNp linux-2.6.32.33/drivers/ata/pata_radisys.c linux-2.6.32.33/drivers/ata/pata_radisys.c
---- linux-2.6.32.33/drivers/ata/pata_radisys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_radisys.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_radisys.c linux-2.6.32.35/drivers/ata/pata_radisys.c
+--- linux-2.6.32.35/drivers/ata/pata_radisys.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_radisys.c 2010-12-31 14:46:53.000000000 -0500
@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22453,9 +22453,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_radisys.c linux-2.6.32.33/drivers/at
.inherits = &ata_bmdma_port_ops,
.qc_issue = radisys_qc_issue,
.cable_detect = ata_cable_unknown,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_rb532_cf.c linux-2.6.32.33/drivers/ata/pata_rb532_cf.c
---- linux-2.6.32.33/drivers/ata/pata_rb532_cf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_rb532_cf.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_rb532_cf.c linux-2.6.32.35/drivers/ata/pata_rb532_cf.c
+--- linux-2.6.32.35/drivers/ata/pata_rb532_cf.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_rb532_cf.c 2010-12-31 14:46:53.000000000 -0500
@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
return IRQ_HANDLED;
}
@@ -22465,9 +22465,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_rb532_cf.c linux-2.6.32.33/drivers/a
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ata_sff_data_xfer32,
};
-diff -urNp linux-2.6.32.33/drivers/ata/pata_rdc.c linux-2.6.32.33/drivers/ata/pata_rdc.c
---- linux-2.6.32.33/drivers/ata/pata_rdc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_rdc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_rdc.c linux-2.6.32.35/drivers/ata/pata_rdc.c
+--- linux-2.6.32.35/drivers/ata/pata_rdc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_rdc.c 2010-12-31 14:46:53.000000000 -0500
@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
pci_write_config_byte(dev, 0x48, udma_enable);
}
@@ -22477,9 +22477,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_rdc.c linux-2.6.32.33/drivers/ata/pa
.inherits = &ata_bmdma32_port_ops,
.cable_detect = rdc_pata_cable_detect,
.set_piomode = rdc_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_rz1000.c linux-2.6.32.33/drivers/ata/pata_rz1000.c
---- linux-2.6.32.33/drivers/ata/pata_rz1000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_rz1000.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_rz1000.c linux-2.6.32.35/drivers/ata/pata_rz1000.c
+--- linux-2.6.32.35/drivers/ata/pata_rz1000.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_rz1000.c 2010-12-31 14:46:53.000000000 -0500
@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
ATA_PIO_SHT(DRV_NAME),
};
@@ -22489,9 +22489,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_rz1000.c linux-2.6.32.33/drivers/ata
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_mode = rz1000_set_mode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_sc1200.c linux-2.6.32.33/drivers/ata/pata_sc1200.c
---- linux-2.6.32.33/drivers/ata/pata_sc1200.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_sc1200.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_sc1200.c linux-2.6.32.35/drivers/ata/pata_sc1200.c
+--- linux-2.6.32.35/drivers/ata/pata_sc1200.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_sc1200.c 2010-12-31 14:46:53.000000000 -0500
@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -22501,9 +22501,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_sc1200.c linux-2.6.32.33/drivers/ata
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_sff_dumb_qc_prep,
.qc_issue = sc1200_qc_issue,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_scc.c linux-2.6.32.33/drivers/ata/pata_scc.c
---- linux-2.6.32.33/drivers/ata/pata_scc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_scc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_scc.c linux-2.6.32.35/drivers/ata/pata_scc.c
+--- linux-2.6.32.35/drivers/ata/pata_scc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_scc.c 2010-12-31 14:46:53.000000000 -0500
@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22513,9 +22513,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_scc.c linux-2.6.32.33/drivers/ata/pa
.inherits = &ata_bmdma_port_ops,
.set_piomode = scc_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_sch.c linux-2.6.32.33/drivers/ata/pata_sch.c
---- linux-2.6.32.33/drivers/ata/pata_sch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_sch.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_sch.c linux-2.6.32.35/drivers/ata/pata_sch.c
+--- linux-2.6.32.35/drivers/ata/pata_sch.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_sch.c 2010-12-31 14:46:53.000000000 -0500
@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22525,9 +22525,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_sch.c linux-2.6.32.33/drivers/ata/pa
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_unknown,
.set_piomode = sch_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_serverworks.c linux-2.6.32.33/drivers/ata/pata_serverworks.c
---- linux-2.6.32.33/drivers/ata/pata_serverworks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_serverworks.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_serverworks.c linux-2.6.32.35/drivers/ata/pata_serverworks.c
+--- linux-2.6.32.35/drivers/ata/pata_serverworks.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_serverworks.c 2010-12-31 14:46:53.000000000 -0500
@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22546,9 +22546,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_serverworks.c linux-2.6.32.33/driver
.inherits = &serverworks_osb4_port_ops,
.mode_filter = serverworks_csb_filter,
};
-diff -urNp linux-2.6.32.33/drivers/ata/pata_sil680.c linux-2.6.32.33/drivers/ata/pata_sil680.c
---- linux-2.6.32.33/drivers/ata/pata_sil680.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_sil680.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_sil680.c linux-2.6.32.35/drivers/ata/pata_sil680.c
+--- linux-2.6.32.35/drivers/ata/pata_sil680.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_sil680.c 2010-12-31 14:46:53.000000000 -0500
@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22558,9 +22558,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_sil680.c linux-2.6.32.33/drivers/ata
.inherits = &ata_bmdma32_port_ops,
.cable_detect = sil680_cable_detect,
.set_piomode = sil680_set_piomode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_sis.c linux-2.6.32.33/drivers/ata/pata_sis.c
---- linux-2.6.32.33/drivers/ata/pata_sis.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_sis.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_sis.c linux-2.6.32.35/drivers/ata/pata_sis.c
+--- linux-2.6.32.35/drivers/ata/pata_sis.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_sis.c 2010-12-31 14:46:53.000000000 -0500
@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22616,9 +22616,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_sis.c linux-2.6.32.33/drivers/ata/pa
.inherits = &sis_base_ops,
.set_piomode = sis_old_set_piomode,
.set_dmamode = sis_old_set_dmamode,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_sl82c105.c linux-2.6.32.33/drivers/ata/pata_sl82c105.c
---- linux-2.6.32.33/drivers/ata/pata_sl82c105.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_sl82c105.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_sl82c105.c linux-2.6.32.35/drivers/ata/pata_sl82c105.c
+--- linux-2.6.32.35/drivers/ata/pata_sl82c105.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_sl82c105.c 2010-12-31 14:46:53.000000000 -0500
@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22628,9 +22628,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_sl82c105.c linux-2.6.32.33/drivers/a
.inherits = &ata_bmdma_port_ops,
.qc_defer = sl82c105_qc_defer,
.bmdma_start = sl82c105_bmdma_start,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_triflex.c linux-2.6.32.33/drivers/ata/pata_triflex.c
---- linux-2.6.32.33/drivers/ata/pata_triflex.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_triflex.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_triflex.c linux-2.6.32.35/drivers/ata/pata_triflex.c
+--- linux-2.6.32.35/drivers/ata/pata_triflex.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_triflex.c 2010-12-31 14:46:53.000000000 -0500
@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22640,9 +22640,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_triflex.c linux-2.6.32.33/drivers/at
.inherits = &ata_bmdma_port_ops,
.bmdma_start = triflex_bmdma_start,
.bmdma_stop = triflex_bmdma_stop,
-diff -urNp linux-2.6.32.33/drivers/ata/pata_via.c linux-2.6.32.33/drivers/ata/pata_via.c
---- linux-2.6.32.33/drivers/ata/pata_via.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_via.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_via.c linux-2.6.32.35/drivers/ata/pata_via.c
+--- linux-2.6.32.35/drivers/ata/pata_via.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_via.c 2010-12-31 14:46:53.000000000 -0500
@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22661,9 +22661,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_via.c linux-2.6.32.33/drivers/ata/pa
.inherits = &via_port_ops,
.sff_data_xfer = ata_sff_data_xfer_noirq,
};
-diff -urNp linux-2.6.32.33/drivers/ata/pata_winbond.c linux-2.6.32.33/drivers/ata/pata_winbond.c
---- linux-2.6.32.33/drivers/ata/pata_winbond.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pata_winbond.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pata_winbond.c linux-2.6.32.35/drivers/ata/pata_winbond.c
+--- linux-2.6.32.35/drivers/ata/pata_winbond.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pata_winbond.c 2010-12-31 14:46:53.000000000 -0500
@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
ATA_PIO_SHT(DRV_NAME),
};
@@ -22673,9 +22673,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pata_winbond.c linux-2.6.32.33/drivers/at
.inherits = &ata_sff_port_ops,
.sff_data_xfer = winbond_data_xfer,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.33/drivers/ata/pdc_adma.c linux-2.6.32.33/drivers/ata/pdc_adma.c
---- linux-2.6.32.33/drivers/ata/pdc_adma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/pdc_adma.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/pdc_adma.c linux-2.6.32.35/drivers/ata/pdc_adma.c
+--- linux-2.6.32.35/drivers/ata/pdc_adma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/pdc_adma.c 2010-12-31 14:46:53.000000000 -0500
@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
.dma_boundary = ADMA_DMA_BOUNDARY,
};
@@ -22685,9 +22685,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/pdc_adma.c linux-2.6.32.33/drivers/ata/pd
.inherits = &ata_sff_port_ops,
.lost_interrupt = ATA_OP_NULL,
-diff -urNp linux-2.6.32.33/drivers/ata/sata_fsl.c linux-2.6.32.33/drivers/ata/sata_fsl.c
---- linux-2.6.32.33/drivers/ata/sata_fsl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/sata_fsl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/sata_fsl.c linux-2.6.32.35/drivers/ata/sata_fsl.c
+--- linux-2.6.32.35/drivers/ata/sata_fsl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/sata_fsl.c 2010-12-31 14:46:53.000000000 -0500
@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -22697,9 +22697,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/sata_fsl.c linux-2.6.32.33/drivers/ata/sa
.inherits = &sata_pmp_port_ops,
.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.32.33/drivers/ata/sata_inic162x.c linux-2.6.32.33/drivers/ata/sata_inic162x.c
---- linux-2.6.32.33/drivers/ata/sata_inic162x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/sata_inic162x.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/sata_inic162x.c linux-2.6.32.35/drivers/ata/sata_inic162x.c
+--- linux-2.6.32.35/drivers/ata/sata_inic162x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/sata_inic162x.c 2010-12-31 14:46:53.000000000 -0500
@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
return 0;
}
@@ -22709,9 +22709,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/sata_inic162x.c linux-2.6.32.33/drivers/a
.inherits = &sata_port_ops,
.check_atapi_dma = inic_check_atapi_dma,
-diff -urNp linux-2.6.32.33/drivers/ata/sata_mv.c linux-2.6.32.33/drivers/ata/sata_mv.c
---- linux-2.6.32.33/drivers/ata/sata_mv.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/sata_mv.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/sata_mv.c linux-2.6.32.35/drivers/ata/sata_mv.c
+--- linux-2.6.32.35/drivers/ata/sata_mv.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/sata_mv.c 2010-12-31 14:46:53.000000000 -0500
@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
.dma_boundary = MV_DMA_BOUNDARY,
};
@@ -22739,9 +22739,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/sata_mv.c linux-2.6.32.33/drivers/ata/sat
.inherits = &mv6_ops,
.dev_config = ATA_OP_NULL,
.qc_prep = mv_qc_prep_iie,
-diff -urNp linux-2.6.32.33/drivers/ata/sata_nv.c linux-2.6.32.33/drivers/ata/sata_nv.c
---- linux-2.6.32.33/drivers/ata/sata_nv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/sata_nv.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/sata_nv.c linux-2.6.32.35/drivers/ata/sata_nv.c
+--- linux-2.6.32.35/drivers/ata/sata_nv.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/sata_nv.c 2010-12-31 14:46:53.000000000 -0500
@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
* cases. Define nv_hardreset() which only kicks in for post-boot
* probing and use it for all variants.
@@ -22784,9 +22784,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/sata_nv.c linux-2.6.32.33/drivers/ata/sat
.inherits = &nv_generic_ops,
.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.32.33/drivers/ata/sata_promise.c linux-2.6.32.33/drivers/ata/sata_promise.c
---- linux-2.6.32.33/drivers/ata/sata_promise.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/sata_promise.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/sata_promise.c linux-2.6.32.35/drivers/ata/sata_promise.c
+--- linux-2.6.32.35/drivers/ata/sata_promise.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/sata_promise.c 2010-12-31 14:46:53.000000000 -0500
@@ -195,7 +195,7 @@ static const struct ata_port_operations
.error_handler = pdc_error_handler,
};
@@ -22813,9 +22813,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/sata_promise.c linux-2.6.32.33/drivers/at
.inherits = &pdc_common_ops,
.cable_detect = pdc_pata_cable_detect,
.freeze = pdc_freeze,
-diff -urNp linux-2.6.32.33/drivers/ata/sata_qstor.c linux-2.6.32.33/drivers/ata/sata_qstor.c
---- linux-2.6.32.33/drivers/ata/sata_qstor.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/sata_qstor.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/sata_qstor.c linux-2.6.32.35/drivers/ata/sata_qstor.c
+--- linux-2.6.32.35/drivers/ata/sata_qstor.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/sata_qstor.c 2010-12-31 14:46:53.000000000 -0500
@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
.dma_boundary = QS_DMA_BOUNDARY,
};
@@ -22825,9 +22825,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/sata_qstor.c linux-2.6.32.33/drivers/ata/
.inherits = &ata_sff_port_ops,
.check_atapi_dma = qs_check_atapi_dma,
-diff -urNp linux-2.6.32.33/drivers/ata/sata_sil24.c linux-2.6.32.33/drivers/ata/sata_sil24.c
---- linux-2.6.32.33/drivers/ata/sata_sil24.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/sata_sil24.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/sata_sil24.c linux-2.6.32.35/drivers/ata/sata_sil24.c
+--- linux-2.6.32.35/drivers/ata/sata_sil24.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/sata_sil24.c 2010-12-31 14:46:53.000000000 -0500
@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -22837,9 +22837,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/sata_sil24.c linux-2.6.32.33/drivers/ata/
.inherits = &sata_pmp_port_ops,
.qc_defer = sil24_qc_defer,
-diff -urNp linux-2.6.32.33/drivers/ata/sata_sil.c linux-2.6.32.33/drivers/ata/sata_sil.c
---- linux-2.6.32.33/drivers/ata/sata_sil.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/sata_sil.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/sata_sil.c linux-2.6.32.35/drivers/ata/sata_sil.c
+--- linux-2.6.32.35/drivers/ata/sata_sil.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/sata_sil.c 2010-12-31 14:46:53.000000000 -0500
@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
.sg_tablesize = ATA_MAX_PRD
};
@@ -22849,9 +22849,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/sata_sil.c linux-2.6.32.33/drivers/ata/sa
.inherits = &ata_bmdma32_port_ops,
.dev_config = sil_dev_config,
.set_mode = sil_set_mode,
-diff -urNp linux-2.6.32.33/drivers/ata/sata_sis.c linux-2.6.32.33/drivers/ata/sata_sis.c
---- linux-2.6.32.33/drivers/ata/sata_sis.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/sata_sis.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/sata_sis.c linux-2.6.32.35/drivers/ata/sata_sis.c
+--- linux-2.6.32.35/drivers/ata/sata_sis.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/sata_sis.c 2010-12-31 14:46:53.000000000 -0500
@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22861,9 +22861,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/sata_sis.c linux-2.6.32.33/drivers/ata/sa
.inherits = &ata_bmdma_port_ops,
.scr_read = sis_scr_read,
.scr_write = sis_scr_write,
-diff -urNp linux-2.6.32.33/drivers/ata/sata_svw.c linux-2.6.32.33/drivers/ata/sata_svw.c
---- linux-2.6.32.33/drivers/ata/sata_svw.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/sata_svw.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/sata_svw.c linux-2.6.32.35/drivers/ata/sata_svw.c
+--- linux-2.6.32.35/drivers/ata/sata_svw.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/sata_svw.c 2010-12-31 14:46:53.000000000 -0500
@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
};
@@ -22873,9 +22873,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/sata_svw.c linux-2.6.32.33/drivers/ata/sa
.inherits = &ata_bmdma_port_ops,
.sff_tf_load = k2_sata_tf_load,
.sff_tf_read = k2_sata_tf_read,
-diff -urNp linux-2.6.32.33/drivers/ata/sata_sx4.c linux-2.6.32.33/drivers/ata/sata_sx4.c
---- linux-2.6.32.33/drivers/ata/sata_sx4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/sata_sx4.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/sata_sx4.c linux-2.6.32.35/drivers/ata/sata_sx4.c
+--- linux-2.6.32.35/drivers/ata/sata_sx4.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/sata_sx4.c 2010-12-31 14:46:53.000000000 -0500
@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
};
@@ -22885,9 +22885,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/sata_sx4.c linux-2.6.32.33/drivers/ata/sa
.inherits = &ata_sff_port_ops,
.check_atapi_dma = pdc_check_atapi_dma,
-diff -urNp linux-2.6.32.33/drivers/ata/sata_uli.c linux-2.6.32.33/drivers/ata/sata_uli.c
---- linux-2.6.32.33/drivers/ata/sata_uli.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/sata_uli.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/sata_uli.c linux-2.6.32.35/drivers/ata/sata_uli.c
+--- linux-2.6.32.35/drivers/ata/sata_uli.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/sata_uli.c 2010-12-31 14:46:53.000000000 -0500
@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22897,9 +22897,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/sata_uli.c linux-2.6.32.33/drivers/ata/sa
.inherits = &ata_bmdma_port_ops,
.scr_read = uli_scr_read,
.scr_write = uli_scr_write,
-diff -urNp linux-2.6.32.33/drivers/ata/sata_via.c linux-2.6.32.33/drivers/ata/sata_via.c
---- linux-2.6.32.33/drivers/ata/sata_via.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/sata_via.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/sata_via.c linux-2.6.32.35/drivers/ata/sata_via.c
+--- linux-2.6.32.35/drivers/ata/sata_via.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/sata_via.c 2010-12-31 14:46:53.000000000 -0500
@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22937,9 +22937,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/sata_via.c linux-2.6.32.33/drivers/ata/sa
.inherits = &svia_base_ops,
.hardreset = sata_std_hardreset,
.scr_read = vt8251_scr_read,
-diff -urNp linux-2.6.32.33/drivers/ata/sata_vsc.c linux-2.6.32.33/drivers/ata/sata_vsc.c
---- linux-2.6.32.33/drivers/ata/sata_vsc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ata/sata_vsc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ata/sata_vsc.c linux-2.6.32.35/drivers/ata/sata_vsc.c
+--- linux-2.6.32.35/drivers/ata/sata_vsc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ata/sata_vsc.c 2010-12-31 14:46:53.000000000 -0500
@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
};
@@ -22949,9 +22949,9 @@ diff -urNp linux-2.6.32.33/drivers/ata/sata_vsc.c linux-2.6.32.33/drivers/ata/sa
.inherits = &ata_bmdma_port_ops,
/* The IRQ handling is not quite standard SFF behaviour so we
cannot use the default lost interrupt handler */
-diff -urNp linux-2.6.32.33/drivers/atm/adummy.c linux-2.6.32.33/drivers/atm/adummy.c
---- linux-2.6.32.33/drivers/atm/adummy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/adummy.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/adummy.c linux-2.6.32.35/drivers/atm/adummy.c
+--- linux-2.6.32.35/drivers/atm/adummy.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/adummy.c 2010-12-31 14:46:53.000000000 -0500
@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
vcc->pop(vcc, skb);
else
@@ -22961,9 +22961,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/adummy.c linux-2.6.32.33/drivers/atm/adum
return 0;
}
-diff -urNp linux-2.6.32.33/drivers/atm/ambassador.c linux-2.6.32.33/drivers/atm/ambassador.c
---- linux-2.6.32.33/drivers/atm/ambassador.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/ambassador.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/ambassador.c linux-2.6.32.35/drivers/atm/ambassador.c
+--- linux-2.6.32.35/drivers/atm/ambassador.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/ambassador.c 2010-12-31 14:46:53.000000000 -0500
@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
@@ -23000,9 +23000,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/ambassador.c linux-2.6.32.33/drivers/atm/
return -ENOMEM; // ?
}
-diff -urNp linux-2.6.32.33/drivers/atm/atmtcp.c linux-2.6.32.33/drivers/atm/atmtcp.c
---- linux-2.6.32.33/drivers/atm/atmtcp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/atmtcp.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/atmtcp.c linux-2.6.32.35/drivers/atm/atmtcp.c
+--- linux-2.6.32.35/drivers/atm/atmtcp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/atmtcp.c 2010-12-31 14:46:53.000000000 -0500
@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
@@ -23052,9 +23052,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/atmtcp.c linux-2.6.32.33/drivers/atm/atmt
done:
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
-diff -urNp linux-2.6.32.33/drivers/atm/eni.c linux-2.6.32.33/drivers/atm/eni.c
---- linux-2.6.32.33/drivers/atm/eni.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/eni.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/eni.c linux-2.6.32.35/drivers/atm/eni.c
+--- linux-2.6.32.35/drivers/atm/eni.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/eni.c 2010-12-31 14:46:53.000000000 -0500
@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
vcc->dev->number);
@@ -23100,9 +23100,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/eni.c linux-2.6.32.33/drivers/atm/eni.c
wake_up(&eni_dev->tx_wait);
dma_complete++;
}
-diff -urNp linux-2.6.32.33/drivers/atm/firestream.c linux-2.6.32.33/drivers/atm/firestream.c
---- linux-2.6.32.33/drivers/atm/firestream.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/firestream.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/firestream.c linux-2.6.32.35/drivers/atm/firestream.c
+--- linux-2.6.32.35/drivers/atm/firestream.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/firestream.c 2010-12-31 14:46:53.000000000 -0500
@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
}
}
@@ -23136,9 +23136,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/firestream.c linux-2.6.32.33/drivers/atm/
break;
default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
-diff -urNp linux-2.6.32.33/drivers/atm/fore200e.c linux-2.6.32.33/drivers/atm/fore200e.c
---- linux-2.6.32.33/drivers/atm/fore200e.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/fore200e.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/fore200e.c linux-2.6.32.35/drivers/atm/fore200e.c
+--- linux-2.6.32.35/drivers/atm/fore200e.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/fore200e.c 2010-12-31 14:46:53.000000000 -0500
@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
#endif
/* check error condition */
@@ -23195,9 +23195,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/fore200e.c linux-2.6.32.33/drivers/atm/fo
fore200e->tx_sat++;
DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff -urNp linux-2.6.32.33/drivers/atm/he.c linux-2.6.32.33/drivers/atm/he.c
---- linux-2.6.32.33/drivers/atm/he.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/he.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/he.c linux-2.6.32.35/drivers/atm/he.c
+--- linux-2.6.32.35/drivers/atm/he.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/he.c 2010-12-31 14:46:53.000000000 -0500
@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -23279,9 +23279,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/he.c linux-2.6.32.33/drivers/atm/he.c
return 0;
}
-diff -urNp linux-2.6.32.33/drivers/atm/horizon.c linux-2.6.32.33/drivers/atm/horizon.c
---- linux-2.6.32.33/drivers/atm/horizon.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/horizon.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/horizon.c linux-2.6.32.35/drivers/atm/horizon.c
+--- linux-2.6.32.35/drivers/atm/horizon.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/horizon.c 2010-12-31 14:46:53.000000000 -0500
@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
{
struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -23300,9 +23300,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/horizon.c linux-2.6.32.33/drivers/atm/hor
// free the skb
hrz_kfree_skb (skb);
-diff -urNp linux-2.6.32.33/drivers/atm/idt77252.c linux-2.6.32.33/drivers/atm/idt77252.c
---- linux-2.6.32.33/drivers/atm/idt77252.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/idt77252.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/idt77252.c linux-2.6.32.35/drivers/atm/idt77252.c
+--- linux-2.6.32.35/drivers/atm/idt77252.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/idt77252.c 2010-12-31 14:46:53.000000000 -0500
@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
else
dev_kfree_skb(skb);
@@ -23457,9 +23457,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/idt77252.c linux-2.6.32.33/drivers/atm/id
return -ENOMEM;
}
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-2.6.32.33/drivers/atm/iphase.c linux-2.6.32.33/drivers/atm/iphase.c
---- linux-2.6.32.33/drivers/atm/iphase.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/iphase.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/iphase.c linux-2.6.32.35/drivers/atm/iphase.c
+--- linux-2.6.32.35/drivers/atm/iphase.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/iphase.c 2010-12-31 14:46:53.000000000 -0500
@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)
status = (u_short) (buf_desc_ptr->desc_mode);
if (status & (RX_CER | RX_PTE | RX_OFL))
@@ -23556,9 +23556,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/iphase.c linux-2.6.32.33/drivers/atm/ipha
if (iavcc->vc_desc_cnt > 10) {
vcc->tx_quota = vcc->tx_quota * 3 / 4;
printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
-diff -urNp linux-2.6.32.33/drivers/atm/lanai.c linux-2.6.32.33/drivers/atm/lanai.c
---- linux-2.6.32.33/drivers/atm/lanai.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/lanai.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/lanai.c linux-2.6.32.35/drivers/atm/lanai.c
+--- linux-2.6.32.35/drivers/atm/lanai.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/lanai.c 2010-12-31 14:46:53.000000000 -0500
@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
lanai_endtx(lanai, lvcc);
@@ -23613,9 +23613,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/lanai.c linux-2.6.32.33/drivers/atm/lanai
lvcc->stats.x.aal5.service_rxcrc++;
lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
-diff -urNp linux-2.6.32.33/drivers/atm/nicstar.c linux-2.6.32.33/drivers/atm/nicstar.c
---- linux-2.6.32.33/drivers/atm/nicstar.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/nicstar.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/nicstar.c linux-2.6.32.35/drivers/atm/nicstar.c
+--- linux-2.6.32.35/drivers/atm/nicstar.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/nicstar.c 2010-12-31 14:46:53.000000000 -0500
@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
if ((vc = (vc_map *) vcc->dev_data) == NULL)
{
@@ -23818,9 +23818,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/nicstar.c linux-2.6.32.33/drivers/atm/nic
}
}
-diff -urNp linux-2.6.32.33/drivers/atm/solos-pci.c linux-2.6.32.33/drivers/atm/solos-pci.c
---- linux-2.6.32.33/drivers/atm/solos-pci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/solos-pci.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/solos-pci.c linux-2.6.32.35/drivers/atm/solos-pci.c
+--- linux-2.6.32.35/drivers/atm/solos-pci.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/solos-pci.c 2010-12-31 14:46:53.000000000 -0500
@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
}
atm_charge(vcc, skb->truesize);
@@ -23839,9 +23839,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/solos-pci.c linux-2.6.32.33/drivers/atm/s
solos_pop(vcc, oldskb);
} else
dev_kfree_skb_irq(oldskb);
-diff -urNp linux-2.6.32.33/drivers/atm/suni.c linux-2.6.32.33/drivers/atm/suni.c
---- linux-2.6.32.33/drivers/atm/suni.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/suni.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/suni.c linux-2.6.32.35/drivers/atm/suni.c
+--- linux-2.6.32.35/drivers/atm/suni.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/suni.c 2010-12-31 14:46:53.000000000 -0500
@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
@@ -23853,9 +23853,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/suni.c linux-2.6.32.33/drivers/atm/suni.c
static void suni_hz(unsigned long from_timer)
-diff -urNp linux-2.6.32.33/drivers/atm/uPD98402.c linux-2.6.32.33/drivers/atm/uPD98402.c
---- linux-2.6.32.33/drivers/atm/uPD98402.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/uPD98402.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/uPD98402.c linux-2.6.32.35/drivers/atm/uPD98402.c
+--- linux-2.6.32.35/drivers/atm/uPD98402.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/uPD98402.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
struct sonet_stats tmp;
int error = 0;
@@ -23900,9 +23900,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/uPD98402.c linux-2.6.32.33/drivers/atm/uP
return 0;
}
-diff -urNp linux-2.6.32.33/drivers/atm/zatm.c linux-2.6.32.33/drivers/atm/zatm.c
---- linux-2.6.32.33/drivers/atm/zatm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/atm/zatm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/atm/zatm.c linux-2.6.32.35/drivers/atm/zatm.c
+--- linux-2.6.32.35/drivers/atm/zatm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/atm/zatm.c 2010-12-31 14:46:53.000000000 -0500
@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
}
if (!size) {
@@ -23930,9 +23930,9 @@ diff -urNp linux-2.6.32.33/drivers/atm/zatm.c linux-2.6.32.33/drivers/atm/zatm.c
wake_up(&zatm_vcc->tx_wait);
}
-diff -urNp linux-2.6.32.33/drivers/base/bus.c linux-2.6.32.33/drivers/base/bus.c
---- linux-2.6.32.33/drivers/base/bus.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/base/bus.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/base/bus.c linux-2.6.32.35/drivers/base/bus.c
+--- linux-2.6.32.35/drivers/base/bus.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/base/bus.c 2010-12-31 14:46:53.000000000 -0500
@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
return ret;
}
@@ -23960,9 +23960,9 @@ diff -urNp linux-2.6.32.33/drivers/base/bus.c linux-2.6.32.33/drivers/base/bus.c
.filter = bus_uevent_filter,
};
-diff -urNp linux-2.6.32.33/drivers/base/class.c linux-2.6.32.33/drivers/base/class.c
---- linux-2.6.32.33/drivers/base/class.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/base/class.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/base/class.c linux-2.6.32.35/drivers/base/class.c
+--- linux-2.6.32.35/drivers/base/class.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/base/class.c 2010-12-31 14:46:53.000000000 -0500
@@ -63,7 +63,7 @@ static void class_release(struct kobject
kfree(cp);
}
@@ -23972,9 +23972,9 @@ diff -urNp linux-2.6.32.33/drivers/base/class.c linux-2.6.32.33/drivers/base/cla
.show = class_attr_show,
.store = class_attr_store,
};
-diff -urNp linux-2.6.32.33/drivers/base/core.c linux-2.6.32.33/drivers/base/core.c
---- linux-2.6.32.33/drivers/base/core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/base/core.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/base/core.c linux-2.6.32.35/drivers/base/core.c
+--- linux-2.6.32.35/drivers/base/core.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/base/core.c 2010-12-31 14:46:53.000000000 -0500
@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
return ret;
}
@@ -23993,9 +23993,9 @@ diff -urNp linux-2.6.32.33/drivers/base/core.c linux-2.6.32.33/drivers/base/core
.filter = dev_uevent_filter,
.name = dev_uevent_name,
.uevent = dev_uevent,
-diff -urNp linux-2.6.32.33/drivers/base/memory.c linux-2.6.32.33/drivers/base/memory.c
---- linux-2.6.32.33/drivers/base/memory.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/base/memory.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/base/memory.c linux-2.6.32.35/drivers/base/memory.c
+--- linux-2.6.32.35/drivers/base/memory.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/base/memory.c 2010-12-31 14:46:53.000000000 -0500
@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
return retval;
}
@@ -24005,9 +24005,9 @@ diff -urNp linux-2.6.32.33/drivers/base/memory.c linux-2.6.32.33/drivers/base/me
.name = memory_uevent_name,
.uevent = memory_uevent,
};
-diff -urNp linux-2.6.32.33/drivers/base/sys.c linux-2.6.32.33/drivers/base/sys.c
---- linux-2.6.32.33/drivers/base/sys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/base/sys.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/base/sys.c linux-2.6.32.35/drivers/base/sys.c
+--- linux-2.6.32.35/drivers/base/sys.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/base/sys.c 2010-12-31 14:46:53.000000000 -0500
@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
return -EIO;
}
@@ -24026,9 +24026,9 @@ diff -urNp linux-2.6.32.33/drivers/base/sys.c linux-2.6.32.33/drivers/base/sys.c
.show = sysdev_class_show,
.store = sysdev_class_store,
};
-diff -urNp linux-2.6.32.33/drivers/block/cciss.c linux-2.6.32.33/drivers/block/cciss.c
---- linux-2.6.32.33/drivers/block/cciss.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/block/cciss.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/block/cciss.c linux-2.6.32.35/drivers/block/cciss.c
+--- linux-2.6.32.35/drivers/block/cciss.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/block/cciss.c 2010-12-31 14:46:53.000000000 -0500
@@ -1011,6 +1011,8 @@ static int cciss_ioctl32_passthru(struct
int err;
u32 cp;
@@ -24038,9 +24038,9 @@ diff -urNp linux-2.6.32.33/drivers/block/cciss.c linux-2.6.32.33/drivers/block/c
err = 0;
err |=
copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
-diff -urNp linux-2.6.32.33/drivers/block/pktcdvd.c linux-2.6.32.33/drivers/block/pktcdvd.c
---- linux-2.6.32.33/drivers/block/pktcdvd.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/block/pktcdvd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/block/pktcdvd.c linux-2.6.32.35/drivers/block/pktcdvd.c
+--- linux-2.6.32.35/drivers/block/pktcdvd.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/drivers/block/pktcdvd.c 2010-12-31 14:46:53.000000000 -0500
@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
return len;
}
@@ -24050,9 +24050,9 @@ diff -urNp linux-2.6.32.33/drivers/block/pktcdvd.c linux-2.6.32.33/drivers/block
.show = kobj_pkt_show,
.store = kobj_pkt_store
};
-diff -urNp linux-2.6.32.33/drivers/char/agp/frontend.c linux-2.6.32.33/drivers/char/agp/frontend.c
---- linux-2.6.32.33/drivers/char/agp/frontend.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/agp/frontend.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/agp/frontend.c linux-2.6.32.35/drivers/char/agp/frontend.c
+--- linux-2.6.32.35/drivers/char/agp/frontend.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/agp/frontend.c 2010-12-31 14:46:53.000000000 -0500
@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
return -EFAULT;
@@ -24062,9 +24062,9 @@ diff -urNp linux-2.6.32.33/drivers/char/agp/frontend.c linux-2.6.32.33/drivers/c
return -EFAULT;
client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-2.6.32.33/drivers/char/agp/intel-agp.c linux-2.6.32.33/drivers/char/agp/intel-agp.c
---- linux-2.6.32.33/drivers/char/agp/intel-agp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/agp/intel-agp.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/agp/intel-agp.c linux-2.6.32.35/drivers/char/agp/intel-agp.c
+--- linux-2.6.32.35/drivers/char/agp/intel-agp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/agp/intel-agp.c 2010-12-31 14:46:53.000000000 -0500
@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc
ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
@@ -24074,9 +24074,9 @@ diff -urNp linux-2.6.32.33/drivers/char/agp/intel-agp.c linux-2.6.32.33/drivers/
};
MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
-diff -urNp linux-2.6.32.33/drivers/char/hpet.c linux-2.6.32.33/drivers/char/hpet.c
---- linux-2.6.32.33/drivers/char/hpet.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/drivers/char/hpet.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/hpet.c linux-2.6.32.35/drivers/char/hpet.c
+--- linux-2.6.32.35/drivers/char/hpet.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/drivers/char/hpet.c 2010-12-31 14:46:53.000000000 -0500
@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
return 0;
}
@@ -24118,9 +24118,9 @@ diff -urNp linux-2.6.32.33/drivers/char/hpet.c linux-2.6.32.33/drivers/char/hpet
static int __init hpet_init(void)
{
-diff -urNp linux-2.6.32.33/drivers/char/hvc_beat.c linux-2.6.32.33/drivers/char/hvc_beat.c
---- linux-2.6.32.33/drivers/char/hvc_beat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/hvc_beat.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/hvc_beat.c linux-2.6.32.35/drivers/char/hvc_beat.c
+--- linux-2.6.32.35/drivers/char/hvc_beat.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/hvc_beat.c 2010-12-31 14:46:53.000000000 -0500
@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
return cnt;
}
@@ -24130,9 +24130,9 @@ diff -urNp linux-2.6.32.33/drivers/char/hvc_beat.c linux-2.6.32.33/drivers/char/
.get_chars = hvc_beat_get_chars,
.put_chars = hvc_beat_put_chars,
};
-diff -urNp linux-2.6.32.33/drivers/char/hvc_console.c linux-2.6.32.33/drivers/char/hvc_console.c
---- linux-2.6.32.33/drivers/char/hvc_console.c 2011-01-11 23:55:35.000000000 -0500
-+++ linux-2.6.32.33/drivers/char/hvc_console.c 2011-01-11 23:56:03.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/hvc_console.c linux-2.6.32.35/drivers/char/hvc_console.c
+--- linux-2.6.32.35/drivers/char/hvc_console.c 2011-01-11 23:55:35.000000000 -0500
++++ linux-2.6.32.35/drivers/char/hvc_console.c 2011-01-11 23:56:03.000000000 -0500
@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
* console interfaces but can still be used as a tty device. This has to be
* static because kmalloc will not work during early console init.
@@ -24160,9 +24160,9 @@ diff -urNp linux-2.6.32.33/drivers/char/hvc_console.c linux-2.6.32.33/drivers/ch
{
struct hvc_struct *hp;
int i;
-diff -urNp linux-2.6.32.33/drivers/char/hvc_console.h linux-2.6.32.33/drivers/char/hvc_console.h
---- linux-2.6.32.33/drivers/char/hvc_console.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/hvc_console.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/hvc_console.h linux-2.6.32.35/drivers/char/hvc_console.h
+--- linux-2.6.32.35/drivers/char/hvc_console.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/hvc_console.h 2010-12-31 14:46:53.000000000 -0500
@@ -55,7 +55,7 @@ struct hvc_struct {
int outbuf_size;
int n_outbuf;
@@ -24186,9 +24186,9 @@ diff -urNp linux-2.6.32.33/drivers/char/hvc_console.h linux-2.6.32.33/drivers/ch
/* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
extern int hvc_remove(struct hvc_struct *hp);
-diff -urNp linux-2.6.32.33/drivers/char/hvc_iseries.c linux-2.6.32.33/drivers/char/hvc_iseries.c
---- linux-2.6.32.33/drivers/char/hvc_iseries.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/hvc_iseries.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/hvc_iseries.c linux-2.6.32.35/drivers/char/hvc_iseries.c
+--- linux-2.6.32.35/drivers/char/hvc_iseries.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/hvc_iseries.c 2010-12-31 14:46:53.000000000 -0500
@@ -197,7 +197,7 @@ done:
return sent;
}
@@ -24198,9 +24198,9 @@ diff -urNp linux-2.6.32.33/drivers/char/hvc_iseries.c linux-2.6.32.33/drivers/ch
.get_chars = get_chars,
.put_chars = put_chars,
.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.33/drivers/char/hvc_iucv.c linux-2.6.32.33/drivers/char/hvc_iucv.c
---- linux-2.6.32.33/drivers/char/hvc_iucv.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/char/hvc_iucv.c 2011-02-22 15:57:23.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/hvc_iucv.c linux-2.6.32.35/drivers/char/hvc_iucv.c
+--- linux-2.6.32.35/drivers/char/hvc_iucv.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/drivers/char/hvc_iucv.c 2011-02-22 15:57:23.000000000 -0500
@@ -924,7 +924,7 @@ static int hvc_iucv_pm_restore_thaw(stru
@@ -24210,9 +24210,9 @@ diff -urNp linux-2.6.32.33/drivers/char/hvc_iucv.c linux-2.6.32.33/drivers/char/
.get_chars = hvc_iucv_get_chars,
.put_chars = hvc_iucv_put_chars,
.notifier_add = hvc_iucv_notifier_add,
-diff -urNp linux-2.6.32.33/drivers/char/hvc_rtas.c linux-2.6.32.33/drivers/char/hvc_rtas.c
---- linux-2.6.32.33/drivers/char/hvc_rtas.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/hvc_rtas.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/hvc_rtas.c linux-2.6.32.35/drivers/char/hvc_rtas.c
+--- linux-2.6.32.35/drivers/char/hvc_rtas.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/hvc_rtas.c 2010-12-31 14:46:53.000000000 -0500
@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
return i;
}
@@ -24222,9 +24222,9 @@ diff -urNp linux-2.6.32.33/drivers/char/hvc_rtas.c linux-2.6.32.33/drivers/char/
.get_chars = hvc_rtas_read_console,
.put_chars = hvc_rtas_write_console,
};
-diff -urNp linux-2.6.32.33/drivers/char/hvcs.c linux-2.6.32.33/drivers/char/hvcs.c
---- linux-2.6.32.33/drivers/char/hvcs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/hvcs.c 2011-01-25 20:24:47.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/hvcs.c linux-2.6.32.35/drivers/char/hvcs.c
+--- linux-2.6.32.35/drivers/char/hvcs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/hvcs.c 2011-01-25 20:24:47.000000000 -0500
@@ -82,6 +82,7 @@
#include <asm/hvcserver.h>
#include <asm/uaccess.h>
@@ -24327,9 +24327,9 @@ diff -urNp linux-2.6.32.33/drivers/char/hvcs.c linux-2.6.32.33/drivers/char/hvcs
return 0;
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.32.33/drivers/char/hvc_udbg.c linux-2.6.32.33/drivers/char/hvc_udbg.c
---- linux-2.6.32.33/drivers/char/hvc_udbg.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/hvc_udbg.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/hvc_udbg.c linux-2.6.32.35/drivers/char/hvc_udbg.c
+--- linux-2.6.32.35/drivers/char/hvc_udbg.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/hvc_udbg.c 2010-12-31 14:46:53.000000000 -0500
@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
return i;
}
@@ -24339,9 +24339,9 @@ diff -urNp linux-2.6.32.33/drivers/char/hvc_udbg.c linux-2.6.32.33/drivers/char/
.get_chars = hvc_udbg_get,
.put_chars = hvc_udbg_put,
};
-diff -urNp linux-2.6.32.33/drivers/char/hvc_vio.c linux-2.6.32.33/drivers/char/hvc_vio.c
---- linux-2.6.32.33/drivers/char/hvc_vio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/hvc_vio.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/hvc_vio.c linux-2.6.32.35/drivers/char/hvc_vio.c
+--- linux-2.6.32.35/drivers/char/hvc_vio.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/hvc_vio.c 2010-12-31 14:46:53.000000000 -0500
@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
return got;
}
@@ -24351,9 +24351,9 @@ diff -urNp linux-2.6.32.33/drivers/char/hvc_vio.c linux-2.6.32.33/drivers/char/h
.get_chars = filtered_get_chars,
.put_chars = hvc_put_chars,
.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.33/drivers/char/hvc_xen.c linux-2.6.32.33/drivers/char/hvc_xen.c
---- linux-2.6.32.33/drivers/char/hvc_xen.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/hvc_xen.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/hvc_xen.c linux-2.6.32.35/drivers/char/hvc_xen.c
+--- linux-2.6.32.35/drivers/char/hvc_xen.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/hvc_xen.c 2010-12-31 14:46:53.000000000 -0500
@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
return recv;
}
@@ -24363,9 +24363,9 @@ diff -urNp linux-2.6.32.33/drivers/char/hvc_xen.c linux-2.6.32.33/drivers/char/h
.get_chars = read_console,
.put_chars = write_console,
.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.33/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.33/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.32.33/drivers/char/ipmi/ipmi_msghandler.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/ipmi/ipmi_msghandler.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.35/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-2.6.32.35/drivers/char/ipmi/ipmi_msghandler.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/ipmi/ipmi_msghandler.c 2010-12-31 14:46:53.000000000 -0500
@@ -414,7 +414,7 @@ struct ipmi_smi {
struct proc_dir_entry *proc_dir;
char proc_dir_name[10];
@@ -24396,9 +24396,9 @@ diff -urNp linux-2.6.32.33/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.33/d
intf->proc_dir = NULL;
-diff -urNp linux-2.6.32.33/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.33/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.32.33/drivers/char/ipmi/ipmi_si_intf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/ipmi/ipmi_si_intf.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.35/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-2.6.32.35/drivers/char/ipmi/ipmi_si_intf.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/ipmi/ipmi_si_intf.c 2010-12-31 14:46:53.000000000 -0500
@@ -277,7 +277,7 @@ struct smi_info {
unsigned char slave_addr;
@@ -24429,9 +24429,9 @@ diff -urNp linux-2.6.32.33/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.33/driv
new_smi->interrupt_disabled = 0;
atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-2.6.32.33/drivers/char/keyboard.c linux-2.6.32.33/drivers/char/keyboard.c
---- linux-2.6.32.33/drivers/char/keyboard.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/keyboard.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/keyboard.c linux-2.6.32.35/drivers/char/keyboard.c
+--- linux-2.6.32.35/drivers/char/keyboard.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/keyboard.c 2010-12-31 14:46:53.000000000 -0500
@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
kbd->kbdmode == VC_MEDIUMRAW) &&
value != KVAL(K_SAK))
@@ -24458,9 +24458,9 @@ diff -urNp linux-2.6.32.33/drivers/char/keyboard.c linux-2.6.32.33/drivers/char/
};
MODULE_DEVICE_TABLE(input, kbd_ids);
-diff -urNp linux-2.6.32.33/drivers/char/mem.c linux-2.6.32.33/drivers/char/mem.c
---- linux-2.6.32.33/drivers/char/mem.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/mem.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/mem.c linux-2.6.32.35/drivers/char/mem.c
+--- linux-2.6.32.35/drivers/char/mem.c 2010-09-26 17:26:05.000000000 -0400
++++ linux-2.6.32.35/drivers/char/mem.c 2010-12-31 14:46:53.000000000 -0500
@@ -18,6 +18,7 @@
#include <linux/raw.h>
#include <linux/tty.h>
@@ -24637,9 +24637,9 @@ diff -urNp linux-2.6.32.33/drivers/char/mem.c linux-2.6.32.33/drivers/char/mem.c
};
static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-2.6.32.33/drivers/char/nvram.c linux-2.6.32.33/drivers/char/nvram.c
---- linux-2.6.32.33/drivers/char/nvram.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/nvram.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/nvram.c linux-2.6.32.35/drivers/char/nvram.c
+--- linux-2.6.32.35/drivers/char/nvram.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/nvram.c 2010-12-31 14:46:53.000000000 -0500
@@ -435,7 +435,10 @@ static const struct file_operations nvra
static struct miscdevice nvram_dev = {
NVRAM_MINOR,
@@ -24652,9 +24652,9 @@ diff -urNp linux-2.6.32.33/drivers/char/nvram.c linux-2.6.32.33/drivers/char/nvr
};
static int __init nvram_init(void)
-diff -urNp linux-2.6.32.33/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.33/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.32.33/drivers/char/pcmcia/ipwireless/tty.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/pcmcia/ipwireless/tty.c 2011-01-25 20:24:47.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.35/drivers/char/pcmcia/ipwireless/tty.c
+--- linux-2.6.32.35/drivers/char/pcmcia/ipwireless/tty.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/pcmcia/ipwireless/tty.c 2011-01-25 20:24:47.000000000 -0500
@@ -29,6 +29,7 @@
#include <linux/tty_driver.h>
#include <linux/tty_flip.h>
@@ -24777,9 +24777,9 @@ diff -urNp linux-2.6.32.33/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.33/
do_ipw_close(ttyj);
ipwireless_disassociate_network_ttys(network,
ttyj->channel_idx);
-diff -urNp linux-2.6.32.33/drivers/char/pty.c linux-2.6.32.33/drivers/char/pty.c
---- linux-2.6.32.33/drivers/char/pty.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/pty.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/pty.c linux-2.6.32.35/drivers/char/pty.c
+--- linux-2.6.32.35/drivers/char/pty.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/pty.c 2010-12-31 14:46:53.000000000 -0500
@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
return ret;
}
@@ -24810,9 +24810,9 @@ diff -urNp linux-2.6.32.33/drivers/char/pty.c linux-2.6.32.33/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.33/drivers/char/random.c linux-2.6.32.33/drivers/char/random.c
---- linux-2.6.32.33/drivers/char/random.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/random.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/random.c linux-2.6.32.35/drivers/char/random.c
+--- linux-2.6.32.35/drivers/char/random.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/random.c 2010-12-31 14:46:53.000000000 -0500
@@ -254,8 +254,13 @@
/*
* Configuration information
@@ -24854,9 +24854,9 @@ diff -urNp linux-2.6.32.33/drivers/char/random.c linux-2.6.32.33/drivers/char/ra
static int max_write_thresh = INPUT_POOL_WORDS * 32;
static char sysctl_bootid[16];
-diff -urNp linux-2.6.32.33/drivers/char/sonypi.c linux-2.6.32.33/drivers/char/sonypi.c
---- linux-2.6.32.33/drivers/char/sonypi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/sonypi.c 2011-01-25 20:24:47.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/sonypi.c linux-2.6.32.35/drivers/char/sonypi.c
+--- linux-2.6.32.35/drivers/char/sonypi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/sonypi.c 2011-01-25 20:24:47.000000000 -0500
@@ -55,6 +55,7 @@
#include <asm/uaccess.h>
#include <asm/io.h>
@@ -24895,9 +24895,9 @@ diff -urNp linux-2.6.32.33/drivers/char/sonypi.c linux-2.6.32.33/drivers/char/so
mutex_unlock(&sonypi_device.lock);
unlock_kernel();
return 0;
-diff -urNp linux-2.6.32.33/drivers/char/tpm/tpm_bios.c linux-2.6.32.33/drivers/char/tpm/tpm_bios.c
---- linux-2.6.32.33/drivers/char/tpm/tpm_bios.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/tpm/tpm_bios.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/tpm/tpm_bios.c linux-2.6.32.35/drivers/char/tpm/tpm_bios.c
+--- linux-2.6.32.35/drivers/char/tpm/tpm_bios.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/tpm/tpm_bios.c 2010-12-31 14:46:53.000000000 -0500
@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
event = addr;
@@ -24938,9 +24938,9 @@ diff -urNp linux-2.6.32.33/drivers/char/tpm/tpm_bios.c linux-2.6.32.33/drivers/c
memcpy(log->bios_event_log, virt, len);
-diff -urNp linux-2.6.32.33/drivers/char/tpm/tpm.c linux-2.6.32.33/drivers/char/tpm/tpm.c
---- linux-2.6.32.33/drivers/char/tpm/tpm.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/char/tpm/tpm.c 2011-02-27 14:53:10.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/tpm/tpm.c linux-2.6.32.35/drivers/char/tpm/tpm.c
+--- linux-2.6.32.35/drivers/char/tpm/tpm.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/drivers/char/tpm/tpm.c 2011-02-27 14:53:10.000000000 -0500
@@ -402,7 +402,7 @@ static ssize_t tpm_transmit(struct tpm_c
chip->vendor.req_complete_val)
goto out_recv;
@@ -24950,9 +24950,9 @@ diff -urNp linux-2.6.32.33/drivers/char/tpm/tpm.c linux-2.6.32.33/drivers/char/t
dev_err(chip->dev, "Operation Canceled\n");
rc = -ECANCELED;
goto out;
-diff -urNp linux-2.6.32.33/drivers/char/tty_io.c linux-2.6.32.33/drivers/char/tty_io.c
---- linux-2.6.32.33/drivers/char/tty_io.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/tty_io.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/tty_io.c linux-2.6.32.35/drivers/char/tty_io.c
+--- linux-2.6.32.35/drivers/char/tty_io.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/tty_io.c 2010-12-31 14:46:53.000000000 -0500
@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
DEFINE_MUTEX(tty_mutex);
EXPORT_SYMBOL(tty_mutex);
@@ -25091,9 +25091,9 @@ diff -urNp linux-2.6.32.33/drivers/char/tty_io.c linux-2.6.32.33/drivers/char/tt
/*
* 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.33/drivers/char/tty_ldisc.c linux-2.6.32.33/drivers/char/tty_ldisc.c
---- linux-2.6.32.33/drivers/char/tty_ldisc.c 2011-01-11 23:55:35.000000000 -0500
-+++ linux-2.6.32.33/drivers/char/tty_ldisc.c 2011-01-11 23:56:03.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/tty_ldisc.c linux-2.6.32.35/drivers/char/tty_ldisc.c
+--- linux-2.6.32.35/drivers/char/tty_ldisc.c 2011-01-11 23:55:35.000000000 -0500
++++ linux-2.6.32.35/drivers/char/tty_ldisc.c 2011-01-11 23:56:03.000000000 -0500
@@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc *
if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
struct tty_ldisc_ops *ldo = ld->ops;
@@ -25139,9 +25139,9 @@ diff -urNp linux-2.6.32.33/drivers/char/tty_ldisc.c linux-2.6.32.33/drivers/char
module_put(ldops->owner);
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
}
-diff -urNp linux-2.6.32.33/drivers/char/virtio_console.c linux-2.6.32.33/drivers/char/virtio_console.c
---- linux-2.6.32.33/drivers/char/virtio_console.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/virtio_console.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/virtio_console.c linux-2.6.32.35/drivers/char/virtio_console.c
+--- linux-2.6.32.35/drivers/char/virtio_console.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/virtio_console.c 2010-12-31 14:46:53.000000000 -0500
@@ -44,6 +44,7 @@ static unsigned int in_len;
static char *in, *inbuf;
@@ -25150,9 +25150,9 @@ diff -urNp linux-2.6.32.33/drivers/char/virtio_console.c linux-2.6.32.33/drivers
static struct hv_ops virtio_cons;
/* The hvc device */
-diff -urNp linux-2.6.32.33/drivers/char/vt.c linux-2.6.32.33/drivers/char/vt.c
---- linux-2.6.32.33/drivers/char/vt.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/char/vt.c 2011-02-27 14:53:10.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/vt.c linux-2.6.32.35/drivers/char/vt.c
+--- linux-2.6.32.35/drivers/char/vt.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/char/vt.c 2011-02-27 14:53:10.000000000 -0500
@@ -243,7 +243,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
static void notify_write(struct vc_data *vc, unsigned int unicode)
@@ -25162,9 +25162,9 @@ diff -urNp linux-2.6.32.33/drivers/char/vt.c linux-2.6.32.33/drivers/char/vt.c
atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
}
-diff -urNp linux-2.6.32.33/drivers/char/vt_ioctl.c linux-2.6.32.33/drivers/char/vt_ioctl.c
---- linux-2.6.32.33/drivers/char/vt_ioctl.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/drivers/char/vt_ioctl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/char/vt_ioctl.c linux-2.6.32.35/drivers/char/vt_ioctl.c
+--- linux-2.6.32.35/drivers/char/vt_ioctl.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/drivers/char/vt_ioctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
return -EFAULT;
@@ -25208,9 +25208,9 @@ diff -urNp linux-2.6.32.33/drivers/char/vt_ioctl.c linux-2.6.32.33/drivers/char/
if (!perm) {
ret = -EPERM;
goto reterr;
-diff -urNp linux-2.6.32.33/drivers/cpufreq/cpufreq.c linux-2.6.32.33/drivers/cpufreq/cpufreq.c
---- linux-2.6.32.33/drivers/cpufreq/cpufreq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/cpufreq/cpufreq.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/cpufreq/cpufreq.c linux-2.6.32.35/drivers/cpufreq/cpufreq.c
+--- linux-2.6.32.35/drivers/cpufreq/cpufreq.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/cpufreq/cpufreq.c 2010-12-31 14:46:53.000000000 -0500
@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
complete(&policy->kobj_unregister);
}
@@ -25220,9 +25220,9 @@ diff -urNp linux-2.6.32.33/drivers/cpufreq/cpufreq.c linux-2.6.32.33/drivers/cpu
.show = show,
.store = store,
};
-diff -urNp linux-2.6.32.33/drivers/cpuidle/sysfs.c linux-2.6.32.33/drivers/cpuidle/sysfs.c
---- linux-2.6.32.33/drivers/cpuidle/sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/cpuidle/sysfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/cpuidle/sysfs.c linux-2.6.32.35/drivers/cpuidle/sysfs.c
+--- linux-2.6.32.35/drivers/cpuidle/sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/cpuidle/sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
return ret;
}
@@ -25250,9 +25250,9 @@ diff -urNp linux-2.6.32.33/drivers/cpuidle/sysfs.c linux-2.6.32.33/drivers/cpuid
{
kobject_put(&device->kobjs[i]->kobj);
wait_for_completion(&device->kobjs[i]->kobj_unregister);
-diff -urNp linux-2.6.32.33/drivers/dma/ioat/dma.c linux-2.6.32.33/drivers/dma/ioat/dma.c
---- linux-2.6.32.33/drivers/dma/ioat/dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/dma/ioat/dma.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/dma/ioat/dma.c linux-2.6.32.35/drivers/dma/ioat/dma.c
+--- linux-2.6.32.35/drivers/dma/ioat/dma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/dma/ioat/dma.c 2010-12-31 14:46:53.000000000 -0500
@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
return entry->show(&chan->common, page);
}
@@ -25262,9 +25262,9 @@ diff -urNp linux-2.6.32.33/drivers/dma/ioat/dma.c linux-2.6.32.33/drivers/dma/io
.show = ioat_attr_show,
};
-diff -urNp linux-2.6.32.33/drivers/dma/ioat/dma.h linux-2.6.32.33/drivers/dma/ioat/dma.h
---- linux-2.6.32.33/drivers/dma/ioat/dma.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/dma/ioat/dma.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/dma/ioat/dma.h linux-2.6.32.35/drivers/dma/ioat/dma.h
+--- linux-2.6.32.35/drivers/dma/ioat/dma.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/dma/ioat/dma.h 2010-12-31 14:46:53.000000000 -0500
@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
unsigned long *phys_complete);
void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
@@ -25274,9 +25274,9 @@ diff -urNp linux-2.6.32.33/drivers/dma/ioat/dma.h linux-2.6.32.33/drivers/dma/io
extern struct ioat_sysfs_entry ioat_version_attr;
extern struct ioat_sysfs_entry ioat_cap_attr;
#endif /* IOATDMA_H */
-diff -urNp linux-2.6.32.33/drivers/edac/edac_core.h linux-2.6.32.33/drivers/edac/edac_core.h
---- linux-2.6.32.33/drivers/edac/edac_core.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/edac/edac_core.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/edac/edac_core.h linux-2.6.32.35/drivers/edac/edac_core.h
+--- linux-2.6.32.35/drivers/edac/edac_core.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/edac/edac_core.h 2010-12-31 14:46:53.000000000 -0500
@@ -99,11 +99,11 @@ extern int edac_debug_level;
#else /* !CONFIG_EDAC_DEBUG */
@@ -25294,9 +25294,9 @@ diff -urNp linux-2.6.32.33/drivers/edac/edac_core.h linux-2.6.32.33/drivers/edac
#endif /* !CONFIG_EDAC_DEBUG */
-diff -urNp linux-2.6.32.33/drivers/edac/edac_device_sysfs.c linux-2.6.32.33/drivers/edac/edac_device_sysfs.c
---- linux-2.6.32.33/drivers/edac/edac_device_sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/edac/edac_device_sysfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/edac/edac_device_sysfs.c linux-2.6.32.35/drivers/edac/edac_device_sysfs.c
+--- linux-2.6.32.35/drivers/edac/edac_device_sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/edac/edac_device_sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
}
@@ -25324,9 +25324,9 @@ diff -urNp linux-2.6.32.33/drivers/edac/edac_device_sysfs.c linux-2.6.32.33/driv
.show = edac_dev_block_show,
.store = edac_dev_block_store
};
-diff -urNp linux-2.6.32.33/drivers/edac/edac_mc_sysfs.c linux-2.6.32.33/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.32.33/drivers/edac/edac_mc_sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/edac/edac_mc_sysfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/edac/edac_mc_sysfs.c linux-2.6.32.35/drivers/edac/edac_mc_sysfs.c
+--- linux-2.6.32.35/drivers/edac/edac_mc_sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/edac/edac_mc_sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
return -EIO;
}
@@ -25345,9 +25345,9 @@ diff -urNp linux-2.6.32.33/drivers/edac/edac_mc_sysfs.c linux-2.6.32.33/drivers/
.show = mcidev_show,
.store = mcidev_store
};
-diff -urNp linux-2.6.32.33/drivers/edac/edac_pci_sysfs.c linux-2.6.32.33/drivers/edac/edac_pci_sysfs.c
---- linux-2.6.32.33/drivers/edac/edac_pci_sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/edac/edac_pci_sysfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/edac/edac_pci_sysfs.c linux-2.6.32.35/drivers/edac/edac_pci_sysfs.c
+--- linux-2.6.32.35/drivers/edac/edac_pci_sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/edac/edac_pci_sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
}
@@ -25366,9 +25366,9 @@ diff -urNp linux-2.6.32.33/drivers/edac/edac_pci_sysfs.c linux-2.6.32.33/drivers
.show = edac_pci_dev_show,
.store = edac_pci_dev_store
};
-diff -urNp linux-2.6.32.33/drivers/firewire/core-cdev.c linux-2.6.32.33/drivers/firewire/core-cdev.c
---- linux-2.6.32.33/drivers/firewire/core-cdev.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/drivers/firewire/core-cdev.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/firewire/core-cdev.c linux-2.6.32.35/drivers/firewire/core-cdev.c
+--- linux-2.6.32.35/drivers/firewire/core-cdev.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/drivers/firewire/core-cdev.c 2010-12-31 14:46:53.000000000 -0500
@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
int ret;
@@ -25379,9 +25379,9 @@ diff -urNp linux-2.6.32.33/drivers/firewire/core-cdev.c linux-2.6.32.33/drivers/
return -EINVAL;
r = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-2.6.32.33/drivers/firmware/dmi_scan.c linux-2.6.32.33/drivers/firmware/dmi_scan.c
---- linux-2.6.32.33/drivers/firmware/dmi_scan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/firmware/dmi_scan.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/firmware/dmi_scan.c linux-2.6.32.35/drivers/firmware/dmi_scan.c
+--- linux-2.6.32.35/drivers/firmware/dmi_scan.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/firmware/dmi_scan.c 2010-12-31 14:46:53.000000000 -0500
@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
}
}
@@ -25394,9 +25394,9 @@ diff -urNp linux-2.6.32.33/drivers/firmware/dmi_scan.c linux-2.6.32.33/drivers/f
p = dmi_ioremap(0xF0000, 0x10000);
if (p == NULL)
goto error;
-diff -urNp linux-2.6.32.33/drivers/firmware/edd.c linux-2.6.32.33/drivers/firmware/edd.c
---- linux-2.6.32.33/drivers/firmware/edd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/firmware/edd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/firmware/edd.c linux-2.6.32.35/drivers/firmware/edd.c
+--- linux-2.6.32.35/drivers/firmware/edd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/firmware/edd.c 2010-12-31 14:46:53.000000000 -0500
@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
return ret;
}
@@ -25406,9 +25406,9 @@ diff -urNp linux-2.6.32.33/drivers/firmware/edd.c linux-2.6.32.33/drivers/firmwa
.show = edd_attr_show,
};
-diff -urNp linux-2.6.32.33/drivers/firmware/efivars.c linux-2.6.32.33/drivers/firmware/efivars.c
---- linux-2.6.32.33/drivers/firmware/efivars.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/firmware/efivars.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/firmware/efivars.c linux-2.6.32.35/drivers/firmware/efivars.c
+--- linux-2.6.32.35/drivers/firmware/efivars.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/firmware/efivars.c 2010-12-31 14:46:53.000000000 -0500
@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
return ret;
}
@@ -25418,9 +25418,9 @@ diff -urNp linux-2.6.32.33/drivers/firmware/efivars.c linux-2.6.32.33/drivers/fi
.show = efivar_attr_show,
.store = efivar_attr_store,
};
-diff -urNp linux-2.6.32.33/drivers/firmware/iscsi_ibft.c linux-2.6.32.33/drivers/firmware/iscsi_ibft.c
---- linux-2.6.32.33/drivers/firmware/iscsi_ibft.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/firmware/iscsi_ibft.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/firmware/iscsi_ibft.c linux-2.6.32.35/drivers/firmware/iscsi_ibft.c
+--- linux-2.6.32.35/drivers/firmware/iscsi_ibft.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/firmware/iscsi_ibft.c 2010-12-31 14:46:53.000000000 -0500
@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
return ret;
}
@@ -25430,9 +25430,9 @@ diff -urNp linux-2.6.32.33/drivers/firmware/iscsi_ibft.c linux-2.6.32.33/drivers
.show = ibft_show_attribute,
};
-diff -urNp linux-2.6.32.33/drivers/firmware/memmap.c linux-2.6.32.33/drivers/firmware/memmap.c
---- linux-2.6.32.33/drivers/firmware/memmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/firmware/memmap.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/firmware/memmap.c linux-2.6.32.35/drivers/firmware/memmap.c
+--- linux-2.6.32.35/drivers/firmware/memmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/firmware/memmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
NULL
};
@@ -25442,9 +25442,9 @@ diff -urNp linux-2.6.32.33/drivers/firmware/memmap.c linux-2.6.32.33/drivers/fir
.show = memmap_attr_show,
};
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.33/drivers/gpu/drm/drm_crtc_helper.c
---- linux-2.6.32.33/drivers/gpu/drm/drm_crtc_helper.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/drm_crtc_helper.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.35/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-2.6.32.35/drivers/gpu/drm/drm_crtc_helper.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/drm_crtc_helper.c 2010-12-31 14:46:53.000000000 -0500
@@ -573,7 +573,7 @@ static bool drm_encoder_crtc_ok(struct d
struct drm_crtc *tmp;
int crtc_mask = 1;
@@ -25454,9 +25454,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.33/dri
dev = crtc->dev;
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_drv.c linux-2.6.32.33/drivers/gpu/drm/drm_drv.c
---- linux-2.6.32.33/drivers/gpu/drm/drm_drv.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/drm_drv.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/drm_drv.c linux-2.6.32.35/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.32.35/drivers/gpu/drm/drm_drv.c 2010-08-29 21:08:20.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/drm_drv.c 2010-12-31 14:46:53.000000000 -0500
@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
char *kdata = NULL;
@@ -25466,9 +25466,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_drv.c linux-2.6.32.33/drivers/gpu
++file_priv->ioctl_count;
DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_fops.c linux-2.6.32.33/drivers/gpu/drm/drm_fops.c
---- linux-2.6.32.33/drivers/gpu/drm/drm_fops.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/drm_fops.c 2011-01-24 18:05:30.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/drm_fops.c linux-2.6.32.35/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.32.35/drivers/gpu/drm/drm_fops.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/drm_fops.c 2011-01-24 18:05:30.000000000 -0500
@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
}
@@ -25520,9 +25520,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_fops.c linux-2.6.32.33/drivers/gp
if (atomic_read(&dev->ioctl_count)) {
DRM_ERROR("Device busy: %d\n",
atomic_read(&dev->ioctl_count));
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_gem.c linux-2.6.32.33/drivers/gpu/drm/drm_gem.c
---- linux-2.6.32.33/drivers/gpu/drm/drm_gem.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/drm_gem.c 2011-01-24 18:05:37.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/drm_gem.c linux-2.6.32.35/drivers/gpu/drm/drm_gem.c
+--- linux-2.6.32.35/drivers/gpu/drm/drm_gem.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/drm_gem.c 2011-01-24 18:05:37.000000000 -0500
@@ -83,11 +83,11 @@ drm_gem_init(struct drm_device *dev)
spin_lock_init(&dev->object_name_lock);
idr_init(&dev->object_name_idr);
@@ -25556,9 +25556,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_gem.c linux-2.6.32.33/drivers/gpu
kfree(obj);
}
EXPORT_SYMBOL(drm_gem_object_free);
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_info.c linux-2.6.32.33/drivers/gpu/drm/drm_info.c
---- linux-2.6.32.33/drivers/gpu/drm/drm_info.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/drm_info.c 2011-03-12 19:51:06.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/drm_info.c linux-2.6.32.35/drivers/gpu/drm/drm_info.c
+--- linux-2.6.32.35/drivers/gpu/drm/drm_info.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/drm_info.c 2011-03-12 19:51:06.000000000 -0500
@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void
struct drm_local_map *map;
struct drm_map_list *r_list;
@@ -25638,9 +25638,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_info.c linux-2.6.32.33/drivers/gp
#if defined(__i386__)
pgprot = pgprot_val(vma->vm_page_prot);
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.33/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.32.33/drivers/gpu/drm/drm_ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/drm_ioctl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.35/drivers/gpu/drm/drm_ioctl.c
+--- linux-2.6.32.35/drivers/gpu/drm/drm_ioctl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/drm_ioctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
stats->data[i].value =
(file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -25650,9 +25650,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.33/drivers/g
stats->data[i].type = dev->types[i];
}
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_lock.c linux-2.6.32.33/drivers/gpu/drm/drm_lock.c
---- linux-2.6.32.33/drivers/gpu/drm/drm_lock.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/drm_lock.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/drm_lock.c linux-2.6.32.35/drivers/gpu/drm/drm_lock.c
+--- linux-2.6.32.35/drivers/gpu/drm/drm_lock.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/drm_lock.c 2010-12-31 14:46:53.000000000 -0500
@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
if (drm_lock_take(&master->lock, lock->context)) {
master->lock.file_priv = file_priv;
@@ -25671,9 +25671,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/drm_lock.c linux-2.6.32.33/drivers/gp
/* kernel_context_switch isn't used by any of the x86 drm
* modules but is required by the Sparc driver.
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.33/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.32.33/drivers/gpu/drm/i810/i810_dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/i810/i810_dma.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.35/drivers/gpu/drm/i810/i810_dma.c
+--- linux-2.6.32.35/drivers/gpu/drm/i810/i810_dma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/i810/i810_dma.c 2010-12-31 14:46:53.000000000 -0500
@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
dma->buflist[vertex->idx],
vertex->discard, vertex->used);
@@ -25696,9 +25696,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.33/drive
sarea_priv->last_enqueue = dev_priv->counter - 1;
sarea_priv->last_dispatch = (int)hw_status[5];
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7017.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.35/drivers/gpu/drm/i915/dvo_ch7017.c
+--- linux-2.6.32.35/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/i915/dvo_ch7017.c 2010-12-31 14:46:53.000000000 -0500
@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
}
}
@@ -25708,9 +25708,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.33/dri
.init = ch7017_init,
.detect = ch7017_detect,
.mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.35/drivers/gpu/drm/i915/dvo_ch7xxx.c
+--- linux-2.6.32.35/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-12-31 14:46:53.000000000 -0500
@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
}
}
@@ -25720,9 +25720,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.33/dri
.init = ch7xxx_init,
.detect = ch7xxx_detect,
.mode_valid = ch7xxx_mode_valid,
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo.h linux-2.6.32.33/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.32.33/drivers/gpu/drm/i915/dvo.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/i915/dvo.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/i915/dvo.h linux-2.6.32.35/drivers/gpu/drm/i915/dvo.h
+--- linux-2.6.32.35/drivers/gpu/drm/i915/dvo.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/i915/dvo.h 2010-12-31 14:46:53.000000000 -0500
@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
*
* \return singly-linked list of modes or NULL if no modes found.
@@ -25755,9 +25755,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo.h linux-2.6.32.33/drivers/gp
+extern const struct intel_dvo_dev_ops ch7017_ops;
#endif /* _INTEL_DVO_H */
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ivch.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.35/drivers/gpu/drm/i915/dvo_ivch.c
+--- linux-2.6.32.35/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/i915/dvo_ivch.c 2010-12-31 14:46:53.000000000 -0500
@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
}
}
@@ -25767,9 +25767,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.33/drive
.init = ivch_init,
.dpms = ivch_dpms,
.save = ivch_save,
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.33/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.32.33/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/i915/dvo_sil164.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.35/drivers/gpu/drm/i915/dvo_sil164.c
+--- linux-2.6.32.35/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/i915/dvo_sil164.c 2010-12-31 14:46:53.000000000 -0500
@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
}
}
@@ -25779,9 +25779,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.33/dri
.init = sil164_init,
.detect = sil164_detect,
.mode_valid = sil164_mode_valid,
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.33/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.32.33/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/i915/dvo_tfp410.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.35/drivers/gpu/drm/i915/dvo_tfp410.c
+--- linux-2.6.32.35/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/i915/dvo_tfp410.c 2010-12-31 14:46:53.000000000 -0500
@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
}
}
@@ -25791,9 +25791,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.33/dri
.init = tfp410_init,
.detect = tfp410_detect,
.mode_valid = tfp410_mode_valid,
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.33/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.32.33/drivers/gpu/drm/i915/i915_drv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/i915/i915_drv.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.35/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.32.35/drivers/gpu/drm/i915/i915_drv.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/i915/i915_drv.c 2010-12-31 14:46:53.000000000 -0500
@@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev)
return i915_resume(dev);
}
@@ -25803,9 +25803,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.33/drive
.fault = i915_gem_fault,
.open = drm_gem_vm_open,
.close = drm_gem_vm_close,
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.33/drivers/gpu/drm/i915/i915_gem.c
---- linux-2.6.32.33/drivers/gpu/drm/i915/i915_gem.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/i915/i915_gem.c 2011-01-24 18:05:30.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.35/drivers/gpu/drm/i915/i915_gem.c
+--- linux-2.6.32.35/drivers/gpu/drm/i915/i915_gem.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/i915/i915_gem.c 2011-01-24 18:05:30.000000000 -0500
@@ -102,7 +102,7 @@ i915_gem_get_aperture_ioctl(struct drm_d
args->aper_size = dev->gtt_total;
@@ -25888,9 +25888,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.33/drive
}
i915_verify_inactive(dev, __FILE__, __LINE__);
}
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.33/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.32.33/drivers/gpu/drm/radeon/mkregtable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/radeon/mkregtable.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.35/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-2.6.32.35/drivers/gpu/drm/radeon/mkregtable.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/radeon/mkregtable.c 2010-12-31 14:46:53.000000000 -0500
@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
regex_t mask_rex;
regmatch_t match[4];
@@ -25908,9 +25908,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.33/d
if (regcomp
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_atombios.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_atombios.c 2011-02-22 15:57:23.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_atombios.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_atombios.c 2011-02-22 15:57:23.000000000 -0500
@@ -520,13 +520,13 @@ static uint16_t atombios_get_connector_o
}
}
@@ -25935,9 +25935,9 @@ diff -urNp linux-2.6.32.33/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.33/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_display.c
---- linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_display.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_display.c 2011-02-22 15:57:23.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_display.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_display.c 2011-02-22 15:57:23.000000000 -0500
@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
@@ -25947,9 +25947,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.
} else
error = abs(current_freq - freq);
vco_diff = abs(vco - best_vco);
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_state.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_state.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_state.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_state.c 2010-12-31 14:46:53.000000000 -0500
@@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm
{
drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -25959,9 +25959,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.33
DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_ttm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/radeon/radeon_ttm.c 2010-12-31 14:46:53.000000000 -0500
@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
DRM_INFO("radeon: ttm finalized\n");
}
@@ -26013,9 +26013,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.33/d
}
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo.c
---- linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_bo.c
+--- linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_bo.c 2010-12-31 14:46:53.000000000 -0500
@@ -39,7 +39,7 @@
#include <linux/module.h>
@@ -26034,9 +26034,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.33/drivers/
.show = &ttm_bo_global_show
};
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_bo_vm.c
+--- linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-12-31 14:46:53.000000000 -0500
@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
{
struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -26057,9 +26057,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.33/drive
/*
* Work around locking order reversal in fault / nopfn
* between mmap_sem and bo_reserve: Perform a trylock operation
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_global.c
---- linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_global.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_global.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_global.c
+--- linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_global.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_global.c 2010-12-31 14:46:53.000000000 -0500
@@ -36,7 +36,7 @@
struct ttm_global_item {
struct mutex mutex;
@@ -26117,9 +26117,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.33/driv
ref->release(ref);
item->object = NULL;
}
-diff -urNp linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_memory.c
---- linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_memory.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_memory.c
+--- linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/gpu/drm/ttm/ttm_memory.c 2010-12-31 14:46:53.000000000 -0500
@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
NULL
};
@@ -26129,9 +26129,9 @@ diff -urNp linux-2.6.32.33/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.33/driv
.show = &ttm_mem_zone_show,
.store = &ttm_mem_zone_store
};
-diff -urNp linux-2.6.32.33/drivers/hid/usbhid/hiddev.c linux-2.6.32.33/drivers/hid/usbhid/hiddev.c
---- linux-2.6.32.33/drivers/hid/usbhid/hiddev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/hid/usbhid/hiddev.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/hid/usbhid/hiddev.c linux-2.6.32.35/drivers/hid/usbhid/hiddev.c
+--- linux-2.6.32.35/drivers/hid/usbhid/hiddev.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/hid/usbhid/hiddev.c 2010-12-31 14:46:53.000000000 -0500
@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
return put_user(HID_VERSION, (int __user *)arg);
@@ -26141,9 +26141,9 @@ diff -urNp linux-2.6.32.33/drivers/hid/usbhid/hiddev.c linux-2.6.32.33/drivers/h
return -EINVAL;
for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-2.6.32.33/drivers/hwmon/k8temp.c linux-2.6.32.33/drivers/hwmon/k8temp.c
---- linux-2.6.32.33/drivers/hwmon/k8temp.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/drivers/hwmon/k8temp.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/hwmon/k8temp.c linux-2.6.32.35/drivers/hwmon/k8temp.c
+--- linux-2.6.32.35/drivers/hwmon/k8temp.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.35/drivers/hwmon/k8temp.c 2010-12-31 14:46:53.000000000 -0500
@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
static struct pci_device_id k8temp_ids[] = {
@@ -26153,9 +26153,9 @@ diff -urNp linux-2.6.32.33/drivers/hwmon/k8temp.c linux-2.6.32.33/drivers/hwmon/
};
MODULE_DEVICE_TABLE(pci, k8temp_ids);
-diff -urNp linux-2.6.32.33/drivers/hwmon/sis5595.c linux-2.6.32.33/drivers/hwmon/sis5595.c
---- linux-2.6.32.33/drivers/hwmon/sis5595.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/hwmon/sis5595.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/hwmon/sis5595.c linux-2.6.32.35/drivers/hwmon/sis5595.c
+--- linux-2.6.32.35/drivers/hwmon/sis5595.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/hwmon/sis5595.c 2010-12-31 14:46:53.000000000 -0500
@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
static struct pci_device_id sis5595_pci_ids[] = {
@@ -26165,9 +26165,9 @@ diff -urNp linux-2.6.32.33/drivers/hwmon/sis5595.c linux-2.6.32.33/drivers/hwmon
};
MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
-diff -urNp linux-2.6.32.33/drivers/hwmon/via686a.c linux-2.6.32.33/drivers/hwmon/via686a.c
---- linux-2.6.32.33/drivers/hwmon/via686a.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/hwmon/via686a.c 2011-02-22 15:57:23.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/hwmon/via686a.c linux-2.6.32.35/drivers/hwmon/via686a.c
+--- linux-2.6.32.35/drivers/hwmon/via686a.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/drivers/hwmon/via686a.c 2011-02-22 15:57:23.000000000 -0500
@@ -777,7 +777,7 @@ static struct via686a_data *via686a_upda
static struct pci_device_id via686a_pci_ids[] = {
@@ -26177,9 +26177,9 @@ diff -urNp linux-2.6.32.33/drivers/hwmon/via686a.c linux-2.6.32.33/drivers/hwmon
};
MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
-diff -urNp linux-2.6.32.33/drivers/hwmon/vt8231.c linux-2.6.32.33/drivers/hwmon/vt8231.c
---- linux-2.6.32.33/drivers/hwmon/vt8231.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/hwmon/vt8231.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/hwmon/vt8231.c linux-2.6.32.35/drivers/hwmon/vt8231.c
+--- linux-2.6.32.35/drivers/hwmon/vt8231.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/hwmon/vt8231.c 2010-12-31 14:46:53.000000000 -0500
@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
static struct pci_device_id vt8231_pci_ids[] = {
@@ -26189,9 +26189,9 @@ diff -urNp linux-2.6.32.33/drivers/hwmon/vt8231.c linux-2.6.32.33/drivers/hwmon/
};
MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
-diff -urNp linux-2.6.32.33/drivers/hwmon/w83791d.c linux-2.6.32.33/drivers/hwmon/w83791d.c
---- linux-2.6.32.33/drivers/hwmon/w83791d.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/hwmon/w83791d.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/hwmon/w83791d.c linux-2.6.32.35/drivers/hwmon/w83791d.c
+--- linux-2.6.32.35/drivers/hwmon/w83791d.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/hwmon/w83791d.c 2010-12-31 14:46:53.000000000 -0500
@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
struct i2c_board_info *info);
static int w83791d_remove(struct i2c_client *client);
@@ -26203,9 +26203,9 @@ diff -urNp linux-2.6.32.33/drivers/hwmon/w83791d.c linux-2.6.32.33/drivers/hwmon
static struct w83791d_data *w83791d_update_device(struct device *dev);
#ifdef DEBUG
-diff -urNp linux-2.6.32.33/drivers/i2c/busses/i2c-i801.c linux-2.6.32.33/drivers/i2c/busses/i2c-i801.c
---- linux-2.6.32.33/drivers/i2c/busses/i2c-i801.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/i2c/busses/i2c-i801.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/i2c/busses/i2c-i801.c linux-2.6.32.35/drivers/i2c/busses/i2c-i801.c
+--- linux-2.6.32.35/drivers/i2c/busses/i2c-i801.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/i2c/busses/i2c-i801.c 2010-12-31 14:46:53.000000000 -0500
@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] =
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
@@ -26215,9 +26215,9 @@ diff -urNp linux-2.6.32.33/drivers/i2c/busses/i2c-i801.c linux-2.6.32.33/drivers
};
MODULE_DEVICE_TABLE (pci, i801_ids);
-diff -urNp linux-2.6.32.33/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.33/drivers/i2c/busses/i2c-piix4.c
---- linux-2.6.32.33/drivers/i2c/busses/i2c-piix4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/i2c/busses/i2c-piix4.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.35/drivers/i2c/busses/i2c-piix4.c
+--- linux-2.6.32.35/drivers/i2c/busses/i2c-piix4.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/i2c/busses/i2c-piix4.c 2010-12-31 14:46:53.000000000 -0500
@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
.ident = "IBM",
.matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -26236,9 +26236,9 @@ diff -urNp linux-2.6.32.33/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.33/driver
};
MODULE_DEVICE_TABLE (pci, piix4_ids);
-diff -urNp linux-2.6.32.33/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.33/drivers/i2c/busses/i2c-sis630.c
---- linux-2.6.32.33/drivers/i2c/busses/i2c-sis630.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/i2c/busses/i2c-sis630.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.35/drivers/i2c/busses/i2c-sis630.c
+--- linux-2.6.32.35/drivers/i2c/busses/i2c-sis630.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/i2c/busses/i2c-sis630.c 2010-12-31 14:46:53.000000000 -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) },
@@ -26248,9 +26248,9 @@ diff -urNp linux-2.6.32.33/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.33/drive
};
MODULE_DEVICE_TABLE (pci, sis630_ids);
-diff -urNp linux-2.6.32.33/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.33/drivers/i2c/busses/i2c-sis96x.c
---- linux-2.6.32.33/drivers/i2c/busses/i2c-sis96x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/i2c/busses/i2c-sis96x.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.35/drivers/i2c/busses/i2c-sis96x.c
+--- linux-2.6.32.35/drivers/i2c/busses/i2c-sis96x.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/i2c/busses/i2c-sis96x.c 2010-12-31 14:46:53.000000000 -0500
@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
static struct pci_device_id sis96x_ids[] = {
@@ -26260,9 +26260,9 @@ diff -urNp linux-2.6.32.33/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.33/drive
};
MODULE_DEVICE_TABLE (pci, sis96x_ids);
-diff -urNp linux-2.6.32.33/drivers/ide/ide-cd.c linux-2.6.32.33/drivers/ide/ide-cd.c
---- linux-2.6.32.33/drivers/ide/ide-cd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ide/ide-cd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ide/ide-cd.c linux-2.6.32.35/drivers/ide/ide-cd.c
+--- linux-2.6.32.35/drivers/ide/ide-cd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ide/ide-cd.c 2010-12-31 14:46:53.000000000 -0500
@@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_
alignment = queue_dma_alignment(q) | q->dma_pad_mask;
if ((unsigned long)buf & alignment
@@ -26272,9 +26272,9 @@ diff -urNp linux-2.6.32.33/drivers/ide/ide-cd.c linux-2.6.32.33/drivers/ide/ide-
drive->dma = 0;
}
}
-diff -urNp linux-2.6.32.33/drivers/ieee1394/dv1394.c linux-2.6.32.33/drivers/ieee1394/dv1394.c
---- linux-2.6.32.33/drivers/ieee1394/dv1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ieee1394/dv1394.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ieee1394/dv1394.c linux-2.6.32.35/drivers/ieee1394/dv1394.c
+--- linux-2.6.32.35/drivers/ieee1394/dv1394.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ieee1394/dv1394.c 2010-12-31 14:46:53.000000000 -0500
@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
based upon DIF section and sequence
*/
@@ -26293,9 +26293,9 @@ diff -urNp linux-2.6.32.33/drivers/ieee1394/dv1394.c linux-2.6.32.33/drivers/iee
};
MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
-diff -urNp linux-2.6.32.33/drivers/ieee1394/eth1394.c linux-2.6.32.33/drivers/ieee1394/eth1394.c
---- linux-2.6.32.33/drivers/ieee1394/eth1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ieee1394/eth1394.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ieee1394/eth1394.c linux-2.6.32.35/drivers/ieee1394/eth1394.c
+--- linux-2.6.32.35/drivers/ieee1394/eth1394.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ieee1394/eth1394.c 2010-12-31 14:46:53.000000000 -0500
@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
.specifier_id = ETHER1394_GASP_SPECIFIER_ID,
.version = ETHER1394_GASP_VERSION,
@@ -26305,9 +26305,9 @@ diff -urNp linux-2.6.32.33/drivers/ieee1394/eth1394.c linux-2.6.32.33/drivers/ie
};
MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
-diff -urNp linux-2.6.32.33/drivers/ieee1394/hosts.c linux-2.6.32.33/drivers/ieee1394/hosts.c
---- linux-2.6.32.33/drivers/ieee1394/hosts.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ieee1394/hosts.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ieee1394/hosts.c linux-2.6.32.35/drivers/ieee1394/hosts.c
+--- linux-2.6.32.35/drivers/ieee1394/hosts.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ieee1394/hosts.c 2010-12-31 14:46:53.000000000 -0500
@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
}
@@ -26316,9 +26316,9 @@ diff -urNp linux-2.6.32.33/drivers/ieee1394/hosts.c linux-2.6.32.33/drivers/ieee
.transmit_packet = dummy_transmit_packet,
.devctl = dummy_devctl,
.isoctl = dummy_isoctl
-diff -urNp linux-2.6.32.33/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.33/drivers/ieee1394/init_ohci1394_dma.c
---- linux-2.6.32.33/drivers/ieee1394/init_ohci1394_dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ieee1394/init_ohci1394_dma.c 2011-02-27 14:53:10.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.35/drivers/ieee1394/init_ohci1394_dma.c
+--- linux-2.6.32.35/drivers/ieee1394/init_ohci1394_dma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ieee1394/init_ohci1394_dma.c 2011-02-27 14:53:10.000000000 -0500
@@ -257,7 +257,7 @@ void __init init_ohci1394_dma_on_all_con
for (func = 0; func < 8; func++) {
u32 class = read_pci_config(num,slot,func,
@@ -26328,9 +26328,9 @@ diff -urNp linux-2.6.32.33/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.33/
continue; /* No device at this func */
if (class>>8 != PCI_CLASS_SERIAL_FIREWIRE_OHCI)
-diff -urNp linux-2.6.32.33/drivers/ieee1394/ohci1394.c linux-2.6.32.33/drivers/ieee1394/ohci1394.c
---- linux-2.6.32.33/drivers/ieee1394/ohci1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ieee1394/ohci1394.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ieee1394/ohci1394.c linux-2.6.32.35/drivers/ieee1394/ohci1394.c
+--- linux-2.6.32.35/drivers/ieee1394/ohci1394.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ieee1394/ohci1394.c 2010-12-31 14:46:53.000000000 -0500
@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
@@ -26352,9 +26352,9 @@ diff -urNp linux-2.6.32.33/drivers/ieee1394/ohci1394.c linux-2.6.32.33/drivers/i
};
MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
-diff -urNp linux-2.6.32.33/drivers/ieee1394/raw1394.c linux-2.6.32.33/drivers/ieee1394/raw1394.c
---- linux-2.6.32.33/drivers/ieee1394/raw1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ieee1394/raw1394.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ieee1394/raw1394.c linux-2.6.32.35/drivers/ieee1394/raw1394.c
+--- linux-2.6.32.35/drivers/ieee1394/raw1394.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ieee1394/raw1394.c 2010-12-31 14:46:53.000000000 -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,
@@ -26364,9 +26364,9 @@ diff -urNp linux-2.6.32.33/drivers/ieee1394/raw1394.c linux-2.6.32.33/drivers/ie
};
MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
-diff -urNp linux-2.6.32.33/drivers/ieee1394/sbp2.c linux-2.6.32.33/drivers/ieee1394/sbp2.c
---- linux-2.6.32.33/drivers/ieee1394/sbp2.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ieee1394/sbp2.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ieee1394/sbp2.c linux-2.6.32.35/drivers/ieee1394/sbp2.c
+--- linux-2.6.32.35/drivers/ieee1394/sbp2.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ieee1394/sbp2.c 2010-12-31 14:46:53.000000000 -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,
@@ -26385,9 +26385,9 @@ diff -urNp linux-2.6.32.33/drivers/ieee1394/sbp2.c linux-2.6.32.33/drivers/ieee1
{
int ret;
-diff -urNp linux-2.6.32.33/drivers/ieee1394/video1394.c linux-2.6.32.33/drivers/ieee1394/video1394.c
---- linux-2.6.32.33/drivers/ieee1394/video1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/ieee1394/video1394.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/ieee1394/video1394.c linux-2.6.32.35/drivers/ieee1394/video1394.c
+--- linux-2.6.32.35/drivers/ieee1394/video1394.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/ieee1394/video1394.c 2010-12-31 14:46:53.000000000 -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
@@ -26397,9 +26397,9 @@ diff -urNp linux-2.6.32.33/drivers/ieee1394/video1394.c linux-2.6.32.33/drivers/
};
MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
-diff -urNp linux-2.6.32.33/drivers/infiniband/core/cm.c linux-2.6.32.33/drivers/infiniband/core/cm.c
---- linux-2.6.32.33/drivers/infiniband/core/cm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/infiniband/core/cm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/infiniband/core/cm.c linux-2.6.32.35/drivers/infiniband/core/cm.c
+--- linux-2.6.32.35/drivers/infiniband/core/cm.c 2011-03-23 19:00:32.000000000 -0400
++++ linux-2.6.32.35/drivers/infiniband/core/cm.c 2011-03-23 19:01:00.000000000 -0400
@@ -112,7 +112,7 @@ static char const counter_group_names[CM
struct cm_counter_group {
@@ -26508,7 +26508,7 @@ diff -urNp linux-2.6.32.33/drivers/infiniband/core/cm.c linux-2.6.32.33/drivers/
counter[CM_SIDR_REQ_COUNTER]);
goto out; /* Duplicate message. */
}
-@@ -3183,10 +3183,10 @@ static void cm_send_handler(struct ib_ma
+@@ -3184,10 +3184,10 @@ static void cm_send_handler(struct ib_ma
if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
msg->retries = 1;
@@ -26521,7 +26521,7 @@ diff -urNp linux-2.6.32.33/drivers/infiniband/core/cm.c linux-2.6.32.33/drivers/
&port->counter_group[CM_XMIT_RETRIES].
counter[attr_index]);
-@@ -3396,7 +3396,7 @@ static void cm_recv_handler(struct ib_ma
+@@ -3397,7 +3397,7 @@ static void cm_recv_handler(struct ib_ma
}
attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
@@ -26530,7 +26530,7 @@ diff -urNp linux-2.6.32.33/drivers/infiniband/core/cm.c linux-2.6.32.33/drivers/
counter[attr_id - CM_ATTR_ID_OFFSET]);
work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
-@@ -3594,10 +3594,10 @@ static ssize_t cm_show_counter(struct ko
+@@ -3595,10 +3595,10 @@ static ssize_t cm_show_counter(struct ko
cm_attr = container_of(attr, struct cm_counter_attribute, attr);
return sprintf(buf, "%ld\n",
@@ -26543,9 +26543,9 @@ diff -urNp linux-2.6.32.33/drivers/infiniband/core/cm.c linux-2.6.32.33/drivers/
.show = cm_show_counter
};
-diff -urNp linux-2.6.32.33/drivers/infiniband/core/sysfs.c linux-2.6.32.33/drivers/infiniband/core/sysfs.c
---- linux-2.6.32.33/drivers/infiniband/core/sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/infiniband/core/sysfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/infiniband/core/sysfs.c linux-2.6.32.35/drivers/infiniband/core/sysfs.c
+--- linux-2.6.32.35/drivers/infiniband/core/sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/infiniband/core/sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
return port_attr->show(p, port_attr, buf);
}
@@ -26555,9 +26555,9 @@ diff -urNp linux-2.6.32.33/drivers/infiniband/core/sysfs.c linux-2.6.32.33/drive
.show = port_attr_show
};
-diff -urNp linux-2.6.32.33/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.33/drivers/infiniband/core/uverbs_marshall.c
---- linux-2.6.32.33/drivers/infiniband/core/uverbs_marshall.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/infiniband/core/uverbs_marshall.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.35/drivers/infiniband/core/uverbs_marshall.c
+--- linux-2.6.32.35/drivers/infiniband/core/uverbs_marshall.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/infiniband/core/uverbs_marshall.c 2010-12-31 14:46:53.000000000 -0500
@@ -40,18 +40,21 @@ void ib_copy_ah_attr_to_user(struct ib_u
dst->grh.sgid_index = src->grh.sgid_index;
dst->grh.hop_limit = src->grh.hop_limit;
@@ -26588,9 +26588,9 @@ diff -urNp linux-2.6.32.33/drivers/infiniband/core/uverbs_marshall.c linux-2.6.3
}
EXPORT_SYMBOL(ib_copy_qp_attr_to_user);
-diff -urNp linux-2.6.32.33/drivers/input/keyboard/atkbd.c linux-2.6.32.33/drivers/input/keyboard/atkbd.c
---- linux-2.6.32.33/drivers/input/keyboard/atkbd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/input/keyboard/atkbd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/input/keyboard/atkbd.c linux-2.6.32.35/drivers/input/keyboard/atkbd.c
+--- linux-2.6.32.35/drivers/input/keyboard/atkbd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/input/keyboard/atkbd.c 2010-12-31 14:46:53.000000000 -0500
@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -26600,9 +26600,9 @@ diff -urNp linux-2.6.32.33/drivers/input/keyboard/atkbd.c linux-2.6.32.33/driver
};
MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
-diff -urNp linux-2.6.32.33/drivers/input/mouse/lifebook.c linux-2.6.32.33/drivers/input/mouse/lifebook.c
---- linux-2.6.32.33/drivers/input/mouse/lifebook.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/input/mouse/lifebook.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/input/mouse/lifebook.c linux-2.6.32.35/drivers/input/mouse/lifebook.c
+--- linux-2.6.32.35/drivers/input/mouse/lifebook.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/input/mouse/lifebook.c 2010-12-31 14:46:53.000000000 -0500
@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
},
@@ -26612,9 +26612,9 @@ diff -urNp linux-2.6.32.33/drivers/input/mouse/lifebook.c linux-2.6.32.33/driver
};
static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
-diff -urNp linux-2.6.32.33/drivers/input/mouse/psmouse-base.c linux-2.6.32.33/drivers/input/mouse/psmouse-base.c
---- linux-2.6.32.33/drivers/input/mouse/psmouse-base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/input/mouse/psmouse-base.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/input/mouse/psmouse-base.c linux-2.6.32.35/drivers/input/mouse/psmouse-base.c
+--- linux-2.6.32.35/drivers/input/mouse/psmouse-base.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/input/mouse/psmouse-base.c 2010-12-31 14:46:53.000000000 -0500
@@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -26624,9 +26624,9 @@ diff -urNp linux-2.6.32.33/drivers/input/mouse/psmouse-base.c linux-2.6.32.33/dr
};
MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
-diff -urNp linux-2.6.32.33/drivers/input/mouse/synaptics.c linux-2.6.32.33/drivers/input/mouse/synaptics.c
---- linux-2.6.32.33/drivers/input/mouse/synaptics.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/input/mouse/synaptics.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/input/mouse/synaptics.c linux-2.6.32.35/drivers/input/mouse/synaptics.c
+--- linux-2.6.32.35/drivers/input/mouse/synaptics.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/input/mouse/synaptics.c 2010-12-31 14:46:53.000000000 -0500
@@ -437,7 +437,7 @@ static void synaptics_process_packet(str
break;
case 2:
@@ -26655,9 +26655,9 @@ diff -urNp linux-2.6.32.33/drivers/input/mouse/synaptics.c linux-2.6.32.33/drive
};
#endif
-diff -urNp linux-2.6.32.33/drivers/input/mousedev.c linux-2.6.32.33/drivers/input/mousedev.c
---- linux-2.6.32.33/drivers/input/mousedev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/input/mousedev.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/input/mousedev.c linux-2.6.32.35/drivers/input/mousedev.c
+--- linux-2.6.32.35/drivers/input/mousedev.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/input/mousedev.c 2010-12-31 14:46:53.000000000 -0500
@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -26667,9 +26667,9 @@ diff -urNp linux-2.6.32.33/drivers/input/mousedev.c linux-2.6.32.33/drivers/inpu
};
static int psaux_registered;
#endif
-diff -urNp linux-2.6.32.33/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.33/drivers/input/serio/i8042-x86ia64io.h
---- linux-2.6.32.33/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 16:04:30.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.35/drivers/input/serio/i8042-x86ia64io.h
+--- linux-2.6.32.35/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/drivers/input/serio/i8042-x86ia64io.h 2011-02-22 16:04:30.000000000 -0500
@@ -179,7 +179,7 @@ static const struct dmi_system_id __init
DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
},
@@ -26724,9 +26724,9 @@ diff -urNp linux-2.6.32.33/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.33
};
#endif /* CONFIG_X86 */
-diff -urNp linux-2.6.32.33/drivers/input/serio/serio_raw.c linux-2.6.32.33/drivers/input/serio/serio_raw.c
---- linux-2.6.32.33/drivers/input/serio/serio_raw.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/input/serio/serio_raw.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/input/serio/serio_raw.c linux-2.6.32.35/drivers/input/serio/serio_raw.c
+--- linux-2.6.32.35/drivers/input/serio/serio_raw.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/input/serio/serio_raw.c 2010-12-31 14:46:53.000000000 -0500
@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -26736,9 +26736,9 @@ diff -urNp linux-2.6.32.33/drivers/input/serio/serio_raw.c linux-2.6.32.33/drive
};
MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
-diff -urNp linux-2.6.32.33/drivers/isdn/gigaset/common.c linux-2.6.32.33/drivers/isdn/gigaset/common.c
---- linux-2.6.32.33/drivers/isdn/gigaset/common.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/isdn/gigaset/common.c 2011-01-24 18:05:30.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/isdn/gigaset/common.c linux-2.6.32.35/drivers/isdn/gigaset/common.c
+--- linux-2.6.32.35/drivers/isdn/gigaset/common.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/isdn/gigaset/common.c 2011-01-24 18:05:30.000000000 -0500
@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
cs->commands_pending = 0;
cs->cur_at_seq = 0;
@@ -26748,9 +26748,9 @@ diff -urNp linux-2.6.32.33/drivers/isdn/gigaset/common.c linux-2.6.32.33/drivers
cs->dev = NULL;
cs->tty = NULL;
cs->tty_dev = NULL;
-diff -urNp linux-2.6.32.33/drivers/isdn/gigaset/gigaset.h linux-2.6.32.33/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.32.33/drivers/isdn/gigaset/gigaset.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/isdn/gigaset/gigaset.h 2011-01-25 20:24:47.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/isdn/gigaset/gigaset.h linux-2.6.32.35/drivers/isdn/gigaset/gigaset.h
+--- linux-2.6.32.35/drivers/isdn/gigaset/gigaset.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/isdn/gigaset/gigaset.h 2011-01-25 20:24:47.000000000 -0500
@@ -34,6 +34,7 @@
#include <linux/tty_driver.h>
#include <linux/list.h>
@@ -26768,9 +26768,9 @@ diff -urNp linux-2.6.32.33/drivers/isdn/gigaset/gigaset.h linux-2.6.32.33/driver
struct tty_struct *tty;
struct tasklet_struct if_wake_tasklet;
unsigned control_state;
-diff -urNp linux-2.6.32.33/drivers/isdn/gigaset/interface.c linux-2.6.32.33/drivers/isdn/gigaset/interface.c
---- linux-2.6.32.33/drivers/isdn/gigaset/interface.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/isdn/gigaset/interface.c 2011-01-24 18:05:30.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/isdn/gigaset/interface.c linux-2.6.32.35/drivers/isdn/gigaset/interface.c
+--- linux-2.6.32.35/drivers/isdn/gigaset/interface.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/isdn/gigaset/interface.c 2011-01-24 18:05:30.000000000 -0500
@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
return -ERESTARTSYS; // FIXME -EINTR?
tty->driver_data = cs;
@@ -26858,9 +26858,9 @@ diff -urNp linux-2.6.32.33/drivers/isdn/gigaset/interface.c linux-2.6.32.33/driv
dev_warn(cs->dev, "%s: device not opened\n", __func__);
goto out;
}
-diff -urNp linux-2.6.32.33/drivers/isdn/hardware/avm/b1.c linux-2.6.32.33/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.32.33/drivers/isdn/hardware/avm/b1.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/isdn/hardware/avm/b1.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/isdn/hardware/avm/b1.c linux-2.6.32.35/drivers/isdn/hardware/avm/b1.c
+--- linux-2.6.32.35/drivers/isdn/hardware/avm/b1.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/isdn/hardware/avm/b1.c 2010-12-31 14:46:53.000000000 -0500
@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
}
if (left) {
@@ -26879,9 +26879,9 @@ diff -urNp linux-2.6.32.33/drivers/isdn/hardware/avm/b1.c linux-2.6.32.33/driver
return -EFAULT;
} else {
memcpy(buf, dp, left);
-diff -urNp linux-2.6.32.33/drivers/isdn/icn/icn.c linux-2.6.32.33/drivers/isdn/icn/icn.c
---- linux-2.6.32.33/drivers/isdn/icn/icn.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/isdn/icn/icn.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/isdn/icn/icn.c linux-2.6.32.35/drivers/isdn/icn/icn.c
+--- linux-2.6.32.35/drivers/isdn/icn/icn.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/isdn/icn/icn.c 2010-12-31 14:46:53.000000000 -0500
@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
if (count > len)
count = len;
@@ -26891,9 +26891,9 @@ diff -urNp linux-2.6.32.33/drivers/isdn/icn/icn.c linux-2.6.32.33/drivers/isdn/i
return -EFAULT;
} else
memcpy(msg, buf, count);
-diff -urNp linux-2.6.32.33/drivers/isdn/mISDN/socket.c linux-2.6.32.33/drivers/isdn/mISDN/socket.c
---- linux-2.6.32.33/drivers/isdn/mISDN/socket.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/isdn/mISDN/socket.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/isdn/mISDN/socket.c linux-2.6.32.35/drivers/isdn/mISDN/socket.c
+--- linux-2.6.32.35/drivers/isdn/mISDN/socket.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/isdn/mISDN/socket.c 2010-12-31 14:46:53.000000000 -0500
@@ -391,6 +391,7 @@ data_sock_ioctl(struct socket *sock, uns
if (dev) {
struct mISDN_devinfo di;
@@ -26910,9 +26910,9 @@ diff -urNp linux-2.6.32.33/drivers/isdn/mISDN/socket.c linux-2.6.32.33/drivers/i
di.id = dev->id;
di.Dprotocols = dev->Dprotocols;
di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
-diff -urNp linux-2.6.32.33/drivers/isdn/sc/interrupt.c linux-2.6.32.33/drivers/isdn/sc/interrupt.c
---- linux-2.6.32.33/drivers/isdn/sc/interrupt.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/isdn/sc/interrupt.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/isdn/sc/interrupt.c linux-2.6.32.35/drivers/isdn/sc/interrupt.c
+--- linux-2.6.32.35/drivers/isdn/sc/interrupt.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/isdn/sc/interrupt.c 2010-12-31 14:46:53.000000000 -0500
@@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy,
}
else if(callid>=0x0000 && callid<=0x7FFF)
@@ -26947,9 +26947,9 @@ diff -urNp linux-2.6.32.33/drivers/isdn/sc/interrupt.c linux-2.6.32.33/drivers/i
continue;
}
-diff -urNp linux-2.6.32.33/drivers/lguest/core.c linux-2.6.32.33/drivers/lguest/core.c
---- linux-2.6.32.33/drivers/lguest/core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/lguest/core.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/lguest/core.c linux-2.6.32.35/drivers/lguest/core.c
+--- linux-2.6.32.35/drivers/lguest/core.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/lguest/core.c 2010-12-31 14:46:53.000000000 -0500
@@ -91,9 +91,17 @@ static __init int map_switcher(void)
* it's worked so far. The end address needs +1 because __get_vm_area
* allocates an extra guard page, so we need space for that.
@@ -26977,9 +26977,9 @@ diff -urNp linux-2.6.32.33/drivers/lguest/core.c linux-2.6.32.33/drivers/lguest/
end_switcher_text - start_switcher_text);
printk(KERN_INFO "lguest: mapped switcher at %p\n",
-diff -urNp linux-2.6.32.33/drivers/lguest/x86/core.c linux-2.6.32.33/drivers/lguest/x86/core.c
---- linux-2.6.32.33/drivers/lguest/x86/core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/lguest/x86/core.c 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/lguest/x86/core.c linux-2.6.32.35/drivers/lguest/x86/core.c
+--- linux-2.6.32.35/drivers/lguest/x86/core.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/lguest/x86/core.c 2010-12-31 14:47:01.000000000 -0500
@@ -59,7 +59,7 @@ static struct {
/* Offset from where switcher.S was compiled to where we've copied it */
static unsigned long switcher_offset(void)
@@ -27021,9 +27021,9 @@ diff -urNp linux-2.6.32.33/drivers/lguest/x86/core.c linux-2.6.32.33/drivers/lgu
lguest_entry.segment = LGUEST_CS;
/*
-diff -urNp linux-2.6.32.33/drivers/lguest/x86/switcher_32.S linux-2.6.32.33/drivers/lguest/x86/switcher_32.S
---- linux-2.6.32.33/drivers/lguest/x86/switcher_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/lguest/x86/switcher_32.S 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/lguest/x86/switcher_32.S linux-2.6.32.35/drivers/lguest/x86/switcher_32.S
+--- linux-2.6.32.35/drivers/lguest/x86/switcher_32.S 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/lguest/x86/switcher_32.S 2010-12-31 14:47:01.000000000 -0500
@@ -87,6 +87,7 @@
#include <asm/page.h>
#include <asm/segment.h>
@@ -27082,9 +27082,9 @@ diff -urNp linux-2.6.32.33/drivers/lguest/x86/switcher_32.S linux-2.6.32.33/driv
// Every interrupt can come to us here
// But we must truly tell each apart.
-diff -urNp linux-2.6.32.33/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.33/drivers/macintosh/via-pmu-backlight.c
---- linux-2.6.32.33/drivers/macintosh/via-pmu-backlight.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/macintosh/via-pmu-backlight.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.35/drivers/macintosh/via-pmu-backlight.c
+--- linux-2.6.32.35/drivers/macintosh/via-pmu-backlight.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/macintosh/via-pmu-backlight.c 2010-12-31 14:46:53.000000000 -0500
@@ -15,7 +15,7 @@
#define MAX_PMU_LEVEL 0xFF
@@ -27103,9 +27103,9 @@ diff -urNp linux-2.6.32.33/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.33
.get_brightness = pmu_backlight_get_brightness,
.update_status = pmu_backlight_update_status,
-diff -urNp linux-2.6.32.33/drivers/macintosh/via-pmu.c linux-2.6.32.33/drivers/macintosh/via-pmu.c
---- linux-2.6.32.33/drivers/macintosh/via-pmu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/macintosh/via-pmu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/macintosh/via-pmu.c linux-2.6.32.35/drivers/macintosh/via-pmu.c
+--- linux-2.6.32.35/drivers/macintosh/via-pmu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/macintosh/via-pmu.c 2010-12-31 14:46:53.000000000 -0500
@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
&& (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
}
@@ -27115,9 +27115,9 @@ diff -urNp linux-2.6.32.33/drivers/macintosh/via-pmu.c linux-2.6.32.33/drivers/m
.enter = powerbook_sleep,
.valid = pmu_sleep_valid,
};
-diff -urNp linux-2.6.32.33/drivers/md/bitmap.c linux-2.6.32.33/drivers/md/bitmap.c
---- linux-2.6.32.33/drivers/md/bitmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/md/bitmap.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/md/bitmap.c linux-2.6.32.35/drivers/md/bitmap.c
+--- linux-2.6.32.35/drivers/md/bitmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/md/bitmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -58,7 +58,7 @@
# if DEBUG > 0
# define PRINTK(x...) printk(KERN_DEBUG x)
@@ -27127,9 +27127,9 @@ diff -urNp linux-2.6.32.33/drivers/md/bitmap.c linux-2.6.32.33/drivers/md/bitmap
# endif
#endif
-diff -urNp linux-2.6.32.33/drivers/md/dm-ioctl.c linux-2.6.32.33/drivers/md/dm-ioctl.c
---- linux-2.6.32.33/drivers/md/dm-ioctl.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.33/drivers/md/dm-ioctl.c 2011-02-27 14:53:10.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/md/dm-ioctl.c linux-2.6.32.35/drivers/md/dm-ioctl.c
+--- linux-2.6.32.35/drivers/md/dm-ioctl.c 2010-08-29 21:08:20.000000000 -0400
++++ linux-2.6.32.35/drivers/md/dm-ioctl.c 2011-02-27 14:53:10.000000000 -0500
@@ -1437,7 +1437,7 @@ static int validate_params(uint cmd, str
cmd == DM_LIST_VERSIONS_CMD)
return 0;
@@ -27139,9 +27139,9 @@ diff -urNp linux-2.6.32.33/drivers/md/dm-ioctl.c linux-2.6.32.33/drivers/md/dm-i
if (!*param->name) {
DMWARN("name not supplied when creating device");
return -EINVAL;
-diff -urNp linux-2.6.32.33/drivers/md/dm-sysfs.c linux-2.6.32.33/drivers/md/dm-sysfs.c
---- linux-2.6.32.33/drivers/md/dm-sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/md/dm-sysfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/md/dm-sysfs.c linux-2.6.32.35/drivers/md/dm-sysfs.c
+--- linux-2.6.32.35/drivers/md/dm-sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/md/dm-sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
NULL,
};
@@ -27151,9 +27151,9 @@ diff -urNp linux-2.6.32.33/drivers/md/dm-sysfs.c linux-2.6.32.33/drivers/md/dm-s
.show = dm_attr_show,
};
-diff -urNp linux-2.6.32.33/drivers/md/dm-table.c linux-2.6.32.33/drivers/md/dm-table.c
---- linux-2.6.32.33/drivers/md/dm-table.c 2011-01-11 23:55:35.000000000 -0500
-+++ linux-2.6.32.33/drivers/md/dm-table.c 2011-01-11 23:56:03.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/md/dm-table.c linux-2.6.32.35/drivers/md/dm-table.c
+--- linux-2.6.32.35/drivers/md/dm-table.c 2011-01-11 23:55:35.000000000 -0500
++++ linux-2.6.32.35/drivers/md/dm-table.c 2011-01-11 23:56:03.000000000 -0500
@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
if (!dev_size)
return 0;
@@ -27163,9 +27163,9 @@ diff -urNp linux-2.6.32.33/drivers/md/dm-table.c linux-2.6.32.33/drivers/md/dm-t
DMWARN("%s: %s too small for target: "
"start=%llu, len=%llu, dev_size=%llu",
dm_device_name(ti->table->md), bdevname(bdev, b),
-diff -urNp linux-2.6.32.33/drivers/md/md.c linux-2.6.32.33/drivers/md/md.c
---- linux-2.6.32.33/drivers/md/md.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/md/md.c 2011-03-02 17:25:19.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/md/md.c linux-2.6.32.35/drivers/md/md.c
+--- linux-2.6.32.35/drivers/md/md.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/drivers/md/md.c 2011-03-02 17:25:19.000000000 -0500
@@ -2517,7 +2517,7 @@ static void rdev_free(struct kobject *ko
mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
kfree(rdev);
@@ -27212,9 +27212,9 @@ diff -urNp linux-2.6.32.33/drivers/md/md.c linux-2.6.32.33/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.33/drivers/md/md.h linux-2.6.32.33/drivers/md/md.h
---- linux-2.6.32.33/drivers/md/md.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/md/md.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/md/md.h linux-2.6.32.35/drivers/md/md.h
+--- linux-2.6.32.35/drivers/md/md.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/md/md.h 2010-12-31 14:46:53.000000000 -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)
@@ -27224,9 +27224,9 @@ diff -urNp linux-2.6.32.33/drivers/md/md.h linux-2.6.32.33/drivers/md/md.h
}
struct mdk_personality
-diff -urNp linux-2.6.32.33/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.33/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.32.33/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/media/dvb/dvb-core/dvbdev.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.35/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-2.6.32.35/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/media/dvb/dvb-core/dvbdev.c 2010-12-31 14:46:53.000000000 -0500
@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
const struct dvb_device *template, void *priv, int type)
{
@@ -27235,9 +27235,9 @@ diff -urNp linux-2.6.32.33/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.33/d
struct file_operations *dvbdevfops;
struct device *clsdev;
int minor;
-diff -urNp linux-2.6.32.33/drivers/media/radio/radio-cadet.c linux-2.6.32.33/drivers/media/radio/radio-cadet.c
---- linux-2.6.32.33/drivers/media/radio/radio-cadet.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/media/radio/radio-cadet.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/media/radio/radio-cadet.c linux-2.6.32.35/drivers/media/radio/radio-cadet.c
+--- linux-2.6.32.35/drivers/media/radio/radio-cadet.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/media/radio/radio-cadet.c 2010-12-31 14:46:53.000000000 -0500
@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
while (i < count && dev->rdsin != dev->rdsout)
readbuf[i++] = dev->rdsbuf[dev->rdsout++];
@@ -27247,9 +27247,9 @@ diff -urNp linux-2.6.32.33/drivers/media/radio/radio-cadet.c linux-2.6.32.33/dri
return -EFAULT;
return i;
}
-diff -urNp linux-2.6.32.33/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.32.33/drivers/media/video/sn9c102/sn9c102_core.c
---- linux-2.6.32.33/drivers/media/video/sn9c102/sn9c102_core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/media/video/sn9c102/sn9c102_core.c 2011-02-27 15:19:00.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.32.35/drivers/media/video/sn9c102/sn9c102_core.c
+--- linux-2.6.32.35/drivers/media/video/sn9c102/sn9c102_core.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/media/video/sn9c102/sn9c102_core.c 2011-02-27 15:19:00.000000000 -0500
@@ -1430,9 +1430,9 @@ static DEVICE_ATTR(i2c_reg, S_IRUGO | S_
sn9c102_show_i2c_reg, sn9c102_store_i2c_reg);
static DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR,
@@ -27263,9 +27263,9 @@ diff -urNp linux-2.6.32.33/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.
static DEVICE_ATTR(frame_header, S_IRUGO, sn9c102_show_frame_header, NULL);
-diff -urNp linux-2.6.32.33/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.33/drivers/media/video/usbvideo/konicawc.c
---- linux-2.6.32.33/drivers/media/video/usbvideo/konicawc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/media/video/usbvideo/konicawc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.35/drivers/media/video/usbvideo/konicawc.c
+--- linux-2.6.32.35/drivers/media/video/usbvideo/konicawc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/media/video/usbvideo/konicawc.c 2010-12-31 14:46:53.000000000 -0500
@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
int error;
@@ -27275,9 +27275,9 @@ diff -urNp linux-2.6.32.33/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.
cam->input = input_dev = input_allocate_device();
if (!input_dev) {
-diff -urNp linux-2.6.32.33/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.33/drivers/media/video/usbvideo/quickcam_messenger.c
---- linux-2.6.32.33/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/media/video/usbvideo/quickcam_messenger.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.35/drivers/media/video/usbvideo/quickcam_messenger.c
+--- linux-2.6.32.35/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/media/video/usbvideo/quickcam_messenger.c 2010-12-31 14:46:53.000000000 -0500
@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
int error;
@@ -27287,9 +27287,9 @@ diff -urNp linux-2.6.32.33/drivers/media/video/usbvideo/quickcam_messenger.c lin
cam->input = input_dev = input_allocate_device();
if (!input_dev) {
-diff -urNp linux-2.6.32.33/drivers/message/fusion/mptbase.c linux-2.6.32.33/drivers/message/fusion/mptbase.c
---- linux-2.6.32.33/drivers/message/fusion/mptbase.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/message/fusion/mptbase.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/message/fusion/mptbase.c linux-2.6.32.35/drivers/message/fusion/mptbase.c
+--- linux-2.6.32.35/drivers/message/fusion/mptbase.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/message/fusion/mptbase.c 2010-12-31 14:46:53.000000000 -0500
@@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **s
len += sprintf(buf+len, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
len += sprintf(buf+len, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
@@ -27305,9 +27305,9 @@ diff -urNp linux-2.6.32.33/drivers/message/fusion/mptbase.c linux-2.6.32.33/driv
/*
* Rounding UP to nearest 4-kB boundary here...
*/
-diff -urNp linux-2.6.32.33/drivers/message/fusion/mptdebug.h linux-2.6.32.33/drivers/message/fusion/mptdebug.h
---- linux-2.6.32.33/drivers/message/fusion/mptdebug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/message/fusion/mptdebug.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/message/fusion/mptdebug.h linux-2.6.32.35/drivers/message/fusion/mptdebug.h
+--- linux-2.6.32.35/drivers/message/fusion/mptdebug.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/message/fusion/mptdebug.h 2010-12-31 14:46:53.000000000 -0500
@@ -71,7 +71,7 @@
CMD; \
}
@@ -27317,9 +27317,9 @@ diff -urNp linux-2.6.32.33/drivers/message/fusion/mptdebug.h linux-2.6.32.33/dri
#endif
-diff -urNp linux-2.6.32.33/drivers/message/fusion/mptsas.c linux-2.6.32.33/drivers/message/fusion/mptsas.c
---- linux-2.6.32.33/drivers/message/fusion/mptsas.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/message/fusion/mptsas.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/message/fusion/mptsas.c linux-2.6.32.35/drivers/message/fusion/mptsas.c
+--- linux-2.6.32.35/drivers/message/fusion/mptsas.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/message/fusion/mptsas.c 2010-12-31 14:46:53.000000000 -0500
@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
return 0;
}
@@ -27368,9 +27368,9 @@ diff -urNp linux-2.6.32.33/drivers/message/fusion/mptsas.c linux-2.6.32.33/drive
static inline struct sas_port *
mptsas_get_port(struct mptsas_phyinfo *phy_info)
{
-diff -urNp linux-2.6.32.33/drivers/message/fusion/mptscsih.c linux-2.6.32.33/drivers/message/fusion/mptscsih.c
---- linux-2.6.32.33/drivers/message/fusion/mptscsih.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/message/fusion/mptscsih.c 2011-03-02 17:25:24.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/message/fusion/mptscsih.c linux-2.6.32.35/drivers/message/fusion/mptscsih.c
+--- linux-2.6.32.35/drivers/message/fusion/mptscsih.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/drivers/message/fusion/mptscsih.c 2011-03-02 17:25:24.000000000 -0500
@@ -1248,15 +1248,16 @@ mptscsih_info(struct Scsi_Host *SChost)
h = shost_priv(SChost);
@@ -27396,9 +27396,9 @@ diff -urNp linux-2.6.32.33/drivers/message/fusion/mptscsih.c linux-2.6.32.33/dri
return h->info_kbuf;
}
-diff -urNp linux-2.6.32.33/drivers/message/i2o/i2o_proc.c linux-2.6.32.33/drivers/message/i2o/i2o_proc.c
---- linux-2.6.32.33/drivers/message/i2o/i2o_proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/message/i2o/i2o_proc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/message/i2o/i2o_proc.c linux-2.6.32.35/drivers/message/i2o/i2o_proc.c
+--- linux-2.6.32.35/drivers/message/i2o/i2o_proc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/message/i2o/i2o_proc.c 2010-12-31 14:46:53.000000000 -0500
@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
"Array Controller Device"
};
@@ -27485,9 +27485,9 @@ diff -urNp linux-2.6.32.33/drivers/message/i2o/i2o_proc.c linux-2.6.32.33/driver
return 0;
}
-diff -urNp linux-2.6.32.33/drivers/mfd/ab3100-core.c linux-2.6.32.33/drivers/mfd/ab3100-core.c
---- linux-2.6.32.33/drivers/mfd/ab3100-core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/mfd/ab3100-core.c 2011-02-27 15:32:18.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/mfd/ab3100-core.c linux-2.6.32.35/drivers/mfd/ab3100-core.c
+--- linux-2.6.32.35/drivers/mfd/ab3100-core.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/mfd/ab3100-core.c 2011-02-27 15:32:18.000000000 -0500
@@ -591,7 +591,7 @@ static void ab3100_setup_debugfs(struct
ab3100_get_priv.ab3100 = ab3100;
ab3100_get_priv.mode = false;
@@ -27506,9 +27506,9 @@ diff -urNp linux-2.6.32.33/drivers/mfd/ab3100-core.c linux-2.6.32.33/drivers/mfd
&ab3100_get_set_reg_fops);
if (!ab3100_set_reg_file) {
err = -ENOMEM;
-diff -urNp linux-2.6.32.33/drivers/misc/ep93xx_pwm.c linux-2.6.32.33/drivers/misc/ep93xx_pwm.c
---- linux-2.6.32.33/drivers/misc/ep93xx_pwm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/misc/ep93xx_pwm.c 2011-02-27 15:23:39.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/misc/ep93xx_pwm.c linux-2.6.32.35/drivers/misc/ep93xx_pwm.c
+--- linux-2.6.32.35/drivers/misc/ep93xx_pwm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/misc/ep93xx_pwm.c 2011-02-27 15:23:39.000000000 -0500
@@ -248,11 +248,11 @@ static ssize_t ep93xx_pwm_set_invert(str
static DEVICE_ATTR(min_freq, S_IRUGO, ep93xx_pwm_get_min_freq, NULL);
@@ -27524,9 +27524,9 @@ diff -urNp linux-2.6.32.33/drivers/misc/ep93xx_pwm.c linux-2.6.32.33/drivers/mis
ep93xx_pwm_get_invert, ep93xx_pwm_set_invert);
static struct attribute *ep93xx_pwm_attrs[] = {
-diff -urNp linux-2.6.32.33/drivers/misc/kgdbts.c linux-2.6.32.33/drivers/misc/kgdbts.c
---- linux-2.6.32.33/drivers/misc/kgdbts.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/misc/kgdbts.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/misc/kgdbts.c linux-2.6.32.35/drivers/misc/kgdbts.c
+--- linux-2.6.32.35/drivers/misc/kgdbts.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/misc/kgdbts.c 2010-12-31 14:46:53.000000000 -0500
@@ -118,7 +118,7 @@
} while (0)
#define MAX_CONFIG_LEN 40
@@ -27545,9 +27545,9 @@ diff -urNp linux-2.6.32.33/drivers/misc/kgdbts.c linux-2.6.32.33/drivers/misc/kg
.name = "kgdbts",
.read_char = kgdbts_get_char,
.write_char = kgdbts_put_char,
-diff -urNp linux-2.6.32.33/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.33/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.32.33/drivers/misc/sgi-gru/gruhandles.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/misc/sgi-gru/gruhandles.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.35/drivers/misc/sgi-gru/gruhandles.c
+--- linux-2.6.32.35/drivers/misc/sgi-gru/gruhandles.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/misc/sgi-gru/gruhandles.c 2010-12-31 14:46:53.000000000 -0500
@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
static void update_mcs_stats(enum mcs_op op, unsigned long clks)
@@ -27559,9 +27559,9 @@ diff -urNp linux-2.6.32.33/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.33/dri
if (mcs_op_statistics[op].max < clks)
mcs_op_statistics[op].max = clks;
}
-diff -urNp linux-2.6.32.33/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.33/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.32.33/drivers/misc/sgi-gru/gruprocfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/misc/sgi-gru/gruprocfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.35/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-2.6.32.35/drivers/misc/sgi-gru/gruprocfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/misc/sgi-gru/gruprocfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -32,9 +32,9 @@
#define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -27585,9 +27585,9 @@ diff -urNp linux-2.6.32.33/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.33/driv
max = mcs_op_statistics[op].max;
seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
count ? total / count : 0, max);
-diff -urNp linux-2.6.32.33/drivers/misc/sgi-gru/grutables.h linux-2.6.32.33/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.32.33/drivers/misc/sgi-gru/grutables.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/misc/sgi-gru/grutables.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/misc/sgi-gru/grutables.h linux-2.6.32.35/drivers/misc/sgi-gru/grutables.h
+--- linux-2.6.32.35/drivers/misc/sgi-gru/grutables.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/misc/sgi-gru/grutables.h 2010-12-31 14:46:53.000000000 -0500
@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
* GRU statistics.
*/
@@ -27771,9 +27771,9 @@ diff -urNp linux-2.6.32.33/drivers/misc/sgi-gru/grutables.h linux-2.6.32.33/driv
} while (0)
#ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-2.6.32.33/drivers/mtd/devices/doc2000.c linux-2.6.32.33/drivers/mtd/devices/doc2000.c
---- linux-2.6.32.33/drivers/mtd/devices/doc2000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/mtd/devices/doc2000.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/mtd/devices/doc2000.c linux-2.6.32.35/drivers/mtd/devices/doc2000.c
+--- linux-2.6.32.35/drivers/mtd/devices/doc2000.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/mtd/devices/doc2000.c 2010-12-31 14:46:53.000000000 -0500
@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
/* The ECC will not be calculated correctly if less than 512 is written */
@@ -27783,9 +27783,9 @@ diff -urNp linux-2.6.32.33/drivers/mtd/devices/doc2000.c linux-2.6.32.33/drivers
printk(KERN_WARNING
"ECC needs a full sector write (adr: %lx size %lx)\n",
(long) to, (long) len);
-diff -urNp linux-2.6.32.33/drivers/mtd/devices/doc2001.c linux-2.6.32.33/drivers/mtd/devices/doc2001.c
---- linux-2.6.32.33/drivers/mtd/devices/doc2001.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/mtd/devices/doc2001.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/mtd/devices/doc2001.c linux-2.6.32.35/drivers/mtd/devices/doc2001.c
+--- linux-2.6.32.35/drivers/mtd/devices/doc2001.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/mtd/devices/doc2001.c 2010-12-31 14:46:53.000000000 -0500
@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
struct Nand *mychip = &this->chips[from >> (this->chipshift)];
@@ -27795,9 +27795,9 @@ diff -urNp linux-2.6.32.33/drivers/mtd/devices/doc2001.c linux-2.6.32.33/drivers
return -EINVAL;
/* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-2.6.32.33/drivers/mtd/ubi/build.c linux-2.6.32.33/drivers/mtd/ubi/build.c
---- linux-2.6.32.33/drivers/mtd/ubi/build.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/mtd/ubi/build.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/mtd/ubi/build.c linux-2.6.32.35/drivers/mtd/ubi/build.c
+--- linux-2.6.32.35/drivers/mtd/ubi/build.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/mtd/ubi/build.c 2010-12-31 14:46:53.000000000 -0500
@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
static int __init bytes_str_to_int(const char *str)
{
@@ -27837,9 +27837,9 @@ diff -urNp linux-2.6.32.33/drivers/mtd/ubi/build.c linux-2.6.32.33/drivers/mtd/u
}
/**
-diff -urNp linux-2.6.32.33/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.33/drivers/net/cxgb3/cxgb3_main.c
---- linux-2.6.32.33/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/cxgb3/cxgb3_main.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.35/drivers/net/cxgb3/cxgb3_main.c
+--- linux-2.6.32.35/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:26:05.000000000 -0400
++++ linux-2.6.32.35/drivers/net/cxgb3/cxgb3_main.c 2010-12-31 14:46:53.000000000 -0500
@@ -2275,7 +2275,7 @@ static int cxgb_extension_ioctl(struct n
case CHELSIO_GET_QSET_NUM:{
struct ch_reg edata;
@@ -27849,9 +27849,9 @@ diff -urNp linux-2.6.32.33/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.33/driver
edata.cmd = CHELSIO_GET_QSET_NUM;
edata.val = pi->nqsets;
-diff -urNp linux-2.6.32.33/drivers/net/e1000e/82571.c linux-2.6.32.33/drivers/net/e1000e/82571.c
---- linux-2.6.32.33/drivers/net/e1000e/82571.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/e1000e/82571.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/e1000e/82571.c linux-2.6.32.35/drivers/net/e1000e/82571.c
+--- linux-2.6.32.35/drivers/net/e1000e/82571.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/e1000e/82571.c 2010-12-31 14:46:53.000000000 -0500
@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
{
struct e1000_hw *hw = &adapter->hw;
@@ -27905,9 +27905,9 @@ diff -urNp linux-2.6.32.33/drivers/net/e1000e/82571.c linux-2.6.32.33/drivers/ne
.acquire_nvm = e1000_acquire_nvm_82571,
.read_nvm = e1000e_read_nvm_eerd,
.release_nvm = e1000_release_nvm_82571,
-diff -urNp linux-2.6.32.33/drivers/net/e1000e/e1000.h linux-2.6.32.33/drivers/net/e1000e/e1000.h
---- linux-2.6.32.33/drivers/net/e1000e/e1000.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/e1000e/e1000.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/e1000e/e1000.h linux-2.6.32.35/drivers/net/e1000e/e1000.h
+--- linux-2.6.32.35/drivers/net/e1000e/e1000.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/e1000e/e1000.h 2010-12-31 14:46:53.000000000 -0500
@@ -375,9 +375,9 @@ struct e1000_info {
u32 pba;
u32 max_hw_frame_size;
@@ -27921,9 +27921,9 @@ diff -urNp linux-2.6.32.33/drivers/net/e1000e/e1000.h linux-2.6.32.33/drivers/ne
};
/* hardware capability, feature, and workaround flags */
-diff -urNp linux-2.6.32.33/drivers/net/e1000e/es2lan.c linux-2.6.32.33/drivers/net/e1000e/es2lan.c
---- linux-2.6.32.33/drivers/net/e1000e/es2lan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/e1000e/es2lan.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/e1000e/es2lan.c linux-2.6.32.35/drivers/net/e1000e/es2lan.c
+--- linux-2.6.32.35/drivers/net/e1000e/es2lan.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/e1000e/es2lan.c 2010-12-31 14:46:53.000000000 -0500
@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
{
struct e1000_hw *hw = &adapter->hw;
@@ -27959,9 +27959,9 @@ diff -urNp linux-2.6.32.33/drivers/net/e1000e/es2lan.c linux-2.6.32.33/drivers/n
.acquire_nvm = e1000_acquire_nvm_80003es2lan,
.read_nvm = e1000e_read_nvm_eerd,
.release_nvm = e1000_release_nvm_80003es2lan,
-diff -urNp linux-2.6.32.33/drivers/net/e1000e/hw.h linux-2.6.32.33/drivers/net/e1000e/hw.h
---- linux-2.6.32.33/drivers/net/e1000e/hw.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/e1000e/hw.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/e1000e/hw.h linux-2.6.32.35/drivers/net/e1000e/hw.h
+--- linux-2.6.32.35/drivers/net/e1000e/hw.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/e1000e/hw.h 2010-12-31 14:46:53.000000000 -0500
@@ -756,34 +756,34 @@ struct e1000_mac_operations {
/* Function pointers for the PHY. */
@@ -28021,9 +28021,9 @@ diff -urNp linux-2.6.32.33/drivers/net/e1000e/hw.h linux-2.6.32.33/drivers/net/e
};
struct e1000_mac_info {
-diff -urNp linux-2.6.32.33/drivers/net/e1000e/ich8lan.c linux-2.6.32.33/drivers/net/e1000e/ich8lan.c
---- linux-2.6.32.33/drivers/net/e1000e/ich8lan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/e1000e/ich8lan.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/e1000e/ich8lan.c linux-2.6.32.35/drivers/net/e1000e/ich8lan.c
+--- linux-2.6.32.35/drivers/net/e1000e/ich8lan.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/e1000e/ich8lan.c 2010-12-31 14:46:53.000000000 -0500
@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan
}
}
@@ -28051,9 +28051,9 @@ diff -urNp linux-2.6.32.33/drivers/net/e1000e/ich8lan.c linux-2.6.32.33/drivers/
.acquire_nvm = e1000_acquire_nvm_ich8lan,
.read_nvm = e1000_read_nvm_ich8lan,
.release_nvm = e1000_release_nvm_ich8lan,
-diff -urNp linux-2.6.32.33/drivers/net/eql.c linux-2.6.32.33/drivers/net/eql.c
---- linux-2.6.32.33/drivers/net/eql.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/eql.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/eql.c linux-2.6.32.35/drivers/net/eql.c
+--- linux-2.6.32.35/drivers/net/eql.c 2010-09-26 17:26:05.000000000 -0400
++++ linux-2.6.32.35/drivers/net/eql.c 2010-12-31 14:46:53.000000000 -0500
@@ -554,7 +554,7 @@ static int eql_g_master_cfg(struct net_d
equalizer_t *eql;
master_config_t mc;
@@ -28063,9 +28063,9 @@ diff -urNp linux-2.6.32.33/drivers/net/eql.c linux-2.6.32.33/drivers/net/eql.c
if (eql_is_master(dev)) {
eql = netdev_priv(dev);
-diff -urNp linux-2.6.32.33/drivers/net/ibmveth.c linux-2.6.32.33/drivers/net/ibmveth.c
---- linux-2.6.32.33/drivers/net/ibmveth.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/ibmveth.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/ibmveth.c linux-2.6.32.35/drivers/net/ibmveth.c
+--- linux-2.6.32.35/drivers/net/ibmveth.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/ibmveth.c 2010-12-31 14:46:53.000000000 -0500
@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
NULL,
};
@@ -28075,9 +28075,9 @@ diff -urNp linux-2.6.32.33/drivers/net/ibmveth.c linux-2.6.32.33/drivers/net/ibm
.show = veth_pool_show,
.store = veth_pool_store,
};
-diff -urNp linux-2.6.32.33/drivers/net/igb/e1000_82575.c linux-2.6.32.33/drivers/net/igb/e1000_82575.c
---- linux-2.6.32.33/drivers/net/igb/e1000_82575.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/igb/e1000_82575.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/igb/e1000_82575.c linux-2.6.32.35/drivers/net/igb/e1000_82575.c
+--- linux-2.6.32.35/drivers/net/igb/e1000_82575.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/igb/e1000_82575.c 2010-12-31 14:46:53.000000000 -0500
@@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct
wr32(E1000_VT_CTL, vt_ctl);
}
@@ -28103,9 +28103,9 @@ diff -urNp linux-2.6.32.33/drivers/net/igb/e1000_82575.c linux-2.6.32.33/drivers
.acquire = igb_acquire_nvm_82575,
.read = igb_read_nvm_eerd,
.release = igb_release_nvm_82575,
-diff -urNp linux-2.6.32.33/drivers/net/igb/e1000_hw.h linux-2.6.32.33/drivers/net/igb/e1000_hw.h
---- linux-2.6.32.33/drivers/net/igb/e1000_hw.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/igb/e1000_hw.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/igb/e1000_hw.h linux-2.6.32.35/drivers/net/igb/e1000_hw.h
+--- linux-2.6.32.35/drivers/net/igb/e1000_hw.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/igb/e1000_hw.h 2010-12-31 14:46:53.000000000 -0500
@@ -305,17 +305,17 @@ struct e1000_phy_operations {
};
@@ -28131,9 +28131,9 @@ diff -urNp linux-2.6.32.33/drivers/net/igb/e1000_hw.h linux-2.6.32.33/drivers/ne
};
extern const struct e1000_info e1000_82575_info;
-diff -urNp linux-2.6.32.33/drivers/net/irda/vlsi_ir.c linux-2.6.32.33/drivers/net/irda/vlsi_ir.c
---- linux-2.6.32.33/drivers/net/irda/vlsi_ir.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/irda/vlsi_ir.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/irda/vlsi_ir.c linux-2.6.32.35/drivers/net/irda/vlsi_ir.c
+--- linux-2.6.32.35/drivers/net/irda/vlsi_ir.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/irda/vlsi_ir.c 2010-12-31 14:46:53.000000000 -0500
@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
/* no race - tx-ring already empty */
vlsi_set_baud(idev, iobase);
@@ -28150,9 +28150,9 @@ diff -urNp linux-2.6.32.33/drivers/net/irda/vlsi_ir.c linux-2.6.32.33/drivers/ne
spin_unlock_irqrestore(&idev->lock, flags);
dev_kfree_skb_any(skb);
return NETDEV_TX_OK;
-diff -urNp linux-2.6.32.33/drivers/net/iseries_veth.c linux-2.6.32.33/drivers/net/iseries_veth.c
---- linux-2.6.32.33/drivers/net/iseries_veth.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/iseries_veth.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/iseries_veth.c linux-2.6.32.35/drivers/net/iseries_veth.c
+--- linux-2.6.32.35/drivers/net/iseries_veth.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/iseries_veth.c 2010-12-31 14:46:53.000000000 -0500
@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
NULL
};
@@ -28171,9 +28171,9 @@ diff -urNp linux-2.6.32.33/drivers/net/iseries_veth.c linux-2.6.32.33/drivers/ne
.show = veth_port_attribute_show
};
-diff -urNp linux-2.6.32.33/drivers/net/pcnet32.c linux-2.6.32.33/drivers/net/pcnet32.c
---- linux-2.6.32.33/drivers/net/pcnet32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/pcnet32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/pcnet32.c linux-2.6.32.35/drivers/net/pcnet32.c
+--- linux-2.6.32.35/drivers/net/pcnet32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/pcnet32.c 2010-12-31 14:46:53.000000000 -0500
@@ -79,7 +79,7 @@ static int cards_found;
/*
* VLB I/O addresses
@@ -28183,9 +28183,9 @@ diff -urNp linux-2.6.32.33/drivers/net/pcnet32.c linux-2.6.32.33/drivers/net/pcn
{ 0x300, 0x320, 0x340, 0x360, 0 };
static int pcnet32_debug = 0;
-diff -urNp linux-2.6.32.33/drivers/net/tg3.h linux-2.6.32.33/drivers/net/tg3.h
---- linux-2.6.32.33/drivers/net/tg3.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/tg3.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/tg3.h linux-2.6.32.35/drivers/net/tg3.h
+--- linux-2.6.32.35/drivers/net/tg3.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/tg3.h 2010-12-31 14:46:53.000000000 -0500
@@ -95,6 +95,7 @@
#define CHIPREV_ID_5750_A0 0x4000
#define CHIPREV_ID_5750_A1 0x4001
@@ -28194,9 +28194,9 @@ diff -urNp linux-2.6.32.33/drivers/net/tg3.h linux-2.6.32.33/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.33/drivers/net/tulip/de4x5.c linux-2.6.32.33/drivers/net/tulip/de4x5.c
---- linux-2.6.32.33/drivers/net/tulip/de4x5.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/tulip/de4x5.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/tulip/de4x5.c linux-2.6.32.35/drivers/net/tulip/de4x5.c
+--- linux-2.6.32.35/drivers/net/tulip/de4x5.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/tulip/de4x5.c 2010-12-31 14:46:53.000000000 -0500
@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
for (i=0; i<ETH_ALEN; i++) {
tmp.addr[i] = dev->dev_addr[i];
@@ -28224,9 +28224,9 @@ diff -urNp linux-2.6.32.33/drivers/net/tulip/de4x5.c linux-2.6.32.33/drivers/net
break;
#define DE4X5_DUMP 0x0f /* Dump the DE4X5 Status */
-diff -urNp linux-2.6.32.33/drivers/net/usb/hso.c linux-2.6.32.33/drivers/net/usb/hso.c
---- linux-2.6.32.33/drivers/net/usb/hso.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/usb/hso.c 2011-01-24 18:05:30.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/usb/hso.c linux-2.6.32.35/drivers/net/usb/hso.c
+--- linux-2.6.32.35/drivers/net/usb/hso.c 2010-09-26 17:26:05.000000000 -0400
++++ linux-2.6.32.35/drivers/net/usb/hso.c 2011-01-24 18:05:30.000000000 -0500
@@ -71,7 +71,7 @@
#include <asm/byteorder.h>
#include <linux/serial_core.h>
@@ -28328,9 +28328,9 @@ diff -urNp linux-2.6.32.33/drivers/net/usb/hso.c linux-2.6.32.33/drivers/net/usb
result =
hso_start_serial_device(serial_table[i], GFP_NOIO);
hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-2.6.32.33/drivers/net/wireless/b43/debugfs.c linux-2.6.32.33/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.32.33/drivers/net/wireless/b43/debugfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/wireless/b43/debugfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/wireless/b43/debugfs.c linux-2.6.32.35/drivers/net/wireless/b43/debugfs.c
+--- linux-2.6.32.35/drivers/net/wireless/b43/debugfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/wireless/b43/debugfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,7 +43,7 @@ static struct dentry *rootdir;
struct b43_debugfs_fops {
ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -28340,9 +28340,9 @@ diff -urNp linux-2.6.32.33/drivers/net/wireless/b43/debugfs.c linux-2.6.32.33/dr
/* Offset of struct b43_dfs_file in struct b43_dfsentry */
size_t file_struct_offset;
};
-diff -urNp linux-2.6.32.33/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.33/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.32.33/drivers/net/wireless/b43legacy/debugfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/wireless/b43legacy/debugfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.35/drivers/net/wireless/b43legacy/debugfs.c
+--- linux-2.6.32.35/drivers/net/wireless/b43legacy/debugfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/wireless/b43legacy/debugfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -44,7 +44,7 @@ static struct dentry *rootdir;
struct b43legacy_debugfs_fops {
ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -28352,9 +28352,9 @@ diff -urNp linux-2.6.32.33/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.33/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-1000.c
---- linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-1000.c
+--- linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-12-31 14:46:53.000000000 -0500
@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
},
};
@@ -28364,9 +28364,9 @@ diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
.ucode = &iwl5000_ucode,
.lib = &iwl1000_lib,
.hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-3945.c
---- linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-3945.c
+--- linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-12-31 14:46:53.000000000 -0500
@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
.build_addsta_hcmd = iwl3945_build_addsta_hcmd,
};
@@ -28376,9 +28376,9 @@ diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.
.ucode = &iwl3945_ucode,
.lib = &iwl3945_lib,
.hcmd = &iwl3945_hcmd,
-diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-4965.c
---- linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-4965.c
+--- linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-12-31 14:46:53.000000000 -0500
@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib =
},
};
@@ -28388,9 +28388,9 @@ diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.
.ucode = &iwl4965_ucode,
.lib = &iwl4965_lib,
.hcmd = &iwl4965_hcmd,
-diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-5000.c
---- linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-5000.c
+--- linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-12-31 14:46:53.000000000 -0500
@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib =
},
};
@@ -28408,9 +28408,9 @@ diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.
.ucode = &iwl5000_ucode,
.lib = &iwl5150_lib,
.hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-6000.c
---- linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-6000.c
+--- linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-12-31 14:46:53.000000000 -0500
@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
.calc_rssi = iwl5000_calc_rssi,
};
@@ -28420,9 +28420,9 @@ diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
.ucode = &iwl5000_ucode,
.lib = &iwl6000_lib,
.hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-12-31 14:46:53.000000000 -0500
@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
#endif
@@ -28434,9 +28434,9 @@ diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32
static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
void *p, u32 len)
{}
-diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-dev.h
---- linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-dev.h
+--- linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-12-31 14:46:53.000000000 -0500
@@ -68,7 +68,7 @@ struct iwl_tx_queue;
/* shared structures from iwl-5000.c */
@@ -28446,9 +28446,9 @@ diff -urNp linux-2.6.32.33/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.3
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.33/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.33/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.32.33/drivers/net/wireless/libertas/debugfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/wireless/libertas/debugfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.35/drivers/net/wireless/libertas/debugfs.c
+--- linux-2.6.32.35/drivers/net/wireless/libertas/debugfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/wireless/libertas/debugfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -708,7 +708,7 @@ out_unlock:
struct lbs_debugfs_files {
const char *name;
@@ -28458,9 +28458,9 @@ diff -urNp linux-2.6.32.33/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
};
static const struct lbs_debugfs_files debugfs_files[] = {
-diff -urNp linux-2.6.32.33/drivers/net/wireless/rndis_wlan.c linux-2.6.32.33/drivers/net/wireless/rndis_wlan.c
---- linux-2.6.32.33/drivers/net/wireless/rndis_wlan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/net/wireless/rndis_wlan.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/net/wireless/rndis_wlan.c linux-2.6.32.35/drivers/net/wireless/rndis_wlan.c
+--- linux-2.6.32.35/drivers/net/wireless/rndis_wlan.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/net/wireless/rndis_wlan.c 2010-12-31 14:46:53.000000000 -0500
@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
@@ -28470,9 +28470,9 @@ diff -urNp linux-2.6.32.33/drivers/net/wireless/rndis_wlan.c linux-2.6.32.33/dri
rts_threshold = 2347;
tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-2.6.32.33/drivers/oprofile/buffer_sync.c linux-2.6.32.33/drivers/oprofile/buffer_sync.c
---- linux-2.6.32.33/drivers/oprofile/buffer_sync.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/drivers/oprofile/buffer_sync.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/oprofile/buffer_sync.c linux-2.6.32.35/drivers/oprofile/buffer_sync.c
+--- linux-2.6.32.35/drivers/oprofile/buffer_sync.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.35/drivers/oprofile/buffer_sync.c 2010-12-31 14:46:53.000000000 -0500
@@ -341,7 +341,7 @@ static void add_data(struct op_entry *en
if (cookie == NO_COOKIE)
offset = pc;
@@ -28508,9 +28508,9 @@ diff -urNp linux-2.6.32.33/drivers/oprofile/buffer_sync.c linux-2.6.32.33/driver
}
}
release_mm(mm);
-diff -urNp linux-2.6.32.33/drivers/oprofile/event_buffer.c linux-2.6.32.33/drivers/oprofile/event_buffer.c
---- linux-2.6.32.33/drivers/oprofile/event_buffer.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/oprofile/event_buffer.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/oprofile/event_buffer.c linux-2.6.32.35/drivers/oprofile/event_buffer.c
+--- linux-2.6.32.35/drivers/oprofile/event_buffer.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/oprofile/event_buffer.c 2010-12-31 14:46:53.000000000 -0500
@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
}
@@ -28520,9 +28520,9 @@ diff -urNp linux-2.6.32.33/drivers/oprofile/event_buffer.c linux-2.6.32.33/drive
return;
}
-diff -urNp linux-2.6.32.33/drivers/oprofile/oprof.c linux-2.6.32.33/drivers/oprofile/oprof.c
---- linux-2.6.32.33/drivers/oprofile/oprof.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/oprofile/oprof.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/oprofile/oprof.c linux-2.6.32.35/drivers/oprofile/oprof.c
+--- linux-2.6.32.35/drivers/oprofile/oprof.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/oprofile/oprof.c 2010-12-31 14:46:53.000000000 -0500
@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
if (oprofile_ops.switch_events())
return;
@@ -28532,9 +28532,9 @@ diff -urNp linux-2.6.32.33/drivers/oprofile/oprof.c linux-2.6.32.33/drivers/opro
start_switch_worker();
}
-diff -urNp linux-2.6.32.33/drivers/oprofile/oprofilefs.c linux-2.6.32.33/drivers/oprofile/oprofilefs.c
---- linux-2.6.32.33/drivers/oprofile/oprofilefs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/oprofile/oprofilefs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/oprofile/oprofilefs.c linux-2.6.32.35/drivers/oprofile/oprofilefs.c
+--- linux-2.6.32.35/drivers/oprofile/oprofilefs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/oprofile/oprofilefs.c 2010-12-31 14:46:53.000000000 -0500
@@ -187,7 +187,7 @@ static const struct file_operations atom
@@ -28544,9 +28544,9 @@ diff -urNp linux-2.6.32.33/drivers/oprofile/oprofilefs.c linux-2.6.32.33/drivers
{
struct dentry *d = __oprofilefs_create_file(sb, root, name,
&atomic_ro_fops, 0444);
-diff -urNp linux-2.6.32.33/drivers/oprofile/oprofile_stats.c linux-2.6.32.33/drivers/oprofile/oprofile_stats.c
---- linux-2.6.32.33/drivers/oprofile/oprofile_stats.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/oprofile/oprofile_stats.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/oprofile/oprofile_stats.c linux-2.6.32.35/drivers/oprofile/oprofile_stats.c
+--- linux-2.6.32.35/drivers/oprofile/oprofile_stats.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/oprofile/oprofile_stats.c 2010-12-31 14:46:53.000000000 -0500
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
cpu_buf->sample_invalid_eip = 0;
}
@@ -28564,9 +28564,9 @@ diff -urNp linux-2.6.32.33/drivers/oprofile/oprofile_stats.c linux-2.6.32.33/dri
}
-diff -urNp linux-2.6.32.33/drivers/oprofile/oprofile_stats.h linux-2.6.32.33/drivers/oprofile/oprofile_stats.h
---- linux-2.6.32.33/drivers/oprofile/oprofile_stats.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/oprofile/oprofile_stats.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/oprofile/oprofile_stats.h linux-2.6.32.35/drivers/oprofile/oprofile_stats.h
+--- linux-2.6.32.35/drivers/oprofile/oprofile_stats.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/oprofile/oprofile_stats.h 2010-12-31 14:46:53.000000000 -0500
@@ -13,11 +13,11 @@
#include <asm/atomic.h>
@@ -28584,9 +28584,9 @@ diff -urNp linux-2.6.32.33/drivers/oprofile/oprofile_stats.h linux-2.6.32.33/dri
};
extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-2.6.32.33/drivers/parisc/pdc_stable.c linux-2.6.32.33/drivers/parisc/pdc_stable.c
---- linux-2.6.32.33/drivers/parisc/pdc_stable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/parisc/pdc_stable.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/parisc/pdc_stable.c linux-2.6.32.35/drivers/parisc/pdc_stable.c
+--- linux-2.6.32.35/drivers/parisc/pdc_stable.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/parisc/pdc_stable.c 2010-12-31 14:46:53.000000000 -0500
@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
return ret;
}
@@ -28596,9 +28596,9 @@ diff -urNp linux-2.6.32.33/drivers/parisc/pdc_stable.c linux-2.6.32.33/drivers/p
.show = pdcspath_attr_show,
.store = pdcspath_attr_store,
};
-diff -urNp linux-2.6.32.33/drivers/parport/procfs.c linux-2.6.32.33/drivers/parport/procfs.c
---- linux-2.6.32.33/drivers/parport/procfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/parport/procfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/parport/procfs.c linux-2.6.32.35/drivers/parport/procfs.c
+--- linux-2.6.32.35/drivers/parport/procfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/parport/procfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
*ppos += len;
@@ -28617,9 +28617,9 @@ diff -urNp linux-2.6.32.33/drivers/parport/procfs.c linux-2.6.32.33/drivers/parp
}
#endif /* IEEE1284.3 support. */
-diff -urNp linux-2.6.32.33/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.33/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.32.33/drivers/pci/hotplug/acpiphp_glue.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/pci/hotplug/acpiphp_glue.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.35/drivers/pci/hotplug/acpiphp_glue.c
+--- linux-2.6.32.35/drivers/pci/hotplug/acpiphp_glue.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/pci/hotplug/acpiphp_glue.c 2010-12-31 14:46:53.000000000 -0500
@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
}
@@ -28629,9 +28629,9 @@ diff -urNp linux-2.6.32.33/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.33/dr
.handler = handle_hotplug_event_func,
};
-diff -urNp linux-2.6.32.33/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.33/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.32.33/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/pci/hotplug/cpqphp_nvram.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.35/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-2.6.32.35/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/pci/hotplug/cpqphp_nvram.c 2010-12-31 14:46:53.000000000 -0500
@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
void compaq_nvram_init (void __iomem *rom_start)
@@ -28646,9 +28646,9 @@ diff -urNp linux-2.6.32.33/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.33/dr
dbg("int15 entry = %p\n", compaq_int15_entry_point);
/* initialize our int15 lock */
-diff -urNp linux-2.6.32.33/drivers/pci/hotplug/fakephp.c linux-2.6.32.33/drivers/pci/hotplug/fakephp.c
---- linux-2.6.32.33/drivers/pci/hotplug/fakephp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/pci/hotplug/fakephp.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/pci/hotplug/fakephp.c linux-2.6.32.35/drivers/pci/hotplug/fakephp.c
+--- linux-2.6.32.35/drivers/pci/hotplug/fakephp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/pci/hotplug/fakephp.c 2010-12-31 14:46:53.000000000 -0500
@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
}
@@ -28658,9 +28658,9 @@ diff -urNp linux-2.6.32.33/drivers/pci/hotplug/fakephp.c linux-2.6.32.33/drivers
.store = legacy_store, .show = legacy_show
},
.release = &legacy_release,
-diff -urNp linux-2.6.32.33/drivers/pci/intel-iommu.c linux-2.6.32.33/drivers/pci/intel-iommu.c
---- linux-2.6.32.33/drivers/pci/intel-iommu.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.33/drivers/pci/intel-iommu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/pci/intel-iommu.c linux-2.6.32.35/drivers/pci/intel-iommu.c
+--- linux-2.6.32.35/drivers/pci/intel-iommu.c 2010-09-26 17:26:05.000000000 -0400
++++ linux-2.6.32.35/drivers/pci/intel-iommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -2643,7 +2643,7 @@ error:
return 0;
}
@@ -28730,9 +28730,9 @@ diff -urNp linux-2.6.32.33/drivers/pci/intel-iommu.c linux-2.6.32.33/drivers/pci
.alloc_coherent = intel_alloc_coherent,
.free_coherent = intel_free_coherent,
.map_sg = intel_map_sg,
-diff -urNp linux-2.6.32.33/drivers/pci/pcie/aspm.c linux-2.6.32.33/drivers/pci/pcie/aspm.c
---- linux-2.6.32.33/drivers/pci/pcie/aspm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/pci/pcie/aspm.c 2011-02-27 14:53:10.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/pci/pcie/aspm.c linux-2.6.32.35/drivers/pci/pcie/aspm.c
+--- linux-2.6.32.35/drivers/pci/pcie/aspm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/pci/pcie/aspm.c 2011-02-27 14:53:10.000000000 -0500
@@ -27,9 +27,9 @@
#define MODULE_PARAM_PREFIX "pcie_aspm."
@@ -28746,9 +28746,9 @@ diff -urNp linux-2.6.32.33/drivers/pci/pcie/aspm.c linux-2.6.32.33/drivers/pci/p
#define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
#define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
-diff -urNp linux-2.6.32.33/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.33/drivers/pci/pcie/portdrv_pci.c
---- linux-2.6.32.33/drivers/pci/pcie/portdrv_pci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/pci/pcie/portdrv_pci.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.35/drivers/pci/pcie/portdrv_pci.c
+--- linux-2.6.32.35/drivers/pci/pcie/portdrv_pci.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/pci/pcie/portdrv_pci.c 2010-12-31 14:46:53.000000000 -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 */
@@ -28758,9 +28758,9 @@ diff -urNp linux-2.6.32.33/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.33/driver
};
MODULE_DEVICE_TABLE(pci, port_pci_ids);
-diff -urNp linux-2.6.32.33/drivers/pci/probe.c linux-2.6.32.33/drivers/pci/probe.c
---- linux-2.6.32.33/drivers/pci/probe.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/pci/probe.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/pci/probe.c linux-2.6.32.35/drivers/pci/probe.c
+--- linux-2.6.32.35/drivers/pci/probe.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/pci/probe.c 2010-12-31 14:46:53.000000000 -0500
@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
return ret;
}
@@ -28778,9 +28778,9 @@ diff -urNp linux-2.6.32.33/drivers/pci/probe.c linux-2.6.32.33/drivers/pci/probe
struct device_attribute *attr,
char *buf)
{
-diff -urNp linux-2.6.32.33/drivers/pci/proc.c linux-2.6.32.33/drivers/pci/proc.c
---- linux-2.6.32.33/drivers/pci/proc.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/drivers/pci/proc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/pci/proc.c linux-2.6.32.35/drivers/pci/proc.c
+--- linux-2.6.32.35/drivers/pci/proc.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/drivers/pci/proc.c 2010-12-31 14:46:53.000000000 -0500
@@ -480,7 +480,16 @@ static const struct file_operations proc
static int __init pci_proc_init(void)
{
@@ -28798,9 +28798,9 @@ diff -urNp linux-2.6.32.33/drivers/pci/proc.c linux-2.6.32.33/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.33/drivers/pci/slot.c linux-2.6.32.33/drivers/pci/slot.c
---- linux-2.6.32.33/drivers/pci/slot.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/pci/slot.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/pci/slot.c linux-2.6.32.35/drivers/pci/slot.c
+--- linux-2.6.32.35/drivers/pci/slot.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/pci/slot.c 2010-12-31 14:46:53.000000000 -0500
@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
return attribute->store ? attribute->store(slot, buf, len) : -EIO;
}
@@ -28810,9 +28810,9 @@ diff -urNp linux-2.6.32.33/drivers/pci/slot.c linux-2.6.32.33/drivers/pci/slot.c
.show = pci_slot_attr_show,
.store = pci_slot_attr_store,
};
-diff -urNp linux-2.6.32.33/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.33/drivers/pcmcia/pcmcia_ioctl.c
---- linux-2.6.32.33/drivers/pcmcia/pcmcia_ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/pcmcia/pcmcia_ioctl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.35/drivers/pcmcia/pcmcia_ioctl.c
+--- linux-2.6.32.35/drivers/pcmcia/pcmcia_ioctl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/pcmcia/pcmcia_ioctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode
return -EFAULT;
}
@@ -28822,9 +28822,9 @@ diff -urNp linux-2.6.32.33/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.33/drivers
if (!buf)
return -ENOMEM;
-diff -urNp linux-2.6.32.33/drivers/pcmcia/ti113x.h linux-2.6.32.33/drivers/pcmcia/ti113x.h
---- linux-2.6.32.33/drivers/pcmcia/ti113x.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/pcmcia/ti113x.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/pcmcia/ti113x.h linux-2.6.32.35/drivers/pcmcia/ti113x.h
+--- linux-2.6.32.35/drivers/pcmcia/ti113x.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/pcmcia/ti113x.h 2010-12-31 14:46:53.000000000 -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),
@@ -28834,9 +28834,9 @@ diff -urNp linux-2.6.32.33/drivers/pcmcia/ti113x.h linux-2.6.32.33/drivers/pcmci
};
static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
-diff -urNp linux-2.6.32.33/drivers/pcmcia/yenta_socket.c linux-2.6.32.33/drivers/pcmcia/yenta_socket.c
---- linux-2.6.32.33/drivers/pcmcia/yenta_socket.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/pcmcia/yenta_socket.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/pcmcia/yenta_socket.c linux-2.6.32.35/drivers/pcmcia/yenta_socket.c
+--- linux-2.6.32.35/drivers/pcmcia/yenta_socket.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/pcmcia/yenta_socket.c 2010-12-31 14:46:53.000000000 -0500
@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
/* match any cardbus bridge */
@@ -28846,9 +28846,9 @@ diff -urNp linux-2.6.32.33/drivers/pcmcia/yenta_socket.c linux-2.6.32.33/drivers
};
MODULE_DEVICE_TABLE(pci, yenta_table);
-diff -urNp linux-2.6.32.33/drivers/platform/x86/acer-wmi.c linux-2.6.32.33/drivers/platform/x86/acer-wmi.c
---- linux-2.6.32.33/drivers/platform/x86/acer-wmi.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/platform/x86/acer-wmi.c 2011-03-02 17:25:24.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/platform/x86/acer-wmi.c linux-2.6.32.35/drivers/platform/x86/acer-wmi.c
+--- linux-2.6.32.35/drivers/platform/x86/acer-wmi.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/drivers/platform/x86/acer-wmi.c 2011-03-02 17:25:24.000000000 -0500
@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
return 0;
}
@@ -28858,9 +28858,9 @@ diff -urNp linux-2.6.32.33/drivers/platform/x86/acer-wmi.c linux-2.6.32.33/drive
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.32.33/drivers/platform/x86/asus_acpi.c linux-2.6.32.33/drivers/platform/x86/asus_acpi.c
---- linux-2.6.32.33/drivers/platform/x86/asus_acpi.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/platform/x86/asus_acpi.c 2011-02-27 15:16:00.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/platform/x86/asus_acpi.c linux-2.6.32.35/drivers/platform/x86/asus_acpi.c
+--- linux-2.6.32.35/drivers/platform/x86/asus_acpi.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/drivers/platform/x86/asus_acpi.c 2011-02-27 15:16:00.000000000 -0500
@@ -1396,7 +1396,7 @@ static int asus_hotk_remove(struct acpi_
return 0;
}
@@ -28870,9 +28870,9 @@ diff -urNp linux-2.6.32.33/drivers/platform/x86/asus_acpi.c linux-2.6.32.33/driv
.get_brightness = read_brightness,
.update_status = set_brightness_status,
};
-diff -urNp linux-2.6.32.33/drivers/platform/x86/asus-laptop.c linux-2.6.32.33/drivers/platform/x86/asus-laptop.c
---- linux-2.6.32.33/drivers/platform/x86/asus-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/platform/x86/asus-laptop.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/platform/x86/asus-laptop.c linux-2.6.32.35/drivers/platform/x86/asus-laptop.c
+--- linux-2.6.32.35/drivers/platform/x86/asus-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/platform/x86/asus-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
*/
static int read_brightness(struct backlight_device *bd);
@@ -28882,9 +28882,9 @@ diff -urNp linux-2.6.32.33/drivers/platform/x86/asus-laptop.c linux-2.6.32.33/dr
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.32.33/drivers/platform/x86/compal-laptop.c linux-2.6.32.33/drivers/platform/x86/compal-laptop.c
---- linux-2.6.32.33/drivers/platform/x86/compal-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/platform/x86/compal-laptop.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/platform/x86/compal-laptop.c linux-2.6.32.35/drivers/platform/x86/compal-laptop.c
+--- linux-2.6.32.35/drivers/platform/x86/compal-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/platform/x86/compal-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
return set_lcd_level(b->props.brightness);
}
@@ -28894,9 +28894,9 @@ diff -urNp linux-2.6.32.33/drivers/platform/x86/compal-laptop.c linux-2.6.32.33/
.get_brightness = bl_get_brightness,
.update_status = bl_update_status,
};
-diff -urNp linux-2.6.32.33/drivers/platform/x86/dell-laptop.c linux-2.6.32.33/drivers/platform/x86/dell-laptop.c
---- linux-2.6.32.33/drivers/platform/x86/dell-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/platform/x86/dell-laptop.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/platform/x86/dell-laptop.c linux-2.6.32.35/drivers/platform/x86/dell-laptop.c
+--- linux-2.6.32.35/drivers/platform/x86/dell-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/platform/x86/dell-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
return buffer.output[1];
}
@@ -28906,9 +28906,9 @@ diff -urNp linux-2.6.32.33/drivers/platform/x86/dell-laptop.c linux-2.6.32.33/dr
.get_brightness = dell_get_intensity,
.update_status = dell_send_intensity,
};
-diff -urNp linux-2.6.32.33/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.33/drivers/platform/x86/eeepc-laptop.c
---- linux-2.6.32.33/drivers/platform/x86/eeepc-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/platform/x86/eeepc-laptop.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.35/drivers/platform/x86/eeepc-laptop.c
+--- linux-2.6.32.35/drivers/platform/x86/eeepc-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/platform/x86/eeepc-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
*/
static int read_brightness(struct backlight_device *bd);
@@ -28918,9 +28918,9 @@ diff -urNp linux-2.6.32.33/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.33/d
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.32.33/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.33/drivers/platform/x86/fujitsu-laptop.c
---- linux-2.6.32.33/drivers/platform/x86/fujitsu-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/platform/x86/fujitsu-laptop.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.35/drivers/platform/x86/fujitsu-laptop.c
+--- linux-2.6.32.35/drivers/platform/x86/fujitsu-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/platform/x86/fujitsu-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
return ret;
}
@@ -28930,9 +28930,9 @@ diff -urNp linux-2.6.32.33/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.33
.get_brightness = bl_get_brightness,
.update_status = bl_update_status,
};
-diff -urNp linux-2.6.32.33/drivers/platform/x86/msi-laptop.c linux-2.6.32.33/drivers/platform/x86/msi-laptop.c
---- linux-2.6.32.33/drivers/platform/x86/msi-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/platform/x86/msi-laptop.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/platform/x86/msi-laptop.c linux-2.6.32.35/drivers/platform/x86/msi-laptop.c
+--- linux-2.6.32.35/drivers/platform/x86/msi-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/platform/x86/msi-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
return set_lcd_level(b->props.brightness);
}
@@ -28942,9 +28942,9 @@ diff -urNp linux-2.6.32.33/drivers/platform/x86/msi-laptop.c linux-2.6.32.33/dri
.get_brightness = bl_get_brightness,
.update_status = bl_update_status,
};
-diff -urNp linux-2.6.32.33/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.33/drivers/platform/x86/panasonic-laptop.c
---- linux-2.6.32.33/drivers/platform/x86/panasonic-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/platform/x86/panasonic-laptop.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.35/drivers/platform/x86/panasonic-laptop.c
+--- linux-2.6.32.35/drivers/platform/x86/panasonic-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/platform/x86/panasonic-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
}
@@ -28954,9 +28954,9 @@ diff -urNp linux-2.6.32.33/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.
.get_brightness = bl_get,
.update_status = bl_set_status,
};
-diff -urNp linux-2.6.32.33/drivers/platform/x86/sony-laptop.c linux-2.6.32.33/drivers/platform/x86/sony-laptop.c
---- linux-2.6.32.33/drivers/platform/x86/sony-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/platform/x86/sony-laptop.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/platform/x86/sony-laptop.c linux-2.6.32.35/drivers/platform/x86/sony-laptop.c
+--- linux-2.6.32.35/drivers/platform/x86/sony-laptop.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/platform/x86/sony-laptop.c 2010-12-31 14:46:53.000000000 -0500
@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
}
@@ -28966,9 +28966,9 @@ diff -urNp linux-2.6.32.33/drivers/platform/x86/sony-laptop.c linux-2.6.32.33/dr
.update_status = sony_backlight_update_status,
.get_brightness = sony_backlight_get_brightness,
};
-diff -urNp linux-2.6.32.33/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.33/drivers/platform/x86/thinkpad_acpi.c
---- linux-2.6.32.33/drivers/platform/x86/thinkpad_acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/platform/x86/thinkpad_acpi.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.35/drivers/platform/x86/thinkpad_acpi.c
+--- linux-2.6.32.35/drivers/platform/x86/thinkpad_acpi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/platform/x86/thinkpad_acpi.c 2010-12-31 14:46:53.000000000 -0500
@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
BACKLIGHT_UPDATE_HOTKEY);
}
@@ -28978,9 +28978,9 @@ diff -urNp linux-2.6.32.33/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.33/
.get_brightness = brightness_get,
.update_status = brightness_update_status,
};
-diff -urNp linux-2.6.32.33/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.33/drivers/platform/x86/toshiba_acpi.c
---- linux-2.6.32.33/drivers/platform/x86/toshiba_acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/platform/x86/toshiba_acpi.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.35/drivers/platform/x86/toshiba_acpi.c
+--- linux-2.6.32.35/drivers/platform/x86/toshiba_acpi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/platform/x86/toshiba_acpi.c 2010-12-31 14:46:53.000000000 -0500
@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
return AE_OK;
}
@@ -28990,9 +28990,9 @@ diff -urNp linux-2.6.32.33/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.33/d
.get_brightness = get_lcd,
.update_status = set_lcd_status,
};
-diff -urNp linux-2.6.32.33/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.33/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.32.33/drivers/pnp/pnpbios/bioscalls.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/pnp/pnpbios/bioscalls.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.35/drivers/pnp/pnpbios/bioscalls.c
+--- linux-2.6.32.35/drivers/pnp/pnpbios/bioscalls.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/pnp/pnpbios/bioscalls.c 2010-12-31 14:46:53.000000000 -0500
@@ -60,7 +60,7 @@ do { \
set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
} while(0)
@@ -29049,9 +29049,9 @@ diff -urNp linux-2.6.32.33/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.33/drive
+
+ pax_close_kernel();
}
-diff -urNp linux-2.6.32.33/drivers/pnp/quirks.c linux-2.6.32.33/drivers/pnp/quirks.c
---- linux-2.6.32.33/drivers/pnp/quirks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/pnp/quirks.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/pnp/quirks.c linux-2.6.32.35/drivers/pnp/quirks.c
+--- linux-2.6.32.35/drivers/pnp/quirks.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/pnp/quirks.c 2010-12-31 14:46:53.000000000 -0500
@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
/* PnP resources that might overlap PCI BARs */
{"PNP0c01", quirk_system_pci_resources},
@@ -29061,9 +29061,9 @@ diff -urNp linux-2.6.32.33/drivers/pnp/quirks.c linux-2.6.32.33/drivers/pnp/quir
};
void pnp_fixup_device(struct pnp_dev *dev)
-diff -urNp linux-2.6.32.33/drivers/pnp/resource.c linux-2.6.32.33/drivers/pnp/resource.c
---- linux-2.6.32.33/drivers/pnp/resource.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/pnp/resource.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/pnp/resource.c linux-2.6.32.35/drivers/pnp/resource.c
+--- linux-2.6.32.35/drivers/pnp/resource.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/pnp/resource.c 2010-12-31 14:46:53.000000000 -0500
@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
return 1;
@@ -29082,9 +29082,9 @@ diff -urNp linux-2.6.32.33/drivers/pnp/resource.c linux-2.6.32.33/drivers/pnp/re
return 0;
/* check if the resource is reserved */
-diff -urNp linux-2.6.32.33/drivers/rtc/rtc-dev.c linux-2.6.32.33/drivers/rtc/rtc-dev.c
---- linux-2.6.32.33/drivers/rtc/rtc-dev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/rtc/rtc-dev.c 2011-01-01 19:02:12.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/rtc/rtc-dev.c linux-2.6.32.35/drivers/rtc/rtc-dev.c
+--- linux-2.6.32.35/drivers/rtc/rtc-dev.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/rtc/rtc-dev.c 2011-01-01 19:02:12.000000000 -0500
@@ -14,6 +14,7 @@
#include <linux/module.h>
#include <linux/rtc.h>
@@ -29102,9 +29102,9 @@ diff -urNp linux-2.6.32.33/drivers/rtc/rtc-dev.c linux-2.6.32.33/drivers/rtc/rtc
return rtc_set_time(rtc, &tm);
case RTC_PIE_ON:
-diff -urNp linux-2.6.32.33/drivers/rtc/rtc-ds1511.c linux-2.6.32.33/drivers/rtc/rtc-ds1511.c
---- linux-2.6.32.33/drivers/rtc/rtc-ds1511.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/rtc/rtc-ds1511.c 2011-02-27 15:20:55.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/rtc/rtc-ds1511.c linux-2.6.32.35/drivers/rtc/rtc-ds1511.c
+--- linux-2.6.32.35/drivers/rtc/rtc-ds1511.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/rtc/rtc-ds1511.c 2011-02-27 15:20:55.000000000 -0500
@@ -480,7 +480,7 @@ ds1511_nvram_write(struct kobject *kobj,
static struct bin_attribute ds1511_nvram_attr = {
.attr = {
@@ -29114,9 +29114,9 @@ diff -urNp linux-2.6.32.33/drivers/rtc/rtc-ds1511.c linux-2.6.32.33/drivers/rtc/
},
.size = DS1511_RAM_MAX,
.read = ds1511_nvram_read,
-diff -urNp linux-2.6.32.33/drivers/s390/cio/qdio_perf.c linux-2.6.32.33/drivers/s390/cio/qdio_perf.c
---- linux-2.6.32.33/drivers/s390/cio/qdio_perf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/s390/cio/qdio_perf.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/s390/cio/qdio_perf.c linux-2.6.32.35/drivers/s390/cio/qdio_perf.c
+--- linux-2.6.32.35/drivers/s390/cio/qdio_perf.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/s390/cio/qdio_perf.c 2010-12-31 14:46:53.000000000 -0500
@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
static int qdio_perf_proc_show(struct seq_file *m, void *v)
{
@@ -29192,9 +29192,9 @@ diff -urNp linux-2.6.32.33/drivers/s390/cio/qdio_perf.c linux-2.6.32.33/drivers/
seq_printf(m, "\n");
return 0;
}
-diff -urNp linux-2.6.32.33/drivers/s390/cio/qdio_perf.h linux-2.6.32.33/drivers/s390/cio/qdio_perf.h
---- linux-2.6.32.33/drivers/s390/cio/qdio_perf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/s390/cio/qdio_perf.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/s390/cio/qdio_perf.h linux-2.6.32.35/drivers/s390/cio/qdio_perf.h
+--- linux-2.6.32.35/drivers/s390/cio/qdio_perf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/s390/cio/qdio_perf.h 2010-12-31 14:46:53.000000000 -0500
@@ -13,46 +13,46 @@
struct qdio_perf_stats {
@@ -29267,9 +29267,9 @@ diff -urNp linux-2.6.32.33/drivers/s390/cio/qdio_perf.h linux-2.6.32.33/drivers/
}
int qdio_setup_perf_stats(void);
-diff -urNp linux-2.6.32.33/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.33/drivers/scsi/aic94xx/aic94xx_init.c
---- linux-2.6.32.33/drivers/scsi/aic94xx/aic94xx_init.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/scsi/aic94xx/aic94xx_init.c 2011-02-27 15:21:24.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.35/drivers/scsi/aic94xx/aic94xx_init.c
+--- linux-2.6.32.35/drivers/scsi/aic94xx/aic94xx_init.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/scsi/aic94xx/aic94xx_init.c 2011-02-27 15:21:24.000000000 -0500
@@ -485,7 +485,7 @@ static ssize_t asd_show_update_bios(stru
flash_error_table[i].reason);
}
@@ -29279,9 +29279,9 @@ diff -urNp linux-2.6.32.33/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.33/d
asd_show_update_bios, asd_store_update_bios);
static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
-diff -urNp linux-2.6.32.33/drivers/scsi/ipr.c linux-2.6.32.33/drivers/scsi/ipr.c
---- linux-2.6.32.33/drivers/scsi/ipr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/scsi/ipr.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/scsi/ipr.c linux-2.6.32.35/drivers/scsi/ipr.c
+--- linux-2.6.32.35/drivers/scsi/ipr.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/scsi/ipr.c 2010-12-31 14:46:53.000000000 -0500
@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
return true;
}
@@ -29291,9 +29291,9 @@ diff -urNp linux-2.6.32.33/drivers/scsi/ipr.c linux-2.6.32.33/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.33/drivers/scsi/libfc/fc_exch.c linux-2.6.32.33/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.32.33/drivers/scsi/libfc/fc_exch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/scsi/libfc/fc_exch.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/scsi/libfc/fc_exch.c linux-2.6.32.35/drivers/scsi/libfc/fc_exch.c
+--- linux-2.6.32.35/drivers/scsi/libfc/fc_exch.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/scsi/libfc/fc_exch.c 2010-12-31 14:46:53.000000000 -0500
@@ -86,12 +86,12 @@ struct fc_exch_mgr {
* all together if not used XXX
*/
@@ -29415,9 +29415,9 @@ diff -urNp linux-2.6.32.33/drivers/scsi/libfc/fc_exch.c linux-2.6.32.33/drivers/
fc_frame_free(fp);
}
-diff -urNp linux-2.6.32.33/drivers/scsi/libsas/sas_ata.c linux-2.6.32.33/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.32.33/drivers/scsi/libsas/sas_ata.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.33/drivers/scsi/libsas/sas_ata.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/scsi/libsas/sas_ata.c linux-2.6.32.35/drivers/scsi/libsas/sas_ata.c
+--- linux-2.6.32.35/drivers/scsi/libsas/sas_ata.c 2010-11-26 18:22:29.000000000 -0500
++++ linux-2.6.32.35/drivers/scsi/libsas/sas_ata.c 2010-12-31 14:46:53.000000000 -0500
@@ -343,10 +343,10 @@ static int sas_ata_scr_read(struct ata_l
}
}
@@ -29431,9 +29431,9 @@ diff -urNp linux-2.6.32.33/drivers/scsi/libsas/sas_ata.c linux-2.6.32.33/drivers
.qc_prep = ata_noop_qc_prep,
.qc_issue = sas_ata_qc_issue,
.qc_fill_rtf = sas_ata_qc_fill_rtf,
-diff -urNp linux-2.6.32.33/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.33/drivers/scsi/mpt2sas/mpt2sas_debug.h
---- linux-2.6.32.33/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.35/drivers/scsi/mpt2sas/mpt2sas_debug.h
+--- linux-2.6.32.35/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-12-31 14:46:53.000000000 -0500
@@ -79,7 +79,7 @@
CMD; \
}
@@ -29443,9 +29443,9 @@ diff -urNp linux-2.6.32.33/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.33/
#endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
-diff -urNp linux-2.6.32.33/drivers/scsi/scsi_logging.h linux-2.6.32.33/drivers/scsi/scsi_logging.h
---- linux-2.6.32.33/drivers/scsi/scsi_logging.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/scsi/scsi_logging.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/scsi/scsi_logging.h linux-2.6.32.35/drivers/scsi/scsi_logging.h
+--- linux-2.6.32.35/drivers/scsi/scsi_logging.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/scsi/scsi_logging.h 2010-12-31 14:46:53.000000000 -0500
@@ -51,7 +51,7 @@ do { \
} while (0); \
} while (0)
@@ -29455,9 +29455,9 @@ diff -urNp linux-2.6.32.33/drivers/scsi/scsi_logging.h linux-2.6.32.33/drivers/s
#endif /* CONFIG_SCSI_LOGGING */
/*
-diff -urNp linux-2.6.32.33/drivers/scsi/sg.c linux-2.6.32.33/drivers/scsi/sg.c
---- linux-2.6.32.33/drivers/scsi/sg.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/scsi/sg.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/scsi/sg.c linux-2.6.32.35/drivers/scsi/sg.c
+--- linux-2.6.32.35/drivers/scsi/sg.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/scsi/sg.c 2010-12-31 14:46:53.000000000 -0500
@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
const struct file_operations * fops;
};
@@ -29476,9 +29476,9 @@ diff -urNp linux-2.6.32.33/drivers/scsi/sg.c linux-2.6.32.33/drivers/scsi/sg.c
sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
if (!sg_proc_sgp)
-diff -urNp linux-2.6.32.33/drivers/serial/8250_pci.c linux-2.6.32.33/drivers/serial/8250_pci.c
---- linux-2.6.32.33/drivers/serial/8250_pci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/serial/8250_pci.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/serial/8250_pci.c linux-2.6.32.35/drivers/serial/8250_pci.c
+--- linux-2.6.32.35/drivers/serial/8250_pci.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/serial/8250_pci.c 2010-12-31 14:46:53.000000000 -0500
@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
@@ -29488,9 +29488,9 @@ diff -urNp linux-2.6.32.33/drivers/serial/8250_pci.c linux-2.6.32.33/drivers/ser
};
static struct pci_driver serial_pci_driver = {
-diff -urNp linux-2.6.32.33/drivers/serial/kgdboc.c linux-2.6.32.33/drivers/serial/kgdboc.c
---- linux-2.6.32.33/drivers/serial/kgdboc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/serial/kgdboc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/serial/kgdboc.c linux-2.6.32.35/drivers/serial/kgdboc.c
+--- linux-2.6.32.35/drivers/serial/kgdboc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/serial/kgdboc.c 2010-12-31 14:46:53.000000000 -0500
@@ -18,7 +18,7 @@
#define MAX_CONFIG_LEN 40
@@ -29509,9 +29509,9 @@ diff -urNp linux-2.6.32.33/drivers/serial/kgdboc.c linux-2.6.32.33/drivers/seria
.name = "kgdboc",
.read_char = kgdboc_get_char,
.write_char = kgdboc_put_char,
-diff -urNp linux-2.6.32.33/drivers/staging/android/binder.c linux-2.6.32.33/drivers/staging/android/binder.c
---- linux-2.6.32.33/drivers/staging/android/binder.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/android/binder.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/android/binder.c linux-2.6.32.35/drivers/staging/android/binder.c
+--- linux-2.6.32.35/drivers/staging/android/binder.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/android/binder.c 2010-12-31 14:46:53.000000000 -0500
@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
}
@@ -29521,9 +29521,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/android/binder.c linux-2.6.32.33/driv
.open = binder_vma_open,
.close = binder_vma_close,
};
-diff -urNp linux-2.6.32.33/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.33/drivers/staging/b3dfg/b3dfg.c
---- linux-2.6.32.33/drivers/staging/b3dfg/b3dfg.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/b3dfg/b3dfg.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.35/drivers/staging/b3dfg/b3dfg.c
+--- linux-2.6.32.35/drivers/staging/b3dfg/b3dfg.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/b3dfg/b3dfg.c 2010-12-31 14:46:53.000000000 -0500
@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
return VM_FAULT_NOPAGE;
}
@@ -29542,9 +29542,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.33/drivers
.owner = THIS_MODULE,
.open = b3dfg_open,
.release = b3dfg_release,
-diff -urNp linux-2.6.32.33/drivers/staging/comedi/comedi_fops.c linux-2.6.32.33/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.32.33/drivers/staging/comedi/comedi_fops.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/comedi/comedi_fops.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/comedi/comedi_fops.c linux-2.6.32.35/drivers/staging/comedi/comedi_fops.c
+--- linux-2.6.32.35/drivers/staging/comedi/comedi_fops.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/comedi/comedi_fops.c 2010-12-31 14:46:53.000000000 -0500
@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
mutex_unlock(&dev->mutex);
}
@@ -29554,9 +29554,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/comedi/comedi_fops.c linux-2.6.32.33/
.close = comedi_unmap,
};
-diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.33/drivers/staging/dream/qdsp5/adsp_driver.c
---- linux-2.6.32.33/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/dream/qdsp5/adsp_driver.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.35/drivers/staging/dream/qdsp5/adsp_driver.c
+--- linux-2.6.32.35/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/dream/qdsp5/adsp_driver.c 2010-12-31 14:46:53.000000000 -0500
@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
static dev_t adsp_devno;
static struct class *adsp_class;
@@ -29566,9 +29566,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3
.owner = THIS_MODULE,
.open = adsp_open,
.unlocked_ioctl = adsp_ioctl,
-diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_aac.c
---- linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_aac.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_aac.c
+--- linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_aac.c 2010-12-31 14:46:53.000000000 -0500
@@ -1022,7 +1022,7 @@ done:
return rc;
}
@@ -29578,9 +29578,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.
.owner = THIS_MODULE,
.open = audio_open,
.release = audio_release,
-diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_amrnb.c
---- linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_amrnb.c
+--- linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-12-31 14:46:53.000000000 -0500
@@ -833,7 +833,7 @@ done:
return rc;
}
@@ -29590,9 +29590,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3
.owner = THIS_MODULE,
.open = audamrnb_open,
.release = audamrnb_release,
-diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_evrc.c
---- linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_evrc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_evrc.c
+--- linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_evrc.c 2010-12-31 14:46:53.000000000 -0500
@@ -805,7 +805,7 @@ dma_fail:
return rc;
}
@@ -29602,9 +29602,9 @@ diff -urNp linux-2.6.32.33/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.33/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_in.c
---- linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_in.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_in.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_in.c
+--- linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_in.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_in.c 2010-12-31 14:46:53.000000000 -0500
@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
return 0;
}
@@ -29623,9 +29623,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.3
.owner = THIS_MODULE,
.open = audpre_open,
.unlocked_ioctl = audpre_ioctl,
-diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_mp3.c
---- linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_mp3.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_mp3.c
+--- linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_mp3.c 2010-12-31 14:46:53.000000000 -0500
@@ -941,7 +941,7 @@ done:
return rc;
}
@@ -29635,9 +29635,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.
.owner = THIS_MODULE,
.open = audio_open,
.release = audio_release,
-diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_out.c
---- linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_out.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_out.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_out.c
+--- linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_out.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_out.c 2010-12-31 14:46:53.000000000 -0500
@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
return 0;
}
@@ -29656,9 +29656,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
.owner = THIS_MODULE,
.open = audpp_open,
.unlocked_ioctl = audpp_ioctl,
-diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_qcelp.c
---- linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_qcelp.c
+--- linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-12-31 14:46:53.000000000 -0500
@@ -816,7 +816,7 @@ err:
return rc;
}
@@ -29668,9 +29668,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3
.owner = THIS_MODULE,
.open = audqcelp_open,
.release = audqcelp_release,
-diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.33/drivers/staging/dream/qdsp5/snd.c
---- linux-2.6.32.33/drivers/staging/dream/qdsp5/snd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/dream/qdsp5/snd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.35/drivers/staging/dream/qdsp5/snd.c
+--- linux-2.6.32.35/drivers/staging/dream/qdsp5/snd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/dream/qdsp5/snd.c 2010-12-31 14:46:53.000000000 -0500
@@ -242,7 +242,7 @@ err:
return rc;
}
@@ -29680,9 +29680,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.33/dri
.owner = THIS_MODULE,
.open = snd_open,
.release = snd_release,
-diff -urNp linux-2.6.32.33/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.33/drivers/staging/dream/smd/smd_qmi.c
---- linux-2.6.32.33/drivers/staging/dream/smd/smd_qmi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/dream/smd/smd_qmi.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.35/drivers/staging/dream/smd/smd_qmi.c
+--- linux-2.6.32.35/drivers/staging/dream/smd/smd_qmi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/dream/smd/smd_qmi.c 2010-12-31 14:46:53.000000000 -0500
@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
return 0;
}
@@ -29692,9 +29692,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.33/d
.owner = THIS_MODULE,
.read = qmi_read,
.write = qmi_write,
-diff -urNp linux-2.6.32.33/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.33/drivers/staging/dream/smd/smd_rpcrouter_device.c
---- linux-2.6.32.33/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.35/drivers/staging/dream/smd/smd_rpcrouter_device.c
+--- linux-2.6.32.35/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-12-31 14:46:53.000000000 -0500
@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
return rc;
}
@@ -29713,9 +29713,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
.owner = THIS_MODULE,
.open = rpcrouter_open,
.release = rpcrouter_release,
-diff -urNp linux-2.6.32.33/drivers/staging/dst/dcore.c linux-2.6.32.33/drivers/staging/dst/dcore.c
---- linux-2.6.32.33/drivers/staging/dst/dcore.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/dst/dcore.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/dst/dcore.c linux-2.6.32.35/drivers/staging/dst/dcore.c
+--- linux-2.6.32.35/drivers/staging/dst/dcore.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/dst/dcore.c 2010-12-31 14:46:53.000000000 -0500
@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
return 0;
}
@@ -29734,9 +29734,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/dst/dcore.c linux-2.6.32.33/drivers/s
snprintf(n->name, sizeof(n->name), "%s", ctl->name);
err = dst_node_sysfs_init(n);
-diff -urNp linux-2.6.32.33/drivers/staging/dst/trans.c linux-2.6.32.33/drivers/staging/dst/trans.c
---- linux-2.6.32.33/drivers/staging/dst/trans.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/dst/trans.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/dst/trans.c linux-2.6.32.35/drivers/staging/dst/trans.c
+--- linux-2.6.32.35/drivers/staging/dst/trans.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/dst/trans.c 2010-12-31 14:46:53.000000000 -0500
@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
t->error = 0;
t->retries = 0;
@@ -29746,9 +29746,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/dst/trans.c linux-2.6.32.33/drivers/s
t->enc = bio_data_dir(bio);
dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
-diff -urNp linux-2.6.32.33/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.33/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.32.33/drivers/staging/go7007/go7007-v4l2.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/go7007/go7007-v4l2.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.35/drivers/staging/go7007/go7007-v4l2.c
+--- linux-2.6.32.35/drivers/staging/go7007/go7007-v4l2.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/go7007/go7007-v4l2.c 2010-12-31 14:46:53.000000000 -0500
@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
return 0;
}
@@ -29758,9 +29758,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.33/
.open = go7007_vm_open,
.close = go7007_vm_close,
.fault = go7007_vm_fault,
-diff -urNp linux-2.6.32.33/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.33/drivers/staging/hv/blkvsc_drv.c
---- linux-2.6.32.33/drivers/staging/hv/blkvsc_drv.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/staging/hv/blkvsc_drv.c 2011-02-22 15:57:23.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.35/drivers/staging/hv/blkvsc_drv.c
+--- linux-2.6.32.35/drivers/staging/hv/blkvsc_drv.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/drivers/staging/hv/blkvsc_drv.c 2011-02-22 15:57:23.000000000 -0500
@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
/* The one and only one */
static struct blkvsc_driver_context g_blkvsc_drv;
@@ -29770,9 +29770,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.33/drive
.owner = THIS_MODULE,
.open = blkvsc_open,
.release = blkvsc_release,
-diff -urNp linux-2.6.32.33/drivers/staging/hv/Hv.c linux-2.6.32.33/drivers/staging/hv/Hv.c
---- linux-2.6.32.33/drivers/staging/hv/Hv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/hv/Hv.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/hv/Hv.c linux-2.6.32.35/drivers/staging/hv/Hv.c
+--- linux-2.6.32.35/drivers/staging/hv/Hv.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/hv/Hv.c 2010-12-31 14:46:53.000000000 -0500
@@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo
u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
u32 outputAddressHi = outputAddress >> 32;
@@ -29782,9 +29782,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/hv/Hv.c linux-2.6.32.33/drivers/stagi
DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
Control, Input, Output);
-diff -urNp linux-2.6.32.33/drivers/staging/panel/panel.c linux-2.6.32.33/drivers/staging/panel/panel.c
---- linux-2.6.32.33/drivers/staging/panel/panel.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/panel/panel.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/panel/panel.c linux-2.6.32.35/drivers/staging/panel/panel.c
+--- linux-2.6.32.35/drivers/staging/panel/panel.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/panel/panel.c 2010-12-31 14:46:53.000000000 -0500
@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
return 0;
}
@@ -29803,9 +29803,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/panel/panel.c linux-2.6.32.33/drivers
.read = keypad_read, /* read */
.open = keypad_open, /* open */
.release = keypad_release, /* close */
-diff -urNp linux-2.6.32.33/drivers/staging/phison/phison.c linux-2.6.32.33/drivers/staging/phison/phison.c
---- linux-2.6.32.33/drivers/staging/phison/phison.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/phison/phison.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/phison/phison.c linux-2.6.32.35/drivers/staging/phison/phison.c
+--- linux-2.6.32.35/drivers/staging/phison/phison.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/phison/phison.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -29815,9 +29815,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/phison/phison.c linux-2.6.32.33/drive
.inherits = &ata_bmdma_port_ops,
.prereset = phison_pre_reset,
};
-diff -urNp linux-2.6.32.33/drivers/staging/poch/poch.c linux-2.6.32.33/drivers/staging/poch/poch.c
---- linux-2.6.32.33/drivers/staging/poch/poch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/poch/poch.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/poch/poch.c linux-2.6.32.35/drivers/staging/poch/poch.c
+--- linux-2.6.32.35/drivers/staging/poch/poch.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/poch/poch.c 2010-12-31 14:46:53.000000000 -0500
@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
return 0;
}
@@ -29827,9 +29827,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/poch/poch.c linux-2.6.32.33/drivers/s
.owner = THIS_MODULE,
.open = poch_open,
.release = poch_release,
-diff -urNp linux-2.6.32.33/drivers/staging/pohmelfs/inode.c linux-2.6.32.33/drivers/staging/pohmelfs/inode.c
---- linux-2.6.32.33/drivers/staging/pohmelfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/pohmelfs/inode.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/pohmelfs/inode.c linux-2.6.32.35/drivers/staging/pohmelfs/inode.c
+--- linux-2.6.32.35/drivers/staging/pohmelfs/inode.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/pohmelfs/inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
mutex_init(&psb->mcache_lock);
psb->mcache_root = RB_ROOT;
@@ -29839,9 +29839,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/pohmelfs/inode.c linux-2.6.32.33/driv
psb->trans_max_pages = 100;
-diff -urNp linux-2.6.32.33/drivers/staging/pohmelfs/mcache.c linux-2.6.32.33/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.32.33/drivers/staging/pohmelfs/mcache.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/pohmelfs/mcache.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/pohmelfs/mcache.c linux-2.6.32.35/drivers/staging/pohmelfs/mcache.c
+--- linux-2.6.32.35/drivers/staging/pohmelfs/mcache.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/pohmelfs/mcache.c 2010-12-31 14:46:53.000000000 -0500
@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
m->data = data;
m->start = start;
@@ -29851,9 +29851,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/pohmelfs/mcache.c linux-2.6.32.33/dri
mutex_lock(&psb->mcache_lock);
err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-2.6.32.33/drivers/staging/pohmelfs/netfs.h linux-2.6.32.33/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.32.33/drivers/staging/pohmelfs/netfs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/pohmelfs/netfs.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/pohmelfs/netfs.h linux-2.6.32.35/drivers/staging/pohmelfs/netfs.h
+--- linux-2.6.32.35/drivers/staging/pohmelfs/netfs.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/pohmelfs/netfs.h 2010-12-31 14:46:53.000000000 -0500
@@ -570,7 +570,7 @@ struct pohmelfs_config;
struct pohmelfs_sb {
struct rb_root mcache_root;
@@ -29863,9 +29863,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/pohmelfs/netfs.h linux-2.6.32.33/driv
unsigned long mcache_timeout;
unsigned int idx;
-diff -urNp linux-2.6.32.33/drivers/staging/sep/sep_driver.c linux-2.6.32.33/drivers/staging/sep/sep_driver.c
---- linux-2.6.32.33/drivers/staging/sep/sep_driver.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/sep/sep_driver.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/sep/sep_driver.c linux-2.6.32.35/drivers/staging/sep/sep_driver.c
+--- linux-2.6.32.35/drivers/staging/sep/sep_driver.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/sep/sep_driver.c 2010-12-31 14:46:53.000000000 -0500
@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
static dev_t sep_devno;
@@ -29875,9 +29875,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/sep/sep_driver.c linux-2.6.32.33/driv
.owner = THIS_MODULE,
.ioctl = sep_ioctl,
.poll = sep_poll,
-diff -urNp linux-2.6.32.33/drivers/staging/vme/devices/vme_user.c linux-2.6.32.33/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.32.33/drivers/staging/vme/devices/vme_user.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/staging/vme/devices/vme_user.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/staging/vme/devices/vme_user.c linux-2.6.32.35/drivers/staging/vme/devices/vme_user.c
+--- linux-2.6.32.35/drivers/staging/vme/devices/vme_user.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/staging/vme/devices/vme_user.c 2010-12-31 14:46:53.000000000 -0500
@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
static int __init vme_user_probe(struct device *, int, int);
static int __exit vme_user_remove(struct device *, int, int);
@@ -29887,9 +29887,9 @@ diff -urNp linux-2.6.32.33/drivers/staging/vme/devices/vme_user.c linux-2.6.32.3
.open = vme_user_open,
.release = vme_user_release,
.read = vme_user_read,
-diff -urNp linux-2.6.32.33/drivers/uio/uio.c linux-2.6.32.33/drivers/uio/uio.c
---- linux-2.6.32.33/drivers/uio/uio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/uio/uio.c 2011-01-24 18:05:34.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/uio/uio.c linux-2.6.32.35/drivers/uio/uio.c
+--- linux-2.6.32.35/drivers/uio/uio.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/uio/uio.c 2011-01-24 18:05:34.000000000 -0500
@@ -23,6 +23,7 @@
#include <linux/string.h>
#include <linux/kobject.h>
@@ -29941,9 +29941,9 @@ diff -urNp linux-2.6.32.33/drivers/uio/uio.c linux-2.6.32.33/drivers/uio/uio.c
}
static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-diff -urNp linux-2.6.32.33/drivers/usb/atm/usbatm.c linux-2.6.32.33/drivers/usb/atm/usbatm.c
---- linux-2.6.32.33/drivers/usb/atm/usbatm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/usb/atm/usbatm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/usb/atm/usbatm.c linux-2.6.32.35/drivers/usb/atm/usbatm.c
+--- linux-2.6.32.35/drivers/usb/atm/usbatm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/usb/atm/usbatm.c 2010-12-31 14:46:53.000000000 -0500
@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
if (printk_ratelimit())
atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -30023,9 +30023,9 @@ diff -urNp linux-2.6.32.33/drivers/usb/atm/usbatm.c linux-2.6.32.33/drivers/usb/
if (!left--) {
if (instance->disconnected)
-diff -urNp linux-2.6.32.33/drivers/usb/class/cdc-acm.c linux-2.6.32.33/drivers/usb/class/cdc-acm.c
---- linux-2.6.32.33/drivers/usb/class/cdc-acm.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/usb/class/cdc-acm.c 2011-02-22 15:57:23.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/usb/class/cdc-acm.c linux-2.6.32.35/drivers/usb/class/cdc-acm.c
+--- linux-2.6.32.35/drivers/usb/class/cdc-acm.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/drivers/usb/class/cdc-acm.c 2011-02-22 15:57:23.000000000 -0500
@@ -1619,7 +1619,7 @@ static struct usb_device_id acm_ids[] =
{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
USB_CDC_ACM_PROTO_AT_CDMA) },
@@ -30035,9 +30035,9 @@ diff -urNp linux-2.6.32.33/drivers/usb/class/cdc-acm.c linux-2.6.32.33/drivers/u
};
MODULE_DEVICE_TABLE(usb, acm_ids);
-diff -urNp linux-2.6.32.33/drivers/usb/class/cdc-wdm.c linux-2.6.32.33/drivers/usb/class/cdc-wdm.c
---- linux-2.6.32.33/drivers/usb/class/cdc-wdm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/usb/class/cdc-wdm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/usb/class/cdc-wdm.c linux-2.6.32.35/drivers/usb/class/cdc-wdm.c
+--- linux-2.6.32.35/drivers/usb/class/cdc-wdm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/usb/class/cdc-wdm.c 2010-12-31 14:46:53.000000000 -0500
@@ -314,7 +314,7 @@ static ssize_t wdm_write
if (r < 0)
goto outnp;
@@ -30047,9 +30047,9 @@ diff -urNp linux-2.6.32.33/drivers/usb/class/cdc-wdm.c linux-2.6.32.33/drivers/u
r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
&desc->flags));
else
-diff -urNp linux-2.6.32.33/drivers/usb/class/usblp.c linux-2.6.32.33/drivers/usb/class/usblp.c
---- linux-2.6.32.33/drivers/usb/class/usblp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/usb/class/usblp.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/usb/class/usblp.c linux-2.6.32.35/drivers/usb/class/usblp.c
+--- linux-2.6.32.35/drivers/usb/class/usblp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/usb/class/usblp.c 2010-12-31 14:46:53.000000000 -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 */
@@ -30068,9 +30068,9 @@ diff -urNp linux-2.6.32.33/drivers/usb/class/usblp.c linux-2.6.32.33/drivers/usb
};
MODULE_DEVICE_TABLE (usb, usblp_ids);
-diff -urNp linux-2.6.32.33/drivers/usb/core/hcd.c linux-2.6.32.33/drivers/usb/core/hcd.c
---- linux-2.6.32.33/drivers/usb/core/hcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/usb/core/hcd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/usb/core/hcd.c linux-2.6.32.35/drivers/usb/core/hcd.c
+--- linux-2.6.32.35/drivers/usb/core/hcd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/usb/core/hcd.c 2010-12-31 14:46:53.000000000 -0500
@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -30089,9 +30089,9 @@ diff -urNp linux-2.6.32.33/drivers/usb/core/hcd.c linux-2.6.32.33/drivers/usb/co
{
if (mon_ops)
-diff -urNp linux-2.6.32.33/drivers/usb/core/hcd.h linux-2.6.32.33/drivers/usb/core/hcd.h
---- linux-2.6.32.33/drivers/usb/core/hcd.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/usb/core/hcd.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/usb/core/hcd.h linux-2.6.32.35/drivers/usb/core/hcd.h
+--- linux-2.6.32.35/drivers/usb/core/hcd.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/usb/core/hcd.h 2010-12-31 14:46:53.000000000 -0500
@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -30119,9 +30119,9 @@ diff -urNp linux-2.6.32.33/drivers/usb/core/hcd.h linux-2.6.32.33/drivers/usb/co
void usb_mon_deregister(void);
#else
-diff -urNp linux-2.6.32.33/drivers/usb/core/hub.c linux-2.6.32.33/drivers/usb/core/hub.c
---- linux-2.6.32.33/drivers/usb/core/hub.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/usb/core/hub.c 2011-02-22 15:57:23.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/usb/core/hub.c linux-2.6.32.35/drivers/usb/core/hub.c
+--- linux-2.6.32.35/drivers/usb/core/hub.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/drivers/usb/core/hub.c 2011-02-22 15:57:23.000000000 -0500
@@ -3430,7 +3430,7 @@ static struct usb_device_id hub_id_table
.bDeviceClass = USB_CLASS_HUB},
{ .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
@@ -30131,9 +30131,9 @@ diff -urNp linux-2.6.32.33/drivers/usb/core/hub.c linux-2.6.32.33/drivers/usb/co
};
MODULE_DEVICE_TABLE (usb, hub_id_table);
-diff -urNp linux-2.6.32.33/drivers/usb/core/message.c linux-2.6.32.33/drivers/usb/core/message.c
---- linux-2.6.32.33/drivers/usb/core/message.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.33/drivers/usb/core/message.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/usb/core/message.c linux-2.6.32.35/drivers/usb/core/message.c
+--- linux-2.6.32.35/drivers/usb/core/message.c 2010-11-26 18:22:29.000000000 -0500
++++ linux-2.6.32.35/drivers/usb/core/message.c 2010-12-31 14:46:53.000000000 -0500
@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
if (buf) {
@@ -30145,9 +30145,9 @@ diff -urNp linux-2.6.32.33/drivers/usb/core/message.c linux-2.6.32.33/drivers/us
if (!smallbuf)
return buf;
memcpy(smallbuf, buf, len);
-diff -urNp linux-2.6.32.33/drivers/usb/host/ehci-pci.c linux-2.6.32.33/drivers/usb/host/ehci-pci.c
---- linux-2.6.32.33/drivers/usb/host/ehci-pci.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/drivers/usb/host/ehci-pci.c 2011-02-22 15:57:23.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/usb/host/ehci-pci.c linux-2.6.32.35/drivers/usb/host/ehci-pci.c
+--- linux-2.6.32.35/drivers/usb/host/ehci-pci.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/drivers/usb/host/ehci-pci.c 2011-02-22 15:57:23.000000000 -0500
@@ -461,7 +461,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,
@@ -30157,9 +30157,9 @@ diff -urNp linux-2.6.32.33/drivers/usb/host/ehci-pci.c linux-2.6.32.33/drivers/u
};
MODULE_DEVICE_TABLE(pci, pci_ids);
-diff -urNp linux-2.6.32.33/drivers/usb/host/uhci-hcd.c linux-2.6.32.33/drivers/usb/host/uhci-hcd.c
---- linux-2.6.32.33/drivers/usb/host/uhci-hcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/usb/host/uhci-hcd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/usb/host/uhci-hcd.c linux-2.6.32.35/drivers/usb/host/uhci-hcd.c
+--- linux-2.6.32.35/drivers/usb/host/uhci-hcd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/usb/host/uhci-hcd.c 2010-12-31 14:46:53.000000000 -0500
@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
/* handle any USB UHCI controller */
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
@@ -30169,9 +30169,9 @@ diff -urNp linux-2.6.32.33/drivers/usb/host/uhci-hcd.c linux-2.6.32.33/drivers/u
};
MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
-diff -urNp linux-2.6.32.33/drivers/usb/misc/appledisplay.c linux-2.6.32.33/drivers/usb/misc/appledisplay.c
---- linux-2.6.32.33/drivers/usb/misc/appledisplay.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/usb/misc/appledisplay.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/usb/misc/appledisplay.c linux-2.6.32.35/drivers/usb/misc/appledisplay.c
+--- linux-2.6.32.35/drivers/usb/misc/appledisplay.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/usb/misc/appledisplay.c 2010-12-31 14:46:53.000000000 -0500
@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
return pdata->msgdata[1];
}
@@ -30181,9 +30181,9 @@ diff -urNp linux-2.6.32.33/drivers/usb/misc/appledisplay.c linux-2.6.32.33/drive
.get_brightness = appledisplay_bl_get_brightness,
.update_status = appledisplay_bl_update_status,
};
-diff -urNp linux-2.6.32.33/drivers/usb/mon/mon_main.c linux-2.6.32.33/drivers/usb/mon/mon_main.c
---- linux-2.6.32.33/drivers/usb/mon/mon_main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/usb/mon/mon_main.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/usb/mon/mon_main.c linux-2.6.32.35/drivers/usb/mon/mon_main.c
+--- linux-2.6.32.35/drivers/usb/mon/mon_main.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/usb/mon/mon_main.c 2010-12-31 14:46:53.000000000 -0500
@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
/*
* Ops
@@ -30193,9 +30193,9 @@ diff -urNp linux-2.6.32.33/drivers/usb/mon/mon_main.c linux-2.6.32.33/drivers/us
.urb_submit = mon_submit,
.urb_submit_error = mon_submit_error,
.urb_complete = mon_complete,
-diff -urNp linux-2.6.32.33/drivers/usb/storage/debug.h linux-2.6.32.33/drivers/usb/storage/debug.h
---- linux-2.6.32.33/drivers/usb/storage/debug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/usb/storage/debug.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/usb/storage/debug.h linux-2.6.32.35/drivers/usb/storage/debug.h
+--- linux-2.6.32.35/drivers/usb/storage/debug.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/usb/storage/debug.h 2010-12-31 14:46:53.000000000 -0500
@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
#define US_DEBUGPX(x...) printk( x )
#define US_DEBUG(x) x
@@ -30209,9 +30209,9 @@ diff -urNp linux-2.6.32.33/drivers/usb/storage/debug.h linux-2.6.32.33/drivers/u
#endif
#endif
-diff -urNp linux-2.6.32.33/drivers/usb/storage/usb.c linux-2.6.32.33/drivers/usb/storage/usb.c
---- linux-2.6.32.33/drivers/usb/storage/usb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/usb/storage/usb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/usb/storage/usb.c linux-2.6.32.35/drivers/usb/storage/usb.c
+--- linux-2.6.32.35/drivers/usb/storage/usb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/usb/storage/usb.c 2010-12-31 14:46:53.000000000 -0500
@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -30221,9 +30221,9 @@ diff -urNp linux-2.6.32.33/drivers/usb/storage/usb.c linux-2.6.32.33/drivers/usb
};
#undef UNUSUAL_DEV
-diff -urNp linux-2.6.32.33/drivers/usb/storage/usual-tables.c linux-2.6.32.33/drivers/usb/storage/usual-tables.c
---- linux-2.6.32.33/drivers/usb/storage/usual-tables.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/usb/storage/usual-tables.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/usb/storage/usual-tables.c linux-2.6.32.35/drivers/usb/storage/usual-tables.c
+--- linux-2.6.32.35/drivers/usb/storage/usual-tables.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/usb/storage/usual-tables.c 2010-12-31 14:46:53.000000000 -0500
@@ -48,7 +48,7 @@
struct usb_device_id usb_storage_usb_ids[] = {
@@ -30233,9 +30233,9 @@ diff -urNp linux-2.6.32.33/drivers/usb/storage/usual-tables.c linux-2.6.32.33/dr
};
EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
-diff -urNp linux-2.6.32.33/drivers/uwb/wlp/messages.c linux-2.6.32.33/drivers/uwb/wlp/messages.c
---- linux-2.6.32.33/drivers/uwb/wlp/messages.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/uwb/wlp/messages.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/uwb/wlp/messages.c linux-2.6.32.35/drivers/uwb/wlp/messages.c
+--- linux-2.6.32.35/drivers/uwb/wlp/messages.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/uwb/wlp/messages.c 2010-12-31 14:46:53.000000000 -0500
@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
size_t len = skb->len;
size_t used;
@@ -30245,9 +30245,9 @@ diff -urNp linux-2.6.32.33/drivers/uwb/wlp/messages.c linux-2.6.32.33/drivers/uw
enum wlp_assc_error assc_err;
char enonce_buf[WLP_WSS_NONCE_STRSIZE];
char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
-diff -urNp linux-2.6.32.33/drivers/uwb/wlp/sysfs.c linux-2.6.32.33/drivers/uwb/wlp/sysfs.c
---- linux-2.6.32.33/drivers/uwb/wlp/sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/uwb/wlp/sysfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/uwb/wlp/sysfs.c linux-2.6.32.35/drivers/uwb/wlp/sysfs.c
+--- linux-2.6.32.35/drivers/uwb/wlp/sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/uwb/wlp/sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
return ret;
}
@@ -30258,9 +30258,9 @@ diff -urNp linux-2.6.32.33/drivers/uwb/wlp/sysfs.c linux-2.6.32.33/drivers/uwb/w
.show = wlp_wss_attr_show,
.store = wlp_wss_attr_store,
};
-diff -urNp linux-2.6.32.33/drivers/video/atmel_lcdfb.c linux-2.6.32.33/drivers/video/atmel_lcdfb.c
---- linux-2.6.32.33/drivers/video/atmel_lcdfb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/atmel_lcdfb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/atmel_lcdfb.c linux-2.6.32.35/drivers/video/atmel_lcdfb.c
+--- linux-2.6.32.35/drivers/video/atmel_lcdfb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/atmel_lcdfb.c 2010-12-31 14:46:53.000000000 -0500
@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
}
@@ -30270,9 +30270,9 @@ diff -urNp linux-2.6.32.33/drivers/video/atmel_lcdfb.c linux-2.6.32.33/drivers/v
.update_status = atmel_bl_update_status,
.get_brightness = atmel_bl_get_brightness,
};
-diff -urNp linux-2.6.32.33/drivers/video/aty/aty128fb.c linux-2.6.32.33/drivers/video/aty/aty128fb.c
---- linux-2.6.32.33/drivers/video/aty/aty128fb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/aty/aty128fb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/aty/aty128fb.c linux-2.6.32.35/drivers/video/aty/aty128fb.c
+--- linux-2.6.32.35/drivers/video/aty/aty128fb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/aty/aty128fb.c 2010-12-31 14:46:53.000000000 -0500
@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -30282,9 +30282,9 @@ diff -urNp linux-2.6.32.33/drivers/video/aty/aty128fb.c linux-2.6.32.33/drivers/
.get_brightness = aty128_bl_get_brightness,
.update_status = aty128_bl_update_status,
};
-diff -urNp linux-2.6.32.33/drivers/video/aty/atyfb_base.c linux-2.6.32.33/drivers/video/aty/atyfb_base.c
---- linux-2.6.32.33/drivers/video/aty/atyfb_base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/aty/atyfb_base.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/aty/atyfb_base.c linux-2.6.32.35/drivers/video/aty/atyfb_base.c
+--- linux-2.6.32.35/drivers/video/aty/atyfb_base.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/aty/atyfb_base.c 2010-12-31 14:46:53.000000000 -0500
@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
return bd->props.brightness;
}
@@ -30294,9 +30294,9 @@ diff -urNp linux-2.6.32.33/drivers/video/aty/atyfb_base.c linux-2.6.32.33/driver
.get_brightness = aty_bl_get_brightness,
.update_status = aty_bl_update_status,
};
-diff -urNp linux-2.6.32.33/drivers/video/aty/radeon_backlight.c linux-2.6.32.33/drivers/video/aty/radeon_backlight.c
---- linux-2.6.32.33/drivers/video/aty/radeon_backlight.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/aty/radeon_backlight.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/aty/radeon_backlight.c linux-2.6.32.35/drivers/video/aty/radeon_backlight.c
+--- linux-2.6.32.35/drivers/video/aty/radeon_backlight.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/aty/radeon_backlight.c 2010-12-31 14:46:53.000000000 -0500
@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -30306,9 +30306,9 @@ diff -urNp linux-2.6.32.33/drivers/video/aty/radeon_backlight.c linux-2.6.32.33/
.get_brightness = radeon_bl_get_brightness,
.update_status = radeon_bl_update_status,
};
-diff -urNp linux-2.6.32.33/drivers/video/backlight/adp5520_bl.c linux-2.6.32.33/drivers/video/backlight/adp5520_bl.c
---- linux-2.6.32.33/drivers/video/backlight/adp5520_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/adp5520_bl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/adp5520_bl.c linux-2.6.32.35/drivers/video/backlight/adp5520_bl.c
+--- linux-2.6.32.35/drivers/video/backlight/adp5520_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/adp5520_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
return error ? data->current_brightness : reg_val;
}
@@ -30318,9 +30318,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/adp5520_bl.c linux-2.6.32.33/
.update_status = adp5520_bl_update_status,
.get_brightness = adp5520_bl_get_brightness,
};
-diff -urNp linux-2.6.32.33/drivers/video/backlight/adx_bl.c linux-2.6.32.33/drivers/video/backlight/adx_bl.c
---- linux-2.6.32.33/drivers/video/backlight/adx_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/adx_bl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/adx_bl.c linux-2.6.32.35/drivers/video/backlight/adx_bl.c
+--- linux-2.6.32.35/drivers/video/backlight/adx_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/adx_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
return 1;
}
@@ -30330,9 +30330,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/adx_bl.c linux-2.6.32.33/driv
.options = 0,
.update_status = adx_backlight_update_status,
.get_brightness = adx_backlight_get_brightness,
-diff -urNp linux-2.6.32.33/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.33/drivers/video/backlight/atmel-pwm-bl.c
---- linux-2.6.32.33/drivers/video/backlight/atmel-pwm-bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/atmel-pwm-bl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.35/drivers/video/backlight/atmel-pwm-bl.c
+--- linux-2.6.32.35/drivers/video/backlight/atmel-pwm-bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/atmel-pwm-bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
return pwm_channel_enable(&pwmbl->pwmc);
}
@@ -30342,9 +30342,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.3
.get_brightness = atmel_pwm_bl_get_intensity,
.update_status = atmel_pwm_bl_set_intensity,
};
-diff -urNp linux-2.6.32.33/drivers/video/backlight/backlight.c linux-2.6.32.33/drivers/video/backlight/backlight.c
---- linux-2.6.32.33/drivers/video/backlight/backlight.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/drivers/video/backlight/backlight.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/backlight.c linux-2.6.32.35/drivers/video/backlight/backlight.c
+--- linux-2.6.32.35/drivers/video/backlight/backlight.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/drivers/video/backlight/backlight.c 2010-12-31 14:46:53.000000000 -0500
@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
* ERR_PTR() or a pointer to the newly allocated device.
*/
@@ -30354,9 +30354,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/backlight.c linux-2.6.32.33/d
{
struct backlight_device *new_bd;
int rc;
-diff -urNp linux-2.6.32.33/drivers/video/backlight/corgi_lcd.c linux-2.6.32.33/drivers/video/backlight/corgi_lcd.c
---- linux-2.6.32.33/drivers/video/backlight/corgi_lcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/corgi_lcd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/corgi_lcd.c linux-2.6.32.35/drivers/video/backlight/corgi_lcd.c
+--- linux-2.6.32.35/drivers/video/backlight/corgi_lcd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/corgi_lcd.c 2010-12-31 14:46:53.000000000 -0500
@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
}
EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -30366,9 +30366,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/corgi_lcd.c linux-2.6.32.33/d
.get_brightness = corgi_bl_get_intensity,
.update_status = corgi_bl_update_status,
};
-diff -urNp linux-2.6.32.33/drivers/video/backlight/cr_bllcd.c linux-2.6.32.33/drivers/video/backlight/cr_bllcd.c
---- linux-2.6.32.33/drivers/video/backlight/cr_bllcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/cr_bllcd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/cr_bllcd.c linux-2.6.32.35/drivers/video/backlight/cr_bllcd.c
+--- linux-2.6.32.35/drivers/video/backlight/cr_bllcd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/cr_bllcd.c 2010-12-31 14:46:53.000000000 -0500
@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
return intensity;
}
@@ -30378,9 +30378,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/cr_bllcd.c linux-2.6.32.33/dr
.get_brightness = cr_backlight_get_intensity,
.update_status = cr_backlight_set_intensity,
};
-diff -urNp linux-2.6.32.33/drivers/video/backlight/da903x_bl.c linux-2.6.32.33/drivers/video/backlight/da903x_bl.c
---- linux-2.6.32.33/drivers/video/backlight/da903x_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/da903x_bl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/da903x_bl.c linux-2.6.32.35/drivers/video/backlight/da903x_bl.c
+--- linux-2.6.32.35/drivers/video/backlight/da903x_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/da903x_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
return data->current_brightness;
}
@@ -30390,9 +30390,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/da903x_bl.c linux-2.6.32.33/d
.update_status = da903x_backlight_update_status,
.get_brightness = da903x_backlight_get_brightness,
};
-diff -urNp linux-2.6.32.33/drivers/video/backlight/generic_bl.c linux-2.6.32.33/drivers/video/backlight/generic_bl.c
---- linux-2.6.32.33/drivers/video/backlight/generic_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/generic_bl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/generic_bl.c linux-2.6.32.35/drivers/video/backlight/generic_bl.c
+--- linux-2.6.32.35/drivers/video/backlight/generic_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/generic_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
}
EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -30402,9 +30402,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/generic_bl.c linux-2.6.32.33/
.options = BL_CORE_SUSPENDRESUME,
.get_brightness = genericbl_get_intensity,
.update_status = genericbl_send_intensity,
-diff -urNp linux-2.6.32.33/drivers/video/backlight/hp680_bl.c linux-2.6.32.33/drivers/video/backlight/hp680_bl.c
---- linux-2.6.32.33/drivers/video/backlight/hp680_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/hp680_bl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/hp680_bl.c linux-2.6.32.35/drivers/video/backlight/hp680_bl.c
+--- linux-2.6.32.35/drivers/video/backlight/hp680_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/hp680_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
return current_intensity;
}
@@ -30414,9 +30414,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/hp680_bl.c linux-2.6.32.33/dr
.get_brightness = hp680bl_get_intensity,
.update_status = hp680bl_set_intensity,
};
-diff -urNp linux-2.6.32.33/drivers/video/backlight/jornada720_bl.c linux-2.6.32.33/drivers/video/backlight/jornada720_bl.c
---- linux-2.6.32.33/drivers/video/backlight/jornada720_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/jornada720_bl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/jornada720_bl.c linux-2.6.32.35/drivers/video/backlight/jornada720_bl.c
+--- linux-2.6.32.35/drivers/video/backlight/jornada720_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/jornada720_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -93,7 +93,7 @@ out:
return ret;
}
@@ -30426,9 +30426,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/jornada720_bl.c linux-2.6.32.
.get_brightness = jornada_bl_get_brightness,
.update_status = jornada_bl_update_status,
.options = BL_CORE_SUSPENDRESUME,
-diff -urNp linux-2.6.32.33/drivers/video/backlight/kb3886_bl.c linux-2.6.32.33/drivers/video/backlight/kb3886_bl.c
---- linux-2.6.32.33/drivers/video/backlight/kb3886_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/kb3886_bl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/kb3886_bl.c linux-2.6.32.35/drivers/video/backlight/kb3886_bl.c
+--- linux-2.6.32.35/drivers/video/backlight/kb3886_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/kb3886_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
return kb3886bl_intensity;
}
@@ -30438,9 +30438,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/kb3886_bl.c linux-2.6.32.33/d
.get_brightness = kb3886bl_get_intensity,
.update_status = kb3886bl_send_intensity,
};
-diff -urNp linux-2.6.32.33/drivers/video/backlight/locomolcd.c linux-2.6.32.33/drivers/video/backlight/locomolcd.c
---- linux-2.6.32.33/drivers/video/backlight/locomolcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/locomolcd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/locomolcd.c linux-2.6.32.35/drivers/video/backlight/locomolcd.c
+--- linux-2.6.32.35/drivers/video/backlight/locomolcd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/locomolcd.c 2010-12-31 14:46:53.000000000 -0500
@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
return current_intensity;
}
@@ -30450,9 +30450,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/locomolcd.c linux-2.6.32.33/d
.get_brightness = locomolcd_get_intensity,
.update_status = locomolcd_set_intensity,
};
-diff -urNp linux-2.6.32.33/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.33/drivers/video/backlight/mbp_nvidia_bl.c
---- linux-2.6.32.33/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/mbp_nvidia_bl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.35/drivers/video/backlight/mbp_nvidia_bl.c
+--- linux-2.6.32.35/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/mbp_nvidia_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -33,7 +33,7 @@ struct dmi_match_data {
unsigned long iostart;
unsigned long iolen;
@@ -30462,9 +30462,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.
};
/* Module parameters. */
-diff -urNp linux-2.6.32.33/drivers/video/backlight/omap1_bl.c linux-2.6.32.33/drivers/video/backlight/omap1_bl.c
---- linux-2.6.32.33/drivers/video/backlight/omap1_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/omap1_bl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/omap1_bl.c linux-2.6.32.35/drivers/video/backlight/omap1_bl.c
+--- linux-2.6.32.35/drivers/video/backlight/omap1_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/omap1_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
return bl->current_intensity;
}
@@ -30474,9 +30474,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/omap1_bl.c linux-2.6.32.33/dr
.get_brightness = omapbl_get_intensity,
.update_status = omapbl_update_status,
};
-diff -urNp linux-2.6.32.33/drivers/video/backlight/progear_bl.c linux-2.6.32.33/drivers/video/backlight/progear_bl.c
---- linux-2.6.32.33/drivers/video/backlight/progear_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/progear_bl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/progear_bl.c linux-2.6.32.35/drivers/video/backlight/progear_bl.c
+--- linux-2.6.32.35/drivers/video/backlight/progear_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/progear_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
return intensity - HW_LEVEL_MIN;
}
@@ -30486,9 +30486,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/progear_bl.c linux-2.6.32.33/
.get_brightness = progearbl_get_intensity,
.update_status = progearbl_set_intensity,
};
-diff -urNp linux-2.6.32.33/drivers/video/backlight/pwm_bl.c linux-2.6.32.33/drivers/video/backlight/pwm_bl.c
---- linux-2.6.32.33/drivers/video/backlight/pwm_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/pwm_bl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/pwm_bl.c linux-2.6.32.35/drivers/video/backlight/pwm_bl.c
+--- linux-2.6.32.35/drivers/video/backlight/pwm_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/pwm_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
return bl->props.brightness;
}
@@ -30498,9 +30498,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/pwm_bl.c linux-2.6.32.33/driv
.update_status = pwm_backlight_update_status,
.get_brightness = pwm_backlight_get_brightness,
};
-diff -urNp linux-2.6.32.33/drivers/video/backlight/tosa_bl.c linux-2.6.32.33/drivers/video/backlight/tosa_bl.c
---- linux-2.6.32.33/drivers/video/backlight/tosa_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/tosa_bl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/tosa_bl.c linux-2.6.32.35/drivers/video/backlight/tosa_bl.c
+--- linux-2.6.32.35/drivers/video/backlight/tosa_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/tosa_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
return props->brightness;
}
@@ -30510,9 +30510,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/tosa_bl.c linux-2.6.32.33/dri
.get_brightness = tosa_bl_get_brightness,
.update_status = tosa_bl_update_status,
};
-diff -urNp linux-2.6.32.33/drivers/video/backlight/wm831x_bl.c linux-2.6.32.33/drivers/video/backlight/wm831x_bl.c
---- linux-2.6.32.33/drivers/video/backlight/wm831x_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/backlight/wm831x_bl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/backlight/wm831x_bl.c linux-2.6.32.35/drivers/video/backlight/wm831x_bl.c
+--- linux-2.6.32.35/drivers/video/backlight/wm831x_bl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/backlight/wm831x_bl.c 2010-12-31 14:46:53.000000000 -0500
@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
return data->current_brightness;
}
@@ -30522,9 +30522,9 @@ diff -urNp linux-2.6.32.33/drivers/video/backlight/wm831x_bl.c linux-2.6.32.33/d
.options = BL_CORE_SUSPENDRESUME,
.update_status = wm831x_backlight_update_status,
.get_brightness = wm831x_backlight_get_brightness,
-diff -urNp linux-2.6.32.33/drivers/video/bf54x-lq043fb.c linux-2.6.32.33/drivers/video/bf54x-lq043fb.c
---- linux-2.6.32.33/drivers/video/bf54x-lq043fb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/bf54x-lq043fb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/bf54x-lq043fb.c linux-2.6.32.35/drivers/video/bf54x-lq043fb.c
+--- linux-2.6.32.35/drivers/video/bf54x-lq043fb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/bf54x-lq043fb.c 2010-12-31 14:46:53.000000000 -0500
@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
return 0;
}
@@ -30534,9 +30534,9 @@ diff -urNp linux-2.6.32.33/drivers/video/bf54x-lq043fb.c linux-2.6.32.33/drivers
.get_brightness = bl_get_brightness,
};
-diff -urNp linux-2.6.32.33/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.33/drivers/video/bfin-t350mcqb-fb.c
---- linux-2.6.32.33/drivers/video/bfin-t350mcqb-fb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/bfin-t350mcqb-fb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.35/drivers/video/bfin-t350mcqb-fb.c
+--- linux-2.6.32.35/drivers/video/bfin-t350mcqb-fb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/bfin-t350mcqb-fb.c 2010-12-31 14:46:53.000000000 -0500
@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
return 0;
}
@@ -30546,9 +30546,9 @@ diff -urNp linux-2.6.32.33/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.33/driv
.get_brightness = bl_get_brightness,
};
-diff -urNp linux-2.6.32.33/drivers/video/fbcmap.c linux-2.6.32.33/drivers/video/fbcmap.c
---- linux-2.6.32.33/drivers/video/fbcmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/fbcmap.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/fbcmap.c linux-2.6.32.35/drivers/video/fbcmap.c
+--- linux-2.6.32.35/drivers/video/fbcmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/fbcmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
rc = -ENODEV;
goto out;
@@ -30559,9 +30559,9 @@ diff -urNp linux-2.6.32.33/drivers/video/fbcmap.c linux-2.6.32.33/drivers/video/
rc = -EINVAL;
goto out1;
}
-diff -urNp linux-2.6.32.33/drivers/video/fbmem.c linux-2.6.32.33/drivers/video/fbmem.c
---- linux-2.6.32.33/drivers/video/fbmem.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/fbmem.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/fbmem.c linux-2.6.32.35/drivers/video/fbmem.c
+--- linux-2.6.32.35/drivers/video/fbmem.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/fbmem.c 2010-12-31 14:46:53.000000000 -0500
@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
image->dx += image->width + 8;
}
@@ -30589,9 +30589,9 @@ diff -urNp linux-2.6.32.33/drivers/video/fbmem.c linux-2.6.32.33/drivers/video/f
return -EINVAL;
if (!registered_fb[con2fb.framebuffer])
request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-2.6.32.33/drivers/video/fbmon.c linux-2.6.32.33/drivers/video/fbmon.c
---- linux-2.6.32.33/drivers/video/fbmon.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/fbmon.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/fbmon.c linux-2.6.32.35/drivers/video/fbmon.c
+--- linux-2.6.32.35/drivers/video/fbmon.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/fbmon.c 2010-12-31 14:46:53.000000000 -0500
@@ -45,7 +45,7 @@
#ifdef DEBUG
#define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -30601,9 +30601,9 @@ diff -urNp linux-2.6.32.33/drivers/video/fbmon.c linux-2.6.32.33/drivers/video/f
#endif
#define FBMON_FIX_HEADER 1
-diff -urNp linux-2.6.32.33/drivers/video/i810/i810_accel.c linux-2.6.32.33/drivers/video/i810/i810_accel.c
---- linux-2.6.32.33/drivers/video/i810/i810_accel.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/i810/i810_accel.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/i810/i810_accel.c linux-2.6.32.35/drivers/video/i810/i810_accel.c
+--- linux-2.6.32.35/drivers/video/i810/i810_accel.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/i810/i810_accel.c 2010-12-31 14:46:53.000000000 -0500
@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
}
}
@@ -30612,9 +30612,9 @@ diff -urNp linux-2.6.32.33/drivers/video/i810/i810_accel.c linux-2.6.32.33/drive
i810_report_error(mmio);
par->dev_flags |= LOCKUP;
info->pixmap.scan_align = 1;
-diff -urNp linux-2.6.32.33/drivers/video/i810/i810_main.c linux-2.6.32.33/drivers/video/i810/i810_main.c
---- linux-2.6.32.33/drivers/video/i810/i810_main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/i810/i810_main.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/i810/i810_main.c linux-2.6.32.35/drivers/video/i810/i810_main.c
+--- linux-2.6.32.35/drivers/video/i810/i810_main.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/i810/i810_main.c 2010-12-31 14:46:53.000000000 -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,
@@ -30624,9 +30624,9 @@ diff -urNp linux-2.6.32.33/drivers/video/i810/i810_main.c linux-2.6.32.33/driver
};
static struct pci_driver i810fb_driver = {
-diff -urNp linux-2.6.32.33/drivers/video/modedb.c linux-2.6.32.33/drivers/video/modedb.c
---- linux-2.6.32.33/drivers/video/modedb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/modedb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/modedb.c linux-2.6.32.35/drivers/video/modedb.c
+--- linux-2.6.32.35/drivers/video/modedb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/modedb.c 2010-12-31 14:46:53.000000000 -0500
@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
{
/* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -30927,9 +30927,9 @@ diff -urNp linux-2.6.32.33/drivers/video/modedb.c linux-2.6.32.33/drivers/video/
},
};
-diff -urNp linux-2.6.32.33/drivers/video/nvidia/nv_backlight.c linux-2.6.32.33/drivers/video/nvidia/nv_backlight.c
---- linux-2.6.32.33/drivers/video/nvidia/nv_backlight.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/nvidia/nv_backlight.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/nvidia/nv_backlight.c linux-2.6.32.35/drivers/video/nvidia/nv_backlight.c
+--- linux-2.6.32.35/drivers/video/nvidia/nv_backlight.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/nvidia/nv_backlight.c 2010-12-31 14:46:53.000000000 -0500
@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -30939,9 +30939,9 @@ diff -urNp linux-2.6.32.33/drivers/video/nvidia/nv_backlight.c linux-2.6.32.33/d
.get_brightness = nvidia_bl_get_brightness,
.update_status = nvidia_bl_update_status,
};
-diff -urNp linux-2.6.32.33/drivers/video/riva/fbdev.c linux-2.6.32.33/drivers/video/riva/fbdev.c
---- linux-2.6.32.33/drivers/video/riva/fbdev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/riva/fbdev.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/riva/fbdev.c linux-2.6.32.35/drivers/video/riva/fbdev.c
+--- linux-2.6.32.35/drivers/video/riva/fbdev.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/riva/fbdev.c 2010-12-31 14:46:53.000000000 -0500
@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
return bd->props.brightness;
}
@@ -30951,9 +30951,9 @@ diff -urNp linux-2.6.32.33/drivers/video/riva/fbdev.c linux-2.6.32.33/drivers/vi
.get_brightness = riva_bl_get_brightness,
.update_status = riva_bl_update_status,
};
-diff -urNp linux-2.6.32.33/drivers/video/uvesafb.c linux-2.6.32.33/drivers/video/uvesafb.c
---- linux-2.6.32.33/drivers/video/uvesafb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/uvesafb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/uvesafb.c linux-2.6.32.35/drivers/video/uvesafb.c
+--- linux-2.6.32.35/drivers/video/uvesafb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/uvesafb.c 2010-12-31 14:46:53.000000000 -0500
@@ -18,6 +18,7 @@
#include <linux/fb.h>
#include <linux/io.h>
@@ -31029,9 +31029,9 @@ diff -urNp linux-2.6.32.33/drivers/video/uvesafb.c linux-2.6.32.33/drivers/video
}
framebuffer_release(info);
-diff -urNp linux-2.6.32.33/drivers/video/vesafb.c linux-2.6.32.33/drivers/video/vesafb.c
---- linux-2.6.32.33/drivers/video/vesafb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/video/vesafb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/video/vesafb.c linux-2.6.32.35/drivers/video/vesafb.c
+--- linux-2.6.32.35/drivers/video/vesafb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/video/vesafb.c 2010-12-31 14:46:53.000000000 -0500
@@ -9,6 +9,7 @@
*/
@@ -31135,9 +31135,9 @@ diff -urNp linux-2.6.32.33/drivers/video/vesafb.c linux-2.6.32.33/drivers/video/
if (info->screen_base)
iounmap(info->screen_base);
framebuffer_release(info);
-diff -urNp linux-2.6.32.33/drivers/xen/sys-hypervisor.c linux-2.6.32.33/drivers/xen/sys-hypervisor.c
---- linux-2.6.32.33/drivers/xen/sys-hypervisor.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/drivers/xen/sys-hypervisor.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/drivers/xen/sys-hypervisor.c linux-2.6.32.35/drivers/xen/sys-hypervisor.c
+--- linux-2.6.32.35/drivers/xen/sys-hypervisor.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/drivers/xen/sys-hypervisor.c 2010-12-31 14:46:53.000000000 -0500
@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
return 0;
}
@@ -31147,9 +31147,9 @@ diff -urNp linux-2.6.32.33/drivers/xen/sys-hypervisor.c linux-2.6.32.33/drivers/
.show = hyp_sysfs_show,
.store = hyp_sysfs_store,
};
-diff -urNp linux-2.6.32.33/fs/9p/vfs_inode.c linux-2.6.32.33/fs/9p/vfs_inode.c
---- linux-2.6.32.33/fs/9p/vfs_inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/9p/vfs_inode.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/9p/vfs_inode.c linux-2.6.32.35/fs/9p/vfs_inode.c
+--- linux-2.6.32.35/fs/9p/vfs_inode.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/9p/vfs_inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
static void
v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -31159,9 +31159,9 @@ diff -urNp linux-2.6.32.33/fs/9p/vfs_inode.c linux-2.6.32.33/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.33/fs/aio.c linux-2.6.32.33/fs/aio.c
---- linux-2.6.32.33/fs/aio.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.33/fs/aio.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/aio.c linux-2.6.32.35/fs/aio.c
+--- linux-2.6.32.35/fs/aio.c 2010-09-26 17:26:05.000000000 -0400
++++ linux-2.6.32.35/fs/aio.c 2010-12-31 14:46:53.000000000 -0500
@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx
size += sizeof(struct io_event) * nr_events;
nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -31171,9 +31171,9 @@ diff -urNp linux-2.6.32.33/fs/aio.c linux-2.6.32.33/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.33/fs/attr.c linux-2.6.32.33/fs/attr.c
---- linux-2.6.32.33/fs/attr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/attr.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/attr.c linux-2.6.32.35/fs/attr.c
+--- linux-2.6.32.35/fs/attr.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/attr.c 2010-12-31 14:46:53.000000000 -0500
@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
unsigned long limit;
@@ -31182,9 +31182,9 @@ diff -urNp linux-2.6.32.33/fs/attr.c linux-2.6.32.33/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.33/fs/autofs/root.c linux-2.6.32.33/fs/autofs/root.c
---- linux-2.6.32.33/fs/autofs/root.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/autofs/root.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/autofs/root.c linux-2.6.32.35/fs/autofs/root.c
+--- linux-2.6.32.35/fs/autofs/root.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/autofs/root.c 2010-12-31 14:46:53.000000000 -0500
@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
set_bit(n,sbi->symlink_bitmap);
sl = &sbi->symlink[n];
@@ -31195,9 +31195,9 @@ diff -urNp linux-2.6.32.33/fs/autofs/root.c linux-2.6.32.33/fs/autofs/root.c
if (!sl->data) {
clear_bit(n,sbi->symlink_bitmap);
unlock_kernel();
-diff -urNp linux-2.6.32.33/fs/autofs4/symlink.c linux-2.6.32.33/fs/autofs4/symlink.c
---- linux-2.6.32.33/fs/autofs4/symlink.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/autofs4/symlink.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/autofs4/symlink.c linux-2.6.32.35/fs/autofs4/symlink.c
+--- linux-2.6.32.35/fs/autofs4/symlink.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/autofs4/symlink.c 2010-12-31 14:46:53.000000000 -0500
@@ -15,7 +15,7 @@
static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
{
@@ -31207,9 +31207,9 @@ diff -urNp linux-2.6.32.33/fs/autofs4/symlink.c linux-2.6.32.33/fs/autofs4/symli
return NULL;
}
-diff -urNp linux-2.6.32.33/fs/befs/linuxvfs.c linux-2.6.32.33/fs/befs/linuxvfs.c
---- linux-2.6.32.33/fs/befs/linuxvfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/befs/linuxvfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/befs/linuxvfs.c linux-2.6.32.35/fs/befs/linuxvfs.c
+--- linux-2.6.32.35/fs/befs/linuxvfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/befs/linuxvfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
{
befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -31219,9 +31219,9 @@ diff -urNp linux-2.6.32.33/fs/befs/linuxvfs.c linux-2.6.32.33/fs/befs/linuxvfs.c
if (!IS_ERR(link))
kfree(link);
}
-diff -urNp linux-2.6.32.33/fs/binfmt_aout.c linux-2.6.32.33/fs/binfmt_aout.c
---- linux-2.6.32.33/fs/binfmt_aout.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/binfmt_aout.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/binfmt_aout.c linux-2.6.32.35/fs/binfmt_aout.c
+--- linux-2.6.32.35/fs/binfmt_aout.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/binfmt_aout.c 2010-12-31 14:46:53.000000000 -0500
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/fs.h>
@@ -31309,9 +31309,9 @@ diff -urNp linux-2.6.32.33/fs/binfmt_aout.c linux-2.6.32.33/fs/binfmt_aout.c
MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
fd_offset + ex.a_text);
up_write(&current->mm->mmap_sem);
-diff -urNp linux-2.6.32.33/fs/binfmt_elf.c linux-2.6.32.33/fs/binfmt_elf.c
---- linux-2.6.32.33/fs/binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/binfmt_elf.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/binfmt_elf.c linux-2.6.32.35/fs/binfmt_elf.c
+--- linux-2.6.32.35/fs/binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/binfmt_elf.c 2010-12-31 14:46:53.000000000 -0500
@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
#define elf_core_dump NULL
#endif
@@ -31947,9 +31947,9 @@ diff -urNp linux-2.6.32.33/fs/binfmt_elf.c linux-2.6.32.33/fs/binfmt_elf.c
static int __init init_elf_binfmt(void)
{
return register_binfmt(&elf_format);
-diff -urNp linux-2.6.32.33/fs/binfmt_flat.c linux-2.6.32.33/fs/binfmt_flat.c
---- linux-2.6.32.33/fs/binfmt_flat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/binfmt_flat.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/binfmt_flat.c linux-2.6.32.35/fs/binfmt_flat.c
+--- linux-2.6.32.35/fs/binfmt_flat.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/binfmt_flat.c 2010-12-31 14:46:53.000000000 -0500
@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
realdatastart = (unsigned long) -ENOMEM;
printk("Unable to allocate RAM for process data, errno %d\n",
@@ -31982,9 +31982,9 @@ diff -urNp linux-2.6.32.33/fs/binfmt_flat.c linux-2.6.32.33/fs/binfmt_flat.c
ret = result;
goto err;
}
-diff -urNp linux-2.6.32.33/fs/binfmt_misc.c linux-2.6.32.33/fs/binfmt_misc.c
---- linux-2.6.32.33/fs/binfmt_misc.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/fs/binfmt_misc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/binfmt_misc.c linux-2.6.32.35/fs/binfmt_misc.c
+--- linux-2.6.32.35/fs/binfmt_misc.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.35/fs/binfmt_misc.c 2010-12-31 14:46:53.000000000 -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},
@@ -31994,9 +31994,9 @@ diff -urNp linux-2.6.32.33/fs/binfmt_misc.c linux-2.6.32.33/fs/binfmt_misc.c
};
int err = simple_fill_super(sb, 0x42494e4d, bm_files);
if (!err)
-diff -urNp linux-2.6.32.33/fs/bio.c linux-2.6.32.33/fs/bio.c
---- linux-2.6.32.33/fs/bio.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/fs/bio.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/bio.c linux-2.6.32.35/fs/bio.c
+--- linux-2.6.32.35/fs/bio.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/fs/bio.c 2010-12-31 14:46:53.000000000 -0500
@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
i = 0;
@@ -32015,9 +32015,9 @@ diff -urNp linux-2.6.32.33/fs/bio.c linux-2.6.32.33/fs/bio.c
__bio_for_each_segment(bvec, bio, i, 0) {
char *addr = page_address(bvec->bv_page);
-diff -urNp linux-2.6.32.33/fs/block_dev.c linux-2.6.32.33/fs/block_dev.c
---- linux-2.6.32.33/fs/block_dev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/block_dev.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/block_dev.c linux-2.6.32.35/fs/block_dev.c
+--- linux-2.6.32.35/fs/block_dev.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/block_dev.c 2010-12-31 14:46:53.000000000 -0500
@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev,
else if (bdev->bd_contains == bdev)
res = 0; /* is a whole device which isn't held */
@@ -32027,9 +32027,9 @@ diff -urNp linux-2.6.32.33/fs/block_dev.c linux-2.6.32.33/fs/block_dev.c
res = 0; /* is a partition of a device that is being partitioned */
else if (bdev->bd_contains->bd_holder != NULL)
res = -EBUSY; /* is a partition of a held device */
-diff -urNp linux-2.6.32.33/fs/btrfs/ctree.c linux-2.6.32.33/fs/btrfs/ctree.c
---- linux-2.6.32.33/fs/btrfs/ctree.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/btrfs/ctree.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/btrfs/ctree.c linux-2.6.32.35/fs/btrfs/ctree.c
+--- linux-2.6.32.35/fs/btrfs/ctree.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/btrfs/ctree.c 2010-12-31 14:46:53.000000000 -0500
@@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(st
free_extent_buffer(buf);
add_root_to_dirty_list(root);
@@ -32054,9 +32054,9 @@ diff -urNp linux-2.6.32.33/fs/btrfs/ctree.c linux-2.6.32.33/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.33/fs/btrfs/disk-io.c linux-2.6.32.33/fs/btrfs/disk-io.c
---- linux-2.6.32.33/fs/btrfs/disk-io.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/btrfs/disk-io.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/btrfs/disk-io.c linux-2.6.32.35/fs/btrfs/disk-io.c
+--- linux-2.6.32.35/fs/btrfs/disk-io.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/btrfs/disk-io.c 2010-12-31 14:46:53.000000000 -0500
@@ -39,7 +39,7 @@
#include "tree-log.h"
#include "free-space-cache.h"
@@ -32075,9 +32075,9 @@ diff -urNp linux-2.6.32.33/fs/btrfs/disk-io.c linux-2.6.32.33/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.33/fs/btrfs/extent_io.h linux-2.6.32.33/fs/btrfs/extent_io.h
---- linux-2.6.32.33/fs/btrfs/extent_io.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/btrfs/extent_io.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/btrfs/extent_io.h linux-2.6.32.35/fs/btrfs/extent_io.h
+--- linux-2.6.32.35/fs/btrfs/extent_io.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/btrfs/extent_io.h 2010-12-31 14:46:53.000000000 -0500
@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
struct bio *bio, int mirror_num,
unsigned long bio_flags);
@@ -32138,9 +32138,9 @@ diff -urNp linux-2.6.32.33/fs/btrfs/extent_io.h linux-2.6.32.33/fs/btrfs/extent_
};
struct extent_state {
-diff -urNp linux-2.6.32.33/fs/btrfs/free-space-cache.c linux-2.6.32.33/fs/btrfs/free-space-cache.c
---- linux-2.6.32.33/fs/btrfs/free-space-cache.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/btrfs/free-space-cache.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/btrfs/free-space-cache.c linux-2.6.32.35/fs/btrfs/free-space-cache.c
+--- linux-2.6.32.35/fs/btrfs/free-space-cache.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/btrfs/free-space-cache.c 2010-12-31 14:46:53.000000000 -0500
@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
while(1) {
@@ -32159,9 +32159,9 @@ diff -urNp linux-2.6.32.33/fs/btrfs/free-space-cache.c linux-2.6.32.33/fs/btrfs/
if (entry->bitmap && entry->bytes > bytes + empty_size) {
ret = btrfs_bitmap_cluster(block_group, entry, cluster,
-diff -urNp linux-2.6.32.33/fs/btrfs/inode.c linux-2.6.32.33/fs/btrfs/inode.c
---- linux-2.6.32.33/fs/btrfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/btrfs/inode.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/btrfs/inode.c linux-2.6.32.35/fs/btrfs/inode.c
+--- linux-2.6.32.35/fs/btrfs/inode.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/btrfs/inode.c 2011-03-26 19:20:53.000000000 -0400
@@ -63,7 +63,7 @@ static const struct inode_operations btr
static const struct address_space_operations btrfs_aops;
static const struct address_space_operations btrfs_symlink_aops;
@@ -32171,7 +32171,31 @@ diff -urNp linux-2.6.32.33/fs/btrfs/inode.c linux-2.6.32.33/fs/btrfs/inode.c
static struct kmem_cache *btrfs_inode_cachep;
struct kmem_cache *btrfs_trans_handle_cachep;
-@@ -5972,7 +5972,7 @@ static const struct file_operations btrf
+@@ -5410,7 +5410,7 @@ fail:
+ return -ENOMEM;
+ }
+
+-static int btrfs_getattr(struct vfsmount *mnt,
++int btrfs_getattr(struct vfsmount *mnt,
+ struct dentry *dentry, struct kstat *stat)
+ {
+ struct inode *inode = dentry->d_inode;
+@@ -5422,6 +5422,14 @@ static int btrfs_getattr(struct vfsmount
+ return 0;
+ }
+
++EXPORT_SYMBOL(btrfs_getattr);
++
++dev_t get_btrfs_dev_from_inode(struct inode *inode)
++{
++ return BTRFS_I(inode)->root->anon_super.s_dev;
++}
++EXPORT_SYMBOL(get_btrfs_dev_from_inode);
++
+ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
+ struct inode *new_dir, struct dentry *new_dentry)
+ {
+@@ -5972,7 +5980,7 @@ static const struct file_operations btrf
.fsync = btrfs_sync_file,
};
@@ -32180,9 +32204,9 @@ diff -urNp linux-2.6.32.33/fs/btrfs/inode.c linux-2.6.32.33/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.33/fs/btrfs/relocation.c linux-2.6.32.33/fs/btrfs/relocation.c
---- linux-2.6.32.33/fs/btrfs/relocation.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/btrfs/relocation.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/btrfs/relocation.c linux-2.6.32.35/fs/btrfs/relocation.c
+--- linux-2.6.32.35/fs/btrfs/relocation.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/btrfs/relocation.c 2010-12-31 14:46:53.000000000 -0500
@@ -884,7 +884,7 @@ static int __update_reloc_root(struct bt
}
spin_unlock(&rc->reloc_root_tree.lock);
@@ -32192,9 +32216,9 @@ diff -urNp linux-2.6.32.33/fs/btrfs/relocation.c linux-2.6.32.33/fs/btrfs/reloca
if (!del) {
spin_lock(&rc->reloc_root_tree.lock);
-diff -urNp linux-2.6.32.33/fs/btrfs/sysfs.c linux-2.6.32.33/fs/btrfs/sysfs.c
---- linux-2.6.32.33/fs/btrfs/sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/btrfs/sysfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/btrfs/sysfs.c linux-2.6.32.35/fs/btrfs/sysfs.c
+--- linux-2.6.32.35/fs/btrfs/sysfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/btrfs/sysfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
complete(&root->kobj_unregister);
}
@@ -32210,9 +32234,9 @@ diff -urNp linux-2.6.32.33/fs/btrfs/sysfs.c linux-2.6.32.33/fs/btrfs/sysfs.c
.show = btrfs_root_attr_show,
.store = btrfs_root_attr_store,
};
-diff -urNp linux-2.6.32.33/fs/buffer.c linux-2.6.32.33/fs/buffer.c
---- linux-2.6.32.33/fs/buffer.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/buffer.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/buffer.c linux-2.6.32.35/fs/buffer.c
+--- linux-2.6.32.35/fs/buffer.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/buffer.c 2010-12-31 14:46:53.000000000 -0500
@@ -25,6 +25,7 @@
#include <linux/percpu.h>
#include <linux/slab.h>
@@ -32221,9 +32245,9 @@ diff -urNp linux-2.6.32.33/fs/buffer.c linux-2.6.32.33/fs/buffer.c
#include <linux/blkdev.h>
#include <linux/file.h>
#include <linux/quotaops.h>
-diff -urNp linux-2.6.32.33/fs/cachefiles/bind.c linux-2.6.32.33/fs/cachefiles/bind.c
---- linux-2.6.32.33/fs/cachefiles/bind.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/cachefiles/bind.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/cachefiles/bind.c linux-2.6.32.35/fs/cachefiles/bind.c
+--- linux-2.6.32.35/fs/cachefiles/bind.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/cachefiles/bind.c 2010-12-31 14:46:53.000000000 -0500
@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
args);
@@ -32240,9 +32264,9 @@ diff -urNp linux-2.6.32.33/fs/cachefiles/bind.c linux-2.6.32.33/fs/cachefiles/bi
cache->bcull_percent < cache->brun_percent &&
cache->brun_percent < 100);
-diff -urNp linux-2.6.32.33/fs/cachefiles/daemon.c linux-2.6.32.33/fs/cachefiles/daemon.c
---- linux-2.6.32.33/fs/cachefiles/daemon.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/cachefiles/daemon.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/cachefiles/daemon.c linux-2.6.32.35/fs/cachefiles/daemon.c
+--- linux-2.6.32.35/fs/cachefiles/daemon.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/cachefiles/daemon.c 2010-12-31 14:46:53.000000000 -0500
@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
if (test_bit(CACHEFILES_DEAD, &cache->flags))
return -EIO;
@@ -32270,9 +32294,9 @@ diff -urNp linux-2.6.32.33/fs/cachefiles/daemon.c linux-2.6.32.33/fs/cachefiles/
return cachefiles_daemon_range_error(cache, args);
cache->bstop_percent = bstop;
-diff -urNp linux-2.6.32.33/fs/cachefiles/rdwr.c linux-2.6.32.33/fs/cachefiles/rdwr.c
---- linux-2.6.32.33/fs/cachefiles/rdwr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/cachefiles/rdwr.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/cachefiles/rdwr.c linux-2.6.32.35/fs/cachefiles/rdwr.c
+--- linux-2.6.32.35/fs/cachefiles/rdwr.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/cachefiles/rdwr.c 2010-12-31 14:46:53.000000000 -0500
@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
old_fs = get_fs();
set_fs(KERNEL_DS);
@@ -32282,9 +32306,9 @@ diff -urNp linux-2.6.32.33/fs/cachefiles/rdwr.c linux-2.6.32.33/fs/cachefiles/rd
set_fs(old_fs);
kunmap(page);
if (ret != len)
-diff -urNp linux-2.6.32.33/fs/cifs/cifs_uniupr.h linux-2.6.32.33/fs/cifs/cifs_uniupr.h
---- linux-2.6.32.33/fs/cifs/cifs_uniupr.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/cifs/cifs_uniupr.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/cifs/cifs_uniupr.h linux-2.6.32.35/fs/cifs/cifs_uniupr.h
+--- linux-2.6.32.35/fs/cifs/cifs_uniupr.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/cifs/cifs_uniupr.h 2010-12-31 14:46:53.000000000 -0500
@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
{0x0490, 0x04cc, UniCaseRangeU0490},
{0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -32294,9 +32318,9 @@ diff -urNp linux-2.6.32.33/fs/cifs/cifs_uniupr.h linux-2.6.32.33/fs/cifs/cifs_un
};
#endif
-diff -urNp linux-2.6.32.33/fs/cifs/link.c linux-2.6.32.33/fs/cifs/link.c
---- linux-2.6.32.33/fs/cifs/link.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/cifs/link.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/cifs/link.c linux-2.6.32.35/fs/cifs/link.c
+--- linux-2.6.32.35/fs/cifs/link.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/cifs/link.c 2010-12-31 14:46:53.000000000 -0500
@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -32306,9 +32330,9 @@ diff -urNp linux-2.6.32.33/fs/cifs/link.c linux-2.6.32.33/fs/cifs/link.c
if (!IS_ERR(p))
kfree(p);
}
-diff -urNp linux-2.6.32.33/fs/compat_binfmt_elf.c linux-2.6.32.33/fs/compat_binfmt_elf.c
---- linux-2.6.32.33/fs/compat_binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/compat_binfmt_elf.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/compat_binfmt_elf.c linux-2.6.32.35/fs/compat_binfmt_elf.c
+--- linux-2.6.32.35/fs/compat_binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/compat_binfmt_elf.c 2010-12-31 14:46:53.000000000 -0500
@@ -29,10 +29,12 @@
#undef elfhdr
#undef elf_phdr
@@ -32322,9 +32346,9 @@ diff -urNp linux-2.6.32.33/fs/compat_binfmt_elf.c linux-2.6.32.33/fs/compat_binf
#define elf_addr_t Elf32_Addr
/*
-diff -urNp linux-2.6.32.33/fs/compat.c linux-2.6.32.33/fs/compat.c
---- linux-2.6.32.33/fs/compat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/compat.c 2011-01-11 23:29:37.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/compat.c linux-2.6.32.35/fs/compat.c
+--- linux-2.6.32.35/fs/compat.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/compat.c 2011-01-11 23:29:37.000000000 -0500
@@ -830,6 +830,7 @@ struct compat_old_linux_dirent {
struct compat_readdir_callback {
@@ -32549,9 +32573,9 @@ diff -urNp linux-2.6.32.33/fs/compat.c linux-2.6.32.33/fs/compat.c
out_file:
if (bprm->file) {
-diff -urNp linux-2.6.32.33/fs/compat_ioctl.c linux-2.6.32.33/fs/compat_ioctl.c
---- linux-2.6.32.33/fs/compat_ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/compat_ioctl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/compat_ioctl.c linux-2.6.32.35/fs/compat_ioctl.c
+--- linux-2.6.32.35/fs/compat_ioctl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/compat_ioctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -234,6 +234,8 @@ static int do_video_set_spu_palette(unsi
up = (struct compat_video_spu_palette __user *) arg;
err = get_user(palp, &up->palette);
@@ -32580,9 +32604,9 @@ diff -urNp linux-2.6.32.33/fs/compat_ioctl.c linux-2.6.32.33/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.33/fs/debugfs/inode.c linux-2.6.32.33/fs/debugfs/inode.c
---- linux-2.6.32.33/fs/debugfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/debugfs/inode.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/debugfs/inode.c linux-2.6.32.35/fs/debugfs/inode.c
+--- linux-2.6.32.35/fs/debugfs/inode.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/debugfs/inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
static int debug_fill_super(struct super_block *sb, void *data, int silent)
@@ -32592,9 +32616,9 @@ diff -urNp linux-2.6.32.33/fs/debugfs/inode.c linux-2.6.32.33/fs/debugfs/inode.c
return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
}
-diff -urNp linux-2.6.32.33/fs/dlm/lockspace.c linux-2.6.32.33/fs/dlm/lockspace.c
---- linux-2.6.32.33/fs/dlm/lockspace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/dlm/lockspace.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/dlm/lockspace.c linux-2.6.32.35/fs/dlm/lockspace.c
+--- linux-2.6.32.35/fs/dlm/lockspace.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/dlm/lockspace.c 2010-12-31 14:46:53.000000000 -0500
@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
kfree(ls);
}
@@ -32604,9 +32628,9 @@ diff -urNp linux-2.6.32.33/fs/dlm/lockspace.c linux-2.6.32.33/fs/dlm/lockspace.c
.show = dlm_attr_show,
.store = dlm_attr_store,
};
-diff -urNp linux-2.6.32.33/fs/ecryptfs/inode.c linux-2.6.32.33/fs/ecryptfs/inode.c
---- linux-2.6.32.33/fs/ecryptfs/inode.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/fs/ecryptfs/inode.c 2011-03-02 17:25:31.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ecryptfs/inode.c linux-2.6.32.35/fs/ecryptfs/inode.c
+--- linux-2.6.32.35/fs/ecryptfs/inode.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/fs/ecryptfs/inode.c 2011-03-02 17:25:31.000000000 -0500
@@ -660,7 +660,7 @@ static int ecryptfs_readlink_lower(struc
old_fs = get_fs();
set_fs(get_ds());
@@ -32625,9 +32649,9 @@ diff -urNp linux-2.6.32.33/fs/ecryptfs/inode.c linux-2.6.32.33/fs/ecryptfs/inode
set_fs(old_fs);
if (rc < 0)
goto out_free;
-diff -urNp linux-2.6.32.33/fs/exec.c linux-2.6.32.33/fs/exec.c
---- linux-2.6.32.33/fs/exec.c 2011-01-11 23:55:35.000000000 -0500
-+++ linux-2.6.32.33/fs/exec.c 2011-02-12 11:21:23.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/exec.c linux-2.6.32.35/fs/exec.c
+--- linux-2.6.32.35/fs/exec.c 2011-01-11 23:55:35.000000000 -0500
++++ linux-2.6.32.35/fs/exec.c 2011-02-12 11:21:23.000000000 -0500
@@ -56,12 +56,24 @@
#include <linux/fsnotify.h>
#include <linux/fs_struct.h>
@@ -33219,9 +33243,9 @@ diff -urNp linux-2.6.32.33/fs/exec.c linux-2.6.32.33/fs/exec.c
/*
* lock_kernel() because format_corename() is controlled by sysctl, which
* uses lock_kernel()
-diff -urNp linux-2.6.32.33/fs/ext2/balloc.c linux-2.6.32.33/fs/ext2/balloc.c
---- linux-2.6.32.33/fs/ext2/balloc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ext2/balloc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ext2/balloc.c linux-2.6.32.35/fs/ext2/balloc.c
+--- linux-2.6.32.35/fs/ext2/balloc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ext2/balloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -33231,9 +33255,9 @@ diff -urNp linux-2.6.32.33/fs/ext2/balloc.c linux-2.6.32.33/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.33/fs/ext2/xattr.c linux-2.6.32.33/fs/ext2/xattr.c
---- linux-2.6.32.33/fs/ext2/xattr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ext2/xattr.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ext2/xattr.c linux-2.6.32.35/fs/ext2/xattr.c
+--- linux-2.6.32.35/fs/ext2/xattr.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ext2/xattr.c 2010-12-31 14:46:53.000000000 -0500
@@ -85,8 +85,8 @@
printk("\n"); \
} while (0)
@@ -33245,9 +33269,9 @@ diff -urNp linux-2.6.32.33/fs/ext2/xattr.c linux-2.6.32.33/fs/ext2/xattr.c
#endif
static int ext2_xattr_set2(struct inode *, struct buffer_head *,
-diff -urNp linux-2.6.32.33/fs/ext3/balloc.c linux-2.6.32.33/fs/ext3/balloc.c
---- linux-2.6.32.33/fs/ext3/balloc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ext3/balloc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ext3/balloc.c linux-2.6.32.35/fs/ext3/balloc.c
+--- linux-2.6.32.35/fs/ext3/balloc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ext3/balloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -33257,9 +33281,9 @@ diff -urNp linux-2.6.32.33/fs/ext3/balloc.c linux-2.6.32.33/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.33/fs/ext3/namei.c linux-2.6.32.33/fs/ext3/namei.c
---- linux-2.6.32.33/fs/ext3/namei.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ext3/namei.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ext3/namei.c linux-2.6.32.35/fs/ext3/namei.c
+--- linux-2.6.32.35/fs/ext3/namei.c 2011-03-23 19:00:32.000000000 -0400
++++ linux-2.6.32.35/fs/ext3/namei.c 2011-03-23 19:01:01.000000000 -0400
@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
@@ -33269,9 +33293,9 @@ diff -urNp linux-2.6.32.33/fs/ext3/namei.c linux-2.6.32.33/fs/ext3/namei.c
bh2 = ext3_append (handle, dir, &newblock, &err);
if (!(bh2)) {
-diff -urNp linux-2.6.32.33/fs/ext3/xattr.c linux-2.6.32.33/fs/ext3/xattr.c
---- linux-2.6.32.33/fs/ext3/xattr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ext3/xattr.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ext3/xattr.c linux-2.6.32.35/fs/ext3/xattr.c
+--- linux-2.6.32.35/fs/ext3/xattr.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ext3/xattr.c 2010-12-31 14:46:53.000000000 -0500
@@ -89,8 +89,8 @@
printk("\n"); \
} while (0)
@@ -33283,9 +33307,9 @@ diff -urNp linux-2.6.32.33/fs/ext3/xattr.c linux-2.6.32.33/fs/ext3/xattr.c
#endif
static void ext3_xattr_cache_insert(struct buffer_head *);
-diff -urNp linux-2.6.32.33/fs/ext4/balloc.c linux-2.6.32.33/fs/ext4/balloc.c
---- linux-2.6.32.33/fs/ext4/balloc.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.33/fs/ext4/balloc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ext4/balloc.c linux-2.6.32.35/fs/ext4/balloc.c
+--- linux-2.6.32.35/fs/ext4/balloc.c 2010-08-29 21:08:20.000000000 -0400
++++ linux-2.6.32.35/fs/ext4/balloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -570,7 +570,7 @@ int ext4_has_free_blocks(struct ext4_sb_
/* Hm, nope. Are (enough) root reserved blocks available? */
if (sbi->s_resuid == current_fsuid() ||
@@ -33295,9 +33319,9 @@ diff -urNp linux-2.6.32.33/fs/ext4/balloc.c linux-2.6.32.33/fs/ext4/balloc.c
if (free_blocks >= (nblocks + dirty_blocks))
return 1;
}
-diff -urNp linux-2.6.32.33/fs/ext4/ext4.h linux-2.6.32.33/fs/ext4/ext4.h
---- linux-2.6.32.33/fs/ext4/ext4.h 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.33/fs/ext4/ext4.h 2011-01-04 17:42:43.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ext4/ext4.h linux-2.6.32.35/fs/ext4/ext4.h
+--- linux-2.6.32.35/fs/ext4/ext4.h 2010-08-29 21:08:20.000000000 -0400
++++ linux-2.6.32.35/fs/ext4/ext4.h 2011-01-04 17:42:43.000000000 -0500
@@ -1078,19 +1078,19 @@ struct ext4_sb_info {
/* stats for buddy allocator */
@@ -33328,9 +33352,9 @@ diff -urNp linux-2.6.32.33/fs/ext4/ext4.h linux-2.6.32.33/fs/ext4/ext4.h
atomic_t s_lock_busy;
/* locality groups */
-diff -urNp linux-2.6.32.33/fs/ext4/mballoc.c linux-2.6.32.33/fs/ext4/mballoc.c
---- linux-2.6.32.33/fs/ext4/mballoc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ext4/mballoc.c 2011-01-04 17:42:43.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ext4/mballoc.c linux-2.6.32.35/fs/ext4/mballoc.c
+--- linux-2.6.32.35/fs/ext4/mballoc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ext4/mballoc.c 2011-01-04 17:42:43.000000000 -0500
@@ -1753,7 +1753,7 @@ void ext4_mb_simple_scan_group(struct ex
BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
@@ -33444,9 +33468,9 @@ diff -urNp linux-2.6.32.33/fs/ext4/mballoc.c linux-2.6.32.33/fs/ext4/mballoc.c
if (ac) {
ac->ac_sb = sb;
-diff -urNp linux-2.6.32.33/fs/ext4/namei.c linux-2.6.32.33/fs/ext4/namei.c
---- linux-2.6.32.33/fs/ext4/namei.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ext4/namei.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ext4/namei.c linux-2.6.32.35/fs/ext4/namei.c
+--- linux-2.6.32.35/fs/ext4/namei.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ext4/namei.c 2010-12-31 14:46:53.000000000 -0500
@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
@@ -33456,9 +33480,9 @@ diff -urNp linux-2.6.32.33/fs/ext4/namei.c linux-2.6.32.33/fs/ext4/namei.c
bh2 = ext4_append (handle, dir, &newblock, &err);
if (!(bh2)) {
-diff -urNp linux-2.6.32.33/fs/ext4/super.c linux-2.6.32.33/fs/ext4/super.c
---- linux-2.6.32.33/fs/ext4/super.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ext4/super.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ext4/super.c linux-2.6.32.35/fs/ext4/super.c
+--- linux-2.6.32.35/fs/ext4/super.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ext4/super.c 2010-12-31 14:46:53.000000000 -0500
@@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobje
}
@@ -33468,9 +33492,9 @@ diff -urNp linux-2.6.32.33/fs/ext4/super.c linux-2.6.32.33/fs/ext4/super.c
.show = ext4_attr_show,
.store = ext4_attr_store,
};
-diff -urNp linux-2.6.32.33/fs/ext4/xattr.c linux-2.6.32.33/fs/ext4/xattr.c
---- linux-2.6.32.33/fs/ext4/xattr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ext4/xattr.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ext4/xattr.c linux-2.6.32.35/fs/ext4/xattr.c
+--- linux-2.6.32.35/fs/ext4/xattr.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ext4/xattr.c 2010-12-31 14:46:53.000000000 -0500
@@ -82,8 +82,8 @@
printk("\n"); \
} while (0)
@@ -33482,9 +33506,9 @@ diff -urNp linux-2.6.32.33/fs/ext4/xattr.c linux-2.6.32.33/fs/ext4/xattr.c
#endif
static void ext4_xattr_cache_insert(struct buffer_head *);
-diff -urNp linux-2.6.32.33/fs/fcntl.c linux-2.6.32.33/fs/fcntl.c
---- linux-2.6.32.33/fs/fcntl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/fcntl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/fcntl.c linux-2.6.32.35/fs/fcntl.c
+--- linux-2.6.32.35/fs/fcntl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/fcntl.c 2010-12-31 14:46:53.000000000 -0500
@@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct
if (err)
return err;
@@ -33505,9 +33529,9 @@ diff -urNp linux-2.6.32.33/fs/fcntl.c linux-2.6.32.33/fs/fcntl.c
if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
break;
err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
-diff -urNp linux-2.6.32.33/fs/fifo.c linux-2.6.32.33/fs/fifo.c
---- linux-2.6.32.33/fs/fifo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/fifo.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/fifo.c linux-2.6.32.35/fs/fifo.c
+--- linux-2.6.32.35/fs/fifo.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/fifo.c 2010-12-31 14:46:53.000000000 -0500
@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
*/
filp->f_op = &read_pipefifo_fops;
@@ -33578,9 +33602,9 @@ diff -urNp linux-2.6.32.33/fs/fifo.c linux-2.6.32.33/fs/fifo.c
free_pipe_info(inode);
err_nocleanup:
-diff -urNp linux-2.6.32.33/fs/file.c linux-2.6.32.33/fs/file.c
---- linux-2.6.32.33/fs/file.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/file.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/file.c linux-2.6.32.35/fs/file.c
+--- linux-2.6.32.35/fs/file.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/file.c 2010-12-31 14:46:53.000000000 -0500
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -33598,9 +33622,9 @@ diff -urNp linux-2.6.32.33/fs/file.c linux-2.6.32.33/fs/file.c
if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
return -EMFILE;
-diff -urNp linux-2.6.32.33/fs/fs_struct.c linux-2.6.32.33/fs/fs_struct.c
---- linux-2.6.32.33/fs/fs_struct.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/fs_struct.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/fs_struct.c linux-2.6.32.35/fs/fs_struct.c
+--- linux-2.6.32.35/fs/fs_struct.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/fs_struct.c 2010-12-31 14:46:53.000000000 -0500
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -33680,9 +33704,9 @@ diff -urNp linux-2.6.32.33/fs/fs_struct.c linux-2.6.32.33/fs/fs_struct.c
write_unlock(&fs->lock);
task_unlock(current);
-diff -urNp linux-2.6.32.33/fs/fuse/control.c linux-2.6.32.33/fs/fuse/control.c
---- linux-2.6.32.33/fs/fuse/control.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/fuse/control.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/fuse/control.c linux-2.6.32.35/fs/fuse/control.c
+--- linux-2.6.32.35/fs/fuse/control.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/fuse/control.c 2010-12-31 14:46:53.000000000 -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)
@@ -33692,9 +33716,9 @@ diff -urNp linux-2.6.32.33/fs/fuse/control.c linux-2.6.32.33/fs/fuse/control.c
struct fuse_conn *fc;
int err;
-diff -urNp linux-2.6.32.33/fs/fuse/cuse.c linux-2.6.32.33/fs/fuse/cuse.c
---- linux-2.6.32.33/fs/fuse/cuse.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/fuse/cuse.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/fuse/cuse.c linux-2.6.32.35/fs/fuse/cuse.c
+--- linux-2.6.32.35/fs/fuse/cuse.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/fuse/cuse.c 2010-12-31 14:46:53.000000000 -0500
@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
return rc;
}
@@ -33729,9 +33753,9 @@ diff -urNp linux-2.6.32.33/fs/fuse/cuse.c linux-2.6.32.33/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.33/fs/fuse/dev.c linux-2.6.32.33/fs/fuse/dev.c
---- linux-2.6.32.33/fs/fuse/dev.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/fs/fuse/dev.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/fuse/dev.c linux-2.6.32.35/fs/fuse/dev.c
+--- linux-2.6.32.35/fs/fuse/dev.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.35/fs/fuse/dev.c 2010-12-31 14:46:53.000000000 -0500
@@ -745,7 +745,7 @@ __releases(&fc->lock)
* request_end(). Otherwise add it to the processing list, and set
* the 'sent' flag.
@@ -33837,9 +33861,9 @@ diff -urNp linux-2.6.32.33/fs/fuse/dev.c linux-2.6.32.33/fs/fuse/dev.c
const struct file_operations fuse_dev_operations = {
.owner = THIS_MODULE,
-diff -urNp linux-2.6.32.33/fs/fuse/dir.c linux-2.6.32.33/fs/fuse/dir.c
---- linux-2.6.32.33/fs/fuse/dir.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/fuse/dir.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/fuse/dir.c linux-2.6.32.35/fs/fuse/dir.c
+--- linux-2.6.32.35/fs/fuse/dir.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/fuse/dir.c 2010-12-31 14:46:53.000000000 -0500
@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
return link;
}
@@ -33849,9 +33873,9 @@ diff -urNp linux-2.6.32.33/fs/fuse/dir.c linux-2.6.32.33/fs/fuse/dir.c
{
if (!IS_ERR(link))
free_page((unsigned long) link);
-diff -urNp linux-2.6.32.33/fs/fuse/fuse_i.h linux-2.6.32.33/fs/fuse/fuse_i.h
---- linux-2.6.32.33/fs/fuse/fuse_i.h 2011-03-11 17:56:47.000000000 -0500
-+++ linux-2.6.32.33/fs/fuse/fuse_i.h 2011-03-11 18:01:11.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/fuse/fuse_i.h linux-2.6.32.35/fs/fuse/fuse_i.h
+--- linux-2.6.32.35/fs/fuse/fuse_i.h 2011-03-11 17:56:47.000000000 -0500
++++ linux-2.6.32.35/fs/fuse/fuse_i.h 2011-03-11 18:01:11.000000000 -0500
@@ -525,6 +525,16 @@ extern const struct file_operations fuse
extern const struct dentry_operations fuse_dentry_operations;
@@ -33869,9 +33893,9 @@ diff -urNp linux-2.6.32.33/fs/fuse/fuse_i.h linux-2.6.32.33/fs/fuse/fuse_i.h
/**
* Inode to nodeid comparison.
*/
-diff -urNp linux-2.6.32.33/fs/gfs2/sys.c linux-2.6.32.33/fs/gfs2/sys.c
---- linux-2.6.32.33/fs/gfs2/sys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/gfs2/sys.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/gfs2/sys.c linux-2.6.32.35/fs/gfs2/sys.c
+--- linux-2.6.32.35/fs/gfs2/sys.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/gfs2/sys.c 2010-12-31 14:46:53.000000000 -0500
@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
return a->store ? a->store(sdp, buf, len) : len;
}
@@ -33890,9 +33914,9 @@ diff -urNp linux-2.6.32.33/fs/gfs2/sys.c linux-2.6.32.33/fs/gfs2/sys.c
.uevent = gfs2_uevent,
};
-diff -urNp linux-2.6.32.33/fs/hfs/inode.c linux-2.6.32.33/fs/hfs/inode.c
---- linux-2.6.32.33/fs/hfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/hfs/inode.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/hfs/inode.c linux-2.6.32.35/fs/hfs/inode.c
+--- linux-2.6.32.35/fs/hfs/inode.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/hfs/inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
if (S_ISDIR(main_inode->i_mode)) {
@@ -33911,9 +33935,9 @@ diff -urNp linux-2.6.32.33/fs/hfs/inode.c linux-2.6.32.33/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.33/fs/hfsplus/inode.c linux-2.6.32.33/fs/hfsplus/inode.c
---- linux-2.6.32.33/fs/hfsplus/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/hfsplus/inode.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/hfsplus/inode.c linux-2.6.32.35/fs/hfsplus/inode.c
+--- linux-2.6.32.35/fs/hfsplus/inode.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/hfsplus/inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
struct hfsplus_cat_folder *folder = &entry.folder;
@@ -33950,9 +33974,9 @@ diff -urNp linux-2.6.32.33/fs/hfsplus/inode.c linux-2.6.32.33/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.33/fs/hugetlbfs/inode.c linux-2.6.32.33/fs/hugetlbfs/inode.c
---- linux-2.6.32.33/fs/hugetlbfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/hugetlbfs/inode.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/hugetlbfs/inode.c linux-2.6.32.35/fs/hugetlbfs/inode.c
+--- linux-2.6.32.35/fs/hugetlbfs/inode.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/hugetlbfs/inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
.kill_sb = kill_litter_super,
};
@@ -33962,9 +33986,9 @@ diff -urNp linux-2.6.32.33/fs/hugetlbfs/inode.c linux-2.6.32.33/fs/hugetlbfs/ino
static int can_do_hugetlb_shm(void)
{
-diff -urNp linux-2.6.32.33/fs/ioctl.c linux-2.6.32.33/fs/ioctl.c
---- linux-2.6.32.33/fs/ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ioctl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ioctl.c linux-2.6.32.35/fs/ioctl.c
+--- linux-2.6.32.35/fs/ioctl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ioctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
u64 phys, u64 len, u32 flags)
{
@@ -33992,9 +34016,9 @@ diff -urNp linux-2.6.32.33/fs/ioctl.c linux-2.6.32.33/fs/ioctl.c
error = -EFAULT;
return error;
-diff -urNp linux-2.6.32.33/fs/jffs2/debug.h linux-2.6.32.33/fs/jffs2/debug.h
---- linux-2.6.32.33/fs/jffs2/debug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/jffs2/debug.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/jffs2/debug.h linux-2.6.32.35/fs/jffs2/debug.h
+--- linux-2.6.32.35/fs/jffs2/debug.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/jffs2/debug.h 2010-12-31 14:46:53.000000000 -0500
@@ -52,13 +52,13 @@
#if CONFIG_JFFS2_FS_DEBUG > 0
#define D1(x) x
@@ -34096,9 +34120,9 @@ diff -urNp linux-2.6.32.33/fs/jffs2/debug.h linux-2.6.32.33/fs/jffs2/debug.h
#endif
/* "Sanity" checks */
-diff -urNp linux-2.6.32.33/fs/jffs2/erase.c linux-2.6.32.33/fs/jffs2/erase.c
---- linux-2.6.32.33/fs/jffs2/erase.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/jffs2/erase.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/jffs2/erase.c linux-2.6.32.35/fs/jffs2/erase.c
+--- linux-2.6.32.35/fs/jffs2/erase.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/jffs2/erase.c 2010-12-31 14:46:53.000000000 -0500
@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
struct jffs2_unknown_node marker = {
.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -34109,9 +34133,9 @@ diff -urNp linux-2.6.32.33/fs/jffs2/erase.c linux-2.6.32.33/fs/jffs2/erase.c
};
jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-2.6.32.33/fs/jffs2/summary.h linux-2.6.32.33/fs/jffs2/summary.h
---- linux-2.6.32.33/fs/jffs2/summary.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/jffs2/summary.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/jffs2/summary.h linux-2.6.32.35/fs/jffs2/summary.h
+--- linux-2.6.32.35/fs/jffs2/summary.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/jffs2/summary.h 2010-12-31 14:46:53.000000000 -0500
@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
#define jffs2_sum_active() (0)
@@ -34140,9 +34164,9 @@ diff -urNp linux-2.6.32.33/fs/jffs2/summary.h linux-2.6.32.33/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.33/fs/jffs2/wbuf.c linux-2.6.32.33/fs/jffs2/wbuf.c
---- linux-2.6.32.33/fs/jffs2/wbuf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/jffs2/wbuf.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/jffs2/wbuf.c linux-2.6.32.35/fs/jffs2/wbuf.c
+--- linux-2.6.32.35/fs/jffs2/wbuf.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/jffs2/wbuf.c 2010-12-31 14:46:53.000000000 -0500
@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
{
.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -34153,9 +34177,9 @@ diff -urNp linux-2.6.32.33/fs/jffs2/wbuf.c linux-2.6.32.33/fs/jffs2/wbuf.c
};
/*
-diff -urNp linux-2.6.32.33/fs/Kconfig.binfmt linux-2.6.32.33/fs/Kconfig.binfmt
---- linux-2.6.32.33/fs/Kconfig.binfmt 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/Kconfig.binfmt 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/Kconfig.binfmt linux-2.6.32.35/fs/Kconfig.binfmt
+--- linux-2.6.32.35/fs/Kconfig.binfmt 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/Kconfig.binfmt 2010-12-31 14:46:53.000000000 -0500
@@ -86,7 +86,7 @@ config HAVE_AOUT
config BINFMT_AOUT
@@ -34165,9 +34189,9 @@ diff -urNp linux-2.6.32.33/fs/Kconfig.binfmt linux-2.6.32.33/fs/Kconfig.binfmt
---help---
A.out (Assembler.OUTput) is a set of formats for libraries and
executables used in the earliest versions of UNIX. Linux used
-diff -urNp linux-2.6.32.33/fs/lockd/svc.c linux-2.6.32.33/fs/lockd/svc.c
---- linux-2.6.32.33/fs/lockd/svc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/lockd/svc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/lockd/svc.c linux-2.6.32.35/fs/lockd/svc.c
+--- linux-2.6.32.35/fs/lockd/svc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/lockd/svc.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,7 +43,7 @@
static struct svc_program nlmsvc_program;
@@ -34177,9 +34201,9 @@ diff -urNp linux-2.6.32.33/fs/lockd/svc.c linux-2.6.32.33/fs/lockd/svc.c
EXPORT_SYMBOL_GPL(nlmsvc_ops);
static DEFINE_MUTEX(nlmsvc_mutex);
-diff -urNp linux-2.6.32.33/fs/locks.c linux-2.6.32.33/fs/locks.c
---- linux-2.6.32.33/fs/locks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/locks.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/locks.c linux-2.6.32.35/fs/locks.c
+--- linux-2.6.32.35/fs/locks.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/locks.c 2010-12-31 14:46:53.000000000 -0500
@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
return;
@@ -34201,9 +34225,9 @@ diff -urNp linux-2.6.32.33/fs/locks.c linux-2.6.32.33/fs/locks.c
}
lock_kernel();
-diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
---- linux-2.6.32.33/fs/namei.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/namei.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/namei.c linux-2.6.32.35/fs/namei.c
+--- linux-2.6.32.35/fs/namei.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/namei.c 2011-03-26 19:37:58.000000000 -0400
@@ -224,14 +224,6 @@ int generic_permission(struct inode *ino
return ret;
@@ -34286,7 +34310,32 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
path_put(&nd->path);
return_err:
return err;
-@@ -1576,6 +1591,20 @@ int may_open(struct path *path, int acc_
+@@ -1091,13 +1106,21 @@ static int do_path_lookup(int dfd, const
+ int retval = path_init(dfd, name, flags, nd);
+ if (!retval)
+ retval = path_walk(name, nd);
+- if (unlikely(!retval && !audit_dummy_context() && nd->path.dentry &&
+- nd->path.dentry->d_inode))
+- audit_inode(name, nd->path.dentry);
++
++ if (likely(!retval)) {
++ if (nd->path.dentry && nd->path.dentry->d_inode) {
++ if (*name != '/' && gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
++ retval = -ENOENT;
++ if (!audit_dummy_context())
++ audit_inode(name, nd->path.dentry);
++ }
++ }
++
+ if (nd->root.mnt) {
+ path_put(&nd->root);
+ nd->root.mnt = NULL;
+ }
++
+ return retval;
+ }
+
+@@ -1576,6 +1599,20 @@ int may_open(struct path *path, int acc_
if (error)
goto err_out;
@@ -34307,7 +34356,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
if (flag & O_TRUNC) {
error = get_write_access(inode);
if (error)
-@@ -1621,12 +1650,19 @@ static int __open_namei_create(struct na
+@@ -1621,12 +1658,19 @@ static int __open_namei_create(struct na
int error;
struct dentry *dir = nd->path.dentry;
@@ -34327,7 +34376,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
out_unlock:
mutex_unlock(&dir->d_inode->i_mutex);
dput(nd->path.dentry);
-@@ -1709,6 +1745,22 @@ struct file *do_filp_open(int dfd, const
+@@ -1709,6 +1753,22 @@ struct file *do_filp_open(int dfd, const
&nd, flag);
if (error)
return ERR_PTR(error);
@@ -34350,7 +34399,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
goto ok;
}
-@@ -1795,6 +1847,14 @@ do_last:
+@@ -1795,6 +1855,14 @@ do_last:
/*
* It already exists.
*/
@@ -34365,7 +34414,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
mutex_unlock(&dir->d_inode->i_mutex);
audit_inode(pathname, path.dentry);
-@@ -1887,6 +1947,13 @@ do_link:
+@@ -1887,6 +1955,13 @@ do_link:
error = security_inode_follow_link(path.dentry, &nd);
if (error)
goto exit_dput;
@@ -34379,7 +34428,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
error = __do_follow_link(&path, &nd);
if (error) {
/* Does someone understand code flow here? Or it is only
-@@ -2061,6 +2128,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2061,6 +2136,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
error = may_mknod(mode);
if (error)
goto out_dput;
@@ -34397,7 +34446,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
error = mnt_want_write(nd.path.mnt);
if (error)
goto out_dput;
-@@ -2081,6 +2159,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2081,6 +2167,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
}
out_drop_write:
mnt_drop_write(nd.path.mnt);
@@ -34407,7 +34456,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
out_dput:
dput(dentry);
out_unlock:
-@@ -2134,6 +2215,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2134,6 +2223,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
if (IS_ERR(dentry))
goto out_unlock;
@@ -34419,7 +34468,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
if (!IS_POSIXACL(nd.path.dentry->d_inode))
mode &= ~current_umask();
error = mnt_want_write(nd.path.mnt);
-@@ -2145,6 +2231,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2145,6 +2239,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode);
out_drop_write:
mnt_drop_write(nd.path.mnt);
@@ -34430,7 +34479,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
out_dput:
dput(dentry);
out_unlock:
-@@ -2226,6 +2316,8 @@ static long do_rmdir(int dfd, const char
+@@ -2226,6 +2324,8 @@ static long do_rmdir(int dfd, const char
char * name;
struct dentry *dentry;
struct nameidata nd;
@@ -34439,7 +34488,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
error = user_path_parent(dfd, pathname, &nd, &name);
if (error)
-@@ -2250,6 +2342,19 @@ static long do_rmdir(int dfd, const char
+@@ -2250,6 +2350,19 @@ static long do_rmdir(int dfd, const char
error = PTR_ERR(dentry);
if (IS_ERR(dentry))
goto exit2;
@@ -34447,7 +34496,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
+ if (dentry->d_inode != NULL) {
+ if (dentry->d_inode->i_nlink <= 1) {
+ saved_ino = dentry->d_inode->i_ino;
-+ saved_dev = dentry->d_inode->i_sb->s_dev;
++ saved_dev = gr_get_dev_from_dentry(dentry);
+ }
+
+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
@@ -34459,7 +34508,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
error = mnt_want_write(nd.path.mnt);
if (error)
goto exit3;
-@@ -2257,6 +2362,8 @@ static long do_rmdir(int dfd, const char
+@@ -2257,6 +2370,8 @@ static long do_rmdir(int dfd, const char
if (error)
goto exit4;
error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
@@ -34468,7 +34517,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
exit4:
mnt_drop_write(nd.path.mnt);
exit3:
-@@ -2318,6 +2425,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2318,6 +2433,8 @@ static long do_unlinkat(int dfd, const c
struct dentry *dentry;
struct nameidata nd;
struct inode *inode = NULL;
@@ -34477,7 +34526,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
error = user_path_parent(dfd, pathname, &nd, &name);
if (error)
-@@ -2337,8 +2446,19 @@ static long do_unlinkat(int dfd, const c
+@@ -2337,8 +2454,19 @@ static long do_unlinkat(int dfd, const c
if (nd.last.name[nd.last.len])
goto slashes;
inode = dentry->d_inode;
@@ -34485,7 +34534,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
+ if (inode) {
+ if (inode->i_nlink <= 1) {
+ saved_ino = inode->i_ino;
-+ saved_dev = inode->i_sb->s_dev;
++ saved_dev = gr_get_dev_from_dentry(dentry);
+ }
+
atomic_inc(&inode->i_count);
@@ -34498,7 +34547,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
error = mnt_want_write(nd.path.mnt);
if (error)
goto exit2;
-@@ -2346,6 +2466,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2346,6 +2474,8 @@ static long do_unlinkat(int dfd, const c
if (error)
goto exit3;
error = vfs_unlink(nd.path.dentry->d_inode, dentry);
@@ -34507,7 +34556,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
exit3:
mnt_drop_write(nd.path.mnt);
exit2:
-@@ -2424,6 +2546,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2424,6 +2554,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
if (IS_ERR(dentry))
goto out_unlock;
@@ -34519,7 +34568,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
error = mnt_want_write(nd.path.mnt);
if (error)
goto out_dput;
-@@ -2431,6 +2558,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2431,6 +2566,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
if (error)
goto out_drop_write;
error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
@@ -34528,7 +34577,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
out_drop_write:
mnt_drop_write(nd.path.mnt);
out_dput:
-@@ -2524,6 +2653,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2524,6 +2661,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
error = PTR_ERR(new_dentry);
if (IS_ERR(new_dentry))
goto out_unlock;
@@ -34549,7 +34598,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
error = mnt_want_write(nd.path.mnt);
if (error)
goto out_dput;
-@@ -2531,6 +2674,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2531,6 +2682,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
if (error)
goto out_drop_write;
error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry);
@@ -34558,7 +34607,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
out_drop_write:
mnt_drop_write(nd.path.mnt);
out_dput:
-@@ -2764,6 +2909,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2764,6 +2917,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
if (new_dentry == trap)
goto exit5;
@@ -34571,7 +34620,7 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
error = mnt_want_write(oldnd.path.mnt);
if (error)
goto exit5;
-@@ -2773,6 +2924,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2773,6 +2932,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
goto exit6;
error = vfs_rename(old_dir->d_inode, old_dentry,
new_dir->d_inode, new_dentry);
@@ -34581,9 +34630,9 @@ diff -urNp linux-2.6.32.33/fs/namei.c linux-2.6.32.33/fs/namei.c
exit6:
mnt_drop_write(oldnd.path.mnt);
exit5:
-diff -urNp linux-2.6.32.33/fs/namespace.c linux-2.6.32.33/fs/namespace.c
---- linux-2.6.32.33/fs/namespace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/namespace.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/namespace.c linux-2.6.32.35/fs/namespace.c
+--- linux-2.6.32.35/fs/namespace.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/namespace.c 2010-12-31 14:46:53.000000000 -0500
@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
if (!(sb->s_flags & MS_RDONLY))
retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -34644,9 +34693,9 @@ diff -urNp linux-2.6.32.33/fs/namespace.c linux-2.6.32.33/fs/namespace.c
read_lock(&current->fs->lock);
root = current->fs->root;
path_get(&current->fs->root);
-diff -urNp linux-2.6.32.33/fs/nfs/inode.c linux-2.6.32.33/fs/nfs/inode.c
---- linux-2.6.32.33/fs/nfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/nfs/inode.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/nfs/inode.c linux-2.6.32.35/fs/nfs/inode.c
+--- linux-2.6.32.35/fs/nfs/inode.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/nfs/inode.c 2010-12-31 14:46:53.000000000 -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);
}
@@ -34667,9 +34716,9 @@ diff -urNp linux-2.6.32.33/fs/nfs/inode.c linux-2.6.32.33/fs/nfs/inode.c
}
void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-2.6.32.33/fs/nfs/nfs4proc.c linux-2.6.32.33/fs/nfs/nfs4proc.c
---- linux-2.6.32.33/fs/nfs/nfs4proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/nfs/nfs4proc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/nfs/nfs4proc.c linux-2.6.32.35/fs/nfs/nfs4proc.c
+--- linux-2.6.32.35/fs/nfs/nfs4proc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/nfs/nfs4proc.c 2010-12-31 14:46:53.000000000 -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)
{
@@ -34940,9 +34989,9 @@ diff -urNp linux-2.6.32.33/fs/nfs/nfs4proc.c linux-2.6.32.33/fs/nfs/nfs4proc.c
int err;
err = nfs4_set_lock_state(state, fl);
-diff -urNp linux-2.6.32.33/fs/nfsd/lockd.c linux-2.6.32.33/fs/nfsd/lockd.c
---- linux-2.6.32.33/fs/nfsd/lockd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/nfsd/lockd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/nfsd/lockd.c linux-2.6.32.35/fs/nfsd/lockd.c
+--- linux-2.6.32.35/fs/nfsd/lockd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/nfsd/lockd.c 2010-12-31 14:46:53.000000000 -0500
@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
fput(filp);
}
@@ -34952,9 +35001,9 @@ diff -urNp linux-2.6.32.33/fs/nfsd/lockd.c linux-2.6.32.33/fs/nfsd/lockd.c
.fopen = nlm_fopen, /* open file for locking */
.fclose = nlm_fclose, /* close file */
};
-diff -urNp linux-2.6.32.33/fs/nfsd/vfs.c linux-2.6.32.33/fs/nfsd/vfs.c
---- linux-2.6.32.33/fs/nfsd/vfs.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/fs/nfsd/vfs.c 2011-03-02 17:25:31.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/nfsd/vfs.c linux-2.6.32.35/fs/nfsd/vfs.c
+--- linux-2.6.32.35/fs/nfsd/vfs.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/fs/nfsd/vfs.c 2011-03-02 17:25:31.000000000 -0500
@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
} else {
oldfs = get_fs();
@@ -34982,9 +35031,9 @@ diff -urNp linux-2.6.32.33/fs/nfsd/vfs.c linux-2.6.32.33/fs/nfsd/vfs.c
set_fs(oldfs);
if (host_err < 0)
-diff -urNp linux-2.6.32.33/fs/nls/nls_base.c linux-2.6.32.33/fs/nls/nls_base.c
---- linux-2.6.32.33/fs/nls/nls_base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/nls/nls_base.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/nls/nls_base.c linux-2.6.32.35/fs/nls/nls_base.c
+--- linux-2.6.32.35/fs/nls/nls_base.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/nls/nls_base.c 2010-12-31 14:46:53.000000000 -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 */},
@@ -34994,9 +35043,9 @@ diff -urNp linux-2.6.32.33/fs/nls/nls_base.c linux-2.6.32.33/fs/nls/nls_base.c
};
#define UNICODE_MAX 0x0010ffff
-diff -urNp linux-2.6.32.33/fs/ntfs/dir.c linux-2.6.32.33/fs/ntfs/dir.c
---- linux-2.6.32.33/fs/ntfs/dir.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ntfs/dir.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ntfs/dir.c linux-2.6.32.35/fs/ntfs/dir.c
+--- linux-2.6.32.35/fs/ntfs/dir.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ntfs/dir.c 2010-12-31 14:46:53.000000000 -0500
@@ -1328,7 +1328,7 @@ find_next_index_buffer:
ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
~(s64)(ndir->itype.index.block_size - 1)));
@@ -35006,9 +35055,9 @@ diff -urNp linux-2.6.32.33/fs/ntfs/dir.c linux-2.6.32.33/fs/ntfs/dir.c
ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
"inode 0x%lx or driver bug.", vdir->i_ino);
goto err_out;
-diff -urNp linux-2.6.32.33/fs/ntfs/file.c linux-2.6.32.33/fs/ntfs/file.c
---- linux-2.6.32.33/fs/ntfs/file.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ntfs/file.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ntfs/file.c linux-2.6.32.35/fs/ntfs/file.c
+--- linux-2.6.32.35/fs/ntfs/file.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ntfs/file.c 2010-12-31 14:46:53.000000000 -0500
@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
#endif /* NTFS_RW */
};
@@ -35018,9 +35067,9 @@ diff -urNp linux-2.6.32.33/fs/ntfs/file.c linux-2.6.32.33/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.33/fs/ocfs2/cluster/masklog.c linux-2.6.32.33/fs/ocfs2/cluster/masklog.c
---- linux-2.6.32.33/fs/ocfs2/cluster/masklog.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ocfs2/cluster/masklog.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ocfs2/cluster/masklog.c linux-2.6.32.35/fs/ocfs2/cluster/masklog.c
+--- linux-2.6.32.35/fs/ocfs2/cluster/masklog.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ocfs2/cluster/masklog.c 2010-12-31 14:46:53.000000000 -0500
@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
return mlog_mask_store(mlog_attr->mask, buf, count);
}
@@ -35030,9 +35079,9 @@ diff -urNp linux-2.6.32.33/fs/ocfs2/cluster/masklog.c linux-2.6.32.33/fs/ocfs2/c
.show = mlog_show,
.store = mlog_store,
};
-diff -urNp linux-2.6.32.33/fs/ocfs2/localalloc.c linux-2.6.32.33/fs/ocfs2/localalloc.c
---- linux-2.6.32.33/fs/ocfs2/localalloc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ocfs2/localalloc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ocfs2/localalloc.c linux-2.6.32.35/fs/ocfs2/localalloc.c
+--- linux-2.6.32.35/fs/ocfs2/localalloc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ocfs2/localalloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
goto bail;
}
@@ -35042,9 +35091,9 @@ diff -urNp linux-2.6.32.33/fs/ocfs2/localalloc.c linux-2.6.32.33/fs/ocfs2/locala
status = 0;
bail:
-diff -urNp linux-2.6.32.33/fs/ocfs2/ocfs2.h linux-2.6.32.33/fs/ocfs2/ocfs2.h
---- linux-2.6.32.33/fs/ocfs2/ocfs2.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ocfs2/ocfs2.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ocfs2/ocfs2.h linux-2.6.32.35/fs/ocfs2/ocfs2.h
+--- linux-2.6.32.35/fs/ocfs2/ocfs2.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ocfs2/ocfs2.h 2010-12-31 14:46:53.000000000 -0500
@@ -217,11 +217,11 @@ enum ocfs2_vol_state
struct ocfs2_alloc_stats
@@ -35062,9 +35111,9 @@ diff -urNp linux-2.6.32.33/fs/ocfs2/ocfs2.h linux-2.6.32.33/fs/ocfs2/ocfs2.h
};
enum ocfs2_local_alloc_state
-diff -urNp linux-2.6.32.33/fs/ocfs2/suballoc.c linux-2.6.32.33/fs/ocfs2/suballoc.c
---- linux-2.6.32.33/fs/ocfs2/suballoc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ocfs2/suballoc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ocfs2/suballoc.c linux-2.6.32.35/fs/ocfs2/suballoc.c
+--- linux-2.6.32.35/fs/ocfs2/suballoc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ocfs2/suballoc.c 2010-12-31 14:46:53.000000000 -0500
@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
mlog_errno(status);
goto bail;
@@ -35110,9 +35159,9 @@ diff -urNp linux-2.6.32.33/fs/ocfs2/suballoc.c linux-2.6.32.33/fs/ocfs2/suballoc
}
}
if (status < 0) {
-diff -urNp linux-2.6.32.33/fs/ocfs2/super.c linux-2.6.32.33/fs/ocfs2/super.c
---- linux-2.6.32.33/fs/ocfs2/super.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ocfs2/super.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ocfs2/super.c linux-2.6.32.35/fs/ocfs2/super.c
+--- linux-2.6.32.35/fs/ocfs2/super.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ocfs2/super.c 2010-12-31 14:46:53.000000000 -0500
@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
"%10s => GlobalAllocs: %d LocalAllocs: %d "
"SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
@@ -35147,9 +35196,9 @@ diff -urNp linux-2.6.32.33/fs/ocfs2/super.c linux-2.6.32.33/fs/ocfs2/super.c
/* Copy the blockcheck stats from the superblock probe */
osb->osb_ecc_stats = *stats;
-diff -urNp linux-2.6.32.33/fs/open.c linux-2.6.32.33/fs/open.c
---- linux-2.6.32.33/fs/open.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/open.c 2011-01-17 02:49:34.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/open.c linux-2.6.32.35/fs/open.c
+--- linux-2.6.32.35/fs/open.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/open.c 2011-01-17 02:49:34.000000000 -0500
@@ -275,6 +275,10 @@ static long do_sys_truncate(const char _
error = locks_verify_truncate(inode, NULL, length);
if (!error)
@@ -35334,9 +35383,9 @@ diff -urNp linux-2.6.32.33/fs/open.c linux-2.6.32.33/fs/open.c
if (IS_ERR(f)) {
put_unused_fd(fd);
fd = PTR_ERR(f);
-diff -urNp linux-2.6.32.33/fs/partitions/ldm.c linux-2.6.32.33/fs/partitions/ldm.c
---- linux-2.6.32.33/fs/partitions/ldm.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/fs/partitions/ldm.c 2011-02-27 15:46:41.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/partitions/ldm.c linux-2.6.32.35/fs/partitions/ldm.c
+--- linux-2.6.32.35/fs/partitions/ldm.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/fs/partitions/ldm.c 2011-02-27 15:46:41.000000000 -0500
@@ -1313,7 +1313,7 @@ static bool ldm_frag_add (const u8 *data
goto found;
}
@@ -35346,9 +35395,9 @@ diff -urNp linux-2.6.32.33/fs/partitions/ldm.c linux-2.6.32.33/fs/partitions/ldm
if (!f) {
ldm_crit ("Out of memory.");
return false;
-diff -urNp linux-2.6.32.33/fs/partitions/mac.c linux-2.6.32.33/fs/partitions/mac.c
---- linux-2.6.32.33/fs/partitions/mac.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/fs/partitions/mac.c 2011-02-22 16:30:44.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/partitions/mac.c linux-2.6.32.35/fs/partitions/mac.c
+--- linux-2.6.32.35/fs/partitions/mac.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/fs/partitions/mac.c 2011-02-22 16:30:44.000000000 -0500
@@ -59,11 +59,11 @@ int mac_partition(struct parsed_partitio
return 0; /* not a MacOS disk */
}
@@ -35362,9 +35411,9 @@ diff -urNp linux-2.6.32.33/fs/partitions/mac.c linux-2.6.32.33/fs/partitions/mac
for (slot = 1; slot <= blocks_in_map; ++slot) {
int pos = slot * secsize;
put_dev_sector(sect);
-diff -urNp linux-2.6.32.33/fs/pipe.c linux-2.6.32.33/fs/pipe.c
---- linux-2.6.32.33/fs/pipe.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.33/fs/pipe.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/pipe.c linux-2.6.32.35/fs/pipe.c
+--- linux-2.6.32.35/fs/pipe.c 2010-11-26 18:22:29.000000000 -0500
++++ linux-2.6.32.35/fs/pipe.c 2010-12-31 14:46:53.000000000 -0500
@@ -363,7 +363,7 @@ pipe_read(struct kiocb *iocb, const stru
error = ops->confirm(pipe, buf);
if (error) {
@@ -35497,9 +35546,9 @@ diff -urNp linux-2.6.32.33/fs/pipe.c linux-2.6.32.33/fs/pipe.c
inode->i_fop = &rdwr_pipefifo_fops;
/*
-diff -urNp linux-2.6.32.33/fs/proc/array.c linux-2.6.32.33/fs/proc/array.c
---- linux-2.6.32.33/fs/proc/array.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/fs/proc/array.c 2011-03-02 17:25:35.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/proc/array.c linux-2.6.32.35/fs/proc/array.c
+--- linux-2.6.32.35/fs/proc/array.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/fs/proc/array.c 2011-03-02 17:25:35.000000000 -0500
@@ -60,6 +60,7 @@
#include <linux/tty.h>
#include <linux/string.h>
@@ -35602,9 +35651,9 @@ diff -urNp linux-2.6.32.33/fs/proc/array.c linux-2.6.32.33/fs/proc/array.c
+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
+}
+#endif
-diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
---- linux-2.6.32.33/fs/proc/base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/proc/base.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/proc/base.c linux-2.6.32.35/fs/proc/base.c
+--- linux-2.6.32.35/fs/proc/base.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/proc/base.c 2011-03-26 20:07:04.000000000 -0400
@@ -102,6 +102,22 @@ struct pid_entry {
union proc_op op;
};
@@ -35704,7 +35753,28 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
static int proc_pid_syscall(struct task_struct *task, char *buffer)
{
long nr;
-@@ -936,6 +974,9 @@ static ssize_t environ_read(struct file
+@@ -547,7 +585,7 @@ static int proc_pid_syscall(struct task_
+ /************************************************************************/
+
+ /* permission checks */
+-static int proc_fd_access_allowed(struct inode *inode)
++static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
+ {
+ struct task_struct *task;
+ int allowed = 0;
+@@ -557,7 +595,10 @@ static int proc_fd_access_allowed(struct
+ */
+ task = get_proc_task(inode);
+ if (task) {
+- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
++ if (log)
++ allowed = ptrace_may_access_log(task, PTRACE_MODE_READ);
++ else
++ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
+ put_task_struct(task);
+ }
+ return allowed;
+@@ -936,6 +977,9 @@ static ssize_t environ_read(struct file
if (!task)
goto out_no_task;
@@ -35714,7 +35784,37 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
if (!ptrace_may_access(task, PTRACE_MODE_READ))
goto out;
-@@ -1456,7 +1497,11 @@ static struct inode *proc_pid_make_inode
+@@ -1350,7 +1394,7 @@ static void *proc_pid_follow_link(struct
+ path_put(&nd->path);
+
+ /* Are we allowed to snoop on the tasks file descriptors? */
+- if (!proc_fd_access_allowed(inode))
++ if (!proc_fd_access_allowed(inode,0))
+ goto out;
+
+ error = PROC_I(inode)->op.proc_get_link(inode, &nd->path);
+@@ -1390,8 +1434,18 @@ static int proc_pid_readlink(struct dent
+ struct path path;
+
+ /* Are we allowed to snoop on the tasks file descriptors? */
+- if (!proc_fd_access_allowed(inode))
+- goto out;
++ /* logging this is needed for learning on chromium to work properly,
++ but we don't want to flood the logs from 'ps' which does a readlink
++ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
++ CAP_SYS_PTRACE as it's not necessary for its basic functionality
++ */
++ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
++ if (!proc_fd_access_allowed(inode,0))
++ goto out;
++ } else {
++ if (!proc_fd_access_allowed(inode,1))
++ goto out;
++ }
+
+ error = PROC_I(inode)->op.proc_get_link(inode, &path);
+ if (error)
+@@ -1456,7 +1510,11 @@ static struct inode *proc_pid_make_inode
rcu_read_lock();
cred = __task_cred(task);
inode->i_uid = cred->euid;
@@ -35726,7 +35826,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
rcu_read_unlock();
}
security_task_to_inode(task, inode);
-@@ -1474,6 +1519,9 @@ static int pid_getattr(struct vfsmount *
+@@ -1474,6 +1532,9 @@ static int pid_getattr(struct vfsmount *
struct inode *inode = dentry->d_inode;
struct task_struct *task;
const struct cred *cred;
@@ -35736,7 +35836,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
generic_fillattr(inode, stat);
-@@ -1481,12 +1529,34 @@ static int pid_getattr(struct vfsmount *
+@@ -1481,12 +1542,34 @@ static int pid_getattr(struct vfsmount *
stat->uid = 0;
stat->gid = 0;
task = pid_task(proc_pid(inode), PIDTYPE_PID);
@@ -35772,7 +35872,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
}
}
rcu_read_unlock();
-@@ -1518,11 +1588,20 @@ static int pid_revalidate(struct dentry
+@@ -1518,11 +1601,20 @@ static int pid_revalidate(struct dentry
if (task) {
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
@@ -35793,7 +35893,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
rcu_read_unlock();
} else {
inode->i_uid = 0;
-@@ -1643,7 +1722,8 @@ static int proc_fd_info(struct inode *in
+@@ -1643,7 +1735,8 @@ static int proc_fd_info(struct inode *in
int fd = proc_fd(inode);
if (task) {
@@ -35803,7 +35903,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
put_task_struct(task);
}
if (files) {
-@@ -1895,12 +1975,22 @@ static const struct file_operations proc
+@@ -1895,12 +1988,22 @@ static const struct file_operations proc
static int proc_fd_permission(struct inode *inode, int mask)
{
int rv;
@@ -35828,7 +35928,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
return rv;
}
-@@ -2009,6 +2099,9 @@ static struct dentry *proc_pident_lookup
+@@ -2009,6 +2112,9 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
@@ -35838,7 +35938,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2053,6 +2146,9 @@ static int proc_pident_readdir(struct fi
+@@ -2053,6 +2159,9 @@ static int proc_pident_readdir(struct fi
if (!task)
goto out_no_task;
@@ -35848,7 +35948,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
ret = 0;
i = filp->f_pos;
switch (i) {
-@@ -2320,7 +2416,7 @@ static void *proc_self_follow_link(struc
+@@ -2320,7 +2429,7 @@ static void *proc_self_follow_link(struc
static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
void *cookie)
{
@@ -35857,7 +35957,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
if (!IS_ERR(s))
__putname(s);
}
-@@ -2519,7 +2615,7 @@ static const struct pid_entry tgid_base_
+@@ -2519,7 +2628,7 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_SCHED_DEBUG
REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
#endif
@@ -35866,7 +35966,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
INF("syscall", S_IRUSR, proc_pid_syscall),
#endif
INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -2544,10 +2640,10 @@ static const struct pid_entry tgid_base_
+@@ -2544,10 +2653,10 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_SECURITY
DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
#endif
@@ -35879,7 +35979,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
ONE("stack", S_IRUSR, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-@@ -2577,6 +2673,9 @@ static const struct pid_entry tgid_base_
+@@ -2577,6 +2686,9 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_TASK_IO_ACCOUNTING
INF("io", S_IRUGO, proc_tgid_io_accounting),
#endif
@@ -35889,7 +35989,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
};
static int proc_tgid_base_readdir(struct file * filp,
-@@ -2701,7 +2800,14 @@ static struct dentry *proc_pid_instantia
+@@ -2701,7 +2813,14 @@ static struct dentry *proc_pid_instantia
if (!inode)
goto out;
@@ -35904,7 +36004,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
inode->i_op = &proc_tgid_base_inode_operations;
inode->i_fop = &proc_tgid_base_operations;
inode->i_flags|=S_IMMUTABLE;
-@@ -2743,7 +2849,11 @@ struct dentry *proc_pid_lookup(struct in
+@@ -2743,7 +2862,11 @@ struct dentry *proc_pid_lookup(struct in
if (!task)
goto out;
@@ -35916,7 +36016,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
put_task_struct(task);
out:
return result;
-@@ -2808,6 +2918,11 @@ int proc_pid_readdir(struct file * filp,
+@@ -2808,6 +2931,11 @@ int proc_pid_readdir(struct file * filp,
{
unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode);
@@ -35928,7 +36028,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
struct tgid_iter iter;
struct pid_namespace *ns;
-@@ -2826,8 +2941,27 @@ int proc_pid_readdir(struct file * filp,
+@@ -2826,8 +2954,27 @@ int proc_pid_readdir(struct file * filp,
for (iter = next_tgid(ns, iter);
iter.task;
iter.tgid += 1, iter = next_tgid(ns, iter)) {
@@ -35957,7 +36057,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
put_task_struct(iter.task);
goto out;
}
-@@ -2853,7 +2987,7 @@ static const struct pid_entry tid_base_s
+@@ -2853,7 +3000,7 @@ static const struct pid_entry tid_base_s
#ifdef CONFIG_SCHED_DEBUG
REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
#endif
@@ -35966,7 +36066,7 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
INF("syscall", S_IRUSR, proc_pid_syscall),
#endif
INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -2877,10 +3011,10 @@ static const struct pid_entry tid_base_s
+@@ -2877,10 +3024,10 @@ static const struct pid_entry tid_base_s
#ifdef CONFIG_SECURITY
DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
#endif
@@ -35979,9 +36079,9 @@ diff -urNp linux-2.6.32.33/fs/proc/base.c linux-2.6.32.33/fs/proc/base.c
ONE("stack", S_IRUSR, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-2.6.32.33/fs/proc/cmdline.c linux-2.6.32.33/fs/proc/cmdline.c
---- linux-2.6.32.33/fs/proc/cmdline.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/proc/cmdline.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/proc/cmdline.c linux-2.6.32.35/fs/proc/cmdline.c
+--- linux-2.6.32.35/fs/proc/cmdline.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/proc/cmdline.c 2010-12-31 14:46:53.000000000 -0500
@@ -23,7 +23,11 @@ static const struct file_operations cmdl
static int __init proc_cmdline_init(void)
@@ -35994,9 +36094,9 @@ diff -urNp linux-2.6.32.33/fs/proc/cmdline.c linux-2.6.32.33/fs/proc/cmdline.c
return 0;
}
module_init(proc_cmdline_init);
-diff -urNp linux-2.6.32.33/fs/proc/devices.c linux-2.6.32.33/fs/proc/devices.c
---- linux-2.6.32.33/fs/proc/devices.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/proc/devices.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/proc/devices.c linux-2.6.32.35/fs/proc/devices.c
+--- linux-2.6.32.35/fs/proc/devices.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/proc/devices.c 2010-12-31 14:46:53.000000000 -0500
@@ -64,7 +64,11 @@ static const struct file_operations proc
static int __init proc_devices_init(void)
@@ -36009,9 +36109,9 @@ diff -urNp linux-2.6.32.33/fs/proc/devices.c linux-2.6.32.33/fs/proc/devices.c
return 0;
}
module_init(proc_devices_init);
-diff -urNp linux-2.6.32.33/fs/proc/inode.c linux-2.6.32.33/fs/proc/inode.c
---- linux-2.6.32.33/fs/proc/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/proc/inode.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/proc/inode.c linux-2.6.32.35/fs/proc/inode.c
+--- linux-2.6.32.35/fs/proc/inode.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/proc/inode.c 2010-12-31 14:46:53.000000000 -0500
@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
if (de->mode) {
inode->i_mode = de->mode;
@@ -36024,9 +36124,9 @@ diff -urNp linux-2.6.32.33/fs/proc/inode.c linux-2.6.32.33/fs/proc/inode.c
}
if (de->size)
inode->i_size = de->size;
-diff -urNp linux-2.6.32.33/fs/proc/internal.h linux-2.6.32.33/fs/proc/internal.h
---- linux-2.6.32.33/fs/proc/internal.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/proc/internal.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/proc/internal.h linux-2.6.32.35/fs/proc/internal.h
+--- linux-2.6.32.35/fs/proc/internal.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/proc/internal.h 2010-12-31 14:46:53.000000000 -0500
@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
struct pid *pid, struct task_struct *task);
extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -36037,9 +36137,9 @@ diff -urNp linux-2.6.32.33/fs/proc/internal.h linux-2.6.32.33/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.33/fs/proc/Kconfig linux-2.6.32.33/fs/proc/Kconfig
---- linux-2.6.32.33/fs/proc/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/proc/Kconfig 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/proc/Kconfig linux-2.6.32.35/fs/proc/Kconfig
+--- linux-2.6.32.35/fs/proc/Kconfig 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/proc/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -30,12 +30,12 @@ config PROC_FS
config PROC_KCORE
@@ -36067,9 +36167,9 @@ diff -urNp linux-2.6.32.33/fs/proc/Kconfig linux-2.6.32.33/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.33/fs/proc/kcore.c linux-2.6.32.33/fs/proc/kcore.c
---- linux-2.6.32.33/fs/proc/kcore.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/proc/kcore.c 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/proc/kcore.c linux-2.6.32.35/fs/proc/kcore.c
+--- linux-2.6.32.35/fs/proc/kcore.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/proc/kcore.c 2010-12-31 14:47:01.000000000 -0500
@@ -477,9 +477,10 @@ read_kcore(struct file *file, char __use
* the addresses in the elf_phdr on our list.
*/
@@ -36128,9 +36228,9 @@ diff -urNp linux-2.6.32.33/fs/proc/kcore.c linux-2.6.32.33/fs/proc/kcore.c
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
if (kcore_need_update)
-diff -urNp linux-2.6.32.33/fs/proc/meminfo.c linux-2.6.32.33/fs/proc/meminfo.c
---- linux-2.6.32.33/fs/proc/meminfo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/proc/meminfo.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/proc/meminfo.c linux-2.6.32.35/fs/proc/meminfo.c
+--- linux-2.6.32.35/fs/proc/meminfo.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/proc/meminfo.c 2010-12-31 14:46:53.000000000 -0500
@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
vmi.used >> 10,
vmi.largest_chunk >> 10
@@ -36140,9 +36240,9 @@ diff -urNp linux-2.6.32.33/fs/proc/meminfo.c linux-2.6.32.33/fs/proc/meminfo.c
#endif
);
-diff -urNp linux-2.6.32.33/fs/proc/nommu.c linux-2.6.32.33/fs/proc/nommu.c
---- linux-2.6.32.33/fs/proc/nommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/proc/nommu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/proc/nommu.c linux-2.6.32.35/fs/proc/nommu.c
+--- linux-2.6.32.35/fs/proc/nommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/proc/nommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
if (len < 1)
len = 1;
@@ -36152,9 +36252,9 @@ diff -urNp linux-2.6.32.33/fs/proc/nommu.c linux-2.6.32.33/fs/proc/nommu.c
}
seq_putc(m, '\n');
-diff -urNp linux-2.6.32.33/fs/proc/proc_net.c linux-2.6.32.33/fs/proc/proc_net.c
---- linux-2.6.32.33/fs/proc/proc_net.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/proc/proc_net.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/proc/proc_net.c linux-2.6.32.35/fs/proc/proc_net.c
+--- linux-2.6.32.35/fs/proc/proc_net.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/proc/proc_net.c 2010-12-31 14:46:53.000000000 -0500
@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
struct task_struct *task;
struct nsproxy *ns;
@@ -36173,9 +36273,9 @@ diff -urNp linux-2.6.32.33/fs/proc/proc_net.c linux-2.6.32.33/fs/proc/proc_net.c
rcu_read_lock();
task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-2.6.32.33/fs/proc/proc_sysctl.c linux-2.6.32.33/fs/proc/proc_sysctl.c
---- linux-2.6.32.33/fs/proc/proc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/proc/proc_sysctl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/proc/proc_sysctl.c linux-2.6.32.35/fs/proc/proc_sysctl.c
+--- linux-2.6.32.35/fs/proc/proc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/proc/proc_sysctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -7,6 +7,8 @@
#include <linux/security.h>
#include "internal.h"
@@ -36215,9 +36315,9 @@ diff -urNp linux-2.6.32.33/fs/proc/proc_sysctl.c linux-2.6.32.33/fs/proc/proc_sy
generic_fillattr(inode, stat);
if (table)
stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-2.6.32.33/fs/proc/root.c linux-2.6.32.33/fs/proc/root.c
---- linux-2.6.32.33/fs/proc/root.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/proc/root.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/proc/root.c linux-2.6.32.35/fs/proc/root.c
+--- linux-2.6.32.35/fs/proc/root.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/proc/root.c 2010-12-31 14:46:53.000000000 -0500
@@ -134,7 +134,15 @@ void __init proc_root_init(void)
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
@@ -36234,9 +36334,9 @@ diff -urNp linux-2.6.32.33/fs/proc/root.c linux-2.6.32.33/fs/proc/root.c
proc_sys_init();
}
-diff -urNp linux-2.6.32.33/fs/proc/task_mmu.c linux-2.6.32.33/fs/proc/task_mmu.c
---- linux-2.6.32.33/fs/proc/task_mmu.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.33/fs/proc/task_mmu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/proc/task_mmu.c linux-2.6.32.35/fs/proc/task_mmu.c
+--- linux-2.6.32.35/fs/proc/task_mmu.c 2010-10-31 16:44:11.000000000 -0400
++++ linux-2.6.32.35/fs/proc/task_mmu.c 2010-12-31 14:46:53.000000000 -0500
@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
"VmStk:\t%8lu kB\n"
"VmExe:\t%8lu kB\n"
@@ -36373,9 +36473,9 @@ diff -urNp linux-2.6.32.33/fs/proc/task_mmu.c linux-2.6.32.33/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.33/fs/proc/task_nommu.c linux-2.6.32.33/fs/proc/task_nommu.c
---- linux-2.6.32.33/fs/proc/task_nommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/proc/task_nommu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/proc/task_nommu.c linux-2.6.32.35/fs/proc/task_nommu.c
+--- linux-2.6.32.35/fs/proc/task_nommu.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/proc/task_nommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
else
bytes += kobjsize(mm);
@@ -36394,9 +36494,9 @@ diff -urNp linux-2.6.32.33/fs/proc/task_nommu.c linux-2.6.32.33/fs/proc/task_nom
}
seq_putc(m, '\n');
-diff -urNp linux-2.6.32.33/fs/readdir.c linux-2.6.32.33/fs/readdir.c
---- linux-2.6.32.33/fs/readdir.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/readdir.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/readdir.c linux-2.6.32.35/fs/readdir.c
+--- linux-2.6.32.35/fs/readdir.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/readdir.c 2010-12-31 14:46:53.000000000 -0500
@@ -16,6 +16,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
@@ -36486,9 +36586,9 @@ diff -urNp linux-2.6.32.33/fs/readdir.c linux-2.6.32.33/fs/readdir.c
buf.count = count;
buf.error = 0;
-diff -urNp linux-2.6.32.33/fs/reiserfs/do_balan.c linux-2.6.32.33/fs/reiserfs/do_balan.c
---- linux-2.6.32.33/fs/reiserfs/do_balan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/reiserfs/do_balan.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/reiserfs/do_balan.c linux-2.6.32.35/fs/reiserfs/do_balan.c
+--- linux-2.6.32.35/fs/reiserfs/do_balan.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/reiserfs/do_balan.c 2010-12-31 14:46:53.000000000 -0500
@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
return;
}
@@ -36498,9 +36598,9 @@ diff -urNp linux-2.6.32.33/fs/reiserfs/do_balan.c linux-2.6.32.33/fs/reiserfs/do
do_balance_starts(tb);
/* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-2.6.32.33/fs/reiserfs/item_ops.c linux-2.6.32.33/fs/reiserfs/item_ops.c
---- linux-2.6.32.33/fs/reiserfs/item_ops.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/reiserfs/item_ops.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/reiserfs/item_ops.c linux-2.6.32.35/fs/reiserfs/item_ops.c
+--- linux-2.6.32.35/fs/reiserfs/item_ops.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/reiserfs/item_ops.c 2010-12-31 14:46:53.000000000 -0500
@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
vi->vi_index, vi->vi_type, vi->vi_ih);
}
@@ -36555,9 +36655,9 @@ diff -urNp linux-2.6.32.33/fs/reiserfs/item_ops.c linux-2.6.32.33/fs/reiserfs/it
&stat_data_ops,
&indirect_ops,
&direct_ops,
-diff -urNp linux-2.6.32.33/fs/reiserfs/procfs.c linux-2.6.32.33/fs/reiserfs/procfs.c
---- linux-2.6.32.33/fs/reiserfs/procfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/reiserfs/procfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/reiserfs/procfs.c linux-2.6.32.35/fs/reiserfs/procfs.c
+--- linux-2.6.32.35/fs/reiserfs/procfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/reiserfs/procfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
"SMALL_TAILS " : "NO_TAILS ",
replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -36567,9 +36667,9 @@ diff -urNp linux-2.6.32.33/fs/reiserfs/procfs.c linux-2.6.32.33/fs/reiserfs/proc
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.33/fs/select.c linux-2.6.32.33/fs/select.c
---- linux-2.6.32.33/fs/select.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/select.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/select.c linux-2.6.32.35/fs/select.c
+--- linux-2.6.32.35/fs/select.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/select.c 2010-12-31 14:46:53.000000000 -0500
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/slab.h>
@@ -36586,9 +36686,9 @@ diff -urNp linux-2.6.32.33/fs/select.c linux-2.6.32.33/fs/select.c
if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
return -EINVAL;
-diff -urNp linux-2.6.32.33/fs/seq_file.c linux-2.6.32.33/fs/seq_file.c
---- linux-2.6.32.33/fs/seq_file.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/seq_file.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/seq_file.c linux-2.6.32.35/fs/seq_file.c
+--- linux-2.6.32.35/fs/seq_file.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/seq_file.c 2010-12-31 14:46:53.000000000 -0500
@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
return 0;
}
@@ -36629,9 +36729,9 @@ diff -urNp linux-2.6.32.33/fs/seq_file.c linux-2.6.32.33/fs/seq_file.c
if (!m->buf)
goto Enomem;
m->count = 0;
-diff -urNp linux-2.6.32.33/fs/smbfs/symlink.c linux-2.6.32.33/fs/smbfs/symlink.c
---- linux-2.6.32.33/fs/smbfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/smbfs/symlink.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/smbfs/symlink.c linux-2.6.32.35/fs/smbfs/symlink.c
+--- linux-2.6.32.35/fs/smbfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/smbfs/symlink.c 2010-12-31 14:46:53.000000000 -0500
@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -36641,9 +36741,9 @@ diff -urNp linux-2.6.32.33/fs/smbfs/symlink.c linux-2.6.32.33/fs/smbfs/symlink.c
if (!IS_ERR(s))
__putname(s);
}
-diff -urNp linux-2.6.32.33/fs/splice.c linux-2.6.32.33/fs/splice.c
---- linux-2.6.32.33/fs/splice.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/fs/splice.c 2011-03-02 17:25:35.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/splice.c linux-2.6.32.35/fs/splice.c
+--- linux-2.6.32.35/fs/splice.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/fs/splice.c 2011-03-02 17:25:35.000000000 -0500
@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
pipe_lock(pipe);
@@ -36782,9 +36882,9 @@ diff -urNp linux-2.6.32.33/fs/splice.c linux-2.6.32.33/fs/splice.c
ret = -EAGAIN;
pipe_unlock(ipipe);
-diff -urNp linux-2.6.32.33/fs/sysfs/file.c linux-2.6.32.33/fs/sysfs/file.c
---- linux-2.6.32.33/fs/sysfs/file.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/fs/sysfs/file.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/sysfs/file.c linux-2.6.32.35/fs/sysfs/file.c
+--- linux-2.6.32.35/fs/sysfs/file.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.35/fs/sysfs/file.c 2010-12-31 14:46:53.000000000 -0500
@@ -53,7 +53,7 @@ struct sysfs_buffer {
size_t count;
loff_t pos;
@@ -36821,9 +36921,9 @@ diff -urNp linux-2.6.32.33/fs/sysfs/file.c linux-2.6.32.33/fs/sysfs/file.c
int error = -EACCES;
char *p;
-diff -urNp linux-2.6.32.33/fs/sysfs/mount.c linux-2.6.32.33/fs/sysfs/mount.c
---- linux-2.6.32.33/fs/sysfs/mount.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/sysfs/mount.c 2011-03-11 18:54:20.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/sysfs/mount.c linux-2.6.32.35/fs/sysfs/mount.c
+--- linux-2.6.32.35/fs/sysfs/mount.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/sysfs/mount.c 2011-03-11 18:54:20.000000000 -0500
@@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
.s_name = "",
.s_count = ATOMIC_INIT(1),
@@ -36836,9 +36936,9 @@ diff -urNp linux-2.6.32.33/fs/sysfs/mount.c linux-2.6.32.33/fs/sysfs/mount.c
.s_ino = 1,
};
-diff -urNp linux-2.6.32.33/fs/sysfs/symlink.c linux-2.6.32.33/fs/sysfs/symlink.c
---- linux-2.6.32.33/fs/sysfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/sysfs/symlink.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/sysfs/symlink.c linux-2.6.32.35/fs/sysfs/symlink.c
+--- linux-2.6.32.35/fs/sysfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/sysfs/symlink.c 2010-12-31 14:46:53.000000000 -0500
@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -36848,9 +36948,9 @@ diff -urNp linux-2.6.32.33/fs/sysfs/symlink.c linux-2.6.32.33/fs/sysfs/symlink.c
if (!IS_ERR(page))
free_page((unsigned long)page);
}
-diff -urNp linux-2.6.32.33/fs/ubifs/debug.c linux-2.6.32.33/fs/ubifs/debug.c
---- linux-2.6.32.33/fs/ubifs/debug.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/ubifs/debug.c 2011-02-27 15:31:34.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/ubifs/debug.c linux-2.6.32.35/fs/ubifs/debug.c
+--- linux-2.6.32.35/fs/ubifs/debug.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/ubifs/debug.c 2011-02-27 15:31:34.000000000 -0500
@@ -2660,19 +2660,19 @@ int dbg_debugfs_init_fs(struct ubifs_inf
}
@@ -36874,9 +36974,9 @@ diff -urNp linux-2.6.32.33/fs/ubifs/debug.c linux-2.6.32.33/fs/ubifs/debug.c
if (IS_ERR(dent))
goto out_remove;
d->dfs_dump_tnc = dent;
-diff -urNp linux-2.6.32.33/fs/udf/balloc.c linux-2.6.32.33/fs/udf/balloc.c
---- linux-2.6.32.33/fs/udf/balloc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/udf/balloc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/udf/balloc.c linux-2.6.32.35/fs/udf/balloc.c
+--- linux-2.6.32.35/fs/udf/balloc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/udf/balloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
mutex_lock(&sbi->s_alloc_mutex);
@@ -36899,9 +36999,9 @@ diff -urNp linux-2.6.32.33/fs/udf/balloc.c linux-2.6.32.33/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.33/fs/udf/misc.c linux-2.6.32.33/fs/udf/misc.c
---- linux-2.6.32.33/fs/udf/misc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/udf/misc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/udf/misc.c linux-2.6.32.35/fs/udf/misc.c
+--- linux-2.6.32.35/fs/udf/misc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/udf/misc.c 2010-12-31 14:46:53.000000000 -0500
@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
iinfo->i_lenEAttr += size;
return (struct genericFormat *)&ea[offset];
@@ -36922,9 +37022,9 @@ diff -urNp linux-2.6.32.33/fs/udf/misc.c linux-2.6.32.33/fs/udf/misc.c
u8 checksum = 0;
int i;
for (i = 0; i < sizeof(struct tag); ++i)
-diff -urNp linux-2.6.32.33/fs/udf/udfdecl.h linux-2.6.32.33/fs/udf/udfdecl.h
---- linux-2.6.32.33/fs/udf/udfdecl.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/udf/udfdecl.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/udf/udfdecl.h linux-2.6.32.35/fs/udf/udfdecl.h
+--- linux-2.6.32.35/fs/udf/udfdecl.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/udf/udfdecl.h 2010-12-31 14:46:53.000000000 -0500
@@ -26,7 +26,7 @@ do { \
printk(f, ##a); \
} while (0)
@@ -36934,9 +37034,9 @@ diff -urNp linux-2.6.32.33/fs/udf/udfdecl.h linux-2.6.32.33/fs/udf/udfdecl.h
#endif
#define udf_info(f, a...) \
-diff -urNp linux-2.6.32.33/fs/utimes.c linux-2.6.32.33/fs/utimes.c
---- linux-2.6.32.33/fs/utimes.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/utimes.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/utimes.c linux-2.6.32.35/fs/utimes.c
+--- linux-2.6.32.35/fs/utimes.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/utimes.c 2010-12-31 14:46:53.000000000 -0500
@@ -1,6 +1,7 @@
#include <linux/compiler.h>
#include <linux/file.h>
@@ -36958,9 +37058,9 @@ diff -urNp linux-2.6.32.33/fs/utimes.c linux-2.6.32.33/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.33/fs/xattr_acl.c linux-2.6.32.33/fs/xattr_acl.c
---- linux-2.6.32.33/fs/xattr_acl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/xattr_acl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/xattr_acl.c linux-2.6.32.35/fs/xattr_acl.c
+--- linux-2.6.32.35/fs/xattr_acl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/xattr_acl.c 2010-12-31 14:46:53.000000000 -0500
@@ -17,8 +17,8 @@
struct posix_acl *
posix_acl_from_xattr(const void *value, size_t size)
@@ -36972,9 +37072,9 @@ diff -urNp linux-2.6.32.33/fs/xattr_acl.c linux-2.6.32.33/fs/xattr_acl.c
int count;
struct posix_acl *acl;
struct posix_acl_entry *acl_e;
-diff -urNp linux-2.6.32.33/fs/xattr.c linux-2.6.32.33/fs/xattr.c
---- linux-2.6.32.33/fs/xattr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/xattr.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/xattr.c linux-2.6.32.35/fs/xattr.c
+--- linux-2.6.32.35/fs/xattr.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/xattr.c 2010-12-31 14:46:53.000000000 -0500
@@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
* Extended attribute SET operations
*/
@@ -37037,9 +37137,9 @@ diff -urNp linux-2.6.32.33/fs/xattr.c linux-2.6.32.33/fs/xattr.c
mnt_drop_write(f->f_path.mnt);
}
fput(f);
-diff -urNp linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl32.c
---- linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-02 17:25:35.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.35/fs/xfs/linux-2.6/xfs_ioctl32.c
+--- linux-2.6.32.35/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-02 17:25:35.000000000 -0500
@@ -75,6 +75,7 @@ xfs_compat_ioc_fsgeometry_v1(
xfs_fsop_geom_t fsgeo;
int error;
@@ -37048,9 +37148,9 @@ diff -urNp linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.33/fs/xfs
error = xfs_fs_geometry(mp, &fsgeo, 3);
if (error)
return -error;
-diff -urNp linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-02 17:25:35.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.35/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.32.35/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-02 17:25:35.000000000 -0500
@@ -134,7 +134,7 @@ xfs_find_handle(
}
@@ -37085,9 +37185,9 @@ diff -urNp linux-2.6.32.33/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.33/fs/xfs/l
error = xfs_fs_geometry(mp, &fsgeo, 4);
if (error)
return -error;
-diff -urNp linux-2.6.32.33/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.33/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.32.33/fs/xfs/linux-2.6/xfs_iops.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/xfs/linux-2.6/xfs_iops.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.35/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.32.35/fs/xfs/linux-2.6/xfs_iops.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/xfs/linux-2.6/xfs_iops.c 2010-12-31 14:46:53.000000000 -0500
@@ -468,7 +468,7 @@ xfs_vn_put_link(
struct nameidata *nd,
void *p)
@@ -37097,9 +37197,9 @@ diff -urNp linux-2.6.32.33/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.33/fs/xfs/li
if (!IS_ERR(s))
kfree(s);
-diff -urNp linux-2.6.32.33/fs/xfs/xfs_bmap.c linux-2.6.32.33/fs/xfs/xfs_bmap.c
---- linux-2.6.32.33/fs/xfs/xfs_bmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/fs/xfs/xfs_bmap.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/fs/xfs/xfs_bmap.c linux-2.6.32.35/fs/xfs/xfs_bmap.c
+--- linux-2.6.32.35/fs/xfs/xfs_bmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/fs/xfs/xfs_bmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
int nmap,
int ret_nmap);
@@ -37109,9 +37209,9 @@ diff -urNp linux-2.6.32.33/fs/xfs/xfs_bmap.c linux-2.6.32.33/fs/xfs/xfs_bmap.c
#endif /* DEBUG */
#if defined(XFS_RW_TRACE)
-diff -urNp linux-2.6.32.33/grsecurity/gracl_alloc.c linux-2.6.32.33/grsecurity/gracl_alloc.c
---- linux-2.6.32.33/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/gracl_alloc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/gracl_alloc.c linux-2.6.32.35/grsecurity/gracl_alloc.c
+--- linux-2.6.32.35/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/gracl_alloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,105 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -37218,10 +37318,10 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl_alloc.c linux-2.6.32.33/grsecurity/g
+ else
+ return 1;
+}
-diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
---- linux-2.6.32.33/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/gracl.c 2011-03-18 17:54:25.000000000 -0400
-@@ -0,0 +1,3990 @@
+diff -urNp linux-2.6.32.35/grsecurity/gracl.c linux-2.6.32.35/grsecurity/gracl.c
+--- linux-2.6.32.35/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/gracl.c 2011-03-26 20:09:50.000000000 -0400
+@@ -0,0 +1,4046 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -37317,6 +37417,26 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+ return (gr_status & GR_READY);
+}
+
++#ifdef CONFIG_BTRFS_FS
++extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
++extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
++#endif
++
++static inline dev_t __get_dev(const struct dentry *dentry)
++{
++#ifdef CONFIG_BTRFS_FS
++ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
++ return get_btrfs_dev_from_inode(dentry->d_inode);
++ else
++#endif
++ return dentry->d_inode->i_sb->s_dev;
++}
++
++dev_t gr_get_dev_from_dentry(struct dentry *dentry)
++{
++ return __get_dev(dentry);
++}
++
+static char gr_task_roletype_to_char(struct task_struct *task)
+{
+ switch (task->role->roletype &
@@ -37471,10 +37591,8 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+ struct task_struct *reaper = &init_task;
+
+ /* we can't use real_root, real_root_mnt, because they belong only to the RBAC system */
-+ read_lock(&reaper->fs->lock);
-+ root = dget(reaper->fs->root.dentry);
-+ rootmnt = mntget(reaper->fs->root.mnt);
-+ read_unlock(&reaper->fs->lock);
++ root = dget(reaper->nsproxy->mnt_ns->root->mnt_root);
++ rootmnt = mntget(reaper->nsproxy->mnt_ns->root);
+
+ spin_lock(&dcache_lock);
+ spin_lock(&vfsmount_lock);
@@ -38007,13 +38125,11 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+ return 1;
+
+ /* grab reference for the real root dentry and vfsmount */
-+ read_lock(&reaper->fs->lock);
-+ real_root_mnt = mntget(reaper->fs->root.mnt);
-+ real_root = dget(reaper->fs->root.dentry);
-+ read_unlock(&reaper->fs->lock);
++ real_root_mnt = mntget(reaper->nsproxy->mnt_ns->root);
++ real_root = dget(reaper->nsproxy->mnt_ns->root->mnt_root);
+
+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
-+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", real_root->d_inode->i_sb->s_dev, real_root->d_inode->i_ino);
++ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root), real_root->d_inode->i_ino);
+#endif
+
+ fakefs_obj = acl_alloc(sizeof(struct acl_object_label));
@@ -39004,7 +39120,7 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+
+ return __full_lookup(orig_dentry, orig_mnt,
+ curr_dentry->d_inode->i_ino,
-+ curr_dentry->d_inode->i_sb->s_dev, subj, path, newglob);
++ __get_dev(curr_dentry), subj, path, newglob);
+}
+
+static struct acl_object_label *
@@ -39109,7 +39225,7 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+ read_lock(&gr_inode_lock);
+ retval =
+ lookup_acl_subj_label(dentry->d_inode->i_ino,
-+ dentry->d_inode->i_sb->s_dev, role);
++ __get_dev(dentry), role);
+ read_unlock(&gr_inode_lock);
+ if (retval != NULL)
+ goto out;
@@ -39121,7 +39237,7 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+
+ read_lock(&gr_inode_lock);
+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
-+ dentry->d_inode->i_sb->s_dev, role);
++ __get_dev(dentry), role);
+ read_unlock(&gr_inode_lock);
+ if (retval != NULL)
+ goto out;
@@ -39131,13 +39247,13 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+
+ read_lock(&gr_inode_lock);
+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
-+ dentry->d_inode->i_sb->s_dev, role);
++ __get_dev(dentry), role);
+ read_unlock(&gr_inode_lock);
+
+ if (unlikely(retval == NULL)) {
+ read_lock(&gr_inode_lock);
+ retval = lookup_acl_subj_label(real_root->d_inode->i_ino,
-+ real_root->d_inode->i_sb->s_dev, role);
++ __get_dev(real_root), role);
+ read_unlock(&gr_inode_lock);
+ }
+out:
@@ -39265,6 +39381,26 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+ currobj = chk_obj_label(dentry, mnt, curracl);
+ retval = currobj->mode & mode;
+
++ /* if we're opening a specified transfer file for writing
++ (e.g. /dev/initctl), then transfer our role to init
++ */
++ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
++ current->role->roletype & GR_ROLE_PERSIST)) {
++ struct task_struct *task = init_pid_ns.child_reaper;
++
++ if (task->role != current->role) {
++ task->acl_sp_role = 0;
++ task->acl_role_id = current->acl_role_id;
++ task->role = current->role;
++ rcu_read_lock();
++ read_lock(&grsec_exec_file_lock);
++ gr_apply_subject_to_task(task);
++ read_unlock(&grsec_exec_file_lock);
++ rcu_read_unlock();
++ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
++ }
++ }
++
+ if (unlikely
+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
@@ -39857,28 +39993,26 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+ struct acl_subject_label *subj;
+ struct acl_role_label *role;
+ unsigned int x;
++ ino_t inode = dentry->d_inode->i_ino;
++ dev_t dev = __get_dev(dentry);
+
+ FOR_EACH_ROLE_START(role)
+ update_acl_subj_label(matchn->inode, matchn->device,
-+ dentry->d_inode->i_ino,
-+ dentry->d_inode->i_sb->s_dev, role);
++ inode, dev, role);
+
+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
-+ if ((subj->inode == dentry->d_inode->i_ino) &&
-+ (subj->device == dentry->d_inode->i_sb->s_dev)) {
-+ subj->inode = dentry->d_inode->i_ino;
-+ subj->device = dentry->d_inode->i_sb->s_dev;
++ if ((subj->inode == inode) && (subj->device == dev)) {
++ subj->inode = inode;
++ subj->device = dev;
+ }
+ FOR_EACH_NESTED_SUBJECT_END(subj)
+ FOR_EACH_SUBJECT_START(role, subj, x)
+ update_acl_obj_label(matchn->inode, matchn->device,
-+ dentry->d_inode->i_ino,
-+ dentry->d_inode->i_sb->s_dev, subj);
++ inode, dev, subj);
+ FOR_EACH_SUBJECT_END(subj,x)
+ FOR_EACH_ROLE_END(role)
+
-+ update_inodev_entry(matchn->inode, matchn->device,
-+ dentry->d_inode->i_ino, dentry->d_inode->i_sb->s_dev);
++ update_inodev_entry(matchn->inode, matchn->device, inode, dev);
+
+ return;
+}
@@ -39912,6 +40046,8 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+{
+ struct name_entry *matchn;
+ struct inodev_entry *inodev;
++ ino_t oldinode = old_dentry->d_inode->i_ino;
++ dev_t olddev = __get_dev(old_dentry);
+
+ /* vfs_rename swaps the name and parent link for old_dentry and
+ new_dentry
@@ -39933,18 +40069,16 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+
+ write_lock(&gr_inode_lock);
+ if (unlikely(replace && new_dentry->d_inode)) {
-+ inodev = lookup_inodev_entry(new_dentry->d_inode->i_ino,
-+ new_dentry->d_inode->i_sb->s_dev);
++ ino_t newinode = new_dentry->d_inode->i_ino;
++ dev_t newdev = __get_dev(new_dentry);
++ inodev = lookup_inodev_entry(newinode, newdev);
+ if (inodev != NULL && (new_dentry->d_inode->i_nlink <= 1))
-+ do_handle_delete(inodev, new_dentry->d_inode->i_ino,
-+ new_dentry->d_inode->i_sb->s_dev);
++ do_handle_delete(inodev, newinode, newdev);
+ }
+
-+ inodev = lookup_inodev_entry(old_dentry->d_inode->i_ino,
-+ old_dentry->d_inode->i_sb->s_dev);
++ inodev = lookup_inodev_entry(oldinode, olddev);
+ if (inodev != NULL && (old_dentry->d_inode->i_nlink <= 1))
-+ do_handle_delete(inodev, old_dentry->d_inode->i_ino,
-+ old_dentry->d_inode->i_sb->s_dev);
++ do_handle_delete(inodev, oldinode, olddev);
+
+ if (unlikely((unsigned long)matchn))
+ do_handle_create(matchn, old_dentry, mnt);
@@ -40391,18 +40525,85 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+ return error;
+}
+
++/* must be called with
++ rcu_read_lock();
++ read_lock(&tasklist_lock);
++ read_lock(&grsec_exec_file_lock);
++*/
++int gr_apply_subject_to_task(struct task_struct *task)
++{
++ struct acl_object_label *obj;
++ char *tmpname;
++ struct acl_subject_label *tmpsubj;
++ struct file *filp;
++ struct name_entry *nmatch;
++
++ filp = task->exec_file;
++ if (filp == NULL)
++ return 0;
++
++ /* the following is to apply the correct subject
++ on binaries running when the RBAC system
++ is enabled, when the binaries have been
++ replaced or deleted since their execution
++ -----
++ when the RBAC system starts, the inode/dev
++ from exec_file will be one the RBAC system
++ is unaware of. It only knows the inode/dev
++ of the present file on disk, or the absence
++ of it.
++ */
++ preempt_disable();
++ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
++
++ nmatch = lookup_name_entry(tmpname);
++ preempt_enable();
++ tmpsubj = NULL;
++ if (nmatch) {
++ if (nmatch->deleted)
++ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
++ else
++ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
++ if (tmpsubj != NULL)
++ task->acl = tmpsubj;
++ }
++ if (tmpsubj == NULL)
++ task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
++ task->role);
++ if (task->acl) {
++ struct acl_subject_label *curr;
++ curr = task->acl;
++
++ task->is_writable = 0;
++ /* ignore additional mmap checks for processes that are writable
++ by the default ACL */
++ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
++ if (unlikely(obj->mode & GR_WRITE))
++ task->is_writable = 1;
++ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
++ if (unlikely(obj->mode & GR_WRITE))
++ task->is_writable = 1;
++
++ gr_set_proc_res(task);
++
++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
++ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
++#endif
++ } else {
++ return 1;
++ }
++
++ return 0;
++}
++
+int
+gr_set_acls(const int type)
+{
-+ struct acl_object_label *obj;
+ struct task_struct *task, *task2;
-+ struct file *filp;
+ struct acl_role_label *role = current->role;
+ __u16 acl_role_id = current->acl_role_id;
+ const struct cred *cred;
-+ char *tmpname;
-+ struct name_entry *nmatch;
-+ struct acl_subject_label *tmpsubj;
++ int ret;
+
+ rcu_read_lock();
+ read_lock(&tasklist_lock);
@@ -40419,63 +40620,17 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+ task->acl_role_id = 0;
+ task->acl_sp_role = 0;
+
-+ if ((filp = task->exec_file)) {
++ if (task->exec_file) {
+ cred = __task_cred(task);
+ task->role = lookup_acl_role_label(task, cred->uid, cred->gid);
+
-+ /* the following is to apply the correct subject
-+ on binaries running when the RBAC system
-+ is enabled, when the binaries have been
-+ replaced or deleted since their execution
-+ -----
-+ when the RBAC system starts, the inode/dev
-+ from exec_file will be one the RBAC system
-+ is unaware of. It only knows the inode/dev
-+ of the present file on disk, or the absence
-+ of it.
-+ */
-+ preempt_disable();
-+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
-+
-+ nmatch = lookup_name_entry(tmpname);
-+ preempt_enable();
-+ tmpsubj = NULL;
-+ if (nmatch) {
-+ if (nmatch->deleted)
-+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
-+ else
-+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
-+ if (tmpsubj != NULL)
-+ task->acl = tmpsubj;
-+ }
-+ if (tmpsubj == NULL)
-+ task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
-+ task->role);
-+ if (task->acl) {
-+ struct acl_subject_label *curr;
-+ curr = task->acl;
-+
-+ task->is_writable = 0;
-+ /* ignore additional mmap checks for processes that are writable
-+ by the default ACL */
-+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
-+ if (unlikely(obj->mode & GR_WRITE))
-+ task->is_writable = 1;
-+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
-+ if (unlikely(obj->mode & GR_WRITE))
-+ task->is_writable = 1;
-+
-+ gr_set_proc_res(task);
-+
-+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
-+ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
-+#endif
-+ } else {
++ ret = gr_apply_subject_to_task(task);
++ if (ret) {
+ read_unlock(&grsec_exec_file_lock);
+ read_unlock(&tasklist_lock);
+ rcu_read_unlock();
+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task->pid);
-+ return 1;
++ return ret;
+ }
+ } else {
+ // it's a kernel process
@@ -41142,6 +41297,7 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+ unsigned int bufsize;
+ int is_not_root;
+ char *path;
++ dev_t dev = __get_dev(dentry);
+
+ if (unlikely(!(gr_status & GR_READY)))
+ return 1;
@@ -41155,7 +41311,7 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+
+ subj = task->acl;
+ do {
-+ obj = lookup_acl_obj_label(ino, dentry->d_inode->i_sb->s_dev, subj);
++ obj = lookup_acl_obj_label(ino, dev, subj);
+ if (obj != NULL)
+ return (obj->mode & GR_FIND) ? 1 : 0;
+ } while ((subj = subj->parent_subject));
@@ -41212,9 +41368,9 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl.c linux-2.6.32.33/grsecurity/gracl.c
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
+
-diff -urNp linux-2.6.32.33/grsecurity/gracl_cap.c linux-2.6.32.33/grsecurity/gracl_cap.c
---- linux-2.6.32.33/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/gracl_cap.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/gracl_cap.c linux-2.6.32.35/grsecurity/gracl_cap.c
+--- linux-2.6.32.35/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/gracl_cap.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,138 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -41354,10 +41510,10 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl_cap.c linux-2.6.32.33/grsecurity/gra
+ return 0;
+}
+
-diff -urNp linux-2.6.32.33/grsecurity/gracl_fs.c linux-2.6.32.33/grsecurity/gracl_fs.c
---- linux-2.6.32.33/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/gracl_fs.c 2010-12-31 14:46:53.000000000 -0500
-@@ -0,0 +1,430 @@
+diff -urNp linux-2.6.32.35/grsecurity/gracl_fs.c linux-2.6.32.35/grsecurity/gracl_fs.c
+--- linux-2.6.32.35/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/gracl_fs.c 2011-03-26 19:57:24.000000000 -0400
+@@ -0,0 +1,431 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/types.h>
@@ -41761,7 +41917,8 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl_fs.c linux-2.6.32.33/grsecurity/grac
+ char *rolename;
+ struct file *exec_file;
+
-+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled())) {
++ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
++ !(current->role->roletype & GR_ROLE_PERSIST))) {
+ id = current->acl_role_id;
+ rolename = current->role->rolename;
+ gr_set_acls(1);
@@ -41788,9 +41945,9 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl_fs.c linux-2.6.32.33/grsecurity/grac
+
+ return 0;
+}
-diff -urNp linux-2.6.32.33/grsecurity/gracl_ip.c linux-2.6.32.33/grsecurity/gracl_ip.c
---- linux-2.6.32.33/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/gracl_ip.c 2011-02-15 19:42:10.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/gracl_ip.c linux-2.6.32.35/grsecurity/gracl_ip.c
+--- linux-2.6.32.35/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/gracl_ip.c 2011-02-15 19:42:10.000000000 -0500
@@ -0,0 +1,382 @@
+#include <linux/kernel.h>
+#include <asm/uaccess.h>
@@ -42174,9 +42331,9 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl_ip.c linux-2.6.32.33/grsecurity/grac
+
+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
+}
-diff -urNp linux-2.6.32.33/grsecurity/gracl_learn.c linux-2.6.32.33/grsecurity/gracl_learn.c
---- linux-2.6.32.33/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/gracl_learn.c 2011-01-16 22:44:26.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/gracl_learn.c linux-2.6.32.35/grsecurity/gracl_learn.c
+--- linux-2.6.32.35/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/gracl_learn.c 2011-01-16 22:44:26.000000000 -0500
@@ -0,0 +1,211 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -42389,9 +42546,9 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl_learn.c linux-2.6.32.33/grsecurity/g
+ .release = close_learn,
+ .poll = poll_learn,
+};
-diff -urNp linux-2.6.32.33/grsecurity/gracl_res.c linux-2.6.32.33/grsecurity/gracl_res.c
---- linux-2.6.32.33/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/gracl_res.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/gracl_res.c linux-2.6.32.35/grsecurity/gracl_res.c
+--- linux-2.6.32.35/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/gracl_res.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,67 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42460,9 +42617,9 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl_res.c linux-2.6.32.33/grsecurity/gra
+ rcu_read_unlock();
+ return;
+}
-diff -urNp linux-2.6.32.33/grsecurity/gracl_segv.c linux-2.6.32.33/grsecurity/gracl_segv.c
---- linux-2.6.32.33/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/gracl_segv.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/gracl_segv.c linux-2.6.32.35/grsecurity/gracl_segv.c
+--- linux-2.6.32.35/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/gracl_segv.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,310 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -42774,9 +42931,9 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl_segv.c linux-2.6.32.33/grsecurity/gr
+
+ return;
+}
-diff -urNp linux-2.6.32.33/grsecurity/gracl_shm.c linux-2.6.32.33/grsecurity/gracl_shm.c
---- linux-2.6.32.33/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/gracl_shm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/gracl_shm.c linux-2.6.32.35/grsecurity/gracl_shm.c
+--- linux-2.6.32.35/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/gracl_shm.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,40 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -42818,9 +42975,9 @@ diff -urNp linux-2.6.32.33/grsecurity/gracl_shm.c linux-2.6.32.33/grsecurity/gra
+
+ return 1;
+}
-diff -urNp linux-2.6.32.33/grsecurity/grsec_chdir.c linux-2.6.32.33/grsecurity/grsec_chdir.c
---- linux-2.6.32.33/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_chdir.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_chdir.c linux-2.6.32.35/grsecurity/grsec_chdir.c
+--- linux-2.6.32.35/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_chdir.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,19 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42841,9 +42998,9 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_chdir.c linux-2.6.32.33/grsecurity/g
+#endif
+ return;
+}
-diff -urNp linux-2.6.32.33/grsecurity/grsec_chroot.c linux-2.6.32.33/grsecurity/grsec_chroot.c
---- linux-2.6.32.33/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_chroot.c 2011-01-11 22:46:12.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_chroot.c linux-2.6.32.35/grsecurity/grsec_chroot.c
+--- linux-2.6.32.35/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_chroot.c 2011-01-11 22:46:12.000000000 -0500
@@ -0,0 +1,390 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -43235,10 +43392,10 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_chroot.c linux-2.6.32.33/grsecurity/
+#ifdef CONFIG_SECURITY
+EXPORT_SYMBOL(gr_handle_chroot_caps);
+#endif
-diff -urNp linux-2.6.32.33/grsecurity/grsec_disabled.c linux-2.6.32.33/grsecurity/grsec_disabled.c
---- linux-2.6.32.33/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_disabled.c 2010-12-31 14:46:53.000000000 -0500
-@@ -0,0 +1,442 @@
+diff -urNp linux-2.6.32.35/grsecurity/grsec_disabled.c linux-2.6.32.35/grsecurity/grsec_disabled.c
+--- linux-2.6.32.35/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_disabled.c 2011-03-26 20:16:41.000000000 -0400
+@@ -0,0 +1,447 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -43673,6 +43830,11 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_disabled.c linux-2.6.32.33/grsecurit
+ return 0;
+}
+
++dev_t gr_get_dev_from_dentry(struct dentry *dentry)
++{
++ return dentry->d_inode->i_sb->s_dev;
++}
++
+EXPORT_SYMBOL(gr_is_capable);
+EXPORT_SYMBOL(gr_is_capable_nolog);
+EXPORT_SYMBOL(gr_learn_resource);
@@ -43681,9 +43843,9 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_disabled.c linux-2.6.32.33/grsecurit
+EXPORT_SYMBOL(gr_check_user_change);
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
-diff -urNp linux-2.6.32.33/grsecurity/grsec_exec.c linux-2.6.32.33/grsecurity/grsec_exec.c
---- linux-2.6.32.33/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_exec.c 2011-01-16 22:46:10.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_exec.c linux-2.6.32.35/grsecurity/grsec_exec.c
+--- linux-2.6.32.35/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_exec.c 2011-01-16 22:46:10.000000000 -0500
@@ -0,0 +1,148 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43833,9 +43995,9 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_exec.c linux-2.6.32.33/grsecurity/gr
+ return;
+}
+#endif
-diff -urNp linux-2.6.32.33/grsecurity/grsec_fifo.c linux-2.6.32.33/grsecurity/grsec_fifo.c
---- linux-2.6.32.33/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_fifo.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_fifo.c linux-2.6.32.35/grsecurity/grsec_fifo.c
+--- linux-2.6.32.35/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_fifo.c 2011-03-26 18:36:31.000000000 -0400
@@ -0,0 +1,24 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43854,16 +44016,16 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_fifo.c linux-2.6.32.33/grsecurity/gr
+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
+ (dentry->d_inode->i_uid != dir->d_inode->i_uid) &&
+ (cred->fsuid != dentry->d_inode->i_uid)) {
-+ if (!generic_permission(dentry->d_inode, acc_mode, NULL))
++ if (!inode_permission(dentry->d_inode, acc_mode))
+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, dentry->d_inode->i_uid, dentry->d_inode->i_gid);
+ return -EACCES;
+ }
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.32.33/grsecurity/grsec_fork.c linux-2.6.32.33/grsecurity/grsec_fork.c
---- linux-2.6.32.33/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_fork.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_fork.c linux-2.6.32.35/grsecurity/grsec_fork.c
+--- linux-2.6.32.35/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_fork.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,23 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43888,9 +44050,9 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_fork.c linux-2.6.32.33/grsecurity/gr
+#endif
+ return;
+}
-diff -urNp linux-2.6.32.33/grsecurity/grsec_init.c linux-2.6.32.33/grsecurity/grsec_init.c
---- linux-2.6.32.33/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_init.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_init.c linux-2.6.32.35/grsecurity/grsec_init.c
+--- linux-2.6.32.35/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_init.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,270 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -44162,9 +44324,9 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_init.c linux-2.6.32.33/grsecurity/gr
+
+ return;
+}
-diff -urNp linux-2.6.32.33/grsecurity/grsec_link.c linux-2.6.32.33/grsecurity/grsec_link.c
---- linux-2.6.32.33/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_link.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_link.c linux-2.6.32.35/grsecurity/grsec_link.c
+--- linux-2.6.32.35/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_link.c 2011-03-26 18:36:51.000000000 -0400
@@ -0,0 +1,43 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -44201,7 +44363,7 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_link.c linux-2.6.32.33/grsecurity/gr
+ if (grsec_enable_link && cred->fsuid != inode->i_uid &&
+ (!S_ISREG(mode) || (mode & S_ISUID) ||
+ ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) ||
-+ (generic_permission(inode, MAY_READ | MAY_WRITE, NULL))) &&
++ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
+ !capable(CAP_FOWNER) && cred->uid) {
+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to);
+ return -EPERM;
@@ -44209,9 +44371,9 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_link.c linux-2.6.32.33/grsecurity/gr
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.32.33/grsecurity/grsec_log.c linux-2.6.32.33/grsecurity/grsec_log.c
---- linux-2.6.32.33/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_log.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_log.c linux-2.6.32.35/grsecurity/grsec_log.c
+--- linux-2.6.32.35/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_log.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,310 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -44523,10 +44685,10 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_log.c linux-2.6.32.33/grsecurity/grs
+ gr_log_end(audit);
+ END_LOCKS(audit);
+}
-diff -urNp linux-2.6.32.33/grsecurity/grsec_mem.c linux-2.6.32.33/grsecurity/grsec_mem.c
---- linux-2.6.32.33/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_mem.c 2010-12-31 14:46:53.000000000 -0500
-@@ -0,0 +1,85 @@
+diff -urNp linux-2.6.32.35/grsecurity/grsec_mem.c linux-2.6.32.35/grsecurity/grsec_mem.c
+--- linux-2.6.32.35/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_mem.c 2011-03-26 19:58:04.000000000 -0400
+@@ -0,0 +1,100 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
@@ -44581,6 +44743,8 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_mem.c linux-2.6.32.33/grsecurity/grs
+ return -EPERM;
+ }
+
++/* if raw i/o is disabled, prevent writes to /dev/mem entirely */
++#ifndef CONFIG_GRKERNSEC_IO
+ /* allowed ranges : ISA I/O BIOS */
+ if ((start >= __pa(high_memory))
+#if defined(CONFIG_X86) || defined(CONFIG_PPC)
@@ -44589,6 +44753,7 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_mem.c linux-2.6.32.33/grsecurity/grs
+#endif
+ )
+ return 0;
++#endif
+
+ if (vma->vm_flags & VM_WRITE) {
+ gr_log_noargs(GR_DONT_AUDIT, GR_MEM_MMAP_MSG);
@@ -44602,7 +44767,19 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_mem.c linux-2.6.32.33/grsecurity/grs
+void
+gr_log_nonroot_mod_load(const char *modname)
+{
-+ gr_log_str(GR_DONT_AUDIT, GR_NONROOT_MODLOAD_MSG, modname);
++ if (1
++#if !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE)
++ /* There are known knowns. These are things we know
++ that we know. There are known unknowns. That is to say,
++ there are things that we know we don't know. But there are
++ also unknown unknowns. There are things we don't know
++ we don't know.
++ This here is a known unknown.
++ */
++ && strcmp(modname, "net-pf-10")
++#endif
++ )
++ gr_log_str(GR_DONT_AUDIT, GR_NONROOT_MODLOAD_MSG, modname);
+ return;
+}
+
@@ -44612,9 +44789,9 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_mem.c linux-2.6.32.33/grsecurity/grs
+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
+ return;
+}
-diff -urNp linux-2.6.32.33/grsecurity/grsec_mount.c linux-2.6.32.33/grsecurity/grsec_mount.c
---- linux-2.6.32.33/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_mount.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_mount.c linux-2.6.32.35/grsecurity/grsec_mount.c
+--- linux-2.6.32.35/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_mount.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,62 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -44678,9 +44855,9 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_mount.c linux-2.6.32.33/grsecurity/g
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.32.33/grsecurity/grsec_pax.c linux-2.6.32.33/grsecurity/grsec_pax.c
---- linux-2.6.32.33/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_pax.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_pax.c linux-2.6.32.35/grsecurity/grsec_pax.c
+--- linux-2.6.32.35/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_pax.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,36 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -44718,9 +44895,9 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_pax.c linux-2.6.32.33/grsecurity/grs
+#endif
+ return;
+}
-diff -urNp linux-2.6.32.33/grsecurity/grsec_ptrace.c linux-2.6.32.33/grsecurity/grsec_ptrace.c
---- linux-2.6.32.33/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_ptrace.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_ptrace.c linux-2.6.32.35/grsecurity/grsec_ptrace.c
+--- linux-2.6.32.35/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_ptrace.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,14 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -44736,9 +44913,9 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_ptrace.c linux-2.6.32.33/grsecurity/
+#endif
+ return;
+}
-diff -urNp linux-2.6.32.33/grsecurity/grsec_sig.c linux-2.6.32.33/grsecurity/grsec_sig.c
---- linux-2.6.32.33/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_sig.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_sig.c linux-2.6.32.35/grsecurity/grsec_sig.c
+--- linux-2.6.32.35/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_sig.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,65 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -44805,9 +44982,9 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_sig.c linux-2.6.32.33/grsecurity/grs
+ return;
+}
+
-diff -urNp linux-2.6.32.33/grsecurity/grsec_sock.c linux-2.6.32.33/grsecurity/grsec_sock.c
---- linux-2.6.32.33/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_sock.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_sock.c linux-2.6.32.35/grsecurity/grsec_sock.c
+--- linux-2.6.32.35/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_sock.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,275 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -45084,9 +45261,9 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_sock.c linux-2.6.32.33/grsecurity/gr
+ return current_cap();
+#endif
+}
-diff -urNp linux-2.6.32.33/grsecurity/grsec_sysctl.c linux-2.6.32.33/grsecurity/grsec_sysctl.c
---- linux-2.6.32.33/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_sysctl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_sysctl.c linux-2.6.32.35/grsecurity/grsec_sysctl.c
+--- linux-2.6.32.35/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_sysctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,479 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -45567,9 +45744,9 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_sysctl.c linux-2.6.32.33/grsecurity/
+ { .ctl_name = 0 }
+};
+#endif
-diff -urNp linux-2.6.32.33/grsecurity/grsec_time.c linux-2.6.32.33/grsecurity/grsec_time.c
---- linux-2.6.32.33/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_time.c 2011-01-05 19:57:32.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_time.c linux-2.6.32.35/grsecurity/grsec_time.c
+--- linux-2.6.32.35/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_time.c 2011-01-05 19:57:32.000000000 -0500
@@ -0,0 +1,16 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -45587,9 +45764,9 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_time.c linux-2.6.32.33/grsecurity/gr
+}
+
+EXPORT_SYMBOL(gr_log_timechange);
-diff -urNp linux-2.6.32.33/grsecurity/grsec_tpe.c linux-2.6.32.33/grsecurity/grsec_tpe.c
---- linux-2.6.32.33/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsec_tpe.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsec_tpe.c linux-2.6.32.35/grsecurity/grsec_tpe.c
+--- linux-2.6.32.35/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsec_tpe.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,39 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -45630,9 +45807,9 @@ diff -urNp linux-2.6.32.33/grsecurity/grsec_tpe.c linux-2.6.32.33/grsecurity/grs
+#endif
+ return 1;
+}
-diff -urNp linux-2.6.32.33/grsecurity/grsum.c linux-2.6.32.33/grsecurity/grsum.c
---- linux-2.6.32.33/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/grsum.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/grsum.c linux-2.6.32.35/grsecurity/grsum.c
+--- linux-2.6.32.35/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/grsum.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,61 @@
+#include <linux/err.h>
+#include <linux/kernel.h>
@@ -45695,10 +45872,10 @@ diff -urNp linux-2.6.32.33/grsecurity/grsum.c linux-2.6.32.33/grsecurity/grsum.c
+
+ return retval;
+}
-diff -urNp linux-2.6.32.33/grsecurity/Kconfig linux-2.6.32.33/grsecurity/Kconfig
---- linux-2.6.32.33/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/Kconfig 2011-03-21 17:09:41.000000000 -0400
-@@ -0,0 +1,1021 @@
+diff -urNp linux-2.6.32.35/grsecurity/Kconfig linux-2.6.32.35/grsecurity/Kconfig
+--- linux-2.6.32.35/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/Kconfig 2011-03-26 19:54:29.000000000 -0400
+@@ -0,0 +1,1020 @@
+#
+# grecurity configuration
+#
@@ -46037,7 +46214,6 @@ diff -urNp linux-2.6.32.33/grsecurity/Kconfig linux-2.6.32.33/grsecurity/Kconfig
+
+config GRKERNSEC_RBAC_DEBUG
+ bool
-+ default n
+
+config GRKERNSEC_NO_RBAC
+ bool "Disable RBAC system"
@@ -46720,9 +46896,9 @@ diff -urNp linux-2.6.32.33/grsecurity/Kconfig linux-2.6.32.33/grsecurity/Kconfig
+endmenu
+
+endmenu
-diff -urNp linux-2.6.32.33/grsecurity/Makefile linux-2.6.32.33/grsecurity/Makefile
---- linux-2.6.32.33/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/grsecurity/Makefile 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/grsecurity/Makefile linux-2.6.32.35/grsecurity/Makefile
+--- linux-2.6.32.35/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/grsecurity/Makefile 2010-12-31 14:46:53.000000000 -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
@@ -46753,9 +46929,9 @@ diff -urNp linux-2.6.32.33/grsecurity/Makefile linux-2.6.32.33/grsecurity/Makefi
+ @-chmod -f 700 .
+ @echo ' grsec: protected kernel image paths'
+endif
-diff -urNp linux-2.6.32.33/include/acpi/acoutput.h linux-2.6.32.33/include/acpi/acoutput.h
---- linux-2.6.32.33/include/acpi/acoutput.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/acpi/acoutput.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/acpi/acoutput.h linux-2.6.32.35/include/acpi/acoutput.h
+--- linux-2.6.32.35/include/acpi/acoutput.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/acpi/acoutput.h 2010-12-31 14:46:53.000000000 -0500
@@ -264,8 +264,8 @@
* leaving no executable debug code!
*/
@@ -46767,9 +46943,9 @@ diff -urNp linux-2.6.32.33/include/acpi/acoutput.h linux-2.6.32.33/include/acpi/
#endif /* ACPI_DEBUG_OUTPUT */
-diff -urNp linux-2.6.32.33/include/acpi/acpi_drivers.h linux-2.6.32.33/include/acpi/acpi_drivers.h
---- linux-2.6.32.33/include/acpi/acpi_drivers.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/acpi/acpi_drivers.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/acpi/acpi_drivers.h linux-2.6.32.35/include/acpi/acpi_drivers.h
+--- linux-2.6.32.35/include/acpi/acpi_drivers.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/acpi/acpi_drivers.h 2010-12-31 14:46:53.000000000 -0500
@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
Dock Station
-------------------------------------------------------------------------- */
@@ -46799,9 +46975,9 @@ diff -urNp linux-2.6.32.33/include/acpi/acpi_drivers.h linux-2.6.32.33/include/a
void *context)
{
return -ENODEV;
-diff -urNp linux-2.6.32.33/include/asm-generic/atomic-long.h linux-2.6.32.33/include/asm-generic/atomic-long.h
---- linux-2.6.32.33/include/asm-generic/atomic-long.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/asm-generic/atomic-long.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/asm-generic/atomic-long.h linux-2.6.32.35/include/asm-generic/atomic-long.h
+--- linux-2.6.32.35/include/asm-generic/atomic-long.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/asm-generic/atomic-long.h 2010-12-31 14:46:53.000000000 -0500
@@ -22,6 +22,12 @@
typedef atomic64_t atomic_long_t;
@@ -47058,9 +47234,9 @@ diff -urNp linux-2.6.32.33/include/asm-generic/atomic-long.h linux-2.6.32.33/inc
+#endif
+
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
-diff -urNp linux-2.6.32.33/include/asm-generic/dma-mapping-common.h linux-2.6.32.33/include/asm-generic/dma-mapping-common.h
---- linux-2.6.32.33/include/asm-generic/dma-mapping-common.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/asm-generic/dma-mapping-common.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/asm-generic/dma-mapping-common.h linux-2.6.32.35/include/asm-generic/dma-mapping-common.h
+--- linux-2.6.32.35/include/asm-generic/dma-mapping-common.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/asm-generic/dma-mapping-common.h 2010-12-31 14:46:53.000000000 -0500
@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
enum dma_data_direction dir,
struct dma_attrs *attrs)
@@ -47169,9 +47345,9 @@ diff -urNp linux-2.6.32.33/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.33/include/asm-generic/futex.h linux-2.6.32.33/include/asm-generic/futex.h
---- linux-2.6.32.33/include/asm-generic/futex.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/asm-generic/futex.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/asm-generic/futex.h linux-2.6.32.35/include/asm-generic/futex.h
+--- linux-2.6.32.35/include/asm-generic/futex.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/asm-generic/futex.h 2010-12-31 14:46:53.000000000 -0500
@@ -6,7 +6,7 @@
#include <asm/errno.h>
@@ -47190,9 +47366,9 @@ diff -urNp linux-2.6.32.33/include/asm-generic/futex.h linux-2.6.32.33/include/a
{
return -ENOSYS;
}
-diff -urNp linux-2.6.32.33/include/asm-generic/int-l64.h linux-2.6.32.33/include/asm-generic/int-l64.h
---- linux-2.6.32.33/include/asm-generic/int-l64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/asm-generic/int-l64.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/asm-generic/int-l64.h linux-2.6.32.35/include/asm-generic/int-l64.h
+--- linux-2.6.32.35/include/asm-generic/int-l64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/asm-generic/int-l64.h 2010-12-31 14:46:53.000000000 -0500
@@ -46,6 +46,8 @@ typedef unsigned int u32;
typedef signed long s64;
typedef unsigned long u64;
@@ -47202,9 +47378,9 @@ diff -urNp linux-2.6.32.33/include/asm-generic/int-l64.h linux-2.6.32.33/include
#define S8_C(x) x
#define U8_C(x) x ## U
#define S16_C(x) x
-diff -urNp linux-2.6.32.33/include/asm-generic/int-ll64.h linux-2.6.32.33/include/asm-generic/int-ll64.h
---- linux-2.6.32.33/include/asm-generic/int-ll64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/asm-generic/int-ll64.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/asm-generic/int-ll64.h linux-2.6.32.35/include/asm-generic/int-ll64.h
+--- linux-2.6.32.35/include/asm-generic/int-ll64.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/asm-generic/int-ll64.h 2010-12-31 14:46:53.000000000 -0500
@@ -51,6 +51,8 @@ typedef unsigned int u32;
typedef signed long long s64;
typedef unsigned long long u64;
@@ -47214,9 +47390,9 @@ diff -urNp linux-2.6.32.33/include/asm-generic/int-ll64.h linux-2.6.32.33/includ
#define S8_C(x) x
#define U8_C(x) x ## U
#define S16_C(x) x
-diff -urNp linux-2.6.32.33/include/asm-generic/kmap_types.h linux-2.6.32.33/include/asm-generic/kmap_types.h
---- linux-2.6.32.33/include/asm-generic/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/asm-generic/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/asm-generic/kmap_types.h linux-2.6.32.35/include/asm-generic/kmap_types.h
+--- linux-2.6.32.35/include/asm-generic/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/asm-generic/kmap_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
KMAP_D(16) KM_IRQ_PTE,
KMAP_D(17) KM_NMI,
@@ -47227,9 +47403,9 @@ diff -urNp linux-2.6.32.33/include/asm-generic/kmap_types.h linux-2.6.32.33/incl
};
#undef KMAP_D
-diff -urNp linux-2.6.32.33/include/asm-generic/pgtable.h linux-2.6.32.33/include/asm-generic/pgtable.h
---- linux-2.6.32.33/include/asm-generic/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/asm-generic/pgtable.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/asm-generic/pgtable.h linux-2.6.32.35/include/asm-generic/pgtable.h
+--- linux-2.6.32.35/include/asm-generic/pgtable.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/asm-generic/pgtable.h 2010-12-31 14:46:53.000000000 -0500
@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
unsigned long size);
#endif
@@ -47245,9 +47421,9 @@ diff -urNp linux-2.6.32.33/include/asm-generic/pgtable.h linux-2.6.32.33/include
#endif /* !__ASSEMBLY__ */
#endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-2.6.32.33/include/asm-generic/pgtable-nopmd.h linux-2.6.32.33/include/asm-generic/pgtable-nopmd.h
---- linux-2.6.32.33/include/asm-generic/pgtable-nopmd.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/asm-generic/pgtable-nopmd.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/asm-generic/pgtable-nopmd.h linux-2.6.32.35/include/asm-generic/pgtable-nopmd.h
+--- linux-2.6.32.35/include/asm-generic/pgtable-nopmd.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/asm-generic/pgtable-nopmd.h 2010-12-31 14:46:53.000000000 -0500
@@ -1,14 +1,19 @@
#ifndef _PGTABLE_NOPMD_H
#define _PGTABLE_NOPMD_H
@@ -47284,9 +47460,9 @@ diff -urNp linux-2.6.32.33/include/asm-generic/pgtable-nopmd.h linux-2.6.32.33/i
/*
* The "pud_xxx()" functions here are trivial for a folded two-level
* setup: the pmd is never bad, and a pmd always exists (as it's folded
-diff -urNp linux-2.6.32.33/include/asm-generic/pgtable-nopud.h linux-2.6.32.33/include/asm-generic/pgtable-nopud.h
---- linux-2.6.32.33/include/asm-generic/pgtable-nopud.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/asm-generic/pgtable-nopud.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/asm-generic/pgtable-nopud.h linux-2.6.32.35/include/asm-generic/pgtable-nopud.h
+--- linux-2.6.32.35/include/asm-generic/pgtable-nopud.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/asm-generic/pgtable-nopud.h 2010-12-31 14:46:53.000000000 -0500
@@ -1,10 +1,15 @@
#ifndef _PGTABLE_NOPUD_H
#define _PGTABLE_NOPUD_H
@@ -47317,9 +47493,9 @@ diff -urNp linux-2.6.32.33/include/asm-generic/pgtable-nopud.h linux-2.6.32.33/i
/*
* The "pgd_xxx()" functions here are trivial for a folded two-level
* setup: the pud is never bad, and a pud always exists (as it's folded
-diff -urNp linux-2.6.32.33/include/asm-generic/vmlinux.lds.h linux-2.6.32.33/include/asm-generic/vmlinux.lds.h
---- linux-2.6.32.33/include/asm-generic/vmlinux.lds.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/asm-generic/vmlinux.lds.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/asm-generic/vmlinux.lds.h linux-2.6.32.35/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.32.35/include/asm-generic/vmlinux.lds.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/asm-generic/vmlinux.lds.h 2010-12-31 14:46:53.000000000 -0500
@@ -199,6 +199,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -47358,9 +47534,9 @@ diff -urNp linux-2.6.32.33/include/asm-generic/vmlinux.lds.h linux-2.6.32.33/inc
/**
* PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.32.33/include/drm/drm_pciids.h linux-2.6.32.33/include/drm/drm_pciids.h
---- linux-2.6.32.33/include/drm/drm_pciids.h 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/include/drm/drm_pciids.h 2011-02-22 15:57:24.000000000 -0500
+diff -urNp linux-2.6.32.35/include/drm/drm_pciids.h linux-2.6.32.35/include/drm/drm_pciids.h
+--- linux-2.6.32.35/include/drm/drm_pciids.h 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/include/drm/drm_pciids.h 2011-02-22 15:57:24.000000000 -0500
@@ -376,7 +376,7 @@
{0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
{0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -47464,9 +47640,9 @@ diff -urNp linux-2.6.32.33/include/drm/drm_pciids.h linux-2.6.32.33/include/drm/
{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.33/include/drm/drmP.h linux-2.6.32.33/include/drm/drmP.h
---- linux-2.6.32.33/include/drm/drmP.h 2011-03-11 17:56:47.000000000 -0500
-+++ linux-2.6.32.33/include/drm/drmP.h 2011-03-11 18:01:11.000000000 -0500
+diff -urNp linux-2.6.32.35/include/drm/drmP.h linux-2.6.32.35/include/drm/drmP.h
+--- linux-2.6.32.35/include/drm/drmP.h 2011-03-11 17:56:47.000000000 -0500
++++ linux-2.6.32.35/include/drm/drmP.h 2011-03-11 18:01:11.000000000 -0500
@@ -71,6 +71,7 @@
#include <linux/workqueue.h>
#include <linux/poll.h>
@@ -47526,9 +47702,9 @@ diff -urNp linux-2.6.32.33/include/drm/drmP.h linux-2.6.32.33/include/drm/drmP.h
uint32_t gtt_total;
uint32_t invalidate_domains; /* domains pending invalidation */
uint32_t flush_domains; /* domains pending flush */
-diff -urNp linux-2.6.32.33/include/linux/a.out.h linux-2.6.32.33/include/linux/a.out.h
---- linux-2.6.32.33/include/linux/a.out.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/a.out.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/a.out.h linux-2.6.32.35/include/linux/a.out.h
+--- linux-2.6.32.35/include/linux/a.out.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/a.out.h 2010-12-31 14:46:53.000000000 -0500
@@ -39,6 +39,14 @@ enum machine_type {
M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
};
@@ -47544,9 +47720,9 @@ diff -urNp linux-2.6.32.33/include/linux/a.out.h linux-2.6.32.33/include/linux/a
#if !defined (N_MAGIC)
#define N_MAGIC(exec) ((exec).a_info & 0xffff)
#endif
-diff -urNp linux-2.6.32.33/include/linux/atmdev.h linux-2.6.32.33/include/linux/atmdev.h
---- linux-2.6.32.33/include/linux/atmdev.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/atmdev.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/atmdev.h linux-2.6.32.35/include/linux/atmdev.h
+--- linux-2.6.32.35/include/linux/atmdev.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/atmdev.h 2010-12-31 14:46:53.000000000 -0500
@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
#endif
@@ -47556,9 +47732,9 @@ diff -urNp linux-2.6.32.33/include/linux/atmdev.h linux-2.6.32.33/include/linux/
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-2.6.32.33/include/linux/backlight.h linux-2.6.32.33/include/linux/backlight.h
---- linux-2.6.32.33/include/linux/backlight.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/backlight.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/backlight.h linux-2.6.32.35/include/linux/backlight.h
+--- linux-2.6.32.35/include/linux/backlight.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/backlight.h 2010-12-31 14:46:53.000000000 -0500
@@ -36,18 +36,18 @@ struct backlight_device;
struct fb_info;
@@ -47600,9 +47776,9 @@ diff -urNp linux-2.6.32.33/include/linux/backlight.h linux-2.6.32.33/include/lin
extern void backlight_device_unregister(struct backlight_device *bd);
extern void backlight_force_update(struct backlight_device *bd,
enum backlight_update_reason reason);
-diff -urNp linux-2.6.32.33/include/linux/binfmts.h linux-2.6.32.33/include/linux/binfmts.h
---- linux-2.6.32.33/include/linux/binfmts.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/binfmts.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/binfmts.h linux-2.6.32.35/include/linux/binfmts.h
+--- linux-2.6.32.35/include/linux/binfmts.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/binfmts.h 2010-12-31 14:46:53.000000000 -0500
@@ -29,6 +29,7 @@ struct linux_binprm{
char buf[BINPRM_BUF_SIZE];
#ifdef CONFIG_MMU
@@ -47630,9 +47806,9 @@ diff -urNp linux-2.6.32.33/include/linux/binfmts.h linux-2.6.32.33/include/linux
unsigned long min_coredump; /* minimal dump size */
int hasvdso;
};
-diff -urNp linux-2.6.32.33/include/linux/blkdev.h linux-2.6.32.33/include/linux/blkdev.h
---- linux-2.6.32.33/include/linux/blkdev.h 2011-01-11 23:55:35.000000000 -0500
-+++ linux-2.6.32.33/include/linux/blkdev.h 2011-01-11 23:56:03.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/blkdev.h linux-2.6.32.35/include/linux/blkdev.h
+--- linux-2.6.32.35/include/linux/blkdev.h 2011-01-11 23:55:35.000000000 -0500
++++ linux-2.6.32.35/include/linux/blkdev.h 2011-01-11 23:56:03.000000000 -0500
@@ -1265,19 +1265,19 @@ static inline int blk_integrity_rq(struc
#endif /* CONFIG_BLK_DEV_INTEGRITY */
@@ -47664,9 +47840,9 @@ diff -urNp linux-2.6.32.33/include/linux/blkdev.h linux-2.6.32.33/include/linux/
};
extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
-diff -urNp linux-2.6.32.33/include/linux/byteorder/little_endian.h linux-2.6.32.33/include/linux/byteorder/little_endian.h
---- linux-2.6.32.33/include/linux/byteorder/little_endian.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/byteorder/little_endian.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/byteorder/little_endian.h linux-2.6.32.35/include/linux/byteorder/little_endian.h
+--- linux-2.6.32.35/include/linux/byteorder/little_endian.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/byteorder/little_endian.h 2010-12-31 14:46:53.000000000 -0500
@@ -42,51 +42,51 @@
static inline __le64 __cpu_to_le64p(const __u64 *p)
@@ -47731,9 +47907,9 @@ diff -urNp linux-2.6.32.33/include/linux/byteorder/little_endian.h linux-2.6.32.
}
#define __cpu_to_le64s(x) do { (void)(x); } while (0)
#define __le64_to_cpus(x) do { (void)(x); } while (0)
-diff -urNp linux-2.6.32.33/include/linux/cache.h linux-2.6.32.33/include/linux/cache.h
---- linux-2.6.32.33/include/linux/cache.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/cache.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/cache.h linux-2.6.32.35/include/linux/cache.h
+--- linux-2.6.32.35/include/linux/cache.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/cache.h 2010-12-31 14:46:53.000000000 -0500
@@ -16,6 +16,10 @@
#define __read_mostly
#endif
@@ -47745,9 +47921,9 @@ diff -urNp linux-2.6.32.33/include/linux/cache.h linux-2.6.32.33/include/linux/c
#ifndef ____cacheline_aligned
#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
#endif
-diff -urNp linux-2.6.32.33/include/linux/capability.h linux-2.6.32.33/include/linux/capability.h
---- linux-2.6.32.33/include/linux/capability.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/capability.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/capability.h linux-2.6.32.35/include/linux/capability.h
+--- linux-2.6.32.35/include/linux/capability.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/capability.h 2010-12-31 14:46:53.000000000 -0500
@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
(security_real_capable_noaudit((t), (cap)) == 0)
@@ -47756,9 +47932,9 @@ diff -urNp linux-2.6.32.33/include/linux/capability.h linux-2.6.32.33/include/li
/* audit system wants to get cap info from files as well */
struct dentry;
-diff -urNp linux-2.6.32.33/include/linux/compiler-gcc4.h linux-2.6.32.33/include/linux/compiler-gcc4.h
---- linux-2.6.32.33/include/linux/compiler-gcc4.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/compiler-gcc4.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/compiler-gcc4.h linux-2.6.32.35/include/linux/compiler-gcc4.h
+--- linux-2.6.32.35/include/linux/compiler-gcc4.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/compiler-gcc4.h 2010-12-31 14:46:53.000000000 -0500
@@ -36,4 +36,8 @@
the kernel context */
#define __cold __attribute__((__cold__))
@@ -47768,9 +47944,9 @@ diff -urNp linux-2.6.32.33/include/linux/compiler-gcc4.h linux-2.6.32.33/include
+#define __bos0(ptr) __bos((ptr), 0)
+#define __bos1(ptr) __bos((ptr), 1)
#endif
-diff -urNp linux-2.6.32.33/include/linux/compiler.h linux-2.6.32.33/include/linux/compiler.h
---- linux-2.6.32.33/include/linux/compiler.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/compiler.h 2010-12-31 14:57:30.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/compiler.h linux-2.6.32.35/include/linux/compiler.h
+--- linux-2.6.32.35/include/linux/compiler.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/compiler.h 2010-12-31 14:57:30.000000000 -0500
@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
#define __cold
#endif
@@ -47803,9 +47979,9 @@ diff -urNp linux-2.6.32.33/include/linux/compiler.h linux-2.6.32.33/include/linu
+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
#endif /* __LINUX_COMPILER_H */
-diff -urNp linux-2.6.32.33/include/linux/decompress/mm.h linux-2.6.32.33/include/linux/decompress/mm.h
---- linux-2.6.32.33/include/linux/decompress/mm.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/decompress/mm.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/decompress/mm.h linux-2.6.32.35/include/linux/decompress/mm.h
+--- linux-2.6.32.35/include/linux/decompress/mm.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/decompress/mm.h 2010-12-31 14:46:53.000000000 -0500
@@ -78,7 +78,7 @@ static void free(void *where)
* warnings when not needed (indeed large_malloc / large_free are not
* needed by inflate */
@@ -47815,9 +47991,9 @@ diff -urNp linux-2.6.32.33/include/linux/decompress/mm.h linux-2.6.32.33/include
#define free(a) kfree(a)
#define large_malloc(a) vmalloc(a)
-diff -urNp linux-2.6.32.33/include/linux/dma-mapping.h linux-2.6.32.33/include/linux/dma-mapping.h
---- linux-2.6.32.33/include/linux/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/dma-mapping.h linux-2.6.32.35/include/linux/dma-mapping.h
+--- linux-2.6.32.35/include/linux/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/dma-mapping.h 2010-12-31 14:46:53.000000000 -0500
@@ -16,50 +16,50 @@ enum dma_data_direction {
};
@@ -47884,9 +48060,9 @@ diff -urNp linux-2.6.32.33/include/linux/dma-mapping.h linux-2.6.32.33/include/l
};
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-diff -urNp linux-2.6.32.33/include/linux/dst.h linux-2.6.32.33/include/linux/dst.h
---- linux-2.6.32.33/include/linux/dst.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/dst.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/dst.h linux-2.6.32.35/include/linux/dst.h
+--- linux-2.6.32.35/include/linux/dst.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/dst.h 2010-12-31 14:46:53.000000000 -0500
@@ -380,7 +380,7 @@ struct dst_node
struct thread_pool *pool;
@@ -47896,9 +48072,9 @@ diff -urNp linux-2.6.32.33/include/linux/dst.h linux-2.6.32.33/include/linux/dst
/*
* How frequently and how many times transaction
-diff -urNp linux-2.6.32.33/include/linux/elf.h linux-2.6.32.33/include/linux/elf.h
---- linux-2.6.32.33/include/linux/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/elf.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/elf.h linux-2.6.32.35/include/linux/elf.h
+--- linux-2.6.32.35/include/linux/elf.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/elf.h 2010-12-31 14:46:53.000000000 -0500
@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
#define PT_GNU_EH_FRAME 0x6474e550
@@ -47971,9 +48147,9 @@ diff -urNp linux-2.6.32.33/include/linux/elf.h linux-2.6.32.33/include/linux/elf
#endif
-diff -urNp linux-2.6.32.33/include/linux/fs.h linux-2.6.32.33/include/linux/fs.h
---- linux-2.6.32.33/include/linux/fs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/fs.h 2011-01-17 02:51:02.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/fs.h linux-2.6.32.35/include/linux/fs.h
+--- linux-2.6.32.35/include/linux/fs.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/fs.h 2011-01-17 02:51:02.000000000 -0500
@@ -90,6 +90,11 @@ struct inodes_stat_t {
/* Expect random access pattern */
#define FMODE_RANDOM ((__force fmode_t)4096)
@@ -48135,9 +48311,9 @@ diff -urNp linux-2.6.32.33/include/linux/fs.h linux-2.6.32.33/include/linux/fs.h
};
/*
-diff -urNp linux-2.6.32.33/include/linux/fs_struct.h linux-2.6.32.33/include/linux/fs_struct.h
---- linux-2.6.32.33/include/linux/fs_struct.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/fs_struct.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/fs_struct.h linux-2.6.32.35/include/linux/fs_struct.h
+--- linux-2.6.32.35/include/linux/fs_struct.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/fs_struct.h 2010-12-31 14:46:53.000000000 -0500
@@ -4,7 +4,7 @@
#include <linux/path.h>
@@ -48147,9 +48323,9 @@ diff -urNp linux-2.6.32.33/include/linux/fs_struct.h linux-2.6.32.33/include/lin
rwlock_t lock;
int umask;
int in_exec;
-diff -urNp linux-2.6.32.33/include/linux/genhd.h linux-2.6.32.33/include/linux/genhd.h
---- linux-2.6.32.33/include/linux/genhd.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/genhd.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/genhd.h linux-2.6.32.35/include/linux/genhd.h
+--- linux-2.6.32.35/include/linux/genhd.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/genhd.h 2010-12-31 14:46:53.000000000 -0500
@@ -161,7 +161,7 @@ struct gendisk {
struct timer_rand_state *random;
@@ -48159,9 +48335,9 @@ diff -urNp linux-2.6.32.33/include/linux/genhd.h linux-2.6.32.33/include/linux/g
struct work_struct async_notify;
#ifdef CONFIG_BLK_DEV_INTEGRITY
struct blk_integrity *integrity;
-diff -urNp linux-2.6.32.33/include/linux/gracl.h linux-2.6.32.33/include/linux/gracl.h
---- linux-2.6.32.33/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/include/linux/gracl.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/gracl.h linux-2.6.32.35/include/linux/gracl.h
+--- linux-2.6.32.35/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/include/linux/gracl.h 2011-03-26 19:59:40.000000000 -0400
@@ -0,0 +1,317 @@
+#ifndef GR_ACL_H
+#define GR_ACL_H
@@ -48174,8 +48350,8 @@ diff -urNp linux-2.6.32.33/include/linux/gracl.h linux-2.6.32.33/include/linux/g
+
+/* Major status information */
+
-+#define GR_VERSION "grsecurity 2.2.1"
-+#define GRSECURITY_VERSION 0x2201
++#define GR_VERSION "grsecurity 2.2.2"
++#define GRSECURITY_VERSION 0x2202
+
+enum {
+ GR_SHUTDOWN = 0,
@@ -48480,9 +48656,9 @@ diff -urNp linux-2.6.32.33/include/linux/gracl.h linux-2.6.32.33/include/linux/g
+
+#endif
+
-diff -urNp linux-2.6.32.33/include/linux/gralloc.h linux-2.6.32.33/include/linux/gralloc.h
---- linux-2.6.32.33/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/include/linux/gralloc.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/gralloc.h linux-2.6.32.35/include/linux/gralloc.h
+--- linux-2.6.32.35/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/include/linux/gralloc.h 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,9 @@
+#ifndef __GRALLOC_H
+#define __GRALLOC_H
@@ -48493,10 +48669,10 @@ diff -urNp linux-2.6.32.33/include/linux/gralloc.h linux-2.6.32.33/include/linux
+void *acl_alloc_num(unsigned long num, unsigned long len);
+
+#endif
-diff -urNp linux-2.6.32.33/include/linux/grdefs.h linux-2.6.32.33/include/linux/grdefs.h
---- linux-2.6.32.33/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/include/linux/grdefs.h 2010-12-31 14:46:53.000000000 -0500
-@@ -0,0 +1,137 @@
+diff -urNp linux-2.6.32.35/include/linux/grdefs.h linux-2.6.32.35/include/linux/grdefs.h
+--- linux-2.6.32.35/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/include/linux/grdefs.h 2011-03-26 19:59:28.000000000 -0400
+@@ -0,0 +1,139 @@
+#ifndef GRDEFS_H
+#define GRDEFS_H
+
@@ -48522,7 +48698,8 @@ diff -urNp linux-2.6.32.33/include/linux/grdefs.h linux-2.6.32.33/include/linux/
+ GR_ROLE_LEARN = 0x0080,
+ GR_ROLE_TPE = 0x0100,
+ GR_ROLE_DOMAIN = 0x0200,
-+ GR_ROLE_PAM = 0x0400
++ GR_ROLE_PAM = 0x0400,
++ GR_ROLE_PERSIST = 0x800
+};
+
+/* ACL Subject and Object mode flags */
@@ -48555,7 +48732,8 @@ diff -urNp linux-2.6.32.33/include/linux/grdefs.h linux-2.6.32.33/include/linux/
+ GR_PTRACERD = 0x00100000,
+ GR_NOPTRACE = 0x00200000,
+ GR_SUPPRESS = 0x00400000,
-+ GR_NOLEARN = 0x00800000
++ GR_NOLEARN = 0x00800000,
++ GR_INIT_TRANSFER= 0x01000000
+};
+
+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
@@ -48634,9 +48812,9 @@ diff -urNp linux-2.6.32.33/include/linux/grdefs.h linux-2.6.32.33/include/linux/
+};
+
+#endif
-diff -urNp linux-2.6.32.33/include/linux/grinternal.h linux-2.6.32.33/include/linux/grinternal.h
---- linux-2.6.32.33/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/include/linux/grinternal.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/grinternal.h linux-2.6.32.35/include/linux/grinternal.h
+--- linux-2.6.32.35/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/include/linux/grinternal.h 2011-03-26 20:03:58.000000000 -0400
@@ -0,0 +1,216 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
@@ -48660,7 +48838,7 @@ diff -urNp linux-2.6.32.33/include/linux/grinternal.h linux-2.6.32.33/include/li
+int gr_check_protected_task(const struct task_struct *task);
+__u32 to_gr_audit(const __u32 reqmode);
+int gr_set_acls(const int type);
-+
++int gr_apply_subject_to_task(struct task_struct *task);
+int gr_acl_is_enabled(void);
+char gr_roletype_to_char(void);
+
@@ -48854,10 +49032,10 @@ diff -urNp linux-2.6.32.33/include/linux/grinternal.h linux-2.6.32.33/include/li
+#endif
+
+#endif
-diff -urNp linux-2.6.32.33/include/linux/grmsg.h linux-2.6.32.33/include/linux/grmsg.h
---- linux-2.6.32.33/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/include/linux/grmsg.h 2010-12-31 14:46:53.000000000 -0500
-@@ -0,0 +1,111 @@
+diff -urNp linux-2.6.32.35/include/linux/grmsg.h linux-2.6.32.35/include/linux/grmsg.h
+--- linux-2.6.32.35/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/include/linux/grmsg.h 2011-03-26 20:04:17.000000000 -0400
+@@ -0,0 +1,112 @@
+#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
@@ -48969,10 +49147,11 @@ diff -urNp linux-2.6.32.33/include/linux/grmsg.h linux-2.6.32.33/include/linux/g
+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
+#define GR_VM86_MSG "denied use of vm86 by "
+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
-diff -urNp linux-2.6.32.33/include/linux/grsecurity.h linux-2.6.32.33/include/linux/grsecurity.h
---- linux-2.6.32.33/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/include/linux/grsecurity.h 2011-01-11 23:11:11.000000000 -0500
-@@ -0,0 +1,214 @@
++#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
+diff -urNp linux-2.6.32.35/include/linux/grsecurity.h linux-2.6.32.35/include/linux/grsecurity.h
+--- linux-2.6.32.35/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/include/linux/grsecurity.h 2011-03-26 19:38:56.000000000 -0400
+@@ -0,0 +1,215 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
+#include <linux/fs.h>
@@ -49171,6 +49350,7 @@ diff -urNp linux-2.6.32.33/include/linux/grsecurity.h linux-2.6.32.33/include/li
+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
+void gr_audit_ptrace(struct task_struct *task);
++dev_t gr_get_dev_from_dentry(struct dentry *dentry);
+
+#ifdef CONFIG_GRKERNSEC
+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
@@ -49187,9 +49367,9 @@ diff -urNp linux-2.6.32.33/include/linux/grsecurity.h linux-2.6.32.33/include/li
+#endif
+
+#endif
-diff -urNp linux-2.6.32.33/include/linux/hdpu_features.h linux-2.6.32.33/include/linux/hdpu_features.h
---- linux-2.6.32.33/include/linux/hdpu_features.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/hdpu_features.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/hdpu_features.h linux-2.6.32.35/include/linux/hdpu_features.h
+--- linux-2.6.32.35/include/linux/hdpu_features.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/hdpu_features.h 2010-12-31 14:46:53.000000000 -0500
@@ -3,7 +3,7 @@
struct cpustate_t {
spinlock_t lock;
@@ -49199,9 +49379,9 @@ diff -urNp linux-2.6.32.33/include/linux/hdpu_features.h linux-2.6.32.33/include
unsigned char cached_val;
int inited;
unsigned long *set_addr;
-diff -urNp linux-2.6.32.33/include/linux/highmem.h linux-2.6.32.33/include/linux/highmem.h
---- linux-2.6.32.33/include/linux/highmem.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/highmem.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/highmem.h linux-2.6.32.35/include/linux/highmem.h
+--- linux-2.6.32.35/include/linux/highmem.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/highmem.h 2010-12-31 14:46:53.000000000 -0500
@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
kunmap_atomic(kaddr, KM_USER0);
}
@@ -49221,9 +49401,9 @@ diff -urNp linux-2.6.32.33/include/linux/highmem.h linux-2.6.32.33/include/linux
static inline void zero_user_segments(struct page *page,
unsigned start1, unsigned end1,
unsigned start2, unsigned end2)
-diff -urNp linux-2.6.32.33/include/linux/interrupt.h linux-2.6.32.33/include/linux/interrupt.h
---- linux-2.6.32.33/include/linux/interrupt.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/interrupt.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/interrupt.h linux-2.6.32.35/include/linux/interrupt.h
+--- linux-2.6.32.35/include/linux/interrupt.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/interrupt.h 2010-12-31 14:46:53.000000000 -0500
@@ -362,7 +362,7 @@ enum
/* map softirq index to softirq name. update 'softirq_to_name' in
* kernel/softirq.c when adding a new softirq.
@@ -49248,9 +49428,9 @@ diff -urNp linux-2.6.32.33/include/linux/interrupt.h linux-2.6.32.33/include/lin
extern void softirq_init(void);
#define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
extern void raise_softirq_irqoff(unsigned int nr);
-diff -urNp linux-2.6.32.33/include/linux/irq.h linux-2.6.32.33/include/linux/irq.h
---- linux-2.6.32.33/include/linux/irq.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/irq.h 2011-01-24 18:05:37.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/irq.h linux-2.6.32.35/include/linux/irq.h
+--- linux-2.6.32.35/include/linux/irq.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/irq.h 2011-01-24 18:05:37.000000000 -0500
@@ -438,12 +438,12 @@ extern int set_irq_msi(unsigned int irq,
static inline bool alloc_desc_masks(struct irq_desc *desc, int node,
bool boot)
@@ -49265,9 +49445,9 @@ diff -urNp linux-2.6.32.33/include/linux/irq.h linux-2.6.32.33/include/linux/irq
if (!alloc_cpumask_var_node(&desc->affinity, gfp, node))
return false;
-diff -urNp linux-2.6.32.33/include/linux/jbd2.h linux-2.6.32.33/include/linux/jbd2.h
---- linux-2.6.32.33/include/linux/jbd2.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/jbd2.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/jbd2.h linux-2.6.32.35/include/linux/jbd2.h
+--- linux-2.6.32.35/include/linux/jbd2.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/jbd2.h 2010-12-31 14:46:53.000000000 -0500
@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
} \
} while (0)
@@ -49277,9 +49457,9 @@ diff -urNp linux-2.6.32.33/include/linux/jbd2.h linux-2.6.32.33/include/linux/jb
#endif
static inline void *jbd2_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.32.33/include/linux/jbd.h linux-2.6.32.33/include/linux/jbd.h
---- linux-2.6.32.33/include/linux/jbd.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/jbd.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/jbd.h linux-2.6.32.35/include/linux/jbd.h
+--- linux-2.6.32.35/include/linux/jbd.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/jbd.h 2010-12-31 14:46:53.000000000 -0500
@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
} \
} while (0)
@@ -49289,9 +49469,9 @@ diff -urNp linux-2.6.32.33/include/linux/jbd.h linux-2.6.32.33/include/linux/jbd
#endif
static inline void *jbd_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.32.33/include/linux/kallsyms.h linux-2.6.32.33/include/linux/kallsyms.h
---- linux-2.6.32.33/include/linux/kallsyms.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/kallsyms.h 2010-12-31 14:53:51.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/kallsyms.h linux-2.6.32.35/include/linux/kallsyms.h
+--- linux-2.6.32.35/include/linux/kallsyms.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/kallsyms.h 2010-12-31 14:53:51.000000000 -0500
@@ -15,7 +15,8 @@
struct module;
@@ -49318,9 +49498,9 @@ diff -urNp linux-2.6.32.33/include/linux/kallsyms.h linux-2.6.32.33/include/linu
/* This macro allows us to keep printk typechecking */
static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-2.6.32.33/include/linux/kgdb.h linux-2.6.32.33/include/linux/kgdb.h
---- linux-2.6.32.33/include/linux/kgdb.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/kgdb.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/kgdb.h linux-2.6.32.35/include/linux/kgdb.h
+--- linux-2.6.32.35/include/linux/kgdb.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/kgdb.h 2010-12-31 14:46:53.000000000 -0500
@@ -251,20 +251,20 @@ struct kgdb_arch {
*/
struct kgdb_io {
@@ -49351,9 +49531,9 @@ diff -urNp linux-2.6.32.33/include/linux/kgdb.h linux-2.6.32.33/include/linux/kg
extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
extern int kgdb_mem2hex(char *mem, char *buf, int count);
-diff -urNp linux-2.6.32.33/include/linux/kobject.h linux-2.6.32.33/include/linux/kobject.h
---- linux-2.6.32.33/include/linux/kobject.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/kobject.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/kobject.h linux-2.6.32.35/include/linux/kobject.h
+--- linux-2.6.32.35/include/linux/kobject.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/kobject.h 2010-12-31 14:46:53.000000000 -0500
@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
struct kobj_type {
@@ -49402,9 +49582,9 @@ diff -urNp linux-2.6.32.33/include/linux/kobject.h linux-2.6.32.33/include/linux
struct kobject *parent_kobj);
static inline struct kset *to_kset(struct kobject *kobj)
-diff -urNp linux-2.6.32.33/include/linux/kvm_host.h linux-2.6.32.33/include/linux/kvm_host.h
---- linux-2.6.32.33/include/linux/kvm_host.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/kvm_host.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/kvm_host.h linux-2.6.32.35/include/linux/kvm_host.h
+--- linux-2.6.32.35/include/linux/kvm_host.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/kvm_host.h 2010-12-31 14:46:53.000000000 -0500
@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
void vcpu_load(struct kvm_vcpu *vcpu);
void vcpu_put(struct kvm_vcpu *vcpu);
@@ -49423,9 +49603,9 @@ diff -urNp linux-2.6.32.33/include/linux/kvm_host.h linux-2.6.32.33/include/linu
void kvm_arch_exit(void);
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-2.6.32.33/include/linux/libata.h linux-2.6.32.33/include/linux/libata.h
---- linux-2.6.32.33/include/linux/libata.h 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/include/linux/libata.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/libata.h linux-2.6.32.35/include/linux/libata.h
+--- linux-2.6.32.35/include/linux/libata.h 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.35/include/linux/libata.h 2010-12-31 14:46:53.000000000 -0500
@@ -64,11 +64,11 @@
#ifdef ATA_VERBOSE_DEBUG
#define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -49491,9 +49671,9 @@ diff -urNp linux-2.6.32.33/include/linux/libata.h linux-2.6.32.33/include/linux/
extern int ata_scsi_detect(struct scsi_host_template *sht);
extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
-diff -urNp linux-2.6.32.33/include/linux/lockd/bind.h linux-2.6.32.33/include/linux/lockd/bind.h
---- linux-2.6.32.33/include/linux/lockd/bind.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/lockd/bind.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/lockd/bind.h linux-2.6.32.35/include/linux/lockd/bind.h
+--- linux-2.6.32.35/include/linux/lockd/bind.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/lockd/bind.h 2010-12-31 14:46:53.000000000 -0500
@@ -23,13 +23,13 @@ struct svc_rqst;
* This is the set of functions for lockd->nfsd communication
*/
@@ -49511,9 +49691,9 @@ diff -urNp linux-2.6.32.33/include/linux/lockd/bind.h linux-2.6.32.33/include/li
/*
* Similar to nfs_client_initdata, but without the NFS-specific
-diff -urNp linux-2.6.32.33/include/linux/mm.h linux-2.6.32.33/include/linux/mm.h
---- linux-2.6.32.33/include/linux/mm.h 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.33/include/linux/mm.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/mm.h linux-2.6.32.35/include/linux/mm.h
+--- linux-2.6.32.35/include/linux/mm.h 2010-10-31 16:44:11.000000000 -0400
++++ linux-2.6.32.35/include/linux/mm.h 2010-12-31 14:46:53.000000000 -0500
@@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
@@ -49593,9 +49773,9 @@ diff -urNp linux-2.6.32.33/include/linux/mm.h linux-2.6.32.33/include/linux/mm.h
#endif /* __KERNEL__ */
#endif /* _LINUX_MM_H */
-diff -urNp linux-2.6.32.33/include/linux/mm_types.h linux-2.6.32.33/include/linux/mm_types.h
---- linux-2.6.32.33/include/linux/mm_types.h 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.33/include/linux/mm_types.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/mm_types.h linux-2.6.32.35/include/linux/mm_types.h
+--- linux-2.6.32.35/include/linux/mm_types.h 2010-08-29 21:08:20.000000000 -0400
++++ linux-2.6.32.35/include/linux/mm_types.h 2010-12-31 14:46:53.000000000 -0500
@@ -186,6 +186,8 @@ struct vm_area_struct {
#ifdef CONFIG_NUMA
struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -49630,9 +49810,9 @@ diff -urNp linux-2.6.32.33/include/linux/mm_types.h linux-2.6.32.33/include/linu
};
/* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
-diff -urNp linux-2.6.32.33/include/linux/mmu_notifier.h linux-2.6.32.33/include/linux/mmu_notifier.h
---- linux-2.6.32.33/include/linux/mmu_notifier.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/mmu_notifier.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/mmu_notifier.h linux-2.6.32.35/include/linux/mmu_notifier.h
+--- linux-2.6.32.35/include/linux/mmu_notifier.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/mmu_notifier.h 2010-12-31 14:46:53.000000000 -0500
@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
*/
#define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -49649,9 +49829,9 @@ diff -urNp linux-2.6.32.33/include/linux/mmu_notifier.h linux-2.6.32.33/include/
})
#define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
-diff -urNp linux-2.6.32.33/include/linux/mmzone.h linux-2.6.32.33/include/linux/mmzone.h
---- linux-2.6.32.33/include/linux/mmzone.h 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.33/include/linux/mmzone.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/mmzone.h linux-2.6.32.35/include/linux/mmzone.h
+--- linux-2.6.32.35/include/linux/mmzone.h 2010-09-26 17:26:05.000000000 -0400
++++ linux-2.6.32.35/include/linux/mmzone.h 2010-12-31 14:46:53.000000000 -0500
@@ -350,7 +350,7 @@ struct zone {
unsigned long flags; /* zone flags, see below */
@@ -49661,9 +49841,9 @@ diff -urNp linux-2.6.32.33/include/linux/mmzone.h linux-2.6.32.33/include/linux/
/*
* prev_priority holds the scanning priority for this zone. It is
-diff -urNp linux-2.6.32.33/include/linux/mod_devicetable.h linux-2.6.32.33/include/linux/mod_devicetable.h
---- linux-2.6.32.33/include/linux/mod_devicetable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/mod_devicetable.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/mod_devicetable.h linux-2.6.32.35/include/linux/mod_devicetable.h
+--- linux-2.6.32.35/include/linux/mod_devicetable.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/mod_devicetable.h 2010-12-31 14:46:53.000000000 -0500
@@ -12,7 +12,7 @@
typedef unsigned long kernel_ulong_t;
#endif
@@ -49682,9 +49862,9 @@ diff -urNp linux-2.6.32.33/include/linux/mod_devicetable.h linux-2.6.32.33/inclu
struct hid_device_id {
__u16 bus;
-diff -urNp linux-2.6.32.33/include/linux/module.h linux-2.6.32.33/include/linux/module.h
---- linux-2.6.32.33/include/linux/module.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/module.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/module.h linux-2.6.32.35/include/linux/module.h
+--- linux-2.6.32.35/include/linux/module.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/module.h 2010-12-31 14:46:53.000000000 -0500
@@ -287,16 +287,16 @@ struct module
int (*init)(void);
@@ -49757,9 +49937,9 @@ diff -urNp linux-2.6.32.33/include/linux/module.h linux-2.6.32.33/include/linux/
}
/* Search for module by name: must hold module_mutex. */
-diff -urNp linux-2.6.32.33/include/linux/moduleloader.h linux-2.6.32.33/include/linux/moduleloader.h
---- linux-2.6.32.33/include/linux/moduleloader.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/moduleloader.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/moduleloader.h linux-2.6.32.35/include/linux/moduleloader.h
+--- linux-2.6.32.35/include/linux/moduleloader.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/moduleloader.h 2010-12-31 14:46:53.000000000 -0500
@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
sections. Returns NULL on failure. */
void *module_alloc(unsigned long size);
@@ -49782,9 +49962,9 @@ diff -urNp linux-2.6.32.33/include/linux/moduleloader.h linux-2.6.32.33/include/
/* Apply the given relocation to the (simplified) ELF. Return -error
or 0. */
int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-2.6.32.33/include/linux/moduleparam.h linux-2.6.32.33/include/linux/moduleparam.h
---- linux-2.6.32.33/include/linux/moduleparam.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/moduleparam.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/moduleparam.h linux-2.6.32.35/include/linux/moduleparam.h
+--- linux-2.6.32.35/include/linux/moduleparam.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/moduleparam.h 2010-12-31 14:46:53.000000000 -0500
@@ -132,7 +132,7 @@ struct kparam_array
/* Actually copy string: maxlen param is usually sizeof(string). */
@@ -49803,9 +49983,9 @@ diff -urNp linux-2.6.32.33/include/linux/moduleparam.h linux-2.6.32.33/include/l
= { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type,\
sizeof(array[0]), array }; \
__module_param_call(MODULE_PARAM_PREFIX, name, \
-diff -urNp linux-2.6.32.33/include/linux/namei.h linux-2.6.32.33/include/linux/namei.h
---- linux-2.6.32.33/include/linux/namei.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/namei.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/namei.h linux-2.6.32.35/include/linux/namei.h
+--- linux-2.6.32.35/include/linux/namei.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/namei.h 2010-12-31 14:46:53.000000000 -0500
@@ -22,7 +22,7 @@ struct nameidata {
unsigned int flags;
int last_type;
@@ -49830,9 +50010,9 @@ diff -urNp linux-2.6.32.33/include/linux/namei.h linux-2.6.32.33/include/linux/n
{
return nd->saved_names[nd->depth];
}
-diff -urNp linux-2.6.32.33/include/linux/netfilter/xt_gradm.h linux-2.6.32.33/include/linux/netfilter/xt_gradm.h
---- linux-2.6.32.33/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/include/linux/netfilter/xt_gradm.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/netfilter/xt_gradm.h linux-2.6.32.35/include/linux/netfilter/xt_gradm.h
+--- linux-2.6.32.35/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/include/linux/netfilter/xt_gradm.h 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,9 @@
+#ifndef _LINUX_NETFILTER_XT_GRADM_H
+#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -49843,9 +50023,9 @@ diff -urNp linux-2.6.32.33/include/linux/netfilter/xt_gradm.h linux-2.6.32.33/in
+};
+
+#endif
-diff -urNp linux-2.6.32.33/include/linux/nodemask.h linux-2.6.32.33/include/linux/nodemask.h
---- linux-2.6.32.33/include/linux/nodemask.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/nodemask.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/nodemask.h linux-2.6.32.35/include/linux/nodemask.h
+--- linux-2.6.32.35/include/linux/nodemask.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/nodemask.h 2010-12-31 14:46:53.000000000 -0500
@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
#define any_online_node(mask) \
@@ -49862,9 +50042,9 @@ diff -urNp linux-2.6.32.33/include/linux/nodemask.h linux-2.6.32.33/include/linu
})
#define num_online_nodes() num_node_state(N_ONLINE)
-diff -urNp linux-2.6.32.33/include/linux/oprofile.h linux-2.6.32.33/include/linux/oprofile.h
---- linux-2.6.32.33/include/linux/oprofile.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/oprofile.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/oprofile.h linux-2.6.32.35/include/linux/oprofile.h
+--- linux-2.6.32.35/include/linux/oprofile.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/oprofile.h 2010-12-31 14:46:53.000000000 -0500
@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
char const * name, ulong * val);
@@ -49877,9 +50057,9 @@ diff -urNp linux-2.6.32.33/include/linux/oprofile.h linux-2.6.32.33/include/linu
/** create a directory */
struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-2.6.32.33/include/linux/pipe_fs_i.h linux-2.6.32.33/include/linux/pipe_fs_i.h
---- linux-2.6.32.33/include/linux/pipe_fs_i.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/pipe_fs_i.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/pipe_fs_i.h linux-2.6.32.35/include/linux/pipe_fs_i.h
+--- linux-2.6.32.35/include/linux/pipe_fs_i.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/pipe_fs_i.h 2010-12-31 14:46:53.000000000 -0500
@@ -46,9 +46,9 @@ struct pipe_inode_info {
wait_queue_head_t wait;
unsigned int nrbufs, curbuf;
@@ -49893,9 +50073,9 @@ diff -urNp linux-2.6.32.33/include/linux/pipe_fs_i.h linux-2.6.32.33/include/lin
unsigned int r_counter;
unsigned int w_counter;
struct fasync_struct *fasync_readers;
-diff -urNp linux-2.6.32.33/include/linux/poison.h linux-2.6.32.33/include/linux/poison.h
---- linux-2.6.32.33/include/linux/poison.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/poison.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/poison.h linux-2.6.32.35/include/linux/poison.h
+--- linux-2.6.32.35/include/linux/poison.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/poison.h 2010-12-31 14:46:53.000000000 -0500
@@ -19,8 +19,8 @@
* under normal circumstances, used to verify that nobody uses
* non-initialized list entries.
@@ -49907,9 +50087,9 @@ diff -urNp linux-2.6.32.33/include/linux/poison.h linux-2.6.32.33/include/linux/
/********** include/linux/timer.h **********/
/*
-diff -urNp linux-2.6.32.33/include/linux/proc_fs.h linux-2.6.32.33/include/linux/proc_fs.h
---- linux-2.6.32.33/include/linux/proc_fs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/proc_fs.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/proc_fs.h linux-2.6.32.35/include/linux/proc_fs.h
+--- linux-2.6.32.35/include/linux/proc_fs.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/proc_fs.h 2010-12-31 14:46:53.000000000 -0500
@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
return proc_create_data(name, mode, parent, proc_fops, NULL);
}
@@ -49930,9 +50110,25 @@ diff -urNp linux-2.6.32.33/include/linux/proc_fs.h linux-2.6.32.33/include/linux
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.33/include/linux/random.h linux-2.6.32.33/include/linux/random.h
---- linux-2.6.32.33/include/linux/random.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/random.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/ptrace.h linux-2.6.32.35/include/linux/ptrace.h
+--- linux-2.6.32.35/include/linux/ptrace.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/ptrace.h 2011-03-26 19:43:36.000000000 -0400
+@@ -96,10 +96,10 @@ extern void __ptrace_unlink(struct task_
+ extern void exit_ptrace(struct task_struct *tracer);
+ #define PTRACE_MODE_READ 1
+ #define PTRACE_MODE_ATTACH 2
+-/* Returns 0 on success, -errno on denial. */
+-extern int __ptrace_may_access(struct task_struct *task, unsigned int mode);
+ /* Returns true on success, false on denial. */
+ extern bool ptrace_may_access(struct task_struct *task, unsigned int mode);
++/* Returns true on success, false on denial. */
++extern bool ptrace_may_access_log(struct task_struct *task, unsigned int mode);
+
+ static inline int ptrace_reparented(struct task_struct *child)
+ {
+diff -urNp linux-2.6.32.35/include/linux/random.h linux-2.6.32.35/include/linux/random.h
+--- linux-2.6.32.35/include/linux/random.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/random.h 2010-12-31 14:46:53.000000000 -0500
@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
u32 random32(void);
void srandom32(u32 seed);
@@ -49945,9 +50141,9 @@ diff -urNp linux-2.6.32.33/include/linux/random.h linux-2.6.32.33/include/linux/
#endif /* __KERNEL___ */
#endif /* _LINUX_RANDOM_H */
-diff -urNp linux-2.6.32.33/include/linux/reiserfs_fs.h linux-2.6.32.33/include/linux/reiserfs_fs.h
---- linux-2.6.32.33/include/linux/reiserfs_fs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/reiserfs_fs.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/reiserfs_fs.h linux-2.6.32.35/include/linux/reiserfs_fs.h
+--- linux-2.6.32.35/include/linux/reiserfs_fs.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/reiserfs_fs.h 2010-12-31 14:46:53.000000000 -0500
@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
#define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
@@ -49994,9 +50190,9 @@ diff -urNp linux-2.6.32.33/include/linux/reiserfs_fs.h linux-2.6.32.33/include/l
#define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
#define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
-diff -urNp linux-2.6.32.33/include/linux/reiserfs_fs_sb.h linux-2.6.32.33/include/linux/reiserfs_fs_sb.h
---- linux-2.6.32.33/include/linux/reiserfs_fs_sb.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/reiserfs_fs_sb.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/reiserfs_fs_sb.h linux-2.6.32.35/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.32.35/include/linux/reiserfs_fs_sb.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/reiserfs_fs_sb.h 2010-12-31 14:46:53.000000000 -0500
@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
/* Comment? -Hans */
wait_queue_head_t s_wait;
@@ -50006,9 +50202,9 @@ diff -urNp linux-2.6.32.33/include/linux/reiserfs_fs_sb.h linux-2.6.32.33/includ
// tree gets re-balanced
unsigned long s_properties; /* File system properties. Currently holds
on-disk FS format */
-diff -urNp linux-2.6.32.33/include/linux/sched.h linux-2.6.32.33/include/linux/sched.h
---- linux-2.6.32.33/include/linux/sched.h 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/include/linux/sched.h 2011-03-21 17:34:54.000000000 -0400
+diff -urNp linux-2.6.32.35/include/linux/sched.h linux-2.6.32.35/include/linux/sched.h
+--- linux-2.6.32.35/include/linux/sched.h 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/include/linux/sched.h 2011-03-26 20:00:09.000000000 -0400
@@ -101,6 +101,7 @@ struct bio;
struct fs_struct;
struct bts_context;
@@ -50110,7 +50306,7 @@ diff -urNp linux-2.6.32.33/include/linux/sched.h linux-2.6.32.33/include/linux/s
struct io_context *io_context;
unsigned long ptrace_message;
-@@ -1519,6 +1535,20 @@ struct task_struct {
+@@ -1519,6 +1535,21 @@ struct task_struct {
unsigned long default_timer_slack_ns;
struct list_head *scm_work_list;
@@ -50122,6 +50318,7 @@ diff -urNp linux-2.6.32.33/include/linux/sched.h linux-2.6.32.33/include/linux/s
+ struct acl_role_label *role;
+ struct file *exec_file;
+ u16 acl_role_id;
++ /* is this the task that authenticated to the special role */
+ u8 acl_sp_role;
+ u8 is_writable;
+ u8 brute;
@@ -50131,7 +50328,7 @@ diff -urNp linux-2.6.32.33/include/linux/sched.h linux-2.6.32.33/include/linux/s
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
/* Index of current stored adress in ret_stack */
int curr_ret_stack;
-@@ -1542,6 +1572,52 @@ struct task_struct {
+@@ -1542,6 +1573,52 @@ struct task_struct {
#endif /* CONFIG_TRACING */
};
@@ -50184,7 +50381,7 @@ diff -urNp linux-2.6.32.33/include/linux/sched.h linux-2.6.32.33/include/linux/s
/* Future-safe accessor for struct task_struct's cpus_allowed. */
#define tsk_cpumask(tsk) (&(tsk)->cpus_allowed)
-@@ -2155,7 +2231,7 @@ extern void __cleanup_sighand(struct sig
+@@ -2155,7 +2232,7 @@ extern void __cleanup_sighand(struct sig
extern void exit_itimers(struct signal_struct *);
extern void flush_itimer_signals(void);
@@ -50193,7 +50390,7 @@ diff -urNp linux-2.6.32.33/include/linux/sched.h linux-2.6.32.33/include/linux/s
extern void daemonize(const char *, ...);
extern int allow_signal(int);
-@@ -2268,8 +2344,8 @@ static inline void unlock_task_sighand(s
+@@ -2268,8 +2345,8 @@ static inline void unlock_task_sighand(s
#ifndef __HAVE_THREAD_FUNCTIONS
@@ -50204,7 +50401,7 @@ diff -urNp linux-2.6.32.33/include/linux/sched.h linux-2.6.32.33/include/linux/s
static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org)
{
-@@ -2284,13 +2360,17 @@ static inline unsigned long *end_of_stac
+@@ -2284,13 +2361,17 @@ static inline unsigned long *end_of_stac
#endif
@@ -50224,9 +50421,9 @@ diff -urNp linux-2.6.32.33/include/linux/sched.h linux-2.6.32.33/include/linux/s
extern void thread_info_cache_init(void);
#ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-2.6.32.33/include/linux/screen_info.h linux-2.6.32.33/include/linux/screen_info.h
---- linux-2.6.32.33/include/linux/screen_info.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/screen_info.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/screen_info.h linux-2.6.32.35/include/linux/screen_info.h
+--- linux-2.6.32.35/include/linux/screen_info.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/screen_info.h 2010-12-31 14:46:53.000000000 -0500
@@ -42,7 +42,8 @@ struct screen_info {
__u16 pages; /* 0x32 */
__u16 vesa_attributes; /* 0x34 */
@@ -50237,9 +50434,9 @@ diff -urNp linux-2.6.32.33/include/linux/screen_info.h linux-2.6.32.33/include/l
} __attribute__((packed));
#define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
-diff -urNp linux-2.6.32.33/include/linux/security.h linux-2.6.32.33/include/linux/security.h
---- linux-2.6.32.33/include/linux/security.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/security.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/security.h linux-2.6.32.35/include/linux/security.h
+--- linux-2.6.32.35/include/linux/security.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/security.h 2010-12-31 14:46:53.000000000 -0500
@@ -34,6 +34,7 @@
#include <linux/key.h>
#include <linux/xfrm.h>
@@ -50248,9 +50445,9 @@ diff -urNp linux-2.6.32.33/include/linux/security.h linux-2.6.32.33/include/linu
#include <net/flow.h>
/* Maximum number of letters for an LSM name string */
-diff -urNp linux-2.6.32.33/include/linux/shm.h linux-2.6.32.33/include/linux/shm.h
---- linux-2.6.32.33/include/linux/shm.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/shm.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/shm.h linux-2.6.32.35/include/linux/shm.h
+--- linux-2.6.32.35/include/linux/shm.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/shm.h 2010-12-31 14:46:53.000000000 -0500
@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
pid_t shm_cprid;
pid_t shm_lprid;
@@ -50262,9 +50459,9 @@ diff -urNp linux-2.6.32.33/include/linux/shm.h linux-2.6.32.33/include/linux/shm
};
/* shm_mode upper byte flags */
-diff -urNp linux-2.6.32.33/include/linux/skbuff.h linux-2.6.32.33/include/linux/skbuff.h
---- linux-2.6.32.33/include/linux/skbuff.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/skbuff.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/skbuff.h linux-2.6.32.35/include/linux/skbuff.h
+--- linux-2.6.32.35/include/linux/skbuff.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/skbuff.h 2010-12-31 14:46:53.000000000 -0500
@@ -544,7 +544,7 @@ static inline union skb_shared_tx *skb_t
*/
static inline int skb_queue_empty(const struct sk_buff_head *list)
@@ -50292,9 +50489,9 @@ diff -urNp linux-2.6.32.33/include/linux/skbuff.h linux-2.6.32.33/include/linux/
}
/**
-diff -urNp linux-2.6.32.33/include/linux/slab.h linux-2.6.32.33/include/linux/slab.h
---- linux-2.6.32.33/include/linux/slab.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/slab.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/slab.h linux-2.6.32.35/include/linux/slab.h
+--- linux-2.6.32.35/include/linux/slab.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/slab.h 2010-12-31 14:46:53.000000000 -0500
@@ -11,6 +11,7 @@
#include <linux/gfp.h>
@@ -50366,9 +50563,9 @@ diff -urNp linux-2.6.32.33/include/linux/slab.h linux-2.6.32.33/include/linux/sl
+})
+
#endif /* _LINUX_SLAB_H */
-diff -urNp linux-2.6.32.33/include/linux/slub_def.h linux-2.6.32.33/include/linux/slub_def.h
---- linux-2.6.32.33/include/linux/slub_def.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/slub_def.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/slub_def.h linux-2.6.32.35/include/linux/slub_def.h
+--- linux-2.6.32.35/include/linux/slub_def.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/slub_def.h 2010-12-31 14:46:53.000000000 -0500
@@ -86,7 +86,7 @@ struct kmem_cache {
struct kmem_cache_order_objects max;
struct kmem_cache_order_objects min;
@@ -50378,9 +50575,9 @@ diff -urNp linux-2.6.32.33/include/linux/slub_def.h linux-2.6.32.33/include/linu
void (*ctor)(void *);
int inuse; /* Offset to metadata */
int align; /* Alignment */
-diff -urNp linux-2.6.32.33/include/linux/sonet.h linux-2.6.32.33/include/linux/sonet.h
---- linux-2.6.32.33/include/linux/sonet.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/sonet.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/sonet.h linux-2.6.32.35/include/linux/sonet.h
+--- linux-2.6.32.35/include/linux/sonet.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/sonet.h 2010-12-31 14:46:53.000000000 -0500
@@ -61,7 +61,7 @@ struct sonet_stats {
#include <asm/atomic.h>
@@ -50390,9 +50587,9 @@ diff -urNp linux-2.6.32.33/include/linux/sonet.h linux-2.6.32.33/include/linux/s
__SONET_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-2.6.32.33/include/linux/sunrpc/clnt.h linux-2.6.32.33/include/linux/sunrpc/clnt.h
---- linux-2.6.32.33/include/linux/sunrpc/clnt.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/sunrpc/clnt.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/sunrpc/clnt.h linux-2.6.32.35/include/linux/sunrpc/clnt.h
+--- linux-2.6.32.35/include/linux/sunrpc/clnt.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/sunrpc/clnt.h 2010-12-31 14:46:53.000000000 -0500
@@ -167,9 +167,9 @@ static inline unsigned short rpc_get_por
{
switch (sap->sa_family) {
@@ -50423,9 +50620,9 @@ diff -urNp linux-2.6.32.33/include/linux/sunrpc/clnt.h linux-2.6.32.33/include/l
}
#endif /* __KERNEL__ */
-diff -urNp linux-2.6.32.33/include/linux/suspend.h linux-2.6.32.33/include/linux/suspend.h
---- linux-2.6.32.33/include/linux/suspend.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/suspend.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/suspend.h linux-2.6.32.35/include/linux/suspend.h
+--- linux-2.6.32.35/include/linux/suspend.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/suspend.h 2010-12-31 14:46:53.000000000 -0500
@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
* which require special recovery actions in that situation.
*/
@@ -50514,9 +50711,9 @@ diff -urNp linux-2.6.32.33/include/linux/suspend.h linux-2.6.32.33/include/linux
static inline int hibernate(void) { return -ENOSYS; }
static inline bool system_entering_hibernation(void) { return false; }
#endif /* CONFIG_HIBERNATION */
-diff -urNp linux-2.6.32.33/include/linux/sysctl.h linux-2.6.32.33/include/linux/sysctl.h
---- linux-2.6.32.33/include/linux/sysctl.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/sysctl.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/sysctl.h linux-2.6.32.35/include/linux/sysctl.h
+--- linux-2.6.32.35/include/linux/sysctl.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/sysctl.h 2010-12-31 14:46:53.000000000 -0500
@@ -164,7 +164,11 @@ enum
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
};
@@ -50547,9 +50744,9 @@ diff -urNp linux-2.6.32.33/include/linux/sysctl.h linux-2.6.32.33/include/linux/
extern ctl_handler sysctl_intvec;
extern ctl_handler sysctl_jiffies;
extern ctl_handler sysctl_ms_jiffies;
-diff -urNp linux-2.6.32.33/include/linux/sysfs.h linux-2.6.32.33/include/linux/sysfs.h
---- linux-2.6.32.33/include/linux/sysfs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/sysfs.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/sysfs.h linux-2.6.32.35/include/linux/sysfs.h
+--- linux-2.6.32.35/include/linux/sysfs.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/sysfs.h 2010-12-31 14:46:53.000000000 -0500
@@ -75,8 +75,8 @@ struct bin_attribute {
};
@@ -50561,9 +50758,9 @@ diff -urNp linux-2.6.32.33/include/linux/sysfs.h linux-2.6.32.33/include/linux/s
};
struct sysfs_dirent;
-diff -urNp linux-2.6.32.33/include/linux/thread_info.h linux-2.6.32.33/include/linux/thread_info.h
---- linux-2.6.32.33/include/linux/thread_info.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/thread_info.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/thread_info.h linux-2.6.32.35/include/linux/thread_info.h
+--- linux-2.6.32.35/include/linux/thread_info.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/thread_info.h 2010-12-31 14:46:53.000000000 -0500
@@ -23,7 +23,7 @@ struct restart_block {
};
/* For futex_wait and futex_wait_requeue_pi */
@@ -50573,9 +50770,9 @@ diff -urNp linux-2.6.32.33/include/linux/thread_info.h linux-2.6.32.33/include/l
u32 val;
u32 flags;
u32 bitset;
-diff -urNp linux-2.6.32.33/include/linux/tty.h linux-2.6.32.33/include/linux/tty.h
---- linux-2.6.32.33/include/linux/tty.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/tty.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/tty.h linux-2.6.32.35/include/linux/tty.h
+--- linux-2.6.32.35/include/linux/tty.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/tty.h 2010-12-31 14:46:53.000000000 -0500
@@ -13,6 +13,7 @@
#include <linux/tty_driver.h>
#include <linux/tty_ldisc.h>
@@ -50611,9 +50808,9 @@ diff -urNp linux-2.6.32.33/include/linux/tty.h linux-2.6.32.33/include/linux/tty
/* n_tty.c */
extern struct tty_ldisc_ops tty_ldisc_N_TTY;
-diff -urNp linux-2.6.32.33/include/linux/tty_ldisc.h linux-2.6.32.33/include/linux/tty_ldisc.h
---- linux-2.6.32.33/include/linux/tty_ldisc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/tty_ldisc.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/tty_ldisc.h linux-2.6.32.35/include/linux/tty_ldisc.h
+--- linux-2.6.32.35/include/linux/tty_ldisc.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/tty_ldisc.h 2010-12-31 14:46:53.000000000 -0500
@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
struct module *owner;
@@ -50623,9 +50820,9 @@ diff -urNp linux-2.6.32.33/include/linux/tty_ldisc.h linux-2.6.32.33/include/lin
};
struct tty_ldisc {
-diff -urNp linux-2.6.32.33/include/linux/types.h linux-2.6.32.33/include/linux/types.h
---- linux-2.6.32.33/include/linux/types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/types.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/types.h linux-2.6.32.35/include/linux/types.h
+--- linux-2.6.32.35/include/linux/types.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/types.h 2010-12-31 14:46:53.000000000 -0500
@@ -191,10 +191,26 @@ typedef struct {
volatile int counter;
} atomic_t;
@@ -50653,9 +50850,9 @@ diff -urNp linux-2.6.32.33/include/linux/types.h linux-2.6.32.33/include/linux/t
#endif
struct ustat {
-diff -urNp linux-2.6.32.33/include/linux/uaccess.h linux-2.6.32.33/include/linux/uaccess.h
---- linux-2.6.32.33/include/linux/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/uaccess.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/uaccess.h linux-2.6.32.35/include/linux/uaccess.h
+--- linux-2.6.32.35/include/linux/uaccess.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/uaccess.h 2010-12-31 14:46:53.000000000 -0500
@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
long ret; \
mm_segment_t old_fs = get_fs(); \
@@ -50687,9 +50884,9 @@ diff -urNp linux-2.6.32.33/include/linux/uaccess.h linux-2.6.32.33/include/linux
+extern long probe_kernel_write(void *dst, const void *src, size_t size);
#endif /* __LINUX_UACCESS_H__ */
-diff -urNp linux-2.6.32.33/include/linux/unaligned/access_ok.h linux-2.6.32.33/include/linux/unaligned/access_ok.h
---- linux-2.6.32.33/include/linux/unaligned/access_ok.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/unaligned/access_ok.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/unaligned/access_ok.h linux-2.6.32.35/include/linux/unaligned/access_ok.h
+--- linux-2.6.32.35/include/linux/unaligned/access_ok.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/unaligned/access_ok.h 2010-12-31 14:46:53.000000000 -0500
@@ -6,32 +6,32 @@
static inline u16 get_unaligned_le16(const void *p)
@@ -50729,9 +50926,9 @@ diff -urNp linux-2.6.32.33/include/linux/unaligned/access_ok.h linux-2.6.32.33/i
}
static inline void put_unaligned_le16(u16 val, void *p)
-diff -urNp linux-2.6.32.33/include/linux/vmalloc.h linux-2.6.32.33/include/linux/vmalloc.h
---- linux-2.6.32.33/include/linux/vmalloc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/linux/vmalloc.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/vmalloc.h linux-2.6.32.35/include/linux/vmalloc.h
+--- linux-2.6.32.35/include/linux/vmalloc.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/linux/vmalloc.h 2010-12-31 14:46:53.000000000 -0500
@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
#define VM_MAP 0x00000004 /* vmap()ed pages */
#define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
@@ -50826,9 +51023,9 @@ diff -urNp linux-2.6.32.33/include/linux/vmalloc.h linux-2.6.32.33/include/linux
+})
+
#endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-2.6.32.33/include/linux/vmstat.h linux-2.6.32.33/include/linux/vmstat.h
---- linux-2.6.32.33/include/linux/vmstat.h 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.33/include/linux/vmstat.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/linux/vmstat.h linux-2.6.32.35/include/linux/vmstat.h
+--- linux-2.6.32.35/include/linux/vmstat.h 2010-09-26 17:26:05.000000000 -0400
++++ linux-2.6.32.35/include/linux/vmstat.h 2010-12-31 14:46:53.000000000 -0500
@@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in
/*
* Zone based page accounting with per cpu differentials.
@@ -50892,9 +51089,9 @@ diff -urNp linux-2.6.32.33/include/linux/vmstat.h linux-2.6.32.33/include/linux/
}
static inline void __dec_zone_page_state(struct page *page,
-diff -urNp linux-2.6.32.33/include/net/inetpeer.h linux-2.6.32.33/include/net/inetpeer.h
---- linux-2.6.32.33/include/net/inetpeer.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/net/inetpeer.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/net/inetpeer.h linux-2.6.32.35/include/net/inetpeer.h
+--- linux-2.6.32.35/include/net/inetpeer.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/net/inetpeer.h 2010-12-31 14:46:53.000000000 -0500
@@ -24,7 +24,7 @@ struct inet_peer
__u32 dtime; /* the time of last use of not
* referenced entries */
@@ -50904,9 +51101,9 @@ diff -urNp linux-2.6.32.33/include/net/inetpeer.h linux-2.6.32.33/include/net/in
__u32 tcp_ts;
unsigned long tcp_ts_stamp;
};
-diff -urNp linux-2.6.32.33/include/net/irda/ircomm_tty.h linux-2.6.32.33/include/net/irda/ircomm_tty.h
---- linux-2.6.32.33/include/net/irda/ircomm_tty.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/net/irda/ircomm_tty.h 2011-01-25 20:24:47.000000000 -0500
+diff -urNp linux-2.6.32.35/include/net/irda/ircomm_tty.h linux-2.6.32.35/include/net/irda/ircomm_tty.h
+--- linux-2.6.32.35/include/net/irda/ircomm_tty.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/net/irda/ircomm_tty.h 2011-01-25 20:24:47.000000000 -0500
@@ -35,6 +35,7 @@
#include <linux/termios.h>
#include <linux/timer.h>
@@ -50926,9 +51123,9 @@ diff -urNp linux-2.6.32.33/include/net/irda/ircomm_tty.h linux-2.6.32.33/include
/* Protect concurent access to :
* o self->open_count
-diff -urNp linux-2.6.32.33/include/net/neighbour.h linux-2.6.32.33/include/net/neighbour.h
---- linux-2.6.32.33/include/net/neighbour.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/net/neighbour.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/net/neighbour.h linux-2.6.32.35/include/net/neighbour.h
+--- linux-2.6.32.35/include/net/neighbour.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/net/neighbour.h 2010-12-31 14:46:53.000000000 -0500
@@ -125,12 +125,12 @@ struct neighbour
struct neigh_ops
{
@@ -50948,9 +51145,9 @@ diff -urNp linux-2.6.32.33/include/net/neighbour.h linux-2.6.32.33/include/net/n
};
struct pneigh_entry
-diff -urNp linux-2.6.32.33/include/net/netlink.h linux-2.6.32.33/include/net/netlink.h
---- linux-2.6.32.33/include/net/netlink.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/net/netlink.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/net/netlink.h linux-2.6.32.35/include/net/netlink.h
+--- linux-2.6.32.35/include/net/netlink.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/net/netlink.h 2010-12-31 14:46:53.000000000 -0500
@@ -558,7 +558,7 @@ static inline void *nlmsg_get_pos(struct
static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
{
@@ -50960,9 +51157,9 @@ diff -urNp linux-2.6.32.33/include/net/netlink.h linux-2.6.32.33/include/net/net
}
/**
-diff -urNp linux-2.6.32.33/include/net/sctp/sctp.h linux-2.6.32.33/include/net/sctp/sctp.h
---- linux-2.6.32.33/include/net/sctp/sctp.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/net/sctp/sctp.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/net/sctp/sctp.h linux-2.6.32.35/include/net/sctp/sctp.h
+--- linux-2.6.32.35/include/net/sctp/sctp.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/net/sctp/sctp.h 2010-12-31 14:46:53.000000000 -0500
@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
#else /* SCTP_DEBUG */
@@ -50974,9 +51171,9 @@ diff -urNp linux-2.6.32.33/include/net/sctp/sctp.h linux-2.6.32.33/include/net/s
#define SCTP_ENABLE_DEBUG
#define SCTP_DISABLE_DEBUG
#define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-2.6.32.33/include/net/tcp.h linux-2.6.32.33/include/net/tcp.h
---- linux-2.6.32.33/include/net/tcp.h 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.33/include/net/tcp.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/net/tcp.h linux-2.6.32.35/include/net/tcp.h
+--- linux-2.6.32.35/include/net/tcp.h 2010-09-26 17:26:05.000000000 -0400
++++ linux-2.6.32.35/include/net/tcp.h 2010-12-31 14:46:53.000000000 -0500
@@ -1444,6 +1444,7 @@ enum tcp_seq_states {
struct tcp_seq_afinfo {
char *name;
@@ -50985,9 +51182,9 @@ diff -urNp linux-2.6.32.33/include/net/tcp.h linux-2.6.32.33/include/net/tcp.h
struct file_operations seq_fops;
struct seq_operations seq_ops;
};
-diff -urNp linux-2.6.32.33/include/net/udp.h linux-2.6.32.33/include/net/udp.h
---- linux-2.6.32.33/include/net/udp.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/net/udp.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/net/udp.h linux-2.6.32.35/include/net/udp.h
+--- linux-2.6.32.35/include/net/udp.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/net/udp.h 2010-12-31 14:46:53.000000000 -0500
@@ -187,6 +187,7 @@ struct udp_seq_afinfo {
char *name;
sa_family_t family;
@@ -50996,9 +51193,9 @@ diff -urNp linux-2.6.32.33/include/net/udp.h linux-2.6.32.33/include/net/udp.h
struct file_operations seq_fops;
struct seq_operations seq_ops;
};
-diff -urNp linux-2.6.32.33/include/sound/ac97_codec.h linux-2.6.32.33/include/sound/ac97_codec.h
---- linux-2.6.32.33/include/sound/ac97_codec.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/sound/ac97_codec.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/sound/ac97_codec.h linux-2.6.32.35/include/sound/ac97_codec.h
+--- linux-2.6.32.35/include/sound/ac97_codec.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/sound/ac97_codec.h 2010-12-31 14:46:53.000000000 -0500
@@ -419,15 +419,15 @@
struct snd_ac97;
@@ -51031,9 +51228,9 @@ diff -urNp linux-2.6.32.33/include/sound/ac97_codec.h linux-2.6.32.33/include/so
void *private_data;
void (*private_free) (struct snd_ac97 *ac97);
/* --- */
-diff -urNp linux-2.6.32.33/include/trace/events/irq.h linux-2.6.32.33/include/trace/events/irq.h
---- linux-2.6.32.33/include/trace/events/irq.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/trace/events/irq.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/trace/events/irq.h linux-2.6.32.35/include/trace/events/irq.h
+--- linux-2.6.32.35/include/trace/events/irq.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/trace/events/irq.h 2010-12-31 14:46:53.000000000 -0500
@@ -34,7 +34,7 @@
*/
TRACE_EVENT(irq_handler_entry,
@@ -51070,9 +51267,9 @@ diff -urNp linux-2.6.32.33/include/trace/events/irq.h linux-2.6.32.33/include/tr
TP_ARGS(h, vec),
-diff -urNp linux-2.6.32.33/include/video/uvesafb.h linux-2.6.32.33/include/video/uvesafb.h
---- linux-2.6.32.33/include/video/uvesafb.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/include/video/uvesafb.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/include/video/uvesafb.h linux-2.6.32.35/include/video/uvesafb.h
+--- linux-2.6.32.35/include/video/uvesafb.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/include/video/uvesafb.h 2010-12-31 14:46:53.000000000 -0500
@@ -177,6 +177,7 @@ struct uvesafb_par {
u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
u8 pmi_setpal; /* PMI for palette changes */
@@ -51081,9 +51278,9 @@ diff -urNp linux-2.6.32.33/include/video/uvesafb.h linux-2.6.32.33/include/video
void *pmi_start;
void *pmi_pal;
u8 *vbe_state_orig; /*
-diff -urNp linux-2.6.32.33/init/do_mounts.c linux-2.6.32.33/init/do_mounts.c
---- linux-2.6.32.33/init/do_mounts.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/init/do_mounts.c 2011-01-04 17:42:43.000000000 -0500
+diff -urNp linux-2.6.32.35/init/do_mounts.c linux-2.6.32.35/init/do_mounts.c
+--- linux-2.6.32.35/init/do_mounts.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/init/do_mounts.c 2011-01-04 17:42:43.000000000 -0500
@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -51129,9 +51326,9 @@ diff -urNp linux-2.6.32.33/init/do_mounts.c linux-2.6.32.33/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.33/init/do_mounts.h linux-2.6.32.33/init/do_mounts.h
---- linux-2.6.32.33/init/do_mounts.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/init/do_mounts.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/init/do_mounts.h linux-2.6.32.35/init/do_mounts.h
+--- linux-2.6.32.35/init/do_mounts.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/init/do_mounts.h 2010-12-31 14:46:53.000000000 -0500
@@ -15,15 +15,15 @@ extern int root_mountflags;
static inline int create_dev(char *name, dev_t dev)
@@ -51151,9 +51348,9 @@ diff -urNp linux-2.6.32.33/init/do_mounts.h linux-2.6.32.33/init/do_mounts.h
return 0;
if (!S_ISBLK(stat.st_mode))
return 0;
-diff -urNp linux-2.6.32.33/init/do_mounts_initrd.c linux-2.6.32.33/init/do_mounts_initrd.c
---- linux-2.6.32.33/init/do_mounts_initrd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/init/do_mounts_initrd.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/init/do_mounts_initrd.c linux-2.6.32.35/init/do_mounts_initrd.c
+--- linux-2.6.32.35/init/do_mounts_initrd.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/init/do_mounts_initrd.c 2010-12-31 14:46:53.000000000 -0500
@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
sys_close(old_fd);sys_close(root_fd);
sys_close(0);sys_close(1);sys_close(2);
@@ -51237,9 +51434,9 @@ diff -urNp linux-2.6.32.33/init/do_mounts_initrd.c linux-2.6.32.33/init/do_mount
+ sys_unlink((__force const char __user *)"/initrd.image");
return 0;
}
-diff -urNp linux-2.6.32.33/init/do_mounts_md.c linux-2.6.32.33/init/do_mounts_md.c
---- linux-2.6.32.33/init/do_mounts_md.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/init/do_mounts_md.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/init/do_mounts_md.c linux-2.6.32.35/init/do_mounts_md.c
+--- linux-2.6.32.35/init/do_mounts_md.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/init/do_mounts_md.c 2010-12-31 14:46:53.000000000 -0500
@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
partitioned ? "_d" : "", minor,
md_setup_args[ent].device_names);
@@ -51267,9 +51464,9 @@ diff -urNp linux-2.6.32.33/init/do_mounts_md.c linux-2.6.32.33/init/do_mounts_md
if (fd >= 0) {
sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
sys_close(fd);
-diff -urNp linux-2.6.32.33/init/initramfs.c linux-2.6.32.33/init/initramfs.c
---- linux-2.6.32.33/init/initramfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/init/initramfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/init/initramfs.c linux-2.6.32.35/init/initramfs.c
+--- linux-2.6.32.35/init/initramfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/init/initramfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -74,7 +74,7 @@ static void __init free_hash(void)
}
}
@@ -51378,9 +51575,9 @@ diff -urNp linux-2.6.32.33/init/initramfs.c linux-2.6.32.33/init/initramfs.c
state = SkipIt;
next_state = Reset;
return 0;
-diff -urNp linux-2.6.32.33/init/Kconfig linux-2.6.32.33/init/Kconfig
---- linux-2.6.32.33/init/Kconfig 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/init/Kconfig 2011-02-22 15:57:24.000000000 -0500
+diff -urNp linux-2.6.32.35/init/Kconfig linux-2.6.32.35/init/Kconfig
+--- linux-2.6.32.35/init/Kconfig 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/init/Kconfig 2011-02-22 15:57:24.000000000 -0500
@@ -1004,7 +1004,7 @@ config SLUB_DEBUG
config COMPAT_BRK
@@ -51390,9 +51587,9 @@ diff -urNp linux-2.6.32.33/init/Kconfig linux-2.6.32.33/init/Kconfig
help
Randomizing heap placement makes heap exploits harder, but it
also breaks ancient binaries (including anything libc5 based).
-diff -urNp linux-2.6.32.33/init/main.c linux-2.6.32.33/init/main.c
---- linux-2.6.32.33/init/main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/init/main.c 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/init/main.c linux-2.6.32.35/init/main.c
+--- linux-2.6.32.35/init/main.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/init/main.c 2010-12-31 14:47:01.000000000 -0500
@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
#ifdef CONFIG_TC
extern void tc_init(void);
@@ -51534,9 +51731,9 @@ diff -urNp linux-2.6.32.33/init/main.c linux-2.6.32.33/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.33/init/noinitramfs.c linux-2.6.32.33/init/noinitramfs.c
---- linux-2.6.32.33/init/noinitramfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/init/noinitramfs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/init/noinitramfs.c linux-2.6.32.35/init/noinitramfs.c
+--- linux-2.6.32.35/init/noinitramfs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/init/noinitramfs.c 2010-12-31 14:46:53.000000000 -0500
@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
{
int err;
@@ -51555,9 +51752,9 @@ diff -urNp linux-2.6.32.33/init/noinitramfs.c linux-2.6.32.33/init/noinitramfs.c
if (err < 0)
goto out;
-diff -urNp linux-2.6.32.33/ipc/ipc_sysctl.c linux-2.6.32.33/ipc/ipc_sysctl.c
---- linux-2.6.32.33/ipc/ipc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/ipc/ipc_sysctl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/ipc/ipc_sysctl.c linux-2.6.32.35/ipc/ipc_sysctl.c
+--- linux-2.6.32.35/ipc/ipc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/ipc/ipc_sysctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
.extra1 = &zero,
.extra2 = &one,
@@ -51576,9 +51773,9 @@ diff -urNp linux-2.6.32.33/ipc/ipc_sysctl.c linux-2.6.32.33/ipc/ipc_sysctl.c
};
static int __init ipc_sysctl_init(void)
-diff -urNp linux-2.6.32.33/ipc/mqueue.c linux-2.6.32.33/ipc/mqueue.c
---- linux-2.6.32.33/ipc/mqueue.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/ipc/mqueue.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/ipc/mqueue.c linux-2.6.32.35/ipc/mqueue.c
+--- linux-2.6.32.35/ipc/mqueue.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/ipc/mqueue.c 2010-12-31 14:46:53.000000000 -0500
@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
mq_bytes = (mq_msg_tblsz +
(info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -51587,9 +51784,9 @@ diff -urNp linux-2.6.32.33/ipc/mqueue.c linux-2.6.32.33/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.33/ipc/shm.c linux-2.6.32.33/ipc/shm.c
---- linux-2.6.32.33/ipc/shm.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/ipc/shm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/ipc/shm.c linux-2.6.32.35/ipc/shm.c
+--- linux-2.6.32.35/ipc/shm.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/ipc/shm.c 2010-12-31 14:46:53.000000000 -0500
@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
#endif
@@ -51642,9 +51839,9 @@ diff -urNp linux-2.6.32.33/ipc/shm.c linux-2.6.32.33/ipc/shm.c
size = i_size_read(path.dentry->d_inode);
shm_unlock(shp);
-diff -urNp linux-2.6.32.33/kernel/acct.c linux-2.6.32.33/kernel/acct.c
---- linux-2.6.32.33/kernel/acct.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/acct.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/acct.c linux-2.6.32.35/kernel/acct.c
+--- linux-2.6.32.35/kernel/acct.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/acct.c 2010-12-31 14:46:53.000000000 -0500
@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
*/
flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -51654,9 +51851,9 @@ diff -urNp linux-2.6.32.33/kernel/acct.c linux-2.6.32.33/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.33/kernel/audit.c linux-2.6.32.33/kernel/audit.c
---- linux-2.6.32.33/kernel/audit.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/audit.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/audit.c linux-2.6.32.35/kernel/audit.c
+--- linux-2.6.32.35/kernel/audit.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/audit.c 2010-12-31 14:46:53.000000000 -0500
@@ -891,8 +891,10 @@ static int audit_receive_msg(struct sk_b
spin_unlock_irq(&tsk->sighand->siglock);
}
@@ -51670,9 +51867,9 @@ diff -urNp linux-2.6.32.33/kernel/audit.c linux-2.6.32.33/kernel/audit.c
break;
}
case AUDIT_TTY_SET: {
-diff -urNp linux-2.6.32.33/kernel/capability.c linux-2.6.32.33/kernel/capability.c
---- linux-2.6.32.33/kernel/capability.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/kernel/capability.c 2011-02-22 15:57:24.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/capability.c linux-2.6.32.35/kernel/capability.c
+--- linux-2.6.32.35/kernel/capability.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/kernel/capability.c 2011-02-22 15:57:24.000000000 -0500
@@ -305,10 +305,26 @@ int capable(int cap)
BUG();
}
@@ -51701,9 +51898,9 @@ diff -urNp linux-2.6.32.33/kernel/capability.c linux-2.6.32.33/kernel/capability
+
EXPORT_SYMBOL(capable);
+EXPORT_SYMBOL(capable_nolog);
-diff -urNp linux-2.6.32.33/kernel/configs.c linux-2.6.32.33/kernel/configs.c
---- linux-2.6.32.33/kernel/configs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/configs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/configs.c linux-2.6.32.35/kernel/configs.c
+--- linux-2.6.32.35/kernel/configs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/configs.c 2010-12-31 14:46:53.000000000 -0500
@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
struct proc_dir_entry *entry;
@@ -51724,9 +51921,9 @@ diff -urNp linux-2.6.32.33/kernel/configs.c linux-2.6.32.33/kernel/configs.c
if (!entry)
return -ENOMEM;
-diff -urNp linux-2.6.32.33/kernel/cpu.c linux-2.6.32.33/kernel/cpu.c
---- linux-2.6.32.33/kernel/cpu.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/kernel/cpu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/cpu.c linux-2.6.32.35/kernel/cpu.c
+--- linux-2.6.32.35/kernel/cpu.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.35/kernel/cpu.c 2010-12-31 14:46:53.000000000 -0500
@@ -19,7 +19,7 @@
/* Serializes the updates to cpu_online_mask, cpu_present_mask */
static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -51736,9 +51933,9 @@ diff -urNp linux-2.6.32.33/kernel/cpu.c linux-2.6.32.33/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.33/kernel/cred.c linux-2.6.32.33/kernel/cred.c
---- linux-2.6.32.33/kernel/cred.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/kernel/cred.c 2011-03-02 17:25:35.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/cred.c linux-2.6.32.35/kernel/cred.c
+--- linux-2.6.32.35/kernel/cred.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/kernel/cred.c 2011-03-02 17:25:35.000000000 -0500
@@ -544,6 +544,8 @@ int commit_creds(struct cred *new)
get_cred(new); /* we will require a ref for the subj creds too */
@@ -51748,9 +51945,9 @@ diff -urNp linux-2.6.32.33/kernel/cred.c linux-2.6.32.33/kernel/cred.c
/* dumpability changes */
if (old->euid != new->euid ||
old->egid != new->egid ||
-diff -urNp linux-2.6.32.33/kernel/exit.c linux-2.6.32.33/kernel/exit.c
---- linux-2.6.32.33/kernel/exit.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/kernel/exit.c 2011-02-22 15:58:29.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/exit.c linux-2.6.32.35/kernel/exit.c
+--- linux-2.6.32.35/kernel/exit.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/kernel/exit.c 2011-02-22 15:58:29.000000000 -0500
@@ -55,6 +55,10 @@
#include <asm/pgtable.h>
#include <asm/mmu_context.h>
@@ -51879,9 +52076,9 @@ diff -urNp linux-2.6.32.33/kernel/exit.c linux-2.6.32.33/kernel/exit.c
get_task_struct(p);
read_unlock(&tasklist_lock);
-diff -urNp linux-2.6.32.33/kernel/fork.c linux-2.6.32.33/kernel/fork.c
---- linux-2.6.32.33/kernel/fork.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/kernel/fork.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/fork.c linux-2.6.32.35/kernel/fork.c
+--- linux-2.6.32.35/kernel/fork.c 2010-09-20 17:26:42.000000000 -0400
++++ linux-2.6.32.35/kernel/fork.c 2010-12-31 14:46:53.000000000 -0500
@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
*stackend = STACK_END_MAGIC; /* for overflow detection */
@@ -52020,9 +52217,9 @@ diff -urNp linux-2.6.32.33/kernel/fork.c linux-2.6.32.33/kernel/fork.c
new_fs = NULL;
else
new_fs = fs;
-diff -urNp linux-2.6.32.33/kernel/futex.c linux-2.6.32.33/kernel/futex.c
---- linux-2.6.32.33/kernel/futex.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.33/kernel/futex.c 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/futex.c linux-2.6.32.35/kernel/futex.c
+--- linux-2.6.32.35/kernel/futex.c 2010-11-26 18:22:29.000000000 -0500
++++ linux-2.6.32.35/kernel/futex.c 2010-12-31 14:47:01.000000000 -0500
@@ -54,6 +54,7 @@
#include <linux/mount.h>
#include <linux/pagemap.h>
@@ -52107,9 +52304,9 @@ diff -urNp linux-2.6.32.33/kernel/futex.c linux-2.6.32.33/kernel/futex.c
if (curval == -EFAULT)
futex_cmpxchg_enabled = 1;
-diff -urNp linux-2.6.32.33/kernel/futex_compat.c linux-2.6.32.33/kernel/futex_compat.c
---- linux-2.6.32.33/kernel/futex_compat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/futex_compat.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/futex_compat.c linux-2.6.32.35/kernel/futex_compat.c
+--- linux-2.6.32.35/kernel/futex_compat.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/futex_compat.c 2010-12-31 14:46:53.000000000 -0500
@@ -10,6 +10,7 @@
#include <linux/compat.h>
#include <linux/nsproxy.h>
@@ -52147,9 +52344,9 @@ diff -urNp linux-2.6.32.33/kernel/futex_compat.c linux-2.6.32.33/kernel/futex_co
head = p->compat_robust_list;
read_unlock(&tasklist_lock);
}
-diff -urNp linux-2.6.32.33/kernel/gcov/base.c linux-2.6.32.33/kernel/gcov/base.c
---- linux-2.6.32.33/kernel/gcov/base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/gcov/base.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/gcov/base.c linux-2.6.32.35/kernel/gcov/base.c
+--- linux-2.6.32.35/kernel/gcov/base.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/gcov/base.c 2010-12-31 14:46:53.000000000 -0500
@@ -102,11 +102,6 @@ void gcov_enable_events(void)
}
@@ -52171,9 +52368,9 @@ diff -urNp linux-2.6.32.33/kernel/gcov/base.c linux-2.6.32.33/kernel/gcov/base.c
if (prev)
prev->next = info->next;
else
-diff -urNp linux-2.6.32.33/kernel/hrtimer.c linux-2.6.32.33/kernel/hrtimer.c
---- linux-2.6.32.33/kernel/hrtimer.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.33/kernel/hrtimer.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/hrtimer.c linux-2.6.32.35/kernel/hrtimer.c
+--- linux-2.6.32.35/kernel/hrtimer.c 2010-10-31 16:44:11.000000000 -0400
++++ linux-2.6.32.35/kernel/hrtimer.c 2010-12-31 14:46:53.000000000 -0500
@@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
local_irq_restore(flags);
}
@@ -52183,9 +52380,9 @@ diff -urNp linux-2.6.32.33/kernel/hrtimer.c linux-2.6.32.33/kernel/hrtimer.c
{
hrtimer_peek_ahead_timers();
}
-diff -urNp linux-2.6.32.33/kernel/kallsyms.c linux-2.6.32.33/kernel/kallsyms.c
---- linux-2.6.32.33/kernel/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/kallsyms.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/kallsyms.c linux-2.6.32.35/kernel/kallsyms.c
+--- linux-2.6.32.35/kernel/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/kallsyms.c 2010-12-31 14:46:53.000000000 -0500
@@ -11,6 +11,9 @@
* Changed the compression method from stem compression to "table lookup"
* compression (see scripts/kallsyms.c for a more complete description)
@@ -52288,9 +52485,9 @@ diff -urNp linux-2.6.32.33/kernel/kallsyms.c linux-2.6.32.33/kernel/kallsyms.c
if (!iter)
return -ENOMEM;
reset_iter(iter, 0);
-diff -urNp linux-2.6.32.33/kernel/kgdb.c linux-2.6.32.33/kernel/kgdb.c
---- linux-2.6.32.33/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/kgdb.c linux-2.6.32.35/kernel/kgdb.c
+--- linux-2.6.32.35/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/kgdb.c 2010-12-31 14:46:53.000000000 -0500
@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
/* Guard for recursive entry */
static int exception_level;
@@ -52318,10 +52515,10 @@ diff -urNp linux-2.6.32.33/kernel/kgdb.c linux-2.6.32.33/kernel/kgdb.c
{
BUG_ON(kgdb_connected);
-diff -urNp linux-2.6.32.33/kernel/kmod.c linux-2.6.32.33/kernel/kmod.c
---- linux-2.6.32.33/kernel/kmod.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/kmod.c 2011-02-12 10:58:19.000000000 -0500
-@@ -90,6 +90,28 @@ int __request_module(bool wait, const ch
+diff -urNp linux-2.6.32.35/kernel/kmod.c linux-2.6.32.35/kernel/kmod.c
+--- linux-2.6.32.35/kernel/kmod.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/kmod.c 2011-03-26 20:00:27.000000000 -0400
+@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
if (ret >= MODULE_NAME_LEN)
return -ENAMETOOLONG;
@@ -52332,17 +52529,7 @@ diff -urNp linux-2.6.32.33/kernel/kmod.c linux-2.6.32.33/kernel/kmod.c
+ auto-loaded
+ */
+ if (current_uid()) {
-+#if !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE)
-+ /* There are known knowns. These are things we know
-+ that we know. There are known unknowns. That is to say,
-+ there are things that we know we don't know. But there are
-+ also unknown unknowns. There are things we don't know
-+ we don't know.
-+ This here is a known unknown.
-+ */
-+ if (strcmp(module_name, "net-pf-10"))
-+#endif
-+ gr_log_nonroot_mod_load(module_name);
++ gr_log_nonroot_mod_load(module_name);
+ return -EPERM;
+ }
+#endif
@@ -52350,9 +52537,9 @@ diff -urNp linux-2.6.32.33/kernel/kmod.c linux-2.6.32.33/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.33/kernel/kprobes.c linux-2.6.32.33/kernel/kprobes.c
---- linux-2.6.32.33/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/kprobes.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/kprobes.c linux-2.6.32.35/kernel/kprobes.c
+--- linux-2.6.32.35/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/kprobes.c 2010-12-31 14:46:53.000000000 -0500
@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
* kernel image and loaded module images reside. This is required
* so x86_64 can correctly handle the %rip-relative fixups.
@@ -52389,9 +52576,9 @@ diff -urNp linux-2.6.32.33/kernel/kprobes.c linux-2.6.32.33/kernel/kprobes.c
head = &kprobe_table[i];
preempt_disable();
-diff -urNp linux-2.6.32.33/kernel/lockdep.c linux-2.6.32.33/kernel/lockdep.c
---- linux-2.6.32.33/kernel/lockdep.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/lockdep.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/lockdep.c linux-2.6.32.35/kernel/lockdep.c
+--- linux-2.6.32.35/kernel/lockdep.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/lockdep.c 2010-12-31 14:46:53.000000000 -0500
@@ -421,20 +421,20 @@ static struct stack_trace lockdep_init_t
/*
* Various lockdep statistics:
@@ -52465,9 +52652,9 @@ diff -urNp linux-2.6.32.33/kernel/lockdep.c linux-2.6.32.33/kernel/lockdep.c
if (very_verbose(class)) {
printk("\nacquire class [%p] %s", class->key, class->name);
if (class->name_version > 1)
-diff -urNp linux-2.6.32.33/kernel/lockdep_internals.h linux-2.6.32.33/kernel/lockdep_internals.h
---- linux-2.6.32.33/kernel/lockdep_internals.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/lockdep_internals.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/lockdep_internals.h linux-2.6.32.35/kernel/lockdep_internals.h
+--- linux-2.6.32.35/kernel/lockdep_internals.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/lockdep_internals.h 2010-12-31 14:46:53.000000000 -0500
@@ -113,26 +113,26 @@ lockdep_count_backward_deps(struct lock_
/*
* Various lockdep statistics:
@@ -52515,9 +52702,9 @@ diff -urNp linux-2.6.32.33/kernel/lockdep_internals.h linux-2.6.32.33/kernel/loc
#else
# define debug_atomic_inc(ptr) do { } while (0)
# define debug_atomic_dec(ptr) do { } while (0)
-diff -urNp linux-2.6.32.33/kernel/lockdep_proc.c linux-2.6.32.33/kernel/lockdep_proc.c
---- linux-2.6.32.33/kernel/lockdep_proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/lockdep_proc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/lockdep_proc.c linux-2.6.32.35/kernel/lockdep_proc.c
+--- linux-2.6.32.35/kernel/lockdep_proc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/lockdep_proc.c 2010-12-31 14:46:53.000000000 -0500
@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
static void print_name(struct seq_file *m, struct lock_class *class)
@@ -52527,9 +52714,9 @@ diff -urNp linux-2.6.32.33/kernel/lockdep_proc.c linux-2.6.32.33/kernel/lockdep_
const char *name = class->name;
if (!name) {
-diff -urNp linux-2.6.32.33/kernel/module.c linux-2.6.32.33/kernel/module.c
---- linux-2.6.32.33/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/module.c 2011-02-02 20:27:32.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/module.c linux-2.6.32.35/kernel/module.c
+--- linux-2.6.32.35/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/module.c 2011-02-02 20:27:32.000000000 -0500
@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
static BLOCKING_NOTIFIER_HEAD(module_notify_list);
@@ -53082,9 +53269,9 @@ diff -urNp linux-2.6.32.33/kernel/module.c linux-2.6.32.33/kernel/module.c
mod = NULL;
}
return mod;
-diff -urNp linux-2.6.32.33/kernel/panic.c linux-2.6.32.33/kernel/panic.c
---- linux-2.6.32.33/kernel/panic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/panic.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/panic.c linux-2.6.32.35/kernel/panic.c
+--- linux-2.6.32.35/kernel/panic.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/panic.c 2010-12-31 14:46:53.000000000 -0500
@@ -352,7 +352,7 @@ static void warn_slowpath_common(const c
const char *board;
@@ -53104,9 +53291,9 @@ diff -urNp linux-2.6.32.33/kernel/panic.c linux-2.6.32.33/kernel/panic.c
__builtin_return_address(0));
}
EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-2.6.32.33/kernel/params.c linux-2.6.32.33/kernel/params.c
---- linux-2.6.32.33/kernel/params.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/params.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/params.c linux-2.6.32.35/kernel/params.c
+--- linux-2.6.32.35/kernel/params.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/params.c 2010-12-31 14:46:53.000000000 -0500
@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
return ret;
}
@@ -53125,9 +53312,9 @@ diff -urNp linux-2.6.32.33/kernel/params.c linux-2.6.32.33/kernel/params.c
.filter = uevent_filter,
};
-diff -urNp linux-2.6.32.33/kernel/pid.c linux-2.6.32.33/kernel/pid.c
---- linux-2.6.32.33/kernel/pid.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/pid.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/pid.c linux-2.6.32.35/kernel/pid.c
+--- linux-2.6.32.35/kernel/pid.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/pid.c 2010-12-31 14:46:53.000000000 -0500
@@ -33,6 +33,7 @@
#include <linux/rculist.h>
#include <linux/bootmem.h>
@@ -53161,9 +53348,9 @@ diff -urNp linux-2.6.32.33/kernel/pid.c linux-2.6.32.33/kernel/pid.c
}
struct task_struct *find_task_by_vpid(pid_t vnr)
-diff -urNp linux-2.6.32.33/kernel/posix-cpu-timers.c linux-2.6.32.33/kernel/posix-cpu-timers.c
---- linux-2.6.32.33/kernel/posix-cpu-timers.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/posix-cpu-timers.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/posix-cpu-timers.c linux-2.6.32.35/kernel/posix-cpu-timers.c
+--- linux-2.6.32.35/kernel/posix-cpu-timers.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/posix-cpu-timers.c 2010-12-31 14:46:53.000000000 -0500
@@ -6,6 +6,7 @@
#include <linux/posix-timers.h>
#include <linux/errno.h>
@@ -53172,9 +53359,9 @@ diff -urNp linux-2.6.32.33/kernel/posix-cpu-timers.c linux-2.6.32.33/kernel/posi
#include <asm/uaccess.h>
#include <linux/kernel_stat.h>
#include <trace/events/timer.h>
-diff -urNp linux-2.6.32.33/kernel/posix-timers.c linux-2.6.32.33/kernel/posix-timers.c
---- linux-2.6.32.33/kernel/posix-timers.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/posix-timers.c 2011-01-02 11:29:16.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/posix-timers.c linux-2.6.32.35/kernel/posix-timers.c
+--- linux-2.6.32.35/kernel/posix-timers.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/posix-timers.c 2011-01-02 11:29:16.000000000 -0500
@@ -42,6 +42,7 @@
#include <linux/compiler.h>
#include <linux/idr.h>
@@ -53197,9 +53384,9 @@ diff -urNp linux-2.6.32.33/kernel/posix-timers.c linux-2.6.32.33/kernel/posix-ti
return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
}
-diff -urNp linux-2.6.32.33/kernel/power/hibernate.c linux-2.6.32.33/kernel/power/hibernate.c
---- linux-2.6.32.33/kernel/power/hibernate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/power/hibernate.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/power/hibernate.c linux-2.6.32.35/kernel/power/hibernate.c
+--- linux-2.6.32.35/kernel/power/hibernate.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/power/hibernate.c 2010-12-31 14:46:53.000000000 -0500
@@ -48,14 +48,14 @@ enum {
static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -53217,9 +53404,9 @@ diff -urNp linux-2.6.32.33/kernel/power/hibernate.c linux-2.6.32.33/kernel/power
{
if (ops && !(ops->begin && ops->end && ops->pre_snapshot
&& ops->prepare && ops->finish && ops->enter && ops->pre_restore
-diff -urNp linux-2.6.32.33/kernel/power/poweroff.c linux-2.6.32.33/kernel/power/poweroff.c
---- linux-2.6.32.33/kernel/power/poweroff.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/power/poweroff.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/power/poweroff.c linux-2.6.32.35/kernel/power/poweroff.c
+--- linux-2.6.32.35/kernel/power/poweroff.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/power/poweroff.c 2010-12-31 14:46:53.000000000 -0500
@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
.enable_mask = SYSRQ_ENABLE_BOOT,
};
@@ -53229,9 +53416,9 @@ diff -urNp linux-2.6.32.33/kernel/power/poweroff.c linux-2.6.32.33/kernel/power/
{
register_sysrq_key('o', &sysrq_poweroff_op);
return 0;
-diff -urNp linux-2.6.32.33/kernel/power/process.c linux-2.6.32.33/kernel/power/process.c
---- linux-2.6.32.33/kernel/power/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/power/process.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/power/process.c linux-2.6.32.35/kernel/power/process.c
+--- linux-2.6.32.35/kernel/power/process.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/power/process.c 2010-12-31 14:46:53.000000000 -0500
@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
struct timeval start, end;
u64 elapsed_csecs64;
@@ -53271,9 +53458,9 @@ diff -urNp linux-2.6.32.33/kernel/power/process.c linux-2.6.32.33/kernel/power/p
do_gettimeofday(&end);
elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
-diff -urNp linux-2.6.32.33/kernel/power/suspend.c linux-2.6.32.33/kernel/power/suspend.c
---- linux-2.6.32.33/kernel/power/suspend.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/power/suspend.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/power/suspend.c linux-2.6.32.35/kernel/power/suspend.c
+--- linux-2.6.32.35/kernel/power/suspend.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/power/suspend.c 2010-12-31 14:46:53.000000000 -0500
@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
[PM_SUSPEND_MEM] = "mem",
};
@@ -53290,9 +53477,9 @@ diff -urNp linux-2.6.32.33/kernel/power/suspend.c linux-2.6.32.33/kernel/power/s
{
mutex_lock(&pm_mutex);
suspend_ops = ops;
-diff -urNp linux-2.6.32.33/kernel/printk.c linux-2.6.32.33/kernel/printk.c
---- linux-2.6.32.33/kernel/printk.c 2011-01-11 23:55:35.000000000 -0500
-+++ linux-2.6.32.33/kernel/printk.c 2011-01-11 23:56:06.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/printk.c linux-2.6.32.35/kernel/printk.c
+--- linux-2.6.32.35/kernel/printk.c 2011-01-11 23:55:35.000000000 -0500
++++ linux-2.6.32.35/kernel/printk.c 2011-01-11 23:56:06.000000000 -0500
@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
char c;
int error = 0;
@@ -53305,28 +53492,69 @@ diff -urNp linux-2.6.32.33/kernel/printk.c linux-2.6.32.33/kernel/printk.c
error = security_syslog(type);
if (error)
return error;
-diff -urNp linux-2.6.32.33/kernel/ptrace.c linux-2.6.32.33/kernel/ptrace.c
---- linux-2.6.32.33/kernel/ptrace.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/kernel/ptrace.c 2011-02-12 10:37:47.000000000 -0500
-@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
+diff -urNp linux-2.6.32.35/kernel/ptrace.c linux-2.6.32.35/kernel/ptrace.c
+--- linux-2.6.32.35/kernel/ptrace.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/kernel/ptrace.c 2011-03-26 19:47:00.000000000 -0400
+@@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_stru
+ return ret;
+ }
+
+-int __ptrace_may_access(struct task_struct *task, unsigned int mode)
++static int __ptrace_may_access(struct task_struct *task, unsigned int mode,
++ unsigned int log)
+ {
+ const struct cred *cred = current_cred(), *tcred;
+
+@@ -141,7 +142,9 @@ int __ptrace_may_access(struct task_stru
cred->gid != tcred->egid ||
cred->gid != tcred->sgid ||
cred->gid != tcred->gid) &&
- !capable(CAP_SYS_PTRACE)) {
-+ !capable_nolog(CAP_SYS_PTRACE)) {
++ ((!log && !capable_nolog(CAP_SYS_PTRACE)) ||
++ (log && !capable(CAP_SYS_PTRACE)))
++ ) {
rcu_read_unlock();
return -EPERM;
}
-@@ -149,7 +149,7 @@ int __ptrace_may_access(struct task_stru
+@@ -149,7 +152,9 @@ int __ptrace_may_access(struct task_stru
smp_rmb();
if (task->mm)
dumpable = get_dumpable(task->mm);
- if (!dumpable && !capable(CAP_SYS_PTRACE))
-+ if (!dumpable && !capable_nolog(CAP_SYS_PTRACE))
++ if (!dumpable &&
++ ((!log && !capable_nolog(CAP_SYS_PTRACE)) ||
++ (log && !capable(CAP_SYS_PTRACE))))
return -EPERM;
return security_ptrace_access_check(task, mode);
-@@ -199,7 +199,7 @@ int ptrace_attach(struct task_struct *ta
+@@ -159,7 +164,16 @@ bool ptrace_may_access(struct task_struc
+ {
+ int err;
+ task_lock(task);
+- err = __ptrace_may_access(task, mode);
++ err = __ptrace_may_access(task, mode, 0);
++ task_unlock(task);
++ return !err;
++}
++
++bool ptrace_may_access_log(struct task_struct *task, unsigned int mode)
++{
++ int err;
++ task_lock(task);
++ err = __ptrace_may_access(task, mode, 1);
+ task_unlock(task);
+ return !err;
+ }
+@@ -186,7 +200,7 @@ int ptrace_attach(struct task_struct *ta
+ goto out;
+
+ task_lock(task);
+- retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH);
++ retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH, 1);
+ task_unlock(task);
+ if (retval)
+ goto unlock_creds;
+@@ -199,7 +213,7 @@ int ptrace_attach(struct task_struct *ta
goto unlock_tasklist;
task->ptrace = PT_PTRACED;
@@ -53335,7 +53563,7 @@ diff -urNp linux-2.6.32.33/kernel/ptrace.c linux-2.6.32.33/kernel/ptrace.c
task->ptrace |= PT_PTRACE_CAP;
__ptrace_link(task, current);
-@@ -532,18 +532,18 @@ int ptrace_request(struct task_struct *c
+@@ -532,18 +546,18 @@ int ptrace_request(struct task_struct *c
ret = ptrace_setoptions(child, data);
break;
case PTRACE_GETEVENTMSG:
@@ -53357,7 +53585,7 @@ diff -urNp linux-2.6.32.33/kernel/ptrace.c linux-2.6.32.33/kernel/ptrace.c
sizeof siginfo))
ret = -EFAULT;
else
-@@ -621,14 +621,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
+@@ -621,14 +635,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
goto out;
}
@@ -53380,7 +53608,7 @@ diff -urNp linux-2.6.32.33/kernel/ptrace.c linux-2.6.32.33/kernel/ptrace.c
goto out_put_task_struct;
}
-@@ -653,7 +660,7 @@ int generic_ptrace_peekdata(struct task_
+@@ -653,7 +674,7 @@ int generic_ptrace_peekdata(struct task_
copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
if (copied != sizeof(tmp))
return -EIO;
@@ -53389,7 +53617,7 @@ diff -urNp linux-2.6.32.33/kernel/ptrace.c linux-2.6.32.33/kernel/ptrace.c
}
int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
-@@ -740,14 +747,21 @@ asmlinkage long compat_sys_ptrace(compat
+@@ -740,14 +761,21 @@ asmlinkage long compat_sys_ptrace(compat
goto out;
}
@@ -53412,9 +53640,9 @@ diff -urNp linux-2.6.32.33/kernel/ptrace.c linux-2.6.32.33/kernel/ptrace.c
goto out_put_task_struct;
}
-diff -urNp linux-2.6.32.33/kernel/rcutree.c linux-2.6.32.33/kernel/rcutree.c
---- linux-2.6.32.33/kernel/rcutree.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/rcutree.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/rcutree.c linux-2.6.32.35/kernel/rcutree.c
+--- linux-2.6.32.35/kernel/rcutree.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/rcutree.c 2010-12-31 14:46:53.000000000 -0500
@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
/*
* Do softirq processing for the current CPU.
@@ -53424,9 +53652,9 @@ diff -urNp linux-2.6.32.33/kernel/rcutree.c linux-2.6.32.33/kernel/rcutree.c
{
/*
* Memory references from any prior RCU read-side critical sections
-diff -urNp linux-2.6.32.33/kernel/rcutree_plugin.h linux-2.6.32.33/kernel/rcutree_plugin.h
---- linux-2.6.32.33/kernel/rcutree_plugin.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/rcutree_plugin.h 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/rcutree_plugin.h linux-2.6.32.35/kernel/rcutree_plugin.h
+--- linux-2.6.32.35/kernel/rcutree_plugin.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/rcutree_plugin.h 2010-12-31 14:47:01.000000000 -0500
@@ -145,7 +145,7 @@ static void rcu_preempt_note_context_swi
*/
void __rcu_read_lock(void)
@@ -53445,9 +53673,9 @@ diff -urNp linux-2.6.32.33/kernel/rcutree_plugin.h linux-2.6.32.33/kernel/rcutre
unlikely(ACCESS_ONCE(t->rcu_read_unlock_special)))
rcu_read_unlock_special(t);
}
-diff -urNp linux-2.6.32.33/kernel/relay.c linux-2.6.32.33/kernel/relay.c
---- linux-2.6.32.33/kernel/relay.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/relay.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/relay.c linux-2.6.32.35/kernel/relay.c
+--- linux-2.6.32.35/kernel/relay.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/relay.c 2010-12-31 14:46:53.000000000 -0500
@@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct fi
unsigned int flags,
int *nonpad_ret)
@@ -53465,9 +53693,9 @@ diff -urNp linux-2.6.32.33/kernel/relay.c linux-2.6.32.33/kernel/relay.c
if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
return 0;
-diff -urNp linux-2.6.32.33/kernel/resource.c linux-2.6.32.33/kernel/resource.c
---- linux-2.6.32.33/kernel/resource.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/resource.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/resource.c linux-2.6.32.35/kernel/resource.c
+--- linux-2.6.32.35/kernel/resource.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/resource.c 2010-12-31 14:46:53.000000000 -0500
@@ -132,8 +132,18 @@ static const struct file_operations proc
static int __init ioresources_init(void)
@@ -53487,9 +53715,9 @@ diff -urNp linux-2.6.32.33/kernel/resource.c linux-2.6.32.33/kernel/resource.c
return 0;
}
__initcall(ioresources_init);
-diff -urNp linux-2.6.32.33/kernel/rtmutex.c linux-2.6.32.33/kernel/rtmutex.c
---- linux-2.6.32.33/kernel/rtmutex.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/rtmutex.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/rtmutex.c linux-2.6.32.35/kernel/rtmutex.c
+--- linux-2.6.32.35/kernel/rtmutex.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/rtmutex.c 2010-12-31 14:46:53.000000000 -0500
@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
*/
spin_lock_irqsave(&pendowner->pi_lock, flags);
@@ -53499,9 +53727,9 @@ diff -urNp linux-2.6.32.33/kernel/rtmutex.c linux-2.6.32.33/kernel/rtmutex.c
WARN_ON(pendowner->pi_blocked_on != waiter);
WARN_ON(pendowner->pi_blocked_on->lock != lock);
-diff -urNp linux-2.6.32.33/kernel/sched.c linux-2.6.32.33/kernel/sched.c
---- linux-2.6.32.33/kernel/sched.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/kernel/sched.c 2011-02-22 15:57:40.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/sched.c linux-2.6.32.35/kernel/sched.c
+--- linux-2.6.32.35/kernel/sched.c 2011-03-23 19:00:32.000000000 -0400
++++ linux-2.6.32.35/kernel/sched.c 2011-03-23 19:01:01.000000000 -0400
@@ -5043,7 +5043,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.
@@ -53557,9 +53785,9 @@ diff -urNp linux-2.6.32.33/kernel/sched.c linux-2.6.32.33/kernel/sched.c
if (cpu != group_first_cpu(sd->groups))
return;
-diff -urNp linux-2.6.32.33/kernel/signal.c linux-2.6.32.33/kernel/signal.c
---- linux-2.6.32.33/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/signal.c 2011-02-12 11:22:46.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/signal.c linux-2.6.32.35/kernel/signal.c
+--- linux-2.6.32.35/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/signal.c 2011-02-12 11:22:46.000000000 -0500
@@ -41,12 +41,12 @@
static struct kmem_cache *sigqueue_cachep;
@@ -53662,10 +53890,10 @@ diff -urNp linux-2.6.32.33/kernel/signal.c linux-2.6.32.33/kernel/signal.c
return ret;
}
-diff -urNp linux-2.6.32.33/kernel/smp.c linux-2.6.32.33/kernel/smp.c
---- linux-2.6.32.33/kernel/smp.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/kernel/smp.c 2011-02-22 15:57:40.000000000 -0500
-@@ -489,22 +489,22 @@ int smp_call_function(void (*func)(void
+diff -urNp linux-2.6.32.35/kernel/smp.c linux-2.6.32.35/kernel/smp.c
+--- linux-2.6.32.35/kernel/smp.c 2011-03-23 19:00:32.000000000 -0400
++++ linux-2.6.32.35/kernel/smp.c 2011-03-23 19:01:01.000000000 -0400
+@@ -522,22 +522,22 @@ int smp_call_function(void (*func)(void
}
EXPORT_SYMBOL(smp_call_function);
@@ -53692,9 +53920,9 @@ diff -urNp linux-2.6.32.33/kernel/smp.c linux-2.6.32.33/kernel/smp.c
{
spin_unlock_irq(&call_function.lock);
}
-diff -urNp linux-2.6.32.33/kernel/softirq.c linux-2.6.32.33/kernel/softirq.c
---- linux-2.6.32.33/kernel/softirq.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/kernel/softirq.c 2011-02-22 15:57:40.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/softirq.c linux-2.6.32.35/kernel/softirq.c
+--- linux-2.6.32.35/kernel/softirq.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/kernel/softirq.c 2011-02-22 15:57:40.000000000 -0500
@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -53749,9 +53977,9 @@ diff -urNp linux-2.6.32.33/kernel/softirq.c linux-2.6.32.33/kernel/softirq.c
{
struct tasklet_struct *list;
-diff -urNp linux-2.6.32.33/kernel/sys.c linux-2.6.32.33/kernel/sys.c
---- linux-2.6.32.33/kernel/sys.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/kernel/sys.c 2011-02-22 15:57:40.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/sys.c linux-2.6.32.35/kernel/sys.c
+--- linux-2.6.32.35/kernel/sys.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/kernel/sys.c 2011-02-22 15:57:40.000000000 -0500
@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
error = -EACCES;
goto out;
@@ -53887,9 +54115,9 @@ diff -urNp linux-2.6.32.33/kernel/sys.c linux-2.6.32.33/kernel/sys.c
error = -EINVAL;
break;
}
-diff -urNp linux-2.6.32.33/kernel/sysctl.c linux-2.6.32.33/kernel/sysctl.c
---- linux-2.6.32.33/kernel/sysctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/sysctl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/sysctl.c linux-2.6.32.35/kernel/sysctl.c
+--- linux-2.6.32.35/kernel/sysctl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/sysctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -63,6 +63,13 @@
static int deprecated_sysctl_warning(struct __sysctl_args *args);
@@ -54121,9 +54349,9 @@ diff -urNp linux-2.6.32.33/kernel/sysctl.c linux-2.6.32.33/kernel/sysctl.c
+EXPORT_SYMBOL(sysctl_string_modpriv);
EXPORT_SYMBOL(sysctl_data);
EXPORT_SYMBOL(unregister_sysctl_table);
-diff -urNp linux-2.6.32.33/kernel/sysctl_check.c linux-2.6.32.33/kernel/sysctl_check.c
---- linux-2.6.32.33/kernel/sysctl_check.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/sysctl_check.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/sysctl_check.c linux-2.6.32.35/kernel/sysctl_check.c
+--- linux-2.6.32.35/kernel/sysctl_check.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/sysctl_check.c 2010-12-31 14:46:53.000000000 -0500
@@ -1489,10 +1489,12 @@ int sysctl_check_table(struct nsproxy *n
} else {
if ((table->strategy == sysctl_data) ||
@@ -54137,9 +54365,9 @@ diff -urNp linux-2.6.32.33/kernel/sysctl_check.c linux-2.6.32.33/kernel/sysctl_c
(table->proc_handler == proc_dointvec) ||
(table->proc_handler == proc_dointvec_minmax) ||
(table->proc_handler == proc_dointvec_jiffies) ||
-diff -urNp linux-2.6.32.33/kernel/taskstats.c linux-2.6.32.33/kernel/taskstats.c
---- linux-2.6.32.33/kernel/taskstats.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/taskstats.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/taskstats.c linux-2.6.32.35/kernel/taskstats.c
+--- linux-2.6.32.35/kernel/taskstats.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/taskstats.c 2010-12-31 14:46:53.000000000 -0500
@@ -26,9 +26,12 @@
#include <linux/cgroup.h>
#include <linux/fs.h>
@@ -54163,9 +54391,9 @@ diff -urNp linux-2.6.32.33/kernel/taskstats.c linux-2.6.32.33/kernel/taskstats.c
if (!alloc_cpumask_var(&mask, GFP_KERNEL))
return -ENOMEM;
-diff -urNp linux-2.6.32.33/kernel/time/tick-broadcast.c linux-2.6.32.33/kernel/time/tick-broadcast.c
---- linux-2.6.32.33/kernel/time/tick-broadcast.c 2011-03-11 17:56:47.000000000 -0500
-+++ linux-2.6.32.33/kernel/time/tick-broadcast.c 2011-03-11 18:01:11.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/time/tick-broadcast.c linux-2.6.32.35/kernel/time/tick-broadcast.c
+--- linux-2.6.32.35/kernel/time/tick-broadcast.c 2011-03-11 17:56:47.000000000 -0500
++++ linux-2.6.32.35/kernel/time/tick-broadcast.c 2011-03-11 18:01:11.000000000 -0500
@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
* then clear the broadcast bit.
*/
@@ -54175,9 +54403,9 @@ diff -urNp linux-2.6.32.33/kernel/time/tick-broadcast.c linux-2.6.32.33/kernel/t
cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-2.6.32.33/kernel/time/timekeeping.c linux-2.6.32.33/kernel/time/timekeeping.c
---- linux-2.6.32.33/kernel/time/timekeeping.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/time/timekeeping.c 2011-01-01 00:15:19.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/time/timekeeping.c linux-2.6.32.35/kernel/time/timekeeping.c
+--- linux-2.6.32.35/kernel/time/timekeeping.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/time/timekeeping.c 2011-01-01 00:15:19.000000000 -0500
@@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/mm.h>
@@ -54195,9 +54423,9 @@ diff -urNp linux-2.6.32.33/kernel/time/timekeeping.c linux-2.6.32.33/kernel/time
write_seqlock_irqsave(&xtime_lock, flags);
timekeeping_forward_now();
-diff -urNp linux-2.6.32.33/kernel/time/timer_list.c linux-2.6.32.33/kernel/time/timer_list.c
---- linux-2.6.32.33/kernel/time/timer_list.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/time/timer_list.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/time/timer_list.c linux-2.6.32.35/kernel/time/timer_list.c
+--- linux-2.6.32.35/kernel/time/timer_list.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/time/timer_list.c 2010-12-31 14:46:53.000000000 -0500
@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
static void print_name_offset(struct seq_file *m, void *sym)
@@ -54239,9 +54467,9 @@ diff -urNp linux-2.6.32.33/kernel/time/timer_list.c linux-2.6.32.33/kernel/time/
if (!pe)
return -ENOMEM;
return 0;
-diff -urNp linux-2.6.32.33/kernel/time/timer_stats.c linux-2.6.32.33/kernel/time/timer_stats.c
---- linux-2.6.32.33/kernel/time/timer_stats.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/time/timer_stats.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/time/timer_stats.c linux-2.6.32.35/kernel/time/timer_stats.c
+--- linux-2.6.32.35/kernel/time/timer_stats.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/time/timer_stats.c 2010-12-31 14:46:53.000000000 -0500
@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time
static void print_name_offset(struct seq_file *m, unsigned long addr)
@@ -54271,9 +54499,9 @@ diff -urNp linux-2.6.32.33/kernel/time/timer_stats.c linux-2.6.32.33/kernel/time
if (!pe)
return -ENOMEM;
return 0;
-diff -urNp linux-2.6.32.33/kernel/time.c linux-2.6.32.33/kernel/time.c
---- linux-2.6.32.33/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/time.c 2011-01-01 18:50:34.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/time.c linux-2.6.32.35/kernel/time.c
+--- linux-2.6.32.35/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/time.c 2011-01-01 18:50:34.000000000 -0500
@@ -165,6 +165,11 @@ int do_sys_settimeofday(struct timespec
return error;
@@ -54304,9 +54532,9 @@ diff -urNp linux-2.6.32.33/kernel/time.c linux-2.6.32.33/kernel/time.c
{
#if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
return (USEC_PER_SEC / HZ) * j;
-diff -urNp linux-2.6.32.33/kernel/timer.c linux-2.6.32.33/kernel/timer.c
---- linux-2.6.32.33/kernel/timer.c 2011-01-11 23:55:35.000000000 -0500
-+++ linux-2.6.32.33/kernel/timer.c 2011-01-11 23:56:06.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/timer.c linux-2.6.32.35/kernel/timer.c
+--- linux-2.6.32.35/kernel/timer.c 2011-01-11 23:55:35.000000000 -0500
++++ linux-2.6.32.35/kernel/timer.c 2011-01-11 23:56:06.000000000 -0500
@@ -1213,7 +1213,7 @@ void update_process_times(int user_tick)
/*
* This function runs timers and the timer-tq in bottom half context.
@@ -54316,9 +54544,9 @@ diff -urNp linux-2.6.32.33/kernel/timer.c linux-2.6.32.33/kernel/timer.c
{
struct tvec_base *base = __get_cpu_var(tvec_bases);
-diff -urNp linux-2.6.32.33/kernel/trace/ftrace.c linux-2.6.32.33/kernel/trace/ftrace.c
---- linux-2.6.32.33/kernel/trace/ftrace.c 2010-09-20 17:26:42.000000000 -0400
-+++ linux-2.6.32.33/kernel/trace/ftrace.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/trace/ftrace.c linux-2.6.32.35/kernel/trace/ftrace.c
+--- linux-2.6.32.35/kernel/trace/ftrace.c 2011-03-23 19:00:32.000000000 -0400
++++ linux-2.6.32.35/kernel/trace/ftrace.c 2011-03-23 19:01:01.000000000 -0400
@@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod,
ip = rec->ip;
@@ -54340,9 +54568,9 @@ diff -urNp linux-2.6.32.33/kernel/trace/ftrace.c linux-2.6.32.33/kernel/trace/ft
}
/*
-diff -urNp linux-2.6.32.33/kernel/trace/ring_buffer.c linux-2.6.32.33/kernel/trace/ring_buffer.c
---- linux-2.6.32.33/kernel/trace/ring_buffer.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.33/kernel/trace/ring_buffer.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/trace/ring_buffer.c linux-2.6.32.35/kernel/trace/ring_buffer.c
+--- linux-2.6.32.35/kernel/trace/ring_buffer.c 2010-10-31 16:44:11.000000000 -0400
++++ linux-2.6.32.35/kernel/trace/ring_buffer.c 2010-12-31 14:46:53.000000000 -0500
@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st
* the reader page). But if the next page is a header page,
* its flags will be non zero.
@@ -54352,9 +54580,9 @@ diff -urNp linux-2.6.32.33/kernel/trace/ring_buffer.c linux-2.6.32.33/kernel/tra
rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
struct buffer_page *page, struct list_head *list)
{
-diff -urNp linux-2.6.32.33/kernel/trace/trace.c linux-2.6.32.33/kernel/trace/trace.c
---- linux-2.6.32.33/kernel/trace/trace.c 2011-01-11 23:55:35.000000000 -0500
-+++ linux-2.6.32.33/kernel/trace/trace.c 2011-01-11 23:56:06.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/trace/trace.c linux-2.6.32.35/kernel/trace/trace.c
+--- linux-2.6.32.35/kernel/trace/trace.c 2011-01-11 23:55:35.000000000 -0500
++++ linux-2.6.32.35/kernel/trace/trace.c 2011-01-11 23:56:06.000000000 -0500
@@ -3816,10 +3816,9 @@ static const struct file_operations trac
};
#endif
@@ -54379,9 +54607,9 @@ diff -urNp linux-2.6.32.33/kernel/trace/trace.c linux-2.6.32.33/kernel/trace/tra
static int once;
struct dentry *d_tracer;
-diff -urNp linux-2.6.32.33/kernel/trace/trace_events.c linux-2.6.32.33/kernel/trace/trace_events.c
---- linux-2.6.32.33/kernel/trace/trace_events.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/trace/trace_events.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/trace/trace_events.c linux-2.6.32.35/kernel/trace/trace_events.c
+--- linux-2.6.32.35/kernel/trace/trace_events.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/trace/trace_events.c 2010-12-31 14:46:53.000000000 -0500
@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
* Modules must own their file_operations to keep up with
* reference counting.
@@ -54391,9 +54619,9 @@ diff -urNp linux-2.6.32.33/kernel/trace/trace_events.c linux-2.6.32.33/kernel/tr
struct ftrace_module_file_ops {
struct list_head list;
struct module *mod;
-diff -urNp linux-2.6.32.33/kernel/trace/trace_output.c linux-2.6.32.33/kernel/trace/trace_output.c
---- linux-2.6.32.33/kernel/trace/trace_output.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/trace/trace_output.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/trace/trace_output.c linux-2.6.32.35/kernel/trace/trace_output.c
+--- linux-2.6.32.35/kernel/trace/trace_output.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/trace/trace_output.c 2010-12-31 14:46:53.000000000 -0500
@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,
return 0;
p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -54403,9 +54631,9 @@ diff -urNp linux-2.6.32.33/kernel/trace/trace_output.c linux-2.6.32.33/kernel/tr
if (p) {
s->len = p - s->buffer;
return 1;
-diff -urNp linux-2.6.32.33/kernel/trace/trace_stack.c linux-2.6.32.33/kernel/trace/trace_stack.c
---- linux-2.6.32.33/kernel/trace/trace_stack.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/trace/trace_stack.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/trace/trace_stack.c linux-2.6.32.35/kernel/trace/trace_stack.c
+--- linux-2.6.32.35/kernel/trace/trace_stack.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/trace/trace_stack.c 2010-12-31 14:46:53.000000000 -0500
@@ -50,7 +50,7 @@ static inline void check_stack(void)
return;
@@ -54415,9 +54643,9 @@ diff -urNp linux-2.6.32.33/kernel/trace/trace_stack.c linux-2.6.32.33/kernel/tra
return;
local_irq_save(flags);
-diff -urNp linux-2.6.32.33/kernel/user.c linux-2.6.32.33/kernel/user.c
---- linux-2.6.32.33/kernel/user.c 2011-02-22 15:56:54.000000000 -0500
-+++ linux-2.6.32.33/kernel/user.c 2011-02-22 16:01:02.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/user.c linux-2.6.32.35/kernel/user.c
+--- linux-2.6.32.35/kernel/user.c 2011-02-22 15:56:54.000000000 -0500
++++ linux-2.6.32.35/kernel/user.c 2011-02-22 16:01:02.000000000 -0500
@@ -159,6 +159,7 @@ struct user_struct *alloc_uid(struct use
spin_lock_irq(&uidhash_lock);
up = uid_hash_find(uid, hashent);
@@ -54426,9 +54654,9 @@ diff -urNp linux-2.6.32.33/kernel/user.c linux-2.6.32.33/kernel/user.c
key_put(new->uid_keyring);
key_put(new->session_keyring);
kmem_cache_free(uid_cachep, new);
-diff -urNp linux-2.6.32.33/kernel/utsname_sysctl.c linux-2.6.32.33/kernel/utsname_sysctl.c
---- linux-2.6.32.33/kernel/utsname_sysctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/kernel/utsname_sysctl.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/kernel/utsname_sysctl.c linux-2.6.32.35/kernel/utsname_sysctl.c
+--- linux-2.6.32.35/kernel/utsname_sysctl.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/kernel/utsname_sysctl.c 2010-12-31 14:46:53.000000000 -0500
@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
.proc_handler = proc_do_uts_string,
.strategy = sysctl_uts_string,
@@ -54447,9 +54675,9 @@ diff -urNp linux-2.6.32.33/kernel/utsname_sysctl.c linux-2.6.32.33/kernel/utsnam
};
static int __init utsname_sysctl_init(void)
-diff -urNp linux-2.6.32.33/lib/bug.c linux-2.6.32.33/lib/bug.c
---- linux-2.6.32.33/lib/bug.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/lib/bug.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/lib/bug.c linux-2.6.32.35/lib/bug.c
+--- linux-2.6.32.35/lib/bug.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/lib/bug.c 2010-12-31 14:46:53.000000000 -0500
@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
return BUG_TRAP_TYPE_NONE;
@@ -54459,9 +54687,9 @@ diff -urNp linux-2.6.32.33/lib/bug.c linux-2.6.32.33/lib/bug.c
printk(KERN_EMERG "------------[ cut here ]------------\n");
-diff -urNp linux-2.6.32.33/lib/debugobjects.c linux-2.6.32.33/lib/debugobjects.c
---- linux-2.6.32.33/lib/debugobjects.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/lib/debugobjects.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/lib/debugobjects.c linux-2.6.32.35/lib/debugobjects.c
+--- linux-2.6.32.35/lib/debugobjects.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/lib/debugobjects.c 2010-12-31 14:46:53.000000000 -0500
@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
if (limit > 4)
return;
@@ -54471,9 +54699,9 @@ diff -urNp linux-2.6.32.33/lib/debugobjects.c linux-2.6.32.33/lib/debugobjects.c
if (is_on_stack == onstack)
return;
-diff -urNp linux-2.6.32.33/lib/dma-debug.c linux-2.6.32.33/lib/dma-debug.c
---- linux-2.6.32.33/lib/dma-debug.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/lib/dma-debug.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/lib/dma-debug.c linux-2.6.32.35/lib/dma-debug.c
+--- linux-2.6.32.35/lib/dma-debug.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/lib/dma-debug.c 2010-12-31 14:46:53.000000000 -0500
@@ -861,7 +861,7 @@ out:
static void check_for_stack(struct device *dev, void *addr)
@@ -54483,9 +54711,9 @@ diff -urNp linux-2.6.32.33/lib/dma-debug.c linux-2.6.32.33/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.33/lib/idr.c linux-2.6.32.33/lib/idr.c
---- linux-2.6.32.33/lib/idr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/lib/idr.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/lib/idr.c linux-2.6.32.35/lib/idr.c
+--- linux-2.6.32.35/lib/idr.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/lib/idr.c 2010-12-31 14:46:53.000000000 -0500
@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
@@ -54495,9 +54723,9 @@ diff -urNp linux-2.6.32.33/lib/idr.c linux-2.6.32.33/lib/idr.c
*starting_id = id;
return IDR_NEED_TO_GROW;
}
-diff -urNp linux-2.6.32.33/lib/inflate.c linux-2.6.32.33/lib/inflate.c
---- linux-2.6.32.33/lib/inflate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/lib/inflate.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/lib/inflate.c linux-2.6.32.35/lib/inflate.c
+--- linux-2.6.32.35/lib/inflate.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/lib/inflate.c 2010-12-31 14:46:53.000000000 -0500
@@ -266,7 +266,7 @@ static void free(void *where)
malloc_ptr = free_mem_ptr;
}
@@ -54507,9 +54735,9 @@ diff -urNp linux-2.6.32.33/lib/inflate.c linux-2.6.32.33/lib/inflate.c
#define free(a) kfree(a)
#endif
-diff -urNp linux-2.6.32.33/lib/Kconfig.debug linux-2.6.32.33/lib/Kconfig.debug
---- linux-2.6.32.33/lib/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/lib/Kconfig.debug 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/lib/Kconfig.debug linux-2.6.32.35/lib/Kconfig.debug
+--- linux-2.6.32.35/lib/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/lib/Kconfig.debug 2010-12-31 14:46:53.000000000 -0500
@@ -905,7 +905,7 @@ config LATENCYTOP
select STACKTRACE
select SCHEDSTATS
@@ -54519,9 +54747,9 @@ diff -urNp linux-2.6.32.33/lib/Kconfig.debug linux-2.6.32.33/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.33/lib/kobject.c linux-2.6.32.33/lib/kobject.c
---- linux-2.6.32.33/lib/kobject.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/lib/kobject.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/lib/kobject.c linux-2.6.32.35/lib/kobject.c
+--- linux-2.6.32.35/lib/kobject.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/lib/kobject.c 2010-12-31 14:46:53.000000000 -0500
@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
return ret;
}
@@ -54549,9 +54777,9 @@ diff -urNp linux-2.6.32.33/lib/kobject.c linux-2.6.32.33/lib/kobject.c
struct kobject *parent_kobj)
{
struct kset *kset;
-diff -urNp linux-2.6.32.33/lib/kobject_uevent.c linux-2.6.32.33/lib/kobject_uevent.c
---- linux-2.6.32.33/lib/kobject_uevent.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/lib/kobject_uevent.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/lib/kobject_uevent.c linux-2.6.32.35/lib/kobject_uevent.c
+--- linux-2.6.32.35/lib/kobject_uevent.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/lib/kobject_uevent.c 2010-12-31 14:46:53.000000000 -0500
@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
const char *subsystem;
struct kobject *top_kobj;
@@ -54561,9 +54789,9 @@ diff -urNp linux-2.6.32.33/lib/kobject_uevent.c linux-2.6.32.33/lib/kobject_ueve
u64 seq;
int i = 0;
int retval = 0;
-diff -urNp linux-2.6.32.33/lib/kref.c linux-2.6.32.33/lib/kref.c
---- linux-2.6.32.33/lib/kref.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/lib/kref.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/lib/kref.c linux-2.6.32.35/lib/kref.c
+--- linux-2.6.32.35/lib/kref.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/lib/kref.c 2010-12-31 14:46:53.000000000 -0500
@@ -61,7 +61,7 @@ void kref_get(struct kref *kref)
*/
int kref_put(struct kref *kref, void (*release)(struct kref *kref))
@@ -54573,9 +54801,9 @@ diff -urNp linux-2.6.32.33/lib/kref.c linux-2.6.32.33/lib/kref.c
WARN_ON(release == (void (*)(struct kref *))kfree);
if (atomic_dec_and_test(&kref->refcount)) {
-diff -urNp linux-2.6.32.33/lib/parser.c linux-2.6.32.33/lib/parser.c
---- linux-2.6.32.33/lib/parser.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/lib/parser.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/lib/parser.c linux-2.6.32.35/lib/parser.c
+--- linux-2.6.32.35/lib/parser.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/lib/parser.c 2010-12-31 14:46:53.000000000 -0500
@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
char *buf;
int ret;
@@ -54585,9 +54813,9 @@ diff -urNp linux-2.6.32.33/lib/parser.c linux-2.6.32.33/lib/parser.c
if (!buf)
return -ENOMEM;
memcpy(buf, s->from, s->to - s->from);
-diff -urNp linux-2.6.32.33/lib/radix-tree.c linux-2.6.32.33/lib/radix-tree.c
---- linux-2.6.32.33/lib/radix-tree.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/lib/radix-tree.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/lib/radix-tree.c linux-2.6.32.35/lib/radix-tree.c
+--- linux-2.6.32.35/lib/radix-tree.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/lib/radix-tree.c 2010-12-31 14:46:53.000000000 -0500
@@ -81,7 +81,7 @@ struct radix_tree_preload {
int nr;
struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -54597,9 +54825,9 @@ diff -urNp linux-2.6.32.33/lib/radix-tree.c linux-2.6.32.33/lib/radix-tree.c
static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
{
-diff -urNp linux-2.6.32.33/lib/random32.c linux-2.6.32.33/lib/random32.c
---- linux-2.6.32.33/lib/random32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/lib/random32.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/lib/random32.c linux-2.6.32.35/lib/random32.c
+--- linux-2.6.32.35/lib/random32.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/lib/random32.c 2010-12-31 14:46:53.000000000 -0500
@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
*/
static inline u32 __seed(u32 x, u32 m)
@@ -54609,9 +54837,9 @@ diff -urNp linux-2.6.32.33/lib/random32.c linux-2.6.32.33/lib/random32.c
}
/**
-diff -urNp linux-2.6.32.33/lib/vsprintf.c linux-2.6.32.33/lib/vsprintf.c
---- linux-2.6.32.33/lib/vsprintf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/lib/vsprintf.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/lib/vsprintf.c linux-2.6.32.35/lib/vsprintf.c
+--- linux-2.6.32.35/lib/vsprintf.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/lib/vsprintf.c 2010-12-31 14:46:53.000000000 -0500
@@ -16,6 +16,9 @@
* - scnprintf and vscnprintf
*/
@@ -54712,14 +54940,14 @@ diff -urNp linux-2.6.32.33/lib/vsprintf.c linux-2.6.32.33/lib/vsprintf.c
break;
}
-diff -urNp linux-2.6.32.33/localversion-grsec linux-2.6.32.33/localversion-grsec
---- linux-2.6.32.33/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/localversion-grsec 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/localversion-grsec linux-2.6.32.35/localversion-grsec
+--- linux-2.6.32.35/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/localversion-grsec 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1 @@
+-grsec
-diff -urNp linux-2.6.32.33/Makefile linux-2.6.32.33/Makefile
---- linux-2.6.32.33/Makefile 2011-03-18 17:10:31.000000000 -0400
-+++ linux-2.6.32.33/Makefile 2011-03-18 17:10:44.000000000 -0400
+diff -urNp linux-2.6.32.35/Makefile linux-2.6.32.35/Makefile
+--- linux-2.6.32.35/Makefile 2011-03-26 18:23:35.000000000 -0400
++++ linux-2.6.32.35/Makefile 2011-03-26 18:23:43.000000000 -0400
@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
HOSTCC = gcc
@@ -54740,9 +54968,9 @@ diff -urNp linux-2.6.32.33/Makefile linux-2.6.32.33/Makefile
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-diff -urNp linux-2.6.32.33/mm/filemap.c linux-2.6.32.33/mm/filemap.c
---- linux-2.6.32.33/mm/filemap.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/mm/filemap.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/filemap.c linux-2.6.32.35/mm/filemap.c
+--- linux-2.6.32.35/mm/filemap.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/mm/filemap.c 2010-12-31 14:46:53.000000000 -0500
@@ -1631,7 +1631,7 @@ int generic_file_mmap(struct file * file
struct address_space *mapping = file->f_mapping;
@@ -54760,9 +54988,9 @@ diff -urNp linux-2.6.32.33/mm/filemap.c linux-2.6.32.33/mm/filemap.c
if (*pos >= limit) {
send_sig(SIGXFSZ, current, 0);
return -EFBIG;
-diff -urNp linux-2.6.32.33/mm/fremap.c linux-2.6.32.33/mm/fremap.c
---- linux-2.6.32.33/mm/fremap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/mm/fremap.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/fremap.c linux-2.6.32.35/mm/fremap.c
+--- linux-2.6.32.35/mm/fremap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/mm/fremap.c 2010-12-31 14:46:53.000000000 -0500
@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
retry:
vma = find_vma(mm, start);
@@ -54784,9 +55012,9 @@ diff -urNp linux-2.6.32.33/mm/fremap.c linux-2.6.32.33/mm/fremap.c
munlock_vma_pages_range(vma, start, start + size);
vma->vm_flags = saved_flags;
}
-diff -urNp linux-2.6.32.33/mm/highmem.c linux-2.6.32.33/mm/highmem.c
---- linux-2.6.32.33/mm/highmem.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/mm/highmem.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/highmem.c linux-2.6.32.35/mm/highmem.c
+--- linux-2.6.32.35/mm/highmem.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/mm/highmem.c 2010-12-31 14:46:53.000000000 -0500
@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
* So no dangers, even with speculative execution.
*/
@@ -54812,9 +55040,9 @@ diff -urNp linux-2.6.32.33/mm/highmem.c linux-2.6.32.33/mm/highmem.c
pkmap_count[last_pkmap_nr] = 1;
set_page_address(page, (void *)vaddr);
-diff -urNp linux-2.6.32.33/mm/hugetlb.c linux-2.6.32.33/mm/hugetlb.c
---- linux-2.6.32.33/mm/hugetlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/mm/hugetlb.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/hugetlb.c linux-2.6.32.35/mm/hugetlb.c
+--- linux-2.6.32.35/mm/hugetlb.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/mm/hugetlb.c 2010-12-31 14:46:53.000000000 -0500
@@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s
return 1;
}
@@ -54894,9 +55122,9 @@ diff -urNp linux-2.6.32.33/mm/hugetlb.c linux-2.6.32.33/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.33/mm/Kconfig linux-2.6.32.33/mm/Kconfig
---- linux-2.6.32.33/mm/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/mm/Kconfig 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/Kconfig linux-2.6.32.35/mm/Kconfig
+--- linux-2.6.32.35/mm/Kconfig 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/mm/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -228,7 +228,7 @@ config KSM
config DEFAULT_MMAP_MIN_ADDR
int "Low address space to protect from user allocation"
@@ -54906,9 +55134,9 @@ diff -urNp linux-2.6.32.33/mm/Kconfig linux-2.6.32.33/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.33/mm/kmemleak.c linux-2.6.32.33/mm/kmemleak.c
---- linux-2.6.32.33/mm/kmemleak.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/mm/kmemleak.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/kmemleak.c linux-2.6.32.35/mm/kmemleak.c
+--- linux-2.6.32.35/mm/kmemleak.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/mm/kmemleak.c 2010-12-31 14:46:53.000000000 -0500
@@ -358,7 +358,7 @@ static void print_unreferenced(struct se
for (i = 0; i < object->trace_len; i++) {
@@ -54918,9 +55146,9 @@ diff -urNp linux-2.6.32.33/mm/kmemleak.c linux-2.6.32.33/mm/kmemleak.c
}
}
-diff -urNp linux-2.6.32.33/mm/maccess.c linux-2.6.32.33/mm/maccess.c
---- linux-2.6.32.33/mm/maccess.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/mm/maccess.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/maccess.c linux-2.6.32.35/mm/maccess.c
+--- linux-2.6.32.35/mm/maccess.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/mm/maccess.c 2010-12-31 14:46:53.000000000 -0500
@@ -14,7 +14,7 @@
* Safely read from address @src to the buffer at @dst. If a kernel fault
* happens, handle that and return -EFAULT.
@@ -54939,9 +55167,9 @@ diff -urNp linux-2.6.32.33/mm/maccess.c linux-2.6.32.33/mm/maccess.c
{
long ret;
mm_segment_t old_fs = get_fs();
-diff -urNp linux-2.6.32.33/mm/madvise.c linux-2.6.32.33/mm/madvise.c
---- linux-2.6.32.33/mm/madvise.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/mm/madvise.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/madvise.c linux-2.6.32.35/mm/madvise.c
+--- linux-2.6.32.35/mm/madvise.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/mm/madvise.c 2010-12-31 14:46:53.000000000 -0500
@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
pgoff_t pgoff;
unsigned long new_flags = vma->vm_flags;
@@ -55018,9 +55246,9 @@ diff -urNp linux-2.6.32.33/mm/madvise.c linux-2.6.32.33/mm/madvise.c
error = 0;
if (end == start)
goto out;
-diff -urNp linux-2.6.32.33/mm/memory.c linux-2.6.32.33/mm/memory.c
---- linux-2.6.32.33/mm/memory.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.33/mm/memory.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/memory.c linux-2.6.32.35/mm/memory.c
+--- linux-2.6.32.35/mm/memory.c 2010-09-26 17:26:05.000000000 -0400
++++ linux-2.6.32.35/mm/memory.c 2010-12-31 14:46:53.000000000 -0500
@@ -187,8 +187,12 @@ static inline void free_pmd_range(struct
return;
@@ -55550,9 +55778,9 @@ diff -urNp linux-2.6.32.33/mm/memory.c linux-2.6.32.33/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.33/mm/memory-failure.c linux-2.6.32.33/mm/memory-failure.c
---- linux-2.6.32.33/mm/memory-failure.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/mm/memory-failure.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/memory-failure.c linux-2.6.32.35/mm/memory-failure.c
+--- linux-2.6.32.35/mm/memory-failure.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/mm/memory-failure.c 2010-12-31 14:46:53.000000000 -0500
@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -55571,9 +55799,9 @@ diff -urNp linux-2.6.32.33/mm/memory-failure.c linux-2.6.32.33/mm/memory-failure
/*
* We need/can do nothing about count=0 pages.
-diff -urNp linux-2.6.32.33/mm/mempolicy.c linux-2.6.32.33/mm/mempolicy.c
---- linux-2.6.32.33/mm/mempolicy.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/mm/mempolicy.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/mempolicy.c linux-2.6.32.35/mm/mempolicy.c
+--- linux-2.6.32.35/mm/mempolicy.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/mm/mempolicy.c 2010-12-31 14:46:53.000000000 -0500
@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
struct vm_area_struct *next;
int err;
@@ -55654,9 +55882,9 @@ diff -urNp linux-2.6.32.33/mm/mempolicy.c linux-2.6.32.33/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.33/mm/migrate.c linux-2.6.32.33/mm/migrate.c
---- linux-2.6.32.33/mm/migrate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/mm/migrate.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/migrate.c linux-2.6.32.35/mm/migrate.c
+--- linux-2.6.32.35/mm/migrate.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/mm/migrate.c 2010-12-31 14:46:53.000000000 -0500
@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
if (!mm)
return -EINVAL;
@@ -55682,9 +55910,9 @@ diff -urNp linux-2.6.32.33/mm/migrate.c linux-2.6.32.33/mm/migrate.c
rcu_read_unlock();
err = -EPERM;
goto out;
-diff -urNp linux-2.6.32.33/mm/mlock.c linux-2.6.32.33/mm/mlock.c
---- linux-2.6.32.33/mm/mlock.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.33/mm/mlock.c 2011-01-24 18:05:37.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/mlock.c linux-2.6.32.35/mm/mlock.c
+--- linux-2.6.32.35/mm/mlock.c 2010-10-31 16:44:11.000000000 -0400
++++ linux-2.6.32.35/mm/mlock.c 2011-01-24 18:05:37.000000000 -0500
@@ -13,6 +13,7 @@
#include <linux/pagemap.h>
#include <linux/mempolicy.h>
@@ -55795,9 +56023,9 @@ diff -urNp linux-2.6.32.33/mm/mlock.c linux-2.6.32.33/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.33/mm/mmap.c linux-2.6.32.33/mm/mmap.c
---- linux-2.6.32.33/mm/mmap.c 2011-01-11 23:55:35.000000000 -0500
-+++ linux-2.6.32.33/mm/mmap.c 2011-03-21 17:34:54.000000000 -0400
+diff -urNp linux-2.6.32.35/mm/mmap.c linux-2.6.32.35/mm/mmap.c
+--- linux-2.6.32.35/mm/mmap.c 2011-01-11 23:55:35.000000000 -0500
++++ linux-2.6.32.35/mm/mmap.c 2011-03-21 17:34:54.000000000 -0400
@@ -45,6 +45,16 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
@@ -57014,9 +57242,9 @@ diff -urNp linux-2.6.32.33/mm/mmap.c linux-2.6.32.33/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.33/mm/mprotect.c linux-2.6.32.33/mm/mprotect.c
---- linux-2.6.32.33/mm/mprotect.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/mm/mprotect.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/mprotect.c linux-2.6.32.35/mm/mprotect.c
+--- linux-2.6.32.35/mm/mprotect.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/mm/mprotect.c 2010-12-31 14:46:53.000000000 -0500
@@ -24,10 +24,16 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
@@ -57239,9 +57467,9 @@ diff -urNp linux-2.6.32.33/mm/mprotect.c linux-2.6.32.33/mm/mprotect.c
nstart = tmp;
if (nstart < prev->vm_end)
-diff -urNp linux-2.6.32.33/mm/mremap.c linux-2.6.32.33/mm/mremap.c
---- linux-2.6.32.33/mm/mremap.c 2011-03-18 17:10:31.000000000 -0400
-+++ linux-2.6.32.33/mm/mremap.c 2011-03-18 17:10:44.000000000 -0400
+diff -urNp linux-2.6.32.35/mm/mremap.c linux-2.6.32.35/mm/mremap.c
+--- linux-2.6.32.35/mm/mremap.c 2011-03-18 17:10:31.000000000 -0400
++++ linux-2.6.32.35/mm/mremap.c 2011-03-18 17:10:44.000000000 -0400
@@ -112,6 +112,12 @@ static void move_ptes(struct vm_area_str
continue;
pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -57346,9 +57574,9 @@ diff -urNp linux-2.6.32.33/mm/mremap.c linux-2.6.32.33/mm/mremap.c
}
out:
if (ret & ~PAGE_MASK)
-diff -urNp linux-2.6.32.33/mm/nommu.c linux-2.6.32.33/mm/nommu.c
---- linux-2.6.32.33/mm/nommu.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/mm/nommu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/nommu.c linux-2.6.32.35/mm/nommu.c
+--- linux-2.6.32.35/mm/nommu.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/mm/nommu.c 2010-12-31 14:46:53.000000000 -0500
@@ -67,7 +67,6 @@ int sysctl_overcommit_memory = OVERCOMMI
int sysctl_overcommit_ratio = 50; /* default is 50% */
int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
@@ -57373,9 +57601,9 @@ diff -urNp linux-2.6.32.33/mm/nommu.c linux-2.6.32.33/mm/nommu.c
* expand a stack to a given address
* - not supported under NOMMU conditions
*/
-diff -urNp linux-2.6.32.33/mm/page_alloc.c linux-2.6.32.33/mm/page_alloc.c
---- linux-2.6.32.33/mm/page_alloc.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.33/mm/page_alloc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/page_alloc.c linux-2.6.32.35/mm/page_alloc.c
+--- linux-2.6.32.35/mm/page_alloc.c 2010-09-26 17:26:05.000000000 -0400
++++ linux-2.6.32.35/mm/page_alloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -587,6 +587,10 @@ static void __free_pages_ok(struct page
int bad = 0;
int wasMlocked = __TestClearPageMlocked(page);
@@ -57432,9 +57660,9 @@ diff -urNp linux-2.6.32.33/mm/page_alloc.c linux-2.6.32.33/mm/page_alloc.c
struct zone *zone, unsigned long zonesize) {}
#endif /* CONFIG_SPARSEMEM */
-diff -urNp linux-2.6.32.33/mm/percpu.c linux-2.6.32.33/mm/percpu.c
---- linux-2.6.32.33/mm/percpu.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.33/mm/percpu.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/percpu.c linux-2.6.32.35/mm/percpu.c
+--- linux-2.6.32.35/mm/percpu.c 2010-09-26 17:26:05.000000000 -0400
++++ linux-2.6.32.35/mm/percpu.c 2010-12-31 14:46:53.000000000 -0500
@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
static unsigned int pcpu_last_unit_cpu __read_mostly;
@@ -57444,9 +57672,9 @@ diff -urNp linux-2.6.32.33/mm/percpu.c linux-2.6.32.33/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.33/mm/rmap.c linux-2.6.32.33/mm/rmap.c
---- linux-2.6.32.33/mm/rmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/mm/rmap.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/rmap.c linux-2.6.32.35/mm/rmap.c
+--- linux-2.6.32.35/mm/rmap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/mm/rmap.c 2010-12-31 14:46:53.000000000 -0500
@@ -121,6 +121,17 @@ int anon_vma_prepare(struct vm_area_stru
/* page_table_lock to protect against threads */
spin_lock(&mm->page_table_lock);
@@ -57465,9 +57693,9 @@ diff -urNp linux-2.6.32.33/mm/rmap.c linux-2.6.32.33/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.33/mm/shmem.c linux-2.6.32.33/mm/shmem.c
---- linux-2.6.32.33/mm/shmem.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/mm/shmem.c 2011-01-24 18:05:37.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/shmem.c linux-2.6.32.35/mm/shmem.c
+--- linux-2.6.32.35/mm/shmem.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/mm/shmem.c 2011-01-24 18:05:37.000000000 -0500
@@ -31,7 +31,7 @@
#include <linux/swap.h>
#include <linux/ima.h>
@@ -57486,9 +57714,9 @@ diff -urNp linux-2.6.32.33/mm/shmem.c linux-2.6.32.33/mm/shmem.c
if (entry->val) {
/*
* The more uptodate page coming down from a stacked
-diff -urNp linux-2.6.32.33/mm/slab.c linux-2.6.32.33/mm/slab.c
---- linux-2.6.32.33/mm/slab.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.33/mm/slab.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/slab.c linux-2.6.32.35/mm/slab.c
+--- linux-2.6.32.35/mm/slab.c 2010-08-29 21:08:20.000000000 -0400
++++ linux-2.6.32.35/mm/slab.c 2010-12-31 14:46:53.000000000 -0500
@@ -308,7 +308,7 @@ struct kmem_list3 {
* Need this for bootstrapping a per node allocator.
*/
@@ -57594,9 +57822,9 @@ diff -urNp linux-2.6.32.33/mm/slab.c linux-2.6.32.33/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.33/mm/slob.c linux-2.6.32.33/mm/slob.c
---- linux-2.6.32.33/mm/slob.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/mm/slob.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/slob.c linux-2.6.32.35/mm/slob.c
+--- linux-2.6.32.35/mm/slob.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/mm/slob.c 2010-12-31 14:46:53.000000000 -0500
@@ -29,7 +29,7 @@
* If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
* alloc_pages() directly, allocating compound pages so the page order
@@ -57917,9 +58145,9 @@ diff -urNp linux-2.6.32.33/mm/slob.c linux-2.6.32.33/mm/slob.c
}
trace_kmem_cache_free(_RET_IP_, b);
-diff -urNp linux-2.6.32.33/mm/slub.c linux-2.6.32.33/mm/slub.c
---- linux-2.6.32.33/mm/slub.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/mm/slub.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/slub.c linux-2.6.32.35/mm/slub.c
+--- linux-2.6.32.35/mm/slub.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/mm/slub.c 2010-12-31 14:46:53.000000000 -0500
@@ -410,7 +410,7 @@ static void print_track(const char *s, s
if (!t->addr)
return;
@@ -58091,9 +58319,9 @@ diff -urNp linux-2.6.32.33/mm/slub.c linux-2.6.32.33/mm/slub.c
return 0;
}
module_init(slab_proc_init);
-diff -urNp linux-2.6.32.33/mm/util.c linux-2.6.32.33/mm/util.c
---- linux-2.6.32.33/mm/util.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/mm/util.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/util.c linux-2.6.32.35/mm/util.c
+--- linux-2.6.32.35/mm/util.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/mm/util.c 2010-12-31 14:46:53.000000000 -0500
@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
void arch_pick_mmap_layout(struct mm_struct *mm)
{
@@ -58107,9 +58335,9 @@ diff -urNp linux-2.6.32.33/mm/util.c linux-2.6.32.33/mm/util.c
mm->get_unmapped_area = arch_get_unmapped_area;
mm->unmap_area = arch_unmap_area;
}
-diff -urNp linux-2.6.32.33/mm/vmalloc.c linux-2.6.32.33/mm/vmalloc.c
---- linux-2.6.32.33/mm/vmalloc.c 2010-11-26 18:22:29.000000000 -0500
-+++ linux-2.6.32.33/mm/vmalloc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/vmalloc.c linux-2.6.32.35/mm/vmalloc.c
+--- linux-2.6.32.35/mm/vmalloc.c 2010-11-26 18:22:29.000000000 -0500
++++ linux-2.6.32.35/mm/vmalloc.c 2010-12-31 14:46:53.000000000 -0500
@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
pte = pte_offset_kernel(pmd, addr);
@@ -58346,9 +58574,9 @@ diff -urNp linux-2.6.32.33/mm/vmalloc.c linux-2.6.32.33/mm/vmalloc.c
if ((PAGE_SIZE-1) & (unsigned long)addr)
return -EINVAL;
-diff -urNp linux-2.6.32.33/mm/vmstat.c linux-2.6.32.33/mm/vmstat.c
---- linux-2.6.32.33/mm/vmstat.c 2010-09-26 17:26:05.000000000 -0400
-+++ linux-2.6.32.33/mm/vmstat.c 2010-12-31 14:54:42.000000000 -0500
+diff -urNp linux-2.6.32.35/mm/vmstat.c linux-2.6.32.35/mm/vmstat.c
+--- linux-2.6.32.35/mm/vmstat.c 2010-09-26 17:26:05.000000000 -0400
++++ linux-2.6.32.35/mm/vmstat.c 2010-12-31 14:54:42.000000000 -0500
@@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu)
*
* vm_stat contains the global counters
@@ -58401,9 +58629,9 @@ diff -urNp linux-2.6.32.33/mm/vmstat.c linux-2.6.32.33/mm/vmstat.c
#endif
return 0;
}
-diff -urNp linux-2.6.32.33/net/8021q/vlan.c linux-2.6.32.33/net/8021q/vlan.c
---- linux-2.6.32.33/net/8021q/vlan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/8021q/vlan.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/8021q/vlan.c linux-2.6.32.35/net/8021q/vlan.c
+--- linux-2.6.32.35/net/8021q/vlan.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/8021q/vlan.c 2010-12-31 14:46:53.000000000 -0500
@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
err = -EPERM;
if (!capable(CAP_NET_ADMIN))
@@ -58414,9 +58642,9 @@ diff -urNp linux-2.6.32.33/net/8021q/vlan.c linux-2.6.32.33/net/8021q/vlan.c
struct vlan_net *vn;
vn = net_generic(net, vlan_net_id);
-diff -urNp linux-2.6.32.33/net/atm/atm_misc.c linux-2.6.32.33/net/atm/atm_misc.c
---- linux-2.6.32.33/net/atm/atm_misc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/atm/atm_misc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/atm/atm_misc.c linux-2.6.32.35/net/atm/atm_misc.c
+--- linux-2.6.32.35/net/atm/atm_misc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/atm/atm_misc.c 2010-12-31 14:46:53.000000000 -0500
@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
return 1;
@@ -58453,9 +58681,9 @@ diff -urNp linux-2.6.32.33/net/atm/atm_misc.c linux-2.6.32.33/net/atm/atm_misc.c
__SONET_ITEMS
#undef __HANDLE_ITEM
}
-diff -urNp linux-2.6.32.33/net/atm/proc.c linux-2.6.32.33/net/atm/proc.c
---- linux-2.6.32.33/net/atm/proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/atm/proc.c 2011-03-12 19:46:43.000000000 -0500
+diff -urNp linux-2.6.32.35/net/atm/proc.c linux-2.6.32.35/net/atm/proc.c
+--- linux-2.6.32.35/net/atm/proc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/atm/proc.c 2011-03-12 19:46:43.000000000 -0500
@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
const struct k_atm_aal_stats *stats)
{
@@ -58494,9 +58722,9 @@ diff -urNp linux-2.6.32.33/net/atm/proc.c linux-2.6.32.33/net/atm/proc.c
else
seq_printf(seq, "%3d %3d %5d ",
vcc->dev->number, vcc->vpi, vcc->vci);
-diff -urNp linux-2.6.32.33/net/atm/resources.c linux-2.6.32.33/net/atm/resources.c
---- linux-2.6.32.33/net/atm/resources.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/atm/resources.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/atm/resources.c linux-2.6.32.35/net/atm/resources.c
+--- linux-2.6.32.35/net/atm/resources.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/atm/resources.c 2010-12-31 14:46:53.000000000 -0500
@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
static void copy_aal_stats(struct k_atm_aal_stats *from,
struct atm_aal_stats *to)
@@ -58515,9 +58743,9 @@ diff -urNp linux-2.6.32.33/net/atm/resources.c linux-2.6.32.33/net/atm/resources
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
}
-diff -urNp linux-2.6.32.33/net/ax25/af_ax25.c linux-2.6.32.33/net/ax25/af_ax25.c
---- linux-2.6.32.33/net/ax25/af_ax25.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ax25/af_ax25.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ax25/af_ax25.c linux-2.6.32.35/net/ax25/af_ax25.c
+--- linux-2.6.32.35/net/ax25/af_ax25.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ax25/af_ax25.c 2010-12-31 14:46:53.000000000 -0500
@@ -1391,6 +1391,7 @@ static int ax25_getname(struct socket *s
ax25_cb *ax25;
int err = 0;
@@ -58534,9 +58762,9 @@ diff -urNp linux-2.6.32.33/net/ax25/af_ax25.c linux-2.6.32.33/net/ax25/af_ax25.c
if (ax25->digipeat != NULL) {
ndigi = ax25->digipeat->ndigi;
-diff -urNp linux-2.6.32.33/net/bluetooth/bnep/sock.c linux-2.6.32.33/net/bluetooth/bnep/sock.c
---- linux-2.6.32.33/net/bluetooth/bnep/sock.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/bluetooth/bnep/sock.c 2011-02-28 17:57:10.000000000 -0500
+diff -urNp linux-2.6.32.35/net/bluetooth/bnep/sock.c linux-2.6.32.35/net/bluetooth/bnep/sock.c
+--- linux-2.6.32.35/net/bluetooth/bnep/sock.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/bluetooth/bnep/sock.c 2011-02-28 17:57:10.000000000 -0500
@@ -88,6 +88,7 @@ static int bnep_sock_ioctl(struct socket
sockfd_put(nsock);
return -EBADFD;
@@ -58545,9 +58773,9 @@ diff -urNp linux-2.6.32.33/net/bluetooth/bnep/sock.c linux-2.6.32.33/net/bluetoo
err = bnep_add_connection(&ca, nsock);
if (!err) {
-diff -urNp linux-2.6.32.33/net/bluetooth/sco.c linux-2.6.32.33/net/bluetooth/sco.c
---- linux-2.6.32.33/net/bluetooth/sco.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/bluetooth/sco.c 2011-02-28 17:55:46.000000000 -0500
+diff -urNp linux-2.6.32.35/net/bluetooth/sco.c linux-2.6.32.35/net/bluetooth/sco.c
+--- linux-2.6.32.35/net/bluetooth/sco.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/bluetooth/sco.c 2011-02-28 17:55:46.000000000 -0500
@@ -700,6 +700,7 @@ static int sco_sock_getsockopt_old(struc
break;
}
@@ -58556,9 +58784,9 @@ diff -urNp linux-2.6.32.33/net/bluetooth/sco.c linux-2.6.32.33/net/bluetooth/sco
cinfo.hci_handle = sco_pi(sk)->conn->hcon->handle;
memcpy(cinfo.dev_class, sco_pi(sk)->conn->hcon->dev_class, 3);
-diff -urNp linux-2.6.32.33/net/bridge/br_private.h linux-2.6.32.33/net/bridge/br_private.h
---- linux-2.6.32.33/net/bridge/br_private.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/bridge/br_private.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/bridge/br_private.h linux-2.6.32.35/net/bridge/br_private.h
+--- linux-2.6.32.35/net/bridge/br_private.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/bridge/br_private.h 2010-12-31 14:46:53.000000000 -0500
@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,
#ifdef CONFIG_SYSFS
@@ -58568,9 +58796,9 @@ diff -urNp linux-2.6.32.33/net/bridge/br_private.h linux-2.6.32.33/net/bridge/br
extern int br_sysfs_addif(struct net_bridge_port *p);
/* br_sysfs_br.c */
-diff -urNp linux-2.6.32.33/net/bridge/br_stp_if.c linux-2.6.32.33/net/bridge/br_stp_if.c
---- linux-2.6.32.33/net/bridge/br_stp_if.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/bridge/br_stp_if.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/bridge/br_stp_if.c linux-2.6.32.35/net/bridge/br_stp_if.c
+--- linux-2.6.32.35/net/bridge/br_stp_if.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/bridge/br_stp_if.c 2010-12-31 14:46:53.000000000 -0500
@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
char *envp[] = { NULL };
@@ -58580,9 +58808,9 @@ diff -urNp linux-2.6.32.33/net/bridge/br_stp_if.c linux-2.6.32.33/net/bridge/br_
printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
br->dev->name, r);
-diff -urNp linux-2.6.32.33/net/bridge/br_sysfs_if.c linux-2.6.32.33/net/bridge/br_sysfs_if.c
---- linux-2.6.32.33/net/bridge/br_sysfs_if.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/bridge/br_sysfs_if.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/bridge/br_sysfs_if.c linux-2.6.32.35/net/bridge/br_sysfs_if.c
+--- linux-2.6.32.35/net/bridge/br_sysfs_if.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/bridge/br_sysfs_if.c 2010-12-31 14:46:53.000000000 -0500
@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
return ret;
}
@@ -58592,9 +58820,9 @@ diff -urNp linux-2.6.32.33/net/bridge/br_sysfs_if.c linux-2.6.32.33/net/bridge/b
.show = brport_show,
.store = brport_store,
};
-diff -urNp linux-2.6.32.33/net/bridge/netfilter/ebtables.c linux-2.6.32.33/net/bridge/netfilter/ebtables.c
---- linux-2.6.32.33/net/bridge/netfilter/ebtables.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/bridge/netfilter/ebtables.c 2011-02-28 17:58:13.000000000 -0500
+diff -urNp linux-2.6.32.35/net/bridge/netfilter/ebtables.c linux-2.6.32.35/net/bridge/netfilter/ebtables.c
+--- linux-2.6.32.35/net/bridge/netfilter/ebtables.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/bridge/netfilter/ebtables.c 2011-02-28 17:58:13.000000000 -0500
@@ -979,6 +979,8 @@ static int do_replace(struct net *net, v
if (tmp.num_counters >= INT_MAX / sizeof(struct ebt_counter))
return -ENOMEM;
@@ -58604,9 +58832,9 @@ diff -urNp linux-2.6.32.33/net/bridge/netfilter/ebtables.c linux-2.6.32.33/net/b
countersize = COUNTER_OFFSET(tmp.nentries) * nr_cpu_ids;
newinfo = vmalloc(sizeof(*newinfo) + countersize);
if (!newinfo)
-diff -urNp linux-2.6.32.33/net/can/bcm.c linux-2.6.32.33/net/can/bcm.c
---- linux-2.6.32.33/net/can/bcm.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/net/can/bcm.c 2011-03-12 19:48:30.000000000 -0500
+diff -urNp linux-2.6.32.35/net/can/bcm.c linux-2.6.32.35/net/can/bcm.c
+--- linux-2.6.32.35/net/can/bcm.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/net/can/bcm.c 2011-03-12 19:48:30.000000000 -0500
@@ -164,9 +164,15 @@ static int bcm_proc_show(struct seq_file
struct bcm_sock *bo = bcm_sk(sk);
struct bcm_op *op;
@@ -58623,9 +58851,9 @@ diff -urNp linux-2.6.32.33/net/can/bcm.c linux-2.6.32.33/net/can/bcm.c
seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs);
seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex));
seq_printf(m, " <<<\n");
-diff -urNp linux-2.6.32.33/net/core/dev.c linux-2.6.32.33/net/core/dev.c
---- linux-2.6.32.33/net/core/dev.c 2011-03-18 17:10:31.000000000 -0400
-+++ linux-2.6.32.33/net/core/dev.c 2011-03-18 17:26:38.000000000 -0400
+diff -urNp linux-2.6.32.35/net/core/dev.c linux-2.6.32.35/net/core/dev.c
+--- linux-2.6.32.35/net/core/dev.c 2011-03-18 17:10:31.000000000 -0400
++++ linux-2.6.32.35/net/core/dev.c 2011-03-18 17:26:38.000000000 -0400
@@ -2063,7 +2063,7 @@ int netif_rx_ni(struct sk_buff *skb)
}
EXPORT_SYMBOL(netif_rx_ni);
@@ -58644,9 +58872,9 @@ diff -urNp linux-2.6.32.33/net/core/dev.c linux-2.6.32.33/net/core/dev.c
{
struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
unsigned long time_limit = jiffies + 2;
-diff -urNp linux-2.6.32.33/net/core/flow.c linux-2.6.32.33/net/core/flow.c
---- linux-2.6.32.33/net/core/flow.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/core/flow.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/core/flow.c linux-2.6.32.35/net/core/flow.c
+--- linux-2.6.32.35/net/core/flow.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/core/flow.c 2010-12-31 14:46:53.000000000 -0500
@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
static u32 flow_hash_shift;
@@ -58674,9 +58902,9 @@ diff -urNp linux-2.6.32.33/net/core/flow.c linux-2.6.32.33/net/core/flow.c
#define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
-diff -urNp linux-2.6.32.33/net/dccp/ccids/ccid3.c linux-2.6.32.33/net/dccp/ccids/ccid3.c
---- linux-2.6.32.33/net/dccp/ccids/ccid3.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/dccp/ccids/ccid3.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/dccp/ccids/ccid3.c linux-2.6.32.35/net/dccp/ccids/ccid3.c
+--- linux-2.6.32.35/net/dccp/ccids/ccid3.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/dccp/ccids/ccid3.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,7 +41,7 @@
static int ccid3_debug;
#define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -58686,9 +58914,9 @@ diff -urNp linux-2.6.32.33/net/dccp/ccids/ccid3.c linux-2.6.32.33/net/dccp/ccids
#endif
/*
-diff -urNp linux-2.6.32.33/net/dccp/dccp.h linux-2.6.32.33/net/dccp/dccp.h
---- linux-2.6.32.33/net/dccp/dccp.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/dccp/dccp.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/dccp/dccp.h linux-2.6.32.35/net/dccp/dccp.h
+--- linux-2.6.32.35/net/dccp/dccp.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/dccp/dccp.h 2010-12-31 14:46:53.000000000 -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)
@@ -58702,9 +58930,9 @@ diff -urNp linux-2.6.32.33/net/dccp/dccp.h linux-2.6.32.33/net/dccp/dccp.h
#endif
extern struct inet_hashinfo dccp_hashinfo;
-diff -urNp linux-2.6.32.33/net/decnet/sysctl_net_decnet.c linux-2.6.32.33/net/decnet/sysctl_net_decnet.c
---- linux-2.6.32.33/net/decnet/sysctl_net_decnet.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/decnet/sysctl_net_decnet.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/decnet/sysctl_net_decnet.c linux-2.6.32.35/net/decnet/sysctl_net_decnet.c
+--- linux-2.6.32.35/net/decnet/sysctl_net_decnet.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/decnet/sysctl_net_decnet.c 2010-12-31 14:46:53.000000000 -0500
@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
if (len > *lenp) len = *lenp;
@@ -58723,9 +58951,9 @@ diff -urNp linux-2.6.32.33/net/decnet/sysctl_net_decnet.c linux-2.6.32.33/net/de
return -EFAULT;
*lenp = len;
-diff -urNp linux-2.6.32.33/net/econet/Kconfig linux-2.6.32.33/net/econet/Kconfig
---- linux-2.6.32.33/net/econet/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/econet/Kconfig 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/econet/Kconfig linux-2.6.32.35/net/econet/Kconfig
+--- linux-2.6.32.35/net/econet/Kconfig 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/econet/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -4,7 +4,7 @@
config ECONET
@@ -58735,9 +58963,9 @@ diff -urNp linux-2.6.32.33/net/econet/Kconfig linux-2.6.32.33/net/econet/Kconfig
---help---
Econet is a fairly old and slow networking protocol mainly used by
Acorn computers to access file and print servers. It uses native
-diff -urNp linux-2.6.32.33/net/ipv4/inet_diag.c linux-2.6.32.33/net/ipv4/inet_diag.c
---- linux-2.6.32.33/net/ipv4/inet_diag.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ipv4/inet_diag.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv4/inet_diag.c linux-2.6.32.35/net/ipv4/inet_diag.c
+--- linux-2.6.32.35/net/ipv4/inet_diag.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ipv4/inet_diag.c 2010-12-31 14:46:53.000000000 -0500
@@ -113,8 +113,13 @@ static int inet_csk_diag_fill(struct soc
r->idiag_retrans = 0;
@@ -58798,9 +59026,9 @@ diff -urNp linux-2.6.32.33/net/ipv4/inet_diag.c linux-2.6.32.33/net/ipv4/inet_di
tmo = req->expires - jiffies;
if (tmo < 0)
-diff -urNp linux-2.6.32.33/net/ipv4/inet_hashtables.c linux-2.6.32.33/net/ipv4/inet_hashtables.c
---- linux-2.6.32.33/net/ipv4/inet_hashtables.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ipv4/inet_hashtables.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv4/inet_hashtables.c linux-2.6.32.35/net/ipv4/inet_hashtables.c
+--- linux-2.6.32.35/net/ipv4/inet_hashtables.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ipv4/inet_hashtables.c 2010-12-31 14:46:53.000000000 -0500
@@ -18,11 +18,14 @@
#include <linux/sched.h>
#include <linux/slab.h>
@@ -58825,9 +59053,9 @@ diff -urNp linux-2.6.32.33/net/ipv4/inet_hashtables.c linux-2.6.32.33/net/ipv4/i
if (tw) {
inet_twsk_deschedule(tw, death_row);
inet_twsk_put(tw);
-diff -urNp linux-2.6.32.33/net/ipv4/inetpeer.c linux-2.6.32.33/net/ipv4/inetpeer.c
---- linux-2.6.32.33/net/ipv4/inetpeer.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ipv4/inetpeer.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv4/inetpeer.c linux-2.6.32.35/net/ipv4/inetpeer.c
+--- linux-2.6.32.35/net/ipv4/inetpeer.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ipv4/inetpeer.c 2010-12-31 14:46:53.000000000 -0500
@@ -389,7 +389,7 @@ struct inet_peer *inet_getpeer(__be32 da
return NULL;
n->v4daddr = daddr;
@@ -58837,9 +59065,9 @@ diff -urNp linux-2.6.32.33/net/ipv4/inetpeer.c linux-2.6.32.33/net/ipv4/inetpeer
n->ip_id_count = secure_ip_id(daddr);
n->tcp_ts_stamp = 0;
-diff -urNp linux-2.6.32.33/net/ipv4/ip_fragment.c linux-2.6.32.33/net/ipv4/ip_fragment.c
---- linux-2.6.32.33/net/ipv4/ip_fragment.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ipv4/ip_fragment.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv4/ip_fragment.c linux-2.6.32.35/net/ipv4/ip_fragment.c
+--- linux-2.6.32.35/net/ipv4/ip_fragment.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ipv4/ip_fragment.c 2010-12-31 14:46:53.000000000 -0500
@@ -255,7 +255,7 @@ static inline int ip_frag_too_far(struct
return 0;
@@ -58849,9 +59077,9 @@ diff -urNp linux-2.6.32.33/net/ipv4/ip_fragment.c linux-2.6.32.33/net/ipv4/ip_fr
qp->rid = end;
rc = qp->q.fragments && (end - start) > max;
-diff -urNp linux-2.6.32.33/net/ipv4/netfilter/arp_tables.c linux-2.6.32.33/net/ipv4/netfilter/arp_tables.c
---- linux-2.6.32.33/net/ipv4/netfilter/arp_tables.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ipv4/netfilter/arp_tables.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv4/netfilter/arp_tables.c linux-2.6.32.35/net/ipv4/netfilter/arp_tables.c
+--- linux-2.6.32.35/net/ipv4/netfilter/arp_tables.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ipv4/netfilter/arp_tables.c 2010-12-31 14:46:53.000000000 -0500
@@ -934,6 +934,7 @@ static int get_info(struct net *net, voi
private = &tmp;
}
@@ -58860,9 +59088,9 @@ diff -urNp linux-2.6.32.33/net/ipv4/netfilter/arp_tables.c linux-2.6.32.33/net/i
info.valid_hooks = t->valid_hooks;
memcpy(info.hook_entry, private->hook_entry,
sizeof(info.hook_entry));
-diff -urNp linux-2.6.32.33/net/ipv4/netfilter/ip_tables.c linux-2.6.32.33/net/ipv4/netfilter/ip_tables.c
---- linux-2.6.32.33/net/ipv4/netfilter/ip_tables.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ipv4/netfilter/ip_tables.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv4/netfilter/ip_tables.c linux-2.6.32.35/net/ipv4/netfilter/ip_tables.c
+--- linux-2.6.32.35/net/ipv4/netfilter/ip_tables.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ipv4/netfilter/ip_tables.c 2010-12-31 14:46:53.000000000 -0500
@@ -1141,6 +1141,7 @@ static int get_info(struct net *net, voi
private = &tmp;
}
@@ -58871,9 +59099,9 @@ diff -urNp linux-2.6.32.33/net/ipv4/netfilter/ip_tables.c linux-2.6.32.33/net/ip
info.valid_hooks = t->valid_hooks;
memcpy(info.hook_entry, private->hook_entry,
sizeof(info.hook_entry));
-diff -urNp linux-2.6.32.33/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.33/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.32.33/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.35/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-2.6.32.35/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-12-31 14:46:53.000000000 -0500
@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
*len = 0;
@@ -58883,9 +59111,9 @@ diff -urNp linux-2.6.32.33/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.3
if (*octets == NULL) {
if (net_ratelimit())
printk("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-2.6.32.33/net/ipv4/tcp_ipv4.c linux-2.6.32.33/net/ipv4/tcp_ipv4.c
---- linux-2.6.32.33/net/ipv4/tcp_ipv4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ipv4/tcp_ipv4.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv4/tcp_ipv4.c linux-2.6.32.35/net/ipv4/tcp_ipv4.c
+--- linux-2.6.32.35/net/ipv4/tcp_ipv4.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ipv4/tcp_ipv4.c 2010-12-31 14:46:53.000000000 -0500
@@ -84,6 +84,9 @@
int sysctl_tcp_tw_reuse __read_mostly;
int sysctl_tcp_low_latency __read_mostly;
@@ -58981,9 +59209,9 @@ diff -urNp linux-2.6.32.33/net/ipv4/tcp_ipv4.c linux-2.6.32.33/net/ipv4/tcp_ipv4
}
#define TMPSZ 150
-diff -urNp linux-2.6.32.33/net/ipv4/tcp_minisocks.c linux-2.6.32.33/net/ipv4/tcp_minisocks.c
---- linux-2.6.32.33/net/ipv4/tcp_minisocks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ipv4/tcp_minisocks.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv4/tcp_minisocks.c linux-2.6.32.35/net/ipv4/tcp_minisocks.c
+--- linux-2.6.32.35/net/ipv4/tcp_minisocks.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ipv4/tcp_minisocks.c 2010-12-31 14:46:53.000000000 -0500
@@ -26,6 +26,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
@@ -59006,9 +59234,9 @@ diff -urNp linux-2.6.32.33/net/ipv4/tcp_minisocks.c linux-2.6.32.33/net/ipv4/tcp
if (!(flg & TCP_FLAG_RST))
req->rsk_ops->send_reset(sk, skb);
-diff -urNp linux-2.6.32.33/net/ipv4/tcp_probe.c linux-2.6.32.33/net/ipv4/tcp_probe.c
---- linux-2.6.32.33/net/ipv4/tcp_probe.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ipv4/tcp_probe.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv4/tcp_probe.c linux-2.6.32.35/net/ipv4/tcp_probe.c
+--- linux-2.6.32.35/net/ipv4/tcp_probe.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ipv4/tcp_probe.c 2010-12-31 14:46:53.000000000 -0500
@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
if (cnt + width >= len)
break;
@@ -59018,9 +59246,9 @@ diff -urNp linux-2.6.32.33/net/ipv4/tcp_probe.c linux-2.6.32.33/net/ipv4/tcp_pro
return -EFAULT;
cnt += width;
}
-diff -urNp linux-2.6.32.33/net/ipv4/tcp_timer.c linux-2.6.32.33/net/ipv4/tcp_timer.c
---- linux-2.6.32.33/net/ipv4/tcp_timer.c 2010-09-26 17:26:06.000000000 -0400
-+++ linux-2.6.32.33/net/ipv4/tcp_timer.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv4/tcp_timer.c linux-2.6.32.35/net/ipv4/tcp_timer.c
+--- linux-2.6.32.35/net/ipv4/tcp_timer.c 2010-09-26 17:26:06.000000000 -0400
++++ linux-2.6.32.35/net/ipv4/tcp_timer.c 2010-12-31 14:46:53.000000000 -0500
@@ -21,6 +21,10 @@
#include <linux/module.h>
#include <net/tcp.h>
@@ -59046,9 +59274,9 @@ diff -urNp linux-2.6.32.33/net/ipv4/tcp_timer.c linux-2.6.32.33/net/ipv4/tcp_tim
if (retransmits_timed_out(sk, retry_until)) {
/* Has it gone just too far? */
tcp_write_err(sk);
-diff -urNp linux-2.6.32.33/net/ipv4/udp.c linux-2.6.32.33/net/ipv4/udp.c
---- linux-2.6.32.33/net/ipv4/udp.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/net/ipv4/udp.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv4/udp.c linux-2.6.32.35/net/ipv4/udp.c
+--- linux-2.6.32.35/net/ipv4/udp.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/net/ipv4/udp.c 2010-12-31 14:46:53.000000000 -0500
@@ -86,6 +86,7 @@
#include <linux/types.h>
#include <linux/fcntl.h>
@@ -59132,9 +59360,9 @@ diff -urNp linux-2.6.32.33/net/ipv4/udp.c linux-2.6.32.33/net/ipv4/udp.c
atomic_read(&sp->sk_drops), len);
}
-diff -urNp linux-2.6.32.33/net/ipv6/exthdrs.c linux-2.6.32.33/net/ipv6/exthdrs.c
---- linux-2.6.32.33/net/ipv6/exthdrs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ipv6/exthdrs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv6/exthdrs.c linux-2.6.32.35/net/ipv6/exthdrs.c
+--- linux-2.6.32.35/net/ipv6/exthdrs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ipv6/exthdrs.c 2010-12-31 14:46:53.000000000 -0500
@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
.type = IPV6_TLV_JUMBO,
.func = ipv6_hop_jumbo,
@@ -59144,9 +59372,9 @@ diff -urNp linux-2.6.32.33/net/ipv6/exthdrs.c linux-2.6.32.33/net/ipv6/exthdrs.c
};
int ipv6_parse_hopopts(struct sk_buff *skb)
-diff -urNp linux-2.6.32.33/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.33/net/ipv6/netfilter/ip6_tables.c
---- linux-2.6.32.33/net/ipv6/netfilter/ip6_tables.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ipv6/netfilter/ip6_tables.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.35/net/ipv6/netfilter/ip6_tables.c
+--- linux-2.6.32.35/net/ipv6/netfilter/ip6_tables.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ipv6/netfilter/ip6_tables.c 2010-12-31 14:46:53.000000000 -0500
@@ -1173,6 +1173,7 @@ static int get_info(struct net *net, voi
private = &tmp;
}
@@ -59155,9 +59383,9 @@ diff -urNp linux-2.6.32.33/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.33/net/i
info.valid_hooks = t->valid_hooks;
memcpy(info.hook_entry, private->hook_entry,
sizeof(info.hook_entry));
-diff -urNp linux-2.6.32.33/net/ipv6/raw.c linux-2.6.32.33/net/ipv6/raw.c
---- linux-2.6.32.33/net/ipv6/raw.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ipv6/raw.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv6/raw.c linux-2.6.32.35/net/ipv6/raw.c
+--- linux-2.6.32.35/net/ipv6/raw.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ipv6/raw.c 2010-12-31 14:46:53.000000000 -0500
@@ -600,7 +600,7 @@ out:
return err;
}
@@ -59182,9 +59410,9 @@ diff -urNp linux-2.6.32.33/net/ipv6/raw.c linux-2.6.32.33/net/ipv6/raw.c
}
static int raw6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.32.33/net/ipv6/tcp_ipv6.c linux-2.6.32.33/net/ipv6/tcp_ipv6.c
---- linux-2.6.32.33/net/ipv6/tcp_ipv6.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ipv6/tcp_ipv6.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv6/tcp_ipv6.c linux-2.6.32.35/net/ipv6/tcp_ipv6.c
+--- linux-2.6.32.35/net/ipv6/tcp_ipv6.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ipv6/tcp_ipv6.c 2010-12-31 14:46:53.000000000 -0500
@@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
}
#endif
@@ -59284,9 +59512,9 @@ diff -urNp linux-2.6.32.33/net/ipv6/tcp_ipv6.c linux-2.6.32.33/net/ipv6/tcp_ipv6
}
static int tcp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.32.33/net/ipv6/udp.c linux-2.6.32.33/net/ipv6/udp.c
---- linux-2.6.32.33/net/ipv6/udp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/ipv6/udp.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/ipv6/udp.c linux-2.6.32.35/net/ipv6/udp.c
+--- linux-2.6.32.35/net/ipv6/udp.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/ipv6/udp.c 2010-12-31 14:46:53.000000000 -0500
@@ -49,6 +49,10 @@
#include <linux/seq_file.h>
#include "udp_impl.h"
@@ -59322,9 +59550,9 @@ diff -urNp linux-2.6.32.33/net/ipv6/udp.c linux-2.6.32.33/net/ipv6/udp.c
atomic_read(&sp->sk_drops));
}
-diff -urNp linux-2.6.32.33/net/irda/af_irda.c linux-2.6.32.33/net/irda/af_irda.c
---- linux-2.6.32.33/net/irda/af_irda.c 2010-09-26 17:26:06.000000000 -0400
-+++ linux-2.6.32.33/net/irda/af_irda.c 2011-01-08 13:13:09.000000000 -0500
+diff -urNp linux-2.6.32.35/net/irda/af_irda.c linux-2.6.32.35/net/irda/af_irda.c
+--- linux-2.6.32.35/net/irda/af_irda.c 2010-09-26 17:26:06.000000000 -0400
++++ linux-2.6.32.35/net/irda/af_irda.c 2011-01-08 13:13:09.000000000 -0500
@@ -2164,6 +2164,13 @@ static int irda_getsockopt(struct socket
switch (optname) {
@@ -59356,9 +59584,9 @@ diff -urNp linux-2.6.32.33/net/irda/af_irda.c linux-2.6.32.33/net/irda/af_irda.c
/* Copy the list itself - watch for overflow */
if(list.len > 2048)
{
-diff -urNp linux-2.6.32.33/net/irda/ircomm/ircomm_tty.c linux-2.6.32.33/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.32.33/net/irda/ircomm/ircomm_tty.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/irda/ircomm/ircomm_tty.c 2011-01-24 18:05:37.000000000 -0500
+diff -urNp linux-2.6.32.35/net/irda/ircomm/ircomm_tty.c linux-2.6.32.35/net/irda/ircomm/ircomm_tty.c
+--- linux-2.6.32.35/net/irda/ircomm/ircomm_tty.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/irda/ircomm/ircomm_tty.c 2011-01-24 18:05:37.000000000 -0500
@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
add_wait_queue(&self->open_wait, &wait);
@@ -59481,9 +59709,9 @@ diff -urNp linux-2.6.32.33/net/irda/ircomm/ircomm_tty.c linux-2.6.32.33/net/irda
seq_printf(m, "Max data size: %d\n", self->max_data_size);
seq_printf(m, "Max header size: %d\n", self->max_header_size);
-diff -urNp linux-2.6.32.33/net/key/af_key.c linux-2.6.32.33/net/key/af_key.c
---- linux-2.6.32.33/net/key/af_key.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/key/af_key.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/key/af_key.c linux-2.6.32.35/net/key/af_key.c
+--- linux-2.6.32.35/net/key/af_key.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/key/af_key.c 2010-12-31 14:46:53.000000000 -0500
@@ -3660,7 +3660,11 @@ static int pfkey_seq_show(struct seq_fil
seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n");
else
@@ -59496,9 +59724,9 @@ diff -urNp linux-2.6.32.33/net/key/af_key.c linux-2.6.32.33/net/key/af_key.c
atomic_read(&s->sk_refcnt),
sk_rmem_alloc_get(s),
sk_wmem_alloc_get(s),
-diff -urNp linux-2.6.32.33/net/mac80211/debugfs_key.c linux-2.6.32.33/net/mac80211/debugfs_key.c
---- linux-2.6.32.33/net/mac80211/debugfs_key.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/mac80211/debugfs_key.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/mac80211/debugfs_key.c linux-2.6.32.35/net/mac80211/debugfs_key.c
+--- linux-2.6.32.35/net/mac80211/debugfs_key.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/mac80211/debugfs_key.c 2010-12-31 14:46:53.000000000 -0500
@@ -211,9 +211,13 @@ static ssize_t key_key_read(struct file
size_t count, loff_t *ppos)
{
@@ -59514,9 +59742,9 @@ diff -urNp linux-2.6.32.33/net/mac80211/debugfs_key.c linux-2.6.32.33/net/mac802
for (i = 0; i < key->conf.keylen; i++)
p += scnprintf(p, bufsize + buf - p, "%02x", key->conf.key[i]);
-diff -urNp linux-2.6.32.33/net/mac80211/ieee80211_i.h linux-2.6.32.33/net/mac80211/ieee80211_i.h
---- linux-2.6.32.33/net/mac80211/ieee80211_i.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/mac80211/ieee80211_i.h 2011-01-24 18:05:37.000000000 -0500
+diff -urNp linux-2.6.32.35/net/mac80211/ieee80211_i.h linux-2.6.32.35/net/mac80211/ieee80211_i.h
+--- linux-2.6.32.35/net/mac80211/ieee80211_i.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/mac80211/ieee80211_i.h 2011-01-24 18:05:37.000000000 -0500
@@ -25,6 +25,7 @@
#include <linux/etherdevice.h>
#include <net/cfg80211.h>
@@ -59534,9 +59762,9 @@ diff -urNp linux-2.6.32.33/net/mac80211/ieee80211_i.h linux-2.6.32.33/net/mac802
int monitors, cooked_mntrs;
/* number of interfaces with corresponding FIF_ flags */
int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
-diff -urNp linux-2.6.32.33/net/mac80211/iface.c linux-2.6.32.33/net/mac80211/iface.c
---- linux-2.6.32.33/net/mac80211/iface.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/mac80211/iface.c 2011-01-24 18:05:37.000000000 -0500
+diff -urNp linux-2.6.32.35/net/mac80211/iface.c linux-2.6.32.35/net/mac80211/iface.c
+--- linux-2.6.32.35/net/mac80211/iface.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/mac80211/iface.c 2011-01-24 18:05:37.000000000 -0500
@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
break;
}
@@ -59591,9 +59819,9 @@ diff -urNp linux-2.6.32.33/net/mac80211/iface.c linux-2.6.32.33/net/mac80211/ifa
ieee80211_clear_tx_pending(local);
ieee80211_stop_device(local);
-diff -urNp linux-2.6.32.33/net/mac80211/main.c linux-2.6.32.33/net/mac80211/main.c
---- linux-2.6.32.33/net/mac80211/main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/mac80211/main.c 2011-01-24 18:05:37.000000000 -0500
+diff -urNp linux-2.6.32.35/net/mac80211/main.c linux-2.6.32.35/net/mac80211/main.c
+--- linux-2.6.32.35/net/mac80211/main.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/mac80211/main.c 2011-01-24 18:05:37.000000000 -0500
@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
local->hw.conf.power_level = power;
}
@@ -59603,9 +59831,9 @@ diff -urNp linux-2.6.32.33/net/mac80211/main.c linux-2.6.32.33/net/mac80211/main
ret = drv_config(local, changed);
/*
* Goal:
-diff -urNp linux-2.6.32.33/net/mac80211/pm.c linux-2.6.32.33/net/mac80211/pm.c
---- linux-2.6.32.33/net/mac80211/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/mac80211/pm.c 2011-01-24 18:05:37.000000000 -0500
+diff -urNp linux-2.6.32.35/net/mac80211/pm.c linux-2.6.32.35/net/mac80211/pm.c
+--- linux-2.6.32.35/net/mac80211/pm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/mac80211/pm.c 2011-01-24 18:05:37.000000000 -0500
@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
}
@@ -59615,9 +59843,9 @@ diff -urNp linux-2.6.32.33/net/mac80211/pm.c linux-2.6.32.33/net/mac80211/pm.c
ieee80211_stop_device(local);
local->suspended = true;
-diff -urNp linux-2.6.32.33/net/mac80211/rate.c linux-2.6.32.33/net/mac80211/rate.c
---- linux-2.6.32.33/net/mac80211/rate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/mac80211/rate.c 2011-01-24 18:05:37.000000000 -0500
+diff -urNp linux-2.6.32.35/net/mac80211/rate.c linux-2.6.32.35/net/mac80211/rate.c
+--- linux-2.6.32.35/net/mac80211/rate.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/mac80211/rate.c 2011-01-24 18:05:37.000000000 -0500
@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
struct rate_control_ref *ref, *old;
@@ -59627,9 +59855,9 @@ diff -urNp linux-2.6.32.33/net/mac80211/rate.c linux-2.6.32.33/net/mac80211/rate
return -EBUSY;
ref = rate_control_alloc(name, local);
-diff -urNp linux-2.6.32.33/net/mac80211/tx.c linux-2.6.32.33/net/mac80211/tx.c
---- linux-2.6.32.33/net/mac80211/tx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/mac80211/tx.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/mac80211/tx.c linux-2.6.32.35/net/mac80211/tx.c
+--- linux-2.6.32.35/net/mac80211/tx.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/mac80211/tx.c 2010-12-31 14:46:53.000000000 -0500
@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
return cpu_to_le16(dur);
}
@@ -59639,9 +59867,9 @@ diff -urNp linux-2.6.32.33/net/mac80211/tx.c linux-2.6.32.33/net/mac80211/tx.c
struct net_device *dev)
{
return local == wdev_priv(dev->ieee80211_ptr);
-diff -urNp linux-2.6.32.33/net/mac80211/util.c linux-2.6.32.33/net/mac80211/util.c
---- linux-2.6.32.33/net/mac80211/util.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/mac80211/util.c 2011-01-24 18:05:37.000000000 -0500
+diff -urNp linux-2.6.32.35/net/mac80211/util.c linux-2.6.32.35/net/mac80211/util.c
+--- linux-2.6.32.35/net/mac80211/util.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/mac80211/util.c 2011-01-24 18:05:37.000000000 -0500
@@ -1042,7 +1042,7 @@ int ieee80211_reconfig(struct ieee80211_
local->resuming = true;
@@ -59651,9 +59879,9 @@ diff -urNp linux-2.6.32.33/net/mac80211/util.c linux-2.6.32.33/net/mac80211/util
/*
* Upon resume hardware can sometimes be goofy due to
* various platform / driver / bus issues, so restarting
-diff -urNp linux-2.6.32.33/net/netfilter/Kconfig linux-2.6.32.33/net/netfilter/Kconfig
---- linux-2.6.32.33/net/netfilter/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/netfilter/Kconfig 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/netfilter/Kconfig linux-2.6.32.35/net/netfilter/Kconfig
+--- linux-2.6.32.35/net/netfilter/Kconfig 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/netfilter/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -635,6 +635,16 @@ config NETFILTER_XT_MATCH_ESP
To compile it as a module, choose M here. If unsure, say N.
@@ -59671,9 +59899,9 @@ diff -urNp linux-2.6.32.33/net/netfilter/Kconfig linux-2.6.32.33/net/netfilter/K
config NETFILTER_XT_MATCH_HASHLIMIT
tristate '"hashlimit" match support'
depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
-diff -urNp linux-2.6.32.33/net/netfilter/Makefile linux-2.6.32.33/net/netfilter/Makefile
---- linux-2.6.32.33/net/netfilter/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/netfilter/Makefile 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/netfilter/Makefile linux-2.6.32.35/net/netfilter/Makefile
+--- linux-2.6.32.35/net/netfilter/Makefile 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/netfilter/Makefile 2010-12-31 14:46:53.000000000 -0500
@@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRAC
obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
@@ -59682,9 +59910,9 @@ diff -urNp linux-2.6.32.33/net/netfilter/Makefile linux-2.6.32.33/net/netfilter/
obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
-diff -urNp linux-2.6.32.33/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.33/net/netfilter/nf_conntrack_netlink.c
---- linux-2.6.32.33/net/netfilter/nf_conntrack_netlink.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/netfilter/nf_conntrack_netlink.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.35/net/netfilter/nf_conntrack_netlink.c
+--- linux-2.6.32.35/net/netfilter/nf_conntrack_netlink.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/netfilter/nf_conntrack_netlink.c 2010-12-31 14:46:53.000000000 -0500
@@ -706,7 +706,7 @@ ctnetlink_parse_tuple_proto(struct nlatt
static int
ctnetlink_parse_tuple(const struct nlattr * const cda[],
@@ -59694,9 +59922,9 @@ diff -urNp linux-2.6.32.33/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.33/
{
struct nlattr *tb[CTA_TUPLE_MAX+1];
int err;
-diff -urNp linux-2.6.32.33/net/netfilter/xt_gradm.c linux-2.6.32.33/net/netfilter/xt_gradm.c
---- linux-2.6.32.33/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.33/net/netfilter/xt_gradm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/netfilter/xt_gradm.c linux-2.6.32.35/net/netfilter/xt_gradm.c
+--- linux-2.6.32.35/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.35/net/netfilter/xt_gradm.c 2010-12-31 14:46:53.000000000 -0500
@@ -0,0 +1,51 @@
+/*
+ * gradm match for netfilter
@@ -59749,9 +59977,9 @@ diff -urNp linux-2.6.32.33/net/netfilter/xt_gradm.c linux-2.6.32.33/net/netfilte
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_gradm");
+MODULE_ALIAS("ip6t_gradm");
-diff -urNp linux-2.6.32.33/net/netlink/af_netlink.c linux-2.6.32.33/net/netlink/af_netlink.c
---- linux-2.6.32.33/net/netlink/af_netlink.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.33/net/netlink/af_netlink.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/netlink/af_netlink.c linux-2.6.32.35/net/netlink/af_netlink.c
+--- linux-2.6.32.35/net/netlink/af_netlink.c 2010-08-29 21:08:20.000000000 -0400
++++ linux-2.6.32.35/net/netlink/af_netlink.c 2010-12-31 14:46:53.000000000 -0500
@@ -1964,13 +1964,21 @@ static int netlink_seq_show(struct seq_f
struct netlink_sock *nlk = nlk_sk(s);
@@ -59774,9 +60002,9 @@ diff -urNp linux-2.6.32.33/net/netlink/af_netlink.c linux-2.6.32.33/net/netlink/
atomic_read(&s->sk_refcnt),
atomic_read(&s->sk_drops)
);
-diff -urNp linux-2.6.32.33/net/netrom/af_netrom.c linux-2.6.32.33/net/netrom/af_netrom.c
---- linux-2.6.32.33/net/netrom/af_netrom.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/netrom/af_netrom.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/netrom/af_netrom.c linux-2.6.32.35/net/netrom/af_netrom.c
+--- linux-2.6.32.35/net/netrom/af_netrom.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/netrom/af_netrom.c 2010-12-31 14:46:53.000000000 -0500
@@ -838,6 +838,7 @@ static int nr_getname(struct socket *soc
struct sock *sk = sock->sk;
struct nr_sock *nr = nr_sk(sk);
@@ -59793,9 +60021,9 @@ diff -urNp linux-2.6.32.33/net/netrom/af_netrom.c linux-2.6.32.33/net/netrom/af_
sax->fsa_ax25.sax25_call = nr->source_addr;
*uaddr_len = sizeof(struct sockaddr_ax25);
}
-diff -urNp linux-2.6.32.33/net/packet/af_packet.c linux-2.6.32.33/net/packet/af_packet.c
---- linux-2.6.32.33/net/packet/af_packet.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/packet/af_packet.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/packet/af_packet.c linux-2.6.32.35/net/packet/af_packet.c
+--- linux-2.6.32.35/net/packet/af_packet.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/packet/af_packet.c 2010-12-31 14:46:53.000000000 -0500
@@ -1526,7 +1526,7 @@ static int packet_getname_spkt(struct so
uaddr->sa_family = AF_PACKET;
dev = dev_get_by_index(sock_net(sk), pkt_sk(sk)->ifindex);
@@ -59825,9 +60053,9 @@ diff -urNp linux-2.6.32.33/net/packet/af_packet.c linux-2.6.32.33/net/packet/af_
atomic_read(&s->sk_refcnt),
s->sk_type,
ntohs(po->num),
-diff -urNp linux-2.6.32.33/net/phonet/af_phonet.c linux-2.6.32.33/net/phonet/af_phonet.c
---- linux-2.6.32.33/net/phonet/af_phonet.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.33/net/phonet/af_phonet.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/phonet/af_phonet.c linux-2.6.32.35/net/phonet/af_phonet.c
+--- linux-2.6.32.35/net/phonet/af_phonet.c 2010-10-31 16:44:11.000000000 -0400
++++ linux-2.6.32.35/net/phonet/af_phonet.c 2010-12-31 14:46:53.000000000 -0500
@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
{
struct phonet_protocol *pp;
@@ -59846,9 +60074,9 @@ diff -urNp linux-2.6.32.33/net/phonet/af_phonet.c linux-2.6.32.33/net/phonet/af_
return -EINVAL;
err = proto_register(pp->prot, 1);
-diff -urNp linux-2.6.32.33/net/phonet/socket.c linux-2.6.32.33/net/phonet/socket.c
---- linux-2.6.32.33/net/phonet/socket.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/phonet/socket.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/phonet/socket.c linux-2.6.32.35/net/phonet/socket.c
+--- linux-2.6.32.35/net/phonet/socket.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/phonet/socket.c 2010-12-31 14:46:53.000000000 -0500
@@ -482,7 +482,12 @@ static int pn_sock_seq_show(struct seq_f
sk->sk_state,
sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
@@ -59863,9 +60091,9 @@ diff -urNp linux-2.6.32.33/net/phonet/socket.c linux-2.6.32.33/net/phonet/socket
atomic_read(&sk->sk_drops), &len);
}
seq_printf(seq, "%*s\n", 127 - len, "");
-diff -urNp linux-2.6.32.33/net/rds/Kconfig linux-2.6.32.33/net/rds/Kconfig
---- linux-2.6.32.33/net/rds/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/rds/Kconfig 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/rds/Kconfig linux-2.6.32.35/net/rds/Kconfig
+--- linux-2.6.32.35/net/rds/Kconfig 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/rds/Kconfig 2010-12-31 14:46:53.000000000 -0500
@@ -1,7 +1,7 @@
config RDS
@@ -59875,9 +60103,9 @@ diff -urNp linux-2.6.32.33/net/rds/Kconfig linux-2.6.32.33/net/rds/Kconfig
---help---
The RDS (Reliable Datagram Sockets) protocol provides reliable,
sequenced delivery of datagrams over Infiniband, iWARP,
-diff -urNp linux-2.6.32.33/net/rxrpc/ar-key.c linux-2.6.32.33/net/rxrpc/ar-key.c
---- linux-2.6.32.33/net/rxrpc/ar-key.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/rxrpc/ar-key.c 2011-02-27 15:01:43.000000000 -0500
+diff -urNp linux-2.6.32.35/net/rxrpc/ar-key.c linux-2.6.32.35/net/rxrpc/ar-key.c
+--- linux-2.6.32.35/net/rxrpc/ar-key.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/rxrpc/ar-key.c 2011-02-27 15:01:43.000000000 -0500
@@ -88,11 +88,11 @@ static int rxrpc_instantiate_xdr_rxkad(s
return ret;
@@ -59905,9 +60133,9 @@ diff -urNp linux-2.6.32.33/net/rxrpc/ar-key.c linux-2.6.32.33/net/rxrpc/ar-key.c
if (!token->kad)
goto error_free;
-diff -urNp linux-2.6.32.33/net/sctp/proc.c linux-2.6.32.33/net/sctp/proc.c
---- linux-2.6.32.33/net/sctp/proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/sctp/proc.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/sctp/proc.c linux-2.6.32.35/net/sctp/proc.c
+--- linux-2.6.32.35/net/sctp/proc.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/sctp/proc.c 2010-12-31 14:46:53.000000000 -0500
@@ -213,7 +213,12 @@ static int sctp_eps_seq_show(struct seq_
sctp_for_each_hentry(epb, node, &head->chain) {
ep = sctp_ep(epb);
@@ -59936,9 +60164,9 @@ diff -urNp linux-2.6.32.33/net/sctp/proc.c linux-2.6.32.33/net/sctp/proc.c
assoc->state, hash,
assoc->assoc_id,
assoc->sndbuf_used,
-diff -urNp linux-2.6.32.33/net/sctp/socket.c linux-2.6.32.33/net/sctp/socket.c
---- linux-2.6.32.33/net/sctp/socket.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/sctp/socket.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/sctp/socket.c linux-2.6.32.35/net/sctp/socket.c
+--- linux-2.6.32.35/net/sctp/socket.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/sctp/socket.c 2010-12-31 14:46:53.000000000 -0500
@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
struct sctp_sndrcvinfo *sinfo;
struct sctp_initmsg *sinit;
@@ -59956,9 +60184,9 @@ diff -urNp linux-2.6.32.33/net/sctp/socket.c linux-2.6.32.33/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.33/net/socket.c linux-2.6.32.33/net/socket.c
---- linux-2.6.32.33/net/socket.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/net/socket.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/socket.c linux-2.6.32.35/net/socket.c
+--- linux-2.6.32.35/net/socket.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/net/socket.c 2010-12-31 14:46:53.000000000 -0500
@@ -87,6 +87,7 @@
#include <linux/wireless.h>
#include <linux/nsproxy.h>
@@ -60122,9 +60350,9 @@ diff -urNp linux-2.6.32.33/net/socket.c linux-2.6.32.33/net/socket.c
err =
security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
if (err)
-diff -urNp linux-2.6.32.33/net/sunrpc/sched.c linux-2.6.32.33/net/sunrpc/sched.c
---- linux-2.6.32.33/net/sunrpc/sched.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/sunrpc/sched.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/sunrpc/sched.c linux-2.6.32.35/net/sunrpc/sched.c
+--- linux-2.6.32.35/net/sunrpc/sched.c 2011-03-23 19:00:33.000000000 -0400
++++ linux-2.6.32.35/net/sunrpc/sched.c 2011-03-23 19:01:01.000000000 -0400
@@ -234,10 +234,10 @@ static int rpc_wait_bit_killable(void *w
#ifdef RPC_DEBUG
static void rpc_task_set_debuginfo(struct rpc_task *task)
@@ -60138,9 +60366,9 @@ diff -urNp linux-2.6.32.33/net/sunrpc/sched.c linux-2.6.32.33/net/sunrpc/sched.c
}
#else
static inline void rpc_task_set_debuginfo(struct rpc_task *task)
-diff -urNp linux-2.6.32.33/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.33/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-2.6.32.33/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/sunrpc/xprtrdma/svc_rdma.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.35/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-2.6.32.35/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/sunrpc/xprtrdma/svc_rdma.c 2010-12-31 14:46:53.000000000 -0500
@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
len -= *ppos;
if (len > *lenp)
@@ -60150,9 +60378,9 @@ diff -urNp linux-2.6.32.33/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.33/net/su
return -EFAULT;
*lenp = len;
*ppos += len;
-diff -urNp linux-2.6.32.33/net/sysctl_net.c linux-2.6.32.33/net/sysctl_net.c
---- linux-2.6.32.33/net/sysctl_net.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/sysctl_net.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/sysctl_net.c linux-2.6.32.35/net/sysctl_net.c
+--- linux-2.6.32.35/net/sysctl_net.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/sysctl_net.c 2010-12-31 14:46:53.000000000 -0500
@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
struct ctl_table *table)
{
@@ -60162,9 +60390,9 @@ diff -urNp linux-2.6.32.33/net/sysctl_net.c linux-2.6.32.33/net/sysctl_net.c
int mode = (table->mode >> 6) & 7;
return (mode << 6) | (mode << 3) | mode;
}
-diff -urNp linux-2.6.32.33/net/tipc/socket.c linux-2.6.32.33/net/tipc/socket.c
---- linux-2.6.32.33/net/tipc/socket.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/tipc/socket.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/tipc/socket.c linux-2.6.32.35/net/tipc/socket.c
+--- linux-2.6.32.35/net/tipc/socket.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/tipc/socket.c 2010-12-31 14:46:53.000000000 -0500
@@ -393,6 +393,7 @@ static int get_name(struct socket *sock,
struct sockaddr_tipc *addr = (struct sockaddr_tipc *)uaddr;
struct tipc_sock *tsock = tipc_sk(sock->sk);
@@ -60185,9 +60413,9 @@ diff -urNp linux-2.6.32.33/net/tipc/socket.c linux-2.6.32.33/net/tipc/socket.c
sock->state = SS_DISCONNECTING;
}
-diff -urNp linux-2.6.32.33/net/unix/af_unix.c linux-2.6.32.33/net/unix/af_unix.c
---- linux-2.6.32.33/net/unix/af_unix.c 2010-09-26 17:26:06.000000000 -0400
-+++ linux-2.6.32.33/net/unix/af_unix.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/unix/af_unix.c linux-2.6.32.35/net/unix/af_unix.c
+--- linux-2.6.32.35/net/unix/af_unix.c 2010-09-26 17:26:06.000000000 -0400
++++ linux-2.6.32.35/net/unix/af_unix.c 2010-12-31 14:46:53.000000000 -0500
@@ -743,6 +743,12 @@ static struct sock *unix_find_other(stru
err = -ECONNREFUSED;
if (!S_ISSOCK(inode->i_mode))
@@ -60257,9 +60485,9 @@ diff -urNp linux-2.6.32.33/net/unix/af_unix.c linux-2.6.32.33/net/unix/af_unix.c
atomic_read(&s->sk_refcnt),
0,
s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
-diff -urNp linux-2.6.32.33/net/wireless/wext.c linux-2.6.32.33/net/wireless/wext.c
---- linux-2.6.32.33/net/wireless/wext.c 2010-10-31 16:44:11.000000000 -0400
-+++ linux-2.6.32.33/net/wireless/wext.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/wireless/wext.c linux-2.6.32.35/net/wireless/wext.c
+--- linux-2.6.32.35/net/wireless/wext.c 2010-10-31 16:44:11.000000000 -0400
++++ linux-2.6.32.35/net/wireless/wext.c 2010-12-31 14:46:53.000000000 -0500
@@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc
*/
@@ -60293,9 +60521,9 @@ diff -urNp linux-2.6.32.33/net/wireless/wext.c linux-2.6.32.33/net/wireless/wext
err = handler(dev, info, (union iwreq_data *) iwp, extra);
iwp->length += essid_compat;
-diff -urNp linux-2.6.32.33/net/x25/x25_in.c linux-2.6.32.33/net/x25/x25_in.c
---- linux-2.6.32.33/net/x25/x25_in.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/net/x25/x25_in.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/x25/x25_in.c linux-2.6.32.35/net/x25/x25_in.c
+--- linux-2.6.32.35/net/x25/x25_in.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/net/x25/x25_in.c 2010-12-31 14:46:53.000000000 -0500
@@ -108,14 +108,13 @@ static int x25_state1_machine(struct soc
*/
skb_pull(skb, X25_STD_MIN_LEN);
@@ -60314,9 +60542,9 @@ diff -urNp linux-2.6.32.33/net/x25/x25_in.c linux-2.6.32.33/net/x25/x25_in.c
if (len > 0)
skb_pull(skb, len);
else
-diff -urNp linux-2.6.32.33/net/xfrm/xfrm_policy.c linux-2.6.32.33/net/xfrm/xfrm_policy.c
---- linux-2.6.32.33/net/xfrm/xfrm_policy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/net/xfrm/xfrm_policy.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/net/xfrm/xfrm_policy.c linux-2.6.32.35/net/xfrm/xfrm_policy.c
+--- linux-2.6.32.35/net/xfrm/xfrm_policy.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/net/xfrm/xfrm_policy.c 2010-12-31 14:46:53.000000000 -0500
@@ -1477,7 +1477,7 @@ free_dst:
goto out;
}
@@ -60344,9 +60572,9 @@ diff -urNp linux-2.6.32.33/net/xfrm/xfrm_policy.c linux-2.6.32.33/net/xfrm/xfrm_
xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
{
#ifdef CONFIG_XFRM_SUB_POLICY
-diff -urNp linux-2.6.32.33/samples/kobject/kset-example.c linux-2.6.32.33/samples/kobject/kset-example.c
---- linux-2.6.32.33/samples/kobject/kset-example.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/samples/kobject/kset-example.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/samples/kobject/kset-example.c linux-2.6.32.35/samples/kobject/kset-example.c
+--- linux-2.6.32.35/samples/kobject/kset-example.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/samples/kobject/kset-example.c 2010-12-31 14:46:53.000000000 -0500
@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
}
@@ -60356,9 +60584,9 @@ diff -urNp linux-2.6.32.33/samples/kobject/kset-example.c linux-2.6.32.33/sample
.show = foo_attr_show,
.store = foo_attr_store,
};
-diff -urNp linux-2.6.32.33/scripts/basic/fixdep.c linux-2.6.32.33/scripts/basic/fixdep.c
---- linux-2.6.32.33/scripts/basic/fixdep.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/scripts/basic/fixdep.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/scripts/basic/fixdep.c linux-2.6.32.35/scripts/basic/fixdep.c
+--- linux-2.6.32.35/scripts/basic/fixdep.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/scripts/basic/fixdep.c 2010-12-31 14:46:53.000000000 -0500
@@ -222,9 +222,9 @@ static void use_config(char *m, int slen
static void parse_config_file(char *map, size_t len)
@@ -60380,9 +60608,9 @@ diff -urNp linux-2.6.32.33/scripts/basic/fixdep.c linux-2.6.32.33/scripts/basic/
if (*p != INT_CONF) {
fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-2.6.32.33/scripts/kallsyms.c linux-2.6.32.33/scripts/kallsyms.c
---- linux-2.6.32.33/scripts/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/scripts/kallsyms.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/scripts/kallsyms.c linux-2.6.32.35/scripts/kallsyms.c
+--- linux-2.6.32.35/scripts/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/scripts/kallsyms.c 2010-12-31 14:46:53.000000000 -0500
@@ -43,10 +43,10 @@ struct text_range {
static unsigned long long _text;
@@ -60398,9 +60626,9 @@ diff -urNp linux-2.6.32.33/scripts/kallsyms.c linux-2.6.32.33/scripts/kallsyms.c
};
#define text_range_text (&text_ranges[0])
#define text_range_inittext (&text_ranges[1])
-diff -urNp linux-2.6.32.33/scripts/mod/file2alias.c linux-2.6.32.33/scripts/mod/file2alias.c
---- linux-2.6.32.33/scripts/mod/file2alias.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/scripts/mod/file2alias.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/scripts/mod/file2alias.c linux-2.6.32.35/scripts/mod/file2alias.c
+--- linux-2.6.32.35/scripts/mod/file2alias.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/scripts/mod/file2alias.c 2010-12-31 14:46:53.000000000 -0500
@@ -72,7 +72,7 @@ static void device_id_check(const char *
unsigned long size, unsigned long id_size,
void *symval)
@@ -60455,9 +60683,9 @@ diff -urNp linux-2.6.32.33/scripts/mod/file2alias.c linux-2.6.32.33/scripts/mod/
sprintf(alias, "dmi*");
-diff -urNp linux-2.6.32.33/scripts/mod/modpost.c linux-2.6.32.33/scripts/mod/modpost.c
---- linux-2.6.32.33/scripts/mod/modpost.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/scripts/mod/modpost.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/scripts/mod/modpost.c linux-2.6.32.35/scripts/mod/modpost.c
+--- linux-2.6.32.35/scripts/mod/modpost.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/scripts/mod/modpost.c 2010-12-31 14:46:53.000000000 -0500
@@ -835,6 +835,7 @@ enum mismatch {
INIT_TO_EXIT,
EXIT_TO_INIT,
@@ -60525,9 +60753,9 @@ diff -urNp linux-2.6.32.33/scripts/mod/modpost.c linux-2.6.32.33/scripts/mod/mod
goto close_write;
tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-2.6.32.33/scripts/mod/modpost.h linux-2.6.32.33/scripts/mod/modpost.h
---- linux-2.6.32.33/scripts/mod/modpost.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/scripts/mod/modpost.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/scripts/mod/modpost.h linux-2.6.32.35/scripts/mod/modpost.h
+--- linux-2.6.32.35/scripts/mod/modpost.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/scripts/mod/modpost.h 2010-12-31 14:46:53.000000000 -0500
@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
struct buffer {
@@ -60547,9 +60775,9 @@ diff -urNp linux-2.6.32.33/scripts/mod/modpost.h linux-2.6.32.33/scripts/mod/mod
struct module {
struct module *next;
-diff -urNp linux-2.6.32.33/scripts/mod/sumversion.c linux-2.6.32.33/scripts/mod/sumversion.c
---- linux-2.6.32.33/scripts/mod/sumversion.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/scripts/mod/sumversion.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/scripts/mod/sumversion.c linux-2.6.32.35/scripts/mod/sumversion.c
+--- linux-2.6.32.35/scripts/mod/sumversion.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/scripts/mod/sumversion.c 2010-12-31 14:46:53.000000000 -0500
@@ -455,7 +455,7 @@ static void write_version(const char *fi
goto out;
}
@@ -60559,9 +60787,9 @@ diff -urNp linux-2.6.32.33/scripts/mod/sumversion.c linux-2.6.32.33/scripts/mod/
warn("writing sum in %s failed: %s\n",
filename, strerror(errno));
goto out;
-diff -urNp linux-2.6.32.33/scripts/pnmtologo.c linux-2.6.32.33/scripts/pnmtologo.c
---- linux-2.6.32.33/scripts/pnmtologo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/scripts/pnmtologo.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/scripts/pnmtologo.c linux-2.6.32.35/scripts/pnmtologo.c
+--- linux-2.6.32.35/scripts/pnmtologo.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/scripts/pnmtologo.c 2010-12-31 14:46:53.000000000 -0500
@@ -237,14 +237,14 @@ static void write_header(void)
fprintf(out, " * Linux logo %s\n", logoname);
fputs(" */\n\n", out);
@@ -60588,9 +60816,9 @@ diff -urNp linux-2.6.32.33/scripts/pnmtologo.c linux-2.6.32.33/scripts/pnmtologo
logoname);
write_hex_cnt = 0;
for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-2.6.32.33/security/capability.c linux-2.6.32.33/security/capability.c
---- linux-2.6.32.33/security/capability.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/security/capability.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/security/capability.c linux-2.6.32.35/security/capability.c
+--- linux-2.6.32.35/security/capability.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/security/capability.c 2010-12-31 14:46:53.000000000 -0500
@@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *ls
}
#endif /* CONFIG_AUDIT */
@@ -60600,9 +60828,9 @@ diff -urNp linux-2.6.32.33/security/capability.c linux-2.6.32.33/security/capabi
.name = "default",
};
-diff -urNp linux-2.6.32.33/security/commoncap.c linux-2.6.32.33/security/commoncap.c
---- linux-2.6.32.33/security/commoncap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/security/commoncap.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/security/commoncap.c linux-2.6.32.35/security/commoncap.c
+--- linux-2.6.32.35/security/commoncap.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/security/commoncap.c 2010-12-31 14:46:53.000000000 -0500
@@ -27,7 +27,7 @@
#include <linux/sched.h>
#include <linux/prctl.h>
@@ -60635,9 +60863,9 @@ diff -urNp linux-2.6.32.33/security/commoncap.c linux-2.6.32.33/security/commonc
if (cred->uid != 0) {
if (bprm->cap_effective)
return 1;
-diff -urNp linux-2.6.32.33/security/integrity/ima/ima_api.c linux-2.6.32.33/security/integrity/ima/ima_api.c
---- linux-2.6.32.33/security/integrity/ima/ima_api.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/security/integrity/ima/ima_api.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/security/integrity/ima/ima_api.c linux-2.6.32.35/security/integrity/ima/ima_api.c
+--- linux-2.6.32.35/security/integrity/ima/ima_api.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/security/integrity/ima/ima_api.c 2010-12-31 14:46:53.000000000 -0500
@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
int result;
@@ -60647,9 +60875,9 @@ diff -urNp linux-2.6.32.33/security/integrity/ima/ima_api.c linux-2.6.32.33/secu
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry) {
-diff -urNp linux-2.6.32.33/security/integrity/ima/ima_fs.c linux-2.6.32.33/security/integrity/ima/ima_fs.c
---- linux-2.6.32.33/security/integrity/ima/ima_fs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/security/integrity/ima/ima_fs.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/security/integrity/ima/ima_fs.c linux-2.6.32.35/security/integrity/ima/ima_fs.c
+--- linux-2.6.32.35/security/integrity/ima/ima_fs.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/security/integrity/ima/ima_fs.c 2010-12-31 14:46:53.000000000 -0500
@@ -27,12 +27,12 @@
static int valid_policy = 1;
#define TMPBUFLEN 12
@@ -60665,9 +60893,9 @@ diff -urNp linux-2.6.32.33/security/integrity/ima/ima_fs.c linux-2.6.32.33/secur
return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
}
-diff -urNp linux-2.6.32.33/security/integrity/ima/ima.h linux-2.6.32.33/security/integrity/ima/ima.h
---- linux-2.6.32.33/security/integrity/ima/ima.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/security/integrity/ima/ima.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/security/integrity/ima/ima.h linux-2.6.32.35/security/integrity/ima/ima.h
+--- linux-2.6.32.35/security/integrity/ima/ima.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/security/integrity/ima/ima.h 2010-12-31 14:46:53.000000000 -0500
@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
extern spinlock_t ima_queue_lock;
@@ -60679,9 +60907,9 @@ diff -urNp linux-2.6.32.33/security/integrity/ima/ima.h linux-2.6.32.33/security
struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
};
extern struct ima_h_table ima_htable;
-diff -urNp linux-2.6.32.33/security/integrity/ima/ima_queue.c linux-2.6.32.33/security/integrity/ima/ima_queue.c
---- linux-2.6.32.33/security/integrity/ima/ima_queue.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/security/integrity/ima/ima_queue.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/security/integrity/ima/ima_queue.c linux-2.6.32.35/security/integrity/ima/ima_queue.c
+--- linux-2.6.32.35/security/integrity/ima/ima_queue.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/security/integrity/ima/ima_queue.c 2010-12-31 14:46:53.000000000 -0500
@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
INIT_LIST_HEAD(&qe->later);
list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -60691,9 +60919,9 @@ diff -urNp linux-2.6.32.33/security/integrity/ima/ima_queue.c linux-2.6.32.33/se
key = ima_hash_key(entry->digest);
hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
return 0;
-diff -urNp linux-2.6.32.33/security/Kconfig linux-2.6.32.33/security/Kconfig
---- linux-2.6.32.33/security/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/security/Kconfig 2011-02-12 11:33:55.000000000 -0500
+diff -urNp linux-2.6.32.35/security/Kconfig linux-2.6.32.35/security/Kconfig
+--- linux-2.6.32.35/security/Kconfig 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/security/Kconfig 2011-02-12 11:33:55.000000000 -0500
@@ -4,6 +4,527 @@
menu "Security options"
@@ -61231,9 +61459,9 @@ diff -urNp linux-2.6.32.33/security/Kconfig linux-2.6.32.33/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.33/security/min_addr.c linux-2.6.32.33/security/min_addr.c
---- linux-2.6.32.33/security/min_addr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/security/min_addr.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/security/min_addr.c linux-2.6.32.35/security/min_addr.c
+--- linux-2.6.32.35/security/min_addr.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/security/min_addr.c 2010-12-31 14:46:53.000000000 -0500
@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
*/
static void update_mmap_min_addr(void)
@@ -61250,9 +61478,9 @@ diff -urNp linux-2.6.32.33/security/min_addr.c linux-2.6.32.33/security/min_addr
}
/*
-diff -urNp linux-2.6.32.33/security/root_plug.c linux-2.6.32.33/security/root_plug.c
---- linux-2.6.32.33/security/root_plug.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/security/root_plug.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/security/root_plug.c linux-2.6.32.35/security/root_plug.c
+--- linux-2.6.32.35/security/root_plug.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/security/root_plug.c 2010-12-31 14:46:53.000000000 -0500
@@ -70,7 +70,7 @@ static int rootplug_bprm_check_security
return 0;
}
@@ -61262,9 +61490,9 @@ diff -urNp linux-2.6.32.33/security/root_plug.c linux-2.6.32.33/security/root_pl
.bprm_check_security = rootplug_bprm_check_security,
};
-diff -urNp linux-2.6.32.33/security/security.c linux-2.6.32.33/security/security.c
---- linux-2.6.32.33/security/security.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/security/security.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/security/security.c linux-2.6.32.35/security/security.c
+--- linux-2.6.32.35/security/security.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/security/security.c 2010-12-31 14:46:53.000000000 -0500
@@ -24,7 +24,7 @@ static __initdata char chosen_lsm[SECURI
extern struct security_operations default_security_ops;
extern void security_fixup_ops(struct security_operations *ops);
@@ -61283,9 +61511,9 @@ diff -urNp linux-2.6.32.33/security/security.c linux-2.6.32.33/security/security
{
if (verify(ops)) {
printk(KERN_DEBUG "%s could not verify "
-diff -urNp linux-2.6.32.33/security/selinux/hooks.c linux-2.6.32.33/security/selinux/hooks.c
---- linux-2.6.32.33/security/selinux/hooks.c 2011-03-02 17:24:54.000000000 -0500
-+++ linux-2.6.32.33/security/selinux/hooks.c 2011-02-22 15:57:40.000000000 -0500
+diff -urNp linux-2.6.32.35/security/selinux/hooks.c linux-2.6.32.35/security/selinux/hooks.c
+--- linux-2.6.32.35/security/selinux/hooks.c 2011-03-02 17:24:54.000000000 -0500
++++ linux-2.6.32.35/security/selinux/hooks.c 2011-02-22 15:57:40.000000000 -0500
@@ -131,7 +131,7 @@ int selinux_enabled = 1;
* Minimal support for a secondary security module,
* just to allow the use of the capability module.
@@ -61314,9 +61542,9 @@ diff -urNp linux-2.6.32.33/security/selinux/hooks.c linux-2.6.32.33/security/sel
/* Unregister netfilter hooks. */
selinux_nf_ip_exit();
-diff -urNp linux-2.6.32.33/security/smack/smack_lsm.c linux-2.6.32.33/security/smack/smack_lsm.c
---- linux-2.6.32.33/security/smack/smack_lsm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/security/smack/smack_lsm.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/security/smack/smack_lsm.c linux-2.6.32.35/security/smack/smack_lsm.c
+--- linux-2.6.32.35/security/smack/smack_lsm.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/security/smack/smack_lsm.c 2010-12-31 14:46:53.000000000 -0500
@@ -3073,7 +3073,7 @@ static int smack_inode_getsecctx(struct
return 0;
}
@@ -61326,9 +61554,9 @@ diff -urNp linux-2.6.32.33/security/smack/smack_lsm.c linux-2.6.32.33/security/s
.name = "smack",
.ptrace_access_check = smack_ptrace_access_check,
-diff -urNp linux-2.6.32.33/security/tomoyo/tomoyo.c linux-2.6.32.33/security/tomoyo/tomoyo.c
---- linux-2.6.32.33/security/tomoyo/tomoyo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/security/tomoyo/tomoyo.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/security/tomoyo/tomoyo.c linux-2.6.32.35/security/tomoyo/tomoyo.c
+--- linux-2.6.32.35/security/tomoyo/tomoyo.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/security/tomoyo/tomoyo.c 2010-12-31 14:46:53.000000000 -0500
@@ -275,7 +275,7 @@ static int tomoyo_dentry_open(struct fil
* tomoyo_security_ops is a "struct security_operations" which is used for
* registering TOMOYO.
@@ -61338,9 +61566,9 @@ diff -urNp linux-2.6.32.33/security/tomoyo/tomoyo.c linux-2.6.32.33/security/tom
.name = "tomoyo",
.cred_alloc_blank = tomoyo_cred_alloc_blank,
.cred_prepare = tomoyo_cred_prepare,
-diff -urNp linux-2.6.32.33/sound/aoa/codecs/onyx.c linux-2.6.32.33/sound/aoa/codecs/onyx.c
---- linux-2.6.32.33/sound/aoa/codecs/onyx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/sound/aoa/codecs/onyx.c 2011-01-24 18:05:37.000000000 -0500
+diff -urNp linux-2.6.32.35/sound/aoa/codecs/onyx.c linux-2.6.32.35/sound/aoa/codecs/onyx.c
+--- linux-2.6.32.35/sound/aoa/codecs/onyx.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/sound/aoa/codecs/onyx.c 2011-01-24 18:05:37.000000000 -0500
@@ -53,7 +53,7 @@ struct onyx {
spdif_locked:1,
analog_locked:1,
@@ -61369,9 +61597,9 @@ diff -urNp linux-2.6.32.33/sound/aoa/codecs/onyx.c linux-2.6.32.33/sound/aoa/cod
onyx->spdif_locked = onyx->analog_locked = 0;
mutex_unlock(&onyx->mutex);
-diff -urNp linux-2.6.32.33/sound/aoa/codecs/onyx.h linux-2.6.32.33/sound/aoa/codecs/onyx.h
---- linux-2.6.32.33/sound/aoa/codecs/onyx.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/sound/aoa/codecs/onyx.h 2011-01-25 20:24:47.000000000 -0500
+diff -urNp linux-2.6.32.35/sound/aoa/codecs/onyx.h linux-2.6.32.35/sound/aoa/codecs/onyx.h
+--- linux-2.6.32.35/sound/aoa/codecs/onyx.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/sound/aoa/codecs/onyx.h 2011-01-25 20:24:47.000000000 -0500
@@ -11,6 +11,7 @@
#include <linux/i2c.h>
#include <asm/pmac_low_i2c.h>
@@ -61380,9 +61608,9 @@ diff -urNp linux-2.6.32.33/sound/aoa/codecs/onyx.h linux-2.6.32.33/sound/aoa/cod
/* PCM3052 register definitions */
-diff -urNp linux-2.6.32.33/sound/core/oss/pcm_oss.c linux-2.6.32.33/sound/core/oss/pcm_oss.c
---- linux-2.6.32.33/sound/core/oss/pcm_oss.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/sound/core/oss/pcm_oss.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/sound/core/oss/pcm_oss.c linux-2.6.32.35/sound/core/oss/pcm_oss.c
+--- linux-2.6.32.35/sound/core/oss/pcm_oss.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/sound/core/oss/pcm_oss.c 2010-12-31 14:46:53.000000000 -0500
@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
}
}
@@ -61394,9 +61622,9 @@ diff -urNp linux-2.6.32.33/sound/core/oss/pcm_oss.c linux-2.6.32.33/sound/core/o
#endif /* CONFIG_SND_VERBOSE_PROCFS */
/*
-diff -urNp linux-2.6.32.33/sound/core/seq/seq_lock.h linux-2.6.32.33/sound/core/seq/seq_lock.h
---- linux-2.6.32.33/sound/core/seq/seq_lock.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/sound/core/seq/seq_lock.h 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/sound/core/seq/seq_lock.h linux-2.6.32.35/sound/core/seq/seq_lock.h
+--- linux-2.6.32.35/sound/core/seq/seq_lock.h 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/sound/core/seq/seq_lock.h 2010-12-31 14:46:53.000000000 -0500
@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
#else /* SMP || CONFIG_SND_DEBUG */
@@ -61412,9 +61640,9 @@ diff -urNp linux-2.6.32.33/sound/core/seq/seq_lock.h linux-2.6.32.33/sound/core/
#endif /* SMP || CONFIG_SND_DEBUG */
-diff -urNp linux-2.6.32.33/sound/drivers/mts64.c linux-2.6.32.33/sound/drivers/mts64.c
---- linux-2.6.32.33/sound/drivers/mts64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/sound/drivers/mts64.c 2011-01-25 22:35:30.000000000 -0500
+diff -urNp linux-2.6.32.35/sound/drivers/mts64.c linux-2.6.32.35/sound/drivers/mts64.c
+--- linux-2.6.32.35/sound/drivers/mts64.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/sound/drivers/mts64.c 2011-01-25 22:35:30.000000000 -0500
@@ -27,6 +27,7 @@
#include <sound/initval.h>
#include <sound/rawmidi.h>
@@ -61471,9 +61699,9 @@ diff -urNp linux-2.6.32.33/sound/drivers/mts64.c linux-2.6.32.33/sound/drivers/m
return 0;
}
-diff -urNp linux-2.6.32.33/sound/drivers/portman2x4.c linux-2.6.32.33/sound/drivers/portman2x4.c
---- linux-2.6.32.33/sound/drivers/portman2x4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/sound/drivers/portman2x4.c 2011-01-25 20:24:47.000000000 -0500
+diff -urNp linux-2.6.32.35/sound/drivers/portman2x4.c linux-2.6.32.35/sound/drivers/portman2x4.c
+--- linux-2.6.32.35/sound/drivers/portman2x4.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/sound/drivers/portman2x4.c 2011-01-25 20:24:47.000000000 -0500
@@ -46,6 +46,7 @@
#include <sound/initval.h>
#include <sound/rawmidi.h>
@@ -61491,9 +61719,9 @@ diff -urNp linux-2.6.32.33/sound/drivers/portman2x4.c linux-2.6.32.33/sound/driv
int mode[PORTMAN_NUM_INPUT_PORTS];
struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
};
-diff -urNp linux-2.6.32.33/sound/oss/sb_audio.c linux-2.6.32.33/sound/oss/sb_audio.c
---- linux-2.6.32.33/sound/oss/sb_audio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/sound/oss/sb_audio.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/sound/oss/sb_audio.c linux-2.6.32.35/sound/oss/sb_audio.c
+--- linux-2.6.32.35/sound/oss/sb_audio.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/sound/oss/sb_audio.c 2010-12-31 14:46:53.000000000 -0500
@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
buf16 = (signed short *)(localbuf + localoffs);
while (c)
@@ -61503,9 +61731,9 @@ diff -urNp linux-2.6.32.33/sound/oss/sb_audio.c linux-2.6.32.33/sound/oss/sb_aud
if (copy_from_user(lbuf8,
userbuf+useroffs + p,
locallen))
-diff -urNp linux-2.6.32.33/sound/oss/swarm_cs4297a.c linux-2.6.32.33/sound/oss/swarm_cs4297a.c
---- linux-2.6.32.33/sound/oss/swarm_cs4297a.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/sound/oss/swarm_cs4297a.c 2010-12-31 14:47:01.000000000 -0500
+diff -urNp linux-2.6.32.35/sound/oss/swarm_cs4297a.c linux-2.6.32.35/sound/oss/swarm_cs4297a.c
+--- linux-2.6.32.35/sound/oss/swarm_cs4297a.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/sound/oss/swarm_cs4297a.c 2010-12-31 14:47:01.000000000 -0500
@@ -2577,7 +2577,6 @@ static int __init cs4297a_init(void)
{
struct cs4297a_state *s;
@@ -61540,9 +61768,9 @@ diff -urNp linux-2.6.32.33/sound/oss/swarm_cs4297a.c linux-2.6.32.33/sound/oss/s
list_add(&s->list, &cs4297a_devs);
-diff -urNp linux-2.6.32.33/sound/pci/ac97/ac97_codec.c linux-2.6.32.33/sound/pci/ac97/ac97_codec.c
---- linux-2.6.32.33/sound/pci/ac97/ac97_codec.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/sound/pci/ac97/ac97_codec.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/sound/pci/ac97/ac97_codec.c linux-2.6.32.35/sound/pci/ac97/ac97_codec.c
+--- linux-2.6.32.35/sound/pci/ac97/ac97_codec.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/sound/pci/ac97/ac97_codec.c 2010-12-31 14:46:53.000000000 -0500
@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
}
@@ -61552,9 +61780,9 @@ diff -urNp linux-2.6.32.33/sound/pci/ac97/ac97_codec.c linux-2.6.32.33/sound/pci
#ifdef CONFIG_SND_AC97_POWER_SAVE
static void do_update_power(struct work_struct *work)
-diff -urNp linux-2.6.32.33/sound/pci/ac97/ac97_patch.c linux-2.6.32.33/sound/pci/ac97/ac97_patch.c
---- linux-2.6.32.33/sound/pci/ac97/ac97_patch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/sound/pci/ac97/ac97_patch.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/sound/pci/ac97/ac97_patch.c linux-2.6.32.35/sound/pci/ac97/ac97_patch.c
+--- linux-2.6.32.35/sound/pci/ac97/ac97_patch.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/sound/pci/ac97/ac97_patch.c 2010-12-31 14:46:53.000000000 -0500
@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
return 0;
}
@@ -61861,9 +62089,9 @@ diff -urNp linux-2.6.32.33/sound/pci/ac97/ac97_patch.c linux-2.6.32.33/sound/pci
.build_specific = patch_ucb1400_specific,
};
-diff -urNp linux-2.6.32.33/sound/pci/ens1370.c linux-2.6.32.33/sound/pci/ens1370.c
---- linux-2.6.32.33/sound/pci/ens1370.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/sound/pci/ens1370.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/sound/pci/ens1370.c linux-2.6.32.35/sound/pci/ens1370.c
+--- linux-2.6.32.35/sound/pci/ens1370.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/sound/pci/ens1370.c 2010-12-31 14:46:53.000000000 -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 */
@@ -61873,9 +62101,9 @@ diff -urNp linux-2.6.32.33/sound/pci/ens1370.c linux-2.6.32.33/sound/pci/ens1370
};
MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
-diff -urNp linux-2.6.32.33/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.33/sound/pci/hda/patch_intelhdmi.c
---- linux-2.6.32.33/sound/pci/hda/patch_intelhdmi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/sound/pci/hda/patch_intelhdmi.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.35/sound/pci/hda/patch_intelhdmi.c
+--- linux-2.6.32.35/sound/pci/hda/patch_intelhdmi.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/sound/pci/hda/patch_intelhdmi.c 2010-12-31 14:46:53.000000000 -0500
@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
cp_ready);
@@ -61891,9 +62119,9 @@ diff -urNp linux-2.6.32.33/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.33/sound
}
-diff -urNp linux-2.6.32.33/sound/pci/intel8x0.c linux-2.6.32.33/sound/pci/intel8x0.c
---- linux-2.6.32.33/sound/pci/intel8x0.c 2010-12-09 18:13:03.000000000 -0500
-+++ linux-2.6.32.33/sound/pci/intel8x0.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/sound/pci/intel8x0.c linux-2.6.32.35/sound/pci/intel8x0.c
+--- linux-2.6.32.35/sound/pci/intel8x0.c 2010-12-09 18:13:03.000000000 -0500
++++ linux-2.6.32.35/sound/pci/intel8x0.c 2010-12-31 14:46:53.000000000 -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 */
@@ -61912,9 +62140,9 @@ diff -urNp linux-2.6.32.33/sound/pci/intel8x0.c linux-2.6.32.33/sound/pci/intel8
};
static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
-diff -urNp linux-2.6.32.33/sound/pci/intel8x0m.c linux-2.6.32.33/sound/pci/intel8x0m.c
---- linux-2.6.32.33/sound/pci/intel8x0m.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/sound/pci/intel8x0m.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/sound/pci/intel8x0m.c linux-2.6.32.35/sound/pci/intel8x0m.c
+--- linux-2.6.32.35/sound/pci/intel8x0m.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/sound/pci/intel8x0m.c 2010-12-31 14:46:53.000000000 -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 */
@@ -61933,9 +62161,9 @@ diff -urNp linux-2.6.32.33/sound/pci/intel8x0m.c linux-2.6.32.33/sound/pci/intel
};
static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
-diff -urNp linux-2.6.32.33/usr/gen_init_cpio.c linux-2.6.32.33/usr/gen_init_cpio.c
---- linux-2.6.32.33/usr/gen_init_cpio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/usr/gen_init_cpio.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/usr/gen_init_cpio.c linux-2.6.32.35/usr/gen_init_cpio.c
+--- linux-2.6.32.35/usr/gen_init_cpio.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/usr/gen_init_cpio.c 2010-12-31 14:46:53.000000000 -0500
@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
int retval;
int rc = -1;
@@ -61958,9 +62186,9 @@ diff -urNp linux-2.6.32.33/usr/gen_init_cpio.c linux-2.6.32.33/usr/gen_init_cpio
} else
break;
}
-diff -urNp linux-2.6.32.33/virt/kvm/kvm_main.c linux-2.6.32.33/virt/kvm/kvm_main.c
---- linux-2.6.32.33/virt/kvm/kvm_main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.33/virt/kvm/kvm_main.c 2010-12-31 14:46:53.000000000 -0500
+diff -urNp linux-2.6.32.35/virt/kvm/kvm_main.c linux-2.6.32.35/virt/kvm/kvm_main.c
+--- linux-2.6.32.35/virt/kvm/kvm_main.c 2010-08-13 16:24:37.000000000 -0400
++++ linux-2.6.32.35/virt/kvm/kvm_main.c 2010-12-31 14:46:53.000000000 -0500
@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode
return 0;
}
diff --git a/2.6.38/0000_README b/2.6.38/0000_README
index 2027ed3..5ee254c 100644
--- a/2.6.38/0000_README
+++ b/2.6.38/0000_README
@@ -3,7 +3,11 @@ README
Individual Patch Descriptions:
-----------------------------------------------------------------------------
-Patch: 4420_grsec-2.2.1-2.6.38-test.patch
+Patch: 1000_linux-2.6.38.1.patch
+From: http://www.kernel.org
+Desc: Linux 2.6.38.1
+
+Patch: 4420_grsecurity-2.2.2-2.6.38.1-201103262052.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/2.6.38/1000_linux-2.6.38.1.patch b/2.6.38/1000_linux-2.6.38.1.patch
new file mode 100644
index 0000000..5b209ea
--- /dev/null
+++ b/2.6.38/1000_linux-2.6.38.1.patch
@@ -0,0 +1,2781 @@
+diff --git a/Documentation/i2c/instantiating-devices b/Documentation/i2c/instantiating-devices
+index 87da405..9edb75d 100644
+--- a/Documentation/i2c/instantiating-devices
++++ b/Documentation/i2c/instantiating-devices
+@@ -100,7 +100,7 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev)
+ (...)
+ i2c_adap = i2c_get_adapter(2);
+ memset(&i2c_info, 0, sizeof(struct i2c_board_info));
+- strlcpy(i2c_info.name, "isp1301_pnx", I2C_NAME_SIZE);
++ strlcpy(i2c_info.type, "isp1301_pnx", I2C_NAME_SIZE);
+ isp1301_i2c_client = i2c_new_probed_device(i2c_adap, &i2c_info,
+ normal_i2c, NULL);
+ i2c_put_adapter(i2c_adap);
+diff --git a/Makefile b/Makefile
+index d6592b6..167ef45 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 38
+-EXTRAVERSION =
++EXTRAVERSION = .1
+ NAME = Flesh-Eating Bats with Fangs
+
+ # *DOCUMENTATION*
+diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
+index 0ca90b8..556bbd4 100644
+--- a/arch/arm/mach-davinci/board-dm644x-evm.c
++++ b/arch/arm/mach-davinci/board-dm644x-evm.c
+@@ -440,11 +440,6 @@ evm_u35_setup(struct i2c_client *client, int gpio, unsigned ngpio, void *c)
+ gpio_request(gpio + 7, "nCF_SEL");
+ gpio_direction_output(gpio + 7, 1);
+
+- /* irlml6401 switches over 1A, in under 8 msec;
+- * now it can be managed by nDRV_VBUS ...
+- */
+- davinci_setup_usb(1000, 8);
+-
+ return 0;
+ }
+
+@@ -705,6 +700,9 @@ static __init void davinci_evm_init(void)
+ davinci_serial_init(&uart_config);
+ dm644x_init_asp(&dm644x_evm_snd_data);
+
++ /* irlml6401 switches over 1A, in under 8 msec */
++ davinci_setup_usb(1000, 8);
++
+ soc_info->emac_pdata->phy_id = DM644X_EVM_PHY_ID;
+ /* Register the fixup for PHY on DaVinci */
+ phy_register_fixup_for_uid(LXT971_PHY_ID, LXT971_PHY_MASK,
+diff --git a/arch/microblaze/include/asm/uaccess.h b/arch/microblaze/include/asm/uaccess.h
+index d840f4a..5bb95a1 100644
+--- a/arch/microblaze/include/asm/uaccess.h
++++ b/arch/microblaze/include/asm/uaccess.h
+@@ -120,16 +120,16 @@ static inline unsigned long __must_check __clear_user(void __user *to,
+ {
+ /* normal memset with two words to __ex_table */
+ __asm__ __volatile__ ( \
+- "1: sb r0, %2, r0;" \
++ "1: sb r0, %1, r0;" \
+ " addik %0, %0, -1;" \
+ " bneid %0, 1b;" \
+- " addik %2, %2, 1;" \
++ " addik %1, %1, 1;" \
+ "2: " \
+ __EX_TABLE_SECTION \
+ ".word 1b,2b;" \
+ ".previous;" \
+- : "=r"(n) \
+- : "0"(n), "r"(to)
++ : "=r"(n), "=r"(to) \
++ : "0"(n), "1"(to)
+ );
+ return n;
+ }
+diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
+index d7d94b8..3948f1d 100644
+--- a/arch/parisc/kernel/irq.c
++++ b/arch/parisc/kernel/irq.c
+@@ -108,7 +108,7 @@ int cpu_check_affinity(unsigned int irq, const struct cpumask *dest)
+ int cpu_dest;
+
+ /* timer and ipi have to always be received on all CPUs */
+- if (CHECK_IRQ_PER_CPU(irq)) {
++ if (CHECK_IRQ_PER_CPU(irq_to_desc(irq)->status)) {
+ /* Bad linux design decision. The mask has already
+ * been set; we must reset it */
+ cpumask_setall(irq_desc[irq].affinity);
+diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
+index 125fc1a..7626fa7 100644
+--- a/arch/powerpc/include/asm/reg.h
++++ b/arch/powerpc/include/asm/reg.h
+@@ -880,6 +880,7 @@
+ #define PV_970 0x0039
+ #define PV_POWER5 0x003A
+ #define PV_POWER5p 0x003B
++#define PV_POWER7 0x003F
+ #define PV_970FX 0x003C
+ #define PV_630 0x0040
+ #define PV_630p 0x0041
+diff --git a/arch/powerpc/kernel/perf_event.c b/arch/powerpc/kernel/perf_event.c
+index ab6f6be..97e0ae4 100644
+--- a/arch/powerpc/kernel/perf_event.c
++++ b/arch/powerpc/kernel/perf_event.c
+@@ -1269,6 +1269,28 @@ unsigned long perf_instruction_pointer(struct pt_regs *regs)
+ return ip;
+ }
+
++static bool pmc_overflow(unsigned long val)
++{
++ if ((int)val < 0)
++ return true;
++
++ /*
++ * Events on POWER7 can roll back if a speculative event doesn't
++ * eventually complete. Unfortunately in some rare cases they will
++ * raise a performance monitor exception. We need to catch this to
++ * ensure we reset the PMC. In all cases the PMC will be 256 or less
++ * cycles from overflow.
++ *
++ * We only do this if the first pass fails to find any overflowing
++ * PMCs because a user might set a period of less than 256 and we
++ * don't want to mistakenly reset them.
++ */
++ if (__is_processor(PV_POWER7) && ((0x80000000 - val) <= 256))
++ return true;
++
++ return false;
++}
++
+ /*
+ * Performance monitor interrupt stuff
+ */
+@@ -1316,7 +1338,7 @@ static void perf_event_interrupt(struct pt_regs *regs)
+ if (is_limited_pmc(i + 1))
+ continue;
+ val = read_pmc(i + 1);
+- if ((int)val < 0)
++ if (pmc_overflow(val))
+ write_pmc(i + 1, 0);
+ }
+ }
+diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
+index 94b979d..effff47 100644
+--- a/arch/x86/include/asm/pgtable-3level.h
++++ b/arch/x86/include/asm/pgtable-3level.h
+@@ -69,8 +69,6 @@ static inline void native_pmd_clear(pmd_t *pmd)
+
+ static inline void pud_clear(pud_t *pudp)
+ {
+- unsigned long pgd;
+-
+ set_pud(pudp, __pud(0));
+
+ /*
+@@ -79,13 +77,10 @@ static inline void pud_clear(pud_t *pudp)
+ * section 8.1: in PAE mode we explicitly have to flush the
+ * TLB via cr3 if the top-level pgd is changed...
+ *
+- * Make sure the pud entry we're updating is within the
+- * current pgd to avoid unnecessary TLB flushes.
++ * Currently all places where pud_clear() is called either have
++ * flush_tlb_mm() followed or don't need TLB flush (x86_64 code or
++ * pud_clear_bad()), so we don't need TLB flush here.
+ */
+- pgd = read_cr3();
+- if (__pa(pudp) >= pgd && __pa(pudp) <
+- (pgd + sizeof(pgd_t)*PTRS_PER_PGD))
+- write_cr3(pgd);
+ }
+
+ #ifdef CONFIG_SMP
+diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
+index 7038b95..4db3554 100644
+--- a/arch/x86/kernel/alternative.c
++++ b/arch/x86/kernel/alternative.c
+@@ -620,7 +620,12 @@ static int __kprobes stop_machine_text_poke(void *data)
+ flush_icache_range((unsigned long)p->addr,
+ (unsigned long)p->addr + p->len);
+ }
+-
++ /*
++ * Intel Archiecture Software Developer's Manual section 7.1.3 specifies
++ * that a core serializing instruction such as "cpuid" should be
++ * executed on _each_ core before the new instruction is made visible.
++ */
++ sync_core();
+ return 0;
+ }
+
+diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
+index 294f26d..0b5e2b5 100644
+--- a/arch/x86/kernel/e820.c
++++ b/arch/x86/kernel/e820.c
+@@ -847,15 +847,21 @@ static int __init parse_memopt(char *p)
+ if (!p)
+ return -EINVAL;
+
+-#ifdef CONFIG_X86_32
+ if (!strcmp(p, "nopentium")) {
++#ifdef CONFIG_X86_32
+ setup_clear_cpu_cap(X86_FEATURE_PSE);
+ return 0;
+- }
++#else
++ printk(KERN_WARNING "mem=nopentium ignored! (only supported on x86_32)\n");
++ return -EINVAL;
+ #endif
++ }
+
+ userdef = 1;
+ mem_size = memparse(p, &p);
++ /* don't remove all of memory when handling "mem={invalid}" param */
++ if (mem_size == 0)
++ return -EINVAL;
+ e820_remove_range(mem_size, ULLONG_MAX - mem_size, E820_RAM, 1);
+
+ return 0;
+diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
+index 9efbdcc..3755ef4 100644
+--- a/arch/x86/kernel/early-quirks.c
++++ b/arch/x86/kernel/early-quirks.c
+@@ -159,7 +159,12 @@ static void __init ati_bugs_contd(int num, int slot, int func)
+ if (rev >= 0x40)
+ acpi_fix_pin2_polarity = 1;
+
+- if (rev > 0x13)
++ /*
++ * SB600: revisions 0x11, 0x12, 0x13, 0x14, ...
++ * SB700: revisions 0x39, 0x3a, ...
++ * SB800: revisions 0x40, 0x41, ...
++ */
++ if (rev >= 0x39)
+ return;
+
+ if (acpi_use_timer_override)
+diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
+index aed1ffb..bbd5c80 100644
+--- a/arch/x86/kernel/entry_64.S
++++ b/arch/x86/kernel/entry_64.S
+@@ -1248,7 +1248,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
+ decl PER_CPU_VAR(irq_count)
+ jmp error_exit
+ CFI_ENDPROC
+-END(do_hypervisor_callback)
++END(xen_do_hypervisor_callback)
+
+ /*
+ * Hypervisor uses this for application faults while it executes.
+diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
+index 0113d19..8573b83 100644
+--- a/arch/x86/mm/pgtable.c
++++ b/arch/x86/mm/pgtable.c
+@@ -168,8 +168,7 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
+ * section 8.1: in PAE mode we explicitly have to flush the
+ * TLB via cr3 if the top-level pgd is changed...
+ */
+- if (mm == current->active_mm)
+- write_cr3(read_cr3());
++ flush_tlb_mm(mm);
+ }
+ #else /* !CONFIG_X86_PAE */
+
+diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
+index b8d96ce..34e08f6 100644
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -260,6 +260,7 @@ static const struct pci_device_id ahci_pci_tbl[] = {
+ { PCI_VDEVICE(INTEL, 0x1d02), board_ahci }, /* PBG AHCI */
+ { PCI_VDEVICE(INTEL, 0x1d04), board_ahci }, /* PBG RAID */
+ { PCI_VDEVICE(INTEL, 0x1d06), board_ahci }, /* PBG RAID */
++ { PCI_VDEVICE(INTEL, 0x2826), board_ahci }, /* PBG RAID */
+ { PCI_VDEVICE(INTEL, 0x2323), board_ahci }, /* DH89xxCC AHCI */
+
+ /* JMicron 360/1/3/5/6, match class to avoid IDE function */
+@@ -383,6 +384,8 @@ static const struct pci_device_id ahci_pci_tbl[] = {
+ .class = PCI_CLASS_STORAGE_SATA_AHCI,
+ .class_mask = 0xffffff,
+ .driver_data = board_ahci_yes_fbs }, /* 88se9128 */
++ { PCI_DEVICE(0x1b4b, 0x9125),
++ .driver_data = board_ahci_yes_fbs }, /* 88se9125 */
+
+ /* Promise */
+ { PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 */
+diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
+index 17a6378..e16850e 100644
+--- a/drivers/ata/libata-eh.c
++++ b/drivers/ata/libata-eh.c
+@@ -1618,7 +1618,7 @@ static void ata_eh_analyze_serror(struct ata_link *link)
+ * host links. For disabled PMP links, only N bit is
+ * considered as X bit is left at 1 for link plugging.
+ */
+- if (link->lpm_policy != ATA_LPM_MAX_POWER)
++ if (link->lpm_policy > ATA_LPM_MAX_POWER)
+ hotplug_mask = 0; /* hotplug doesn't work w/ LPM */
+ else if (!(link->flags & ATA_LFLAG_DISABLED) || ata_is_host_link(link))
+ hotplug_mask = SERR_PHYRDY_CHG | SERR_DEV_XCHG;
+diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
+index 85da4c4..2eee8e0 100644
+--- a/drivers/gpu/drm/drm_sysfs.c
++++ b/drivers/gpu/drm/drm_sysfs.c
+@@ -158,8 +158,15 @@ static ssize_t status_show(struct device *device,
+ {
+ struct drm_connector *connector = to_drm_connector(device);
+ enum drm_connector_status status;
++ int ret;
++
++ ret = mutex_lock_interruptible(&connector->dev->mode_config.mutex);
++ if (ret)
++ return ret;
+
+ status = connector->funcs->detect(connector, true);
++ mutex_unlock(&connector->dev->mode_config.mutex);
++
+ return snprintf(buf, PAGE_SIZE, "%s\n",
+ drm_get_connector_status_name(status));
+ }
+diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
+index 8a9e08b..2347bc1 100644
+--- a/drivers/gpu/drm/i915/i915_irq.c
++++ b/drivers/gpu/drm/i915/i915_irq.c
+@@ -1377,7 +1377,12 @@ int i915_enable_vblank(struct drm_device *dev, int pipe)
+ else
+ i915_enable_pipestat(dev_priv, pipe,
+ PIPE_VBLANK_INTERRUPT_ENABLE);
++
++ /* maintain vblank delivery even in deep C-states */
++ if (dev_priv->info->gen == 3)
++ I915_WRITE(INSTPM, INSTPM_AGPBUSY_DIS << 16);
+ spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
++
+ return 0;
+ }
+
+@@ -1390,6 +1395,10 @@ void i915_disable_vblank(struct drm_device *dev, int pipe)
+ unsigned long irqflags;
+
+ spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
++ if (dev_priv->info->gen == 3)
++ I915_WRITE(INSTPM,
++ INSTPM_AGPBUSY_DIS << 16 | INSTPM_AGPBUSY_DIS);
++
+ if (HAS_PCH_SPLIT(dev))
+ ironlake_disable_display_irq(dev_priv, (pipe == 0) ?
+ DE_PIPEA_VBLANK: DE_PIPEB_VBLANK);
+diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
+index 2abe240..12c547a 100644
+--- a/drivers/gpu/drm/i915/i915_reg.h
++++ b/drivers/gpu/drm/i915/i915_reg.h
+@@ -405,9 +405,12 @@
+ #define I915_ERROR_INSTRUCTION (1<<0)
+ #define INSTPM 0x020c0
+ #define INSTPM_SELF_EN (1<<12) /* 915GM only */
++#define INSTPM_AGPBUSY_DIS (1<<11) /* gen3: when disabled, pending interrupts
++ will not assert AGPBUSY# and will only
++ be delivered when out of C3. */
+ #define ACTHD 0x020c8
+ #define FW_BLC 0x020d8
+-#define FW_BLC2 0x020dc
++#define FW_BLC2 0x020dc
+ #define FW_BLC_SELF 0x020e0 /* 915+ only */
+ #define FW_BLC_SELF_EN_MASK (1<<31)
+ #define FW_BLC_SELF_FIFO_MASK (1<<16) /* 945 only */
+diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
+index a4e5e53..4a5a73b 100644
+--- a/drivers/gpu/drm/radeon/atombios_crtc.c
++++ b/drivers/gpu/drm/radeon/atombios_crtc.c
+@@ -61,8 +61,8 @@ static void atombios_overscan_setup(struct drm_crtc *crtc,
+ args.usOverscanLeft = cpu_to_le16((adjusted_mode->crtc_hdisplay - (a2 / mode->crtc_vdisplay)) / 2);
+ args.usOverscanRight = cpu_to_le16((adjusted_mode->crtc_hdisplay - (a2 / mode->crtc_vdisplay)) / 2);
+ } else if (a2 > a1) {
+- args.usOverscanLeft = cpu_to_le16((adjusted_mode->crtc_vdisplay - (a1 / mode->crtc_hdisplay)) / 2);
+- args.usOverscanRight = cpu_to_le16((adjusted_mode->crtc_vdisplay - (a1 / mode->crtc_hdisplay)) / 2);
++ args.usOverscanTop = cpu_to_le16((adjusted_mode->crtc_vdisplay - (a1 / mode->crtc_hdisplay)) / 2);
++ args.usOverscanBottom = cpu_to_le16((adjusted_mode->crtc_vdisplay - (a1 / mode->crtc_hdisplay)) / 2);
+ }
+ break;
+ case RMX_FULL:
+diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
+index 2560f01..ae445b1 100644
+--- a/drivers/hid/Kconfig
++++ b/drivers/hid/Kconfig
+@@ -68,9 +68,15 @@ config HID_A4TECH
+ ---help---
+ Support for A4 tech X5 and WOP-35 / Trust 450L mice.
+
+-config HID_ACRUX_FF
+- tristate "ACRUX force feedback"
++config HID_ACRUX
++ tristate "ACRUX game controller support"
+ depends on USB_HID
++ ---help---
++ Say Y here if you want to enable support for ACRUX game controllers.
++
++config HID_ACRUX_FF
++ tristate "ACRUX force feedback support"
++ depends on HID_ACRUX
+ select INPUT_FF_MEMLESS
+ ---help---
+ Say Y here if you want to enable force feedback support for ACRUX
+@@ -319,10 +325,10 @@ config HID_NTRIG
+ Support for N-Trig touch screen.
+
+ config HID_ORTEK
+- tristate "Ortek WKB-2000 wireless keyboard and mouse trackpad"
++ tristate "Ortek PKB-1700/WKB-2000 wireless keyboard and mouse trackpad"
+ depends on USB_HID
+ ---help---
+- Support for Ortek WKB-2000 wireless keyboard + mouse trackpad.
++ Support for Ortek PKB-1700/WKB-2000 wireless keyboard + mouse trackpad.
+
+ config HID_PANTHERLORD
+ tristate "Pantherlord/GreenAsia game controller"
+diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
+index 6efc2a0..13e6248 100644
+--- a/drivers/hid/Makefile
++++ b/drivers/hid/Makefile
+@@ -27,7 +27,7 @@ endif
+
+ obj-$(CONFIG_HID_3M_PCT) += hid-3m-pct.o
+ obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o
+-obj-$(CONFIG_HID_ACRUX_FF) += hid-axff.o
++obj-$(CONFIG_HID_ACRUX) += hid-axff.o
+ obj-$(CONFIG_HID_APPLE) += hid-apple.o
+ obj-$(CONFIG_HID_BELKIN) += hid-belkin.o
+ obj-$(CONFIG_HID_CANDO) += hid-cando.o
+diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
+index 61aa712..b85744f 100644
+--- a/drivers/hid/hid-apple.c
++++ b/drivers/hid/hid-apple.c
+@@ -481,6 +481,12 @@ static const struct hid_device_id apple_devices[] = {
+ .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS),
+ .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI),
++ .driver_data = APPLE_HAS_FN },
++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO),
++ .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),
++ .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
+diff --git a/drivers/hid/hid-axff.c b/drivers/hid/hid-axff.c
+index e5b961d..b455428 100644
+--- a/drivers/hid/hid-axff.c
++++ b/drivers/hid/hid-axff.c
+@@ -33,6 +33,8 @@
+ #include <linux/hid.h>
+
+ #include "hid-ids.h"
++
++#ifdef CONFIG_HID_ACRUX_FF
+ #include "usbhid/usbhid.h"
+
+ struct axff_device {
+@@ -109,6 +111,12 @@ err_free_mem:
+ kfree(axff);
+ return error;
+ }
++#else
++static inline int axff_init(struct hid_device *hid)
++{
++ return 0;
++}
++#endif
+
+ static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id)
+ {
+@@ -139,9 +147,25 @@ static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id)
+ error);
+ }
+
++ /*
++ * We need to start polling device right away, otherwise
++ * it will go into a coma.
++ */
++ error = hid_hw_open(hdev);
++ if (error) {
++ dev_err(&hdev->dev, "hw open failed\n");
++ return error;
++ }
++
+ return 0;
+ }
+
++static void ax_remove(struct hid_device *hdev)
++{
++ hid_hw_close(hdev);
++ hid_hw_stop(hdev);
++}
++
+ static const struct hid_device_id ax_devices[] = {
+ { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802), },
+ { }
+@@ -149,9 +173,10 @@ static const struct hid_device_id ax_devices[] = {
+ MODULE_DEVICE_TABLE(hid, ax_devices);
+
+ static struct hid_driver ax_driver = {
+- .name = "acrux",
+- .id_table = ax_devices,
+- .probe = ax_probe,
++ .name = "acrux",
++ .id_table = ax_devices,
++ .probe = ax_probe,
++ .remove = ax_remove,
+ };
+
+ static int __init ax_init(void)
+diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
+index d678cf3..9477b2a 100644
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1256,9 +1256,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
+ { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) },
+-#if defined(CONFIG_HID_ACRUX_FF) || defined(CONFIG_HID_ACRUX_FF_MODULE)
+ { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
+-#endif
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
+@@ -1302,6 +1300,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) },
++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
+@@ -1400,6 +1401,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) },
++ { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
+@@ -1801,6 +1803,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = {
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) },
++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
+ { }
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index 92a0d61..090bf48 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -103,6 +103,9 @@
+ #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI 0x0242
+ #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO 0x0243
+ #define USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS 0x0244
++#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x0245
++#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0246
++#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0247
+ #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239
+ #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a
+ #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b
+@@ -466,6 +469,7 @@
+ #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064
+
+ #define USB_VENDOR_ID_ORTEK 0x05a4
++#define USB_DEVICE_ID_ORTEK_PKB1700 0x1700
+ #define USB_DEVICE_ID_ORTEK_WKB2000 0x2000
+
+ #define USB_VENDOR_ID_PANJIT 0x134c
+diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
+index 7f552bf..ebcc02a 100644
+--- a/drivers/hid/hid-input.c
++++ b/drivers/hid/hid-input.c
+@@ -290,14 +290,6 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
+ goto ignore;
+ }
+
+- if (field->report_type == HID_FEATURE_REPORT) {
+- if (device->driver->feature_mapping) {
+- device->driver->feature_mapping(device, hidinput, field,
+- usage);
+- }
+- goto ignore;
+- }
+-
+ if (device->driver->input_mapping) {
+ int ret = device->driver->input_mapping(device, hidinput, field,
+ usage, &bit, &max);
+@@ -835,6 +827,24 @@ static void hidinput_close(struct input_dev *dev)
+ hid_hw_close(hid);
+ }
+
++static void report_features(struct hid_device *hid)
++{
++ struct hid_driver *drv = hid->driver;
++ struct hid_report_enum *rep_enum;
++ struct hid_report *rep;
++ int i, j;
++
++ if (!drv->feature_mapping)
++ return;
++
++ rep_enum = &hid->report_enum[HID_FEATURE_REPORT];
++ list_for_each_entry(rep, &rep_enum->report_list, list)
++ for (i = 0; i < rep->maxfield; i++)
++ for (j = 0; j < rep->field[i]->maxusage; j++)
++ drv->feature_mapping(hid, rep->field[i],
++ rep->field[i]->usage + j);
++}
++
+ /*
+ * Register the input device; print a message.
+ * Configure the input layer interface
+@@ -863,7 +873,9 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)
+ return -1;
+ }
+
+- for (k = HID_INPUT_REPORT; k <= HID_FEATURE_REPORT; k++) {
++ report_features(hid);
++
++ for (k = HID_INPUT_REPORT; k <= HID_OUTPUT_REPORT; k++) {
+ if (k == HID_OUTPUT_REPORT &&
+ hid->quirks & HID_QUIRK_SKIP_OUTPUT_REPORTS)
+ continue;
+diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
+index 698e645..318cc40 100644
+--- a/drivers/hid/hid-magicmouse.c
++++ b/drivers/hid/hid-magicmouse.c
+@@ -258,7 +258,7 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tda
+ input_report_abs(input, ABS_MT_TRACKING_ID, id);
+ input_report_abs(input, ABS_MT_TOUCH_MAJOR, touch_major << 2);
+ input_report_abs(input, ABS_MT_TOUCH_MINOR, touch_minor << 2);
+- input_report_abs(input, ABS_MT_ORIENTATION, orientation);
++ input_report_abs(input, ABS_MT_ORIENTATION, -orientation);
+ input_report_abs(input, ABS_MT_POSITION_X, x);
+ input_report_abs(input, ABS_MT_POSITION_Y, y);
+
+@@ -397,7 +397,7 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h
+ input_set_abs_params(input, ABS_MT_TRACKING_ID, 0, 15, 0, 0);
+ input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255, 4, 0);
+ input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255, 4, 0);
+- input_set_abs_params(input, ABS_MT_ORIENTATION, -32, 31, 1, 0);
++ input_set_abs_params(input, ABS_MT_ORIENTATION, -31, 32, 1, 0);
+
+ /* Note: Touch Y position from the device is inverted relative
+ * to how pointer motion is reported (and relative to how USB
+diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
+index 07d3183..2bbc954 100644
+--- a/drivers/hid/hid-multitouch.c
++++ b/drivers/hid/hid-multitouch.c
+@@ -122,7 +122,7 @@ struct mt_class mt_classes[] = {
+ { }
+ };
+
+-static void mt_feature_mapping(struct hid_device *hdev, struct hid_input *hi,
++static void mt_feature_mapping(struct hid_device *hdev,
+ struct hid_field *field, struct hid_usage *usage)
+ {
+ if (usage->hid == HID_DG_INPUTMODE) {
+diff --git a/drivers/hid/hid-ortek.c b/drivers/hid/hid-ortek.c
+index e90edfc..ad6faa6 100644
+--- a/drivers/hid/hid-ortek.c
++++ b/drivers/hid/hid-ortek.c
+@@ -1,5 +1,5 @@
+ /*
+- * HID driver for Ortek WKB-2000 (wireless keyboard + mouse trackpad).
++ * HID driver for Ortek PKB-1700/WKB-2000 (wireless keyboard + mouse trackpad).
+ * Fixes LogicalMaximum error in USB report description, see
+ * http://bugzilla.kernel.org/show_bug.cgi?id=14787
+ *
+@@ -30,6 +30,7 @@ static __u8 *ortek_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+ }
+
+ static const struct hid_device_id ortek_devices[] = {
++ { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
+ { }
+ };
+diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
+index a610e78..38a41d2 100644
+--- a/drivers/hwmon/sht15.c
++++ b/drivers/hwmon/sht15.c
+@@ -333,11 +333,11 @@ static inline int sht15_calc_humid(struct sht15_data *data)
+
+ const int c1 = -4;
+ const int c2 = 40500; /* x 10 ^ -6 */
+- const int c3 = -2800; /* x10 ^ -9 */
++ const int c3 = -28; /* x 10 ^ -7 */
+
+ RHlinear = c1*1000
+ + c2 * data->val_humid/1000
+- + (data->val_humid * data->val_humid * c3)/1000000;
++ + (data->val_humid * data->val_humid * c3) / 10000;
+ return (temp - 25000) * (10000 + 80 * data->val_humid)
+ / 1000000 + RHlinear;
+ }
+diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
+index 64e0903..1d9616b 100644
+--- a/drivers/infiniband/core/cm.c
++++ b/drivers/infiniband/core/cm.c
+@@ -2989,6 +2989,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
+ goto out; /* No match. */
+ }
+ atomic_inc(&cur_cm_id_priv->refcount);
++ atomic_inc(&cm_id_priv->refcount);
+ spin_unlock_irq(&cm.lock);
+
+ cm_id_priv->id.cm_handler = cur_cm_id_priv->id.cm_handler;
+diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
+index 6884da2..e450c5a 100644
+--- a/drivers/infiniband/core/cma.c
++++ b/drivers/infiniband/core/cma.c
+@@ -1210,6 +1210,11 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
+ cm_id->context = conn_id;
+ cm_id->cm_handler = cma_ib_handler;
+
++ /*
++ * Protect against the user destroying conn_id from another thread
++ * until we're done accessing it.
++ */
++ atomic_inc(&conn_id->refcount);
+ ret = conn_id->id.event_handler(&conn_id->id, &event);
+ if (!ret) {
+ /*
+@@ -1222,8 +1227,10 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
+ ib_send_cm_mra(cm_id, CMA_CM_MRA_SETTING, NULL, 0);
+ mutex_unlock(&lock);
+ mutex_unlock(&conn_id->handler_mutex);
++ cma_deref_id(conn_id);
+ goto out;
+ }
++ cma_deref_id(conn_id);
+
+ /* Destroy the CM ID by returning a non-zero value. */
+ conn_id->cm_id.ib = NULL;
+@@ -1425,17 +1432,25 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
+ event.param.conn.private_data_len = iw_event->private_data_len;
+ event.param.conn.initiator_depth = attr.max_qp_init_rd_atom;
+ event.param.conn.responder_resources = attr.max_qp_rd_atom;
++
++ /*
++ * Protect against the user destroying conn_id from another thread
++ * until we're done accessing it.
++ */
++ atomic_inc(&conn_id->refcount);
+ ret = conn_id->id.event_handler(&conn_id->id, &event);
+ if (ret) {
+ /* User wants to destroy the CM ID */
+ conn_id->cm_id.iw = NULL;
+ cma_exch(conn_id, CMA_DESTROYING);
+ mutex_unlock(&conn_id->handler_mutex);
++ cma_deref_id(conn_id);
+ rdma_destroy_id(&conn_id->id);
+ goto out;
+ }
+
+ mutex_unlock(&conn_id->handler_mutex);
++ cma_deref_id(conn_id);
+
+ out:
+ if (dev)
+diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
+index ee82851..3185314 100644
+--- a/drivers/input/mouse/bcm5974.c
++++ b/drivers/input/mouse/bcm5974.c
+@@ -63,6 +63,10 @@
+ #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI 0x0242
+ #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO 0x0243
+ #define USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS 0x0244
++/* Macbook8 (unibody, March 2011) */
++#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x0245
++#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0246
++#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0247
+
+ #define BCM5974_DEVICE(prod) { \
+ .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \
+@@ -96,6 +100,10 @@ static const struct usb_device_id bcm5974_table[] = {
+ BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI),
+ BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO),
+ BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS),
++ /* MacbookPro8 */
++ BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI),
++ BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ISO),
++ BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),
+ /* Terminating entry */
+ {}
+ };
+@@ -274,6 +282,18 @@ static const struct bcm5974_config bcm5974_config_table[] = {
+ { DIM_X, DIM_X / SN_COORD, -4616, 5112 },
+ { DIM_Y, DIM_Y / SN_COORD, -142, 5234 }
+ },
++ {
++ USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI,
++ USB_DEVICE_ID_APPLE_WELLSPRING5_ISO,
++ USB_DEVICE_ID_APPLE_WELLSPRING5_JIS,
++ HAS_INTEGRATED_BUTTON,
++ 0x84, sizeof(struct bt_data),
++ 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
++ { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 },
++ { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
++ { DIM_X, DIM_X / SN_COORD, -4415, 5050 },
++ { DIM_Y, DIM_Y / SN_COORD, -55, 6680 }
++ },
+ {}
+ };
+
+diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
+index ebc62ad..fbe1ea4 100644
+--- a/drivers/mmc/core/sdio.c
++++ b/drivers/mmc/core/sdio.c
+@@ -395,6 +395,14 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
+ if (err)
+ goto remove;
+
++ /*
++ * Update oldcard with the new RCA received from the SDIO
++ * device -- we're doing this so that it's updated in the
++ * "card" struct when oldcard overwrites that later.
++ */
++ if (oldcard)
++ oldcard->rca = card->rca;
++
+ mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
+ }
+
+diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
+index 0dc905b..f7e622c 100644
+--- a/drivers/mmc/host/sdhci-pci.c
++++ b/drivers/mmc/host/sdhci-pci.c
+@@ -547,6 +547,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = {
+ },
+
+ {
++ .vendor = PCI_VENDOR_ID_RICOH,
++ .device = 0xe823,
++ .subvendor = PCI_ANY_ID,
++ .subdevice = PCI_ANY_ID,
++ .driver_data = (kernel_ulong_t)&sdhci_ricoh_mmc,
++ },
++
++ {
+ .vendor = PCI_VENDOR_ID_ENE,
+ .device = PCI_DEVICE_ID_ENE_CB712_SD,
+ .subvendor = PCI_ANY_ID,
+diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
+index 9f01e50..7c0a7c4 100644
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -495,6 +495,17 @@ static int __ath9k_hw_init(struct ath_hw *ah)
+ if (ah->hw_version.devid == AR5416_AR9100_DEVID)
+ ah->hw_version.macVersion = AR_SREV_VERSION_9100;
+
++ /*
++ * Read back AR_WA into a permanent copy and set bits 14 and 17.
++ * We need to do this to avoid RMW of this register. We cannot
++ * read the reg when chip is asleep.
++ */
++ ah->WARegVal = REG_READ(ah, AR_WA);
++ ah->WARegVal |= (AR_WA_D3_L1_DISABLE |
++ AR_WA_ASPM_TIMER_BASED_DISABLE);
++
++ ath9k_hw_read_revisions(ah);
++
+ if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) {
+ ath_err(common, "Couldn't reset chip\n");
+ return -EIO;
+@@ -563,14 +574,6 @@ static int __ath9k_hw_init(struct ath_hw *ah)
+
+ ath9k_hw_init_mode_regs(ah);
+
+- /*
+- * Read back AR_WA into a permanent copy and set bits 14 and 17.
+- * We need to do this to avoid RMW of this register. We cannot
+- * read the reg when chip is asleep.
+- */
+- ah->WARegVal = REG_READ(ah, AR_WA);
+- ah->WARegVal |= (AR_WA_D3_L1_DISABLE |
+- AR_WA_ASPM_TIMER_BASED_DISABLE);
+
+ if (ah->is_pciexpress)
+ ath9k_hw_configpcipowersave(ah, 0, 0);
+@@ -1082,8 +1085,6 @@ static bool ath9k_hw_set_reset_power_on(struct ath_hw *ah)
+ return false;
+ }
+
+- ath9k_hw_read_revisions(ah);
+-
+ return ath9k_hw_set_reset(ah, ATH9K_RESET_WARM);
+ }
+
+diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
+index b2497b8..3867a2e 100644
+--- a/drivers/net/wireless/ath/ath9k/recv.c
++++ b/drivers/net/wireless/ath/ath9k/recv.c
+@@ -439,9 +439,7 @@ u32 ath_calcrxfilter(struct ath_softc *sc)
+ * mode interface or when in monitor mode. AP mode does not need this
+ * since it receives all in-BSS frames anyway.
+ */
+- if (((sc->sc_ah->opmode != NL80211_IFTYPE_AP) &&
+- (sc->rx.rxfilter & FIF_PROMISC_IN_BSS)) ||
+- (sc->sc_ah->is_monitoring))
++ if (sc->sc_ah->is_monitoring)
+ rfilt |= ATH9K_RX_FILTER_PROM;
+
+ if (sc->rx.rxfilter & FIF_CONTROL)
+diff --git a/drivers/net/wireless/rtl818x/rtl8187/dev.c b/drivers/net/wireless/rtl818x/rtl8187/dev.c
+index 6b82cac..2bb5297 100644
+--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
++++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
+@@ -871,23 +871,35 @@ static void rtl8187_work(struct work_struct *work)
+ /* The RTL8187 returns the retry count through register 0xFFFA. In
+ * addition, it appears to be a cumulative retry count, not the
+ * value for the current TX packet. When multiple TX entries are
+- * queued, the retry count will be valid for the last one in the queue.
+- * The "error" should not matter for purposes of rate setting. */
++ * waiting in the queue, the retry count will be the total for all.
++ * The "error" may matter for purposes of rate setting, but there is
++ * no other choice with this hardware.
++ */
+ struct rtl8187_priv *priv = container_of(work, struct rtl8187_priv,
+ work.work);
+ struct ieee80211_tx_info *info;
+ struct ieee80211_hw *dev = priv->dev;
+ static u16 retry;
+ u16 tmp;
++ u16 avg_retry;
++ int length;
+
+ mutex_lock(&priv->conf_mutex);
+ tmp = rtl818x_ioread16(priv, (__le16 *)0xFFFA);
++ length = skb_queue_len(&priv->b_tx_status.queue);
++ if (unlikely(!length))
++ length = 1;
++ if (unlikely(tmp < retry))
++ tmp = retry;
++ avg_retry = (tmp - retry) / length;
+ while (skb_queue_len(&priv->b_tx_status.queue) > 0) {
+ struct sk_buff *old_skb;
+
+ old_skb = skb_dequeue(&priv->b_tx_status.queue);
+ info = IEEE80211_SKB_CB(old_skb);
+- info->status.rates[0].count = tmp - retry + 1;
++ info->status.rates[0].count = avg_retry + 1;
++ if (info->status.rates[0].count > RETRY_COUNT)
++ info->flags &= ~IEEE80211_TX_STAT_ACK;
+ ieee80211_tx_status_irqsafe(dev, old_skb);
+ }
+ retry = tmp;
+@@ -933,8 +945,8 @@ static int rtl8187_start(struct ieee80211_hw *dev)
+ rtl818x_iowrite32(priv, &priv->map->TX_CONF,
+ RTL818X_TX_CONF_HW_SEQNUM |
+ RTL818X_TX_CONF_DISREQQSIZE |
+- (7 << 8 /* short retry limit */) |
+- (7 << 0 /* long retry limit */) |
++ (RETRY_COUNT << 8 /* short retry limit */) |
++ (RETRY_COUNT << 0 /* long retry limit */) |
+ (7 << 21 /* MAX TX DMA */));
+ rtl8187_init_urbs(dev);
+ rtl8187b_init_status_urb(dev);
+@@ -1378,6 +1390,9 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
+ dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
+ IEEE80211_HW_SIGNAL_DBM |
+ IEEE80211_HW_RX_INCLUDES_FCS;
++ /* Initialize rate-control variables */
++ dev->max_rates = 1;
++ dev->max_rate_tries = RETRY_COUNT;
+
+ eeprom.data = dev;
+ eeprom.register_read = rtl8187_eeprom_register_read;
+diff --git a/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h b/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
+index 0d7b142..f1cc907 100644
+--- a/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
++++ b/drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
+@@ -35,6 +35,8 @@
+ #define RFKILL_MASK_8187_89_97 0x2
+ #define RFKILL_MASK_8198 0x4
+
++#define RETRY_COUNT 7
++
+ struct rtl8187_rx_info {
+ struct urb *urb;
+ struct ieee80211_hw *dev;
+diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
+index ea25e5b..c85438a 100644
+--- a/drivers/pci/pci-sysfs.c
++++ b/drivers/pci/pci-sysfs.c
+@@ -1088,7 +1088,7 @@ static int pci_create_capabilities_sysfs(struct pci_dev *dev)
+ attr->write = write_vpd_attr;
+ retval = sysfs_create_bin_file(&dev->dev.kobj, attr);
+ if (retval) {
+- kfree(dev->vpd->attr);
++ kfree(attr);
+ return retval;
+ }
+ dev->vpd->attr = attr;
+diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
+index 53a786f..bd80f63 100644
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -533,6 +533,17 @@ static void __devinit quirk_piix4_acpi(struct pci_dev *dev)
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3, quirk_piix4_acpi);
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3, quirk_piix4_acpi);
+
++#define ICH_PMBASE 0x40
++#define ICH_ACPI_CNTL 0x44
++#define ICH4_ACPI_EN 0x10
++#define ICH6_ACPI_EN 0x80
++#define ICH4_GPIOBASE 0x58
++#define ICH4_GPIO_CNTL 0x5c
++#define ICH4_GPIO_EN 0x10
++#define ICH6_GPIOBASE 0x48
++#define ICH6_GPIO_CNTL 0x4c
++#define ICH6_GPIO_EN 0x10
++
+ /*
+ * ICH4, ICH4-M, ICH5, ICH5-M ACPI: Three IO regions pointed to by longwords at
+ * 0x40 (128 bytes of ACPI, GPIO & TCO registers)
+@@ -541,12 +552,33 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3, qui
+ static void __devinit quirk_ich4_lpc_acpi(struct pci_dev *dev)
+ {
+ u32 region;
++ u8 enable;
+
+- pci_read_config_dword(dev, 0x40, &region);
+- quirk_io_region(dev, region, 128, PCI_BRIDGE_RESOURCES, "ICH4 ACPI/GPIO/TCO");
++ /*
++ * The check for PCIBIOS_MIN_IO is to ensure we won't create a conflict
++ * with low legacy (and fixed) ports. We don't know the decoding
++ * priority and can't tell whether the legacy device or the one created
++ * here is really at that address. This happens on boards with broken
++ * BIOSes.
++ */
++
++ pci_read_config_byte(dev, ICH_ACPI_CNTL, &enable);
++ if (enable & ICH4_ACPI_EN) {
++ pci_read_config_dword(dev, ICH_PMBASE, &region);
++ region &= PCI_BASE_ADDRESS_IO_MASK;
++ if (region >= PCIBIOS_MIN_IO)
++ quirk_io_region(dev, region, 128, PCI_BRIDGE_RESOURCES,
++ "ICH4 ACPI/GPIO/TCO");
++ }
+
+- pci_read_config_dword(dev, 0x58, &region);
+- quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES+1, "ICH4 GPIO");
++ pci_read_config_byte(dev, ICH4_GPIO_CNTL, &enable);
++ if (enable & ICH4_GPIO_EN) {
++ pci_read_config_dword(dev, ICH4_GPIOBASE, &region);
++ region &= PCI_BASE_ADDRESS_IO_MASK;
++ if (region >= PCIBIOS_MIN_IO)
++ quirk_io_region(dev, region, 64,
++ PCI_BRIDGE_RESOURCES + 1, "ICH4 GPIO");
++ }
+ }
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0, quirk_ich4_lpc_acpi);
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_0, quirk_ich4_lpc_acpi);
+@@ -562,12 +594,25 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1, qui
+ static void __devinit ich6_lpc_acpi_gpio(struct pci_dev *dev)
+ {
+ u32 region;
++ u8 enable;
+
+- pci_read_config_dword(dev, 0x40, &region);
+- quirk_io_region(dev, region, 128, PCI_BRIDGE_RESOURCES, "ICH6 ACPI/GPIO/TCO");
++ pci_read_config_byte(dev, ICH_ACPI_CNTL, &enable);
++ if (enable & ICH6_ACPI_EN) {
++ pci_read_config_dword(dev, ICH_PMBASE, &region);
++ region &= PCI_BASE_ADDRESS_IO_MASK;
++ if (region >= PCIBIOS_MIN_IO)
++ quirk_io_region(dev, region, 128, PCI_BRIDGE_RESOURCES,
++ "ICH6 ACPI/GPIO/TCO");
++ }
+
+- pci_read_config_dword(dev, 0x48, &region);
+- quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES+1, "ICH6 GPIO");
++ pci_read_config_byte(dev, ICH6_GPIO_CNTL, &enable);
++ if (enable & ICH4_GPIO_EN) {
++ pci_read_config_dword(dev, ICH6_GPIOBASE, &region);
++ region &= PCI_BASE_ADDRESS_IO_MASK;
++ if (region >= PCIBIOS_MIN_IO)
++ quirk_io_region(dev, region, 64,
++ PCI_BRIDGE_RESOURCES + 1, "ICH6 GPIO");
++ }
+ }
+
+ static void __devinit ich6_lpc_generic_decode(struct pci_dev *dev, unsigned reg, const char *name, int dynsize)
+@@ -2618,58 +2663,6 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4375,
+
+ #endif /* CONFIG_PCI_MSI */
+
+-#ifdef CONFIG_PCI_IOV
+-
+-/*
+- * For Intel 82576 SR-IOV NIC, if BIOS doesn't allocate resources for the
+- * SR-IOV BARs, zero the Flash BAR and program the SR-IOV BARs to use the
+- * old Flash Memory Space.
+- */
+-static void __devinit quirk_i82576_sriov(struct pci_dev *dev)
+-{
+- int pos, flags;
+- u32 bar, start, size;
+-
+- if (PAGE_SIZE > 0x10000)
+- return;
+-
+- flags = pci_resource_flags(dev, 0);
+- if ((flags & PCI_BASE_ADDRESS_SPACE) !=
+- PCI_BASE_ADDRESS_SPACE_MEMORY ||
+- (flags & PCI_BASE_ADDRESS_MEM_TYPE_MASK) !=
+- PCI_BASE_ADDRESS_MEM_TYPE_32)
+- return;
+-
+- pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_SRIOV);
+- if (!pos)
+- return;
+-
+- pci_read_config_dword(dev, pos + PCI_SRIOV_BAR, &bar);
+- if (bar & PCI_BASE_ADDRESS_MEM_MASK)
+- return;
+-
+- start = pci_resource_start(dev, 1);
+- size = pci_resource_len(dev, 1);
+- if (!start || size != 0x400000 || start & (size - 1))
+- return;
+-
+- pci_resource_flags(dev, 1) = 0;
+- pci_write_config_dword(dev, PCI_BASE_ADDRESS_1, 0);
+- pci_write_config_dword(dev, pos + PCI_SRIOV_BAR, start);
+- pci_write_config_dword(dev, pos + PCI_SRIOV_BAR + 12, start + size / 2);
+-
+- dev_info(&dev->dev, "use Flash Memory Space for SR-IOV BARs\n");
+-}
+-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x10c9, quirk_i82576_sriov);
+-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x10e6, quirk_i82576_sriov);
+-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x10e7, quirk_i82576_sriov);
+-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x10e8, quirk_i82576_sriov);
+-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150a, quirk_i82576_sriov);
+-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov);
+-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
+-
+-#endif /* CONFIG_PCI_IOV */
+-
+ /* Allow manual resource allocation for PCI hotplug bridges
+ * via pci=hpmemsize=nnM and pci=hpiosize=nnM parameters. For
+ * some PCI-PCI hotplug bridges, like PLX 6254 (former HINT HB6),
+diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
+index 6b72932..30f2b33 100644
+--- a/drivers/scsi/device_handler/scsi_dh_alua.c
++++ b/drivers/scsi/device_handler/scsi_dh_alua.c
+@@ -285,7 +285,8 @@ static void stpg_endio(struct request *req, int error)
+ print_alua_state(h->state));
+ }
+ done:
+- blk_put_request(req);
++ req->end_io_data = NULL;
++ __blk_put_request(req->q, req);
+ if (h->callback_fn) {
+ h->callback_fn(h->callback_data, err);
+ h->callback_fn = h->callback_data = NULL;
+diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c
+index b47d7aa..e2fe165 100644
+--- a/drivers/staging/tidspbridge/rmgr/proc.c
++++ b/drivers/staging/tidspbridge/rmgr/proc.c
+@@ -781,12 +781,14 @@ int proc_begin_dma(void *hprocessor, void *pmpu_addr, u32 ul_size,
+ (u32)pmpu_addr,
+ ul_size, dir);
+
++ mutex_lock(&proc_lock);
++
+ /* find requested memory are in cached mapping information */
+ map_obj = find_containing_mapping(pr_ctxt, (u32) pmpu_addr, ul_size);
+ if (!map_obj) {
+ pr_err("%s: find_containing_mapping failed\n", __func__);
+ status = -EFAULT;
+- goto err_out;
++ goto no_map;
+ }
+
+ if (memory_give_ownership(map_obj, (u32) pmpu_addr, ul_size, dir)) {
+@@ -795,6 +797,8 @@ int proc_begin_dma(void *hprocessor, void *pmpu_addr, u32 ul_size,
+ status = -EFAULT;
+ }
+
++no_map:
++ mutex_unlock(&proc_lock);
+ err_out:
+
+ return status;
+@@ -819,21 +823,24 @@ int proc_end_dma(void *hprocessor, void *pmpu_addr, u32 ul_size,
+ (u32)pmpu_addr,
+ ul_size, dir);
+
++ mutex_lock(&proc_lock);
++
+ /* find requested memory are in cached mapping information */
+ map_obj = find_containing_mapping(pr_ctxt, (u32) pmpu_addr, ul_size);
+ if (!map_obj) {
+ pr_err("%s: find_containing_mapping failed\n", __func__);
+ status = -EFAULT;
+- goto err_out;
++ goto no_map;
+ }
+
+ if (memory_regain_ownership(map_obj, (u32) pmpu_addr, ul_size, dir)) {
+ pr_err("%s: InValid address parameters %p %x\n",
+ __func__, pmpu_addr, ul_size);
+ status = -EFAULT;
+- goto err_out;
+ }
+
++no_map:
++ mutex_unlock(&proc_lock);
+ err_out:
+ return status;
+ }
+@@ -1726,9 +1733,8 @@ int proc_un_map(void *hprocessor, void *map_addr,
+ (p_proc_object->hbridge_context, va_align, size_align);
+ }
+
+- mutex_unlock(&proc_lock);
+ if (status)
+- goto func_end;
++ goto unmap_failed;
+
+ /*
+ * A successful unmap should be followed by removal of map_obj
+@@ -1737,6 +1743,9 @@ int proc_un_map(void *hprocessor, void *map_addr,
+ */
+ remove_mapping_information(pr_ctxt, (u32) map_addr, size_align);
+
++unmap_failed:
++ mutex_unlock(&proc_lock);
++
+ func_end:
+ dev_dbg(bridge, "%s: hprocessor: 0x%p map_addr: 0x%p status: 0x%x\n",
+ __func__, hprocessor, map_addr, status);
+diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h
+index d7b3aca..6160b2f 100644
+--- a/drivers/staging/winbond/core.h
++++ b/drivers/staging/winbond/core.h
+@@ -3,6 +3,7 @@
+
+ #include <linux/wireless.h>
+ #include <linux/types.h>
++#include <linux/delay.h>
+
+ #include "wbhal.h"
+ #include "mto.h"
+diff --git a/drivers/target/target_core_cdb.c b/drivers/target/target_core_cdb.c
+index 366080b..7f19c8b 100644
+--- a/drivers/target/target_core_cdb.c
++++ b/drivers/target/target_core_cdb.c
+@@ -667,7 +667,13 @@ target_emulate_readcapacity(struct se_cmd *cmd)
+ {
+ struct se_device *dev = SE_DEV(cmd);
+ unsigned char *buf = cmd->t_task->t_task_buf;
+- u32 blocks = dev->transport->get_blocks(dev);
++ unsigned long long blocks_long = dev->transport->get_blocks(dev);
++ u32 blocks;
++
++ if (blocks_long >= 0x00000000ffffffff)
++ blocks = 0xffffffff;
++ else
++ blocks = (u32)blocks_long;
+
+ buf[0] = (blocks >> 24) & 0xff;
+ buf[1] = (blocks >> 16) & 0xff;
+diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c
+index 3975df6..b3b881b 100644
+--- a/drivers/tty/serial/8250.c
++++ b/drivers/tty/serial/8250.c
+@@ -954,6 +954,23 @@ static int broken_efr(struct uart_8250_port *up)
+ return 0;
+ }
+
++static inline int ns16550a_goto_highspeed(struct uart_8250_port *up)
++{
++ unsigned char status;
++
++ status = serial_in(up, 0x04); /* EXCR2 */
++#define PRESL(x) ((x) & 0x30)
++ if (PRESL(status) == 0x10) {
++ /* already in high speed mode */
++ return 0;
++ } else {
++ status &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
++ status |= 0x10; /* 1.625 divisor for baud_base --> 921600 */
++ serial_outp(up, 0x04, status);
++ }
++ return 1;
++}
++
+ /*
+ * We know that the chip has FIFOs. Does it have an EFR? The
+ * EFR is located in the same register position as the IIR and
+@@ -1025,12 +1042,8 @@ static void autoconfig_16550a(struct uart_8250_port *up)
+ quot = serial_dl_read(up);
+ quot <<= 3;
+
+- status1 = serial_in(up, 0x04); /* EXCR2 */
+- status1 &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
+- status1 |= 0x10; /* 1.625 divisor for baud_base --> 921600 */
+- serial_outp(up, 0x04, status1);
+-
+- serial_dl_write(up, quot);
++ if (ns16550a_goto_highspeed(up))
++ serial_dl_write(up, quot);
+
+ serial_outp(up, UART_LCR, 0);
+
+@@ -3025,17 +3038,13 @@ void serial8250_resume_port(int line)
+ struct uart_8250_port *up = &serial8250_ports[line];
+
+ if (up->capabilities & UART_NATSEMI) {
+- unsigned char tmp;
+-
+ /* Ensure it's still in high speed mode */
+ serial_outp(up, UART_LCR, 0xE0);
+
+- tmp = serial_in(up, 0x04); /* EXCR2 */
+- tmp &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
+- tmp |= 0x10; /* 1.625 divisor for baud_base --> 921600 */
+- serial_outp(up, 0x04, tmp);
++ ns16550a_goto_highspeed(up);
+
+ serial_outp(up, UART_LCR, 0);
++ up->port.uartclk = 921600*16;
+ }
+ uart_resume_port(&serial8250_reg, &up->port);
+ }
+diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
+index b62857b..37e13c3 100644
+--- a/drivers/tty/serial/mrst_max3110.c
++++ b/drivers/tty/serial/mrst_max3110.c
+@@ -51,7 +51,7 @@
+ struct uart_max3110 {
+ struct uart_port port;
+ struct spi_device *spi;
+- char name[24];
++ char name[SPI_NAME_SIZE];
+
+ wait_queue_head_t wq;
+ struct task_struct *main_thread;
+diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
+index f71e8e3..d370885 100644
+--- a/drivers/usb/core/hcd-pci.c
++++ b/drivers/usb/core/hcd-pci.c
+@@ -363,8 +363,7 @@ static int check_root_hub_suspended(struct device *dev)
+ struct pci_dev *pci_dev = to_pci_dev(dev);
+ struct usb_hcd *hcd = pci_get_drvdata(pci_dev);
+
+- if (!(hcd->state == HC_STATE_SUSPENDED ||
+- hcd->state == HC_STATE_HALT)) {
++ if (HCD_RH_RUNNING(hcd)) {
+ dev_warn(dev, "Root hub is not suspended\n");
+ return -EBUSY;
+ }
+@@ -386,7 +385,7 @@ static int suspend_common(struct device *dev, bool do_wakeup)
+ if (retval)
+ return retval;
+
+- if (hcd->driver->pci_suspend) {
++ if (hcd->driver->pci_suspend && !HCD_DEAD(hcd)) {
+ /* Optimization: Don't suspend if a root-hub wakeup is
+ * pending and it would cause the HCD to wake up anyway.
+ */
+@@ -427,7 +426,7 @@ static int resume_common(struct device *dev, int event)
+ struct usb_hcd *hcd = pci_get_drvdata(pci_dev);
+ int retval;
+
+- if (hcd->state != HC_STATE_SUSPENDED) {
++ if (HCD_RH_RUNNING(hcd)) {
+ dev_dbg(dev, "can't resume, not suspended!\n");
+ return 0;
+ }
+@@ -442,7 +441,7 @@ static int resume_common(struct device *dev, int event)
+
+ clear_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
+
+- if (hcd->driver->pci_resume) {
++ if (hcd->driver->pci_resume && !HCD_DEAD(hcd)) {
+ if (event != PM_EVENT_AUTO_RESUME)
+ wait_for_companions(pci_dev, hcd);
+
+@@ -475,10 +474,10 @@ static int hcd_pci_suspend_noirq(struct device *dev)
+
+ pci_save_state(pci_dev);
+
+- /* If the root hub is HALTed rather than SUSPENDed,
++ /* If the root hub is dead rather than suspended,
+ * disallow remote wakeup.
+ */
+- if (hcd->state == HC_STATE_HALT)
++ if (HCD_DEAD(hcd))
+ device_set_wakeup_enable(dev, 0);
+ dev_dbg(dev, "wakeup: %d\n", device_may_wakeup(dev));
+
+diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
+index e935f71..c34a935 100644
+--- a/drivers/usb/core/hcd.c
++++ b/drivers/usb/core/hcd.c
+@@ -983,7 +983,7 @@ static int register_root_hub(struct usb_hcd *hcd)
+ spin_unlock_irq (&hcd_root_hub_lock);
+
+ /* Did the HC die before the root hub was registered? */
+- if (hcd->state == HC_STATE_HALT)
++ if (HCD_DEAD(hcd) || hcd->state == HC_STATE_HALT)
+ usb_hc_died (hcd); /* This time clean up */
+ }
+
+@@ -1089,13 +1089,10 @@ int usb_hcd_link_urb_to_ep(struct usb_hcd *hcd, struct urb *urb)
+ * Check the host controller's state and add the URB to the
+ * endpoint's queue.
+ */
+- switch (hcd->state) {
+- case HC_STATE_RUNNING:
+- case HC_STATE_RESUMING:
++ if (HCD_RH_RUNNING(hcd)) {
+ urb->unlinked = 0;
+ list_add_tail(&urb->urb_list, &urb->ep->urb_list);
+- break;
+- default:
++ } else {
+ rc = -ESHUTDOWN;
+ goto done;
+ }
+@@ -1913,7 +1910,7 @@ int usb_hcd_get_frame_number (struct usb_device *udev)
+ {
+ struct usb_hcd *hcd = bus_to_hcd(udev->bus);
+
+- if (!HC_IS_RUNNING (hcd->state))
++ if (!HCD_RH_RUNNING(hcd))
+ return -ESHUTDOWN;
+ return hcd->driver->get_frame_number (hcd);
+ }
+@@ -1930,9 +1927,15 @@ int hcd_bus_suspend(struct usb_device *rhdev, pm_message_t msg)
+
+ dev_dbg(&rhdev->dev, "bus %s%s\n",
+ (msg.event & PM_EVENT_AUTO ? "auto-" : ""), "suspend");
++ if (HCD_DEAD(hcd)) {
++ dev_dbg(&rhdev->dev, "skipped %s of dead bus\n", "suspend");
++ return 0;
++ }
++
+ if (!hcd->driver->bus_suspend) {
+ status = -ENOENT;
+ } else {
++ clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
+ hcd->state = HC_STATE_QUIESCING;
+ status = hcd->driver->bus_suspend(hcd);
+ }
+@@ -1940,7 +1943,12 @@ int hcd_bus_suspend(struct usb_device *rhdev, pm_message_t msg)
+ usb_set_device_state(rhdev, USB_STATE_SUSPENDED);
+ hcd->state = HC_STATE_SUSPENDED;
+ } else {
+- hcd->state = old_state;
++ spin_lock_irq(&hcd_root_hub_lock);
++ if (!HCD_DEAD(hcd)) {
++ set_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
++ hcd->state = old_state;
++ }
++ spin_unlock_irq(&hcd_root_hub_lock);
+ dev_dbg(&rhdev->dev, "bus %s fail, err %d\n",
+ "suspend", status);
+ }
+@@ -1955,9 +1963,13 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg)
+
+ dev_dbg(&rhdev->dev, "usb %s%s\n",
+ (msg.event & PM_EVENT_AUTO ? "auto-" : ""), "resume");
++ if (HCD_DEAD(hcd)) {
++ dev_dbg(&rhdev->dev, "skipped %s of dead bus\n", "resume");
++ return 0;
++ }
+ if (!hcd->driver->bus_resume)
+ return -ENOENT;
+- if (hcd->state == HC_STATE_RUNNING)
++ if (HCD_RH_RUNNING(hcd))
+ return 0;
+
+ hcd->state = HC_STATE_RESUMING;
+@@ -1966,10 +1978,15 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg)
+ if (status == 0) {
+ /* TRSMRCY = 10 msec */
+ msleep(10);
+- usb_set_device_state(rhdev, rhdev->actconfig
+- ? USB_STATE_CONFIGURED
+- : USB_STATE_ADDRESS);
+- hcd->state = HC_STATE_RUNNING;
++ spin_lock_irq(&hcd_root_hub_lock);
++ if (!HCD_DEAD(hcd)) {
++ usb_set_device_state(rhdev, rhdev->actconfig
++ ? USB_STATE_CONFIGURED
++ : USB_STATE_ADDRESS);
++ set_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
++ hcd->state = HC_STATE_RUNNING;
++ }
++ spin_unlock_irq(&hcd_root_hub_lock);
+ } else {
+ hcd->state = old_state;
+ dev_dbg(&rhdev->dev, "bus %s fail, err %d\n",
+@@ -2080,7 +2097,7 @@ irqreturn_t usb_hcd_irq (int irq, void *__hcd)
+ */
+ local_irq_save(flags);
+
+- if (unlikely(hcd->state == HC_STATE_HALT || !HCD_HW_ACCESSIBLE(hcd))) {
++ if (unlikely(HCD_DEAD(hcd) || !HCD_HW_ACCESSIBLE(hcd))) {
+ rc = IRQ_NONE;
+ } else if (hcd->driver->irq(hcd) == IRQ_NONE) {
+ rc = IRQ_NONE;
+@@ -2114,6 +2131,8 @@ void usb_hc_died (struct usb_hcd *hcd)
+ dev_err (hcd->self.controller, "HC died; cleaning up\n");
+
+ spin_lock_irqsave (&hcd_root_hub_lock, flags);
++ clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
++ set_bit(HCD_FLAG_DEAD, &hcd->flags);
+ if (hcd->rh_registered) {
+ clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);
+
+@@ -2256,6 +2275,12 @@ int usb_add_hcd(struct usb_hcd *hcd,
+ */
+ device_init_wakeup(&rhdev->dev, 1);
+
++ /* HCD_FLAG_RH_RUNNING doesn't matter until the root hub is
++ * registered. But since the controller can die at any time,
++ * let's initialize the flag before touching the hardware.
++ */
++ set_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
++
+ /* "reset" is misnamed; its role is now one-time init. the controller
+ * should already have been reset (and boot firmware kicked off etc).
+ */
+@@ -2323,6 +2348,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
+ return retval;
+
+ error_create_attr_group:
++ clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
+ if (HC_IS_RUNNING(hcd->state))
+ hcd->state = HC_STATE_QUIESCING;
+ spin_lock_irq(&hcd_root_hub_lock);
+@@ -2375,6 +2401,7 @@ void usb_remove_hcd(struct usb_hcd *hcd)
+ usb_get_dev(rhdev);
+ sysfs_remove_group(&rhdev->dev.kobj, &usb_bus_attr_group);
+
++ clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
+ if (HC_IS_RUNNING (hcd->state))
+ hcd->state = HC_STATE_QUIESCING;
+
+diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
+index c14fc08..ae334b0 100644
+--- a/drivers/usb/core/urb.c
++++ b/drivers/usb/core/urb.c
+@@ -366,7 +366,16 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
+ if (xfertype == USB_ENDPOINT_XFER_ISOC) {
+ int n, len;
+
+- /* FIXME SuperSpeed isoc endpoints have up to 16 bursts */
++ /* SuperSpeed isoc endpoints have up to 16 bursts of up to
++ * 3 packets each
++ */
++ if (dev->speed == USB_SPEED_SUPER) {
++ int burst = 1 + ep->ss_ep_comp.bMaxBurst;
++ int mult = USB_SS_MULT(ep->ss_ep_comp.bmAttributes);
++ max *= burst;
++ max *= mult;
++ }
++
+ /* "high bandwidth" mode, 1-3 packets/uframe? */
+ if (dev->speed == USB_SPEED_HIGH) {
+ int mult = 1 + ((max >> 11) & 0x03);
+diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
+index 8a515f0..72ae77c 100644
+--- a/drivers/usb/host/ehci-hub.c
++++ b/drivers/usb/host/ehci-hub.c
+@@ -106,6 +106,27 @@ static void ehci_handover_companion_ports(struct ehci_hcd *ehci)
+ ehci->owned_ports = 0;
+ }
+
++static int ehci_port_change(struct ehci_hcd *ehci)
++{
++ int i = HCS_N_PORTS(ehci->hcs_params);
++
++ /* First check if the controller indicates a change event */
++
++ if (ehci_readl(ehci, &ehci->regs->status) & STS_PCD)
++ return 1;
++
++ /*
++ * Not all controllers appear to update this while going from D3 to D0,
++ * so check the individual port status registers as well
++ */
++
++ while (i--)
++ if (ehci_readl(ehci, &ehci->regs->port_status[i]) & PORT_CSC)
++ return 1;
++
++ return 0;
++}
++
+ static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
+ bool suspending, bool do_wakeup)
+ {
+@@ -173,7 +194,7 @@ static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
+ }
+
+ /* Does the root hub have a port wakeup pending? */
+- if (!suspending && (ehci_readl(ehci, &ehci->regs->status) & STS_PCD))
++ if (!suspending && ehci_port_change(ehci))
+ usb_hcd_resume_root_hub(ehci_to_hcd(ehci));
+
+ spin_unlock_irqrestore(&ehci->lock, flags);
+diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
+index bdba8c5..c470cc8 100644
+--- a/drivers/usb/host/isp1760-hcd.c
++++ b/drivers/usb/host/isp1760-hcd.c
+@@ -33,6 +33,7 @@ struct isp1760_hcd {
+ struct inter_packet_info atl_ints[32];
+ struct inter_packet_info int_ints[32];
+ struct memory_chunk memory_pool[BLOCKS];
++ u32 atl_queued;
+
+ /* periodic schedule support */
+ #define DEFAULT_I_TDPS 1024
+@@ -850,6 +851,11 @@ static void enqueue_an_ATL_packet(struct usb_hcd *hcd, struct isp1760_qh *qh,
+ skip_map &= ~queue_entry;
+ isp1760_writel(skip_map, hcd->regs + HC_ATL_PTD_SKIPMAP_REG);
+
++ priv->atl_queued++;
++ if (priv->atl_queued == 2)
++ isp1760_writel(INTERRUPT_ENABLE_SOT_MASK,
++ hcd->regs + HC_INTERRUPT_ENABLE);
++
+ buffstatus = isp1760_readl(hcd->regs + HC_BUFFER_STATUS_REG);
+ buffstatus |= ATL_BUFFER;
+ isp1760_writel(buffstatus, hcd->regs + HC_BUFFER_STATUS_REG);
+@@ -992,6 +998,7 @@ static void do_atl_int(struct usb_hcd *usb_hcd)
+ u32 dw3;
+
+ status = 0;
++ priv->atl_queued--;
+
+ queue_entry = __ffs(done_map);
+ done_map &= ~(1 << queue_entry);
+@@ -1054,11 +1061,6 @@ static void do_atl_int(struct usb_hcd *usb_hcd)
+ * device is not able to send data fast enough.
+ * This happens mostly on slower hardware.
+ */
+- printk(KERN_NOTICE "Reloading ptd %p/%p... qh %p read: "
+- "%d of %zu done: %08x cur: %08x\n", qtd,
+- urb, qh, PTD_XFERRED_LENGTH(dw3),
+- qtd->length, done_map,
+- (1 << queue_entry));
+
+ /* RL counter = ERR counter */
+ dw3 &= ~(0xf << 19);
+@@ -1086,6 +1088,11 @@ static void do_atl_int(struct usb_hcd *usb_hcd)
+ priv_write_copy(priv, (u32 *)&ptd, usb_hcd->regs +
+ atl_regs, sizeof(ptd));
+
++ priv->atl_queued++;
++ if (priv->atl_queued == 2)
++ isp1760_writel(INTERRUPT_ENABLE_SOT_MASK,
++ usb_hcd->regs + HC_INTERRUPT_ENABLE);
++
+ buffstatus = isp1760_readl(usb_hcd->regs +
+ HC_BUFFER_STATUS_REG);
+ buffstatus |= ATL_BUFFER;
+@@ -1191,6 +1198,9 @@ static void do_atl_int(struct usb_hcd *usb_hcd)
+ skip_map = isp1760_readl(usb_hcd->regs +
+ HC_ATL_PTD_SKIPMAP_REG);
+ }
++ if (priv->atl_queued <= 1)
++ isp1760_writel(INTERRUPT_ENABLE_MASK,
++ usb_hcd->regs + HC_INTERRUPT_ENABLE);
+ }
+
+ static void do_intl_int(struct usb_hcd *usb_hcd)
+@@ -1770,7 +1780,7 @@ static irqreturn_t isp1760_irq(struct usb_hcd *usb_hcd)
+ goto leave;
+
+ isp1760_writel(imask, usb_hcd->regs + HC_INTERRUPT_REG);
+- if (imask & HC_ATL_INT)
++ if (imask & (HC_ATL_INT | HC_SOT_INT))
+ do_atl_int(usb_hcd);
+
+ if (imask & HC_INTL_INT)
+diff --git a/drivers/usb/host/isp1760-hcd.h b/drivers/usb/host/isp1760-hcd.h
+index 6931ef5..612bce5 100644
+--- a/drivers/usb/host/isp1760-hcd.h
++++ b/drivers/usb/host/isp1760-hcd.h
+@@ -69,6 +69,7 @@ void deinit_kmem_cache(void);
+
+ #define HC_INTERRUPT_ENABLE 0x314
+ #define INTERRUPT_ENABLE_MASK (HC_INTL_INT | HC_ATL_INT | HC_EOT_INT)
++#define INTERRUPT_ENABLE_SOT_MASK (HC_INTL_INT | HC_SOT_INT | HC_EOT_INT)
+
+ #define HC_ISO_INT (1 << 9)
+ #define HC_ATL_INT (1 << 8)
+diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
+index 3289bf4..d3f0406 100644
+--- a/drivers/usb/host/xhci-ring.c
++++ b/drivers/usb/host/xhci-ring.c
+@@ -500,15 +500,26 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,
+ state->new_cycle_state = ~(state->new_cycle_state) & 0x1;
+ next_trb(xhci, ep_ring, &state->new_deq_seg, &state->new_deq_ptr);
+
++ /*
++ * If there is only one segment in a ring, find_trb_seg()'s while loop
++ * will not run, and it will return before it has a chance to see if it
++ * needs to toggle the cycle bit. It can't tell if the stalled transfer
++ * ended just before the link TRB on a one-segment ring, or if the TD
++ * wrapped around the top of the ring, because it doesn't have the TD in
++ * question. Look for the one-segment case where stalled TRB's address
++ * is greater than the new dequeue pointer address.
++ */
++ if (ep_ring->first_seg == ep_ring->first_seg->next &&
++ state->new_deq_ptr < dev->eps[ep_index].stopped_trb)
++ state->new_cycle_state ^= 0x1;
++ xhci_dbg(xhci, "Cycle state = 0x%x\n", state->new_cycle_state);
++
+ /* Don't update the ring cycle state for the producer (us). */
+ xhci_dbg(xhci, "New dequeue segment = %p (virtual)\n",
+ state->new_deq_seg);
+ addr = xhci_trb_virt_to_dma(state->new_deq_seg, state->new_deq_ptr);
+ xhci_dbg(xhci, "New dequeue pointer = 0x%llx (DMA)\n",
+ (unsigned long long) addr);
+- xhci_dbg(xhci, "Setting dequeue pointer in internal ring state.\n");
+- ep_ring->dequeue = state->new_deq_ptr;
+- ep_ring->deq_seg = state->new_deq_seg;
+ }
+
+ static void td_to_noop(struct xhci_hcd *xhci, struct xhci_ring *ep_ring,
+@@ -951,9 +962,26 @@ static void handle_set_deq_completion(struct xhci_hcd *xhci,
+ } else {
+ xhci_dbg(xhci, "Successful Set TR Deq Ptr cmd, deq = @%08llx\n",
+ ep_ctx->deq);
++ if (xhci_trb_virt_to_dma(dev->eps[ep_index].queued_deq_seg,
++ dev->eps[ep_index].queued_deq_ptr) ==
++ (ep_ctx->deq & ~(EP_CTX_CYCLE_MASK))) {
++ /* Update the ring's dequeue segment and dequeue pointer
++ * to reflect the new position.
++ */
++ ep_ring->deq_seg = dev->eps[ep_index].queued_deq_seg;
++ ep_ring->dequeue = dev->eps[ep_index].queued_deq_ptr;
++ } else {
++ xhci_warn(xhci, "Mismatch between completed Set TR Deq "
++ "Ptr command & xHCI internal state.\n");
++ xhci_warn(xhci, "ep deq seg = %p, deq ptr = %p\n",
++ dev->eps[ep_index].queued_deq_seg,
++ dev->eps[ep_index].queued_deq_ptr);
++ }
+ }
+
+ dev->eps[ep_index].ep_state &= ~SET_DEQ_PENDING;
++ dev->eps[ep_index].queued_deq_seg = NULL;
++ dev->eps[ep_index].queued_deq_ptr = NULL;
+ /* Restart any rings with pending URBs */
+ ring_doorbell_for_active_rings(xhci, slot_id, ep_index);
+ }
+@@ -3229,6 +3257,7 @@ static int queue_set_tr_deq(struct xhci_hcd *xhci, int slot_id,
+ u32 trb_ep_index = EP_ID_FOR_TRB(ep_index);
+ u32 trb_stream_id = STREAM_ID_FOR_TRB(stream_id);
+ u32 type = TRB_TYPE(TRB_SET_DEQ);
++ struct xhci_virt_ep *ep;
+
+ addr = xhci_trb_virt_to_dma(deq_seg, deq_ptr);
+ if (addr == 0) {
+@@ -3237,6 +3266,14 @@ static int queue_set_tr_deq(struct xhci_hcd *xhci, int slot_id,
+ deq_seg, deq_ptr);
+ return 0;
+ }
++ ep = &xhci->devs[slot_id]->eps[ep_index];
++ if ((ep->ep_state & SET_DEQ_PENDING)) {
++ xhci_warn(xhci, "WARN Cannot submit Set TR Deq Ptr\n");
++ xhci_warn(xhci, "A Set TR Deq Ptr command is pending.\n");
++ return 0;
++ }
++ ep->queued_deq_seg = deq_seg;
++ ep->queued_deq_ptr = deq_ptr;
+ return queue_command(xhci, lower_32_bits(addr) | cycle_state,
+ upper_32_bits(addr), trb_stream_id,
+ trb_slot_id | trb_ep_index | type, false);
+diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
+index 7f127df..62bc1bc 100644
+--- a/drivers/usb/host/xhci.h
++++ b/drivers/usb/host/xhci.h
+@@ -644,6 +644,9 @@ struct xhci_ep_ctx {
+ #define AVG_TRB_LENGTH_FOR_EP(p) ((p) & 0xffff)
+ #define MAX_ESIT_PAYLOAD_FOR_EP(p) (((p) & 0xffff) << 16)
+
++/* deq bitmasks */
++#define EP_CTX_CYCLE_MASK (1 << 0)
++
+
+ /**
+ * struct xhci_input_control_context
+@@ -746,6 +749,12 @@ struct xhci_virt_ep {
+ struct timer_list stop_cmd_timer;
+ int stop_cmds_pending;
+ struct xhci_hcd *xhci;
++ /* Dequeue pointer and dequeue segment for a submitted Set TR Dequeue
++ * command. We'll need to update the ring's dequeue segment and dequeue
++ * pointer after the command completes.
++ */
++ struct xhci_segment *queued_deq_seg;
++ union xhci_trb *queued_deq_ptr;
+ /*
+ * Sometimes the xHC can not process isochronous endpoint ring quickly
+ * enough, and it will miss some isoc tds on the ring and generate
+diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
+index 7b8815d..14ac87e 100644
+--- a/drivers/usb/serial/ch341.c
++++ b/drivers/usb/serial/ch341.c
+@@ -75,6 +75,7 @@ static int debug;
+ static const struct usb_device_id id_table[] = {
+ { USB_DEVICE(0x4348, 0x5523) },
+ { USB_DEVICE(0x1a86, 0x7523) },
++ { USB_DEVICE(0x1a86, 0x5523) },
+ { },
+ };
+ MODULE_DEVICE_TABLE(usb, id_table);
+diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
+index bd5bd85..b382d9a 100644
+--- a/drivers/usb/serial/kobil_sct.c
++++ b/drivers/usb/serial/kobil_sct.c
+@@ -372,7 +372,7 @@ static void kobil_read_int_callback(struct urb *urb)
+ }
+
+ tty = tty_port_tty_get(&port->port);
+- if (urb->actual_length) {
++ if (tty && urb->actual_length) {
+
+ /* BEGIN DEBUG */
+ /*
+diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
+index 5f46838..75c7f45 100644
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -652,7 +652,8 @@ static const struct usb_device_id option_ids[] = {
+ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0028, 0xff, 0xff, 0xff) },
+ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0029, 0xff, 0xff, 0xff) },
+ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0030, 0xff, 0xff, 0xff) },
+- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626, 0xff, 0xff, 0xff) },
++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626, 0xff,
++ 0xff, 0xff), .driver_info = (kernel_ulong_t)&four_g_w14_blacklist },
+ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0032, 0xff, 0xff, 0xff) },
+ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0033, 0xff, 0xff, 0xff) },
+ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0034, 0xff, 0xff, 0xff) },
+diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
+index 546a521..2ff90a9 100644
+--- a/drivers/usb/serial/usb-serial.c
++++ b/drivers/usb/serial/usb-serial.c
+@@ -911,9 +911,8 @@ int usb_serial_probe(struct usb_interface *interface,
+ dev_err(&interface->dev, "No free urbs available\n");
+ goto probe_error;
+ }
+- buffer_size = serial->type->bulk_in_size;
+- if (!buffer_size)
+- buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
++ buffer_size = max_t(int, serial->type->bulk_in_size,
++ le16_to_cpu(endpoint->wMaxPacketSize));
+ port->bulk_in_size = buffer_size;
+ port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
+ port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
+diff --git a/fs/dcache.c b/fs/dcache.c
+index 611ffe9..a39fe47 100644
+--- a/fs/dcache.c
++++ b/fs/dcache.c
+@@ -296,8 +296,12 @@ static struct dentry *d_kill(struct dentry *dentry, struct dentry *parent)
+ __releases(parent->d_lock)
+ __releases(dentry->d_inode->i_lock)
+ {
+- dentry->d_parent = NULL;
+ list_del(&dentry->d_u.d_child);
++ /*
++ * Inform try_to_ascend() that we are no longer attached to the
++ * dentry tree
++ */
++ dentry->d_flags |= DCACHE_DISCONNECTED;
+ if (parent)
+ spin_unlock(&parent->d_lock);
+ dentry_iput(dentry);
+@@ -1012,6 +1016,35 @@ void shrink_dcache_for_umount(struct super_block *sb)
+ }
+
+ /*
++ * This tries to ascend one level of parenthood, but
++ * we can race with renaming, so we need to re-check
++ * the parenthood after dropping the lock and check
++ * that the sequence number still matches.
++ */
++static struct dentry *try_to_ascend(struct dentry *old, int locked, unsigned seq)
++{
++ struct dentry *new = old->d_parent;
++
++ rcu_read_lock();
++ spin_unlock(&old->d_lock);
++ spin_lock(&new->d_lock);
++
++ /*
++ * might go back up the wrong parent if we have had a rename
++ * or deletion
++ */
++ if (new != old->d_parent ||
++ (old->d_flags & DCACHE_DISCONNECTED) ||
++ (!locked && read_seqretry(&rename_lock, seq))) {
++ spin_unlock(&new->d_lock);
++ new = NULL;
++ }
++ rcu_read_unlock();
++ return new;
++}
++
++
++/*
+ * Search for at least 1 mount point in the dentry's subdirs.
+ * We descend to the next level whenever the d_subdirs
+ * list is non-empty and continue searching.
+@@ -1066,24 +1099,10 @@ resume:
+ * All done at this level ... ascend and resume the search.
+ */
+ if (this_parent != parent) {
+- struct dentry *tmp;
+- struct dentry *child;
+-
+- tmp = this_parent->d_parent;
+- rcu_read_lock();
+- spin_unlock(&this_parent->d_lock);
+- child = this_parent;
+- this_parent = tmp;
+- spin_lock(&this_parent->d_lock);
+- /* might go back up the wrong parent if we have had a rename
+- * or deletion */
+- if (this_parent != child->d_parent ||
+- (!locked && read_seqretry(&rename_lock, seq))) {
+- spin_unlock(&this_parent->d_lock);
+- rcu_read_unlock();
++ struct dentry *child = this_parent;
++ this_parent = try_to_ascend(this_parent, locked, seq);
++ if (!this_parent)
+ goto rename_retry;
+- }
+- rcu_read_unlock();
+ next = child->d_u.d_child.next;
+ goto resume;
+ }
+@@ -1181,24 +1200,10 @@ resume:
+ * All done at this level ... ascend and resume the search.
+ */
+ if (this_parent != parent) {
+- struct dentry *tmp;
+- struct dentry *child;
+-
+- tmp = this_parent->d_parent;
+- rcu_read_lock();
+- spin_unlock(&this_parent->d_lock);
+- child = this_parent;
+- this_parent = tmp;
+- spin_lock(&this_parent->d_lock);
+- /* might go back up the wrong parent if we have had a rename
+- * or deletion */
+- if (this_parent != child->d_parent ||
+- (!locked && read_seqretry(&rename_lock, seq))) {
+- spin_unlock(&this_parent->d_lock);
+- rcu_read_unlock();
++ struct dentry *child = this_parent;
++ this_parent = try_to_ascend(this_parent, locked, seq);
++ if (!this_parent)
+ goto rename_retry;
+- }
+- rcu_read_unlock();
+ next = child->d_u.d_child.next;
+ goto resume;
+ }
+@@ -2942,28 +2947,14 @@ resume:
+ spin_unlock(&dentry->d_lock);
+ }
+ if (this_parent != root) {
+- struct dentry *tmp;
+- struct dentry *child;
+-
+- tmp = this_parent->d_parent;
++ struct dentry *child = this_parent;
+ if (!(this_parent->d_flags & DCACHE_GENOCIDE)) {
+ this_parent->d_flags |= DCACHE_GENOCIDE;
+ this_parent->d_count--;
+ }
+- rcu_read_lock();
+- spin_unlock(&this_parent->d_lock);
+- child = this_parent;
+- this_parent = tmp;
+- spin_lock(&this_parent->d_lock);
+- /* might go back up the wrong parent if we have had a rename
+- * or deletion */
+- if (this_parent != child->d_parent ||
+- (!locked && read_seqretry(&rename_lock, seq))) {
+- spin_unlock(&this_parent->d_lock);
+- rcu_read_unlock();
++ this_parent = try_to_ascend(this_parent, locked, seq);
++ if (!this_parent)
+ goto rename_retry;
+- }
+- rcu_read_unlock();
+ next = child->d_u.d_child.next;
+ goto resume;
+ }
+diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
+index b27ba71..75c968e 100644
+--- a/fs/ext3/namei.c
++++ b/fs/ext3/namei.c
+@@ -1540,8 +1540,8 @@ static int ext3_dx_add_entry(handle_t *handle, struct dentry *dentry,
+ goto cleanup;
+ node2 = (struct dx_node *)(bh2->b_data);
+ entries2 = node2->entries;
++ memset(&node2->fake, 0, sizeof(struct fake_dirent));
+ node2->fake.rec_len = ext3_rec_len_to_disk(sb->s_blocksize);
+- node2->fake.inode = 0;
+ BUFFER_TRACE(frame->bh, "get_write_access");
+ err = ext3_journal_get_write_access(handle, frame->bh);
+ if (err)
+diff --git a/fs/partitions/osf.c b/fs/partitions/osf.c
+index be03a0b..764b86a 100644
+--- a/fs/partitions/osf.c
++++ b/fs/partitions/osf.c
+@@ -10,7 +10,7 @@
+ #include "check.h"
+ #include "osf.h"
+
+-#define MAX_OSF_PARTITIONS 8
++#define MAX_OSF_PARTITIONS 18
+
+ int osf_partition(struct parsed_partitions *state)
+ {
+diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
+index dcd6a7c..ca29e03 100644
+--- a/include/linux/ftrace.h
++++ b/include/linux/ftrace.h
+@@ -428,6 +428,7 @@ extern void unregister_ftrace_graph(void);
+
+ extern void ftrace_graph_init_task(struct task_struct *t);
+ extern void ftrace_graph_exit_task(struct task_struct *t);
++extern void ftrace_graph_init_idle_task(struct task_struct *t, int cpu);
+
+ static inline int task_curr_ret_stack(struct task_struct *t)
+ {
+@@ -451,6 +452,7 @@ static inline void unpause_graph_tracing(void)
+
+ static inline void ftrace_graph_init_task(struct task_struct *t) { }
+ static inline void ftrace_graph_exit_task(struct task_struct *t) { }
++static inline void ftrace_graph_init_idle_task(struct task_struct *t, int cpu) { }
+
+ static inline int register_ftrace_graph(trace_func_graph_ret_t retfunc,
+ trace_func_graph_ent_t entryfunc)
+diff --git a/include/linux/hid.h b/include/linux/hid.h
+index d91c25e..fc5faf6 100644
+--- a/include/linux/hid.h
++++ b/include/linux/hid.h
+@@ -638,7 +638,7 @@ struct hid_driver {
+ struct hid_input *hidinput, struct hid_field *field,
+ struct hid_usage *usage, unsigned long **bit, int *max);
+ void (*feature_mapping)(struct hid_device *hdev,
+- struct hid_input *hidinput, struct hid_field *field,
++ struct hid_field *field,
+ struct hid_usage *usage);
+ #ifdef CONFIG_PM
+ int (*suspend)(struct hid_device *hdev, pm_message_t message);
+diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
+index ab46194..76d896c 100644
+--- a/include/linux/usb/ch9.h
++++ b/include/linux/usb/ch9.h
+@@ -585,6 +585,8 @@ struct usb_ss_ep_comp_descriptor {
+ #define USB_DT_SS_EP_COMP_SIZE 6
+ /* Bits 4:0 of bmAttributes if this is a bulk endpoint */
+ #define USB_SS_MAX_STREAMS(p) (1 << (p & 0x1f))
++/* Bits 1:0 of bmAttributes if this is an isoc endpoint */
++#define USB_SS_MULT(p) (1 + ((p) & 0x3))
+
+ /*-------------------------------------------------------------------------*/
+
+diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
+index a854fe8..f21f599 100644
+--- a/include/linux/usb/hcd.h
++++ b/include/linux/usb/hcd.h
+@@ -99,6 +99,8 @@ struct usb_hcd {
+ #define HCD_FLAG_POLL_RH 2 /* poll for rh status? */
+ #define HCD_FLAG_POLL_PENDING 3 /* status has changed? */
+ #define HCD_FLAG_WAKEUP_PENDING 4 /* root hub is resuming? */
++#define HCD_FLAG_RH_RUNNING 5 /* root hub is running? */
++#define HCD_FLAG_DEAD 6 /* controller has died? */
+
+ /* The flags can be tested using these macros; they are likely to
+ * be slightly faster than test_bit().
+@@ -108,6 +110,8 @@ struct usb_hcd {
+ #define HCD_POLL_RH(hcd) ((hcd)->flags & (1U << HCD_FLAG_POLL_RH))
+ #define HCD_POLL_PENDING(hcd) ((hcd)->flags & (1U << HCD_FLAG_POLL_PENDING))
+ #define HCD_WAKEUP_PENDING(hcd) ((hcd)->flags & (1U << HCD_FLAG_WAKEUP_PENDING))
++#define HCD_RH_RUNNING(hcd) ((hcd)->flags & (1U << HCD_FLAG_RH_RUNNING))
++#define HCD_DEAD(hcd) ((hcd)->flags & (1U << HCD_FLAG_DEAD))
+
+ /* Flags that get set only during HCD registration or removal. */
+ unsigned rh_registered:1;/* is root hub registered? */
+diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
+index c904913..45f3b9d 100644
+--- a/include/linux/usb/serial.h
++++ b/include/linux/usb/serial.h
+@@ -191,7 +191,8 @@ static inline void usb_set_serial_data(struct usb_serial *serial, void *data)
+ * @id_table: pointer to a list of usb_device_id structures that define all
+ * of the devices this structure can support.
+ * @num_ports: the number of different ports this device will have.
+- * @bulk_in_size: bytes to allocate for bulk-in buffer (0 = end-point size)
++ * @bulk_in_size: minimum number of bytes to allocate for bulk-in buffer
++ * (0 = end-point size)
+ * @bulk_out_size: bytes to allocate for bulk-out buffer (0 = end-point size)
+ * @calc_num_ports: pointer to a function to determine how many ports this
+ * device has dynamically. It will be called after the probe()
+diff --git a/kernel/perf_event.c b/kernel/perf_event.c
+index 656222f..b22a2ef 100644
+--- a/kernel/perf_event.c
++++ b/kernel/perf_event.c
+@@ -4567,7 +4567,7 @@ static int perf_exclude_event(struct perf_event *event,
+ struct pt_regs *regs)
+ {
+ if (event->hw.state & PERF_HES_STOPPED)
+- return 0;
++ return 1;
+
+ if (regs) {
+ if (event->attr.exclude_user && user_mode(regs))
+@@ -4923,6 +4923,8 @@ static int perf_tp_event_match(struct perf_event *event,
+ struct perf_sample_data *data,
+ struct pt_regs *regs)
+ {
++ if (event->hw.state & PERF_HES_STOPPED)
++ return 0;
+ /*
+ * All tracepoints are from kernel-space.
+ */
+diff --git a/kernel/sched.c b/kernel/sched.c
+index 42eab5a..c164920 100644
+--- a/kernel/sched.c
++++ b/kernel/sched.c
+@@ -5572,7 +5572,7 @@ void __cpuinit init_idle(struct task_struct *idle, int cpu)
+ * The idle tasks have their own, simple scheduling class:
+ */
+ idle->sched_class = &idle_sched_class;
+- ftrace_graph_init_task(idle);
++ ftrace_graph_init_idle_task(idle, cpu);
+ }
+
+ /*
+diff --git a/kernel/smp.c b/kernel/smp.c
+index 9910744..9545489 100644
+--- a/kernel/smp.c
++++ b/kernel/smp.c
+@@ -450,7 +450,7 @@ void smp_call_function_many(const struct cpumask *mask,
+ {
+ struct call_function_data *data;
+ unsigned long flags;
+- int cpu, next_cpu, this_cpu = smp_processor_id();
++ int refs, cpu, next_cpu, this_cpu = smp_processor_id();
+
+ /*
+ * Can deadlock when called with interrupts disabled.
+@@ -461,7 +461,7 @@ void smp_call_function_many(const struct cpumask *mask,
+ WARN_ON_ONCE(cpu_online(this_cpu) && irqs_disabled()
+ && !oops_in_progress && !early_boot_irqs_disabled);
+
+- /* So, what's a CPU they want? Ignoring this one. */
++ /* Try to fastpath. So, what's a CPU they want? Ignoring this one. */
+ cpu = cpumask_first_and(mask, cpu_online_mask);
+ if (cpu == this_cpu)
+ cpu = cpumask_next_and(cpu, mask, cpu_online_mask);
+@@ -483,22 +483,49 @@ void smp_call_function_many(const struct cpumask *mask,
+
+ data = &__get_cpu_var(cfd_data);
+ csd_lock(&data->csd);
++
++ /* This BUG_ON verifies our reuse assertions and can be removed */
+ BUG_ON(atomic_read(&data->refs) || !cpumask_empty(data->cpumask));
+
++ /*
++ * The global call function queue list add and delete are protected
++ * by a lock, but the list is traversed without any lock, relying
++ * on the rcu list add and delete to allow safe concurrent traversal.
++ * We reuse the call function data without waiting for any grace
++ * period after some other cpu removes it from the global queue.
++ * This means a cpu might find our data block as it is being
++ * filled out.
++ *
++ * We hold off the interrupt handler on the other cpu by
++ * ordering our writes to the cpu mask vs our setting of the
++ * refs counter. We assert only the cpu owning the data block
++ * will set a bit in cpumask, and each bit will only be cleared
++ * by the subject cpu. Each cpu must first find its bit is
++ * set and then check that refs is set indicating the element is
++ * ready to be processed, otherwise it must skip the entry.
++ *
++ * On the previous iteration refs was set to 0 by another cpu.
++ * To avoid the use of transitivity, set the counter to 0 here
++ * so the wmb will pair with the rmb in the interrupt handler.
++ */
++ atomic_set(&data->refs, 0); /* convert 3rd to 1st party write */
++
+ data->csd.func = func;
+ data->csd.info = info;
+- cpumask_and(data->cpumask, mask, cpu_online_mask);
+- cpumask_clear_cpu(this_cpu, data->cpumask);
+
+- /*
+- * To ensure the interrupt handler gets an complete view
+- * we order the cpumask and refs writes and order the read
+- * of them in the interrupt handler. In addition we may
+- * only clear our own cpu bit from the mask.
+- */
++ /* Ensure 0 refs is visible before mask. Also orders func and info */
+ smp_wmb();
+
+- atomic_set(&data->refs, cpumask_weight(data->cpumask));
++ /* We rely on the "and" being processed before the store */
++ cpumask_and(data->cpumask, mask, cpu_online_mask);
++ cpumask_clear_cpu(this_cpu, data->cpumask);
++ refs = cpumask_weight(data->cpumask);
++
++ /* Some callers race with other cpus changing the passed mask */
++ if (unlikely(!refs)) {
++ csd_unlock(&data->csd);
++ return;
++ }
+
+ raw_spin_lock_irqsave(&call_function.lock, flags);
+ /*
+@@ -507,6 +534,12 @@ void smp_call_function_many(const struct cpumask *mask,
+ * will not miss any other list entries:
+ */
+ list_add_rcu(&data->csd.list, &call_function.queue);
++ /*
++ * We rely on the wmb() in list_add_rcu to complete our writes
++ * to the cpumask before this write to refs, which indicates
++ * data is on the list and is ready to be processed.
++ */
++ atomic_set(&data->refs, refs);
+ raw_spin_unlock_irqrestore(&call_function.lock, flags);
+
+ /*
+diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
+index f3dadae..888b611 100644
+--- a/kernel/trace/ftrace.c
++++ b/kernel/trace/ftrace.c
+@@ -3328,7 +3328,7 @@ static int start_graph_tracing(void)
+ /* The cpu_boot init_task->ret_stack will never be freed */
+ for_each_online_cpu(cpu) {
+ if (!idle_task(cpu)->ret_stack)
+- ftrace_graph_init_task(idle_task(cpu));
++ ftrace_graph_init_idle_task(idle_task(cpu), cpu);
+ }
+
+ do {
+@@ -3418,6 +3418,49 @@ void unregister_ftrace_graph(void)
+ mutex_unlock(&ftrace_lock);
+ }
+
++static DEFINE_PER_CPU(struct ftrace_ret_stack *, idle_ret_stack);
++
++static void
++graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
++{
++ atomic_set(&t->tracing_graph_pause, 0);
++ atomic_set(&t->trace_overrun, 0);
++ t->ftrace_timestamp = 0;
++ /* make curr_ret_stack visable before we add the ret_stack */
++ smp_wmb();
++ t->ret_stack = ret_stack;
++}
++
++/*
++ * Allocate a return stack for the idle task. May be the first
++ * time through, or it may be done by CPU hotplug online.
++ */
++void ftrace_graph_init_idle_task(struct task_struct *t, int cpu)
++{
++ t->curr_ret_stack = -1;
++ /*
++ * The idle task has no parent, it either has its own
++ * stack or no stack at all.
++ */
++ if (t->ret_stack)
++ WARN_ON(t->ret_stack != per_cpu(idle_ret_stack, cpu));
++
++ if (ftrace_graph_active) {
++ struct ftrace_ret_stack *ret_stack;
++
++ ret_stack = per_cpu(idle_ret_stack, cpu);
++ if (!ret_stack) {
++ ret_stack = kmalloc(FTRACE_RETFUNC_DEPTH
++ * sizeof(struct ftrace_ret_stack),
++ GFP_KERNEL);
++ if (!ret_stack)
++ return;
++ per_cpu(idle_ret_stack, cpu) = ret_stack;
++ }
++ graph_init_task(t, ret_stack);
++ }
++}
++
+ /* Allocate a return stack for newly created task */
+ void ftrace_graph_init_task(struct task_struct *t)
+ {
+@@ -3433,12 +3476,7 @@ void ftrace_graph_init_task(struct task_struct *t)
+ GFP_KERNEL);
+ if (!ret_stack)
+ return;
+- atomic_set(&t->tracing_graph_pause, 0);
+- atomic_set(&t->trace_overrun, 0);
+- t->ftrace_timestamp = 0;
+- /* make curr_ret_stack visable before we add the ret_stack */
+- smp_wmb();
+- t->ret_stack = ret_stack;
++ graph_init_task(t, ret_stack);
+ }
+ }
+
+diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
+index 57d344c..35d046b 100644
+--- a/net/sunrpc/clnt.c
++++ b/net/sunrpc/clnt.c
+@@ -436,7 +436,9 @@ void rpc_killall_tasks(struct rpc_clnt *clnt)
+ if (!(rovr->tk_flags & RPC_TASK_KILLED)) {
+ rovr->tk_flags |= RPC_TASK_KILLED;
+ rpc_exit(rovr, -EIO);
+- rpc_wake_up_queued_task(rovr->tk_waitqueue, rovr);
++ if (RPC_IS_QUEUED(rovr))
++ rpc_wake_up_queued_task(rovr->tk_waitqueue,
++ rovr);
+ }
+ }
+ spin_unlock(&clnt->cl_lock);
+diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
+index 59e5994..17c3e3a 100644
+--- a/net/sunrpc/sched.c
++++ b/net/sunrpc/sched.c
+@@ -637,14 +637,12 @@ static void __rpc_execute(struct rpc_task *task)
+ save_callback = task->tk_callback;
+ task->tk_callback = NULL;
+ save_callback(task);
+- }
+-
+- /*
+- * Perform the next FSM step.
+- * tk_action may be NULL when the task has been killed
+- * by someone else.
+- */
+- if (!RPC_IS_QUEUED(task)) {
++ } else {
++ /*
++ * Perform the next FSM step.
++ * tk_action may be NULL when the task has been killed
++ * by someone else.
++ */
+ if (task->tk_action == NULL)
+ break;
+ task->tk_action(task);
+diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c
+index 9d32f18..cb09f1f 100644
+--- a/security/tomoyo/file.c
++++ b/security/tomoyo/file.c
+@@ -927,7 +927,7 @@ int tomoyo_check_open_permission(struct tomoyo_domain_info *domain,
+ struct path *path, const int flag)
+ {
+ const u8 acc_mode = ACC_MODE(flag);
+- int error = -ENOMEM;
++ int error = 0;
+ struct tomoyo_path_info buf;
+ struct tomoyo_request_info r;
+ int idx;
+@@ -938,9 +938,6 @@ int tomoyo_check_open_permission(struct tomoyo_domain_info *domain,
+ buf.name = NULL;
+ r.mode = TOMOYO_CONFIG_DISABLED;
+ idx = tomoyo_read_lock();
+- if (!tomoyo_get_realpath(&buf, path))
+- goto out;
+- error = 0;
+ /*
+ * If the filename is specified by "deny_rewrite" keyword,
+ * we need to check "allow_rewrite" permission when the filename is not
+diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c
+index 12b44b0..a0da775 100644
+--- a/sound/drivers/aloop.c
++++ b/sound/drivers/aloop.c
+@@ -482,8 +482,9 @@ static unsigned int loopback_pos_update(struct loopback_cable *cable)
+ cable->streams[SNDRV_PCM_STREAM_CAPTURE];
+ unsigned long delta_play = 0, delta_capt = 0;
+ unsigned int running;
++ unsigned long flags;
+
+- spin_lock(&cable->lock);
++ spin_lock_irqsave(&cable->lock, flags);
+ running = cable->running ^ cable->pause;
+ if (running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) {
+ delta_play = jiffies - dpcm_play->last_jiffies;
+@@ -495,10 +496,8 @@ static unsigned int loopback_pos_update(struct loopback_cable *cable)
+ dpcm_capt->last_jiffies += delta_capt;
+ }
+
+- if (delta_play == 0 && delta_capt == 0) {
+- spin_unlock(&cable->lock);
+- return running;
+- }
++ if (delta_play == 0 && delta_capt == 0)
++ goto unlock;
+
+ if (delta_play > delta_capt) {
+ loopback_bytepos_update(dpcm_play, delta_play - delta_capt,
+@@ -510,14 +509,14 @@ static unsigned int loopback_pos_update(struct loopback_cable *cable)
+ delta_capt = delta_play;
+ }
+
+- if (delta_play == 0 && delta_capt == 0) {
+- spin_unlock(&cable->lock);
+- return running;
+- }
++ if (delta_play == 0 && delta_capt == 0)
++ goto unlock;
++
+ /* note delta_capt == delta_play at this moment */
+ loopback_bytepos_update(dpcm_capt, delta_capt, BYTEPOS_UPDATE_COPY);
+ loopback_bytepos_update(dpcm_play, delta_play, BYTEPOS_UPDATE_POSONLY);
+- spin_unlock(&cable->lock);
++ unlock:
++ spin_unlock_irqrestore(&cable->lock, flags);
+ return running;
+ }
+
+diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c
+index 22dbd91..448dd01 100644
+--- a/sound/pci/asihpi/hpioctl.c
++++ b/sound/pci/asihpi/hpioctl.c
+@@ -155,6 +155,11 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+ goto out;
+ }
+
++ if (hm->h.adapter_index >= HPI_MAX_ADAPTERS) {
++ err = -EINVAL;
++ goto out;
++ }
++
+ pa = &adapters[hm->h.adapter_index];
+ hr->h.size = 0;
+ if (hm->h.object == HPI_OBJ_SUBSYSTEM) {
+diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
+index 1bff80c..b932154 100644
+--- a/sound/pci/ctxfi/ctatc.c
++++ b/sound/pci/ctxfi/ctatc.c
+@@ -869,7 +869,7 @@ spdif_passthru_playback_setup(struct ct_atc *atc, struct ct_atc_pcm *apcm)
+ mutex_lock(&atc->atc_mutex);
+ dao->ops->get_spos(dao, &status);
+ if (((status >> 24) & IEC958_AES3_CON_FS) != iec958_con_fs) {
+- status &= ((~IEC958_AES3_CON_FS) << 24);
++ status &= ~(IEC958_AES3_CON_FS << 24);
+ status |= (iec958_con_fs << 24);
+ dao->ops->set_spos(dao, status);
+ dao->ops->commit_write(dao);
+diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c
+index af56eb9..47d9ea9 100644
+--- a/sound/pci/ctxfi/ctdaio.c
++++ b/sound/pci/ctxfi/ctdaio.c
+@@ -176,6 +176,7 @@ static int dao_set_left_input(struct dao *dao, struct rsc *input)
+ if (!entry)
+ return -ENOMEM;
+
++ dao->ops->clear_left_input(dao);
+ /* Program master and conjugate resources */
+ input->ops->master(input);
+ daio->rscl.ops->master(&daio->rscl);
+@@ -204,6 +205,7 @@ static int dao_set_right_input(struct dao *dao, struct rsc *input)
+ if (!entry)
+ return -ENOMEM;
+
++ dao->ops->clear_right_input(dao);
+ /* Program master and conjugate resources */
+ input->ops->master(input);
+ daio->rscr.ops->master(&daio->rscr);
+diff --git a/sound/pci/ctxfi/ctmixer.c b/sound/pci/ctxfi/ctmixer.c
+index 15c1e72..c3519ff 100644
+--- a/sound/pci/ctxfi/ctmixer.c
++++ b/sound/pci/ctxfi/ctmixer.c
+@@ -566,19 +566,6 @@ static int ct_spdif_get_mask(struct snd_kcontrol *kcontrol,
+ return 0;
+ }
+
+-static int ct_spdif_default_get(struct snd_kcontrol *kcontrol,
+- struct snd_ctl_elem_value *ucontrol)
+-{
+- unsigned int status = SNDRV_PCM_DEFAULT_CON_SPDIF;
+-
+- ucontrol->value.iec958.status[0] = (status >> 0) & 0xff;
+- ucontrol->value.iec958.status[1] = (status >> 8) & 0xff;
+- ucontrol->value.iec958.status[2] = (status >> 16) & 0xff;
+- ucontrol->value.iec958.status[3] = (status >> 24) & 0xff;
+-
+- return 0;
+-}
+-
+ static int ct_spdif_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+ {
+@@ -586,6 +573,10 @@ static int ct_spdif_get(struct snd_kcontrol *kcontrol,
+ unsigned int status;
+
+ atc->spdif_out_get_status(atc, &status);
++
++ if (status == 0)
++ status = SNDRV_PCM_DEFAULT_CON_SPDIF;
++
+ ucontrol->value.iec958.status[0] = (status >> 0) & 0xff;
+ ucontrol->value.iec958.status[1] = (status >> 8) & 0xff;
+ ucontrol->value.iec958.status[2] = (status >> 16) & 0xff;
+@@ -629,7 +620,7 @@ static struct snd_kcontrol_new iec958_default_ctl = {
+ .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),
+ .count = 1,
+ .info = ct_spdif_info,
+- .get = ct_spdif_default_get,
++ .get = ct_spdif_get,
+ .put = ct_spdif_put,
+ .private_value = MIXER_IEC958_DEFAULT
+ };
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index 4261bb8..acd2099 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -394,6 +394,7 @@ struct alc_spec {
+ /* other flags */
+ unsigned int no_analog :1; /* digital I/O only */
+ unsigned int dual_adc_switch:1; /* switch ADCs (for ALC275) */
++ unsigned int single_input_src:1;
+ int init_amp;
+ int codec_variant; /* flag for other variants */
+
+@@ -3919,6 +3920,8 @@ static struct hda_amp_list alc880_lg_loopbacks[] = {
+ * Common callbacks
+ */
+
++static void alc_init_special_input_src(struct hda_codec *codec);
++
+ static int alc_init(struct hda_codec *codec)
+ {
+ struct alc_spec *spec = codec->spec;
+@@ -3929,6 +3932,7 @@ static int alc_init(struct hda_codec *codec)
+
+ for (i = 0; i < spec->num_init_verbs; i++)
+ snd_hda_sequence_write(codec, spec->init_verbs[i]);
++ alc_init_special_input_src(codec);
+
+ if (spec->init_hook)
+ spec->init_hook(codec);
+@@ -5151,7 +5155,9 @@ static const char *alc_get_line_out_pfx(const struct auto_pin_cfg *cfg,
+
+ switch (cfg->line_out_type) {
+ case AUTO_PIN_SPEAKER_OUT:
+- return "Speaker";
++ if (cfg->line_outs == 1)
++ return "Speaker";
++ break;
+ case AUTO_PIN_HP_OUT:
+ return "Headphone";
+ default:
+@@ -5205,16 +5211,19 @@ static int alc880_auto_create_multi_out_ctls(struct alc_spec *spec,
+ return err;
+ } else {
+ const char *name = pfx;
+- if (!name)
++ int index = i;
++ if (!name) {
+ name = chname[i];
++ index = 0;
++ }
+ err = __add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL,
+- name, i,
++ name, index,
+ HDA_COMPOSE_AMP_VAL(nid, 3, 0,
+ HDA_OUTPUT));
+ if (err < 0)
+ return err;
+ err = __add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE,
+- name, i,
++ name, index,
+ HDA_COMPOSE_AMP_VAL(nid, 3, 2,
+ HDA_INPUT));
+ if (err < 0)
+@@ -5585,6 +5594,7 @@ static void fixup_single_adc(struct hda_codec *codec)
+ spec->capsrc_nids += i;
+ spec->adc_nids += i;
+ spec->num_adc_nids = 1;
++ spec->single_input_src = 1;
+ }
+ }
+
+@@ -5596,6 +5606,16 @@ static void fixup_dual_adc_switch(struct hda_codec *codec)
+ init_capsrc_for_pin(codec, spec->int_mic.pin);
+ }
+
++/* initialize some special cases for input sources */
++static void alc_init_special_input_src(struct hda_codec *codec)
++{
++ struct alc_spec *spec = codec->spec;
++ if (spec->dual_adc_switch)
++ fixup_dual_adc_switch(codec);
++ else if (spec->single_input_src)
++ init_capsrc_for_pin(codec, spec->autocfg.inputs[0].pin);
++}
++
+ static void set_capture_mixer(struct hda_codec *codec)
+ {
+ struct alc_spec *spec = codec->spec;
+@@ -5611,7 +5631,7 @@ static void set_capture_mixer(struct hda_codec *codec)
+ int mux = 0;
+ int num_adcs = spec->num_adc_nids;
+ if (spec->dual_adc_switch)
+- fixup_dual_adc_switch(codec);
++ num_adcs = 1;
+ else if (spec->auto_mic)
+ fixup_automic_adc(codec);
+ else if (spec->input_mux) {
+@@ -5620,8 +5640,6 @@ static void set_capture_mixer(struct hda_codec *codec)
+ else if (spec->input_mux->num_items == 1)
+ fixup_single_adc(codec);
+ }
+- if (spec->dual_adc_switch)
+- num_adcs = 1;
+ spec->cap_mixer = caps[mux][num_adcs - 1];
+ }
+ }
+@@ -10748,6 +10766,7 @@ static struct alc_config_preset alc882_presets[] = {
+ */
+ enum {
+ PINFIX_ABIT_AW9D_MAX,
++ PINFIX_LENOVO_Y530,
+ PINFIX_PB_M5210,
+ PINFIX_ACER_ASPIRE_7736,
+ };
+@@ -10762,6 +10781,14 @@ static const struct alc_fixup alc882_fixups[] = {
+ { }
+ }
+ },
++ [PINFIX_LENOVO_Y530] = {
++ .type = ALC_FIXUP_PINS,
++ .v.pins = (const struct alc_pincfg[]) {
++ { 0x15, 0x99130112 }, /* rear int speakers */
++ { 0x16, 0x99130111 }, /* subwoofer */
++ { }
++ }
++ },
+ [PINFIX_PB_M5210] = {
+ .type = ALC_FIXUP_VERBS,
+ .v.verbs = (const struct hda_verb[]) {
+@@ -10777,6 +10804,7 @@ static const struct alc_fixup alc882_fixups[] = {
+
+ static struct snd_pci_quirk alc882_fixup_tbl[] = {
+ SND_PCI_QUIRK(0x1025, 0x0155, "Packard-Bell M5120", PINFIX_PB_M5210),
++ SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", PINFIX_LENOVO_Y530),
+ SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", PINFIX_ABIT_AW9D_MAX),
+ SND_PCI_QUIRK(0x1025, 0x0296, "Acer Aspire 7736z", PINFIX_ACER_ASPIRE_7736),
+ {}
+@@ -10829,23 +10857,28 @@ static void alc882_auto_init_hp_out(struct hda_codec *codec)
+ hda_nid_t pin, dac;
+ int i;
+
+- for (i = 0; i < ARRAY_SIZE(spec->autocfg.hp_pins); i++) {
+- pin = spec->autocfg.hp_pins[i];
+- if (!pin)
+- break;
+- dac = spec->multiout.hp_nid;
+- if (!dac)
+- dac = spec->multiout.dac_nids[0]; /* to front */
+- alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, dac);
++ if (spec->autocfg.line_out_type != AUTO_PIN_HP_OUT) {
++ for (i = 0; i < ARRAY_SIZE(spec->autocfg.hp_pins); i++) {
++ pin = spec->autocfg.hp_pins[i];
++ if (!pin)
++ break;
++ dac = spec->multiout.hp_nid;
++ if (!dac)
++ dac = spec->multiout.dac_nids[0]; /* to front */
++ alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, dac);
++ }
+ }
+- for (i = 0; i < ARRAY_SIZE(spec->autocfg.speaker_pins); i++) {
+- pin = spec->autocfg.speaker_pins[i];
+- if (!pin)
+- break;
+- dac = spec->multiout.extra_out_nid[0];
+- if (!dac)
+- dac = spec->multiout.dac_nids[0]; /* to front */
+- alc882_auto_set_output_and_unmute(codec, pin, PIN_OUT, dac);
++
++ if (spec->autocfg.line_out_type != AUTO_PIN_SPEAKER_OUT) {
++ for (i = 0; i < ARRAY_SIZE(spec->autocfg.speaker_pins); i++) {
++ pin = spec->autocfg.speaker_pins[i];
++ if (!pin)
++ break;
++ dac = spec->multiout.extra_out_nid[0];
++ if (!dac)
++ dac = spec->multiout.dac_nids[0]; /* to front */
++ alc882_auto_set_output_and_unmute(codec, pin, PIN_OUT, dac);
++ }
+ }
+ }
+
+diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
+index bd7b123..052062d 100644
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -757,7 +757,7 @@ static int stac92xx_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
+ struct sigmatel_spec *spec = codec->spec;
+ unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+ const struct hda_input_mux *imux = spec->input_mux;
+- unsigned int idx, prev_idx;
++ unsigned int idx, prev_idx, didx;
+
+ idx = ucontrol->value.enumerated.item[0];
+ if (idx >= imux->num_items)
+@@ -769,7 +769,8 @@ static int stac92xx_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
+ snd_hda_codec_write_cache(codec, spec->mux_nids[adc_idx], 0,
+ AC_VERB_SET_CONNECT_SEL,
+ imux->items[idx].index);
+- if (prev_idx >= spec->num_analog_muxes) {
++ if (prev_idx >= spec->num_analog_muxes &&
++ spec->mux_nids[adc_idx] != spec->dmux_nids[adc_idx]) {
+ imux = spec->dinput_mux;
+ /* 0 = analog */
+ snd_hda_codec_write_cache(codec,
+@@ -779,9 +780,13 @@ static int stac92xx_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
+ }
+ } else {
+ imux = spec->dinput_mux;
++ /* first dimux item is hardcoded to select analog imux,
++ * so lets skip it
++ */
++ didx = idx - spec->num_analog_muxes + 1;
+ snd_hda_codec_write_cache(codec, spec->dmux_nids[adc_idx], 0,
+ AC_VERB_SET_CONNECT_SEL,
+- imux->items[idx - 1].index);
++ imux->items[didx].index);
+ }
+ spec->cur_mux[adc_idx] = idx;
+ return 1;
+diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
+index 3ceaef6..838a0d5 100644
+--- a/sound/soc/pxa/z2.c
++++ b/sound/soc/pxa/z2.c
+@@ -147,7 +147,7 @@ static int z2_wm8750_init(struct snd_soc_pcm_runtime *rtd)
+ snd_soc_dapm_disable_pin(dapm, "LINPUT3");
+ snd_soc_dapm_disable_pin(dapm, "RINPUT3");
+ snd_soc_dapm_disable_pin(dapm, "OUT3");
+- snd_soc_dapm_disable_pin(dapm, "MONO");
++ snd_soc_dapm_disable_pin(dapm, "MONO1");
+
+ /* Add z2 specific widgets */
+ snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,
+diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN
+index 97d7656..26d4d3f 100755
+--- a/tools/perf/util/PERF-VERSION-GEN
++++ b/tools/perf/util/PERF-VERSION-GEN
+@@ -23,10 +23,10 @@ if test -d ../../.git -o -f ../../.git &&
+ then
+ VN=$(echo "$VN" | sed -e 's/-/./g');
+ else
+- eval `grep '^VERSION\s*=' ../../Makefile|tr -d ' '`
+- eval `grep '^PATCHLEVEL\s*=' ../../Makefile|tr -d ' '`
+- eval `grep '^SUBLEVEL\s*=' ../../Makefile|tr -d ' '`
+- eval `grep '^EXTRAVERSION\s*=' ../../Makefile|tr -d ' '`
++ eval $(grep '^VERSION[[:space:]]*=' ../../Makefile|tr -d ' ')
++ eval $(grep '^PATCHLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ')
++ eval $(grep '^SUBLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ')
++ eval $(grep '^EXTRAVERSION[[:space:]]*=' ../../Makefile|tr -d ' ')
+
+ VN="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}"
+ fi
diff --git a/2.6.38/4420_grsec-2.2.1-2.6.38-test.patch b/2.6.38/4420_grsecurity-2.2.2-2.6.38.1-201103262052.patch
index 5e5da14..a4d647d 100644
--- a/2.6.38/4420_grsec-2.2.1-2.6.38-test.patch
+++ b/2.6.38/4420_grsecurity-2.2.2-2.6.38.1-201103262052.patch
@@ -1,6 +1,6 @@
-diff -urNp linux-2.6.38/arch/alpha/include/asm/dma-mapping.h linux-2.6.38-new/arch/alpha/include/asm/dma-mapping.h
---- linux-2.6.38/arch/alpha/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/alpha/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/alpha/include/asm/dma-mapping.h linux-2.6.38.1/arch/alpha/include/asm/dma-mapping.h
+--- linux-2.6.38.1/arch/alpha/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/alpha/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
@@ -3,9 +3,9 @@
#include <linux/dma-attrs.h>
@@ -13,9 +13,9 @@ diff -urNp linux-2.6.38/arch/alpha/include/asm/dma-mapping.h linux-2.6.38-new/ar
{
return dma_ops;
}
-diff -urNp linux-2.6.38/arch/alpha/include/asm/elf.h linux-2.6.38-new/arch/alpha/include/asm/elf.h
---- linux-2.6.38/arch/alpha/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/alpha/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/alpha/include/asm/elf.h linux-2.6.38.1/arch/alpha/include/asm/elf.h
+--- linux-2.6.38.1/arch/alpha/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/alpha/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
@@ -30,9 +30,9 @@ diff -urNp linux-2.6.38/arch/alpha/include/asm/elf.h linux-2.6.38-new/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.38/arch/alpha/include/asm/pgtable.h linux-2.6.38-new/arch/alpha/include/asm/pgtable.h
---- linux-2.6.38/arch/alpha/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/alpha/include/asm/pgtable.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/alpha/include/asm/pgtable.h linux-2.6.38.1/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.38.1/arch/alpha/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/alpha/include/asm/pgtable.h 2011-03-21 18:31:35.000000000 -0400
@@ -101,6 +101,17 @@ struct vm_area_struct;
#define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
#define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -51,9 +51,9 @@ diff -urNp linux-2.6.38/arch/alpha/include/asm/pgtable.h linux-2.6.38-new/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.38/arch/alpha/kernel/module.c linux-2.6.38-new/arch/alpha/kernel/module.c
---- linux-2.6.38/arch/alpha/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/alpha/kernel/module.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/alpha/kernel/module.c linux-2.6.38.1/arch/alpha/kernel/module.c
+--- linux-2.6.38.1/arch/alpha/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/alpha/kernel/module.c 2011-03-21 18:31:35.000000000 -0400
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -63,9 +63,9 @@ diff -urNp linux-2.6.38/arch/alpha/kernel/module.c linux-2.6.38-new/arch/alpha/k
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.38/arch/alpha/kernel/osf_sys.c linux-2.6.38-new/arch/alpha/kernel/osf_sys.c
---- linux-2.6.38/arch/alpha/kernel/osf_sys.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/alpha/kernel/osf_sys.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/alpha/kernel/osf_sys.c linux-2.6.38.1/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.38.1/arch/alpha/kernel/osf_sys.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/alpha/kernel/osf_sys.c 2011-03-21 18:31:35.000000000 -0400
@@ -1162,7 +1162,7 @@ arch_get_unmapped_area_1(unsigned long a
/* At this point: (!vma || addr < vma->vm_end). */
if (limit - len < addr)
@@ -97,9 +97,9 @@ diff -urNp linux-2.6.38/arch/alpha/kernel/osf_sys.c linux-2.6.38-new/arch/alpha/
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-2.6.38/arch/alpha/kernel/pci_iommu.c linux-2.6.38-new/arch/alpha/kernel/pci_iommu.c
---- linux-2.6.38/arch/alpha/kernel/pci_iommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/alpha/kernel/pci_iommu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/alpha/kernel/pci_iommu.c linux-2.6.38.1/arch/alpha/kernel/pci_iommu.c
+--- linux-2.6.38.1/arch/alpha/kernel/pci_iommu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/alpha/kernel/pci_iommu.c 2011-03-21 18:31:35.000000000 -0400
@@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev
return 0;
}
@@ -116,9 +116,9 @@ diff -urNp linux-2.6.38/arch/alpha/kernel/pci_iommu.c linux-2.6.38-new/arch/alph
-struct dma_map_ops *dma_ops = &alpha_pci_ops;
+const struct dma_map_ops *dma_ops = &alpha_pci_ops;
EXPORT_SYMBOL(dma_ops);
-diff -urNp linux-2.6.38/arch/alpha/kernel/pci-noop.c linux-2.6.38-new/arch/alpha/kernel/pci-noop.c
---- linux-2.6.38/arch/alpha/kernel/pci-noop.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/alpha/kernel/pci-noop.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/alpha/kernel/pci-noop.c linux-2.6.38.1/arch/alpha/kernel/pci-noop.c
+--- linux-2.6.38.1/arch/alpha/kernel/pci-noop.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/alpha/kernel/pci-noop.c 2011-03-21 18:31:35.000000000 -0400
@@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct de
return 0;
}
@@ -137,9 +137,9 @@ diff -urNp linux-2.6.38/arch/alpha/kernel/pci-noop.c linux-2.6.38-new/arch/alpha
EXPORT_SYMBOL(dma_ops);
void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
-diff -urNp linux-2.6.38/arch/alpha/mm/fault.c linux-2.6.38-new/arch/alpha/mm/fault.c
---- linux-2.6.38/arch/alpha/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/alpha/mm/fault.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/alpha/mm/fault.c linux-2.6.38.1/arch/alpha/mm/fault.c
+--- linux-2.6.38.1/arch/alpha/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/alpha/mm/fault.c 2011-03-21 18:31:35.000000000 -0400
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
@@ -296,9 +296,9 @@ diff -urNp linux-2.6.38/arch/alpha/mm/fault.c linux-2.6.38-new/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.38/arch/arm/include/asm/elf.h linux-2.6.38-new/arch/arm/include/asm/elf.h
---- linux-2.6.38/arch/arm/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/arm/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/arm/include/asm/elf.h linux-2.6.38.1/arch/arm/include/asm/elf.h
+--- linux-2.6.38.1/arch/arm/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/arm/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
@@ -115,7 +115,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. */
@@ -326,9 +326,9 @@ diff -urNp linux-2.6.38/arch/arm/include/asm/elf.h linux-2.6.38-new/arch/arm/inc
extern int vectors_user_mapping(void);
#define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES
-diff -urNp linux-2.6.38/arch/arm/include/asm/kmap_types.h linux-2.6.38-new/arch/arm/include/asm/kmap_types.h
---- linux-2.6.38/arch/arm/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/arm/include/asm/kmap_types.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/arm/include/asm/kmap_types.h linux-2.6.38.1/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.38.1/arch/arm/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/arm/include/asm/kmap_types.h 2011-03-21 18:31:35.000000000 -0400
@@ -21,6 +21,7 @@ enum km_type {
KM_L1_CACHE,
KM_L2_CACHE,
@@ -337,9 +337,9 @@ diff -urNp linux-2.6.38/arch/arm/include/asm/kmap_types.h linux-2.6.38-new/arch/
KM_TYPE_NR
};
-diff -urNp linux-2.6.38/arch/arm/include/asm/uaccess.h linux-2.6.38-new/arch/arm/include/asm/uaccess.h
---- linux-2.6.38/arch/arm/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/arm/include/asm/uaccess.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/arm/include/asm/uaccess.h linux-2.6.38.1/arch/arm/include/asm/uaccess.h
+--- linux-2.6.38.1/arch/arm/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/arm/include/asm/uaccess.h 2011-03-21 18:31:35.000000000 -0400
@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -360,9 +360,9 @@ diff -urNp linux-2.6.38/arch/arm/include/asm/uaccess.h linux-2.6.38-new/arch/arm
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
-diff -urNp linux-2.6.38/arch/arm/kernel/kgdb.c linux-2.6.38-new/arch/arm/kernel/kgdb.c
---- linux-2.6.38/arch/arm/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/arm/kernel/kgdb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/arm/kernel/kgdb.c linux-2.6.38.1/arch/arm/kernel/kgdb.c
+--- linux-2.6.38.1/arch/arm/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/arm/kernel/kgdb.c 2011-03-21 18:31:35.000000000 -0400
@@ -246,7 +246,7 @@ void kgdb_arch_exit(void)
* and we handle the normal undef case within the do_undefinstr
* handler.
@@ -372,9 +372,9 @@ diff -urNp linux-2.6.38/arch/arm/kernel/kgdb.c linux-2.6.38-new/arch/arm/kernel/
#ifndef __ARMEB__
.gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
#else /* ! __ARMEB__ */
-diff -urNp linux-2.6.38/arch/arm/kernel/process.c linux-2.6.38-new/arch/arm/kernel/process.c
---- linux-2.6.38/arch/arm/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/arm/kernel/process.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/arm/kernel/process.c linux-2.6.38.1/arch/arm/kernel/process.c
+--- linux-2.6.38.1/arch/arm/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/arm/kernel/process.c 2011-03-21 18:31:35.000000000 -0400
@@ -28,7 +28,6 @@
#include <linux/tick.h>
#include <linux/utsname.h>
@@ -396,9 +396,9 @@ diff -urNp linux-2.6.38/arch/arm/kernel/process.c linux-2.6.38-new/arch/arm/kern
#ifdef CONFIG_MMU
/*
* The vectors page is always readable from user space for the
-diff -urNp linux-2.6.38/arch/arm/mach-msm/last_radio_log.c linux-2.6.38-new/arch/arm/mach-msm/last_radio_log.c
---- linux-2.6.38/arch/arm/mach-msm/last_radio_log.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/arm/mach-msm/last_radio_log.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/arm/mach-msm/last_radio_log.c linux-2.6.38.1/arch/arm/mach-msm/last_radio_log.c
+--- linux-2.6.38.1/arch/arm/mach-msm/last_radio_log.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/arm/mach-msm/last_radio_log.c 2011-03-21 18:31:35.000000000 -0400
@@ -47,7 +47,7 @@ static ssize_t last_radio_log_read(struc
return count;
}
@@ -408,9 +408,9 @@ diff -urNp linux-2.6.38/arch/arm/mach-msm/last_radio_log.c linux-2.6.38-new/arch
.read = last_radio_log_read,
.llseek = default_llseek,
};
-diff -urNp linux-2.6.38/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.38-new/arch/arm/mach-ux500/mbox-db5500.c
---- linux-2.6.38/arch/arm/mach-ux500/mbox-db5500.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/arm/mach-ux500/mbox-db5500.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.38.1/arch/arm/mach-ux500/mbox-db5500.c
+--- linux-2.6.38.1/arch/arm/mach-ux500/mbox-db5500.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/arm/mach-ux500/mbox-db5500.c 2011-03-21 18:31:35.000000000 -0400
@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev
return sprintf(buf, "0x%X\n", mbox_value);
}
@@ -420,9 +420,9 @@ diff -urNp linux-2.6.38/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.38-new/arch/
static int mbox_show(struct seq_file *s, void *data)
{
-diff -urNp linux-2.6.38/arch/arm/mm/fault.c linux-2.6.38-new/arch/arm/mm/fault.c
---- linux-2.6.38/arch/arm/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/arm/mm/fault.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/arm/mm/fault.c linux-2.6.38.1/arch/arm/mm/fault.c
+--- linux-2.6.38.1/arch/arm/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/arm/mm/fault.c 2011-03-21 18:31:35.000000000 -0400
@@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk,
}
#endif
@@ -471,9 +471,9 @@ diff -urNp linux-2.6.38/arch/arm/mm/fault.c linux-2.6.38-new/arch/arm/mm/fault.c
/*
* First Level Translation Fault Handler
*
-diff -urNp linux-2.6.38/arch/arm/mm/mmap.c linux-2.6.38-new/arch/arm/mm/mmap.c
---- linux-2.6.38/arch/arm/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/arm/mm/mmap.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/arm/mm/mmap.c linux-2.6.38.1/arch/arm/mm/mmap.c
+--- linux-2.6.38.1/arch/arm/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/arm/mm/mmap.c 2011-03-21 18:31:35.000000000 -0400
@@ -64,6 +64,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -523,9 +523,9 @@ diff -urNp linux-2.6.38/arch/arm/mm/mmap.c linux-2.6.38-new/arch/arm/mm/mmap.c
/*
* Remember the place where we stopped the search:
*/
-diff -urNp linux-2.6.38/arch/avr32/include/asm/elf.h linux-2.6.38-new/arch/avr32/include/asm/elf.h
---- linux-2.6.38/arch/avr32/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/avr32/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/avr32/include/asm/elf.h linux-2.6.38.1/arch/avr32/include/asm/elf.h
+--- linux-2.6.38.1/arch/avr32/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/avr32/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -542,9 +542,9 @@ diff -urNp linux-2.6.38/arch/avr32/include/asm/elf.h linux-2.6.38-new/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.38/arch/avr32/include/asm/kmap_types.h linux-2.6.38-new/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.38/arch/avr32/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/avr32/include/asm/kmap_types.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/avr32/include/asm/kmap_types.h linux-2.6.38.1/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.38.1/arch/avr32/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/avr32/include/asm/kmap_types.h 2011-03-21 18:31:35.000000000 -0400
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
@@ -555,9 +555,9 @@ diff -urNp linux-2.6.38/arch/avr32/include/asm/kmap_types.h linux-2.6.38-new/arc
};
#undef D
-diff -urNp linux-2.6.38/arch/avr32/mm/fault.c linux-2.6.38-new/arch/avr32/mm/fault.c
---- linux-2.6.38/arch/avr32/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/avr32/mm/fault.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/avr32/mm/fault.c linux-2.6.38.1/arch/avr32/mm/fault.c
+--- linux-2.6.38.1/arch/avr32/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/avr32/mm/fault.c 2011-03-21 18:31:35.000000000 -0400
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -599,9 +599,9 @@ diff -urNp linux-2.6.38/arch/avr32/mm/fault.c linux-2.6.38-new/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.38/arch/blackfin/kernel/kgdb.c linux-2.6.38-new/arch/blackfin/kernel/kgdb.c
---- linux-2.6.38/arch/blackfin/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/blackfin/kernel/kgdb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/blackfin/kernel/kgdb.c linux-2.6.38.1/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.38.1/arch/blackfin/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/blackfin/kernel/kgdb.c 2011-03-21 18:31:35.000000000 -0400
@@ -420,7 +420,7 @@ int kgdb_arch_handle_exception(int vecto
return -1; /* this means that we do not want to exit from the handler */
}
@@ -611,9 +611,9 @@ diff -urNp linux-2.6.38/arch/blackfin/kernel/kgdb.c linux-2.6.38-new/arch/blackf
.gdb_bpt_instr = {0xa1},
#ifdef CONFIG_SMP
.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.38/arch/blackfin/mm/maccess.c linux-2.6.38-new/arch/blackfin/mm/maccess.c
---- linux-2.6.38/arch/blackfin/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/blackfin/mm/maccess.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/blackfin/mm/maccess.c linux-2.6.38.1/arch/blackfin/mm/maccess.c
+--- linux-2.6.38.1/arch/blackfin/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/blackfin/mm/maccess.c 2011-03-21 18:31:35.000000000 -0400
@@ -16,7 +16,7 @@ static int validate_memory_access_addres
return bfin_mem_access_type(addr, size);
}
@@ -632,9 +632,9 @@ diff -urNp linux-2.6.38/arch/blackfin/mm/maccess.c linux-2.6.38-new/arch/blackfi
{
unsigned long ldst = (unsigned long)dst;
int mem_type;
-diff -urNp linux-2.6.38/arch/frv/include/asm/kmap_types.h linux-2.6.38-new/arch/frv/include/asm/kmap_types.h
---- linux-2.6.38/arch/frv/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/frv/include/asm/kmap_types.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/frv/include/asm/kmap_types.h linux-2.6.38.1/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.38.1/arch/frv/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/frv/include/asm/kmap_types.h 2011-03-21 18:31:35.000000000 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -643,9 +643,9 @@ diff -urNp linux-2.6.38/arch/frv/include/asm/kmap_types.h linux-2.6.38-new/arch/
KM_TYPE_NR
};
-diff -urNp linux-2.6.38/arch/frv/mm/elf-fdpic.c linux-2.6.38-new/arch/frv/mm/elf-fdpic.c
---- linux-2.6.38/arch/frv/mm/elf-fdpic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/frv/mm/elf-fdpic.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/frv/mm/elf-fdpic.c linux-2.6.38.1/arch/frv/mm/elf-fdpic.c
+--- linux-2.6.38.1/arch/frv/mm/elf-fdpic.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/frv/mm/elf-fdpic.c 2011-03-21 18:31:35.000000000 -0400
@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
if (addr) {
addr = PAGE_ALIGN(addr);
@@ -674,9 +674,9 @@ diff -urNp linux-2.6.38/arch/frv/mm/elf-fdpic.c linux-2.6.38-new/arch/frv/mm/elf
goto success;
addr = vma->vm_end;
}
-diff -urNp linux-2.6.38/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38-new/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.38/arch/ia64/hp/common/hwsw_iommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/hp/common/hwsw_iommu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38.1/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.38.1/arch/ia64/hp/common/hwsw_iommu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/hp/common/hwsw_iommu.c 2011-03-21 18:31:35.000000000 -0400
@@ -17,7 +17,7 @@
#include <linux/swiotlb.h>
#include <asm/machvec.h>
@@ -695,9 +695,9 @@ diff -urNp linux-2.6.38/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38-new/arch/i
{
if (use_swiotlb(dev))
return &swiotlb_dma_ops;
-diff -urNp linux-2.6.38/arch/ia64/hp/common/sba_iommu.c linux-2.6.38-new/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.38/arch/ia64/hp/common/sba_iommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/hp/common/sba_iommu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/hp/common/sba_iommu.c linux-2.6.38.1/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.38.1/arch/ia64/hp/common/sba_iommu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/hp/common/sba_iommu.c 2011-03-21 18:31:35.000000000 -0400
@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
},
};
@@ -716,9 +716,9 @@ diff -urNp linux-2.6.38/arch/ia64/hp/common/sba_iommu.c linux-2.6.38-new/arch/ia
.alloc_coherent = sba_alloc_coherent,
.free_coherent = sba_free_coherent,
.map_page = sba_map_page,
-diff -urNp linux-2.6.38/arch/ia64/include/asm/dma-mapping.h linux-2.6.38-new/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.38/arch/ia64/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/include/asm/dma-mapping.h linux-2.6.38.1/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.38.1/arch/ia64/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
@@ -12,7 +12,7 @@
#define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -762,9 +762,9 @@ diff -urNp linux-2.6.38/arch/ia64/include/asm/dma-mapping.h linux-2.6.38-new/arc
return ops->dma_supported(dev, mask);
}
-diff -urNp linux-2.6.38/arch/ia64/include/asm/elf.h linux-2.6.38-new/arch/ia64/include/asm/elf.h
---- linux-2.6.38/arch/ia64/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/include/asm/elf.h linux-2.6.38.1/arch/ia64/include/asm/elf.h
+--- linux-2.6.38.1/arch/ia64/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
@@ -42,6 +42,13 @@
*/
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -779,9 +779,9 @@ diff -urNp linux-2.6.38/arch/ia64/include/asm/elf.h linux-2.6.38-new/arch/ia64/i
#define PT_IA_64_UNWIND 0x70000001
/* IA-64 relocations: */
-diff -urNp linux-2.6.38/arch/ia64/include/asm/machvec.h linux-2.6.38-new/arch/ia64/include/asm/machvec.h
---- linux-2.6.38/arch/ia64/include/asm/machvec.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/include/asm/machvec.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/include/asm/machvec.h linux-2.6.38.1/arch/ia64/include/asm/machvec.h
+--- linux-2.6.38.1/arch/ia64/include/asm/machvec.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/include/asm/machvec.h 2011-03-21 18:31:35.000000000 -0400
@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
/* DMA-mapping interface: */
typedef void ia64_mv_dma_init (void);
@@ -800,9 +800,9 @@ diff -urNp linux-2.6.38/arch/ia64/include/asm/machvec.h linux-2.6.38-new/arch/ia
/*
* Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.38/arch/ia64/include/asm/pgtable.h linux-2.6.38-new/arch/ia64/include/asm/pgtable.h
---- linux-2.6.38/arch/ia64/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/include/asm/pgtable.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/include/asm/pgtable.h linux-2.6.38.1/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.38.1/arch/ia64/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/include/asm/pgtable.h 2011-03-21 18:31:35.000000000 -0400
@@ -12,7 +12,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
@@ -830,9 +830,9 @@ diff -urNp linux-2.6.38/arch/ia64/include/asm/pgtable.h linux-2.6.38-new/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.38/arch/ia64/include/asm/spinlock.h linux-2.6.38-new/arch/ia64/include/asm/spinlock.h
---- linux-2.6.38/arch/ia64/include/asm/spinlock.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/include/asm/spinlock.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/include/asm/spinlock.h linux-2.6.38.1/arch/ia64/include/asm/spinlock.h
+--- linux-2.6.38.1/arch/ia64/include/asm/spinlock.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/include/asm/spinlock.h 2011-03-21 18:31:35.000000000 -0400
@@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
@@ -842,9 +842,9 @@ diff -urNp linux-2.6.38/arch/ia64/include/asm/spinlock.h linux-2.6.38-new/arch/i
}
static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
-diff -urNp linux-2.6.38/arch/ia64/include/asm/uaccess.h linux-2.6.38-new/arch/ia64/include/asm/uaccess.h
---- linux-2.6.38/arch/ia64/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/include/asm/uaccess.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/include/asm/uaccess.h linux-2.6.38.1/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.38.1/arch/ia64/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/include/asm/uaccess.h 2011-03-21 18:31:35.000000000 -0400
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
const void *__cu_from = (from); \
long __cu_len = (n); \
@@ -863,9 +863,9 @@ diff -urNp linux-2.6.38/arch/ia64/include/asm/uaccess.h linux-2.6.38-new/arch/ia
__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
__cu_len; \
})
-diff -urNp linux-2.6.38/arch/ia64/kernel/dma-mapping.c linux-2.6.38-new/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.38/arch/ia64/kernel/dma-mapping.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/kernel/dma-mapping.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/kernel/dma-mapping.c linux-2.6.38.1/arch/ia64/kernel/dma-mapping.c
+--- linux-2.6.38.1/arch/ia64/kernel/dma-mapping.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/kernel/dma-mapping.c 2011-03-21 18:31:35.000000000 -0400
@@ -3,7 +3,7 @@
/* Set this to 1 if there is a HW IOMMU in the system */
int iommu_detected __read_mostly;
@@ -884,9 +884,9 @@ diff -urNp linux-2.6.38/arch/ia64/kernel/dma-mapping.c linux-2.6.38-new/arch/ia6
{
return dma_ops;
}
-diff -urNp linux-2.6.38/arch/ia64/kernel/module.c linux-2.6.38-new/arch/ia64/kernel/module.c
---- linux-2.6.38/arch/ia64/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/kernel/module.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/kernel/module.c linux-2.6.38.1/arch/ia64/kernel/module.c
+--- linux-2.6.38.1/arch/ia64/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/kernel/module.c 2011-03-21 18:31:35.000000000 -0400
@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
void
module_free (struct module *mod, void *module_region)
@@ -975,9 +975,9 @@ diff -urNp linux-2.6.38/arch/ia64/kernel/module.c linux-2.6.38-new/arch/ia64/ker
mod->arch.gp = gp;
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
-diff -urNp linux-2.6.38/arch/ia64/kernel/pci-dma.c linux-2.6.38-new/arch/ia64/kernel/pci-dma.c
---- linux-2.6.38/arch/ia64/kernel/pci-dma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/kernel/pci-dma.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/kernel/pci-dma.c linux-2.6.38.1/arch/ia64/kernel/pci-dma.c
+--- linux-2.6.38.1/arch/ia64/kernel/pci-dma.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/kernel/pci-dma.c 2011-03-21 18:31:35.000000000 -0400
@@ -43,7 +43,7 @@ struct device fallback_dev = {
.dma_mask = &fallback_dev.coherent_dma_mask,
};
@@ -987,9 +987,9 @@ diff -urNp linux-2.6.38/arch/ia64/kernel/pci-dma.c linux-2.6.38-new/arch/ia64/ke
static int __init pci_iommu_init(void)
{
-diff -urNp linux-2.6.38/arch/ia64/kernel/pci-swiotlb.c linux-2.6.38-new/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.38/arch/ia64/kernel/pci-swiotlb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/kernel/pci-swiotlb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/kernel/pci-swiotlb.c linux-2.6.38.1/arch/ia64/kernel/pci-swiotlb.c
+--- linux-2.6.38.1/arch/ia64/kernel/pci-swiotlb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/kernel/pci-swiotlb.c 2011-03-21 18:31:35.000000000 -0400
@@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent
return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
}
@@ -999,9 +999,9 @@ diff -urNp linux-2.6.38/arch/ia64/kernel/pci-swiotlb.c linux-2.6.38-new/arch/ia6
.alloc_coherent = ia64_swiotlb_alloc_coherent,
.free_coherent = swiotlb_free_coherent,
.map_page = swiotlb_map_page,
-diff -urNp linux-2.6.38/arch/ia64/kernel/sys_ia64.c linux-2.6.38-new/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.38/arch/ia64/kernel/sys_ia64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/kernel/sys_ia64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/kernel/sys_ia64.c linux-2.6.38.1/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.38.1/arch/ia64/kernel/sys_ia64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/kernel/sys_ia64.c 2011-03-21 18:31:35.000000000 -0400
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
@@ -1034,9 +1034,9 @@ diff -urNp linux-2.6.38/arch/ia64/kernel/sys_ia64.c linux-2.6.38-new/arch/ia64/k
/* Remember the address where we stopped this search: */
mm->free_area_cache = addr + len;
return addr;
-diff -urNp linux-2.6.38/arch/ia64/kernel/vmlinux.lds.S linux-2.6.38-new/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.38/arch/ia64/kernel/vmlinux.lds.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/kernel/vmlinux.lds.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/kernel/vmlinux.lds.S linux-2.6.38.1/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.38.1/arch/ia64/kernel/vmlinux.lds.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/kernel/vmlinux.lds.S 2011-03-21 18:31:35.000000000 -0400
@@ -199,7 +199,7 @@ SECTIONS {
/* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE);
@@ -1046,9 +1046,9 @@ diff -urNp linux-2.6.38/arch/ia64/kernel/vmlinux.lds.S linux-2.6.38-new/arch/ia6
/*
* ensure percpu data fits
* into percpu page size
-diff -urNp linux-2.6.38/arch/ia64/mm/fault.c linux-2.6.38-new/arch/ia64/mm/fault.c
---- linux-2.6.38/arch/ia64/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/mm/fault.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/mm/fault.c linux-2.6.38.1/arch/ia64/mm/fault.c
+--- linux-2.6.38.1/arch/ia64/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/mm/fault.c 2011-03-21 18:31:35.000000000 -0400
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
return pte_present(pte);
}
@@ -1098,9 +1098,9 @@ diff -urNp linux-2.6.38/arch/ia64/mm/fault.c linux-2.6.38-new/arch/ia64/mm/fault
/*
* If for any reason at all we couldn't handle the fault, make
* sure we exit gracefully rather than endlessly redo the
-diff -urNp linux-2.6.38/arch/ia64/mm/hugetlbpage.c linux-2.6.38-new/arch/ia64/mm/hugetlbpage.c
---- linux-2.6.38/arch/ia64/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/mm/hugetlbpage.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/mm/hugetlbpage.c linux-2.6.38.1/arch/ia64/mm/hugetlbpage.c
+--- linux-2.6.38.1/arch/ia64/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/mm/hugetlbpage.c 2011-03-21 18:31:35.000000000 -0400
@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(
/* At this point: (!vmm || addr < vmm->vm_end). */
if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
@@ -1110,9 +1110,9 @@ diff -urNp linux-2.6.38/arch/ia64/mm/hugetlbpage.c linux-2.6.38-new/arch/ia64/mm
return addr;
addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
}
-diff -urNp linux-2.6.38/arch/ia64/mm/init.c linux-2.6.38-new/arch/ia64/mm/init.c
---- linux-2.6.38/arch/ia64/mm/init.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/mm/init.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/mm/init.c linux-2.6.38.1/arch/ia64/mm/init.c
+--- linux-2.6.38.1/arch/ia64/mm/init.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/mm/init.c 2011-03-21 18:31:35.000000000 -0400
@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.38/arch/ia64/mm/init.c linux-2.6.38-new/arch/ia64/mm/init.c
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
down_write(&current->mm->mmap_sem);
if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-2.6.38/arch/ia64/sn/pci/pci_dma.c linux-2.6.38-new/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.38/arch/ia64/sn/pci/pci_dma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/ia64/sn/pci/pci_dma.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/ia64/sn/pci/pci_dma.c linux-2.6.38.1/arch/ia64/sn/pci/pci_dma.c
+--- linux-2.6.38.1/arch/ia64/sn/pci/pci_dma.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/ia64/sn/pci/pci_dma.c 2011-03-21 18:31:35.000000000 -0400
@@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus *
return ret;
}
@@ -1145,9 +1145,9 @@ diff -urNp linux-2.6.38/arch/ia64/sn/pci/pci_dma.c linux-2.6.38-new/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.38/arch/m32r/lib/usercopy.c linux-2.6.38-new/arch/m32r/lib/usercopy.c
---- linux-2.6.38/arch/m32r/lib/usercopy.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/m32r/lib/usercopy.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/m32r/lib/usercopy.c linux-2.6.38.1/arch/m32r/lib/usercopy.c
+--- linux-2.6.38.1/arch/m32r/lib/usercopy.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/m32r/lib/usercopy.c 2011-03-21 18:31:35.000000000 -0400
@@ -14,6 +14,9 @@
unsigned long
__generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1168,9 +1168,9 @@ diff -urNp linux-2.6.38/arch/m32r/lib/usercopy.c linux-2.6.38-new/arch/m32r/lib/
prefetchw(to);
if (access_ok(VERIFY_READ, from, n))
__copy_user_zeroing(to,from,n);
-diff -urNp linux-2.6.38/arch/microblaze/include/asm/device.h linux-2.6.38-new/arch/microblaze/include/asm/device.h
---- linux-2.6.38/arch/microblaze/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/microblaze/include/asm/device.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/microblaze/include/asm/device.h linux-2.6.38.1/arch/microblaze/include/asm/device.h
+--- linux-2.6.38.1/arch/microblaze/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/microblaze/include/asm/device.h 2011-03-21 18:31:35.000000000 -0400
@@ -13,7 +13,7 @@ struct device_node;
struct dev_archdata {
@@ -1180,9 +1180,9 @@ diff -urNp linux-2.6.38/arch/microblaze/include/asm/device.h linux-2.6.38-new/ar
void *dma_data;
};
-diff -urNp linux-2.6.38/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38-new/arch/microblaze/include/asm/dma-mapping.h
---- linux-2.6.38/arch/microblaze/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/microblaze/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38.1/arch/microblaze/include/asm/dma-mapping.h
+--- linux-2.6.38.1/arch/microblaze/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/microblaze/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
@@ -43,14 +43,14 @@ static inline unsigned long device_to_ma
return 0xfffffffful;
}
@@ -1254,9 +1254,9 @@ diff -urNp linux-2.6.38/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38-n
BUG_ON(!ops);
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.38/arch/microblaze/include/asm/pci.h linux-2.6.38-new/arch/microblaze/include/asm/pci.h
---- linux-2.6.38/arch/microblaze/include/asm/pci.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/microblaze/include/asm/pci.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/microblaze/include/asm/pci.h linux-2.6.38.1/arch/microblaze/include/asm/pci.h
+--- linux-2.6.38.1/arch/microblaze/include/asm/pci.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/microblaze/include/asm/pci.h 2011-03-21 18:31:35.000000000 -0400
@@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_
}
@@ -1268,9 +1268,9 @@ diff -urNp linux-2.6.38/arch/microblaze/include/asm/pci.h linux-2.6.38-new/arch/
#else /* CONFIG_PCI */
#define set_pci_dma_ops(d)
#define get_pci_dma_ops() NULL
-diff -urNp linux-2.6.38/arch/microblaze/kernel/dma.c linux-2.6.38-new/arch/microblaze/kernel/dma.c
---- linux-2.6.38/arch/microblaze/kernel/dma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/microblaze/kernel/dma.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/microblaze/kernel/dma.c linux-2.6.38.1/arch/microblaze/kernel/dma.c
+--- linux-2.6.38.1/arch/microblaze/kernel/dma.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/microblaze/kernel/dma.c 2011-03-21 18:31:35.000000000 -0400
@@ -133,7 +133,7 @@ static inline void dma_direct_unmap_page
__dma_sync_page(dma_address, 0 , size, direction);
}
@@ -1280,9 +1280,9 @@ diff -urNp linux-2.6.38/arch/microblaze/kernel/dma.c linux-2.6.38-new/arch/micro
.alloc_coherent = dma_direct_alloc_coherent,
.free_coherent = dma_direct_free_coherent,
.map_sg = dma_direct_map_sg,
-diff -urNp linux-2.6.38/arch/microblaze/kernel/kgdb.c linux-2.6.38-new/arch/microblaze/kernel/kgdb.c
---- linux-2.6.38/arch/microblaze/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/microblaze/kernel/kgdb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/microblaze/kernel/kgdb.c linux-2.6.38.1/arch/microblaze/kernel/kgdb.c
+--- linux-2.6.38.1/arch/microblaze/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/microblaze/kernel/kgdb.c 2011-03-21 18:31:35.000000000 -0400
@@ -141,10 +141,11 @@ void kgdb_arch_exit(void)
/*
* Global data
@@ -1296,9 +1296,9 @@ diff -urNp linux-2.6.38/arch/microblaze/kernel/kgdb.c linux-2.6.38-new/arch/micr
.gdb_bpt_instr = {0xba, 0x0c, 0x00, 0x18}, /* brki r16, 0x18 */
#endif
};
-diff -urNp linux-2.6.38/arch/microblaze/pci/pci-common.c linux-2.6.38-new/arch/microblaze/pci/pci-common.c
---- linux-2.6.38/arch/microblaze/pci/pci-common.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/microblaze/pci/pci-common.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/microblaze/pci/pci-common.c linux-2.6.38.1/arch/microblaze/pci/pci-common.c
+--- linux-2.6.38.1/arch/microblaze/pci/pci-common.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/microblaze/pci/pci-common.c 2011-03-21 18:31:35.000000000 -0400
@@ -47,14 +47,14 @@ resource_size_t isa_mem_base;
/* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */
unsigned int pci_flags;
@@ -1317,9 +1317,9 @@ diff -urNp linux-2.6.38/arch/microblaze/pci/pci-common.c linux-2.6.38-new/arch/m
{
return pci_dma_ops;
}
-diff -urNp linux-2.6.38/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.38-new/arch/mips/cavium-octeon/dma-octeon.c
---- linux-2.6.38/arch/mips/cavium-octeon/dma-octeon.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/mips/cavium-octeon/dma-octeon.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.38.1/arch/mips/cavium-octeon/dma-octeon.c
+--- linux-2.6.38.1/arch/mips/cavium-octeon/dma-octeon.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/mips/cavium-octeon/dma-octeon.c 2011-03-21 18:31:35.000000000 -0400
@@ -202,7 +202,7 @@ static phys_addr_t octeon_unity_dma_to_p
}
@@ -1338,9 +1338,9 @@ diff -urNp linux-2.6.38/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.38-new/ar
void __init octeon_pci_dma_init(void)
{
-diff -urNp linux-2.6.38/arch/mips/include/asm/device.h linux-2.6.38-new/arch/mips/include/asm/device.h
---- linux-2.6.38/arch/mips/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/mips/include/asm/device.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/mips/include/asm/device.h linux-2.6.38.1/arch/mips/include/asm/device.h
+--- linux-2.6.38.1/arch/mips/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/mips/include/asm/device.h 2011-03-21 18:31:35.000000000 -0400
@@ -10,7 +10,7 @@ struct dma_map_ops;
struct dev_archdata {
@@ -1350,9 +1350,9 @@ diff -urNp linux-2.6.38/arch/mips/include/asm/device.h linux-2.6.38-new/arch/mip
};
struct pdev_archdata {
-diff -urNp linux-2.6.38/arch/mips/include/asm/dma-mapping.h linux-2.6.38-new/arch/mips/include/asm/dma-mapping.h
---- linux-2.6.38/arch/mips/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/mips/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/mips/include/asm/dma-mapping.h linux-2.6.38.1/arch/mips/include/asm/dma-mapping.h
+--- linux-2.6.38.1/arch/mips/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/mips/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
@@ -7,9 +7,9 @@
#include <dma-coherence.h>
@@ -1399,9 +1399,9 @@ diff -urNp linux-2.6.38/arch/mips/include/asm/dma-mapping.h linux-2.6.38-new/arc
ops->free_coherent(dev, size, vaddr, dma_handle);
-diff -urNp linux-2.6.38/arch/mips/include/asm/elf.h linux-2.6.38-new/arch/mips/include/asm/elf.h
---- linux-2.6.38/arch/mips/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/mips/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/mips/include/asm/elf.h linux-2.6.38.1/arch/mips/include/asm/elf.h
+--- linux-2.6.38.1/arch/mips/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/mips/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
@@ -372,13 +372,16 @@ extern const char *__elf_platform;
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
#endif
@@ -1423,9 +1423,9 @@ diff -urNp linux-2.6.38/arch/mips/include/asm/elf.h linux-2.6.38-new/arch/mips/i
-#define arch_randomize_brk arch_randomize_brk
-
#endif /* _ASM_ELF_H */
-diff -urNp linux-2.6.38/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.38-new/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
---- linux-2.6.38/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.38.1/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
+--- linux-2.6.38.1/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-03-21 18:31:35.000000000 -0400
@@ -66,7 +66,7 @@ dma_addr_t phys_to_dma(struct device *de
phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);
@@ -1435,9 +1435,9 @@ diff -urNp linux-2.6.38/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
extern char *octeon_swiotlb;
#endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */
-diff -urNp linux-2.6.38/arch/mips/include/asm/page.h linux-2.6.38-new/arch/mips/include/asm/page.h
---- linux-2.6.38/arch/mips/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/mips/include/asm/page.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/mips/include/asm/page.h linux-2.6.38.1/arch/mips/include/asm/page.h
+--- linux-2.6.38.1/arch/mips/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/mips/include/asm/page.h 2011-03-21 18:31:35.000000000 -0400
@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
#ifdef CONFIG_CPU_MIPS32
typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1447,9 +1447,9 @@ diff -urNp linux-2.6.38/arch/mips/include/asm/page.h linux-2.6.38-new/arch/mips/
#else
typedef struct { unsigned long long pte; } pte_t;
#define pte_val(x) ((x).pte)
-diff -urNp linux-2.6.38/arch/mips/include/asm/system.h linux-2.6.38-new/arch/mips/include/asm/system.h
---- linux-2.6.38/arch/mips/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/mips/include/asm/system.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/mips/include/asm/system.h linux-2.6.38.1/arch/mips/include/asm/system.h
+--- linux-2.6.38.1/arch/mips/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/mips/include/asm/system.h 2011-03-21 18:31:35.000000000 -0400
@@ -23,6 +23,7 @@
#include <asm/dsp.h>
#include <asm/watch.h>
@@ -1466,9 +1466,9 @@ diff -urNp linux-2.6.38/arch/mips/include/asm/system.h linux-2.6.38-new/arch/mip
+#define arch_align_stack(x) ((x) & ALMASK)
#endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.38/arch/mips/kernel/binfmt_elfn32.c linux-2.6.38-new/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.38/arch/mips/kernel/binfmt_elfn32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/mips/kernel/binfmt_elfn32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/mips/kernel/binfmt_elfn32.c linux-2.6.38.1/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.38.1/arch/mips/kernel/binfmt_elfn32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/mips/kernel/binfmt_elfn32.c 2011-03-21 18:31:35.000000000 -0400
@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1483,9 +1483,9 @@ diff -urNp linux-2.6.38/arch/mips/kernel/binfmt_elfn32.c linux-2.6.38-new/arch/m
#include <asm/processor.h>
#include <linux/module.h>
#include <linux/elfcore.h>
-diff -urNp linux-2.6.38/arch/mips/kernel/binfmt_elfo32.c linux-2.6.38-new/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.38/arch/mips/kernel/binfmt_elfo32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/mips/kernel/binfmt_elfo32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/mips/kernel/binfmt_elfo32.c linux-2.6.38.1/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.38.1/arch/mips/kernel/binfmt_elfo32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/mips/kernel/binfmt_elfo32.c 2011-03-21 18:31:35.000000000 -0400
@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1500,9 +1500,9 @@ diff -urNp linux-2.6.38/arch/mips/kernel/binfmt_elfo32.c linux-2.6.38-new/arch/m
#include <asm/processor.h>
/*
-diff -urNp linux-2.6.38/arch/mips/kernel/kgdb.c linux-2.6.38-new/arch/mips/kernel/kgdb.c
---- linux-2.6.38/arch/mips/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/mips/kernel/kgdb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/mips/kernel/kgdb.c linux-2.6.38.1/arch/mips/kernel/kgdb.c
+--- linux-2.6.38.1/arch/mips/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/mips/kernel/kgdb.c 2011-03-21 18:31:35.000000000 -0400
@@ -351,7 +351,7 @@ int kgdb_arch_handle_exception(int vecto
return -1;
}
@@ -1512,9 +1512,9 @@ diff -urNp linux-2.6.38/arch/mips/kernel/kgdb.c linux-2.6.38-new/arch/mips/kerne
/*
* We use kgdb_early_setup so that functions we need to call now don't
-diff -urNp linux-2.6.38/arch/mips/kernel/process.c linux-2.6.38-new/arch/mips/kernel/process.c
---- linux-2.6.38/arch/mips/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/mips/kernel/process.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/mips/kernel/process.c linux-2.6.38.1/arch/mips/kernel/process.c
+--- linux-2.6.38.1/arch/mips/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/mips/kernel/process.c 2011-03-21 18:31:35.000000000 -0400
@@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru
out:
return pc;
@@ -1531,9 +1531,9 @@ diff -urNp linux-2.6.38/arch/mips/kernel/process.c linux-2.6.38-new/arch/mips/ke
-
- return sp & ALMASK;
-}
-diff -urNp linux-2.6.38/arch/mips/kernel/syscall.c linux-2.6.38-new/arch/mips/kernel/syscall.c
---- linux-2.6.38/arch/mips/kernel/syscall.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/mips/kernel/syscall.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/mips/kernel/syscall.c linux-2.6.38.1/arch/mips/kernel/syscall.c
+--- linux-2.6.38.1/arch/mips/kernel/syscall.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/mips/kernel/syscall.c 2011-03-21 18:31:35.000000000 -0400
@@ -108,14 +108,18 @@ unsigned long arch_get_unmapped_area(str
do_color_align = 0;
if (filp || (flags & MAP_SHARED))
@@ -1584,9 +1584,9 @@ diff -urNp linux-2.6.38/arch/mips/kernel/syscall.c linux-2.6.38-new/arch/mips/ke
SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len,
unsigned long, prot, unsigned long, flags, unsigned long,
fd, off_t, offset)
-diff -urNp linux-2.6.38/arch/mips/mm/dma-default.c linux-2.6.38-new/arch/mips/mm/dma-default.c
---- linux-2.6.38/arch/mips/mm/dma-default.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/mips/mm/dma-default.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/mips/mm/dma-default.c linux-2.6.38.1/arch/mips/mm/dma-default.c
+--- linux-2.6.38.1/arch/mips/mm/dma-default.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/mips/mm/dma-default.c 2011-03-21 18:31:35.000000000 -0400
@@ -300,7 +300,7 @@ void dma_cache_sync(struct device *dev,
EXPORT_SYMBOL(dma_cache_sync);
@@ -1605,9 +1605,9 @@ diff -urNp linux-2.6.38/arch/mips/mm/dma-default.c linux-2.6.38-new/arch/mips/mm
EXPORT_SYMBOL(mips_dma_map_ops);
#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
-diff -urNp linux-2.6.38/arch/mips/mm/fault.c linux-2.6.38-new/arch/mips/mm/fault.c
---- linux-2.6.38/arch/mips/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/mips/mm/fault.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/mips/mm/fault.c linux-2.6.38.1/arch/mips/mm/fault.c
+--- linux-2.6.38.1/arch/mips/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/mips/mm/fault.c 2011-03-21 18:31:35.000000000 -0400
@@ -28,6 +28,23 @@
#include <asm/highmem.h> /* For VMALLOC_END */
#include <linux/kdebug.h>
@@ -1632,9 +1632,9 @@ diff -urNp linux-2.6.38/arch/mips/mm/fault.c linux-2.6.38-new/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.38/arch/parisc/include/asm/elf.h linux-2.6.38-new/arch/parisc/include/asm/elf.h
---- linux-2.6.38/arch/parisc/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/parisc/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/parisc/include/asm/elf.h linux-2.6.38.1/arch/parisc/include/asm/elf.h
+--- linux-2.6.38.1/arch/parisc/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/parisc/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration..
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1649,9 +1649,9 @@ diff -urNp linux-2.6.38/arch/parisc/include/asm/elf.h linux-2.6.38-new/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.38/arch/parisc/include/asm/pgtable.h linux-2.6.38-new/arch/parisc/include/asm/pgtable.h
---- linux-2.6.38/arch/parisc/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/parisc/include/asm/pgtable.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/parisc/include/asm/pgtable.h linux-2.6.38.1/arch/parisc/include/asm/pgtable.h
+--- linux-2.6.38.1/arch/parisc/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/parisc/include/asm/pgtable.h 2011-03-21 18:31:35.000000000 -0400
@@ -209,6 +209,17 @@ struct vm_area_struct;
#define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
#define PAGE_COPY PAGE_EXECREAD
@@ -1670,9 +1670,9 @@ diff -urNp linux-2.6.38/arch/parisc/include/asm/pgtable.h linux-2.6.38-new/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.38/arch/parisc/kernel/module.c linux-2.6.38-new/arch/parisc/kernel/module.c
---- linux-2.6.38/arch/parisc/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/parisc/kernel/module.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/parisc/kernel/module.c linux-2.6.38.1/arch/parisc/kernel/module.c
+--- linux-2.6.38.1/arch/parisc/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/parisc/kernel/module.c 2011-03-21 18:31:35.000000000 -0400
@@ -96,16 +96,38 @@
/* three functions to determine where in the module core
@@ -1773,9 +1773,9 @@ diff -urNp linux-2.6.38/arch/parisc/kernel/module.c linux-2.6.38-new/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.38/arch/parisc/kernel/sys_parisc.c linux-2.6.38-new/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.38/arch/parisc/kernel/sys_parisc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/parisc/kernel/sys_parisc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/parisc/kernel/sys_parisc.c linux-2.6.38.1/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.38.1/arch/parisc/kernel/sys_parisc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/parisc/kernel/sys_parisc.c 2011-03-21 18:31:35.000000000 -0400
@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
/* At this point: (!vma || addr < vma->vm_end). */
if (TASK_SIZE - len < addr)
@@ -1803,9 +1803,9 @@ diff -urNp linux-2.6.38/arch/parisc/kernel/sys_parisc.c linux-2.6.38-new/arch/pa
if (filp) {
addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.38/arch/parisc/kernel/traps.c linux-2.6.38-new/arch/parisc/kernel/traps.c
---- linux-2.6.38/arch/parisc/kernel/traps.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/parisc/kernel/traps.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/parisc/kernel/traps.c linux-2.6.38.1/arch/parisc/kernel/traps.c
+--- linux-2.6.38.1/arch/parisc/kernel/traps.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/parisc/kernel/traps.c 2011-03-21 18:31:35.000000000 -0400
@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
down_read(&current->mm->mmap_sem);
@@ -1817,9 +1817,9 @@ diff -urNp linux-2.6.38/arch/parisc/kernel/traps.c linux-2.6.38-new/arch/parisc/
fault_address = regs->iaoq[0];
fault_space = regs->iasq[0];
-diff -urNp linux-2.6.38/arch/parisc/mm/fault.c linux-2.6.38-new/arch/parisc/mm/fault.c
---- linux-2.6.38/arch/parisc/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/parisc/mm/fault.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/parisc/mm/fault.c linux-2.6.38.1/arch/parisc/mm/fault.c
+--- linux-2.6.38.1/arch/parisc/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/parisc/mm/fault.c 2011-03-21 18:31:35.000000000 -0400
@@ -15,6 +15,7 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -1989,9 +1989,9 @@ diff -urNp linux-2.6.38/arch/parisc/mm/fault.c linux-2.6.38-new/arch/parisc/mm/f
/*
* If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.38/arch/powerpc/include/asm/device.h linux-2.6.38-new/arch/powerpc/include/asm/device.h
---- linux-2.6.38/arch/powerpc/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/include/asm/device.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/include/asm/device.h linux-2.6.38.1/arch/powerpc/include/asm/device.h
+--- linux-2.6.38.1/arch/powerpc/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/include/asm/device.h 2011-03-21 18:31:35.000000000 -0400
@@ -17,7 +17,7 @@ struct device_node;
*/
struct dev_archdata {
@@ -2001,9 +2001,9 @@ diff -urNp linux-2.6.38/arch/powerpc/include/asm/device.h linux-2.6.38-new/arch/
/*
* When an iommu is in use, dma_data is used as a ptr to the base of the
-diff -urNp linux-2.6.38/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38-new/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.38/arch/powerpc/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.1/arch/powerpc/include/asm/dma-mapping.h
+--- linux-2.6.38.1/arch/powerpc/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
@@ -66,12 +66,13 @@ static inline unsigned long device_to_ma
/*
* Available generic sets of operations
@@ -2066,9 +2066,9 @@ diff -urNp linux-2.6.38/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38-new/
if (dma_ops->mapping_error)
return dma_ops->mapping_error(dev, dma_addr);
-diff -urNp linux-2.6.38/arch/powerpc/include/asm/elf.h linux-2.6.38-new/arch/powerpc/include/asm/elf.h
---- linux-2.6.38/arch/powerpc/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/include/asm/elf.h linux-2.6.38.1/arch/powerpc/include/asm/elf.h
+--- linux-2.6.38.1/arch/powerpc/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -2101,9 +2101,9 @@ diff -urNp linux-2.6.38/arch/powerpc/include/asm/elf.h linux-2.6.38-new/arch/pow
#endif /* __KERNEL__ */
/*
-diff -urNp linux-2.6.38/arch/powerpc/include/asm/iommu.h linux-2.6.38-new/arch/powerpc/include/asm/iommu.h
---- linux-2.6.38/arch/powerpc/include/asm/iommu.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/include/asm/iommu.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/include/asm/iommu.h linux-2.6.38.1/arch/powerpc/include/asm/iommu.h
+--- linux-2.6.38.1/arch/powerpc/include/asm/iommu.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/include/asm/iommu.h 2011-03-21 18:31:35.000000000 -0400
@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
extern void iommu_init_early_dart(void);
extern void iommu_init_early_pasemi(void);
@@ -2114,9 +2114,9 @@ diff -urNp linux-2.6.38/arch/powerpc/include/asm/iommu.h linux-2.6.38-new/arch/p
#ifdef CONFIG_PCI
extern void pci_iommu_init(void);
extern void pci_direct_iommu_init(void);
-diff -urNp linux-2.6.38/arch/powerpc/include/asm/kmap_types.h linux-2.6.38-new/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.38/arch/powerpc/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/include/asm/kmap_types.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/include/asm/kmap_types.h linux-2.6.38.1/arch/powerpc/include/asm/kmap_types.h
+--- linux-2.6.38.1/arch/powerpc/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/include/asm/kmap_types.h 2011-03-21 18:31:35.000000000 -0400
@@ -27,6 +27,7 @@ enum km_type {
KM_PPC_SYNC_PAGE,
KM_PPC_SYNC_ICACHE,
@@ -2125,9 +2125,9 @@ diff -urNp linux-2.6.38/arch/powerpc/include/asm/kmap_types.h linux-2.6.38-new/a
KM_TYPE_NR
};
-diff -urNp linux-2.6.38/arch/powerpc/include/asm/page_64.h linux-2.6.38-new/arch/powerpc/include/asm/page_64.h
---- linux-2.6.38/arch/powerpc/include/asm/page_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/include/asm/page_64.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/include/asm/page_64.h linux-2.6.38.1/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.38.1/arch/powerpc/include/asm/page_64.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/include/asm/page_64.h 2011-03-21 18:31:35.000000000 -0400
@@ -172,15 +172,18 @@ do { \
* stack by default, so in the absense of a PT_GNU_STACK program header
* we turn execute permission off.
@@ -2149,9 +2149,9 @@ diff -urNp linux-2.6.38/arch/powerpc/include/asm/page_64.h linux-2.6.38-new/arch
#include <asm-generic/getorder.h>
-diff -urNp linux-2.6.38/arch/powerpc/include/asm/page.h linux-2.6.38-new/arch/powerpc/include/asm/page.h
---- linux-2.6.38/arch/powerpc/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/include/asm/page.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/include/asm/page.h linux-2.6.38.1/arch/powerpc/include/asm/page.h
+--- linux-2.6.38.1/arch/powerpc/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/include/asm/page.h 2011-03-21 18:31:35.000000000 -0400
@@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr;
* and needs to be executable. This means the whole heap ends
* up being executable.
@@ -2174,9 +2174,9 @@ diff -urNp linux-2.6.38/arch/powerpc/include/asm/page.h linux-2.6.38-new/arch/po
#ifndef __ASSEMBLY__
#undef STRICT_MM_TYPECHECKS
-diff -urNp linux-2.6.38/arch/powerpc/include/asm/pci.h linux-2.6.38-new/arch/powerpc/include/asm/pci.h
---- linux-2.6.38/arch/powerpc/include/asm/pci.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/include/asm/pci.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/include/asm/pci.h linux-2.6.38.1/arch/powerpc/include/asm/pci.h
+--- linux-2.6.38.1/arch/powerpc/include/asm/pci.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/include/asm/pci.h 2011-03-21 18:31:35.000000000 -0400
@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
}
@@ -2188,9 +2188,9 @@ diff -urNp linux-2.6.38/arch/powerpc/include/asm/pci.h linux-2.6.38-new/arch/pow
#else /* CONFIG_PCI */
#define set_pci_dma_ops(d)
#define get_pci_dma_ops() NULL
-diff -urNp linux-2.6.38/arch/powerpc/include/asm/pgtable.h linux-2.6.38-new/arch/powerpc/include/asm/pgtable.h
---- linux-2.6.38/arch/powerpc/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/include/asm/pgtable.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/include/asm/pgtable.h linux-2.6.38.1/arch/powerpc/include/asm/pgtable.h
+--- linux-2.6.38.1/arch/powerpc/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/include/asm/pgtable.h 2011-03-21 18:31:35.000000000 -0400
@@ -2,6 +2,7 @@
#define _ASM_POWERPC_PGTABLE_H
#ifdef __KERNEL__
@@ -2199,9 +2199,9 @@ diff -urNp linux-2.6.38/arch/powerpc/include/asm/pgtable.h linux-2.6.38-new/arch
#ifndef __ASSEMBLY__
#include <asm/processor.h> /* For TASK_SIZE */
#include <asm/mmu.h>
-diff -urNp linux-2.6.38/arch/powerpc/include/asm/pte-hash32.h linux-2.6.38-new/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.38/arch/powerpc/include/asm/pte-hash32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/include/asm/pte-hash32.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/include/asm/pte-hash32.h linux-2.6.38.1/arch/powerpc/include/asm/pte-hash32.h
+--- linux-2.6.38.1/arch/powerpc/include/asm/pte-hash32.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/include/asm/pte-hash32.h 2011-03-21 18:31:35.000000000 -0400
@@ -21,6 +21,7 @@
#define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
#define _PAGE_USER 0x004 /* usermode access allowed */
@@ -2210,9 +2210,9 @@ diff -urNp linux-2.6.38/arch/powerpc/include/asm/pte-hash32.h linux-2.6.38-new/a
#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.38/arch/powerpc/include/asm/reg.h linux-2.6.38-new/arch/powerpc/include/asm/reg.h
---- linux-2.6.38/arch/powerpc/include/asm/reg.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/include/asm/reg.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/include/asm/reg.h linux-2.6.38.1/arch/powerpc/include/asm/reg.h
+--- linux-2.6.38.1/arch/powerpc/include/asm/reg.h 2011-03-23 17:20:06.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/include/asm/reg.h 2011-03-23 17:21:43.000000000 -0400
@@ -191,6 +191,7 @@
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -2221,9 +2221,9 @@ diff -urNp linux-2.6.38/arch/powerpc/include/asm/reg.h linux-2.6.38-new/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.38/arch/powerpc/include/asm/swiotlb.h linux-2.6.38-new/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.38/arch/powerpc/include/asm/swiotlb.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/include/asm/swiotlb.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/include/asm/swiotlb.h linux-2.6.38.1/arch/powerpc/include/asm/swiotlb.h
+--- linux-2.6.38.1/arch/powerpc/include/asm/swiotlb.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/include/asm/swiotlb.h 2011-03-21 18:31:35.000000000 -0400
@@ -13,7 +13,7 @@
#include <linux/swiotlb.h>
@@ -2233,9 +2233,9 @@ diff -urNp linux-2.6.38/arch/powerpc/include/asm/swiotlb.h linux-2.6.38-new/arch
static inline void dma_mark_clean(void *addr, size_t size) {}
-diff -urNp linux-2.6.38/arch/powerpc/include/asm/system.h linux-2.6.38-new/arch/powerpc/include/asm/system.h
---- linux-2.6.38/arch/powerpc/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/include/asm/system.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/include/asm/system.h linux-2.6.38.1/arch/powerpc/include/asm/system.h
+--- linux-2.6.38.1/arch/powerpc/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/include/asm/system.h 2011-03-21 18:31:35.000000000 -0400
@@ -533,7 +533,7 @@ __cmpxchg_local(volatile void *ptr, unsi
#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
#endif
@@ -2245,9 +2245,9 @@ diff -urNp linux-2.6.38/arch/powerpc/include/asm/system.h linux-2.6.38-new/arch/
/* Used in very early kernel initialization. */
extern unsigned long reloc_offset(void);
-diff -urNp linux-2.6.38/arch/powerpc/include/asm/uaccess.h linux-2.6.38-new/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.38/arch/powerpc/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/include/asm/uaccess.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/include/asm/uaccess.h linux-2.6.38.1/arch/powerpc/include/asm/uaccess.h
+--- linux-2.6.38.1/arch/powerpc/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/include/asm/uaccess.h 2011-03-21 18:31:35.000000000 -0400
@@ -13,6 +13,8 @@
#define VERIFY_READ 0
#define VERIFY_WRITE 1
@@ -2425,9 +2425,9 @@ diff -urNp linux-2.6.38/arch/powerpc/include/asm/uaccess.h linux-2.6.38-new/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.38/arch/powerpc/kernel/dma.c linux-2.6.38-new/arch/powerpc/kernel/dma.c
---- linux-2.6.38/arch/powerpc/kernel/dma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/kernel/dma.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/kernel/dma.c linux-2.6.38.1/arch/powerpc/kernel/dma.c
+--- linux-2.6.38.1/arch/powerpc/kernel/dma.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/kernel/dma.c 2011-03-21 18:31:35.000000000 -0400
@@ -136,7 +136,7 @@ static inline void dma_direct_sync_singl
}
#endif
@@ -2446,9 +2446,9 @@ diff -urNp linux-2.6.38/arch/powerpc/kernel/dma.c linux-2.6.38-new/arch/powerpc/
if (ppc_md.dma_set_mask)
return ppc_md.dma_set_mask(dev, dma_mask);
-diff -urNp linux-2.6.38/arch/powerpc/kernel/dma-iommu.c linux-2.6.38-new/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.38/arch/powerpc/kernel/dma-iommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/kernel/dma-iommu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/kernel/dma-iommu.c linux-2.6.38.1/arch/powerpc/kernel/dma-iommu.c
+--- linux-2.6.38.1/arch/powerpc/kernel/dma-iommu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/kernel/dma-iommu.c 2011-03-21 18:31:35.000000000 -0400
@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
}
@@ -2467,9 +2467,9 @@ diff -urNp linux-2.6.38/arch/powerpc/kernel/dma-iommu.c linux-2.6.38-new/arch/po
.alloc_coherent = dma_iommu_alloc_coherent,
.free_coherent = dma_iommu_free_coherent,
.map_sg = dma_iommu_map_sg,
-diff -urNp linux-2.6.38/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.38-new/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.38/arch/powerpc/kernel/dma-swiotlb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/kernel/dma-swiotlb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.38.1/arch/powerpc/kernel/dma-swiotlb.c
+--- linux-2.6.38.1/arch/powerpc/kernel/dma-swiotlb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/kernel/dma-swiotlb.c 2011-03-21 18:31:35.000000000 -0400
@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
* map_page, and unmap_page on highmem, use normal dma_ops
* for everything else.
@@ -2479,9 +2479,9 @@ diff -urNp linux-2.6.38/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.38-new/arch/
.alloc_coherent = dma_direct_alloc_coherent,
.free_coherent = dma_direct_free_coherent,
.map_sg = swiotlb_map_sg_attrs,
-diff -urNp linux-2.6.38/arch/powerpc/kernel/exceptions-64e.S linux-2.6.38-new/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.38/arch/powerpc/kernel/exceptions-64e.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/kernel/exceptions-64e.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/kernel/exceptions-64e.S linux-2.6.38.1/arch/powerpc/kernel/exceptions-64e.S
+--- linux-2.6.38.1/arch/powerpc/kernel/exceptions-64e.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/kernel/exceptions-64e.S 2011-03-21 18:31:35.000000000 -0400
@@ -495,6 +495,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
@@ -2500,9 +2500,9 @@ diff -urNp linux-2.6.38/arch/powerpc/kernel/exceptions-64e.S linux-2.6.38-new/ar
addi r3,r1,STACK_FRAME_OVERHEAD
ld r4,_DAR(r1)
bl .bad_page_fault
-diff -urNp linux-2.6.38/arch/powerpc/kernel/exceptions-64s.S linux-2.6.38-new/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.38/arch/powerpc/kernel/exceptions-64s.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/kernel/exceptions-64s.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/kernel/exceptions-64s.S linux-2.6.38.1/arch/powerpc/kernel/exceptions-64s.S
+--- linux-2.6.38.1/arch/powerpc/kernel/exceptions-64s.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/kernel/exceptions-64s.S 2011-03-21 18:31:35.000000000 -0400
@@ -848,10 +848,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
@@ -2515,9 +2515,9 @@ diff -urNp linux-2.6.38/arch/powerpc/kernel/exceptions-64s.S linux-2.6.38-new/ar
mr r5,r3
addi r3,r1,STACK_FRAME_OVERHEAD
lwz r4,_DAR(r1)
-diff -urNp linux-2.6.38/arch/powerpc/kernel/ibmebus.c linux-2.6.38-new/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.38/arch/powerpc/kernel/ibmebus.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/kernel/ibmebus.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/kernel/ibmebus.c linux-2.6.38.1/arch/powerpc/kernel/ibmebus.c
+--- linux-2.6.38.1/arch/powerpc/kernel/ibmebus.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/kernel/ibmebus.c 2011-03-21 18:31:35.000000000 -0400
@@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct
return 1;
}
@@ -2527,9 +2527,9 @@ diff -urNp linux-2.6.38/arch/powerpc/kernel/ibmebus.c linux-2.6.38-new/arch/powe
.alloc_coherent = ibmebus_alloc_coherent,
.free_coherent = ibmebus_free_coherent,
.map_sg = ibmebus_map_sg,
-diff -urNp linux-2.6.38/arch/powerpc/kernel/kgdb.c linux-2.6.38-new/arch/powerpc/kernel/kgdb.c
---- linux-2.6.38/arch/powerpc/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/kernel/kgdb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/kernel/kgdb.c linux-2.6.38.1/arch/powerpc/kernel/kgdb.c
+--- linux-2.6.38.1/arch/powerpc/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/kernel/kgdb.c 2011-03-21 18:31:35.000000000 -0400
@@ -422,7 +422,7 @@ int kgdb_arch_handle_exception(int vecto
/*
* Global data
@@ -2539,9 +2539,9 @@ diff -urNp linux-2.6.38/arch/powerpc/kernel/kgdb.c linux-2.6.38-new/arch/powerpc
.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
};
-diff -urNp linux-2.6.38/arch/powerpc/kernel/module_32.c linux-2.6.38-new/arch/powerpc/kernel/module_32.c
---- linux-2.6.38/arch/powerpc/kernel/module_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/kernel/module_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/kernel/module_32.c linux-2.6.38.1/arch/powerpc/kernel/module_32.c
+--- linux-2.6.38.1/arch/powerpc/kernel/module_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/kernel/module_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
me->arch.core_plt_section = i;
}
@@ -2571,9 +2571,9 @@ diff -urNp linux-2.6.38/arch/powerpc/kernel/module_32.c linux-2.6.38-new/arch/po
/* Find this entry, or if that fails, the next avail. entry */
while (entry->jump[0]) {
-diff -urNp linux-2.6.38/arch/powerpc/kernel/module.c linux-2.6.38-new/arch/powerpc/kernel/module.c
---- linux-2.6.38/arch/powerpc/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/kernel/module.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/kernel/module.c linux-2.6.38.1/arch/powerpc/kernel/module.c
+--- linux-2.6.38.1/arch/powerpc/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/kernel/module.c 2011-03-21 18:31:35.000000000 -0400
@@ -31,11 +31,24 @@
LIST_HEAD(module_bug_list);
@@ -2613,9 +2613,9 @@ diff -urNp linux-2.6.38/arch/powerpc/kernel/module.c linux-2.6.38-new/arch/power
static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs,
const char *name)
-diff -urNp linux-2.6.38/arch/powerpc/kernel/pci-common.c linux-2.6.38-new/arch/powerpc/kernel/pci-common.c
---- linux-2.6.38/arch/powerpc/kernel/pci-common.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/kernel/pci-common.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/kernel/pci-common.c linux-2.6.38.1/arch/powerpc/kernel/pci-common.c
+--- linux-2.6.38.1/arch/powerpc/kernel/pci-common.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/kernel/pci-common.c 2011-03-21 18:31:35.000000000 -0400
@@ -52,14 +52,14 @@ resource_size_t isa_mem_base;
unsigned int ppc_pci_flags = 0;
@@ -2634,9 +2634,9 @@ diff -urNp linux-2.6.38/arch/powerpc/kernel/pci-common.c linux-2.6.38-new/arch/p
{
return pci_dma_ops;
}
-diff -urNp linux-2.6.38/arch/powerpc/kernel/process.c linux-2.6.38-new/arch/powerpc/kernel/process.c
---- linux-2.6.38/arch/powerpc/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/kernel/process.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/kernel/process.c linux-2.6.38.1/arch/powerpc/kernel/process.c
+--- linux-2.6.38.1/arch/powerpc/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/kernel/process.c 2011-03-21 18:31:35.000000000 -0400
@@ -655,8 +655,8 @@ void show_regs(struct pt_regs * regs)
* Lookup NIP late so we have the best change of getting the
* above info out without failing
@@ -2729,9 +2729,9 @@ diff -urNp linux-2.6.38/arch/powerpc/kernel/process.c linux-2.6.38-new/arch/powe
-
- return ret;
-}
-diff -urNp linux-2.6.38/arch/powerpc/kernel/signal_32.c linux-2.6.38-new/arch/powerpc/kernel/signal_32.c
---- linux-2.6.38/arch/powerpc/kernel/signal_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/kernel/signal_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/kernel/signal_32.c linux-2.6.38.1/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.38.1/arch/powerpc/kernel/signal_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/kernel/signal_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -858,7 +858,7 @@ int handle_rt_signal32(unsigned long sig
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
@@ -2741,9 +2741,9 @@ diff -urNp linux-2.6.38/arch/powerpc/kernel/signal_32.c linux-2.6.38-new/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.38/arch/powerpc/kernel/signal_64.c linux-2.6.38-new/arch/powerpc/kernel/signal_64.c
---- linux-2.6.38/arch/powerpc/kernel/signal_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/kernel/signal_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/kernel/signal_64.c linux-2.6.38.1/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.38.1/arch/powerpc/kernel/signal_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/kernel/signal_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
current->thread.fpscr.val = 0;
@@ -2753,9 +2753,9 @@ diff -urNp linux-2.6.38/arch/powerpc/kernel/signal_64.c linux-2.6.38-new/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.38/arch/powerpc/kernel/vdso.c linux-2.6.38-new/arch/powerpc/kernel/vdso.c
---- linux-2.6.38/arch/powerpc/kernel/vdso.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/kernel/vdso.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/kernel/vdso.c linux-2.6.38.1/arch/powerpc/kernel/vdso.c
+--- linux-2.6.38.1/arch/powerpc/kernel/vdso.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/kernel/vdso.c 2011-03-21 18:31:35.000000000 -0400
@@ -36,6 +36,7 @@
#include <asm/firmware.h>
#include <asm/vdso.h>
@@ -2782,9 +2782,9 @@ diff -urNp linux-2.6.38/arch/powerpc/kernel/vdso.c linux-2.6.38-new/arch/powerpc
if (IS_ERR_VALUE(vdso_base)) {
rc = vdso_base;
goto fail_mmapsem;
-diff -urNp linux-2.6.38/arch/powerpc/kernel/vio.c linux-2.6.38-new/arch/powerpc/kernel/vio.c
---- linux-2.6.38/arch/powerpc/kernel/vio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/kernel/vio.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/kernel/vio.c linux-2.6.38.1/arch/powerpc/kernel/vio.c
+--- linux-2.6.38.1/arch/powerpc/kernel/vio.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/kernel/vio.c 2011-03-21 18:31:35.000000000 -0400
@@ -605,11 +605,12 @@ static int vio_dma_iommu_dma_supported(s
return dma_iommu_ops.dma_supported(dev, mask);
}
@@ -2799,9 +2799,9 @@ diff -urNp linux-2.6.38/arch/powerpc/kernel/vio.c linux-2.6.38-new/arch/powerpc/
.map_page = vio_dma_iommu_map_page,
.unmap_page = vio_dma_iommu_unmap_page,
.dma_supported = vio_dma_iommu_dma_supported,
-diff -urNp linux-2.6.38/arch/powerpc/lib/usercopy_64.c linux-2.6.38-new/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.38/arch/powerpc/lib/usercopy_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/lib/usercopy_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/lib/usercopy_64.c linux-2.6.38.1/arch/powerpc/lib/usercopy_64.c
+--- linux-2.6.38.1/arch/powerpc/lib/usercopy_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/lib/usercopy_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -9,22 +9,6 @@
#include <linux/module.h>
#include <asm/uaccess.h>
@@ -2833,9 +2833,9 @@ diff -urNp linux-2.6.38/arch/powerpc/lib/usercopy_64.c linux-2.6.38-new/arch/pow
-EXPORT_SYMBOL(copy_to_user);
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-2.6.38/arch/powerpc/mm/fault.c linux-2.6.38-new/arch/powerpc/mm/fault.c
---- linux-2.6.38/arch/powerpc/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/mm/fault.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/mm/fault.c linux-2.6.38.1/arch/powerpc/mm/fault.c
+--- linux-2.6.38.1/arch/powerpc/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/mm/fault.c 2011-03-21 18:31:35.000000000 -0400
@@ -31,6 +31,10 @@
#include <linux/kdebug.h>
#include <linux/perf_event.h>
@@ -2940,9 +2940,9 @@ diff -urNp linux-2.6.38/arch/powerpc/mm/fault.c linux-2.6.38-new/arch/powerpc/mm
_exception(SIGSEGV, regs, code, address);
return 0;
}
-diff -urNp linux-2.6.38/arch/powerpc/mm/mmap_64.c linux-2.6.38-new/arch/powerpc/mm/mmap_64.c
---- linux-2.6.38/arch/powerpc/mm/mmap_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/mm/mmap_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/mm/mmap_64.c linux-2.6.38.1/arch/powerpc/mm/mmap_64.c
+--- linux-2.6.38.1/arch/powerpc/mm/mmap_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/mm/mmap_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -2966,9 +2966,9 @@ diff -urNp linux-2.6.38/arch/powerpc/mm/mmap_64.c linux-2.6.38-new/arch/powerpc/
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.38/arch/powerpc/mm/slice.c linux-2.6.38-new/arch/powerpc/mm/slice.c
---- linux-2.6.38/arch/powerpc/mm/slice.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/mm/slice.c 2011-03-21 23:47:41.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/mm/slice.c linux-2.6.38.1/arch/powerpc/mm/slice.c
+--- linux-2.6.38.1/arch/powerpc/mm/slice.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/mm/slice.c 2011-03-21 23:47:41.000000000 -0400
@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
if ((mm->task_size - len) < addr)
return 0;
@@ -3035,9 +3035,9 @@ diff -urNp linux-2.6.38/arch/powerpc/mm/slice.c linux-2.6.38-new/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.38/arch/powerpc/platforms/cell/iommu.c linux-2.6.38-new/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.38/arch/powerpc/platforms/cell/iommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/platforms/cell/iommu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/platforms/cell/iommu.c linux-2.6.38.1/arch/powerpc/platforms/cell/iommu.c
+--- linux-2.6.38.1/arch/powerpc/platforms/cell/iommu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/platforms/cell/iommu.c 2011-03-21 18:31:35.000000000 -0400
@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -3047,9 +3047,9 @@ diff -urNp linux-2.6.38/arch/powerpc/platforms/cell/iommu.c linux-2.6.38-new/arc
.alloc_coherent = dma_fixed_alloc_coherent,
.free_coherent = dma_fixed_free_coherent,
.map_sg = dma_fixed_map_sg,
-diff -urNp linux-2.6.38/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.38-new/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.38/arch/powerpc/platforms/ps3/system-bus.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/platforms/ps3/system-bus.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.38.1/arch/powerpc/platforms/ps3/system-bus.c
+--- linux-2.6.38.1/arch/powerpc/platforms/ps3/system-bus.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/platforms/ps3/system-bus.c 2011-03-21 18:31:35.000000000 -0400
@@ -695,7 +695,7 @@ static int ps3_dma_supported(struct devi
return mask >= DMA_BIT_MASK(32);
}
@@ -3068,9 +3068,9 @@ diff -urNp linux-2.6.38/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.38-new
.alloc_coherent = ps3_alloc_coherent,
.free_coherent = ps3_free_coherent,
.map_sg = ps3_ioc0_map_sg,
-diff -urNp linux-2.6.38/arch/powerpc/sysdev/ppc4xx_cpm.c linux-2.6.38-new/arch/powerpc/sysdev/ppc4xx_cpm.c
---- linux-2.6.38/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/powerpc/sysdev/ppc4xx_cpm.c linux-2.6.38.1/arch/powerpc/sysdev/ppc4xx_cpm.c
+--- linux-2.6.38.1/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-03-21 18:31:35.000000000 -0400
@@ -240,7 +240,7 @@ static int cpm_suspend_enter(suspend_sta
return 0;
}
@@ -3080,9 +3080,9 @@ diff -urNp linux-2.6.38/arch/powerpc/sysdev/ppc4xx_cpm.c linux-2.6.38-new/arch/p
.valid = cpm_suspend_valid,
.enter = cpm_suspend_enter,
};
-diff -urNp linux-2.6.38/arch/s390/include/asm/elf.h linux-2.6.38-new/arch/s390/include/asm/elf.h
---- linux-2.6.38/arch/s390/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/s390/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/s390/include/asm/elf.h linux-2.6.38.1/arch/s390/include/asm/elf.h
+--- linux-2.6.38.1/arch/s390/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/s390/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
@@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -3108,9 +3108,9 @@ diff -urNp linux-2.6.38/arch/s390/include/asm/elf.h linux-2.6.38-new/arch/s390/i
-#define arch_randomize_brk arch_randomize_brk
-
#endif
-diff -urNp linux-2.6.38/arch/s390/include/asm/system.h linux-2.6.38-new/arch/s390/include/asm/system.h
---- linux-2.6.38/arch/s390/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/s390/include/asm/system.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/s390/include/asm/system.h linux-2.6.38.1/arch/s390/include/asm/system.h
+--- linux-2.6.38.1/arch/s390/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/s390/include/asm/system.h 2011-03-21 18:31:35.000000000 -0400
@@ -449,7 +449,7 @@ extern void (*_machine_restart)(char *co
extern void (*_machine_halt)(void);
extern void (*_machine_power_off)(void);
@@ -3120,9 +3120,9 @@ diff -urNp linux-2.6.38/arch/s390/include/asm/system.h linux-2.6.38-new/arch/s39
static inline int tprot(unsigned long addr)
{
-diff -urNp linux-2.6.38/arch/s390/include/asm/uaccess.h linux-2.6.38-new/arch/s390/include/asm/uaccess.h
---- linux-2.6.38/arch/s390/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/s390/include/asm/uaccess.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/s390/include/asm/uaccess.h linux-2.6.38.1/arch/s390/include/asm/uaccess.h
+--- linux-2.6.38.1/arch/s390/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/s390/include/asm/uaccess.h 2011-03-21 18:31:35.000000000 -0400
@@ -234,6 +234,10 @@ static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long n)
{
@@ -3155,9 +3155,9 @@ diff -urNp linux-2.6.38/arch/s390/include/asm/uaccess.h linux-2.6.38-new/arch/s3
if (unlikely(sz != -1 && sz < n)) {
copy_from_user_overflow();
return n;
-diff -urNp linux-2.6.38/arch/s390/Kconfig linux-2.6.38-new/arch/s390/Kconfig
---- linux-2.6.38/arch/s390/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/s390/Kconfig 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/s390/Kconfig linux-2.6.38.1/arch/s390/Kconfig
+--- linux-2.6.38.1/arch/s390/Kconfig 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/s390/Kconfig 2011-03-21 18:31:35.000000000 -0400
@@ -233,11 +233,9 @@ config S390_EXEC_PROTECT
prompt "Data execute protection"
help
@@ -3173,9 +3173,9 @@ diff -urNp linux-2.6.38/arch/s390/Kconfig linux-2.6.38-new/arch/s390/Kconfig
comment "Code generation options"
-diff -urNp linux-2.6.38/arch/s390/kernel/module.c linux-2.6.38-new/arch/s390/kernel/module.c
---- linux-2.6.38/arch/s390/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/s390/kernel/module.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/s390/kernel/module.c linux-2.6.38.1/arch/s390/kernel/module.c
+--- linux-2.6.38.1/arch/s390/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/s390/kernel/module.c 2011-03-21 18:31:35.000000000 -0400
@@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
/* Increase core size by size of got & plt and set start
@@ -3247,9 +3247,9 @@ diff -urNp linux-2.6.38/arch/s390/kernel/module.c linux-2.6.38-new/arch/s390/ker
rela->r_addend - loc;
if (r_type == R_390_GOTPC)
*(unsigned int *) loc = val;
-diff -urNp linux-2.6.38/arch/s390/kernel/process.c linux-2.6.38-new/arch/s390/kernel/process.c
---- linux-2.6.38/arch/s390/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/s390/kernel/process.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/s390/kernel/process.c linux-2.6.38.1/arch/s390/kernel/process.c
+--- linux-2.6.38.1/arch/s390/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/s390/kernel/process.c 2011-03-21 18:31:35.000000000 -0400
@@ -334,39 +334,3 @@ unsigned long get_wchan(struct task_stru
}
return 0;
@@ -3290,9 +3290,9 @@ diff -urNp linux-2.6.38/arch/s390/kernel/process.c linux-2.6.38-new/arch/s390/ke
- return base;
- return ret;
-}
-diff -urNp linux-2.6.38/arch/s390/kernel/setup.c linux-2.6.38-new/arch/s390/kernel/setup.c
---- linux-2.6.38/arch/s390/kernel/setup.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/s390/kernel/setup.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/s390/kernel/setup.c linux-2.6.38.1/arch/s390/kernel/setup.c
+--- linux-2.6.38.1/arch/s390/kernel/setup.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/s390/kernel/setup.c 2011-03-21 18:31:35.000000000 -0400
@@ -281,7 +281,7 @@ static int __init early_parse_mem(char *
}
early_param("mem", early_parse_mem);
@@ -3341,9 +3341,9 @@ diff -urNp linux-2.6.38/arch/s390/kernel/setup.c linux-2.6.38-new/arch/s390/kern
static void setup_addressing_mode(void)
{
if (user_mode == SECONDARY_SPACE_MODE) {
-diff -urNp linux-2.6.38/arch/s390/mm/maccess.c linux-2.6.38-new/arch/s390/mm/maccess.c
---- linux-2.6.38/arch/s390/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/s390/mm/maccess.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/s390/mm/maccess.c linux-2.6.38.1/arch/s390/mm/maccess.c
+--- linux-2.6.38.1/arch/s390/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/s390/mm/maccess.c 2011-03-21 18:31:35.000000000 -0400
@@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void
return rc ? rc : count;
}
@@ -3353,9 +3353,9 @@ diff -urNp linux-2.6.38/arch/s390/mm/maccess.c linux-2.6.38-new/arch/s390/mm/mac
{
long copied = 0;
-diff -urNp linux-2.6.38/arch/s390/mm/mmap.c linux-2.6.38-new/arch/s390/mm/mmap.c
---- linux-2.6.38/arch/s390/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/s390/mm/mmap.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/s390/mm/mmap.c linux-2.6.38.1/arch/s390/mm/mmap.c
+--- linux-2.6.38.1/arch/s390/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/s390/mm/mmap.c 2011-03-21 18:31:35.000000000 -0400
@@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -3402,9 +3402,9 @@ diff -urNp linux-2.6.38/arch/s390/mm/mmap.c linux-2.6.38-new/arch/s390/mm/mmap.c
mm->get_unmapped_area = s390_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.38/arch/score/include/asm/system.h linux-2.6.38-new/arch/score/include/asm/system.h
---- linux-2.6.38/arch/score/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/score/include/asm/system.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/score/include/asm/system.h linux-2.6.38.1/arch/score/include/asm/system.h
+--- linux-2.6.38.1/arch/score/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/score/include/asm/system.h 2011-03-21 18:31:35.000000000 -0400
@@ -17,7 +17,7 @@ do { \
#define finish_arch_switch(prev) do {} while (0)
@@ -3414,9 +3414,9 @@ diff -urNp linux-2.6.38/arch/score/include/asm/system.h linux-2.6.38-new/arch/sc
#define mb() barrier()
#define rmb() barrier()
-diff -urNp linux-2.6.38/arch/score/kernel/process.c linux-2.6.38-new/arch/score/kernel/process.c
---- linux-2.6.38/arch/score/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/score/kernel/process.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/score/kernel/process.c linux-2.6.38.1/arch/score/kernel/process.c
+--- linux-2.6.38.1/arch/score/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/score/kernel/process.c 2011-03-21 18:31:35.000000000 -0400
@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
return task_pt_regs(task)->cp0_epc;
@@ -3426,9 +3426,9 @@ diff -urNp linux-2.6.38/arch/score/kernel/process.c linux-2.6.38-new/arch/score/
-{
- return sp;
-}
-diff -urNp linux-2.6.38/arch/sh/include/asm/dma-mapping.h linux-2.6.38-new/arch/sh/include/asm/dma-mapping.h
---- linux-2.6.38/arch/sh/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sh/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sh/include/asm/dma-mapping.h linux-2.6.38.1/arch/sh/include/asm/dma-mapping.h
+--- linux-2.6.38.1/arch/sh/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sh/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
@@ -1,10 +1,10 @@
#ifndef __ASM_SH_DMA_MAPPING_H
#define __ASM_SH_DMA_MAPPING_H
@@ -3487,9 +3487,9 @@ diff -urNp linux-2.6.38/arch/sh/include/asm/dma-mapping.h linux-2.6.38-new/arch/
if (dma_release_from_coherent(dev, get_order(size), vaddr))
return;
-diff -urNp linux-2.6.38/arch/sh/kernel/dma-nommu.c linux-2.6.38-new/arch/sh/kernel/dma-nommu.c
---- linux-2.6.38/arch/sh/kernel/dma-nommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sh/kernel/dma-nommu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sh/kernel/dma-nommu.c linux-2.6.38.1/arch/sh/kernel/dma-nommu.c
+--- linux-2.6.38.1/arch/sh/kernel/dma-nommu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sh/kernel/dma-nommu.c 2011-03-21 18:31:35.000000000 -0400
@@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device
}
#endif
@@ -3499,9 +3499,9 @@ diff -urNp linux-2.6.38/arch/sh/kernel/dma-nommu.c linux-2.6.38-new/arch/sh/kern
.alloc_coherent = dma_generic_alloc_coherent,
.free_coherent = dma_generic_free_coherent,
.map_page = nommu_map_page,
-diff -urNp linux-2.6.38/arch/sh/kernel/kgdb.c linux-2.6.38-new/arch/sh/kernel/kgdb.c
---- linux-2.6.38/arch/sh/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sh/kernel/kgdb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sh/kernel/kgdb.c linux-2.6.38.1/arch/sh/kernel/kgdb.c
+--- linux-2.6.38.1/arch/sh/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sh/kernel/kgdb.c 2011-03-21 18:31:35.000000000 -0400
@@ -319,7 +319,7 @@ void kgdb_arch_exit(void)
unregister_die_notifier(&kgdb_notifier);
}
@@ -3511,9 +3511,9 @@ diff -urNp linux-2.6.38/arch/sh/kernel/kgdb.c linux-2.6.38-new/arch/sh/kernel/kg
/* Breakpoint instruction: trapa #0x3c */
#ifdef CONFIG_CPU_LITTLE_ENDIAN
.gdb_bpt_instr = { 0x3c, 0xc3 },
-diff -urNp linux-2.6.38/arch/sh/mm/consistent.c linux-2.6.38-new/arch/sh/mm/consistent.c
---- linux-2.6.38/arch/sh/mm/consistent.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sh/mm/consistent.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sh/mm/consistent.c linux-2.6.38.1/arch/sh/mm/consistent.c
+--- linux-2.6.38.1/arch/sh/mm/consistent.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sh/mm/consistent.c 2011-03-21 18:31:35.000000000 -0400
@@ -22,7 +22,7 @@
#define PREALLOC_DMA_DEBUG_ENTRIES 4096
@@ -3523,9 +3523,9 @@ diff -urNp linux-2.6.38/arch/sh/mm/consistent.c linux-2.6.38-new/arch/sh/mm/cons
EXPORT_SYMBOL(dma_ops);
static int __init dma_init(void)
-diff -urNp linux-2.6.38/arch/sh/mm/mmap.c linux-2.6.38-new/arch/sh/mm/mmap.c
---- linux-2.6.38/arch/sh/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sh/mm/mmap.c 2011-03-21 23:47:41.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sh/mm/mmap.c linux-2.6.38.1/arch/sh/mm/mmap.c
+--- linux-2.6.38.1/arch/sh/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sh/mm/mmap.c 2011-03-21 23:47:41.000000000 -0400
@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
addr = PAGE_ALIGN(addr);
@@ -3600,9 +3600,9 @@ diff -urNp linux-2.6.38/arch/sh/mm/mmap.c linux-2.6.38-new/arch/sh/mm/mmap.c
bottomup:
/*
-diff -urNp linux-2.6.38/arch/sparc/include/asm/atomic_64.h linux-2.6.38-new/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.38/arch/sparc/include/asm/atomic_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/include/asm/atomic_64.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/include/asm/atomic_64.h linux-2.6.38.1/arch/sparc/include/asm/atomic_64.h
+--- linux-2.6.38.1/arch/sparc/include/asm/atomic_64.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/include/asm/atomic_64.h 2011-03-21 18:31:35.000000000 -0400
@@ -14,18 +14,40 @@
#define ATOMIC64_INIT(i) { (i) }
@@ -3762,9 +3762,9 @@ diff -urNp linux-2.6.38/arch/sparc/include/asm/atomic_64.h linux-2.6.38-new/arch
}
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.38/arch/sparc/include/asm/dma-mapping.h linux-2.6.38-new/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.38/arch/sparc/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/include/asm/dma-mapping.h linux-2.6.38.1/arch/sparc/include/asm/dma-mapping.h
+--- linux-2.6.38.1/arch/sparc/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
@@ -12,10 +12,10 @@ extern int dma_supported(struct device *
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
@@ -3796,9 +3796,9 @@ diff -urNp linux-2.6.38/arch/sparc/include/asm/dma-mapping.h linux-2.6.38-new/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.38/arch/sparc/include/asm/elf_32.h linux-2.6.38-new/arch/sparc/include/asm/elf_32.h
---- linux-2.6.38/arch/sparc/include/asm/elf_32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/include/asm/elf_32.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/include/asm/elf_32.h linux-2.6.38.1/arch/sparc/include/asm/elf_32.h
+--- linux-2.6.38.1/arch/sparc/include/asm/elf_32.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/include/asm/elf_32.h 2011-03-21 18:31:35.000000000 -0400
@@ -114,6 +114,13 @@ typedef struct {
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -3813,9 +3813,9 @@ diff -urNp linux-2.6.38/arch/sparc/include/asm/elf_32.h linux-2.6.38-new/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.38/arch/sparc/include/asm/elf_64.h linux-2.6.38-new/arch/sparc/include/asm/elf_64.h
---- linux-2.6.38/arch/sparc/include/asm/elf_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/include/asm/elf_64.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/include/asm/elf_64.h linux-2.6.38.1/arch/sparc/include/asm/elf_64.h
+--- linux-2.6.38.1/arch/sparc/include/asm/elf_64.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/include/asm/elf_64.h 2011-03-21 18:31:35.000000000 -0400
@@ -162,6 +162,12 @@ typedef struct {
#define ELF_ET_DYN_BASE 0x0000010000000000UL
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -3829,9 +3829,9 @@ diff -urNp linux-2.6.38/arch/sparc/include/asm/elf_64.h linux-2.6.38-new/arch/sp
/* This yields a mask that user programs can use to figure out what
instruction set this cpu supports. */
-diff -urNp linux-2.6.38/arch/sparc/include/asm/pgtable_32.h linux-2.6.38-new/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.38/arch/sparc/include/asm/pgtable_32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/include/asm/pgtable_32.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/include/asm/pgtable_32.h linux-2.6.38.1/arch/sparc/include/asm/pgtable_32.h
+--- linux-2.6.38.1/arch/sparc/include/asm/pgtable_32.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/include/asm/pgtable_32.h 2011-03-21 18:31:35.000000000 -0400
@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
BTFIXUPDEF_INT(page_none)
BTFIXUPDEF_INT(page_copy)
@@ -3863,9 +3863,9 @@ diff -urNp linux-2.6.38/arch/sparc/include/asm/pgtable_32.h linux-2.6.38-new/arc
extern unsigned long page_kernel;
#ifdef MODULE
-diff -urNp linux-2.6.38/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.38-new/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.38/arch/sparc/include/asm/pgtsrmmu.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/include/asm/pgtsrmmu.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.38.1/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-2.6.38.1/arch/sparc/include/asm/pgtsrmmu.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/include/asm/pgtsrmmu.h 2011-03-21 18:31:35.000000000 -0400
@@ -115,6 +115,13 @@
SRMMU_EXEC | SRMMU_REF)
#define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3880,9 +3880,9 @@ diff -urNp linux-2.6.38/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.38-new/arch/
#define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
SRMMU_DIRTY | SRMMU_REF)
-diff -urNp linux-2.6.38/arch/sparc/include/asm/spinlock_64.h linux-2.6.38-new/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.38/arch/sparc/include/asm/spinlock_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/include/asm/spinlock_64.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.1/arch/sparc/include/asm/spinlock_64.h
+--- linux-2.6.38.1/arch/sparc/include/asm/spinlock_64.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/include/asm/spinlock_64.h 2011-03-21 18:31:35.000000000 -0400
@@ -99,7 +99,12 @@ static void inline arch_read_lock(arch_r
__asm__ __volatile__ (
"1: ldsw [%2], %0\n"
@@ -3934,9 +3934,9 @@ diff -urNp linux-2.6.38/arch/sparc/include/asm/spinlock_64.h linux-2.6.38-new/ar
" cas [%2], %0, %1\n"
" cmp %0, %1\n"
" bne,pn %%xcc, 1b\n"
-diff -urNp linux-2.6.38/arch/sparc/include/asm/uaccess_32.h linux-2.6.38-new/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.38/arch/sparc/include/asm/uaccess_32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/include/asm/uaccess_32.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/include/asm/uaccess_32.h linux-2.6.38.1/arch/sparc/include/asm/uaccess_32.h
+--- linux-2.6.38.1/arch/sparc/include/asm/uaccess_32.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/include/asm/uaccess_32.h 2011-03-21 18:31:35.000000000 -0400
@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3988,9 +3988,9 @@ diff -urNp linux-2.6.38/arch/sparc/include/asm/uaccess_32.h linux-2.6.38-new/arc
return __copy_user((__force void __user *) to, from, n);
}
-diff -urNp linux-2.6.38/arch/sparc/include/asm/uaccess_64.h linux-2.6.38-new/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.38/arch/sparc/include/asm/uaccess_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/include/asm/uaccess_64.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/include/asm/uaccess_64.h linux-2.6.38.1/arch/sparc/include/asm/uaccess_64.h
+--- linux-2.6.38.1/arch/sparc/include/asm/uaccess_64.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/include/asm/uaccess_64.h 2011-03-21 18:31:35.000000000 -0400
@@ -10,6 +10,7 @@
#include <linux/compiler.h>
#include <linux/string.h>
@@ -4033,9 +4033,9 @@ diff -urNp linux-2.6.38/arch/sparc/include/asm/uaccess_64.h linux-2.6.38-new/arc
if (unlikely(ret))
ret = copy_to_user_fixup(to, from, size);
return ret;
-diff -urNp linux-2.6.38/arch/sparc/include/asm/uaccess.h linux-2.6.38-new/arch/sparc/include/asm/uaccess.h
---- linux-2.6.38/arch/sparc/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/include/asm/uaccess.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/include/asm/uaccess.h linux-2.6.38.1/arch/sparc/include/asm/uaccess.h
+--- linux-2.6.38.1/arch/sparc/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/include/asm/uaccess.h 2011-03-21 18:31:35.000000000 -0400
@@ -1,5 +1,13 @@
#ifndef ___ASM_SPARC_UACCESS_H
#define ___ASM_SPARC_UACCESS_H
@@ -4050,9 +4050,9 @@ diff -urNp linux-2.6.38/arch/sparc/include/asm/uaccess.h linux-2.6.38-new/arch/s
#if defined(__sparc__) && defined(__arch64__)
#include <asm/uaccess_64.h>
#else
-diff -urNp linux-2.6.38/arch/sparc/kernel/iommu.c linux-2.6.38-new/arch/sparc/kernel/iommu.c
---- linux-2.6.38/arch/sparc/kernel/iommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/kernel/iommu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/kernel/iommu.c linux-2.6.38.1/arch/sparc/kernel/iommu.c
+--- linux-2.6.38.1/arch/sparc/kernel/iommu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/kernel/iommu.c 2011-03-21 18:31:35.000000000 -0400
@@ -827,7 +827,7 @@ static void dma_4u_sync_sg_for_cpu(struc
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -4071,9 +4071,9 @@ diff -urNp linux-2.6.38/arch/sparc/kernel/iommu.c linux-2.6.38-new/arch/sparc/ke
EXPORT_SYMBOL(dma_ops);
extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
-diff -urNp linux-2.6.38/arch/sparc/kernel/ioport.c linux-2.6.38-new/arch/sparc/kernel/ioport.c
---- linux-2.6.38/arch/sparc/kernel/ioport.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/kernel/ioport.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/kernel/ioport.c linux-2.6.38.1/arch/sparc/kernel/ioport.c
+--- linux-2.6.38.1/arch/sparc/kernel/ioport.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/kernel/ioport.c 2011-03-21 18:31:35.000000000 -0400
@@ -397,7 +397,7 @@ static void sbus_sync_sg_for_device(stru
BUG();
}
@@ -4101,9 +4101,9 @@ diff -urNp linux-2.6.38/arch/sparc/kernel/ioport.c linux-2.6.38-new/arch/sparc/k
.alloc_coherent = pci32_alloc_coherent,
.free_coherent = pci32_free_coherent,
.map_page = pci32_map_page,
-diff -urNp linux-2.6.38/arch/sparc/kernel/kgdb_32.c linux-2.6.38-new/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.38/arch/sparc/kernel/kgdb_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/kernel/kgdb_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/kernel/kgdb_32.c linux-2.6.38.1/arch/sparc/kernel/kgdb_32.c
+--- linux-2.6.38.1/arch/sparc/kernel/kgdb_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/kernel/kgdb_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -164,7 +164,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
regs->npc = regs->pc + 4;
}
@@ -4113,9 +4113,9 @@ diff -urNp linux-2.6.38/arch/sparc/kernel/kgdb_32.c linux-2.6.38-new/arch/sparc/
/* Breakpoint instruction: ta 0x7d */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
};
-diff -urNp linux-2.6.38/arch/sparc/kernel/kgdb_64.c linux-2.6.38-new/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.38/arch/sparc/kernel/kgdb_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/kernel/kgdb_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/kernel/kgdb_64.c linux-2.6.38.1/arch/sparc/kernel/kgdb_64.c
+--- linux-2.6.38.1/arch/sparc/kernel/kgdb_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/kernel/kgdb_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -187,7 +187,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
regs->tnpc = regs->tpc + 4;
}
@@ -4125,9 +4125,9 @@ diff -urNp linux-2.6.38/arch/sparc/kernel/kgdb_64.c linux-2.6.38-new/arch/sparc/
/* Breakpoint instruction: ta 0x72 */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
};
-diff -urNp linux-2.6.38/arch/sparc/kernel/Makefile linux-2.6.38-new/arch/sparc/kernel/Makefile
---- linux-2.6.38/arch/sparc/kernel/Makefile 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/kernel/Makefile 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/kernel/Makefile linux-2.6.38.1/arch/sparc/kernel/Makefile
+--- linux-2.6.38.1/arch/sparc/kernel/Makefile 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/kernel/Makefile 2011-03-21 18:31:35.000000000 -0400
@@ -3,7 +3,7 @@
#
@@ -4137,9 +4137,9 @@ diff -urNp linux-2.6.38/arch/sparc/kernel/Makefile linux-2.6.38-new/arch/sparc/k
extra-y := head_$(BITS).o
extra-y += init_task.o
-diff -urNp linux-2.6.38/arch/sparc/kernel/pci_sun4v.c linux-2.6.38-new/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.38/arch/sparc/kernel/pci_sun4v.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/kernel/pci_sun4v.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/kernel/pci_sun4v.c linux-2.6.38.1/arch/sparc/kernel/pci_sun4v.c
+--- linux-2.6.38.1/arch/sparc/kernel/pci_sun4v.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/kernel/pci_sun4v.c 2011-03-21 18:31:35.000000000 -0400
@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -4149,9 +4149,9 @@ diff -urNp linux-2.6.38/arch/sparc/kernel/pci_sun4v.c linux-2.6.38-new/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.38/arch/sparc/kernel/process_32.c linux-2.6.38-new/arch/sparc/kernel/process_32.c
---- linux-2.6.38/arch/sparc/kernel/process_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/kernel/process_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/kernel/process_32.c linux-2.6.38.1/arch/sparc/kernel/process_32.c
+--- linux-2.6.38.1/arch/sparc/kernel/process_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/kernel/process_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
rw->ins[4], rw->ins[5],
rw->ins[6],
@@ -4187,9 +4187,9 @@ diff -urNp linux-2.6.38/arch/sparc/kernel/process_32.c linux-2.6.38-new/arch/spa
fp = rw->ins[6];
} while (++count < 16);
printk("\n");
-diff -urNp linux-2.6.38/arch/sparc/kernel/process_64.c linux-2.6.38-new/arch/sparc/kernel/process_64.c
---- linux-2.6.38/arch/sparc/kernel/process_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/kernel/process_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/kernel/process_64.c linux-2.6.38.1/arch/sparc/kernel/process_64.c
+--- linux-2.6.38.1/arch/sparc/kernel/process_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/kernel/process_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
@@ -4225,9 +4225,9 @@ diff -urNp linux-2.6.38/arch/sparc/kernel/process_64.c linux-2.6.38-new/arch/spa
(void *) gp->tpc,
(void *) gp->o7,
(void *) gp->i7,
-diff -urNp linux-2.6.38/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38-new/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.38/arch/sparc/kernel/sys_sparc_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/kernel/sys_sparc_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38.1/arch/sparc/kernel/sys_sparc_32.c
+--- linux-2.6.38.1/arch/sparc/kernel/sys_sparc_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/kernel/sys_sparc_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str
if (ARCH_SUN4C && len > 0x20000000)
return -ENOMEM;
@@ -4246,9 +4246,9 @@ diff -urNp linux-2.6.38/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38-new/arch/s
return addr;
addr = vmm->vm_end;
if (flags & MAP_SHARED)
-diff -urNp linux-2.6.38/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38-new/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.38/arch/sparc/kernel/sys_sparc_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/kernel/sys_sparc_64.c 2011-03-21 23:47:41.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.1/arch/sparc/kernel/sys_sparc_64.c
+--- linux-2.6.38.1/arch/sparc/kernel/sys_sparc_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/kernel/sys_sparc_64.c 2011-03-21 23:47:41.000000000 -0400
@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str
/* We do not accept a shared mapping if it would violate
* cache aliasing constraints.
@@ -4396,9 +4396,9 @@ diff -urNp linux-2.6.38/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38-new/arch/s
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.38/arch/sparc/kernel/traps_32.c linux-2.6.38-new/arch/sparc/kernel/traps_32.c
---- linux-2.6.38/arch/sparc/kernel/traps_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/kernel/traps_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/kernel/traps_32.c linux-2.6.38.1/arch/sparc/kernel/traps_32.c
+--- linux-2.6.38.1/arch/sparc/kernel/traps_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/kernel/traps_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_
count++ < 30 &&
(((unsigned long) rw) >= PAGE_OFFSET) &&
@@ -4408,9 +4408,9 @@ diff -urNp linux-2.6.38/arch/sparc/kernel/traps_32.c linux-2.6.38-new/arch/sparc
(void *) rw->ins[7]);
rw = (struct reg_window32 *)rw->ins[6];
}
-diff -urNp linux-2.6.38/arch/sparc/kernel/traps_64.c linux-2.6.38-new/arch/sparc/kernel/traps_64.c
---- linux-2.6.38/arch/sparc/kernel/traps_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/kernel/traps_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/kernel/traps_64.c linux-2.6.38.1/arch/sparc/kernel/traps_64.c
+--- linux-2.6.38.1/arch/sparc/kernel/traps_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/kernel/traps_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_
i + 1,
p->trapstack[i].tstate, p->trapstack[i].tpc,
@@ -4527,9 +4527,9 @@ diff -urNp linux-2.6.38/arch/sparc/kernel/traps_64.c linux-2.6.38-new/arch/sparc
(void *) rw->ins[7]);
rw = kernel_stack_up(rw);
-diff -urNp linux-2.6.38/arch/sparc/kernel/unaligned_64.c linux-2.6.38-new/arch/sparc/kernel/unaligned_64.c
---- linux-2.6.38/arch/sparc/kernel/unaligned_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/kernel/unaligned_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/kernel/unaligned_64.c linux-2.6.38.1/arch/sparc/kernel/unaligned_64.c
+--- linux-2.6.38.1/arch/sparc/kernel/unaligned_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/kernel/unaligned_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs
static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
@@ -4539,9 +4539,9 @@ diff -urNp linux-2.6.38/arch/sparc/kernel/unaligned_64.c linux-2.6.38-new/arch/s
regs->tpc, (void *) regs->tpc);
}
}
-diff -urNp linux-2.6.38/arch/sparc/lib/atomic_64.S linux-2.6.38-new/arch/sparc/lib/atomic_64.S
---- linux-2.6.38/arch/sparc/lib/atomic_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/lib/atomic_64.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/lib/atomic_64.S linux-2.6.38.1/arch/sparc/lib/atomic_64.S
+--- linux-2.6.38.1/arch/sparc/lib/atomic_64.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/lib/atomic_64.S 2011-03-21 18:31:35.000000000 -0400
@@ -18,7 +18,12 @@
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
@@ -4776,9 +4776,9 @@ diff -urNp linux-2.6.38/arch/sparc/lib/atomic_64.S linux-2.6.38-new/arch/sparc/l
casx [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
-diff -urNp linux-2.6.38/arch/sparc/lib/ksyms.c linux-2.6.38-new/arch/sparc/lib/ksyms.c
---- linux-2.6.38/arch/sparc/lib/ksyms.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/lib/ksyms.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/lib/ksyms.c linux-2.6.38.1/arch/sparc/lib/ksyms.c
+--- linux-2.6.38.1/arch/sparc/lib/ksyms.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/lib/ksyms.c 2011-03-21 18:31:35.000000000 -0400
@@ -142,12 +142,17 @@ EXPORT_SYMBOL(__downgrade_write);
/* Atomic counter implementation. */
@@ -4797,9 +4797,9 @@ diff -urNp linux-2.6.38/arch/sparc/lib/ksyms.c linux-2.6.38-new/arch/sparc/lib/k
EXPORT_SYMBOL(atomic64_sub_ret);
/* Atomic bit operations. */
-diff -urNp linux-2.6.38/arch/sparc/Makefile linux-2.6.38-new/arch/sparc/Makefile
---- linux-2.6.38/arch/sparc/Makefile 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/Makefile 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/Makefile linux-2.6.38.1/arch/sparc/Makefile
+--- linux-2.6.38.1/arch/sparc/Makefile 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/Makefile 2011-03-21 18:31:35.000000000 -0400
@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
# Export what is needed by arch/sparc/boot/Makefile
export VMLINUX_INIT VMLINUX_MAIN
@@ -4809,9 +4809,9 @@ diff -urNp linux-2.6.38/arch/sparc/Makefile linux-2.6.38-new/arch/sparc/Makefile
VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
VMLINUX_MAIN += $(drivers-y) $(net-y)
-diff -urNp linux-2.6.38/arch/sparc/mm/fault_32.c linux-2.6.38-new/arch/sparc/mm/fault_32.c
---- linux-2.6.38/arch/sparc/mm/fault_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/mm/fault_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/mm/fault_32.c linux-2.6.38.1/arch/sparc/mm/fault_32.c
+--- linux-2.6.38.1/arch/sparc/mm/fault_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/mm/fault_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -22,6 +22,9 @@
#include <linux/interrupt.h>
#include <linux/module.h>
@@ -5116,9 +5116,9 @@ diff -urNp linux-2.6.38/arch/sparc/mm/fault_32.c linux-2.6.38-new/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.38/arch/sparc/mm/fault_64.c linux-2.6.38-new/arch/sparc/mm/fault_64.c
---- linux-2.6.38/arch/sparc/mm/fault_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/mm/fault_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/mm/fault_64.c linux-2.6.38.1/arch/sparc/mm/fault_64.c
+--- linux-2.6.38.1/arch/sparc/mm/fault_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/mm/fault_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -21,6 +21,9 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -5626,9 +5626,9 @@ diff -urNp linux-2.6.38/arch/sparc/mm/fault_64.c linux-2.6.38-new/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.38/arch/sparc/mm/hugetlbpage.c linux-2.6.38-new/arch/sparc/mm/hugetlbpage.c
---- linux-2.6.38/arch/sparc/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/mm/hugetlbpage.c 2011-03-21 23:47:41.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/mm/hugetlbpage.c linux-2.6.38.1/arch/sparc/mm/hugetlbpage.c
+--- linux-2.6.38.1/arch/sparc/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/mm/hugetlbpage.c 2011-03-21 23:47:41.000000000 -0400
@@ -68,7 +68,7 @@ full_search:
}
return -ENOMEM;
@@ -5688,9 +5688,9 @@ diff -urNp linux-2.6.38/arch/sparc/mm/hugetlbpage.c linux-2.6.38-new/arch/sparc/
return addr;
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.38/arch/sparc/mm/init_32.c linux-2.6.38-new/arch/sparc/mm/init_32.c
---- linux-2.6.38/arch/sparc/mm/init_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/mm/init_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/mm/init_32.c linux-2.6.38.1/arch/sparc/mm/init_32.c
+--- linux-2.6.38.1/arch/sparc/mm/init_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/mm/init_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -318,6 +318,9 @@ extern void device_scan(void);
pgprot_t PAGE_SHARED __read_mostly;
EXPORT_SYMBOL(PAGE_SHARED);
@@ -5725,9 +5725,9 @@ diff -urNp linux-2.6.38/arch/sparc/mm/init_32.c linux-2.6.38-new/arch/sparc/mm/i
protection_map[12] = PAGE_READONLY;
protection_map[13] = PAGE_READONLY;
protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.38/arch/sparc/mm/Makefile linux-2.6.38-new/arch/sparc/mm/Makefile
---- linux-2.6.38/arch/sparc/mm/Makefile 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/mm/Makefile 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/mm/Makefile linux-2.6.38.1/arch/sparc/mm/Makefile
+--- linux-2.6.38.1/arch/sparc/mm/Makefile 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/mm/Makefile 2011-03-21 18:31:35.000000000 -0400
@@ -2,7 +2,7 @@
#
@@ -5737,9 +5737,9 @@ diff -urNp linux-2.6.38/arch/sparc/mm/Makefile linux-2.6.38-new/arch/sparc/mm/Ma
obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
obj-y += fault_$(BITS).o
-diff -urNp linux-2.6.38/arch/sparc/mm/srmmu.c linux-2.6.38-new/arch/sparc/mm/srmmu.c
---- linux-2.6.38/arch/sparc/mm/srmmu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/sparc/mm/srmmu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/sparc/mm/srmmu.c linux-2.6.38.1/arch/sparc/mm/srmmu.c
+--- linux-2.6.38.1/arch/sparc/mm/srmmu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/sparc/mm/srmmu.c 2011-03-21 18:31:35.000000000 -0400
@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -5754,9 +5754,9 @@ diff -urNp linux-2.6.38/arch/sparc/mm/srmmu.c linux-2.6.38-new/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.38/arch/um/include/asm/kmap_types.h linux-2.6.38-new/arch/um/include/asm/kmap_types.h
---- linux-2.6.38/arch/um/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/um/include/asm/kmap_types.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/um/include/asm/kmap_types.h linux-2.6.38.1/arch/um/include/asm/kmap_types.h
+--- linux-2.6.38.1/arch/um/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/um/include/asm/kmap_types.h 2011-03-21 18:31:35.000000000 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -5765,9 +5765,9 @@ diff -urNp linux-2.6.38/arch/um/include/asm/kmap_types.h linux-2.6.38-new/arch/u
KM_TYPE_NR
};
-diff -urNp linux-2.6.38/arch/um/include/asm/page.h linux-2.6.38-new/arch/um/include/asm/page.h
---- linux-2.6.38/arch/um/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/um/include/asm/page.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/um/include/asm/page.h linux-2.6.38.1/arch/um/include/asm/page.h
+--- linux-2.6.38.1/arch/um/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/um/include/asm/page.h 2011-03-21 18:31:35.000000000 -0400
@@ -14,6 +14,9 @@
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
@@ -5778,9 +5778,9 @@ diff -urNp linux-2.6.38/arch/um/include/asm/page.h linux-2.6.38-new/arch/um/incl
#ifndef __ASSEMBLY__
struct page;
-diff -urNp linux-2.6.38/arch/um/kernel/process.c linux-2.6.38-new/arch/um/kernel/process.c
---- linux-2.6.38/arch/um/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/um/kernel/process.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/um/kernel/process.c linux-2.6.38.1/arch/um/kernel/process.c
+--- linux-2.6.38.1/arch/um/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/um/kernel/process.c 2011-03-21 18:31:35.000000000 -0400
@@ -404,22 +404,6 @@ int singlestepping(void * t)
return 2;
}
@@ -5804,9 +5804,9 @@ diff -urNp linux-2.6.38/arch/um/kernel/process.c linux-2.6.38-new/arch/um/kernel
unsigned long get_wchan(struct task_struct *p)
{
unsigned long stack_page, sp, ip;
-diff -urNp linux-2.6.38/arch/um/sys-i386/syscalls.c linux-2.6.38-new/arch/um/sys-i386/syscalls.c
---- linux-2.6.38/arch/um/sys-i386/syscalls.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/um/sys-i386/syscalls.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/um/sys-i386/syscalls.c linux-2.6.38.1/arch/um/sys-i386/syscalls.c
+--- linux-2.6.38.1/arch/um/sys-i386/syscalls.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/um/sys-i386/syscalls.c 2011-03-21 18:31:35.000000000 -0400
@@ -11,6 +11,21 @@
#include "asm/uaccess.h"
#include "asm/unistd.h"
@@ -5829,9 +5829,9 @@ diff -urNp linux-2.6.38/arch/um/sys-i386/syscalls.c linux-2.6.38-new/arch/um/sys
/*
* The prototype on i386 is:
*
-diff -urNp linux-2.6.38/arch/x86/boot/bitops.h linux-2.6.38-new/arch/x86/boot/bitops.h
---- linux-2.6.38/arch/x86/boot/bitops.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/boot/bitops.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/boot/bitops.h linux-2.6.38.1/arch/x86/boot/bitops.h
+--- linux-2.6.38.1/arch/x86/boot/bitops.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/boot/bitops.h 2011-03-21 18:31:35.000000000 -0400
@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
u8 v;
const u32 *p = (const u32 *)addr;
@@ -5850,9 +5850,9 @@ diff -urNp linux-2.6.38/arch/x86/boot/bitops.h linux-2.6.38-new/arch/x86/boot/bi
}
#endif /* BOOT_BITOPS_H */
-diff -urNp linux-2.6.38/arch/x86/boot/boot.h linux-2.6.38-new/arch/x86/boot/boot.h
---- linux-2.6.38/arch/x86/boot/boot.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/boot/boot.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/boot/boot.h linux-2.6.38.1/arch/x86/boot/boot.h
+--- linux-2.6.38.1/arch/x86/boot/boot.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/boot/boot.h 2011-03-21 18:31:35.000000000 -0400
@@ -85,7 +85,7 @@ static inline void io_delay(void)
static inline u16 ds(void)
{
@@ -5871,9 +5871,9 @@ diff -urNp linux-2.6.38/arch/x86/boot/boot.h linux-2.6.38-new/arch/x86/boot/boot
: "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
return diff;
}
-diff -urNp linux-2.6.38/arch/x86/boot/compressed/head_32.S linux-2.6.38-new/arch/x86/boot/compressed/head_32.S
---- linux-2.6.38/arch/x86/boot/compressed/head_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/boot/compressed/head_32.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/boot/compressed/head_32.S linux-2.6.38.1/arch/x86/boot/compressed/head_32.S
+--- linux-2.6.38.1/arch/x86/boot/compressed/head_32.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/boot/compressed/head_32.S 2011-03-21 18:31:35.000000000 -0400
@@ -76,7 +76,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -5902,9 +5902,9 @@ diff -urNp linux-2.6.38/arch/x86/boot/compressed/head_32.S linux-2.6.38-new/arch
addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
jmp 1b
2:
-diff -urNp linux-2.6.38/arch/x86/boot/compressed/head_64.S linux-2.6.38-new/arch/x86/boot/compressed/head_64.S
---- linux-2.6.38/arch/x86/boot/compressed/head_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/boot/compressed/head_64.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/boot/compressed/head_64.S linux-2.6.38.1/arch/x86/boot/compressed/head_64.S
+--- linux-2.6.38.1/arch/x86/boot/compressed/head_64.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/boot/compressed/head_64.S 2011-03-21 18:31:35.000000000 -0400
@@ -91,7 +91,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -5923,9 +5923,9 @@ diff -urNp linux-2.6.38/arch/x86/boot/compressed/head_64.S linux-2.6.38-new/arch
#endif
/* Target address to relocate to for decompression */
-diff -urNp linux-2.6.38/arch/x86/boot/compressed/misc.c linux-2.6.38-new/arch/x86/boot/compressed/misc.c
---- linux-2.6.38/arch/x86/boot/compressed/misc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/boot/compressed/misc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/boot/compressed/misc.c linux-2.6.38.1/arch/x86/boot/compressed/misc.c
+--- linux-2.6.38.1/arch/x86/boot/compressed/misc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/boot/compressed/misc.c 2011-03-21 18:31:35.000000000 -0400
@@ -310,7 +310,7 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
@@ -5944,9 +5944,9 @@ diff -urNp linux-2.6.38/arch/x86/boot/compressed/misc.c linux-2.6.38-new/arch/x8
error("Wrong destination address");
#endif
-diff -urNp linux-2.6.38/arch/x86/boot/compressed/relocs.c linux-2.6.38-new/arch/x86/boot/compressed/relocs.c
---- linux-2.6.38/arch/x86/boot/compressed/relocs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/boot/compressed/relocs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/boot/compressed/relocs.c linux-2.6.38.1/arch/x86/boot/compressed/relocs.c
+--- linux-2.6.38.1/arch/x86/boot/compressed/relocs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/boot/compressed/relocs.c 2011-03-21 18:31:35.000000000 -0400
@@ -13,8 +13,11 @@
static void die(char *fmt, ...);
@@ -6139,9 +6139,9 @@ diff -urNp linux-2.6.38/arch/x86/boot/compressed/relocs.c linux-2.6.38-new/arch/
read_shdrs(fp);
read_strtabs(fp);
read_symtabs(fp);
-diff -urNp linux-2.6.38/arch/x86/boot/cpucheck.c linux-2.6.38-new/arch/x86/boot/cpucheck.c
---- linux-2.6.38/arch/x86/boot/cpucheck.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/boot/cpucheck.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/boot/cpucheck.c linux-2.6.38.1/arch/x86/boot/cpucheck.c
+--- linux-2.6.38.1/arch/x86/boot/cpucheck.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/boot/cpucheck.c 2011-03-21 18:31:35.000000000 -0400
@@ -74,7 +74,7 @@ static int has_fpu(void)
u16 fcw = -1, fsw = -1;
u32 cr0;
@@ -6237,9 +6237,9 @@ diff -urNp linux-2.6.38/arch/x86/boot/cpucheck.c linux-2.6.38-new/arch/x86/boot/
err = check_flags();
}
-diff -urNp linux-2.6.38/arch/x86/boot/header.S linux-2.6.38-new/arch/x86/boot/header.S
---- linux-2.6.38/arch/x86/boot/header.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/boot/header.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/boot/header.S linux-2.6.38.1/arch/x86/boot/header.S
+--- linux-2.6.38.1/arch/x86/boot/header.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/boot/header.S 2011-03-21 18:31:35.000000000 -0400
@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
# single linked list of
# struct setup_data
@@ -6249,9 +6249,9 @@ diff -urNp linux-2.6.38/arch/x86/boot/header.S linux-2.6.38-new/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.38/arch/x86/boot/memory.c linux-2.6.38-new/arch/x86/boot/memory.c
---- linux-2.6.38/arch/x86/boot/memory.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/boot/memory.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/boot/memory.c linux-2.6.38.1/arch/x86/boot/memory.c
+--- linux-2.6.38.1/arch/x86/boot/memory.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/boot/memory.c 2011-03-21 18:31:35.000000000 -0400
@@ -19,7 +19,7 @@
static int detect_memory_e820(void)
@@ -6261,9 +6261,9 @@ diff -urNp linux-2.6.38/arch/x86/boot/memory.c linux-2.6.38-new/arch/x86/boot/me
struct biosregs ireg, oreg;
struct e820entry *desc = boot_params.e820_map;
static struct e820entry buf; /* static so it is zeroed */
-diff -urNp linux-2.6.38/arch/x86/boot/video.c linux-2.6.38-new/arch/x86/boot/video.c
---- linux-2.6.38/arch/x86/boot/video.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/boot/video.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/boot/video.c linux-2.6.38.1/arch/x86/boot/video.c
+--- linux-2.6.38.1/arch/x86/boot/video.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/boot/video.c 2011-03-21 18:31:35.000000000 -0400
@@ -96,7 +96,7 @@ static void store_mode_params(void)
static unsigned int get_entry(void)
{
@@ -6273,9 +6273,9 @@ diff -urNp linux-2.6.38/arch/x86/boot/video.c linux-2.6.38-new/arch/x86/boot/vid
int key;
unsigned int v;
-diff -urNp linux-2.6.38/arch/x86/boot/video-vesa.c linux-2.6.38-new/arch/x86/boot/video-vesa.c
---- linux-2.6.38/arch/x86/boot/video-vesa.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/boot/video-vesa.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/boot/video-vesa.c linux-2.6.38.1/arch/x86/boot/video-vesa.c
+--- linux-2.6.38.1/arch/x86/boot/video-vesa.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/boot/video-vesa.c 2011-03-21 18:31:35.000000000 -0400
@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
boot_params.screen_info.vesapm_seg = oreg.es;
@@ -6284,9 +6284,9 @@ diff -urNp linux-2.6.38/arch/x86/boot/video-vesa.c linux-2.6.38-new/arch/x86/boo
}
/*
-diff -urNp linux-2.6.38/arch/x86/ia32/ia32_aout.c linux-2.6.38-new/arch/x86/ia32/ia32_aout.c
---- linux-2.6.38/arch/x86/ia32/ia32_aout.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/ia32/ia32_aout.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/ia32/ia32_aout.c linux-2.6.38.1/arch/x86/ia32/ia32_aout.c
+--- linux-2.6.38.1/arch/x86/ia32/ia32_aout.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/ia32/ia32_aout.c 2011-03-21 18:31:35.000000000 -0400
@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
unsigned long dump_start, dump_size;
struct user32 dump;
@@ -6296,9 +6296,9 @@ diff -urNp linux-2.6.38/arch/x86/ia32/ia32_aout.c linux-2.6.38-new/arch/x86/ia32
fs = get_fs();
set_fs(KERNEL_DS);
has_dumped = 1;
-diff -urNp linux-2.6.38/arch/x86/ia32/ia32entry.S linux-2.6.38-new/arch/x86/ia32/ia32entry.S
---- linux-2.6.38/arch/x86/ia32/ia32entry.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/ia32/ia32entry.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/ia32/ia32entry.S linux-2.6.38.1/arch/x86/ia32/ia32entry.S
+--- linux-2.6.38.1/arch/x86/ia32/ia32entry.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/ia32/ia32entry.S 2011-03-21 18:31:35.000000000 -0400
@@ -13,6 +13,7 @@
#include <asm/thread_info.h>
#include <asm/segment.h>
@@ -6396,9 +6396,9 @@ diff -urNp linux-2.6.38/arch/x86/ia32/ia32entry.S linux-2.6.38-new/arch/x86/ia32
/*
* No need to follow this irqs on/off section: the syscall
* disabled irqs and here we enable it straight after entry:
-diff -urNp linux-2.6.38/arch/x86/ia32/ia32_signal.c linux-2.6.38-new/arch/x86/ia32/ia32_signal.c
---- linux-2.6.38/arch/x86/ia32/ia32_signal.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/ia32/ia32_signal.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/ia32/ia32_signal.c linux-2.6.38.1/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.38.1/arch/x86/ia32/ia32_signal.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/ia32/ia32_signal.c 2011-03-21 18:31:35.000000000 -0400
@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
sp -= frame_size;
/* Align the stack pointer according to the i386 ABI,
@@ -6448,9 +6448,9 @@ diff -urNp linux-2.6.38/arch/x86/ia32/ia32_signal.c linux-2.6.38-new/arch/x86/ia
} put_user_catch(err);
if (err)
-diff -urNp linux-2.6.38/arch/x86/include/asm/alternative.h linux-2.6.38-new/arch/x86/include/asm/alternative.h
---- linux-2.6.38/arch/x86/include/asm/alternative.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/alternative.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/alternative.h linux-2.6.38.1/arch/x86/include/asm/alternative.h
+--- linux-2.6.38.1/arch/x86/include/asm/alternative.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/alternative.h 2011-03-21 18:31:35.000000000 -0400
@@ -94,7 +94,7 @@ static inline int alternatives_text_rese
".section .discard,\"aw\",@progbits\n" \
" .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
@@ -6460,9 +6460,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/alternative.h linux-2.6.38-new/arch
"663:\n\t" newinstr "\n664:\n" /* replacement */ \
".previous"
-diff -urNp linux-2.6.38/arch/x86/include/asm/apm.h linux-2.6.38-new/arch/x86/include/asm/apm.h
---- linux-2.6.38/arch/x86/include/asm/apm.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/apm.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/apm.h linux-2.6.38.1/arch/x86/include/asm/apm.h
+--- linux-2.6.38.1/arch/x86/include/asm/apm.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/apm.h 2011-03-21 18:31:35.000000000 -0400
@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
__asm__ __volatile__(APM_DO_ZERO_SEGS
"pushl %%edi\n\t"
@@ -6481,9 +6481,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/apm.h linux-2.6.38-new/arch/x86/inc
"setc %%bl\n\t"
"popl %%ebp\n\t"
"popl %%edi\n\t"
-diff -urNp linux-2.6.38/arch/x86/include/asm/atomic64_32.h linux-2.6.38-new/arch/x86/include/asm/atomic64_32.h
---- linux-2.6.38/arch/x86/include/asm/atomic64_32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/atomic64_32.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/atomic64_32.h linux-2.6.38.1/arch/x86/include/asm/atomic64_32.h
+--- linux-2.6.38.1/arch/x86/include/asm/atomic64_32.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/atomic64_32.h 2011-03-21 18:31:35.000000000 -0400
@@ -12,6 +12,14 @@ typedef struct {
u64 __aligned(8) counter;
} atomic64_t;
@@ -6499,9 +6499,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/atomic64_32.h linux-2.6.38-new/arch
#define ATOMIC64_INIT(val) { (val) }
#ifdef CONFIG_X86_CMPXCHG64
-diff -urNp linux-2.6.38/arch/x86/include/asm/atomic64_64.h linux-2.6.38-new/arch/x86/include/asm/atomic64_64.h
---- linux-2.6.38/arch/x86/include/asm/atomic64_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/atomic64_64.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/atomic64_64.h linux-2.6.38.1/arch/x86/include/asm/atomic64_64.h
+--- linux-2.6.38.1/arch/x86/include/asm/atomic64_64.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/atomic64_64.h 2011-03-21 18:31:35.000000000 -0400
@@ -18,7 +18,19 @@
*/
static inline long atomic64_read(const atomic64_t *v)
@@ -6811,9 +6811,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/atomic64_64.h linux-2.6.38-new/arch
}
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.38/arch/x86/include/asm/atomic.h linux-2.6.38-new/arch/x86/include/asm/atomic.h
---- linux-2.6.38/arch/x86/include/asm/atomic.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/atomic.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/atomic.h linux-2.6.38.1/arch/x86/include/asm/atomic.h
+--- linux-2.6.38.1/arch/x86/include/asm/atomic.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/atomic.h 2011-03-21 18:31:35.000000000 -0400
@@ -22,7 +22,18 @@
*/
static inline int atomic_read(const atomic_t *v)
@@ -7185,9 +7185,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/atomic.h linux-2.6.38-new/arch/x86/
/*
* atomic_dec_if_positive - decrement by 1 if old value positive
* @v: pointer of type atomic_t
-diff -urNp linux-2.6.38/arch/x86/include/asm/bitops.h linux-2.6.38-new/arch/x86/include/asm/bitops.h
---- linux-2.6.38/arch/x86/include/asm/bitops.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/bitops.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/bitops.h linux-2.6.38.1/arch/x86/include/asm/bitops.h
+--- linux-2.6.38.1/arch/x86/include/asm/bitops.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/bitops.h 2011-03-21 18:31:35.000000000 -0400
@@ -38,7 +38,7 @@
* a mask operation on a byte.
*/
@@ -7197,9 +7197,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/bitops.h linux-2.6.38-new/arch/x86/
#define CONST_MASK(nr) (1 << ((nr) & 7))
/**
-diff -urNp linux-2.6.38/arch/x86/include/asm/boot.h linux-2.6.38-new/arch/x86/include/asm/boot.h
---- linux-2.6.38/arch/x86/include/asm/boot.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/boot.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/boot.h linux-2.6.38.1/arch/x86/include/asm/boot.h
+--- linux-2.6.38.1/arch/x86/include/asm/boot.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/boot.h 2011-03-21 18:31:35.000000000 -0400
@@ -11,10 +11,15 @@
#include <asm/pgtable_types.h>
@@ -7217,9 +7217,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/boot.h linux-2.6.38-new/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.38/arch/x86/include/asm/cacheflush.h linux-2.6.38-new/arch/x86/include/asm/cacheflush.h
---- linux-2.6.38/arch/x86/include/asm/cacheflush.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/cacheflush.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/cacheflush.h linux-2.6.38.1/arch/x86/include/asm/cacheflush.h
+--- linux-2.6.38.1/arch/x86/include/asm/cacheflush.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/cacheflush.h 2011-03-21 18:31:35.000000000 -0400
@@ -26,7 +26,7 @@ static inline unsigned long get_page_mem
unsigned long pg_flags = pg->flags & _PGMT_MASK;
@@ -7229,9 +7229,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/cacheflush.h linux-2.6.38-new/arch/
else if (pg_flags == _PGMT_WC)
return _PAGE_CACHE_WC;
else if (pg_flags == _PGMT_UC_MINUS)
-diff -urNp linux-2.6.38/arch/x86/include/asm/cache.h linux-2.6.38-new/arch/x86/include/asm/cache.h
---- linux-2.6.38/arch/x86/include/asm/cache.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/cache.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/cache.h linux-2.6.38.1/arch/x86/include/asm/cache.h
+--- linux-2.6.38.1/arch/x86/include/asm/cache.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/cache.h 2011-03-21 18:31:35.000000000 -0400
@@ -8,6 +8,7 @@
#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
@@ -7240,9 +7240,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/cache.h linux-2.6.38-new/arch/x86/i
#define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
-diff -urNp linux-2.6.38/arch/x86/include/asm/checksum_32.h linux-2.6.38-new/arch/x86/include/asm/checksum_32.h
---- linux-2.6.38/arch/x86/include/asm/checksum_32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/checksum_32.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/checksum_32.h linux-2.6.38.1/arch/x86/include/asm/checksum_32.h
+--- linux-2.6.38.1/arch/x86/include/asm/checksum_32.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/checksum_32.h 2011-03-21 18:31:35.000000000 -0400
@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
int len, __wsum sum,
int *src_err_ptr, int *dst_err_ptr);
@@ -7276,9 +7276,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/checksum_32.h linux-2.6.38-new/arch
len, sum, NULL, err_ptr);
if (len)
-diff -urNp linux-2.6.38/arch/x86/include/asm/cpufeature.h linux-2.6.38-new/arch/x86/include/asm/cpufeature.h
---- linux-2.6.38/arch/x86/include/asm/cpufeature.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/cpufeature.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/cpufeature.h linux-2.6.38.1/arch/x86/include/asm/cpufeature.h
+--- linux-2.6.38.1/arch/x86/include/asm/cpufeature.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/cpufeature.h 2011-03-21 18:31:35.000000000 -0400
@@ -349,7 +349,7 @@ static __always_inline __pure bool __sta
".section .discard,\"aw\",@progbits\n"
" .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
@@ -7288,9 +7288,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/cpufeature.h linux-2.6.38-new/arch/
"3: movb $1,%0\n"
"4:\n"
".previous\n"
-diff -urNp linux-2.6.38/arch/x86/include/asm/desc_defs.h linux-2.6.38-new/arch/x86/include/asm/desc_defs.h
---- linux-2.6.38/arch/x86/include/asm/desc_defs.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/desc_defs.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/desc_defs.h linux-2.6.38.1/arch/x86/include/asm/desc_defs.h
+--- linux-2.6.38.1/arch/x86/include/asm/desc_defs.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/desc_defs.h 2011-03-21 18:31:35.000000000 -0400
@@ -31,6 +31,12 @@ struct desc_struct {
unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
@@ -7304,9 +7304,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/desc_defs.h linux-2.6.38-new/arch/x
};
} __attribute__((packed));
-diff -urNp linux-2.6.38/arch/x86/include/asm/desc.h linux-2.6.38-new/arch/x86/include/asm/desc.h
---- linux-2.6.38/arch/x86/include/asm/desc.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/desc.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/desc.h linux-2.6.38.1/arch/x86/include/asm/desc.h
+--- linux-2.6.38.1/arch/x86/include/asm/desc.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/desc.h 2011-03-21 18:31:35.000000000 -0400
@@ -4,6 +4,7 @@
#include <asm/desc_defs.h>
#include <asm/ldt.h>
@@ -7494,9 +7494,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/desc.h linux-2.6.38-new/arch/x86/in
+#endif
+
#endif /* _ASM_X86_DESC_H */
-diff -urNp linux-2.6.38/arch/x86/include/asm/device.h linux-2.6.38-new/arch/x86/include/asm/device.h
---- linux-2.6.38/arch/x86/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/device.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/device.h linux-2.6.38.1/arch/x86/include/asm/device.h
+--- linux-2.6.38.1/arch/x86/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/device.h 2011-03-21 18:31:35.000000000 -0400
@@ -6,7 +6,7 @@ struct dev_archdata {
void *acpi_handle;
#endif
@@ -7506,9 +7506,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/device.h linux-2.6.38-new/arch/x86/
#endif
#if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU)
void *iommu; /* hook for IOMMU specific extension */
-diff -urNp linux-2.6.38/arch/x86/include/asm/dma-mapping.h linux-2.6.38-new/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.38/arch/x86/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/dma-mapping.h linux-2.6.38.1/arch/x86/include/asm/dma-mapping.h
+--- linux-2.6.38.1/arch/x86/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
@@ -26,9 +26,9 @@ extern int iommu_merge;
extern struct device x86_dma_fallback_dev;
extern int panic_on_overflow;
@@ -7548,9 +7548,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/dma-mapping.h linux-2.6.38-new/arch
WARN_ON(irqs_disabled()); /* for portability */
-diff -urNp linux-2.6.38/arch/x86/include/asm/e820.h linux-2.6.38-new/arch/x86/include/asm/e820.h
---- linux-2.6.38/arch/x86/include/asm/e820.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/e820.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/e820.h linux-2.6.38.1/arch/x86/include/asm/e820.h
+--- linux-2.6.38.1/arch/x86/include/asm/e820.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/e820.h 2011-03-21 18:31:35.000000000 -0400
@@ -69,7 +69,7 @@ struct e820map {
#define ISA_START_ADDRESS 0xa0000
#define ISA_END_ADDRESS 0x100000
@@ -7560,9 +7560,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/e820.h linux-2.6.38-new/arch/x86/in
#define BIOS_END 0x00100000
#define BIOS_ROM_BASE 0xffe00000
-diff -urNp linux-2.6.38/arch/x86/include/asm/elf.h linux-2.6.38-new/arch/x86/include/asm/elf.h
---- linux-2.6.38/arch/x86/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/elf.h linux-2.6.38.1/arch/x86/include/asm/elf.h
+--- linux-2.6.38.1/arch/x86/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/elf.h 2011-03-21 18:31:35.000000000 -0400
@@ -237,7 +237,25 @@ extern int force_personality32;
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -7616,9 +7616,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/elf.h linux-2.6.38-new/arch/x86/inc
-#define arch_randomize_brk arch_randomize_brk
-
#endif /* _ASM_X86_ELF_H */
-diff -urNp linux-2.6.38/arch/x86/include/asm/futex.h linux-2.6.38-new/arch/x86/include/asm/futex.h
---- linux-2.6.38/arch/x86/include/asm/futex.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/futex.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/futex.h linux-2.6.38.1/arch/x86/include/asm/futex.h
+--- linux-2.6.38.1/arch/x86/include/asm/futex.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/futex.h 2011-03-21 18:31:35.000000000 -0400
@@ -12,16 +12,18 @@
#include <asm/system.h>
@@ -7694,9 +7694,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/futex.h linux-2.6.38-new/arch/x86/i
: "i" (-EFAULT), "r" (newval), "0" (oldval)
: "memory"
);
-diff -urNp linux-2.6.38/arch/x86/include/asm/i387.h linux-2.6.38-new/arch/x86/include/asm/i387.h
---- linux-2.6.38/arch/x86/include/asm/i387.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/i387.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/i387.h linux-2.6.38.1/arch/x86/include/asm/i387.h
+--- linux-2.6.38.1/arch/x86/include/asm/i387.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/i387.h 2011-03-21 18:31:35.000000000 -0400
@@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
{
int err;
@@ -7737,9 +7737,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/i387.h linux-2.6.38-new/arch/x86/in
/*
* These must be called with preempt disabled
-diff -urNp linux-2.6.38/arch/x86/include/asm/io.h linux-2.6.38-new/arch/x86/include/asm/io.h
---- linux-2.6.38/arch/x86/include/asm/io.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/io.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/io.h linux-2.6.38.1/arch/x86/include/asm/io.h
+--- linux-2.6.38.1/arch/x86/include/asm/io.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/io.h 2011-03-21 18:31:35.000000000 -0400
@@ -216,6 +216,17 @@ extern void set_iounmap_nonlazy(void);
#include <linux/vmalloc.h>
@@ -7758,9 +7758,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/io.h linux-2.6.38-new/arch/x86/incl
/*
* Convert a virtual cached pointer to an uncached pointer
*/
-diff -urNp linux-2.6.38/arch/x86/include/asm/iommu.h linux-2.6.38-new/arch/x86/include/asm/iommu.h
---- linux-2.6.38/arch/x86/include/asm/iommu.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/iommu.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/iommu.h linux-2.6.38.1/arch/x86/include/asm/iommu.h
+--- linux-2.6.38.1/arch/x86/include/asm/iommu.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/iommu.h 2011-03-21 18:31:35.000000000 -0400
@@ -1,7 +1,7 @@
#ifndef _ASM_X86_IOMMU_H
#define _ASM_X86_IOMMU_H
@@ -7770,9 +7770,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/iommu.h linux-2.6.38-new/arch/x86/i
extern int force_iommu, no_iommu;
extern int iommu_detected;
extern int iommu_pass_through;
-diff -urNp linux-2.6.38/arch/x86/include/asm/irqflags.h linux-2.6.38-new/arch/x86/include/asm/irqflags.h
---- linux-2.6.38/arch/x86/include/asm/irqflags.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/irqflags.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/irqflags.h linux-2.6.38.1/arch/x86/include/asm/irqflags.h
+--- linux-2.6.38.1/arch/x86/include/asm/irqflags.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/irqflags.h 2011-03-21 18:31:35.000000000 -0400
@@ -140,6 +140,11 @@ static inline unsigned long arch_local_i
sti; \
sysexit
@@ -7785,9 +7785,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/irqflags.h linux-2.6.38-new/arch/x8
#else
#define INTERRUPT_RETURN iret
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
-diff -urNp linux-2.6.38/arch/x86/include/asm/kvm_host.h linux-2.6.38-new/arch/x86/include/asm/kvm_host.h
---- linux-2.6.38/arch/x86/include/asm/kvm_host.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/kvm_host.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/kvm_host.h linux-2.6.38.1/arch/x86/include/asm/kvm_host.h
+--- linux-2.6.38.1/arch/x86/include/asm/kvm_host.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/kvm_host.h 2011-03-21 18:31:35.000000000 -0400
@@ -603,7 +603,7 @@ struct kvm_arch_async_pf {
bool direct_map;
};
@@ -7797,9 +7797,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/kvm_host.h linux-2.6.38-new/arch/x8
int kvm_mmu_module_init(void);
void kvm_mmu_module_exit(void);
-diff -urNp linux-2.6.38/arch/x86/include/asm/local.h linux-2.6.38-new/arch/x86/include/asm/local.h
---- linux-2.6.38/arch/x86/include/asm/local.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/local.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/local.h linux-2.6.38.1/arch/x86/include/asm/local.h
+--- linux-2.6.38.1/arch/x86/include/asm/local.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/local.h 2011-03-21 18:31:35.000000000 -0400
@@ -18,26 +18,58 @@ typedef struct {
static inline void local_inc(local_t *l)
@@ -7952,9 +7952,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/local.h linux-2.6.38-new/arch/x86/i
: "+r" (i), "+m" (l->a.counter)
: : "memory");
return i + __i;
-diff -urNp linux-2.6.38/arch/x86/include/asm/mc146818rtc.h linux-2.6.38-new/arch/x86/include/asm/mc146818rtc.h
---- linux-2.6.38/arch/x86/include/asm/mc146818rtc.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/mc146818rtc.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/mc146818rtc.h linux-2.6.38.1/arch/x86/include/asm/mc146818rtc.h
+--- linux-2.6.38.1/arch/x86/include/asm/mc146818rtc.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/mc146818rtc.h 2011-03-21 18:31:35.000000000 -0400
@@ -81,8 +81,8 @@ static inline unsigned char current_lock
#else
#define lock_cmos_prefix(reg) do {} while (0)
@@ -7966,9 +7966,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/mc146818rtc.h linux-2.6.38-new/arch
#define do_i_have_lock_cmos() 0
#define current_lock_cmos_reg() 0
#endif
-diff -urNp linux-2.6.38/arch/x86/include/asm/mce.h linux-2.6.38-new/arch/x86/include/asm/mce.h
---- linux-2.6.38/arch/x86/include/asm/mce.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/mce.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/mce.h linux-2.6.38.1/arch/x86/include/asm/mce.h
+--- linux-2.6.38.1/arch/x86/include/asm/mce.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/mce.h 2011-03-21 18:31:35.000000000 -0400
@@ -198,7 +198,7 @@ int mce_notify_irq(void);
void mce_notify_process(void);
@@ -7978,9 +7978,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/mce.h linux-2.6.38-new/arch/x86/inc
/*
* Exception handler
-diff -urNp linux-2.6.38/arch/x86/include/asm/microcode.h linux-2.6.38-new/arch/x86/include/asm/microcode.h
---- linux-2.6.38/arch/x86/include/asm/microcode.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/microcode.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/microcode.h linux-2.6.38.1/arch/x86/include/asm/microcode.h
+--- linux-2.6.38.1/arch/x86/include/asm/microcode.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/microcode.h 2011-03-21 18:31:35.000000000 -0400
@@ -12,13 +12,13 @@ struct device;
enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
@@ -8027,9 +8027,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/microcode.h linux-2.6.38-new/arch/x
{
return NULL;
}
-diff -urNp linux-2.6.38/arch/x86/include/asm/mman.h linux-2.6.38-new/arch/x86/include/asm/mman.h
---- linux-2.6.38/arch/x86/include/asm/mman.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/mman.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/mman.h linux-2.6.38.1/arch/x86/include/asm/mman.h
+--- linux-2.6.38.1/arch/x86/include/asm/mman.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/mman.h 2011-03-21 18:31:35.000000000 -0400
@@ -5,4 +5,14 @@
#include <asm-generic/mman.h>
@@ -8045,9 +8045,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/mman.h linux-2.6.38-new/arch/x86/in
+#endif
+
#endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-2.6.38/arch/x86/include/asm/mmu_context.h linux-2.6.38-new/arch/x86/include/asm/mmu_context.h
---- linux-2.6.38/arch/x86/include/asm/mmu_context.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/mmu_context.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/mmu_context.h linux-2.6.38.1/arch/x86/include/asm/mmu_context.h
+--- linux-2.6.38.1/arch/x86/include/asm/mmu_context.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/mmu_context.h 2011-03-21 18:31:35.000000000 -0400
@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -8172,9 +8172,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/mmu_context.h linux-2.6.38-new/arch
}
#define activate_mm(prev, next) \
-diff -urNp linux-2.6.38/arch/x86/include/asm/mmu.h linux-2.6.38-new/arch/x86/include/asm/mmu.h
---- linux-2.6.38/arch/x86/include/asm/mmu.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/mmu.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/mmu.h linux-2.6.38.1/arch/x86/include/asm/mmu.h
+--- linux-2.6.38.1/arch/x86/include/asm/mmu.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/mmu.h 2011-03-21 18:31:35.000000000 -0400
@@ -9,10 +9,23 @@
* we put the segment information here.
*/
@@ -8201,9 +8201,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/mmu.h linux-2.6.38-new/arch/x86/inc
} mm_context_t;
#ifdef CONFIG_SMP
-diff -urNp linux-2.6.38/arch/x86/include/asm/module.h linux-2.6.38-new/arch/x86/include/asm/module.h
---- linux-2.6.38/arch/x86/include/asm/module.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/module.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/module.h linux-2.6.38.1/arch/x86/include/asm/module.h
+--- linux-2.6.38.1/arch/x86/include/asm/module.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/module.h 2011-03-21 18:31:35.000000000 -0400
@@ -59,8 +59,26 @@
#error unknown processor family
#endif
@@ -8232,9 +8232,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/module.h linux-2.6.38-new/arch/x86/
#endif
#endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-2.6.38/arch/x86/include/asm/page_64_types.h linux-2.6.38-new/arch/x86/include/asm/page_64_types.h
---- linux-2.6.38/arch/x86/include/asm/page_64_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/page_64_types.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/page_64_types.h linux-2.6.38.1/arch/x86/include/asm/page_64_types.h
+--- linux-2.6.38.1/arch/x86/include/asm/page_64_types.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/page_64_types.h 2011-03-21 18:31:35.000000000 -0400
@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
/* duplicated to the one in bootmem.h */
@@ -8244,9 +8244,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/page_64_types.h linux-2.6.38-new/ar
extern unsigned long __phys_addr(unsigned long);
#define __phys_reloc_hide(x) (x)
-diff -urNp linux-2.6.38/arch/x86/include/asm/paravirt.h linux-2.6.38-new/arch/x86/include/asm/paravirt.h
---- linux-2.6.38/arch/x86/include/asm/paravirt.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/paravirt.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/paravirt.h linux-2.6.38.1/arch/x86/include/asm/paravirt.h
+--- linux-2.6.38.1/arch/x86/include/asm/paravirt.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/paravirt.h 2011-03-21 18:31:35.000000000 -0400
@@ -739,6 +739,21 @@ static inline void __set_fixmap(unsigned
pv_mmu_ops.set_fixmap(idx, phys, flags);
}
@@ -8300,9 +8300,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/paravirt.h linux-2.6.38-new/arch/x8
#endif /* CONFIG_X86_32 */
#endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.38/arch/x86/include/asm/paravirt_types.h linux-2.6.38-new/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.38/arch/x86/include/asm/paravirt_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/paravirt_types.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/paravirt_types.h linux-2.6.38.1/arch/x86/include/asm/paravirt_types.h
+--- linux-2.6.38.1/arch/x86/include/asm/paravirt_types.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/paravirt_types.h 2011-03-21 18:31:35.000000000 -0400
@@ -317,6 +317,12 @@ struct pv_mmu_ops {
an mfn. We can tell which is which from the index. */
void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
@@ -8316,9 +8316,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/paravirt_types.h linux-2.6.38-new/a
};
struct arch_spinlock;
-diff -urNp linux-2.6.38/arch/x86/include/asm/pci_x86.h linux-2.6.38-new/arch/x86/include/asm/pci_x86.h
---- linux-2.6.38/arch/x86/include/asm/pci_x86.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/pci_x86.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/pci_x86.h linux-2.6.38.1/arch/x86/include/asm/pci_x86.h
+--- linux-2.6.38.1/arch/x86/include/asm/pci_x86.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/pci_x86.h 2011-03-21 18:31:35.000000000 -0400
@@ -93,16 +93,16 @@ extern int (*pcibios_enable_irq)(struct
extern void (*pcibios_disable_irq)(struct pci_dev *dev);
@@ -8341,9 +8341,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/pci_x86.h linux-2.6.38-new/arch/x86
extern bool port_cf9_safe;
/* arch_initcall level */
-diff -urNp linux-2.6.38/arch/x86/include/asm/pgalloc.h linux-2.6.38-new/arch/x86/include/asm/pgalloc.h
---- linux-2.6.38/arch/x86/include/asm/pgalloc.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/pgalloc.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/pgalloc.h linux-2.6.38.1/arch/x86/include/asm/pgalloc.h
+--- linux-2.6.38.1/arch/x86/include/asm/pgalloc.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/pgalloc.h 2011-03-21 18:31:35.000000000 -0400
@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
pmd_t *pmd, pte_t *pte)
{
@@ -8358,9 +8358,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/pgalloc.h linux-2.6.38-new/arch/x86
set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
}
-diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable-2level.h linux-2.6.38-new/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.38/arch/x86/include/asm/pgtable-2level.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/pgtable-2level.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/pgtable-2level.h linux-2.6.38.1/arch/x86/include/asm/pgtable-2level.h
+--- linux-2.6.38.1/arch/x86/include/asm/pgtable-2level.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/pgtable-2level.h 2011-03-21 18:31:35.000000000 -0400
@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8371,9 +8371,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable-2level.h linux-2.6.38-new/a
}
static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable_32.h linux-2.6.38-new/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.38/arch/x86/include/asm/pgtable_32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/pgtable_32.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/pgtable_32.h linux-2.6.38.1/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.38.1/arch/x86/include/asm/pgtable_32.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/pgtable_32.h 2011-03-21 18:31:35.000000000 -0400
@@ -25,9 +25,6 @@
struct mm_struct;
struct vm_area_struct;
@@ -8417,9 +8417,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable_32.h linux-2.6.38-new/arch/
/*
* kern_addr_valid() is (1) for FLATMEM and (0) for
* SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable_32_types.h linux-2.6.38-new/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.38/arch/x86/include/asm/pgtable_32_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/pgtable_32_types.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/pgtable_32_types.h linux-2.6.38.1/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.38.1/arch/x86/include/asm/pgtable_32_types.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/pgtable_32_types.h 2011-03-21 18:31:35.000000000 -0400
@@ -8,7 +8,7 @@
*/
#ifdef CONFIG_X86_PAE
@@ -8449,9 +8449,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable_32_types.h linux-2.6.38-new
#define MODULES_VADDR VMALLOC_START
#define MODULES_END VMALLOC_END
#define MODULES_LEN (MODULES_VADDR - MODULES_END)
-diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable-3level.h linux-2.6.38-new/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.38/arch/x86/include/asm/pgtable-3level.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/pgtable-3level.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/pgtable-3level.h linux-2.6.38.1/arch/x86/include/asm/pgtable-3level.h
+--- linux-2.6.38.1/arch/x86/include/asm/pgtable-3level.h 2011-03-23 17:20:06.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/pgtable-3level.h 2011-03-23 17:21:43.000000000 -0400
@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8469,9 +8469,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable-3level.h linux-2.6.38-new/a
}
/*
-diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable_64.h linux-2.6.38-new/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.38/arch/x86/include/asm/pgtable_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/pgtable_64.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/pgtable_64.h linux-2.6.38.1/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.38.1/arch/x86/include/asm/pgtable_64.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/pgtable_64.h 2011-03-21 18:31:35.000000000 -0400
@@ -16,10 +16,13 @@
extern pud_t level3_kernel_pgt[512];
@@ -8508,9 +8508,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable_64.h linux-2.6.38-new/arch/
}
static inline void native_pgd_clear(pgd_t *pgd)
-diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable_64_types.h linux-2.6.38-new/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.38/arch/x86/include/asm/pgtable_64_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/pgtable_64_types.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/pgtable_64_types.h linux-2.6.38.1/arch/x86/include/asm/pgtable_64_types.h
+--- linux-2.6.38.1/arch/x86/include/asm/pgtable_64_types.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/pgtable_64_types.h 2011-03-21 18:31:35.000000000 -0400
@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
#define MODULES_VADDR _AC(0xffffffffa0000000, UL)
#define MODULES_END _AC(0xffffffffff000000, UL)
@@ -8522,9 +8522,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable_64_types.h linux-2.6.38-new
+#define ktva_ktla(addr) (addr)
#endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable.h linux-2.6.38-new/arch/x86/include/asm/pgtable.h
---- linux-2.6.38/arch/x86/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/pgtable.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/pgtable.h linux-2.6.38.1/arch/x86/include/asm/pgtable.h
+--- linux-2.6.38.1/arch/x86/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/pgtable.h 2011-03-21 18:31:35.000000000 -0400
@@ -81,12 +81,51 @@ extern struct mm_struct *pgd_page_get_mm
#define arch_end_context_switch(prev) do {} while(0)
@@ -8694,9 +8694,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable.h linux-2.6.38-new/arch/x86
#include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable_types.h linux-2.6.38-new/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.38/arch/x86/include/asm/pgtable_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/pgtable_types.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/pgtable_types.h linux-2.6.38.1/arch/x86/include/asm/pgtable_types.h
+--- linux-2.6.38.1/arch/x86/include/asm/pgtable_types.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/pgtable_types.h 2011-03-21 18:31:35.000000000 -0400
@@ -16,13 +16,12 @@
#define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
#define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -8810,9 +8810,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/pgtable_types.h linux-2.6.38-new/ar
#define pgprot_writecombine pgprot_writecombine
extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-2.6.38/arch/x86/include/asm/processor.h linux-2.6.38-new/arch/x86/include/asm/processor.h
---- linux-2.6.38/arch/x86/include/asm/processor.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/processor.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/processor.h linux-2.6.38.1/arch/x86/include/asm/processor.h
+--- linux-2.6.38.1/arch/x86/include/asm/processor.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/processor.h 2011-03-21 18:31:35.000000000 -0400
@@ -270,7 +270,7 @@ struct tss_struct {
} ____cacheline_aligned;
@@ -8897,9 +8897,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/processor.h linux-2.6.38-new/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.38/arch/x86/include/asm/ptrace.h linux-2.6.38-new/arch/x86/include/asm/ptrace.h
---- linux-2.6.38/arch/x86/include/asm/ptrace.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/ptrace.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/ptrace.h linux-2.6.38.1/arch/x86/include/asm/ptrace.h
+--- linux-2.6.38.1/arch/x86/include/asm/ptrace.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/ptrace.h 2011-03-21 18:31:35.000000000 -0400
@@ -152,28 +152,29 @@ static inline unsigned long regs_return_
}
@@ -8936,9 +8936,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/ptrace.h linux-2.6.38-new/arch/x86/
#endif
}
-diff -urNp linux-2.6.38/arch/x86/include/asm/reboot.h linux-2.6.38-new/arch/x86/include/asm/reboot.h
---- linux-2.6.38/arch/x86/include/asm/reboot.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/reboot.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/reboot.h linux-2.6.38.1/arch/x86/include/asm/reboot.h
+--- linux-2.6.38.1/arch/x86/include/asm/reboot.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/reboot.h 2011-03-21 18:31:35.000000000 -0400
@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -8948,9 +8948,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/reboot.h linux-2.6.38-new/arch/x86/
typedef void (*nmi_shootdown_cb)(int, struct die_args*);
void nmi_shootdown_cpus(nmi_shootdown_cb callback);
-diff -urNp linux-2.6.38/arch/x86/include/asm/rwsem.h linux-2.6.38-new/arch/x86/include/asm/rwsem.h
---- linux-2.6.38/arch/x86/include/asm/rwsem.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/rwsem.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/rwsem.h linux-2.6.38.1/arch/x86/include/asm/rwsem.h
+--- linux-2.6.38.1/arch/x86/include/asm/rwsem.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/rwsem.h 2011-03-21 18:31:35.000000000 -0400
@@ -118,6 +118,14 @@ static inline void __down_read(struct rw
{
asm volatile("# beginning down_read\n\t"
@@ -9075,9 +9075,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/rwsem.h linux-2.6.38-new/arch/x86/i
: "+r" (tmp), "+m" (sem->count)
: : "memory");
-diff -urNp linux-2.6.38/arch/x86/include/asm/segment.h linux-2.6.38-new/arch/x86/include/asm/segment.h
---- linux-2.6.38/arch/x86/include/asm/segment.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/segment.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/segment.h linux-2.6.38.1/arch/x86/include/asm/segment.h
+--- linux-2.6.38.1/arch/x86/include/asm/segment.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/segment.h 2011-03-21 18:31:35.000000000 -0400
@@ -62,8 +62,8 @@
* 26 - ESPFIX small SS
* 27 - per-cpu [ offset to per-cpu data area ]
@@ -9137,9 +9137,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/segment.h linux-2.6.38-new/arch/x86
#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.38/arch/x86/include/asm/smp.h linux-2.6.38-new/arch/x86/include/asm/smp.h
---- linux-2.6.38/arch/x86/include/asm/smp.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/smp.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/smp.h linux-2.6.38.1/arch/x86/include/asm/smp.h
+--- linux-2.6.38.1/arch/x86/include/asm/smp.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/smp.h 2011-03-21 18:31:35.000000000 -0400
@@ -24,7 +24,7 @@ extern unsigned int num_processors;
DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
@@ -9149,9 +9149,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/smp.h linux-2.6.38-new/arch/x86/inc
static inline struct cpumask *cpu_sibling_mask(int cpu)
{
-diff -urNp linux-2.6.38/arch/x86/include/asm/spinlock.h linux-2.6.38-new/arch/x86/include/asm/spinlock.h
---- linux-2.6.38/arch/x86/include/asm/spinlock.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/spinlock.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/spinlock.h linux-2.6.38.1/arch/x86/include/asm/spinlock.h
+--- linux-2.6.38.1/arch/x86/include/asm/spinlock.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/spinlock.h 2011-03-21 18:31:35.000000000 -0400
@@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar
static inline void arch_read_lock(arch_rwlock_t *rw)
{
@@ -9214,9 +9214,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/spinlock.h linux-2.6.38-new/arch/x8
: "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
}
-diff -urNp linux-2.6.38/arch/x86/include/asm/stackprotector.h linux-2.6.38-new/arch/x86/include/asm/stackprotector.h
---- linux-2.6.38/arch/x86/include/asm/stackprotector.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/stackprotector.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/stackprotector.h linux-2.6.38.1/arch/x86/include/asm/stackprotector.h
+--- linux-2.6.38.1/arch/x86/include/asm/stackprotector.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/stackprotector.h 2011-03-21 18:31:35.000000000 -0400
@@ -113,7 +113,7 @@ static inline void setup_stack_canary_se
static inline void load_stack_canary_segment(void)
@@ -9226,9 +9226,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/stackprotector.h linux-2.6.38-new/a
asm volatile ("mov %0, %%gs" : : "r" (0));
#endif
}
-diff -urNp linux-2.6.38/arch/x86/include/asm/system.h linux-2.6.38-new/arch/x86/include/asm/system.h
---- linux-2.6.38/arch/x86/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/system.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/system.h linux-2.6.38.1/arch/x86/include/asm/system.h
+--- linux-2.6.38.1/arch/x86/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/system.h 2011-03-21 18:31:35.000000000 -0400
@@ -202,7 +202,7 @@ static inline unsigned long get_limit(un
{
unsigned long __limit;
@@ -9247,9 +9247,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/system.h linux-2.6.38-new/arch/x86/
extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
void default_idle(void);
-diff -urNp linux-2.6.38/arch/x86/include/asm/uaccess_32.h linux-2.6.38-new/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.38/arch/x86/include/asm/uaccess_32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/uaccess_32.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/uaccess_32.h linux-2.6.38.1/arch/x86/include/asm/uaccess_32.h
+--- linux-2.6.38.1/arch/x86/include/asm/uaccess_32.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/uaccess_32.h 2011-03-21 18:31:35.000000000 -0400
@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
static __always_inline unsigned long __must_check
__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -9406,9 +9406,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/uaccess_32.h linux-2.6.38-new/arch/
return n;
}
-diff -urNp linux-2.6.38/arch/x86/include/asm/uaccess_64.h linux-2.6.38-new/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.38/arch/x86/include/asm/uaccess_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/uaccess_64.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/uaccess_64.h linux-2.6.38.1/arch/x86/include/asm/uaccess_64.h
+--- linux-2.6.38.1/arch/x86/include/asm/uaccess_64.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/uaccess_64.h 2011-03-21 18:31:35.000000000 -0400
@@ -11,6 +11,9 @@
#include <asm/alternative.h>
#include <asm/cpufeature.h>
@@ -9781,9 +9781,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/uaccess_64.h linux-2.6.38-new/arch/
copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
#endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-2.6.38/arch/x86/include/asm/uaccess.h linux-2.6.38-new/arch/x86/include/asm/uaccess.h
---- linux-2.6.38/arch/x86/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/uaccess.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/uaccess.h linux-2.6.38.1/arch/x86/include/asm/uaccess.h
+--- linux-2.6.38.1/arch/x86/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/uaccess.h 2011-03-21 18:31:35.000000000 -0400
@@ -8,12 +8,15 @@
#include <linux/thread_info.h>
#include <linux/prefetch.h>
@@ -10002,9 +10002,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/uaccess.h linux-2.6.38-new/arch/x86
#ifdef CONFIG_X86_32
# include "uaccess_32.h"
#else
-diff -urNp linux-2.6.38/arch/x86/include/asm/vgtod.h linux-2.6.38-new/arch/x86/include/asm/vgtod.h
---- linux-2.6.38/arch/x86/include/asm/vgtod.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/vgtod.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/vgtod.h linux-2.6.38.1/arch/x86/include/asm/vgtod.h
+--- linux-2.6.38.1/arch/x86/include/asm/vgtod.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/vgtod.h 2011-03-21 18:31:35.000000000 -0400
@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
int sysctl_enabled;
struct timezone sys_tz;
@@ -10013,9 +10013,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/vgtod.h linux-2.6.38-new/arch/x86/i
cycle_t (*vread)(void);
cycle_t cycle_last;
cycle_t mask;
-diff -urNp linux-2.6.38/arch/x86/include/asm/vsyscall.h linux-2.6.38-new/arch/x86/include/asm/vsyscall.h
---- linux-2.6.38/arch/x86/include/asm/vsyscall.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/vsyscall.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/vsyscall.h linux-2.6.38.1/arch/x86/include/asm/vsyscall.h
+--- linux-2.6.38.1/arch/x86/include/asm/vsyscall.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/vsyscall.h 2011-03-21 18:31:35.000000000 -0400
@@ -15,9 +15,10 @@ enum vsyscall_num {
#ifdef __KERNEL__
@@ -10046,9 +10046,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/vsyscall.h linux-2.6.38-new/arch/x8
#endif /* __KERNEL__ */
#endif /* _ASM_X86_VSYSCALL_H */
-diff -urNp linux-2.6.38/arch/x86/include/asm/xsave.h linux-2.6.38-new/arch/x86/include/asm/xsave.h
---- linux-2.6.38/arch/x86/include/asm/xsave.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/include/asm/xsave.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/include/asm/xsave.h linux-2.6.38.1/arch/x86/include/asm/xsave.h
+--- linux-2.6.38.1/arch/x86/include/asm/xsave.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/include/asm/xsave.h 2011-03-21 18:31:35.000000000 -0400
@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
{
int err;
@@ -10073,9 +10073,9 @@ diff -urNp linux-2.6.38/arch/x86/include/asm/xsave.h linux-2.6.38-new/arch/x86/i
__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
"2:\n"
".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.38/arch/x86/Kconfig linux-2.6.38-new/arch/x86/Kconfig
---- linux-2.6.38/arch/x86/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/Kconfig 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/Kconfig linux-2.6.38.1/arch/x86/Kconfig
+--- linux-2.6.38.1/arch/x86/Kconfig 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/Kconfig 2011-03-21 18:31:35.000000000 -0400
@@ -223,7 +223,7 @@ config X86_TRAMPOLINE
config X86_32_LAZY_GS
@@ -10157,9 +10157,9 @@ diff -urNp linux-2.6.38/arch/x86/Kconfig linux-2.6.38-new/arch/x86/Kconfig
---help---
Map the 32-bit VDSO to the predictable old-style address too.
-diff -urNp linux-2.6.38/arch/x86/Kconfig.cpu linux-2.6.38-new/arch/x86/Kconfig.cpu
---- linux-2.6.38/arch/x86/Kconfig.cpu 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/Kconfig.cpu 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/Kconfig.cpu linux-2.6.38.1/arch/x86/Kconfig.cpu
+--- linux-2.6.38.1/arch/x86/Kconfig.cpu 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/Kconfig.cpu 2011-03-21 18:31:35.000000000 -0400
@@ -339,7 +339,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -10187,9 +10187,9 @@ diff -urNp linux-2.6.38/arch/x86/Kconfig.cpu linux-2.6.38-new/arch/x86/Kconfig.c
config X86_MINIMUM_CPU_FAMILY
int
-diff -urNp linux-2.6.38/arch/x86/Kconfig.debug linux-2.6.38-new/arch/x86/Kconfig.debug
---- linux-2.6.38/arch/x86/Kconfig.debug 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/Kconfig.debug 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/Kconfig.debug linux-2.6.38.1/arch/x86/Kconfig.debug
+--- linux-2.6.38.1/arch/x86/Kconfig.debug 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/Kconfig.debug 2011-03-21 18:31:35.000000000 -0400
@@ -101,7 +101,7 @@ config X86_PTDUMP
config DEBUG_RODATA
bool "Write protect kernel read-only data structures"
@@ -10208,9 +10208,9 @@ diff -urNp linux-2.6.38/arch/x86/Kconfig.debug linux-2.6.38-new/arch/x86/Kconfig
---help---
This option helps catch unintended modifications to loadable
kernel module's text and read-only data. It also prevents execution
-diff -urNp linux-2.6.38/arch/x86/kernel/acpi/boot.c linux-2.6.38-new/arch/x86/kernel/acpi/boot.c
---- linux-2.6.38/arch/x86/kernel/acpi/boot.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/acpi/boot.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/acpi/boot.c linux-2.6.38.1/arch/x86/kernel/acpi/boot.c
+--- linux-2.6.38.1/arch/x86/kernel/acpi/boot.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/acpi/boot.c 2011-03-21 18:31:35.000000000 -0400
@@ -1472,7 +1472,7 @@ static struct dmi_system_id __initdata a
DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
},
@@ -10220,9 +10220,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/acpi/boot.c linux-2.6.38-new/arch/x86/ke
};
/*
-diff -urNp linux-2.6.38/arch/x86/kernel/acpi/sleep.c linux-2.6.38-new/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.38/arch/x86/kernel/acpi/sleep.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/acpi/sleep.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/acpi/sleep.c linux-2.6.38.1/arch/x86/kernel/acpi/sleep.c
+--- linux-2.6.38.1/arch/x86/kernel/acpi/sleep.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/acpi/sleep.c 2011-03-21 18:31:35.000000000 -0400
@@ -18,7 +18,7 @@
#include "realmode/wakeup.h"
#include "sleep.h"
@@ -10245,9 +10245,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/acpi/sleep.c linux-2.6.38-new/arch/x86/k
initial_gs = per_cpu_offset(smp_processor_id());
#endif
initial_code = (unsigned long)wakeup_long64;
-diff -urNp linux-2.6.38/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.38-new/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.38/arch/x86/kernel/acpi/wakeup_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/acpi/wakeup_32.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.38.1/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-2.6.38.1/arch/x86/kernel/acpi/wakeup_32.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/acpi/wakeup_32.S 2011-03-21 18:31:35.000000000 -0400
@@ -30,13 +30,11 @@ wakeup_pmode_return:
# and restore the stack ... but you need gdt for this to work
movl saved_context_esp, %esp
@@ -10264,9 +10264,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.38-new/arch/x
bogus_magic:
jmp bogus_magic
-diff -urNp linux-2.6.38/arch/x86/kernel/alternative.c linux-2.6.38-new/arch/x86/kernel/alternative.c
---- linux-2.6.38/arch/x86/kernel/alternative.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/alternative.c 2011-03-21 23:47:41.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/alternative.c linux-2.6.38.1/arch/x86/kernel/alternative.c
+--- linux-2.6.38.1/arch/x86/kernel/alternative.c 2011-03-23 17:20:06.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/alternative.c 2011-03-26 20:47:42.000000000 -0400
@@ -248,7 +248,7 @@ static void alternatives_smp_lock(const
if (!*poff || ptr < text || ptr >= text_end)
continue;
@@ -10368,21 +10368,21 @@ diff -urNp linux-2.6.38/arch/x86/kernel/alternative.c linux-2.6.38-new/arch/x86/
return addr;
}
-@@ -620,7 +610,12 @@ static int __kprobes stop_machine_text_p
+@@ -620,12 +610,7 @@ static int __kprobes stop_machine_text_p
flush_icache_range((unsigned long)p->addr,
(unsigned long)p->addr + p->len);
}
--
-+ /*
-+ * Intel Archiecture Software Developer's Manual section 7.1.3 specifies
-+ * that a core serializing instruction such as "cpuid" should be
-+ * executed on _each_ core before the new instruction is made visible.
-+ */
-+ sync_core();
+- /*
+- * Intel Archiecture Software Developer's Manual section 7.1.3 specifies
+- * that a core serializing instruction such as "cpuid" should be
+- * executed on _each_ core before the new instruction is made visible.
+- */
+- sync_core();
++
return 0;
}
-@@ -677,9 +672,9 @@ void __kprobes text_poke_smp_batch(struc
+@@ -682,9 +667,9 @@ void __kprobes text_poke_smp_batch(struc
#if defined(CONFIG_DYNAMIC_FTRACE) || defined(HAVE_JUMP_LABEL)
#ifdef CONFIG_X86_64
@@ -10394,9 +10394,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/alternative.c linux-2.6.38-new/arch/x86/
#endif
void __init arch_init_ideal_nop5(void)
-diff -urNp linux-2.6.38/arch/x86/kernel/amd_iommu.c linux-2.6.38-new/arch/x86/kernel/amd_iommu.c
---- linux-2.6.38/arch/x86/kernel/amd_iommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/amd_iommu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/amd_iommu.c linux-2.6.38.1/arch/x86/kernel/amd_iommu.c
+--- linux-2.6.38.1/arch/x86/kernel/amd_iommu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/amd_iommu.c 2011-03-21 18:31:35.000000000 -0400
@@ -2286,7 +2286,7 @@ static void prealloc_protection_domains(
}
}
@@ -10406,9 +10406,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/amd_iommu.c linux-2.6.38-new/arch/x86/ke
.alloc_coherent = alloc_coherent,
.free_coherent = free_coherent,
.map_page = map_page,
-diff -urNp linux-2.6.38/arch/x86/kernel/apic/io_apic.c linux-2.6.38-new/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.38/arch/x86/kernel/apic/io_apic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/apic/io_apic.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/apic/io_apic.c linux-2.6.38.1/arch/x86/kernel/apic/io_apic.c
+--- linux-2.6.38.1/arch/x86/kernel/apic/io_apic.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/apic/io_apic.c 2011-03-21 18:31:35.000000000 -0400
@@ -617,7 +617,7 @@ struct IO_APIC_route_entry **alloc_ioapi
ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
GFP_KERNEL);
@@ -10445,9 +10445,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/apic/io_apic.c linux-2.6.38-new/arch/x86
{
raw_spin_unlock(&vector_lock);
}
-diff -urNp linux-2.6.38/arch/x86/kernel/apm_32.c linux-2.6.38-new/arch/x86/kernel/apm_32.c
---- linux-2.6.38/arch/x86/kernel/apm_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/apm_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/apm_32.c linux-2.6.38.1/arch/x86/kernel/apm_32.c
+--- linux-2.6.38.1/arch/x86/kernel/apm_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/apm_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -410,7 +410,7 @@ static DEFINE_MUTEX(apm_mutex);
* This is for buggy BIOS's that refer to (real mode) segment 0x40
* even though they are called in protected mode.
@@ -10549,9 +10549,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/apm_32.c linux-2.6.38-new/arch/x86/kerne
proc_create("apm", 0, NULL, &apm_file_ops);
-diff -urNp linux-2.6.38/arch/x86/kernel/asm-offsets_32.c linux-2.6.38-new/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.38/arch/x86/kernel/asm-offsets_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/asm-offsets_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/asm-offsets_32.c linux-2.6.38.1/arch/x86/kernel/asm-offsets_32.c
+--- linux-2.6.38.1/arch/x86/kernel/asm-offsets_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/asm-offsets_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -113,6 +113,11 @@ void foo(void)
OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
@@ -10564,9 +10564,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/asm-offsets_32.c linux-2.6.38-new/arch/x
#endif
#ifdef CONFIG_XEN
-diff -urNp linux-2.6.38/arch/x86/kernel/asm-offsets_64.c linux-2.6.38-new/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.38/arch/x86/kernel/asm-offsets_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/asm-offsets_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/asm-offsets_64.c linux-2.6.38.1/arch/x86/kernel/asm-offsets_64.c
+--- linux-2.6.38.1/arch/x86/kernel/asm-offsets_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/asm-offsets_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -63,6 +63,18 @@ int main(void)
OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
@@ -10594,9 +10594,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/asm-offsets_64.c linux-2.6.38-new/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.38/arch/x86/kernel/cpu/common.c linux-2.6.38-new/arch/x86/kernel/cpu/common.c
---- linux-2.6.38/arch/x86/kernel/cpu/common.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/cpu/common.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/cpu/common.c linux-2.6.38.1/arch/x86/kernel/cpu/common.c
+--- linux-2.6.38.1/arch/x86/kernel/cpu/common.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/cpu/common.c 2011-03-21 18:31:35.000000000 -0400
@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -10722,9 +10722,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/cpu/common.c linux-2.6.38-new/arch/x86/k
struct thread_struct *thread = &curr->thread;
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-2.6.38/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.38-new/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
---- linux-2.6.38/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.38.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+--- linux-2.6.38.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-03-21 18:31:35.000000000 -0400
@@ -481,7 +481,7 @@ static const struct dmi_system_id sw_any
DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
},
@@ -10734,9 +10734,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.38-
};
static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
-diff -urNp linux-2.6.38/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.38-new/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
---- linux-2.6.38/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.38.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
+--- linux-2.6.38.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-03-21 18:31:35.000000000 -0400
@@ -226,7 +226,7 @@ static struct cpu_model models[] =
{ &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
{ &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
@@ -10746,9 +10746,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2
};
#undef _BANIAS
#undef BANIAS
-diff -urNp linux-2.6.38/arch/x86/kernel/cpu/intel.c linux-2.6.38-new/arch/x86/kernel/cpu/intel.c
---- linux-2.6.38/arch/x86/kernel/cpu/intel.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/cpu/intel.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/cpu/intel.c linux-2.6.38.1/arch/x86/kernel/cpu/intel.c
+--- linux-2.6.38.1/arch/x86/kernel/cpu/intel.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/cpu/intel.c 2011-03-21 18:31:35.000000000 -0400
@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug
* Update the IDT descriptor and reload the IDT so that
* it uses the read-only mapped virtual address.
@@ -10758,9 +10758,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/cpu/intel.c linux-2.6.38-new/arch/x86/ke
load_idt(&idt_descr);
}
#endif
-diff -urNp linux-2.6.38/arch/x86/kernel/cpu/Makefile linux-2.6.38-new/arch/x86/kernel/cpu/Makefile
---- linux-2.6.38/arch/x86/kernel/cpu/Makefile 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/cpu/Makefile 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/cpu/Makefile linux-2.6.38.1/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.38.1/arch/x86/kernel/cpu/Makefile 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/cpu/Makefile 2011-03-21 18:31:35.000000000 -0400
@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
CFLAGS_REMOVE_perf_event.o = -pg
endif
@@ -10772,9 +10772,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/cpu/Makefile linux-2.6.38-new/arch/x86/k
obj-y := intel_cacheinfo.o scattered.o topology.o
obj-y += proc.o capflags.o powerflags.o common.o
obj-y += vmware.o hypervisor.o sched.o mshyperv.o
-diff -urNp linux-2.6.38/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38-new/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.38/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.1/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-2.6.38.1/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-21 18:31:35.000000000 -0400
@@ -45,6 +45,7 @@
#include <asm/ipi.h>
#include <asm/mce.h>
@@ -10845,9 +10845,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38-new/arch/x
};
/*
-diff -urNp linux-2.6.38/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.38-new/arch/x86/kernel/cpu/mtrr/generic.c
---- linux-2.6.38/arch/x86/kernel/cpu/mtrr/generic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/cpu/mtrr/generic.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.38.1/arch/x86/kernel/cpu/mtrr/generic.c
+--- linux-2.6.38.1/arch/x86/kernel/cpu/mtrr/generic.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/cpu/mtrr/generic.c 2011-03-21 18:31:35.000000000 -0400
@@ -28,7 +28,7 @@ static struct fixed_range_block fixed_ra
{ MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
{ MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
@@ -10857,9 +10857,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.38-new/arch
};
static unsigned long smp_changes_mask;
-diff -urNp linux-2.6.38/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.38-new/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.38/arch/x86/kernel/cpu/mtrr/main.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/cpu/mtrr/main.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.38.1/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-2.6.38.1/arch/x86/kernel/cpu/mtrr/main.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/cpu/mtrr/main.c 2011-03-21 18:31:35.000000000 -0400
@@ -61,7 +61,7 @@ static DEFINE_MUTEX(mtrr_mutex);
u64 size_or_mask, size_and_mask;
static bool mtrr_aps_delayed_init;
@@ -10869,9 +10869,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.38-new/arch/x8
const struct mtrr_ops *mtrr_if;
-diff -urNp linux-2.6.38/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.38-new/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.38/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.38.1/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-2.6.38.1/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-21 18:31:35.000000000 -0400
@@ -12,19 +12,19 @@
extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
@@ -10900,9 +10900,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.38-new/arch/x8
};
extern int generic_get_free_region(unsigned long base, unsigned long size,
-diff -urNp linux-2.6.38/arch/x86/kernel/cpu/perf_event.c linux-2.6.38-new/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.38/arch/x86/kernel/cpu/perf_event.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/cpu/perf_event.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/cpu/perf_event.c linux-2.6.38.1/arch/x86/kernel/cpu/perf_event.c
+--- linux-2.6.38.1/arch/x86/kernel/cpu/perf_event.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/cpu/perf_event.c 2011-03-21 18:31:35.000000000 -0400
@@ -1781,7 +1781,7 @@ perf_callchain_user(struct perf_callchai
break;
@@ -10912,9 +10912,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/cpu/perf_event.c linux-2.6.38-new/arch/x
}
}
-diff -urNp linux-2.6.38/arch/x86/kernel/crash.c linux-2.6.38-new/arch/x86/kernel/crash.c
---- linux-2.6.38/arch/x86/kernel/crash.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/crash.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/crash.c linux-2.6.38.1/arch/x86/kernel/crash.c
+--- linux-2.6.38.1/arch/x86/kernel/crash.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/crash.c 2011-03-21 18:31:35.000000000 -0400
@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu,
regs = args->regs;
@@ -10924,9 +10924,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/crash.c linux-2.6.38-new/arch/x86/kernel
crash_fixup_ss_esp(&fixed_regs, regs);
regs = &fixed_regs;
}
-diff -urNp linux-2.6.38/arch/x86/kernel/doublefault_32.c linux-2.6.38-new/arch/x86/kernel/doublefault_32.c
---- linux-2.6.38/arch/x86/kernel/doublefault_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/doublefault_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/doublefault_32.c linux-2.6.38.1/arch/x86/kernel/doublefault_32.c
+--- linux-2.6.38.1/arch/x86/kernel/doublefault_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/doublefault_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -11,7 +11,7 @@
#define DOUBLEFAULT_STACKSIZE (1024)
@@ -10958,9 +10958,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/doublefault_32.c linux-2.6.38-new/arch/x
.fs = __KERNEL_PERCPU,
.__cr3 = __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.38/arch/x86/kernel/dumpstack_32.c linux-2.6.38-new/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.38/arch/x86/kernel/dumpstack_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/dumpstack_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/dumpstack_32.c linux-2.6.38.1/arch/x86/kernel/dumpstack_32.c
+--- linux-2.6.38.1/arch/x86/kernel/dumpstack_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/dumpstack_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -95,21 +95,22 @@ void show_registers(struct pt_regs *regs
* When in-kernel, we also print out the stack and code at the
* time of the fault..
@@ -11004,9 +11004,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/dumpstack_32.c linux-2.6.38-new/arch/x86
if (ip < PAGE_OFFSET)
return 0;
if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-2.6.38/arch/x86/kernel/dumpstack.c linux-2.6.38-new/arch/x86/kernel/dumpstack.c
---- linux-2.6.38/arch/x86/kernel/dumpstack.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/dumpstack.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/dumpstack.c linux-2.6.38.1/arch/x86/kernel/dumpstack.c
+--- linux-2.6.38.1/arch/x86/kernel/dumpstack.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/dumpstack.c 2011-03-21 18:31:35.000000000 -0400
@@ -2,6 +2,9 @@
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -11062,9 +11062,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/dumpstack.c linux-2.6.38-new/arch/x86/ke
report_bug(regs->ip, regs);
if (__die(str, regs, err))
-diff -urNp linux-2.6.38/arch/x86/kernel/entry_32.S linux-2.6.38-new/arch/x86/kernel/entry_32.S
---- linux-2.6.38/arch/x86/kernel/entry_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/entry_32.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/entry_32.S linux-2.6.38.1/arch/x86/kernel/entry_32.S
+--- linux-2.6.38.1/arch/x86/kernel/entry_32.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/entry_32.S 2011-03-21 18:31:35.000000000 -0400
@@ -183,13 +183,81 @@
/*CFI_REL_OFFSET gs, PT_GS*/
.endm
@@ -11437,9 +11437,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/entry_32.S linux-2.6.38-new/arch/x86/ker
RESTORE_REGS
lss 12+4(%esp), %esp # back to espfix stack
CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-2.6.38/arch/x86/kernel/entry_64.S linux-2.6.38-new/arch/x86/kernel/entry_64.S
---- linux-2.6.38/arch/x86/kernel/entry_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/entry_64.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/entry_64.S linux-2.6.38.1/arch/x86/kernel/entry_64.S
+--- linux-2.6.38.1/arch/x86/kernel/entry_64.S 2011-03-23 17:20:06.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/entry_64.S 2011-03-23 17:21:49.000000000 -0400
@@ -53,6 +53,7 @@
#include <asm/paravirt.h>
#include <asm/ftrace.h>
@@ -11918,9 +11918,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/entry_64.S linux-2.6.38-new/arch/x86/ker
RESTORE_ALL 8
jmp irq_return
nmi_userspace:
-diff -urNp linux-2.6.38/arch/x86/kernel/ftrace.c linux-2.6.38-new/arch/x86/kernel/ftrace.c
---- linux-2.6.38/arch/x86/kernel/ftrace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/ftrace.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/ftrace.c linux-2.6.38.1/arch/x86/kernel/ftrace.c
+--- linux-2.6.38.1/arch/x86/kernel/ftrace.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/ftrace.c 2011-03-21 18:31:35.000000000 -0400
@@ -177,7 +177,9 @@ void ftrace_nmi_enter(void)
if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -11958,9 +11958,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/ftrace.c linux-2.6.38-new/arch/x86/kerne
if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
return -EFAULT;
-diff -urNp linux-2.6.38/arch/x86/kernel/head32.c linux-2.6.38-new/arch/x86/kernel/head32.c
---- linux-2.6.38/arch/x86/kernel/head32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/head32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/head32.c linux-2.6.38.1/arch/x86/kernel/head32.c
+--- linux-2.6.38.1/arch/x86/kernel/head32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/head32.c 2011-03-21 18:31:35.000000000 -0400
@@ -19,6 +19,7 @@
#include <asm/io_apic.h>
#include <asm/bios_ebda.h>
@@ -11978,9 +11978,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/head32.c linux-2.6.38-new/arch/x86/kerne
#ifdef CONFIG_BLK_DEV_INITRD
/* Reserve INITRD */
-diff -urNp linux-2.6.38/arch/x86/kernel/head_32.S linux-2.6.38-new/arch/x86/kernel/head_32.S
---- linux-2.6.38/arch/x86/kernel/head_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/head_32.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/head_32.S linux-2.6.38.1/arch/x86/kernel/head_32.S
+--- linux-2.6.38.1/arch/x86/kernel/head_32.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/head_32.S 2011-03-21 18:31:35.000000000 -0400
@@ -25,6 +25,12 @@
/* Physical address */
#define pa(X) ((X) - __PAGE_OFFSET)
@@ -12408,9 +12408,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/head_32.S linux-2.6.38-new/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.38/arch/x86/kernel/head_64.S linux-2.6.38-new/arch/x86/kernel/head_64.S
---- linux-2.6.38/arch/x86/kernel/head_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/head_64.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/head_64.S linux-2.6.38.1/arch/x86/kernel/head_64.S
+--- linux-2.6.38.1/arch/x86/kernel/head_64.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/head_64.S 2011-03-21 18:31:35.000000000 -0400
@@ -19,6 +19,7 @@
#include <asm/cache.h>
#include <asm/processor-flags.h>
@@ -12680,9 +12680,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/head_64.S linux-2.6.38-new/arch/x86/kern
__PAGE_ALIGNED_BSS
.align PAGE_SIZE
-diff -urNp linux-2.6.38/arch/x86/kernel/i386_ksyms_32.c linux-2.6.38-new/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.38/arch/x86/kernel/i386_ksyms_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/i386_ksyms_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/i386_ksyms_32.c linux-2.6.38.1/arch/x86/kernel/i386_ksyms_32.c
+--- linux-2.6.38.1/arch/x86/kernel/i386_ksyms_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/i386_ksyms_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
EXPORT_SYMBOL(cmpxchg8b_emu);
#endif
@@ -12704,9 +12704,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/i386_ksyms_32.c linux-2.6.38-new/arch/x8
+#ifdef CONFIG_PAX_KERNEXEC
+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
+#endif
-diff -urNp linux-2.6.38/arch/x86/kernel/init_task.c linux-2.6.38-new/arch/x86/kernel/init_task.c
---- linux-2.6.38/arch/x86/kernel/init_task.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/init_task.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/init_task.c linux-2.6.38.1/arch/x86/kernel/init_task.c
+--- linux-2.6.38.1/arch/x86/kernel/init_task.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/init_task.c 2011-03-21 18:31:35.000000000 -0400
@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
* section. Since TSS's are completely CPU-local, we want them
* on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -12715,9 +12715,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/init_task.c linux-2.6.38-new/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.38/arch/x86/kernel/ioport.c linux-2.6.38-new/arch/x86/kernel/ioport.c
---- linux-2.6.38/arch/x86/kernel/ioport.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/ioport.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/ioport.c linux-2.6.38.1/arch/x86/kernel/ioport.c
+--- linux-2.6.38.1/arch/x86/kernel/ioport.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/ioport.c 2011-03-21 18:31:35.000000000 -0400
@@ -6,6 +6,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
@@ -12761,9 +12761,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/ioport.c linux-2.6.38-new/arch/x86/kerne
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
}
-diff -urNp linux-2.6.38/arch/x86/kernel/irq_32.c linux-2.6.38-new/arch/x86/kernel/irq_32.c
---- linux-2.6.38/arch/x86/kernel/irq_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/irq_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/irq_32.c linux-2.6.38.1/arch/x86/kernel/irq_32.c
+--- linux-2.6.38.1/arch/x86/kernel/irq_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/irq_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -91,7 +91,7 @@ execute_on_irq_stack(int overflow, struc
return 0;
@@ -12816,9 +12816,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/irq_32.c linux-2.6.38-new/arch/x86/kerne
/*
* Shouldnt happen, we returned above if in_interrupt():
*/
-diff -urNp linux-2.6.38/arch/x86/kernel/kgdb.c linux-2.6.38-new/arch/x86/kernel/kgdb.c
---- linux-2.6.38/arch/x86/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/kgdb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/kgdb.c linux-2.6.38.1/arch/x86/kernel/kgdb.c
+--- linux-2.6.38.1/arch/x86/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/kgdb.c 2011-03-21 18:31:35.000000000 -0400
@@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem,
switch (regno) {
#ifdef CONFIG_X86_32
@@ -12842,9 +12842,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/kgdb.c linux-2.6.38-new/arch/x86/kernel/
/* Breakpoint instruction: */
.gdb_bpt_instr = { 0xcc },
.flags = KGDB_HW_BREAKPOINT,
-diff -urNp linux-2.6.38/arch/x86/kernel/kprobes.c linux-2.6.38-new/arch/x86/kernel/kprobes.c
---- linux-2.6.38/arch/x86/kernel/kprobes.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/kprobes.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/kprobes.c linux-2.6.38.1/arch/x86/kernel/kprobes.c
+--- linux-2.6.38.1/arch/x86/kernel/kprobes.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/kprobes.c 2011-03-21 18:31:35.000000000 -0400
@@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat
} __attribute__((packed)) *insn;
@@ -12978,9 +12978,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/kprobes.c linux-2.6.38-new/arch/x86/kern
RELATIVE_ADDR_SIZE);
insn_buf[0] = RELATIVEJUMP_OPCODE;
-diff -urNp linux-2.6.38/arch/x86/kernel/ldt.c linux-2.6.38-new/arch/x86/kernel/ldt.c
---- linux-2.6.38/arch/x86/kernel/ldt.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/ldt.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/ldt.c linux-2.6.38.1/arch/x86/kernel/ldt.c
+--- linux-2.6.38.1/arch/x86/kernel/ldt.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/ldt.c 2011-03-21 18:31:35.000000000 -0400
@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
if (reload) {
#ifdef CONFIG_SMP
@@ -13045,9 +13045,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/ldt.c linux-2.6.38-new/arch/x86/kernel/l
fill_ldt(&ldt, &ldt_info);
if (oldmode)
ldt.avl = 0;
-diff -urNp linux-2.6.38/arch/x86/kernel/machine_kexec_32.c linux-2.6.38-new/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.38/arch/x86/kernel/machine_kexec_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/machine_kexec_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/machine_kexec_32.c linux-2.6.38.1/arch/x86/kernel/machine_kexec_32.c
+--- linux-2.6.38.1/arch/x86/kernel/machine_kexec_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/machine_kexec_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -27,7 +27,7 @@
#include <asm/cacheflush.h>
#include <asm/debugreg.h>
@@ -13075,9 +13075,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/machine_kexec_32.c linux-2.6.38-new/arch
relocate_kernel_ptr = control_page;
page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-2.6.38/arch/x86/kernel/microcode_amd.c linux-2.6.38-new/arch/x86/kernel/microcode_amd.c
---- linux-2.6.38/arch/x86/kernel/microcode_amd.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/microcode_amd.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/microcode_amd.c linux-2.6.38.1/arch/x86/kernel/microcode_amd.c
+--- linux-2.6.38.1/arch/x86/kernel/microcode_amd.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/microcode_amd.c 2011-03-21 18:31:35.000000000 -0400
@@ -317,7 +317,7 @@ static void microcode_fini_cpu_amd(int c
uci->mc = NULL;
}
@@ -13096,9 +13096,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/microcode_amd.c linux-2.6.38-new/arch/x8
{
return &microcode_amd_ops;
}
-diff -urNp linux-2.6.38/arch/x86/kernel/microcode_core.c linux-2.6.38-new/arch/x86/kernel/microcode_core.c
---- linux-2.6.38/arch/x86/kernel/microcode_core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/microcode_core.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/microcode_core.c linux-2.6.38.1/arch/x86/kernel/microcode_core.c
+--- linux-2.6.38.1/arch/x86/kernel/microcode_core.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/microcode_core.c 2011-03-21 18:31:35.000000000 -0400
@@ -92,7 +92,7 @@ MODULE_LICENSE("GPL");
#define MICROCODE_VERSION "2.00"
@@ -13108,9 +13108,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/microcode_core.c linux-2.6.38-new/arch/x
/*
* Synchronization.
-diff -urNp linux-2.6.38/arch/x86/kernel/microcode_intel.c linux-2.6.38-new/arch/x86/kernel/microcode_intel.c
---- linux-2.6.38/arch/x86/kernel/microcode_intel.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/microcode_intel.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/microcode_intel.c linux-2.6.38.1/arch/x86/kernel/microcode_intel.c
+--- linux-2.6.38.1/arch/x86/kernel/microcode_intel.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/microcode_intel.c 2011-03-21 18:31:35.000000000 -0400
@@ -440,13 +440,13 @@ static enum ucode_state request_microcod
static int get_ucode_user(void *to, const void *from, size_t n)
@@ -13145,9 +13145,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/microcode_intel.c linux-2.6.38-new/arch/
{
return &microcode_intel_ops;
}
-diff -urNp linux-2.6.38/arch/x86/kernel/module.c linux-2.6.38-new/arch/x86/kernel/module.c
---- linux-2.6.38/arch/x86/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/module.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/module.c linux-2.6.38.1/arch/x86/kernel/module.c
+--- linux-2.6.38.1/arch/x86/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/module.c 2011-03-21 18:31:35.000000000 -0400
@@ -35,21 +35,66 @@
#define DEBUGP(fmt...)
#endif
@@ -13286,9 +13286,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/module.c linux-2.6.38-new/arch/x86/kerne
#if 0
if ((s64)val != *(s32 *)loc)
goto overflow;
-diff -urNp linux-2.6.38/arch/x86/kernel/paravirt.c linux-2.6.38-new/arch/x86/kernel/paravirt.c
---- linux-2.6.38/arch/x86/kernel/paravirt.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/paravirt.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/paravirt.c linux-2.6.38.1/arch/x86/kernel/paravirt.c
+--- linux-2.6.38.1/arch/x86/kernel/paravirt.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/paravirt.c 2011-03-21 18:31:35.000000000 -0400
@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
* corresponding structure. */
static void *get_call_destination(u8 type)
@@ -13392,9 +13392,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/paravirt.c linux-2.6.38-new/arch/x86/ker
};
EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.38/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.38-new/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.38/arch/x86/kernel/paravirt-spinlocks.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/paravirt-spinlocks.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.38.1/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.38.1/arch/x86/kernel/paravirt-spinlocks.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/paravirt-spinlocks.c 2011-03-21 18:31:35.000000000 -0400
@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t
arch_spin_lock(lock);
}
@@ -13404,9 +13404,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.38-new/ar
#ifdef CONFIG_SMP
.spin_is_locked = __ticket_spin_is_locked,
.spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-2.6.38/arch/x86/kernel/pci-calgary_64.c linux-2.6.38-new/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.38/arch/x86/kernel/pci-calgary_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/pci-calgary_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/pci-calgary_64.c linux-2.6.38.1/arch/x86/kernel/pci-calgary_64.c
+--- linux-2.6.38.1/arch/x86/kernel/pci-calgary_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/pci-calgary_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -476,7 +476,7 @@ static void calgary_free_coherent(struct
free_pages((unsigned long)vaddr, get_order(size));
}
@@ -13416,9 +13416,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/pci-calgary_64.c linux-2.6.38-new/arch/x
.alloc_coherent = calgary_alloc_coherent,
.free_coherent = calgary_free_coherent,
.map_sg = calgary_map_sg,
-diff -urNp linux-2.6.38/arch/x86/kernel/pci-dma.c linux-2.6.38-new/arch/x86/kernel/pci-dma.c
---- linux-2.6.38/arch/x86/kernel/pci-dma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/pci-dma.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/pci-dma.c linux-2.6.38.1/arch/x86/kernel/pci-dma.c
+--- linux-2.6.38.1/arch/x86/kernel/pci-dma.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/pci-dma.c 2011-03-21 18:31:35.000000000 -0400
@@ -16,7 +16,7 @@
static int forbid_dac __read_mostly;
@@ -13437,9 +13437,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/pci-dma.c linux-2.6.38-new/arch/x86/kern
#ifdef CONFIG_PCI
if (mask > 0xffffffff && forbid_dac > 0) {
-diff -urNp linux-2.6.38/arch/x86/kernel/pci-gart_64.c linux-2.6.38-new/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.38/arch/x86/kernel/pci-gart_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/pci-gart_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/pci-gart_64.c linux-2.6.38.1/arch/x86/kernel/pci-gart_64.c
+--- linux-2.6.38.1/arch/x86/kernel/pci-gart_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/pci-gart_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -706,7 +706,7 @@ static __init int init_amd_gatt(struct a
return -1;
}
@@ -13449,9 +13449,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/pci-gart_64.c linux-2.6.38-new/arch/x86/
.map_sg = gart_map_sg,
.unmap_sg = gart_unmap_sg,
.map_page = gart_map_page,
-diff -urNp linux-2.6.38/arch/x86/kernel/pci-nommu.c linux-2.6.38-new/arch/x86/kernel/pci-nommu.c
---- linux-2.6.38/arch/x86/kernel/pci-nommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/pci-nommu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/pci-nommu.c linux-2.6.38.1/arch/x86/kernel/pci-nommu.c
+--- linux-2.6.38.1/arch/x86/kernel/pci-nommu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/pci-nommu.c 2011-03-21 18:31:35.000000000 -0400
@@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(str
flush_write_buffers();
}
@@ -13461,9 +13461,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/pci-nommu.c linux-2.6.38-new/arch/x86/ke
.alloc_coherent = dma_generic_alloc_coherent,
.free_coherent = nommu_free_coherent,
.map_sg = nommu_map_sg,
-diff -urNp linux-2.6.38/arch/x86/kernel/pci-swiotlb.c linux-2.6.38-new/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.38/arch/x86/kernel/pci-swiotlb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/pci-swiotlb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/pci-swiotlb.c linux-2.6.38.1/arch/x86/kernel/pci-swiotlb.c
+--- linux-2.6.38.1/arch/x86/kernel/pci-swiotlb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/pci-swiotlb.c 2011-03-21 18:31:35.000000000 -0400
@@ -26,7 +26,7 @@ static void *x86_swiotlb_alloc_coherent(
return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
}
@@ -13473,9 +13473,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/pci-swiotlb.c linux-2.6.38-new/arch/x86/
.mapping_error = swiotlb_dma_mapping_error,
.alloc_coherent = x86_swiotlb_alloc_coherent,
.free_coherent = swiotlb_free_coherent,
-diff -urNp linux-2.6.38/arch/x86/kernel/process_32.c linux-2.6.38-new/arch/x86/kernel/process_32.c
---- linux-2.6.38/arch/x86/kernel/process_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/process_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/process_32.c linux-2.6.38.1/arch/x86/kernel/process_32.c
+--- linux-2.6.38.1/arch/x86/kernel/process_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/process_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as
unsigned long thread_saved_pc(struct task_struct *tsk)
{
@@ -13559,9 +13559,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/process_32.c linux-2.6.38-new/arch/x86/k
+ load_sp0(init_tss + smp_processor_id(), thread);
+}
+#endif
-diff -urNp linux-2.6.38/arch/x86/kernel/process_64.c linux-2.6.38-new/arch/x86/kernel/process_64.c
---- linux-2.6.38/arch/x86/kernel/process_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/process_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/process_64.c linux-2.6.38.1/arch/x86/kernel/process_64.c
+--- linux-2.6.38.1/arch/x86/kernel/process_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/process_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -87,7 +87,7 @@ static void __exit_idle(void)
void exit_idle(void)
{
@@ -13595,9 +13595,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/process_64.c linux-2.6.38-new/arch/x86/k
return 0;
ip = *(u64 *)(fp+8);
if (!in_sched_functions(ip))
-diff -urNp linux-2.6.38/arch/x86/kernel/process.c linux-2.6.38-new/arch/x86/kernel/process.c
---- linux-2.6.38/arch/x86/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/process.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/process.c linux-2.6.38.1/arch/x86/kernel/process.c
+--- linux-2.6.38.1/arch/x86/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/process.c 2011-03-21 18:31:35.000000000 -0400
@@ -70,7 +70,7 @@ void exit_thread(void)
unsigned long *bp = t->io_bitmap_ptr;
@@ -13668,9 +13668,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/process.c linux-2.6.38-new/arch/x86/kern
- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
-}
-
-diff -urNp linux-2.6.38/arch/x86/kernel/ptrace.c linux-2.6.38-new/arch/x86/kernel/ptrace.c
---- linux-2.6.38/arch/x86/kernel/ptrace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/ptrace.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/ptrace.c linux-2.6.38.1/arch/x86/kernel/ptrace.c
+--- linux-2.6.38.1/arch/x86/kernel/ptrace.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/ptrace.c 2011-03-21 18:31:35.000000000 -0400
@@ -805,7 +805,7 @@ long arch_ptrace(struct task_struct *chi
unsigned long addr, unsigned long data)
{
@@ -13724,9 +13724,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/ptrace.c linux-2.6.38-new/arch/x86/kerne
{
bool step;
-diff -urNp linux-2.6.38/arch/x86/kernel/reboot.c linux-2.6.38-new/arch/x86/kernel/reboot.c
---- linux-2.6.38/arch/x86/kernel/reboot.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/reboot.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/reboot.c linux-2.6.38.1/arch/x86/kernel/reboot.c
+--- linux-2.6.38.1/arch/x86/kernel/reboot.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/reboot.c 2011-03-21 18:31:35.000000000 -0400
@@ -34,7 +34,7 @@ void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
@@ -13792,9 +13792,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/reboot.c linux-2.6.38-new/arch/x86/kerne
/* Set up the IDT for real mode. */
load_idt(&real_mode_idt);
-diff -urNp linux-2.6.38/arch/x86/kernel/setup.c linux-2.6.38-new/arch/x86/kernel/setup.c
---- linux-2.6.38/arch/x86/kernel/setup.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/setup.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/setup.c linux-2.6.38.1/arch/x86/kernel/setup.c
+--- linux-2.6.38.1/arch/x86/kernel/setup.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/setup.c 2011-03-21 18:31:35.000000000 -0400
@@ -654,7 +654,7 @@ static void __init trim_bios_range(void)
* area (640->1Mb) as ram even though it is not.
* take them out.
@@ -13824,9 +13824,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/setup.c linux-2.6.38-new/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.38/arch/x86/kernel/setup_percpu.c linux-2.6.38-new/arch/x86/kernel/setup_percpu.c
---- linux-2.6.38/arch/x86/kernel/setup_percpu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/setup_percpu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/setup_percpu.c linux-2.6.38.1/arch/x86/kernel/setup_percpu.c
+--- linux-2.6.38.1/arch/x86/kernel/setup_percpu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/setup_percpu.c 2011-03-21 18:31:35.000000000 -0400
@@ -21,19 +21,17 @@
#include <asm/cpu.h>
#include <asm/stackprotector.h>
@@ -13890,9 +13890,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/setup_percpu.c linux-2.6.38-new/arch/x86
/*
* Up to this point, the boot CPU has been using .init.data
* area. Reload any changed state for the boot CPU.
-diff -urNp linux-2.6.38/arch/x86/kernel/signal.c linux-2.6.38-new/arch/x86/kernel/signal.c
---- linux-2.6.38/arch/x86/kernel/signal.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/signal.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/signal.c linux-2.6.38.1/arch/x86/kernel/signal.c
+--- linux-2.6.38.1/arch/x86/kernel/signal.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/signal.c 2011-03-21 18:31:35.000000000 -0400
@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi
* Align the stack pointer according to the i386 ABI,
* i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -13967,9 +13967,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/signal.c linux-2.6.38-new/arch/x86/kerne
return;
if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-2.6.38/arch/x86/kernel/smpboot.c linux-2.6.38-new/arch/x86/kernel/smpboot.c
---- linux-2.6.38/arch/x86/kernel/smpboot.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/smpboot.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/smpboot.c linux-2.6.38.1/arch/x86/kernel/smpboot.c
+--- linux-2.6.38.1/arch/x86/kernel/smpboot.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/smpboot.c 2011-03-21 18:31:35.000000000 -0400
@@ -783,7 +783,11 @@ do_rest:
(unsigned long)task_stack_page(c_idle.idle) -
KERNEL_STACK_OFFSET + THREAD_SIZE;
@@ -13995,9 +13995,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/smpboot.c linux-2.6.38-new/arch/x86/kern
err = do_boot_cpu(apicid, cpu);
if (err) {
pr_debug("do_boot_cpu failed %d\n", err);
-diff -urNp linux-2.6.38/arch/x86/kernel/step.c linux-2.6.38-new/arch/x86/kernel/step.c
---- linux-2.6.38/arch/x86/kernel/step.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/step.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/step.c linux-2.6.38.1/arch/x86/kernel/step.c
+--- linux-2.6.38.1/arch/x86/kernel/step.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/step.c 2011-03-21 18:31:35.000000000 -0400
@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
struct desc_struct *desc;
unsigned long base;
@@ -14040,17 +14040,17 @@ diff -urNp linux-2.6.38/arch/x86/kernel/step.c linux-2.6.38-new/arch/x86/kernel/
/* 32-bit mode: register increment */
return 0;
/* 64-bit mode: REX prefix */
-diff -urNp linux-2.6.38/arch/x86/kernel/syscall_table_32.S linux-2.6.38-new/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.38/arch/x86/kernel/syscall_table_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/syscall_table_32.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/syscall_table_32.S linux-2.6.38.1/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.38.1/arch/x86/kernel/syscall_table_32.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/syscall_table_32.S 2011-03-21 18:31:35.000000000 -0400
@@ -1,3 +1,4 @@
+.section .rodata,"a",@progbits
ENTRY(sys_call_table)
.long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
.long sys_exit
-diff -urNp linux-2.6.38/arch/x86/kernel/sys_i386_32.c linux-2.6.38-new/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.38/arch/x86/kernel/sys_i386_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/sys_i386_32.c 2011-03-21 23:47:41.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/sys_i386_32.c linux-2.6.38.1/arch/x86/kernel/sys_i386_32.c
+--- linux-2.6.38.1/arch/x86/kernel/sys_i386_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/sys_i386_32.c 2011-03-21 23:47:41.000000000 -0400
@@ -24,17 +24,224 @@
#include <asm/syscalls.h>
@@ -14288,9 +14288,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/sys_i386_32.c linux-2.6.38-new/arch/x86/
+
+ return addr;
}
-diff -urNp linux-2.6.38/arch/x86/kernel/sys_x86_64.c linux-2.6.38-new/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.38/arch/x86/kernel/sys_x86_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/sys_x86_64.c 2011-03-21 23:47:41.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/sys_x86_64.c linux-2.6.38.1/arch/x86/kernel/sys_x86_64.c
+--- linux-2.6.38.1/arch/x86/kernel/sys_x86_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/sys_x86_64.c 2011-03-21 23:47:41.000000000 -0400
@@ -32,8 +32,8 @@ out:
return error;
}
@@ -14428,9 +14428,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/sys_x86_64.c linux-2.6.38-new/arch/x86/k
mm->cached_hole_size = ~0UL;
return addr;
-diff -urNp linux-2.6.38/arch/x86/kernel/time.c linux-2.6.38-new/arch/x86/kernel/time.c
---- linux-2.6.38/arch/x86/kernel/time.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/time.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/time.c linux-2.6.38.1/arch/x86/kernel/time.c
+--- linux-2.6.38.1/arch/x86/kernel/time.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/time.c 2011-03-21 18:31:35.000000000 -0400
@@ -22,17 +22,13 @@
#include <asm/hpet.h>
#include <asm/time.h>
@@ -14469,9 +14469,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/time.c linux-2.6.38-new/arch/x86/kernel/
}
return pc;
}
-diff -urNp linux-2.6.38/arch/x86/kernel/tls.c linux-2.6.38-new/arch/x86/kernel/tls.c
---- linux-2.6.38/arch/x86/kernel/tls.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/tls.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/tls.c linux-2.6.38.1/arch/x86/kernel/tls.c
+--- linux-2.6.38.1/arch/x86/kernel/tls.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/tls.c 2011-03-21 18:31:35.000000000 -0400
@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
return -EINVAL;
@@ -14484,9 +14484,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/tls.c linux-2.6.38-new/arch/x86/kernel/t
set_tls_desc(p, idx, &info, 1);
return 0;
-diff -urNp linux-2.6.38/arch/x86/kernel/trampoline_32.S linux-2.6.38-new/arch/x86/kernel/trampoline_32.S
---- linux-2.6.38/arch/x86/kernel/trampoline_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/trampoline_32.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/trampoline_32.S linux-2.6.38.1/arch/x86/kernel/trampoline_32.S
+--- linux-2.6.38.1/arch/x86/kernel/trampoline_32.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/trampoline_32.S 2011-03-21 18:31:35.000000000 -0400
@@ -32,6 +32,12 @@
#include <asm/segment.h>
#include <asm/page_types.h>
@@ -14509,9 +14509,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/trampoline_32.S linux-2.6.38-new/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.38/arch/x86/kernel/trampoline_64.S linux-2.6.38-new/arch/x86/kernel/trampoline_64.S
---- linux-2.6.38/arch/x86/kernel/trampoline_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/trampoline_64.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/trampoline_64.S linux-2.6.38.1/arch/x86/kernel/trampoline_64.S
+--- linux-2.6.38.1/arch/x86/kernel/trampoline_64.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/trampoline_64.S 2011-03-21 18:31:35.000000000 -0400
@@ -91,7 +91,7 @@ startup_32:
movl $__KERNEL_DS, %eax # Initialize the %ds segment register
movl %eax, %ds
@@ -14530,9 +14530,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/trampoline_64.S linux-2.6.38-new/arch/x8
.long tgdt - r_base
.short 0
.quad 0x00cf9b000000ffff # __KERNEL32_CS
-diff -urNp linux-2.6.38/arch/x86/kernel/traps.c linux-2.6.38-new/arch/x86/kernel/traps.c
---- linux-2.6.38/arch/x86/kernel/traps.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/traps.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/traps.c linux-2.6.38.1/arch/x86/kernel/traps.c
+--- linux-2.6.38.1/arch/x86/kernel/traps.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/traps.c 2011-03-21 18:31:35.000000000 -0400
@@ -70,12 +70,6 @@ asmlinkage int system_call(void);
/* Do we ignore FPU interrupts ? */
@@ -14675,9 +14675,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/traps.c linux-2.6.38-new/arch/x86/kernel
{
if (!fixup_exception(regs)) {
task->thread.error_code = error_code;
-diff -urNp linux-2.6.38/arch/x86/kernel/tsc.c linux-2.6.38-new/arch/x86/kernel/tsc.c
---- linux-2.6.38/arch/x86/kernel/tsc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/tsc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/tsc.c linux-2.6.38.1/arch/x86/kernel/tsc.c
+--- linux-2.6.38.1/arch/x86/kernel/tsc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/tsc.c 2011-03-21 18:31:35.000000000 -0400
@@ -837,7 +837,7 @@ static struct dmi_system_id __initdata b
DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
},
@@ -14687,9 +14687,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/tsc.c linux-2.6.38-new/arch/x86/kernel/t
};
static void __init check_system_tsc_reliable(void)
-diff -urNp linux-2.6.38/arch/x86/kernel/vm86_32.c linux-2.6.38-new/arch/x86/kernel/vm86_32.c
---- linux-2.6.38/arch/x86/kernel/vm86_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/vm86_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/vm86_32.c linux-2.6.38.1/arch/x86/kernel/vm86_32.c
+--- linux-2.6.38.1/arch/x86/kernel/vm86_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/vm86_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -41,6 +41,7 @@
#include <linux/ptrace.h>
#include <linux/audit.h>
@@ -14754,9 +14754,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/vm86_32.c linux-2.6.38-new/arch/x86/kern
if (get_user(segoffs, intr_ptr))
goto cannot_handle;
if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-2.6.38/arch/x86/kernel/vmlinux.lds.S linux-2.6.38-new/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.38/arch/x86/kernel/vmlinux.lds.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/vmlinux.lds.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.1/arch/x86/kernel/vmlinux.lds.S
+--- linux-2.6.38.1/arch/x86/kernel/vmlinux.lds.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/vmlinux.lds.S 2011-03-21 18:31:35.000000000 -0400
@@ -26,6 +26,13 @@
#include <asm/page_types.h>
#include <asm/cache.h>
@@ -15053,9 +15053,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/vmlinux.lds.S linux-2.6.38-new/arch/x86/
"kernel image bigger than KERNEL_IMAGE_SIZE");
#ifdef CONFIG_SMP
-diff -urNp linux-2.6.38/arch/x86/kernel/vsyscall_64.c linux-2.6.38-new/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.38/arch/x86/kernel/vsyscall_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/vsyscall_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/vsyscall_64.c linux-2.6.38.1/arch/x86/kernel/vsyscall_64.c
+--- linux-2.6.38.1/arch/x86/kernel/vsyscall_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/vsyscall_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -15073,9 +15073,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/vsyscall_64.c linux-2.6.38-new/arch/x86/
p = tcache->blob[1];
} else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
/* Load per CPU data from RDTSCP */
-diff -urNp linux-2.6.38/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.38-new/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.38/arch/x86/kernel/x8664_ksyms_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/x8664_ksyms_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.38.1/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-2.6.38.1/arch/x86/kernel/x8664_ksyms_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/x8664_ksyms_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
EXPORT_SYMBOL(copy_user_generic_string);
EXPORT_SYMBOL(copy_user_generic_unrolled);
@@ -15085,9 +15085,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.38-new/arch/x
EXPORT_SYMBOL(copy_page);
EXPORT_SYMBOL(clear_page);
-diff -urNp linux-2.6.38/arch/x86/kernel/xsave.c linux-2.6.38-new/arch/x86/kernel/xsave.c
---- linux-2.6.38/arch/x86/kernel/xsave.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kernel/xsave.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kernel/xsave.c linux-2.6.38.1/arch/x86/kernel/xsave.c
+--- linux-2.6.38.1/arch/x86/kernel/xsave.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kernel/xsave.c 2011-03-21 18:31:35.000000000 -0400
@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_
fx_sw_user->xstate_size > fx_sw_user->extended_size)
return -EINVAL;
@@ -15115,9 +15115,9 @@ diff -urNp linux-2.6.38/arch/x86/kernel/xsave.c linux-2.6.38-new/arch/x86/kernel
buf);
if (unlikely(err)) {
/*
-diff -urNp linux-2.6.38/arch/x86/kvm/emulate.c linux-2.6.38-new/arch/x86/kvm/emulate.c
---- linux-2.6.38/arch/x86/kvm/emulate.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kvm/emulate.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kvm/emulate.c linux-2.6.38.1/arch/x86/kvm/emulate.c
+--- linux-2.6.38.1/arch/x86/kvm/emulate.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kvm/emulate.c 2011-03-21 18:31:35.000000000 -0400
@@ -88,7 +88,7 @@
#define Src2ImmByte (2<<29)
#define Src2One (3<<29)
@@ -15152,9 +15152,9 @@ diff -urNp linux-2.6.38/arch/x86/kvm/emulate.c linux-2.6.38-new/arch/x86/kvm/emu
switch ((_dst).bytes) { \
case 1: \
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
-diff -urNp linux-2.6.38/arch/x86/kvm/lapic.c linux-2.6.38-new/arch/x86/kvm/lapic.c
---- linux-2.6.38/arch/x86/kvm/lapic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kvm/lapic.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kvm/lapic.c linux-2.6.38.1/arch/x86/kvm/lapic.c
+--- linux-2.6.38.1/arch/x86/kvm/lapic.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kvm/lapic.c 2011-03-21 18:31:35.000000000 -0400
@@ -53,7 +53,7 @@
#define APIC_BUS_CYCLE_NS 1
@@ -15164,9 +15164,9 @@ diff -urNp linux-2.6.38/arch/x86/kvm/lapic.c linux-2.6.38-new/arch/x86/kvm/lapic
#define APIC_LVT_NUM 6
/* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-2.6.38/arch/x86/kvm/svm.c linux-2.6.38-new/arch/x86/kvm/svm.c
---- linux-2.6.38/arch/x86/kvm/svm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kvm/svm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kvm/svm.c linux-2.6.38.1/arch/x86/kvm/svm.c
+--- linux-2.6.38.1/arch/x86/kvm/svm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kvm/svm.c 2011-03-21 18:31:35.000000000 -0400
@@ -3273,7 +3273,11 @@ static void reload_tss(struct kvm_vcpu *
int cpu = raw_smp_processor_id();
@@ -15188,9 +15188,9 @@ diff -urNp linux-2.6.38/arch/x86/kvm/svm.c linux-2.6.38-new/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.38/arch/x86/kvm/vmx.c linux-2.6.38-new/arch/x86/kvm/vmx.c
---- linux-2.6.38/arch/x86/kvm/vmx.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kvm/vmx.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kvm/vmx.c linux-2.6.38.1/arch/x86/kvm/vmx.c
+--- linux-2.6.38.1/arch/x86/kvm/vmx.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kvm/vmx.c 2011-03-21 18:31:35.000000000 -0400
@@ -725,7 +725,11 @@ static void reload_tss(void)
struct desc_struct *descs;
@@ -15269,9 +15269,9 @@ diff -urNp linux-2.6.38/arch/x86/kvm/vmx.c linux-2.6.38-new/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.38/arch/x86/kvm/x86.c linux-2.6.38-new/arch/x86/kvm/x86.c
---- linux-2.6.38/arch/x86/kvm/x86.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/kvm/x86.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/kvm/x86.c linux-2.6.38.1/arch/x86/kvm/x86.c
+--- linux-2.6.38.1/arch/x86/kvm/x86.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/kvm/x86.c 2011-03-21 18:31:35.000000000 -0400
@@ -93,7 +93,7 @@ static void update_cr8_intercept(struct
static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
struct kvm_cpuid_entry2 __user *entries);
@@ -15383,9 +15383,9 @@ diff -urNp linux-2.6.38/arch/x86/kvm/x86.c linux-2.6.38-new/arch/x86/kvm/x86.c
if (kvm_x86_ops) {
printk(KERN_ERR "kvm: already loaded the other module\n");
-diff -urNp linux-2.6.38/arch/x86/lib/atomic64_cx8_32.S linux-2.6.38-new/arch/x86/lib/atomic64_cx8_32.S
---- linux-2.6.38/arch/x86/lib/atomic64_cx8_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/lib/atomic64_cx8_32.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/lib/atomic64_cx8_32.S linux-2.6.38.1/arch/x86/lib/atomic64_cx8_32.S
+--- linux-2.6.38.1/arch/x86/lib/atomic64_cx8_32.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/lib/atomic64_cx8_32.S 2011-03-21 18:31:35.000000000 -0400
@@ -86,13 +86,23 @@ ENTRY(atomic64_\func\()_return_cx8)
movl %edx, %ecx
\ins\()l %esi, %ebx
@@ -15466,9 +15466,9 @@ diff -urNp linux-2.6.38/arch/x86/lib/atomic64_cx8_32.S linux-2.6.38-new/arch/x86
LOCK_PREFIX
cmpxchg8b (%esi)
jne 1b
-diff -urNp linux-2.6.38/arch/x86/lib/checksum_32.S linux-2.6.38-new/arch/x86/lib/checksum_32.S
---- linux-2.6.38/arch/x86/lib/checksum_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/lib/checksum_32.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/lib/checksum_32.S linux-2.6.38.1/arch/x86/lib/checksum_32.S
+--- linux-2.6.38.1/arch/x86/lib/checksum_32.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/lib/checksum_32.S 2011-03-21 18:31:35.000000000 -0400
@@ -28,7 +28,8 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
@@ -15729,9 +15729,9 @@ diff -urNp linux-2.6.38/arch/x86/lib/checksum_32.S linux-2.6.38-new/arch/x86/lib
#undef ROUND
#undef ROUND1
-diff -urNp linux-2.6.38/arch/x86/lib/clear_page_64.S linux-2.6.38-new/arch/x86/lib/clear_page_64.S
---- linux-2.6.38/arch/x86/lib/clear_page_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/lib/clear_page_64.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/lib/clear_page_64.S linux-2.6.38.1/arch/x86/lib/clear_page_64.S
+--- linux-2.6.38.1/arch/x86/lib/clear_page_64.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/lib/clear_page_64.S 2011-03-21 18:31:35.000000000 -0400
@@ -43,7 +43,7 @@ ENDPROC(clear_page)
#include <asm/cpufeature.h>
@@ -15741,9 +15741,9 @@ diff -urNp linux-2.6.38/arch/x86/lib/clear_page_64.S linux-2.6.38-new/arch/x86/l
1: .byte 0xeb /* jmp <disp8> */
.byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.38/arch/x86/lib/copy_page_64.S linux-2.6.38-new/arch/x86/lib/copy_page_64.S
---- linux-2.6.38/arch/x86/lib/copy_page_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/lib/copy_page_64.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/lib/copy_page_64.S linux-2.6.38.1/arch/x86/lib/copy_page_64.S
+--- linux-2.6.38.1/arch/x86/lib/copy_page_64.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/lib/copy_page_64.S 2011-03-21 18:31:35.000000000 -0400
@@ -104,7 +104,7 @@ ENDPROC(copy_page)
#include <asm/cpufeature.h>
@@ -15753,9 +15753,9 @@ diff -urNp linux-2.6.38/arch/x86/lib/copy_page_64.S linux-2.6.38-new/arch/x86/li
1: .byte 0xeb /* jmp <disp8> */
.byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.38/arch/x86/lib/copy_user_64.S linux-2.6.38-new/arch/x86/lib/copy_user_64.S
---- linux-2.6.38/arch/x86/lib/copy_user_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/lib/copy_user_64.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/lib/copy_user_64.S linux-2.6.38.1/arch/x86/lib/copy_user_64.S
+--- linux-2.6.38.1/arch/x86/lib/copy_user_64.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/lib/copy_user_64.S 2011-03-21 18:31:35.000000000 -0400
@@ -15,13 +15,14 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -15812,9 +15812,9 @@ diff -urNp linux-2.6.38/arch/x86/lib/copy_user_64.S linux-2.6.38-new/arch/x86/li
movl %edx,%ecx
xorl %eax,%eax
rep
-diff -urNp linux-2.6.38/arch/x86/lib/copy_user_nocache_64.S linux-2.6.38-new/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.38/arch/x86/lib/copy_user_nocache_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/lib/copy_user_nocache_64.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/lib/copy_user_nocache_64.S linux-2.6.38.1/arch/x86/lib/copy_user_nocache_64.S
+--- linux-2.6.38.1/arch/x86/lib/copy_user_nocache_64.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/lib/copy_user_nocache_64.S 2011-03-21 18:31:35.000000000 -0400
@@ -14,6 +14,7 @@
#include <asm/current.h>
#include <asm/asm-offsets.h>
@@ -15839,9 +15839,9 @@ diff -urNp linux-2.6.38/arch/x86/lib/copy_user_nocache_64.S linux-2.6.38-new/arc
cmpl $8,%edx
jb 20f /* less then 8 bytes, go to byte copy loop */
ALIGN_DESTINATION
-diff -urNp linux-2.6.38/arch/x86/lib/csum-wrappers_64.c linux-2.6.38-new/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.38/arch/x86/lib/csum-wrappers_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/lib/csum-wrappers_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/lib/csum-wrappers_64.c linux-2.6.38.1/arch/x86/lib/csum-wrappers_64.c
+--- linux-2.6.38.1/arch/x86/lib/csum-wrappers_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/lib/csum-wrappers_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
len -= 2;
}
@@ -15860,9 +15860,9 @@ diff -urNp linux-2.6.38/arch/x86/lib/csum-wrappers_64.c linux-2.6.38-new/arch/x8
return csum_partial_copy_generic(src, (void __force *)dst,
len, isum, NULL, errp);
}
-diff -urNp linux-2.6.38/arch/x86/lib/getuser.S linux-2.6.38-new/arch/x86/lib/getuser.S
---- linux-2.6.38/arch/x86/lib/getuser.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/lib/getuser.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/lib/getuser.S linux-2.6.38.1/arch/x86/lib/getuser.S
+--- linux-2.6.38.1/arch/x86/lib/getuser.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/lib/getuser.S 2011-03-21 18:31:35.000000000 -0400
@@ -33,14 +33,35 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -15968,9 +15968,9 @@ diff -urNp linux-2.6.38/arch/x86/lib/getuser.S linux-2.6.38-new/arch/x86/lib/get
4: movq -7(%_ASM_AX),%_ASM_DX
xor %eax,%eax
ret
-diff -urNp linux-2.6.38/arch/x86/lib/insn.c linux-2.6.38-new/arch/x86/lib/insn.c
---- linux-2.6.38/arch/x86/lib/insn.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/lib/insn.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/lib/insn.c linux-2.6.38.1/arch/x86/lib/insn.c
+--- linux-2.6.38.1/arch/x86/lib/insn.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/lib/insn.c 2011-03-21 18:31:35.000000000 -0400
@@ -21,6 +21,11 @@
#include <linux/string.h>
#include <asm/inat.h>
@@ -15994,9 +15994,9 @@ diff -urNp linux-2.6.38/arch/x86/lib/insn.c linux-2.6.38-new/arch/x86/lib/insn.c
insn->x86_64 = x86_64 ? 1 : 0;
insn->opnd_bytes = 4;
if (x86_64)
-diff -urNp linux-2.6.38/arch/x86/lib/mmx_32.c linux-2.6.38-new/arch/x86/lib/mmx_32.c
---- linux-2.6.38/arch/x86/lib/mmx_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/lib/mmx_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/lib/mmx_32.c linux-2.6.38.1/arch/x86/lib/mmx_32.c
+--- linux-2.6.38.1/arch/x86/lib/mmx_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/lib/mmx_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
{
void *p;
@@ -16312,9 +16312,9 @@ diff -urNp linux-2.6.38/arch/x86/lib/mmx_32.c linux-2.6.38-new/arch/x86/lib/mmx_
from += 64;
to += 64;
-diff -urNp linux-2.6.38/arch/x86/lib/putuser.S linux-2.6.38-new/arch/x86/lib/putuser.S
---- linux-2.6.38/arch/x86/lib/putuser.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/lib/putuser.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/lib/putuser.S linux-2.6.38.1/arch/x86/lib/putuser.S
+--- linux-2.6.38.1/arch/x86/lib/putuser.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/lib/putuser.S 2011-03-21 18:31:35.000000000 -0400
@@ -15,7 +15,8 @@
#include <asm/thread_info.h>
#include <asm/errno.h>
@@ -16452,9 +16452,9 @@ diff -urNp linux-2.6.38/arch/x86/lib/putuser.S linux-2.6.38-new/arch/x86/lib/put
#endif
xor %eax,%eax
EXIT
-diff -urNp linux-2.6.38/arch/x86/lib/usercopy_32.c linux-2.6.38-new/arch/x86/lib/usercopy_32.c
---- linux-2.6.38/arch/x86/lib/usercopy_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/lib/usercopy_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/lib/usercopy_32.c linux-2.6.38.1/arch/x86/lib/usercopy_32.c
+--- linux-2.6.38.1/arch/x86/lib/usercopy_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/lib/usercopy_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -43,7 +43,7 @@ do { \
__asm__ __volatile__( \
" testl %1,%1\n" \
@@ -17074,9 +17074,9 @@ diff -urNp linux-2.6.38/arch/x86/lib/usercopy_32.c linux-2.6.38-new/arch/x86/lib
+}
+EXPORT_SYMBOL(set_fs);
+#endif
-diff -urNp linux-2.6.38/arch/x86/lib/usercopy_64.c linux-2.6.38-new/arch/x86/lib/usercopy_64.c
---- linux-2.6.38/arch/x86/lib/usercopy_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/lib/usercopy_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/lib/usercopy_64.c linux-2.6.38.1/arch/x86/lib/usercopy_64.c
+--- linux-2.6.38.1/arch/x86/lib/usercopy_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/lib/usercopy_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -42,6 +42,8 @@ long
__strncpy_from_user(char *dst, const char __user *src, long count)
{
@@ -17113,9 +17113,9 @@ diff -urNp linux-2.6.38/arch/x86/lib/usercopy_64.c linux-2.6.38-new/arch/x86/lib
}
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-2.6.38/arch/x86/Makefile linux-2.6.38-new/arch/x86/Makefile
---- linux-2.6.38/arch/x86/Makefile 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/Makefile 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/Makefile linux-2.6.38.1/arch/x86/Makefile
+--- linux-2.6.38.1/arch/x86/Makefile 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/Makefile 2011-03-21 18:31:35.000000000 -0400
@@ -195,3 +195,12 @@ define archhelp
echo ' FDARGS="..." arguments for the booted kernel'
echo ' FDINITRD=file initrd for the booted kernel'
@@ -17129,9 +17129,9 @@ diff -urNp linux-2.6.38/arch/x86/Makefile linux-2.6.38-new/arch/x86/Makefile
+
+archprepare:
+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-2.6.38/arch/x86/mm/extable.c linux-2.6.38-new/arch/x86/mm/extable.c
---- linux-2.6.38/arch/x86/mm/extable.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/extable.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/extable.c linux-2.6.38.1/arch/x86/mm/extable.c
+--- linux-2.6.38.1/arch/x86/mm/extable.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/extable.c 2011-03-21 18:31:35.000000000 -0400
@@ -1,14 +1,71 @@
#include <linux/module.h>
#include <linux/spinlock.h>
@@ -17205,9 +17205,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/extable.c linux-2.6.38-new/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.38/arch/x86/mm/fault.c linux-2.6.38-new/arch/x86/mm/fault.c
---- linux-2.6.38/arch/x86/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/fault.c 2011-03-21 23:48:53.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/fault.c linux-2.6.38.1/arch/x86/mm/fault.c
+--- linux-2.6.38.1/arch/x86/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/fault.c 2011-03-21 23:48:53.000000000 -0400
@@ -12,10 +12,18 @@
#include <linux/mmiotrace.h> /* kmmio_handler, ... */
#include <linux/perf_event.h> /* perf_sw_event */
@@ -17877,9 +17877,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/fault.c linux-2.6.38-new/arch/x86/mm/fault.c
+
+ return ret ? -EFAULT : 0;
+}
-diff -urNp linux-2.6.38/arch/x86/mm/gup.c linux-2.6.38-new/arch/x86/mm/gup.c
---- linux-2.6.38/arch/x86/mm/gup.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/gup.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/gup.c linux-2.6.38.1/arch/x86/mm/gup.c
+--- linux-2.6.38.1/arch/x86/mm/gup.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/gup.c 2011-03-21 18:31:35.000000000 -0400
@@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long
addr = start;
len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -17889,9 +17889,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/gup.c linux-2.6.38-new/arch/x86/mm/gup.c
(void __user *)start, len)))
return 0;
-diff -urNp linux-2.6.38/arch/x86/mm/highmem_32.c linux-2.6.38-new/arch/x86/mm/highmem_32.c
---- linux-2.6.38/arch/x86/mm/highmem_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/highmem_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/highmem_32.c linux-2.6.38.1/arch/x86/mm/highmem_32.c
+--- linux-2.6.38.1/arch/x86/mm/highmem_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/highmem_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page
idx = type + KM_TYPE_NR*smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -17903,9 +17903,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/highmem_32.c linux-2.6.38-new/arch/x86/mm/hi
return (void *)vaddr;
}
-diff -urNp linux-2.6.38/arch/x86/mm/hugetlbpage.c linux-2.6.38-new/arch/x86/mm/hugetlbpage.c
---- linux-2.6.38/arch/x86/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/hugetlbpage.c 2011-03-21 23:47:41.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/hugetlbpage.c linux-2.6.38.1/arch/x86/mm/hugetlbpage.c
+--- linux-2.6.38.1/arch/x86/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/hugetlbpage.c 2011-03-21 23:47:41.000000000 -0400
@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
@@ -18113,9 +18113,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/hugetlbpage.c linux-2.6.38-new/arch/x86/mm/h
return addr;
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.38/arch/x86/mm/init_32.c linux-2.6.38-new/arch/x86/mm/init_32.c
---- linux-2.6.38/arch/x86/mm/init_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/init_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/init_32.c linux-2.6.38.1/arch/x86/mm/init_32.c
+--- linux-2.6.38.1/arch/x86/mm/init_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/init_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
}
@@ -18390,9 +18390,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/init_32.c linux-2.6.38-new/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.38/arch/x86/mm/init_64.c linux-2.6.38-new/arch/x86/mm/init_64.c
---- linux-2.6.38/arch/x86/mm/init_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/init_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/init_64.c linux-2.6.38.1/arch/x86/mm/init_64.c
+--- linux-2.6.38.1/arch/x86/mm/init_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/init_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -72,7 +72,7 @@ early_param("gbpages", parse_direct_gbpa
* around without checking the pgd every time.
*/
@@ -18504,9 +18504,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/init_64.c linux-2.6.38-new/arch/x86/mm/init_
return "[vdso]";
if (vma == &gate_vma)
return "[vsyscall]";
-diff -urNp linux-2.6.38/arch/x86/mm/init.c linux-2.6.38-new/arch/x86/mm/init.c
---- linux-2.6.38/arch/x86/mm/init.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/init.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/init.c linux-2.6.38.1/arch/x86/mm/init.c
+--- linux-2.6.38.1/arch/x86/mm/init.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/init.c 2011-03-21 18:31:35.000000000 -0400
@@ -72,11 +72,7 @@ static void __init find_early_table_spac
* cause a hotspot and fill up ZONE_DMA. The page tables
* need roughly 0.5KB per GB.
@@ -18622,9 +18622,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/init.c linux-2.6.38-new/arch/x86/mm/init.c
free_init_pages("unused kernel memory",
(unsigned long)(&__init_begin),
(unsigned long)(&__init_end));
-diff -urNp linux-2.6.38/arch/x86/mm/iomap_32.c linux-2.6.38-new/arch/x86/mm/iomap_32.c
---- linux-2.6.38/arch/x86/mm/iomap_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/iomap_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/iomap_32.c linux-2.6.38.1/arch/x86/mm/iomap_32.c
+--- linux-2.6.38.1/arch/x86/mm/iomap_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/iomap_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long
type = kmap_atomic_idx_push();
idx = type + KM_TYPE_NR * smp_processor_id();
@@ -18637,9 +18637,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/iomap_32.c linux-2.6.38-new/arch/x86/mm/ioma
arch_flush_lazy_mmu_mode();
return (void *)vaddr;
-diff -urNp linux-2.6.38/arch/x86/mm/ioremap.c linux-2.6.38-new/arch/x86/mm/ioremap.c
---- linux-2.6.38/arch/x86/mm/ioremap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/ioremap.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/ioremap.c linux-2.6.38.1/arch/x86/mm/ioremap.c
+--- linux-2.6.38.1/arch/x86/mm/ioremap.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/ioremap.c 2011-03-21 18:31:35.000000000 -0400
@@ -104,7 +104,7 @@ static void __iomem *__ioremap_caller(re
for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
int is_ram = page_is_ram(pfn);
@@ -18668,9 +18668,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/ioremap.c linux-2.6.38-new/arch/x86/mm/iorem
/*
* The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-2.6.38/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.38-new/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.38/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.38.1/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-2.6.38.1/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-21 18:31:35.000000000 -0400
@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
* memory (e.g. tracked pages)? For now, we need this to avoid
* invoking kmemcheck for PnP BIOS calls.
@@ -18683,9 +18683,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.38-new/arch/
return false;
pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-2.6.38/arch/x86/mm/mmap.c linux-2.6.38-new/arch/x86/mm/mmap.c
---- linux-2.6.38/arch/x86/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/mmap.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/mmap.c linux-2.6.38.1/arch/x86/mm/mmap.c
+--- linux-2.6.38.1/arch/x86/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/mmap.c 2011-03-21 18:31:35.000000000 -0400
@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
* Leave an at least ~128 MB hole with possible stack randomization.
*/
@@ -18767,9 +18767,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/mmap.c linux-2.6.38-new/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.38/arch/x86/mm/numa_32.c linux-2.6.38-new/arch/x86/mm/numa_32.c
---- linux-2.6.38/arch/x86/mm/numa_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/numa_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/numa_32.c linux-2.6.38.1/arch/x86/mm/numa_32.c
+--- linux-2.6.38.1/arch/x86/mm/numa_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/numa_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -99,7 +99,6 @@ unsigned long node_memmap_size_bytes(int
}
#endif
@@ -18778,9 +18778,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/numa_32.c linux-2.6.38-new/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.38/arch/x86/mm/pageattr.c linux-2.6.38-new/arch/x86/mm/pageattr.c
---- linux-2.6.38/arch/x86/mm/pageattr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/pageattr.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/pageattr.c linux-2.6.38.1/arch/x86/mm/pageattr.c
+--- linux-2.6.38.1/arch/x86/mm/pageattr.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/pageattr.c 2011-03-21 18:31:35.000000000 -0400
@@ -261,7 +261,7 @@ static inline pgprot_t static_protection
*/
#ifdef CONFIG_PCI_BIOS
@@ -18865,9 +18865,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/pageattr.c linux-2.6.38-new/arch/x86/mm/page
}
static int
-diff -urNp linux-2.6.38/arch/x86/mm/pageattr-test.c linux-2.6.38-new/arch/x86/mm/pageattr-test.c
---- linux-2.6.38/arch/x86/mm/pageattr-test.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/pageattr-test.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/pageattr-test.c linux-2.6.38.1/arch/x86/mm/pageattr-test.c
+--- linux-2.6.38.1/arch/x86/mm/pageattr-test.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/pageattr-test.c 2011-03-21 18:31:35.000000000 -0400
@@ -36,7 +36,7 @@ enum {
static int pte_testbit(pte_t pte)
@@ -18877,9 +18877,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/pageattr-test.c linux-2.6.38-new/arch/x86/mm
}
struct split_state {
-diff -urNp linux-2.6.38/arch/x86/mm/pat.c linux-2.6.38-new/arch/x86/mm/pat.c
---- linux-2.6.38/arch/x86/mm/pat.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/pat.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/pat.c linux-2.6.38.1/arch/x86/mm/pat.c
+--- linux-2.6.38.1/arch/x86/mm/pat.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/pat.c 2011-03-21 18:31:35.000000000 -0400
@@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
if (!entry) {
@@ -18927,9 +18927,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/pat.c linux-2.6.38-new/arch/x86/mm/pat.c
cattr_name(want_flags),
(unsigned long long)paddr,
(unsigned long long)(paddr + size),
-diff -urNp linux-2.6.38/arch/x86/mm/pgtable_32.c linux-2.6.38-new/arch/x86/mm/pgtable_32.c
---- linux-2.6.38/arch/x86/mm/pgtable_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/pgtable_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/pgtable_32.c linux-2.6.38.1/arch/x86/mm/pgtable_32.c
+--- linux-2.6.38.1/arch/x86/mm/pgtable_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/pgtable_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr,
return;
}
@@ -18944,9 +18944,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/pgtable_32.c linux-2.6.38-new/arch/x86/mm/pg
/*
* It's enough to flush this one mapping.
-diff -urNp linux-2.6.38/arch/x86/mm/pgtable.c linux-2.6.38-new/arch/x86/mm/pgtable.c
---- linux-2.6.38/arch/x86/mm/pgtable.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/pgtable.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/pgtable.c linux-2.6.38.1/arch/x86/mm/pgtable.c
+--- linux-2.6.38.1/arch/x86/mm/pgtable.c 2011-03-23 17:20:06.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/pgtable.c 2011-03-24 23:22:14.000000000 -0400
@@ -84,9 +84,58 @@ static inline void pgd_list_del(pgd_t *p
list_del(&page->lru);
}
@@ -19034,9 +19034,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/pgtable.c linux-2.6.38-new/arch/x86/mm/pgtab
void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
{
-@@ -171,36 +221,38 @@ void pud_populate(struct mm_struct *mm,
- if (mm == current->active_mm)
- write_cr3(read_cr3());
+@@ -170,36 +220,38 @@ void pud_populate(struct mm_struct *mm,
+ */
+ flush_tlb_mm(mm);
}
+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
+#define PREALLOCATED_PXDS USER_PGD_PTRS
@@ -19084,7 +19084,7 @@ diff -urNp linux-2.6.38/arch/x86/mm/pgtable.c linux-2.6.38-new/arch/x86/mm/pgtab
return -ENOMEM;
}
-@@ -213,51 +265,55 @@ static int preallocate_pmds(pmd_t *pmds[
+@@ -212,51 +264,55 @@ static int preallocate_pmds(pmd_t *pmds[
* preallocate which never got a corresponding vma will need to be
* freed manually.
*/
@@ -19157,7 +19157,7 @@ diff -urNp linux-2.6.38/arch/x86/mm/pgtable.c linux-2.6.38-new/arch/x86/mm/pgtab
pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
-@@ -266,11 +322,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -265,11 +321,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
mm->pgd = pgd;
@@ -19171,7 +19171,7 @@ diff -urNp linux-2.6.38/arch/x86/mm/pgtable.c linux-2.6.38-new/arch/x86/mm/pgtab
/*
* Make sure that pre-populating the pmds is atomic with
-@@ -280,14 +336,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -279,14 +335,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
spin_lock(&pgd_lock);
pgd_ctor(mm, pgd);
@@ -19189,7 +19189,7 @@ diff -urNp linux-2.6.38/arch/x86/mm/pgtable.c linux-2.6.38-new/arch/x86/mm/pgtab
out_free_pgd:
free_page((unsigned long)pgd);
out:
-@@ -296,7 +352,7 @@ out:
+@@ -295,7 +351,7 @@ out:
void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{
@@ -19198,9 +19198,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/pgtable.c linux-2.6.38-new/arch/x86/mm/pgtab
pgd_dtor(pgd);
paravirt_pgd_free(mm, pgd);
free_page((unsigned long)pgd);
-diff -urNp linux-2.6.38/arch/x86/mm/setup_nx.c linux-2.6.38-new/arch/x86/mm/setup_nx.c
---- linux-2.6.38/arch/x86/mm/setup_nx.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/setup_nx.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/setup_nx.c linux-2.6.38.1/arch/x86/mm/setup_nx.c
+--- linux-2.6.38.1/arch/x86/mm/setup_nx.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/setup_nx.c 2011-03-21 18:31:35.000000000 -0400
@@ -5,8 +5,10 @@
#include <asm/pgtable.h>
#include <asm/proto.h>
@@ -19230,9 +19230,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/setup_nx.c linux-2.6.38-new/arch/x86/mm/setu
__supported_pte_mask &= ~_PAGE_NX;
}
-diff -urNp linux-2.6.38/arch/x86/mm/tlb.c linux-2.6.38-new/arch/x86/mm/tlb.c
---- linux-2.6.38/arch/x86/mm/tlb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/mm/tlb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/mm/tlb.c linux-2.6.38.1/arch/x86/mm/tlb.c
+--- linux-2.6.38.1/arch/x86/mm/tlb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/mm/tlb.c 2011-03-21 18:31:35.000000000 -0400
@@ -14,7 +14,7 @@
#include <asm/uv/uv.h>
@@ -19254,9 +19254,9 @@ diff -urNp linux-2.6.38/arch/x86/mm/tlb.c linux-2.6.38-new/arch/x86/mm/tlb.c
}
EXPORT_SYMBOL_GPL(leave_mm);
-diff -urNp linux-2.6.38/arch/x86/oprofile/backtrace.c linux-2.6.38-new/arch/x86/oprofile/backtrace.c
---- linux-2.6.38/arch/x86/oprofile/backtrace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/oprofile/backtrace.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/oprofile/backtrace.c linux-2.6.38.1/arch/x86/oprofile/backtrace.c
+--- linux-2.6.38.1/arch/x86/oprofile/backtrace.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/oprofile/backtrace.c 2011-03-21 18:31:35.000000000 -0400
@@ -57,7 +57,7 @@ dump_user_backtrace_32(struct stack_fram
struct stack_frame_ia32 *fp;
@@ -19275,9 +19275,9 @@ diff -urNp linux-2.6.38/arch/x86/oprofile/backtrace.c linux-2.6.38-new/arch/x86/
unsigned long stack = kernel_stack_pointer(regs);
if (depth)
dump_trace(NULL, regs, (unsigned long *)stack,
-diff -urNp linux-2.6.38/arch/x86/oprofile/op_model_p4.c linux-2.6.38-new/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.38/arch/x86/oprofile/op_model_p4.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/oprofile/op_model_p4.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/oprofile/op_model_p4.c linux-2.6.38.1/arch/x86/oprofile/op_model_p4.c
+--- linux-2.6.38.1/arch/x86/oprofile/op_model_p4.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/oprofile/op_model_p4.c 2011-03-21 18:31:35.000000000 -0400
@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
#endif
}
@@ -19287,9 +19287,9 @@ diff -urNp linux-2.6.38/arch/x86/oprofile/op_model_p4.c linux-2.6.38-new/arch/x8
{
#ifdef CONFIG_SMP
return smp_num_siblings == 2 ? 2 : 1;
-diff -urNp linux-2.6.38/arch/x86/pci/ce4100.c linux-2.6.38-new/arch/x86/pci/ce4100.c
---- linux-2.6.38/arch/x86/pci/ce4100.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/pci/ce4100.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/pci/ce4100.c linux-2.6.38.1/arch/x86/pci/ce4100.c
+--- linux-2.6.38.1/arch/x86/pci/ce4100.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/pci/ce4100.c 2011-03-21 18:31:35.000000000 -0400
@@ -302,7 +302,7 @@ static int ce4100_conf_write(unsigned in
return pci_direct_conf1.write(seg, bus, devfn, reg, len, value);
}
@@ -19299,9 +19299,9 @@ diff -urNp linux-2.6.38/arch/x86/pci/ce4100.c linux-2.6.38-new/arch/x86/pci/ce41
.read = ce4100_conf_read,
.write = ce4100_conf_write,
};
-diff -urNp linux-2.6.38/arch/x86/pci/common.c linux-2.6.38-new/arch/x86/pci/common.c
---- linux-2.6.38/arch/x86/pci/common.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/pci/common.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/pci/common.c linux-2.6.38.1/arch/x86/pci/common.c
+--- linux-2.6.38.1/arch/x86/pci/common.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/pci/common.c 2011-03-21 18:31:35.000000000 -0400
@@ -33,8 +33,8 @@ int noioapicreroute = 1;
int pcibios_last_bus = -1;
unsigned long pirq_table_addr;
@@ -19322,9 +19322,9 @@ diff -urNp linux-2.6.38/arch/x86/pci/common.c linux-2.6.38-new/arch/x86/pci/comm
};
void __init dmi_check_pciprobe(void)
-diff -urNp linux-2.6.38/arch/x86/pci/direct.c linux-2.6.38-new/arch/x86/pci/direct.c
---- linux-2.6.38/arch/x86/pci/direct.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/pci/direct.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/pci/direct.c linux-2.6.38.1/arch/x86/pci/direct.c
+--- linux-2.6.38.1/arch/x86/pci/direct.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/pci/direct.c 2011-03-21 18:31:35.000000000 -0400
@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
#undef PCI_CONF1_ADDRESS
@@ -19352,9 +19352,9 @@ diff -urNp linux-2.6.38/arch/x86/pci/direct.c linux-2.6.38-new/arch/x86/pci/dire
{
u32 x = 0;
int year, devfn;
-diff -urNp linux-2.6.38/arch/x86/pci/fixup.c linux-2.6.38-new/arch/x86/pci/fixup.c
---- linux-2.6.38/arch/x86/pci/fixup.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/pci/fixup.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/pci/fixup.c linux-2.6.38.1/arch/x86/pci/fixup.c
+--- linux-2.6.38.1/arch/x86/pci/fixup.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/pci/fixup.c 2011-03-21 18:31:35.000000000 -0400
@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
},
@@ -19373,9 +19373,9 @@ diff -urNp linux-2.6.38/arch/x86/pci/fixup.c linux-2.6.38-new/arch/x86/pci/fixup
};
static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
-diff -urNp linux-2.6.38/arch/x86/pci/irq.c linux-2.6.38-new/arch/x86/pci/irq.c
---- linux-2.6.38/arch/x86/pci/irq.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/pci/irq.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/pci/irq.c linux-2.6.38.1/arch/x86/pci/irq.c
+--- linux-2.6.38.1/arch/x86/pci/irq.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/pci/irq.c 2011-03-21 18:31:35.000000000 -0400
@@ -542,7 +542,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) },
@@ -19394,9 +19394,9 @@ diff -urNp linux-2.6.38/arch/x86/pci/irq.c linux-2.6.38-new/arch/x86/pci/irq.c
};
void __init pcibios_irq_init(void)
-diff -urNp linux-2.6.38/arch/x86/pci/mmconfig_32.c linux-2.6.38-new/arch/x86/pci/mmconfig_32.c
---- linux-2.6.38/arch/x86/pci/mmconfig_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/pci/mmconfig_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/pci/mmconfig_32.c linux-2.6.38.1/arch/x86/pci/mmconfig_32.c
+--- linux-2.6.38.1/arch/x86/pci/mmconfig_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/pci/mmconfig_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -19406,9 +19406,9 @@ diff -urNp linux-2.6.38/arch/x86/pci/mmconfig_32.c linux-2.6.38-new/arch/x86/pci
.read = pci_mmcfg_read,
.write = pci_mmcfg_write,
};
-diff -urNp linux-2.6.38/arch/x86/pci/mmconfig_64.c linux-2.6.38-new/arch/x86/pci/mmconfig_64.c
---- linux-2.6.38/arch/x86/pci/mmconfig_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/pci/mmconfig_64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/pci/mmconfig_64.c linux-2.6.38.1/arch/x86/pci/mmconfig_64.c
+--- linux-2.6.38.1/arch/x86/pci/mmconfig_64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/pci/mmconfig_64.c 2011-03-21 18:31:35.000000000 -0400
@@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -19418,9 +19418,9 @@ diff -urNp linux-2.6.38/arch/x86/pci/mmconfig_64.c linux-2.6.38-new/arch/x86/pci
.read = pci_mmcfg_read,
.write = pci_mmcfg_write,
};
-diff -urNp linux-2.6.38/arch/x86/pci/numaq_32.c linux-2.6.38-new/arch/x86/pci/numaq_32.c
---- linux-2.6.38/arch/x86/pci/numaq_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/pci/numaq_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/pci/numaq_32.c linux-2.6.38.1/arch/x86/pci/numaq_32.c
+--- linux-2.6.38.1/arch/x86/pci/numaq_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/pci/numaq_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned i
#undef PCI_CONF1_MQ_ADDRESS
@@ -19430,9 +19430,9 @@ diff -urNp linux-2.6.38/arch/x86/pci/numaq_32.c linux-2.6.38-new/arch/x86/pci/nu
.read = pci_conf1_mq_read,
.write = pci_conf1_mq_write
};
-diff -urNp linux-2.6.38/arch/x86/pci/olpc.c linux-2.6.38-new/arch/x86/pci/olpc.c
---- linux-2.6.38/arch/x86/pci/olpc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/pci/olpc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/pci/olpc.c linux-2.6.38.1/arch/x86/pci/olpc.c
+--- linux-2.6.38.1/arch/x86/pci/olpc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/pci/olpc.c 2011-03-21 18:31:35.000000000 -0400
@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
return 0;
}
@@ -19442,9 +19442,9 @@ diff -urNp linux-2.6.38/arch/x86/pci/olpc.c linux-2.6.38-new/arch/x86/pci/olpc.c
.read = pci_olpc_read,
.write = pci_olpc_write,
};
-diff -urNp linux-2.6.38/arch/x86/pci/pcbios.c linux-2.6.38-new/arch/x86/pci/pcbios.c
---- linux-2.6.38/arch/x86/pci/pcbios.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/pci/pcbios.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/pci/pcbios.c linux-2.6.38.1/arch/x86/pci/pcbios.c
+--- linux-2.6.38.1/arch/x86/pci/pcbios.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/pci/pcbios.c 2011-03-21 18:31:35.000000000 -0400
@@ -79,50 +79,93 @@ union bios32 {
static struct {
unsigned long address;
@@ -19767,9 +19767,9 @@ diff -urNp linux-2.6.38/arch/x86/pci/pcbios.c linux-2.6.38-new/arch/x86/pci/pcbi
return !(ret & 0xff00);
}
EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-2.6.38/arch/x86/platform/efi/efi_32.c linux-2.6.38-new/arch/x86/platform/efi/efi_32.c
---- linux-2.6.38/arch/x86/platform/efi/efi_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/platform/efi/efi_32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/platform/efi/efi_32.c linux-2.6.38.1/arch/x86/platform/efi/efi_32.c
+--- linux-2.6.38.1/arch/x86/platform/efi/efi_32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/platform/efi/efi_32.c 2011-03-21 18:31:35.000000000 -0400
@@ -38,70 +38,37 @@
*/
@@ -19850,9 +19850,9 @@ diff -urNp linux-2.6.38/arch/x86/platform/efi/efi_32.c linux-2.6.38-new/arch/x86
/*
* After the lock is released, the original page table is restored.
-diff -urNp linux-2.6.38/arch/x86/platform/efi/efi_stub_32.S linux-2.6.38-new/arch/x86/platform/efi/efi_stub_32.S
---- linux-2.6.38/arch/x86/platform/efi/efi_stub_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/platform/efi/efi_stub_32.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/platform/efi/efi_stub_32.S linux-2.6.38.1/arch/x86/platform/efi/efi_stub_32.S
+--- linux-2.6.38.1/arch/x86/platform/efi/efi_stub_32.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/platform/efi/efi_stub_32.S 2011-03-21 18:31:35.000000000 -0400
@@ -6,6 +6,7 @@
*/
@@ -19951,9 +19951,9 @@ diff -urNp linux-2.6.38/arch/x86/platform/efi/efi_stub_32.S linux-2.6.38-new/arc
saved_return_addr:
.long 0
efi_rt_function_ptr:
-diff -urNp linux-2.6.38/arch/x86/power/cpu.c linux-2.6.38-new/arch/x86/power/cpu.c
---- linux-2.6.38/arch/x86/power/cpu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/power/cpu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/power/cpu.c linux-2.6.38.1/arch/x86/power/cpu.c
+--- linux-2.6.38.1/arch/x86/power/cpu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/power/cpu.c 2011-03-21 18:31:35.000000000 -0400
@@ -130,7 +130,7 @@ static void do_fpu_end(void)
static void fix_processor_context(void)
{
@@ -19973,9 +19973,9 @@ diff -urNp linux-2.6.38/arch/x86/power/cpu.c linux-2.6.38-new/arch/x86/power/cpu
syscall_init(); /* This sets MSR_*STAR and related */
#endif
-diff -urNp linux-2.6.38/arch/x86/vdso/Makefile linux-2.6.38-new/arch/x86/vdso/Makefile
---- linux-2.6.38/arch/x86/vdso/Makefile 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/vdso/Makefile 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/vdso/Makefile linux-2.6.38.1/arch/x86/vdso/Makefile
+--- linux-2.6.38.1/arch/x86/vdso/Makefile 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/vdso/Makefile 2011-03-21 18:31:35.000000000 -0400
@@ -123,7 +123,7 @@ quiet_cmd_vdso = VDSO $@
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
@@ -19985,9 +19985,9 @@ diff -urNp linux-2.6.38/arch/x86/vdso/Makefile linux-2.6.38-new/arch/x86/vdso/Ma
GCOV_PROFILE := n
#
-diff -urNp linux-2.6.38/arch/x86/vdso/vclock_gettime.c linux-2.6.38-new/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.38/arch/x86/vdso/vclock_gettime.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/vdso/vclock_gettime.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/vdso/vclock_gettime.c linux-2.6.38.1/arch/x86/vdso/vclock_gettime.c
+--- linux-2.6.38.1/arch/x86/vdso/vclock_gettime.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/vdso/vclock_gettime.c 2011-03-21 18:31:35.000000000 -0400
@@ -22,24 +22,48 @@
#include <asm/hpet.h>
#include <asm/unistd.h>
@@ -20086,9 +20086,9 @@ diff -urNp linux-2.6.38/arch/x86/vdso/vclock_gettime.c linux-2.6.38-new/arch/x86
}
int gettimeofday(struct timeval *, struct timezone *)
__attribute__((weak, alias("__vdso_gettimeofday")));
-diff -urNp linux-2.6.38/arch/x86/vdso/vdso32-setup.c linux-2.6.38-new/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.38/arch/x86/vdso/vdso32-setup.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/vdso/vdso32-setup.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/vdso/vdso32-setup.c linux-2.6.38.1/arch/x86/vdso/vdso32-setup.c
+--- linux-2.6.38.1/arch/x86/vdso/vdso32-setup.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/vdso/vdso32-setup.c 2011-03-21 18:31:35.000000000 -0400
@@ -25,6 +25,7 @@
#include <asm/tlbflush.h>
#include <asm/vdso.h>
@@ -20171,9 +20171,9 @@ diff -urNp linux-2.6.38/arch/x86/vdso/vdso32-setup.c linux-2.6.38-new/arch/x86/v
return &gate_vma;
return NULL;
}
-diff -urNp linux-2.6.38/arch/x86/vdso/vdso.lds.S linux-2.6.38-new/arch/x86/vdso/vdso.lds.S
---- linux-2.6.38/arch/x86/vdso/vdso.lds.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/vdso/vdso.lds.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/vdso/vdso.lds.S linux-2.6.38.1/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.38.1/arch/x86/vdso/vdso.lds.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/vdso/vdso.lds.S 2011-03-21 18:31:35.000000000 -0400
@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
#define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
#include "vextern.h"
@@ -20184,9 +20184,9 @@ diff -urNp linux-2.6.38/arch/x86/vdso/vdso.lds.S linux-2.6.38-new/arch/x86/vdso/
+VEXTERN(fallback_time)
+VEXTERN(getcpu)
+#undef VEXTERN
-diff -urNp linux-2.6.38/arch/x86/vdso/vextern.h linux-2.6.38-new/arch/x86/vdso/vextern.h
---- linux-2.6.38/arch/x86/vdso/vextern.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/vdso/vextern.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/vdso/vextern.h linux-2.6.38.1/arch/x86/vdso/vextern.h
+--- linux-2.6.38.1/arch/x86/vdso/vextern.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/vdso/vextern.h 2011-03-21 18:31:35.000000000 -0400
@@ -11,6 +11,5 @@
put into vextern.h and be referenced as a pointer with vdso prefix.
The main kernel later fills in the values. */
@@ -20194,9 +20194,9 @@ diff -urNp linux-2.6.38/arch/x86/vdso/vextern.h linux-2.6.38-new/arch/x86/vdso/v
-VEXTERN(jiffies)
VEXTERN(vgetcpu_mode)
VEXTERN(vsyscall_gtod_data)
-diff -urNp linux-2.6.38/arch/x86/vdso/vma.c linux-2.6.38-new/arch/x86/vdso/vma.c
---- linux-2.6.38/arch/x86/vdso/vma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/vdso/vma.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/vdso/vma.c linux-2.6.38.1/arch/x86/vdso/vma.c
+--- linux-2.6.38.1/arch/x86/vdso/vma.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/vdso/vma.c 2011-03-21 18:31:35.000000000 -0400
@@ -58,7 +58,7 @@ static int __init init_vdso_vars(void)
if (!vbase)
goto oom;
@@ -20235,9 +20235,9 @@ diff -urNp linux-2.6.38/arch/x86/vdso/vma.c linux-2.6.38-new/arch/x86/vdso/vma.c
- return 0;
-}
-__setup("vdso=", vdso_setup);
-diff -urNp linux-2.6.38/arch/x86/xen/enlighten.c linux-2.6.38-new/arch/x86/xen/enlighten.c
---- linux-2.6.38/arch/x86/xen/enlighten.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/xen/enlighten.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/xen/enlighten.c linux-2.6.38.1/arch/x86/xen/enlighten.c
+--- linux-2.6.38.1/arch/x86/xen/enlighten.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/xen/enlighten.c 2011-03-21 18:31:35.000000000 -0400
@@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
struct shared_info xen_dummy_shared_info;
@@ -20280,9 +20280,9 @@ diff -urNp linux-2.6.38/arch/x86/xen/enlighten.c linux-2.6.38-new/arch/x86/xen/e
xen_smp_init();
#ifdef CONFIG_ACPI_NUMA
-diff -urNp linux-2.6.38/arch/x86/xen/mmu.c linux-2.6.38-new/arch/x86/xen/mmu.c
---- linux-2.6.38/arch/x86/xen/mmu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/xen/mmu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/xen/mmu.c linux-2.6.38.1/arch/x86/xen/mmu.c
+--- linux-2.6.38.1/arch/x86/xen/mmu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/xen/mmu.c 2011-03-21 18:31:35.000000000 -0400
@@ -1718,6 +1718,8 @@ __init pgd_t *xen_setup_kernel_pagetable
convert_pfn_mfn(init_level4_pgt);
convert_pfn_mfn(level3_ident_pgt);
@@ -20303,9 +20303,9 @@ diff -urNp linux-2.6.38/arch/x86/xen/mmu.c linux-2.6.38-new/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.38/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.38-new/arch/x86/xen/pci-swiotlb-xen.c
---- linux-2.6.38/arch/x86/xen/pci-swiotlb-xen.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/xen/pci-swiotlb-xen.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.38.1/arch/x86/xen/pci-swiotlb-xen.c
+--- linux-2.6.38.1/arch/x86/xen/pci-swiotlb-xen.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/xen/pci-swiotlb-xen.c 2011-03-21 18:31:35.000000000 -0400
@@ -10,7 +10,7 @@
int xen_swiotlb __read_mostly;
@@ -20315,9 +20315,9 @@ diff -urNp linux-2.6.38/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.38-new/arch/x86
.mapping_error = xen_swiotlb_dma_mapping_error,
.alloc_coherent = xen_swiotlb_alloc_coherent,
.free_coherent = xen_swiotlb_free_coherent,
-diff -urNp linux-2.6.38/arch/x86/xen/smp.c linux-2.6.38-new/arch/x86/xen/smp.c
---- linux-2.6.38/arch/x86/xen/smp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/xen/smp.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/xen/smp.c linux-2.6.38.1/arch/x86/xen/smp.c
+--- linux-2.6.38.1/arch/x86/xen/smp.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/xen/smp.c 2011-03-21 18:31:35.000000000 -0400
@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_
{
BUG_ON(smp_processor_id() != 0);
@@ -20346,9 +20346,9 @@ diff -urNp linux-2.6.38/arch/x86/xen/smp.c linux-2.6.38-new/arch/x86/xen/smp.c
#else
ctxt->gs_base_kernel = per_cpu_offset(cpu);
#endif
-diff -urNp linux-2.6.38/arch/x86/xen/xen-head.S linux-2.6.38-new/arch/x86/xen/xen-head.S
---- linux-2.6.38/arch/x86/xen/xen-head.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/xen/xen-head.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/xen/xen-head.S linux-2.6.38.1/arch/x86/xen/xen-head.S
+--- linux-2.6.38.1/arch/x86/xen/xen-head.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/xen/xen-head.S 2011-03-21 18:31:35.000000000 -0400
@@ -19,6 +19,17 @@ ENTRY(startup_xen)
#ifdef CONFIG_X86_32
mov %esi,xen_start_info
@@ -20367,9 +20367,9 @@ diff -urNp linux-2.6.38/arch/x86/xen/xen-head.S linux-2.6.38-new/arch/x86/xen/xe
#else
mov %rsi,xen_start_info
mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-2.6.38/arch/x86/xen/xen-ops.h linux-2.6.38-new/arch/x86/xen/xen-ops.h
---- linux-2.6.38/arch/x86/xen/xen-ops.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/arch/x86/xen/xen-ops.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/arch/x86/xen/xen-ops.h linux-2.6.38.1/arch/x86/xen/xen-ops.h
+--- linux-2.6.38.1/arch/x86/xen/xen-ops.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/arch/x86/xen/xen-ops.h 2011-03-21 18:31:35.000000000 -0400
@@ -10,8 +10,6 @@
extern const char xen_hypervisor_callback[];
extern const char xen_failsafe_callback[];
@@ -20379,9 +20379,9 @@ diff -urNp linux-2.6.38/arch/x86/xen/xen-ops.h linux-2.6.38-new/arch/x86/xen/xen
struct trap_info;
void xen_copy_trap_info(struct trap_info *traps);
-diff -urNp linux-2.6.38/block/blk-iopoll.c linux-2.6.38-new/block/blk-iopoll.c
---- linux-2.6.38/block/blk-iopoll.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/block/blk-iopoll.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/block/blk-iopoll.c linux-2.6.38.1/block/blk-iopoll.c
+--- linux-2.6.38.1/block/blk-iopoll.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/block/blk-iopoll.c 2011-03-21 18:31:35.000000000 -0400
@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
}
EXPORT_SYMBOL(blk_iopoll_complete);
@@ -20391,9 +20391,9 @@ diff -urNp linux-2.6.38/block/blk-iopoll.c linux-2.6.38-new/block/blk-iopoll.c
{
struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-2.6.38/block/blk-map.c linux-2.6.38-new/block/blk-map.c
---- linux-2.6.38/block/blk-map.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/block/blk-map.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/block/blk-map.c linux-2.6.38.1/block/blk-map.c
+--- linux-2.6.38.1/block/blk-map.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/block/blk-map.c 2011-03-21 18:31:35.000000000 -0400
@@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue
if (!len || !kbuf)
return -EINVAL;
@@ -20403,9 +20403,9 @@ diff -urNp linux-2.6.38/block/blk-map.c linux-2.6.38-new/block/blk-map.c
if (do_copy)
bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
else
-diff -urNp linux-2.6.38/block/blk-softirq.c linux-2.6.38-new/block/blk-softirq.c
---- linux-2.6.38/block/blk-softirq.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/block/blk-softirq.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/block/blk-softirq.c linux-2.6.38.1/block/blk-softirq.c
+--- linux-2.6.38.1/block/blk-softirq.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/block/blk-softirq.c 2011-03-21 18:31:35.000000000 -0400
@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
* Softirq action handler - move entries to local list and loop over them
* while passing them to the queue registered handler.
@@ -20415,9 +20415,9 @@ diff -urNp linux-2.6.38/block/blk-softirq.c linux-2.6.38-new/block/blk-softirq.c
{
struct list_head *cpu_list, local_list;
-diff -urNp linux-2.6.38/crypto/lrw.c linux-2.6.38-new/crypto/lrw.c
---- linux-2.6.38/crypto/lrw.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/crypto/lrw.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/crypto/lrw.c linux-2.6.38.1/crypto/lrw.c
+--- linux-2.6.38.1/crypto/lrw.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/crypto/lrw.c 2011-03-21 18:31:35.000000000 -0400
@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
struct priv *ctx = crypto_tfm_ctx(parent);
struct crypto_cipher *child = ctx->child;
@@ -20427,9 +20427,9 @@ diff -urNp linux-2.6.38/crypto/lrw.c linux-2.6.38-new/crypto/lrw.c
int bsize = crypto_cipher_blocksize(child);
crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
-diff -urNp linux-2.6.38/Documentation/dontdiff linux-2.6.38-new/Documentation/dontdiff
---- linux-2.6.38/Documentation/dontdiff 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/Documentation/dontdiff 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/Documentation/dontdiff linux-2.6.38.1/Documentation/dontdiff
+--- linux-2.6.38.1/Documentation/dontdiff 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/Documentation/dontdiff 2011-03-21 18:31:35.000000000 -0400
@@ -3,6 +3,7 @@
*.bin
*.cpio
@@ -20555,9 +20555,9 @@ diff -urNp linux-2.6.38/Documentation/dontdiff linux-2.6.38-new/Documentation/do
wakeup.bin
wakeup.elf
wakeup.lds
-diff -urNp linux-2.6.38/Documentation/filesystems/sysfs.txt linux-2.6.38-new/Documentation/filesystems/sysfs.txt
---- linux-2.6.38/Documentation/filesystems/sysfs.txt 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/Documentation/filesystems/sysfs.txt 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/Documentation/filesystems/sysfs.txt linux-2.6.38.1/Documentation/filesystems/sysfs.txt
+--- linux-2.6.38.1/Documentation/filesystems/sysfs.txt 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/Documentation/filesystems/sysfs.txt 2011-03-21 18:31:35.000000000 -0400
@@ -123,8 +123,8 @@ set of sysfs operations for forwarding r
show and store methods of the attribute owners.
@@ -20569,9 +20569,9 @@ diff -urNp linux-2.6.38/Documentation/filesystems/sysfs.txt linux-2.6.38-new/Doc
};
[ Subsystems should have already defined a struct kobj_type as a
-diff -urNp linux-2.6.38/Documentation/kernel-parameters.txt linux-2.6.38-new/Documentation/kernel-parameters.txt
---- linux-2.6.38/Documentation/kernel-parameters.txt 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/Documentation/kernel-parameters.txt 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/Documentation/kernel-parameters.txt linux-2.6.38.1/Documentation/kernel-parameters.txt
+--- linux-2.6.38.1/Documentation/kernel-parameters.txt 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/Documentation/kernel-parameters.txt 2011-03-21 18:31:35.000000000 -0400
@@ -1853,6 +1853,13 @@ bytes respectively. Such letter suffixes
the specified number of seconds. This is to be used if
your oopses keep scrolling off the screen.
@@ -20586,9 +20586,9 @@ diff -urNp linux-2.6.38/Documentation/kernel-parameters.txt linux-2.6.38-new/Doc
pcbit= [HW,ISDN]
pcd. [PARIDE]
-diff -urNp linux-2.6.38/drivers/acpi/battery.c linux-2.6.38-new/drivers/acpi/battery.c
---- linux-2.6.38/drivers/acpi/battery.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/acpi/battery.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/acpi/battery.c linux-2.6.38.1/drivers/acpi/battery.c
+--- linux-2.6.38.1/drivers/acpi/battery.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/acpi/battery.c 2011-03-21 18:31:35.000000000 -0400
@@ -862,7 +862,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
}
@@ -20598,9 +20598,9 @@ diff -urNp linux-2.6.38/drivers/acpi/battery.c linux-2.6.38-new/drivers/acpi/bat
mode_t mode;
const char *name;
} acpi_battery_file[] = {
-diff -urNp linux-2.6.38/drivers/acpi/blacklist.c linux-2.6.38-new/drivers/acpi/blacklist.c
---- linux-2.6.38/drivers/acpi/blacklist.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/acpi/blacklist.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/acpi/blacklist.c linux-2.6.38.1/drivers/acpi/blacklist.c
+--- linux-2.6.38.1/drivers/acpi/blacklist.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/acpi/blacklist.c 2011-03-21 18:31:35.000000000 -0400
@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
{"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
"Incorrect _ADR", 1},
@@ -20610,9 +20610,9 @@ diff -urNp linux-2.6.38/drivers/acpi/blacklist.c linux-2.6.38-new/drivers/acpi/b
};
#if CONFIG_ACPI_BLACKLIST_YEAR
-diff -urNp linux-2.6.38/drivers/acpi/dock.c linux-2.6.38-new/drivers/acpi/dock.c
---- linux-2.6.38/drivers/acpi/dock.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/acpi/dock.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/acpi/dock.c linux-2.6.38.1/drivers/acpi/dock.c
+--- linux-2.6.38.1/drivers/acpi/dock.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/acpi/dock.c 2011-03-21 18:31:35.000000000 -0400
@@ -77,7 +77,7 @@ struct dock_dependent_device {
struct list_head list;
struct list_head hotplug_list;
@@ -20631,9 +20631,9 @@ diff -urNp linux-2.6.38/drivers/acpi/dock.c linux-2.6.38-new/drivers/acpi/dock.c
void *context)
{
struct dock_dependent_device *dd;
-diff -urNp linux-2.6.38/drivers/acpi/ec_sys.c linux-2.6.38-new/drivers/acpi/ec_sys.c
---- linux-2.6.38/drivers/acpi/ec_sys.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/acpi/ec_sys.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/acpi/ec_sys.c linux-2.6.38.1/drivers/acpi/ec_sys.c
+--- linux-2.6.38.1/drivers/acpi/ec_sys.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/acpi/ec_sys.c 2011-03-21 18:31:35.000000000 -0400
@@ -96,7 +96,7 @@ static ssize_t acpi_ec_write_io(struct f
return count;
}
@@ -20643,9 +20643,9 @@ diff -urNp linux-2.6.38/drivers/acpi/ec_sys.c linux-2.6.38-new/drivers/acpi/ec_s
.owner = THIS_MODULE,
.open = acpi_ec_open_io,
.read = acpi_ec_read_io,
-diff -urNp linux-2.6.38/drivers/acpi/power_meter.c linux-2.6.38-new/drivers/acpi/power_meter.c
---- linux-2.6.38/drivers/acpi/power_meter.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/acpi/power_meter.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/acpi/power_meter.c linux-2.6.38.1/drivers/acpi/power_meter.c
+--- linux-2.6.38.1/drivers/acpi/power_meter.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/acpi/power_meter.c 2011-03-21 18:31:35.000000000 -0400
@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
return res;
@@ -20655,9 +20655,9 @@ diff -urNp linux-2.6.38/drivers/acpi/power_meter.c linux-2.6.38-new/drivers/acpi
mutex_lock(&resource->lock);
resource->trip[attr->index - 7] = temp;
-diff -urNp linux-2.6.38/drivers/acpi/proc.c linux-2.6.38-new/drivers/acpi/proc.c
---- linux-2.6.38/drivers/acpi/proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/acpi/proc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/acpi/proc.c linux-2.6.38.1/drivers/acpi/proc.c
+--- linux-2.6.38.1/drivers/acpi/proc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/acpi/proc.c 2011-03-21 18:31:35.000000000 -0400
@@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f
size_t count, loff_t * ppos)
{
@@ -20692,9 +20692,9 @@ diff -urNp linux-2.6.38/drivers/acpi/proc.c linux-2.6.38-new/drivers/acpi/proc.c
if (device_can_wakeup(&dev->dev)) {
bool enable = !device_may_wakeup(&dev->dev);
device_set_wakeup_enable(&dev->dev, enable);
-diff -urNp linux-2.6.38/drivers/acpi/processor_driver.c linux-2.6.38-new/drivers/acpi/processor_driver.c
---- linux-2.6.38/drivers/acpi/processor_driver.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/acpi/processor_driver.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/acpi/processor_driver.c linux-2.6.38.1/drivers/acpi/processor_driver.c
+--- linux-2.6.38.1/drivers/acpi/processor_driver.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/acpi/processor_driver.c 2011-03-21 18:31:35.000000000 -0400
@@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(
return 0;
#endif
@@ -20704,9 +20704,9 @@ diff -urNp linux-2.6.38/drivers/acpi/processor_driver.c linux-2.6.38-new/drivers
/*
* Buggy BIOS check
-diff -urNp linux-2.6.38/drivers/acpi/processor_idle.c linux-2.6.38-new/drivers/acpi/processor_idle.c
---- linux-2.6.38/drivers/acpi/processor_idle.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/acpi/processor_idle.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/acpi/processor_idle.c linux-2.6.38.1/drivers/acpi/processor_idle.c
+--- linux-2.6.38.1/drivers/acpi/processor_idle.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/acpi/processor_idle.c 2011-03-21 18:31:35.000000000 -0400
@@ -121,7 +121,7 @@ static struct dmi_system_id __cpuinitdat
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
@@ -20716,9 +20716,9 @@ diff -urNp linux-2.6.38/drivers/acpi/processor_idle.c linux-2.6.38-new/drivers/a
};
-diff -urNp linux-2.6.38/drivers/ata/acard-ahci.c linux-2.6.38-new/drivers/ata/acard-ahci.c
---- linux-2.6.38/drivers/ata/acard-ahci.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/acard-ahci.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/acard-ahci.c linux-2.6.38.1/drivers/ata/acard-ahci.c
+--- linux-2.6.38.1/drivers/ata/acard-ahci.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/acard-ahci.c 2011-03-21 18:31:35.000000000 -0400
@@ -87,7 +87,7 @@ static struct scsi_host_template acard_a
AHCI_SHT("acard-ahci"),
};
@@ -20728,9 +20728,9 @@ diff -urNp linux-2.6.38/drivers/ata/acard-ahci.c linux-2.6.38-new/drivers/ata/ac
.inherits = &ahci_ops,
.qc_prep = acard_ahci_qc_prep,
.qc_fill_rtf = acard_ahci_qc_fill_rtf,
-diff -urNp linux-2.6.38/drivers/ata/ahci.c linux-2.6.38-new/drivers/ata/ahci.c
---- linux-2.6.38/drivers/ata/ahci.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/ahci.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/ahci.c linux-2.6.38.1/drivers/ata/ahci.c
+--- linux-2.6.38.1/drivers/ata/ahci.c 2011-03-23 17:20:06.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/ahci.c 2011-03-23 17:21:49.000000000 -0400
@@ -94,17 +94,17 @@ static struct scsi_host_template ahci_sh
AHCI_SHT("ahci"),
};
@@ -20752,7 +20752,7 @@ diff -urNp linux-2.6.38/drivers/ata/ahci.c linux-2.6.38-new/drivers/ata/ahci.c
.inherits = &ahci_ops,
.softreset = ahci_sb600_softreset,
.pmp_softreset = ahci_sb600_softreset,
-@@ -391,7 +391,7 @@ static const struct pci_device_id ahci_p
+@@ -394,7 +394,7 @@ static const struct pci_device_id ahci_p
{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
@@ -20761,9 +20761,9 @@ diff -urNp linux-2.6.38/drivers/ata/ahci.c linux-2.6.38-new/drivers/ata/ahci.c
};
-diff -urNp linux-2.6.38/drivers/ata/ahci.h linux-2.6.38-new/drivers/ata/ahci.h
---- linux-2.6.38/drivers/ata/ahci.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/ahci.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/ahci.h linux-2.6.38.1/drivers/ata/ahci.h
+--- linux-2.6.38.1/drivers/ata/ahci.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/ahci.h 2011-03-21 18:31:35.000000000 -0400
@@ -309,7 +309,7 @@ extern struct device_attribute *ahci_sde
.shost_attrs = ahci_shost_attrs, \
.sdev_attrs = ahci_sdev_attrs
@@ -20773,9 +20773,9 @@ diff -urNp linux-2.6.38/drivers/ata/ahci.h linux-2.6.38-new/drivers/ata/ahci.h
void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag,
u32 opts);
-diff -urNp linux-2.6.38/drivers/ata/ata_generic.c linux-2.6.38-new/drivers/ata/ata_generic.c
---- linux-2.6.38/drivers/ata/ata_generic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/ata_generic.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/ata_generic.c linux-2.6.38.1/drivers/ata/ata_generic.c
+--- linux-2.6.38.1/drivers/ata/ata_generic.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/ata_generic.c 2011-03-21 18:31:35.000000000 -0400
@@ -101,7 +101,7 @@ static struct scsi_host_template generic
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20785,9 +20785,9 @@ diff -urNp linux-2.6.38/drivers/ata/ata_generic.c linux-2.6.38-new/drivers/ata/a
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_unknown,
.set_mode = generic_set_mode,
-diff -urNp linux-2.6.38/drivers/ata/ata_piix.c linux-2.6.38-new/drivers/ata/ata_piix.c
---- linux-2.6.38/drivers/ata/ata_piix.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/ata_piix.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/ata_piix.c linux-2.6.38.1/drivers/ata/ata_piix.c
+--- linux-2.6.38.1/drivers/ata/ata_piix.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/ata_piix.c 2011-03-21 18:31:35.000000000 -0400
@@ -309,7 +309,7 @@ static const struct pci_device_id piix_p
{ 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
/* SATA Controller IDE (PBG) */
@@ -20854,9 +20854,9 @@ diff -urNp linux-2.6.38/drivers/ata/ata_piix.c linux-2.6.38-new/drivers/ata/ata_
};
static const char *oemstrs[] = {
"Tecra M3,",
-diff -urNp linux-2.6.38/drivers/ata/libahci.c linux-2.6.38-new/drivers/ata/libahci.c
---- linux-2.6.38/drivers/ata/libahci.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/libahci.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/libahci.c linux-2.6.38.1/drivers/ata/libahci.c
+--- linux-2.6.38.1/drivers/ata/libahci.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/libahci.c 2011-03-21 18:31:35.000000000 -0400
@@ -137,7 +137,7 @@ struct device_attribute *ahci_sdev_attrs
};
EXPORT_SYMBOL_GPL(ahci_sdev_attrs);
@@ -20866,9 +20866,9 @@ diff -urNp linux-2.6.38/drivers/ata/libahci.c linux-2.6.38-new/drivers/ata/libah
.inherits = &sata_pmp_port_ops,
.qc_defer = ahci_pmp_qc_defer,
-diff -urNp linux-2.6.38/drivers/ata/libata-acpi.c linux-2.6.38-new/drivers/ata/libata-acpi.c
---- linux-2.6.38/drivers/ata/libata-acpi.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/libata-acpi.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/libata-acpi.c linux-2.6.38.1/drivers/ata/libata-acpi.c
+--- linux-2.6.38.1/drivers/ata/libata-acpi.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/libata-acpi.c 2011-03-21 18:31:35.000000000 -0400
@@ -218,12 +218,12 @@ static void ata_acpi_dev_uevent(acpi_han
ata_acpi_uevent(dev->link->ap, dev, event);
}
@@ -20884,9 +20884,9 @@ diff -urNp linux-2.6.38/drivers/ata/libata-acpi.c linux-2.6.38-new/drivers/ata/l
.handler = ata_acpi_ap_notify_dock,
.uevent = ata_acpi_ap_uevent,
};
-diff -urNp linux-2.6.38/drivers/ata/libata-core.c linux-2.6.38-new/drivers/ata/libata-core.c
---- linux-2.6.38/drivers/ata/libata-core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/libata-core.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/libata-core.c linux-2.6.38.1/drivers/ata/libata-core.c
+--- linux-2.6.38.1/drivers/ata/libata-core.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/libata-core.c 2011-03-21 18:31:35.000000000 -0400
@@ -897,7 +897,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 },
@@ -20978,9 +20978,9 @@ diff -urNp linux-2.6.38/drivers/ata/libata-core.c linux-2.6.38-new/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.38/drivers/ata/libata-eh.c linux-2.6.38-new/drivers/ata/libata-eh.c
---- linux-2.6.38/drivers/ata/libata-eh.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/libata-eh.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/libata-eh.c linux-2.6.38.1/drivers/ata/libata-eh.c
+--- linux-2.6.38.1/drivers/ata/libata-eh.c 2011-03-23 17:20:06.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/libata-eh.c 2011-03-23 17:21:49.000000000 -0400
@@ -3880,7 +3880,7 @@ void ata_do_eh(struct ata_port *ap, ata_
*/
void ata_std_error_handler(struct ata_port *ap)
@@ -20990,9 +20990,9 @@ diff -urNp linux-2.6.38/drivers/ata/libata-eh.c linux-2.6.38-new/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.38/drivers/ata/libata-pmp.c linux-2.6.38-new/drivers/ata/libata-pmp.c
---- linux-2.6.38/drivers/ata/libata-pmp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/libata-pmp.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/libata-pmp.c linux-2.6.38.1/drivers/ata/libata-pmp.c
+--- linux-2.6.38.1/drivers/ata/libata-pmp.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/libata-pmp.c 2011-03-21 18:31:35.000000000 -0400
@@ -912,7 +912,7 @@ static int sata_pmp_handle_link_fail(str
*/
static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -21002,9 +21002,9 @@ diff -urNp linux-2.6.38/drivers/ata/libata-pmp.c linux-2.6.38-new/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.38/drivers/ata/pata_acpi.c linux-2.6.38-new/drivers/ata/pata_acpi.c
---- linux-2.6.38/drivers/ata/pata_acpi.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_acpi.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_acpi.c linux-2.6.38.1/drivers/ata/pata_acpi.c
+--- linux-2.6.38.1/drivers/ata/pata_acpi.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_acpi.c 2011-03-21 18:31:35.000000000 -0400
@@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21014,9 +21014,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_acpi.c linux-2.6.38-new/drivers/ata/pat
.inherits = &ata_bmdma_port_ops,
.qc_issue = pacpi_qc_issue,
.cable_detect = pacpi_cable_detect,
-diff -urNp linux-2.6.38/drivers/ata/pata_ali.c linux-2.6.38-new/drivers/ata/pata_ali.c
---- linux-2.6.38/drivers/ata/pata_ali.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_ali.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_ali.c linux-2.6.38.1/drivers/ata/pata_ali.c
+--- linux-2.6.38.1/drivers/ata/pata_ali.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_ali.c 2011-03-21 18:31:35.000000000 -0400
@@ -363,7 +363,7 @@ static struct scsi_host_template ali_sht
* Port operations for PIO only ALi
*/
@@ -21062,9 +21062,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_ali.c linux-2.6.38-new/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.38/drivers/ata/pata_amd.c linux-2.6.38-new/drivers/ata/pata_amd.c
---- linux-2.6.38/drivers/ata/pata_amd.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_amd.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_amd.c linux-2.6.38.1/drivers/ata/pata_amd.c
+--- linux-2.6.38.1/drivers/ata/pata_amd.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_amd.c 2011-03-21 18:31:35.000000000 -0400
@@ -397,28 +397,28 @@ static const struct ata_port_operations
.prereset = amd_pre_reset,
};
@@ -21114,9 +21114,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_amd.c linux-2.6.38-new/drivers/ata/pata
.inherits = &nv_base_port_ops,
.set_piomode = nv133_set_piomode,
.set_dmamode = nv133_set_dmamode,
-diff -urNp linux-2.6.38/drivers/ata/pata_artop.c linux-2.6.38-new/drivers/ata/pata_artop.c
---- linux-2.6.38/drivers/ata/pata_artop.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_artop.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_artop.c linux-2.6.38.1/drivers/ata/pata_artop.c
+--- linux-2.6.38.1/drivers/ata/pata_artop.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_artop.c 2011-03-21 18:31:35.000000000 -0400
@@ -312,7 +312,7 @@ static struct scsi_host_template artop_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21135,9 +21135,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_artop.c linux-2.6.38-new/drivers/ata/pa
.inherits = &ata_bmdma_port_ops,
.cable_detect = artop6260_cable_detect,
.set_piomode = artop6260_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_at32.c linux-2.6.38-new/drivers/ata/pata_at32.c
---- linux-2.6.38/drivers/ata/pata_at32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_at32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_at32.c linux-2.6.38.1/drivers/ata/pata_at32.c
+--- linux-2.6.38.1/drivers/ata/pata_at32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_at32.c 2011-03-21 18:31:35.000000000 -0400
@@ -173,7 +173,7 @@ static struct scsi_host_template at32_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -21147,9 +21147,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_at32.c linux-2.6.38-new/drivers/ata/pat
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = pata_at32_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_at91.c linux-2.6.38-new/drivers/ata/pata_at91.c
---- linux-2.6.38/drivers/ata/pata_at91.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_at91.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_at91.c linux-2.6.38.1/drivers/ata/pata_at91.c
+--- linux-2.6.38.1/drivers/ata/pata_at91.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_at91.c 2011-03-21 18:31:35.000000000 -0400
@@ -196,7 +196,7 @@ static struct scsi_host_template pata_at
ATA_PIO_SHT(DRV_NAME),
};
@@ -21159,9 +21159,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_at91.c linux-2.6.38-new/drivers/ata/pat
.inherits = &ata_sff_port_ops,
.sff_data_xfer = pata_at91_data_xfer_noirq,
-diff -urNp linux-2.6.38/drivers/ata/pata_atiixp.c linux-2.6.38-new/drivers/ata/pata_atiixp.c
---- linux-2.6.38/drivers/ata/pata_atiixp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_atiixp.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_atiixp.c linux-2.6.38.1/drivers/ata/pata_atiixp.c
+--- linux-2.6.38.1/drivers/ata/pata_atiixp.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_atiixp.c 2011-03-21 18:31:35.000000000 -0400
@@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21171,9 +21171,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_atiixp.c linux-2.6.38-new/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_bmdma_dumb_qc_prep,
-diff -urNp linux-2.6.38/drivers/ata/pata_atp867x.c linux-2.6.38-new/drivers/ata/pata_atp867x.c
---- linux-2.6.38/drivers/ata/pata_atp867x.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_atp867x.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_atp867x.c linux-2.6.38.1/drivers/ata/pata_atp867x.c
+--- linux-2.6.38.1/drivers/ata/pata_atp867x.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_atp867x.c 2011-03-21 18:31:35.000000000 -0400
@@ -275,7 +275,7 @@ static struct scsi_host_template atp867x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21183,9 +21183,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_atp867x.c linux-2.6.38-new/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.cable_detect = atp867x_cable_detect,
.set_piomode = atp867x_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_bf54x.c linux-2.6.38-new/drivers/ata/pata_bf54x.c
---- linux-2.6.38/drivers/ata/pata_bf54x.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_bf54x.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_bf54x.c linux-2.6.38.1/drivers/ata/pata_bf54x.c
+--- linux-2.6.38.1/drivers/ata/pata_bf54x.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_bf54x.c 2011-03-21 18:31:35.000000000 -0400
@@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sh
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -21195,9 +21195,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_bf54x.c linux-2.6.38-new/drivers/ata/pa
.inherits = &ata_bmdma_port_ops,
.set_piomode = bfin_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_cmd640.c linux-2.6.38-new/drivers/ata/pata_cmd640.c
---- linux-2.6.38/drivers/ata/pata_cmd640.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_cmd640.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_cmd640.c linux-2.6.38.1/drivers/ata/pata_cmd640.c
+--- linux-2.6.38.1/drivers/ata/pata_cmd640.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_cmd640.c 2011-03-21 18:31:35.000000000 -0400
@@ -176,7 +176,7 @@ static struct scsi_host_template cmd640_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21207,9 +21207,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_cmd640.c linux-2.6.38-new/drivers/ata/p
.inherits = &ata_sff_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.38/drivers/ata/pata_cmd64x.c linux-2.6.38-new/drivers/ata/pata_cmd64x.c
---- linux-2.6.38/drivers/ata/pata_cmd64x.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_cmd64x.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_cmd64x.c linux-2.6.38.1/drivers/ata/pata_cmd64x.c
+--- linux-2.6.38.1/drivers/ata/pata_cmd64x.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_cmd64x.c 2011-03-21 18:31:35.000000000 -0400
@@ -268,18 +268,18 @@ static const struct ata_port_operations
.set_dmamode = cmd64x_set_dmamode,
};
@@ -21232,9 +21232,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_cmd64x.c linux-2.6.38-new/drivers/ata/p
.inherits = &cmd64x_base_ops,
.bmdma_stop = cmd648_bmdma_stop,
.cable_detect = cmd648_cable_detect,
-diff -urNp linux-2.6.38/drivers/ata/pata_cs5520.c linux-2.6.38-new/drivers/ata/pata_cs5520.c
---- linux-2.6.38/drivers/ata/pata_cs5520.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_cs5520.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_cs5520.c linux-2.6.38.1/drivers/ata/pata_cs5520.c
+--- linux-2.6.38.1/drivers/ata/pata_cs5520.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_cs5520.c 2011-03-21 18:31:35.000000000 -0400
@@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21244,9 +21244,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_cs5520.c linux-2.6.38-new/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_bmdma_dumb_qc_prep,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.38/drivers/ata/pata_cs5530.c linux-2.6.38-new/drivers/ata/pata_cs5530.c
---- linux-2.6.38/drivers/ata/pata_cs5530.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_cs5530.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_cs5530.c linux-2.6.38.1/drivers/ata/pata_cs5530.c
+--- linux-2.6.38.1/drivers/ata/pata_cs5530.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_cs5530.c 2011-03-21 18:31:35.000000000 -0400
@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21256,9 +21256,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_cs5530.c linux-2.6.38-new/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_bmdma_dumb_qc_prep,
-diff -urNp linux-2.6.38/drivers/ata/pata_cs5535.c linux-2.6.38-new/drivers/ata/pata_cs5535.c
---- linux-2.6.38/drivers/ata/pata_cs5535.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_cs5535.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_cs5535.c linux-2.6.38.1/drivers/ata/pata_cs5535.c
+--- linux-2.6.38.1/drivers/ata/pata_cs5535.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_cs5535.c 2011-03-21 18:31:35.000000000 -0400
@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21268,9 +21268,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_cs5535.c linux-2.6.38-new/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.cable_detect = cs5535_cable_detect,
.set_piomode = cs5535_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_cs5536.c linux-2.6.38-new/drivers/ata/pata_cs5536.c
---- linux-2.6.38/drivers/ata/pata_cs5536.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_cs5536.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_cs5536.c linux-2.6.38.1/drivers/ata/pata_cs5536.c
+--- linux-2.6.38.1/drivers/ata/pata_cs5536.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_cs5536.c 2011-03-21 18:31:35.000000000 -0400
@@ -233,7 +233,7 @@ static struct scsi_host_template cs5536_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21280,9 +21280,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_cs5536.c linux-2.6.38-new/drivers/ata/p
.inherits = &ata_bmdma32_port_ops,
.cable_detect = cs5536_cable_detect,
.set_piomode = cs5536_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_cypress.c linux-2.6.38-new/drivers/ata/pata_cypress.c
---- linux-2.6.38/drivers/ata/pata_cypress.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_cypress.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_cypress.c linux-2.6.38.1/drivers/ata/pata_cypress.c
+--- linux-2.6.38.1/drivers/ata/pata_cypress.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_cypress.c 2011-03-21 18:31:35.000000000 -0400
@@ -115,7 +115,7 @@ static struct scsi_host_template cy82c69
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21292,9 +21292,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_cypress.c linux-2.6.38-new/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = cy82c693_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_efar.c linux-2.6.38-new/drivers/ata/pata_efar.c
---- linux-2.6.38/drivers/ata/pata_efar.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_efar.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_efar.c linux-2.6.38.1/drivers/ata/pata_efar.c
+--- linux-2.6.38.1/drivers/ata/pata_efar.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_efar.c 2011-03-21 18:31:35.000000000 -0400
@@ -238,7 +238,7 @@ static struct scsi_host_template efar_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21304,9 +21304,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_efar.c linux-2.6.38-new/drivers/ata/pat
.inherits = &ata_bmdma_port_ops,
.cable_detect = efar_cable_detect,
.set_piomode = efar_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_hpt366.c linux-2.6.38-new/drivers/ata/pata_hpt366.c
---- linux-2.6.38/drivers/ata/pata_hpt366.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_hpt366.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_hpt366.c linux-2.6.38.1/drivers/ata/pata_hpt366.c
+--- linux-2.6.38.1/drivers/ata/pata_hpt366.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_hpt366.c 2011-03-21 18:31:35.000000000 -0400
@@ -275,7 +275,7 @@ static struct scsi_host_template hpt36x_
* Configuration for HPT366/68
*/
@@ -21316,9 +21316,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_hpt366.c linux-2.6.38-new/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.cable_detect = hpt36x_cable_detect,
.mode_filter = hpt366_filter,
-diff -urNp linux-2.6.38/drivers/ata/pata_hpt37x.c linux-2.6.38-new/drivers/ata/pata_hpt37x.c
---- linux-2.6.38/drivers/ata/pata_hpt37x.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_hpt37x.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_hpt37x.c linux-2.6.38.1/drivers/ata/pata_hpt37x.c
+--- linux-2.6.38.1/drivers/ata/pata_hpt37x.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_hpt37x.c 2011-03-21 18:31:35.000000000 -0400
@@ -587,7 +587,7 @@ static struct scsi_host_template hpt37x_
* Configuration for HPT370
*/
@@ -21364,9 +21364,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_hpt37x.c linux-2.6.38-new/drivers/ata/p
.inherits = &hpt372_port_ops,
.cable_detect = hpt374_fn1_cable_detect,
};
-diff -urNp linux-2.6.38/drivers/ata/pata_hpt3x2n.c linux-2.6.38-new/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.38/drivers/ata/pata_hpt3x2n.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_hpt3x2n.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_hpt3x2n.c linux-2.6.38.1/drivers/ata/pata_hpt3x2n.c
+--- linux-2.6.38.1/drivers/ata/pata_hpt3x2n.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_hpt3x2n.c 2011-03-21 18:31:35.000000000 -0400
@@ -348,7 +348,7 @@ static struct scsi_host_template hpt3x2n
* Configuration for HPT302N/371N.
*/
@@ -21385,9 +21385,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_hpt3x2n.c linux-2.6.38-new/drivers/ata/
.inherits = &hpt3xxn_port_ops,
.mode_filter = &hpt372n_filter,
};
-diff -urNp linux-2.6.38/drivers/ata/pata_hpt3x3.c linux-2.6.38-new/drivers/ata/pata_hpt3x3.c
---- linux-2.6.38/drivers/ata/pata_hpt3x3.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_hpt3x3.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_hpt3x3.c linux-2.6.38.1/drivers/ata/pata_hpt3x3.c
+--- linux-2.6.38.1/drivers/ata/pata_hpt3x3.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_hpt3x3.c 2011-03-21 18:31:35.000000000 -0400
@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21397,9 +21397,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_hpt3x3.c linux-2.6.38-new/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = hpt3x3_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_icside.c linux-2.6.38-new/drivers/ata/pata_icside.c
---- linux-2.6.38/drivers/ata/pata_icside.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_icside.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_icside.c linux-2.6.38.1/drivers/ata/pata_icside.c
+--- linux-2.6.38.1/drivers/ata/pata_icside.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_icside.c 2011-03-21 18:31:35.000000000 -0400
@@ -320,7 +320,7 @@ static void pata_icside_postreset(struct
}
}
@@ -21409,9 +21409,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_icside.c linux-2.6.38-new/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
/* no need to build any PRD tables for DMA */
.qc_prep = ata_noop_qc_prep,
-diff -urNp linux-2.6.38/drivers/ata/pata_isapnp.c linux-2.6.38-new/drivers/ata/pata_isapnp.c
---- linux-2.6.38/drivers/ata/pata_isapnp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_isapnp.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_isapnp.c linux-2.6.38.1/drivers/ata/pata_isapnp.c
+--- linux-2.6.38.1/drivers/ata/pata_isapnp.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_isapnp.c 2011-03-21 18:31:35.000000000 -0400
@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21427,9 +21427,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_isapnp.c linux-2.6.38-new/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.38/drivers/ata/pata_it8213.c linux-2.6.38-new/drivers/ata/pata_it8213.c
---- linux-2.6.38/drivers/ata/pata_it8213.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_it8213.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_it8213.c linux-2.6.38.1/drivers/ata/pata_it8213.c
+--- linux-2.6.38.1/drivers/ata/pata_it8213.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_it8213.c 2011-03-21 18:31:35.000000000 -0400
@@ -233,7 +233,7 @@ static struct scsi_host_template it8213_
};
@@ -21439,9 +21439,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_it8213.c linux-2.6.38-new/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.cable_detect = it8213_cable_detect,
.set_piomode = it8213_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_it821x.c linux-2.6.38-new/drivers/ata/pata_it821x.c
---- linux-2.6.38/drivers/ata/pata_it821x.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_it821x.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_it821x.c linux-2.6.38.1/drivers/ata/pata_it821x.c
+--- linux-2.6.38.1/drivers/ata/pata_it821x.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_it821x.c 2011-03-21 18:31:35.000000000 -0400
@@ -801,7 +801,7 @@ static struct scsi_host_template it821x_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21469,9 +21469,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_it821x.c linux-2.6.38-new/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.check_atapi_dma= it821x_check_atapi_dma,
-diff -urNp linux-2.6.38/drivers/ata/pata_ixp4xx_cf.c linux-2.6.38-new/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.38/drivers/ata/pata_ixp4xx_cf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_ixp4xx_cf.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_ixp4xx_cf.c linux-2.6.38.1/drivers/ata/pata_ixp4xx_cf.c
+--- linux-2.6.38.1/drivers/ata/pata_ixp4xx_cf.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_ixp4xx_cf.c 2011-03-21 18:31:35.000000000 -0400
@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21481,9 +21481,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_ixp4xx_cf.c linux-2.6.38-new/drivers/at
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ixp4xx_mmio_data_xfer,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.38/drivers/ata/pata_jmicron.c linux-2.6.38-new/drivers/ata/pata_jmicron.c
---- linux-2.6.38/drivers/ata/pata_jmicron.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_jmicron.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_jmicron.c linux-2.6.38.1/drivers/ata/pata_jmicron.c
+--- linux-2.6.38.1/drivers/ata/pata_jmicron.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_jmicron.c 2011-03-21 18:31:35.000000000 -0400
@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21493,9 +21493,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_jmicron.c linux-2.6.38-new/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.prereset = jmicron_pre_reset,
};
-diff -urNp linux-2.6.38/drivers/ata/pata_legacy.c linux-2.6.38-new/drivers/ata/pata_legacy.c
---- linux-2.6.38/drivers/ata/pata_legacy.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_legacy.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_legacy.c linux-2.6.38.1/drivers/ata/pata_legacy.c
+--- linux-2.6.38.1/drivers/ata/pata_legacy.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_legacy.c 2011-03-21 18:31:35.000000000 -0400
@@ -116,7 +116,7 @@ struct legacy_probe {
struct legacy_controller {
@@ -21607,9 +21607,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_legacy.c linux-2.6.38-new/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.38/drivers/ata/pata_macio.c linux-2.6.38-new/drivers/ata/pata_macio.c
---- linux-2.6.38/drivers/ata/pata_macio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_macio.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_macio.c linux-2.6.38.1/drivers/ata/pata_macio.c
+--- linux-2.6.38.1/drivers/ata/pata_macio.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_macio.c 2011-03-21 18:31:35.000000000 -0400
@@ -918,9 +918,8 @@ static struct scsi_host_template pata_ma
.slave_configure = pata_macio_slave_config,
};
@@ -21621,9 +21621,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_macio.c linux-2.6.38-new/drivers/ata/pa
.freeze = pata_macio_freeze,
.set_piomode = pata_macio_set_timings,
.set_dmamode = pata_macio_set_timings,
-diff -urNp linux-2.6.38/drivers/ata/pata_marvell.c linux-2.6.38-new/drivers/ata/pata_marvell.c
---- linux-2.6.38/drivers/ata/pata_marvell.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_marvell.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_marvell.c linux-2.6.38.1/drivers/ata/pata_marvell.c
+--- linux-2.6.38.1/drivers/ata/pata_marvell.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_marvell.c 2011-03-21 18:31:35.000000000 -0400
@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21633,9 +21633,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_marvell.c linux-2.6.38-new/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.cable_detect = marvell_cable_detect,
.prereset = marvell_pre_reset,
-diff -urNp linux-2.6.38/drivers/ata/pata_mpc52xx.c linux-2.6.38-new/drivers/ata/pata_mpc52xx.c
---- linux-2.6.38/drivers/ata/pata_mpc52xx.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_mpc52xx.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_mpc52xx.c linux-2.6.38.1/drivers/ata/pata_mpc52xx.c
+--- linux-2.6.38.1/drivers/ata/pata_mpc52xx.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_mpc52xx.c 2011-03-21 18:31:35.000000000 -0400
@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
ATA_PIO_SHT(DRV_NAME),
};
@@ -21645,9 +21645,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_mpc52xx.c linux-2.6.38-new/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.sff_dev_select = mpc52xx_ata_dev_select,
.set_piomode = mpc52xx_ata_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_mpiix.c linux-2.6.38-new/drivers/ata/pata_mpiix.c
---- linux-2.6.38/drivers/ata/pata_mpiix.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_mpiix.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_mpiix.c linux-2.6.38.1/drivers/ata/pata_mpiix.c
+--- linux-2.6.38.1/drivers/ata/pata_mpiix.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_mpiix.c 2011-03-21 18:31:35.000000000 -0400
@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
ATA_PIO_SHT(DRV_NAME),
};
@@ -21657,9 +21657,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_mpiix.c linux-2.6.38-new/drivers/ata/pa
.inherits = &ata_sff_port_ops,
.qc_issue = mpiix_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.38/drivers/ata/pata_netcell.c linux-2.6.38-new/drivers/ata/pata_netcell.c
---- linux-2.6.38/drivers/ata/pata_netcell.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_netcell.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_netcell.c linux-2.6.38.1/drivers/ata/pata_netcell.c
+--- linux-2.6.38.1/drivers/ata/pata_netcell.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_netcell.c 2011-03-21 18:31:35.000000000 -0400
@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21669,9 +21669,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_netcell.c linux-2.6.38-new/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_80wire,
.read_id = netcell_read_id,
-diff -urNp linux-2.6.38/drivers/ata/pata_ninja32.c linux-2.6.38-new/drivers/ata/pata_ninja32.c
---- linux-2.6.38/drivers/ata/pata_ninja32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_ninja32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_ninja32.c linux-2.6.38.1/drivers/ata/pata_ninja32.c
+--- linux-2.6.38.1/drivers/ata/pata_ninja32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_ninja32.c 2011-03-21 18:31:35.000000000 -0400
@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21681,9 +21681,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_ninja32.c linux-2.6.38-new/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.sff_dev_select = ninja32_dev_select,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.38/drivers/ata/pata_ns87410.c linux-2.6.38-new/drivers/ata/pata_ns87410.c
---- linux-2.6.38/drivers/ata/pata_ns87410.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_ns87410.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_ns87410.c linux-2.6.38.1/drivers/ata/pata_ns87410.c
+--- linux-2.6.38.1/drivers/ata/pata_ns87410.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_ns87410.c 2011-03-21 18:31:35.000000000 -0400
@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
ATA_PIO_SHT(DRV_NAME),
};
@@ -21693,9 +21693,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_ns87410.c linux-2.6.38-new/drivers/ata/
.inherits = &ata_sff_port_ops,
.qc_issue = ns87410_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.38/drivers/ata/pata_ns87415.c linux-2.6.38-new/drivers/ata/pata_ns87415.c
---- linux-2.6.38/drivers/ata/pata_ns87415.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_ns87415.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_ns87415.c linux-2.6.38.1/drivers/ata/pata_ns87415.c
+--- linux-2.6.38.1/drivers/ata/pata_ns87415.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_ns87415.c 2011-03-21 18:31:35.000000000 -0400
@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
}
#endif /* 87560 SuperIO Support */
@@ -21714,9 +21714,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_ns87415.c linux-2.6.38-new/drivers/ata/
.inherits = &ns87415_pata_ops,
.sff_tf_read = ns87560_tf_read,
.sff_check_status = ns87560_check_status,
-diff -urNp linux-2.6.38/drivers/ata/pata_octeon_cf.c linux-2.6.38-new/drivers/ata/pata_octeon_cf.c
---- linux-2.6.38/drivers/ata/pata_octeon_cf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_octeon_cf.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_octeon_cf.c linux-2.6.38.1/drivers/ata/pata_octeon_cf.c
+--- linux-2.6.38.1/drivers/ata/pata_octeon_cf.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_octeon_cf.c 2011-03-21 18:31:35.000000000 -0400
@@ -780,7 +780,7 @@ static unsigned int octeon_cf_qc_issue(s
return 0;
}
@@ -21726,9 +21726,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_octeon_cf.c linux-2.6.38-new/drivers/at
.inherits = &ata_sff_port_ops,
.check_atapi_dma = octeon_cf_check_atapi_dma,
.qc_prep = ata_noop_qc_prep,
-diff -urNp linux-2.6.38/drivers/ata/pata_oldpiix.c linux-2.6.38-new/drivers/ata/pata_oldpiix.c
---- linux-2.6.38/drivers/ata/pata_oldpiix.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_oldpiix.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_oldpiix.c linux-2.6.38.1/drivers/ata/pata_oldpiix.c
+--- linux-2.6.38.1/drivers/ata/pata_oldpiix.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_oldpiix.c 2011-03-21 18:31:35.000000000 -0400
@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21738,9 +21738,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_oldpiix.c linux-2.6.38-new/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.qc_issue = oldpiix_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.38/drivers/ata/pata_opti.c linux-2.6.38-new/drivers/ata/pata_opti.c
---- linux-2.6.38/drivers/ata/pata_opti.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_opti.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_opti.c linux-2.6.38.1/drivers/ata/pata_opti.c
+--- linux-2.6.38.1/drivers/ata/pata_opti.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_opti.c 2011-03-21 18:31:35.000000000 -0400
@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -21750,9 +21750,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_opti.c linux-2.6.38-new/drivers/ata/pat
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = opti_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_optidma.c linux-2.6.38-new/drivers/ata/pata_optidma.c
---- linux-2.6.38/drivers/ata/pata_optidma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_optidma.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_optidma.c linux-2.6.38.1/drivers/ata/pata_optidma.c
+--- linux-2.6.38.1/drivers/ata/pata_optidma.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_optidma.c 2011-03-21 18:31:35.000000000 -0400
@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21771,9 +21771,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_optidma.c linux-2.6.38-new/drivers/ata/
.inherits = &optidma_port_ops,
.set_piomode = optiplus_set_pio_mode,
.set_dmamode = optiplus_set_dma_mode,
-diff -urNp linux-2.6.38/drivers/ata/pata_palmld.c linux-2.6.38-new/drivers/ata/pata_palmld.c
---- linux-2.6.38/drivers/ata/pata_palmld.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_palmld.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_palmld.c linux-2.6.38.1/drivers/ata/pata_palmld.c
+--- linux-2.6.38.1/drivers/ata/pata_palmld.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_palmld.c 2011-03-21 18:31:35.000000000 -0400
@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21783,9 +21783,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_palmld.c linux-2.6.38-new/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.38/drivers/ata/pata_pcmcia.c linux-2.6.38-new/drivers/ata/pata_pcmcia.c
---- linux-2.6.38/drivers/ata/pata_pcmcia.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_pcmcia.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_pcmcia.c linux-2.6.38.1/drivers/ata/pata_pcmcia.c
+--- linux-2.6.38.1/drivers/ata/pata_pcmcia.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_pcmcia.c 2011-03-21 18:31:35.000000000 -0400
@@ -151,14 +151,14 @@ static struct scsi_host_template pcmcia_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21812,9 +21812,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_pcmcia.c linux-2.6.38-new/drivers/ata/p
/* Set up attributes in order to probe card and get resources */
pdev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO |
-diff -urNp linux-2.6.38/drivers/ata/pata_pdc2027x.c linux-2.6.38-new/drivers/ata/pata_pdc2027x.c
---- linux-2.6.38/drivers/ata/pata_pdc2027x.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_pdc2027x.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_pdc2027x.c linux-2.6.38.1/drivers/ata/pata_pdc2027x.c
+--- linux-2.6.38.1/drivers/ata/pata_pdc2027x.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_pdc2027x.c 2011-03-21 18:31:35.000000000 -0400
@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21832,9 +21832,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_pdc2027x.c linux-2.6.38-new/drivers/ata
.inherits = &pdc2027x_pata100_ops,
.mode_filter = pdc2027x_mode_filter,
.set_piomode = pdc2027x_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_pdc202xx_old.c linux-2.6.38-new/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.38/drivers/ata/pata_pdc202xx_old.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_pdc202xx_old.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_pdc202xx_old.c linux-2.6.38.1/drivers/ata/pata_pdc202xx_old.c
+--- linux-2.6.38.1/drivers/ata/pata_pdc202xx_old.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_pdc202xx_old.c 2011-03-21 18:31:35.000000000 -0400
@@ -295,7 +295,7 @@ static struct scsi_host_template pdc202x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21853,9 +21853,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_pdc202xx_old.c linux-2.6.38-new/drivers
.inherits = &pdc2024x_port_ops,
.check_atapi_dma = pdc2026x_check_atapi_dma,
-diff -urNp linux-2.6.38/drivers/ata/pata_piccolo.c linux-2.6.38-new/drivers/ata/pata_piccolo.c
---- linux-2.6.38/drivers/ata/pata_piccolo.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_piccolo.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_piccolo.c linux-2.6.38.1/drivers/ata/pata_piccolo.c
+--- linux-2.6.38.1/drivers/ata/pata_piccolo.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_piccolo.c 2011-03-21 18:31:35.000000000 -0400
@@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21865,9 +21865,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_piccolo.c linux-2.6.38-new/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_unknown,
.set_piomode = tosh_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_platform.c linux-2.6.38-new/drivers/ata/pata_platform.c
---- linux-2.6.38/drivers/ata/pata_platform.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_platform.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_platform.c linux-2.6.38.1/drivers/ata/pata_platform.c
+--- linux-2.6.38.1/drivers/ata/pata_platform.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_platform.c 2011-03-21 18:31:35.000000000 -0400
@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
ATA_PIO_SHT(DRV_NAME),
};
@@ -21877,9 +21877,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_platform.c linux-2.6.38-new/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.38/drivers/ata/pata_pxa.c linux-2.6.38-new/drivers/ata/pata_pxa.c
---- linux-2.6.38/drivers/ata/pata_pxa.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_pxa.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_pxa.c linux-2.6.38.1/drivers/ata/pata_pxa.c
+--- linux-2.6.38.1/drivers/ata/pata_pxa.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_pxa.c 2011-03-21 18:31:35.000000000 -0400
@@ -198,7 +198,7 @@ static struct scsi_host_template pxa_ata
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21889,9 +21889,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_pxa.c linux-2.6.38-new/drivers/ata/pata
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.38/drivers/ata/pata_qdi.c linux-2.6.38-new/drivers/ata/pata_qdi.c
---- linux-2.6.38/drivers/ata/pata_qdi.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_qdi.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_qdi.c linux-2.6.38.1/drivers/ata/pata_qdi.c
+--- linux-2.6.38.1/drivers/ata/pata_qdi.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_qdi.c 2011-03-21 18:31:35.000000000 -0400
@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
ATA_PIO_SHT(DRV_NAME),
};
@@ -21910,9 +21910,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_qdi.c linux-2.6.38-new/drivers/ata/pata
.inherits = &qdi6500_port_ops,
.set_piomode = qdi6580_set_piomode,
};
-diff -urNp linux-2.6.38/drivers/ata/pata_radisys.c linux-2.6.38-new/drivers/ata/pata_radisys.c
---- linux-2.6.38/drivers/ata/pata_radisys.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_radisys.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_radisys.c linux-2.6.38.1/drivers/ata/pata_radisys.c
+--- linux-2.6.38.1/drivers/ata/pata_radisys.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_radisys.c 2011-03-21 18:31:35.000000000 -0400
@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21922,9 +21922,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_radisys.c linux-2.6.38-new/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.qc_issue = radisys_qc_issue,
.cable_detect = ata_cable_unknown,
-diff -urNp linux-2.6.38/drivers/ata/pata_rb532_cf.c linux-2.6.38-new/drivers/ata/pata_rb532_cf.c
---- linux-2.6.38/drivers/ata/pata_rb532_cf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_rb532_cf.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_rb532_cf.c linux-2.6.38.1/drivers/ata/pata_rb532_cf.c
+--- linux-2.6.38.1/drivers/ata/pata_rb532_cf.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_rb532_cf.c 2011-03-21 18:31:35.000000000 -0400
@@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handle
return IRQ_HANDLED;
}
@@ -21934,9 +21934,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_rb532_cf.c linux-2.6.38-new/drivers/ata
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ata_sff_data_xfer32,
};
-diff -urNp linux-2.6.38/drivers/ata/pata_rdc.c linux-2.6.38-new/drivers/ata/pata_rdc.c
---- linux-2.6.38/drivers/ata/pata_rdc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_rdc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_rdc.c linux-2.6.38.1/drivers/ata/pata_rdc.c
+--- linux-2.6.38.1/drivers/ata/pata_rdc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_rdc.c 2011-03-21 18:31:35.000000000 -0400
@@ -273,7 +273,7 @@ static void rdc_set_dmamode(struct ata_p
pci_write_config_byte(dev, 0x48, udma_enable);
}
@@ -21946,9 +21946,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_rdc.c linux-2.6.38-new/drivers/ata/pata
.inherits = &ata_bmdma32_port_ops,
.cable_detect = rdc_pata_cable_detect,
.set_piomode = rdc_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_rz1000.c linux-2.6.38-new/drivers/ata/pata_rz1000.c
---- linux-2.6.38/drivers/ata/pata_rz1000.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_rz1000.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_rz1000.c linux-2.6.38.1/drivers/ata/pata_rz1000.c
+--- linux-2.6.38.1/drivers/ata/pata_rz1000.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_rz1000.c 2011-03-21 18:31:35.000000000 -0400
@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21958,9 +21958,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_rz1000.c linux-2.6.38-new/drivers/ata/p
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_mode = rz1000_set_mode,
-diff -urNp linux-2.6.38/drivers/ata/pata_samsung_cf.c linux-2.6.38-new/drivers/ata/pata_samsung_cf.c
---- linux-2.6.38/drivers/ata/pata_samsung_cf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_samsung_cf.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_samsung_cf.c linux-2.6.38.1/drivers/ata/pata_samsung_cf.c
+--- linux-2.6.38.1/drivers/ata/pata_samsung_cf.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_samsung_cf.c 2011-03-21 18:31:35.000000000 -0400
@@ -399,7 +399,7 @@ static struct scsi_host_template pata_s3
ATA_PIO_SHT(DRV_NAME),
};
@@ -21979,9 +21979,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_samsung_cf.c linux-2.6.38-new/drivers/a
.inherits = &ata_sff_port_ops,
.set_piomode = pata_s3c_set_piomode,
};
-diff -urNp linux-2.6.38/drivers/ata/pata_sc1200.c linux-2.6.38-new/drivers/ata/pata_sc1200.c
---- linux-2.6.38/drivers/ata/pata_sc1200.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_sc1200.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_sc1200.c linux-2.6.38.1/drivers/ata/pata_sc1200.c
+--- linux-2.6.38.1/drivers/ata/pata_sc1200.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_sc1200.c 2011-03-21 18:31:35.000000000 -0400
@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21991,9 +21991,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_sc1200.c linux-2.6.38-new/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_bmdma_dumb_qc_prep,
.qc_issue = sc1200_qc_issue,
-diff -urNp linux-2.6.38/drivers/ata/pata_scc.c linux-2.6.38-new/drivers/ata/pata_scc.c
---- linux-2.6.38/drivers/ata/pata_scc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_scc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_scc.c linux-2.6.38.1/drivers/ata/pata_scc.c
+--- linux-2.6.38.1/drivers/ata/pata_scc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_scc.c 2011-03-21 18:31:35.000000000 -0400
@@ -926,7 +926,7 @@ static struct scsi_host_template scc_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22003,9 +22003,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_scc.c linux-2.6.38-new/drivers/ata/pata
.inherits = &ata_bmdma_port_ops,
.set_piomode = scc_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_sch.c linux-2.6.38-new/drivers/ata/pata_sch.c
---- linux-2.6.38/drivers/ata/pata_sch.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_sch.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_sch.c linux-2.6.38.1/drivers/ata/pata_sch.c
+--- linux-2.6.38.1/drivers/ata/pata_sch.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_sch.c 2011-03-21 18:31:35.000000000 -0400
@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22015,9 +22015,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_sch.c linux-2.6.38-new/drivers/ata/pata
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_unknown,
.set_piomode = sch_set_piomode,
-diff -urNp linux-2.6.38/drivers/ata/pata_serverworks.c linux-2.6.38-new/drivers/ata/pata_serverworks.c
---- linux-2.6.38/drivers/ata/pata_serverworks.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_serverworks.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_serverworks.c linux-2.6.38.1/drivers/ata/pata_serverworks.c
+--- linux-2.6.38.1/drivers/ata/pata_serverworks.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_serverworks.c 2011-03-21 18:31:35.000000000 -0400
@@ -300,7 +300,7 @@ static struct scsi_host_template serverw
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22036,9 +22036,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_serverworks.c linux-2.6.38-new/drivers/
.inherits = &serverworks_osb4_port_ops,
.mode_filter = serverworks_csb_filter,
};
-diff -urNp linux-2.6.38/drivers/ata/pata_sil680.c linux-2.6.38-new/drivers/ata/pata_sil680.c
---- linux-2.6.38/drivers/ata/pata_sil680.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_sil680.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_sil680.c linux-2.6.38.1/drivers/ata/pata_sil680.c
+--- linux-2.6.38.1/drivers/ata/pata_sil680.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_sil680.c 2011-03-21 18:31:35.000000000 -0400
@@ -225,8 +225,7 @@ static struct scsi_host_template sil680_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22049,9 +22049,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_sil680.c linux-2.6.38-new/drivers/ata/p
.inherits = &ata_bmdma32_port_ops,
.sff_exec_command = sil680_sff_exec_command,
.sff_irq_check = sil680_sff_irq_check,
-diff -urNp linux-2.6.38/drivers/ata/pata_sis.c linux-2.6.38-new/drivers/ata/pata_sis.c
---- linux-2.6.38/drivers/ata/pata_sis.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_sis.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_sis.c linux-2.6.38.1/drivers/ata/pata_sis.c
+--- linux-2.6.38.1/drivers/ata/pata_sis.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_sis.c 2011-03-21 18:31:35.000000000 -0400
@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22107,9 +22107,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_sis.c linux-2.6.38-new/drivers/ata/pata
.inherits = &sis_base_ops,
.set_piomode = sis_old_set_piomode,
.set_dmamode = sis_old_set_dmamode,
-diff -urNp linux-2.6.38/drivers/ata/pata_sl82c105.c linux-2.6.38-new/drivers/ata/pata_sl82c105.c
---- linux-2.6.38/drivers/ata/pata_sl82c105.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_sl82c105.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_sl82c105.c linux-2.6.38.1/drivers/ata/pata_sl82c105.c
+--- linux-2.6.38.1/drivers/ata/pata_sl82c105.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_sl82c105.c 2011-03-21 18:31:35.000000000 -0400
@@ -241,7 +241,7 @@ static struct scsi_host_template sl82c10
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22119,9 +22119,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_sl82c105.c linux-2.6.38-new/drivers/ata
.inherits = &ata_bmdma_port_ops,
.qc_defer = sl82c105_qc_defer,
.bmdma_start = sl82c105_bmdma_start,
-diff -urNp linux-2.6.38/drivers/ata/pata_triflex.c linux-2.6.38-new/drivers/ata/pata_triflex.c
---- linux-2.6.38/drivers/ata/pata_triflex.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_triflex.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_triflex.c linux-2.6.38.1/drivers/ata/pata_triflex.c
+--- linux-2.6.38.1/drivers/ata/pata_triflex.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_triflex.c 2011-03-21 18:31:35.000000000 -0400
@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22131,9 +22131,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_triflex.c linux-2.6.38-new/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.bmdma_start = triflex_bmdma_start,
.bmdma_stop = triflex_bmdma_stop,
-diff -urNp linux-2.6.38/drivers/ata/pata_via.c linux-2.6.38-new/drivers/ata/pata_via.c
---- linux-2.6.38/drivers/ata/pata_via.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pata_via.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pata_via.c linux-2.6.38.1/drivers/ata/pata_via.c
+--- linux-2.6.38.1/drivers/ata/pata_via.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pata_via.c 2011-03-21 18:31:35.000000000 -0400
@@ -441,7 +441,7 @@ static struct scsi_host_template via_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22152,9 +22152,9 @@ diff -urNp linux-2.6.38/drivers/ata/pata_via.c linux-2.6.38-new/drivers/ata/pata
.inherits = &via_port_ops,
.sff_data_xfer = ata_sff_data_xfer_noirq,
};
-diff -urNp linux-2.6.38/drivers/ata/pdc_adma.c linux-2.6.38-new/drivers/ata/pdc_adma.c
---- linux-2.6.38/drivers/ata/pdc_adma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/pdc_adma.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/pdc_adma.c linux-2.6.38.1/drivers/ata/pdc_adma.c
+--- linux-2.6.38.1/drivers/ata/pdc_adma.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/pdc_adma.c 2011-03-21 18:31:35.000000000 -0400
@@ -146,7 +146,7 @@ static struct scsi_host_template adma_at
.dma_boundary = ADMA_DMA_BOUNDARY,
};
@@ -22164,9 +22164,9 @@ diff -urNp linux-2.6.38/drivers/ata/pdc_adma.c linux-2.6.38-new/drivers/ata/pdc_
.inherits = &ata_sff_port_ops,
.lost_interrupt = ATA_OP_NULL,
-diff -urNp linux-2.6.38/drivers/ata/sata_dwc_460ex.c linux-2.6.38-new/drivers/ata/sata_dwc_460ex.c
---- linux-2.6.38/drivers/ata/sata_dwc_460ex.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/sata_dwc_460ex.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/sata_dwc_460ex.c linux-2.6.38.1/drivers/ata/sata_dwc_460ex.c
+--- linux-2.6.38.1/drivers/ata/sata_dwc_460ex.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/sata_dwc_460ex.c 2011-03-21 18:31:35.000000000 -0400
@@ -1560,7 +1560,7 @@ static struct scsi_host_template sata_dw
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -22176,9 +22176,9 @@ diff -urNp linux-2.6.38/drivers/ata/sata_dwc_460ex.c linux-2.6.38-new/drivers/at
.inherits = &ata_sff_port_ops,
.error_handler = sata_dwc_error_handler,
-diff -urNp linux-2.6.38/drivers/ata/sata_fsl.c linux-2.6.38-new/drivers/ata/sata_fsl.c
---- linux-2.6.38/drivers/ata/sata_fsl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/sata_fsl.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/sata_fsl.c linux-2.6.38.1/drivers/ata/sata_fsl.c
+--- linux-2.6.38.1/drivers/ata/sata_fsl.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/sata_fsl.c 2011-03-21 18:31:35.000000000 -0400
@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -22188,9 +22188,9 @@ diff -urNp linux-2.6.38/drivers/ata/sata_fsl.c linux-2.6.38-new/drivers/ata/sata
.inherits = &sata_pmp_port_ops,
.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.38/drivers/ata/sata_inic162x.c linux-2.6.38-new/drivers/ata/sata_inic162x.c
---- linux-2.6.38/drivers/ata/sata_inic162x.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/sata_inic162x.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/sata_inic162x.c linux-2.6.38.1/drivers/ata/sata_inic162x.c
+--- linux-2.6.38.1/drivers/ata/sata_inic162x.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/sata_inic162x.c 2011-03-21 18:31:35.000000000 -0400
@@ -705,7 +705,7 @@ static int inic_port_start(struct ata_po
return 0;
}
@@ -22200,9 +22200,9 @@ diff -urNp linux-2.6.38/drivers/ata/sata_inic162x.c linux-2.6.38-new/drivers/ata
.inherits = &sata_port_ops,
.check_atapi_dma = inic_check_atapi_dma,
-diff -urNp linux-2.6.38/drivers/ata/sata_mv.c linux-2.6.38-new/drivers/ata/sata_mv.c
---- linux-2.6.38/drivers/ata/sata_mv.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/sata_mv.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/sata_mv.c linux-2.6.38.1/drivers/ata/sata_mv.c
+--- linux-2.6.38.1/drivers/ata/sata_mv.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/sata_mv.c 2011-03-21 18:31:35.000000000 -0400
@@ -663,7 +663,7 @@ static struct scsi_host_template mv6_sht
.dma_boundary = MV_DMA_BOUNDARY,
};
@@ -22230,9 +22230,9 @@ diff -urNp linux-2.6.38/drivers/ata/sata_mv.c linux-2.6.38-new/drivers/ata/sata_
.inherits = &mv6_ops,
.dev_config = ATA_OP_NULL,
.qc_prep = mv_qc_prep_iie,
-diff -urNp linux-2.6.38/drivers/ata/sata_nv.c linux-2.6.38-new/drivers/ata/sata_nv.c
---- linux-2.6.38/drivers/ata/sata_nv.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/sata_nv.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/sata_nv.c linux-2.6.38.1/drivers/ata/sata_nv.c
+--- linux-2.6.38.1/drivers/ata/sata_nv.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/sata_nv.c 2011-03-21 18:31:35.000000000 -0400
@@ -465,7 +465,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.
@@ -22275,9 +22275,9 @@ diff -urNp linux-2.6.38/drivers/ata/sata_nv.c linux-2.6.38-new/drivers/ata/sata_
.inherits = &nv_generic_ops,
.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.38/drivers/ata/sata_promise.c linux-2.6.38-new/drivers/ata/sata_promise.c
---- linux-2.6.38/drivers/ata/sata_promise.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/sata_promise.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/sata_promise.c linux-2.6.38.1/drivers/ata/sata_promise.c
+--- linux-2.6.38.1/drivers/ata/sata_promise.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/sata_promise.c 2011-03-21 18:31:35.000000000 -0400
@@ -196,7 +196,7 @@ static const struct ata_port_operations
.error_handler = pdc_error_handler,
};
@@ -22304,9 +22304,9 @@ diff -urNp linux-2.6.38/drivers/ata/sata_promise.c linux-2.6.38-new/drivers/ata/
.inherits = &pdc_common_ops,
.cable_detect = pdc_pata_cable_detect,
.freeze = pdc_freeze,
-diff -urNp linux-2.6.38/drivers/ata/sata_qstor.c linux-2.6.38-new/drivers/ata/sata_qstor.c
---- linux-2.6.38/drivers/ata/sata_qstor.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/sata_qstor.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/sata_qstor.c linux-2.6.38.1/drivers/ata/sata_qstor.c
+--- linux-2.6.38.1/drivers/ata/sata_qstor.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/sata_qstor.c 2011-03-21 18:31:35.000000000 -0400
@@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_
.dma_boundary = QS_DMA_BOUNDARY,
};
@@ -22316,9 +22316,9 @@ diff -urNp linux-2.6.38/drivers/ata/sata_qstor.c linux-2.6.38-new/drivers/ata/sa
.inherits = &ata_sff_port_ops,
.check_atapi_dma = qs_check_atapi_dma,
-diff -urNp linux-2.6.38/drivers/ata/sata_sil24.c linux-2.6.38-new/drivers/ata/sata_sil24.c
---- linux-2.6.38/drivers/ata/sata_sil24.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/sata_sil24.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/sata_sil24.c linux-2.6.38.1/drivers/ata/sata_sil24.c
+--- linux-2.6.38.1/drivers/ata/sata_sil24.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/sata_sil24.c 2011-03-21 18:31:35.000000000 -0400
@@ -389,7 +389,7 @@ static struct scsi_host_template sil24_s
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -22328,9 +22328,9 @@ diff -urNp linux-2.6.38/drivers/ata/sata_sil24.c linux-2.6.38-new/drivers/ata/sa
.inherits = &sata_pmp_port_ops,
.qc_defer = sil24_qc_defer,
-diff -urNp linux-2.6.38/drivers/ata/sata_sil.c linux-2.6.38-new/drivers/ata/sata_sil.c
---- linux-2.6.38/drivers/ata/sata_sil.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/sata_sil.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/sata_sil.c linux-2.6.38.1/drivers/ata/sata_sil.c
+--- linux-2.6.38.1/drivers/ata/sata_sil.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/sata_sil.c 2011-03-21 18:31:35.000000000 -0400
@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
.sg_tablesize = ATA_MAX_PRD
};
@@ -22340,9 +22340,9 @@ diff -urNp linux-2.6.38/drivers/ata/sata_sil.c linux-2.6.38-new/drivers/ata/sata
.inherits = &ata_bmdma32_port_ops,
.dev_config = sil_dev_config,
.set_mode = sil_set_mode,
-diff -urNp linux-2.6.38/drivers/ata/sata_sis.c linux-2.6.38-new/drivers/ata/sata_sis.c
---- linux-2.6.38/drivers/ata/sata_sis.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/sata_sis.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/sata_sis.c linux-2.6.38.1/drivers/ata/sata_sis.c
+--- linux-2.6.38.1/drivers/ata/sata_sis.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/sata_sis.c 2011-03-21 18:31:35.000000000 -0400
@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22352,9 +22352,9 @@ diff -urNp linux-2.6.38/drivers/ata/sata_sis.c linux-2.6.38-new/drivers/ata/sata
.inherits = &ata_bmdma_port_ops,
.scr_read = sis_scr_read,
.scr_write = sis_scr_write,
-diff -urNp linux-2.6.38/drivers/ata/sata_svw.c linux-2.6.38-new/drivers/ata/sata_svw.c
---- linux-2.6.38/drivers/ata/sata_svw.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/sata_svw.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/sata_svw.c linux-2.6.38.1/drivers/ata/sata_svw.c
+--- linux-2.6.38.1/drivers/ata/sata_svw.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/sata_svw.c 2011-03-21 18:31:35.000000000 -0400
@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
};
@@ -22364,9 +22364,9 @@ diff -urNp linux-2.6.38/drivers/ata/sata_svw.c linux-2.6.38-new/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.38/drivers/ata/sata_sx4.c linux-2.6.38-new/drivers/ata/sata_sx4.c
---- linux-2.6.38/drivers/ata/sata_sx4.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/sata_sx4.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/sata_sx4.c linux-2.6.38.1/drivers/ata/sata_sx4.c
+--- linux-2.6.38.1/drivers/ata/sata_sx4.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/sata_sx4.c 2011-03-21 18:31:35.000000000 -0400
@@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sat
};
@@ -22376,9 +22376,9 @@ diff -urNp linux-2.6.38/drivers/ata/sata_sx4.c linux-2.6.38-new/drivers/ata/sata
.inherits = &ata_sff_port_ops,
.check_atapi_dma = pdc_check_atapi_dma,
-diff -urNp linux-2.6.38/drivers/ata/sata_uli.c linux-2.6.38-new/drivers/ata/sata_uli.c
---- linux-2.6.38/drivers/ata/sata_uli.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/sata_uli.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/sata_uli.c linux-2.6.38.1/drivers/ata/sata_uli.c
+--- linux-2.6.38.1/drivers/ata/sata_uli.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/sata_uli.c 2011-03-21 18:31:35.000000000 -0400
@@ -80,7 +80,7 @@ static struct scsi_host_template uli_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22388,9 +22388,9 @@ diff -urNp linux-2.6.38/drivers/ata/sata_uli.c linux-2.6.38-new/drivers/ata/sata
.inherits = &ata_bmdma_port_ops,
.scr_read = uli_scr_read,
.scr_write = uli_scr_write,
-diff -urNp linux-2.6.38/drivers/ata/sata_via.c linux-2.6.38-new/drivers/ata/sata_via.c
---- linux-2.6.38/drivers/ata/sata_via.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/sata_via.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/sata_via.c linux-2.6.38.1/drivers/ata/sata_via.c
+--- linux-2.6.38.1/drivers/ata/sata_via.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/sata_via.c 2011-03-21 18:31:35.000000000 -0400
@@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22429,9 +22429,9 @@ diff -urNp linux-2.6.38/drivers/ata/sata_via.c linux-2.6.38-new/drivers/ata/sata
.inherits = &svia_base_ops,
.hardreset = sata_std_hardreset,
.scr_read = vt8251_scr_read,
-diff -urNp linux-2.6.38/drivers/ata/sata_vsc.c linux-2.6.38-new/drivers/ata/sata_vsc.c
---- linux-2.6.38/drivers/ata/sata_vsc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ata/sata_vsc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ata/sata_vsc.c linux-2.6.38.1/drivers/ata/sata_vsc.c
+--- linux-2.6.38.1/drivers/ata/sata_vsc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ata/sata_vsc.c 2011-03-21 18:31:35.000000000 -0400
@@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sat
};
@@ -22441,9 +22441,9 @@ diff -urNp linux-2.6.38/drivers/ata/sata_vsc.c linux-2.6.38-new/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.38/drivers/atm/adummy.c linux-2.6.38-new/drivers/atm/adummy.c
---- linux-2.6.38/drivers/atm/adummy.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/adummy.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/adummy.c linux-2.6.38.1/drivers/atm/adummy.c
+--- linux-2.6.38.1/drivers/atm/adummy.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/adummy.c 2011-03-21 18:31:35.000000000 -0400
@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct
vcc->pop(vcc, skb);
else
@@ -22453,9 +22453,9 @@ diff -urNp linux-2.6.38/drivers/atm/adummy.c linux-2.6.38-new/drivers/atm/adummy
return 0;
}
-diff -urNp linux-2.6.38/drivers/atm/ambassador.c linux-2.6.38-new/drivers/atm/ambassador.c
---- linux-2.6.38/drivers/atm/ambassador.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/ambassador.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/ambassador.c linux-2.6.38.1/drivers/atm/ambassador.c
+--- linux-2.6.38.1/drivers/atm/ambassador.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/ambassador.c 2011-03-21 18:31:35.000000000 -0400
@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev,
PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
@@ -22492,9 +22492,9 @@ diff -urNp linux-2.6.38/drivers/atm/ambassador.c linux-2.6.38-new/drivers/atm/am
return -ENOMEM; // ?
}
-diff -urNp linux-2.6.38/drivers/atm/atmtcp.c linux-2.6.38-new/drivers/atm/atmtcp.c
---- linux-2.6.38/drivers/atm/atmtcp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/atmtcp.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/atmtcp.c linux-2.6.38.1/drivers/atm/atmtcp.c
+--- linux-2.6.38.1/drivers/atm/atmtcp.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/atmtcp.c 2011-03-21 18:31:35.000000000 -0400
@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
@@ -22544,9 +22544,9 @@ diff -urNp linux-2.6.38/drivers/atm/atmtcp.c linux-2.6.38-new/drivers/atm/atmtcp
done:
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
-diff -urNp linux-2.6.38/drivers/atm/eni.c linux-2.6.38-new/drivers/atm/eni.c
---- linux-2.6.38/drivers/atm/eni.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/eni.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/eni.c linux-2.6.38.1/drivers/atm/eni.c
+--- linux-2.6.38.1/drivers/atm/eni.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/eni.c 2011-03-21 18:31:35.000000000 -0400
@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
vcc->dev->number);
@@ -22592,9 +22592,9 @@ diff -urNp linux-2.6.38/drivers/atm/eni.c linux-2.6.38-new/drivers/atm/eni.c
wake_up(&eni_dev->tx_wait);
dma_complete++;
}
-diff -urNp linux-2.6.38/drivers/atm/firestream.c linux-2.6.38-new/drivers/atm/firestream.c
---- linux-2.6.38/drivers/atm/firestream.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/firestream.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/firestream.c linux-2.6.38.1/drivers/atm/firestream.c
+--- linux-2.6.38.1/drivers/atm/firestream.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/firestream.c 2011-03-21 18:31:35.000000000 -0400
@@ -749,7 +749,7 @@ static void process_txdone_queue (struct
}
}
@@ -22628,9 +22628,9 @@ diff -urNp linux-2.6.38/drivers/atm/firestream.c linux-2.6.38-new/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.38/drivers/atm/fore200e.c linux-2.6.38-new/drivers/atm/fore200e.c
---- linux-2.6.38/drivers/atm/fore200e.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/fore200e.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/fore200e.c linux-2.6.38.1/drivers/atm/fore200e.c
+--- linux-2.6.38.1/drivers/atm/fore200e.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/fore200e.c 2011-03-21 18:31:35.000000000 -0400
@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
#endif
/* check error condition */
@@ -22687,9 +22687,9 @@ diff -urNp linux-2.6.38/drivers/atm/fore200e.c linux-2.6.38-new/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.38/drivers/atm/he.c linux-2.6.38-new/drivers/atm/he.c
---- linux-2.6.38/drivers/atm/he.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/he.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/he.c linux-2.6.38.1/drivers/atm/he.c
+--- linux-2.6.38.1/drivers/atm/he.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/he.c 2011-03-21 18:31:35.000000000 -0400
@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -22771,9 +22771,9 @@ diff -urNp linux-2.6.38/drivers/atm/he.c linux-2.6.38-new/drivers/atm/he.c
return 0;
}
-diff -urNp linux-2.6.38/drivers/atm/horizon.c linux-2.6.38-new/drivers/atm/horizon.c
---- linux-2.6.38/drivers/atm/horizon.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/horizon.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/horizon.c linux-2.6.38.1/drivers/atm/horizon.c
+--- linux-2.6.38.1/drivers/atm/horizon.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/horizon.c 2011-03-21 18:31:35.000000000 -0400
@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev,
{
struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -22792,9 +22792,9 @@ diff -urNp linux-2.6.38/drivers/atm/horizon.c linux-2.6.38-new/drivers/atm/horiz
// free the skb
hrz_kfree_skb (skb);
-diff -urNp linux-2.6.38/drivers/atm/idt77252.c linux-2.6.38-new/drivers/atm/idt77252.c
---- linux-2.6.38/drivers/atm/idt77252.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/idt77252.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/idt77252.c linux-2.6.38.1/drivers/atm/idt77252.c
+--- linux-2.6.38.1/drivers/atm/idt77252.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/idt77252.c 2011-03-21 18:31:35.000000000 -0400
@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str
else
dev_kfree_skb(skb);
@@ -22949,9 +22949,9 @@ diff -urNp linux-2.6.38/drivers/atm/idt77252.c linux-2.6.38-new/drivers/atm/idt7
return -ENOMEM;
}
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-2.6.38/drivers/atm/iphase.c linux-2.6.38-new/drivers/atm/iphase.c
---- linux-2.6.38/drivers/atm/iphase.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/iphase.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/iphase.c linux-2.6.38.1/drivers/atm/iphase.c
+--- linux-2.6.38.1/drivers/atm/iphase.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/iphase.c 2011-03-21 18:31:35.000000000 -0400
@@ -1124,7 +1124,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))
@@ -23048,9 +23048,9 @@ diff -urNp linux-2.6.38/drivers/atm/iphase.c linux-2.6.38-new/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.38/drivers/atm/lanai.c linux-2.6.38-new/drivers/atm/lanai.c
---- linux-2.6.38/drivers/atm/lanai.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/lanai.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/lanai.c linux-2.6.38.1/drivers/atm/lanai.c
+--- linux-2.6.38.1/drivers/atm/lanai.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/lanai.c 2011-03-21 18:31:35.000000000 -0400
@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l
vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
lanai_endtx(lanai, lvcc);
@@ -23105,9 +23105,9 @@ diff -urNp linux-2.6.38/drivers/atm/lanai.c linux-2.6.38-new/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.38/drivers/atm/nicstar.c linux-2.6.38-new/drivers/atm/nicstar.c
---- linux-2.6.38/drivers/atm/nicstar.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/nicstar.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/nicstar.c linux-2.6.38.1/drivers/atm/nicstar.c
+--- linux-2.6.38.1/drivers/atm/nicstar.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/nicstar.c 2011-03-21 18:31:35.000000000 -0400
@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc,
if ((vc = (vc_map *) vcc->dev_data) == NULL) {
printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
@@ -23309,9 +23309,9 @@ diff -urNp linux-2.6.38/drivers/atm/nicstar.c linux-2.6.38-new/drivers/atm/nicst
}
}
-diff -urNp linux-2.6.38/drivers/atm/solos-pci.c linux-2.6.38-new/drivers/atm/solos-pci.c
---- linux-2.6.38/drivers/atm/solos-pci.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/solos-pci.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/solos-pci.c linux-2.6.38.1/drivers/atm/solos-pci.c
+--- linux-2.6.38.1/drivers/atm/solos-pci.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/solos-pci.c 2011-03-21 18:31:35.000000000 -0400
@@ -717,7 +717,7 @@ void solos_bh(unsigned long card_arg)
}
atm_charge(vcc, skb->truesize);
@@ -23330,9 +23330,9 @@ diff -urNp linux-2.6.38/drivers/atm/solos-pci.c linux-2.6.38-new/drivers/atm/sol
solos_pop(vcc, oldskb);
} else
dev_kfree_skb_irq(oldskb);
-diff -urNp linux-2.6.38/drivers/atm/suni.c linux-2.6.38-new/drivers/atm/suni.c
---- linux-2.6.38/drivers/atm/suni.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/suni.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/suni.c linux-2.6.38.1/drivers/atm/suni.c
+--- linux-2.6.38.1/drivers/atm/suni.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/suni.c 2011-03-21 18:31:35.000000000 -0400
@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
@@ -23344,9 +23344,9 @@ diff -urNp linux-2.6.38/drivers/atm/suni.c linux-2.6.38-new/drivers/atm/suni.c
static void suni_hz(unsigned long from_timer)
-diff -urNp linux-2.6.38/drivers/atm/uPD98402.c linux-2.6.38-new/drivers/atm/uPD98402.c
---- linux-2.6.38/drivers/atm/uPD98402.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/uPD98402.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/uPD98402.c linux-2.6.38.1/drivers/atm/uPD98402.c
+--- linux-2.6.38.1/drivers/atm/uPD98402.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/uPD98402.c 2011-03-21 18:31:35.000000000 -0400
@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
struct sonet_stats tmp;
int error = 0;
@@ -23391,9 +23391,9 @@ diff -urNp linux-2.6.38/drivers/atm/uPD98402.c linux-2.6.38-new/drivers/atm/uPD9
return 0;
}
-diff -urNp linux-2.6.38/drivers/atm/zatm.c linux-2.6.38-new/drivers/atm/zatm.c
---- linux-2.6.38/drivers/atm/zatm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/atm/zatm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/atm/zatm.c linux-2.6.38.1/drivers/atm/zatm.c
+--- linux-2.6.38.1/drivers/atm/zatm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/atm/zatm.c 2011-03-21 18:31:35.000000000 -0400
@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
}
if (!size) {
@@ -23421,9 +23421,9 @@ diff -urNp linux-2.6.38/drivers/atm/zatm.c linux-2.6.38-new/drivers/atm/zatm.c
wake_up(&zatm_vcc->tx_wait);
}
-diff -urNp linux-2.6.38/drivers/block/cciss.c linux-2.6.38-new/drivers/block/cciss.c
---- linux-2.6.38/drivers/block/cciss.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/block/cciss.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/block/cciss.c linux-2.6.38.1/drivers/block/cciss.c
+--- linux-2.6.38.1/drivers/block/cciss.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/block/cciss.c 2011-03-21 18:31:35.000000000 -0400
@@ -1112,6 +1112,8 @@ static int cciss_ioctl32_passthru(struct
int err;
u32 cp;
@@ -23433,9 +23433,9 @@ diff -urNp linux-2.6.38/drivers/block/cciss.c linux-2.6.38-new/drivers/block/cci
err = 0;
err |=
copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
-diff -urNp linux-2.6.38/drivers/char/agp/frontend.c linux-2.6.38-new/drivers/char/agp/frontend.c
---- linux-2.6.38/drivers/char/agp/frontend.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/char/agp/frontend.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/char/agp/frontend.c linux-2.6.38.1/drivers/char/agp/frontend.c
+--- linux-2.6.38.1/drivers/char/agp/frontend.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/char/agp/frontend.c 2011-03-21 18:31:35.000000000 -0400
@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag
if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
return -EFAULT;
@@ -23445,9 +23445,9 @@ diff -urNp linux-2.6.38/drivers/char/agp/frontend.c linux-2.6.38-new/drivers/cha
return -EFAULT;
client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-2.6.38/drivers/char/agp/intel-agp.c linux-2.6.38-new/drivers/char/agp/intel-agp.c
---- linux-2.6.38/drivers/char/agp/intel-agp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/char/agp/intel-agp.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/char/agp/intel-agp.c linux-2.6.38.1/drivers/char/agp/intel-agp.c
+--- linux-2.6.38.1/drivers/char/agp/intel-agp.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/char/agp/intel-agp.c 2011-03-21 18:31:35.000000000 -0400
@@ -903,7 +903,7 @@ static struct pci_device_id agp_intel_pc
ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB),
ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB),
@@ -23457,9 +23457,9 @@ diff -urNp linux-2.6.38/drivers/char/agp/intel-agp.c linux-2.6.38-new/drivers/ch
};
MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
-diff -urNp linux-2.6.38/drivers/char/hpet.c linux-2.6.38-new/drivers/char/hpet.c
---- linux-2.6.38/drivers/char/hpet.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/char/hpet.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/char/hpet.c linux-2.6.38.1/drivers/char/hpet.c
+--- linux-2.6.38.1/drivers/char/hpet.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/char/hpet.c 2011-03-21 18:31:35.000000000 -0400
@@ -553,7 +553,7 @@ static inline unsigned long hpet_time_di
}
@@ -23478,9 +23478,9 @@ diff -urNp linux-2.6.38/drivers/char/hpet.c linux-2.6.38-new/drivers/char/hpet.c
static int __init hpet_init(void)
{
-diff -urNp linux-2.6.38/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.38-new/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.38/drivers/char/ipmi/ipmi_msghandler.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/char/ipmi/ipmi_msghandler.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.38.1/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-2.6.38.1/drivers/char/ipmi/ipmi_msghandler.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/char/ipmi/ipmi_msghandler.c 2011-03-21 18:31:35.000000000 -0400
@@ -414,7 +414,7 @@ struct ipmi_smi {
struct proc_dir_entry *proc_dir;
char proc_dir_name[10];
@@ -23511,9 +23511,9 @@ diff -urNp linux-2.6.38/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.38-new/dri
intf->proc_dir = NULL;
-diff -urNp linux-2.6.38/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38-new/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.38/drivers/char/ipmi/ipmi_si_intf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/char/ipmi/ipmi_si_intf.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38.1/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-2.6.38.1/drivers/char/ipmi/ipmi_si_intf.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/char/ipmi/ipmi_si_intf.c 2011-03-21 18:31:35.000000000 -0400
@@ -285,7 +285,7 @@ struct smi_info {
unsigned char slave_addr;
@@ -23544,9 +23544,9 @@ diff -urNp linux-2.6.38/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38-new/driver
new_smi->interrupt_disabled = 1;
atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-2.6.38/drivers/char/mem.c linux-2.6.38-new/drivers/char/mem.c
---- linux-2.6.38/drivers/char/mem.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/char/mem.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/char/mem.c linux-2.6.38.1/drivers/char/mem.c
+--- linux-2.6.38.1/drivers/char/mem.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/char/mem.c 2011-03-21 18:31:35.000000000 -0400
@@ -18,6 +18,7 @@
#include <linux/raw.h>
#include <linux/tty.h>
@@ -23714,9 +23714,9 @@ diff -urNp linux-2.6.38/drivers/char/mem.c linux-2.6.38-new/drivers/char/mem.c
};
static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-2.6.38/drivers/char/nvram.c linux-2.6.38-new/drivers/char/nvram.c
---- linux-2.6.38/drivers/char/nvram.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/char/nvram.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/char/nvram.c linux-2.6.38.1/drivers/char/nvram.c
+--- linux-2.6.38.1/drivers/char/nvram.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/char/nvram.c 2011-03-21 18:31:35.000000000 -0400
@@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f
spin_unlock_irq(&rtc_lock);
@@ -23738,9 +23738,9 @@ diff -urNp linux-2.6.38/drivers/char/nvram.c linux-2.6.38-new/drivers/char/nvram
};
static int __init nvram_init(void)
-diff -urNp linux-2.6.38/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38-new/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.38/drivers/char/pcmcia/ipwireless/tty.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/char/pcmcia/ipwireless/tty.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.1/drivers/char/pcmcia/ipwireless/tty.c
+--- linux-2.6.38.1/drivers/char/pcmcia/ipwireless/tty.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/char/pcmcia/ipwireless/tty.c 2011-03-21 18:31:35.000000000 -0400
@@ -29,6 +29,7 @@
#include <linux/tty_driver.h>
#include <linux/tty_flip.h>
@@ -23863,9 +23863,9 @@ diff -urNp linux-2.6.38/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38-new/dr
do_ipw_close(ttyj);
ipwireless_disassociate_network_ttys(network,
ttyj->channel_idx);
-diff -urNp linux-2.6.38/drivers/char/random.c linux-2.6.38-new/drivers/char/random.c
---- linux-2.6.38/drivers/char/random.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/char/random.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/char/random.c linux-2.6.38.1/drivers/char/random.c
+--- linux-2.6.38.1/drivers/char/random.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/char/random.c 2011-03-21 18:31:35.000000000 -0400
@@ -254,8 +254,13 @@
/*
* Configuration information
@@ -23916,9 +23916,9 @@ diff -urNp linux-2.6.38/drivers/char/random.c linux-2.6.38-new/drivers/char/rand
static int max_write_thresh = INPUT_POOL_WORDS * 32;
static char sysctl_bootid[16];
-diff -urNp linux-2.6.38/drivers/char/sonypi.c linux-2.6.38-new/drivers/char/sonypi.c
---- linux-2.6.38/drivers/char/sonypi.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/char/sonypi.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/char/sonypi.c linux-2.6.38.1/drivers/char/sonypi.c
+--- linux-2.6.38.1/drivers/char/sonypi.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/char/sonypi.c 2011-03-21 18:31:35.000000000 -0400
@@ -55,6 +55,7 @@
#include <asm/uaccess.h>
#include <asm/io.h>
@@ -23957,9 +23957,9 @@ diff -urNp linux-2.6.38/drivers/char/sonypi.c linux-2.6.38-new/drivers/char/sony
mutex_unlock(&sonypi_device.lock);
return 0;
-diff -urNp linux-2.6.38/drivers/char/tpm/tpm_bios.c linux-2.6.38-new/drivers/char/tpm/tpm_bios.c
---- linux-2.6.38/drivers/char/tpm/tpm_bios.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/char/tpm/tpm_bios.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/char/tpm/tpm_bios.c linux-2.6.38.1/drivers/char/tpm/tpm_bios.c
+--- linux-2.6.38.1/drivers/char/tpm/tpm_bios.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/char/tpm/tpm_bios.c 2011-03-21 18:31:35.000000000 -0400
@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
event = addr;
@@ -24000,9 +24000,9 @@ diff -urNp linux-2.6.38/drivers/char/tpm/tpm_bios.c linux-2.6.38-new/drivers/cha
memcpy(log->bios_event_log, virt, len);
-diff -urNp linux-2.6.38/drivers/char/tpm/tpm.c linux-2.6.38-new/drivers/char/tpm/tpm.c
---- linux-2.6.38/drivers/char/tpm/tpm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/char/tpm/tpm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/char/tpm/tpm.c linux-2.6.38.1/drivers/char/tpm/tpm.c
+--- linux-2.6.38.1/drivers/char/tpm/tpm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/char/tpm/tpm.c 2011-03-21 18:31:35.000000000 -0400
@@ -411,7 +411,7 @@ static ssize_t tpm_transmit(struct tpm_c
chip->vendor.req_complete_val)
goto out_recv;
@@ -24012,9 +24012,9 @@ diff -urNp linux-2.6.38/drivers/char/tpm/tpm.c linux-2.6.38-new/drivers/char/tpm
dev_err(chip->dev, "Operation Canceled\n");
rc = -ECANCELED;
goto out;
-diff -urNp linux-2.6.38/drivers/cpuidle/sysfs.c linux-2.6.38-new/drivers/cpuidle/sysfs.c
---- linux-2.6.38/drivers/cpuidle/sysfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/cpuidle/sysfs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/cpuidle/sysfs.c linux-2.6.38.1/drivers/cpuidle/sysfs.c
+--- linux-2.6.38.1/drivers/cpuidle/sysfs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/cpuidle/sysfs.c 2011-03-21 18:31:35.000000000 -0400
@@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpui
.release = cpuidle_state_sysfs_release,
};
@@ -24024,9 +24024,9 @@ diff -urNp linux-2.6.38/drivers/cpuidle/sysfs.c linux-2.6.38-new/drivers/cpuidle
{
kobject_put(&device->kobjs[i]->kobj);
wait_for_completion(&device->kobjs[i]->kobj_unregister);
-diff -urNp linux-2.6.38/drivers/edac/edac_core.h linux-2.6.38-new/drivers/edac/edac_core.h
---- linux-2.6.38/drivers/edac/edac_core.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/edac/edac_core.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/edac/edac_core.h linux-2.6.38.1/drivers/edac/edac_core.h
+--- linux-2.6.38.1/drivers/edac/edac_core.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/edac/edac_core.h 2011-03-21 18:31:35.000000000 -0400
@@ -88,11 +88,11 @@ extern int edac_debug_level;
#else /* !CONFIG_EDAC_DEBUG */
@@ -24044,9 +24044,9 @@ diff -urNp linux-2.6.38/drivers/edac/edac_core.h linux-2.6.38-new/drivers/edac/e
#endif /* !CONFIG_EDAC_DEBUG */
-diff -urNp linux-2.6.38/drivers/edac/edac_mc_sysfs.c linux-2.6.38-new/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.38/drivers/edac/edac_mc_sysfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/edac/edac_mc_sysfs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/edac/edac_mc_sysfs.c linux-2.6.38.1/drivers/edac/edac_mc_sysfs.c
+--- linux-2.6.38.1/drivers/edac/edac_mc_sysfs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/edac/edac_mc_sysfs.c 2011-03-21 18:31:35.000000000 -0400
@@ -761,7 +761,7 @@ static void edac_inst_grp_release(struct
}
@@ -24056,9 +24056,9 @@ diff -urNp linux-2.6.38/drivers/edac/edac_mc_sysfs.c linux-2.6.38-new/drivers/ed
.show = inst_grp_show,
.store = inst_grp_store
};
-diff -urNp linux-2.6.38/drivers/firewire/core-cdev.c linux-2.6.38-new/drivers/firewire/core-cdev.c
---- linux-2.6.38/drivers/firewire/core-cdev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/firewire/core-cdev.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/firewire/core-cdev.c linux-2.6.38.1/drivers/firewire/core-cdev.c
+--- linux-2.6.38.1/drivers/firewire/core-cdev.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/firewire/core-cdev.c 2011-03-21 18:31:35.000000000 -0400
@@ -1329,8 +1329,7 @@ static int init_iso_resource(struct clie
int ret;
@@ -24069,9 +24069,9 @@ diff -urNp linux-2.6.38/drivers/firewire/core-cdev.c linux-2.6.38-new/drivers/fi
return -EINVAL;
r = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-2.6.38/drivers/firmware/dmi_scan.c linux-2.6.38-new/drivers/firmware/dmi_scan.c
---- linux-2.6.38/drivers/firmware/dmi_scan.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/firmware/dmi_scan.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/firmware/dmi_scan.c linux-2.6.38.1/drivers/firmware/dmi_scan.c
+--- linux-2.6.38.1/drivers/firmware/dmi_scan.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/firmware/dmi_scan.c 2011-03-21 18:31:35.000000000 -0400
@@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
}
}
@@ -24084,9 +24084,9 @@ diff -urNp linux-2.6.38/drivers/firmware/dmi_scan.c linux-2.6.38-new/drivers/fir
p = dmi_ioremap(0xF0000, 0x10000);
if (p == NULL)
goto error;
-diff -urNp linux-2.6.38/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38-new/drivers/gpu/drm/drm_crtc_helper.c
---- linux-2.6.38/drivers/gpu/drm/drm_crtc_helper.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/drm_crtc_helper.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38.1/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-2.6.38.1/drivers/gpu/drm/drm_crtc_helper.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/drm_crtc_helper.c 2011-03-21 18:31:35.000000000 -0400
@@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
struct drm_crtc *tmp;
int crtc_mask = 1;
@@ -24096,9 +24096,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38-new/drive
dev = crtc->dev;
-diff -urNp linux-2.6.38/drivers/gpu/drm/drm_drv.c linux-2.6.38-new/drivers/gpu/drm/drm_drv.c
---- linux-2.6.38/drivers/gpu/drm/drm_drv.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/drm_drv.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/drm_drv.c linux-2.6.38.1/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.38.1/drivers/gpu/drm/drm_drv.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/drm_drv.c 2011-03-21 18:31:35.000000000 -0400
@@ -425,7 +425,7 @@ long drm_ioctl(struct file *filp,
dev = file_priv->minor->dev;
@@ -24108,9 +24108,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/drm_drv.c linux-2.6.38-new/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.38/drivers/gpu/drm/drm_fops.c linux-2.6.38-new/drivers/gpu/drm/drm_fops.c
---- linux-2.6.38/drivers/gpu/drm/drm_fops.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/drm_fops.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/drm_fops.c linux-2.6.38.1/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.38.1/drivers/gpu/drm/drm_fops.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/drm_fops.c 2011-03-21 18:31:35.000000000 -0400
@@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
}
@@ -24160,9 +24160,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/drm_fops.c linux-2.6.38-new/drivers/gpu/
if (atomic_read(&dev->ioctl_count)) {
DRM_ERROR("Device busy: %d\n",
atomic_read(&dev->ioctl_count));
-diff -urNp linux-2.6.38/drivers/gpu/drm/drm_global.c linux-2.6.38-new/drivers/gpu/drm/drm_global.c
---- linux-2.6.38/drivers/gpu/drm/drm_global.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/drm_global.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/drm_global.c linux-2.6.38.1/drivers/gpu/drm/drm_global.c
+--- linux-2.6.38.1/drivers/gpu/drm/drm_global.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/drm_global.c 2011-03-21 18:31:35.000000000 -0400
@@ -36,7 +36,7 @@
struct drm_global_item {
struct mutex mutex;
@@ -24220,9 +24220,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/drm_global.c linux-2.6.38-new/drivers/gp
ref->release(ref);
item->object = NULL;
}
-diff -urNp linux-2.6.38/drivers/gpu/drm/drm_info.c linux-2.6.38-new/drivers/gpu/drm/drm_info.c
---- linux-2.6.38/drivers/gpu/drm/drm_info.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/drm_info.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/drm_info.c linux-2.6.38.1/drivers/gpu/drm/drm_info.c
+--- linux-2.6.38.1/drivers/gpu/drm/drm_info.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/drm_info.c 2011-03-21 18:31:35.000000000 -0400
@@ -86,10 +86,14 @@ int drm_vm_info(struct seq_file *m, void
struct drm_local_map *map;
struct drm_map_list *r_list;
@@ -24263,9 +24263,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/drm_info.c linux-2.6.38-new/drivers/gpu/
#if defined(__i386__)
pgprot = pgprot_val(vma->vm_page_prot);
-diff -urNp linux-2.6.38/drivers/gpu/drm/drm_ioctl.c linux-2.6.38-new/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.38/drivers/gpu/drm/drm_ioctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/drm_ioctl.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/drm_ioctl.c linux-2.6.38.1/drivers/gpu/drm/drm_ioctl.c
+--- linux-2.6.38.1/drivers/gpu/drm/drm_ioctl.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/drm_ioctl.c 2011-03-21 18:31:35.000000000 -0400
@@ -353,7 +353,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);
@@ -24275,9 +24275,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/drm_ioctl.c linux-2.6.38-new/drivers/gpu
stats->data[i].type = dev->types[i];
}
-diff -urNp linux-2.6.38/drivers/gpu/drm/drm_lock.c linux-2.6.38-new/drivers/gpu/drm/drm_lock.c
---- linux-2.6.38/drivers/gpu/drm/drm_lock.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/drm_lock.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/drm_lock.c linux-2.6.38.1/drivers/gpu/drm/drm_lock.c
+--- linux-2.6.38.1/drivers/gpu/drm/drm_lock.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/drm_lock.c 2011-03-21 18:31:35.000000000 -0400
@@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi
if (drm_lock_take(&master->lock, lock->context)) {
master->lock.file_priv = file_priv;
@@ -24296,9 +24296,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/drm_lock.c linux-2.6.38-new/drivers/gpu/
if (drm_lock_free(&master->lock, lock->context)) {
/* FIXME: Should really bail out here. */
-diff -urNp linux-2.6.38/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38-new/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.38/drivers/gpu/drm/i810/i810_dma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/i810/i810_dma.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38.1/drivers/gpu/drm/i810/i810_dma.c
+--- linux-2.6.38.1/drivers/gpu/drm/i810/i810_dma.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/i810/i810_dma.c 2011-03-21 18:31:35.000000000 -0400
@@ -953,8 +953,8 @@ static int i810_dma_vertex(struct drm_de
dma->buflist[vertex->idx],
vertex->discard, vertex->used);
@@ -24321,9 +24321,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38-new/drivers
sarea_priv->last_enqueue = dev_priv->counter - 1;
sarea_priv->last_dispatch = (int)hw_status[5];
-diff -urNp linux-2.6.38/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.38-new/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.38/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.38.1/drivers/gpu/drm/i915/dvo_ch7017.c
+--- linux-2.6.38.1/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-21 18:31:35.000000000 -0400
@@ -390,7 +390,7 @@ static void ch7017_destroy(struct intel_
}
}
@@ -24333,9 +24333,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.38-new/drive
.init = ch7017_init,
.detect = ch7017_detect,
.mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.38/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.38-new/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.38/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.38.1/drivers/gpu/drm/i915/dvo_ch7xxx.c
+--- linux-2.6.38.1/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-21 18:31:35.000000000 -0400
@@ -320,7 +320,7 @@ static void ch7xxx_destroy(struct intel_
}
}
@@ -24345,9 +24345,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.38-new/drive
.init = ch7xxx_init,
.detect = ch7xxx_detect,
.mode_valid = ch7xxx_mode_valid,
-diff -urNp linux-2.6.38/drivers/gpu/drm/i915/dvo.h linux-2.6.38-new/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.38/drivers/gpu/drm/i915/dvo.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/i915/dvo.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/i915/dvo.h linux-2.6.38.1/drivers/gpu/drm/i915/dvo.h
+--- linux-2.6.38.1/drivers/gpu/drm/i915/dvo.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/i915/dvo.h 2011-03-21 18:31:35.000000000 -0400
@@ -122,23 +122,23 @@ struct intel_dvo_dev_ops {
*
* \return singly-linked list of modes or NULL if no modes found.
@@ -24380,9 +24380,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/i915/dvo.h linux-2.6.38-new/drivers/gpu/
+extern const struct intel_dvo_dev_ops ch7017_ops;
#endif /* _INTEL_DVO_H */
-diff -urNp linux-2.6.38/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.38-new/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.38/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.38.1/drivers/gpu/drm/i915/dvo_ivch.c
+--- linux-2.6.38.1/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-21 18:31:35.000000000 -0400
@@ -410,7 +410,7 @@ static void ivch_destroy(struct intel_dv
}
}
@@ -24392,9 +24392,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.38-new/drivers
.init = ivch_init,
.dpms = ivch_dpms,
.mode_valid = ivch_mode_valid,
-diff -urNp linux-2.6.38/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.38-new/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.38/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.38.1/drivers/gpu/drm/i915/dvo_sil164.c
+--- linux-2.6.38.1/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-21 18:31:35.000000000 -0400
@@ -252,7 +252,7 @@ static void sil164_destroy(struct intel_
}
}
@@ -24404,9 +24404,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.38-new/drive
.init = sil164_init,
.detect = sil164_detect,
.mode_valid = sil164_mode_valid,
-diff -urNp linux-2.6.38/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.38-new/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.38/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.38.1/drivers/gpu/drm/i915/dvo_tfp410.c
+--- linux-2.6.38.1/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-21 18:31:35.000000000 -0400
@@ -293,7 +293,7 @@ static void tfp410_destroy(struct intel_
}
}
@@ -24416,9 +24416,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.38-new/drive
.init = tfp410_init,
.detect = tfp410_detect,
.mode_valid = tfp410_mode_valid,
-diff -urNp linux-2.6.38/drivers/gpu/drm/i915/i915_dma.c linux-2.6.38-new/drivers/gpu/drm/i915/i915_dma.c
---- linux-2.6.38/drivers/gpu/drm/i915/i915_dma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/i915/i915_dma.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/i915/i915_dma.c linux-2.6.38.1/drivers/gpu/drm/i915/i915_dma.c
+--- linux-2.6.38.1/drivers/gpu/drm/i915/i915_dma.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/i915/i915_dma.c 2011-03-21 18:31:35.000000000 -0400
@@ -1159,7 +1159,7 @@ static bool i915_switcheroo_can_switch(s
bool can_switch;
@@ -24428,9 +24428,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/i915/i915_dma.c linux-2.6.38-new/drivers
spin_unlock(&dev->count_lock);
return can_switch;
}
-diff -urNp linux-2.6.38/drivers/gpu/drm/i915/i915_drv.c linux-2.6.38-new/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.38/drivers/gpu/drm/i915/i915_drv.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/i915/i915_drv.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/i915/i915_drv.c linux-2.6.38.1/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.38.1/drivers/gpu/drm/i915/i915_drv.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/i915/i915_drv.c 2011-03-21 18:31:35.000000000 -0400
@@ -673,7 +673,7 @@ static const struct dev_pm_ops i915_pm_o
.restore = i915_pm_resume,
};
@@ -24440,9 +24440,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/i915/i915_drv.c linux-2.6.38-new/drivers
.fault = i915_gem_fault,
.open = drm_gem_vm_open,
.close = drm_gem_vm_close,
-diff -urNp linux-2.6.38/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.38-new/drivers/gpu/drm/nouveau/nouveau_state.c
---- linux-2.6.38/drivers/gpu/drm/nouveau/nouveau_state.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/nouveau/nouveau_state.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.38.1/drivers/gpu/drm/nouveau/nouveau_state.c
+--- linux-2.6.38.1/drivers/gpu/drm/nouveau/nouveau_state.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/nouveau/nouveau_state.c 2011-03-21 18:31:35.000000000 -0400
@@ -621,7 +621,7 @@ static bool nouveau_switcheroo_can_switc
bool can_switch;
@@ -24452,9 +24452,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.38-new
spin_unlock(&dev->count_lock);
return can_switch;
}
-diff -urNp linux-2.6.38/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.38-new/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.38/drivers/gpu/drm/radeon/mkregtable.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/radeon/mkregtable.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.38.1/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-2.6.38.1/drivers/gpu/drm/radeon/mkregtable.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/radeon/mkregtable.c 2011-03-21 18:31:35.000000000 -0400
@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
regex_t mask_rex;
regmatch_t match[4];
@@ -24472,9 +24472,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.38-new/dri
if (regcomp
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-2.6.38/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.38-new/drivers/gpu/drm/radeon/radeon_device.c
---- linux-2.6.38/drivers/gpu/drm/radeon/radeon_device.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/radeon/radeon_device.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.38.1/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-2.6.38.1/drivers/gpu/drm/radeon/radeon_device.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/radeon/radeon_device.c 2011-03-21 18:31:35.000000000 -0400
@@ -673,7 +673,7 @@ static bool radeon_switcheroo_can_switch
bool can_switch;
@@ -24484,9 +24484,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.38-new/
spin_unlock(&dev->count_lock);
return can_switch;
}
-diff -urNp linux-2.6.38/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.38-new/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.38/drivers/gpu/drm/radeon/radeon_state.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/radeon/radeon_state.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.38.1/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-2.6.38.1/drivers/gpu/drm/radeon/radeon_state.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/radeon/radeon_state.c 2011-03-21 18:31:35.000000000 -0400
@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de
if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
@@ -24505,9 +24505,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.38-new/d
DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
-diff -urNp linux-2.6.38/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.38-new/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.38/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.38.1/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-2.6.38.1/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-21 18:31:35.000000000 -0400
@@ -603,8 +603,9 @@ void radeon_ttm_set_active_vram_size(str
man->size = size >> PAGE_SHIFT;
}
@@ -24568,9 +24568,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.38-new/dri
vma->vm_ops = &radeon_ttm_vm_ops;
return 0;
}
-diff -urNp linux-2.6.38/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.38-new/drivers/gpu/drm/ttm/ttm_bo.c
---- linux-2.6.38/drivers/gpu/drm/ttm/ttm_bo.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/ttm/ttm_bo.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.38.1/drivers/gpu/drm/ttm/ttm_bo.c
+--- linux-2.6.38.1/drivers/gpu/drm/ttm/ttm_bo.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/ttm/ttm_bo.c 2011-03-21 18:31:35.000000000 -0400
@@ -40,7 +40,7 @@
#include <asm/atomic.h>
@@ -24580,9 +24580,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.38-new/drivers/gp
#define TTM_BO_HASH_ORDER 13
static int ttm_bo_setup_vm(struct ttm_buffer_object *bo);
-diff -urNp linux-2.6.38/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38-new/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.38/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38.1/drivers/gpu/drm/ttm/ttm_bo_vm.c
+--- linux-2.6.38.1/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-21 18:31:35.000000000 -0400
@@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_
return best_bo;
}
@@ -24640,9 +24640,9 @@ diff -urNp linux-2.6.38/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38-new/drivers
static const struct vm_operations_struct ttm_bo_vm_ops = {
.fault = ttm_bo_vm_fault,
-diff -urNp linux-2.6.38/drivers/hid/usbhid/hiddev.c linux-2.6.38-new/drivers/hid/usbhid/hiddev.c
---- linux-2.6.38/drivers/hid/usbhid/hiddev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/hid/usbhid/hiddev.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/hid/usbhid/hiddev.c linux-2.6.38.1/drivers/hid/usbhid/hiddev.c
+--- linux-2.6.38.1/drivers/hid/usbhid/hiddev.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/hid/usbhid/hiddev.c 2011-03-21 18:31:35.000000000 -0400
@@ -613,7 +613,7 @@ static long hiddev_ioctl(struct file *fi
break;
@@ -24652,9 +24652,9 @@ diff -urNp linux-2.6.38/drivers/hid/usbhid/hiddev.c linux-2.6.38-new/drivers/hid
break;
for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-2.6.38/drivers/hwmon/k8temp.c linux-2.6.38-new/drivers/hwmon/k8temp.c
---- linux-2.6.38/drivers/hwmon/k8temp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/hwmon/k8temp.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/hwmon/k8temp.c linux-2.6.38.1/drivers/hwmon/k8temp.c
+--- linux-2.6.38.1/drivers/hwmon/k8temp.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/hwmon/k8temp.c 2011-03-21 18:31:35.000000000 -0400
@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
static const struct pci_device_id k8temp_ids[] = {
@@ -24664,9 +24664,9 @@ diff -urNp linux-2.6.38/drivers/hwmon/k8temp.c linux-2.6.38-new/drivers/hwmon/k8
};
MODULE_DEVICE_TABLE(pci, k8temp_ids);
-diff -urNp linux-2.6.38/drivers/hwmon/sis5595.c linux-2.6.38-new/drivers/hwmon/sis5595.c
---- linux-2.6.38/drivers/hwmon/sis5595.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/hwmon/sis5595.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/hwmon/sis5595.c linux-2.6.38.1/drivers/hwmon/sis5595.c
+--- linux-2.6.38.1/drivers/hwmon/sis5595.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/hwmon/sis5595.c 2011-03-21 18:31:35.000000000 -0400
@@ -701,7 +701,7 @@ static struct sis5595_data *sis5595_upda
static const struct pci_device_id sis5595_pci_ids[] = {
@@ -24676,9 +24676,9 @@ diff -urNp linux-2.6.38/drivers/hwmon/sis5595.c linux-2.6.38-new/drivers/hwmon/s
};
MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
-diff -urNp linux-2.6.38/drivers/hwmon/via686a.c linux-2.6.38-new/drivers/hwmon/via686a.c
---- linux-2.6.38/drivers/hwmon/via686a.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/hwmon/via686a.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/hwmon/via686a.c linux-2.6.38.1/drivers/hwmon/via686a.c
+--- linux-2.6.38.1/drivers/hwmon/via686a.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/hwmon/via686a.c 2011-03-21 18:31:35.000000000 -0400
@@ -779,7 +779,7 @@ static struct via686a_data *via686a_upda
static const struct pci_device_id via686a_pci_ids[] = {
@@ -24688,9 +24688,9 @@ diff -urNp linux-2.6.38/drivers/hwmon/via686a.c linux-2.6.38-new/drivers/hwmon/v
};
MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
-diff -urNp linux-2.6.38/drivers/hwmon/vt8231.c linux-2.6.38-new/drivers/hwmon/vt8231.c
---- linux-2.6.38/drivers/hwmon/vt8231.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/hwmon/vt8231.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/hwmon/vt8231.c linux-2.6.38.1/drivers/hwmon/vt8231.c
+--- linux-2.6.38.1/drivers/hwmon/vt8231.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/hwmon/vt8231.c 2011-03-21 18:31:35.000000000 -0400
@@ -701,7 +701,7 @@ static struct platform_driver vt8231_dri
static const struct pci_device_id vt8231_pci_ids[] = {
@@ -24700,9 +24700,9 @@ diff -urNp linux-2.6.38/drivers/hwmon/vt8231.c linux-2.6.38-new/drivers/hwmon/vt
};
MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
-diff -urNp linux-2.6.38/drivers/hwmon/w83791d.c linux-2.6.38-new/drivers/hwmon/w83791d.c
---- linux-2.6.38/drivers/hwmon/w83791d.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/hwmon/w83791d.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/hwmon/w83791d.c linux-2.6.38.1/drivers/hwmon/w83791d.c
+--- linux-2.6.38.1/drivers/hwmon/w83791d.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/hwmon/w83791d.c 2011-03-21 18:31:35.000000000 -0400
@@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli
struct i2c_board_info *info);
static int w83791d_remove(struct i2c_client *client);
@@ -24714,9 +24714,9 @@ diff -urNp linux-2.6.38/drivers/hwmon/w83791d.c linux-2.6.38-new/drivers/hwmon/w
static struct w83791d_data *w83791d_update_device(struct device *dev);
#ifdef DEBUG
-diff -urNp linux-2.6.38/drivers/i2c/busses/i2c-i801.c linux-2.6.38-new/drivers/i2c/busses/i2c-i801.c
---- linux-2.6.38/drivers/i2c/busses/i2c-i801.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/i2c/busses/i2c-i801.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/i2c/busses/i2c-i801.c linux-2.6.38.1/drivers/i2c/busses/i2c-i801.c
+--- linux-2.6.38.1/drivers/i2c/busses/i2c-i801.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/i2c/busses/i2c-i801.c 2011-03-21 18:31:35.000000000 -0400
@@ -621,7 +621,7 @@ static const struct pci_device_id i801_i
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF0) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1) },
@@ -24726,9 +24726,9 @@ diff -urNp linux-2.6.38/drivers/i2c/busses/i2c-i801.c linux-2.6.38-new/drivers/i
};
MODULE_DEVICE_TABLE(pci, i801_ids);
-diff -urNp linux-2.6.38/drivers/i2c/busses/i2c-piix4.c linux-2.6.38-new/drivers/i2c/busses/i2c-piix4.c
---- linux-2.6.38/drivers/i2c/busses/i2c-piix4.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/i2c/busses/i2c-piix4.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/i2c/busses/i2c-piix4.c linux-2.6.38.1/drivers/i2c/busses/i2c-piix4.c
+--- linux-2.6.38.1/drivers/i2c/busses/i2c-piix4.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/i2c/busses/i2c-piix4.c 2011-03-21 18:31:35.000000000 -0400
@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
.ident = "IBM",
.matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -24747,9 +24747,9 @@ diff -urNp linux-2.6.38/drivers/i2c/busses/i2c-piix4.c linux-2.6.38-new/drivers/
};
MODULE_DEVICE_TABLE (pci, piix4_ids);
-diff -urNp linux-2.6.38/drivers/i2c/busses/i2c-sis630.c linux-2.6.38-new/drivers/i2c/busses/i2c-sis630.c
---- linux-2.6.38/drivers/i2c/busses/i2c-sis630.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/i2c/busses/i2c-sis630.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/i2c/busses/i2c-sis630.c linux-2.6.38.1/drivers/i2c/busses/i2c-sis630.c
+--- linux-2.6.38.1/drivers/i2c/busses/i2c-sis630.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/i2c/busses/i2c-sis630.c 2011-03-21 18:31:35.000000000 -0400
@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
static const struct pci_device_id sis630_ids[] __devinitconst = {
{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
@@ -24759,9 +24759,9 @@ diff -urNp linux-2.6.38/drivers/i2c/busses/i2c-sis630.c linux-2.6.38-new/drivers
};
MODULE_DEVICE_TABLE (pci, sis630_ids);
-diff -urNp linux-2.6.38/drivers/i2c/busses/i2c-sis96x.c linux-2.6.38-new/drivers/i2c/busses/i2c-sis96x.c
---- linux-2.6.38/drivers/i2c/busses/i2c-sis96x.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/i2c/busses/i2c-sis96x.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/i2c/busses/i2c-sis96x.c linux-2.6.38.1/drivers/i2c/busses/i2c-sis96x.c
+--- linux-2.6.38.1/drivers/i2c/busses/i2c-sis96x.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/i2c/busses/i2c-sis96x.c 2011-03-21 18:31:35.000000000 -0400
@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
static const struct pci_device_id sis96x_ids[] = {
@@ -24771,9 +24771,9 @@ diff -urNp linux-2.6.38/drivers/i2c/busses/i2c-sis96x.c linux-2.6.38-new/drivers
};
MODULE_DEVICE_TABLE (pci, sis96x_ids);
-diff -urNp linux-2.6.38/drivers/ide/ide-cd.c linux-2.6.38-new/drivers/ide/ide-cd.c
---- linux-2.6.38/drivers/ide/ide-cd.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/ide/ide-cd.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/ide/ide-cd.c linux-2.6.38.1/drivers/ide/ide-cd.c
+--- linux-2.6.38.1/drivers/ide/ide-cd.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/ide/ide-cd.c 2011-03-21 18:31:35.000000000 -0400
@@ -776,7 +776,7 @@ static void cdrom_do_block_pc(ide_drive_
alignment = queue_dma_alignment(q) | q->dma_pad_mask;
if ((unsigned long)buf & alignment
@@ -24783,9 +24783,9 @@ diff -urNp linux-2.6.38/drivers/ide/ide-cd.c linux-2.6.38-new/drivers/ide/ide-cd
drive->dma = 0;
}
}
-diff -urNp linux-2.6.38/drivers/infiniband/core/cm.c linux-2.6.38-new/drivers/infiniband/core/cm.c
---- linux-2.6.38/drivers/infiniband/core/cm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/infiniband/core/cm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/infiniband/core/cm.c linux-2.6.38.1/drivers/infiniband/core/cm.c
+--- linux-2.6.38.1/drivers/infiniband/core/cm.c 2011-03-23 17:20:07.000000000 -0400
++++ linux-2.6.38.1/drivers/infiniband/core/cm.c 2011-03-23 17:21:50.000000000 -0400
@@ -113,7 +113,7 @@ static char const counter_group_names[CM
struct cm_counter_group {
@@ -24894,7 +24894,7 @@ diff -urNp linux-2.6.38/drivers/infiniband/core/cm.c linux-2.6.38-new/drivers/in
counter[CM_SIDR_REQ_COUNTER]);
goto out; /* Duplicate message. */
}
-@@ -3186,10 +3186,10 @@ static void cm_send_handler(struct ib_ma
+@@ -3187,10 +3187,10 @@ static void cm_send_handler(struct ib_ma
if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
msg->retries = 1;
@@ -24907,7 +24907,7 @@ diff -urNp linux-2.6.38/drivers/infiniband/core/cm.c linux-2.6.38-new/drivers/in
&port->counter_group[CM_XMIT_RETRIES].
counter[attr_index]);
-@@ -3399,7 +3399,7 @@ static void cm_recv_handler(struct ib_ma
+@@ -3400,7 +3400,7 @@ static void cm_recv_handler(struct ib_ma
}
attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
@@ -24916,7 +24916,7 @@ diff -urNp linux-2.6.38/drivers/infiniband/core/cm.c linux-2.6.38-new/drivers/in
counter[attr_id - CM_ATTR_ID_OFFSET]);
work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
-@@ -3597,7 +3597,7 @@ static ssize_t cm_show_counter(struct ko
+@@ -3598,7 +3598,7 @@ static ssize_t cm_show_counter(struct ko
cm_attr = container_of(attr, struct cm_counter_attribute, attr);
return sprintf(buf, "%ld\n",
@@ -24925,9 +24925,9 @@ diff -urNp linux-2.6.38/drivers/infiniband/core/cm.c linux-2.6.38-new/drivers/in
}
static const struct sysfs_ops cm_counter_ops = {
-diff -urNp linux-2.6.38/drivers/infiniband/hw/qib/qib.h linux-2.6.38-new/drivers/infiniband/hw/qib/qib.h
---- linux-2.6.38/drivers/infiniband/hw/qib/qib.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/infiniband/hw/qib/qib.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/infiniband/hw/qib/qib.h linux-2.6.38.1/drivers/infiniband/hw/qib/qib.h
+--- linux-2.6.38.1/drivers/infiniband/hw/qib/qib.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/infiniband/hw/qib/qib.h 2011-03-21 18:31:35.000000000 -0400
@@ -51,6 +51,7 @@
#include <linux/completion.h>
#include <linux/kref.h>
@@ -24936,9 +24936,9 @@ diff -urNp linux-2.6.38/drivers/infiniband/hw/qib/qib.h linux-2.6.38-new/drivers
#include "qib_common.h"
#include "qib_verbs.h"
-diff -urNp linux-2.6.38/drivers/input/keyboard/atkbd.c linux-2.6.38-new/drivers/input/keyboard/atkbd.c
---- linux-2.6.38/drivers/input/keyboard/atkbd.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/input/keyboard/atkbd.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/input/keyboard/atkbd.c linux-2.6.38.1/drivers/input/keyboard/atkbd.c
+--- linux-2.6.38.1/drivers/input/keyboard/atkbd.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/input/keyboard/atkbd.c 2011-03-21 18:31:35.000000000 -0400
@@ -1250,7 +1250,7 @@ static struct serio_device_id atkbd_seri
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -24948,9 +24948,9 @@ diff -urNp linux-2.6.38/drivers/input/keyboard/atkbd.c linux-2.6.38-new/drivers/
};
MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
-diff -urNp linux-2.6.38/drivers/input/mouse/lifebook.c linux-2.6.38-new/drivers/input/mouse/lifebook.c
---- linux-2.6.38/drivers/input/mouse/lifebook.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/input/mouse/lifebook.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/input/mouse/lifebook.c linux-2.6.38.1/drivers/input/mouse/lifebook.c
+--- linux-2.6.38.1/drivers/input/mouse/lifebook.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/input/mouse/lifebook.c 2011-03-21 18:31:35.000000000 -0400
@@ -123,7 +123,7 @@ static const struct dmi_system_id __init
DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
},
@@ -24960,9 +24960,9 @@ diff -urNp linux-2.6.38/drivers/input/mouse/lifebook.c linux-2.6.38-new/drivers/
};
void __init lifebook_module_init(void)
-diff -urNp linux-2.6.38/drivers/input/mouse/psmouse-base.c linux-2.6.38-new/drivers/input/mouse/psmouse-base.c
---- linux-2.6.38/drivers/input/mouse/psmouse-base.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/input/mouse/psmouse-base.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/input/mouse/psmouse-base.c linux-2.6.38.1/drivers/input/mouse/psmouse-base.c
+--- linux-2.6.38.1/drivers/input/mouse/psmouse-base.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/input/mouse/psmouse-base.c 2011-03-21 18:31:35.000000000 -0400
@@ -1462,7 +1462,7 @@ static struct serio_device_id psmouse_se
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -24972,9 +24972,9 @@ diff -urNp linux-2.6.38/drivers/input/mouse/psmouse-base.c linux-2.6.38-new/driv
};
MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
-diff -urNp linux-2.6.38/drivers/input/mouse/synaptics.c linux-2.6.38-new/drivers/input/mouse/synaptics.c
---- linux-2.6.38/drivers/input/mouse/synaptics.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/input/mouse/synaptics.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/input/mouse/synaptics.c linux-2.6.38.1/drivers/input/mouse/synaptics.c
+--- linux-2.6.38.1/drivers/input/mouse/synaptics.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/input/mouse/synaptics.c 2011-03-21 18:31:35.000000000 -0400
@@ -559,7 +559,7 @@ static void synaptics_process_packet(str
break;
case 2:
@@ -25003,9 +25003,9 @@ diff -urNp linux-2.6.38/drivers/input/mouse/synaptics.c linux-2.6.38-new/drivers
#endif
};
-diff -urNp linux-2.6.38/drivers/input/mousedev.c linux-2.6.38-new/drivers/input/mousedev.c
---- linux-2.6.38/drivers/input/mousedev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/input/mousedev.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/input/mousedev.c linux-2.6.38.1/drivers/input/mousedev.c
+--- linux-2.6.38.1/drivers/input/mousedev.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/input/mousedev.c 2011-03-21 18:31:35.000000000 -0400
@@ -764,7 +764,7 @@ static ssize_t mousedev_read(struct file
spin_unlock_irq(&client->packet_lock);
@@ -25024,9 +25024,9 @@ diff -urNp linux-2.6.38/drivers/input/mousedev.c linux-2.6.38-new/drivers/input/
};
static int psaux_registered;
#endif
-diff -urNp linux-2.6.38/drivers/input/serio/i8042-x86ia64io.h linux-2.6.38-new/drivers/input/serio/i8042-x86ia64io.h
---- linux-2.6.38/drivers/input/serio/i8042-x86ia64io.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/input/serio/i8042-x86ia64io.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/input/serio/i8042-x86ia64io.h linux-2.6.38.1/drivers/input/serio/i8042-x86ia64io.h
+--- linux-2.6.38.1/drivers/input/serio/i8042-x86ia64io.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/input/serio/i8042-x86ia64io.h 2011-03-21 18:31:35.000000000 -0400
@@ -183,7 +183,7 @@ static const struct dmi_system_id __init
DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
},
@@ -25081,9 +25081,9 @@ diff -urNp linux-2.6.38/drivers/input/serio/i8042-x86ia64io.h linux-2.6.38-new/d
};
#endif /* CONFIG_X86 */
-diff -urNp linux-2.6.38/drivers/input/serio/serio_raw.c linux-2.6.38-new/drivers/input/serio/serio_raw.c
---- linux-2.6.38/drivers/input/serio/serio_raw.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/input/serio/serio_raw.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/input/serio/serio_raw.c linux-2.6.38.1/drivers/input/serio/serio_raw.c
+--- linux-2.6.38.1/drivers/input/serio/serio_raw.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/input/serio/serio_raw.c 2011-03-21 18:31:35.000000000 -0400
@@ -376,7 +376,7 @@ static struct serio_device_id serio_raw_
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -25093,9 +25093,9 @@ diff -urNp linux-2.6.38/drivers/input/serio/serio_raw.c linux-2.6.38-new/drivers
};
MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
-diff -urNp linux-2.6.38/drivers/isdn/gigaset/common.c linux-2.6.38-new/drivers/isdn/gigaset/common.c
---- linux-2.6.38/drivers/isdn/gigaset/common.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/isdn/gigaset/common.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/isdn/gigaset/common.c linux-2.6.38.1/drivers/isdn/gigaset/common.c
+--- linux-2.6.38.1/drivers/isdn/gigaset/common.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/isdn/gigaset/common.c 2011-03-21 18:31:35.000000000 -0400
@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct
cs->commands_pending = 0;
cs->cur_at_seq = 0;
@@ -25105,9 +25105,9 @@ diff -urNp linux-2.6.38/drivers/isdn/gigaset/common.c linux-2.6.38-new/drivers/i
cs->dev = NULL;
cs->tty = NULL;
cs->tty_dev = NULL;
-diff -urNp linux-2.6.38/drivers/isdn/gigaset/gigaset.h linux-2.6.38-new/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.38/drivers/isdn/gigaset/gigaset.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/isdn/gigaset/gigaset.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/isdn/gigaset/gigaset.h linux-2.6.38.1/drivers/isdn/gigaset/gigaset.h
+--- linux-2.6.38.1/drivers/isdn/gigaset/gigaset.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/isdn/gigaset/gigaset.h 2011-03-21 18:31:35.000000000 -0400
@@ -35,6 +35,7 @@
#include <linux/tty_driver.h>
#include <linux/list.h>
@@ -25125,9 +25125,9 @@ diff -urNp linux-2.6.38/drivers/isdn/gigaset/gigaset.h linux-2.6.38-new/drivers/
struct tty_struct *tty;
struct tasklet_struct if_wake_tasklet;
unsigned control_state;
-diff -urNp linux-2.6.38/drivers/isdn/gigaset/interface.c linux-2.6.38-new/drivers/isdn/gigaset/interface.c
---- linux-2.6.38/drivers/isdn/gigaset/interface.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/isdn/gigaset/interface.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/isdn/gigaset/interface.c linux-2.6.38.1/drivers/isdn/gigaset/interface.c
+--- linux-2.6.38.1/drivers/isdn/gigaset/interface.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/isdn/gigaset/interface.c 2011-03-21 18:31:35.000000000 -0400
@@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tt
return -ERESTARTSYS;
tty->driver_data = cs;
@@ -25215,9 +25215,9 @@ diff -urNp linux-2.6.38/drivers/isdn/gigaset/interface.c linux-2.6.38-new/driver
dev_warn(cs->dev, "%s: device not opened\n", __func__);
goto out;
}
-diff -urNp linux-2.6.38/drivers/isdn/hardware/avm/b1.c linux-2.6.38-new/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.38/drivers/isdn/hardware/avm/b1.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/isdn/hardware/avm/b1.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/isdn/hardware/avm/b1.c linux-2.6.38.1/drivers/isdn/hardware/avm/b1.c
+--- linux-2.6.38.1/drivers/isdn/hardware/avm/b1.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/isdn/hardware/avm/b1.c 2011-03-21 18:31:35.000000000 -0400
@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
}
if (left) {
@@ -25236,9 +25236,9 @@ diff -urNp linux-2.6.38/drivers/isdn/hardware/avm/b1.c linux-2.6.38-new/drivers/
return -EFAULT;
} else {
memcpy(buf, dp, left);
-diff -urNp linux-2.6.38/drivers/isdn/icn/icn.c linux-2.6.38-new/drivers/isdn/icn/icn.c
---- linux-2.6.38/drivers/isdn/icn/icn.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/isdn/icn/icn.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/isdn/icn/icn.c linux-2.6.38.1/drivers/isdn/icn/icn.c
+--- linux-2.6.38.1/drivers/isdn/icn/icn.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/isdn/icn/icn.c 2011-03-21 18:31:35.000000000 -0400
@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
if (count > len)
count = len;
@@ -25248,9 +25248,9 @@ diff -urNp linux-2.6.38/drivers/isdn/icn/icn.c linux-2.6.38-new/drivers/isdn/icn
return -EFAULT;
} else
memcpy(msg, buf, count);
-diff -urNp linux-2.6.38/drivers/leds/leds-lp5521.c linux-2.6.38-new/drivers/leds/leds-lp5521.c
---- linux-2.6.38/drivers/leds/leds-lp5521.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/leds/leds-lp5521.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/leds/leds-lp5521.c linux-2.6.38.1/drivers/leds/leds-lp5521.c
+--- linux-2.6.38.1/drivers/leds/leds-lp5521.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/leds/leds-lp5521.c 2011-03-21 18:31:35.000000000 -0400
@@ -534,7 +534,7 @@ static ssize_t lp5521_selftest(struct de
}
@@ -25282,9 +25282,9 @@ diff -urNp linux-2.6.38/drivers/leds/leds-lp5521.c linux-2.6.38-new/drivers/leds
static DEVICE_ATTR(selftest, S_IRUGO, lp5521_selftest, NULL);
static struct attribute *lp5521_attributes[] = {
-diff -urNp linux-2.6.38/drivers/leds/leds-lp5523.c linux-2.6.38-new/drivers/leds/leds-lp5523.c
---- linux-2.6.38/drivers/leds/leds-lp5523.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/leds/leds-lp5523.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/leds/leds-lp5523.c linux-2.6.38.1/drivers/leds/leds-lp5523.c
+--- linux-2.6.38.1/drivers/leds/leds-lp5523.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/leds/leds-lp5523.c 2011-03-21 18:31:35.000000000 -0400
@@ -713,7 +713,7 @@ static ssize_t store_current(struct devi
}
@@ -25325,9 +25325,9 @@ diff -urNp linux-2.6.38/drivers/leds/leds-lp5523.c linux-2.6.38-new/drivers/leds
static DEVICE_ATTR(selftest, S_IRUGO, lp5523_selftest, NULL);
static struct attribute *lp5523_attributes[] = {
-diff -urNp linux-2.6.38/drivers/lguest/core.c linux-2.6.38-new/drivers/lguest/core.c
---- linux-2.6.38/drivers/lguest/core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/lguest/core.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/lguest/core.c linux-2.6.38.1/drivers/lguest/core.c
+--- linux-2.6.38.1/drivers/lguest/core.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/lguest/core.c 2011-03-21 18:31:35.000000000 -0400
@@ -92,9 +92,17 @@ static __init int map_switcher(void)
* it's worked so far. The end address needs +1 because __get_vm_area
* allocates an extra guard page, so we need space for that.
@@ -25355,9 +25355,9 @@ diff -urNp linux-2.6.38/drivers/lguest/core.c linux-2.6.38-new/drivers/lguest/co
end_switcher_text - start_switcher_text);
printk(KERN_INFO "lguest: mapped switcher at %p\n",
-diff -urNp linux-2.6.38/drivers/lguest/x86/core.c linux-2.6.38-new/drivers/lguest/x86/core.c
---- linux-2.6.38/drivers/lguest/x86/core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/lguest/x86/core.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/lguest/x86/core.c linux-2.6.38.1/drivers/lguest/x86/core.c
+--- linux-2.6.38.1/drivers/lguest/x86/core.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/lguest/x86/core.c 2011-03-21 18:31:35.000000000 -0400
@@ -59,7 +59,7 @@ static struct {
/* Offset from where switcher.S was compiled to where we've copied it */
static unsigned long switcher_offset(void)
@@ -25399,9 +25399,9 @@ diff -urNp linux-2.6.38/drivers/lguest/x86/core.c linux-2.6.38-new/drivers/lgues
lguest_entry.segment = LGUEST_CS;
/*
-diff -urNp linux-2.6.38/drivers/lguest/x86/switcher_32.S linux-2.6.38-new/drivers/lguest/x86/switcher_32.S
---- linux-2.6.38/drivers/lguest/x86/switcher_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/lguest/x86/switcher_32.S 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/lguest/x86/switcher_32.S linux-2.6.38.1/drivers/lguest/x86/switcher_32.S
+--- linux-2.6.38.1/drivers/lguest/x86/switcher_32.S 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/lguest/x86/switcher_32.S 2011-03-21 18:31:35.000000000 -0400
@@ -87,6 +87,7 @@
#include <asm/page.h>
#include <asm/segment.h>
@@ -25460,9 +25460,9 @@ diff -urNp linux-2.6.38/drivers/lguest/x86/switcher_32.S linux-2.6.38-new/driver
// Every interrupt can come to us here
// But we must truly tell each apart.
-diff -urNp linux-2.6.38/drivers/md/bitmap.c linux-2.6.38-new/drivers/md/bitmap.c
---- linux-2.6.38/drivers/md/bitmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/md/bitmap.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/md/bitmap.c linux-2.6.38.1/drivers/md/bitmap.c
+--- linux-2.6.38.1/drivers/md/bitmap.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/md/bitmap.c 2011-03-21 18:31:35.000000000 -0400
@@ -55,7 +55,7 @@
# if DEBUG > 0
# define PRINTK(x...) printk(KERN_DEBUG x)
@@ -25472,9 +25472,9 @@ diff -urNp linux-2.6.38/drivers/md/bitmap.c linux-2.6.38-new/drivers/md/bitmap.c
# endif
#endif
-diff -urNp linux-2.6.38/drivers/md/dm-ioctl.c linux-2.6.38-new/drivers/md/dm-ioctl.c
---- linux-2.6.38/drivers/md/dm-ioctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/md/dm-ioctl.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/md/dm-ioctl.c linux-2.6.38.1/drivers/md/dm-ioctl.c
+--- linux-2.6.38.1/drivers/md/dm-ioctl.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/md/dm-ioctl.c 2011-03-21 18:31:35.000000000 -0400
@@ -1541,7 +1541,7 @@ static int validate_params(uint cmd, str
cmd == DM_LIST_VERSIONS_CMD)
return 0;
@@ -25484,9 +25484,9 @@ diff -urNp linux-2.6.38/drivers/md/dm-ioctl.c linux-2.6.38-new/drivers/md/dm-ioc
if (!*param->name) {
DMWARN("name not supplied when creating device");
return -EINVAL;
-diff -urNp linux-2.6.38/drivers/md/dm-table.c linux-2.6.38-new/drivers/md/dm-table.c
---- linux-2.6.38/drivers/md/dm-table.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/md/dm-table.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/md/dm-table.c linux-2.6.38.1/drivers/md/dm-table.c
+--- linux-2.6.38.1/drivers/md/dm-table.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/md/dm-table.c 2011-03-21 18:31:35.000000000 -0400
@@ -372,7 +372,7 @@ static int device_area_is_invalid(struct
if (!dev_size)
return 0;
@@ -25496,9 +25496,9 @@ diff -urNp linux-2.6.38/drivers/md/dm-table.c linux-2.6.38-new/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.38/drivers/md/md.c linux-2.6.38-new/drivers/md/md.c
---- linux-2.6.38/drivers/md/md.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/md/md.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/md/md.c linux-2.6.38.1/drivers/md/md.c
+--- linux-2.6.38.1/drivers/md/md.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/md/md.c 2011-03-21 18:31:35.000000000 -0400
@@ -1889,7 +1889,7 @@ static int bind_rdev_to_array(mdk_rdev_t
ko = &part_to_dev(rdev->bdev->bd_part)->kobj;
@@ -25553,9 +25553,9 @@ diff -urNp linux-2.6.38/drivers/md/md.c linux-2.6.38-new/drivers/md/md.c
spares++;
md_new_event(mddev);
set_bit(MD_CHANGE_DEVS, &mddev->flags);
-diff -urNp linux-2.6.38/drivers/md/md.h linux-2.6.38-new/drivers/md/md.h
---- linux-2.6.38/drivers/md/md.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/md/md.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/md/md.h linux-2.6.38.1/drivers/md/md.h
+--- linux-2.6.38.1/drivers/md/md.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/md/md.h 2011-03-21 18:31:35.000000000 -0400
@@ -360,7 +360,7 @@ static inline void rdev_dec_pending(mdk_
static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
@@ -25565,9 +25565,9 @@ diff -urNp linux-2.6.38/drivers/md/md.h linux-2.6.38-new/drivers/md/md.h
}
struct mdk_personality
-diff -urNp linux-2.6.38/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.38-new/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.38/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.38.1/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-2.6.38.1/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-21 18:31:35.000000000 -0400
@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt
const struct dvb_device *template, void *priv, int type)
{
@@ -25577,9 +25577,9 @@ diff -urNp linux-2.6.38/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.38-new/dri
struct device *clsdev;
int minor;
int id;
-diff -urNp linux-2.6.38/drivers/media/radio/radio-cadet.c linux-2.6.38-new/drivers/media/radio/radio-cadet.c
---- linux-2.6.38/drivers/media/radio/radio-cadet.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/media/radio/radio-cadet.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/media/radio/radio-cadet.c linux-2.6.38.1/drivers/media/radio/radio-cadet.c
+--- linux-2.6.38.1/drivers/media/radio/radio-cadet.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/media/radio/radio-cadet.c 2011-03-21 18:31:35.000000000 -0400
@@ -349,7 +349,7 @@ static ssize_t cadet_read(struct file *f
readbuf[i++] = dev->rdsbuf[dev->rdsout++];
mutex_unlock(&dev->lock);
@@ -25589,9 +25589,9 @@ diff -urNp linux-2.6.38/drivers/media/radio/radio-cadet.c linux-2.6.38-new/drive
return -EFAULT;
return i;
}
-diff -urNp linux-2.6.38/drivers/media/rc/ir-lirc-codec.c linux-2.6.38-new/drivers/media/rc/ir-lirc-codec.c
---- linux-2.6.38/drivers/media/rc/ir-lirc-codec.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/media/rc/ir-lirc-codec.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/media/rc/ir-lirc-codec.c linux-2.6.38.1/drivers/media/rc/ir-lirc-codec.c
+--- linux-2.6.38.1/drivers/media/rc/ir-lirc-codec.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/media/rc/ir-lirc-codec.c 2011-03-21 18:31:35.000000000 -0400
@@ -277,7 +277,7 @@ static void ir_lirc_close(void *data)
return;
}
@@ -25601,9 +25601,9 @@ diff -urNp linux-2.6.38/drivers/media/rc/ir-lirc-codec.c linux-2.6.38-new/driver
.owner = THIS_MODULE,
.write = ir_lirc_transmit_ir,
.unlocked_ioctl = ir_lirc_ioctl,
-diff -urNp linux-2.6.38/drivers/media/rc/lirc_dev.c linux-2.6.38-new/drivers/media/rc/lirc_dev.c
---- linux-2.6.38/drivers/media/rc/lirc_dev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/media/rc/lirc_dev.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/media/rc/lirc_dev.c linux-2.6.38.1/drivers/media/rc/lirc_dev.c
+--- linux-2.6.38.1/drivers/media/rc/lirc_dev.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/media/rc/lirc_dev.c 2011-03-21 18:31:35.000000000 -0400
@@ -151,7 +151,7 @@ static int lirc_thread(void *irctl)
}
@@ -25613,9 +25613,9 @@ diff -urNp linux-2.6.38/drivers/media/rc/lirc_dev.c linux-2.6.38-new/drivers/med
.owner = THIS_MODULE,
.read = lirc_dev_fop_read,
.write = lirc_dev_fop_write,
-diff -urNp linux-2.6.38/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.38-new/drivers/media/video/sn9c102/sn9c102_core.c
---- linux-2.6.38/drivers/media/video/sn9c102/sn9c102_core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/media/video/sn9c102/sn9c102_core.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.38.1/drivers/media/video/sn9c102/sn9c102_core.c
+--- linux-2.6.38.1/drivers/media/video/sn9c102/sn9c102_core.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/media/video/sn9c102/sn9c102_core.c 2011-03-21 18:31:35.000000000 -0400
@@ -1430,9 +1430,9 @@ static DEVICE_ATTR(i2c_reg, S_IRUGO | S_
sn9c102_show_i2c_reg, sn9c102_store_i2c_reg);
static DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR,
@@ -25629,9 +25629,9 @@ diff -urNp linux-2.6.38/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.38-
static DEVICE_ATTR(frame_header, S_IRUGO, sn9c102_show_frame_header, NULL);
-diff -urNp linux-2.6.38/drivers/message/fusion/mptbase.c linux-2.6.38-new/drivers/message/fusion/mptbase.c
---- linux-2.6.38/drivers/message/fusion/mptbase.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/message/fusion/mptbase.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/message/fusion/mptbase.c linux-2.6.38.1/drivers/message/fusion/mptbase.c
+--- linux-2.6.38.1/drivers/message/fusion/mptbase.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/message/fusion/mptbase.c 2011-03-21 18:31:35.000000000 -0400
@@ -6683,8 +6683,13 @@ static int mpt_iocinfo_proc_show(struct
seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
@@ -25646,9 +25646,9 @@ diff -urNp linux-2.6.38/drivers/message/fusion/mptbase.c linux-2.6.38-new/driver
/*
* Rounding UP to nearest 4-kB boundary here...
*/
-diff -urNp linux-2.6.38/drivers/message/fusion/mptdebug.h linux-2.6.38-new/drivers/message/fusion/mptdebug.h
---- linux-2.6.38/drivers/message/fusion/mptdebug.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/message/fusion/mptdebug.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/message/fusion/mptdebug.h linux-2.6.38.1/drivers/message/fusion/mptdebug.h
+--- linux-2.6.38.1/drivers/message/fusion/mptdebug.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/message/fusion/mptdebug.h 2011-03-21 18:31:35.000000000 -0400
@@ -71,7 +71,7 @@
CMD; \
}
@@ -25658,9 +25658,9 @@ diff -urNp linux-2.6.38/drivers/message/fusion/mptdebug.h linux-2.6.38-new/drive
#endif
-diff -urNp linux-2.6.38/drivers/message/fusion/mptsas.c linux-2.6.38-new/drivers/message/fusion/mptsas.c
---- linux-2.6.38/drivers/message/fusion/mptsas.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/message/fusion/mptsas.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/message/fusion/mptsas.c linux-2.6.38.1/drivers/message/fusion/mptsas.c
+--- linux-2.6.38.1/drivers/message/fusion/mptsas.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/message/fusion/mptsas.c 2011-03-21 18:31:35.000000000 -0400
@@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
return 0;
}
@@ -25709,9 +25709,9 @@ diff -urNp linux-2.6.38/drivers/message/fusion/mptsas.c linux-2.6.38-new/drivers
static inline struct sas_port *
mptsas_get_port(struct mptsas_phyinfo *phy_info)
{
-diff -urNp linux-2.6.38/drivers/message/fusion/mptscsih.c linux-2.6.38-new/drivers/message/fusion/mptscsih.c
---- linux-2.6.38/drivers/message/fusion/mptscsih.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/message/fusion/mptscsih.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/message/fusion/mptscsih.c linux-2.6.38.1/drivers/message/fusion/mptscsih.c
+--- linux-2.6.38.1/drivers/message/fusion/mptscsih.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/message/fusion/mptscsih.c 2011-03-21 18:31:35.000000000 -0400
@@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
h = shost_priv(SChost);
@@ -25737,9 +25737,9 @@ diff -urNp linux-2.6.38/drivers/message/fusion/mptscsih.c linux-2.6.38-new/drive
return h->info_kbuf;
}
-diff -urNp linux-2.6.38/drivers/message/i2o/i2o_proc.c linux-2.6.38-new/drivers/message/i2o/i2o_proc.c
---- linux-2.6.38/drivers/message/i2o/i2o_proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/message/i2o/i2o_proc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/message/i2o/i2o_proc.c linux-2.6.38.1/drivers/message/i2o/i2o_proc.c
+--- linux-2.6.38.1/drivers/message/i2o/i2o_proc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/message/i2o/i2o_proc.c 2011-03-21 18:31:35.000000000 -0400
@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
"Array Controller Device"
};
@@ -25826,9 +25826,9 @@ diff -urNp linux-2.6.38/drivers/message/i2o/i2o_proc.c linux-2.6.38-new/drivers/
return 0;
}
-diff -urNp linux-2.6.38/drivers/mfd/ab3100-core.c linux-2.6.38-new/drivers/mfd/ab3100-core.c
---- linux-2.6.38/drivers/mfd/ab3100-core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/mfd/ab3100-core.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/mfd/ab3100-core.c linux-2.6.38.1/drivers/mfd/ab3100-core.c
+--- linux-2.6.38.1/drivers/mfd/ab3100-core.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/mfd/ab3100-core.c 2011-03-21 18:31:35.000000000 -0400
@@ -613,7 +613,7 @@ static void ab3100_setup_debugfs(struct
ab3100_get_priv.ab3100 = ab3100;
ab3100_get_priv.mode = false;
@@ -25847,9 +25847,9 @@ diff -urNp linux-2.6.38/drivers/mfd/ab3100-core.c linux-2.6.38-new/drivers/mfd/a
&ab3100_get_set_reg_fops);
if (!ab3100_set_reg_file) {
err = -ENOMEM;
-diff -urNp linux-2.6.38/drivers/mfd/ab3550-core.c linux-2.6.38-new/drivers/mfd/ab3550-core.c
---- linux-2.6.38/drivers/mfd/ab3550-core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/mfd/ab3550-core.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/mfd/ab3550-core.c linux-2.6.38.1/drivers/mfd/ab3550-core.c
+--- linux-2.6.38.1/drivers/mfd/ab3550-core.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/mfd/ab3550-core.c 2011-03-21 18:31:35.000000000 -0400
@@ -1053,17 +1053,17 @@ static inline void ab3550_setup_debugfs(
goto exit_destroy_dir;
@@ -25871,9 +25871,9 @@ diff -urNp linux-2.6.38/drivers/mfd/ab3550-core.c linux-2.6.38-new/drivers/mfd/a
if (!ab3550_val_file)
goto exit_destroy_address;
-diff -urNp linux-2.6.38/drivers/mfd/ab8500-debugfs.c linux-2.6.38-new/drivers/mfd/ab8500-debugfs.c
---- linux-2.6.38/drivers/mfd/ab8500-debugfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/mfd/ab8500-debugfs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/mfd/ab8500-debugfs.c linux-2.6.38.1/drivers/mfd/ab8500-debugfs.c
+--- linux-2.6.38.1/drivers/mfd/ab8500-debugfs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/mfd/ab8500-debugfs.c 2011-03-21 18:31:35.000000000 -0400
@@ -585,18 +585,18 @@ static int __devinit ab8500_debug_probe(
goto exit_destroy_dir;
@@ -25896,9 +25896,9 @@ diff -urNp linux-2.6.38/drivers/mfd/ab8500-debugfs.c linux-2.6.38-new/drivers/mf
if (!ab8500_val_file)
goto exit_destroy_address;
-diff -urNp linux-2.6.38/drivers/mfd/janz-cmodio.c linux-2.6.38-new/drivers/mfd/janz-cmodio.c
---- linux-2.6.38/drivers/mfd/janz-cmodio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/mfd/janz-cmodio.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/mfd/janz-cmodio.c linux-2.6.38.1/drivers/mfd/janz-cmodio.c
+--- linux-2.6.38.1/drivers/mfd/janz-cmodio.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/mfd/janz-cmodio.c 2011-03-21 18:31:35.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
@@ -25907,9 +25907,9 @@ diff -urNp linux-2.6.38/drivers/mfd/janz-cmodio.c linux-2.6.38-new/drivers/mfd/j
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
-diff -urNp linux-2.6.38/drivers/misc/ep93xx_pwm.c linux-2.6.38-new/drivers/misc/ep93xx_pwm.c
---- linux-2.6.38/drivers/misc/ep93xx_pwm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/misc/ep93xx_pwm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/misc/ep93xx_pwm.c linux-2.6.38.1/drivers/misc/ep93xx_pwm.c
+--- linux-2.6.38.1/drivers/misc/ep93xx_pwm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/misc/ep93xx_pwm.c 2011-03-21 18:31:35.000000000 -0400
@@ -249,11 +249,11 @@ static ssize_t ep93xx_pwm_set_invert(str
static DEVICE_ATTR(min_freq, S_IRUGO, ep93xx_pwm_get_min_freq, NULL);
@@ -25925,9 +25925,9 @@ diff -urNp linux-2.6.38/drivers/misc/ep93xx_pwm.c linux-2.6.38-new/drivers/misc/
ep93xx_pwm_get_invert, ep93xx_pwm_set_invert);
static struct attribute *ep93xx_pwm_attrs[] = {
-diff -urNp linux-2.6.38/drivers/misc/kgdbts.c linux-2.6.38-new/drivers/misc/kgdbts.c
---- linux-2.6.38/drivers/misc/kgdbts.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/misc/kgdbts.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/misc/kgdbts.c linux-2.6.38.1/drivers/misc/kgdbts.c
+--- linux-2.6.38.1/drivers/misc/kgdbts.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/misc/kgdbts.c 2011-03-21 18:31:35.000000000 -0400
@@ -118,7 +118,7 @@
} while (0)
#define MAX_CONFIG_LEN 40
@@ -25946,9 +25946,9 @@ diff -urNp linux-2.6.38/drivers/misc/kgdbts.c linux-2.6.38-new/drivers/misc/kgdb
.name = "kgdbts",
.read_char = kgdbts_get_char,
.write_char = kgdbts_put_char,
-diff -urNp linux-2.6.38/drivers/misc/sgi-gru/gruhandles.c linux-2.6.38-new/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.38/drivers/misc/sgi-gru/gruhandles.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/misc/sgi-gru/gruhandles.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/misc/sgi-gru/gruhandles.c linux-2.6.38.1/drivers/misc/sgi-gru/gruhandles.c
+--- linux-2.6.38.1/drivers/misc/sgi-gru/gruhandles.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/misc/sgi-gru/gruhandles.c 2011-03-21 18:31:35.000000000 -0400
@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
unsigned long nsec;
@@ -25960,9 +25960,9 @@ diff -urNp linux-2.6.38/drivers/misc/sgi-gru/gruhandles.c linux-2.6.38-new/drive
if (mcs_op_statistics[op].max < nsec)
mcs_op_statistics[op].max = nsec;
}
-diff -urNp linux-2.6.38/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38-new/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.38/drivers/misc/sgi-gru/gruprocfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/misc/sgi-gru/gruprocfs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38.1/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-2.6.38.1/drivers/misc/sgi-gru/gruprocfs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/misc/sgi-gru/gruprocfs.c 2011-03-21 18:31:35.000000000 -0400
@@ -32,9 +32,9 @@
#define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -25986,9 +25986,9 @@ diff -urNp linux-2.6.38/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38-new/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.38/drivers/misc/sgi-gru/grutables.h linux-2.6.38-new/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.38/drivers/misc/sgi-gru/grutables.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/misc/sgi-gru/grutables.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/misc/sgi-gru/grutables.h linux-2.6.38.1/drivers/misc/sgi-gru/grutables.h
+--- linux-2.6.38.1/drivers/misc/sgi-gru/grutables.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/misc/sgi-gru/grutables.h 2011-03-21 18:31:35.000000000 -0400
@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
* GRU statistics.
*/
@@ -26168,9 +26168,9 @@ diff -urNp linux-2.6.38/drivers/misc/sgi-gru/grutables.h linux-2.6.38-new/driver
} while (0)
#ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-2.6.38/drivers/mtd/devices/doc2000.c linux-2.6.38-new/drivers/mtd/devices/doc2000.c
---- linux-2.6.38/drivers/mtd/devices/doc2000.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/mtd/devices/doc2000.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/mtd/devices/doc2000.c linux-2.6.38.1/drivers/mtd/devices/doc2000.c
+--- linux-2.6.38.1/drivers/mtd/devices/doc2000.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/mtd/devices/doc2000.c 2011-03-21 18:31:35.000000000 -0400
@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
/* The ECC will not be calculated correctly if less than 512 is written */
@@ -26180,9 +26180,9 @@ diff -urNp linux-2.6.38/drivers/mtd/devices/doc2000.c linux-2.6.38-new/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.38/drivers/mtd/devices/doc2001.c linux-2.6.38-new/drivers/mtd/devices/doc2001.c
---- linux-2.6.38/drivers/mtd/devices/doc2001.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/mtd/devices/doc2001.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/mtd/devices/doc2001.c linux-2.6.38.1/drivers/mtd/devices/doc2001.c
+--- linux-2.6.38.1/drivers/mtd/devices/doc2001.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/mtd/devices/doc2001.c 2011-03-21 18:31:35.000000000 -0400
@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
struct Nand *mychip = &this->chips[from >> (this->chipshift)];
@@ -26192,9 +26192,9 @@ diff -urNp linux-2.6.38/drivers/mtd/devices/doc2001.c linux-2.6.38-new/drivers/m
return -EINVAL;
/* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-2.6.38/drivers/mtd/nand/denali.c linux-2.6.38-new/drivers/mtd/nand/denali.c
---- linux-2.6.38/drivers/mtd/nand/denali.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/mtd/nand/denali.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/mtd/nand/denali.c linux-2.6.38.1/drivers/mtd/nand/denali.c
+--- linux-2.6.38.1/drivers/mtd/nand/denali.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/mtd/nand/denali.c 2011-03-21 18:31:35.000000000 -0400
@@ -25,6 +25,7 @@
#include <linux/pci.h>
#include <linux/mtd/mtd.h>
@@ -26203,9 +26203,9 @@ diff -urNp linux-2.6.38/drivers/mtd/nand/denali.c linux-2.6.38-new/drivers/mtd/n
#include "denali.h"
-diff -urNp linux-2.6.38/drivers/mtd/ubi/build.c linux-2.6.38-new/drivers/mtd/ubi/build.c
---- linux-2.6.38/drivers/mtd/ubi/build.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/mtd/ubi/build.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/mtd/ubi/build.c linux-2.6.38.1/drivers/mtd/ubi/build.c
+--- linux-2.6.38.1/drivers/mtd/ubi/build.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/mtd/ubi/build.c 2011-03-21 18:31:35.000000000 -0400
@@ -1285,7 +1285,7 @@ module_exit(ubi_exit);
static int __init bytes_str_to_int(const char *str)
{
@@ -26245,9 +26245,9 @@ diff -urNp linux-2.6.38/drivers/mtd/ubi/build.c linux-2.6.38-new/drivers/mtd/ubi
}
/**
-diff -urNp linux-2.6.38/drivers/net/e1000e/82571.c linux-2.6.38-new/drivers/net/e1000e/82571.c
---- linux-2.6.38/drivers/net/e1000e/82571.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/e1000e/82571.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/e1000e/82571.c linux-2.6.38.1/drivers/net/e1000e/82571.c
+--- linux-2.6.38.1/drivers/net/e1000e/82571.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/e1000e/82571.c 2011-03-21 18:31:35.000000000 -0400
@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s
{
struct e1000_hw *hw = &adapter->hw;
@@ -26302,9 +26302,9 @@ diff -urNp linux-2.6.38/drivers/net/e1000e/82571.c linux-2.6.38-new/drivers/net/
.acquire = e1000_acquire_nvm_82571,
.read = e1000e_read_nvm_eerd,
.release = e1000_release_nvm_82571,
-diff -urNp linux-2.6.38/drivers/net/e1000e/e1000.h linux-2.6.38-new/drivers/net/e1000e/e1000.h
---- linux-2.6.38/drivers/net/e1000e/e1000.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/e1000e/e1000.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/e1000e/e1000.h linux-2.6.38.1/drivers/net/e1000e/e1000.h
+--- linux-2.6.38.1/drivers/net/e1000e/e1000.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/e1000e/e1000.h 2011-03-21 18:31:35.000000000 -0400
@@ -408,9 +408,9 @@ struct e1000_info {
u32 pba;
u32 max_hw_frame_size;
@@ -26318,9 +26318,9 @@ diff -urNp linux-2.6.38/drivers/net/e1000e/e1000.h linux-2.6.38-new/drivers/net/
};
/* hardware capability, feature, and workaround flags */
-diff -urNp linux-2.6.38/drivers/net/e1000e/es2lan.c linux-2.6.38-new/drivers/net/e1000e/es2lan.c
---- linux-2.6.38/drivers/net/e1000e/es2lan.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/e1000e/es2lan.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/e1000e/es2lan.c linux-2.6.38.1/drivers/net/e1000e/es2lan.c
+--- linux-2.6.38.1/drivers/net/e1000e/es2lan.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/e1000e/es2lan.c 2011-03-21 18:31:35.000000000 -0400
@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es
{
struct e1000_hw *hw = &adapter->hw;
@@ -26357,9 +26357,9 @@ diff -urNp linux-2.6.38/drivers/net/e1000e/es2lan.c linux-2.6.38-new/drivers/net
.acquire = e1000_acquire_nvm_80003es2lan,
.read = e1000e_read_nvm_eerd,
.release = e1000_release_nvm_80003es2lan,
-diff -urNp linux-2.6.38/drivers/net/e1000e/hw.h linux-2.6.38-new/drivers/net/e1000e/hw.h
---- linux-2.6.38/drivers/net/e1000e/hw.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/e1000e/hw.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/e1000e/hw.h linux-2.6.38.1/drivers/net/e1000e/hw.h
+--- linux-2.6.38.1/drivers/net/e1000e/hw.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/e1000e/hw.h 2011-03-21 18:31:35.000000000 -0400
@@ -801,16 +801,17 @@ struct e1000_phy_operations {
/* Function pointers for the NVM. */
@@ -26401,9 +26401,9 @@ diff -urNp linux-2.6.38/drivers/net/e1000e/hw.h linux-2.6.38-new/drivers/net/e10
struct e1000_nvm_operations ops;
enum e1000_nvm_type type;
-diff -urNp linux-2.6.38/drivers/net/e1000e/ich8lan.c linux-2.6.38-new/drivers/net/e1000e/ich8lan.c
---- linux-2.6.38/drivers/net/e1000e/ich8lan.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/e1000e/ich8lan.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/e1000e/ich8lan.c linux-2.6.38.1/drivers/net/e1000e/ich8lan.c
+--- linux-2.6.38.1/drivers/net/e1000e/ich8lan.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/e1000e/ich8lan.c 2011-03-21 18:31:35.000000000 -0400
@@ -3840,7 +3840,7 @@ static void e1000_clear_hw_cntrs_ich8lan
}
}
@@ -26431,9 +26431,9 @@ diff -urNp linux-2.6.38/drivers/net/e1000e/ich8lan.c linux-2.6.38-new/drivers/ne
.acquire = e1000_acquire_nvm_ich8lan,
.read = e1000_read_nvm_ich8lan,
.release = e1000_release_nvm_ich8lan,
-diff -urNp linux-2.6.38/drivers/net/igb/e1000_82575.c linux-2.6.38-new/drivers/net/igb/e1000_82575.c
---- linux-2.6.38/drivers/net/igb/e1000_82575.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/igb/e1000_82575.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/igb/e1000_82575.c linux-2.6.38.1/drivers/net/igb/e1000_82575.c
+--- linux-2.6.38.1/drivers/net/igb/e1000_82575.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/igb/e1000_82575.c 2011-03-21 18:31:35.000000000 -0400
@@ -1747,7 +1747,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
return ret_val;
}
@@ -26459,9 +26459,9 @@ diff -urNp linux-2.6.38/drivers/net/igb/e1000_82575.c linux-2.6.38-new/drivers/n
.acquire = igb_acquire_nvm_82575,
.read = igb_read_nvm_eerd,
.release = igb_release_nvm_82575,
-diff -urNp linux-2.6.38/drivers/net/igb/e1000_hw.h linux-2.6.38-new/drivers/net/igb/e1000_hw.h
---- linux-2.6.38/drivers/net/igb/e1000_hw.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/igb/e1000_hw.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/igb/e1000_hw.h linux-2.6.38.1/drivers/net/igb/e1000_hw.h
+--- linux-2.6.38.1/drivers/net/igb/e1000_hw.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/igb/e1000_hw.h 2011-03-21 18:31:35.000000000 -0400
@@ -327,22 +327,23 @@ struct e1000_phy_operations {
};
@@ -26509,9 +26509,9 @@ diff -urNp linux-2.6.38/drivers/net/igb/e1000_hw.h linux-2.6.38-new/drivers/net/
struct e1000_nvm_operations ops;
enum e1000_nvm_type type;
-diff -urNp linux-2.6.38/drivers/net/igbvf/vf.h linux-2.6.38-new/drivers/net/igbvf/vf.h
---- linux-2.6.38/drivers/net/igbvf/vf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/igbvf/vf.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/igbvf/vf.h linux-2.6.38.1/drivers/net/igbvf/vf.h
+--- linux-2.6.38.1/drivers/net/igbvf/vf.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/igbvf/vf.h 2011-03-21 18:31:35.000000000 -0400
@@ -191,6 +191,7 @@ struct e1000_mac_operations {
};
@@ -26520,9 +26520,9 @@ diff -urNp linux-2.6.38/drivers/net/igbvf/vf.h linux-2.6.38-new/drivers/net/igbv
struct e1000_mac_operations ops;
u8 addr[6];
u8 perm_addr[6];
-diff -urNp linux-2.6.38/drivers/net/irda/vlsi_ir.c linux-2.6.38-new/drivers/net/irda/vlsi_ir.c
---- linux-2.6.38/drivers/net/irda/vlsi_ir.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/irda/vlsi_ir.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/irda/vlsi_ir.c linux-2.6.38.1/drivers/net/irda/vlsi_ir.c
+--- linux-2.6.38.1/drivers/net/irda/vlsi_ir.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/irda/vlsi_ir.c 2011-03-21 18:31:35.000000000 -0400
@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
/* no race - tx-ring already empty */
vlsi_set_baud(idev, iobase);
@@ -26539,9 +26539,9 @@ diff -urNp linux-2.6.38/drivers/net/irda/vlsi_ir.c linux-2.6.38-new/drivers/net/
spin_unlock_irqrestore(&idev->lock, flags);
dev_kfree_skb_any(skb);
return NETDEV_TX_OK;
-diff -urNp linux-2.6.38/drivers/net/pcnet32.c linux-2.6.38-new/drivers/net/pcnet32.c
---- linux-2.6.38/drivers/net/pcnet32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/pcnet32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/pcnet32.c linux-2.6.38.1/drivers/net/pcnet32.c
+--- linux-2.6.38.1/drivers/net/pcnet32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/pcnet32.c 2011-03-21 18:31:35.000000000 -0400
@@ -82,7 +82,7 @@ static int cards_found;
/*
* VLB I/O addresses
@@ -26551,9 +26551,9 @@ diff -urNp linux-2.6.38/drivers/net/pcnet32.c linux-2.6.38-new/drivers/net/pcnet
{ 0x300, 0x320, 0x340, 0x360, 0 };
static int pcnet32_debug;
-diff -urNp linux-2.6.38/drivers/net/ppp_generic.c linux-2.6.38-new/drivers/net/ppp_generic.c
---- linux-2.6.38/drivers/net/ppp_generic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/ppp_generic.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/ppp_generic.c linux-2.6.38.1/drivers/net/ppp_generic.c
+--- linux-2.6.38.1/drivers/net/ppp_generic.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/ppp_generic.c 2011-03-21 18:31:35.000000000 -0400
@@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, st
void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
struct ppp_stats stats;
@@ -26572,9 +26572,9 @@ diff -urNp linux-2.6.38/drivers/net/ppp_generic.c linux-2.6.38-new/drivers/net/p
break;
err = 0;
break;
-diff -urNp linux-2.6.38/drivers/net/tg3.h linux-2.6.38-new/drivers/net/tg3.h
---- linux-2.6.38/drivers/net/tg3.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/tg3.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/tg3.h linux-2.6.38.1/drivers/net/tg3.h
+--- linux-2.6.38.1/drivers/net/tg3.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/tg3.h 2011-03-21 18:31:35.000000000 -0400
@@ -131,6 +131,7 @@
#define CHIPREV_ID_5750_A0 0x4000
#define CHIPREV_ID_5750_A1 0x4001
@@ -26583,9 +26583,9 @@ diff -urNp linux-2.6.38/drivers/net/tg3.h linux-2.6.38-new/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.38/drivers/net/tulip/de4x5.c linux-2.6.38-new/drivers/net/tulip/de4x5.c
---- linux-2.6.38/drivers/net/tulip/de4x5.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/tulip/de4x5.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/tulip/de4x5.c linux-2.6.38.1/drivers/net/tulip/de4x5.c
+--- linux-2.6.38.1/drivers/net/tulip/de4x5.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/tulip/de4x5.c 2011-03-21 18:31:35.000000000 -0400
@@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru
for (i=0; i<ETH_ALEN; i++) {
tmp.addr[i] = dev->dev_addr[i];
@@ -26604,9 +26604,9 @@ diff -urNp linux-2.6.38/drivers/net/tulip/de4x5.c linux-2.6.38-new/drivers/net/t
return -EFAULT;
break;
}
-diff -urNp linux-2.6.38/drivers/net/usb/hso.c linux-2.6.38-new/drivers/net/usb/hso.c
---- linux-2.6.38/drivers/net/usb/hso.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/usb/hso.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/usb/hso.c linux-2.6.38.1/drivers/net/usb/hso.c
+--- linux-2.6.38.1/drivers/net/usb/hso.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/usb/hso.c 2011-03-21 18:31:35.000000000 -0400
@@ -71,7 +71,7 @@
#include <asm/byteorder.h>
#include <linux/serial_core.h>
@@ -26703,9 +26703,9 @@ diff -urNp linux-2.6.38/drivers/net/usb/hso.c linux-2.6.38-new/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.38/drivers/net/wireless/b43/debugfs.c linux-2.6.38-new/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.38/drivers/net/wireless/b43/debugfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/wireless/b43/debugfs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/wireless/b43/debugfs.c linux-2.6.38.1/drivers/net/wireless/b43/debugfs.c
+--- linux-2.6.38.1/drivers/net/wireless/b43/debugfs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/wireless/b43/debugfs.c 2011-03-21 18:31:35.000000000 -0400
@@ -43,7 +43,7 @@ static struct dentry *rootdir;
struct b43_debugfs_fops {
ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -26715,9 +26715,9 @@ diff -urNp linux-2.6.38/drivers/net/wireless/b43/debugfs.c linux-2.6.38-new/driv
/* Offset of struct b43_dfs_file in struct b43_dfsentry */
size_t file_struct_offset;
};
-diff -urNp linux-2.6.38/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.38-new/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.38/drivers/net/wireless/b43legacy/debugfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/wireless/b43legacy/debugfs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.38.1/drivers/net/wireless/b43legacy/debugfs.c
+--- linux-2.6.38.1/drivers/net/wireless/b43legacy/debugfs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/wireless/b43legacy/debugfs.c 2011-03-21 18:31:35.000000000 -0400
@@ -44,7 +44,7 @@ static struct dentry *rootdir;
struct b43legacy_debugfs_fops {
ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -26727,9 +26727,9 @@ diff -urNp linux-2.6.38/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.38-ne
/* 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.38/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.38-new/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.38/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.38.1/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-2.6.38.1/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-21 18:31:35.000000000 -0400
@@ -68,8 +68,8 @@ do {
} while (0)
@@ -26741,9 +26741,9 @@ diff -urNp linux-2.6.38/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.38-ne
static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
const void *p, u32 len)
{}
-diff -urNp linux-2.6.38/drivers/net/wireless/libertas/debugfs.c linux-2.6.38-new/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.38/drivers/net/wireless/libertas/debugfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/wireless/libertas/debugfs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/wireless/libertas/debugfs.c linux-2.6.38.1/drivers/net/wireless/libertas/debugfs.c
+--- linux-2.6.38.1/drivers/net/wireless/libertas/debugfs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/wireless/libertas/debugfs.c 2011-03-21 18:31:35.000000000 -0400
@@ -702,7 +702,7 @@ out_unlock:
struct lbs_debugfs_files {
const char *name;
@@ -26753,9 +26753,9 @@ diff -urNp linux-2.6.38/drivers/net/wireless/libertas/debugfs.c linux-2.6.38-new
};
static const struct lbs_debugfs_files debugfs_files[] = {
-diff -urNp linux-2.6.38/drivers/net/wireless/rndis_wlan.c linux-2.6.38-new/drivers/net/wireless/rndis_wlan.c
---- linux-2.6.38/drivers/net/wireless/rndis_wlan.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/net/wireless/rndis_wlan.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/net/wireless/rndis_wlan.c linux-2.6.38.1/drivers/net/wireless/rndis_wlan.c
+--- linux-2.6.38.1/drivers/net/wireless/rndis_wlan.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/net/wireless/rndis_wlan.c 2011-03-21 18:31:35.000000000 -0400
@@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn
netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
@@ -26765,9 +26765,9 @@ diff -urNp linux-2.6.38/drivers/net/wireless/rndis_wlan.c linux-2.6.38-new/drive
rts_threshold = 2347;
tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-2.6.38/drivers/oprofile/buffer_sync.c linux-2.6.38-new/drivers/oprofile/buffer_sync.c
---- linux-2.6.38/drivers/oprofile/buffer_sync.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/oprofile/buffer_sync.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/oprofile/buffer_sync.c linux-2.6.38.1/drivers/oprofile/buffer_sync.c
+--- linux-2.6.38.1/drivers/oprofile/buffer_sync.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/oprofile/buffer_sync.c 2011-03-21 18:31:35.000000000 -0400
@@ -342,7 +342,7 @@ static void add_data(struct op_entry *en
if (cookie == NO_COOKIE)
offset = pc;
@@ -26803,9 +26803,9 @@ diff -urNp linux-2.6.38/drivers/oprofile/buffer_sync.c linux-2.6.38-new/drivers/
}
}
release_mm(mm);
-diff -urNp linux-2.6.38/drivers/oprofile/event_buffer.c linux-2.6.38-new/drivers/oprofile/event_buffer.c
---- linux-2.6.38/drivers/oprofile/event_buffer.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/oprofile/event_buffer.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/oprofile/event_buffer.c linux-2.6.38.1/drivers/oprofile/event_buffer.c
+--- linux-2.6.38.1/drivers/oprofile/event_buffer.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/oprofile/event_buffer.c 2011-03-21 18:31:35.000000000 -0400
@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
}
@@ -26815,9 +26815,9 @@ diff -urNp linux-2.6.38/drivers/oprofile/event_buffer.c linux-2.6.38-new/drivers
return;
}
-diff -urNp linux-2.6.38/drivers/oprofile/oprof.c linux-2.6.38-new/drivers/oprofile/oprof.c
---- linux-2.6.38/drivers/oprofile/oprof.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/oprofile/oprof.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/oprofile/oprof.c linux-2.6.38.1/drivers/oprofile/oprof.c
+--- linux-2.6.38.1/drivers/oprofile/oprof.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/oprofile/oprof.c 2011-03-21 18:31:35.000000000 -0400
@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
if (oprofile_ops.switch_events())
return;
@@ -26827,9 +26827,9 @@ diff -urNp linux-2.6.38/drivers/oprofile/oprof.c linux-2.6.38-new/drivers/oprofi
start_switch_worker();
}
-diff -urNp linux-2.6.38/drivers/oprofile/oprofilefs.c linux-2.6.38-new/drivers/oprofile/oprofilefs.c
---- linux-2.6.38/drivers/oprofile/oprofilefs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/oprofile/oprofilefs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/oprofile/oprofilefs.c linux-2.6.38.1/drivers/oprofile/oprofilefs.c
+--- linux-2.6.38.1/drivers/oprofile/oprofilefs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/oprofile/oprofilefs.c 2011-03-21 18:31:35.000000000 -0400
@@ -186,7 +186,7 @@ static const struct file_operations atom
@@ -26839,9 +26839,9 @@ diff -urNp linux-2.6.38/drivers/oprofile/oprofilefs.c linux-2.6.38-new/drivers/o
{
return __oprofilefs_create_file(sb, root, name,
&atomic_ro_fops, 0444, val);
-diff -urNp linux-2.6.38/drivers/oprofile/oprofile_stats.c linux-2.6.38-new/drivers/oprofile/oprofile_stats.c
---- linux-2.6.38/drivers/oprofile/oprofile_stats.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/oprofile/oprofile_stats.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/oprofile/oprofile_stats.c linux-2.6.38.1/drivers/oprofile/oprofile_stats.c
+--- linux-2.6.38.1/drivers/oprofile/oprofile_stats.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/oprofile/oprofile_stats.c 2011-03-21 18:31:35.000000000 -0400
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
cpu_buf->sample_invalid_eip = 0;
}
@@ -26859,9 +26859,9 @@ diff -urNp linux-2.6.38/drivers/oprofile/oprofile_stats.c linux-2.6.38-new/drive
}
-diff -urNp linux-2.6.38/drivers/oprofile/oprofile_stats.h linux-2.6.38-new/drivers/oprofile/oprofile_stats.h
---- linux-2.6.38/drivers/oprofile/oprofile_stats.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/oprofile/oprofile_stats.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/oprofile/oprofile_stats.h linux-2.6.38.1/drivers/oprofile/oprofile_stats.h
+--- linux-2.6.38.1/drivers/oprofile/oprofile_stats.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/oprofile/oprofile_stats.h 2011-03-21 18:31:35.000000000 -0400
@@ -13,11 +13,11 @@
#include <asm/atomic.h>
@@ -26879,9 +26879,9 @@ diff -urNp linux-2.6.38/drivers/oprofile/oprofile_stats.h linux-2.6.38-new/drive
};
extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-2.6.38/drivers/parport/procfs.c linux-2.6.38-new/drivers/parport/procfs.c
---- linux-2.6.38/drivers/parport/procfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/parport/procfs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/parport/procfs.c linux-2.6.38.1/drivers/parport/procfs.c
+--- linux-2.6.38.1/drivers/parport/procfs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/parport/procfs.c 2011-03-21 18:31:35.000000000 -0400
@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
*ppos += len;
@@ -26900,9 +26900,9 @@ diff -urNp linux-2.6.38/drivers/parport/procfs.c linux-2.6.38-new/drivers/parpor
}
#endif /* IEEE1284.3 support. */
-diff -urNp linux-2.6.38/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.38-new/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.38/drivers/pci/hotplug/acpiphp_glue.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/pci/hotplug/acpiphp_glue.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.38.1/drivers/pci/hotplug/acpiphp_glue.c
+--- linux-2.6.38.1/drivers/pci/hotplug/acpiphp_glue.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/pci/hotplug/acpiphp_glue.c 2011-03-21 18:31:35.000000000 -0400
@@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif
}
@@ -26912,9 +26912,9 @@ diff -urNp linux-2.6.38/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.38-new/driv
.handler = handle_hotplug_event_func,
};
-diff -urNp linux-2.6.38/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.38-new/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.38/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.38.1/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-2.6.38.1/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-21 18:31:35.000000000 -0400
@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
void compaq_nvram_init (void __iomem *rom_start)
@@ -26929,9 +26929,9 @@ diff -urNp linux-2.6.38/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.38-new/driv
dbg("int15 entry = %p\n", compaq_int15_entry_point);
/* initialize our int15 lock */
-diff -urNp linux-2.6.38/drivers/pci/intel-iommu.c linux-2.6.38-new/drivers/pci/intel-iommu.c
---- linux-2.6.38/drivers/pci/intel-iommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/pci/intel-iommu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/pci/intel-iommu.c linux-2.6.38.1/drivers/pci/intel-iommu.c
+--- linux-2.6.38.1/drivers/pci/intel-iommu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/pci/intel-iommu.c 2011-03-21 18:31:35.000000000 -0400
@@ -2934,7 +2934,7 @@ static int intel_mapping_error(struct de
return !dma_addr;
}
@@ -26941,9 +26941,9 @@ diff -urNp linux-2.6.38/drivers/pci/intel-iommu.c linux-2.6.38-new/drivers/pci/i
.alloc_coherent = intel_alloc_coherent,
.free_coherent = intel_free_coherent,
.map_sg = intel_map_sg,
-diff -urNp linux-2.6.38/drivers/pci/pcie/aspm.c linux-2.6.38-new/drivers/pci/pcie/aspm.c
---- linux-2.6.38/drivers/pci/pcie/aspm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/pci/pcie/aspm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/pci/pcie/aspm.c linux-2.6.38.1/drivers/pci/pcie/aspm.c
+--- linux-2.6.38.1/drivers/pci/pcie/aspm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/pci/pcie/aspm.c 2011-03-21 18:31:35.000000000 -0400
@@ -27,9 +27,9 @@
#define MODULE_PARAM_PREFIX "pcie_aspm."
@@ -26957,9 +26957,9 @@ diff -urNp linux-2.6.38/drivers/pci/pcie/aspm.c linux-2.6.38-new/drivers/pci/pci
#define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
#define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
-diff -urNp linux-2.6.38/drivers/pci/pcie/portdrv_pci.c linux-2.6.38-new/drivers/pci/pcie/portdrv_pci.c
---- linux-2.6.38/drivers/pci/pcie/portdrv_pci.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/pci/pcie/portdrv_pci.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/pci/pcie/portdrv_pci.c linux-2.6.38.1/drivers/pci/pcie/portdrv_pci.c
+--- linux-2.6.38.1/drivers/pci/pcie/portdrv_pci.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/pci/pcie/portdrv_pci.c 2011-03-21 18:31:35.000000000 -0400
@@ -307,7 +307,7 @@ static void pcie_portdrv_err_resume(stru
static const struct pci_device_id port_pci_ids[] = { {
/* handle any PCI-Express port */
@@ -26969,9 +26969,9 @@ diff -urNp linux-2.6.38/drivers/pci/pcie/portdrv_pci.c linux-2.6.38-new/drivers/
};
MODULE_DEVICE_TABLE(pci, port_pci_ids);
-diff -urNp linux-2.6.38/drivers/pci/probe.c linux-2.6.38-new/drivers/pci/probe.c
---- linux-2.6.38/drivers/pci/probe.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/pci/probe.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/pci/probe.c linux-2.6.38.1/drivers/pci/probe.c
+--- linux-2.6.38.1/drivers/pci/probe.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/pci/probe.c 2011-03-21 18:31:35.000000000 -0400
@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
return ret;
}
@@ -26998,9 +26998,9 @@ diff -urNp linux-2.6.38/drivers/pci/probe.c linux-2.6.38-new/drivers/pci/probe.c
if (!dev->mmio_always_on) {
pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
-diff -urNp linux-2.6.38/drivers/pci/proc.c linux-2.6.38-new/drivers/pci/proc.c
---- linux-2.6.38/drivers/pci/proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/pci/proc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/pci/proc.c linux-2.6.38.1/drivers/pci/proc.c
+--- linux-2.6.38.1/drivers/pci/proc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/pci/proc.c 2011-03-21 18:31:35.000000000 -0400
@@ -476,7 +476,16 @@ static const struct file_operations proc
static int __init pci_proc_init(void)
{
@@ -27018,9 +27018,9 @@ diff -urNp linux-2.6.38/drivers/pci/proc.c linux-2.6.38-new/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.38/drivers/pcmcia/ti113x.h linux-2.6.38-new/drivers/pcmcia/ti113x.h
---- linux-2.6.38/drivers/pcmcia/ti113x.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/pcmcia/ti113x.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/pcmcia/ti113x.h linux-2.6.38.1/drivers/pcmcia/ti113x.h
+--- linux-2.6.38.1/drivers/pcmcia/ti113x.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/pcmcia/ti113x.h 2011-03-21 18:31:35.000000000 -0400
@@ -936,7 +936,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),
@@ -27030,9 +27030,9 @@ diff -urNp linux-2.6.38/drivers/pcmcia/ti113x.h linux-2.6.38-new/drivers/pcmcia/
};
static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
-diff -urNp linux-2.6.38/drivers/pcmcia/yenta_socket.c linux-2.6.38-new/drivers/pcmcia/yenta_socket.c
---- linux-2.6.38/drivers/pcmcia/yenta_socket.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/pcmcia/yenta_socket.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/pcmcia/yenta_socket.c linux-2.6.38.1/drivers/pcmcia/yenta_socket.c
+--- linux-2.6.38.1/drivers/pcmcia/yenta_socket.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/pcmcia/yenta_socket.c 2011-03-21 18:31:35.000000000 -0400
@@ -1426,7 +1426,7 @@ static struct pci_device_id yenta_table[
/* match any cardbus bridge */
@@ -27042,9 +27042,9 @@ diff -urNp linux-2.6.38/drivers/pcmcia/yenta_socket.c linux-2.6.38-new/drivers/p
};
MODULE_DEVICE_TABLE(pci, yenta_table);
-diff -urNp linux-2.6.38/drivers/platform/x86/asus-laptop.c linux-2.6.38-new/drivers/platform/x86/asus-laptop.c
---- linux-2.6.38/drivers/platform/x86/asus-laptop.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/platform/x86/asus-laptop.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/platform/x86/asus-laptop.c linux-2.6.38.1/drivers/platform/x86/asus-laptop.c
+--- linux-2.6.38.1/drivers/platform/x86/asus-laptop.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/platform/x86/asus-laptop.c 2011-03-21 18:31:35.000000000 -0400
@@ -243,7 +243,6 @@ struct asus_laptop {
struct asus_led gled;
struct asus_led kled;
@@ -27053,9 +27053,9 @@ diff -urNp linux-2.6.38/drivers/platform/x86/asus-laptop.c linux-2.6.38-new/driv
int wireless_status;
bool have_rsts;
int lcd_state;
-diff -urNp linux-2.6.38/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38-new/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.38/drivers/pnp/pnpbios/bioscalls.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/pnp/pnpbios/bioscalls.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.1/drivers/pnp/pnpbios/bioscalls.c
+--- linux-2.6.38.1/drivers/pnp/pnpbios/bioscalls.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/pnp/pnpbios/bioscalls.c 2011-03-21 18:31:35.000000000 -0400
@@ -59,7 +59,7 @@ do { \
set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
} while(0)
@@ -27112,9 +27112,9 @@ diff -urNp linux-2.6.38/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38-new/drivers
+
+ pax_close_kernel();
}
-diff -urNp linux-2.6.38/drivers/pnp/quirks.c linux-2.6.38-new/drivers/pnp/quirks.c
---- linux-2.6.38/drivers/pnp/quirks.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/pnp/quirks.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/pnp/quirks.c linux-2.6.38.1/drivers/pnp/quirks.c
+--- linux-2.6.38.1/drivers/pnp/quirks.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/pnp/quirks.c 2011-03-21 18:31:35.000000000 -0400
@@ -322,7 +322,7 @@ static struct pnp_fixup pnp_fixups[] = {
/* PnP resources that might overlap PCI BARs */
{"PNP0c01", quirk_system_pci_resources},
@@ -27124,9 +27124,9 @@ diff -urNp linux-2.6.38/drivers/pnp/quirks.c linux-2.6.38-new/drivers/pnp/quirks
};
void pnp_fixup_device(struct pnp_dev *dev)
-diff -urNp linux-2.6.38/drivers/pnp/resource.c linux-2.6.38-new/drivers/pnp/resource.c
---- linux-2.6.38/drivers/pnp/resource.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/pnp/resource.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/pnp/resource.c linux-2.6.38.1/drivers/pnp/resource.c
+--- linux-2.6.38.1/drivers/pnp/resource.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/pnp/resource.c 2011-03-21 18:31:35.000000000 -0400
@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
return 1;
@@ -27145,9 +27145,9 @@ diff -urNp linux-2.6.38/drivers/pnp/resource.c linux-2.6.38-new/drivers/pnp/reso
return 0;
/* check if the resource is reserved */
-diff -urNp linux-2.6.38/drivers/rtc/rtc-dev.c linux-2.6.38-new/drivers/rtc/rtc-dev.c
---- linux-2.6.38/drivers/rtc/rtc-dev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/rtc/rtc-dev.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/rtc/rtc-dev.c linux-2.6.38.1/drivers/rtc/rtc-dev.c
+--- linux-2.6.38.1/drivers/rtc/rtc-dev.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/rtc/rtc-dev.c 2011-03-21 18:31:35.000000000 -0400
@@ -14,6 +14,7 @@
#include <linux/module.h>
#include <linux/rtc.h>
@@ -27165,9 +27165,9 @@ diff -urNp linux-2.6.38/drivers/rtc/rtc-dev.c linux-2.6.38-new/drivers/rtc/rtc-d
return rtc_set_time(rtc, &tm);
case RTC_PIE_ON:
-diff -urNp linux-2.6.38/drivers/rtc/rtc-ds1511.c linux-2.6.38-new/drivers/rtc/rtc-ds1511.c
---- linux-2.6.38/drivers/rtc/rtc-ds1511.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/rtc/rtc-ds1511.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/rtc/rtc-ds1511.c linux-2.6.38.1/drivers/rtc/rtc-ds1511.c
+--- linux-2.6.38.1/drivers/rtc/rtc-ds1511.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/rtc/rtc-ds1511.c 2011-03-21 18:31:35.000000000 -0400
@@ -485,7 +485,7 @@ ds1511_nvram_write(struct file *filp, st
static struct bin_attribute ds1511_nvram_attr = {
.attr = {
@@ -27177,9 +27177,9 @@ diff -urNp linux-2.6.38/drivers/rtc/rtc-ds1511.c linux-2.6.38-new/drivers/rtc/rt
},
.size = DS1511_RAM_MAX,
.read = ds1511_nvram_read,
-diff -urNp linux-2.6.38/drivers/s390/cio/qdio_debug.c linux-2.6.38-new/drivers/s390/cio/qdio_debug.c
---- linux-2.6.38/drivers/s390/cio/qdio_debug.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/s390/cio/qdio_debug.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/s390/cio/qdio_debug.c linux-2.6.38.1/drivers/s390/cio/qdio_debug.c
+--- linux-2.6.38.1/drivers/s390/cio/qdio_debug.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/s390/cio/qdio_debug.c 2011-03-21 18:31:35.000000000 -0400
@@ -225,7 +225,7 @@ static int qperf_seq_open(struct inode *
filp->f_path.dentry->d_inode->i_private);
}
@@ -27189,9 +27189,9 @@ diff -urNp linux-2.6.38/drivers/s390/cio/qdio_debug.c linux-2.6.38-new/drivers/s
.owner = THIS_MODULE,
.open = qperf_seq_open,
.read = seq_read,
-diff -urNp linux-2.6.38/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.38-new/drivers/scsi/aic94xx/aic94xx_init.c
---- linux-2.6.38/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.38.1/drivers/scsi/aic94xx/aic94xx_init.c
+--- linux-2.6.38.1/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-21 18:31:35.000000000 -0400
@@ -486,7 +486,7 @@ static ssize_t asd_show_update_bios(stru
flash_error_table[i].reason);
}
@@ -27201,9 +27201,9 @@ diff -urNp linux-2.6.38/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.38-new/dri
asd_show_update_bios, asd_store_update_bios);
static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
-diff -urNp linux-2.6.38/drivers/scsi/hpsa.c linux-2.6.38-new/drivers/scsi/hpsa.c
---- linux-2.6.38/drivers/scsi/hpsa.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/scsi/hpsa.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/scsi/hpsa.c linux-2.6.38.1/drivers/scsi/hpsa.c
+--- linux-2.6.38.1/drivers/scsi/hpsa.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/scsi/hpsa.c 2011-03-21 18:31:35.000000000 -0400
@@ -2281,6 +2281,8 @@ static int hpsa_ioctl32_passthru(struct
int err;
u32 cp;
@@ -27213,9 +27213,9 @@ diff -urNp linux-2.6.38/drivers/scsi/hpsa.c linux-2.6.38-new/drivers/scsi/hpsa.c
err = 0;
err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
sizeof(arg64.LUN_info));
-diff -urNp linux-2.6.38/drivers/scsi/ipr.c linux-2.6.38-new/drivers/scsi/ipr.c
---- linux-2.6.38/drivers/scsi/ipr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/scsi/ipr.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/scsi/ipr.c linux-2.6.38.1/drivers/scsi/ipr.c
+--- linux-2.6.38.1/drivers/scsi/ipr.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/scsi/ipr.c 2011-03-21 18:31:35.000000000 -0400
@@ -6207,7 +6207,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
return true;
}
@@ -27225,9 +27225,9 @@ diff -urNp linux-2.6.38/drivers/scsi/ipr.c linux-2.6.38-new/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.38/drivers/scsi/libfc/fc_exch.c linux-2.6.38-new/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.38/drivers/scsi/libfc/fc_exch.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/scsi/libfc/fc_exch.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/scsi/libfc/fc_exch.c linux-2.6.38.1/drivers/scsi/libfc/fc_exch.c
+--- linux-2.6.38.1/drivers/scsi/libfc/fc_exch.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/scsi/libfc/fc_exch.c 2011-03-21 18:31:35.000000000 -0400
@@ -105,12 +105,12 @@ struct fc_exch_mgr {
* all together if not used XXX
*/
@@ -27349,9 +27349,9 @@ diff -urNp linux-2.6.38/drivers/scsi/libfc/fc_exch.c linux-2.6.38-new/drivers/sc
fc_frame_free(fp);
}
-diff -urNp linux-2.6.38/drivers/scsi/libsas/sas_ata.c linux-2.6.38-new/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.38/drivers/scsi/libsas/sas_ata.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/scsi/libsas/sas_ata.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/scsi/libsas/sas_ata.c linux-2.6.38.1/drivers/scsi/libsas/sas_ata.c
+--- linux-2.6.38.1/drivers/scsi/libsas/sas_ata.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/scsi/libsas/sas_ata.c 2011-03-21 18:31:35.000000000 -0400
@@ -348,10 +348,10 @@ static int sas_ata_scr_read(struct ata_l
}
}
@@ -27365,9 +27365,9 @@ diff -urNp linux-2.6.38/drivers/scsi/libsas/sas_ata.c linux-2.6.38-new/drivers/s
.qc_prep = ata_noop_qc_prep,
.qc_issue = sas_ata_qc_issue,
.qc_fill_rtf = sas_ata_qc_fill_rtf,
-diff -urNp linux-2.6.38/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.38-new/drivers/scsi/mpt2sas/mpt2sas_debug.h
---- linux-2.6.38/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.38.1/drivers/scsi/mpt2sas/mpt2sas_debug.h
+--- linux-2.6.38.1/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-03-21 18:31:35.000000000 -0400
@@ -79,7 +79,7 @@
CMD; \
}
@@ -27377,9 +27377,9 @@ diff -urNp linux-2.6.38/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.38-new/dr
#endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
-diff -urNp linux-2.6.38/drivers/scsi/qla2xxx/qla_os.c linux-2.6.38-new/drivers/scsi/qla2xxx/qla_os.c
---- linux-2.6.38/drivers/scsi/qla2xxx/qla_os.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/scsi/qla2xxx/qla_os.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/scsi/qla2xxx/qla_os.c linux-2.6.38.1/drivers/scsi/qla2xxx/qla_os.c
+--- linux-2.6.38.1/drivers/scsi/qla2xxx/qla_os.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/scsi/qla2xxx/qla_os.c 2011-03-21 18:31:35.000000000 -0400
@@ -4096,7 +4096,7 @@ static struct pci_driver qla2xxx_pci_dri
.err_handler = &qla2xxx_err_handler,
};
@@ -27389,9 +27389,9 @@ diff -urNp linux-2.6.38/drivers/scsi/qla2xxx/qla_os.c linux-2.6.38-new/drivers/s
.owner = THIS_MODULE,
.llseek = noop_llseek,
};
-diff -urNp linux-2.6.38/drivers/scsi/scsi_logging.h linux-2.6.38-new/drivers/scsi/scsi_logging.h
---- linux-2.6.38/drivers/scsi/scsi_logging.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/scsi/scsi_logging.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/scsi/scsi_logging.h linux-2.6.38.1/drivers/scsi/scsi_logging.h
+--- linux-2.6.38.1/drivers/scsi/scsi_logging.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/scsi/scsi_logging.h 2011-03-21 18:31:35.000000000 -0400
@@ -51,7 +51,7 @@ do { \
} while (0); \
} while (0)
@@ -27401,9 +27401,9 @@ diff -urNp linux-2.6.38/drivers/scsi/scsi_logging.h linux-2.6.38-new/drivers/scs
#endif /* CONFIG_SCSI_LOGGING */
/*
-diff -urNp linux-2.6.38/drivers/scsi/scsi_transport_iscsi.c linux-2.6.38-new/drivers/scsi/scsi_transport_iscsi.c
---- linux-2.6.38/drivers/scsi/scsi_transport_iscsi.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/scsi/scsi_transport_iscsi.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/scsi/scsi_transport_iscsi.c linux-2.6.38.1/drivers/scsi/scsi_transport_iscsi.c
+--- linux-2.6.38.1/drivers/scsi/scsi_transport_iscsi.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/scsi/scsi_transport_iscsi.c 2011-03-21 18:31:35.000000000 -0400
@@ -1847,7 +1847,7 @@ store_priv_session_##field(struct device
#define iscsi_priv_session_rw_attr(field, format) \
iscsi_priv_session_attr_show(field, format) \
@@ -27413,9 +27413,9 @@ diff -urNp linux-2.6.38/drivers/scsi/scsi_transport_iscsi.c linux-2.6.38-new/dri
show_priv_session_##field, \
store_priv_session_##field)
iscsi_priv_session_rw_attr(recovery_tmo, "%d");
-diff -urNp linux-2.6.38/drivers/scsi/sg.c linux-2.6.38-new/drivers/scsi/sg.c
---- linux-2.6.38/drivers/scsi/sg.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/scsi/sg.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/scsi/sg.c linux-2.6.38.1/drivers/scsi/sg.c
+--- linux-2.6.38.1/drivers/scsi/sg.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/scsi/sg.c 2011-03-21 18:31:35.000000000 -0400
@@ -2310,7 +2310,7 @@ struct sg_proc_leaf {
const struct file_operations * fops;
};
@@ -27434,9 +27434,9 @@ diff -urNp linux-2.6.38/drivers/scsi/sg.c linux-2.6.38-new/drivers/scsi/sg.c
sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
if (!sg_proc_sgp)
-diff -urNp linux-2.6.38/drivers/staging/autofs/root.c linux-2.6.38-new/drivers/staging/autofs/root.c
---- linux-2.6.38/drivers/staging/autofs/root.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/autofs/root.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/autofs/root.c linux-2.6.38.1/drivers/staging/autofs/root.c
+--- linux-2.6.38.1/drivers/staging/autofs/root.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/autofs/root.c 2011-03-21 18:31:35.000000000 -0400
@@ -311,7 +311,8 @@ static int autofs_root_symlink(struct in
set_bit(n,sbi->symlink_bitmap);
sl = &sbi->symlink[n];
@@ -27447,9 +27447,9 @@ diff -urNp linux-2.6.38/drivers/staging/autofs/root.c linux-2.6.38-new/drivers/s
if (!sl->data) {
clear_bit(n,sbi->symlink_bitmap);
unlock_kernel();
-diff -urNp linux-2.6.38/drivers/staging/bcm/Bcmchar.c linux-2.6.38-new/drivers/staging/bcm/Bcmchar.c
---- linux-2.6.38/drivers/staging/bcm/Bcmchar.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/bcm/Bcmchar.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/bcm/Bcmchar.c linux-2.6.38.1/drivers/staging/bcm/Bcmchar.c
+--- linux-2.6.38.1/drivers/staging/bcm/Bcmchar.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/bcm/Bcmchar.c 2011-03-21 18:31:35.000000000 -0400
@@ -2093,7 +2093,7 @@ static long bcm_char_ioctl(struct file *
}
@@ -27459,9 +27459,9 @@ diff -urNp linux-2.6.38/drivers/staging/bcm/Bcmchar.c linux-2.6.38-new/drivers/s
.owner = THIS_MODULE,
.open = bcm_char_open,
.release = bcm_char_release,
-diff -urNp linux-2.6.38/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.38-new/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
---- linux-2.6.38/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.38.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+--- linux-2.6.38.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-03-21 18:31:35.000000000 -0400
@@ -863,14 +863,14 @@ static void dhd_op_if(dhd_if_t *ifp)
free_netdev(ifp->net);
}
@@ -27517,9 +27517,9 @@ diff -urNp linux-2.6.38/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6
#if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
g_bus = bus;
-diff -urNp linux-2.6.38/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.38-new/drivers/staging/brcm80211/brcmfmac/wl_iw.c
---- linux-2.6.38/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.38.1/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+--- linux-2.6.38.1/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-03-21 18:31:35.000000000 -0400
@@ -513,7 +513,7 @@ wl_iw_get_range(struct net_device *dev,
list = (wl_u32_list_t *) channels;
@@ -27529,9 +27529,9 @@ diff -urNp linux-2.6.38/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.38-
range->min_nwid = range->max_nwid = 0;
-diff -urNp linux-2.6.38/drivers/staging/comedi/comedi_fops.c linux-2.6.38-new/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.38/drivers/staging/comedi/comedi_fops.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/comedi/comedi_fops.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/comedi/comedi_fops.c linux-2.6.38.1/drivers/staging/comedi/comedi_fops.c
+--- linux-2.6.38.1/drivers/staging/comedi/comedi_fops.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/comedi/comedi_fops.c 2011-03-21 18:31:35.000000000 -0400
@@ -1426,7 +1426,7 @@ static void comedi_unmap(struct vm_area_
mutex_unlock(&dev->mutex);
}
@@ -27541,9 +27541,9 @@ diff -urNp linux-2.6.38/drivers/staging/comedi/comedi_fops.c linux-2.6.38-new/dr
.close = comedi_unmap,
};
-diff -urNp linux-2.6.38/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux-2.6.38-new/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
---- linux-2.6.38/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux-2.6.38.1/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+--- linux-2.6.38.1/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-03-21 18:31:35.000000000 -0400
@@ -55,7 +55,7 @@ int numofmsgbuf = 0;
//
// Table of entry-point routines for char device
@@ -27553,9 +27553,9 @@ diff -urNp linux-2.6.38/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux-2
{
.unlocked_ioctl = ft1000_ioctl,
.poll = ft1000_poll_dev,
-diff -urNp linux-2.6.38/drivers/staging/go7007/go7007-v4l2.c linux-2.6.38-new/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.38/drivers/staging/go7007/go7007-v4l2.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/go7007/go7007-v4l2.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/go7007/go7007-v4l2.c linux-2.6.38.1/drivers/staging/go7007/go7007-v4l2.c
+--- linux-2.6.38.1/drivers/staging/go7007/go7007-v4l2.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/go7007/go7007-v4l2.c 2011-03-21 18:31:35.000000000 -0400
@@ -1672,7 +1672,7 @@ static int go7007_vm_fault(struct vm_are
return 0;
}
@@ -27565,9 +27565,9 @@ diff -urNp linux-2.6.38/drivers/staging/go7007/go7007-v4l2.c linux-2.6.38-new/dr
.open = go7007_vm_open,
.close = go7007_vm_close,
.fault = go7007_vm_fault,
-diff -urNp linux-2.6.38/drivers/staging/hv/hv.c linux-2.6.38-new/drivers/staging/hv/hv.c
---- linux-2.6.38/drivers/staging/hv/hv.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/hv/hv.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/hv/hv.c linux-2.6.38.1/drivers/staging/hv/hv.c
+--- linux-2.6.38.1/drivers/staging/hv/hv.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/hv/hv.c 2011-03-21 18:31:35.000000000 -0400
@@ -163,7 +163,7 @@ static u64 do_hypercall(u64 control, voi
u64 output_address = (output) ? virt_to_phys(output) : 0;
u32 output_address_hi = output_address >> 32;
@@ -27577,9 +27577,9 @@ diff -urNp linux-2.6.38/drivers/staging/hv/hv.c linux-2.6.38-new/drivers/staging
DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
control, input, output);
-diff -urNp linux-2.6.38/drivers/staging/phison/phison.c linux-2.6.38-new/drivers/staging/phison/phison.c
---- linux-2.6.38/drivers/staging/phison/phison.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/phison/phison.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/phison/phison.c linux-2.6.38.1/drivers/staging/phison/phison.c
+--- linux-2.6.38.1/drivers/staging/phison/phison.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/phison/phison.c 2011-03-21 18:31:35.000000000 -0400
@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -27589,9 +27589,9 @@ diff -urNp linux-2.6.38/drivers/staging/phison/phison.c linux-2.6.38-new/drivers
.inherits = &ata_bmdma_port_ops,
.prereset = phison_pre_reset,
};
-diff -urNp linux-2.6.38/drivers/staging/pohmelfs/inode.c linux-2.6.38-new/drivers/staging/pohmelfs/inode.c
---- linux-2.6.38/drivers/staging/pohmelfs/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/pohmelfs/inode.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/pohmelfs/inode.c linux-2.6.38.1/drivers/staging/pohmelfs/inode.c
+--- linux-2.6.38.1/drivers/staging/pohmelfs/inode.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/pohmelfs/inode.c 2011-03-21 18:31:35.000000000 -0400
@@ -1855,7 +1855,7 @@ static int pohmelfs_fill_super(struct su
mutex_init(&psb->mcache_lock);
psb->mcache_root = RB_ROOT;
@@ -27601,9 +27601,9 @@ diff -urNp linux-2.6.38/drivers/staging/pohmelfs/inode.c linux-2.6.38-new/driver
psb->trans_max_pages = 100;
-diff -urNp linux-2.6.38/drivers/staging/pohmelfs/mcache.c linux-2.6.38-new/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.38/drivers/staging/pohmelfs/mcache.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/pohmelfs/mcache.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/pohmelfs/mcache.c linux-2.6.38.1/drivers/staging/pohmelfs/mcache.c
+--- linux-2.6.38.1/drivers/staging/pohmelfs/mcache.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/pohmelfs/mcache.c 2011-03-21 18:31:35.000000000 -0400
@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
m->data = data;
m->start = start;
@@ -27613,9 +27613,9 @@ diff -urNp linux-2.6.38/drivers/staging/pohmelfs/mcache.c linux-2.6.38-new/drive
mutex_lock(&psb->mcache_lock);
err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-2.6.38/drivers/staging/pohmelfs/netfs.h linux-2.6.38-new/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.38/drivers/staging/pohmelfs/netfs.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/pohmelfs/netfs.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/pohmelfs/netfs.h linux-2.6.38.1/drivers/staging/pohmelfs/netfs.h
+--- linux-2.6.38.1/drivers/staging/pohmelfs/netfs.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/pohmelfs/netfs.h 2011-03-21 18:31:35.000000000 -0400
@@ -571,7 +571,7 @@ struct pohmelfs_config;
struct pohmelfs_sb {
struct rb_root mcache_root;
@@ -27625,9 +27625,9 @@ diff -urNp linux-2.6.38/drivers/staging/pohmelfs/netfs.h linux-2.6.38-new/driver
unsigned long mcache_timeout;
unsigned int idx;
-diff -urNp linux-2.6.38/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.38-new/drivers/staging/rtl8192u/ieee80211/proc.c
---- linux-2.6.38/drivers/staging/rtl8192u/ieee80211/proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/rtl8192u/ieee80211/proc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.38.1/drivers/staging/rtl8192u/ieee80211/proc.c
+--- linux-2.6.38.1/drivers/staging/rtl8192u/ieee80211/proc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/rtl8192u/ieee80211/proc.c 2011-03-21 18:31:35.000000000 -0400
@@ -99,7 +99,7 @@ static int crypto_info_open(struct inode
return seq_open(file, &crypto_seq_ops);
}
@@ -27637,9 +27637,9 @@ diff -urNp linux-2.6.38/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.38-n
.open = crypto_info_open,
.read = seq_read,
.llseek = seq_lseek,
-diff -urNp linux-2.6.38/drivers/staging/spectra/ffsport.c linux-2.6.38-new/drivers/staging/spectra/ffsport.c
---- linux-2.6.38/drivers/staging/spectra/ffsport.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/spectra/ffsport.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/spectra/ffsport.c linux-2.6.38.1/drivers/staging/spectra/ffsport.c
+--- linux-2.6.38.1/drivers/staging/spectra/ffsport.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/spectra/ffsport.c 2011-03-21 18:31:35.000000000 -0400
@@ -604,7 +604,7 @@ int GLOB_SBD_unlocked_ioctl(struct block
return ret;
}
@@ -27649,9 +27649,9 @@ diff -urNp linux-2.6.38/drivers/staging/spectra/ffsport.c linux-2.6.38-new/drive
.owner = THIS_MODULE,
.open = GLOB_SBD_open,
.release = GLOB_SBD_release,
-diff -urNp linux-2.6.38/drivers/staging/vme/devices/vme_user.c linux-2.6.38-new/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.38/drivers/staging/vme/devices/vme_user.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/vme/devices/vme_user.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/vme/devices/vme_user.c linux-2.6.38.1/drivers/staging/vme/devices/vme_user.c
+--- linux-2.6.38.1/drivers/staging/vme/devices/vme_user.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/vme/devices/vme_user.c 2011-03-21 18:31:35.000000000 -0400
@@ -138,7 +138,7 @@ static long vme_user_unlocked_ioctl(stru
static int __devinit vme_user_probe(struct device *, int, int);
static int __devexit vme_user_remove(struct device *, int, int);
@@ -27661,9 +27661,9 @@ diff -urNp linux-2.6.38/drivers/staging/vme/devices/vme_user.c linux-2.6.38-new/
.open = vme_user_open,
.release = vme_user_release,
.read = vme_user_read,
-diff -urNp linux-2.6.38/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.38-new/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
---- linux-2.6.38/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.38.1/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
+--- linux-2.6.38.1/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-03-21 18:31:35.000000000 -0400
@@ -426,7 +426,7 @@ int cyasblkdev_revalidate_disk(struct ge
@@ -27673,9 +27673,9 @@ diff -urNp linux-2.6.38/drivers/staging/westbridge/astoria/block/cyasblkdev_bloc
.open = cyasblkdev_blk_open,
.release = cyasblkdev_blk_release,
.ioctl = cyasblkdev_blk_ioctl,
-diff -urNp linux-2.6.38/drivers/tty/hvc/hvc_console.h linux-2.6.38-new/drivers/tty/hvc/hvc_console.h
---- linux-2.6.38/drivers/tty/hvc/hvc_console.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/tty/hvc/hvc_console.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/tty/hvc/hvc_console.h linux-2.6.38.1/drivers/tty/hvc/hvc_console.h
+--- linux-2.6.38.1/drivers/tty/hvc/hvc_console.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/tty/hvc/hvc_console.h 2011-03-21 18:31:35.000000000 -0400
@@ -82,6 +82,7 @@ extern int hvc_instantiate(uint32_t vter
/* register a vterm for hvc tty operation (module_init or hotplug add) */
extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data,
@@ -27684,9 +27684,9 @@ diff -urNp linux-2.6.38/drivers/tty/hvc/hvc_console.h linux-2.6.38-new/drivers/t
/* 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.38/drivers/tty/hvc/hvcs.c linux-2.6.38-new/drivers/tty/hvc/hvcs.c
---- linux-2.6.38/drivers/tty/hvc/hvcs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/tty/hvc/hvcs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/tty/hvc/hvcs.c linux-2.6.38.1/drivers/tty/hvc/hvcs.c
+--- linux-2.6.38.1/drivers/tty/hvc/hvcs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/tty/hvc/hvcs.c 2011-03-21 18:31:35.000000000 -0400
@@ -83,6 +83,7 @@
#include <asm/hvcserver.h>
#include <asm/uaccess.h>
@@ -27789,9 +27789,9 @@ diff -urNp linux-2.6.38/drivers/tty/hvc/hvcs.c linux-2.6.38-new/drivers/tty/hvc/
return 0;
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.38/drivers/tty/hvc/hvc_xen.c linux-2.6.38-new/drivers/tty/hvc/hvc_xen.c
---- linux-2.6.38/drivers/tty/hvc/hvc_xen.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/tty/hvc/hvc_xen.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/tty/hvc/hvc_xen.c linux-2.6.38.1/drivers/tty/hvc/hvc_xen.c
+--- linux-2.6.38.1/drivers/tty/hvc/hvc_xen.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/tty/hvc/hvc_xen.c 2011-03-21 18:31:35.000000000 -0400
@@ -123,7 +123,7 @@ static int domU_read_console(uint32_t vt
return recv;
}
@@ -27828,9 +27828,9 @@ diff -urNp linux-2.6.38/drivers/tty/hvc/hvc_xen.c linux-2.6.38-new/drivers/tty/h
if (!xen_pv_domain())
return 0;
-diff -urNp linux-2.6.38/drivers/tty/n_gsm.c linux-2.6.38-new/drivers/tty/n_gsm.c
---- linux-2.6.38/drivers/tty/n_gsm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/tty/n_gsm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/tty/n_gsm.c linux-2.6.38.1/drivers/tty/n_gsm.c
+--- linux-2.6.38.1/drivers/tty/n_gsm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/tty/n_gsm.c 2011-03-21 18:31:35.000000000 -0400
@@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
return NULL;
spin_lock_init(&dlci->lock);
@@ -27840,9 +27840,9 @@ diff -urNp linux-2.6.38/drivers/tty/n_gsm.c linux-2.6.38-new/drivers/tty/n_gsm.c
kfree(dlci);
return NULL;
}
-diff -urNp linux-2.6.38/drivers/tty/n_tty.c linux-2.6.38-new/drivers/tty/n_tty.c
---- linux-2.6.38/drivers/tty/n_tty.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/tty/n_tty.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/tty/n_tty.c linux-2.6.38.1/drivers/tty/n_tty.c
+--- linux-2.6.38.1/drivers/tty/n_tty.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/tty/n_tty.c 2011-03-21 18:31:35.000000000 -0400
@@ -2116,6 +2116,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
{
*ops = tty_ldisc_N_TTY;
@@ -27852,9 +27852,9 @@ diff -urNp linux-2.6.38/drivers/tty/n_tty.c linux-2.6.38-new/drivers/tty/n_tty.c
+ ops->flags = 0;
}
EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
-diff -urNp linux-2.6.38/drivers/tty/pty.c linux-2.6.38-new/drivers/tty/pty.c
---- linux-2.6.38/drivers/tty/pty.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/tty/pty.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/tty/pty.c linux-2.6.38.1/drivers/tty/pty.c
+--- linux-2.6.38.1/drivers/tty/pty.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/tty/pty.c 2011-03-21 18:31:35.000000000 -0400
@@ -700,7 +700,18 @@ out:
return retval;
}
@@ -27886,9 +27886,9 @@ diff -urNp linux-2.6.38/drivers/tty/pty.c linux-2.6.38-new/drivers/tty/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.38/drivers/tty/serial/8250_pci.c linux-2.6.38-new/drivers/tty/serial/8250_pci.c
---- linux-2.6.38/drivers/tty/serial/8250_pci.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/tty/serial/8250_pci.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/tty/serial/8250_pci.c linux-2.6.38.1/drivers/tty/serial/8250_pci.c
+--- linux-2.6.38.1/drivers/tty/serial/8250_pci.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/tty/serial/8250_pci.c 2011-03-21 18:31:35.000000000 -0400
@@ -3818,7 +3818,7 @@ static struct pci_device_id serial_pci_t
PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
@@ -27898,9 +27898,9 @@ diff -urNp linux-2.6.38/drivers/tty/serial/8250_pci.c linux-2.6.38-new/drivers/t
};
static struct pci_driver serial_pci_driver = {
-diff -urNp linux-2.6.38/drivers/tty/serial/kgdboc.c linux-2.6.38-new/drivers/tty/serial/kgdboc.c
---- linux-2.6.38/drivers/tty/serial/kgdboc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/tty/serial/kgdboc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/tty/serial/kgdboc.c linux-2.6.38.1/drivers/tty/serial/kgdboc.c
+--- linux-2.6.38.1/drivers/tty/serial/kgdboc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/tty/serial/kgdboc.c 2011-03-21 18:31:35.000000000 -0400
@@ -22,7 +22,7 @@
#define MAX_CONFIG_LEN 40
@@ -27919,9 +27919,9 @@ diff -urNp linux-2.6.38/drivers/tty/serial/kgdboc.c linux-2.6.38-new/drivers/tty
.name = "kgdboc",
.read_char = kgdboc_get_char,
.write_char = kgdboc_put_char,
-diff -urNp linux-2.6.38/drivers/tty/tty_io.c linux-2.6.38-new/drivers/tty/tty_io.c
---- linux-2.6.38/drivers/tty/tty_io.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/tty/tty_io.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/tty/tty_io.c linux-2.6.38.1/drivers/tty/tty_io.c
+--- linux-2.6.38.1/drivers/tty/tty_io.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/tty/tty_io.c 2011-03-21 18:31:35.000000000 -0400
@@ -140,21 +140,11 @@ EXPORT_SYMBOL(tty_mutex);
/* Spinlock to protect the tty->tty_files list */
DEFINE_SPINLOCK(tty_files_lock);
@@ -28059,9 +28059,9 @@ diff -urNp linux-2.6.38/drivers/tty/tty_io.c linux-2.6.38-new/drivers/tty/tty_io
/*
* 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.38/drivers/tty/tty_ldisc.c linux-2.6.38-new/drivers/tty/tty_ldisc.c
---- linux-2.6.38/drivers/tty/tty_ldisc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/tty/tty_ldisc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/tty/tty_ldisc.c linux-2.6.38.1/drivers/tty/tty_ldisc.c
+--- linux-2.6.38.1/drivers/tty/tty_ldisc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/tty/tty_ldisc.c 2011-03-21 18:31:35.000000000 -0400
@@ -76,7 +76,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;
@@ -28107,9 +28107,9 @@ diff -urNp linux-2.6.38/drivers/tty/tty_ldisc.c linux-2.6.38-new/drivers/tty/tty
module_put(ldops->owner);
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
}
-diff -urNp linux-2.6.38/drivers/tty/vt/keyboard.c linux-2.6.38-new/drivers/tty/vt/keyboard.c
---- linux-2.6.38/drivers/tty/vt/keyboard.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/tty/vt/keyboard.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/tty/vt/keyboard.c linux-2.6.38.1/drivers/tty/vt/keyboard.c
+--- linux-2.6.38.1/drivers/tty/vt/keyboard.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/tty/vt/keyboard.c 2011-03-21 18:31:35.000000000 -0400
@@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, u
kbd->kbdmode == VC_MEDIUMRAW) &&
value != KVAL(K_SAK))
@@ -28136,9 +28136,9 @@ diff -urNp linux-2.6.38/drivers/tty/vt/keyboard.c linux-2.6.38-new/drivers/tty/v
};
MODULE_DEVICE_TABLE(input, kbd_ids);
-diff -urNp linux-2.6.38/drivers/tty/vt/vt.c linux-2.6.38-new/drivers/tty/vt/vt.c
---- linux-2.6.38/drivers/tty/vt/vt.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/tty/vt/vt.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/tty/vt/vt.c linux-2.6.38.1/drivers/tty/vt/vt.c
+--- linux-2.6.38.1/drivers/tty/vt/vt.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/tty/vt/vt.c 2011-03-21 18:31:35.000000000 -0400
@@ -262,7 +262,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
static void notify_write(struct vc_data *vc, unsigned int unicode)
@@ -28148,9 +28148,9 @@ diff -urNp linux-2.6.38/drivers/tty/vt/vt.c linux-2.6.38-new/drivers/tty/vt/vt.c
atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
}
-diff -urNp linux-2.6.38/drivers/tty/vt/vt_ioctl.c linux-2.6.38-new/drivers/tty/vt/vt_ioctl.c
---- linux-2.6.38/drivers/tty/vt/vt_ioctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/tty/vt/vt_ioctl.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/tty/vt/vt_ioctl.c linux-2.6.38.1/drivers/tty/vt/vt_ioctl.c
+--- linux-2.6.38.1/drivers/tty/vt/vt_ioctl.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/tty/vt/vt_ioctl.c 2011-03-21 18:31:35.000000000 -0400
@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
return -EFAULT;
@@ -28191,9 +28191,9 @@ diff -urNp linux-2.6.38/drivers/tty/vt/vt_ioctl.c linux-2.6.38-new/drivers/tty/v
if (!perm) {
ret = -EPERM;
goto reterr;
-diff -urNp linux-2.6.38/drivers/uio/uio.c linux-2.6.38-new/drivers/uio/uio.c
---- linux-2.6.38/drivers/uio/uio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/uio/uio.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/uio/uio.c linux-2.6.38.1/drivers/uio/uio.c
+--- linux-2.6.38.1/drivers/uio/uio.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/uio/uio.c 2011-03-21 18:31:35.000000000 -0400
@@ -25,6 +25,7 @@
#include <linux/kobject.h>
#include <linux/cdev.h>
@@ -28227,9 +28227,9 @@ diff -urNp linux-2.6.38/drivers/uio/uio.c linux-2.6.38-new/drivers/uio/uio.c
}
static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-diff -urNp linux-2.6.38/drivers/usb/atm/cxacru.c linux-2.6.38-new/drivers/usb/atm/cxacru.c
---- linux-2.6.38/drivers/usb/atm/cxacru.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/usb/atm/cxacru.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/usb/atm/cxacru.c linux-2.6.38.1/drivers/usb/atm/cxacru.c
+--- linux-2.6.38.1/drivers/usb/atm/cxacru.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/usb/atm/cxacru.c 2011-03-21 18:31:35.000000000 -0400
@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c
ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
if (ret < 2)
@@ -28239,9 +28239,9 @@ diff -urNp linux-2.6.38/drivers/usb/atm/cxacru.c linux-2.6.38-new/drivers/usb/at
return -EINVAL;
pos += tmp;
-diff -urNp linux-2.6.38/drivers/usb/atm/usbatm.c linux-2.6.38-new/drivers/usb/atm/usbatm.c
---- linux-2.6.38/drivers/usb/atm/usbatm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/usb/atm/usbatm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/usb/atm/usbatm.c linux-2.6.38.1/drivers/usb/atm/usbatm.c
+--- linux-2.6.38.1/drivers/usb/atm/usbatm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/usb/atm/usbatm.c 2011-03-21 18:31:35.000000000 -0400
@@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru
if (printk_ratelimit())
atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -28321,9 +28321,9 @@ diff -urNp linux-2.6.38/drivers/usb/atm/usbatm.c linux-2.6.38-new/drivers/usb/at
if (!left--) {
if (instance->disconnected)
-diff -urNp linux-2.6.38/drivers/usb/class/cdc-acm.c linux-2.6.38-new/drivers/usb/class/cdc-acm.c
---- linux-2.6.38/drivers/usb/class/cdc-acm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/usb/class/cdc-acm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/usb/class/cdc-acm.c linux-2.6.38.1/drivers/usb/class/cdc-acm.c
+--- linux-2.6.38.1/drivers/usb/class/cdc-acm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/usb/class/cdc-acm.c 2011-03-21 18:31:35.000000000 -0400
@@ -1635,7 +1635,7 @@ static const struct usb_device_id acm_id
{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
USB_CDC_ACM_PROTO_AT_CDMA) },
@@ -28333,9 +28333,9 @@ diff -urNp linux-2.6.38/drivers/usb/class/cdc-acm.c linux-2.6.38-new/drivers/usb
};
MODULE_DEVICE_TABLE(usb, acm_ids);
-diff -urNp linux-2.6.38/drivers/usb/class/usblp.c linux-2.6.38-new/drivers/usb/class/usblp.c
---- linux-2.6.38/drivers/usb/class/usblp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/usb/class/usblp.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/usb/class/usblp.c linux-2.6.38.1/drivers/usb/class/usblp.c
+--- linux-2.6.38.1/drivers/usb/class/usblp.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/usb/class/usblp.c 2011-03-21 18:31:35.000000000 -0400
@@ -227,7 +227,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 */
@@ -28354,10 +28354,10 @@ diff -urNp linux-2.6.38/drivers/usb/class/usblp.c linux-2.6.38-new/drivers/usb/c
};
MODULE_DEVICE_TABLE(usb, usblp_ids);
-diff -urNp linux-2.6.38/drivers/usb/core/hcd.c linux-2.6.38-new/drivers/usb/core/hcd.c
---- linux-2.6.38/drivers/usb/core/hcd.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/usb/core/hcd.c 2011-03-21 18:31:35.000000000 -0400
-@@ -2430,7 +2430,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
+diff -urNp linux-2.6.38.1/drivers/usb/core/hcd.c linux-2.6.38.1/drivers/usb/core/hcd.c
+--- linux-2.6.38.1/drivers/usb/core/hcd.c 2011-03-23 17:20:07.000000000 -0400
++++ linux-2.6.38.1/drivers/usb/core/hcd.c 2011-03-26 20:49:43.000000000 -0400
+@@ -2457,7 +2457,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -28366,7 +28366,7 @@ diff -urNp linux-2.6.38/drivers/usb/core/hcd.c linux-2.6.38-new/drivers/usb/core
/*
* The registration is unlocked.
-@@ -2440,7 +2440,7 @@ struct usb_mon_operations *mon_ops;
+@@ -2467,7 +2467,7 @@ struct usb_mon_operations *mon_ops;
* symbols from usbcore, usbcore gets referenced and cannot be unloaded first.
*/
@@ -28375,9 +28375,9 @@ diff -urNp linux-2.6.38/drivers/usb/core/hcd.c linux-2.6.38-new/drivers/usb/core
{
if (mon_ops)
-diff -urNp linux-2.6.38/drivers/usb/core/hub.c linux-2.6.38-new/drivers/usb/core/hub.c
---- linux-2.6.38/drivers/usb/core/hub.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/usb/core/hub.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/usb/core/hub.c linux-2.6.38.1/drivers/usb/core/hub.c
+--- linux-2.6.38.1/drivers/usb/core/hub.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/usb/core/hub.c 2011-03-21 18:31:35.000000000 -0400
@@ -3492,7 +3492,7 @@ static const struct usb_device_id hub_id
.bDeviceClass = USB_CLASS_HUB},
{ .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
@@ -28387,9 +28387,9 @@ diff -urNp linux-2.6.38/drivers/usb/core/hub.c linux-2.6.38-new/drivers/usb/core
};
MODULE_DEVICE_TABLE (usb, hub_id_table);
-diff -urNp linux-2.6.38/drivers/usb/core/message.c linux-2.6.38-new/drivers/usb/core/message.c
---- linux-2.6.38/drivers/usb/core/message.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/usb/core/message.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/usb/core/message.c linux-2.6.38.1/drivers/usb/core/message.c
+--- linux-2.6.38.1/drivers/usb/core/message.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/usb/core/message.c 2011-03-21 18:31:35.000000000 -0400
@@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
if (buf) {
@@ -28401,9 +28401,9 @@ diff -urNp linux-2.6.38/drivers/usb/core/message.c linux-2.6.38-new/drivers/usb/
if (!smallbuf)
return buf;
memcpy(smallbuf, buf, len);
-diff -urNp linux-2.6.38/drivers/usb/early/ehci-dbgp.c linux-2.6.38-new/drivers/usb/early/ehci-dbgp.c
---- linux-2.6.38/drivers/usb/early/ehci-dbgp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/usb/early/ehci-dbgp.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/usb/early/ehci-dbgp.c linux-2.6.38.1/drivers/usb/early/ehci-dbgp.c
+--- linux-2.6.38.1/drivers/usb/early/ehci-dbgp.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/usb/early/ehci-dbgp.c 2011-03-21 18:31:35.000000000 -0400
@@ -96,7 +96,7 @@ static inline u32 dbgp_len_update(u32 x,
}
@@ -28422,9 +28422,9 @@ diff -urNp linux-2.6.38/drivers/usb/early/ehci-dbgp.c linux-2.6.38-new/drivers/u
.name = "kgdbdbgp",
.read_char = kgdbdbgp_read_char,
.write_char = kgdbdbgp_write_char,
-diff -urNp linux-2.6.38/drivers/usb/host/ehci-pci.c linux-2.6.38-new/drivers/usb/host/ehci-pci.c
---- linux-2.6.38/drivers/usb/host/ehci-pci.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/usb/host/ehci-pci.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/usb/host/ehci-pci.c linux-2.6.38.1/drivers/usb/host/ehci-pci.c
+--- linux-2.6.38.1/drivers/usb/host/ehci-pci.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/usb/host/ehci-pci.c 2011-03-21 18:31:35.000000000 -0400
@@ -516,7 +516,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,
@@ -28434,9 +28434,9 @@ diff -urNp linux-2.6.38/drivers/usb/host/ehci-pci.c linux-2.6.38-new/drivers/usb
};
MODULE_DEVICE_TABLE(pci, pci_ids);
-diff -urNp linux-2.6.38/drivers/usb/host/uhci-hcd.c linux-2.6.38-new/drivers/usb/host/uhci-hcd.c
---- linux-2.6.38/drivers/usb/host/uhci-hcd.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/usb/host/uhci-hcd.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/usb/host/uhci-hcd.c linux-2.6.38.1/drivers/usb/host/uhci-hcd.c
+--- linux-2.6.38.1/drivers/usb/host/uhci-hcd.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/usb/host/uhci-hcd.c 2011-03-21 18:31:35.000000000 -0400
@@ -948,7 +948,7 @@ static const struct pci_device_id uhci_p
/* handle any USB UHCI controller */
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
@@ -28446,9 +28446,9 @@ diff -urNp linux-2.6.38/drivers/usb/host/uhci-hcd.c linux-2.6.38-new/drivers/usb
};
MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
-diff -urNp linux-2.6.38/drivers/usb/mon/mon_main.c linux-2.6.38-new/drivers/usb/mon/mon_main.c
---- linux-2.6.38/drivers/usb/mon/mon_main.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/usb/mon/mon_main.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/usb/mon/mon_main.c linux-2.6.38.1/drivers/usb/mon/mon_main.c
+--- linux-2.6.38.1/drivers/usb/mon/mon_main.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/usb/mon/mon_main.c 2011-03-21 18:31:35.000000000 -0400
@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
/*
* Ops
@@ -28458,9 +28458,9 @@ diff -urNp linux-2.6.38/drivers/usb/mon/mon_main.c linux-2.6.38-new/drivers/usb/
.urb_submit = mon_submit,
.urb_submit_error = mon_submit_error,
.urb_complete = mon_complete,
-diff -urNp linux-2.6.38/drivers/usb/storage/debug.h linux-2.6.38-new/drivers/usb/storage/debug.h
---- linux-2.6.38/drivers/usb/storage/debug.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/usb/storage/debug.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/usb/storage/debug.h linux-2.6.38.1/drivers/usb/storage/debug.h
+--- linux-2.6.38.1/drivers/usb/storage/debug.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/usb/storage/debug.h 2011-03-21 18:31:35.000000000 -0400
@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
#define US_DEBUGPX(x...) printk( x )
#define US_DEBUG(x) x
@@ -28474,9 +28474,9 @@ diff -urNp linux-2.6.38/drivers/usb/storage/debug.h linux-2.6.38-new/drivers/usb
#endif
#endif
-diff -urNp linux-2.6.38/drivers/usb/storage/usb.c linux-2.6.38-new/drivers/usb/storage/usb.c
---- linux-2.6.38/drivers/usb/storage/usb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/usb/storage/usb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/usb/storage/usb.c linux-2.6.38.1/drivers/usb/storage/usb.c
+--- linux-2.6.38.1/drivers/usb/storage/usb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/usb/storage/usb.c 2011-03-21 18:31:35.000000000 -0400
@@ -122,7 +122,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -28486,9 +28486,9 @@ diff -urNp linux-2.6.38/drivers/usb/storage/usb.c linux-2.6.38-new/drivers/usb/s
};
#undef UNUSUAL_DEV
-diff -urNp linux-2.6.38/drivers/usb/storage/usual-tables.c linux-2.6.38-new/drivers/usb/storage/usual-tables.c
---- linux-2.6.38/drivers/usb/storage/usual-tables.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/usb/storage/usual-tables.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/usb/storage/usual-tables.c linux-2.6.38.1/drivers/usb/storage/usual-tables.c
+--- linux-2.6.38.1/drivers/usb/storage/usual-tables.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/usb/storage/usual-tables.c 2011-03-21 18:31:35.000000000 -0400
@@ -48,7 +48,7 @@
struct usb_device_id usb_storage_usb_ids[] = {
@@ -28498,9 +28498,9 @@ diff -urNp linux-2.6.38/drivers/usb/storage/usual-tables.c linux-2.6.38-new/driv
};
EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
-diff -urNp linux-2.6.38/drivers/vhost/vhost.c linux-2.6.38-new/drivers/vhost/vhost.c
---- linux-2.6.38/drivers/vhost/vhost.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/vhost/vhost.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/vhost/vhost.c linux-2.6.38.1/drivers/vhost/vhost.c
+--- linux-2.6.38.1/drivers/vhost/vhost.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/vhost/vhost.c 2011-03-21 18:31:35.000000000 -0400
@@ -565,7 +565,7 @@ static int init_used(struct vhost_virtqu
return get_user(vq->last_used_idx, &used->idx);
}
@@ -28510,9 +28510,9 @@ diff -urNp linux-2.6.38/drivers/vhost/vhost.c linux-2.6.38-new/drivers/vhost/vho
{
struct file *eventfp, *filep = NULL,
*pollstart = NULL, *pollstop = NULL;
-diff -urNp linux-2.6.38/drivers/video/fbcmap.c linux-2.6.38-new/drivers/video/fbcmap.c
---- linux-2.6.38/drivers/video/fbcmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/video/fbcmap.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/video/fbcmap.c linux-2.6.38.1/drivers/video/fbcmap.c
+--- linux-2.6.38.1/drivers/video/fbcmap.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/video/fbcmap.c 2011-03-21 18:31:35.000000000 -0400
@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user
rc = -ENODEV;
goto out;
@@ -28523,9 +28523,9 @@ diff -urNp linux-2.6.38/drivers/video/fbcmap.c linux-2.6.38-new/drivers/video/fb
rc = -EINVAL;
goto out1;
}
-diff -urNp linux-2.6.38/drivers/video/fbmem.c linux-2.6.38-new/drivers/video/fbmem.c
---- linux-2.6.38/drivers/video/fbmem.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/video/fbmem.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/video/fbmem.c linux-2.6.38.1/drivers/video/fbmem.c
+--- linux-2.6.38.1/drivers/video/fbmem.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/video/fbmem.c 2011-03-21 18:31:35.000000000 -0400
@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
image->dx += image->width + 8;
}
@@ -28553,9 +28553,9 @@ diff -urNp linux-2.6.38/drivers/video/fbmem.c linux-2.6.38-new/drivers/video/fbm
return -EINVAL;
if (!registered_fb[con2fb.framebuffer])
request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-2.6.38/drivers/video/fbmon.c linux-2.6.38-new/drivers/video/fbmon.c
---- linux-2.6.38/drivers/video/fbmon.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/video/fbmon.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/video/fbmon.c linux-2.6.38.1/drivers/video/fbmon.c
+--- linux-2.6.38.1/drivers/video/fbmon.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/video/fbmon.c 2011-03-21 18:31:35.000000000 -0400
@@ -46,7 +46,7 @@
#ifdef DEBUG
#define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -28565,9 +28565,9 @@ diff -urNp linux-2.6.38/drivers/video/fbmon.c linux-2.6.38-new/drivers/video/fbm
#endif
#define FBMON_FIX_HEADER 1
-diff -urNp linux-2.6.38/drivers/video/i810/i810_accel.c linux-2.6.38-new/drivers/video/i810/i810_accel.c
---- linux-2.6.38/drivers/video/i810/i810_accel.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/video/i810/i810_accel.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/video/i810/i810_accel.c linux-2.6.38.1/drivers/video/i810/i810_accel.c
+--- linux-2.6.38.1/drivers/video/i810/i810_accel.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/video/i810/i810_accel.c 2011-03-21 18:31:35.000000000 -0400
@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
}
}
@@ -28576,9 +28576,9 @@ diff -urNp linux-2.6.38/drivers/video/i810/i810_accel.c linux-2.6.38-new/drivers
i810_report_error(mmio);
par->dev_flags |= LOCKUP;
info->pixmap.scan_align = 1;
-diff -urNp linux-2.6.38/drivers/video/i810/i810_main.c linux-2.6.38-new/drivers/video/i810/i810_main.c
---- linux-2.6.38/drivers/video/i810/i810_main.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/video/i810/i810_main.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/video/i810/i810_main.c linux-2.6.38.1/drivers/video/i810/i810_main.c
+--- linux-2.6.38.1/drivers/video/i810/i810_main.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/video/i810/i810_main.c 2011-03-21 18:31:35.000000000 -0400
@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
@@ -28588,9 +28588,9 @@ diff -urNp linux-2.6.38/drivers/video/i810/i810_main.c linux-2.6.38-new/drivers/
};
static struct pci_driver i810fb_driver = {
-diff -urNp linux-2.6.38/drivers/video/modedb.c linux-2.6.38-new/drivers/video/modedb.c
---- linux-2.6.38/drivers/video/modedb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/video/modedb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/video/modedb.c linux-2.6.38.1/drivers/video/modedb.c
+--- linux-2.6.38.1/drivers/video/modedb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/video/modedb.c 2011-03-21 18:31:35.000000000 -0400
@@ -40,255 +40,255 @@ static const struct fb_videomode modedb[
/* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -28907,9 +28907,9 @@ diff -urNp linux-2.6.38/drivers/video/modedb.c linux-2.6.38-new/drivers/video/mo
};
#ifdef CONFIG_FB_MODE_HELPERS
-diff -urNp linux-2.6.38/drivers/video/pxa3xx-gcu.c linux-2.6.38-new/drivers/video/pxa3xx-gcu.c
---- linux-2.6.38/drivers/video/pxa3xx-gcu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/video/pxa3xx-gcu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/video/pxa3xx-gcu.c linux-2.6.38.1/drivers/video/pxa3xx-gcu.c
+--- linux-2.6.38.1/drivers/video/pxa3xx-gcu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/video/pxa3xx-gcu.c 2011-03-21 18:31:35.000000000 -0400
@@ -103,7 +103,7 @@ struct pxa3xx_gcu_priv {
dma_addr_t shared_phys;
struct resource *resource_mem;
@@ -28919,9 +28919,9 @@ diff -urNp linux-2.6.38/drivers/video/pxa3xx-gcu.c linux-2.6.38-new/drivers/vide
wait_queue_head_t wait_idle;
wait_queue_head_t wait_free;
spinlock_t spinlock;
-diff -urNp linux-2.6.38/drivers/video/uvesafb.c linux-2.6.38-new/drivers/video/uvesafb.c
---- linux-2.6.38/drivers/video/uvesafb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/video/uvesafb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/video/uvesafb.c linux-2.6.38.1/drivers/video/uvesafb.c
+--- linux-2.6.38.1/drivers/video/uvesafb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/video/uvesafb.c 2011-03-21 18:31:35.000000000 -0400
@@ -19,6 +19,7 @@
#include <linux/io.h>
#include <linux/mutex.h>
@@ -28997,9 +28997,9 @@ diff -urNp linux-2.6.38/drivers/video/uvesafb.c linux-2.6.38-new/drivers/video/u
}
framebuffer_release(info);
-diff -urNp linux-2.6.38/drivers/video/vesafb.c linux-2.6.38-new/drivers/video/vesafb.c
---- linux-2.6.38/drivers/video/vesafb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/drivers/video/vesafb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/drivers/video/vesafb.c linux-2.6.38.1/drivers/video/vesafb.c
+--- linux-2.6.38.1/drivers/video/vesafb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/drivers/video/vesafb.c 2011-03-21 18:31:35.000000000 -0400
@@ -9,6 +9,7 @@
*/
@@ -29103,9 +29103,9 @@ diff -urNp linux-2.6.38/drivers/video/vesafb.c linux-2.6.38-new/drivers/video/ve
if (info->screen_base)
iounmap(info->screen_base);
framebuffer_release(info);
-diff -urNp linux-2.6.38/fs/9p/vfs_inode.c linux-2.6.38-new/fs/9p/vfs_inode.c
---- linux-2.6.38/fs/9p/vfs_inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/9p/vfs_inode.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/9p/vfs_inode.c linux-2.6.38.1/fs/9p/vfs_inode.c
+--- linux-2.6.38.1/fs/9p/vfs_inode.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/9p/vfs_inode.c 2011-03-21 18:31:35.000000000 -0400
@@ -1094,7 +1094,7 @@ static void *v9fs_vfs_follow_link(struct
void
v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -29115,9 +29115,9 @@ diff -urNp linux-2.6.38/fs/9p/vfs_inode.c linux-2.6.38-new/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.38/fs/aio.c linux-2.6.38-new/fs/aio.c
---- linux-2.6.38/fs/aio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/aio.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/aio.c linux-2.6.38.1/fs/aio.c
+--- linux-2.6.38.1/fs/aio.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/aio.c 2011-03-21 18:31:35.000000000 -0400
@@ -130,7 +130,7 @@ static int aio_setup_ring(struct kioctx
size += sizeof(struct io_event) * nr_events;
nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -29127,9 +29127,9 @@ diff -urNp linux-2.6.38/fs/aio.c linux-2.6.38-new/fs/aio.c
return -EINVAL;
nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
-diff -urNp linux-2.6.38/fs/attr.c linux-2.6.38-new/fs/attr.c
---- linux-2.6.38/fs/attr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/attr.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/attr.c linux-2.6.38.1/fs/attr.c
+--- linux-2.6.38.1/fs/attr.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/attr.c 2011-03-21 18:31:35.000000000 -0400
@@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode
unsigned long limit;
@@ -29138,9 +29138,9 @@ diff -urNp linux-2.6.38/fs/attr.c linux-2.6.38-new/fs/attr.c
if (limit != RLIM_INFINITY && offset > limit)
goto out_sig;
if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-2.6.38/fs/befs/linuxvfs.c linux-2.6.38-new/fs/befs/linuxvfs.c
---- linux-2.6.38/fs/befs/linuxvfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/befs/linuxvfs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/befs/linuxvfs.c linux-2.6.38.1/fs/befs/linuxvfs.c
+--- linux-2.6.38.1/fs/befs/linuxvfs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/befs/linuxvfs.c 2011-03-21 18:31:35.000000000 -0400
@@ -499,7 +499,7 @@ static void befs_put_link(struct dentry
{
befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -29150,9 +29150,9 @@ diff -urNp linux-2.6.38/fs/befs/linuxvfs.c linux-2.6.38-new/fs/befs/linuxvfs.c
if (!IS_ERR(link))
kfree(link);
}
-diff -urNp linux-2.6.38/fs/binfmt_aout.c linux-2.6.38-new/fs/binfmt_aout.c
---- linux-2.6.38/fs/binfmt_aout.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/binfmt_aout.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/binfmt_aout.c linux-2.6.38.1/fs/binfmt_aout.c
+--- linux-2.6.38.1/fs/binfmt_aout.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/binfmt_aout.c 2011-03-21 18:31:35.000000000 -0400
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/fs.h>
@@ -29229,9 +29229,9 @@ diff -urNp linux-2.6.38/fs/binfmt_aout.c linux-2.6.38-new/fs/binfmt_aout.c
MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
fd_offset + ex.a_text);
up_write(&current->mm->mmap_sem);
-diff -urNp linux-2.6.38/fs/binfmt_elf.c linux-2.6.38-new/fs/binfmt_elf.c
---- linux-2.6.38/fs/binfmt_elf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/binfmt_elf.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/binfmt_elf.c linux-2.6.38.1/fs/binfmt_elf.c
+--- linux-2.6.38.1/fs/binfmt_elf.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/binfmt_elf.c 2011-03-21 18:31:35.000000000 -0400
@@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
#define elf_core_dump NULL
#endif
@@ -29897,9 +29897,9 @@ diff -urNp linux-2.6.38/fs/binfmt_elf.c linux-2.6.38-new/fs/binfmt_elf.c
static int __init init_elf_binfmt(void)
{
return register_binfmt(&elf_format);
-diff -urNp linux-2.6.38/fs/binfmt_flat.c linux-2.6.38-new/fs/binfmt_flat.c
---- linux-2.6.38/fs/binfmt_flat.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/binfmt_flat.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/binfmt_flat.c linux-2.6.38.1/fs/binfmt_flat.c
+--- linux-2.6.38.1/fs/binfmt_flat.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/binfmt_flat.c 2011-03-21 18:31:35.000000000 -0400
@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b
realdatastart = (unsigned long) -ENOMEM;
printk("Unable to allocate RAM for process data, errno %d\n",
@@ -29932,9 +29932,9 @@ diff -urNp linux-2.6.38/fs/binfmt_flat.c linux-2.6.38-new/fs/binfmt_flat.c
ret = result;
goto err;
}
-diff -urNp linux-2.6.38/fs/binfmt_misc.c linux-2.6.38-new/fs/binfmt_misc.c
---- linux-2.6.38/fs/binfmt_misc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/binfmt_misc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/binfmt_misc.c linux-2.6.38.1/fs/binfmt_misc.c
+--- linux-2.6.38.1/fs/binfmt_misc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/binfmt_misc.c 2011-03-21 18:31:35.000000000 -0400
@@ -698,7 +698,7 @@ static int bm_fill_super(struct super_bl
static struct tree_descr bm_files[] = {
[2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
@@ -29944,9 +29944,9 @@ diff -urNp linux-2.6.38/fs/binfmt_misc.c linux-2.6.38-new/fs/binfmt_misc.c
};
int err = simple_fill_super(sb, 0x42494e4d, bm_files);
if (!err)
-diff -urNp linux-2.6.38/fs/bio.c linux-2.6.38-new/fs/bio.c
---- linux-2.6.38/fs/bio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/bio.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/bio.c linux-2.6.38.1/fs/bio.c
+--- linux-2.6.38.1/fs/bio.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/bio.c 2011-03-21 18:31:35.000000000 -0400
@@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b
const int read = bio_data_dir(bio) == READ;
struct bio_map_data *bmd = bio->bi_private;
@@ -29956,9 +29956,9 @@ diff -urNp linux-2.6.38/fs/bio.c linux-2.6.38-new/fs/bio.c
__bio_for_each_segment(bvec, bio, i, 0) {
char *addr = page_address(bvec->bv_page);
-diff -urNp linux-2.6.38/fs/block_dev.c linux-2.6.38-new/fs/block_dev.c
---- linux-2.6.38/fs/block_dev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/block_dev.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/block_dev.c linux-2.6.38.1/fs/block_dev.c
+--- linux-2.6.38.1/fs/block_dev.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/block_dev.c 2011-03-21 18:31:35.000000000 -0400
@@ -669,7 +669,7 @@ static bool bd_may_claim(struct block_de
else if (bdev->bd_contains == bdev)
return true; /* is a whole device which isn't held */
@@ -29968,9 +29968,9 @@ diff -urNp linux-2.6.38/fs/block_dev.c linux-2.6.38-new/fs/block_dev.c
return true; /* is a partition of a device that is being partitioned */
else if (whole->bd_holder != NULL)
return false; /* is a partition of a held device */
-diff -urNp linux-2.6.38/fs/btrfs/ctree.c linux-2.6.38-new/fs/btrfs/ctree.c
---- linux-2.6.38/fs/btrfs/ctree.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/btrfs/ctree.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/btrfs/ctree.c linux-2.6.38.1/fs/btrfs/ctree.c
+--- linux-2.6.38.1/fs/btrfs/ctree.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/btrfs/ctree.c 2011-03-21 18:31:35.000000000 -0400
@@ -468,9 +468,12 @@ static noinline int __btrfs_cow_block(st
free_extent_buffer(buf);
add_root_to_dirty_list(root);
@@ -29995,9 +29995,9 @@ diff -urNp linux-2.6.38/fs/btrfs/ctree.c linux-2.6.38-new/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.38/fs/btrfs/disk-io.c linux-2.6.38-new/fs/btrfs/disk-io.c
---- linux-2.6.38/fs/btrfs/disk-io.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/btrfs/disk-io.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/btrfs/disk-io.c linux-2.6.38.1/fs/btrfs/disk-io.c
+--- linux-2.6.38.1/fs/btrfs/disk-io.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/btrfs/disk-io.c 2011-03-21 18:31:35.000000000 -0400
@@ -41,7 +41,7 @@
#include "tree-log.h"
#include "free-space-cache.h"
@@ -30016,9 +30016,9 @@ diff -urNp linux-2.6.38/fs/btrfs/disk-io.c linux-2.6.38-new/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.38/fs/btrfs/extent_io.h linux-2.6.38-new/fs/btrfs/extent_io.h
---- linux-2.6.38/fs/btrfs/extent_io.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/btrfs/extent_io.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/btrfs/extent_io.h linux-2.6.38.1/fs/btrfs/extent_io.h
+--- linux-2.6.38.1/fs/btrfs/extent_io.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/btrfs/extent_io.h 2011-03-21 18:31:35.000000000 -0400
@@ -55,36 +55,36 @@ typedef int (extent_submit_bio_hook_t)(s
struct bio *bio, int mirror_num,
unsigned long bio_flags, u64 bio_offset);
@@ -30079,9 +30079,9 @@ diff -urNp linux-2.6.38/fs/btrfs/extent_io.h linux-2.6.38-new/fs/btrfs/extent_io
};
struct extent_state {
-diff -urNp linux-2.6.38/fs/btrfs/free-space-cache.c linux-2.6.38-new/fs/btrfs/free-space-cache.c
---- linux-2.6.38/fs/btrfs/free-space-cache.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/btrfs/free-space-cache.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/btrfs/free-space-cache.c linux-2.6.38.1/fs/btrfs/free-space-cache.c
+--- linux-2.6.38.1/fs/btrfs/free-space-cache.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/btrfs/free-space-cache.c 2011-03-21 18:31:35.000000000 -0400
@@ -1855,8 +1855,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
while(1) {
@@ -30100,9 +30100,9 @@ diff -urNp linux-2.6.38/fs/btrfs/free-space-cache.c linux-2.6.38-new/fs/btrfs/fr
if (entry->bitmap && entry->bytes > bytes + empty_size) {
ret = btrfs_bitmap_cluster(block_group, entry, cluster,
-diff -urNp linux-2.6.38/fs/btrfs/inode.c linux-2.6.38-new/fs/btrfs/inode.c
---- linux-2.6.38/fs/btrfs/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/btrfs/inode.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/btrfs/inode.c linux-2.6.38.1/fs/btrfs/inode.c
+--- linux-2.6.38.1/fs/btrfs/inode.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/btrfs/inode.c 2011-03-24 23:08:20.000000000 -0400
@@ -64,7 +64,7 @@ static const struct inode_operations btr
static const struct address_space_operations btrfs_aops;
static const struct address_space_operations btrfs_symlink_aops;
@@ -30112,7 +30112,31 @@ diff -urNp linux-2.6.38/fs/btrfs/inode.c linux-2.6.38-new/fs/btrfs/inode.c
static struct kmem_cache *btrfs_inode_cachep;
struct kmem_cache *btrfs_trans_handle_cachep;
-@@ -7311,7 +7311,7 @@ static const struct file_operations btrf
+@@ -6796,7 +6796,7 @@ fail:
+ return -ENOMEM;
+ }
+
+-static int btrfs_getattr(struct vfsmount *mnt,
++int btrfs_getattr(struct vfsmount *mnt,
+ struct dentry *dentry, struct kstat *stat)
+ {
+ struct inode *inode = dentry->d_inode;
+@@ -6808,6 +6808,14 @@ static int btrfs_getattr(struct vfsmount
+ return 0;
+ }
+
++EXPORT_SYMBOL(btrfs_getattr);
++
++dev_t get_btrfs_dev_from_inode(struct inode *inode)
++{
++ return BTRFS_I(inode)->root->anon_super.s_dev;
++}
++EXPORT_SYMBOL(get_btrfs_dev_from_inode);
++
+ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
+ struct inode *new_dir, struct dentry *new_dentry)
+ {
+@@ -7311,7 +7319,7 @@ static const struct file_operations btrf
.fsync = btrfs_sync_file,
};
@@ -30121,9 +30145,9 @@ diff -urNp linux-2.6.38/fs/btrfs/inode.c linux-2.6.38-new/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.38/fs/btrfs/ioctl.c linux-2.6.38-new/fs/btrfs/ioctl.c
---- linux-2.6.38/fs/btrfs/ioctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/btrfs/ioctl.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/btrfs/ioctl.c linux-2.6.38.1/fs/btrfs/ioctl.c
+--- linux-2.6.38.1/fs/btrfs/ioctl.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/btrfs/ioctl.c 2011-03-21 18:31:35.000000000 -0400
@@ -2270,9 +2270,12 @@ long btrfs_ioctl_space_info(struct btrfs
for (i = 0; i < num_types; i++) {
struct btrfs_space_info *tmp;
@@ -30148,9 +30172,9 @@ diff -urNp linux-2.6.38/fs/btrfs/ioctl.c linux-2.6.38-new/fs/btrfs/ioctl.c
}
up_read(&info->groups_sem);
}
-diff -urNp linux-2.6.38/fs/btrfs/relocation.c linux-2.6.38-new/fs/btrfs/relocation.c
---- linux-2.6.38/fs/btrfs/relocation.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/btrfs/relocation.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/btrfs/relocation.c linux-2.6.38.1/fs/btrfs/relocation.c
+--- linux-2.6.38.1/fs/btrfs/relocation.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/btrfs/relocation.c 2011-03-21 18:31:35.000000000 -0400
@@ -1239,7 +1239,7 @@ static int __update_reloc_root(struct bt
}
spin_unlock(&rc->reloc_root_tree.lock);
@@ -30160,9 +30184,9 @@ diff -urNp linux-2.6.38/fs/btrfs/relocation.c linux-2.6.38-new/fs/btrfs/relocati
if (!del) {
spin_lock(&rc->reloc_root_tree.lock);
-diff -urNp linux-2.6.38/fs/cachefiles/bind.c linux-2.6.38-new/fs/cachefiles/bind.c
---- linux-2.6.38/fs/cachefiles/bind.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/cachefiles/bind.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/cachefiles/bind.c linux-2.6.38.1/fs/cachefiles/bind.c
+--- linux-2.6.38.1/fs/cachefiles/bind.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/cachefiles/bind.c 2011-03-21 18:31:35.000000000 -0400
@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
args);
@@ -30179,9 +30203,9 @@ diff -urNp linux-2.6.38/fs/cachefiles/bind.c linux-2.6.38-new/fs/cachefiles/bind
cache->bcull_percent < cache->brun_percent &&
cache->brun_percent < 100);
-diff -urNp linux-2.6.38/fs/cachefiles/daemon.c linux-2.6.38-new/fs/cachefiles/daemon.c
---- linux-2.6.38/fs/cachefiles/daemon.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/cachefiles/daemon.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/cachefiles/daemon.c linux-2.6.38.1/fs/cachefiles/daemon.c
+--- linux-2.6.38.1/fs/cachefiles/daemon.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/cachefiles/daemon.c 2011-03-21 18:31:35.000000000 -0400
@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st
if (n > buflen)
return -EMSGSIZE;
@@ -30218,9 +30242,9 @@ diff -urNp linux-2.6.38/fs/cachefiles/daemon.c linux-2.6.38-new/fs/cachefiles/da
return cachefiles_daemon_range_error(cache, args);
cache->bstop_percent = bstop;
-diff -urNp linux-2.6.38/fs/cachefiles/rdwr.c linux-2.6.38-new/fs/cachefiles/rdwr.c
---- linux-2.6.38/fs/cachefiles/rdwr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/cachefiles/rdwr.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/cachefiles/rdwr.c linux-2.6.38.1/fs/cachefiles/rdwr.c
+--- linux-2.6.38.1/fs/cachefiles/rdwr.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/cachefiles/rdwr.c 2011-03-21 18:31:35.000000000 -0400
@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
old_fs = get_fs();
set_fs(KERNEL_DS);
@@ -30230,9 +30254,9 @@ diff -urNp linux-2.6.38/fs/cachefiles/rdwr.c linux-2.6.38-new/fs/cachefiles/rdwr
set_fs(old_fs);
kunmap(page);
if (ret != len)
-diff -urNp linux-2.6.38/fs/ceph/dir.c linux-2.6.38-new/fs/ceph/dir.c
---- linux-2.6.38/fs/ceph/dir.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ceph/dir.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ceph/dir.c linux-2.6.38.1/fs/ceph/dir.c
+--- linux-2.6.38.1/fs/ceph/dir.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ceph/dir.c 2011-03-21 18:31:35.000000000 -0400
@@ -226,7 +226,7 @@ static int ceph_readdir(struct file *fil
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
struct ceph_mds_client *mdsc = fsc->mdsc;
@@ -30251,9 +30275,9 @@ diff -urNp linux-2.6.38/fs/ceph/dir.c linux-2.6.38-new/fs/ceph/dir.c
u64 pos = ceph_make_fpos(frag, off);
struct ceph_mds_reply_inode *in =
rinfo->dir_in[off - fi->offset].in;
-diff -urNp linux-2.6.38/fs/cifs/cifs_uniupr.h linux-2.6.38-new/fs/cifs/cifs_uniupr.h
---- linux-2.6.38/fs/cifs/cifs_uniupr.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/cifs/cifs_uniupr.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/cifs/cifs_uniupr.h linux-2.6.38.1/fs/cifs/cifs_uniupr.h
+--- linux-2.6.38.1/fs/cifs/cifs_uniupr.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/cifs/cifs_uniupr.h 2011-03-21 18:31:35.000000000 -0400
@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
{0x0490, 0x04cc, UniCaseRangeU0490},
{0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -30263,9 +30287,9 @@ diff -urNp linux-2.6.38/fs/cifs/cifs_uniupr.h linux-2.6.38-new/fs/cifs/cifs_uniu
};
#endif
-diff -urNp linux-2.6.38/fs/cifs/link.c linux-2.6.38-new/fs/cifs/link.c
---- linux-2.6.38/fs/cifs/link.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/cifs/link.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/cifs/link.c linux-2.6.38.1/fs/cifs/link.c
+--- linux-2.6.38.1/fs/cifs/link.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/cifs/link.c 2011-03-21 18:31:35.000000000 -0400
@@ -577,7 +577,7 @@ symlink_exit:
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -30275,9 +30299,9 @@ diff -urNp linux-2.6.38/fs/cifs/link.c linux-2.6.38-new/fs/cifs/link.c
if (!IS_ERR(p))
kfree(p);
}
-diff -urNp linux-2.6.38/fs/compat_binfmt_elf.c linux-2.6.38-new/fs/compat_binfmt_elf.c
---- linux-2.6.38/fs/compat_binfmt_elf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/compat_binfmt_elf.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/compat_binfmt_elf.c linux-2.6.38.1/fs/compat_binfmt_elf.c
+--- linux-2.6.38.1/fs/compat_binfmt_elf.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/compat_binfmt_elf.c 2011-03-21 18:31:35.000000000 -0400
@@ -30,11 +30,13 @@
#undef elf_phdr
#undef elf_shdr
@@ -30292,9 +30316,9 @@ diff -urNp linux-2.6.38/fs/compat_binfmt_elf.c linux-2.6.38-new/fs/compat_binfmt
#define elf_addr_t Elf32_Addr
/*
-diff -urNp linux-2.6.38/fs/compat.c linux-2.6.38-new/fs/compat.c
---- linux-2.6.38/fs/compat.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/compat.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/compat.c linux-2.6.38.1/fs/compat.c
+--- linux-2.6.38.1/fs/compat.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/compat.c 2011-03-21 18:31:35.000000000 -0400
@@ -594,7 +594,7 @@ ssize_t compat_rw_copy_check_uvector(int
goto out;
@@ -30477,9 +30501,9 @@ diff -urNp linux-2.6.38/fs/compat.c linux-2.6.38-new/fs/compat.c
out:
if (bprm->mm) {
acct_arg_size(bprm, 0);
-diff -urNp linux-2.6.38/fs/compat_ioctl.c linux-2.6.38-new/fs/compat_ioctl.c
---- linux-2.6.38/fs/compat_ioctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/compat_ioctl.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/compat_ioctl.c linux-2.6.38.1/fs/compat_ioctl.c
+--- linux-2.6.38.1/fs/compat_ioctl.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/compat_ioctl.c 2011-03-21 18:31:35.000000000 -0400
@@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi
err = get_user(palp, &up->palette);
@@ -30500,9 +30524,9 @@ diff -urNp linux-2.6.38/fs/compat_ioctl.c linux-2.6.38-new/fs/compat_ioctl.c
if (a > b)
return 1;
if (a < b)
-diff -urNp linux-2.6.38/fs/debugfs/inode.c linux-2.6.38-new/fs/debugfs/inode.c
---- linux-2.6.38/fs/debugfs/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/debugfs/inode.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/debugfs/inode.c linux-2.6.38.1/fs/debugfs/inode.c
+--- linux-2.6.38.1/fs/debugfs/inode.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/debugfs/inode.c 2011-03-21 18:31:35.000000000 -0400
@@ -130,7 +130,7 @@ static inline int debugfs_positive(struc
static int debug_fill_super(struct super_block *sb, void *data, int silent)
@@ -30512,9 +30536,9 @@ diff -urNp linux-2.6.38/fs/debugfs/inode.c linux-2.6.38-new/fs/debugfs/inode.c
return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
}
-diff -urNp linux-2.6.38/fs/dlm/lockspace.c linux-2.6.38-new/fs/dlm/lockspace.c
---- linux-2.6.38/fs/dlm/lockspace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/dlm/lockspace.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/dlm/lockspace.c linux-2.6.38.1/fs/dlm/lockspace.c
+--- linux-2.6.38.1/fs/dlm/lockspace.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/dlm/lockspace.c 2011-03-21 18:31:35.000000000 -0400
@@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset,
return 0;
}
@@ -30524,9 +30548,9 @@ diff -urNp linux-2.6.38/fs/dlm/lockspace.c linux-2.6.38-new/fs/dlm/lockspace.c
.uevent = dlm_uevent,
};
-diff -urNp linux-2.6.38/fs/ecryptfs/inode.c linux-2.6.38-new/fs/ecryptfs/inode.c
---- linux-2.6.38/fs/ecryptfs/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ecryptfs/inode.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ecryptfs/inode.c linux-2.6.38.1/fs/ecryptfs/inode.c
+--- linux-2.6.38.1/fs/ecryptfs/inode.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ecryptfs/inode.c 2011-03-21 18:31:35.000000000 -0400
@@ -658,7 +658,7 @@ static int ecryptfs_readlink_lower(struc
old_fs = get_fs();
set_fs(get_ds());
@@ -30554,9 +30578,9 @@ diff -urNp linux-2.6.38/fs/ecryptfs/inode.c linux-2.6.38-new/fs/ecryptfs/inode.c
if (!IS_ERR(buf)) {
/* Free the char* */
kfree(buf);
-diff -urNp linux-2.6.38/fs/ecryptfs/miscdev.c linux-2.6.38-new/fs/ecryptfs/miscdev.c
---- linux-2.6.38/fs/ecryptfs/miscdev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ecryptfs/miscdev.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ecryptfs/miscdev.c linux-2.6.38.1/fs/ecryptfs/miscdev.c
+--- linux-2.6.38.1/fs/ecryptfs/miscdev.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ecryptfs/miscdev.c 2011-03-21 18:31:35.000000000 -0400
@@ -328,7 +328,7 @@ check_list:
goto out_unlock_msg_ctx;
i = 5;
@@ -30566,9 +30590,9 @@ diff -urNp linux-2.6.38/fs/ecryptfs/miscdev.c linux-2.6.38-new/fs/ecryptfs/miscd
goto out_unlock_msg_ctx;
i += packet_length_size;
if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
-diff -urNp linux-2.6.38/fs/exec.c linux-2.6.38-new/fs/exec.c
---- linux-2.6.38/fs/exec.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/exec.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/exec.c linux-2.6.38.1/fs/exec.c
+--- linux-2.6.38.1/fs/exec.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/exec.c 2011-03-21 18:31:35.000000000 -0400
@@ -55,12 +55,24 @@
#include <linux/fs_struct.h>
#include <linux/pipe_fs_i.h>
@@ -31101,9 +31125,9 @@ diff -urNp linux-2.6.38/fs/exec.c linux-2.6.38-new/fs/exec.c
if (ispipe) {
int dump_count;
char **helper_argv;
-diff -urNp linux-2.6.38/fs/ext2/balloc.c linux-2.6.38-new/fs/ext2/balloc.c
---- linux-2.6.38/fs/ext2/balloc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ext2/balloc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ext2/balloc.c linux-2.6.38.1/fs/ext2/balloc.c
+--- linux-2.6.38.1/fs/ext2/balloc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ext2/balloc.c 2011-03-21 18:31:35.000000000 -0400
@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -31113,9 +31137,9 @@ diff -urNp linux-2.6.38/fs/ext2/balloc.c linux-2.6.38-new/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.38/fs/ext2/xattr.c linux-2.6.38-new/fs/ext2/xattr.c
---- linux-2.6.38/fs/ext2/xattr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ext2/xattr.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ext2/xattr.c linux-2.6.38.1/fs/ext2/xattr.c
+--- linux-2.6.38.1/fs/ext2/xattr.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ext2/xattr.c 2011-03-21 18:31:35.000000000 -0400
@@ -86,8 +86,8 @@
printk("\n"); \
} while (0)
@@ -31127,9 +31151,9 @@ diff -urNp linux-2.6.38/fs/ext2/xattr.c linux-2.6.38-new/fs/ext2/xattr.c
#endif
static int ext2_xattr_set2(struct inode *, struct buffer_head *,
-diff -urNp linux-2.6.38/fs/ext3/balloc.c linux-2.6.38-new/fs/ext3/balloc.c
---- linux-2.6.38/fs/ext3/balloc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ext3/balloc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ext3/balloc.c linux-2.6.38.1/fs/ext3/balloc.c
+--- linux-2.6.38.1/fs/ext3/balloc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ext3/balloc.c 2011-03-21 18:31:35.000000000 -0400
@@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -31139,9 +31163,9 @@ diff -urNp linux-2.6.38/fs/ext3/balloc.c linux-2.6.38-new/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.38/fs/ext3/namei.c linux-2.6.38-new/fs/ext3/namei.c
---- linux-2.6.38/fs/ext3/namei.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ext3/namei.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ext3/namei.c linux-2.6.38.1/fs/ext3/namei.c
+--- linux-2.6.38.1/fs/ext3/namei.c 2011-03-23 17:20:08.000000000 -0400
++++ linux-2.6.38.1/fs/ext3/namei.c 2011-03-23 17:21:51.000000000 -0400
@@ -1159,7 +1159,7 @@ static struct ext3_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
@@ -31151,9 +31175,9 @@ diff -urNp linux-2.6.38/fs/ext3/namei.c linux-2.6.38-new/fs/ext3/namei.c
bh2 = ext3_append (handle, dir, &newblock, &err);
if (!(bh2)) {
-diff -urNp linux-2.6.38/fs/ext3/xattr.c linux-2.6.38-new/fs/ext3/xattr.c
---- linux-2.6.38/fs/ext3/xattr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ext3/xattr.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ext3/xattr.c linux-2.6.38.1/fs/ext3/xattr.c
+--- linux-2.6.38.1/fs/ext3/xattr.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ext3/xattr.c 2011-03-21 18:31:35.000000000 -0400
@@ -89,8 +89,8 @@
printk("\n"); \
} while (0)
@@ -31165,9 +31189,9 @@ diff -urNp linux-2.6.38/fs/ext3/xattr.c linux-2.6.38-new/fs/ext3/xattr.c
#endif
static void ext3_xattr_cache_insert(struct buffer_head *);
-diff -urNp linux-2.6.38/fs/ext4/balloc.c linux-2.6.38-new/fs/ext4/balloc.c
---- linux-2.6.38/fs/ext4/balloc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ext4/balloc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ext4/balloc.c linux-2.6.38.1/fs/ext4/balloc.c
+--- linux-2.6.38.1/fs/ext4/balloc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ext4/balloc.c 2011-03-21 18:31:35.000000000 -0400
@@ -519,7 +519,7 @@ static int ext4_has_free_blocks(struct e
/* Hm, nope. Are (enough) root reserved blocks available? */
if (sbi->s_resuid == current_fsuid() ||
@@ -31177,9 +31201,9 @@ diff -urNp linux-2.6.38/fs/ext4/balloc.c linux-2.6.38-new/fs/ext4/balloc.c
if (free_blocks >= (nblocks + dirty_blocks))
return 1;
}
-diff -urNp linux-2.6.38/fs/ext4/ext4.h linux-2.6.38-new/fs/ext4/ext4.h
---- linux-2.6.38/fs/ext4/ext4.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ext4/ext4.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ext4/ext4.h linux-2.6.38.1/fs/ext4/ext4.h
+--- linux-2.6.38.1/fs/ext4/ext4.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ext4/ext4.h 2011-03-21 18:31:35.000000000 -0400
@@ -1166,19 +1166,19 @@ struct ext4_sb_info {
unsigned long s_mb_last_start;
@@ -31210,9 +31234,9 @@ diff -urNp linux-2.6.38/fs/ext4/ext4.h linux-2.6.38-new/fs/ext4/ext4.h
atomic_t s_lock_busy;
/* locality groups */
-diff -urNp linux-2.6.38/fs/ext4/mballoc.c linux-2.6.38-new/fs/ext4/mballoc.c
---- linux-2.6.38/fs/ext4/mballoc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ext4/mballoc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ext4/mballoc.c linux-2.6.38.1/fs/ext4/mballoc.c
+--- linux-2.6.38.1/fs/ext4/mballoc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ext4/mballoc.c 2011-03-21 18:31:35.000000000 -0400
@@ -1846,7 +1846,7 @@ void ext4_mb_simple_scan_group(struct ex
BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
@@ -31326,9 +31350,9 @@ diff -urNp linux-2.6.38/fs/ext4/mballoc.c linux-2.6.38-new/fs/ext4/mballoc.c
trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
return 0;
-diff -urNp linux-2.6.38/fs/ext4/namei.c linux-2.6.38-new/fs/ext4/namei.c
---- linux-2.6.38/fs/ext4/namei.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ext4/namei.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ext4/namei.c linux-2.6.38.1/fs/ext4/namei.c
+--- linux-2.6.38.1/fs/ext4/namei.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ext4/namei.c 2011-03-21 18:31:35.000000000 -0400
@@ -1161,7 +1161,7 @@ static struct ext4_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
@@ -31338,9 +31362,9 @@ diff -urNp linux-2.6.38/fs/ext4/namei.c linux-2.6.38-new/fs/ext4/namei.c
bh2 = ext4_append (handle, dir, &newblock, &err);
if (!(bh2)) {
-diff -urNp linux-2.6.38/fs/ext4/xattr.c linux-2.6.38-new/fs/ext4/xattr.c
---- linux-2.6.38/fs/ext4/xattr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ext4/xattr.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ext4/xattr.c linux-2.6.38.1/fs/ext4/xattr.c
+--- linux-2.6.38.1/fs/ext4/xattr.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ext4/xattr.c 2011-03-21 18:31:35.000000000 -0400
@@ -82,8 +82,8 @@
printk("\n"); \
} while (0)
@@ -31352,9 +31376,9 @@ diff -urNp linux-2.6.38/fs/ext4/xattr.c linux-2.6.38-new/fs/ext4/xattr.c
#endif
static void ext4_xattr_cache_insert(struct buffer_head *);
-diff -urNp linux-2.6.38/fs/fcntl.c linux-2.6.38-new/fs/fcntl.c
---- linux-2.6.38/fs/fcntl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/fcntl.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/fcntl.c linux-2.6.38.1/fs/fcntl.c
+--- linux-2.6.38.1/fs/fcntl.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/fcntl.c 2011-03-21 18:31:35.000000000 -0400
@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
if (err)
return err;
@@ -31392,9 +31416,9 @@ diff -urNp linux-2.6.38/fs/fcntl.c linux-2.6.38-new/fs/fcntl.c
));
fasync_cache = kmem_cache_create("fasync_cache",
-diff -urNp linux-2.6.38/fs/fifo.c linux-2.6.38-new/fs/fifo.c
---- linux-2.6.38/fs/fifo.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/fifo.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/fifo.c linux-2.6.38.1/fs/fifo.c
+--- linux-2.6.38.1/fs/fifo.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/fifo.c 2011-03-21 18:31:35.000000000 -0400
@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
*/
filp->f_op = &read_pipefifo_fops;
@@ -31465,9 +31489,9 @@ diff -urNp linux-2.6.38/fs/fifo.c linux-2.6.38-new/fs/fifo.c
free_pipe_info(inode);
err_nocleanup:
-diff -urNp linux-2.6.38/fs/file.c linux-2.6.38-new/fs/file.c
---- linux-2.6.38/fs/file.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/file.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/file.c linux-2.6.38.1/fs/file.c
+--- linux-2.6.38.1/fs/file.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/file.c 2011-03-21 18:31:35.000000000 -0400
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -31484,9 +31508,9 @@ diff -urNp linux-2.6.38/fs/file.c linux-2.6.38-new/fs/file.c
if (nr >= rlimit(RLIMIT_NOFILE))
return -EMFILE;
-diff -urNp linux-2.6.38/fs/fs_struct.c linux-2.6.38-new/fs/fs_struct.c
---- linux-2.6.38/fs/fs_struct.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/fs_struct.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/fs_struct.c linux-2.6.38.1/fs/fs_struct.c
+--- linux-2.6.38.1/fs/fs_struct.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/fs_struct.c 2011-03-21 18:31:35.000000000 -0400
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -31576,9 +31600,9 @@ diff -urNp linux-2.6.38/fs/fs_struct.c linux-2.6.38-new/fs/fs_struct.c
spin_unlock(&fs->lock);
task_unlock(current);
-diff -urNp linux-2.6.38/fs/fuse/control.c linux-2.6.38-new/fs/fuse/control.c
---- linux-2.6.38/fs/fuse/control.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/fuse/control.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/fuse/control.c linux-2.6.38.1/fs/fuse/control.c
+--- linux-2.6.38.1/fs/fuse/control.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/fuse/control.c 2011-03-21 18:31:35.000000000 -0400
@@ -298,7 +298,7 @@ void fuse_ctl_remove_conn(struct fuse_co
static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
@@ -31588,9 +31612,9 @@ diff -urNp linux-2.6.38/fs/fuse/control.c linux-2.6.38-new/fs/fuse/control.c
struct fuse_conn *fc;
int err;
-diff -urNp linux-2.6.38/fs/fuse/cuse.c linux-2.6.38-new/fs/fuse/cuse.c
---- linux-2.6.38/fs/fuse/cuse.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/fuse/cuse.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/fuse/cuse.c linux-2.6.38.1/fs/fuse/cuse.c
+--- linux-2.6.38.1/fs/fuse/cuse.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/fuse/cuse.c 2011-03-21 18:31:35.000000000 -0400
@@ -530,8 +530,18 @@ static int cuse_channel_release(struct i
return rc;
}
@@ -31625,9 +31649,9 @@ diff -urNp linux-2.6.38/fs/fuse/cuse.c linux-2.6.38-new/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.38/fs/fuse/dev.c linux-2.6.38-new/fs/fuse/dev.c
---- linux-2.6.38/fs/fuse/dev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/fuse/dev.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/fuse/dev.c linux-2.6.38.1/fs/fuse/dev.c
+--- linux-2.6.38.1/fs/fuse/dev.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/fuse/dev.c 2011-03-21 18:31:35.000000000 -0400
@@ -1183,7 +1183,7 @@ static ssize_t fuse_dev_do_read(struct f
return err;
}
@@ -31709,9 +31733,9 @@ diff -urNp linux-2.6.38/fs/fuse/dev.c linux-2.6.38-new/fs/fuse/dev.c
const struct file_operations fuse_dev_operations = {
.owner = THIS_MODULE,
.llseek = no_llseek,
-diff -urNp linux-2.6.38/fs/fuse/dir.c linux-2.6.38-new/fs/fuse/dir.c
---- linux-2.6.38/fs/fuse/dir.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/fuse/dir.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/fuse/dir.c linux-2.6.38.1/fs/fuse/dir.c
+--- linux-2.6.38.1/fs/fuse/dir.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/fuse/dir.c 2011-03-21 18:31:35.000000000 -0400
@@ -1133,7 +1133,7 @@ static char *read_link(struct dentry *de
return link;
}
@@ -31721,9 +31745,9 @@ diff -urNp linux-2.6.38/fs/fuse/dir.c linux-2.6.38-new/fs/fuse/dir.c
{
if (!IS_ERR(link))
free_page((unsigned long) link);
-diff -urNp linux-2.6.38/fs/fuse/fuse_i.h linux-2.6.38-new/fs/fuse/fuse_i.h
---- linux-2.6.38/fs/fuse/fuse_i.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/fuse/fuse_i.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/fuse/fuse_i.h linux-2.6.38.1/fs/fuse/fuse_i.h
+--- linux-2.6.38.1/fs/fuse/fuse_i.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/fuse/fuse_i.h 2011-03-21 18:31:35.000000000 -0400
@@ -541,6 +541,16 @@ extern const struct file_operations fuse
extern const struct dentry_operations fuse_dentry_operations;
@@ -31741,9 +31765,9 @@ diff -urNp linux-2.6.38/fs/fuse/fuse_i.h linux-2.6.38-new/fs/fuse/fuse_i.h
/**
* Inode to nodeid comparison.
*/
-diff -urNp linux-2.6.38/fs/hfs/inode.c linux-2.6.38-new/fs/hfs/inode.c
---- linux-2.6.38/fs/hfs/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/hfs/inode.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/hfs/inode.c linux-2.6.38.1/fs/hfs/inode.c
+--- linux-2.6.38.1/fs/hfs/inode.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/hfs/inode.c 2011-03-21 18:31:35.000000000 -0400
@@ -447,7 +447,7 @@ int hfs_write_inode(struct inode *inode,
if (S_ISDIR(main_inode->i_mode)) {
@@ -31762,9 +31786,9 @@ diff -urNp linux-2.6.38/fs/hfs/inode.c linux-2.6.38-new/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.38/fs/hfsplus/inode.c linux-2.6.38-new/fs/hfsplus/inode.c
---- linux-2.6.38/fs/hfsplus/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/hfsplus/inode.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/hfsplus/inode.c linux-2.6.38.1/fs/hfsplus/inode.c
+--- linux-2.6.38.1/fs/hfsplus/inode.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/hfsplus/inode.c 2011-03-21 18:31:35.000000000 -0400
@@ -498,7 +498,7 @@ int hfsplus_cat_read_inode(struct inode
struct hfsplus_cat_folder *folder = &entry.folder;
@@ -31801,9 +31825,9 @@ diff -urNp linux-2.6.38/fs/hfsplus/inode.c linux-2.6.38-new/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.38/fs/hugetlbfs/inode.c linux-2.6.38-new/fs/hugetlbfs/inode.c
---- linux-2.6.38/fs/hugetlbfs/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/hugetlbfs/inode.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/hugetlbfs/inode.c linux-2.6.38.1/fs/hugetlbfs/inode.c
+--- linux-2.6.38.1/fs/hugetlbfs/inode.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/hugetlbfs/inode.c 2011-03-21 18:31:35.000000000 -0400
@@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs
.kill_sb = kill_litter_super,
};
@@ -31813,9 +31837,9 @@ diff -urNp linux-2.6.38/fs/hugetlbfs/inode.c linux-2.6.38-new/fs/hugetlbfs/inode
static int can_do_hugetlb_shm(void)
{
-diff -urNp linux-2.6.38/fs/jffs2/debug.h linux-2.6.38-new/fs/jffs2/debug.h
---- linux-2.6.38/fs/jffs2/debug.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/jffs2/debug.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/jffs2/debug.h linux-2.6.38.1/fs/jffs2/debug.h
+--- linux-2.6.38.1/fs/jffs2/debug.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/jffs2/debug.h 2011-03-21 18:31:35.000000000 -0400
@@ -53,13 +53,13 @@
#if CONFIG_JFFS2_FS_DEBUG > 0
#define D1(x) x
@@ -31917,9 +31941,9 @@ diff -urNp linux-2.6.38/fs/jffs2/debug.h linux-2.6.38-new/fs/jffs2/debug.h
#endif
/* "Sanity" checks */
-diff -urNp linux-2.6.38/fs/jffs2/erase.c linux-2.6.38-new/fs/jffs2/erase.c
---- linux-2.6.38/fs/jffs2/erase.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/jffs2/erase.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/jffs2/erase.c linux-2.6.38.1/fs/jffs2/erase.c
+--- linux-2.6.38.1/fs/jffs2/erase.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/jffs2/erase.c 2011-03-21 18:31:35.000000000 -0400
@@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru
struct jffs2_unknown_node marker = {
.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -31930,9 +31954,9 @@ diff -urNp linux-2.6.38/fs/jffs2/erase.c linux-2.6.38-new/fs/jffs2/erase.c
};
jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-2.6.38/fs/jffs2/summary.h linux-2.6.38-new/fs/jffs2/summary.h
---- linux-2.6.38/fs/jffs2/summary.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/jffs2/summary.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/jffs2/summary.h linux-2.6.38.1/fs/jffs2/summary.h
+--- linux-2.6.38.1/fs/jffs2/summary.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/jffs2/summary.h 2011-03-21 18:31:35.000000000 -0400
@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
#define jffs2_sum_active() (0)
@@ -31961,9 +31985,9 @@ diff -urNp linux-2.6.38/fs/jffs2/summary.h linux-2.6.38-new/fs/jffs2/summary.h
#define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
#endif /* CONFIG_JFFS2_SUMMARY */
-diff -urNp linux-2.6.38/fs/jffs2/wbuf.c linux-2.6.38-new/fs/jffs2/wbuf.c
---- linux-2.6.38/fs/jffs2/wbuf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/jffs2/wbuf.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/jffs2/wbuf.c linux-2.6.38.1/fs/jffs2/wbuf.c
+--- linux-2.6.38.1/fs/jffs2/wbuf.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/jffs2/wbuf.c 2011-03-21 18:31:35.000000000 -0400
@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
{
.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -31974,9 +31998,9 @@ diff -urNp linux-2.6.38/fs/jffs2/wbuf.c linux-2.6.38-new/fs/jffs2/wbuf.c
};
/*
-diff -urNp linux-2.6.38/fs/Kconfig.binfmt linux-2.6.38-new/fs/Kconfig.binfmt
---- linux-2.6.38/fs/Kconfig.binfmt 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/Kconfig.binfmt 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/Kconfig.binfmt linux-2.6.38.1/fs/Kconfig.binfmt
+--- linux-2.6.38.1/fs/Kconfig.binfmt 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/Kconfig.binfmt 2011-03-21 18:31:35.000000000 -0400
@@ -86,7 +86,7 @@ config HAVE_AOUT
config BINFMT_AOUT
@@ -31986,9 +32010,9 @@ diff -urNp linux-2.6.38/fs/Kconfig.binfmt linux-2.6.38-new/fs/Kconfig.binfmt
---help---
A.out (Assembler.OUTput) is a set of formats for libraries and
executables used in the earliest versions of UNIX. Linux used
-diff -urNp linux-2.6.38/fs/lockd/svc.c linux-2.6.38-new/fs/lockd/svc.c
---- linux-2.6.38/fs/lockd/svc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/lockd/svc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/lockd/svc.c linux-2.6.38.1/fs/lockd/svc.c
+--- linux-2.6.38.1/fs/lockd/svc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/lockd/svc.c 2011-03-21 18:31:35.000000000 -0400
@@ -41,7 +41,7 @@
static struct svc_program nlmsvc_program;
@@ -31998,9 +32022,9 @@ diff -urNp linux-2.6.38/fs/lockd/svc.c linux-2.6.38-new/fs/lockd/svc.c
EXPORT_SYMBOL_GPL(nlmsvc_ops);
static DEFINE_MUTEX(nlmsvc_mutex);
-diff -urNp linux-2.6.38/fs/locks.c linux-2.6.38-new/fs/locks.c
---- linux-2.6.38/fs/locks.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/locks.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/locks.c linux-2.6.38.1/fs/locks.c
+--- linux-2.6.38.1/fs/locks.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/locks.c 2011-03-21 18:31:35.000000000 -0400
@@ -2044,16 +2044,16 @@ void locks_remove_flock(struct file *fil
return;
@@ -32022,9 +32046,9 @@ diff -urNp linux-2.6.38/fs/locks.c linux-2.6.38-new/fs/locks.c
}
lock_flocks();
-diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
---- linux-2.6.38/fs/namei.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/namei.c 2011-03-21 23:40:22.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/namei.c linux-2.6.38.1/fs/namei.c
+--- linux-2.6.38.1/fs/namei.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/namei.c 2011-03-25 18:59:30.000000000 -0400
@@ -226,14 +226,6 @@ int generic_permission(struct inode *ino
return ret;
@@ -32088,31 +32112,62 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
current->link_count++;
current->total_link_count++;
nd->depth++;
-@@ -1737,6 +1745,12 @@ static int do_path_lookup(int dfd, const
- }
+@@ -1505,13 +1513,36 @@ return_reval:
+ return_base:
+ if (nameidata_drop_rcu_last_maybe(nd))
+ return -ECHILD;
++
++ if (!(nd->flags & LOOKUP_PARENT) && !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
++ err = -ENOENT;
++ goto err_and_ret;
++ }
++
+ return 0;
+ out_dput:
+ if (!(nd->flags & LOOKUP_RCU))
+ path_put_conditional(&next, nd);
+ break;
}
-
-+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt))
-+ retval = -ENOENT;
++#ifdef CONFIG_GRKERNSEC
++ /* we do this because we can't operate here on an rcu'd dentry,
++ acquire a properly-referenced copy
++ */
++ if (nameidata_drop_rcu_last_maybe(nd))
++ return -ECHILD;
++#endif
+
-+ if (*name != '/' && !gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
-+ retval = -ENOENT;
++ if (!(nd->flags & LOOKUP_PARENT) && !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt))
++ err = -ENOENT;
+
++err_and_ret:
++#ifndef CONFIG_GRKERNSEC
++ /* since we convert to ref-walk above, always put the path if we reach
++ here
++ */
+ if (!(nd->flags & LOOKUP_RCU))
++#endif
+ path_put(&nd->path);
+ return_err:
+ return err;
+@@ -1738,6 +1769,9 @@ static int do_path_lookup(int dfd, const
+ }
+
if (likely(!retval)) {
++ if (*name != '/' && nd->path.dentry && nd->inode && !gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
++ return -ENOENT;
++
if (unlikely(!audit_dummy_context())) {
if (nd->path.dentry && nd->inode)
-@@ -1789,6 +1803,10 @@ int vfs_path_lookup(struct dentry *dentr
+ audit_inode(name, nd->path.dentry);
+@@ -1789,6 +1823,7 @@ int vfs_path_lookup(struct dentry *dentr
nd->inode = nd->path.dentry->d_inode;
retval = path_walk(name, nd);
+
-+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt))
-+ retval = -ENOENT;
-+
if (unlikely(!retval && !audit_dummy_context() && nd->path.dentry &&
nd->inode))
audit_inode(name, nd->path.dentry);
-@@ -2078,6 +2096,30 @@ int vfs_create(struct inode *dir, struct
+@@ -2078,6 +2113,30 @@ int vfs_create(struct inode *dir, struct
return error;
}
@@ -32143,7 +32198,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
int may_open(struct path *path, int acc_mode, int flag)
{
struct dentry *dentry = path->dentry;
-@@ -2126,7 +2168,27 @@ int may_open(struct path *path, int acc_
+@@ -2126,7 +2185,27 @@ int may_open(struct path *path, int acc_
/*
* Ensure there are no outstanding leases on the file.
*/
@@ -32172,7 +32227,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
}
static int handle_truncate(struct file *filp)
-@@ -2161,6 +2223,12 @@ static int __open_namei_create(struct na
+@@ -2161,6 +2240,12 @@ static int __open_namei_create(struct na
{
int error;
struct dentry *dir = nd->path.dentry;
@@ -32185,7 +32240,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
if (!IS_POSIXACL(dir->d_inode))
mode &= ~current_umask();
-@@ -2168,6 +2236,8 @@ static int __open_namei_create(struct na
+@@ -2168,6 +2253,8 @@ static int __open_namei_create(struct na
if (error)
goto out_unlock;
error = vfs_create(dir->d_inode, path->dentry, mode, nd);
@@ -32194,7 +32249,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
out_unlock:
mutex_unlock(&dir->d_inode->i_mutex);
dput(nd->path.dentry);
-@@ -2179,30 +2249,6 @@ out_unlock:
+@@ -2179,30 +2266,6 @@ out_unlock:
return may_open(&nd->path, 0, open_flag & ~O_TRUNC);
}
@@ -32225,7 +32280,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
static int open_will_truncate(int flag, struct inode *inode)
{
/*
-@@ -2273,6 +2319,7 @@ static struct file *do_last(struct namei
+@@ -2273,6 +2336,7 @@ static struct file *do_last(struct namei
int mode, const char *pathname)
{
struct dentry *dir = nd->path.dentry;
@@ -32233,7 +32288,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
struct file *filp;
int error = -EISDIR;
-@@ -2351,6 +2398,14 @@ static struct file *do_last(struct namei
+@@ -2351,6 +2415,14 @@ static struct file *do_last(struct namei
/*
* It already exists.
*/
@@ -32248,32 +32303,23 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
mutex_unlock(&dir->d_inode->i_mutex);
audit_inode(pathname, path->dentry);
-@@ -2467,6 +2522,11 @@ struct file *do_filp_open(int dfd, const
+@@ -2467,6 +2539,7 @@ struct file *do_filp_open(int dfd, const
if (!nd.inode->i_op->lookup)
goto out_path2;
}
-+ if (!gr_acl_handle_hidden_file(nd.path.dentry, nd.path.mnt)) {
-+ error = -ENOENT;
-+ goto out_path2;
-+ }
+
audit_inode(pathname, nd.path.dentry);
filp = finish_open(&nd, open_flag, acc_mode);
out2:
-@@ -2500,6 +2560,12 @@ reval:
+@@ -2500,6 +2573,7 @@ reval:
error = path_walk_simple(pathname, &nd);
}
+
-+ if (!gr_acl_handle_hidden_file(nd.path.dentry, nd.path.mnt)) {
-+ error = -ENOENT;
-+ goto out_filp;
-+ }
-+
if (unlikely(error))
goto out_filp;
if (unlikely(!audit_dummy_context()))
-@@ -2534,6 +2600,11 @@ reval:
+@@ -2534,6 +2608,11 @@ reval:
error = security_inode_follow_link(link.dentry, &nd);
if (error)
goto exit_dput;
@@ -32285,7 +32331,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
error = __do_follow_link(&link, &nd, &cookie);
if (unlikely(error)) {
if (!IS_ERR(cookie) && linki->i_op->put_link)
-@@ -2704,6 +2775,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2704,6 +2783,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
error = may_mknod(mode);
if (error)
goto out_dput;
@@ -32303,7 +32349,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
error = mnt_want_write(nd.path.mnt);
if (error)
goto out_dput;
-@@ -2724,6 +2806,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2724,6 +2814,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
}
out_drop_write:
mnt_drop_write(nd.path.mnt);
@@ -32313,7 +32359,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
out_dput:
dput(dentry);
out_unlock:
-@@ -2776,6 +2861,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2776,6 +2869,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
if (IS_ERR(dentry))
goto out_unlock;
@@ -32325,7 +32371,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
if (!IS_POSIXACL(nd.path.dentry->d_inode))
mode &= ~current_umask();
error = mnt_want_write(nd.path.mnt);
-@@ -2787,6 +2877,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2787,6 +2885,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode);
out_drop_write:
mnt_drop_write(nd.path.mnt);
@@ -32336,7 +32382,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
out_dput:
dput(dentry);
out_unlock:
-@@ -2866,6 +2960,8 @@ static long do_rmdir(int dfd, const char
+@@ -2866,6 +2968,8 @@ static long do_rmdir(int dfd, const char
char * name;
struct dentry *dentry;
struct nameidata nd;
@@ -32345,7 +32391,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
error = user_path_parent(dfd, pathname, &nd, &name);
if (error)
-@@ -2890,6 +2986,19 @@ static long do_rmdir(int dfd, const char
+@@ -2890,6 +2994,19 @@ static long do_rmdir(int dfd, const char
error = PTR_ERR(dentry);
if (IS_ERR(dentry))
goto exit2;
@@ -32353,7 +32399,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
+ if (dentry->d_inode != NULL) {
+ if (dentry->d_inode->i_nlink <= 1) {
+ saved_ino = dentry->d_inode->i_ino;
-+ saved_dev = dentry->d_inode->i_sb->s_dev;
++ saved_dev = gr_get_dev_from_dentry(dentry);
+ }
+
+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
@@ -32365,7 +32411,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
error = mnt_want_write(nd.path.mnt);
if (error)
goto exit3;
-@@ -2897,6 +3006,8 @@ static long do_rmdir(int dfd, const char
+@@ -2897,6 +3014,8 @@ static long do_rmdir(int dfd, const char
if (error)
goto exit4;
error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
@@ -32374,7 +32420,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
exit4:
mnt_drop_write(nd.path.mnt);
exit3:
-@@ -2959,6 +3070,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2959,6 +3078,8 @@ static long do_unlinkat(int dfd, const c
struct dentry *dentry;
struct nameidata nd;
struct inode *inode = NULL;
@@ -32383,7 +32429,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
error = user_path_parent(dfd, pathname, &nd, &name);
if (error)
-@@ -2978,8 +3091,17 @@ static long do_unlinkat(int dfd, const c
+@@ -2978,8 +3099,17 @@ static long do_unlinkat(int dfd, const c
if (nd.last.name[nd.last.len])
goto slashes;
inode = dentry->d_inode;
@@ -32392,7 +32438,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
ihold(inode);
+ if (inode->i_nlink <= 1) {
+ saved_ino = inode->i_ino;
-+ saved_dev = inode->i_sb->s_dev;
++ saved_dev = gr_get_dev_from_dentry(dentry);
+ }
+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
+ error = -EACCES;
@@ -32402,7 +32448,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
error = mnt_want_write(nd.path.mnt);
if (error)
goto exit2;
-@@ -2987,6 +3109,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2987,6 +3117,8 @@ static long do_unlinkat(int dfd, const c
if (error)
goto exit3;
error = vfs_unlink(nd.path.dentry->d_inode, dentry);
@@ -32411,7 +32457,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
exit3:
mnt_drop_write(nd.path.mnt);
exit2:
-@@ -3064,6 +3188,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -3064,6 +3196,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
if (IS_ERR(dentry))
goto out_unlock;
@@ -32423,7 +32469,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
error = mnt_want_write(nd.path.mnt);
if (error)
goto out_dput;
-@@ -3071,6 +3200,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -3071,6 +3208,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
if (error)
goto out_drop_write;
error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
@@ -32432,7 +32478,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
out_drop_write:
mnt_drop_write(nd.path.mnt);
out_dput:
-@@ -3163,6 +3294,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -3163,6 +3302,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
error = PTR_ERR(new_dentry);
if (IS_ERR(new_dentry))
goto out_unlock;
@@ -32453,7 +32499,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
error = mnt_want_write(nd.path.mnt);
if (error)
goto out_dput;
-@@ -3170,6 +3315,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -3170,6 +3323,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
if (error)
goto out_drop_write;
error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry);
@@ -32462,7 +32508,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
out_drop_write:
mnt_drop_write(nd.path.mnt);
out_dput:
-@@ -3403,6 +3550,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -3403,6 +3558,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
if (new_dentry == trap)
goto exit5;
@@ -32475,7 +32521,7 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
error = mnt_want_write(oldnd.path.mnt);
if (error)
goto exit5;
-@@ -3412,6 +3565,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -3412,6 +3573,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
goto exit6;
error = vfs_rename(old_dir->d_inode, old_dentry,
new_dir->d_inode, new_dentry);
@@ -32485,9 +32531,9 @@ diff -urNp linux-2.6.38/fs/namei.c linux-2.6.38-new/fs/namei.c
exit6:
mnt_drop_write(oldnd.path.mnt);
exit5:
-diff -urNp linux-2.6.38/fs/namespace.c linux-2.6.38-new/fs/namespace.c
---- linux-2.6.38/fs/namespace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/namespace.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/namespace.c linux-2.6.38.1/fs/namespace.c
+--- linux-2.6.38.1/fs/namespace.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/namespace.c 2011-03-21 18:31:35.000000000 -0400
@@ -1285,6 +1285,9 @@ static int do_umount(struct vfsmount *mn
if (!(sb->s_flags & MS_RDONLY))
retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -32548,9 +32594,9 @@ diff -urNp linux-2.6.38/fs/namespace.c linux-2.6.38-new/fs/namespace.c
get_fs_root(current->fs, &root);
down_write(&namespace_sem);
mutex_lock(&old.dentry->d_inode->i_mutex);
-diff -urNp linux-2.6.38/fs/nfs/inode.c linux-2.6.38-new/fs/nfs/inode.c
---- linux-2.6.38/fs/nfs/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/nfs/inode.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/nfs/inode.c linux-2.6.38.1/fs/nfs/inode.c
+--- linux-2.6.38.1/fs/nfs/inode.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/nfs/inode.c 2011-03-21 18:31:35.000000000 -0400
@@ -998,16 +998,16 @@ static int nfs_size_need_update(const st
return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
}
@@ -32571,9 +32617,9 @@ diff -urNp linux-2.6.38/fs/nfs/inode.c linux-2.6.38-new/fs/nfs/inode.c
}
void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-2.6.38/fs/nfs/nfs4proc.c linux-2.6.38-new/fs/nfs/nfs4proc.c
---- linux-2.6.38/fs/nfs/nfs4proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/nfs/nfs4proc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/nfs/nfs4proc.c linux-2.6.38.1/fs/nfs/nfs4proc.c
+--- linux-2.6.38.1/fs/nfs/nfs4proc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/nfs/nfs4proc.c 2011-03-21 18:31:35.000000000 -0400
@@ -1198,7 +1198,7 @@ static int _nfs4_do_open_reclaim(struct
static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
{
@@ -32844,9 +32890,9 @@ diff -urNp linux-2.6.38/fs/nfs/nfs4proc.c linux-2.6.38-new/fs/nfs/nfs4proc.c
int err;
err = nfs4_set_lock_state(state, fl);
-diff -urNp linux-2.6.38/fs/nfsd/lockd.c linux-2.6.38-new/fs/nfsd/lockd.c
---- linux-2.6.38/fs/nfsd/lockd.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/nfsd/lockd.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/nfsd/lockd.c linux-2.6.38.1/fs/nfsd/lockd.c
+--- linux-2.6.38.1/fs/nfsd/lockd.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/nfsd/lockd.c 2011-03-21 18:31:35.000000000 -0400
@@ -61,7 +61,7 @@ nlm_fclose(struct file *filp)
fput(filp);
}
@@ -32856,9 +32902,9 @@ diff -urNp linux-2.6.38/fs/nfsd/lockd.c linux-2.6.38-new/fs/nfsd/lockd.c
.fopen = nlm_fopen, /* open file for locking */
.fclose = nlm_fclose, /* close file */
};
-diff -urNp linux-2.6.38/fs/nfsd/nfsctl.c linux-2.6.38-new/fs/nfsd/nfsctl.c
---- linux-2.6.38/fs/nfsd/nfsctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/nfsd/nfsctl.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/nfsd/nfsctl.c linux-2.6.38.1/fs/nfsd/nfsctl.c
+--- linux-2.6.38.1/fs/nfsd/nfsctl.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/nfsd/nfsctl.c 2011-03-21 18:31:35.000000000 -0400
@@ -180,7 +180,7 @@ static int export_features_open(struct i
return single_open(file, export_features_show, NULL);
}
@@ -32868,9 +32914,9 @@ diff -urNp linux-2.6.38/fs/nfsd/nfsctl.c linux-2.6.38-new/fs/nfsd/nfsctl.c
.open = export_features_open,
.read = seq_read,
.llseek = seq_lseek,
-diff -urNp linux-2.6.38/fs/nfsd/vfs.c linux-2.6.38-new/fs/nfsd/vfs.c
---- linux-2.6.38/fs/nfsd/vfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/nfsd/vfs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/nfsd/vfs.c linux-2.6.38.1/fs/nfsd/vfs.c
+--- linux-2.6.38.1/fs/nfsd/vfs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/nfsd/vfs.c 2011-03-21 18:31:35.000000000 -0400
@@ -898,7 +898,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
} else {
oldfs = get_fs();
@@ -32898,9 +32944,9 @@ diff -urNp linux-2.6.38/fs/nfsd/vfs.c linux-2.6.38-new/fs/nfsd/vfs.c
set_fs(oldfs);
if (host_err < 0)
-diff -urNp linux-2.6.38/fs/nls/nls_base.c linux-2.6.38-new/fs/nls/nls_base.c
---- linux-2.6.38/fs/nls/nls_base.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/nls/nls_base.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/nls/nls_base.c linux-2.6.38.1/fs/nls/nls_base.c
+--- linux-2.6.38.1/fs/nls/nls_base.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/nls/nls_base.c 2011-03-21 18:31:35.000000000 -0400
@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
{0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
{0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
@@ -32910,9 +32956,9 @@ diff -urNp linux-2.6.38/fs/nls/nls_base.c linux-2.6.38-new/fs/nls/nls_base.c
};
#define UNICODE_MAX 0x0010ffff
-diff -urNp linux-2.6.38/fs/ntfs/dir.c linux-2.6.38-new/fs/ntfs/dir.c
---- linux-2.6.38/fs/ntfs/dir.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ntfs/dir.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ntfs/dir.c linux-2.6.38.1/fs/ntfs/dir.c
+--- linux-2.6.38.1/fs/ntfs/dir.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ntfs/dir.c 2011-03-21 18:31:35.000000000 -0400
@@ -1329,7 +1329,7 @@ find_next_index_buffer:
ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
~(s64)(ndir->itype.index.block_size - 1)));
@@ -32922,9 +32968,9 @@ diff -urNp linux-2.6.38/fs/ntfs/dir.c linux-2.6.38-new/fs/ntfs/dir.c
ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
"inode 0x%lx or driver bug.", vdir->i_ino);
goto err_out;
-diff -urNp linux-2.6.38/fs/ntfs/file.c linux-2.6.38-new/fs/ntfs/file.c
---- linux-2.6.38/fs/ntfs/file.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ntfs/file.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ntfs/file.c linux-2.6.38.1/fs/ntfs/file.c
+--- linux-2.6.38.1/fs/ntfs/file.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ntfs/file.c 2011-03-21 18:31:35.000000000 -0400
@@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_
#endif /* NTFS_RW */
};
@@ -32934,9 +32980,9 @@ diff -urNp linux-2.6.38/fs/ntfs/file.c linux-2.6.38-new/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.38/fs/ocfs2/localalloc.c linux-2.6.38-new/fs/ocfs2/localalloc.c
---- linux-2.6.38/fs/ocfs2/localalloc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ocfs2/localalloc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ocfs2/localalloc.c linux-2.6.38.1/fs/ocfs2/localalloc.c
+--- linux-2.6.38.1/fs/ocfs2/localalloc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ocfs2/localalloc.c 2011-03-21 18:31:35.000000000 -0400
@@ -1307,7 +1307,7 @@ static int ocfs2_local_alloc_slide_windo
goto bail;
}
@@ -32946,9 +32992,9 @@ diff -urNp linux-2.6.38/fs/ocfs2/localalloc.c linux-2.6.38-new/fs/ocfs2/localall
bail:
if (handle)
-diff -urNp linux-2.6.38/fs/ocfs2/ocfs2.h linux-2.6.38-new/fs/ocfs2/ocfs2.h
---- linux-2.6.38/fs/ocfs2/ocfs2.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ocfs2/ocfs2.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ocfs2/ocfs2.h linux-2.6.38.1/fs/ocfs2/ocfs2.h
+--- linux-2.6.38.1/fs/ocfs2/ocfs2.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ocfs2/ocfs2.h 2011-03-21 18:31:35.000000000 -0400
@@ -230,11 +230,11 @@ enum ocfs2_vol_state
struct ocfs2_alloc_stats
@@ -32966,9 +33012,9 @@ diff -urNp linux-2.6.38/fs/ocfs2/ocfs2.h linux-2.6.38-new/fs/ocfs2/ocfs2.h
};
enum ocfs2_local_alloc_state
-diff -urNp linux-2.6.38/fs/ocfs2/suballoc.c linux-2.6.38-new/fs/ocfs2/suballoc.c
---- linux-2.6.38/fs/ocfs2/suballoc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ocfs2/suballoc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ocfs2/suballoc.c linux-2.6.38.1/fs/ocfs2/suballoc.c
+--- linux-2.6.38.1/fs/ocfs2/suballoc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ocfs2/suballoc.c 2011-03-21 18:31:35.000000000 -0400
@@ -877,7 +877,7 @@ static int ocfs2_reserve_suballoc_bits(s
mlog_errno(status);
goto bail;
@@ -33014,9 +33060,9 @@ diff -urNp linux-2.6.38/fs/ocfs2/suballoc.c linux-2.6.38-new/fs/ocfs2/suballoc.c
*num_clusters = res.sr_bits;
}
}
-diff -urNp linux-2.6.38/fs/ocfs2/super.c linux-2.6.38-new/fs/ocfs2/super.c
---- linux-2.6.38/fs/ocfs2/super.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ocfs2/super.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ocfs2/super.c linux-2.6.38.1/fs/ocfs2/super.c
+--- linux-2.6.38.1/fs/ocfs2/super.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ocfs2/super.c 2011-03-21 18:31:35.000000000 -0400
@@ -297,11 +297,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
"%10s => GlobalAllocs: %d LocalAllocs: %d "
"SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
@@ -33051,9 +33097,9 @@ diff -urNp linux-2.6.38/fs/ocfs2/super.c linux-2.6.38-new/fs/ocfs2/super.c
/* Copy the blockcheck stats from the superblock probe */
osb->osb_ecc_stats = *stats;
-diff -urNp linux-2.6.38/fs/ocfs2/symlink.c linux-2.6.38-new/fs/ocfs2/symlink.c
---- linux-2.6.38/fs/ocfs2/symlink.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ocfs2/symlink.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ocfs2/symlink.c linux-2.6.38.1/fs/ocfs2/symlink.c
+--- linux-2.6.38.1/fs/ocfs2/symlink.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ocfs2/symlink.c 2011-03-21 18:31:35.000000000 -0400
@@ -148,7 +148,7 @@ bail:
static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -33063,9 +33109,9 @@ diff -urNp linux-2.6.38/fs/ocfs2/symlink.c linux-2.6.38-new/fs/ocfs2/symlink.c
if (!IS_ERR(link))
kfree(link);
}
-diff -urNp linux-2.6.38/fs/open.c linux-2.6.38-new/fs/open.c
---- linux-2.6.38/fs/open.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/open.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/open.c linux-2.6.38.1/fs/open.c
+--- linux-2.6.38.1/fs/open.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/open.c 2011-03-21 18:31:35.000000000 -0400
@@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
error = locks_verify_truncate(inode, NULL, length);
if (!error)
@@ -33203,9 +33249,9 @@ diff -urNp linux-2.6.38/fs/open.c linux-2.6.38-new/fs/open.c
if (IS_ERR(f)) {
put_unused_fd(fd);
fd = PTR_ERR(f);
-diff -urNp linux-2.6.38/fs/partitions/ldm.c linux-2.6.38-new/fs/partitions/ldm.c
---- linux-2.6.38/fs/partitions/ldm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/partitions/ldm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/partitions/ldm.c linux-2.6.38.1/fs/partitions/ldm.c
+--- linux-2.6.38.1/fs/partitions/ldm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/partitions/ldm.c 2011-03-21 18:31:35.000000000 -0400
@@ -1313,7 +1313,7 @@ static bool ldm_frag_add (const u8 *data
goto found;
}
@@ -33215,9 +33261,9 @@ diff -urNp linux-2.6.38/fs/partitions/ldm.c linux-2.6.38-new/fs/partitions/ldm.c
if (!f) {
ldm_crit ("Out of memory.");
return false;
-diff -urNp linux-2.6.38/fs/pipe.c linux-2.6.38-new/fs/pipe.c
---- linux-2.6.38/fs/pipe.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/pipe.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/pipe.c linux-2.6.38.1/fs/pipe.c
+--- linux-2.6.38.1/fs/pipe.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/pipe.c 2011-03-21 18:31:35.000000000 -0400
@@ -420,9 +420,9 @@ redo:
}
if (bufs) /* More to do? */
@@ -33341,9 +33387,9 @@ diff -urNp linux-2.6.38/fs/pipe.c linux-2.6.38-new/fs/pipe.c
inode->i_fop = &rdwr_pipefifo_fops;
/*
-diff -urNp linux-2.6.38/fs/proc/array.c linux-2.6.38-new/fs/proc/array.c
---- linux-2.6.38/fs/proc/array.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/proc/array.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/proc/array.c linux-2.6.38.1/fs/proc/array.c
+--- linux-2.6.38.1/fs/proc/array.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/proc/array.c 2011-03-21 18:31:35.000000000 -0400
@@ -60,6 +60,7 @@
#include <linux/tty.h>
#include <linux/string.h>
@@ -33446,9 +33492,9 @@ diff -urNp linux-2.6.38/fs/proc/array.c linux-2.6.38-new/fs/proc/array.c
+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
+}
+#endif
-diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
---- linux-2.6.38/fs/proc/base.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/proc/base.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/proc/base.c linux-2.6.38.1/fs/proc/base.c
+--- linux-2.6.38.1/fs/proc/base.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/proc/base.c 2011-03-26 11:59:10.000000000 -0400
@@ -104,6 +104,22 @@ struct pid_entry {
union proc_op op;
};
@@ -33548,7 +33594,28 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
static int proc_pid_syscall(struct task_struct *task, char *buffer)
{
long nr;
-@@ -917,6 +955,9 @@ static ssize_t environ_read(struct file
+@@ -528,7 +566,7 @@ static int proc_pid_syscall(struct task_
+ /************************************************************************/
+
+ /* permission checks */
+-static int proc_fd_access_allowed(struct inode *inode)
++static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
+ {
+ struct task_struct *task;
+ int allowed = 0;
+@@ -538,7 +576,10 @@ static int proc_fd_access_allowed(struct
+ */
+ task = get_proc_task(inode);
+ if (task) {
+- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
++ if (log)
++ allowed = ptrace_may_access_log(task, PTRACE_MODE_READ);
++ else
++ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
+ put_task_struct(task);
+ }
+ return allowed;
+@@ -917,6 +958,9 @@ static ssize_t environ_read(struct file
if (!task)
goto out_no_task;
@@ -33558,7 +33625,37 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
if (!ptrace_may_access(task, PTRACE_MODE_READ))
goto out;
-@@ -1712,7 +1753,11 @@ static struct inode *proc_pid_make_inode
+@@ -1606,7 +1650,7 @@ static void *proc_pid_follow_link(struct
+ path_put(&nd->path);
+
+ /* Are we allowed to snoop on the tasks file descriptors? */
+- if (!proc_fd_access_allowed(inode))
++ if (!proc_fd_access_allowed(inode,0))
+ goto out;
+
+ error = PROC_I(inode)->op.proc_get_link(inode, &nd->path);
+@@ -1645,8 +1689,18 @@ static int proc_pid_readlink(struct dent
+ struct path path;
+
+ /* Are we allowed to snoop on the tasks file descriptors? */
+- if (!proc_fd_access_allowed(inode))
+- goto out;
++ /* logging this is needed for learning on chromium to work properly,
++ but we don't want to flood the logs from 'ps' which does a readlink
++ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
++ CAP_SYS_PTRACE as it's not necessary for its basic functionality
++ */
++ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
++ if (!proc_fd_access_allowed(inode,0))
++ goto out;
++ } else {
++ if (!proc_fd_access_allowed(inode,1))
++ goto out;
++ }
+
+ error = PROC_I(inode)->op.proc_get_link(inode, &path);
+ if (error)
+@@ -1712,7 +1766,11 @@ static struct inode *proc_pid_make_inode
rcu_read_lock();
cred = __task_cred(task);
inode->i_uid = cred->euid;
@@ -33570,7 +33667,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
rcu_read_unlock();
}
security_task_to_inode(task, inode);
-@@ -1730,6 +1775,9 @@ static int pid_getattr(struct vfsmount *
+@@ -1730,6 +1788,9 @@ static int pid_getattr(struct vfsmount *
struct inode *inode = dentry->d_inode;
struct task_struct *task;
const struct cred *cred;
@@ -33580,7 +33677,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
generic_fillattr(inode, stat);
-@@ -1737,12 +1785,34 @@ static int pid_getattr(struct vfsmount *
+@@ -1737,12 +1798,34 @@ static int pid_getattr(struct vfsmount *
stat->uid = 0;
stat->gid = 0;
task = pid_task(proc_pid(inode), PIDTYPE_PID);
@@ -33616,7 +33713,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
}
}
rcu_read_unlock();
-@@ -1780,11 +1850,20 @@ static int pid_revalidate(struct dentry
+@@ -1780,11 +1863,20 @@ static int pid_revalidate(struct dentry
if (task) {
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
@@ -33637,7 +33734,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
rcu_read_unlock();
} else {
inode->i_uid = 0;
-@@ -1905,7 +1984,8 @@ static int proc_fd_info(struct inode *in
+@@ -1905,7 +1997,8 @@ static int proc_fd_info(struct inode *in
int fd = proc_fd(inode);
if (task) {
@@ -33647,7 +33744,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
put_task_struct(task);
}
if (files) {
-@@ -2165,15 +2245,25 @@ static const struct file_operations proc
+@@ -2165,15 +2258,25 @@ static const struct file_operations proc
*/
static int proc_fd_permission(struct inode *inode, int mask, unsigned int flags)
{
@@ -33675,7 +33772,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
return rv;
}
-@@ -2283,6 +2373,9 @@ static struct dentry *proc_pident_lookup
+@@ -2283,6 +2386,9 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
@@ -33685,7 +33782,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2327,6 +2420,9 @@ static int proc_pident_readdir(struct fi
+@@ -2327,6 +2433,9 @@ static int proc_pident_readdir(struct fi
if (!task)
goto out_no_task;
@@ -33695,7 +33792,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
ret = 0;
i = filp->f_pos;
switch (i) {
-@@ -2597,7 +2693,7 @@ static void *proc_self_follow_link(struc
+@@ -2597,7 +2706,7 @@ static void *proc_self_follow_link(struc
static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
void *cookie)
{
@@ -33704,7 +33801,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
if (!IS_ERR(s))
__putname(s);
}
-@@ -2777,7 +2873,7 @@ static const struct pid_entry tgid_base_
+@@ -2777,7 +2886,7 @@ static const struct pid_entry tgid_base_
REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
#endif
REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
@@ -33713,7 +33810,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
INF("syscall", S_IRUSR, proc_pid_syscall),
#endif
INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -2802,10 +2898,10 @@ static const struct pid_entry tgid_base_
+@@ -2802,10 +2911,10 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_SECURITY
DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
#endif
@@ -33726,7 +33823,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
ONE("stack", S_IRUSR, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-@@ -2836,6 +2932,9 @@ static const struct pid_entry tgid_base_
+@@ -2836,6 +2945,9 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_TASK_IO_ACCOUNTING
INF("io", S_IRUGO, proc_tgid_io_accounting),
#endif
@@ -33736,7 +33833,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
};
static int proc_tgid_base_readdir(struct file * filp,
-@@ -2961,7 +3060,14 @@ static struct dentry *proc_pid_instantia
+@@ -2961,7 +3073,14 @@ static struct dentry *proc_pid_instantia
if (!inode)
goto out;
@@ -33751,7 +33848,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
inode->i_op = &proc_tgid_base_inode_operations;
inode->i_fop = &proc_tgid_base_operations;
inode->i_flags|=S_IMMUTABLE;
-@@ -3003,7 +3109,11 @@ struct dentry *proc_pid_lookup(struct in
+@@ -3003,7 +3122,11 @@ struct dentry *proc_pid_lookup(struct in
if (!task)
goto out;
@@ -33763,7 +33860,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
put_task_struct(task);
out:
return result;
-@@ -3068,6 +3178,11 @@ int proc_pid_readdir(struct file * filp,
+@@ -3068,6 +3191,11 @@ int proc_pid_readdir(struct file * filp,
{
unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode);
@@ -33775,7 +33872,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
struct tgid_iter iter;
struct pid_namespace *ns;
-@@ -3086,8 +3201,27 @@ int proc_pid_readdir(struct file * filp,
+@@ -3086,8 +3214,27 @@ int proc_pid_readdir(struct file * filp,
for (iter = next_tgid(ns, iter);
iter.task;
iter.tgid += 1, iter = next_tgid(ns, iter)) {
@@ -33804,7 +33901,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
put_task_struct(iter.task);
goto out;
}
-@@ -3114,7 +3248,7 @@ static const struct pid_entry tid_base_s
+@@ -3114,7 +3261,7 @@ static const struct pid_entry tid_base_s
REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
#endif
REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
@@ -33813,7 +33910,7 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
INF("syscall", S_IRUSR, proc_pid_syscall),
#endif
INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -3138,10 +3272,10 @@ static const struct pid_entry tid_base_s
+@@ -3138,10 +3285,10 @@ static const struct pid_entry tid_base_s
#ifdef CONFIG_SECURITY
DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
#endif
@@ -33826,9 +33923,9 @@ diff -urNp linux-2.6.38/fs/proc/base.c linux-2.6.38-new/fs/proc/base.c
ONE("stack", S_IRUSR, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-2.6.38/fs/proc/cmdline.c linux-2.6.38-new/fs/proc/cmdline.c
---- linux-2.6.38/fs/proc/cmdline.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/proc/cmdline.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/proc/cmdline.c linux-2.6.38.1/fs/proc/cmdline.c
+--- linux-2.6.38.1/fs/proc/cmdline.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/proc/cmdline.c 2011-03-21 18:31:35.000000000 -0400
@@ -23,7 +23,11 @@ static const struct file_operations cmdl
static int __init proc_cmdline_init(void)
@@ -33841,9 +33938,9 @@ diff -urNp linux-2.6.38/fs/proc/cmdline.c linux-2.6.38-new/fs/proc/cmdline.c
return 0;
}
module_init(proc_cmdline_init);
-diff -urNp linux-2.6.38/fs/proc/devices.c linux-2.6.38-new/fs/proc/devices.c
---- linux-2.6.38/fs/proc/devices.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/proc/devices.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/proc/devices.c linux-2.6.38.1/fs/proc/devices.c
+--- linux-2.6.38.1/fs/proc/devices.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/proc/devices.c 2011-03-21 18:31:35.000000000 -0400
@@ -64,7 +64,11 @@ static const struct file_operations proc
static int __init proc_devices_init(void)
@@ -33856,9 +33953,9 @@ diff -urNp linux-2.6.38/fs/proc/devices.c linux-2.6.38-new/fs/proc/devices.c
return 0;
}
module_init(proc_devices_init);
-diff -urNp linux-2.6.38/fs/proc/inode.c linux-2.6.38-new/fs/proc/inode.c
---- linux-2.6.38/fs/proc/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/proc/inode.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/proc/inode.c linux-2.6.38.1/fs/proc/inode.c
+--- linux-2.6.38.1/fs/proc/inode.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/proc/inode.c 2011-03-21 18:31:35.000000000 -0400
@@ -435,7 +435,11 @@ struct inode *proc_get_inode(struct supe
if (de->mode) {
inode->i_mode = de->mode;
@@ -33871,9 +33968,9 @@ diff -urNp linux-2.6.38/fs/proc/inode.c linux-2.6.38-new/fs/proc/inode.c
}
if (de->size)
inode->i_size = de->size;
-diff -urNp linux-2.6.38/fs/proc/internal.h linux-2.6.38-new/fs/proc/internal.h
---- linux-2.6.38/fs/proc/internal.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/proc/internal.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/proc/internal.h linux-2.6.38.1/fs/proc/internal.h
+--- linux-2.6.38.1/fs/proc/internal.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/proc/internal.h 2011-03-21 18:31:35.000000000 -0400
@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
struct pid *pid, struct task_struct *task);
extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -33884,9 +33981,9 @@ diff -urNp linux-2.6.38/fs/proc/internal.h linux-2.6.38-new/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.38/fs/proc/Kconfig linux-2.6.38-new/fs/proc/Kconfig
---- linux-2.6.38/fs/proc/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/proc/Kconfig 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/proc/Kconfig linux-2.6.38.1/fs/proc/Kconfig
+--- linux-2.6.38.1/fs/proc/Kconfig 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/proc/Kconfig 2011-03-21 18:31:35.000000000 -0400
@@ -30,12 +30,12 @@ config PROC_FS
config PROC_KCORE
@@ -33914,9 +34011,9 @@ diff -urNp linux-2.6.38/fs/proc/Kconfig linux-2.6.38-new/fs/proc/Kconfig
bool "Enable /proc page monitoring" if EXPERT
help
Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-2.6.38/fs/proc/kcore.c linux-2.6.38-new/fs/proc/kcore.c
---- linux-2.6.38/fs/proc/kcore.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/proc/kcore.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/proc/kcore.c linux-2.6.38.1/fs/proc/kcore.c
+--- linux-2.6.38.1/fs/proc/kcore.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/proc/kcore.c 2011-03-21 18:31:35.000000000 -0400
@@ -478,9 +478,10 @@ read_kcore(struct file *file, char __use
* the addresses in the elf_phdr on our list.
*/
@@ -33975,9 +34072,9 @@ diff -urNp linux-2.6.38/fs/proc/kcore.c linux-2.6.38-new/fs/proc/kcore.c
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
if (kcore_need_update)
-diff -urNp linux-2.6.38/fs/proc/meminfo.c linux-2.6.38-new/fs/proc/meminfo.c
---- linux-2.6.38/fs/proc/meminfo.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/proc/meminfo.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/proc/meminfo.c linux-2.6.38.1/fs/proc/meminfo.c
+--- linux-2.6.38.1/fs/proc/meminfo.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/proc/meminfo.c 2011-03-21 18:31:35.000000000 -0400
@@ -157,7 +157,7 @@ static int meminfo_proc_show(struct seq_
vmi.used >> 10,
vmi.largest_chunk >> 10
@@ -33987,9 +34084,9 @@ diff -urNp linux-2.6.38/fs/proc/meminfo.c linux-2.6.38-new/fs/proc/meminfo.c
#endif
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
-diff -urNp linux-2.6.38/fs/proc/nommu.c linux-2.6.38-new/fs/proc/nommu.c
---- linux-2.6.38/fs/proc/nommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/proc/nommu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/proc/nommu.c linux-2.6.38.1/fs/proc/nommu.c
+--- linux-2.6.38.1/fs/proc/nommu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/proc/nommu.c 2011-03-21 18:31:35.000000000 -0400
@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
if (len < 1)
len = 1;
@@ -33999,9 +34096,9 @@ diff -urNp linux-2.6.38/fs/proc/nommu.c linux-2.6.38-new/fs/proc/nommu.c
}
seq_putc(m, '\n');
-diff -urNp linux-2.6.38/fs/proc/proc_net.c linux-2.6.38-new/fs/proc/proc_net.c
---- linux-2.6.38/fs/proc/proc_net.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/proc/proc_net.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/proc/proc_net.c linux-2.6.38.1/fs/proc/proc_net.c
+--- linux-2.6.38.1/fs/proc/proc_net.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/proc/proc_net.c 2011-03-21 18:31:35.000000000 -0400
@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
struct task_struct *task;
struct nsproxy *ns;
@@ -34020,9 +34117,9 @@ diff -urNp linux-2.6.38/fs/proc/proc_net.c linux-2.6.38-new/fs/proc/proc_net.c
rcu_read_lock();
task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-2.6.38/fs/proc/proc_sysctl.c linux-2.6.38-new/fs/proc/proc_sysctl.c
---- linux-2.6.38/fs/proc/proc_sysctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/proc/proc_sysctl.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/proc/proc_sysctl.c linux-2.6.38.1/fs/proc/proc_sysctl.c
+--- linux-2.6.38.1/fs/proc/proc_sysctl.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/proc/proc_sysctl.c 2011-03-21 18:31:35.000000000 -0400
@@ -8,6 +8,8 @@
#include <linux/namei.h>
#include "internal.h"
@@ -34062,9 +34159,9 @@ diff -urNp linux-2.6.38/fs/proc/proc_sysctl.c linux-2.6.38-new/fs/proc/proc_sysc
generic_fillattr(inode, stat);
if (table)
stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-2.6.38/fs/proc/root.c linux-2.6.38-new/fs/proc/root.c
---- linux-2.6.38/fs/proc/root.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/proc/root.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/proc/root.c linux-2.6.38.1/fs/proc/root.c
+--- linux-2.6.38.1/fs/proc/root.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/proc/root.c 2011-03-21 18:31:35.000000000 -0400
@@ -132,7 +132,15 @@ void __init proc_root_init(void)
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
@@ -34081,9 +34178,9 @@ diff -urNp linux-2.6.38/fs/proc/root.c linux-2.6.38-new/fs/proc/root.c
proc_sys_init();
}
-diff -urNp linux-2.6.38/fs/proc/task_mmu.c linux-2.6.38-new/fs/proc/task_mmu.c
---- linux-2.6.38/fs/proc/task_mmu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/proc/task_mmu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/proc/task_mmu.c linux-2.6.38.1/fs/proc/task_mmu.c
+--- linux-2.6.38.1/fs/proc/task_mmu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/proc/task_mmu.c 2011-03-21 18:31:35.000000000 -0400
@@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct
"VmExe:\t%8lu kB\n"
"VmLib:\t%8lu kB\n"
@@ -34223,9 +34320,9 @@ diff -urNp linux-2.6.38/fs/proc/task_mmu.c linux-2.6.38-new/fs/proc/task_mmu.c
mss.resident >> 10,
(unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
mss.shared_clean >> 10,
-diff -urNp linux-2.6.38/fs/proc/task_nommu.c linux-2.6.38-new/fs/proc/task_nommu.c
---- linux-2.6.38/fs/proc/task_nommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/proc/task_nommu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/proc/task_nommu.c linux-2.6.38.1/fs/proc/task_nommu.c
+--- linux-2.6.38.1/fs/proc/task_nommu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/proc/task_nommu.c 2011-03-21 18:31:35.000000000 -0400
@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
else
bytes += kobjsize(mm);
@@ -34244,9 +34341,9 @@ diff -urNp linux-2.6.38/fs/proc/task_nommu.c linux-2.6.38-new/fs/proc/task_nommu
} else if (mm) {
if (vma->vm_start <= mm->start_stack &&
vma->vm_end >= mm->start_stack) {
-diff -urNp linux-2.6.38/fs/readdir.c linux-2.6.38-new/fs/readdir.c
---- linux-2.6.38/fs/readdir.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/readdir.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/readdir.c linux-2.6.38.1/fs/readdir.c
+--- linux-2.6.38.1/fs/readdir.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/readdir.c 2011-03-21 18:31:35.000000000 -0400
@@ -17,6 +17,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
@@ -34336,9 +34433,9 @@ diff -urNp linux-2.6.38/fs/readdir.c linux-2.6.38-new/fs/readdir.c
buf.count = count;
buf.error = 0;
-diff -urNp linux-2.6.38/fs/reiserfs/do_balan.c linux-2.6.38-new/fs/reiserfs/do_balan.c
---- linux-2.6.38/fs/reiserfs/do_balan.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/reiserfs/do_balan.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/reiserfs/do_balan.c linux-2.6.38.1/fs/reiserfs/do_balan.c
+--- linux-2.6.38.1/fs/reiserfs/do_balan.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/reiserfs/do_balan.c 2011-03-21 18:31:35.000000000 -0400
@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
return;
}
@@ -34348,9 +34445,9 @@ diff -urNp linux-2.6.38/fs/reiserfs/do_balan.c linux-2.6.38-new/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.38/fs/reiserfs/item_ops.c linux-2.6.38-new/fs/reiserfs/item_ops.c
---- linux-2.6.38/fs/reiserfs/item_ops.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/reiserfs/item_ops.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/reiserfs/item_ops.c linux-2.6.38.1/fs/reiserfs/item_ops.c
+--- linux-2.6.38.1/fs/reiserfs/item_ops.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/reiserfs/item_ops.c 2011-03-21 18:31:35.000000000 -0400
@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
vi->vi_index, vi->vi_type, vi->vi_ih);
}
@@ -34405,9 +34502,9 @@ diff -urNp linux-2.6.38/fs/reiserfs/item_ops.c linux-2.6.38-new/fs/reiserfs/item
&stat_data_ops,
&indirect_ops,
&direct_ops,
-diff -urNp linux-2.6.38/fs/reiserfs/procfs.c linux-2.6.38-new/fs/reiserfs/procfs.c
---- linux-2.6.38/fs/reiserfs/procfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/reiserfs/procfs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/reiserfs/procfs.c linux-2.6.38.1/fs/reiserfs/procfs.c
+--- linux-2.6.38.1/fs/reiserfs/procfs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/reiserfs/procfs.c 2011-03-21 18:31:35.000000000 -0400
@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
"SMALL_TAILS " : "NO_TAILS ",
replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -34417,9 +34514,9 @@ diff -urNp linux-2.6.38/fs/reiserfs/procfs.c linux-2.6.38-new/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.38/fs/select.c linux-2.6.38-new/fs/select.c
---- linux-2.6.38/fs/select.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/select.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/select.c linux-2.6.38.1/fs/select.c
+--- linux-2.6.38.1/fs/select.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/select.c 2011-03-21 18:31:35.000000000 -0400
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/slab.h>
@@ -34436,9 +34533,9 @@ diff -urNp linux-2.6.38/fs/select.c linux-2.6.38-new/fs/select.c
if (nfds > rlimit(RLIMIT_NOFILE))
return -EINVAL;
-diff -urNp linux-2.6.38/fs/seq_file.c linux-2.6.38-new/fs/seq_file.c
---- linux-2.6.38/fs/seq_file.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/seq_file.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/seq_file.c linux-2.6.38.1/fs/seq_file.c
+--- linux-2.6.38.1/fs/seq_file.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/seq_file.c 2011-03-21 18:31:35.000000000 -0400
@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
return 0;
}
@@ -34479,9 +34576,9 @@ diff -urNp linux-2.6.38/fs/seq_file.c linux-2.6.38-new/fs/seq_file.c
if (!m->buf)
goto Enomem;
m->count = 0;
-diff -urNp linux-2.6.38/fs/splice.c linux-2.6.38-new/fs/splice.c
---- linux-2.6.38/fs/splice.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/splice.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/splice.c linux-2.6.38.1/fs/splice.c
+--- linux-2.6.38.1/fs/splice.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/splice.c 2011-03-21 18:31:35.000000000 -0400
@@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode
pipe_lock(pipe);
@@ -34620,9 +34717,9 @@ diff -urNp linux-2.6.38/fs/splice.c linux-2.6.38-new/fs/splice.c
ret = -EAGAIN;
pipe_unlock(ipipe);
-diff -urNp linux-2.6.38/fs/sysfs/mount.c linux-2.6.38-new/fs/sysfs/mount.c
---- linux-2.6.38/fs/sysfs/mount.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/sysfs/mount.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/sysfs/mount.c linux-2.6.38.1/fs/sysfs/mount.c
+--- linux-2.6.38.1/fs/sysfs/mount.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/sysfs/mount.c 2011-03-21 18:31:35.000000000 -0400
@@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
.s_name = "",
.s_count = ATOMIC_INIT(1),
@@ -34635,9 +34732,9 @@ diff -urNp linux-2.6.38/fs/sysfs/mount.c linux-2.6.38-new/fs/sysfs/mount.c
.s_ino = 1,
};
-diff -urNp linux-2.6.38/fs/sysfs/symlink.c linux-2.6.38-new/fs/sysfs/symlink.c
---- linux-2.6.38/fs/sysfs/symlink.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/sysfs/symlink.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/sysfs/symlink.c linux-2.6.38.1/fs/sysfs/symlink.c
+--- linux-2.6.38.1/fs/sysfs/symlink.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/sysfs/symlink.c 2011-03-21 18:31:35.000000000 -0400
@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de
static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -34647,9 +34744,9 @@ diff -urNp linux-2.6.38/fs/sysfs/symlink.c linux-2.6.38-new/fs/sysfs/symlink.c
if (!IS_ERR(page))
free_page((unsigned long)page);
}
-diff -urNp linux-2.6.38/fs/ubifs/debug.c linux-2.6.38-new/fs/ubifs/debug.c
---- linux-2.6.38/fs/ubifs/debug.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/ubifs/debug.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/ubifs/debug.c linux-2.6.38.1/fs/ubifs/debug.c
+--- linux-2.6.38.1/fs/ubifs/debug.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/ubifs/debug.c 2011-03-21 18:31:35.000000000 -0400
@@ -2813,19 +2813,19 @@ int dbg_debugfs_init_fs(struct ubifs_inf
}
@@ -34673,9 +34770,9 @@ diff -urNp linux-2.6.38/fs/ubifs/debug.c linux-2.6.38-new/fs/ubifs/debug.c
if (IS_ERR(dent))
goto out_remove;
d->dfs_dump_tnc = dent;
-diff -urNp linux-2.6.38/fs/udf/misc.c linux-2.6.38-new/fs/udf/misc.c
---- linux-2.6.38/fs/udf/misc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/udf/misc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/udf/misc.c linux-2.6.38.1/fs/udf/misc.c
+--- linux-2.6.38.1/fs/udf/misc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/udf/misc.c 2011-03-21 18:31:35.000000000 -0400
@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
iinfo->i_lenEAttr += size;
return (struct genericFormat *)&ea[offset];
@@ -34696,9 +34793,9 @@ diff -urNp linux-2.6.38/fs/udf/misc.c linux-2.6.38-new/fs/udf/misc.c
u8 checksum = 0;
int i;
for (i = 0; i < sizeof(struct tag); ++i)
-diff -urNp linux-2.6.38/fs/udf/udfdecl.h linux-2.6.38-new/fs/udf/udfdecl.h
---- linux-2.6.38/fs/udf/udfdecl.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/udf/udfdecl.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/udf/udfdecl.h linux-2.6.38.1/fs/udf/udfdecl.h
+--- linux-2.6.38.1/fs/udf/udfdecl.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/udf/udfdecl.h 2011-03-21 18:31:35.000000000 -0400
@@ -26,7 +26,7 @@ do { \
printk(f, ##a); \
} while (0)
@@ -34708,9 +34805,9 @@ diff -urNp linux-2.6.38/fs/udf/udfdecl.h linux-2.6.38-new/fs/udf/udfdecl.h
#endif
#define udf_info(f, a...) \
-diff -urNp linux-2.6.38/fs/utimes.c linux-2.6.38-new/fs/utimes.c
---- linux-2.6.38/fs/utimes.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/utimes.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/utimes.c linux-2.6.38.1/fs/utimes.c
+--- linux-2.6.38.1/fs/utimes.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/utimes.c 2011-03-21 18:31:35.000000000 -0400
@@ -1,6 +1,7 @@
#include <linux/compiler.h>
#include <linux/file.h>
@@ -34732,9 +34829,9 @@ diff -urNp linux-2.6.38/fs/utimes.c linux-2.6.38-new/fs/utimes.c
mutex_lock(&inode->i_mutex);
error = notify_change(path->dentry, &newattrs);
mutex_unlock(&inode->i_mutex);
-diff -urNp linux-2.6.38/fs/xattr_acl.c linux-2.6.38-new/fs/xattr_acl.c
---- linux-2.6.38/fs/xattr_acl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/xattr_acl.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/xattr_acl.c linux-2.6.38.1/fs/xattr_acl.c
+--- linux-2.6.38.1/fs/xattr_acl.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/xattr_acl.c 2011-03-21 18:31:35.000000000 -0400
@@ -17,8 +17,8 @@
struct posix_acl *
posix_acl_from_xattr(const void *value, size_t size)
@@ -34746,9 +34843,9 @@ diff -urNp linux-2.6.38/fs/xattr_acl.c linux-2.6.38-new/fs/xattr_acl.c
int count;
struct posix_acl *acl;
struct posix_acl_entry *acl_e;
-diff -urNp linux-2.6.38/fs/xattr.c linux-2.6.38-new/fs/xattr.c
---- linux-2.6.38/fs/xattr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/xattr.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/xattr.c linux-2.6.38.1/fs/xattr.c
+--- linux-2.6.38.1/fs/xattr.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/xattr.c 2011-03-21 18:31:35.000000000 -0400
@@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
* Extended attribute SET operations
*/
@@ -34811,9 +34908,9 @@ diff -urNp linux-2.6.38/fs/xattr.c linux-2.6.38-new/fs/xattr.c
mnt_drop_write(f->f_path.mnt);
}
fput(f);
-diff -urNp linux-2.6.38/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.38-new/fs/xfs/linux-2.6/xfs_ioctl32.c
---- linux-2.6.38/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.38.1/fs/xfs/linux-2.6/xfs_ioctl32.c
+--- linux-2.6.38.1/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-21 18:31:35.000000000 -0400
@@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1(
xfs_fsop_geom_t fsgeo;
int error;
@@ -34822,9 +34919,9 @@ diff -urNp linux-2.6.38/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.38-new/fs/xfs/l
error = xfs_fs_geometry(mp, &fsgeo, 3);
if (error)
return -error;
-diff -urNp linux-2.6.38/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38-new/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.38/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38.1/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.38.1/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-21 18:31:35.000000000 -0400
@@ -128,7 +128,7 @@ xfs_find_handle(
}
@@ -34842,9 +34939,9 @@ diff -urNp linux-2.6.38/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38-new/fs/xfs/lin
error = xfs_fs_geometry(mp, &fsgeo, 4);
if (error)
return -error;
-diff -urNp linux-2.6.38/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38-new/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.38/fs/xfs/linux-2.6/xfs_iops.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/xfs/linux-2.6/xfs_iops.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38.1/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.38.1/fs/xfs/linux-2.6/xfs_iops.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/xfs/linux-2.6/xfs_iops.c 2011-03-21 18:31:35.000000000 -0400
@@ -436,7 +436,7 @@ xfs_vn_put_link(
struct nameidata *nd,
void *p)
@@ -34854,9 +34951,9 @@ diff -urNp linux-2.6.38/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38-new/fs/xfs/linu
if (!IS_ERR(s))
kfree(s);
-diff -urNp linux-2.6.38/fs/xfs/xfs_bmap.c linux-2.6.38-new/fs/xfs/xfs_bmap.c
---- linux-2.6.38/fs/xfs/xfs_bmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/fs/xfs/xfs_bmap.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/fs/xfs/xfs_bmap.c linux-2.6.38.1/fs/xfs/xfs_bmap.c
+--- linux-2.6.38.1/fs/xfs/xfs_bmap.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/fs/xfs/xfs_bmap.c 2011-03-21 18:31:35.000000000 -0400
@@ -287,7 +287,7 @@ xfs_bmap_validate_ret(
int nmap,
int ret_nmap);
@@ -34866,9 +34963,9 @@ diff -urNp linux-2.6.38/fs/xfs/xfs_bmap.c linux-2.6.38-new/fs/xfs/xfs_bmap.c
#endif /* DEBUG */
STATIC int
-diff -urNp linux-2.6.38/grsecurity/gracl_alloc.c linux-2.6.38-new/grsecurity/gracl_alloc.c
---- linux-2.6.38/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/gracl_alloc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/gracl_alloc.c linux-2.6.38.1/grsecurity/gracl_alloc.c
+--- linux-2.6.38.1/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/gracl_alloc.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,105 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -34975,10 +35072,10 @@ diff -urNp linux-2.6.38/grsecurity/gracl_alloc.c linux-2.6.38-new/grsecurity/gra
+ else
+ return 1;
+}
-diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
---- linux-2.6.38/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/gracl.c 2011-03-21 22:55:11.000000000 -0400
-@@ -0,0 +1,4015 @@
+diff -urNp linux-2.6.38.1/grsecurity/gracl.c linux-2.6.38.1/grsecurity/gracl.c
+--- linux-2.6.38.1/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/gracl.c 2011-03-26 17:50:26.000000000 -0400
+@@ -0,0 +1,4078 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -35076,6 +35173,26 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+ return (gr_status & GR_READY);
+}
+
++#ifdef CONFIG_BTRFS_FS
++extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
++extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
++#endif
++
++static inline dev_t __get_dev(const struct dentry *dentry)
++{
++#ifdef CONFIG_BTRFS_FS
++ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
++ return get_btrfs_dev_from_inode(dentry->d_inode);
++ else
++#endif
++ return dentry->d_inode->i_sb->s_dev;
++}
++
++dev_t gr_get_dev_from_dentry(struct dentry *dentry)
++{
++ return __get_dev(dentry);
++}
++
+static char gr_task_roletype_to_char(struct task_struct *task)
+{
+ switch (task->role->roletype &
@@ -35247,7 +35364,9 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+ path.mnt = (struct vfsmount *)vfsmnt;
+
+ /* we can't use real_root.dentry, real_root.mnt, because they belong only to the RBAC system */
-+ get_fs_root(reaper->fs, &root);
++ root.dentry = reaper->nsproxy->mnt_ns->root->mnt_root;
++ root.mnt = reaper->nsproxy->mnt_ns->root;
++ path_get(&root);
+
+ write_seqlock(&rename_lock);
+ br_read_lock(vfsmount_lock);
@@ -35779,10 +35898,12 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+ return 1;
+
+ /* grab reference for the real root dentry and vfsmount */
-+ get_fs_root(reaper->fs, &real_root);
++ real_root.dentry = reaper->nsproxy->mnt_ns->root->mnt_root;
++ real_root.mnt = reaper->nsproxy->mnt_ns->root;
++ path_get(&real_root);
+
+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
-+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", real_root.dentry->d_inode->i_sb->s_dev, real_root.dentry->d_inode->i_ino);
++ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root.dentry), real_root.dentry->d_inode->i_ino);
+#endif
+
+ fakefs_obj = acl_alloc(sizeof(struct acl_object_label));
@@ -36770,7 +36891,7 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+
+ spin_lock(&curr_dentry->d_lock);
+ inode = curr_dentry->d_inode->i_ino;
-+ device = curr_dentry->d_inode->i_sb->s_dev;
++ device = __get_dev(curr_dentry);
+ spin_unlock(&curr_dentry->d_lock);
+
+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
@@ -36883,7 +37004,7 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+ read_lock(&gr_inode_lock);
+ retval =
+ lookup_acl_subj_label(dentry->d_inode->i_ino,
-+ dentry->d_inode->i_sb->s_dev, role);
++ __get_dev(dentry), role);
+ read_unlock(&gr_inode_lock);
+ spin_unlock(&dentry->d_lock);
+ if (retval != NULL)
@@ -36897,7 +37018,7 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+ spin_lock(&dentry->d_lock);
+ read_lock(&gr_inode_lock);
+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
-+ dentry->d_inode->i_sb->s_dev, role);
++ __get_dev(dentry), role);
+ read_unlock(&gr_inode_lock);
+ parent = dentry->d_parent;
+ spin_unlock(&dentry->d_lock);
@@ -36911,7 +37032,7 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+ spin_lock(&dentry->d_lock);
+ read_lock(&gr_inode_lock);
+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
-+ dentry->d_inode->i_sb->s_dev, role);
++ __get_dev(dentry), role);
+ read_unlock(&gr_inode_lock);
+ spin_unlock(&dentry->d_lock);
+
@@ -36919,7 +37040,7 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+ /* real_root is pinned, we don't need to hold a reference */
+ read_lock(&gr_inode_lock);
+ retval = lookup_acl_subj_label(real_root.dentry->d_inode->i_ino,
-+ real_root.dentry->d_inode->i_sb->s_dev, role);
++ __get_dev(real_root.dentry), role);
+ read_unlock(&gr_inode_lock);
+ }
+out:
@@ -37047,6 +37168,26 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+ currobj = chk_obj_label(dentry, mnt, curracl);
+ retval = currobj->mode & mode;
+
++ /* if we're opening a specified transfer file for writing
++ (e.g. /dev/initctl), then transfer our role to init
++ */
++ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
++ current->role->roletype & GR_ROLE_PERSIST)) {
++ struct task_struct *task = init_pid_ns.child_reaper;
++
++ if (task->role != current->role) {
++ task->acl_sp_role = 0;
++ task->acl_role_id = current->acl_role_id;
++ task->role = current->role;
++ rcu_read_lock();
++ read_lock(&grsec_exec_file_lock);
++ gr_apply_subject_to_task(task);
++ read_unlock(&grsec_exec_file_lock);
++ rcu_read_unlock();
++ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
++ }
++ }
++
+ if (unlikely
+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
@@ -37639,28 +37780,25 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+ struct acl_subject_label *subj;
+ struct acl_role_label *role;
+ unsigned int x;
++ ino_t ino = dentry->d_inode->i_ino;
++ dev_t dev = __get_dev(dentry);
+
+ FOR_EACH_ROLE_START(role)
-+ update_acl_subj_label(matchn->inode, matchn->device,
-+ dentry->d_inode->i_ino,
-+ dentry->d_inode->i_sb->s_dev, role);
++ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
+
+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
-+ if ((subj->inode == dentry->d_inode->i_ino) &&
-+ (subj->device == dentry->d_inode->i_sb->s_dev)) {
-+ subj->inode = dentry->d_inode->i_ino;
-+ subj->device = dentry->d_inode->i_sb->s_dev;
++ if ((subj->inode == ino) && (subj->device == dev)) {
++ subj->inode = ino;
++ subj->device = dev;
+ }
+ FOR_EACH_NESTED_SUBJECT_END(subj)
+ FOR_EACH_SUBJECT_START(role, subj, x)
+ update_acl_obj_label(matchn->inode, matchn->device,
-+ dentry->d_inode->i_ino,
-+ dentry->d_inode->i_sb->s_dev, subj);
++ ino, dev, subj);
+ FOR_EACH_SUBJECT_END(subj,x)
+ FOR_EACH_ROLE_END(role)
+
-+ update_inodev_entry(matchn->inode, matchn->device,
-+ dentry->d_inode->i_ino, dentry->d_inode->i_sb->s_dev);
++ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
+
+ return;
+}
@@ -37694,6 +37832,8 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+{
+ struct name_entry *matchn;
+ struct inodev_entry *inodev;
++ ino_t old_ino = old_dentry->d_inode->i_ino;
++ dev_t old_dev = __get_dev(old_dentry);
+
+ /* vfs_rename swaps the name and parent link for old_dentry and
+ new_dentry
@@ -37715,18 +37855,17 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+
+ write_lock(&gr_inode_lock);
+ if (unlikely(replace && new_dentry->d_inode)) {
-+ inodev = lookup_inodev_entry(new_dentry->d_inode->i_ino,
-+ new_dentry->d_inode->i_sb->s_dev);
++ ino_t new_ino = new_dentry->d_inode->i_ino;
++ dev_t new_dev = __get_dev(new_dentry);
++
++ inodev = lookup_inodev_entry(new_ino, new_dev);
+ if (inodev != NULL && (new_dentry->d_inode->i_nlink <= 1))
-+ do_handle_delete(inodev, new_dentry->d_inode->i_ino,
-+ new_dentry->d_inode->i_sb->s_dev);
++ do_handle_delete(inodev, new_ino, new_dev);
+ }
+
-+ inodev = lookup_inodev_entry(old_dentry->d_inode->i_ino,
-+ old_dentry->d_inode->i_sb->s_dev);
++ inodev = lookup_inodev_entry(old_ino, old_dev);
+ if (inodev != NULL && (old_dentry->d_inode->i_nlink <= 1))
-+ do_handle_delete(inodev, old_dentry->d_inode->i_ino,
-+ old_dentry->d_inode->i_sb->s_dev);
++ do_handle_delete(inodev, old_ino, old_dev);
+
+ if (unlikely((unsigned long)matchn))
+ do_handle_create(matchn, old_dentry, mnt);
@@ -38173,18 +38312,85 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+ return error;
+}
+
++/* must be called with
++ rcu_read_lock();
++ read_lock(&tasklist_lock);
++ read_lock(&grsec_exec_file_lock);
++*/
++int gr_apply_subject_to_task(struct task_struct *task)
++{
++ struct acl_object_label *obj;
++ char *tmpname;
++ struct acl_subject_label *tmpsubj;
++ struct file *filp;
++ struct name_entry *nmatch;
++
++ filp = task->exec_file;
++ if (filp == NULL)
++ return 0;
++
++ /* the following is to apply the correct subject
++ on binaries running when the RBAC system
++ is enabled, when the binaries have been
++ replaced or deleted since their execution
++ -----
++ when the RBAC system starts, the inode/dev
++ from exec_file will be one the RBAC system
++ is unaware of. It only knows the inode/dev
++ of the present file on disk, or the absence
++ of it.
++ */
++ preempt_disable();
++ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
++
++ nmatch = lookup_name_entry(tmpname);
++ preempt_enable();
++ tmpsubj = NULL;
++ if (nmatch) {
++ if (nmatch->deleted)
++ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
++ else
++ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
++ if (tmpsubj != NULL)
++ task->acl = tmpsubj;
++ }
++ if (tmpsubj == NULL)
++ task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
++ task->role);
++ if (task->acl) {
++ struct acl_subject_label *curr;
++ curr = task->acl;
++
++ task->is_writable = 0;
++ /* ignore additional mmap checks for processes that are writable
++ by the default ACL */
++ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
++ if (unlikely(obj->mode & GR_WRITE))
++ task->is_writable = 1;
++ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
++ if (unlikely(obj->mode & GR_WRITE))
++ task->is_writable = 1;
++
++ gr_set_proc_res(task);
++
++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
++ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
++#endif
++ } else {
++ return 1;
++ }
++
++ return 0;
++}
++
+int
+gr_set_acls(const int type)
+{
-+ struct acl_object_label *obj;
+ struct task_struct *task, *task2;
-+ struct file *filp;
+ struct acl_role_label *role = current->role;
+ __u16 acl_role_id = current->acl_role_id;
+ const struct cred *cred;
-+ char *tmpname;
-+ struct name_entry *nmatch;
-+ struct acl_subject_label *tmpsubj;
++ int ret;
+
+ rcu_read_lock();
+ read_lock(&tasklist_lock);
@@ -38201,63 +38407,16 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+ task->acl_role_id = 0;
+ task->acl_sp_role = 0;
+
-+ if ((filp = task->exec_file)) {
++ if (task->exec_file) {
+ cred = __task_cred(task);
+ task->role = lookup_acl_role_label(task, cred->uid, cred->gid);
-+
-+ /* the following is to apply the correct subject
-+ on binaries running when the RBAC system
-+ is enabled, when the binaries have been
-+ replaced or deleted since their execution
-+ -----
-+ when the RBAC system starts, the inode/dev
-+ from exec_file will be one the RBAC system
-+ is unaware of. It only knows the inode/dev
-+ of the present file on disk, or the absence
-+ of it.
-+ */
-+ preempt_disable();
-+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
-+
-+ nmatch = lookup_name_entry(tmpname);
-+ preempt_enable();
-+ tmpsubj = NULL;
-+ if (nmatch) {
-+ if (nmatch->deleted)
-+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
-+ else
-+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
-+ if (tmpsubj != NULL)
-+ task->acl = tmpsubj;
-+ }
-+ if (tmpsubj == NULL)
-+ task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
-+ task->role);
-+ if (task->acl) {
-+ struct acl_subject_label *curr;
-+ curr = task->acl;
-+
-+ task->is_writable = 0;
-+ /* ignore additional mmap checks for processes that are writable
-+ by the default ACL */
-+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
-+ if (unlikely(obj->mode & GR_WRITE))
-+ task->is_writable = 1;
-+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
-+ if (unlikely(obj->mode & GR_WRITE))
-+ task->is_writable = 1;
-+
-+ gr_set_proc_res(task);
-+
-+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
-+ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
-+#endif
-+ } else {
++ ret = gr_apply_subject_to_task(task);
++ if (ret) {
+ read_unlock(&grsec_exec_file_lock);
+ read_unlock(&tasklist_lock);
+ rcu_read_unlock();
+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task->pid);
-+ return 1;
++ return ret;
+ }
+ } else {
+ // it's a kernel process
@@ -38924,6 +39083,7 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+ unsigned int bufsize;
+ int is_not_root;
+ char *path;
++ dev_t dev = __get_dev(dentry);
+
+ if (unlikely(!(gr_status & GR_READY)))
+ return 1;
@@ -38937,7 +39097,7 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+
+ subj = task->acl;
+ do {
-+ obj = lookup_acl_obj_label(ino, dentry->d_inode->i_sb->s_dev, subj);
++ obj = lookup_acl_obj_label(ino, dev, subj);
+ if (obj != NULL)
+ return (obj->mode & GR_FIND) ? 1 : 0;
+ } while ((subj = subj->parent_subject));
@@ -38994,9 +39154,9 @@ diff -urNp linux-2.6.38/grsecurity/gracl.c linux-2.6.38-new/grsecurity/gracl.c
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
+
-diff -urNp linux-2.6.38/grsecurity/gracl_cap.c linux-2.6.38-new/grsecurity/gracl_cap.c
---- linux-2.6.38/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/gracl_cap.c 2011-03-21 20:22:36.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/gracl_cap.c linux-2.6.38.1/grsecurity/gracl_cap.c
+--- linux-2.6.38.1/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/gracl_cap.c 2011-03-21 20:22:36.000000000 -0400
@@ -0,0 +1,139 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -39137,10 +39297,10 @@ diff -urNp linux-2.6.38/grsecurity/gracl_cap.c linux-2.6.38-new/grsecurity/gracl
+ return 0;
+}
+
-diff -urNp linux-2.6.38/grsecurity/gracl_fs.c linux-2.6.38-new/grsecurity/gracl_fs.c
---- linux-2.6.38/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/gracl_fs.c 2011-03-21 18:31:35.000000000 -0400
-@@ -0,0 +1,430 @@
+diff -urNp linux-2.6.38.1/grsecurity/gracl_fs.c linux-2.6.38.1/grsecurity/gracl_fs.c
+--- linux-2.6.38.1/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/gracl_fs.c 2011-03-26 14:32:42.000000000 -0400
+@@ -0,0 +1,431 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/types.h>
@@ -39544,7 +39704,8 @@ diff -urNp linux-2.6.38/grsecurity/gracl_fs.c linux-2.6.38-new/grsecurity/gracl_
+ char *rolename;
+ struct file *exec_file;
+
-+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled())) {
++ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
++ !(current->role->roletype & GR_ROLE_PERSIST))) {
+ id = current->acl_role_id;
+ rolename = current->role->rolename;
+ gr_set_acls(1);
@@ -39571,9 +39732,9 @@ diff -urNp linux-2.6.38/grsecurity/gracl_fs.c linux-2.6.38-new/grsecurity/gracl_
+
+ return 0;
+}
-diff -urNp linux-2.6.38/grsecurity/gracl_ip.c linux-2.6.38-new/grsecurity/gracl_ip.c
---- linux-2.6.38/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/gracl_ip.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/gracl_ip.c linux-2.6.38.1/grsecurity/gracl_ip.c
+--- linux-2.6.38.1/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/gracl_ip.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,382 @@
+#include <linux/kernel.h>
+#include <asm/uaccess.h>
@@ -39957,9 +40118,9 @@ diff -urNp linux-2.6.38/grsecurity/gracl_ip.c linux-2.6.38-new/grsecurity/gracl_
+
+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
+}
-diff -urNp linux-2.6.38/grsecurity/gracl_learn.c linux-2.6.38-new/grsecurity/gracl_learn.c
---- linux-2.6.38/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/gracl_learn.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/gracl_learn.c linux-2.6.38.1/grsecurity/gracl_learn.c
+--- linux-2.6.38.1/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/gracl_learn.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,211 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -40172,9 +40333,9 @@ diff -urNp linux-2.6.38/grsecurity/gracl_learn.c linux-2.6.38-new/grsecurity/gra
+ .release = close_learn,
+ .poll = poll_learn,
+};
-diff -urNp linux-2.6.38/grsecurity/gracl_res.c linux-2.6.38-new/grsecurity/gracl_res.c
---- linux-2.6.38/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/gracl_res.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/gracl_res.c linux-2.6.38.1/grsecurity/gracl_res.c
+--- linux-2.6.38.1/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/gracl_res.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,68 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40244,10 +40405,10 @@ diff -urNp linux-2.6.38/grsecurity/gracl_res.c linux-2.6.38-new/grsecurity/gracl
+ rcu_read_unlock();
+ return;
+}
-diff -urNp linux-2.6.38/grsecurity/gracl_segv.c linux-2.6.38-new/grsecurity/gracl_segv.c
---- linux-2.6.38/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/gracl_segv.c 2011-03-21 18:31:35.000000000 -0400
-@@ -0,0 +1,310 @@
+diff -urNp linux-2.6.38.1/grsecurity/gracl_segv.c linux-2.6.38.1/grsecurity/gracl_segv.c
+--- linux-2.6.38.1/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/gracl_segv.c 2011-03-24 23:09:37.000000000 -0400
+@@ -0,0 +1,326 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <asm/uaccess.h>
@@ -40276,6 +40437,22 @@ diff -urNp linux-2.6.38/grsecurity/gracl_segv.c linux-2.6.38-new/grsecurity/grac
+ struct acl_role_label *role);
+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
+
++
++#ifdef CONFIG_BTRFS_FS
++extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
++extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
++#endif
++
++static inline dev_t __get_dev(const struct dentry *dentry)
++{
++#ifdef CONFIG_BTRFS_FS
++ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
++ return get_btrfs_dev_from_inode(dentry->d_inode);
++ else
++#endif
++ return dentry->d_inode->i_sb->s_dev;
++}
++
+int
+gr_init_uidset(void)
+{
@@ -40514,7 +40691,7 @@ diff -urNp linux-2.6.38/grsecurity/gracl_segv.c linux-2.6.38-new/grsecurity/grac
+
+ read_lock(&gr_inode_lock);
+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
-+ filp->f_path.dentry->d_inode->i_sb->s_dev,
++ __get_dev(filp->f_path.dentry),
+ current->role);
+ read_unlock(&gr_inode_lock);
+
@@ -40558,9 +40735,9 @@ diff -urNp linux-2.6.38/grsecurity/gracl_segv.c linux-2.6.38-new/grsecurity/grac
+
+ return;
+}
-diff -urNp linux-2.6.38/grsecurity/gracl_shm.c linux-2.6.38-new/grsecurity/gracl_shm.c
---- linux-2.6.38/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/gracl_shm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/gracl_shm.c linux-2.6.38.1/grsecurity/gracl_shm.c
+--- linux-2.6.38.1/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/gracl_shm.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,40 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -40602,9 +40779,9 @@ diff -urNp linux-2.6.38/grsecurity/gracl_shm.c linux-2.6.38-new/grsecurity/gracl
+
+ return 1;
+}
-diff -urNp linux-2.6.38/grsecurity/grsec_chdir.c linux-2.6.38-new/grsecurity/grsec_chdir.c
---- linux-2.6.38/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_chdir.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_chdir.c linux-2.6.38.1/grsecurity/grsec_chdir.c
+--- linux-2.6.38.1/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_chdir.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,19 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40625,9 +40802,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_chdir.c linux-2.6.38-new/grsecurity/grs
+#endif
+ return;
+}
-diff -urNp linux-2.6.38/grsecurity/grsec_chroot.c linux-2.6.38-new/grsecurity/grsec_chroot.c
---- linux-2.6.38/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_chroot.c 2011-03-21 21:24:10.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_chroot.c linux-2.6.38.1/grsecurity/grsec_chroot.c
+--- linux-2.6.38.1/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_chroot.c 2011-03-21 21:24:10.000000000 -0400
@@ -0,0 +1,351 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -40980,10 +41157,10 @@ diff -urNp linux-2.6.38/grsecurity/grsec_chroot.c linux-2.6.38-new/grsecurity/gr
+#ifdef CONFIG_SECURITY
+EXPORT_SYMBOL(gr_handle_chroot_caps);
+#endif
-diff -urNp linux-2.6.38/grsecurity/grsec_disabled.c linux-2.6.38-new/grsecurity/grsec_disabled.c
---- linux-2.6.38/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_disabled.c 2011-03-21 18:31:35.000000000 -0400
-@@ -0,0 +1,442 @@
+diff -urNp linux-2.6.38.1/grsecurity/grsec_disabled.c linux-2.6.38.1/grsecurity/grsec_disabled.c
+--- linux-2.6.38.1/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_disabled.c 2011-03-25 18:57:41.000000000 -0400
+@@ -0,0 +1,447 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -41418,6 +41595,11 @@ diff -urNp linux-2.6.38/grsecurity/grsec_disabled.c linux-2.6.38-new/grsecurity/
+ return 0;
+}
+
++dev_t gr_get_dev_from_dentry(struct dentry *dentry)
++{
++ return dentry->d_inode->i_sb->s_dev;
++}
++
+EXPORT_SYMBOL(gr_is_capable);
+EXPORT_SYMBOL(gr_is_capable_nolog);
+EXPORT_SYMBOL(gr_learn_resource);
@@ -41426,9 +41608,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_disabled.c linux-2.6.38-new/grsecurity/
+EXPORT_SYMBOL(gr_check_user_change);
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
-diff -urNp linux-2.6.38/grsecurity/grsec_exec.c linux-2.6.38-new/grsecurity/grsec_exec.c
---- linux-2.6.38/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_exec.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_exec.c linux-2.6.38.1/grsecurity/grsec_exec.c
+--- linux-2.6.38.1/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_exec.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,147 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41577,9 +41759,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_exec.c linux-2.6.38-new/grsecurity/grse
+ return;
+}
+#endif
-diff -urNp linux-2.6.38/grsecurity/grsec_fifo.c linux-2.6.38-new/grsecurity/grsec_fifo.c
---- linux-2.6.38/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_fifo.c 2011-03-21 20:33:29.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_fifo.c linux-2.6.38.1/grsecurity/grsec_fifo.c
+--- linux-2.6.38.1/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_fifo.c 2011-03-21 20:33:29.000000000 -0400
@@ -0,0 +1,24 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41605,9 +41787,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_fifo.c linux-2.6.38-new/grsecurity/grse
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.38/grsecurity/grsec_fork.c linux-2.6.38-new/grsecurity/grsec_fork.c
---- linux-2.6.38/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_fork.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_fork.c linux-2.6.38.1/grsecurity/grsec_fork.c
+--- linux-2.6.38.1/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_fork.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,23 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41632,9 +41814,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_fork.c linux-2.6.38-new/grsecurity/grse
+#endif
+ return;
+}
-diff -urNp linux-2.6.38/grsecurity/grsec_init.c linux-2.6.38-new/grsecurity/grsec_init.c
---- linux-2.6.38/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_init.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_init.c linux-2.6.38.1/grsecurity/grsec_init.c
+--- linux-2.6.38.1/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_init.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,270 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41906,9 +42088,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_init.c linux-2.6.38-new/grsecurity/grse
+
+ return;
+}
-diff -urNp linux-2.6.38/grsecurity/grsec_link.c linux-2.6.38-new/grsecurity/grsec_link.c
---- linux-2.6.38/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_link.c 2011-03-21 20:34:41.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_link.c linux-2.6.38.1/grsecurity/grsec_link.c
+--- linux-2.6.38.1/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_link.c 2011-03-21 20:34:41.000000000 -0400
@@ -0,0 +1,43 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41953,9 +42135,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_link.c linux-2.6.38-new/grsecurity/grse
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.38/grsecurity/grsec_log.c linux-2.6.38-new/grsecurity/grsec_log.c
---- linux-2.6.38/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_log.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_log.c linux-2.6.38.1/grsecurity/grsec_log.c
+--- linux-2.6.38.1/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_log.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,310 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42267,10 +42449,10 @@ diff -urNp linux-2.6.38/grsecurity/grsec_log.c linux-2.6.38-new/grsecurity/grsec
+ gr_log_end(audit);
+ END_LOCKS(audit);
+}
-diff -urNp linux-2.6.38/grsecurity/grsec_mem.c linux-2.6.38-new/grsecurity/grsec_mem.c
---- linux-2.6.38/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_mem.c 2011-03-21 18:31:35.000000000 -0400
-@@ -0,0 +1,88 @@
+diff -urNp linux-2.6.38.1/grsecurity/grsec_mem.c linux-2.6.38.1/grsecurity/grsec_mem.c
+--- linux-2.6.38.1/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_mem.c 2011-03-26 14:40:33.000000000 -0400
+@@ -0,0 +1,100 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
@@ -42349,7 +42531,19 @@ diff -urNp linux-2.6.38/grsecurity/grsec_mem.c linux-2.6.38-new/grsecurity/grsec
+void
+gr_log_nonroot_mod_load(const char *modname)
+{
-+ gr_log_str(GR_DONT_AUDIT, GR_NONROOT_MODLOAD_MSG, modname);
++ if (1
++#if !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE)
++ /* There are known knowns. These are things we know
++ that we know. There are known unknowns. That is to say,
++ there are things that we know we don't know. But there are
++ also unknown unknowns. There are things we don't know
++ we don't know.
++ This here is a known unknown.
++ */
++ && strcmp(modname, "net-pf-10")
++#endif
++ )
++ gr_log_str(GR_DONT_AUDIT, GR_NONROOT_MODLOAD_MSG, modname);
+ return;
+}
+
@@ -42359,9 +42553,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_mem.c linux-2.6.38-new/grsecurity/grsec
+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
+ return;
+}
-diff -urNp linux-2.6.38/grsecurity/grsec_mount.c linux-2.6.38-new/grsecurity/grsec_mount.c
---- linux-2.6.38/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_mount.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_mount.c linux-2.6.38.1/grsecurity/grsec_mount.c
+--- linux-2.6.38.1/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_mount.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,62 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42425,9 +42619,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_mount.c linux-2.6.38-new/grsecurity/grs
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.38/grsecurity/grsec_pax.c linux-2.6.38-new/grsecurity/grsec_pax.c
---- linux-2.6.38/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_pax.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_pax.c linux-2.6.38.1/grsecurity/grsec_pax.c
+--- linux-2.6.38.1/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_pax.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,36 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42465,9 +42659,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_pax.c linux-2.6.38-new/grsecurity/grsec
+#endif
+ return;
+}
-diff -urNp linux-2.6.38/grsecurity/grsec_ptrace.c linux-2.6.38-new/grsecurity/grsec_ptrace.c
---- linux-2.6.38/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_ptrace.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_ptrace.c linux-2.6.38.1/grsecurity/grsec_ptrace.c
+--- linux-2.6.38.1/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_ptrace.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,14 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42483,9 +42677,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_ptrace.c linux-2.6.38-new/grsecurity/gr
+#endif
+ return;
+}
-diff -urNp linux-2.6.38/grsecurity/grsec_sig.c linux-2.6.38-new/grsecurity/grsec_sig.c
---- linux-2.6.38/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_sig.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_sig.c linux-2.6.38.1/grsecurity/grsec_sig.c
+--- linux-2.6.38.1/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_sig.c 2011-03-26 19:58:27.000000000 -0400
@@ -0,0 +1,65 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42552,9 +42746,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_sig.c linux-2.6.38-new/grsecurity/grsec
+ return;
+}
+
-diff -urNp linux-2.6.38/grsecurity/grsec_sock.c linux-2.6.38-new/grsecurity/grsec_sock.c
---- linux-2.6.38/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_sock.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_sock.c linux-2.6.38.1/grsecurity/grsec_sock.c
+--- linux-2.6.38.1/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_sock.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,275 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -42831,9 +43025,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_sock.c linux-2.6.38-new/grsecurity/grse
+ return current_cap();
+#endif
+}
-diff -urNp linux-2.6.38/grsecurity/grsec_sysctl.c linux-2.6.38-new/grsecurity/grsec_sysctl.c
---- linux-2.6.38/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_sysctl.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_sysctl.c linux-2.6.38.1/grsecurity/grsec_sysctl.c
+--- linux-2.6.38.1/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_sysctl.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,433 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43268,9 +43462,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_sysctl.c linux-2.6.38-new/grsecurity/gr
+ { }
+};
+#endif
-diff -urNp linux-2.6.38/grsecurity/grsec_time.c linux-2.6.38-new/grsecurity/grsec_time.c
---- linux-2.6.38/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_time.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_time.c linux-2.6.38.1/grsecurity/grsec_time.c
+--- linux-2.6.38.1/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_time.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,16 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43288,9 +43482,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_time.c linux-2.6.38-new/grsecurity/grse
+}
+
+EXPORT_SYMBOL(gr_log_timechange);
-diff -urNp linux-2.6.38/grsecurity/grsec_tpe.c linux-2.6.38-new/grsecurity/grsec_tpe.c
---- linux-2.6.38/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsec_tpe.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsec_tpe.c linux-2.6.38.1/grsecurity/grsec_tpe.c
+--- linux-2.6.38.1/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsec_tpe.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,39 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43331,9 +43525,9 @@ diff -urNp linux-2.6.38/grsecurity/grsec_tpe.c linux-2.6.38-new/grsecurity/grsec
+#endif
+ return 1;
+}
-diff -urNp linux-2.6.38/grsecurity/grsum.c linux-2.6.38-new/grsecurity/grsum.c
---- linux-2.6.38/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/grsum.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/grsum.c linux-2.6.38.1/grsecurity/grsum.c
+--- linux-2.6.38.1/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/grsum.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,61 @@
+#include <linux/err.h>
+#include <linux/kernel.h>
@@ -43396,10 +43590,10 @@ diff -urNp linux-2.6.38/grsecurity/grsum.c linux-2.6.38-new/grsecurity/grsum.c
+
+ return retval;
+}
-diff -urNp linux-2.6.38/grsecurity/Kconfig linux-2.6.38-new/grsecurity/Kconfig
---- linux-2.6.38/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/Kconfig 2011-03-21 18:31:35.000000000 -0400
-@@ -0,0 +1,1017 @@
+diff -urNp linux-2.6.38.1/grsecurity/Kconfig linux-2.6.38.1/grsecurity/Kconfig
+--- linux-2.6.38.1/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/Kconfig 2011-03-26 19:54:37.000000000 -0400
+@@ -0,0 +1,1020 @@
+#
+# grecurity configuration
+#
@@ -43736,6 +43930,9 @@ diff -urNp linux-2.6.38/grsecurity/Kconfig linux-2.6.38-new/grsecurity/Kconfig
+menu "Role Based Access Control Options"
+depends on GRKERNSEC
+
++config GRKERNSEC_RBAC_DEBUG
++ bool
++
+config GRKERNSEC_NO_RBAC
+ bool "Disable RBAC system"
+ help
@@ -44417,9 +44614,9 @@ diff -urNp linux-2.6.38/grsecurity/Kconfig linux-2.6.38-new/grsecurity/Kconfig
+endmenu
+
+endmenu
-diff -urNp linux-2.6.38/grsecurity/Makefile linux-2.6.38-new/grsecurity/Makefile
---- linux-2.6.38/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/grsecurity/Makefile 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/grsecurity/Makefile linux-2.6.38.1/grsecurity/Makefile
+--- linux-2.6.38.1/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/grsecurity/Makefile 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,29 @@
+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
+# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -44450,9 +44647,9 @@ diff -urNp linux-2.6.38/grsecurity/Makefile linux-2.6.38-new/grsecurity/Makefile
+ @-chmod -f 700 .
+ @echo ' grsec: protected kernel image paths'
+endif
-diff -urNp linux-2.6.38/include/acpi/acoutput.h linux-2.6.38-new/include/acpi/acoutput.h
---- linux-2.6.38/include/acpi/acoutput.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/acpi/acoutput.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/acpi/acoutput.h linux-2.6.38.1/include/acpi/acoutput.h
+--- linux-2.6.38.1/include/acpi/acoutput.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/acpi/acoutput.h 2011-03-21 18:31:35.000000000 -0400
@@ -269,8 +269,8 @@
* leaving no executable debug code!
*/
@@ -44464,9 +44661,9 @@ diff -urNp linux-2.6.38/include/acpi/acoutput.h linux-2.6.38-new/include/acpi/ac
#endif /* ACPI_DEBUG_OUTPUT */
-diff -urNp linux-2.6.38/include/acpi/acpi_drivers.h linux-2.6.38-new/include/acpi/acpi_drivers.h
---- linux-2.6.38/include/acpi/acpi_drivers.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/acpi/acpi_drivers.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/acpi/acpi_drivers.h linux-2.6.38.1/include/acpi/acpi_drivers.h
+--- linux-2.6.38.1/include/acpi/acpi_drivers.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/acpi/acpi_drivers.h 2011-03-21 18:31:35.000000000 -0400
@@ -119,8 +119,8 @@ void pci_acpi_crs_quirks(void);
Dock Station
-------------------------------------------------------------------------- */
@@ -44496,9 +44693,9 @@ diff -urNp linux-2.6.38/include/acpi/acpi_drivers.h linux-2.6.38-new/include/acp
void *context)
{
return -ENODEV;
-diff -urNp linux-2.6.38/include/asm-generic/atomic-long.h linux-2.6.38-new/include/asm-generic/atomic-long.h
---- linux-2.6.38/include/asm-generic/atomic-long.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/asm-generic/atomic-long.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/asm-generic/atomic-long.h linux-2.6.38.1/include/asm-generic/atomic-long.h
+--- linux-2.6.38.1/include/asm-generic/atomic-long.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/asm-generic/atomic-long.h 2011-03-21 18:31:35.000000000 -0400
@@ -22,6 +22,12 @@
typedef atomic64_t atomic_long_t;
@@ -44791,9 +44988,9 @@ diff -urNp linux-2.6.38/include/asm-generic/atomic-long.h linux-2.6.38-new/inclu
+#endif
+
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
-diff -urNp linux-2.6.38/include/asm-generic/dma-mapping-common.h linux-2.6.38-new/include/asm-generic/dma-mapping-common.h
---- linux-2.6.38/include/asm-generic/dma-mapping-common.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/asm-generic/dma-mapping-common.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/asm-generic/dma-mapping-common.h linux-2.6.38.1/include/asm-generic/dma-mapping-common.h
+--- linux-2.6.38.1/include/asm-generic/dma-mapping-common.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/asm-generic/dma-mapping-common.h 2011-03-21 18:31:35.000000000 -0400
@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
enum dma_data_direction dir,
struct dma_attrs *attrs)
@@ -44884,9 +45081,9 @@ diff -urNp linux-2.6.38/include/asm-generic/dma-mapping-common.h linux-2.6.38-ne
BUG_ON(!valid_dma_direction(dir));
if (ops->sync_sg_for_device)
-diff -urNp linux-2.6.38/include/asm-generic/futex.h linux-2.6.38-new/include/asm-generic/futex.h
---- linux-2.6.38/include/asm-generic/futex.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/asm-generic/futex.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/asm-generic/futex.h linux-2.6.38.1/include/asm-generic/futex.h
+--- linux-2.6.38.1/include/asm-generic/futex.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/asm-generic/futex.h 2011-03-21 18:31:35.000000000 -0400
@@ -6,7 +6,7 @@
#include <asm/errno.h>
@@ -44905,9 +45102,9 @@ diff -urNp linux-2.6.38/include/asm-generic/futex.h linux-2.6.38-new/include/asm
{
return -ENOSYS;
}
-diff -urNp linux-2.6.38/include/asm-generic/int-l64.h linux-2.6.38-new/include/asm-generic/int-l64.h
---- linux-2.6.38/include/asm-generic/int-l64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/asm-generic/int-l64.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/asm-generic/int-l64.h linux-2.6.38.1/include/asm-generic/int-l64.h
+--- linux-2.6.38.1/include/asm-generic/int-l64.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/asm-generic/int-l64.h 2011-03-21 18:31:35.000000000 -0400
@@ -46,6 +46,8 @@ typedef unsigned int u32;
typedef signed long s64;
typedef unsigned long u64;
@@ -44917,9 +45114,9 @@ diff -urNp linux-2.6.38/include/asm-generic/int-l64.h linux-2.6.38-new/include/a
#define S8_C(x) x
#define U8_C(x) x ## U
#define S16_C(x) x
-diff -urNp linux-2.6.38/include/asm-generic/int-ll64.h linux-2.6.38-new/include/asm-generic/int-ll64.h
---- linux-2.6.38/include/asm-generic/int-ll64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/asm-generic/int-ll64.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/asm-generic/int-ll64.h linux-2.6.38.1/include/asm-generic/int-ll64.h
+--- linux-2.6.38.1/include/asm-generic/int-ll64.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/asm-generic/int-ll64.h 2011-03-21 18:31:35.000000000 -0400
@@ -51,6 +51,8 @@ typedef unsigned int u32;
typedef signed long long s64;
typedef unsigned long long u64;
@@ -44929,9 +45126,9 @@ diff -urNp linux-2.6.38/include/asm-generic/int-ll64.h linux-2.6.38-new/include/
#define S8_C(x) x
#define U8_C(x) x ## U
#define S16_C(x) x
-diff -urNp linux-2.6.38/include/asm-generic/kmap_types.h linux-2.6.38-new/include/asm-generic/kmap_types.h
---- linux-2.6.38/include/asm-generic/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/asm-generic/kmap_types.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/asm-generic/kmap_types.h linux-2.6.38.1/include/asm-generic/kmap_types.h
+--- linux-2.6.38.1/include/asm-generic/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/asm-generic/kmap_types.h 2011-03-21 18:31:35.000000000 -0400
@@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
KMAP_D(17) KM_NMI,
KMAP_D(18) KM_NMI_PTE,
@@ -44945,9 +45142,9 @@ diff -urNp linux-2.6.38/include/asm-generic/kmap_types.h linux-2.6.38-new/includ
};
#undef KMAP_D
-diff -urNp linux-2.6.38/include/asm-generic/pgtable.h linux-2.6.38-new/include/asm-generic/pgtable.h
---- linux-2.6.38/include/asm-generic/pgtable.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/asm-generic/pgtable.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/asm-generic/pgtable.h linux-2.6.38.1/include/asm-generic/pgtable.h
+--- linux-2.6.38.1/include/asm-generic/pgtable.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/asm-generic/pgtable.h 2011-03-21 18:31:35.000000000 -0400
@@ -447,6 +447,14 @@ static inline int pmd_write(pmd_t pmd)
#endif /* __HAVE_ARCH_PMD_WRITE */
#endif
@@ -44963,9 +45160,9 @@ diff -urNp linux-2.6.38/include/asm-generic/pgtable.h linux-2.6.38-new/include/a
#endif /* !__ASSEMBLY__ */
#endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-2.6.38/include/asm-generic/pgtable-nopmd.h linux-2.6.38-new/include/asm-generic/pgtable-nopmd.h
---- linux-2.6.38/include/asm-generic/pgtable-nopmd.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/asm-generic/pgtable-nopmd.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/asm-generic/pgtable-nopmd.h linux-2.6.38.1/include/asm-generic/pgtable-nopmd.h
+--- linux-2.6.38.1/include/asm-generic/pgtable-nopmd.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/asm-generic/pgtable-nopmd.h 2011-03-21 18:31:35.000000000 -0400
@@ -1,14 +1,19 @@
#ifndef _PGTABLE_NOPMD_H
#define _PGTABLE_NOPMD_H
@@ -45002,9 +45199,9 @@ diff -urNp linux-2.6.38/include/asm-generic/pgtable-nopmd.h linux-2.6.38-new/inc
/*
* The "pud_xxx()" functions here are trivial for a folded two-level
* setup: the pmd is never bad, and a pmd always exists (as it's folded
-diff -urNp linux-2.6.38/include/asm-generic/pgtable-nopud.h linux-2.6.38-new/include/asm-generic/pgtable-nopud.h
---- linux-2.6.38/include/asm-generic/pgtable-nopud.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/asm-generic/pgtable-nopud.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/asm-generic/pgtable-nopud.h linux-2.6.38.1/include/asm-generic/pgtable-nopud.h
+--- linux-2.6.38.1/include/asm-generic/pgtable-nopud.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/asm-generic/pgtable-nopud.h 2011-03-21 18:31:35.000000000 -0400
@@ -1,10 +1,15 @@
#ifndef _PGTABLE_NOPUD_H
#define _PGTABLE_NOPUD_H
@@ -45035,9 +45232,9 @@ diff -urNp linux-2.6.38/include/asm-generic/pgtable-nopud.h linux-2.6.38-new/inc
/*
* The "pgd_xxx()" functions here are trivial for a folded two-level
* setup: the pud is never bad, and a pud always exists (as it's folded
-diff -urNp linux-2.6.38/include/asm-generic/vmlinux.lds.h linux-2.6.38-new/include/asm-generic/vmlinux.lds.h
---- linux-2.6.38/include/asm-generic/vmlinux.lds.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/asm-generic/vmlinux.lds.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/asm-generic/vmlinux.lds.h linux-2.6.38.1/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.38.1/include/asm-generic/vmlinux.lds.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/asm-generic/vmlinux.lds.h 2011-03-21 18:31:35.000000000 -0400
@@ -213,6 +213,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -45074,9 +45271,9 @@ diff -urNp linux-2.6.38/include/asm-generic/vmlinux.lds.h linux-2.6.38-new/inclu
/**
* PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.38/include/drm/drm_pciids.h linux-2.6.38-new/include/drm/drm_pciids.h
---- linux-2.6.38/include/drm/drm_pciids.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/drm/drm_pciids.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/drm/drm_pciids.h linux-2.6.38.1/include/drm/drm_pciids.h
+--- linux-2.6.38.1/include/drm/drm_pciids.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/drm/drm_pciids.h 2011-03-21 18:31:35.000000000 -0400
@@ -458,7 +458,7 @@
{0x1002, 0x9803, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
{0x1002, 0x9804, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -45180,9 +45377,9 @@ diff -urNp linux-2.6.38/include/drm/drm_pciids.h linux-2.6.38-new/include/drm/dr
{0x8086, 0x0102, 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.38/include/drm/drmP.h linux-2.6.38-new/include/drm/drmP.h
---- linux-2.6.38/include/drm/drmP.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/drm/drmP.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/drm/drmP.h linux-2.6.38.1/include/drm/drmP.h
+--- linux-2.6.38.1/include/drm/drmP.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/drm/drmP.h 2011-03-21 18:31:35.000000000 -0400
@@ -73,6 +73,7 @@
#include <linux/workqueue.h>
#include <linux/poll.h>
@@ -45236,9 +45433,9 @@ diff -urNp linux-2.6.38/include/drm/drmP.h linux-2.6.38-new/include/drm/drmP.h
void *dev_private; /**< device private data */
void *mm_private;
struct address_space *dev_mapping;
-diff -urNp linux-2.6.38/include/linux/a.out.h linux-2.6.38-new/include/linux/a.out.h
---- linux-2.6.38/include/linux/a.out.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/a.out.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/a.out.h linux-2.6.38.1/include/linux/a.out.h
+--- linux-2.6.38.1/include/linux/a.out.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/a.out.h 2011-03-21 18:31:35.000000000 -0400
@@ -39,6 +39,14 @@ enum machine_type {
M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
};
@@ -45254,9 +45451,9 @@ diff -urNp linux-2.6.38/include/linux/a.out.h linux-2.6.38-new/include/linux/a.o
#if !defined (N_MAGIC)
#define N_MAGIC(exec) ((exec).a_info & 0xffff)
#endif
-diff -urNp linux-2.6.38/include/linux/atmdev.h linux-2.6.38-new/include/linux/atmdev.h
---- linux-2.6.38/include/linux/atmdev.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/atmdev.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/atmdev.h linux-2.6.38.1/include/linux/atmdev.h
+--- linux-2.6.38.1/include/linux/atmdev.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/atmdev.h 2011-03-21 18:31:35.000000000 -0400
@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
#endif
@@ -45266,9 +45463,9 @@ diff -urNp linux-2.6.38/include/linux/atmdev.h linux-2.6.38-new/include/linux/at
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-2.6.38/include/linux/binfmts.h linux-2.6.38-new/include/linux/binfmts.h
---- linux-2.6.38/include/linux/binfmts.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/binfmts.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/binfmts.h linux-2.6.38.1/include/linux/binfmts.h
+--- linux-2.6.38.1/include/linux/binfmts.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/binfmts.h 2011-03-21 18:31:35.000000000 -0400
@@ -92,6 +92,7 @@ struct linux_binfmt {
int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
int (*load_shlib)(struct file *);
@@ -45277,9 +45474,9 @@ diff -urNp linux-2.6.38/include/linux/binfmts.h linux-2.6.38-new/include/linux/b
unsigned long min_coredump; /* minimal dump size */
};
-diff -urNp linux-2.6.38/include/linux/blkdev.h linux-2.6.38-new/include/linux/blkdev.h
---- linux-2.6.38/include/linux/blkdev.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/blkdev.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/blkdev.h linux-2.6.38.1/include/linux/blkdev.h
+--- linux-2.6.38.1/include/linux/blkdev.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/blkdev.h 2011-03-21 18:31:35.000000000 -0400
@@ -1247,22 +1247,22 @@ queue_max_integrity_segments(struct requ
#endif /* CONFIG_BLK_DEV_INTEGRITY */
@@ -45315,9 +45512,9 @@ diff -urNp linux-2.6.38/include/linux/blkdev.h linux-2.6.38-new/include/linux/bl
};
extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
-diff -urNp linux-2.6.38/include/linux/byteorder/little_endian.h linux-2.6.38-new/include/linux/byteorder/little_endian.h
---- linux-2.6.38/include/linux/byteorder/little_endian.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/byteorder/little_endian.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/byteorder/little_endian.h linux-2.6.38.1/include/linux/byteorder/little_endian.h
+--- linux-2.6.38.1/include/linux/byteorder/little_endian.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/byteorder/little_endian.h 2011-03-21 18:31:35.000000000 -0400
@@ -42,51 +42,51 @@
static inline __le64 __cpu_to_le64p(const __u64 *p)
@@ -45382,9 +45579,9 @@ diff -urNp linux-2.6.38/include/linux/byteorder/little_endian.h linux-2.6.38-new
}
#define __cpu_to_le64s(x) do { (void)(x); } while (0)
#define __le64_to_cpus(x) do { (void)(x); } while (0)
-diff -urNp linux-2.6.38/include/linux/cache.h linux-2.6.38-new/include/linux/cache.h
---- linux-2.6.38/include/linux/cache.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/cache.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/cache.h linux-2.6.38.1/include/linux/cache.h
+--- linux-2.6.38.1/include/linux/cache.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/cache.h 2011-03-21 18:31:35.000000000 -0400
@@ -16,6 +16,10 @@
#define __read_mostly
#endif
@@ -45396,9 +45593,9 @@ diff -urNp linux-2.6.38/include/linux/cache.h linux-2.6.38-new/include/linux/cac
#ifndef ____cacheline_aligned
#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
#endif
-diff -urNp linux-2.6.38/include/linux/capability.h linux-2.6.38-new/include/linux/capability.h
---- linux-2.6.38/include/linux/capability.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/capability.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/capability.h linux-2.6.38.1/include/linux/capability.h
+--- linux-2.6.38.1/include/linux/capability.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/capability.h 2011-03-21 18:31:35.000000000 -0400
@@ -561,6 +561,7 @@ extern const kernel_cap_t __cap_init_eff
(security_real_capable_noaudit((t), (cap)) == 0)
@@ -45407,9 +45604,9 @@ diff -urNp linux-2.6.38/include/linux/capability.h linux-2.6.38-new/include/linu
/* audit system wants to get cap info from files as well */
struct dentry;
-diff -urNp linux-2.6.38/include/linux/compiler-gcc4.h linux-2.6.38-new/include/linux/compiler-gcc4.h
---- linux-2.6.38/include/linux/compiler-gcc4.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/compiler-gcc4.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/compiler-gcc4.h linux-2.6.38.1/include/linux/compiler-gcc4.h
+--- linux-2.6.38.1/include/linux/compiler-gcc4.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/compiler-gcc4.h 2011-03-21 18:31:35.000000000 -0400
@@ -54,6 +54,10 @@
#endif
@@ -45421,9 +45618,9 @@ diff -urNp linux-2.6.38/include/linux/compiler-gcc4.h linux-2.6.38-new/include/l
#endif
#if __GNUC_MINOR__ > 0
-diff -urNp linux-2.6.38/include/linux/compiler.h linux-2.6.38-new/include/linux/compiler.h
---- linux-2.6.38/include/linux/compiler.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/compiler.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/compiler.h linux-2.6.38.1/include/linux/compiler.h
+--- linux-2.6.38.1/include/linux/compiler.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/compiler.h 2011-03-21 18:31:35.000000000 -0400
@@ -273,6 +273,22 @@ void ftrace_likely_update(struct ftrace_
#define __cold
#endif
@@ -45456,9 +45653,9 @@ diff -urNp linux-2.6.38/include/linux/compiler.h linux-2.6.38-new/include/linux/
+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
#endif /* __LINUX_COMPILER_H */
-diff -urNp linux-2.6.38/include/linux/cpuset.h linux-2.6.38-new/include/linux/cpuset.h
---- linux-2.6.38/include/linux/cpuset.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/cpuset.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/cpuset.h linux-2.6.38.1/include/linux/cpuset.h
+--- linux-2.6.38.1/include/linux/cpuset.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/cpuset.h 2011-03-21 18:31:35.000000000 -0400
@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
* nodemask.
*/
@@ -45468,9 +45665,9 @@ diff -urNp linux-2.6.38/include/linux/cpuset.h linux-2.6.38-new/include/linux/cp
}
static inline void set_mems_allowed(nodemask_t nodemask)
-diff -urNp linux-2.6.38/include/linux/decompress/mm.h linux-2.6.38-new/include/linux/decompress/mm.h
---- linux-2.6.38/include/linux/decompress/mm.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/decompress/mm.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/decompress/mm.h linux-2.6.38.1/include/linux/decompress/mm.h
+--- linux-2.6.38.1/include/linux/decompress/mm.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/decompress/mm.h 2011-03-21 18:31:35.000000000 -0400
@@ -77,7 +77,7 @@ static void free(void *where)
* warnings when not needed (indeed large_malloc / large_free are not
* needed by inflate */
@@ -45480,9 +45677,9 @@ diff -urNp linux-2.6.38/include/linux/decompress/mm.h linux-2.6.38-new/include/l
#define free(a) kfree(a)
#define large_malloc(a) vmalloc(a)
-diff -urNp linux-2.6.38/include/linux/dma-mapping.h linux-2.6.38-new/include/linux/dma-mapping.h
---- linux-2.6.38/include/linux/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/dma-mapping.h linux-2.6.38.1/include/linux/dma-mapping.h
+--- linux-2.6.38.1/include/linux/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/dma-mapping.h 2011-03-21 18:31:35.000000000 -0400
@@ -16,40 +16,40 @@ enum dma_data_direction {
};
@@ -45538,9 +45735,9 @@ diff -urNp linux-2.6.38/include/linux/dma-mapping.h linux-2.6.38-new/include/lin
};
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-diff -urNp linux-2.6.38/include/linux/elf.h linux-2.6.38-new/include/linux/elf.h
---- linux-2.6.38/include/linux/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/elf.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/elf.h linux-2.6.38.1/include/linux/elf.h
+--- linux-2.6.38.1/include/linux/elf.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/elf.h 2011-03-21 18:31:35.000000000 -0400
@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
#define PT_GNU_EH_FRAME 0x6474e550
@@ -45613,9 +45810,9 @@ diff -urNp linux-2.6.38/include/linux/elf.h linux-2.6.38-new/include/linux/elf.h
#endif
-diff -urNp linux-2.6.38/include/linux/fs.h linux-2.6.38-new/include/linux/fs.h
---- linux-2.6.38/include/linux/fs.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/fs.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/fs.h linux-2.6.38.1/include/linux/fs.h
+--- linux-2.6.38.1/include/linux/fs.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/fs.h 2011-03-21 18:31:35.000000000 -0400
@@ -105,6 +105,11 @@ struct inodes_stat_t {
/* File was opened by fanotify and shouldn't generate fanotify events */
#define FMODE_NONOTIFY ((__force fmode_t)0x1000000)
@@ -45764,9 +45961,9 @@ diff -urNp linux-2.6.38/include/linux/fs.h linux-2.6.38-new/include/linux/fs.h
};
/*
-diff -urNp linux-2.6.38/include/linux/fs_struct.h linux-2.6.38-new/include/linux/fs_struct.h
---- linux-2.6.38/include/linux/fs_struct.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/fs_struct.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/fs_struct.h linux-2.6.38.1/include/linux/fs_struct.h
+--- linux-2.6.38.1/include/linux/fs_struct.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/fs_struct.h 2011-03-21 18:31:35.000000000 -0400
@@ -6,7 +6,7 @@
#include <linux/seqlock.h>
@@ -45776,9 +45973,9 @@ diff -urNp linux-2.6.38/include/linux/fs_struct.h linux-2.6.38-new/include/linux
spinlock_t lock;
seqcount_t seq;
int umask;
-diff -urNp linux-2.6.38/include/linux/genhd.h linux-2.6.38-new/include/linux/genhd.h
---- linux-2.6.38/include/linux/genhd.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/genhd.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/genhd.h linux-2.6.38.1/include/linux/genhd.h
+--- linux-2.6.38.1/include/linux/genhd.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/genhd.h 2011-03-21 18:31:35.000000000 -0400
@@ -183,7 +183,7 @@ struct gendisk {
struct kobject *slave_dir;
@@ -45788,9 +45985,9 @@ diff -urNp linux-2.6.38/include/linux/genhd.h linux-2.6.38-new/include/linux/gen
struct disk_events *ev;
#ifdef CONFIG_BLK_DEV_INTEGRITY
struct blk_integrity *integrity;
-diff -urNp linux-2.6.38/include/linux/gracl.h linux-2.6.38-new/include/linux/gracl.h
---- linux-2.6.38/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/include/linux/gracl.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/gracl.h linux-2.6.38.1/include/linux/gracl.h
+--- linux-2.6.38.1/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/include/linux/gracl.h 2011-03-26 14:27:27.000000000 -0400
@@ -0,0 +1,317 @@
+#ifndef GR_ACL_H
+#define GR_ACL_H
@@ -45803,8 +46000,8 @@ diff -urNp linux-2.6.38/include/linux/gracl.h linux-2.6.38-new/include/linux/gra
+
+/* Major status information */
+
-+#define GR_VERSION "grsecurity 2.2.1"
-+#define GRSECURITY_VERSION 0x2201
++#define GR_VERSION "grsecurity 2.2.2"
++#define GRSECURITY_VERSION 0x2202
+
+enum {
+ GR_SHUTDOWN = 0,
@@ -46109,9 +46306,9 @@ diff -urNp linux-2.6.38/include/linux/gracl.h linux-2.6.38-new/include/linux/gra
+
+#endif
+
-diff -urNp linux-2.6.38/include/linux/gralloc.h linux-2.6.38-new/include/linux/gralloc.h
---- linux-2.6.38/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/include/linux/gralloc.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/gralloc.h linux-2.6.38.1/include/linux/gralloc.h
+--- linux-2.6.38.1/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/include/linux/gralloc.h 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,9 @@
+#ifndef __GRALLOC_H
+#define __GRALLOC_H
@@ -46122,10 +46319,10 @@ diff -urNp linux-2.6.38/include/linux/gralloc.h linux-2.6.38-new/include/linux/g
+void *acl_alloc_num(unsigned long num, unsigned long len);
+
+#endif
-diff -urNp linux-2.6.38/include/linux/grdefs.h linux-2.6.38-new/include/linux/grdefs.h
---- linux-2.6.38/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/include/linux/grdefs.h 2011-03-21 18:31:35.000000000 -0400
-@@ -0,0 +1,137 @@
+diff -urNp linux-2.6.38.1/include/linux/grdefs.h linux-2.6.38.1/include/linux/grdefs.h
+--- linux-2.6.38.1/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/include/linux/grdefs.h 2011-03-26 16:39:14.000000000 -0400
+@@ -0,0 +1,139 @@
+#ifndef GRDEFS_H
+#define GRDEFS_H
+
@@ -46151,7 +46348,8 @@ diff -urNp linux-2.6.38/include/linux/grdefs.h linux-2.6.38-new/include/linux/gr
+ GR_ROLE_LEARN = 0x0080,
+ GR_ROLE_TPE = 0x0100,
+ GR_ROLE_DOMAIN = 0x0200,
-+ GR_ROLE_PAM = 0x0400
++ GR_ROLE_PAM = 0x0400,
++ GR_ROLE_PERSIST = 0x0800
+};
+
+/* ACL Subject and Object mode flags */
@@ -46184,7 +46382,8 @@ diff -urNp linux-2.6.38/include/linux/grdefs.h linux-2.6.38-new/include/linux/gr
+ GR_PTRACERD = 0x00100000,
+ GR_NOPTRACE = 0x00200000,
+ GR_SUPPRESS = 0x00400000,
-+ GR_NOLEARN = 0x00800000
++ GR_NOLEARN = 0x00800000,
++ GR_INIT_TRANSFER= 0x01000000
+};
+
+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
@@ -46263,10 +46462,10 @@ diff -urNp linux-2.6.38/include/linux/grdefs.h linux-2.6.38-new/include/linux/gr
+};
+
+#endif
-diff -urNp linux-2.6.38/include/linux/grinternal.h linux-2.6.38-new/include/linux/grinternal.h
---- linux-2.6.38/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/include/linux/grinternal.h 2011-03-21 18:31:35.000000000 -0400
-@@ -0,0 +1,216 @@
+diff -urNp linux-2.6.38.1/include/linux/grinternal.h linux-2.6.38.1/include/linux/grinternal.h
+--- linux-2.6.38.1/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/include/linux/grinternal.h 2011-03-26 16:51:07.000000000 -0400
+@@ -0,0 +1,217 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
+
@@ -46289,7 +46488,7 @@ diff -urNp linux-2.6.38/include/linux/grinternal.h linux-2.6.38-new/include/linu
+int gr_check_protected_task(const struct task_struct *task);
+__u32 to_gr_audit(const __u32 reqmode);
+int gr_set_acls(const int type);
-+
++int gr_apply_subject_to_task(struct task_struct *task);
+int gr_acl_is_enabled(void);
+char gr_roletype_to_char(void);
+
@@ -46403,6 +46602,7 @@ diff -urNp linux-2.6.38/include/linux/grinternal.h linux-2.6.38-new/include/linu
+enum {
+ GR_DO_AUDIT,
+ GR_DONT_AUDIT,
++ /* used for non-audit messages that we shouldn't kill the task on */
+ GR_DONT_AUDIT_GOOD
+};
+
@@ -46483,10 +46683,10 @@ diff -urNp linux-2.6.38/include/linux/grinternal.h linux-2.6.38-new/include/linu
+#endif
+
+#endif
-diff -urNp linux-2.6.38/include/linux/grmsg.h linux-2.6.38-new/include/linux/grmsg.h
---- linux-2.6.38/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/include/linux/grmsg.h 2011-03-21 18:31:35.000000000 -0400
-@@ -0,0 +1,111 @@
+diff -urNp linux-2.6.38.1/include/linux/grmsg.h linux-2.6.38.1/include/linux/grmsg.h
+--- linux-2.6.38.1/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/include/linux/grmsg.h 2011-03-26 16:52:08.000000000 -0400
+@@ -0,0 +1,112 @@
+#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
@@ -46598,10 +46798,11 @@ diff -urNp linux-2.6.38/include/linux/grmsg.h linux-2.6.38-new/include/linux/grm
+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
+#define GR_VM86_MSG "denied use of vm86 by "
+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
-diff -urNp linux-2.6.38/include/linux/grsecurity.h linux-2.6.38-new/include/linux/grsecurity.h
---- linux-2.6.38/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/include/linux/grsecurity.h 2011-03-21 18:31:35.000000000 -0400
-@@ -0,0 +1,214 @@
++#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
+diff -urNp linux-2.6.38.1/include/linux/grsecurity.h linux-2.6.38.1/include/linux/grsecurity.h
+--- linux-2.6.38.1/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/include/linux/grsecurity.h 2011-03-26 19:58:41.000000000 -0400
+@@ -0,0 +1,215 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
+#include <linux/fs.h>
@@ -46800,6 +47001,7 @@ diff -urNp linux-2.6.38/include/linux/grsecurity.h linux-2.6.38-new/include/linu
+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
+void gr_audit_ptrace(struct task_struct *task);
++dev_t gr_get_dev_from_dentry(struct dentry *dentry);
+
+#ifdef CONFIG_GRKERNSEC
+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
@@ -46816,9 +47018,9 @@ diff -urNp linux-2.6.38/include/linux/grsecurity.h linux-2.6.38-new/include/linu
+#endif
+
+#endif
-diff -urNp linux-2.6.38/include/linux/grsock.h linux-2.6.38-new/include/linux/grsock.h
---- linux-2.6.38/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/include/linux/grsock.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/grsock.h linux-2.6.38.1/include/linux/grsock.h
+--- linux-2.6.38.1/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/include/linux/grsock.h 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,19 @@
+#ifndef __GRSOCK_H
+#define __GRSOCK_H
@@ -46839,9 +47041,9 @@ diff -urNp linux-2.6.38/include/linux/grsock.h linux-2.6.38-new/include/linux/gr
+ const int protocol);
+
+#endif
-diff -urNp linux-2.6.38/include/linux/highmem.h linux-2.6.38-new/include/linux/highmem.h
---- linux-2.6.38/include/linux/highmem.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/highmem.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/highmem.h linux-2.6.38.1/include/linux/highmem.h
+--- linux-2.6.38.1/include/linux/highmem.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/highmem.h 2011-03-21 18:31:35.000000000 -0400
@@ -185,6 +185,18 @@ static inline void clear_highpage(struct
kunmap_atomic(kaddr, KM_USER0);
}
@@ -46861,9 +47063,9 @@ diff -urNp linux-2.6.38/include/linux/highmem.h linux-2.6.38-new/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.38/include/linux/init.h linux-2.6.38-new/include/linux/init.h
---- linux-2.6.38/include/linux/init.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/init.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/init.h linux-2.6.38.1/include/linux/init.h
+--- linux-2.6.38.1/include/linux/init.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/init.h 2011-03-21 18:31:35.000000000 -0400
@@ -293,13 +293,13 @@ void __init parse_early_options(char *cm
/* Each module must use one module_init(). */
@@ -46880,9 +47082,9 @@ diff -urNp linux-2.6.38/include/linux/init.h linux-2.6.38-new/include/linux/init
{ return exitfn; } \
void cleanup_module(void) __attribute__((alias(#exitfn)));
-diff -urNp linux-2.6.38/include/linux/interrupt.h linux-2.6.38-new/include/linux/interrupt.h
---- linux-2.6.38/include/linux/interrupt.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/interrupt.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/interrupt.h linux-2.6.38.1/include/linux/interrupt.h
+--- linux-2.6.38.1/include/linux/interrupt.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/interrupt.h 2011-03-21 18:31:35.000000000 -0400
@@ -393,7 +393,7 @@ enum
/* map softirq index to softirq name. update 'softirq_to_name' in
* kernel/softirq.c when adding a new softirq.
@@ -46907,9 +47109,9 @@ diff -urNp linux-2.6.38/include/linux/interrupt.h linux-2.6.38-new/include/linux
extern void softirq_init(void);
static inline void __raise_softirq_irqoff(unsigned int nr)
{
-diff -urNp linux-2.6.38/include/linux/jbd2.h linux-2.6.38-new/include/linux/jbd2.h
---- linux-2.6.38/include/linux/jbd2.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/jbd2.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/jbd2.h linux-2.6.38.1/include/linux/jbd2.h
+--- linux-2.6.38.1/include/linux/jbd2.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/jbd2.h 2011-03-21 18:31:35.000000000 -0400
@@ -67,7 +67,7 @@ extern u8 jbd2_journal_enable_debug;
} \
} while (0)
@@ -46919,9 +47121,9 @@ diff -urNp linux-2.6.38/include/linux/jbd2.h linux-2.6.38-new/include/linux/jbd2
#endif
extern void *jbd2_alloc(size_t size, gfp_t flags);
-diff -urNp linux-2.6.38/include/linux/jbd.h linux-2.6.38-new/include/linux/jbd.h
---- linux-2.6.38/include/linux/jbd.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/jbd.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/jbd.h linux-2.6.38.1/include/linux/jbd.h
+--- linux-2.6.38.1/include/linux/jbd.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/jbd.h 2011-03-21 18:31:35.000000000 -0400
@@ -67,7 +67,7 @@ extern u8 journal_enable_debug;
} \
} while (0)
@@ -46931,9 +47133,9 @@ diff -urNp linux-2.6.38/include/linux/jbd.h linux-2.6.38-new/include/linux/jbd.h
#endif
static inline void *jbd_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.38/include/linux/kallsyms.h linux-2.6.38-new/include/linux/kallsyms.h
---- linux-2.6.38/include/linux/kallsyms.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/kallsyms.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/kallsyms.h linux-2.6.38.1/include/linux/kallsyms.h
+--- linux-2.6.38.1/include/linux/kallsyms.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/kallsyms.h 2011-03-21 18:31:35.000000000 -0400
@@ -15,7 +15,8 @@
struct module;
@@ -46960,9 +47162,9 @@ diff -urNp linux-2.6.38/include/linux/kallsyms.h linux-2.6.38-new/include/linux/
/* This macro allows us to keep printk typechecking */
static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-2.6.38/include/linux/kgdb.h linux-2.6.38-new/include/linux/kgdb.h
---- linux-2.6.38/include/linux/kgdb.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/kgdb.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/kgdb.h linux-2.6.38.1/include/linux/kgdb.h
+--- linux-2.6.38.1/include/linux/kgdb.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/kgdb.h 2011-03-21 18:31:35.000000000 -0400
@@ -269,22 +269,22 @@ struct kgdb_arch {
*/
struct kgdb_io {
@@ -46996,9 +47198,9 @@ diff -urNp linux-2.6.38/include/linux/kgdb.h linux-2.6.38-new/include/linux/kgdb
extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
extern char *kgdb_mem2hex(char *mem, char *buf, int count);
-diff -urNp linux-2.6.38/include/linux/kvm_host.h linux-2.6.38-new/include/linux/kvm_host.h
---- linux-2.6.38/include/linux/kvm_host.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/kvm_host.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/kvm_host.h linux-2.6.38.1/include/linux/kvm_host.h
+--- linux-2.6.38.1/include/linux/kvm_host.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/kvm_host.h 2011-03-21 18:31:35.000000000 -0400
@@ -288,7 +288,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
void vcpu_load(struct kvm_vcpu *vcpu);
void vcpu_put(struct kvm_vcpu *vcpu);
@@ -47017,9 +47219,9 @@ diff -urNp linux-2.6.38/include/linux/kvm_host.h linux-2.6.38-new/include/linux/
void kvm_arch_exit(void);
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-2.6.38/include/linux/libata.h linux-2.6.38-new/include/linux/libata.h
---- linux-2.6.38/include/linux/libata.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/libata.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/libata.h linux-2.6.38.1/include/linux/libata.h
+--- linux-2.6.38.1/include/linux/libata.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/libata.h 2011-03-21 18:31:35.000000000 -0400
@@ -65,11 +65,11 @@
#ifdef ATA_VERBOSE_DEBUG
#define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -47085,9 +47287,9 @@ diff -urNp linux-2.6.38/include/linux/libata.h linux-2.6.38-new/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_Host *h, struct scsi_cmnd *cmd);
-diff -urNp linux-2.6.38/include/linux/lockd/bind.h linux-2.6.38-new/include/linux/lockd/bind.h
---- linux-2.6.38/include/linux/lockd/bind.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/lockd/bind.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/lockd/bind.h linux-2.6.38.1/include/linux/lockd/bind.h
+--- linux-2.6.38.1/include/linux/lockd/bind.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/lockd/bind.h 2011-03-21 18:31:35.000000000 -0400
@@ -23,13 +23,13 @@ struct svc_rqst;
* This is the set of functions for lockd->nfsd communication
*/
@@ -47105,9 +47307,9 @@ diff -urNp linux-2.6.38/include/linux/lockd/bind.h linux-2.6.38-new/include/linu
/*
* Similar to nfs_client_initdata, but without the NFS-specific
-diff -urNp linux-2.6.38/include/linux/mm.h linux-2.6.38-new/include/linux/mm.h
---- linux-2.6.38/include/linux/mm.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/mm.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/mm.h linux-2.6.38.1/include/linux/mm.h
+--- linux-2.6.38.1/include/linux/mm.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/mm.h 2011-03-21 18:31:35.000000000 -0400
@@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
@@ -47208,9 +47410,9 @@ diff -urNp linux-2.6.38/include/linux/mm.h linux-2.6.38-new/include/linux/mm.h
+
#endif /* __KERNEL__ */
#endif /* _LINUX_MM_H */
-diff -urNp linux-2.6.38/include/linux/mm_types.h linux-2.6.38-new/include/linux/mm_types.h
---- linux-2.6.38/include/linux/mm_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/mm_types.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/mm_types.h linux-2.6.38.1/include/linux/mm_types.h
+--- linux-2.6.38.1/include/linux/mm_types.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/mm_types.h 2011-03-21 18:31:35.000000000 -0400
@@ -183,6 +183,8 @@ struct vm_area_struct {
#ifdef CONFIG_NUMA
struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -47245,9 +47447,9 @@ diff -urNp linux-2.6.38/include/linux/mm_types.h linux-2.6.38-new/include/linux/
};
/* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
-diff -urNp linux-2.6.38/include/linux/mmu_notifier.h linux-2.6.38-new/include/linux/mmu_notifier.h
---- linux-2.6.38/include/linux/mmu_notifier.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/mmu_notifier.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/mmu_notifier.h linux-2.6.38.1/include/linux/mmu_notifier.h
+--- linux-2.6.38.1/include/linux/mmu_notifier.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/mmu_notifier.h 2011-03-21 18:31:35.000000000 -0400
@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr
*/
#define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -47264,9 +47466,9 @@ diff -urNp linux-2.6.38/include/linux/mmu_notifier.h linux-2.6.38-new/include/li
})
#define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
-diff -urNp linux-2.6.38/include/linux/mmzone.h linux-2.6.38-new/include/linux/mmzone.h
---- linux-2.6.38/include/linux/mmzone.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/mmzone.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/mmzone.h linux-2.6.38.1/include/linux/mmzone.h
+--- linux-2.6.38.1/include/linux/mmzone.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/mmzone.h 2011-03-21 18:31:35.000000000 -0400
@@ -355,7 +355,7 @@ struct zone {
unsigned long flags; /* zone flags, see below */
@@ -47276,9 +47478,9 @@ diff -urNp linux-2.6.38/include/linux/mmzone.h linux-2.6.38-new/include/linux/mm
/*
* The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
-diff -urNp linux-2.6.38/include/linux/mod_devicetable.h linux-2.6.38-new/include/linux/mod_devicetable.h
---- linux-2.6.38/include/linux/mod_devicetable.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/mod_devicetable.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/mod_devicetable.h linux-2.6.38.1/include/linux/mod_devicetable.h
+--- linux-2.6.38.1/include/linux/mod_devicetable.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/mod_devicetable.h 2011-03-21 18:31:35.000000000 -0400
@@ -12,7 +12,7 @@
typedef unsigned long kernel_ulong_t;
#endif
@@ -47297,9 +47499,9 @@ diff -urNp linux-2.6.38/include/linux/mod_devicetable.h linux-2.6.38-new/include
struct hid_device_id {
__u16 bus;
-diff -urNp linux-2.6.38/include/linux/module.h linux-2.6.38-new/include/linux/module.h
---- linux-2.6.38/include/linux/module.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/module.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/module.h linux-2.6.38.1/include/linux/module.h
+--- linux-2.6.38.1/include/linux/module.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/module.h 2011-03-21 18:31:35.000000000 -0400
@@ -324,19 +324,16 @@ struct module
int (*init)(void);
@@ -47375,9 +47577,9 @@ diff -urNp linux-2.6.38/include/linux/module.h linux-2.6.38-new/include/linux/mo
}
/* Search for module by name: must hold module_mutex. */
-diff -urNp linux-2.6.38/include/linux/moduleloader.h linux-2.6.38-new/include/linux/moduleloader.h
---- linux-2.6.38/include/linux/moduleloader.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/moduleloader.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/moduleloader.h linux-2.6.38.1/include/linux/moduleloader.h
+--- linux-2.6.38.1/include/linux/moduleloader.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/moduleloader.h 2011-03-21 18:31:35.000000000 -0400
@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
sections. Returns NULL on failure. */
void *module_alloc(unsigned long size);
@@ -47400,9 +47602,9 @@ diff -urNp linux-2.6.38/include/linux/moduleloader.h linux-2.6.38-new/include/li
/* Apply the given relocation to the (simplified) ELF. Return -error
or 0. */
int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-2.6.38/include/linux/moduleparam.h linux-2.6.38-new/include/linux/moduleparam.h
---- linux-2.6.38/include/linux/moduleparam.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/moduleparam.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/moduleparam.h linux-2.6.38.1/include/linux/moduleparam.h
+--- linux-2.6.38.1/include/linux/moduleparam.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/moduleparam.h 2011-03-21 18:31:35.000000000 -0400
@@ -255,7 +255,7 @@ static inline void __kernel_param_unlock
* @len is usually just sizeof(string).
*/
@@ -47421,9 +47623,9 @@ diff -urNp linux-2.6.38/include/linux/moduleparam.h linux-2.6.38-new/include/lin
= { ARRAY_SIZE(array), nump, &param_ops_##type, \
sizeof(array[0]), array }; \
__module_param_call(MODULE_PARAM_PREFIX, name, \
-diff -urNp linux-2.6.38/include/linux/namei.h linux-2.6.38-new/include/linux/namei.h
---- linux-2.6.38/include/linux/namei.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/namei.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/namei.h linux-2.6.38.1/include/linux/namei.h
+--- linux-2.6.38.1/include/linux/namei.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/namei.h 2011-03-21 18:31:35.000000000 -0400
@@ -25,7 +25,7 @@ struct nameidata {
unsigned seq;
int last_type;
@@ -47448,9 +47650,9 @@ diff -urNp linux-2.6.38/include/linux/namei.h linux-2.6.38-new/include/linux/nam
{
return nd->saved_names[nd->depth];
}
-diff -urNp linux-2.6.38/include/linux/netfilter/xt_gradm.h linux-2.6.38-new/include/linux/netfilter/xt_gradm.h
---- linux-2.6.38/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/include/linux/netfilter/xt_gradm.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/netfilter/xt_gradm.h linux-2.6.38.1/include/linux/netfilter/xt_gradm.h
+--- linux-2.6.38.1/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/include/linux/netfilter/xt_gradm.h 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,9 @@
+#ifndef _LINUX_NETFILTER_XT_GRADM_H
+#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -47461,9 +47663,9 @@ diff -urNp linux-2.6.38/include/linux/netfilter/xt_gradm.h linux-2.6.38-new/incl
+};
+
+#endif
-diff -urNp linux-2.6.38/include/linux/oprofile.h linux-2.6.38-new/include/linux/oprofile.h
---- linux-2.6.38/include/linux/oprofile.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/oprofile.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/oprofile.h linux-2.6.38.1/include/linux/oprofile.h
+--- linux-2.6.38.1/include/linux/oprofile.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/oprofile.h 2011-03-21 18:31:35.000000000 -0400
@@ -132,9 +132,9 @@ int oprofilefs_create_ulong(struct super
int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
char const * name, ulong * val);
@@ -47476,9 +47678,9 @@ diff -urNp linux-2.6.38/include/linux/oprofile.h linux-2.6.38-new/include/linux/
/** create a directory */
struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-2.6.38/include/linux/pipe_fs_i.h linux-2.6.38-new/include/linux/pipe_fs_i.h
---- linux-2.6.38/include/linux/pipe_fs_i.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/pipe_fs_i.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/pipe_fs_i.h linux-2.6.38.1/include/linux/pipe_fs_i.h
+--- linux-2.6.38.1/include/linux/pipe_fs_i.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/pipe_fs_i.h 2011-03-21 18:31:35.000000000 -0400
@@ -46,9 +46,9 @@ struct pipe_buffer {
struct pipe_inode_info {
wait_queue_head_t wait;
@@ -47492,9 +47694,9 @@ diff -urNp linux-2.6.38/include/linux/pipe_fs_i.h linux-2.6.38-new/include/linux
unsigned int r_counter;
unsigned int w_counter;
struct page *tmp_page;
-diff -urNp linux-2.6.38/include/linux/pm_runtime.h linux-2.6.38-new/include/linux/pm_runtime.h
---- linux-2.6.38/include/linux/pm_runtime.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/pm_runtime.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/pm_runtime.h linux-2.6.38.1/include/linux/pm_runtime.h
+--- linux-2.6.38.1/include/linux/pm_runtime.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/pm_runtime.h 2011-03-21 18:31:35.000000000 -0400
@@ -89,7 +89,7 @@ static inline bool pm_runtime_enabled(st
static inline void pm_runtime_mark_last_busy(struct device *dev)
@@ -47504,9 +47706,9 @@ diff -urNp linux-2.6.38/include/linux/pm_runtime.h linux-2.6.38-new/include/linu
}
#else /* !CONFIG_PM_RUNTIME */
-diff -urNp linux-2.6.38/include/linux/poison.h linux-2.6.38-new/include/linux/poison.h
---- linux-2.6.38/include/linux/poison.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/poison.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/poison.h linux-2.6.38.1/include/linux/poison.h
+--- linux-2.6.38.1/include/linux/poison.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/poison.h 2011-03-21 18:31:35.000000000 -0400
@@ -19,8 +19,8 @@
* under normal circumstances, used to verify that nobody uses
* non-initialized list entries.
@@ -47518,9 +47720,9 @@ diff -urNp linux-2.6.38/include/linux/poison.h linux-2.6.38-new/include/linux/po
/********** include/linux/timer.h **********/
/*
-diff -urNp linux-2.6.38/include/linux/proc_fs.h linux-2.6.38-new/include/linux/proc_fs.h
---- linux-2.6.38/include/linux/proc_fs.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/proc_fs.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/proc_fs.h linux-2.6.38.1/include/linux/proc_fs.h
+--- linux-2.6.38.1/include/linux/proc_fs.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/proc_fs.h 2011-03-21 18:31:35.000000000 -0400
@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
return proc_create_data(name, mode, parent, proc_fops, NULL);
}
@@ -47541,9 +47743,25 @@ diff -urNp linux-2.6.38/include/linux/proc_fs.h linux-2.6.38-new/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.38/include/linux/random.h linux-2.6.38-new/include/linux/random.h
---- linux-2.6.38/include/linux/random.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/random.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/ptrace.h linux-2.6.38.1/include/linux/ptrace.h
+--- linux-2.6.38.1/include/linux/ptrace.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/ptrace.h 2011-03-26 11:36:13.000000000 -0400
+@@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_
+ extern void exit_ptrace(struct task_struct *tracer);
+ #define PTRACE_MODE_READ 1
+ #define PTRACE_MODE_ATTACH 2
+-/* Returns 0 on success, -errno on denial. */
+-extern int __ptrace_may_access(struct task_struct *task, unsigned int mode);
+ /* Returns true on success, false on denial. */
+ extern bool ptrace_may_access(struct task_struct *task, unsigned int mode);
++/* Returns true on success, false on denial. */
++extern bool ptrace_may_access_log(struct task_struct *task, unsigned int mode);
+
+ static inline int ptrace_reparented(struct task_struct *child)
+ {
+diff -urNp linux-2.6.38.1/include/linux/random.h linux-2.6.38.1/include/linux/random.h
+--- linux-2.6.38.1/include/linux/random.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/random.h 2011-03-21 18:31:35.000000000 -0400
@@ -80,12 +80,17 @@ void srandom32(u32 seed);
u32 prandom32(struct rnd_state *);
@@ -47563,9 +47781,9 @@ diff -urNp linux-2.6.38/include/linux/random.h linux-2.6.38-new/include/linux/ra
}
/**
-diff -urNp linux-2.6.38/include/linux/reiserfs_fs.h linux-2.6.38-new/include/linux/reiserfs_fs.h
---- linux-2.6.38/include/linux/reiserfs_fs.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/reiserfs_fs.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/reiserfs_fs.h linux-2.6.38.1/include/linux/reiserfs_fs.h
+--- linux-2.6.38.1/include/linux/reiserfs_fs.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/reiserfs_fs.h 2011-03-21 18:31:35.000000000 -0400
@@ -1403,7 +1403,7 @@ static inline loff_t max_reiserfs_offset
#define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
@@ -47612,9 +47830,9 @@ diff -urNp linux-2.6.38/include/linux/reiserfs_fs.h linux-2.6.38-new/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.38/include/linux/reiserfs_fs_sb.h linux-2.6.38-new/include/linux/reiserfs_fs_sb.h
---- linux-2.6.38/include/linux/reiserfs_fs_sb.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/reiserfs_fs_sb.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/reiserfs_fs_sb.h linux-2.6.38.1/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.38.1/include/linux/reiserfs_fs_sb.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/reiserfs_fs_sb.h 2011-03-21 18:31:35.000000000 -0400
@@ -386,7 +386,7 @@ struct reiserfs_sb_info {
/* Comment? -Hans */
wait_queue_head_t s_wait;
@@ -47624,9 +47842,9 @@ diff -urNp linux-2.6.38/include/linux/reiserfs_fs_sb.h linux-2.6.38-new/include/
// tree gets re-balanced
unsigned long s_properties; /* File system properties. Currently holds
on-disk FS format */
-diff -urNp linux-2.6.38/include/linux/rmap.h linux-2.6.38-new/include/linux/rmap.h
---- linux-2.6.38/include/linux/rmap.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/rmap.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/rmap.h linux-2.6.38.1/include/linux/rmap.h
+--- linux-2.6.38.1/include/linux/rmap.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/rmap.h 2011-03-21 18:31:35.000000000 -0400
@@ -145,8 +145,8 @@ static inline void anon_vma_unlock(struc
void anon_vma_init(void); /* create anon_vma_cachep */
int anon_vma_prepare(struct vm_area_struct *);
@@ -47638,9 +47856,9 @@ diff -urNp linux-2.6.38/include/linux/rmap.h linux-2.6.38-new/include/linux/rmap
void __anon_vma_link(struct vm_area_struct *);
void anon_vma_free(struct anon_vma *);
-diff -urNp linux-2.6.38/include/linux/sched.h linux-2.6.38-new/include/linux/sched.h
---- linux-2.6.38/include/linux/sched.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/sched.h 2011-03-21 23:47:41.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/sched.h linux-2.6.38.1/include/linux/sched.h
+--- linux-2.6.38.1/include/linux/sched.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/sched.h 2011-03-26 17:18:15.000000000 -0400
@@ -99,6 +99,7 @@ struct robust_list_head;
struct bio_list;
struct fs_struct;
@@ -47738,7 +47956,7 @@ diff -urNp linux-2.6.38/include/linux/sched.h linux-2.6.38-new/include/linux/sch
#ifdef CONFIG_DEBUG_MUTEXES
/* mutex deadlock detection */
struct mutex_waiter *blocked_on;
-@@ -1499,6 +1516,20 @@ struct task_struct {
+@@ -1499,6 +1516,21 @@ struct task_struct {
unsigned long default_timer_slack_ns;
struct list_head *scm_work_list;
@@ -47750,6 +47968,7 @@ diff -urNp linux-2.6.38/include/linux/sched.h linux-2.6.38-new/include/linux/sch
+ struct acl_role_label *role;
+ struct file *exec_file;
+ u16 acl_role_id;
++ /* is this the task that authenticated to the special role */
+ u8 acl_sp_role;
+ u8 is_writable;
+ u8 brute;
@@ -47759,7 +47978,7 @@ diff -urNp linux-2.6.38/include/linux/sched.h linux-2.6.38-new/include/linux/sch
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
/* Index of current stored address in ret_stack */
int curr_ret_stack;
-@@ -1530,6 +1561,52 @@ struct task_struct {
+@@ -1530,6 +1562,52 @@ struct task_struct {
#endif
};
@@ -47812,7 +48031,7 @@ diff -urNp linux-2.6.38/include/linux/sched.h linux-2.6.38-new/include/linux/sch
/* Future-safe accessor for struct task_struct's cpus_allowed. */
#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
-@@ -2169,7 +2246,7 @@ extern void __cleanup_sighand(struct sig
+@@ -2169,7 +2247,7 @@ extern void __cleanup_sighand(struct sig
extern void exit_itimers(struct signal_struct *);
extern void flush_itimer_signals(void);
@@ -47821,7 +48040,7 @@ diff -urNp linux-2.6.38/include/linux/sched.h linux-2.6.38-new/include/linux/sch
extern void daemonize(const char *, ...);
extern int allow_signal(int);
-@@ -2294,8 +2371,8 @@ static inline void unlock_task_sighand(s
+@@ -2294,8 +2372,8 @@ static inline void unlock_task_sighand(s
#ifndef __HAVE_THREAD_FUNCTIONS
@@ -47832,7 +48051,7 @@ diff -urNp linux-2.6.38/include/linux/sched.h linux-2.6.38-new/include/linux/sch
static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org)
{
-@@ -2310,13 +2387,17 @@ static inline unsigned long *end_of_stac
+@@ -2310,13 +2388,17 @@ static inline unsigned long *end_of_stac
#endif
@@ -47852,9 +48071,9 @@ diff -urNp linux-2.6.38/include/linux/sched.h linux-2.6.38-new/include/linux/sch
extern void thread_info_cache_init(void);
#ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-2.6.38/include/linux/screen_info.h linux-2.6.38-new/include/linux/screen_info.h
---- linux-2.6.38/include/linux/screen_info.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/screen_info.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/screen_info.h linux-2.6.38.1/include/linux/screen_info.h
+--- linux-2.6.38.1/include/linux/screen_info.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/screen_info.h 2011-03-21 18:31:35.000000000 -0400
@@ -43,7 +43,8 @@ struct screen_info {
__u16 pages; /* 0x32 */
__u16 vesa_attributes; /* 0x34 */
@@ -47865,9 +48084,9 @@ diff -urNp linux-2.6.38/include/linux/screen_info.h linux-2.6.38-new/include/lin
} __attribute__((packed));
#define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
-diff -urNp linux-2.6.38/include/linux/security.h linux-2.6.38-new/include/linux/security.h
---- linux-2.6.38/include/linux/security.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/security.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/security.h linux-2.6.38.1/include/linux/security.h
+--- linux-2.6.38.1/include/linux/security.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/security.h 2011-03-21 18:31:35.000000000 -0400
@@ -35,6 +35,7 @@
#include <linux/key.h>
#include <linux/xfrm.h>
@@ -47876,9 +48095,9 @@ diff -urNp linux-2.6.38/include/linux/security.h linux-2.6.38-new/include/linux/
#include <net/flow.h>
/* Maximum number of letters for an LSM name string */
-diff -urNp linux-2.6.38/include/linux/shm.h linux-2.6.38-new/include/linux/shm.h
---- linux-2.6.38/include/linux/shm.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/shm.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/shm.h linux-2.6.38.1/include/linux/shm.h
+--- linux-2.6.38.1/include/linux/shm.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/shm.h 2011-03-21 18:31:35.000000000 -0400
@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
pid_t shm_cprid;
pid_t shm_lprid;
@@ -47890,9 +48109,9 @@ diff -urNp linux-2.6.38/include/linux/shm.h linux-2.6.38-new/include/linux/shm.h
};
/* shm_mode upper byte flags */
-diff -urNp linux-2.6.38/include/linux/skbuff.h linux-2.6.38-new/include/linux/skbuff.h
---- linux-2.6.38/include/linux/skbuff.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/skbuff.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/skbuff.h linux-2.6.38.1/include/linux/skbuff.h
+--- linux-2.6.38.1/include/linux/skbuff.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/skbuff.h 2011-03-21 18:31:35.000000000 -0400
@@ -589,7 +589,7 @@ static inline struct skb_shared_hwtstamp
*/
static inline int skb_queue_empty(const struct sk_buff_head *list)
@@ -47920,9 +48139,9 @@ diff -urNp linux-2.6.38/include/linux/skbuff.h linux-2.6.38-new/include/linux/sk
}
/**
-diff -urNp linux-2.6.38/include/linux/slab.h linux-2.6.38-new/include/linux/slab.h
---- linux-2.6.38/include/linux/slab.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/slab.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/slab.h linux-2.6.38.1/include/linux/slab.h
+--- linux-2.6.38.1/include/linux/slab.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/slab.h 2011-03-21 18:31:35.000000000 -0400
@@ -11,6 +11,7 @@
#include <linux/gfp.h>
@@ -47994,9 +48213,9 @@ diff -urNp linux-2.6.38/include/linux/slab.h linux-2.6.38-new/include/linux/slab
+})
+
#endif /* _LINUX_SLAB_H */
-diff -urNp linux-2.6.38/include/linux/slub_def.h linux-2.6.38-new/include/linux/slub_def.h
---- linux-2.6.38/include/linux/slub_def.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/slub_def.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/slub_def.h linux-2.6.38.1/include/linux/slub_def.h
+--- linux-2.6.38.1/include/linux/slub_def.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/slub_def.h 2011-03-21 18:31:35.000000000 -0400
@@ -79,7 +79,7 @@ struct kmem_cache {
struct kmem_cache_order_objects max;
struct kmem_cache_order_objects min;
@@ -48006,9 +48225,9 @@ diff -urNp linux-2.6.38/include/linux/slub_def.h linux-2.6.38-new/include/linux/
void (*ctor)(void *);
int inuse; /* Offset to metadata */
int align; /* Alignment */
-diff -urNp linux-2.6.38/include/linux/sonet.h linux-2.6.38-new/include/linux/sonet.h
---- linux-2.6.38/include/linux/sonet.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/sonet.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/sonet.h linux-2.6.38.1/include/linux/sonet.h
+--- linux-2.6.38.1/include/linux/sonet.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/sonet.h 2011-03-21 18:31:35.000000000 -0400
@@ -61,7 +61,7 @@ struct sonet_stats {
#include <asm/atomic.h>
@@ -48018,9 +48237,9 @@ diff -urNp linux-2.6.38/include/linux/sonet.h linux-2.6.38-new/include/linux/son
__SONET_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-2.6.38/include/linux/sunrpc/clnt.h linux-2.6.38-new/include/linux/sunrpc/clnt.h
---- linux-2.6.38/include/linux/sunrpc/clnt.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/sunrpc/clnt.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/sunrpc/clnt.h linux-2.6.38.1/include/linux/sunrpc/clnt.h
+--- linux-2.6.38.1/include/linux/sunrpc/clnt.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/sunrpc/clnt.h 2011-03-21 18:31:35.000000000 -0400
@@ -168,9 +168,9 @@ static inline unsigned short rpc_get_por
{
switch (sap->sa_family) {
@@ -48051,9 +48270,9 @@ diff -urNp linux-2.6.38/include/linux/sunrpc/clnt.h linux-2.6.38-new/include/lin
}
#endif /* __KERNEL__ */
-diff -urNp linux-2.6.38/include/linux/suspend.h linux-2.6.38-new/include/linux/suspend.h
---- linux-2.6.38/include/linux/suspend.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/suspend.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/suspend.h linux-2.6.38.1/include/linux/suspend.h
+--- linux-2.6.38.1/include/linux/suspend.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/suspend.h 2011-03-21 18:31:35.000000000 -0400
@@ -106,15 +106,15 @@ typedef int __bitwise suspend_state_t;
* which require special recovery actions in that situation.
*/
@@ -48106,9 +48325,9 @@ diff -urNp linux-2.6.38/include/linux/suspend.h linux-2.6.38-new/include/linux/s
};
#ifdef CONFIG_HIBERNATION
-diff -urNp linux-2.6.38/include/linux/sysctl.h linux-2.6.38-new/include/linux/sysctl.h
---- linux-2.6.38/include/linux/sysctl.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/sysctl.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/sysctl.h linux-2.6.38.1/include/linux/sysctl.h
+--- linux-2.6.38.1/include/linux/sysctl.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/sysctl.h 2011-03-21 18:31:35.000000000 -0400
@@ -155,7 +155,11 @@ enum
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
};
@@ -48131,9 +48350,9 @@ diff -urNp linux-2.6.38/include/linux/sysctl.h linux-2.6.38-new/include/linux/sy
extern int proc_dointvec(struct ctl_table *, int,
void __user *, size_t *, loff_t *);
extern int proc_dointvec_minmax(struct ctl_table *, int,
-diff -urNp linux-2.6.38/include/linux/sysfs.h linux-2.6.38-new/include/linux/sysfs.h
---- linux-2.6.38/include/linux/sysfs.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/sysfs.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/sysfs.h linux-2.6.38.1/include/linux/sysfs.h
+--- linux-2.6.38.1/include/linux/sysfs.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/sysfs.h 2011-03-21 18:31:35.000000000 -0400
@@ -110,8 +110,8 @@ struct bin_attribute {
#define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr)
@@ -48145,9 +48364,9 @@ diff -urNp linux-2.6.38/include/linux/sysfs.h linux-2.6.38-new/include/linux/sys
};
struct sysfs_dirent;
-diff -urNp linux-2.6.38/include/linux/tty.h linux-2.6.38-new/include/linux/tty.h
---- linux-2.6.38/include/linux/tty.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/tty.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/tty.h linux-2.6.38.1/include/linux/tty.h
+--- linux-2.6.38.1/include/linux/tty.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/tty.h 2011-03-21 18:31:35.000000000 -0400
@@ -13,6 +13,8 @@
#include <linux/tty_driver.h>
#include <linux/tty_ldisc.h>
@@ -48184,9 +48403,9 @@ diff -urNp linux-2.6.38/include/linux/tty.h linux-2.6.38-new/include/linux/tty.h
/* n_tty.c */
extern struct tty_ldisc_ops tty_ldisc_N_TTY;
-diff -urNp linux-2.6.38/include/linux/tty_ldisc.h linux-2.6.38-new/include/linux/tty_ldisc.h
---- linux-2.6.38/include/linux/tty_ldisc.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/tty_ldisc.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/tty_ldisc.h linux-2.6.38.1/include/linux/tty_ldisc.h
+--- linux-2.6.38.1/include/linux/tty_ldisc.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/tty_ldisc.h 2011-03-21 18:31:35.000000000 -0400
@@ -148,7 +148,7 @@ struct tty_ldisc_ops {
struct module *owner;
@@ -48196,9 +48415,9 @@ diff -urNp linux-2.6.38/include/linux/tty_ldisc.h linux-2.6.38-new/include/linux
};
struct tty_ldisc {
-diff -urNp linux-2.6.38/include/linux/types.h linux-2.6.38-new/include/linux/types.h
---- linux-2.6.38/include/linux/types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/types.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/types.h linux-2.6.38.1/include/linux/types.h
+--- linux-2.6.38.1/include/linux/types.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/types.h 2011-03-21 18:31:35.000000000 -0400
@@ -207,10 +207,26 @@ typedef struct {
int counter;
} atomic_t;
@@ -48226,9 +48445,9 @@ diff -urNp linux-2.6.38/include/linux/types.h linux-2.6.38-new/include/linux/typ
#endif
struct list_head {
-diff -urNp linux-2.6.38/include/linux/uaccess.h linux-2.6.38-new/include/linux/uaccess.h
---- linux-2.6.38/include/linux/uaccess.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/uaccess.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/uaccess.h linux-2.6.38.1/include/linux/uaccess.h
+--- linux-2.6.38.1/include/linux/uaccess.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/uaccess.h 2011-03-21 18:31:35.000000000 -0400
@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
long ret; \
mm_segment_t old_fs = get_fs(); \
@@ -48264,9 +48483,9 @@ diff -urNp linux-2.6.38/include/linux/uaccess.h linux-2.6.38-new/include/linux/u
+extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
#endif /* __LINUX_UACCESS_H__ */
-diff -urNp linux-2.6.38/include/linux/unaligned/access_ok.h linux-2.6.38-new/include/linux/unaligned/access_ok.h
---- linux-2.6.38/include/linux/unaligned/access_ok.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/unaligned/access_ok.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/unaligned/access_ok.h linux-2.6.38.1/include/linux/unaligned/access_ok.h
+--- linux-2.6.38.1/include/linux/unaligned/access_ok.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/unaligned/access_ok.h 2011-03-21 18:31:35.000000000 -0400
@@ -6,32 +6,32 @@
static inline u16 get_unaligned_le16(const void *p)
@@ -48306,10 +48525,10 @@ diff -urNp linux-2.6.38/include/linux/unaligned/access_ok.h linux-2.6.38-new/inc
}
static inline void put_unaligned_le16(u16 val, void *p)
-diff -urNp linux-2.6.38/include/linux/usb/hcd.h linux-2.6.38-new/include/linux/usb/hcd.h
---- linux-2.6.38/include/linux/usb/hcd.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/usb/hcd.h 2011-03-21 18:31:35.000000000 -0400
-@@ -585,7 +585,7 @@ struct usb_mon_operations {
+diff -urNp linux-2.6.38.1/include/linux/usb/hcd.h linux-2.6.38.1/include/linux/usb/hcd.h
+--- linux-2.6.38.1/include/linux/usb/hcd.h 2011-03-23 17:20:08.000000000 -0400
++++ linux-2.6.38.1/include/linux/usb/hcd.h 2011-03-23 17:21:51.000000000 -0400
+@@ -589,7 +589,7 @@ struct usb_mon_operations {
/* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
};
@@ -48318,7 +48537,7 @@ diff -urNp linux-2.6.38/include/linux/usb/hcd.h linux-2.6.38-new/include/linux/u
static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb)
{
-@@ -607,7 +607,7 @@ static inline void usbmon_urb_complete(s
+@@ -611,7 +611,7 @@ static inline void usbmon_urb_complete(s
(*mon_ops->urb_complete)(bus, urb, status);
}
@@ -48327,9 +48546,9 @@ diff -urNp linux-2.6.38/include/linux/usb/hcd.h linux-2.6.38-new/include/linux/u
void usb_mon_deregister(void);
#else
-diff -urNp linux-2.6.38/include/linux/vmalloc.h linux-2.6.38-new/include/linux/vmalloc.h
---- linux-2.6.38/include/linux/vmalloc.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/vmalloc.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/vmalloc.h linux-2.6.38.1/include/linux/vmalloc.h
+--- linux-2.6.38.1/include/linux/vmalloc.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/vmalloc.h 2011-03-21 18:31:35.000000000 -0400
@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
#define VM_MAP 0x00000004 /* vmap()ed pages */
#define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
@@ -48446,9 +48665,9 @@ diff -urNp linux-2.6.38/include/linux/vmalloc.h linux-2.6.38-new/include/linux/v
+})
+
#endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-2.6.38/include/linux/vmstat.h linux-2.6.38-new/include/linux/vmstat.h
---- linux-2.6.38/include/linux/vmstat.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/linux/vmstat.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/linux/vmstat.h linux-2.6.38.1/include/linux/vmstat.h
+--- linux-2.6.38.1/include/linux/vmstat.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/linux/vmstat.h 2011-03-21 18:31:35.000000000 -0400
@@ -140,18 +140,18 @@ static inline void vm_events_fold_cpu(in
/*
* Zone based page accounting with per cpu differentials.
@@ -48512,9 +48731,9 @@ diff -urNp linux-2.6.38/include/linux/vmstat.h linux-2.6.38-new/include/linux/vm
}
static inline void __dec_zone_page_state(struct page *page,
-diff -urNp linux-2.6.38/include/net/inetpeer.h linux-2.6.38-new/include/net/inetpeer.h
---- linux-2.6.38/include/net/inetpeer.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/net/inetpeer.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/net/inetpeer.h linux-2.6.38.1/include/net/inetpeer.h
+--- linux-2.6.38.1/include/net/inetpeer.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/net/inetpeer.h 2011-03-21 18:31:35.000000000 -0400
@@ -38,8 +38,8 @@ struct inet_peer {
*/
union {
@@ -48535,9 +48754,9 @@ diff -urNp linux-2.6.38/include/net/inetpeer.h linux-2.6.38-new/include/net/inet
}
#endif /* _NET_INETPEER_H */
-diff -urNp linux-2.6.38/include/net/irda/ircomm_tty.h linux-2.6.38-new/include/net/irda/ircomm_tty.h
---- linux-2.6.38/include/net/irda/ircomm_tty.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/net/irda/ircomm_tty.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/net/irda/ircomm_tty.h linux-2.6.38.1/include/net/irda/ircomm_tty.h
+--- linux-2.6.38.1/include/net/irda/ircomm_tty.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/net/irda/ircomm_tty.h 2011-03-21 18:31:35.000000000 -0400
@@ -35,6 +35,7 @@
#include <linux/termios.h>
#include <linux/timer.h>
@@ -48557,9 +48776,9 @@ diff -urNp linux-2.6.38/include/net/irda/ircomm_tty.h linux-2.6.38-new/include/n
/* Protect concurent access to :
* o self->open_count
-diff -urNp linux-2.6.38/include/net/neighbour.h linux-2.6.38-new/include/net/neighbour.h
---- linux-2.6.38/include/net/neighbour.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/net/neighbour.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/net/neighbour.h linux-2.6.38.1/include/net/neighbour.h
+--- linux-2.6.38.1/include/net/neighbour.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/net/neighbour.h 2011-03-21 18:31:35.000000000 -0400
@@ -118,12 +118,12 @@ struct neighbour {
struct neigh_ops {
@@ -48579,9 +48798,9 @@ diff -urNp linux-2.6.38/include/net/neighbour.h linux-2.6.38-new/include/net/nei
};
struct pneigh_entry {
-diff -urNp linux-2.6.38/include/net/netlink.h linux-2.6.38-new/include/net/netlink.h
---- linux-2.6.38/include/net/netlink.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/net/netlink.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/net/netlink.h linux-2.6.38.1/include/net/netlink.h
+--- linux-2.6.38.1/include/net/netlink.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/net/netlink.h 2011-03-21 18:31:35.000000000 -0400
@@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct
static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
{
@@ -48591,9 +48810,9 @@ diff -urNp linux-2.6.38/include/net/netlink.h linux-2.6.38-new/include/net/netli
}
/**
-diff -urNp linux-2.6.38/include/net/sctp/sctp.h linux-2.6.38-new/include/net/sctp/sctp.h
---- linux-2.6.38/include/net/sctp/sctp.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/net/sctp/sctp.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/net/sctp/sctp.h linux-2.6.38.1/include/net/sctp/sctp.h
+--- linux-2.6.38.1/include/net/sctp/sctp.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/net/sctp/sctp.h 2011-03-21 18:31:35.000000000 -0400
@@ -316,9 +316,9 @@ do { \
#else /* SCTP_DEBUG */
@@ -48607,9 +48826,9 @@ diff -urNp linux-2.6.38/include/net/sctp/sctp.h linux-2.6.38-new/include/net/sct
#define SCTP_ENABLE_DEBUG
#define SCTP_DISABLE_DEBUG
#define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-2.6.38/include/net/tcp.h linux-2.6.38-new/include/net/tcp.h
---- linux-2.6.38/include/net/tcp.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/net/tcp.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/net/tcp.h linux-2.6.38.1/include/net/tcp.h
+--- linux-2.6.38.1/include/net/tcp.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/net/tcp.h 2011-03-21 18:31:35.000000000 -0400
@@ -1382,7 +1382,7 @@ enum tcp_seq_states {
struct tcp_seq_afinfo {
char *name;
@@ -48619,9 +48838,9 @@ diff -urNp linux-2.6.38/include/net/tcp.h linux-2.6.38-new/include/net/tcp.h
struct seq_operations seq_ops;
};
-diff -urNp linux-2.6.38/include/net/udp.h linux-2.6.38-new/include/net/udp.h
---- linux-2.6.38/include/net/udp.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/net/udp.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/net/udp.h linux-2.6.38.1/include/net/udp.h
+--- linux-2.6.38.1/include/net/udp.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/net/udp.h 2011-03-21 18:31:35.000000000 -0400
@@ -223,7 +223,7 @@ struct udp_seq_afinfo {
char *name;
sa_family_t family;
@@ -48631,9 +48850,9 @@ diff -urNp linux-2.6.38/include/net/udp.h linux-2.6.38-new/include/net/udp.h
struct seq_operations seq_ops;
};
-diff -urNp linux-2.6.38/include/sound/ac97_codec.h linux-2.6.38-new/include/sound/ac97_codec.h
---- linux-2.6.38/include/sound/ac97_codec.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/sound/ac97_codec.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/sound/ac97_codec.h linux-2.6.38.1/include/sound/ac97_codec.h
+--- linux-2.6.38.1/include/sound/ac97_codec.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/sound/ac97_codec.h 2011-03-21 18:31:35.000000000 -0400
@@ -419,15 +419,15 @@
struct snd_ac97;
@@ -48657,9 +48876,9 @@ diff -urNp linux-2.6.38/include/sound/ac97_codec.h linux-2.6.38-new/include/soun
};
struct snd_ac97_bus_ops {
-diff -urNp linux-2.6.38/include/trace/events/irq.h linux-2.6.38-new/include/trace/events/irq.h
---- linux-2.6.38/include/trace/events/irq.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/trace/events/irq.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/trace/events/irq.h linux-2.6.38.1/include/trace/events/irq.h
+--- linux-2.6.38.1/include/trace/events/irq.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/trace/events/irq.h 2011-03-21 18:31:35.000000000 -0400
@@ -36,7 +36,7 @@ struct softirq_action;
*/
TRACE_EVENT(irq_handler_entry,
@@ -48678,9 +48897,9 @@ diff -urNp linux-2.6.38/include/trace/events/irq.h linux-2.6.38-new/include/trac
TP_ARGS(irq, action, ret),
-diff -urNp linux-2.6.38/include/video/uvesafb.h linux-2.6.38-new/include/video/uvesafb.h
---- linux-2.6.38/include/video/uvesafb.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/include/video/uvesafb.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/include/video/uvesafb.h linux-2.6.38.1/include/video/uvesafb.h
+--- linux-2.6.38.1/include/video/uvesafb.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/include/video/uvesafb.h 2011-03-21 18:31:35.000000000 -0400
@@ -177,6 +177,7 @@ struct uvesafb_par {
u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
u8 pmi_setpal; /* PMI for palette changes */
@@ -48689,9 +48908,9 @@ diff -urNp linux-2.6.38/include/video/uvesafb.h linux-2.6.38-new/include/video/u
void *pmi_start;
void *pmi_pal;
u8 *vbe_state_orig; /*
-diff -urNp linux-2.6.38/init/do_mounts.c linux-2.6.38-new/init/do_mounts.c
---- linux-2.6.38/init/do_mounts.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/init/do_mounts.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/init/do_mounts.c linux-2.6.38.1/init/do_mounts.c
+--- linux-2.6.38.1/init/do_mounts.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/init/do_mounts.c 2011-03-21 18:31:35.000000000 -0400
@@ -287,7 +287,7 @@ static void __init get_fs_names(char *pa
static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -48731,9 +48950,9 @@ diff -urNp linux-2.6.38/init/do_mounts.c linux-2.6.38-new/init/do_mounts.c
+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
sys_chroot((const char __user __force *)".");
}
-diff -urNp linux-2.6.38/init/do_mounts.h linux-2.6.38-new/init/do_mounts.h
---- linux-2.6.38/init/do_mounts.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/init/do_mounts.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/init/do_mounts.h linux-2.6.38.1/init/do_mounts.h
+--- linux-2.6.38.1/init/do_mounts.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/init/do_mounts.h 2011-03-21 18:31:35.000000000 -0400
@@ -15,15 +15,15 @@ extern int root_mountflags;
static inline int create_dev(char *name, dev_t dev)
@@ -48753,9 +48972,9 @@ diff -urNp linux-2.6.38/init/do_mounts.h linux-2.6.38-new/init/do_mounts.h
return 0;
if (!S_ISBLK(stat.st_mode))
return 0;
-diff -urNp linux-2.6.38/init/do_mounts_initrd.c linux-2.6.38-new/init/do_mounts_initrd.c
---- linux-2.6.38/init/do_mounts_initrd.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/init/do_mounts_initrd.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/init/do_mounts_initrd.c linux-2.6.38.1/init/do_mounts_initrd.c
+--- linux-2.6.38.1/init/do_mounts_initrd.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/init/do_mounts_initrd.c 2011-03-21 18:31:35.000000000 -0400
@@ -44,13 +44,13 @@ static void __init handle_initrd(void)
create_dev("/dev/root.old", Root_RAM0);
/* mount initrd on rootfs' /root */
@@ -48830,9 +49049,9 @@ diff -urNp linux-2.6.38/init/do_mounts_initrd.c linux-2.6.38-new/init/do_mounts_
+ sys_unlink((__force const char __user *)"/initrd.image");
return 0;
}
-diff -urNp linux-2.6.38/init/do_mounts_md.c linux-2.6.38-new/init/do_mounts_md.c
---- linux-2.6.38/init/do_mounts_md.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/init/do_mounts_md.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/init/do_mounts_md.c linux-2.6.38.1/init/do_mounts_md.c
+--- linux-2.6.38.1/init/do_mounts_md.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/init/do_mounts_md.c 2011-03-21 18:31:35.000000000 -0400
@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
partitioned ? "_d" : "", minor,
md_setup_args[ent].device_names);
@@ -48851,9 +49070,9 @@ diff -urNp linux-2.6.38/init/do_mounts_md.c linux-2.6.38-new/init/do_mounts_md.c
sys_ioctl(fd, BLKRRPART, 0);
}
sys_close(fd);
-diff -urNp linux-2.6.38/init/initramfs.c linux-2.6.38-new/init/initramfs.c
---- linux-2.6.38/init/initramfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/init/initramfs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/init/initramfs.c linux-2.6.38.1/init/initramfs.c
+--- linux-2.6.38.1/init/initramfs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/init/initramfs.c 2011-03-21 18:31:35.000000000 -0400
@@ -74,7 +74,7 @@ static void __init free_hash(void)
}
}
@@ -48962,9 +49181,9 @@ diff -urNp linux-2.6.38/init/initramfs.c linux-2.6.38-new/init/initramfs.c
state = SkipIt;
next_state = Reset;
return 0;
-diff -urNp linux-2.6.38/init/Kconfig linux-2.6.38-new/init/Kconfig
---- linux-2.6.38/init/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/init/Kconfig 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/init/Kconfig linux-2.6.38.1/init/Kconfig
+--- linux-2.6.38.1/init/Kconfig 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/init/Kconfig 2011-03-21 18:31:35.000000000 -0400
@@ -1185,7 +1185,7 @@ config SLUB_DEBUG
config COMPAT_BRK
@@ -48974,9 +49193,9 @@ diff -urNp linux-2.6.38/init/Kconfig linux-2.6.38-new/init/Kconfig
help
Randomizing heap placement makes heap exploits harder, but it
also breaks ancient binaries (including anything libc5 based).
-diff -urNp linux-2.6.38/init/main.c linux-2.6.38-new/init/main.c
---- linux-2.6.38/init/main.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/init/main.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/init/main.c linux-2.6.38.1/init/main.c
+--- linux-2.6.38.1/init/main.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/init/main.c 2011-03-21 18:31:35.000000000 -0400
@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void)
extern void tc_init(void);
#endif
@@ -49086,9 +49305,9 @@ diff -urNp linux-2.6.38/init/main.c linux-2.6.38-new/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.38/ipc/mqueue.c linux-2.6.38-new/ipc/mqueue.c
---- linux-2.6.38/ipc/mqueue.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/ipc/mqueue.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/ipc/mqueue.c linux-2.6.38.1/ipc/mqueue.c
+--- linux-2.6.38.1/ipc/mqueue.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/ipc/mqueue.c 2011-03-21 18:31:35.000000000 -0400
@@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st
mq_bytes = (mq_msg_tblsz +
(info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -49097,9 +49316,9 @@ diff -urNp linux-2.6.38/ipc/mqueue.c linux-2.6.38-new/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.38/ipc/shm.c linux-2.6.38-new/ipc/shm.c
---- linux-2.6.38/ipc/shm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/ipc/shm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/ipc/shm.c linux-2.6.38.1/ipc/shm.c
+--- linux-2.6.38.1/ipc/shm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/ipc/shm.c 2011-03-21 18:31:35.000000000 -0400
@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name
static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
#endif
@@ -49161,9 +49380,9 @@ diff -urNp linux-2.6.38/ipc/shm.c linux-2.6.38-new/ipc/shm.c
size = i_size_read(path.dentry->d_inode);
shm_unlock(shp);
-diff -urNp linux-2.6.38/kernel/acct.c linux-2.6.38-new/kernel/acct.c
---- linux-2.6.38/kernel/acct.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/acct.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/acct.c linux-2.6.38.1/kernel/acct.c
+--- linux-2.6.38.1/kernel/acct.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/acct.c 2011-03-21 18:31:35.000000000 -0400
@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
*/
flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -49173,9 +49392,9 @@ diff -urNp linux-2.6.38/kernel/acct.c linux-2.6.38-new/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.38/kernel/capability.c linux-2.6.38-new/kernel/capability.c
---- linux-2.6.38/kernel/capability.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/capability.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/capability.c linux-2.6.38.1/kernel/capability.c
+--- linux-2.6.38.1/kernel/capability.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/capability.c 2011-03-21 18:31:35.000000000 -0400
@@ -205,6 +205,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
* before modification is attempted and the application
* fails.
@@ -49214,9 +49433,9 @@ diff -urNp linux-2.6.38/kernel/capability.c linux-2.6.38-new/kernel/capability.c
+
EXPORT_SYMBOL(capable);
+EXPORT_SYMBOL(capable_nolog);
-diff -urNp linux-2.6.38/kernel/compat.c linux-2.6.38-new/kernel/compat.c
---- linux-2.6.38/kernel/compat.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/compat.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/compat.c linux-2.6.38.1/kernel/compat.c
+--- linux-2.6.38.1/kernel/compat.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/compat.c 2011-03-21 18:31:35.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/linkage.h>
@@ -49225,9 +49444,9 @@ diff -urNp linux-2.6.38/kernel/compat.c linux-2.6.38-new/kernel/compat.c
#include <linux/errno.h>
#include <linux/time.h>
#include <linux/signal.h>
-diff -urNp linux-2.6.38/kernel/configs.c linux-2.6.38-new/kernel/configs.c
---- linux-2.6.38/kernel/configs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/configs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/configs.c linux-2.6.38.1/kernel/configs.c
+--- linux-2.6.38.1/kernel/configs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/configs.c 2011-03-21 18:31:35.000000000 -0400
@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
struct proc_dir_entry *entry;
@@ -49248,9 +49467,9 @@ diff -urNp linux-2.6.38/kernel/configs.c linux-2.6.38-new/kernel/configs.c
if (!entry)
return -ENOMEM;
-diff -urNp linux-2.6.38/kernel/cred.c linux-2.6.38-new/kernel/cred.c
---- linux-2.6.38/kernel/cred.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/cred.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/cred.c linux-2.6.38.1/kernel/cred.c
+--- linux-2.6.38.1/kernel/cred.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/cred.c 2011-03-21 18:31:35.000000000 -0400
@@ -483,6 +483,8 @@ int commit_creds(struct cred *new)
get_cred(new); /* we will require a ref for the subj creds too */
@@ -49260,9 +49479,9 @@ diff -urNp linux-2.6.38/kernel/cred.c linux-2.6.38-new/kernel/cred.c
/* dumpability changes */
if (old->euid != new->euid ||
old->egid != new->egid ||
-diff -urNp linux-2.6.38/kernel/debug/debug_core.c linux-2.6.38-new/kernel/debug/debug_core.c
---- linux-2.6.38/kernel/debug/debug_core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/debug/debug_core.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/debug/debug_core.c linux-2.6.38.1/kernel/debug/debug_core.c
+--- linux-2.6.38.1/kernel/debug/debug_core.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/debug/debug_core.c 2011-03-21 18:31:35.000000000 -0400
@@ -72,7 +72,7 @@ int kgdb_io_module_registered;
/* Guard for recursive entry */
static int exception_level;
@@ -49290,9 +49509,9 @@ diff -urNp linux-2.6.38/kernel/debug/debug_core.c linux-2.6.38-new/kernel/debug/
{
BUG_ON(kgdb_connected);
-diff -urNp linux-2.6.38/kernel/debug/kdb/kdb_main.c linux-2.6.38-new/kernel/debug/kdb/kdb_main.c
---- linux-2.6.38/kernel/debug/kdb/kdb_main.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/debug/kdb/kdb_main.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/debug/kdb/kdb_main.c linux-2.6.38.1/kernel/debug/kdb/kdb_main.c
+--- linux-2.6.38.1/kernel/debug/kdb/kdb_main.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/debug/kdb/kdb_main.c 2011-03-21 18:31:35.000000000 -0400
@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
list_for_each_entry(mod, kdb_modules, list) {
@@ -49311,9 +49530,9 @@ diff -urNp linux-2.6.38/kernel/debug/kdb/kdb_main.c linux-2.6.38-new/kernel/debu
#ifdef CONFIG_MODULE_UNLOAD
{
-diff -urNp linux-2.6.38/kernel/exit.c linux-2.6.38-new/kernel/exit.c
---- linux-2.6.38/kernel/exit.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/exit.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/exit.c linux-2.6.38.1/kernel/exit.c
+--- linux-2.6.38.1/kernel/exit.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/exit.c 2011-03-21 18:31:35.000000000 -0400
@@ -57,6 +57,10 @@
#include <asm/pgtable.h>
#include <asm/mmu_context.h>
@@ -49433,9 +49652,9 @@ diff -urNp linux-2.6.38/kernel/exit.c linux-2.6.38-new/kernel/exit.c
exit_mm(tsk);
if (group_dead)
-diff -urNp linux-2.6.38/kernel/fork.c linux-2.6.38-new/kernel/fork.c
---- linux-2.6.38/kernel/fork.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/fork.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/fork.c linux-2.6.38.1/kernel/fork.c
+--- linux-2.6.38.1/kernel/fork.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/fork.c 2011-03-21 18:31:35.000000000 -0400
@@ -280,7 +280,7 @@ static struct task_struct *dup_task_stru
*stackend = STACK_END_MAGIC; /* for overflow detection */
@@ -49732,9 +49951,9 @@ diff -urNp linux-2.6.38/kernel/fork.c linux-2.6.38-new/kernel/fork.c
new_fs = NULL;
else
new_fs = fs;
-diff -urNp linux-2.6.38/kernel/futex.c linux-2.6.38-new/kernel/futex.c
---- linux-2.6.38/kernel/futex.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/futex.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/futex.c linux-2.6.38.1/kernel/futex.c
+--- linux-2.6.38.1/kernel/futex.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/futex.c 2011-03-21 18:31:35.000000000 -0400
@@ -54,6 +54,7 @@
#include <linux/mount.h>
#include <linux/pagemap.h>
@@ -49801,9 +50020,9 @@ diff -urNp linux-2.6.38/kernel/futex.c linux-2.6.38-new/kernel/futex.c
if (curval == -EFAULT)
futex_cmpxchg_enabled = 1;
-diff -urNp linux-2.6.38/kernel/futex_compat.c linux-2.6.38-new/kernel/futex_compat.c
---- linux-2.6.38/kernel/futex_compat.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/futex_compat.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/futex_compat.c linux-2.6.38.1/kernel/futex_compat.c
+--- linux-2.6.38.1/kernel/futex_compat.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/futex_compat.c 2011-03-21 18:31:35.000000000 -0400
@@ -10,6 +10,7 @@
#include <linux/compat.h>
#include <linux/nsproxy.h>
@@ -49841,9 +50060,9 @@ diff -urNp linux-2.6.38/kernel/futex_compat.c linux-2.6.38-new/kernel/futex_comp
head = p->compat_robust_list;
rcu_read_unlock();
}
-diff -urNp linux-2.6.38/kernel/gcov/base.c linux-2.6.38-new/kernel/gcov/base.c
---- linux-2.6.38/kernel/gcov/base.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/gcov/base.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/gcov/base.c linux-2.6.38.1/kernel/gcov/base.c
+--- linux-2.6.38.1/kernel/gcov/base.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/gcov/base.c 2011-03-21 18:31:35.000000000 -0400
@@ -102,11 +102,6 @@ void gcov_enable_events(void)
}
@@ -49865,9 +50084,9 @@ diff -urNp linux-2.6.38/kernel/gcov/base.c linux-2.6.38-new/kernel/gcov/base.c
if (prev)
prev->next = info->next;
else
-diff -urNp linux-2.6.38/kernel/hrtimer.c linux-2.6.38-new/kernel/hrtimer.c
---- linux-2.6.38/kernel/hrtimer.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/hrtimer.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/hrtimer.c linux-2.6.38.1/kernel/hrtimer.c
+--- linux-2.6.38.1/kernel/hrtimer.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/hrtimer.c 2011-03-21 18:31:35.000000000 -0400
@@ -1371,7 +1371,7 @@ void hrtimer_peek_ahead_timers(void)
local_irq_restore(flags);
}
@@ -49877,9 +50096,9 @@ diff -urNp linux-2.6.38/kernel/hrtimer.c linux-2.6.38-new/kernel/hrtimer.c
{
hrtimer_peek_ahead_timers();
}
-diff -urNp linux-2.6.38/kernel/jump_label.c linux-2.6.38-new/kernel/jump_label.c
---- linux-2.6.38/kernel/jump_label.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/jump_label.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/jump_label.c linux-2.6.38.1/kernel/jump_label.c
+--- linux-2.6.38.1/kernel/jump_label.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/jump_label.c 2011-03-21 18:31:35.000000000 -0400
@@ -49,6 +49,17 @@ void jump_label_unlock(void)
mutex_unlock(&jump_label_mutex);
}
@@ -49920,9 +50139,9 @@ diff -urNp linux-2.6.38/kernel/jump_label.c linux-2.6.38-new/kernel/jump_label.c
iter++;
}
}
-diff -urNp linux-2.6.38/kernel/kallsyms.c linux-2.6.38-new/kernel/kallsyms.c
---- linux-2.6.38/kernel/kallsyms.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/kallsyms.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/kallsyms.c linux-2.6.38.1/kernel/kallsyms.c
+--- linux-2.6.38.1/kernel/kallsyms.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/kallsyms.c 2011-03-21 18:31:35.000000000 -0400
@@ -11,6 +11,9 @@
* Changed the compression method from stem compression to "table lookup"
* compression (see scripts/kallsyms.c for a more complete description)
@@ -50025,10 +50244,10 @@ diff -urNp linux-2.6.38/kernel/kallsyms.c linux-2.6.38-new/kernel/kallsyms.c
if (!iter)
return -ENOMEM;
reset_iter(iter, 0);
-diff -urNp linux-2.6.38/kernel/kmod.c linux-2.6.38-new/kernel/kmod.c
---- linux-2.6.38/kernel/kmod.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/kmod.c 2011-03-21 18:31:35.000000000 -0400
-@@ -90,6 +90,28 @@ int __request_module(bool wait, const ch
+diff -urNp linux-2.6.38.1/kernel/kmod.c linux-2.6.38.1/kernel/kmod.c
+--- linux-2.6.38.1/kernel/kmod.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/kmod.c 2011-03-26 13:28:34.000000000 -0400
+@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
if (ret)
return ret;
@@ -50039,17 +50258,7 @@ diff -urNp linux-2.6.38/kernel/kmod.c linux-2.6.38-new/kernel/kmod.c
+ auto-loaded
+ */
+ if (current_uid()) {
-+#if !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE)
-+ /* There are known knowns. These are things we know
-+ that we know. There are known unknowns. That is to say,
-+ there are things that we know we don't know. But there are
-+ also unknown unknowns. There are things we don't know
-+ we don't know.
-+ This here is a known unknown.
-+ */
-+ if (strcmp(module_name, "net-pf-10"))
-+#endif
-+ gr_log_nonroot_mod_load(module_name);
++ gr_log_nonroot_mod_load(module_name);
+ return -EPERM;
+ }
+#endif
@@ -50057,9 +50266,9 @@ diff -urNp linux-2.6.38/kernel/kmod.c linux-2.6.38-new/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.38/kernel/kprobes.c linux-2.6.38-new/kernel/kprobes.c
---- linux-2.6.38/kernel/kprobes.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/kprobes.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/kprobes.c linux-2.6.38.1/kernel/kprobes.c
+--- linux-2.6.38.1/kernel/kprobes.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/kprobes.c 2011-03-21 18:31:35.000000000 -0400
@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_
* kernel image and loaded module images reside. This is required
* so x86_64 can correctly handle the %rip-relative fixups.
@@ -50096,9 +50305,9 @@ diff -urNp linux-2.6.38/kernel/kprobes.c linux-2.6.38-new/kernel/kprobes.c
head = &kprobe_table[i];
preempt_disable();
-diff -urNp linux-2.6.38/kernel/lockdep.c linux-2.6.38-new/kernel/lockdep.c
---- linux-2.6.38/kernel/lockdep.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/lockdep.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/lockdep.c linux-2.6.38.1/kernel/lockdep.c
+--- linux-2.6.38.1/kernel/lockdep.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/lockdep.c 2011-03-21 18:31:35.000000000 -0400
@@ -571,6 +571,10 @@ static int static_obj(void *obj)
end = (unsigned long) &_end,
addr = (unsigned long) obj;
@@ -50127,9 +50336,9 @@ diff -urNp linux-2.6.38/kernel/lockdep.c linux-2.6.38-new/kernel/lockdep.c
if (very_verbose(class)) {
printk("\nacquire class [%p] %s", class->key, class->name);
if (class->name_version > 1)
-diff -urNp linux-2.6.38/kernel/lockdep_proc.c linux-2.6.38-new/kernel/lockdep_proc.c
---- linux-2.6.38/kernel/lockdep_proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/lockdep_proc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/lockdep_proc.c linux-2.6.38.1/kernel/lockdep_proc.c
+--- linux-2.6.38.1/kernel/lockdep_proc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/lockdep_proc.c 2011-03-21 18:31:35.000000000 -0400
@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
static void print_name(struct seq_file *m, struct lock_class *class)
@@ -50139,9 +50348,9 @@ diff -urNp linux-2.6.38/kernel/lockdep_proc.c linux-2.6.38-new/kernel/lockdep_pr
const char *name = class->name;
if (!name) {
-diff -urNp linux-2.6.38/kernel/module.c linux-2.6.38-new/kernel/module.c
---- linux-2.6.38/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/module.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/module.c linux-2.6.38.1/kernel/module.c
+--- linux-2.6.38.1/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/module.c 2011-03-21 18:31:35.000000000 -0400
@@ -118,7 +118,8 @@ static BLOCKING_NOTIFIER_HEAD(module_not
/* Bounds of module allocation, for speeding __module_address.
@@ -50753,9 +50962,9 @@ diff -urNp linux-2.6.38/kernel/module.c linux-2.6.38-new/kernel/module.c
mod = NULL;
}
return mod;
-diff -urNp linux-2.6.38/kernel/panic.c linux-2.6.38-new/kernel/panic.c
---- linux-2.6.38/kernel/panic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/panic.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/panic.c linux-2.6.38.1/kernel/panic.c
+--- linux-2.6.38.1/kernel/panic.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/panic.c 2011-03-21 18:31:35.000000000 -0400
@@ -369,7 +369,7 @@ static void warn_slowpath_common(const c
const char *board;
@@ -50775,9 +50984,9 @@ diff -urNp linux-2.6.38/kernel/panic.c linux-2.6.38-new/kernel/panic.c
__builtin_return_address(0));
}
EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-2.6.38/kernel/pid.c linux-2.6.38-new/kernel/pid.c
---- linux-2.6.38/kernel/pid.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/pid.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/pid.c linux-2.6.38.1/kernel/pid.c
+--- linux-2.6.38.1/kernel/pid.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/pid.c 2011-03-21 18:31:35.000000000 -0400
@@ -33,6 +33,7 @@
#include <linux/rculist.h>
#include <linux/bootmem.h>
@@ -50812,9 +51021,9 @@ diff -urNp linux-2.6.38/kernel/pid.c linux-2.6.38-new/kernel/pid.c
}
struct task_struct *find_task_by_vpid(pid_t vnr)
-diff -urNp linux-2.6.38/kernel/posix-cpu-timers.c linux-2.6.38-new/kernel/posix-cpu-timers.c
---- linux-2.6.38/kernel/posix-cpu-timers.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/posix-cpu-timers.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/posix-cpu-timers.c linux-2.6.38.1/kernel/posix-cpu-timers.c
+--- linux-2.6.38.1/kernel/posix-cpu-timers.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/posix-cpu-timers.c 2011-03-21 18:31:35.000000000 -0400
@@ -6,6 +6,7 @@
#include <linux/posix-timers.h>
#include <linux/errno.h>
@@ -50823,9 +51032,9 @@ diff -urNp linux-2.6.38/kernel/posix-cpu-timers.c linux-2.6.38-new/kernel/posix-
#include <asm/uaccess.h>
#include <linux/kernel_stat.h>
#include <trace/events/timer.h>
-diff -urNp linux-2.6.38/kernel/posix-timers.c linux-2.6.38-new/kernel/posix-timers.c
---- linux-2.6.38/kernel/posix-timers.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/posix-timers.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/posix-timers.c linux-2.6.38.1/kernel/posix-timers.c
+--- linux-2.6.38.1/kernel/posix-timers.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/posix-timers.c 2011-03-21 18:31:35.000000000 -0400
@@ -42,6 +42,7 @@
#include <linux/compiler.h>
#include <linux/idr.h>
@@ -50848,9 +51057,9 @@ diff -urNp linux-2.6.38/kernel/posix-timers.c linux-2.6.38-new/kernel/posix-time
return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
}
-diff -urNp linux-2.6.38/kernel/power/poweroff.c linux-2.6.38-new/kernel/power/poweroff.c
---- linux-2.6.38/kernel/power/poweroff.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/power/poweroff.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/power/poweroff.c linux-2.6.38.1/kernel/power/poweroff.c
+--- linux-2.6.38.1/kernel/power/poweroff.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/power/poweroff.c 2011-03-21 18:31:35.000000000 -0400
@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
.enable_mask = SYSRQ_ENABLE_BOOT,
};
@@ -50860,9 +51069,9 @@ diff -urNp linux-2.6.38/kernel/power/poweroff.c linux-2.6.38-new/kernel/power/po
{
register_sysrq_key('o', &sysrq_poweroff_op);
return 0;
-diff -urNp linux-2.6.38/kernel/power/process.c linux-2.6.38-new/kernel/power/process.c
---- linux-2.6.38/kernel/power/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/power/process.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/power/process.c linux-2.6.38.1/kernel/power/process.c
+--- linux-2.6.38.1/kernel/power/process.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/power/process.c 2011-03-21 18:31:35.000000000 -0400
@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_
u64 elapsed_csecs64;
unsigned int elapsed_csecs;
@@ -50905,44 +51114,91 @@ diff -urNp linux-2.6.38/kernel/power/process.c linux-2.6.38-new/kernel/power/pro
break;
if (pm_wakeup_pending()) {
-diff -urNp linux-2.6.38/kernel/printk.c linux-2.6.38-new/kernel/printk.c
---- linux-2.6.38/kernel/printk.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/printk.c 2011-03-21 20:29:31.000000000 -0400
-@@ -272,6 +272,12 @@ static int syslog_action_restricted(int
+diff -urNp linux-2.6.38.1/kernel/printk.c linux-2.6.38.1/kernel/printk.c
+--- linux-2.6.38.1/kernel/printk.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/printk.c 2011-03-23 22:30:08.000000000 -0400
+@@ -279,12 +279,17 @@ static int check_syslog_permissions(int
+ if (from_file && type != SYSLOG_ACTION_OPEN)
+ return 0;
- static int check_syslog_permissions(int type, bool from_file)
- {
-+
+#ifdef CONFIG_GRKERNSEC_DMESG
-+ if (grsec_enable_dmesg && (!capable(CAP_SYSLOG) || !capable_nolog(CAP_SYS_ADMIN)))
++ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
+ return -EPERM;
+#endif
+
- /*
- * If this is from /proc/kmsg and we've already opened it, then we've
- * already done the capabilities checks at open time.
-diff -urNp linux-2.6.38/kernel/ptrace.c linux-2.6.38-new/kernel/ptrace.c
---- linux-2.6.38/kernel/ptrace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/ptrace.c 2011-03-21 18:31:35.000000000 -0400
-@@ -140,7 +140,7 @@ int __ptrace_may_access(struct task_stru
+ if (syslog_action_restricted(type)) {
+ if (capable(CAP_SYSLOG))
+ return 0;
+ /* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */
+ if (capable(CAP_SYS_ADMIN)) {
+- WARN_ONCE(1, "Attempt to access syslog with CAP_SYS_ADMIN "
++ printk_once(KERN_WARNING "Attempt to access syslog with CAP_SYS_ADMIN "
+ "but no CAP_SYSLOG (deprecated).\n");
+ return 0;
+ }
+diff -urNp linux-2.6.38.1/kernel/ptrace.c linux-2.6.38.1/kernel/ptrace.c
+--- linux-2.6.38.1/kernel/ptrace.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/ptrace.c 2011-03-26 11:42:34.000000000 -0400
+@@ -116,7 +116,8 @@ int ptrace_check_attach(struct task_stru
+ return ret;
+ }
+
+-int __ptrace_may_access(struct task_struct *task, unsigned int mode)
++static int __ptrace_may_access(struct task_struct *task, unsigned int mode,
++ unsigned int log)
+ {
+ const struct cred *cred = current_cred(), *tcred;
+
+@@ -140,7 +141,9 @@ int __ptrace_may_access(struct task_stru
cred->gid != tcred->egid ||
cred->gid != tcred->sgid ||
cred->gid != tcred->gid) &&
- !capable(CAP_SYS_PTRACE)) {
-+ !capable_nolog(CAP_SYS_PTRACE)) {
++ ((!log && !capable_nolog(CAP_SYS_PTRACE)) ||
++ (log && !capable(CAP_SYS_PTRACE)))
++ ) {
rcu_read_unlock();
return -EPERM;
}
-@@ -148,7 +148,7 @@ int __ptrace_may_access(struct task_stru
+@@ -148,7 +151,9 @@ int __ptrace_may_access(struct task_stru
smp_rmb();
if (task->mm)
dumpable = get_dumpable(task->mm);
- if (!dumpable && !capable(CAP_SYS_PTRACE))
-+ if (!dumpable && !capable_nolog(CAP_SYS_PTRACE))
++ if (!dumpable &&
++ ((!log && !capable_nolog(CAP_SYS_PTRACE)) ||
++ (log && !capable(CAP_SYS_PTRACE))))
return -EPERM;
return security_ptrace_access_check(task, mode);
-@@ -198,7 +198,7 @@ static int ptrace_attach(struct task_str
+@@ -158,7 +163,16 @@ bool ptrace_may_access(struct task_struc
+ {
+ int err;
+ task_lock(task);
+- err = __ptrace_may_access(task, mode);
++ err = __ptrace_may_access(task, mode, 0);
++ task_unlock(task);
++ return !err;
++}
++
++bool ptrace_may_access_log(struct task_struct *task, unsigned int mode)
++{
++ int err;
++ task_lock(task);
++ err = __ptrace_may_access(task, mode, 1);
+ task_unlock(task);
+ return !err;
+ }
+@@ -185,7 +199,7 @@ static int ptrace_attach(struct task_str
+ goto out;
+
+ task_lock(task);
+- retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH);
++ retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH, 1);
+ task_unlock(task);
+ if (retval)
+ goto unlock_creds;
+@@ -198,7 +212,7 @@ static int ptrace_attach(struct task_str
goto unlock_tasklist;
task->ptrace = PT_PTRACED;
@@ -50951,7 +51207,7 @@ diff -urNp linux-2.6.38/kernel/ptrace.c linux-2.6.38-new/kernel/ptrace.c
task->ptrace |= PT_PTRACE_CAP;
__ptrace_link(task, current);
-@@ -369,7 +369,7 @@ int ptrace_readdata(struct task_struct *
+@@ -369,7 +383,7 @@ int ptrace_readdata(struct task_struct *
break;
return -EIO;
}
@@ -50960,7 +51216,7 @@ diff -urNp linux-2.6.38/kernel/ptrace.c linux-2.6.38-new/kernel/ptrace.c
return -EFAULT;
copied += retval;
src += retval;
-@@ -565,7 +565,7 @@ int ptrace_request(struct task_struct *c
+@@ -565,7 +579,7 @@ int ptrace_request(struct task_struct *c
{
int ret = -EIO;
siginfo_t siginfo;
@@ -50969,7 +51225,7 @@ diff -urNp linux-2.6.38/kernel/ptrace.c linux-2.6.38-new/kernel/ptrace.c
unsigned long __user *datalp = datavp;
switch (request) {
-@@ -713,14 +713,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
+@@ -713,14 +727,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
goto out;
}
@@ -50992,7 +51248,7 @@ diff -urNp linux-2.6.38/kernel/ptrace.c linux-2.6.38-new/kernel/ptrace.c
goto out_put_task_struct;
}
-@@ -745,7 +752,7 @@ int generic_ptrace_peekdata(struct task_
+@@ -745,7 +766,7 @@ int generic_ptrace_peekdata(struct task_
copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
if (copied != sizeof(tmp))
return -EIO;
@@ -51001,7 +51257,7 @@ diff -urNp linux-2.6.38/kernel/ptrace.c linux-2.6.38-new/kernel/ptrace.c
}
int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
-@@ -855,14 +862,21 @@ asmlinkage long compat_sys_ptrace(compat
+@@ -855,14 +876,21 @@ asmlinkage long compat_sys_ptrace(compat
goto out;
}
@@ -51024,9 +51280,9 @@ diff -urNp linux-2.6.38/kernel/ptrace.c linux-2.6.38-new/kernel/ptrace.c
goto out_put_task_struct;
}
-diff -urNp linux-2.6.38/kernel/rcutree.c linux-2.6.38-new/kernel/rcutree.c
---- linux-2.6.38/kernel/rcutree.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/rcutree.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/rcutree.c linux-2.6.38.1/kernel/rcutree.c
+--- linux-2.6.38.1/kernel/rcutree.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/rcutree.c 2011-03-21 18:31:35.000000000 -0400
@@ -1389,7 +1389,7 @@ __rcu_process_callbacks(struct rcu_state
/*
* Do softirq processing for the current CPU.
@@ -51036,9 +51292,9 @@ diff -urNp linux-2.6.38/kernel/rcutree.c linux-2.6.38-new/kernel/rcutree.c
{
/*
* Memory references from any prior RCU read-side critical sections
-diff -urNp linux-2.6.38/kernel/rcutree_plugin.h linux-2.6.38-new/kernel/rcutree_plugin.h
---- linux-2.6.38/kernel/rcutree_plugin.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/rcutree_plugin.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/rcutree_plugin.h linux-2.6.38.1/kernel/rcutree_plugin.h
+--- linux-2.6.38.1/kernel/rcutree_plugin.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/rcutree_plugin.h 2011-03-21 18:31:35.000000000 -0400
@@ -730,7 +730,7 @@ void synchronize_rcu_expedited(void)
/* Clean up and exit. */
@@ -51048,9 +51304,9 @@ diff -urNp linux-2.6.38/kernel/rcutree_plugin.h linux-2.6.38-new/kernel/rcutree_
unlock_mb_ret:
mutex_unlock(&sync_rcu_preempt_exp_mutex);
mb_ret:
-diff -urNp linux-2.6.38/kernel/resource.c linux-2.6.38-new/kernel/resource.c
---- linux-2.6.38/kernel/resource.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/resource.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/resource.c linux-2.6.38.1/kernel/resource.c
+--- linux-2.6.38.1/kernel/resource.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/resource.c 2011-03-21 18:31:35.000000000 -0400
@@ -133,8 +133,18 @@ static const struct file_operations proc
static int __init ioresources_init(void)
@@ -51070,9 +51326,9 @@ diff -urNp linux-2.6.38/kernel/resource.c linux-2.6.38-new/kernel/resource.c
return 0;
}
__initcall(ioresources_init);
-diff -urNp linux-2.6.38/kernel/rtmutex.c linux-2.6.38-new/kernel/rtmutex.c
---- linux-2.6.38/kernel/rtmutex.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/rtmutex.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/rtmutex.c linux-2.6.38.1/kernel/rtmutex.c
+--- linux-2.6.38.1/kernel/rtmutex.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/rtmutex.c 2011-03-21 18:31:35.000000000 -0400
@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
*/
raw_spin_lock_irqsave(&pendowner->pi_lock, flags);
@@ -51082,9 +51338,9 @@ diff -urNp linux-2.6.38/kernel/rtmutex.c linux-2.6.38-new/kernel/rtmutex.c
WARN_ON(pendowner->pi_blocked_on != waiter);
WARN_ON(pendowner->pi_blocked_on->lock != lock);
-diff -urNp linux-2.6.38/kernel/sched.c linux-2.6.38-new/kernel/sched.c
---- linux-2.6.38/kernel/sched.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/sched.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/sched.c linux-2.6.38.1/kernel/sched.c
+--- linux-2.6.38.1/kernel/sched.c 2011-03-23 17:20:08.000000000 -0400
++++ linux-2.6.38.1/kernel/sched.c 2011-03-23 17:21:51.000000000 -0400
@@ -4638,6 +4638,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;
@@ -51121,9 +51377,9 @@ diff -urNp linux-2.6.38/kernel/sched.c linux-2.6.38-new/kernel/sched.c
if (cpu != group_first_cpu(sd->groups))
return;
-diff -urNp linux-2.6.38/kernel/sched_fair.c linux-2.6.38-new/kernel/sched_fair.c
---- linux-2.6.38/kernel/sched_fair.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/sched_fair.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/sched_fair.c linux-2.6.38.1/kernel/sched_fair.c
+--- linux-2.6.38.1/kernel/sched_fair.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/sched_fair.c 2011-03-21 18:31:35.000000000 -0400
@@ -3960,7 +3960,7 @@ static void nohz_idle_balance(int this_c
* run_rebalance_domains is triggered when needed from the scheduler tick.
* Also triggered for nohz idle balancing (with nohz_balancing_kick set).
@@ -51133,9 +51389,9 @@ diff -urNp linux-2.6.38/kernel/sched_fair.c linux-2.6.38-new/kernel/sched_fair.c
{
int this_cpu = smp_processor_id();
struct rq *this_rq = cpu_rq(this_cpu);
-diff -urNp linux-2.6.38/kernel/signal.c linux-2.6.38-new/kernel/signal.c
---- linux-2.6.38/kernel/signal.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/signal.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/signal.c linux-2.6.38.1/kernel/signal.c
+--- linux-2.6.38.1/kernel/signal.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/signal.c 2011-03-21 18:31:35.000000000 -0400
@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
int print_fatal_signals __read_mostly;
@@ -51238,10 +51494,10 @@ diff -urNp linux-2.6.38/kernel/signal.c linux-2.6.38-new/kernel/signal.c
return ret;
}
-diff -urNp linux-2.6.38/kernel/smp.c linux-2.6.38-new/kernel/smp.c
---- linux-2.6.38/kernel/smp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/smp.c 2011-03-21 18:31:35.000000000 -0400
-@@ -550,22 +550,22 @@ int smp_call_function(smp_call_func_t fu
+diff -urNp linux-2.6.38.1/kernel/smp.c linux-2.6.38.1/kernel/smp.c
+--- linux-2.6.38.1/kernel/smp.c 2011-03-23 17:20:08.000000000 -0400
++++ linux-2.6.38.1/kernel/smp.c 2011-03-26 20:50:44.000000000 -0400
+@@ -583,22 +583,22 @@ int smp_call_function(smp_call_func_t fu
}
EXPORT_SYMBOL(smp_call_function);
@@ -51268,9 +51524,9 @@ diff -urNp linux-2.6.38/kernel/smp.c linux-2.6.38-new/kernel/smp.c
{
raw_spin_unlock_irq(&call_function.lock);
}
-diff -urNp linux-2.6.38/kernel/softirq.c linux-2.6.38-new/kernel/softirq.c
---- linux-2.6.38/kernel/softirq.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/softirq.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/softirq.c linux-2.6.38.1/kernel/softirq.c
+--- linux-2.6.38.1/kernel/softirq.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/softirq.c 2011-03-21 18:31:35.000000000 -0400
@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -51325,9 +51581,9 @@ diff -urNp linux-2.6.38/kernel/softirq.c linux-2.6.38-new/kernel/softirq.c
{
struct tasklet_struct *list;
-diff -urNp linux-2.6.38/kernel/sys.c linux-2.6.38-new/kernel/sys.c
---- linux-2.6.38/kernel/sys.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/sys.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/sys.c linux-2.6.38.1/kernel/sys.c
+--- linux-2.6.38.1/kernel/sys.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/sys.c 2011-03-21 18:31:35.000000000 -0400
@@ -136,6 +136,12 @@ static int set_one_prio(struct task_stru
error = -EACCES;
goto out;
@@ -51449,9 +51705,9 @@ diff -urNp linux-2.6.38/kernel/sys.c linux-2.6.38-new/kernel/sys.c
error = -EINVAL;
break;
}
-diff -urNp linux-2.6.38/kernel/sysctl.c linux-2.6.38-new/kernel/sysctl.c
---- linux-2.6.38/kernel/sysctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/sysctl.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/sysctl.c linux-2.6.38.1/kernel/sysctl.c
+--- linux-2.6.38.1/kernel/sysctl.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/sysctl.c 2011-03-21 18:31:35.000000000 -0400
@@ -84,6 +84,13 @@
@@ -51640,9 +51896,9 @@ diff -urNp linux-2.6.38/kernel/sysctl.c linux-2.6.38-new/kernel/sysctl.c
EXPORT_SYMBOL(proc_doulongvec_minmax);
EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
EXPORT_SYMBOL(register_sysctl_table);
-diff -urNp linux-2.6.38/kernel/sysctl_check.c linux-2.6.38-new/kernel/sysctl_check.c
---- linux-2.6.38/kernel/sysctl_check.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/sysctl_check.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/sysctl_check.c linux-2.6.38.1/kernel/sysctl_check.c
+--- linux-2.6.38.1/kernel/sysctl_check.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/sysctl_check.c 2011-03-21 18:31:35.000000000 -0400
@@ -131,6 +131,7 @@ int sysctl_check_table(struct nsproxy *n
set_fail(&fail, table, "Directory with extra2");
} else {
@@ -51651,9 +51907,9 @@ diff -urNp linux-2.6.38/kernel/sysctl_check.c linux-2.6.38-new/kernel/sysctl_che
(table->proc_handler == proc_dointvec) ||
(table->proc_handler == proc_dointvec_minmax) ||
(table->proc_handler == proc_dointvec_jiffies) ||
-diff -urNp linux-2.6.38/kernel/taskstats.c linux-2.6.38-new/kernel/taskstats.c
---- linux-2.6.38/kernel/taskstats.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/taskstats.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/taskstats.c linux-2.6.38.1/kernel/taskstats.c
+--- linux-2.6.38.1/kernel/taskstats.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/taskstats.c 2011-03-21 18:31:35.000000000 -0400
@@ -27,9 +27,12 @@
#include <linux/cgroup.h>
#include <linux/fs.h>
@@ -51677,9 +51933,9 @@ diff -urNp linux-2.6.38/kernel/taskstats.c linux-2.6.38-new/kernel/taskstats.c
if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
return cmd_attr_register_cpumask(info);
else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
-diff -urNp linux-2.6.38/kernel/time/tick-broadcast.c linux-2.6.38-new/kernel/time/tick-broadcast.c
---- linux-2.6.38/kernel/time/tick-broadcast.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/time/tick-broadcast.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/time/tick-broadcast.c linux-2.6.38.1/kernel/time/tick-broadcast.c
+--- linux-2.6.38.1/kernel/time/tick-broadcast.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/time/tick-broadcast.c 2011-03-21 18:31:35.000000000 -0400
@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
* then clear the broadcast bit.
*/
@@ -51689,9 +51945,9 @@ diff -urNp linux-2.6.38/kernel/time/tick-broadcast.c linux-2.6.38-new/kernel/tim
cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-2.6.38/kernel/time/timekeeping.c linux-2.6.38-new/kernel/time/timekeeping.c
---- linux-2.6.38/kernel/time/timekeeping.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/time/timekeeping.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/time/timekeeping.c linux-2.6.38.1/kernel/time/timekeeping.c
+--- linux-2.6.38.1/kernel/time/timekeeping.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/time/timekeeping.c 2011-03-21 18:31:35.000000000 -0400
@@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/mm.h>
@@ -51709,9 +51965,9 @@ diff -urNp linux-2.6.38/kernel/time/timekeeping.c linux-2.6.38-new/kernel/time/t
write_seqlock_irqsave(&xtime_lock, flags);
timekeeping_forward_now();
-diff -urNp linux-2.6.38/kernel/time/timer_list.c linux-2.6.38-new/kernel/time/timer_list.c
---- linux-2.6.38/kernel/time/timer_list.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/time/timer_list.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/time/timer_list.c linux-2.6.38.1/kernel/time/timer_list.c
+--- linux-2.6.38.1/kernel/time/timer_list.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/time/timer_list.c 2011-03-21 18:31:35.000000000 -0400
@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
static void print_name_offset(struct seq_file *m, void *sym)
@@ -51753,9 +52009,9 @@ diff -urNp linux-2.6.38/kernel/time/timer_list.c linux-2.6.38-new/kernel/time/ti
if (!pe)
return -ENOMEM;
return 0;
-diff -urNp linux-2.6.38/kernel/time/timer_stats.c linux-2.6.38-new/kernel/time/timer_stats.c
---- linux-2.6.38/kernel/time/timer_stats.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/time/timer_stats.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/time/timer_stats.c linux-2.6.38.1/kernel/time/timer_stats.c
+--- linux-2.6.38.1/kernel/time/timer_stats.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/time/timer_stats.c 2011-03-21 18:31:35.000000000 -0400
@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time
static void print_name_offset(struct seq_file *m, unsigned long addr)
@@ -51785,9 +52041,9 @@ diff -urNp linux-2.6.38/kernel/time/timer_stats.c linux-2.6.38-new/kernel/time/t
if (!pe)
return -ENOMEM;
return 0;
-diff -urNp linux-2.6.38/kernel/time.c linux-2.6.38-new/kernel/time.c
---- linux-2.6.38/kernel/time.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/time.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/time.c linux-2.6.38.1/kernel/time.c
+--- linux-2.6.38.1/kernel/time.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/time.c 2011-03-21 18:31:35.000000000 -0400
@@ -163,6 +163,11 @@ int do_sys_settimeofday(struct timespec
return error;
@@ -51800,9 +52056,9 @@ diff -urNp linux-2.6.38/kernel/time.c linux-2.6.38-new/kernel/time.c
/* SMP safe, global irq locking makes it work. */
sys_tz = *tz;
update_vsyscall_tz();
-diff -urNp linux-2.6.38/kernel/timer.c linux-2.6.38-new/kernel/timer.c
---- linux-2.6.38/kernel/timer.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/timer.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/timer.c linux-2.6.38.1/kernel/timer.c
+--- linux-2.6.38.1/kernel/timer.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/timer.c 2011-03-21 18:31:35.000000000 -0400
@@ -1276,7 +1276,7 @@ void update_process_times(int user_tick)
/*
* This function runs timers and the timer-tq in bottom half context.
@@ -51812,9 +52068,9 @@ diff -urNp linux-2.6.38/kernel/timer.c linux-2.6.38-new/kernel/timer.c
{
struct tvec_base *base = __this_cpu_read(tvec_bases);
-diff -urNp linux-2.6.38/kernel/trace/ftrace.c linux-2.6.38-new/kernel/trace/ftrace.c
---- linux-2.6.38/kernel/trace/ftrace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/trace/ftrace.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/trace/ftrace.c linux-2.6.38.1/kernel/trace/ftrace.c
+--- linux-2.6.38.1/kernel/trace/ftrace.c 2011-03-23 17:20:08.000000000 -0400
++++ linux-2.6.38.1/kernel/trace/ftrace.c 2011-03-23 17:21:51.000000000 -0400
@@ -1107,13 +1107,18 @@ ftrace_code_disable(struct module *mod,
ip = rec->ip;
@@ -51836,9 +52092,9 @@ diff -urNp linux-2.6.38/kernel/trace/ftrace.c linux-2.6.38-new/kernel/trace/ftra
}
/*
-diff -urNp linux-2.6.38/kernel/trace/ring_buffer.c linux-2.6.38-new/kernel/trace/ring_buffer.c
---- linux-2.6.38/kernel/trace/ring_buffer.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/trace/ring_buffer.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/trace/ring_buffer.c linux-2.6.38.1/kernel/trace/ring_buffer.c
+--- linux-2.6.38.1/kernel/trace/ring_buffer.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/trace/ring_buffer.c 2011-03-21 18:31:35.000000000 -0400
@@ -669,7 +669,7 @@ static struct list_head *rb_list_head(st
* the reader page). But if the next page is a header page,
* its flags will be non zero.
@@ -51848,9 +52104,9 @@ diff -urNp linux-2.6.38/kernel/trace/ring_buffer.c linux-2.6.38-new/kernel/trace
rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
struct buffer_page *page, struct list_head *list)
{
-diff -urNp linux-2.6.38/kernel/trace/trace.c linux-2.6.38-new/kernel/trace/trace.c
---- linux-2.6.38/kernel/trace/trace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/trace/trace.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/trace/trace.c linux-2.6.38.1/kernel/trace/trace.c
+--- linux-2.6.38.1/kernel/trace/trace.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/trace/trace.c 2011-03-21 18:31:35.000000000 -0400
@@ -3967,10 +3967,9 @@ static const struct file_operations trac
};
#endif
@@ -51875,9 +52131,9 @@ diff -urNp linux-2.6.38/kernel/trace/trace.c linux-2.6.38-new/kernel/trace/trace
static int once;
struct dentry *d_tracer;
-diff -urNp linux-2.6.38/kernel/trace/trace_events.c linux-2.6.38-new/kernel/trace/trace_events.c
---- linux-2.6.38/kernel/trace/trace_events.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/trace/trace_events.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/trace/trace_events.c linux-2.6.38.1/kernel/trace/trace_events.c
+--- linux-2.6.38.1/kernel/trace/trace_events.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/trace/trace_events.c 2011-03-21 18:31:35.000000000 -0400
@@ -1240,10 +1240,10 @@ static LIST_HEAD(ftrace_module_file_list
struct ftrace_module_file_ops {
struct list_head list;
@@ -51893,9 +52149,9 @@ diff -urNp linux-2.6.38/kernel/trace/trace_events.c linux-2.6.38-new/kernel/trac
};
static struct ftrace_module_file_ops *
-diff -urNp linux-2.6.38/kernel/trace/trace_output.c linux-2.6.38-new/kernel/trace/trace_output.c
---- linux-2.6.38/kernel/trace/trace_output.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/trace/trace_output.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/trace/trace_output.c linux-2.6.38.1/kernel/trace/trace_output.c
+--- linux-2.6.38.1/kernel/trace/trace_output.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/trace/trace_output.c 2011-03-21 18:31:35.000000000 -0400
@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s,
p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -51905,9 +52161,9 @@ diff -urNp linux-2.6.38/kernel/trace/trace_output.c linux-2.6.38-new/kernel/trac
if (p) {
s->len = p - s->buffer;
return 1;
-diff -urNp linux-2.6.38/kernel/trace/trace_stack.c linux-2.6.38-new/kernel/trace/trace_stack.c
---- linux-2.6.38/kernel/trace/trace_stack.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/kernel/trace/trace_stack.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/kernel/trace/trace_stack.c linux-2.6.38.1/kernel/trace/trace_stack.c
+--- linux-2.6.38.1/kernel/trace/trace_stack.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/kernel/trace/trace_stack.c 2011-03-21 18:31:35.000000000 -0400
@@ -50,7 +50,7 @@ static inline void check_stack(void)
return;
@@ -51917,9 +52173,9 @@ diff -urNp linux-2.6.38/kernel/trace/trace_stack.c linux-2.6.38-new/kernel/trace
return;
local_irq_save(flags);
-diff -urNp linux-2.6.38/lib/bug.c linux-2.6.38-new/lib/bug.c
---- linux-2.6.38/lib/bug.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/lib/bug.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/lib/bug.c linux-2.6.38.1/lib/bug.c
+--- linux-2.6.38.1/lib/bug.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/lib/bug.c 2011-03-21 18:31:35.000000000 -0400
@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
return BUG_TRAP_TYPE_NONE;
@@ -51929,9 +52185,9 @@ diff -urNp linux-2.6.38/lib/bug.c linux-2.6.38-new/lib/bug.c
file = NULL;
line = 0;
-diff -urNp linux-2.6.38/lib/debugobjects.c linux-2.6.38-new/lib/debugobjects.c
---- linux-2.6.38/lib/debugobjects.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/lib/debugobjects.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/lib/debugobjects.c linux-2.6.38.1/lib/debugobjects.c
+--- linux-2.6.38.1/lib/debugobjects.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/lib/debugobjects.c 2011-03-21 18:31:35.000000000 -0400
@@ -281,7 +281,7 @@ static void debug_object_is_on_stack(voi
if (limit > 4)
return;
@@ -51941,9 +52197,9 @@ diff -urNp linux-2.6.38/lib/debugobjects.c linux-2.6.38-new/lib/debugobjects.c
if (is_on_stack == onstack)
return;
-diff -urNp linux-2.6.38/lib/dma-debug.c linux-2.6.38-new/lib/dma-debug.c
---- linux-2.6.38/lib/dma-debug.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/lib/dma-debug.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/lib/dma-debug.c linux-2.6.38.1/lib/dma-debug.c
+--- linux-2.6.38.1/lib/dma-debug.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/lib/dma-debug.c 2011-03-21 18:31:35.000000000 -0400
@@ -862,7 +862,7 @@ out:
static void check_for_stack(struct device *dev, void *addr)
@@ -51953,9 +52209,9 @@ diff -urNp linux-2.6.38/lib/dma-debug.c linux-2.6.38-new/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.38/lib/inflate.c linux-2.6.38-new/lib/inflate.c
---- linux-2.6.38/lib/inflate.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/lib/inflate.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/lib/inflate.c linux-2.6.38.1/lib/inflate.c
+--- linux-2.6.38.1/lib/inflate.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/lib/inflate.c 2011-03-21 18:31:35.000000000 -0400
@@ -269,7 +269,7 @@ static void free(void *where)
malloc_ptr = free_mem_ptr;
}
@@ -51965,9 +52221,9 @@ diff -urNp linux-2.6.38/lib/inflate.c linux-2.6.38-new/lib/inflate.c
#define free(a) kfree(a)
#endif
-diff -urNp linux-2.6.38/lib/Kconfig.debug linux-2.6.38-new/lib/Kconfig.debug
---- linux-2.6.38/lib/Kconfig.debug 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/lib/Kconfig.debug 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/lib/Kconfig.debug linux-2.6.38.1/lib/Kconfig.debug
+--- linux-2.6.38.1/lib/Kconfig.debug 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/lib/Kconfig.debug 2011-03-21 18:31:35.000000000 -0400
@@ -1066,6 +1066,7 @@ config LATENCYTOP
depends on DEBUG_KERNEL
depends on STACKTRACE_SUPPORT
@@ -51976,9 +52232,9 @@ diff -urNp linux-2.6.38/lib/Kconfig.debug linux-2.6.38-new/lib/Kconfig.debug
select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
select KALLSYMS
select KALLSYMS_ALL
-diff -urNp linux-2.6.38/lib/kref.c linux-2.6.38-new/lib/kref.c
---- linux-2.6.38/lib/kref.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/lib/kref.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/lib/kref.c linux-2.6.38.1/lib/kref.c
+--- linux-2.6.38.1/lib/kref.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/lib/kref.c 2011-03-21 18:31:35.000000000 -0400
@@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
*/
int kref_put(struct kref *kref, void (*release)(struct kref *kref))
@@ -51988,9 +52244,9 @@ diff -urNp linux-2.6.38/lib/kref.c linux-2.6.38-new/lib/kref.c
WARN_ON(release == (void (*)(struct kref *))kfree);
if (atomic_dec_and_test(&kref->refcount)) {
-diff -urNp linux-2.6.38/lib/radix-tree.c linux-2.6.38-new/lib/radix-tree.c
---- linux-2.6.38/lib/radix-tree.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/lib/radix-tree.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/lib/radix-tree.c linux-2.6.38.1/lib/radix-tree.c
+--- linux-2.6.38.1/lib/radix-tree.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/lib/radix-tree.c 2011-03-21 18:31:35.000000000 -0400
@@ -80,7 +80,7 @@ struct radix_tree_preload {
int nr;
struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -52000,9 +52256,9 @@ diff -urNp linux-2.6.38/lib/radix-tree.c linux-2.6.38-new/lib/radix-tree.c
static inline void *ptr_to_indirect(void *ptr)
{
-diff -urNp linux-2.6.38/lib/vsprintf.c linux-2.6.38-new/lib/vsprintf.c
---- linux-2.6.38/lib/vsprintf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/lib/vsprintf.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/lib/vsprintf.c linux-2.6.38.1/lib/vsprintf.c
+--- linux-2.6.38.1/lib/vsprintf.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/lib/vsprintf.c 2011-03-21 18:31:35.000000000 -0400
@@ -16,6 +16,9 @@
* - scnprintf and vscnprintf
*/
@@ -52096,14 +52352,14 @@ diff -urNp linux-2.6.38/lib/vsprintf.c linux-2.6.38-new/lib/vsprintf.c
break;
}
-diff -urNp linux-2.6.38/localversion-grsec linux-2.6.38-new/localversion-grsec
---- linux-2.6.38/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/localversion-grsec 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/localversion-grsec linux-2.6.38.1/localversion-grsec
+--- linux-2.6.38.1/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/localversion-grsec 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1 @@
+-grsec
-diff -urNp linux-2.6.38/Makefile linux-2.6.38-new/Makefile
---- linux-2.6.38/Makefile 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/Makefile 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/Makefile linux-2.6.38.1/Makefile
+--- linux-2.6.38.1/Makefile 2011-03-23 17:20:06.000000000 -0400
++++ linux-2.6.38.1/Makefile 2011-03-23 17:21:43.000000000 -0400
@@ -233,8 +233,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
HOSTCC = gcc
@@ -52124,9 +52380,9 @@ diff -urNp linux-2.6.38/Makefile linux-2.6.38-new/Makefile
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-diff -urNp linux-2.6.38/mm/bootmem.c linux-2.6.38-new/mm/bootmem.c
---- linux-2.6.38/mm/bootmem.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/bootmem.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/bootmem.c linux-2.6.38.1/mm/bootmem.c
+--- linux-2.6.38.1/mm/bootmem.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/bootmem.c 2011-03-21 18:31:35.000000000 -0400
@@ -201,19 +201,30 @@ static void __init __free_pages_memory(u
unsigned long __init free_all_memory_core_early(int nodeid)
{
@@ -52160,9 +52416,9 @@ diff -urNp linux-2.6.38/mm/bootmem.c linux-2.6.38-new/mm/bootmem.c
return count;
}
-diff -urNp linux-2.6.38/mm/filemap.c linux-2.6.38-new/mm/filemap.c
---- linux-2.6.38/mm/filemap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/filemap.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/filemap.c linux-2.6.38.1/mm/filemap.c
+--- linux-2.6.38.1/mm/filemap.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/filemap.c 2011-03-21 18:31:35.000000000 -0400
@@ -1664,7 +1664,7 @@ int generic_file_mmap(struct file * file
struct address_space *mapping = file->f_mapping;
@@ -52180,9 +52436,9 @@ diff -urNp linux-2.6.38/mm/filemap.c linux-2.6.38-new/mm/filemap.c
if (*pos >= limit) {
send_sig(SIGXFSZ, current, 0);
return -EFBIG;
-diff -urNp linux-2.6.38/mm/fremap.c linux-2.6.38-new/mm/fremap.c
---- linux-2.6.38/mm/fremap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/fremap.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/fremap.c linux-2.6.38.1/mm/fremap.c
+--- linux-2.6.38.1/mm/fremap.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/fremap.c 2011-03-21 18:31:35.000000000 -0400
@@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
retry:
vma = find_vma(mm, start);
@@ -52204,9 +52460,9 @@ diff -urNp linux-2.6.38/mm/fremap.c linux-2.6.38-new/mm/fremap.c
munlock_vma_pages_range(vma, start, start + size);
vma->vm_flags = saved_flags;
}
-diff -urNp linux-2.6.38/mm/highmem.c linux-2.6.38-new/mm/highmem.c
---- linux-2.6.38/mm/highmem.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/highmem.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/highmem.c linux-2.6.38.1/mm/highmem.c
+--- linux-2.6.38.1/mm/highmem.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/highmem.c 2011-03-21 18:31:35.000000000 -0400
@@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
* So no dangers, even with speculative execution.
*/
@@ -52232,9 +52488,9 @@ diff -urNp linux-2.6.38/mm/highmem.c linux-2.6.38-new/mm/highmem.c
pkmap_count[last_pkmap_nr] = 1;
set_page_address(page, (void *)vaddr);
-diff -urNp linux-2.6.38/mm/hugetlb.c linux-2.6.38-new/mm/hugetlb.c
---- linux-2.6.38/mm/hugetlb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/hugetlb.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/hugetlb.c linux-2.6.38.1/mm/hugetlb.c
+--- linux-2.6.38.1/mm/hugetlb.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/hugetlb.c 2011-03-21 18:31:35.000000000 -0400
@@ -2333,6 +2333,27 @@ static int unmap_ref_private(struct mm_s
return 1;
}
@@ -52324,9 +52580,9 @@ diff -urNp linux-2.6.38/mm/hugetlb.c linux-2.6.38-new/mm/hugetlb.c
ptep = huge_pte_alloc(mm, address, huge_page_size(h));
if (!ptep)
return VM_FAULT_OOM;
-diff -urNp linux-2.6.38/mm/Kconfig linux-2.6.38-new/mm/Kconfig
---- linux-2.6.38/mm/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/Kconfig 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/Kconfig linux-2.6.38.1/mm/Kconfig
+--- linux-2.6.38.1/mm/Kconfig 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/Kconfig 2011-03-21 18:31:35.000000000 -0400
@@ -240,7 +240,7 @@ config KSM
config DEFAULT_MMAP_MIN_ADDR
int "Low address space to protect from user allocation"
@@ -52336,9 +52592,9 @@ diff -urNp linux-2.6.38/mm/Kconfig linux-2.6.38-new/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.38/mm/kmemleak.c linux-2.6.38-new/mm/kmemleak.c
---- linux-2.6.38/mm/kmemleak.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/kmemleak.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/kmemleak.c linux-2.6.38.1/mm/kmemleak.c
+--- linux-2.6.38.1/mm/kmemleak.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/kmemleak.c 2011-03-21 18:31:35.000000000 -0400
@@ -357,7 +357,7 @@ static void print_unreferenced(struct se
for (i = 0; i < object->trace_len; i++) {
@@ -52348,9 +52604,9 @@ diff -urNp linux-2.6.38/mm/kmemleak.c linux-2.6.38-new/mm/kmemleak.c
}
}
-diff -urNp linux-2.6.38/mm/maccess.c linux-2.6.38-new/mm/maccess.c
---- linux-2.6.38/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/maccess.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/maccess.c linux-2.6.38.1/mm/maccess.c
+--- linux-2.6.38.1/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/maccess.c 2011-03-21 18:31:35.000000000 -0400
@@ -15,10 +15,10 @@
* happens, handle that and return -EFAULT.
*/
@@ -52377,9 +52633,9 @@ diff -urNp linux-2.6.38/mm/maccess.c linux-2.6.38-new/mm/maccess.c
{
long ret;
mm_segment_t old_fs = get_fs();
-diff -urNp linux-2.6.38/mm/madvise.c linux-2.6.38-new/mm/madvise.c
---- linux-2.6.38/mm/madvise.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/madvise.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/madvise.c linux-2.6.38.1/mm/madvise.c
+--- linux-2.6.38.1/mm/madvise.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/madvise.c 2011-03-21 18:31:35.000000000 -0400
@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
pgoff_t pgoff;
unsigned long new_flags = vma->vm_flags;
@@ -52456,9 +52712,9 @@ diff -urNp linux-2.6.38/mm/madvise.c linux-2.6.38-new/mm/madvise.c
error = 0;
if (end == start)
goto out;
-diff -urNp linux-2.6.38/mm/memory.c linux-2.6.38-new/mm/memory.c
---- linux-2.6.38/mm/memory.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/memory.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/memory.c linux-2.6.38.1/mm/memory.c
+--- linux-2.6.38.1/mm/memory.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/memory.c 2011-03-21 18:31:35.000000000 -0400
@@ -259,8 +259,12 @@ static inline void free_pmd_range(struct
return;
@@ -52988,9 +53244,9 @@ diff -urNp linux-2.6.38/mm/memory.c linux-2.6.38-new/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.38/mm/memory-failure.c linux-2.6.38-new/mm/memory-failure.c
---- linux-2.6.38/mm/memory-failure.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/memory-failure.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/memory-failure.c linux-2.6.38.1/mm/memory-failure.c
+--- linux-2.6.38.1/mm/memory-failure.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/memory-failure.c 2011-03-21 18:31:35.000000000 -0400
@@ -58,7 +58,7 @@ int sysctl_memory_failure_early_kill __r
int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -53063,9 +53319,9 @@ diff -urNp linux-2.6.38/mm/memory-failure.c linux-2.6.38-new/mm/memory-failure.c
SetPageHWPoison(page);
/* keep elevated page count for bad page */
return ret;
-diff -urNp linux-2.6.38/mm/mempolicy.c linux-2.6.38-new/mm/mempolicy.c
---- linux-2.6.38/mm/mempolicy.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/mempolicy.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/mempolicy.c linux-2.6.38.1/mm/mempolicy.c
+--- linux-2.6.38.1/mm/mempolicy.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/mempolicy.c 2011-03-21 18:31:35.000000000 -0400
@@ -643,6 +643,10 @@ static int mbind_range(struct mm_struct
unsigned long vmstart;
unsigned long vmend;
@@ -53146,9 +53402,9 @@ diff -urNp linux-2.6.38/mm/mempolicy.c linux-2.6.38-new/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.38/mm/migrate.c linux-2.6.38-new/mm/migrate.c
---- linux-2.6.38/mm/migrate.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/migrate.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/migrate.c linux-2.6.38.1/mm/migrate.c
+--- linux-2.6.38.1/mm/migrate.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/migrate.c 2011-03-21 18:31:35.000000000 -0400
@@ -1299,6 +1299,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
if (!mm)
return -EINVAL;
@@ -53174,9 +53430,9 @@ diff -urNp linux-2.6.38/mm/migrate.c linux-2.6.38-new/mm/migrate.c
rcu_read_unlock();
err = -EPERM;
goto out;
-diff -urNp linux-2.6.38/mm/mlock.c linux-2.6.38-new/mm/mlock.c
---- linux-2.6.38/mm/mlock.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/mlock.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/mlock.c linux-2.6.38.1/mm/mlock.c
+--- linux-2.6.38.1/mm/mlock.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/mlock.c 2011-03-21 18:31:35.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/pagemap.h>
#include <linux/mempolicy.h>
@@ -53278,9 +53534,9 @@ diff -urNp linux-2.6.38/mm/mlock.c linux-2.6.38-new/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.38/mm/mmap.c linux-2.6.38-new/mm/mmap.c
---- linux-2.6.38/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/mmap.c 2011-03-21 23:47:41.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/mmap.c linux-2.6.38.1/mm/mmap.c
+--- linux-2.6.38.1/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/mmap.c 2011-03-21 23:47:41.000000000 -0400
@@ -46,6 +46,16 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
@@ -54541,9 +54797,9 @@ diff -urNp linux-2.6.38/mm/mmap.c linux-2.6.38-new/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.38/mm/mprotect.c linux-2.6.38-new/mm/mprotect.c
---- linux-2.6.38/mm/mprotect.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/mprotect.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/mprotect.c linux-2.6.38.1/mm/mprotect.c
+--- linux-2.6.38.1/mm/mprotect.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/mprotect.c 2011-03-21 18:31:35.000000000 -0400
@@ -23,10 +23,16 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
@@ -54770,9 +55026,9 @@ diff -urNp linux-2.6.38/mm/mprotect.c linux-2.6.38-new/mm/mprotect.c
nstart = tmp;
if (nstart < prev->vm_end)
-diff -urNp linux-2.6.38/mm/mremap.c linux-2.6.38-new/mm/mremap.c
---- linux-2.6.38/mm/mremap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/mremap.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/mremap.c linux-2.6.38.1/mm/mremap.c
+--- linux-2.6.38.1/mm/mremap.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/mremap.c 2011-03-21 18:31:35.000000000 -0400
@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
continue;
pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -54877,9 +55133,9 @@ diff -urNp linux-2.6.38/mm/mremap.c linux-2.6.38-new/mm/mremap.c
}
out:
if (ret & ~PAGE_MASK)
-diff -urNp linux-2.6.38/mm/nommu.c linux-2.6.38-new/mm/nommu.c
---- linux-2.6.38/mm/nommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/nommu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/nommu.c linux-2.6.38.1/mm/nommu.c
+--- linux-2.6.38.1/mm/nommu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/nommu.c 2011-03-21 18:31:35.000000000 -0400
@@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI
int sysctl_overcommit_ratio = 50; /* default is 50% */
int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
@@ -54912,9 +55168,9 @@ diff -urNp linux-2.6.38/mm/nommu.c linux-2.6.38-new/mm/nommu.c
*region = *vma->vm_region;
new->vm_region = region;
-diff -urNp linux-2.6.38/mm/page_alloc.c linux-2.6.38-new/mm/page_alloc.c
---- linux-2.6.38/mm/page_alloc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/page_alloc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/page_alloc.c linux-2.6.38.1/mm/page_alloc.c
+--- linux-2.6.38.1/mm/page_alloc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/page_alloc.c 2011-03-21 18:31:35.000000000 -0400
@@ -644,6 +644,10 @@ static bool free_pages_prepare(struct pa
int i;
int bad = 0;
@@ -54950,9 +55206,9 @@ diff -urNp linux-2.6.38/mm/page_alloc.c linux-2.6.38-new/mm/page_alloc.c
if (order && (gfp_flags & __GFP_COMP))
prep_compound_page(page, order);
-diff -urNp linux-2.6.38/mm/percpu.c linux-2.6.38-new/mm/percpu.c
---- linux-2.6.38/mm/percpu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/percpu.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/percpu.c linux-2.6.38.1/mm/percpu.c
+--- linux-2.6.38.1/mm/percpu.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/percpu.c 2011-03-21 18:31:35.000000000 -0400
@@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu
static unsigned int pcpu_last_unit_cpu __read_mostly;
@@ -54962,9 +55218,9 @@ diff -urNp linux-2.6.38/mm/percpu.c linux-2.6.38-new/mm/percpu.c
EXPORT_SYMBOL_GPL(pcpu_base_addr);
static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
-diff -urNp linux-2.6.38/mm/rmap.c linux-2.6.38-new/mm/rmap.c
---- linux-2.6.38/mm/rmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/rmap.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/rmap.c linux-2.6.38.1/mm/rmap.c
+--- linux-2.6.38.1/mm/rmap.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/rmap.c 2011-03-21 18:31:35.000000000 -0400
@@ -117,6 +117,10 @@ int anon_vma_prepare(struct vm_area_stru
struct anon_vma *anon_vma = vma->anon_vma;
struct anon_vma_chain *avc;
@@ -55054,9 +55310,9 @@ diff -urNp linux-2.6.38/mm/rmap.c linux-2.6.38-new/mm/rmap.c
{
struct anon_vma_chain *avc;
struct anon_vma *anon_vma;
-diff -urNp linux-2.6.38/mm/shmem.c linux-2.6.38-new/mm/shmem.c
---- linux-2.6.38/mm/shmem.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/shmem.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/shmem.c linux-2.6.38.1/mm/shmem.c
+--- linux-2.6.38.1/mm/shmem.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/shmem.c 2011-03-21 18:31:35.000000000 -0400
@@ -31,7 +31,7 @@
#include <linux/percpu_counter.h>
#include <linux/swap.h>
@@ -55075,9 +55331,9 @@ diff -urNp linux-2.6.38/mm/shmem.c linux-2.6.38-new/mm/shmem.c
if (entry->val) {
/*
* The more uptodate page coming down from a stacked
-diff -urNp linux-2.6.38/mm/slab.c linux-2.6.38-new/mm/slab.c
---- linux-2.6.38/mm/slab.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/slab.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/slab.c linux-2.6.38.1/mm/slab.c
+--- linux-2.6.38.1/mm/slab.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/slab.c 2011-03-21 18:31:35.000000000 -0400
@@ -284,7 +284,7 @@ struct kmem_list3 {
* Need this for bootstrapping a per node allocator.
*/
@@ -55183,9 +55439,9 @@ diff -urNp linux-2.6.38/mm/slab.c linux-2.6.38-new/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.38/mm/slob.c linux-2.6.38-new/mm/slob.c
---- linux-2.6.38/mm/slob.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/slob.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/slob.c linux-2.6.38.1/mm/slob.c
+--- linux-2.6.38.1/mm/slob.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/slob.c 2011-03-21 18:31:35.000000000 -0400
@@ -29,7 +29,7 @@
* If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
* alloc_pages() directly, allocating compound pages so the page order
@@ -55505,9 +55761,9 @@ diff -urNp linux-2.6.38/mm/slob.c linux-2.6.38-new/mm/slob.c
}
trace_kmem_cache_free(_RET_IP_, b);
-diff -urNp linux-2.6.38/mm/slub.c linux-2.6.38-new/mm/slub.c
---- linux-2.6.38/mm/slub.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/slub.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/slub.c linux-2.6.38.1/mm/slub.c
+--- linux-2.6.38.1/mm/slub.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/slub.c 2011-03-21 18:31:35.000000000 -0400
@@ -390,7 +390,7 @@ static void print_track(const char *s, s
if (!t->addr)
return;
@@ -55661,9 +55917,9 @@ diff -urNp linux-2.6.38/mm/slub.c linux-2.6.38-new/mm/slub.c
return 0;
}
module_init(slab_proc_init);
-diff -urNp linux-2.6.38/mm/util.c linux-2.6.38-new/mm/util.c
---- linux-2.6.38/mm/util.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/util.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/util.c linux-2.6.38.1/mm/util.c
+--- linux-2.6.38.1/mm/util.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/util.c 2011-03-21 18:31:35.000000000 -0400
@@ -219,6 +219,12 @@ EXPORT_SYMBOL(strndup_user);
void arch_pick_mmap_layout(struct mm_struct *mm)
{
@@ -55677,9 +55933,9 @@ diff -urNp linux-2.6.38/mm/util.c linux-2.6.38-new/mm/util.c
mm->get_unmapped_area = arch_get_unmapped_area;
mm->unmap_area = arch_unmap_area;
}
-diff -urNp linux-2.6.38/mm/vmalloc.c linux-2.6.38-new/mm/vmalloc.c
---- linux-2.6.38/mm/vmalloc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/vmalloc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/vmalloc.c linux-2.6.38.1/mm/vmalloc.c
+--- linux-2.6.38.1/mm/vmalloc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/vmalloc.c 2011-03-21 18:31:35.000000000 -0400
@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
pte = pte_offset_kernel(pmd, addr);
@@ -55912,9 +56168,9 @@ diff -urNp linux-2.6.38/mm/vmalloc.c linux-2.6.38-new/mm/vmalloc.c
if ((PAGE_SIZE-1) & (unsigned long)addr)
return -EINVAL;
-diff -urNp linux-2.6.38/mm/vmstat.c linux-2.6.38-new/mm/vmstat.c
---- linux-2.6.38/mm/vmstat.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/mm/vmstat.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/mm/vmstat.c linux-2.6.38.1/mm/vmstat.c
+--- linux-2.6.38.1/mm/vmstat.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/mm/vmstat.c 2011-03-21 18:31:35.000000000 -0400
@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
*
* vm_stat contains the global counters
@@ -55967,9 +56223,9 @@ diff -urNp linux-2.6.38/mm/vmstat.c linux-2.6.38-new/mm/vmstat.c
#endif
return 0;
}
-diff -urNp linux-2.6.38/net/8021q/vlan.c linux-2.6.38-new/net/8021q/vlan.c
---- linux-2.6.38/net/8021q/vlan.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/8021q/vlan.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/8021q/vlan.c linux-2.6.38.1/net/8021q/vlan.c
+--- linux-2.6.38.1/net/8021q/vlan.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/8021q/vlan.c 2011-03-21 18:31:35.000000000 -0400
@@ -589,8 +589,7 @@ static int vlan_ioctl_handler(struct net
err = -EPERM;
if (!capable(CAP_NET_ADMIN))
@@ -55980,9 +56236,9 @@ diff -urNp linux-2.6.38/net/8021q/vlan.c linux-2.6.38-new/net/8021q/vlan.c
struct vlan_net *vn;
vn = net_generic(net, vlan_net_id);
-diff -urNp linux-2.6.38/net/atm/atm_misc.c linux-2.6.38-new/net/atm/atm_misc.c
---- linux-2.6.38/net/atm/atm_misc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/atm/atm_misc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/atm/atm_misc.c linux-2.6.38.1/net/atm/atm_misc.c
+--- linux-2.6.38.1/net/atm/atm_misc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/atm/atm_misc.c 2011-03-21 18:31:35.000000000 -0400
@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int
if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
return 1;
@@ -56019,9 +56275,9 @@ diff -urNp linux-2.6.38/net/atm/atm_misc.c linux-2.6.38-new/net/atm/atm_misc.c
__SONET_ITEMS
#undef __HANDLE_ITEM
}
-diff -urNp linux-2.6.38/net/atm/proc.c linux-2.6.38-new/net/atm/proc.c
---- linux-2.6.38/net/atm/proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/atm/proc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/atm/proc.c linux-2.6.38.1/net/atm/proc.c
+--- linux-2.6.38.1/net/atm/proc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/atm/proc.c 2011-03-21 18:31:35.000000000 -0400
@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
const struct k_atm_aal_stats *stats)
{
@@ -56060,9 +56316,9 @@ diff -urNp linux-2.6.38/net/atm/proc.c linux-2.6.38-new/net/atm/proc.c
else
seq_printf(seq, "%3d %3d %5d ",
vcc->dev->number, vcc->vpi, vcc->vci);
-diff -urNp linux-2.6.38/net/atm/resources.c linux-2.6.38-new/net/atm/resources.c
---- linux-2.6.38/net/atm/resources.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/atm/resources.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/atm/resources.c linux-2.6.38.1/net/atm/resources.c
+--- linux-2.6.38.1/net/atm/resources.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/atm/resources.c 2011-03-21 18:31:35.000000000 -0400
@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
static void copy_aal_stats(struct k_atm_aal_stats *from,
struct atm_aal_stats *to)
@@ -56081,9 +56337,9 @@ diff -urNp linux-2.6.38/net/atm/resources.c linux-2.6.38-new/net/atm/resources.c
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
}
-diff -urNp linux-2.6.38/net/bluetooth/bnep/sock.c linux-2.6.38-new/net/bluetooth/bnep/sock.c
---- linux-2.6.38/net/bluetooth/bnep/sock.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/bluetooth/bnep/sock.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/bluetooth/bnep/sock.c linux-2.6.38.1/net/bluetooth/bnep/sock.c
+--- linux-2.6.38.1/net/bluetooth/bnep/sock.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/bluetooth/bnep/sock.c 2011-03-21 18:31:35.000000000 -0400
@@ -88,6 +88,7 @@ static int bnep_sock_ioctl(struct socket
sockfd_put(nsock);
return -EBADFD;
@@ -56092,9 +56348,9 @@ diff -urNp linux-2.6.38/net/bluetooth/bnep/sock.c linux-2.6.38-new/net/bluetooth
err = bnep_add_connection(&ca, nsock);
if (!err) {
-diff -urNp linux-2.6.38/net/bluetooth/sco.c linux-2.6.38-new/net/bluetooth/sco.c
---- linux-2.6.38/net/bluetooth/sco.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/bluetooth/sco.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/bluetooth/sco.c linux-2.6.38.1/net/bluetooth/sco.c
+--- linux-2.6.38.1/net/bluetooth/sco.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/bluetooth/sco.c 2011-03-21 18:31:35.000000000 -0400
@@ -703,6 +703,7 @@ static int sco_sock_getsockopt_old(struc
break;
}
@@ -56103,9 +56359,9 @@ diff -urNp linux-2.6.38/net/bluetooth/sco.c linux-2.6.38-new/net/bluetooth/sco.c
cinfo.hci_handle = sco_pi(sk)->conn->hcon->handle;
memcpy(cinfo.dev_class, sco_pi(sk)->conn->hcon->dev_class, 3);
-diff -urNp linux-2.6.38/net/bridge/br_multicast.c linux-2.6.38-new/net/bridge/br_multicast.c
---- linux-2.6.38/net/bridge/br_multicast.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/bridge/br_multicast.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/bridge/br_multicast.c linux-2.6.38.1/net/bridge/br_multicast.c
+--- linux-2.6.38.1/net/bridge/br_multicast.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/bridge/br_multicast.c 2011-03-21 18:31:35.000000000 -0400
@@ -1482,7 +1482,7 @@ static int br_multicast_ipv6_rcv(struct
nexthdr = ip6h->nexthdr;
offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
@@ -56115,9 +56371,9 @@ diff -urNp linux-2.6.38/net/bridge/br_multicast.c linux-2.6.38-new/net/bridge/br
return 0;
/* Okay, we found ICMPv6 header */
-diff -urNp linux-2.6.38/net/bridge/netfilter/ebtables.c linux-2.6.38-new/net/bridge/netfilter/ebtables.c
---- linux-2.6.38/net/bridge/netfilter/ebtables.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/bridge/netfilter/ebtables.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/bridge/netfilter/ebtables.c linux-2.6.38.1/net/bridge/netfilter/ebtables.c
+--- linux-2.6.38.1/net/bridge/netfilter/ebtables.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/bridge/netfilter/ebtables.c 2011-03-21 18:31:35.000000000 -0400
@@ -1107,6 +1107,8 @@ static int do_replace(struct net *net, c
if (tmp.num_counters >= INT_MAX / sizeof(struct ebt_counter))
return -ENOMEM;
@@ -56136,9 +56392,9 @@ diff -urNp linux-2.6.38/net/bridge/netfilter/ebtables.c linux-2.6.38-new/net/bri
BUGPRINT("c2u Didn't work\n");
ret = -EFAULT;
break;
-diff -urNp linux-2.6.38/net/can/bcm.c linux-2.6.38-new/net/can/bcm.c
---- linux-2.6.38/net/can/bcm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/can/bcm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/can/bcm.c linux-2.6.38.1/net/can/bcm.c
+--- linux-2.6.38.1/net/can/bcm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/can/bcm.c 2011-03-21 18:31:35.000000000 -0400
@@ -165,9 +165,15 @@ static int bcm_proc_show(struct seq_file
struct bcm_sock *bo = bcm_sk(sk);
struct bcm_op *op;
@@ -56155,9 +56411,9 @@ diff -urNp linux-2.6.38/net/can/bcm.c linux-2.6.38-new/net/can/bcm.c
seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs);
seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex));
seq_printf(m, " <<<\n");
-diff -urNp linux-2.6.38/net/core/dev.c linux-2.6.38-new/net/core/dev.c
---- linux-2.6.38/net/core/dev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/core/dev.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/core/dev.c linux-2.6.38.1/net/core/dev.c
+--- linux-2.6.38.1/net/core/dev.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/core/dev.c 2011-03-21 18:31:35.000000000 -0400
@@ -1124,7 +1124,7 @@ void dev_load(struct net *net, const cha
if (no_module && capable(CAP_NET_ADMIN))
no_module = request_module("netdev-%s", name);
@@ -56185,9 +56441,9 @@ diff -urNp linux-2.6.38/net/core/dev.c linux-2.6.38-new/net/core/dev.c
{
struct softnet_data *sd = &__get_cpu_var(softnet_data);
unsigned long time_limit = jiffies + 2;
-diff -urNp linux-2.6.38/net/core/sock.c linux-2.6.38-new/net/core/sock.c
---- linux-2.6.38/net/core/sock.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/core/sock.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/core/sock.c linux-2.6.38.1/net/core/sock.c
+--- linux-2.6.38.1/net/core/sock.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/core/sock.c 2011-03-21 18:31:35.000000000 -0400
@@ -934,7 +934,7 @@ int sock_getsockopt(struct socket *sock,
return -ENOTCONN;
if (lv < len)
@@ -56206,9 +56462,9 @@ diff -urNp linux-2.6.38/net/core/sock.c linux-2.6.38-new/net/core/sock.c
return -EFAULT;
lenout:
if (put_user(len, optlen))
-diff -urNp linux-2.6.38/net/dccp/ccids/ccid3.c linux-2.6.38-new/net/dccp/ccids/ccid3.c
---- linux-2.6.38/net/dccp/ccids/ccid3.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/dccp/ccids/ccid3.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/dccp/ccids/ccid3.c linux-2.6.38.1/net/dccp/ccids/ccid3.c
+--- linux-2.6.38.1/net/dccp/ccids/ccid3.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/dccp/ccids/ccid3.c 2011-03-21 18:31:35.000000000 -0400
@@ -41,7 +41,7 @@
static int ccid3_debug;
#define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -56218,9 +56474,9 @@ diff -urNp linux-2.6.38/net/dccp/ccids/ccid3.c linux-2.6.38-new/net/dccp/ccids/c
#endif
/*
-diff -urNp linux-2.6.38/net/dccp/dccp.h linux-2.6.38-new/net/dccp/dccp.h
---- linux-2.6.38/net/dccp/dccp.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/dccp/dccp.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/dccp/dccp.h linux-2.6.38.1/net/dccp/dccp.h
+--- linux-2.6.38.1/net/dccp/dccp.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/dccp/dccp.h 2011-03-21 18:31:35.000000000 -0400
@@ -44,9 +44,9 @@ extern int dccp_debug;
#define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
#define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
@@ -56234,9 +56490,9 @@ diff -urNp linux-2.6.38/net/dccp/dccp.h linux-2.6.38-new/net/dccp/dccp.h
#endif
extern struct inet_hashinfo dccp_hashinfo;
-diff -urNp linux-2.6.38/net/decnet/sysctl_net_decnet.c linux-2.6.38-new/net/decnet/sysctl_net_decnet.c
---- linux-2.6.38/net/decnet/sysctl_net_decnet.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/decnet/sysctl_net_decnet.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/decnet/sysctl_net_decnet.c linux-2.6.38.1/net/decnet/sysctl_net_decnet.c
+--- linux-2.6.38.1/net/decnet/sysctl_net_decnet.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/decnet/sysctl_net_decnet.c 2011-03-21 18:31:35.000000000 -0400
@@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t
if (len > *lenp) len = *lenp;
@@ -56255,9 +56511,9 @@ diff -urNp linux-2.6.38/net/decnet/sysctl_net_decnet.c linux-2.6.38-new/net/decn
return -EFAULT;
*lenp = len;
-diff -urNp linux-2.6.38/net/econet/Kconfig linux-2.6.38-new/net/econet/Kconfig
---- linux-2.6.38/net/econet/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/econet/Kconfig 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/econet/Kconfig linux-2.6.38.1/net/econet/Kconfig
+--- linux-2.6.38.1/net/econet/Kconfig 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/econet/Kconfig 2011-03-21 18:31:35.000000000 -0400
@@ -4,7 +4,7 @@
config ECONET
@@ -56267,9 +56523,9 @@ diff -urNp linux-2.6.38/net/econet/Kconfig linux-2.6.38-new/net/econet/Kconfig
---help---
Econet is a fairly old and slow networking protocol mainly used by
Acorn computers to access file and print servers. It uses native
-diff -urNp linux-2.6.38/net/ipv4/inet_diag.c linux-2.6.38-new/net/ipv4/inet_diag.c
---- linux-2.6.38/net/ipv4/inet_diag.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/ipv4/inet_diag.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/ipv4/inet_diag.c linux-2.6.38.1/net/ipv4/inet_diag.c
+--- linux-2.6.38.1/net/ipv4/inet_diag.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/ipv4/inet_diag.c 2011-03-21 18:31:35.000000000 -0400
@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc
r->idiag_retrans = 0;
@@ -56331,9 +56587,9 @@ diff -urNp linux-2.6.38/net/ipv4/inet_diag.c linux-2.6.38-new/net/ipv4/inet_diag
tmo = req->expires - jiffies;
if (tmo < 0)
-diff -urNp linux-2.6.38/net/ipv4/inet_hashtables.c linux-2.6.38-new/net/ipv4/inet_hashtables.c
---- linux-2.6.38/net/ipv4/inet_hashtables.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/ipv4/inet_hashtables.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/ipv4/inet_hashtables.c linux-2.6.38.1/net/ipv4/inet_hashtables.c
+--- linux-2.6.38.1/net/ipv4/inet_hashtables.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/ipv4/inet_hashtables.c 2011-03-21 18:31:35.000000000 -0400
@@ -18,11 +18,14 @@
#include <linux/sched.h>
#include <linux/slab.h>
@@ -56358,9 +56614,9 @@ diff -urNp linux-2.6.38/net/ipv4/inet_hashtables.c linux-2.6.38-new/net/ipv4/ine
if (tw) {
inet_twsk_deschedule(tw, death_row);
while (twrefcnt) {
-diff -urNp linux-2.6.38/net/ipv4/inetpeer.c linux-2.6.38-new/net/ipv4/inetpeer.c
---- linux-2.6.38/net/ipv4/inetpeer.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/ipv4/inetpeer.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/ipv4/inetpeer.c linux-2.6.38.1/net/ipv4/inetpeer.c
+--- linux-2.6.38.1/net/ipv4/inetpeer.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/ipv4/inetpeer.c 2011-03-21 18:31:35.000000000 -0400
@@ -509,8 +509,8 @@ struct inet_peer *inet_getpeer(struct in
if (p) {
p->daddr = *daddr;
@@ -56372,9 +56628,9 @@ diff -urNp linux-2.6.38/net/ipv4/inetpeer.c linux-2.6.38-new/net/ipv4/inetpeer.c
p->tcp_ts_stamp = 0;
INIT_LIST_HEAD(&p->unused);
-diff -urNp linux-2.6.38/net/ipv4/ip_fragment.c linux-2.6.38-new/net/ipv4/ip_fragment.c
---- linux-2.6.38/net/ipv4/ip_fragment.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/ipv4/ip_fragment.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/ipv4/ip_fragment.c linux-2.6.38.1/net/ipv4/ip_fragment.c
+--- linux-2.6.38.1/net/ipv4/ip_fragment.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/ipv4/ip_fragment.c 2011-03-21 18:31:35.000000000 -0400
@@ -298,7 +298,7 @@ static inline int ip_frag_too_far(struct
return 0;
@@ -56384,9 +56640,9 @@ diff -urNp linux-2.6.38/net/ipv4/ip_fragment.c linux-2.6.38-new/net/ipv4/ip_frag
qp->rid = end;
rc = qp->q.fragments && (end - start) > max;
-diff -urNp linux-2.6.38/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.38-new/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.38/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.38.1/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-2.6.38.1/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-21 18:31:35.000000000 -0400
@@ -398,7 +398,7 @@ static unsigned char asn1_octets_decode(
*len = 0;
@@ -56396,9 +56652,9 @@ diff -urNp linux-2.6.38/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.38-new/
if (*octets == NULL) {
if (net_ratelimit())
pr_notice("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-2.6.38/net/ipv4/route.c linux-2.6.38-new/net/ipv4/route.c
---- linux-2.6.38/net/ipv4/route.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/ipv4/route.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/ipv4/route.c linux-2.6.38.1/net/ipv4/route.c
+--- linux-2.6.38.1/net/ipv4/route.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/ipv4/route.c 2011-03-21 18:31:35.000000000 -0400
@@ -2857,7 +2857,7 @@ static int rt_fill_info(struct net *net,
expires = rt->dst.expires ? rt->dst.expires - jiffies : 0;
if (rt->peer) {
@@ -56408,9 +56664,9 @@ diff -urNp linux-2.6.38/net/ipv4/route.c linux-2.6.38-new/net/ipv4/route.c
if (rt->peer->tcp_ts_stamp) {
ts = rt->peer->tcp_ts;
tsage = get_seconds() - rt->peer->tcp_ts_stamp;
-diff -urNp linux-2.6.38/net/ipv4/tcp_ipv4.c linux-2.6.38-new/net/ipv4/tcp_ipv4.c
---- linux-2.6.38/net/ipv4/tcp_ipv4.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/ipv4/tcp_ipv4.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/ipv4/tcp_ipv4.c linux-2.6.38.1/net/ipv4/tcp_ipv4.c
+--- linux-2.6.38.1/net/ipv4/tcp_ipv4.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/ipv4/tcp_ipv4.c 2011-03-21 18:31:35.000000000 -0400
@@ -86,6 +86,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
int sysctl_tcp_low_latency __read_mostly;
EXPORT_SYMBOL(sysctl_tcp_low_latency);
@@ -56506,9 +56762,9 @@ diff -urNp linux-2.6.38/net/ipv4/tcp_ipv4.c linux-2.6.38-new/net/ipv4/tcp_ipv4.c
}
#define TMPSZ 150
-diff -urNp linux-2.6.38/net/ipv4/tcp_minisocks.c linux-2.6.38-new/net/ipv4/tcp_minisocks.c
---- linux-2.6.38/net/ipv4/tcp_minisocks.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/ipv4/tcp_minisocks.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/ipv4/tcp_minisocks.c linux-2.6.38.1/net/ipv4/tcp_minisocks.c
+--- linux-2.6.38.1/net/ipv4/tcp_minisocks.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/ipv4/tcp_minisocks.c 2011-03-21 18:31:35.000000000 -0400
@@ -27,6 +27,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
@@ -56531,9 +56787,9 @@ diff -urNp linux-2.6.38/net/ipv4/tcp_minisocks.c linux-2.6.38-new/net/ipv4/tcp_m
if (!(flg & TCP_FLAG_RST))
req->rsk_ops->send_reset(sk, skb);
-diff -urNp linux-2.6.38/net/ipv4/tcp_probe.c linux-2.6.38-new/net/ipv4/tcp_probe.c
---- linux-2.6.38/net/ipv4/tcp_probe.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/ipv4/tcp_probe.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/ipv4/tcp_probe.c linux-2.6.38.1/net/ipv4/tcp_probe.c
+--- linux-2.6.38.1/net/ipv4/tcp_probe.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/ipv4/tcp_probe.c 2011-03-21 18:31:35.000000000 -0400
@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
if (cnt + width >= len)
break;
@@ -56543,9 +56799,9 @@ diff -urNp linux-2.6.38/net/ipv4/tcp_probe.c linux-2.6.38-new/net/ipv4/tcp_probe
return -EFAULT;
cnt += width;
}
-diff -urNp linux-2.6.38/net/ipv4/tcp_timer.c linux-2.6.38-new/net/ipv4/tcp_timer.c
---- linux-2.6.38/net/ipv4/tcp_timer.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/ipv4/tcp_timer.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/ipv4/tcp_timer.c linux-2.6.38.1/net/ipv4/tcp_timer.c
+--- linux-2.6.38.1/net/ipv4/tcp_timer.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/ipv4/tcp_timer.c 2011-03-21 18:31:35.000000000 -0400
@@ -22,6 +22,10 @@
#include <linux/gfp.h>
#include <net/tcp.h>
@@ -56571,9 +56827,9 @@ diff -urNp linux-2.6.38/net/ipv4/tcp_timer.c linux-2.6.38-new/net/ipv4/tcp_timer
if (retransmits_timed_out(sk, retry_until,
syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
/* Has it gone just too far? */
-diff -urNp linux-2.6.38/net/ipv4/udp.c linux-2.6.38-new/net/ipv4/udp.c
---- linux-2.6.38/net/ipv4/udp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/ipv4/udp.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/ipv4/udp.c linux-2.6.38.1/net/ipv4/udp.c
+--- linux-2.6.38.1/net/ipv4/udp.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/ipv4/udp.c 2011-03-21 18:31:35.000000000 -0400
@@ -86,6 +86,7 @@
#include <linux/types.h>
#include <linux/fcntl.h>
@@ -56657,9 +56913,9 @@ diff -urNp linux-2.6.38/net/ipv4/udp.c linux-2.6.38-new/net/ipv4/udp.c
atomic_read(&sp->sk_drops), len);
}
-diff -urNp linux-2.6.38/net/ipv6/exthdrs.c linux-2.6.38-new/net/ipv6/exthdrs.c
---- linux-2.6.38/net/ipv6/exthdrs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/ipv6/exthdrs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/ipv6/exthdrs.c linux-2.6.38.1/net/ipv6/exthdrs.c
+--- linux-2.6.38.1/net/ipv6/exthdrs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/ipv6/exthdrs.c 2011-03-21 18:31:35.000000000 -0400
@@ -634,7 +634,7 @@ static struct tlvtype_proc tlvprochopopt
.type = IPV6_TLV_JUMBO,
.func = ipv6_hop_jumbo,
@@ -56669,9 +56925,9 @@ diff -urNp linux-2.6.38/net/ipv6/exthdrs.c linux-2.6.38-new/net/ipv6/exthdrs.c
};
int ipv6_parse_hopopts(struct sk_buff *skb)
-diff -urNp linux-2.6.38/net/ipv6/raw.c linux-2.6.38-new/net/ipv6/raw.c
---- linux-2.6.38/net/ipv6/raw.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/ipv6/raw.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/ipv6/raw.c linux-2.6.38.1/net/ipv6/raw.c
+--- linux-2.6.38.1/net/ipv6/raw.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/ipv6/raw.c 2011-03-21 18:31:35.000000000 -0400
@@ -602,7 +602,7 @@ out:
return err;
}
@@ -56696,9 +56952,9 @@ diff -urNp linux-2.6.38/net/ipv6/raw.c linux-2.6.38-new/net/ipv6/raw.c
}
static int raw6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.38/net/ipv6/tcp_ipv6.c linux-2.6.38-new/net/ipv6/tcp_ipv6.c
---- linux-2.6.38/net/ipv6/tcp_ipv6.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/ipv6/tcp_ipv6.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/ipv6/tcp_ipv6.c linux-2.6.38.1/net/ipv6/tcp_ipv6.c
+--- linux-2.6.38.1/net/ipv6/tcp_ipv6.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/ipv6/tcp_ipv6.c 2011-03-21 18:31:35.000000000 -0400
@@ -92,6 +92,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
}
#endif
@@ -56798,9 +57054,9 @@ diff -urNp linux-2.6.38/net/ipv6/tcp_ipv6.c linux-2.6.38-new/net/ipv6/tcp_ipv6.c
}
static int tcp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.38/net/ipv6/udp.c linux-2.6.38-new/net/ipv6/udp.c
---- linux-2.6.38/net/ipv6/udp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/ipv6/udp.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/ipv6/udp.c linux-2.6.38.1/net/ipv6/udp.c
+--- linux-2.6.38.1/net/ipv6/udp.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/ipv6/udp.c 2011-03-21 18:31:35.000000000 -0400
@@ -50,6 +50,10 @@
#include <linux/seq_file.h>
#include "udp_impl.h"
@@ -56836,9 +57092,9 @@ diff -urNp linux-2.6.38/net/ipv6/udp.c linux-2.6.38-new/net/ipv6/udp.c
atomic_read(&sp->sk_drops));
}
-diff -urNp linux-2.6.38/net/irda/ircomm/ircomm_tty.c linux-2.6.38-new/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.38/net/irda/ircomm/ircomm_tty.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/irda/ircomm/ircomm_tty.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/irda/ircomm/ircomm_tty.c linux-2.6.38.1/net/irda/ircomm/ircomm_tty.c
+--- linux-2.6.38.1/net/irda/ircomm/ircomm_tty.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/irda/ircomm/ircomm_tty.c 2011-03-21 18:31:35.000000000 -0400
@@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(st
add_wait_queue(&self->open_wait, &wait);
@@ -56961,9 +57217,9 @@ diff -urNp linux-2.6.38/net/irda/ircomm/ircomm_tty.c linux-2.6.38-new/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.38/net/key/af_key.c linux-2.6.38-new/net/key/af_key.c
---- linux-2.6.38/net/key/af_key.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/key/af_key.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/key/af_key.c linux-2.6.38.1/net/key/af_key.c
+--- linux-2.6.38.1/net/key/af_key.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/key/af_key.c 2011-03-21 18:31:35.000000000 -0400
@@ -3644,7 +3644,11 @@ static int pfkey_seq_show(struct seq_fil
seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n");
else
@@ -56976,9 +57232,9 @@ diff -urNp linux-2.6.38/net/key/af_key.c linux-2.6.38-new/net/key/af_key.c
atomic_read(&s->sk_refcnt),
sk_rmem_alloc_get(s),
sk_wmem_alloc_get(s),
-diff -urNp linux-2.6.38/net/mac80211/ieee80211_i.h linux-2.6.38-new/net/mac80211/ieee80211_i.h
---- linux-2.6.38/net/mac80211/ieee80211_i.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/mac80211/ieee80211_i.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/mac80211/ieee80211_i.h linux-2.6.38.1/net/mac80211/ieee80211_i.h
+--- linux-2.6.38.1/net/mac80211/ieee80211_i.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/mac80211/ieee80211_i.h 2011-03-21 18:31:35.000000000 -0400
@@ -27,6 +27,7 @@
#include <net/ieee80211_radiotap.h>
#include <net/cfg80211.h>
@@ -56996,9 +57252,9 @@ diff -urNp linux-2.6.38/net/mac80211/ieee80211_i.h linux-2.6.38-new/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.38/net/mac80211/iface.c linux-2.6.38-new/net/mac80211/iface.c
---- linux-2.6.38/net/mac80211/iface.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/mac80211/iface.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/mac80211/iface.c linux-2.6.38.1/net/mac80211/iface.c
+--- linux-2.6.38.1/net/mac80211/iface.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/mac80211/iface.c 2011-03-21 18:31:35.000000000 -0400
@@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_
break;
}
@@ -57053,9 +57309,9 @@ diff -urNp linux-2.6.38/net/mac80211/iface.c linux-2.6.38-new/net/mac80211/iface
if (local->ops->napi_poll)
napi_disable(&local->napi);
ieee80211_clear_tx_pending(local);
-diff -urNp linux-2.6.38/net/mac80211/main.c linux-2.6.38-new/net/mac80211/main.c
---- linux-2.6.38/net/mac80211/main.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/mac80211/main.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/mac80211/main.c linux-2.6.38.1/net/mac80211/main.c
+--- linux-2.6.38.1/net/mac80211/main.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/mac80211/main.c 2011-03-21 18:31:35.000000000 -0400
@@ -161,7 +161,7 @@ int ieee80211_hw_config(struct ieee80211
local->hw.conf.power_level = power;
}
@@ -57065,9 +57321,9 @@ diff -urNp linux-2.6.38/net/mac80211/main.c linux-2.6.38-new/net/mac80211/main.c
ret = drv_config(local, changed);
/*
* Goal:
-diff -urNp linux-2.6.38/net/mac80211/pm.c linux-2.6.38-new/net/mac80211/pm.c
---- linux-2.6.38/net/mac80211/pm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/mac80211/pm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/mac80211/pm.c linux-2.6.38.1/net/mac80211/pm.c
+--- linux-2.6.38.1/net/mac80211/pm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/mac80211/pm.c 2011-03-21 18:31:35.000000000 -0400
@@ -95,7 +95,7 @@ int __ieee80211_suspend(struct ieee80211
}
@@ -57077,9 +57333,9 @@ diff -urNp linux-2.6.38/net/mac80211/pm.c linux-2.6.38-new/net/mac80211/pm.c
ieee80211_stop_device(local);
local->suspended = true;
-diff -urNp linux-2.6.38/net/mac80211/rate.c linux-2.6.38-new/net/mac80211/rate.c
---- linux-2.6.38/net/mac80211/rate.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/mac80211/rate.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/mac80211/rate.c linux-2.6.38.1/net/mac80211/rate.c
+--- linux-2.6.38.1/net/mac80211/rate.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/mac80211/rate.c 2011-03-21 18:31:35.000000000 -0400
@@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct
ASSERT_RTNL();
@@ -57089,9 +57345,9 @@ diff -urNp linux-2.6.38/net/mac80211/rate.c linux-2.6.38-new/net/mac80211/rate.c
return -EBUSY;
if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
-diff -urNp linux-2.6.38/net/mac80211/rc80211_pid_debugfs.c linux-2.6.38-new/net/mac80211/rc80211_pid_debugfs.c
---- linux-2.6.38/net/mac80211/rc80211_pid_debugfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/mac80211/rc80211_pid_debugfs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/mac80211/rc80211_pid_debugfs.c linux-2.6.38.1/net/mac80211/rc80211_pid_debugfs.c
+--- linux-2.6.38.1/net/mac80211/rc80211_pid_debugfs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/mac80211/rc80211_pid_debugfs.c 2011-03-21 18:31:35.000000000 -0400
@@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
spin_unlock_irqrestore(&events->lock, status);
@@ -57101,9 +57357,9 @@ diff -urNp linux-2.6.38/net/mac80211/rc80211_pid_debugfs.c linux-2.6.38-new/net/
return -EFAULT;
return p;
-diff -urNp linux-2.6.38/net/mac80211/tx.c linux-2.6.38-new/net/mac80211/tx.c
---- linux-2.6.38/net/mac80211/tx.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/mac80211/tx.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/mac80211/tx.c linux-2.6.38.1/net/mac80211/tx.c
+--- linux-2.6.38.1/net/mac80211/tx.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/mac80211/tx.c 2011-03-21 18:31:35.000000000 -0400
@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
return cpu_to_le16(dur);
}
@@ -57113,9 +57369,9 @@ diff -urNp linux-2.6.38/net/mac80211/tx.c linux-2.6.38-new/net/mac80211/tx.c
struct net_device *dev)
{
return local == wdev_priv(dev->ieee80211_ptr);
-diff -urNp linux-2.6.38/net/mac80211/util.c linux-2.6.38-new/net/mac80211/util.c
---- linux-2.6.38/net/mac80211/util.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/mac80211/util.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/mac80211/util.c linux-2.6.38.1/net/mac80211/util.c
+--- linux-2.6.38.1/net/mac80211/util.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/mac80211/util.c 2011-03-21 18:31:35.000000000 -0400
@@ -1135,7 +1135,7 @@ int ieee80211_reconfig(struct ieee80211_
local->resuming = true;
@@ -57125,9 +57381,9 @@ diff -urNp linux-2.6.38/net/mac80211/util.c linux-2.6.38-new/net/mac80211/util.c
/*
* Upon resume hardware can sometimes be goofy due to
* various platform / driver / bus issues, so restarting
-diff -urNp linux-2.6.38/net/netfilter/Kconfig linux-2.6.38-new/net/netfilter/Kconfig
---- linux-2.6.38/net/netfilter/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/netfilter/Kconfig 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/netfilter/Kconfig linux-2.6.38.1/net/netfilter/Kconfig
+--- linux-2.6.38.1/net/netfilter/Kconfig 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/netfilter/Kconfig 2011-03-21 18:31:35.000000000 -0400
@@ -709,6 +709,16 @@ config NETFILTER_XT_MATCH_ESP
To compile it as a module, choose M here. If unsure, say N.
@@ -57145,9 +57401,9 @@ diff -urNp linux-2.6.38/net/netfilter/Kconfig linux-2.6.38-new/net/netfilter/Kco
config NETFILTER_XT_MATCH_HASHLIMIT
tristate '"hashlimit" match support'
depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
-diff -urNp linux-2.6.38/net/netfilter/Makefile linux-2.6.38-new/net/netfilter/Makefile
---- linux-2.6.38/net/netfilter/Makefile 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/netfilter/Makefile 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/netfilter/Makefile linux-2.6.38.1/net/netfilter/Makefile
+--- linux-2.6.38.1/net/netfilter/Makefile 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/netfilter/Makefile 2011-03-21 18:31:35.000000000 -0400
@@ -74,6 +74,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CPU) +=
obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
@@ -57156,9 +57412,9 @@ diff -urNp linux-2.6.38/net/netfilter/Makefile linux-2.6.38-new/net/netfilter/Ma
obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
-diff -urNp linux-2.6.38/net/netfilter/nf_conntrack_netlink.c linux-2.6.38-new/net/netfilter/nf_conntrack_netlink.c
---- linux-2.6.38/net/netfilter/nf_conntrack_netlink.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/netfilter/nf_conntrack_netlink.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/netfilter/nf_conntrack_netlink.c linux-2.6.38.1/net/netfilter/nf_conntrack_netlink.c
+--- linux-2.6.38.1/net/netfilter/nf_conntrack_netlink.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/netfilter/nf_conntrack_netlink.c 2011-03-21 18:31:35.000000000 -0400
@@ -761,7 +761,7 @@ static const struct nla_policy tuple_nla
static int
ctnetlink_parse_tuple(const struct nlattr * const cda[],
@@ -57168,9 +57424,9 @@ diff -urNp linux-2.6.38/net/netfilter/nf_conntrack_netlink.c linux-2.6.38-new/ne
{
struct nlattr *tb[CTA_TUPLE_MAX+1];
int err;
-diff -urNp linux-2.6.38/net/netfilter/xt_gradm.c linux-2.6.38-new/net/netfilter/xt_gradm.c
---- linux-2.6.38/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38-new/net/netfilter/xt_gradm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/netfilter/xt_gradm.c linux-2.6.38.1/net/netfilter/xt_gradm.c
+--- linux-2.6.38.1/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.1/net/netfilter/xt_gradm.c 2011-03-21 18:31:35.000000000 -0400
@@ -0,0 +1,51 @@
+/*
+ * gradm match for netfilter
@@ -57223,9 +57479,9 @@ diff -urNp linux-2.6.38/net/netfilter/xt_gradm.c linux-2.6.38-new/net/netfilter/
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_gradm");
+MODULE_ALIAS("ip6t_gradm");
-diff -urNp linux-2.6.38/net/netlink/af_netlink.c linux-2.6.38-new/net/netlink/af_netlink.c
---- linux-2.6.38/net/netlink/af_netlink.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/netlink/af_netlink.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/netlink/af_netlink.c linux-2.6.38.1/net/netlink/af_netlink.c
+--- linux-2.6.38.1/net/netlink/af_netlink.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/netlink/af_netlink.c 2011-03-21 18:31:35.000000000 -0400
@@ -2001,13 +2001,21 @@ static int netlink_seq_show(struct seq_f
struct netlink_sock *nlk = nlk_sk(s);
@@ -57248,9 +57504,9 @@ diff -urNp linux-2.6.38/net/netlink/af_netlink.c linux-2.6.38-new/net/netlink/af
atomic_read(&s->sk_refcnt),
atomic_read(&s->sk_drops),
sock_i_ino(s)
-diff -urNp linux-2.6.38/net/netrom/af_netrom.c linux-2.6.38-new/net/netrom/af_netrom.c
---- linux-2.6.38/net/netrom/af_netrom.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/netrom/af_netrom.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/netrom/af_netrom.c linux-2.6.38.1/net/netrom/af_netrom.c
+--- linux-2.6.38.1/net/netrom/af_netrom.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/netrom/af_netrom.c 2011-03-21 18:31:35.000000000 -0400
@@ -840,6 +840,7 @@ static int nr_getname(struct socket *soc
struct sock *sk = sock->sk;
struct nr_sock *nr = nr_sk(sk);
@@ -57267,9 +57523,9 @@ diff -urNp linux-2.6.38/net/netrom/af_netrom.c linux-2.6.38-new/net/netrom/af_ne
sax->fsa_ax25.sax25_call = nr->source_addr;
*uaddr_len = sizeof(struct sockaddr_ax25);
}
-diff -urNp linux-2.6.38/net/packet/af_packet.c linux-2.6.38-new/net/packet/af_packet.c
---- linux-2.6.38/net/packet/af_packet.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/packet/af_packet.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/packet/af_packet.c linux-2.6.38.1/net/packet/af_packet.c
+--- linux-2.6.38.1/net/packet/af_packet.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/packet/af_packet.c 2011-03-21 18:31:35.000000000 -0400
@@ -2134,7 +2134,7 @@ static int packet_getsockopt(struct sock
case PACKET_HDRLEN:
if (len > sizeof(int))
@@ -57300,9 +57556,9 @@ diff -urNp linux-2.6.38/net/packet/af_packet.c linux-2.6.38-new/net/packet/af_pa
atomic_read(&s->sk_refcnt),
s->sk_type,
ntohs(po->num),
-diff -urNp linux-2.6.38/net/phonet/af_phonet.c linux-2.6.38-new/net/phonet/af_phonet.c
---- linux-2.6.38/net/phonet/af_phonet.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/phonet/af_phonet.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/phonet/af_phonet.c linux-2.6.38.1/net/phonet/af_phonet.c
+--- linux-2.6.38.1/net/phonet/af_phonet.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/phonet/af_phonet.c 2011-03-21 18:31:35.000000000 -0400
@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
{
struct phonet_protocol *pp;
@@ -57321,9 +57577,9 @@ diff -urNp linux-2.6.38/net/phonet/af_phonet.c linux-2.6.38-new/net/phonet/af_ph
return -EINVAL;
err = proto_register(pp->prot, 1);
-diff -urNp linux-2.6.38/net/phonet/socket.c linux-2.6.38-new/net/phonet/socket.c
---- linux-2.6.38/net/phonet/socket.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/phonet/socket.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/phonet/socket.c linux-2.6.38.1/net/phonet/socket.c
+--- linux-2.6.38.1/net/phonet/socket.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/phonet/socket.c 2011-03-21 18:31:35.000000000 -0400
@@ -637,7 +637,12 @@ static int pn_sock_seq_show(struct seq_f
sk->sk_state,
sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
@@ -57338,9 +57594,9 @@ diff -urNp linux-2.6.38/net/phonet/socket.c linux-2.6.38-new/net/phonet/socket.c
atomic_read(&sk->sk_drops), &len);
}
seq_printf(seq, "%*s\n", 127 - len, "");
-diff -urNp linux-2.6.38/net/sctp/proc.c linux-2.6.38-new/net/sctp/proc.c
---- linux-2.6.38/net/sctp/proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/sctp/proc.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/sctp/proc.c linux-2.6.38.1/net/sctp/proc.c
+--- linux-2.6.38.1/net/sctp/proc.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/sctp/proc.c 2011-03-21 18:31:35.000000000 -0400
@@ -212,7 +212,12 @@ static int sctp_eps_seq_show(struct seq_
sctp_for_each_hentry(epb, node, &head->chain) {
ep = sctp_ep(epb);
@@ -57369,9 +57625,9 @@ diff -urNp linux-2.6.38/net/sctp/proc.c linux-2.6.38-new/net/sctp/proc.c
assoc->state, hash,
assoc->assoc_id,
assoc->sndbuf_used,
-diff -urNp linux-2.6.38/net/sctp/socket.c linux-2.6.38-new/net/sctp/socket.c
---- linux-2.6.38/net/sctp/socket.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/sctp/socket.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/sctp/socket.c linux-2.6.38.1/net/sctp/socket.c
+--- linux-2.6.38.1/net/sctp/socket.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/sctp/socket.c 2011-03-21 18:31:35.000000000 -0400
@@ -1496,7 +1496,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
struct sctp_sndrcvinfo *sinfo;
struct sctp_initmsg *sinit;
@@ -57390,9 +57646,9 @@ diff -urNp linux-2.6.38/net/sctp/socket.c linux-2.6.38-new/net/sctp/socket.c
return -EFAULT;
to += addrlen;
cnt++;
-diff -urNp linux-2.6.38/net/socket.c linux-2.6.38-new/net/socket.c
---- linux-2.6.38/net/socket.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/socket.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/socket.c linux-2.6.38.1/net/socket.c
+--- linux-2.6.38.1/net/socket.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/socket.c 2011-03-21 18:31:35.000000000 -0400
@@ -88,6 +88,7 @@
#include <linux/nsproxy.h>
#include <linux/magic.h>
@@ -57543,9 +57799,9 @@ diff -urNp linux-2.6.38/net/socket.c linux-2.6.38-new/net/socket.c
err =
security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
if (err)
-diff -urNp linux-2.6.38/net/sunrpc/sched.c linux-2.6.38-new/net/sunrpc/sched.c
---- linux-2.6.38/net/sunrpc/sched.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/sunrpc/sched.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/sunrpc/sched.c linux-2.6.38.1/net/sunrpc/sched.c
+--- linux-2.6.38.1/net/sunrpc/sched.c 2011-03-23 17:20:08.000000000 -0400
++++ linux-2.6.38.1/net/sunrpc/sched.c 2011-03-23 17:21:51.000000000 -0400
@@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w
#ifdef RPC_DEBUG
static void rpc_task_set_debuginfo(struct rpc_task *task)
@@ -57558,9 +57814,9 @@ diff -urNp linux-2.6.38/net/sunrpc/sched.c linux-2.6.38-new/net/sunrpc/sched.c
}
#else
static inline void rpc_task_set_debuginfo(struct rpc_task *task)
-diff -urNp linux-2.6.38/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38-new/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-2.6.38/net/sunrpc/xprtrdma/svc_rdma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/sunrpc/xprtrdma/svc_rdma.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38.1/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-2.6.38.1/net/sunrpc/xprtrdma/svc_rdma.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/sunrpc/xprtrdma/svc_rdma.c 2011-03-21 18:31:35.000000000 -0400
@@ -109,7 +109,7 @@ static int read_reset_stat(ctl_table *ta
len -= *ppos;
if (len > *lenp)
@@ -57570,9 +57826,9 @@ diff -urNp linux-2.6.38/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38-new/net/sunr
return -EFAULT;
*lenp = len;
*ppos += len;
-diff -urNp linux-2.6.38/net/sysctl_net.c linux-2.6.38-new/net/sysctl_net.c
---- linux-2.6.38/net/sysctl_net.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/sysctl_net.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/sysctl_net.c linux-2.6.38.1/net/sysctl_net.c
+--- linux-2.6.38.1/net/sysctl_net.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/sysctl_net.c 2011-03-21 18:31:35.000000000 -0400
@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
struct ctl_table *table)
{
@@ -57582,9 +57838,9 @@ diff -urNp linux-2.6.38/net/sysctl_net.c linux-2.6.38-new/net/sysctl_net.c
int mode = (table->mode >> 6) & 7;
return (mode << 6) | (mode << 3) | mode;
}
-diff -urNp linux-2.6.38/net/tipc/socket.c linux-2.6.38-new/net/tipc/socket.c
---- linux-2.6.38/net/tipc/socket.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/tipc/socket.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/tipc/socket.c linux-2.6.38.1/net/tipc/socket.c
+--- linux-2.6.38.1/net/tipc/socket.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/tipc/socket.c 2011-03-21 18:31:35.000000000 -0400
@@ -1447,8 +1447,9 @@ static int connect(struct socket *sock,
} else {
if (res == 0)
@@ -57597,9 +57853,9 @@ diff -urNp linux-2.6.38/net/tipc/socket.c linux-2.6.38-new/net/tipc/socket.c
sock->state = SS_DISCONNECTING;
}
-diff -urNp linux-2.6.38/net/unix/af_unix.c linux-2.6.38-new/net/unix/af_unix.c
---- linux-2.6.38/net/unix/af_unix.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/unix/af_unix.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/unix/af_unix.c linux-2.6.38.1/net/unix/af_unix.c
+--- linux-2.6.38.1/net/unix/af_unix.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/unix/af_unix.c 2011-03-21 18:31:35.000000000 -0400
@@ -765,6 +765,12 @@ static struct sock *unix_find_other(stru
err = -ECONNREFUSED;
if (!S_ISSOCK(inode->i_mode))
@@ -57670,9 +57926,9 @@ diff -urNp linux-2.6.38/net/unix/af_unix.c linux-2.6.38-new/net/unix/af_unix.c
atomic_read(&s->sk_refcnt),
0,
s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
-diff -urNp linux-2.6.38/net/wireless/reg.c linux-2.6.38-new/net/wireless/reg.c
---- linux-2.6.38/net/wireless/reg.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/wireless/reg.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/wireless/reg.c linux-2.6.38.1/net/wireless/reg.c
+--- linux-2.6.38.1/net/wireless/reg.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/wireless/reg.c 2011-03-21 18:31:35.000000000 -0400
@@ -54,7 +54,7 @@
printk(KERN_DEBUG pr_fmt(format), ##args); \
} while (0)
@@ -57682,9 +57938,9 @@ diff -urNp linux-2.6.38/net/wireless/reg.c linux-2.6.38-new/net/wireless/reg.c
#endif
/* Receipt of information from last regulatory request */
-diff -urNp linux-2.6.38/net/wireless/wext-core.c linux-2.6.38-new/net/wireless/wext-core.c
---- linux-2.6.38/net/wireless/wext-core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/wireless/wext-core.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/wireless/wext-core.c linux-2.6.38.1/net/wireless/wext-core.c
+--- linux-2.6.38.1/net/wireless/wext-core.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/wireless/wext-core.c 2011-03-21 18:31:35.000000000 -0400
@@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc
*/
@@ -57718,9 +57974,9 @@ diff -urNp linux-2.6.38/net/wireless/wext-core.c linux-2.6.38-new/net/wireless/w
err = handler(dev, info, (union iwreq_data *) iwp, extra);
iwp->length += essid_compat;
-diff -urNp linux-2.6.38/net/x25/x25_facilities.c linux-2.6.38-new/net/x25/x25_facilities.c
---- linux-2.6.38/net/x25/x25_facilities.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/x25/x25_facilities.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/x25/x25_facilities.c linux-2.6.38.1/net/x25/x25_facilities.c
+--- linux-2.6.38.1/net/x25/x25_facilities.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/x25/x25_facilities.c 2011-03-21 18:31:35.000000000 -0400
@@ -167,7 +167,8 @@ int x25_parse_facilities(struct sk_buff
break;
default:
@@ -57731,9 +57987,9 @@ diff -urNp linux-2.6.38/net/x25/x25_facilities.c linux-2.6.38-new/net/x25/x25_fa
break;
}
len -= p[1] + 2;
-diff -urNp linux-2.6.38/net/xfrm/xfrm_policy.c linux-2.6.38-new/net/xfrm/xfrm_policy.c
---- linux-2.6.38/net/xfrm/xfrm_policy.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/net/xfrm/xfrm_policy.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/net/xfrm/xfrm_policy.c linux-2.6.38.1/net/xfrm/xfrm_policy.c
+--- linux-2.6.38.1/net/xfrm/xfrm_policy.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/net/xfrm/xfrm_policy.c 2011-03-21 18:31:35.000000000 -0400
@@ -1507,7 +1507,7 @@ free_dst:
goto out;
}
@@ -57761,9 +58017,9 @@ diff -urNp linux-2.6.38/net/xfrm/xfrm_policy.c linux-2.6.38-new/net/xfrm/xfrm_po
xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
{
#ifdef CONFIG_XFRM_SUB_POLICY
-diff -urNp linux-2.6.38/scripts/basic/fixdep.c linux-2.6.38-new/scripts/basic/fixdep.c
---- linux-2.6.38/scripts/basic/fixdep.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/scripts/basic/fixdep.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/scripts/basic/fixdep.c linux-2.6.38.1/scripts/basic/fixdep.c
+--- linux-2.6.38.1/scripts/basic/fixdep.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/scripts/basic/fixdep.c 2011-03-21 18:31:35.000000000 -0400
@@ -235,9 +235,9 @@ static void use_config(const char *m, in
static void parse_config_file(const char *map, size_t len)
@@ -57785,9 +58041,9 @@ diff -urNp linux-2.6.38/scripts/basic/fixdep.c linux-2.6.38-new/scripts/basic/fi
if (*p != INT_CONF) {
fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-2.6.38/scripts/kallsyms.c linux-2.6.38-new/scripts/kallsyms.c
---- linux-2.6.38/scripts/kallsyms.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/scripts/kallsyms.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/scripts/kallsyms.c linux-2.6.38.1/scripts/kallsyms.c
+--- linux-2.6.38.1/scripts/kallsyms.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/scripts/kallsyms.c 2011-03-21 18:31:35.000000000 -0400
@@ -43,10 +43,10 @@ struct text_range {
static unsigned long long _text;
@@ -57803,9 +58059,9 @@ diff -urNp linux-2.6.38/scripts/kallsyms.c linux-2.6.38-new/scripts/kallsyms.c
};
#define text_range_text (&text_ranges[0])
#define text_range_inittext (&text_ranges[1])
-diff -urNp linux-2.6.38/scripts/mod/file2alias.c linux-2.6.38-new/scripts/mod/file2alias.c
---- linux-2.6.38/scripts/mod/file2alias.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/scripts/mod/file2alias.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/scripts/mod/file2alias.c linux-2.6.38.1/scripts/mod/file2alias.c
+--- linux-2.6.38.1/scripts/mod/file2alias.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/scripts/mod/file2alias.c 2011-03-21 18:31:35.000000000 -0400
@@ -72,7 +72,7 @@ static void device_id_check(const char *
unsigned long size, unsigned long id_size,
void *symval)
@@ -57860,9 +58116,9 @@ diff -urNp linux-2.6.38/scripts/mod/file2alias.c linux-2.6.38-new/scripts/mod/fi
sprintf(alias, "dmi*");
-diff -urNp linux-2.6.38/scripts/mod/modpost.c linux-2.6.38-new/scripts/mod/modpost.c
---- linux-2.6.38/scripts/mod/modpost.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/scripts/mod/modpost.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/scripts/mod/modpost.c linux-2.6.38.1/scripts/mod/modpost.c
+--- linux-2.6.38.1/scripts/mod/modpost.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/scripts/mod/modpost.c 2011-03-21 18:31:35.000000000 -0400
@@ -896,6 +896,7 @@ enum mismatch {
ANY_INIT_TO_ANY_EXIT,
ANY_EXIT_TO_ANY_INIT,
@@ -57930,9 +58186,9 @@ diff -urNp linux-2.6.38/scripts/mod/modpost.c linux-2.6.38-new/scripts/mod/modpo
goto close_write;
tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-2.6.38/scripts/mod/modpost.h linux-2.6.38-new/scripts/mod/modpost.h
---- linux-2.6.38/scripts/mod/modpost.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/scripts/mod/modpost.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/scripts/mod/modpost.h linux-2.6.38.1/scripts/mod/modpost.h
+--- linux-2.6.38.1/scripts/mod/modpost.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/scripts/mod/modpost.h 2011-03-21 18:31:35.000000000 -0400
@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
struct buffer {
@@ -57952,9 +58208,9 @@ diff -urNp linux-2.6.38/scripts/mod/modpost.h linux-2.6.38-new/scripts/mod/modpo
struct module {
struct module *next;
-diff -urNp linux-2.6.38/scripts/mod/sumversion.c linux-2.6.38-new/scripts/mod/sumversion.c
---- linux-2.6.38/scripts/mod/sumversion.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/scripts/mod/sumversion.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/scripts/mod/sumversion.c linux-2.6.38.1/scripts/mod/sumversion.c
+--- linux-2.6.38.1/scripts/mod/sumversion.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/scripts/mod/sumversion.c 2011-03-21 18:31:35.000000000 -0400
@@ -470,7 +470,7 @@ static void write_version(const char *fi
goto out;
}
@@ -57964,9 +58220,9 @@ diff -urNp linux-2.6.38/scripts/mod/sumversion.c linux-2.6.38-new/scripts/mod/su
warn("writing sum in %s failed: %s\n",
filename, strerror(errno));
goto out;
-diff -urNp linux-2.6.38/scripts/pnmtologo.c linux-2.6.38-new/scripts/pnmtologo.c
---- linux-2.6.38/scripts/pnmtologo.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/scripts/pnmtologo.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/scripts/pnmtologo.c linux-2.6.38.1/scripts/pnmtologo.c
+--- linux-2.6.38.1/scripts/pnmtologo.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/scripts/pnmtologo.c 2011-03-21 18:31:35.000000000 -0400
@@ -237,14 +237,14 @@ static void write_header(void)
fprintf(out, " * Linux logo %s\n", logoname);
fputs(" */\n\n", out);
@@ -57993,9 +58249,9 @@ diff -urNp linux-2.6.38/scripts/pnmtologo.c linux-2.6.38-new/scripts/pnmtologo.c
logoname);
write_hex_cnt = 0;
for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-2.6.38/security/apparmor/lsm.c linux-2.6.38-new/security/apparmor/lsm.c
---- linux-2.6.38/security/apparmor/lsm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/security/apparmor/lsm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/security/apparmor/lsm.c linux-2.6.38.1/security/apparmor/lsm.c
+--- linux-2.6.38.1/security/apparmor/lsm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/security/apparmor/lsm.c 2011-03-21 18:31:35.000000000 -0400
@@ -619,7 +619,7 @@ static int apparmor_task_setrlimit(struc
return error;
}
@@ -58005,9 +58261,9 @@ diff -urNp linux-2.6.38/security/apparmor/lsm.c linux-2.6.38-new/security/apparm
.name = "apparmor",
.ptrace_access_check = apparmor_ptrace_access_check,
-diff -urNp linux-2.6.38/security/commoncap.c linux-2.6.38-new/security/commoncap.c
---- linux-2.6.38/security/commoncap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/security/commoncap.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/security/commoncap.c linux-2.6.38.1/security/commoncap.c
+--- linux-2.6.38.1/security/commoncap.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/security/commoncap.c 2011-03-21 18:31:35.000000000 -0400
@@ -27,6 +27,7 @@
#include <linux/sched.h>
#include <linux/prctl.h>
@@ -58039,9 +58295,9 @@ diff -urNp linux-2.6.38/security/commoncap.c linux-2.6.38-new/security/commoncap
if (cred->uid != 0) {
if (bprm->cap_effective)
return 1;
-diff -urNp linux-2.6.38/security/integrity/ima/ima_api.c linux-2.6.38-new/security/integrity/ima/ima_api.c
---- linux-2.6.38/security/integrity/ima/ima_api.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/security/integrity/ima/ima_api.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/security/integrity/ima/ima_api.c linux-2.6.38.1/security/integrity/ima/ima_api.c
+--- linux-2.6.38.1/security/integrity/ima/ima_api.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/security/integrity/ima/ima_api.c 2011-03-21 18:31:35.000000000 -0400
@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
int result;
@@ -58051,9 +58307,9 @@ diff -urNp linux-2.6.38/security/integrity/ima/ima_api.c linux-2.6.38-new/securi
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry) {
-diff -urNp linux-2.6.38/security/integrity/ima/ima_fs.c linux-2.6.38-new/security/integrity/ima/ima_fs.c
---- linux-2.6.38/security/integrity/ima/ima_fs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/security/integrity/ima/ima_fs.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/security/integrity/ima/ima_fs.c linux-2.6.38.1/security/integrity/ima/ima_fs.c
+--- linux-2.6.38.1/security/integrity/ima/ima_fs.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/security/integrity/ima/ima_fs.c 2011-03-21 18:31:35.000000000 -0400
@@ -28,12 +28,12 @@
static int valid_policy = 1;
#define TMPBUFLEN 12
@@ -58069,9 +58325,9 @@ diff -urNp linux-2.6.38/security/integrity/ima/ima_fs.c linux-2.6.38-new/securit
return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
}
-diff -urNp linux-2.6.38/security/integrity/ima/ima.h linux-2.6.38-new/security/integrity/ima/ima.h
---- linux-2.6.38/security/integrity/ima/ima.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/security/integrity/ima/ima.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/security/integrity/ima/ima.h linux-2.6.38.1/security/integrity/ima/ima.h
+--- linux-2.6.38.1/security/integrity/ima/ima.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/security/integrity/ima/ima.h 2011-03-21 18:31:35.000000000 -0400
@@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino
extern spinlock_t ima_queue_lock;
@@ -58083,9 +58339,9 @@ diff -urNp linux-2.6.38/security/integrity/ima/ima.h linux-2.6.38-new/security/i
struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
};
extern struct ima_h_table ima_htable;
-diff -urNp linux-2.6.38/security/integrity/ima/ima_queue.c linux-2.6.38-new/security/integrity/ima/ima_queue.c
---- linux-2.6.38/security/integrity/ima/ima_queue.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/security/integrity/ima/ima_queue.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/security/integrity/ima/ima_queue.c linux-2.6.38.1/security/integrity/ima/ima_queue.c
+--- linux-2.6.38.1/security/integrity/ima/ima_queue.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/security/integrity/ima/ima_queue.c 2011-03-21 18:31:35.000000000 -0400
@@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i
INIT_LIST_HEAD(&qe->later);
list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -58095,9 +58351,9 @@ diff -urNp linux-2.6.38/security/integrity/ima/ima_queue.c linux-2.6.38-new/secu
key = ima_hash_key(entry->digest);
hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
return 0;
-diff -urNp linux-2.6.38/security/Kconfig linux-2.6.38-new/security/Kconfig
---- linux-2.6.38/security/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/security/Kconfig 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/security/Kconfig linux-2.6.38.1/security/Kconfig
+--- linux-2.6.38.1/security/Kconfig 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/security/Kconfig 2011-03-21 18:31:35.000000000 -0400
@@ -4,6 +4,527 @@
menu "Security options"
@@ -58635,9 +58891,9 @@ diff -urNp linux-2.6.38/security/Kconfig linux-2.6.38-new/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.38/security/min_addr.c linux-2.6.38-new/security/min_addr.c
---- linux-2.6.38/security/min_addr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/security/min_addr.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/security/min_addr.c linux-2.6.38.1/security/min_addr.c
+--- linux-2.6.38.1/security/min_addr.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/security/min_addr.c 2011-03-21 18:31:35.000000000 -0400
@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
*/
static void update_mmap_min_addr(void)
@@ -58654,9 +58910,9 @@ diff -urNp linux-2.6.38/security/min_addr.c linux-2.6.38-new/security/min_addr.c
}
/*
-diff -urNp linux-2.6.38/security/security.c linux-2.6.38-new/security/security.c
---- linux-2.6.38/security/security.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/security/security.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/security/security.c linux-2.6.38.1/security/security.c
+--- linux-2.6.38.1/security/security.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/security/security.c 2011-03-21 18:31:35.000000000 -0400
@@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI
/* things that live in capability.c */
extern void __init security_fixup_ops(struct security_operations *ops);
@@ -58678,9 +58934,9 @@ diff -urNp linux-2.6.38/security/security.c linux-2.6.38-new/security/security.c
}
/* Save user chosen LSM */
-diff -urNp linux-2.6.38/security/selinux/hooks.c linux-2.6.38-new/security/selinux/hooks.c
---- linux-2.6.38/security/selinux/hooks.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/security/selinux/hooks.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/security/selinux/hooks.c linux-2.6.38.1/security/selinux/hooks.c
+--- linux-2.6.38.1/security/selinux/hooks.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/security/selinux/hooks.c 2011-03-21 18:31:35.000000000 -0400
@@ -90,7 +90,6 @@
#define NUM_SEL_MNT_OPTS 5
@@ -58698,9 +58954,9 @@ diff -urNp linux-2.6.38/security/selinux/hooks.c linux-2.6.38-new/security/selin
.name = "selinux",
.ptrace_access_check = selinux_ptrace_access_check,
-diff -urNp linux-2.6.38/security/smack/smack_lsm.c linux-2.6.38-new/security/smack/smack_lsm.c
---- linux-2.6.38/security/smack/smack_lsm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/security/smack/smack_lsm.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/security/smack/smack_lsm.c linux-2.6.38.1/security/smack/smack_lsm.c
+--- linux-2.6.38.1/security/smack/smack_lsm.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/security/smack/smack_lsm.c 2011-03-21 18:31:35.000000000 -0400
@@ -3179,7 +3179,7 @@ static int smack_inode_getsecctx(struct
return 0;
}
@@ -58710,9 +58966,9 @@ diff -urNp linux-2.6.38/security/smack/smack_lsm.c linux-2.6.38-new/security/sma
.name = "smack",
.ptrace_access_check = smack_ptrace_access_check,
-diff -urNp linux-2.6.38/security/tomoyo/tomoyo.c linux-2.6.38-new/security/tomoyo/tomoyo.c
---- linux-2.6.38/security/tomoyo/tomoyo.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/security/tomoyo/tomoyo.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/security/tomoyo/tomoyo.c linux-2.6.38.1/security/tomoyo/tomoyo.c
+--- linux-2.6.38.1/security/tomoyo/tomoyo.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/security/tomoyo/tomoyo.c 2011-03-21 18:31:35.000000000 -0400
@@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa
* tomoyo_security_ops is a "struct security_operations" which is used for
* registering TOMOYO.
@@ -58722,9 +58978,9 @@ diff -urNp linux-2.6.38/security/tomoyo/tomoyo.c linux-2.6.38-new/security/tomoy
.name = "tomoyo",
.cred_alloc_blank = tomoyo_cred_alloc_blank,
.cred_prepare = tomoyo_cred_prepare,
-diff -urNp linux-2.6.38/sound/aoa/codecs/onyx.c linux-2.6.38-new/sound/aoa/codecs/onyx.c
---- linux-2.6.38/sound/aoa/codecs/onyx.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/sound/aoa/codecs/onyx.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/sound/aoa/codecs/onyx.c linux-2.6.38.1/sound/aoa/codecs/onyx.c
+--- linux-2.6.38.1/sound/aoa/codecs/onyx.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/sound/aoa/codecs/onyx.c 2011-03-21 18:31:35.000000000 -0400
@@ -54,7 +54,7 @@ struct onyx {
spdif_locked:1,
analog_locked:1,
@@ -58753,9 +59009,9 @@ diff -urNp linux-2.6.38/sound/aoa/codecs/onyx.c linux-2.6.38-new/sound/aoa/codec
onyx->spdif_locked = onyx->analog_locked = 0;
mutex_unlock(&onyx->mutex);
-diff -urNp linux-2.6.38/sound/aoa/codecs/onyx.h linux-2.6.38-new/sound/aoa/codecs/onyx.h
---- linux-2.6.38/sound/aoa/codecs/onyx.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/sound/aoa/codecs/onyx.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/sound/aoa/codecs/onyx.h linux-2.6.38.1/sound/aoa/codecs/onyx.h
+--- linux-2.6.38.1/sound/aoa/codecs/onyx.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/sound/aoa/codecs/onyx.h 2011-03-21 18:31:35.000000000 -0400
@@ -11,6 +11,7 @@
#include <linux/i2c.h>
#include <asm/pmac_low_i2c.h>
@@ -58764,9 +59020,9 @@ diff -urNp linux-2.6.38/sound/aoa/codecs/onyx.h linux-2.6.38-new/sound/aoa/codec
/* PCM3052 register definitions */
-diff -urNp linux-2.6.38/sound/core/oss/pcm_oss.c linux-2.6.38-new/sound/core/oss/pcm_oss.c
---- linux-2.6.38/sound/core/oss/pcm_oss.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/sound/core/oss/pcm_oss.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/sound/core/oss/pcm_oss.c linux-2.6.38.1/sound/core/oss/pcm_oss.c
+--- linux-2.6.38.1/sound/core/oss/pcm_oss.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/sound/core/oss/pcm_oss.c 2011-03-21 18:31:35.000000000 -0400
@@ -2971,8 +2971,8 @@ static void snd_pcm_oss_proc_done(struct
}
}
@@ -58778,9 +59034,9 @@ diff -urNp linux-2.6.38/sound/core/oss/pcm_oss.c linux-2.6.38-new/sound/core/oss
#endif /* CONFIG_SND_VERBOSE_PROCFS */
/*
-diff -urNp linux-2.6.38/sound/core/seq/seq_lock.h linux-2.6.38-new/sound/core/seq/seq_lock.h
---- linux-2.6.38/sound/core/seq/seq_lock.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/sound/core/seq/seq_lock.h 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/sound/core/seq/seq_lock.h linux-2.6.38.1/sound/core/seq/seq_lock.h
+--- linux-2.6.38.1/sound/core/seq/seq_lock.h 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/sound/core/seq/seq_lock.h 2011-03-21 18:31:35.000000000 -0400
@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
#else /* SMP || CONFIG_SND_DEBUG */
@@ -58796,9 +59052,9 @@ diff -urNp linux-2.6.38/sound/core/seq/seq_lock.h linux-2.6.38-new/sound/core/se
#endif /* SMP || CONFIG_SND_DEBUG */
-diff -urNp linux-2.6.38/sound/drivers/mts64.c linux-2.6.38-new/sound/drivers/mts64.c
---- linux-2.6.38/sound/drivers/mts64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/sound/drivers/mts64.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/sound/drivers/mts64.c linux-2.6.38.1/sound/drivers/mts64.c
+--- linux-2.6.38.1/sound/drivers/mts64.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/sound/drivers/mts64.c 2011-03-21 18:31:35.000000000 -0400
@@ -28,6 +28,7 @@
#include <sound/initval.h>
#include <sound/rawmidi.h>
@@ -58855,9 +59111,9 @@ diff -urNp linux-2.6.38/sound/drivers/mts64.c linux-2.6.38-new/sound/drivers/mts
return 0;
}
-diff -urNp linux-2.6.38/sound/drivers/portman2x4.c linux-2.6.38-new/sound/drivers/portman2x4.c
---- linux-2.6.38/sound/drivers/portman2x4.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/sound/drivers/portman2x4.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/sound/drivers/portman2x4.c linux-2.6.38.1/sound/drivers/portman2x4.c
+--- linux-2.6.38.1/sound/drivers/portman2x4.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/sound/drivers/portman2x4.c 2011-03-21 18:31:35.000000000 -0400
@@ -47,6 +47,7 @@
#include <sound/initval.h>
#include <sound/rawmidi.h>
@@ -58875,9 +59131,9 @@ diff -urNp linux-2.6.38/sound/drivers/portman2x4.c linux-2.6.38-new/sound/driver
int mode[PORTMAN_NUM_INPUT_PORTS];
struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
};
-diff -urNp linux-2.6.38/sound/oss/sb_audio.c linux-2.6.38-new/sound/oss/sb_audio.c
---- linux-2.6.38/sound/oss/sb_audio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/sound/oss/sb_audio.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/sound/oss/sb_audio.c linux-2.6.38.1/sound/oss/sb_audio.c
+--- linux-2.6.38.1/sound/oss/sb_audio.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/sound/oss/sb_audio.c 2011-03-21 18:31:35.000000000 -0400
@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
buf16 = (signed short *)(localbuf + localoffs);
while (c)
@@ -58887,9 +59143,9 @@ diff -urNp linux-2.6.38/sound/oss/sb_audio.c linux-2.6.38-new/sound/oss/sb_audio
if (copy_from_user(lbuf8,
userbuf+useroffs + p,
locallen))
-diff -urNp linux-2.6.38/sound/oss/swarm_cs4297a.c linux-2.6.38-new/sound/oss/swarm_cs4297a.c
---- linux-2.6.38/sound/oss/swarm_cs4297a.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/sound/oss/swarm_cs4297a.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/sound/oss/swarm_cs4297a.c linux-2.6.38.1/sound/oss/swarm_cs4297a.c
+--- linux-2.6.38.1/sound/oss/swarm_cs4297a.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/sound/oss/swarm_cs4297a.c 2011-03-21 18:31:35.000000000 -0400
@@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
{
struct cs4297a_state *s;
@@ -58924,9 +59180,9 @@ diff -urNp linux-2.6.38/sound/oss/swarm_cs4297a.c linux-2.6.38-new/sound/oss/swa
list_add(&s->list, &cs4297a_devs);
-diff -urNp linux-2.6.38/sound/pci/ac97/ac97_patch.c linux-2.6.38-new/sound/pci/ac97/ac97_patch.c
---- linux-2.6.38/sound/pci/ac97/ac97_patch.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/sound/pci/ac97/ac97_patch.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/sound/pci/ac97/ac97_patch.c linux-2.6.38.1/sound/pci/ac97/ac97_patch.c
+--- linux-2.6.38.1/sound/pci/ac97/ac97_patch.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/sound/pci/ac97/ac97_patch.c 2011-03-21 18:31:35.000000000 -0400
@@ -1486,7 +1486,7 @@ static const struct snd_ac97_res_table a
{ AC97_VIDEO, 0x9f1f },
{ AC97_AUX, 0x9f1f },
@@ -58945,9 +59201,9 @@ diff -urNp linux-2.6.38/sound/pci/ac97/ac97_patch.c linux-2.6.38-new/sound/pci/a
};
static int patch_lm4550(struct snd_ac97 *ac97)
-diff -urNp linux-2.6.38/sound/pci/ens1370.c linux-2.6.38-new/sound/pci/ens1370.c
---- linux-2.6.38/sound/pci/ens1370.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/sound/pci/ens1370.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/sound/pci/ens1370.c linux-2.6.38.1/sound/pci/ens1370.c
+--- linux-2.6.38.1/sound/pci/ens1370.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/sound/pci/ens1370.c 2011-03-21 18:31:35.000000000 -0400
@@ -452,7 +452,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_audio
{ PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
{ PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
@@ -58957,9 +59213,9 @@ diff -urNp linux-2.6.38/sound/pci/ens1370.c linux-2.6.38-new/sound/pci/ens1370.c
};
MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
-diff -urNp linux-2.6.38/sound/pci/hda/patch_hdmi.c linux-2.6.38-new/sound/pci/hda/patch_hdmi.c
---- linux-2.6.38/sound/pci/hda/patch_hdmi.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/sound/pci/hda/patch_hdmi.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/sound/pci/hda/patch_hdmi.c linux-2.6.38.1/sound/pci/hda/patch_hdmi.c
+--- linux-2.6.38.1/sound/pci/hda/patch_hdmi.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/sound/pci/hda/patch_hdmi.c 2011-03-21 18:31:35.000000000 -0400
@@ -733,10 +733,10 @@ static void hdmi_non_intrinsic_event(str
cp_ready);
@@ -58975,9 +59231,9 @@ diff -urNp linux-2.6.38/sound/pci/hda/patch_hdmi.c linux-2.6.38-new/sound/pci/hd
}
-diff -urNp linux-2.6.38/sound/pci/intel8x0.c linux-2.6.38-new/sound/pci/intel8x0.c
---- linux-2.6.38/sound/pci/intel8x0.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/sound/pci/intel8x0.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/sound/pci/intel8x0.c linux-2.6.38.1/sound/pci/intel8x0.c
+--- linux-2.6.38.1/sound/pci/intel8x0.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/sound/pci/intel8x0.c 2011-03-21 18:31:35.000000000 -0400
@@ -444,7 +444,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel
{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
{ PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
@@ -58996,9 +59252,9 @@ diff -urNp linux-2.6.38/sound/pci/intel8x0.c linux-2.6.38-new/sound/pci/intel8x0
};
static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
-diff -urNp linux-2.6.38/sound/pci/intel8x0m.c linux-2.6.38-new/sound/pci/intel8x0m.c
---- linux-2.6.38/sound/pci/intel8x0m.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/sound/pci/intel8x0m.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/sound/pci/intel8x0m.c linux-2.6.38.1/sound/pci/intel8x0m.c
+--- linux-2.6.38.1/sound/pci/intel8x0m.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/sound/pci/intel8x0m.c 2011-03-21 18:31:35.000000000 -0400
@@ -239,7 +239,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel
{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
{ PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
@@ -59017,9 +59273,9 @@ diff -urNp linux-2.6.38/sound/pci/intel8x0m.c linux-2.6.38-new/sound/pci/intel8x
};
static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
-diff -urNp linux-2.6.38/usr/gen_init_cpio.c linux-2.6.38-new/usr/gen_init_cpio.c
---- linux-2.6.38/usr/gen_init_cpio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/usr/gen_init_cpio.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/usr/gen_init_cpio.c linux-2.6.38.1/usr/gen_init_cpio.c
+--- linux-2.6.38.1/usr/gen_init_cpio.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/usr/gen_init_cpio.c 2011-03-21 18:31:35.000000000 -0400
@@ -305,7 +305,7 @@ static int cpio_mkfile(const char *name,
int retval;
int rc = -1;
@@ -59042,9 +59298,9 @@ diff -urNp linux-2.6.38/usr/gen_init_cpio.c linux-2.6.38-new/usr/gen_init_cpio.c
} else
break;
}
-diff -urNp linux-2.6.38/virt/kvm/kvm_main.c linux-2.6.38-new/virt/kvm/kvm_main.c
---- linux-2.6.38/virt/kvm/kvm_main.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38-new/virt/kvm/kvm_main.c 2011-03-21 18:31:35.000000000 -0400
+diff -urNp linux-2.6.38.1/virt/kvm/kvm_main.c linux-2.6.38.1/virt/kvm/kvm_main.c
+--- linux-2.6.38.1/virt/kvm/kvm_main.c 2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.1/virt/kvm/kvm_main.c 2011-03-21 18:31:35.000000000 -0400
@@ -1521,7 +1521,7 @@ static int kvm_vcpu_release(struct inode
return 0;
}