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-11-16 05:16:42 -0500
committerAnthony G. Basile <blueness@gentoo.org>2011-11-16 05:16:42 -0500
commit3b401f991a0a35b08dd3252133d8c9674c2cfb51 (patch)
treeee4459946e781b98424339a8ce5d519287e2d0e0
parentEOL 3.0.8 and 2.6.32.46 (diff)
downloadhardened-patchset-3b401f991a0a35b08dd3252133d8c9674c2cfb51.tar.gz
hardened-patchset-3b401f991a0a35b08dd3252133d8c9674c2cfb51.tar.bz2
hardened-patchset-3b401f991a0a35b08dd3252133d8c9674c2cfb51.zip
Grsec/PaX: 2.2.2-{2.6.32.48,3.0.9}-20111115200320111115
Diffstat
-rw-r--r--2.6.32/0000_README2
-rw-r--r--2.6.32/4420_grsecurity-2.2.2-2.6.32.48-201111152003.patch (renamed from 2.6.32/4420_grsecurity-2.2.2-2.6.32.48-201111121310.patch)6553
-rw-r--r--3.0.9/0000_README2
-rw-r--r--3.0.9/4420_grsecurity-2.2.2-3.0.9-201111152003.patch (renamed from 3.0.9/4420_grsecurity-2.2.2-3.0.9-201111121310.patch)2970
4 files changed, 4771 insertions, 4756 deletions
diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index 5e969f0..b6de0e5 100644
--- a/2.6.32/0000_README
+++ b/2.6.32/0000_README
@@ -3,7 +3,7 @@ README
Individual Patch Descriptions:
-----------------------------------------------------------------------------
-Patch: 4420_grsecurity-2.2.2-2.6.32.48-201111121310.patch
+Patch: 4420_grsecurity-2.2.2-2.6.32.48-201111152003.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/2.6.32/4420_grsecurity-2.2.2-2.6.32.48-201111121310.patch b/2.6.32/4420_grsecurity-2.2.2-2.6.32.48-201111152003.patch
index fa7931f..7ed3623 100644
--- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.48-201111121310.patch
+++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.48-201111152003.patch
@@ -1,6 +1,6 @@
diff -urNp linux-2.6.32.48/arch/alpha/include/asm/elf.h linux-2.6.32.48/arch/alpha/include/asm/elf.h
---- linux-2.6.32.48/arch/alpha/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/alpha/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/alpha/include/asm/elf.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/alpha/include/asm/elf.h 2011-11-15 19:59:42.000000000 -0500
@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
@@ -16,8 +16,8 @@ diff -urNp linux-2.6.32.48/arch/alpha/include/asm/elf.h linux-2.6.32.48/arch/alp
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.48/arch/alpha/include/asm/pgtable.h linux-2.6.32.48/arch/alpha/include/asm/pgtable.h
---- linux-2.6.32.48/arch/alpha/include/asm/pgtable.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/alpha/include/asm/pgtable.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/alpha/include/asm/pgtable.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/alpha/include/asm/pgtable.h 2011-11-15 19:59:42.000000000 -0500
@@ -101,6 +101,17 @@ struct vm_area_struct;
#define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
#define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -37,8 +37,8 @@ diff -urNp linux-2.6.32.48/arch/alpha/include/asm/pgtable.h linux-2.6.32.48/arch
#define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
diff -urNp linux-2.6.32.48/arch/alpha/kernel/module.c linux-2.6.32.48/arch/alpha/kernel/module.c
---- linux-2.6.32.48/arch/alpha/kernel/module.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/alpha/kernel/module.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/alpha/kernel/module.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/alpha/kernel/module.c 2011-11-15 19:59:42.000000000 -0500
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -49,8 +49,8 @@ diff -urNp linux-2.6.32.48/arch/alpha/kernel/module.c linux-2.6.32.48/arch/alpha
for (i = 0; i < n; i++) {
diff -urNp linux-2.6.32.48/arch/alpha/kernel/osf_sys.c linux-2.6.32.48/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32.48/arch/alpha/kernel/osf_sys.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/alpha/kernel/osf_sys.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/alpha/kernel/osf_sys.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/alpha/kernel/osf_sys.c 2011-11-15 19:59:42.000000000 -0500
@@ -1172,7 +1172,7 @@ arch_get_unmapped_area_1(unsigned long a
/* At this point: (!vma || addr < vma->vm_end). */
if (limit - len < addr)
@@ -83,8 +83,8 @@ diff -urNp linux-2.6.32.48/arch/alpha/kernel/osf_sys.c linux-2.6.32.48/arch/alph
return addr;
diff -urNp linux-2.6.32.48/arch/alpha/mm/fault.c linux-2.6.32.48/arch/alpha/mm/fault.c
---- linux-2.6.32.48/arch/alpha/mm/fault.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/alpha/mm/fault.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/alpha/mm/fault.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/alpha/mm/fault.c 2011-11-15 19:59:42.000000000 -0500
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
@@ -242,8 +242,8 @@ diff -urNp linux-2.6.32.48/arch/alpha/mm/fault.c linux-2.6.32.48/arch/alpha/mm/f
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
diff -urNp linux-2.6.32.48/arch/arm/include/asm/elf.h linux-2.6.32.48/arch/arm/include/asm/elf.h
---- linux-2.6.32.48/arch/arm/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/include/asm/elf.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/include/asm/elf.h 2011-11-15 19:59:42.000000000 -0500
@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -261,8 +261,8 @@ diff -urNp linux-2.6.32.48/arch/arm/include/asm/elf.h linux-2.6.32.48/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.48/arch/arm/include/asm/kmap_types.h linux-2.6.32.48/arch/arm/include/asm/kmap_types.h
---- linux-2.6.32.48/arch/arm/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/include/asm/kmap_types.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/include/asm/kmap_types.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/include/asm/kmap_types.h 2011-11-15 19:59:42.000000000 -0500
@@ -19,6 +19,7 @@ enum km_type {
KM_SOFTIRQ0,
KM_SOFTIRQ1,
@@ -272,8 +272,8 @@ diff -urNp linux-2.6.32.48/arch/arm/include/asm/kmap_types.h linux-2.6.32.48/arc
};
diff -urNp linux-2.6.32.48/arch/arm/include/asm/uaccess.h linux-2.6.32.48/arch/arm/include/asm/uaccess.h
---- linux-2.6.32.48/arch/arm/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/include/asm/uaccess.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/include/asm/uaccess.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/include/asm/uaccess.h 2011-11-15 19:59:42.000000000 -0500
@@ -22,6 +22,8 @@
#define VERIFY_READ 0
#define VERIFY_WRITE 1
@@ -330,8 +330,8 @@ diff -urNp linux-2.6.32.48/arch/arm/include/asm/uaccess.h linux-2.6.32.48/arch/a
n = __copy_to_user(to, from, n);
return n;
diff -urNp linux-2.6.32.48/arch/arm/kernel/armksyms.c linux-2.6.32.48/arch/arm/kernel/armksyms.c
---- linux-2.6.32.48/arch/arm/kernel/armksyms.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/kernel/armksyms.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/kernel/armksyms.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/kernel/armksyms.c 2011-11-15 19:59:42.000000000 -0500
@@ -118,8 +118,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
#ifdef CONFIG_MMU
EXPORT_SYMBOL(copy_page);
@@ -344,8 +344,8 @@ diff -urNp linux-2.6.32.48/arch/arm/kernel/armksyms.c linux-2.6.32.48/arch/arm/k
EXPORT_SYMBOL(__get_user_1);
diff -urNp linux-2.6.32.48/arch/arm/kernel/kgdb.c linux-2.6.32.48/arch/arm/kernel/kgdb.c
---- linux-2.6.32.48/arch/arm/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/kernel/kgdb.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/kernel/kgdb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/kernel/kgdb.c 2011-11-15 19:59:42.000000000 -0500
@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
* and we handle the normal undef case within the do_undefinstr
* handler.
@@ -356,8 +356,8 @@ diff -urNp linux-2.6.32.48/arch/arm/kernel/kgdb.c linux-2.6.32.48/arch/arm/kerne
.gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
#else /* ! __ARMEB__ */
diff -urNp linux-2.6.32.48/arch/arm/kernel/traps.c linux-2.6.32.48/arch/arm/kernel/traps.c
---- linux-2.6.32.48/arch/arm/kernel/traps.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/kernel/traps.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/kernel/traps.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/kernel/traps.c 2011-11-15 19:59:42.000000000 -0500
@@ -247,6 +247,8 @@ static void __die(const char *str, int e
DEFINE_SPINLOCK(die_lock);
@@ -377,8 +377,8 @@ diff -urNp linux-2.6.32.48/arch/arm/kernel/traps.c linux-2.6.32.48/arch/arm/kern
}
diff -urNp linux-2.6.32.48/arch/arm/lib/copy_from_user.S linux-2.6.32.48/arch/arm/lib/copy_from_user.S
---- linux-2.6.32.48/arch/arm/lib/copy_from_user.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/lib/copy_from_user.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/lib/copy_from_user.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/lib/copy_from_user.S 2011-11-15 19:59:42.000000000 -0500
@@ -16,7 +16,7 @@
/*
* Prototype:
@@ -403,8 +403,8 @@ diff -urNp linux-2.6.32.48/arch/arm/lib/copy_from_user.S linux-2.6.32.48/arch/ar
.section .fixup,"ax"
.align 0
diff -urNp linux-2.6.32.48/arch/arm/lib/copy_to_user.S linux-2.6.32.48/arch/arm/lib/copy_to_user.S
---- linux-2.6.32.48/arch/arm/lib/copy_to_user.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/lib/copy_to_user.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/lib/copy_to_user.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/lib/copy_to_user.S 2011-11-15 19:59:42.000000000 -0500
@@ -16,7 +16,7 @@
/*
* Prototype:
@@ -429,8 +429,8 @@ diff -urNp linux-2.6.32.48/arch/arm/lib/copy_to_user.S linux-2.6.32.48/arch/arm/
.section .fixup,"ax"
.align 0
diff -urNp linux-2.6.32.48/arch/arm/lib/uaccess.S linux-2.6.32.48/arch/arm/lib/uaccess.S
---- linux-2.6.32.48/arch/arm/lib/uaccess.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/lib/uaccess.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/lib/uaccess.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/lib/uaccess.S 2011-11-15 19:59:42.000000000 -0500
@@ -19,7 +19,7 @@
#define PAGE_SHIFT 12
@@ -485,8 +485,8 @@ diff -urNp linux-2.6.32.48/arch/arm/lib/uaccess.S linux-2.6.32.48/arch/arm/lib/u
.section .fixup,"ax"
.align 0
diff -urNp linux-2.6.32.48/arch/arm/lib/uaccess_with_memcpy.c linux-2.6.32.48/arch/arm/lib/uaccess_with_memcpy.c
---- linux-2.6.32.48/arch/arm/lib/uaccess_with_memcpy.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/lib/uaccess_with_memcpy.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/lib/uaccess_with_memcpy.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/lib/uaccess_with_memcpy.c 2011-11-15 19:59:42.000000000 -0500
@@ -97,7 +97,7 @@ out:
}
@@ -497,8 +497,8 @@ diff -urNp linux-2.6.32.48/arch/arm/lib/uaccess_with_memcpy.c linux-2.6.32.48/ar
/*
* This test is stubbed out of the main function above to keep
diff -urNp linux-2.6.32.48/arch/arm/mach-at91/pm.c linux-2.6.32.48/arch/arm/mach-at91/pm.c
---- linux-2.6.32.48/arch/arm/mach-at91/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/mach-at91/pm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/mach-at91/pm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/mach-at91/pm.c 2011-11-15 19:59:42.000000000 -0500
@@ -348,7 +348,7 @@ static void at91_pm_end(void)
}
@@ -509,8 +509,8 @@ diff -urNp linux-2.6.32.48/arch/arm/mach-at91/pm.c linux-2.6.32.48/arch/arm/mach
.begin = at91_pm_begin,
.enter = at91_pm_enter,
diff -urNp linux-2.6.32.48/arch/arm/mach-omap1/pm.c linux-2.6.32.48/arch/arm/mach-omap1/pm.c
---- linux-2.6.32.48/arch/arm/mach-omap1/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/mach-omap1/pm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/mach-omap1/pm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/mach-omap1/pm.c 2011-11-15 19:59:42.000000000 -0500
@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
@@ -521,8 +521,8 @@ diff -urNp linux-2.6.32.48/arch/arm/mach-omap1/pm.c linux-2.6.32.48/arch/arm/mac
.enter = omap_pm_enter,
.finish = omap_pm_finish,
diff -urNp linux-2.6.32.48/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.48/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.32.48/arch/arm/mach-omap2/pm24xx.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/mach-omap2/pm24xx.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/mach-omap2/pm24xx.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/mach-omap2/pm24xx.c 2011-11-15 19:59:42.000000000 -0500
@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
enable_hlt();
}
@@ -533,8 +533,8 @@ diff -urNp linux-2.6.32.48/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.48/arch/arm
.enter = omap2_pm_enter,
.finish = omap2_pm_finish,
diff -urNp linux-2.6.32.48/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.48/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.32.48/arch/arm/mach-omap2/pm34xx.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/mach-omap2/pm34xx.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/mach-omap2/pm34xx.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/mach-omap2/pm34xx.c 2011-11-15 19:59:42.000000000 -0500
@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
return;
}
@@ -545,8 +545,8 @@ diff -urNp linux-2.6.32.48/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.48/arch/arm
.end = omap3_pm_end,
.prepare = omap3_pm_prepare,
diff -urNp linux-2.6.32.48/arch/arm/mach-pnx4008/pm.c linux-2.6.32.48/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.32.48/arch/arm/mach-pnx4008/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/mach-pnx4008/pm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/mach-pnx4008/pm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/mach-pnx4008/pm.c 2011-11-15 19:59:42.000000000 -0500
@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
(state == PM_SUSPEND_MEM);
}
@@ -557,8 +557,8 @@ diff -urNp linux-2.6.32.48/arch/arm/mach-pnx4008/pm.c linux-2.6.32.48/arch/arm/m
.valid = pnx4008_pm_valid,
};
diff -urNp linux-2.6.32.48/arch/arm/mach-pxa/pm.c linux-2.6.32.48/arch/arm/mach-pxa/pm.c
---- linux-2.6.32.48/arch/arm/mach-pxa/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/mach-pxa/pm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/mach-pxa/pm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/mach-pxa/pm.c 2011-11-15 19:59:42.000000000 -0500
@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
pxa_cpu_pm_fns->finish();
}
@@ -569,8 +569,8 @@ diff -urNp linux-2.6.32.48/arch/arm/mach-pxa/pm.c linux-2.6.32.48/arch/arm/mach-
.enter = pxa_pm_enter,
.prepare = pxa_pm_prepare,
diff -urNp linux-2.6.32.48/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.48/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.32.48/arch/arm/mach-pxa/sharpsl_pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/mach-pxa/sharpsl_pm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/mach-pxa/sharpsl_pm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/mach-pxa/sharpsl_pm.c 2011-11-15 19:59:42.000000000 -0500
@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
}
@@ -581,8 +581,8 @@ diff -urNp linux-2.6.32.48/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.48/arch/a
.finish = pxa_pm_finish,
.enter = corgi_pxa_pm_enter,
diff -urNp linux-2.6.32.48/arch/arm/mach-sa1100/pm.c linux-2.6.32.48/arch/arm/mach-sa1100/pm.c
---- linux-2.6.32.48/arch/arm/mach-sa1100/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/mach-sa1100/pm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/mach-sa1100/pm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/mach-sa1100/pm.c 2011-11-15 19:59:42.000000000 -0500
@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
return virt_to_phys(sp);
}
@@ -593,8 +593,8 @@ diff -urNp linux-2.6.32.48/arch/arm/mach-sa1100/pm.c linux-2.6.32.48/arch/arm/ma
.valid = suspend_valid_only_mem,
};
diff -urNp linux-2.6.32.48/arch/arm/mm/fault.c linux-2.6.32.48/arch/arm/mm/fault.c
---- linux-2.6.32.48/arch/arm/mm/fault.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/mm/fault.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/mm/fault.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/mm/fault.c 2011-11-15 19:59:42.000000000 -0500
@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
}
#endif
@@ -644,8 +644,8 @@ diff -urNp linux-2.6.32.48/arch/arm/mm/fault.c linux-2.6.32.48/arch/arm/mm/fault
* First Level Translation Fault Handler
*
diff -urNp linux-2.6.32.48/arch/arm/mm/mmap.c linux-2.6.32.48/arch/arm/mm/mmap.c
---- linux-2.6.32.48/arch/arm/mm/mmap.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/mm/mmap.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/mm/mmap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/mm/mmap.c 2011-11-15 19:59:42.000000000 -0500
@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -696,8 +696,8 @@ diff -urNp linux-2.6.32.48/arch/arm/mm/mmap.c linux-2.6.32.48/arch/arm/mm/mmap.c
* Remember the place where we stopped the search:
*/
diff -urNp linux-2.6.32.48/arch/arm/plat-s3c/pm.c linux-2.6.32.48/arch/arm/plat-s3c/pm.c
---- linux-2.6.32.48/arch/arm/plat-s3c/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/arm/plat-s3c/pm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/arm/plat-s3c/pm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/arm/plat-s3c/pm.c 2011-11-15 19:59:42.000000000 -0500
@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
s3c_pm_check_cleanup();
}
@@ -708,8 +708,8 @@ diff -urNp linux-2.6.32.48/arch/arm/plat-s3c/pm.c linux-2.6.32.48/arch/arm/plat-
.prepare = s3c_pm_prepare,
.finish = s3c_pm_finish,
diff -urNp linux-2.6.32.48/arch/avr32/include/asm/elf.h linux-2.6.32.48/arch/avr32/include/asm/elf.h
---- linux-2.6.32.48/arch/avr32/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/avr32/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/avr32/include/asm/elf.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/avr32/include/asm/elf.h 2011-11-15 19:59:42.000000000 -0500
@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -727,8 +727,8 @@ diff -urNp linux-2.6.32.48/arch/avr32/include/asm/elf.h linux-2.6.32.48/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.48/arch/avr32/include/asm/kmap_types.h linux-2.6.32.48/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.32.48/arch/avr32/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/avr32/include/asm/kmap_types.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/avr32/include/asm/kmap_types.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/avr32/include/asm/kmap_types.h 2011-11-15 19:59:42.000000000 -0500
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
@@ -740,8 +740,8 @@ diff -urNp linux-2.6.32.48/arch/avr32/include/asm/kmap_types.h linux-2.6.32.48/a
#undef D
diff -urNp linux-2.6.32.48/arch/avr32/mach-at32ap/pm.c linux-2.6.32.48/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.32.48/arch/avr32/mach-at32ap/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/avr32/mach-at32ap/pm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/avr32/mach-at32ap/pm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/avr32/mach-at32ap/pm.c 2011-11-15 19:59:42.000000000 -0500
@@ -176,7 +176,7 @@ out:
return 0;
}
@@ -752,8 +752,8 @@ diff -urNp linux-2.6.32.48/arch/avr32/mach-at32ap/pm.c linux-2.6.32.48/arch/avr3
.enter = avr32_pm_enter,
};
diff -urNp linux-2.6.32.48/arch/avr32/mm/fault.c linux-2.6.32.48/arch/avr32/mm/fault.c
---- linux-2.6.32.48/arch/avr32/mm/fault.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/avr32/mm/fault.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/avr32/mm/fault.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/avr32/mm/fault.c 2011-11-15 19:59:42.000000000 -0500
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -796,8 +796,8 @@ diff -urNp linux-2.6.32.48/arch/avr32/mm/fault.c linux-2.6.32.48/arch/avr32/mm/f
printk("%s%s[%d]: segfault at %08lx pc %08lx "
"sp %08lx ecr %lu\n",
diff -urNp linux-2.6.32.48/arch/blackfin/kernel/kgdb.c linux-2.6.32.48/arch/blackfin/kernel/kgdb.c
---- linux-2.6.32.48/arch/blackfin/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/blackfin/kernel/kgdb.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/blackfin/kernel/kgdb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/blackfin/kernel/kgdb.c 2011-11-15 19:59:42.000000000 -0500
@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
return -1; /* this means that we do not want to exit from the handler */
}
@@ -808,8 +808,8 @@ diff -urNp linux-2.6.32.48/arch/blackfin/kernel/kgdb.c linux-2.6.32.48/arch/blac
#ifdef CONFIG_SMP
.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
diff -urNp linux-2.6.32.48/arch/blackfin/mach-common/pm.c linux-2.6.32.48/arch/blackfin/mach-common/pm.c
---- linux-2.6.32.48/arch/blackfin/mach-common/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/blackfin/mach-common/pm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/blackfin/mach-common/pm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/blackfin/mach-common/pm.c 2011-11-15 19:59:42.000000000 -0500
@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
return 0;
}
@@ -820,8 +820,8 @@ diff -urNp linux-2.6.32.48/arch/blackfin/mach-common/pm.c linux-2.6.32.48/arch/b
.valid = bfin_pm_valid,
};
diff -urNp linux-2.6.32.48/arch/frv/include/asm/kmap_types.h linux-2.6.32.48/arch/frv/include/asm/kmap_types.h
---- linux-2.6.32.48/arch/frv/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/frv/include/asm/kmap_types.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/frv/include/asm/kmap_types.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/frv/include/asm/kmap_types.h 2011-11-15 19:59:42.000000000 -0500
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -831,8 +831,8 @@ diff -urNp linux-2.6.32.48/arch/frv/include/asm/kmap_types.h linux-2.6.32.48/arc
};
diff -urNp linux-2.6.32.48/arch/frv/mm/elf-fdpic.c linux-2.6.32.48/arch/frv/mm/elf-fdpic.c
---- linux-2.6.32.48/arch/frv/mm/elf-fdpic.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/frv/mm/elf-fdpic.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/frv/mm/elf-fdpic.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/frv/mm/elf-fdpic.c 2011-11-15 19:59:42.000000000 -0500
@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
if (addr) {
addr = PAGE_ALIGN(addr);
@@ -862,8 +862,8 @@ diff -urNp linux-2.6.32.48/arch/frv/mm/elf-fdpic.c linux-2.6.32.48/arch/frv/mm/e
addr = vma->vm_end;
}
diff -urNp linux-2.6.32.48/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.48/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.32.48/arch/ia64/hp/common/hwsw_iommu.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/hp/common/hwsw_iommu.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/hp/common/hwsw_iommu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/hp/common/hwsw_iommu.c 2011-11-15 19:59:42.000000000 -0500
@@ -17,7 +17,7 @@
#include <linux/swiotlb.h>
#include <asm/machvec.h>
@@ -883,8 +883,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.48/arch
if (use_swiotlb(dev))
return &swiotlb_dma_ops;
diff -urNp linux-2.6.32.48/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.48/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.32.48/arch/ia64/hp/common/sba_iommu.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/hp/common/sba_iommu.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/hp/common/sba_iommu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/hp/common/sba_iommu.c 2011-11-15 19:59:42.000000000 -0500
@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
},
};
@@ -904,8 +904,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.48/arch/
.free_coherent = sba_free_coherent,
.map_page = sba_map_page,
diff -urNp linux-2.6.32.48/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.48/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.32.48/arch/ia64/ia32/binfmt_elf32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/ia32/binfmt_elf32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/ia32/binfmt_elf32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/ia32/binfmt_elf32.c 2011-11-15 19:59:42.000000000 -0500
@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
#define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack))
@@ -921,8 +921,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.48/arch/ia
#include "../../../fs/binfmt_elf.c"
diff -urNp linux-2.6.32.48/arch/ia64/ia32/ia32priv.h linux-2.6.32.48/arch/ia64/ia32/ia32priv.h
---- linux-2.6.32.48/arch/ia64/ia32/ia32priv.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/ia32/ia32priv.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/ia32/ia32priv.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/ia32/ia32priv.h 2011-11-15 19:59:42.000000000 -0500
@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
#define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_386
@@ -940,8 +940,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/ia32/ia32priv.h linux-2.6.32.48/arch/ia64/i
#define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
diff -urNp linux-2.6.32.48/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.48/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.32.48/arch/ia64/include/asm/dma-mapping.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/include/asm/dma-mapping.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/include/asm/dma-mapping.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/include/asm/dma-mapping.h 2011-11-15 19:59:42.000000000 -0500
@@ -12,7 +12,7 @@
#define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -986,8 +986,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.48/a
}
diff -urNp linux-2.6.32.48/arch/ia64/include/asm/elf.h linux-2.6.32.48/arch/ia64/include/asm/elf.h
---- linux-2.6.32.48/arch/ia64/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/include/asm/elf.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/include/asm/elf.h 2011-11-15 19:59:42.000000000 -0500
@@ -43,6 +43,13 @@
*/
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -1003,8 +1003,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/include/asm/elf.h linux-2.6.32.48/arch/ia64
/* IA-64 relocations: */
diff -urNp linux-2.6.32.48/arch/ia64/include/asm/machvec.h linux-2.6.32.48/arch/ia64/include/asm/machvec.h
---- linux-2.6.32.48/arch/ia64/include/asm/machvec.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/include/asm/machvec.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/include/asm/machvec.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/include/asm/machvec.h 2011-11-15 19:59:42.000000000 -0500
@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
/* DMA-mapping interface: */
typedef void ia64_mv_dma_init (void);
@@ -1024,8 +1024,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/include/asm/machvec.h linux-2.6.32.48/arch/
/*
* Define default versions so we can extend machvec for new platforms without having
diff -urNp linux-2.6.32.48/arch/ia64/include/asm/pgtable.h linux-2.6.32.48/arch/ia64/include/asm/pgtable.h
---- linux-2.6.32.48/arch/ia64/include/asm/pgtable.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/include/asm/pgtable.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/include/asm/pgtable.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/include/asm/pgtable.h 2011-11-15 19:59:42.000000000 -0500
@@ -12,7 +12,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
@@ -1054,8 +1054,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/include/asm/pgtable.h linux-2.6.32.48/arch/
#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.48/arch/ia64/include/asm/spinlock.h linux-2.6.32.48/arch/ia64/include/asm/spinlock.h
---- linux-2.6.32.48/arch/ia64/include/asm/spinlock.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/include/asm/spinlock.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/include/asm/spinlock.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/include/asm/spinlock.h 2011-11-15 19:59:42.000000000 -0500
@@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
@@ -1066,8 +1066,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/include/asm/spinlock.h linux-2.6.32.48/arch
static __always_inline void __ticket_spin_unlock_wait(raw_spinlock_t *lock)
diff -urNp linux-2.6.32.48/arch/ia64/include/asm/uaccess.h linux-2.6.32.48/arch/ia64/include/asm/uaccess.h
---- linux-2.6.32.48/arch/ia64/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/include/asm/uaccess.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/include/asm/uaccess.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/include/asm/uaccess.h 2011-11-15 19:59:42.000000000 -0500
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
const void *__cu_from = (from); \
long __cu_len = (n); \
@@ -1087,8 +1087,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/include/asm/uaccess.h linux-2.6.32.48/arch/
__cu_len; \
})
diff -urNp linux-2.6.32.48/arch/ia64/kernel/dma-mapping.c linux-2.6.32.48/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.32.48/arch/ia64/kernel/dma-mapping.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/kernel/dma-mapping.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/kernel/dma-mapping.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/kernel/dma-mapping.c 2011-11-15 19:59:42.000000000 -0500
@@ -3,7 +3,7 @@
/* Set this to 1 if there is a HW IOMMU in the system */
int iommu_detected __read_mostly;
@@ -1108,8 +1108,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/kernel/dma-mapping.c linux-2.6.32.48/arch/i
return dma_ops;
}
diff -urNp linux-2.6.32.48/arch/ia64/kernel/module.c linux-2.6.32.48/arch/ia64/kernel/module.c
---- linux-2.6.32.48/arch/ia64/kernel/module.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/kernel/module.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/kernel/module.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/kernel/module.c 2011-11-15 19:59:42.000000000 -0500
@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
void
module_free (struct module *mod, void *module_region)
@@ -1199,8 +1199,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/kernel/module.c linux-2.6.32.48/arch/ia64/k
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
diff -urNp linux-2.6.32.48/arch/ia64/kernel/pci-dma.c linux-2.6.32.48/arch/ia64/kernel/pci-dma.c
---- linux-2.6.32.48/arch/ia64/kernel/pci-dma.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/kernel/pci-dma.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/kernel/pci-dma.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/kernel/pci-dma.c 2011-11-15 19:59:42.000000000 -0500
@@ -43,7 +43,7 @@ struct device fallback_dev = {
.dma_mask = &fallback_dev.coherent_dma_mask,
};
@@ -1253,8 +1253,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/kernel/pci-dma.c linux-2.6.32.48/arch/ia64/
/*
* The order of these functions is important for
diff -urNp linux-2.6.32.48/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.48/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.32.48/arch/ia64/kernel/pci-swiotlb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/kernel/pci-swiotlb.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/kernel/pci-swiotlb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/kernel/pci-swiotlb.c 2011-11-15 19:59:42.000000000 -0500
@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
}
@@ -1265,8 +1265,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.48/arch/i
.free_coherent = swiotlb_free_coherent,
.map_page = swiotlb_map_page,
diff -urNp linux-2.6.32.48/arch/ia64/kernel/sys_ia64.c linux-2.6.32.48/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.32.48/arch/ia64/kernel/sys_ia64.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/kernel/sys_ia64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/kernel/sys_ia64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/kernel/sys_ia64.c 2011-11-15 19:59:42.000000000 -0500
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
@@ -1300,8 +1300,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/kernel/sys_ia64.c linux-2.6.32.48/arch/ia64
mm->free_area_cache = addr + len;
return addr;
diff -urNp linux-2.6.32.48/arch/ia64/kernel/topology.c linux-2.6.32.48/arch/ia64/kernel/topology.c
---- linux-2.6.32.48/arch/ia64/kernel/topology.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/kernel/topology.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/kernel/topology.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/kernel/topology.c 2011-11-15 19:59:42.000000000 -0500
@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
return ret;
}
@@ -1312,8 +1312,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/kernel/topology.c linux-2.6.32.48/arch/ia64
};
diff -urNp linux-2.6.32.48/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.48/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.32.48/arch/ia64/kernel/vmlinux.lds.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/kernel/vmlinux.lds.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/kernel/vmlinux.lds.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/kernel/vmlinux.lds.S 2011-11-15 19:59:42.000000000 -0500
@@ -190,7 +190,7 @@ SECTIONS
/* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE);
@@ -1324,8 +1324,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.48/arch/i
* into percpu page size
*/
diff -urNp linux-2.6.32.48/arch/ia64/mm/fault.c linux-2.6.32.48/arch/ia64/mm/fault.c
---- linux-2.6.32.48/arch/ia64/mm/fault.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/mm/fault.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/mm/fault.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/mm/fault.c 2011-11-15 19:59:42.000000000 -0500
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
return pte_present(pte);
}
@@ -1376,8 +1376,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/mm/fault.c linux-2.6.32.48/arch/ia64/mm/fau
/*
* If for any reason at all we couldn't handle the fault, make
diff -urNp linux-2.6.32.48/arch/ia64/mm/hugetlbpage.c linux-2.6.32.48/arch/ia64/mm/hugetlbpage.c
---- linux-2.6.32.48/arch/ia64/mm/hugetlbpage.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/mm/hugetlbpage.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/mm/hugetlbpage.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/mm/hugetlbpage.c 2011-11-15 19:59:42.000000000 -0500
@@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area(
/* At this point: (!vmm || addr < vmm->vm_end). */
if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
@@ -1388,8 +1388,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/mm/hugetlbpage.c linux-2.6.32.48/arch/ia64/
addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
}
diff -urNp linux-2.6.32.48/arch/ia64/mm/init.c linux-2.6.32.48/arch/ia64/mm/init.c
---- linux-2.6.32.48/arch/ia64/mm/init.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/mm/init.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/mm/init.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/mm/init.c 2011-11-15 19:59:42.000000000 -0500
@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1411,8 +1411,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/mm/init.c linux-2.6.32.48/arch/ia64/mm/init
down_write(&current->mm->mmap_sem);
if (insert_vm_struct(current->mm, vma)) {
diff -urNp linux-2.6.32.48/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.48/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.32.48/arch/ia64/sn/pci/pci_dma.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/ia64/sn/pci/pci_dma.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/ia64/sn/pci/pci_dma.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/ia64/sn/pci/pci_dma.c 2011-11-15 19:59:42.000000000 -0500
@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
return ret;
}
@@ -1423,8 +1423,8 @@ diff -urNp linux-2.6.32.48/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.48/arch/ia64/
.free_coherent = sn_dma_free_coherent,
.map_page = sn_dma_map_page,
diff -urNp linux-2.6.32.48/arch/m32r/lib/usercopy.c linux-2.6.32.48/arch/m32r/lib/usercopy.c
---- linux-2.6.32.48/arch/m32r/lib/usercopy.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/m32r/lib/usercopy.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/m32r/lib/usercopy.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/m32r/lib/usercopy.c 2011-11-15 19:59:42.000000000 -0500
@@ -14,6 +14,9 @@
unsigned long
__generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1446,8 +1446,8 @@ diff -urNp linux-2.6.32.48/arch/m32r/lib/usercopy.c linux-2.6.32.48/arch/m32r/li
if (access_ok(VERIFY_READ, from, n))
__copy_user_zeroing(to,from,n);
diff -urNp linux-2.6.32.48/arch/mips/alchemy/devboards/pm.c linux-2.6.32.48/arch/mips/alchemy/devboards/pm.c
---- linux-2.6.32.48/arch/mips/alchemy/devboards/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/mips/alchemy/devboards/pm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/mips/alchemy/devboards/pm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/mips/alchemy/devboards/pm.c 2011-11-15 19:59:42.000000000 -0500
@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
}
@@ -1458,8 +1458,8 @@ diff -urNp linux-2.6.32.48/arch/mips/alchemy/devboards/pm.c linux-2.6.32.48/arch
.begin = db1x_pm_begin,
.enter = db1x_pm_enter,
diff -urNp linux-2.6.32.48/arch/mips/include/asm/elf.h linux-2.6.32.48/arch/mips/include/asm/elf.h
---- linux-2.6.32.48/arch/mips/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/mips/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/mips/include/asm/elf.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/mips/include/asm/elf.h 2011-11-15 19:59:42.000000000 -0500
@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
#endif
@@ -1473,8 +1473,8 @@ diff -urNp linux-2.6.32.48/arch/mips/include/asm/elf.h linux-2.6.32.48/arch/mips
+
#endif /* _ASM_ELF_H */
diff -urNp linux-2.6.32.48/arch/mips/include/asm/page.h linux-2.6.32.48/arch/mips/include/asm/page.h
---- linux-2.6.32.48/arch/mips/include/asm/page.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/mips/include/asm/page.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/mips/include/asm/page.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/mips/include/asm/page.h 2011-11-15 19:59:42.000000000 -0500
@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
#ifdef CONFIG_CPU_MIPS32
typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1485,8 +1485,8 @@ diff -urNp linux-2.6.32.48/arch/mips/include/asm/page.h linux-2.6.32.48/arch/mip
typedef struct { unsigned long long pte; } pte_t;
#define pte_val(x) ((x).pte)
diff -urNp linux-2.6.32.48/arch/mips/include/asm/reboot.h linux-2.6.32.48/arch/mips/include/asm/reboot.h
---- linux-2.6.32.48/arch/mips/include/asm/reboot.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/mips/include/asm/reboot.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/mips/include/asm/reboot.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/mips/include/asm/reboot.h 2011-11-15 19:59:42.000000000 -0500
@@ -9,7 +9,7 @@
#ifndef _ASM_REBOOT_H
#define _ASM_REBOOT_H
@@ -1498,8 +1498,8 @@ diff -urNp linux-2.6.32.48/arch/mips/include/asm/reboot.h linux-2.6.32.48/arch/m
#endif /* _ASM_REBOOT_H */
diff -urNp linux-2.6.32.48/arch/mips/include/asm/system.h linux-2.6.32.48/arch/mips/include/asm/system.h
---- linux-2.6.32.48/arch/mips/include/asm/system.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/mips/include/asm/system.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/mips/include/asm/system.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/mips/include/asm/system.h 2011-11-15 19:59:42.000000000 -0500
@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
*/
#define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1509,8 +1509,8 @@ diff -urNp linux-2.6.32.48/arch/mips/include/asm/system.h linux-2.6.32.48/arch/m
#endif /* _ASM_SYSTEM_H */
diff -urNp linux-2.6.32.48/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.48/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.32.48/arch/mips/kernel/binfmt_elfn32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/mips/kernel/binfmt_elfn32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/mips/kernel/binfmt_elfn32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/mips/kernel/binfmt_elfn32.c 2011-11-15 19:59:42.000000000 -0500
@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1526,8 +1526,8 @@ diff -urNp linux-2.6.32.48/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.48/arch
#include <linux/module.h>
#include <linux/elfcore.h>
diff -urNp linux-2.6.32.48/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.48/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.32.48/arch/mips/kernel/binfmt_elfo32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/mips/kernel/binfmt_elfo32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/mips/kernel/binfmt_elfo32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/mips/kernel/binfmt_elfo32.c 2011-11-15 19:59:42.000000000 -0500
@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1543,8 +1543,8 @@ diff -urNp linux-2.6.32.48/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.48/arch
/*
diff -urNp linux-2.6.32.48/arch/mips/kernel/kgdb.c linux-2.6.32.48/arch/mips/kernel/kgdb.c
---- linux-2.6.32.48/arch/mips/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/mips/kernel/kgdb.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/mips/kernel/kgdb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/mips/kernel/kgdb.c 2011-11-15 19:59:42.000000000 -0500
@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
return -1;
}
@@ -1554,8 +1554,8 @@ diff -urNp linux-2.6.32.48/arch/mips/kernel/kgdb.c linux-2.6.32.48/arch/mips/ker
/*
diff -urNp linux-2.6.32.48/arch/mips/kernel/process.c linux-2.6.32.48/arch/mips/kernel/process.c
---- linux-2.6.32.48/arch/mips/kernel/process.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/mips/kernel/process.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/mips/kernel/process.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/mips/kernel/process.c 2011-11-15 19:59:42.000000000 -0500
@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
out:
return pc;
@@ -1573,8 +1573,8 @@ diff -urNp linux-2.6.32.48/arch/mips/kernel/process.c linux-2.6.32.48/arch/mips/
- return sp & ALMASK;
-}
diff -urNp linux-2.6.32.48/arch/mips/kernel/reset.c linux-2.6.32.48/arch/mips/kernel/reset.c
---- linux-2.6.32.48/arch/mips/kernel/reset.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/mips/kernel/reset.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/mips/kernel/reset.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/mips/kernel/reset.c 2011-11-15 19:59:42.000000000 -0500
@@ -19,8 +19,8 @@
* So handle all using function pointers to machine specific
* functions.
@@ -1607,8 +1607,8 @@ diff -urNp linux-2.6.32.48/arch/mips/kernel/reset.c linux-2.6.32.48/arch/mips/ke
+ BUG();
}
diff -urNp linux-2.6.32.48/arch/mips/kernel/syscall.c linux-2.6.32.48/arch/mips/kernel/syscall.c
---- linux-2.6.32.48/arch/mips/kernel/syscall.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/mips/kernel/syscall.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/mips/kernel/syscall.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/mips/kernel/syscall.c 2011-11-15 19:59:42.000000000 -0500
@@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str
do_color_align = 0;
if (filp || (flags & MAP_SHARED))
@@ -1644,8 +1644,8 @@ diff -urNp linux-2.6.32.48/arch/mips/kernel/syscall.c linux-2.6.32.48/arch/mips/
addr = vmm->vm_end;
if (do_color_align)
diff -urNp linux-2.6.32.48/arch/mips/Makefile linux-2.6.32.48/arch/mips/Makefile
---- linux-2.6.32.48/arch/mips/Makefile 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/mips/Makefile 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/mips/Makefile 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/mips/Makefile 2011-11-15 19:59:42.000000000 -0500
@@ -51,6 +51,8 @@ endif
cflags-y := -ffunction-sections
cflags-y += $(call cc-option, -mno-check-zero-division)
@@ -1656,8 +1656,8 @@ diff -urNp linux-2.6.32.48/arch/mips/Makefile linux-2.6.32.48/arch/mips/Makefile
ld-emul = $(32bit-emul)
vmlinux-32 = vmlinux
diff -urNp linux-2.6.32.48/arch/mips/mm/fault.c linux-2.6.32.48/arch/mips/mm/fault.c
---- linux-2.6.32.48/arch/mips/mm/fault.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/mips/mm/fault.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/mips/mm/fault.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/mips/mm/fault.c 2011-11-15 19:59:42.000000000 -0500
@@ -26,6 +26,23 @@
#include <asm/ptrace.h>
#include <asm/highmem.h> /* For VMALLOC_END */
@@ -1683,8 +1683,8 @@ diff -urNp linux-2.6.32.48/arch/mips/mm/fault.c linux-2.6.32.48/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.48/arch/parisc/include/asm/elf.h linux-2.6.32.48/arch/parisc/include/asm/elf.h
---- linux-2.6.32.48/arch/parisc/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/parisc/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/parisc/include/asm/elf.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/parisc/include/asm/elf.h 2011-11-15 19:59:42.000000000 -0500
@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1700,8 +1700,8 @@ diff -urNp linux-2.6.32.48/arch/parisc/include/asm/elf.h linux-2.6.32.48/arch/pa
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.48/arch/parisc/include/asm/pgtable.h linux-2.6.32.48/arch/parisc/include/asm/pgtable.h
---- linux-2.6.32.48/arch/parisc/include/asm/pgtable.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/parisc/include/asm/pgtable.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/parisc/include/asm/pgtable.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/parisc/include/asm/pgtable.h 2011-11-15 19:59:42.000000000 -0500
@@ -207,6 +207,17 @@
#define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
#define PAGE_COPY PAGE_EXECREAD
@@ -1721,8 +1721,8 @@ diff -urNp linux-2.6.32.48/arch/parisc/include/asm/pgtable.h linux-2.6.32.48/arc
#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.48/arch/parisc/kernel/module.c linux-2.6.32.48/arch/parisc/kernel/module.c
---- linux-2.6.32.48/arch/parisc/kernel/module.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/parisc/kernel/module.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/parisc/kernel/module.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/parisc/kernel/module.c 2011-11-15 19:59:42.000000000 -0500
@@ -95,16 +95,38 @@
/* three functions to determine where in the module core
@@ -1824,8 +1824,8 @@ diff -urNp linux-2.6.32.48/arch/parisc/kernel/module.c linux-2.6.32.48/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.48/arch/parisc/kernel/sys_parisc.c linux-2.6.32.48/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.32.48/arch/parisc/kernel/sys_parisc.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/parisc/kernel/sys_parisc.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/parisc/kernel/sys_parisc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/parisc/kernel/sys_parisc.c 2011-11-15 19:59:42.000000000 -0500
@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
/* At this point: (!vma || addr < vma->vm_end). */
if (TASK_SIZE - len < addr)
@@ -1854,8 +1854,8 @@ diff -urNp linux-2.6.32.48/arch/parisc/kernel/sys_parisc.c linux-2.6.32.48/arch/
if (filp) {
addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
diff -urNp linux-2.6.32.48/arch/parisc/kernel/traps.c linux-2.6.32.48/arch/parisc/kernel/traps.c
---- linux-2.6.32.48/arch/parisc/kernel/traps.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/parisc/kernel/traps.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/parisc/kernel/traps.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/parisc/kernel/traps.c 2011-11-15 19:59:42.000000000 -0500
@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
down_read(&current->mm->mmap_sem);
@@ -1868,8 +1868,8 @@ diff -urNp linux-2.6.32.48/arch/parisc/kernel/traps.c linux-2.6.32.48/arch/paris
fault_space = regs->iasq[0];
diff -urNp linux-2.6.32.48/arch/parisc/mm/fault.c linux-2.6.32.48/arch/parisc/mm/fault.c
---- linux-2.6.32.48/arch/parisc/mm/fault.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/parisc/mm/fault.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/parisc/mm/fault.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/parisc/mm/fault.c 2011-11-15 19:59:42.000000000 -0500
@@ -15,6 +15,7 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -2040,8 +2040,8 @@ diff -urNp linux-2.6.32.48/arch/parisc/mm/fault.c linux-2.6.32.48/arch/parisc/mm
/*
* If for any reason at all we couldn't handle the fault, make
diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/device.h linux-2.6.32.48/arch/powerpc/include/asm/device.h
---- linux-2.6.32.48/arch/powerpc/include/asm/device.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/include/asm/device.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/include/asm/device.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/include/asm/device.h 2011-11-15 19:59:42.000000000 -0500
@@ -14,7 +14,7 @@ struct dev_archdata {
struct device_node *of_node;
@@ -2052,8 +2052,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/device.h linux-2.6.32.48/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.48/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.48/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.32.48/arch/powerpc/include/asm/dma-mapping.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/include/asm/dma-mapping.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/include/asm/dma-mapping.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/include/asm/dma-mapping.h 2011-11-15 19:59:42.000000000 -0500
@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
#ifdef CONFIG_PPC64
extern struct dma_map_ops dma_iommu_ops;
@@ -2121,8 +2121,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.4
if (dma_ops->mapping_error)
return dma_ops->mapping_error(dev, dma_addr);
diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/elf.h linux-2.6.32.48/arch/powerpc/include/asm/elf.h
---- linux-2.6.32.48/arch/powerpc/include/asm/elf.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/include/asm/elf.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/include/asm/elf.h 2011-11-15 19:59:42.000000000 -0500
@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -2156,8 +2156,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/elf.h linux-2.6.32.48/arch/p
/*
diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/iommu.h linux-2.6.32.48/arch/powerpc/include/asm/iommu.h
---- linux-2.6.32.48/arch/powerpc/include/asm/iommu.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/include/asm/iommu.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/include/asm/iommu.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/include/asm/iommu.h 2011-11-15 19:59:42.000000000 -0500
@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
extern void iommu_init_early_dart(void);
extern void iommu_init_early_pasemi(void);
@@ -2169,8 +2169,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/iommu.h linux-2.6.32.48/arch
extern void pci_iommu_init(void);
extern void pci_direct_iommu_init(void);
diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.48/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.32.48/arch/powerpc/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/include/asm/kmap_types.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/include/asm/kmap_types.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/include/asm/kmap_types.h 2011-11-15 19:59:42.000000000 -0500
@@ -26,6 +26,7 @@ enum km_type {
KM_SOFTIRQ1,
KM_PPC_SYNC_PAGE,
@@ -2180,8 +2180,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.48
};
diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/page_64.h linux-2.6.32.48/arch/powerpc/include/asm/page_64.h
---- linux-2.6.32.48/arch/powerpc/include/asm/page_64.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/include/asm/page_64.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/include/asm/page_64.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/include/asm/page_64.h 2011-11-15 19:59:42.000000000 -0500
@@ -180,15 +180,18 @@ do { \
* stack by default, so in the absense of a PT_GNU_STACK program header
* we turn execute permission off.
@@ -2204,8 +2204,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/page_64.h linux-2.6.32.48/ar
#include <asm-generic/getorder.h>
diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/page.h linux-2.6.32.48/arch/powerpc/include/asm/page.h
---- linux-2.6.32.48/arch/powerpc/include/asm/page.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/include/asm/page.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/include/asm/page.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/include/asm/page.h 2011-11-15 19:59:42.000000000 -0500
@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
* and needs to be executable. This means the whole heap ends
* up being executable.
@@ -2229,8 +2229,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/page.h linux-2.6.32.48/arch/
#undef STRICT_MM_TYPECHECKS
diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/pci.h linux-2.6.32.48/arch/powerpc/include/asm/pci.h
---- linux-2.6.32.48/arch/powerpc/include/asm/pci.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/include/asm/pci.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/include/asm/pci.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/include/asm/pci.h 2011-11-15 19:59:42.000000000 -0500
@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
}
@@ -2243,8 +2243,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/pci.h linux-2.6.32.48/arch/p
#define set_pci_dma_ops(d)
#define get_pci_dma_ops() NULL
diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/pgtable.h linux-2.6.32.48/arch/powerpc/include/asm/pgtable.h
---- linux-2.6.32.48/arch/powerpc/include/asm/pgtable.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/include/asm/pgtable.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/include/asm/pgtable.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/include/asm/pgtable.h 2011-11-15 19:59:42.000000000 -0500
@@ -2,6 +2,7 @@
#define _ASM_POWERPC_PGTABLE_H
#ifdef __KERNEL__
@@ -2254,8 +2254,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/pgtable.h linux-2.6.32.48/ar
#include <asm/processor.h> /* For TASK_SIZE */
#include <asm/mmu.h>
diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.48/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.32.48/arch/powerpc/include/asm/pte-hash32.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/include/asm/pte-hash32.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/include/asm/pte-hash32.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/include/asm/pte-hash32.h 2011-11-15 19:59:42.000000000 -0500
@@ -21,6 +21,7 @@
#define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
#define _PAGE_USER 0x004 /* usermode access allowed */
@@ -2265,8 +2265,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.48
#define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
#define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/ptrace.h linux-2.6.32.48/arch/powerpc/include/asm/ptrace.h
---- linux-2.6.32.48/arch/powerpc/include/asm/ptrace.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/include/asm/ptrace.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/include/asm/ptrace.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/include/asm/ptrace.h 2011-11-15 19:59:42.000000000 -0500
@@ -103,7 +103,7 @@ extern unsigned long profile_pc(struct p
} while(0)
@@ -2277,8 +2277,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/ptrace.h linux-2.6.32.48/arc
unsigned long data);
diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/reg.h linux-2.6.32.48/arch/powerpc/include/asm/reg.h
---- linux-2.6.32.48/arch/powerpc/include/asm/reg.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/include/asm/reg.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/include/asm/reg.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/include/asm/reg.h 2011-11-15 19:59:42.000000000 -0500
@@ -191,6 +191,7 @@
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -2288,8 +2288,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/reg.h linux-2.6.32.48/arch/p
#define DSISR_ISSTORE 0x02000000 /* access was a store */
#define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.48/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.32.48/arch/powerpc/include/asm/swiotlb.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/include/asm/swiotlb.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/include/asm/swiotlb.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/include/asm/swiotlb.h 2011-11-15 19:59:42.000000000 -0500
@@ -13,7 +13,7 @@
#include <linux/swiotlb.h>
@@ -2300,8 +2300,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.48/ar
static inline void dma_mark_clean(void *addr, size_t size) {}
diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/system.h linux-2.6.32.48/arch/powerpc/include/asm/system.h
---- linux-2.6.32.48/arch/powerpc/include/asm/system.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/include/asm/system.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/include/asm/system.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/include/asm/system.h 2011-11-15 19:59:42.000000000 -0500
@@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi
#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
#endif
@@ -2312,8 +2312,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/system.h linux-2.6.32.48/arc
/* Used in very early kernel initialization. */
extern unsigned long reloc_offset(void);
diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/uaccess.h linux-2.6.32.48/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.32.48/arch/powerpc/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/include/asm/uaccess.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/include/asm/uaccess.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/include/asm/uaccess.h 2011-11-15 19:59:42.000000000 -0500
@@ -13,6 +13,8 @@
#define VERIFY_READ 0
#define VERIFY_WRITE 1
@@ -2492,8 +2492,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/uaccess.h linux-2.6.32.48/ar
static inline unsigned long clear_user(void __user *addr, unsigned long size)
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.48/arch/powerpc/kernel/cacheinfo.c
---- linux-2.6.32.48/arch/powerpc/kernel/cacheinfo.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/cacheinfo.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/cacheinfo.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/cacheinfo.c 2011-11-15 19:59:42.000000000 -0500
@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
&cache_assoc_attr,
};
@@ -2504,8 +2504,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.48/arch/
};
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/dma.c linux-2.6.32.48/arch/powerpc/kernel/dma.c
---- linux-2.6.32.48/arch/powerpc/kernel/dma.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/dma.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/dma.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/dma.c 2011-11-15 19:59:42.000000000 -0500
@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
}
#endif
@@ -2516,8 +2516,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/dma.c linux-2.6.32.48/arch/powerp
.free_coherent = dma_direct_free_coherent,
.map_sg = dma_direct_map_sg,
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.48/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.32.48/arch/powerpc/kernel/dma-iommu.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/dma-iommu.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/dma-iommu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/dma-iommu.c 2011-11-15 19:59:42.000000000 -0500
@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
}
@@ -2528,8 +2528,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.48/arch/
struct iommu_table *tbl = get_iommu_table_base(dev);
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.48/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.32.48/arch/powerpc/kernel/dma-swiotlb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/dma-swiotlb.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/dma-swiotlb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/dma-swiotlb.c 2011-11-15 19:59:42.000000000 -0500
@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
* map_page, and unmap_page on highmem, use normal dma_ops
* for everything else.
@@ -2540,8 +2540,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.48/arc
.free_coherent = dma_direct_free_coherent,
.map_sg = swiotlb_map_sg_attrs,
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.48/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.32.48/arch/powerpc/kernel/exceptions-64e.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/exceptions-64e.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/exceptions-64e.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/exceptions-64e.S 2011-11-15 19:59:42.000000000 -0500
@@ -455,6 +455,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
@@ -2561,8 +2561,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.48/
ld r4,_DAR(r1)
bl .bad_page_fault
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.48/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.32.48/arch/powerpc/kernel/exceptions-64s.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/exceptions-64s.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/exceptions-64s.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/exceptions-64s.S 2011-11-15 19:59:42.000000000 -0500
@@ -818,10 +818,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
@@ -2576,8 +2576,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.48/
addi r3,r1,STACK_FRAME_OVERHEAD
lwz r4,_DAR(r1)
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/ibmebus.c linux-2.6.32.48/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.32.48/arch/powerpc/kernel/ibmebus.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/ibmebus.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/ibmebus.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/ibmebus.c 2011-11-15 19:59:42.000000000 -0500
@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
return 1;
}
@@ -2588,8 +2588,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/ibmebus.c linux-2.6.32.48/arch/po
.free_coherent = ibmebus_free_coherent,
.map_sg = ibmebus_map_sg,
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/kgdb.c linux-2.6.32.48/arch/powerpc/kernel/kgdb.c
---- linux-2.6.32.48/arch/powerpc/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/kgdb.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/kgdb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/kgdb.c 2011-11-15 19:59:42.000000000 -0500
@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
return 0;
@@ -2609,8 +2609,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/kgdb.c linux-2.6.32.48/arch/power
};
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/module_32.c linux-2.6.32.48/arch/powerpc/kernel/module_32.c
---- linux-2.6.32.48/arch/powerpc/kernel/module_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/module_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/module_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/module_32.c 2011-11-15 19:59:42.000000000 -0500
@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
me->arch.core_plt_section = i;
}
@@ -2641,8 +2641,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/module_32.c linux-2.6.32.48/arch/
/* Find this entry, or if that fails, the next avail. entry */
while (entry->jump[0]) {
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/module.c linux-2.6.32.48/arch/powerpc/kernel/module.c
---- linux-2.6.32.48/arch/powerpc/kernel/module.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/module.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/module.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/module.c 2011-11-15 19:59:42.000000000 -0500
@@ -31,11 +31,24 @@
LIST_HEAD(module_bug_list);
@@ -2683,8 +2683,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/module.c linux-2.6.32.48/arch/pow
const Elf_Shdr *sechdrs,
const char *name)
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/pci-common.c linux-2.6.32.48/arch/powerpc/kernel/pci-common.c
---- linux-2.6.32.48/arch/powerpc/kernel/pci-common.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/pci-common.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/pci-common.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/pci-common.c 2011-11-15 19:59:42.000000000 -0500
@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
unsigned int ppc_pci_flags = 0;
@@ -2704,8 +2704,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/pci-common.c linux-2.6.32.48/arch
return pci_dma_ops;
}
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/process.c linux-2.6.32.48/arch/powerpc/kernel/process.c
---- linux-2.6.32.48/arch/powerpc/kernel/process.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/process.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/process.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/process.c 2011-11-15 19:59:42.000000000 -0500
@@ -539,8 +539,8 @@ void show_regs(struct pt_regs * regs)
* Lookup NIP late so we have the best change of getting the
* above info out without failing
@@ -2799,8 +2799,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/process.c linux-2.6.32.48/arch/po
- return ret;
-}
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/ptrace.c linux-2.6.32.48/arch/powerpc/kernel/ptrace.c
---- linux-2.6.32.48/arch/powerpc/kernel/ptrace.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/ptrace.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/ptrace.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/ptrace.c 2011-11-15 19:59:42.000000000 -0500
@@ -86,7 +86,7 @@ static int set_user_trap(struct task_str
/*
* Get contents of register REGNO in task TASK.
@@ -2820,8 +2820,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/ptrace.c linux-2.6.32.48/arch/pow
flush_fp_to_thread(child);
tmp = ((unsigned long *)child->thread.fpr)
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/signal_32.c linux-2.6.32.48/arch/powerpc/kernel/signal_32.c
---- linux-2.6.32.48/arch/powerpc/kernel/signal_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/signal_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/signal_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/signal_32.c 2011-11-15 19:59:42.000000000 -0500
@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
@@ -2832,8 +2832,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/signal_32.c linux-2.6.32.48/arch/
goto badframe;
regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/signal_64.c linux-2.6.32.48/arch/powerpc/kernel/signal_64.c
---- linux-2.6.32.48/arch/powerpc/kernel/signal_64.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/signal_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/signal_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/signal_64.c 2011-11-15 19:59:42.000000000 -0500
@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
current->thread.fpscr.val = 0;
@@ -2844,8 +2844,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/signal_64.c linux-2.6.32.48/arch/
} else {
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.48/arch/powerpc/kernel/sys_ppc32.c
---- linux-2.6.32.48/arch/powerpc/kernel/sys_ppc32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/sys_ppc32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/sys_ppc32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/sys_ppc32.c 2011-11-15 19:59:42.000000000 -0500
@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
if (oldlenp) {
if (!error) {
@@ -2860,8 +2860,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.48/arch/
return error;
}
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/traps.c linux-2.6.32.48/arch/powerpc/kernel/traps.c
---- linux-2.6.32.48/arch/powerpc/kernel/traps.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/traps.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/traps.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/traps.c 2011-11-15 19:59:42.000000000 -0500
@@ -99,6 +99,8 @@ static void pmac_backlight_unblank(void)
static inline void pmac_backlight_unblank(void) { }
#endif
@@ -2881,8 +2881,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/traps.c linux-2.6.32.48/arch/powe
do_exit(err);
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/vdso.c linux-2.6.32.48/arch/powerpc/kernel/vdso.c
---- linux-2.6.32.48/arch/powerpc/kernel/vdso.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/vdso.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/vdso.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/vdso.c 2011-11-15 19:59:42.000000000 -0500
@@ -36,6 +36,7 @@
#include <asm/firmware.h>
#include <asm/vdso.h>
@@ -2910,8 +2910,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/vdso.c linux-2.6.32.48/arch/power
rc = vdso_base;
goto fail_mmapsem;
diff -urNp linux-2.6.32.48/arch/powerpc/kernel/vio.c linux-2.6.32.48/arch/powerpc/kernel/vio.c
---- linux-2.6.32.48/arch/powerpc/kernel/vio.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/kernel/vio.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/kernel/vio.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/kernel/vio.c 2011-11-15 19:59:42.000000000 -0500
@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
vio_cmo_dealloc(viodev, alloc_size);
}
@@ -2935,8 +2935,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/kernel/vio.c linux-2.6.32.48/arch/powerp
}
diff -urNp linux-2.6.32.48/arch/powerpc/lib/usercopy_64.c linux-2.6.32.48/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.32.48/arch/powerpc/lib/usercopy_64.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/lib/usercopy_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/lib/usercopy_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/lib/usercopy_64.c 2011-11-15 19:59:42.000000000 -0500
@@ -9,22 +9,6 @@
#include <linux/module.h>
#include <asm/uaccess.h>
@@ -2969,8 +2969,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/lib/usercopy_64.c linux-2.6.32.48/arch/p
EXPORT_SYMBOL(copy_in_user);
diff -urNp linux-2.6.32.48/arch/powerpc/Makefile linux-2.6.32.48/arch/powerpc/Makefile
---- linux-2.6.32.48/arch/powerpc/Makefile 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/Makefile 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/Makefile 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/Makefile 2011-11-15 19:59:42.000000000 -0500
@@ -74,6 +74,8 @@ KBUILD_AFLAGS += -Iarch/$(ARCH)
KBUILD_CFLAGS += -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y)
CPP = $(CC) -E $(KBUILD_CFLAGS)
@@ -2981,8 +2981,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/Makefile linux-2.6.32.48/arch/powerpc/Ma
ifeq ($(CONFIG_PPC64),y)
diff -urNp linux-2.6.32.48/arch/powerpc/mm/fault.c linux-2.6.32.48/arch/powerpc/mm/fault.c
---- linux-2.6.32.48/arch/powerpc/mm/fault.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/mm/fault.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/mm/fault.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/mm/fault.c 2011-11-15 19:59:42.000000000 -0500
@@ -30,6 +30,10 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -3088,8 +3088,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/mm/fault.c linux-2.6.32.48/arch/powerpc/
return 0;
}
diff -urNp linux-2.6.32.48/arch/powerpc/mm/mem.c linux-2.6.32.48/arch/powerpc/mm/mem.c
---- linux-2.6.32.48/arch/powerpc/mm/mem.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/mm/mem.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/mm/mem.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/mm/mem.c 2011-11-15 19:59:42.000000000 -0500
@@ -250,7 +250,7 @@ static int __init mark_nonram_nosave(voi
{
unsigned long lmb_next_region_start_pfn,
@@ -3100,8 +3100,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/mm/mem.c linux-2.6.32.48/arch/powerpc/mm
for (i = 0; i < lmb.memory.cnt - 1; i++) {
lmb_region_max_pfn =
diff -urNp linux-2.6.32.48/arch/powerpc/mm/mmap_64.c linux-2.6.32.48/arch/powerpc/mm/mmap_64.c
---- linux-2.6.32.48/arch/powerpc/mm/mmap_64.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/mm/mmap_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/mm/mmap_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/mm/mmap_64.c 2011-11-15 19:59:42.000000000 -0500
@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -3126,8 +3126,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/mm/mmap_64.c linux-2.6.32.48/arch/powerp
mm->unmap_area = arch_unmap_area_topdown;
}
diff -urNp linux-2.6.32.48/arch/powerpc/mm/slice.c linux-2.6.32.48/arch/powerpc/mm/slice.c
---- linux-2.6.32.48/arch/powerpc/mm/slice.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/mm/slice.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/mm/slice.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/mm/slice.c 2011-11-15 19:59:42.000000000 -0500
@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
if ((mm->task_size - len) < addr)
return 0;
@@ -3195,8 +3195,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/mm/slice.c linux-2.6.32.48/arch/powerpc/
if (!fixed && addr) {
addr = _ALIGN_UP(addr, 1ul << pshift);
diff -urNp linux-2.6.32.48/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.48/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.32.48/arch/powerpc/platforms/52xx/lite5200_pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-11-15 19:59:42.000000000 -0500
@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
lite5200_pm_target_state = PM_SUSPEND_ON;
}
@@ -3207,8 +3207,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3
.begin = lite5200_pm_begin,
.prepare = lite5200_pm_prepare,
diff -urNp linux-2.6.32.48/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.48/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.32.48/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-11-15 19:59:42.000000000 -0500
@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
iounmap(mbar);
}
@@ -3219,8 +3219,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32
.prepare = mpc52xx_pm_prepare,
.enter = mpc52xx_pm_enter,
diff -urNp linux-2.6.32.48/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.48/arch/powerpc/platforms/83xx/suspend.c
---- linux-2.6.32.48/arch/powerpc/platforms/83xx/suspend.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/platforms/83xx/suspend.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/platforms/83xx/suspend.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/platforms/83xx/suspend.c 2011-11-15 19:59:42.000000000 -0500
@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
return ret;
}
@@ -3231,8 +3231,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.48
.begin = mpc83xx_suspend_begin,
.enter = mpc83xx_suspend_enter,
diff -urNp linux-2.6.32.48/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.48/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.32.48/arch/powerpc/platforms/cell/iommu.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/platforms/cell/iommu.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/platforms/cell/iommu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/platforms/cell/iommu.c 2011-11-15 19:59:42.000000000 -0500
@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -3243,8 +3243,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.48/a
.free_coherent = dma_fixed_free_coherent,
.map_sg = dma_fixed_map_sg,
diff -urNp linux-2.6.32.48/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.48/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.32.48/arch/powerpc/platforms/ps3/system-bus.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/platforms/ps3/system-bus.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/platforms/ps3/system-bus.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/platforms/ps3/system-bus.c 2011-11-15 19:59:42.000000000 -0500
@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
return mask >= DMA_BIT_MASK(32);
}
@@ -3264,8 +3264,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
.free_coherent = ps3_free_coherent,
.map_sg = ps3_ioc0_map_sg,
diff -urNp linux-2.6.32.48/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.48/arch/powerpc/platforms/pseries/Kconfig
---- linux-2.6.32.48/arch/powerpc/platforms/pseries/Kconfig 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/powerpc/platforms/pseries/Kconfig 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/powerpc/platforms/pseries/Kconfig 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/powerpc/platforms/pseries/Kconfig 2011-11-15 19:59:42.000000000 -0500
@@ -2,6 +2,8 @@ config PPC_PSERIES
depends on PPC64 && PPC_BOOK3S
bool "IBM pSeries & new (POWER5-based) iSeries"
@@ -3276,8 +3276,8 @@ diff -urNp linux-2.6.32.48/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.4
select PPC_RTAS
select RTAS_ERROR_LOGGING
diff -urNp linux-2.6.32.48/arch/s390/include/asm/elf.h linux-2.6.32.48/arch/s390/include/asm/elf.h
---- linux-2.6.32.48/arch/s390/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/s390/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/s390/include/asm/elf.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/s390/include/asm/elf.h 2011-11-15 19:59:42.000000000 -0500
@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
that it will "exec", and that there is sufficient room for the brk. */
#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
@@ -3293,8 +3293,8 @@ diff -urNp linux-2.6.32.48/arch/s390/include/asm/elf.h linux-2.6.32.48/arch/s390
instruction set this CPU supports. */
diff -urNp linux-2.6.32.48/arch/s390/include/asm/setup.h linux-2.6.32.48/arch/s390/include/asm/setup.h
---- linux-2.6.32.48/arch/s390/include/asm/setup.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/s390/include/asm/setup.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/s390/include/asm/setup.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/s390/include/asm/setup.h 2011-11-15 19:59:42.000000000 -0500
@@ -50,13 +50,13 @@ extern unsigned long memory_end;
void detect_memory_layout(struct mem_chunk chunk[]);
@@ -3312,8 +3312,8 @@ diff -urNp linux-2.6.32.48/arch/s390/include/asm/setup.h linux-2.6.32.48/arch/s3
#define s390_noexec (0)
#endif
diff -urNp linux-2.6.32.48/arch/s390/include/asm/uaccess.h linux-2.6.32.48/arch/s390/include/asm/uaccess.h
---- linux-2.6.32.48/arch/s390/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/s390/include/asm/uaccess.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/s390/include/asm/uaccess.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/s390/include/asm/uaccess.h 2011-11-15 19:59:42.000000000 -0500
@@ -232,6 +232,10 @@ static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long n)
{
@@ -3347,8 +3347,8 @@ diff -urNp linux-2.6.32.48/arch/s390/include/asm/uaccess.h linux-2.6.32.48/arch/
n = __copy_from_user(to, from, n);
else
diff -urNp linux-2.6.32.48/arch/s390/Kconfig linux-2.6.32.48/arch/s390/Kconfig
---- linux-2.6.32.48/arch/s390/Kconfig 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/s390/Kconfig 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/s390/Kconfig 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/s390/Kconfig 2011-11-15 19:59:42.000000000 -0500
@@ -194,28 +194,26 @@ config AUDIT_ARCH
config S390_SWITCH_AMODE
@@ -3387,8 +3387,8 @@ diff -urNp linux-2.6.32.48/arch/s390/Kconfig linux-2.6.32.48/arch/s390/Kconfig
comment "Code generation options"
diff -urNp linux-2.6.32.48/arch/s390/kernel/module.c linux-2.6.32.48/arch/s390/kernel/module.c
---- linux-2.6.32.48/arch/s390/kernel/module.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/s390/kernel/module.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/s390/kernel/module.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/s390/kernel/module.c 2011-11-15 19:59:42.000000000 -0500
@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
/* Increase core size by size of got & plt and set start
@@ -3461,8 +3461,8 @@ diff -urNp linux-2.6.32.48/arch/s390/kernel/module.c linux-2.6.32.48/arch/s390/k
if (r_type == R_390_GOTPC)
*(unsigned int *) loc = val;
diff -urNp linux-2.6.32.48/arch/s390/kernel/setup.c linux-2.6.32.48/arch/s390/kernel/setup.c
---- linux-2.6.32.48/arch/s390/kernel/setup.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/s390/kernel/setup.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/s390/kernel/setup.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/s390/kernel/setup.c 2011-11-15 19:59:42.000000000 -0500
@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
early_param("mem", early_parse_mem);
@@ -3517,8 +3517,8 @@ diff -urNp linux-2.6.32.48/arch/s390/kernel/setup.c linux-2.6.32.48/arch/s390/ke
{
if (s390_noexec) {
diff -urNp linux-2.6.32.48/arch/s390/mm/mmap.c linux-2.6.32.48/arch/s390/mm/mmap.c
---- linux-2.6.32.48/arch/s390/mm/mmap.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/s390/mm/mmap.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/s390/mm/mmap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/s390/mm/mmap.c 2011-11-15 19:59:42.000000000 -0500
@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -3566,8 +3566,8 @@ diff -urNp linux-2.6.32.48/arch/s390/mm/mmap.c linux-2.6.32.48/arch/s390/mm/mmap
mm->unmap_area = arch_unmap_area_topdown;
}
diff -urNp linux-2.6.32.48/arch/score/include/asm/system.h linux-2.6.32.48/arch/score/include/asm/system.h
---- linux-2.6.32.48/arch/score/include/asm/system.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/score/include/asm/system.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/score/include/asm/system.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/score/include/asm/system.h 2011-11-15 19:59:42.000000000 -0500
@@ -17,7 +17,7 @@ do { \
#define finish_arch_switch(prev) do {} while (0)
@@ -3578,8 +3578,8 @@ diff -urNp linux-2.6.32.48/arch/score/include/asm/system.h linux-2.6.32.48/arch/
#define mb() barrier()
#define rmb() barrier()
diff -urNp linux-2.6.32.48/arch/score/kernel/process.c linux-2.6.32.48/arch/score/kernel/process.c
---- linux-2.6.32.48/arch/score/kernel/process.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/score/kernel/process.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/score/kernel/process.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/score/kernel/process.c 2011-11-15 19:59:42.000000000 -0500
@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
return task_pt_regs(task)->cp0_epc;
@@ -3590,8 +3590,8 @@ diff -urNp linux-2.6.32.48/arch/score/kernel/process.c linux-2.6.32.48/arch/scor
- return sp;
-}
diff -urNp linux-2.6.32.48/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.48/arch/sh/boards/mach-hp6xx/pm.c
---- linux-2.6.32.48/arch/sh/boards/mach-hp6xx/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sh/boards/mach-hp6xx/pm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sh/boards/mach-hp6xx/pm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sh/boards/mach-hp6xx/pm.c 2011-11-15 19:59:42.000000000 -0500
@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
return 0;
}
@@ -3602,8 +3602,8 @@ diff -urNp linux-2.6.32.48/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.48/arch/s
.valid = suspend_valid_only_mem,
};
diff -urNp linux-2.6.32.48/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.48/arch/sh/kernel/cpu/sh4/sq.c
---- linux-2.6.32.48/arch/sh/kernel/cpu/sh4/sq.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sh/kernel/cpu/sh4/sq.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sh/kernel/cpu/sh4/sq.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sh/kernel/cpu/sh4/sq.c 2011-11-15 19:59:42.000000000 -0500
@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
NULL,
};
@@ -3614,8 +3614,8 @@ diff -urNp linux-2.6.32.48/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.48/arch/sh/k
.store = sq_sysfs_store,
};
diff -urNp linux-2.6.32.48/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.48/arch/sh/kernel/cpu/shmobile/pm.c
---- linux-2.6.32.48/arch/sh/kernel/cpu/shmobile/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sh/kernel/cpu/shmobile/pm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sh/kernel/cpu/shmobile/pm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sh/kernel/cpu/shmobile/pm.c 2011-11-15 19:59:42.000000000 -0500
@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
return 0;
}
@@ -3626,8 +3626,8 @@ diff -urNp linux-2.6.32.48/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.48/arch
.valid = suspend_valid_only_mem,
};
diff -urNp linux-2.6.32.48/arch/sh/kernel/kgdb.c linux-2.6.32.48/arch/sh/kernel/kgdb.c
---- linux-2.6.32.48/arch/sh/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sh/kernel/kgdb.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sh/kernel/kgdb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sh/kernel/kgdb.c 2011-11-15 19:59:42.000000000 -0500
@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3638,8 +3638,8 @@ diff -urNp linux-2.6.32.48/arch/sh/kernel/kgdb.c linux-2.6.32.48/arch/sh/kernel/
#ifdef CONFIG_CPU_LITTLE_ENDIAN
.gdb_bpt_instr = { 0x3c, 0xc3 },
diff -urNp linux-2.6.32.48/arch/sh/mm/mmap.c linux-2.6.32.48/arch/sh/mm/mmap.c
---- linux-2.6.32.48/arch/sh/mm/mmap.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/sh/mm/mmap.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sh/mm/mmap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sh/mm/mmap.c 2011-11-15 19:59:42.000000000 -0500
@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
addr = PAGE_ALIGN(addr);
@@ -3715,8 +3715,8 @@ diff -urNp linux-2.6.32.48/arch/sh/mm/mmap.c linux-2.6.32.48/arch/sh/mm/mmap.c
bottomup:
/*
diff -urNp linux-2.6.32.48/arch/sparc/include/asm/atomic_64.h linux-2.6.32.48/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.32.48/arch/sparc/include/asm/atomic_64.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/include/asm/atomic_64.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/include/asm/atomic_64.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/include/asm/atomic_64.h 2011-11-15 19:59:42.000000000 -0500
@@ -14,18 +14,40 @@
#define ATOMIC64_INIT(i) { (i) }
@@ -3910,8 +3910,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/include/asm/atomic_64.h linux-2.6.32.48/ar
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
diff -urNp linux-2.6.32.48/arch/sparc/include/asm/cache.h linux-2.6.32.48/arch/sparc/include/asm/cache.h
---- linux-2.6.32.48/arch/sparc/include/asm/cache.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/include/asm/cache.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/include/asm/cache.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/include/asm/cache.h 2011-11-15 19:59:42.000000000 -0500
@@ -8,7 +8,7 @@
#define _SPARC_CACHE_H
@@ -3922,8 +3922,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/include/asm/cache.h linux-2.6.32.48/arch/s
#ifdef CONFIG_SPARC32
diff -urNp linux-2.6.32.48/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.48/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.32.48/arch/sparc/include/asm/dma-mapping.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/include/asm/dma-mapping.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/include/asm/dma-mapping.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/include/asm/dma-mapping.h 2011-11-15 19:59:42.000000000 -0500
@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
#define dma_is_consistent(d, h) (1)
@@ -3956,8 +3956,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.48/
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.48/arch/sparc/include/asm/elf_32.h linux-2.6.32.48/arch/sparc/include/asm/elf_32.h
---- linux-2.6.32.48/arch/sparc/include/asm/elf_32.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/include/asm/elf_32.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/include/asm/elf_32.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/include/asm/elf_32.h 2011-11-15 19:59:42.000000000 -0500
@@ -116,6 +116,13 @@ typedef struct {
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -3973,8 +3973,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/include/asm/elf_32.h linux-2.6.32.48/arch/
instruction set this cpu supports. This can NOT be done in userspace
on Sparc. */
diff -urNp linux-2.6.32.48/arch/sparc/include/asm/elf_64.h linux-2.6.32.48/arch/sparc/include/asm/elf_64.h
---- linux-2.6.32.48/arch/sparc/include/asm/elf_64.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/include/asm/elf_64.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/include/asm/elf_64.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/include/asm/elf_64.h 2011-11-15 19:59:42.000000000 -0500
@@ -163,6 +163,12 @@ typedef struct {
#define ELF_ET_DYN_BASE 0x0000010000000000UL
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -3989,8 +3989,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/include/asm/elf_64.h linux-2.6.32.48/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.48/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.48/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.32.48/arch/sparc/include/asm/pgtable_32.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/include/asm/pgtable_32.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/include/asm/pgtable_32.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/include/asm/pgtable_32.h 2011-11-15 19:59:42.000000000 -0500
@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
BTFIXUPDEF_INT(page_none)
BTFIXUPDEF_INT(page_copy)
@@ -4023,8 +4023,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.48/a
#ifdef MODULE
diff -urNp linux-2.6.32.48/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.48/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.32.48/arch/sparc/include/asm/pgtsrmmu.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/include/asm/pgtsrmmu.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/include/asm/pgtsrmmu.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/include/asm/pgtsrmmu.h 2011-11-15 19:59:42.000000000 -0500
@@ -115,6 +115,13 @@
SRMMU_EXEC | SRMMU_REF)
#define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -4040,8 +4040,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.48/arc
SRMMU_DIRTY | SRMMU_REF)
diff -urNp linux-2.6.32.48/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.48/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.32.48/arch/sparc/include/asm/spinlock_64.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/include/asm/spinlock_64.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/include/asm/spinlock_64.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/include/asm/spinlock_64.h 2011-11-15 19:59:42.000000000 -0500
@@ -92,14 +92,19 @@ static inline void __raw_spin_lock_flags
/* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
@@ -4140,8 +4140,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.48/
unsigned long mask, tmp1, tmp2, result;
diff -urNp linux-2.6.32.48/arch/sparc/include/asm/thread_info_32.h linux-2.6.32.48/arch/sparc/include/asm/thread_info_32.h
---- linux-2.6.32.48/arch/sparc/include/asm/thread_info_32.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/include/asm/thread_info_32.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/include/asm/thread_info_32.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/include/asm/thread_info_32.h 2011-11-15 19:59:42.000000000 -0500
@@ -50,6 +50,8 @@ struct thread_info {
unsigned long w_saved;
@@ -4152,8 +4152,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/include/asm/thread_info_32.h linux-2.6.32.
/*
diff -urNp linux-2.6.32.48/arch/sparc/include/asm/thread_info_64.h linux-2.6.32.48/arch/sparc/include/asm/thread_info_64.h
---- linux-2.6.32.48/arch/sparc/include/asm/thread_info_64.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/include/asm/thread_info_64.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/include/asm/thread_info_64.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/include/asm/thread_info_64.h 2011-11-15 19:59:42.000000000 -0500
@@ -68,6 +68,8 @@ struct thread_info {
struct pt_regs *kern_una_regs;
unsigned int kern_una_insn;
@@ -4164,8 +4164,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/include/asm/thread_info_64.h linux-2.6.32.
};
diff -urNp linux-2.6.32.48/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.48/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.32.48/arch/sparc/include/asm/uaccess_32.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/include/asm/uaccess_32.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/include/asm/uaccess_32.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/include/asm/uaccess_32.h 2011-11-15 19:59:42.000000000 -0500
@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -4218,8 +4218,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.48/a
}
diff -urNp linux-2.6.32.48/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.48/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.32.48/arch/sparc/include/asm/uaccess_64.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/include/asm/uaccess_64.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/include/asm/uaccess_64.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/include/asm/uaccess_64.h 2011-11-15 19:59:42.000000000 -0500
@@ -9,6 +9,7 @@
#include <linux/compiler.h>
#include <linux/string.h>
@@ -4263,8 +4263,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.48/a
ret = copy_to_user_fixup(to, from, size);
return ret;
diff -urNp linux-2.6.32.48/arch/sparc/include/asm/uaccess.h linux-2.6.32.48/arch/sparc/include/asm/uaccess.h
---- linux-2.6.32.48/arch/sparc/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/include/asm/uaccess.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/include/asm/uaccess.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/include/asm/uaccess.h 2011-11-15 19:59:42.000000000 -0500
@@ -1,5 +1,13 @@
#ifndef ___ASM_SPARC_UACCESS_H
#define ___ASM_SPARC_UACCESS_H
@@ -4280,8 +4280,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/include/asm/uaccess.h linux-2.6.32.48/arch
#include <asm/uaccess_64.h>
#else
diff -urNp linux-2.6.32.48/arch/sparc/kernel/iommu.c linux-2.6.32.48/arch/sparc/kernel/iommu.c
---- linux-2.6.32.48/arch/sparc/kernel/iommu.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/kernel/iommu.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/kernel/iommu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/kernel/iommu.c 2011-11-15 19:59:42.000000000 -0500
@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -4301,8 +4301,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/kernel/iommu.c linux-2.6.32.48/arch/sparc/
extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
diff -urNp linux-2.6.32.48/arch/sparc/kernel/ioport.c linux-2.6.32.48/arch/sparc/kernel/ioport.c
---- linux-2.6.32.48/arch/sparc/kernel/ioport.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/kernel/ioport.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/kernel/ioport.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/kernel/ioport.c 2011-11-15 19:59:42.000000000 -0500
@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
BUG();
}
@@ -4331,8 +4331,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/kernel/ioport.c linux-2.6.32.48/arch/sparc
.free_coherent = pci32_free_coherent,
.map_page = pci32_map_page,
diff -urNp linux-2.6.32.48/arch/sparc/kernel/kgdb_32.c linux-2.6.32.48/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.32.48/arch/sparc/kernel/kgdb_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/kernel/kgdb_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/kernel/kgdb_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/kernel/kgdb_32.c 2011-11-15 19:59:42.000000000 -0500
@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
{
}
@@ -4343,8 +4343,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/kernel/kgdb_32.c linux-2.6.32.48/arch/spar
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
};
diff -urNp linux-2.6.32.48/arch/sparc/kernel/kgdb_64.c linux-2.6.32.48/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.32.48/arch/sparc/kernel/kgdb_64.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/kernel/kgdb_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/kernel/kgdb_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/kernel/kgdb_64.c 2011-11-15 19:59:42.000000000 -0500
@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
{
}
@@ -4355,8 +4355,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/kernel/kgdb_64.c linux-2.6.32.48/arch/spar
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
};
diff -urNp linux-2.6.32.48/arch/sparc/kernel/Makefile linux-2.6.32.48/arch/sparc/kernel/Makefile
---- linux-2.6.32.48/arch/sparc/kernel/Makefile 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/kernel/Makefile 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/kernel/Makefile 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/kernel/Makefile 2011-11-15 19:59:42.000000000 -0500
@@ -3,7 +3,7 @@
#
@@ -4367,8 +4367,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/kernel/Makefile linux-2.6.32.48/arch/sparc
extra-y := head_$(BITS).o
extra-y += init_task.o
diff -urNp linux-2.6.32.48/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.48/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.32.48/arch/sparc/kernel/pci_sun4v.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/kernel/pci_sun4v.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/kernel/pci_sun4v.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/kernel/pci_sun4v.c 2011-11-15 19:59:42.000000000 -0500
@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -4379,8 +4379,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.48/arch/sp
.free_coherent = dma_4v_free_coherent,
.map_page = dma_4v_map_page,
diff -urNp linux-2.6.32.48/arch/sparc/kernel/process_32.c linux-2.6.32.48/arch/sparc/kernel/process_32.c
---- linux-2.6.32.48/arch/sparc/kernel/process_32.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/kernel/process_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/kernel/process_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/kernel/process_32.c 2011-11-15 19:59:42.000000000 -0500
@@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
rw->ins[4], rw->ins[5],
rw->ins[6],
@@ -4417,8 +4417,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/kernel/process_32.c linux-2.6.32.48/arch/s
} while (++count < 16);
printk("\n");
diff -urNp linux-2.6.32.48/arch/sparc/kernel/process_64.c linux-2.6.32.48/arch/sparc/kernel/process_64.c
---- linux-2.6.32.48/arch/sparc/kernel/process_64.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/kernel/process_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/kernel/process_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/kernel/process_64.c 2011-11-15 19:59:42.000000000 -0500
@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
@@ -4455,8 +4455,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/kernel/process_64.c linux-2.6.32.48/arch/s
(void *) gp->o7,
(void *) gp->i7,
diff -urNp linux-2.6.32.48/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.48/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.32.48/arch/sparc/kernel/sys_sparc_32.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/kernel/sys_sparc_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/kernel/sys_sparc_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/kernel/sys_sparc_32.c 2011-11-15 19:59:42.000000000 -0500
@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
if (ARCH_SUN4C && len > 0x20000000)
return -ENOMEM;
@@ -4476,8 +4476,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.48/arch
addr = vmm->vm_end;
if (flags & MAP_SHARED)
diff -urNp linux-2.6.32.48/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.48/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.32.48/arch/sparc/kernel/sys_sparc_64.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/kernel/sys_sparc_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/kernel/sys_sparc_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/kernel/sys_sparc_64.c 2011-11-15 19:59:42.000000000 -0500
@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
/* We do not accept a shared mapping if it would violate
* cache aliasing constraints.
@@ -4626,8 +4626,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.48/arch
mm->unmap_area = arch_unmap_area_topdown;
}
diff -urNp linux-2.6.32.48/arch/sparc/kernel/traps_32.c linux-2.6.32.48/arch/sparc/kernel/traps_32.c
---- linux-2.6.32.48/arch/sparc/kernel/traps_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/kernel/traps_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/kernel/traps_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/kernel/traps_32.c 2011-11-15 19:59:42.000000000 -0500
@@ -44,6 +44,8 @@ static void instruction_dump(unsigned lo
#define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
#define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
@@ -4658,8 +4658,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/kernel/traps_32.c linux-2.6.32.48/arch/spa
}
diff -urNp linux-2.6.32.48/arch/sparc/kernel/traps_64.c linux-2.6.32.48/arch/sparc/kernel/traps_64.c
---- linux-2.6.32.48/arch/sparc/kernel/traps_64.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/kernel/traps_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/kernel/traps_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/kernel/traps_64.c 2011-11-15 19:59:42.000000000 -0500
@@ -73,7 +73,7 @@ static void dump_tl1_traplog(struct tl1_
i + 1,
p->trapstack[i].tstate, p->trapstack[i].tpc,
@@ -4792,8 +4792,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/kernel/traps_64.c linux-2.6.32.48/arch/spa
}
EXPORT_SYMBOL(die_if_kernel);
diff -urNp linux-2.6.32.48/arch/sparc/kernel/una_asm_64.S linux-2.6.32.48/arch/sparc/kernel/una_asm_64.S
---- linux-2.6.32.48/arch/sparc/kernel/una_asm_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/kernel/una_asm_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/kernel/una_asm_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/kernel/una_asm_64.S 2011-11-15 19:59:42.000000000 -0500
@@ -127,7 +127,7 @@ do_int_load:
wr %o5, 0x0, %asi
retl
@@ -4804,8 +4804,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/kernel/una_asm_64.S linux-2.6.32.48/arch/s
.section __ex_table,"a"
.word 4b, __retl_efault
diff -urNp linux-2.6.32.48/arch/sparc/kernel/unaligned_64.c linux-2.6.32.48/arch/sparc/kernel/unaligned_64.c
---- linux-2.6.32.48/arch/sparc/kernel/unaligned_64.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/kernel/unaligned_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/kernel/unaligned_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/kernel/unaligned_64.c 2011-11-15 19:59:42.000000000 -0500
@@ -288,7 +288,7 @@ static void log_unaligned(struct pt_regs
if (count < 5) {
last_time = jiffies;
@@ -4816,8 +4816,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/kernel/unaligned_64.c linux-2.6.32.48/arch
}
}
diff -urNp linux-2.6.32.48/arch/sparc/lib/atomic_64.S linux-2.6.32.48/arch/sparc/lib/atomic_64.S
---- linux-2.6.32.48/arch/sparc/lib/atomic_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/lib/atomic_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/lib/atomic_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/lib/atomic_64.S 2011-11-15 19:59:42.000000000 -0500
@@ -18,7 +18,12 @@
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
@@ -5053,8 +5053,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/lib/atomic_64.S linux-2.6.32.48/arch/sparc
cmp %g1, %g7
bne,pn %xcc, 2f
diff -urNp linux-2.6.32.48/arch/sparc/lib/ksyms.c linux-2.6.32.48/arch/sparc/lib/ksyms.c
---- linux-2.6.32.48/arch/sparc/lib/ksyms.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/lib/ksyms.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/lib/ksyms.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/lib/ksyms.c 2011-11-15 19:59:42.000000000 -0500
@@ -144,12 +144,18 @@ EXPORT_SYMBOL(__downgrade_write);
/* Atomic counter implementation. */
@@ -5075,8 +5075,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/lib/ksyms.c linux-2.6.32.48/arch/sparc/lib
/* Atomic bit operations. */
diff -urNp linux-2.6.32.48/arch/sparc/lib/Makefile linux-2.6.32.48/arch/sparc/lib/Makefile
---- linux-2.6.32.48/arch/sparc/lib/Makefile 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/lib/Makefile 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/lib/Makefile 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/lib/Makefile 2011-11-15 19:59:42.000000000 -0500
@@ -2,7 +2,7 @@
#
@@ -5087,8 +5087,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/lib/Makefile linux-2.6.32.48/arch/sparc/li
lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
lib-$(CONFIG_SPARC32) += memcpy.o memset.o
diff -urNp linux-2.6.32.48/arch/sparc/lib/rwsem_64.S linux-2.6.32.48/arch/sparc/lib/rwsem_64.S
---- linux-2.6.32.48/arch/sparc/lib/rwsem_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/lib/rwsem_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/lib/rwsem_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/lib/rwsem_64.S 2011-11-15 19:59:42.000000000 -0500
@@ -11,7 +11,12 @@
.globl __down_read
__down_read:
@@ -5188,8 +5188,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/lib/rwsem_64.S linux-2.6.32.48/arch/sparc/
cmp %g3, %g7
bne,pn %icc, 1b
diff -urNp linux-2.6.32.48/arch/sparc/Makefile linux-2.6.32.48/arch/sparc/Makefile
---- linux-2.6.32.48/arch/sparc/Makefile 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/Makefile 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/Makefile 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/Makefile 2011-11-15 19:59:42.000000000 -0500
@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
# Export what is needed by arch/sparc/boot/Makefile
export VMLINUX_INIT VMLINUX_MAIN
@@ -5200,8 +5200,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/Makefile linux-2.6.32.48/arch/sparc/Makefi
VMLINUX_MAIN += $(drivers-y) $(net-y)
diff -urNp linux-2.6.32.48/arch/sparc/mm/fault_32.c linux-2.6.32.48/arch/sparc/mm/fault_32.c
---- linux-2.6.32.48/arch/sparc/mm/fault_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/mm/fault_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/mm/fault_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/mm/fault_32.c 2011-11-15 19:59:42.000000000 -0500
@@ -21,6 +21,9 @@
#include <linux/interrupt.h>
#include <linux/module.h>
@@ -5506,8 +5506,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/mm/fault_32.c linux-2.6.32.48/arch/sparc/m
if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
goto bad_area;
diff -urNp linux-2.6.32.48/arch/sparc/mm/fault_64.c linux-2.6.32.48/arch/sparc/mm/fault_64.c
---- linux-2.6.32.48/arch/sparc/mm/fault_64.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/mm/fault_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/mm/fault_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/mm/fault_64.c 2011-11-15 19:59:42.000000000 -0500
@@ -20,6 +20,9 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -6015,8 +6015,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/mm/fault_64.c linux-2.6.32.48/arch/sparc/m
* 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.48/arch/sparc/mm/hugetlbpage.c linux-2.6.32.48/arch/sparc/mm/hugetlbpage.c
---- linux-2.6.32.48/arch/sparc/mm/hugetlbpage.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/mm/hugetlbpage.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/mm/hugetlbpage.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/mm/hugetlbpage.c 2011-11-15 19:59:42.000000000 -0500
@@ -69,7 +69,7 @@ full_search:
}
return -ENOMEM;
@@ -6077,8 +6077,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/mm/hugetlbpage.c linux-2.6.32.48/arch/spar
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
diff -urNp linux-2.6.32.48/arch/sparc/mm/init_32.c linux-2.6.32.48/arch/sparc/mm/init_32.c
---- linux-2.6.32.48/arch/sparc/mm/init_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/mm/init_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/mm/init_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/mm/init_32.c 2011-11-15 19:59:42.000000000 -0500
@@ -317,6 +317,9 @@ extern void device_scan(void);
pgprot_t PAGE_SHARED __read_mostly;
EXPORT_SYMBOL(PAGE_SHARED);
@@ -6114,8 +6114,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/mm/init_32.c linux-2.6.32.48/arch/sparc/mm
protection_map[13] = PAGE_READONLY;
protection_map[14] = PAGE_SHARED;
diff -urNp linux-2.6.32.48/arch/sparc/mm/Makefile linux-2.6.32.48/arch/sparc/mm/Makefile
---- linux-2.6.32.48/arch/sparc/mm/Makefile 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/mm/Makefile 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/mm/Makefile 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/mm/Makefile 2011-11-15 19:59:42.000000000 -0500
@@ -2,7 +2,7 @@
#
@@ -6126,8 +6126,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/mm/Makefile linux-2.6.32.48/arch/sparc/mm/
obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
obj-y += fault_$(BITS).o
diff -urNp linux-2.6.32.48/arch/sparc/mm/srmmu.c linux-2.6.32.48/arch/sparc/mm/srmmu.c
---- linux-2.6.32.48/arch/sparc/mm/srmmu.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/sparc/mm/srmmu.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/sparc/mm/srmmu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/sparc/mm/srmmu.c 2011-11-15 19:59:42.000000000 -0500
@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -6143,8 +6143,8 @@ diff -urNp linux-2.6.32.48/arch/sparc/mm/srmmu.c linux-2.6.32.48/arch/sparc/mm/s
page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
diff -urNp linux-2.6.32.48/arch/um/include/asm/kmap_types.h linux-2.6.32.48/arch/um/include/asm/kmap_types.h
---- linux-2.6.32.48/arch/um/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/um/include/asm/kmap_types.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/um/include/asm/kmap_types.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/um/include/asm/kmap_types.h 2011-11-15 19:59:42.000000000 -0500
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -6154,8 +6154,8 @@ diff -urNp linux-2.6.32.48/arch/um/include/asm/kmap_types.h linux-2.6.32.48/arch
};
diff -urNp linux-2.6.32.48/arch/um/include/asm/page.h linux-2.6.32.48/arch/um/include/asm/page.h
---- linux-2.6.32.48/arch/um/include/asm/page.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/um/include/asm/page.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/um/include/asm/page.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/um/include/asm/page.h 2011-11-15 19:59:42.000000000 -0500
@@ -14,6 +14,9 @@
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
@@ -6167,8 +6167,8 @@ diff -urNp linux-2.6.32.48/arch/um/include/asm/page.h linux-2.6.32.48/arch/um/in
struct page;
diff -urNp linux-2.6.32.48/arch/um/kernel/process.c linux-2.6.32.48/arch/um/kernel/process.c
---- linux-2.6.32.48/arch/um/kernel/process.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/um/kernel/process.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/um/kernel/process.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/um/kernel/process.c 2011-11-15 19:59:42.000000000 -0500
@@ -393,22 +393,6 @@ int singlestepping(void * t)
return 2;
}
@@ -6193,8 +6193,8 @@ diff -urNp linux-2.6.32.48/arch/um/kernel/process.c linux-2.6.32.48/arch/um/kern
{
unsigned long stack_page, sp, ip;
diff -urNp linux-2.6.32.48/arch/um/sys-i386/syscalls.c linux-2.6.32.48/arch/um/sys-i386/syscalls.c
---- linux-2.6.32.48/arch/um/sys-i386/syscalls.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/um/sys-i386/syscalls.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/um/sys-i386/syscalls.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/um/sys-i386/syscalls.c 2011-11-15 19:59:42.000000000 -0500
@@ -11,6 +11,21 @@
#include "asm/uaccess.h"
#include "asm/unistd.h"
@@ -6218,8 +6218,8 @@ diff -urNp linux-2.6.32.48/arch/um/sys-i386/syscalls.c linux-2.6.32.48/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.48/arch/x86/boot/bitops.h linux-2.6.32.48/arch/x86/boot/bitops.h
---- linux-2.6.32.48/arch/x86/boot/bitops.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/boot/bitops.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/boot/bitops.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/boot/bitops.h 2011-11-15 19:59:42.000000000 -0500
@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
u8 v;
const u32 *p = (const u32 *)addr;
@@ -6239,8 +6239,8 @@ diff -urNp linux-2.6.32.48/arch/x86/boot/bitops.h linux-2.6.32.48/arch/x86/boot/
#endif /* BOOT_BITOPS_H */
diff -urNp linux-2.6.32.48/arch/x86/boot/boot.h linux-2.6.32.48/arch/x86/boot/boot.h
---- linux-2.6.32.48/arch/x86/boot/boot.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/boot/boot.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/boot/boot.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/boot/boot.h 2011-11-15 19:59:42.000000000 -0500
@@ -82,7 +82,7 @@ static inline void io_delay(void)
static inline u16 ds(void)
{
@@ -6260,8 +6260,8 @@ diff -urNp linux-2.6.32.48/arch/x86/boot/boot.h linux-2.6.32.48/arch/x86/boot/bo
return diff;
}
diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/head_32.S linux-2.6.32.48/arch/x86/boot/compressed/head_32.S
---- linux-2.6.32.48/arch/x86/boot/compressed/head_32.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/boot/compressed/head_32.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/boot/compressed/head_32.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/boot/compressed/head_32.S 2011-11-15 19:59:42.000000000 -0500
@@ -76,7 +76,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -6291,8 +6291,8 @@ diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/head_32.S linux-2.6.32.48/ar
jmp 1b
2:
diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/head_64.S linux-2.6.32.48/arch/x86/boot/compressed/head_64.S
---- linux-2.6.32.48/arch/x86/boot/compressed/head_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/boot/compressed/head_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/boot/compressed/head_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/boot/compressed/head_64.S 2011-11-15 19:59:42.000000000 -0500
@@ -91,7 +91,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -6321,8 +6321,8 @@ diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/head_64.S linux-2.6.32.48/ar
/* Target address to relocate to for decompression */
diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/Makefile linux-2.6.32.48/arch/x86/boot/compressed/Makefile
---- linux-2.6.32.48/arch/x86/boot/compressed/Makefile 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/boot/compressed/Makefile 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/boot/compressed/Makefile 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/boot/compressed/Makefile 2011-11-15 19:59:42.000000000 -0500
@@ -13,6 +13,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal
KBUILD_CFLAGS += $(cflags-y)
KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
@@ -6334,8 +6334,8 @@ diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/Makefile linux-2.6.32.48/arc
KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
GCOV_PROFILE := n
diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/misc.c linux-2.6.32.48/arch/x86/boot/compressed/misc.c
---- linux-2.6.32.48/arch/x86/boot/compressed/misc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/boot/compressed/misc.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/boot/compressed/misc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/boot/compressed/misc.c 2011-11-15 19:59:42.000000000 -0500
@@ -288,7 +288,7 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
@@ -6355,8 +6355,8 @@ diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/misc.c linux-2.6.32.48/arch/
#endif
diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.48/arch/x86/boot/compressed/mkpiggy.c
---- linux-2.6.32.48/arch/x86/boot/compressed/mkpiggy.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/boot/compressed/mkpiggy.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/boot/compressed/mkpiggy.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/boot/compressed/mkpiggy.c 2011-11-15 19:59:42.000000000 -0500
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
offs = (olen > ilen) ? olen - ilen : 0;
@@ -6367,8 +6367,8 @@ diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.48/ar
printf(".section \".rodata.compressed\",\"a\",@progbits\n");
diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/relocs.c linux-2.6.32.48/arch/x86/boot/compressed/relocs.c
---- linux-2.6.32.48/arch/x86/boot/compressed/relocs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/boot/compressed/relocs.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/boot/compressed/relocs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/boot/compressed/relocs.c 2011-11-15 19:59:42.000000000 -0500
@@ -10,8 +10,11 @@
#define USE_BSD
#include <endian.h>
@@ -6570,8 +6570,8 @@ diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/relocs.c linux-2.6.32.48/arc
read_strtabs(fp);
read_symtabs(fp);
diff -urNp linux-2.6.32.48/arch/x86/boot/cpucheck.c linux-2.6.32.48/arch/x86/boot/cpucheck.c
---- linux-2.6.32.48/arch/x86/boot/cpucheck.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/boot/cpucheck.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/boot/cpucheck.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/boot/cpucheck.c 2011-11-15 19:59:42.000000000 -0500
@@ -74,7 +74,7 @@ static int has_fpu(void)
u16 fcw = -1, fsw = -1;
u32 cr0;
@@ -6668,8 +6668,8 @@ diff -urNp linux-2.6.32.48/arch/x86/boot/cpucheck.c linux-2.6.32.48/arch/x86/boo
err = check_flags();
}
diff -urNp linux-2.6.32.48/arch/x86/boot/header.S linux-2.6.32.48/arch/x86/boot/header.S
---- linux-2.6.32.48/arch/x86/boot/header.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/boot/header.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/boot/header.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/boot/header.S 2011-11-15 19:59:42.000000000 -0500
@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
# single linked list of
# struct setup_data
@@ -6680,8 +6680,8 @@ diff -urNp linux-2.6.32.48/arch/x86/boot/header.S linux-2.6.32.48/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.48/arch/x86/boot/Makefile linux-2.6.32.48/arch/x86/boot/Makefile
---- linux-2.6.32.48/arch/x86/boot/Makefile 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/boot/Makefile 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/boot/Makefile 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/boot/Makefile 2011-11-15 19:59:42.000000000 -0500
@@ -69,6 +69,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os
$(call cc-option, -fno-stack-protector) \
$(call cc-option, -mpreferred-stack-boundary=2)
@@ -6693,8 +6693,8 @@ diff -urNp linux-2.6.32.48/arch/x86/boot/Makefile linux-2.6.32.48/arch/x86/boot/
GCOV_PROFILE := n
diff -urNp linux-2.6.32.48/arch/x86/boot/memory.c linux-2.6.32.48/arch/x86/boot/memory.c
---- linux-2.6.32.48/arch/x86/boot/memory.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/boot/memory.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/boot/memory.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/boot/memory.c 2011-11-15 19:59:42.000000000 -0500
@@ -19,7 +19,7 @@
static int detect_memory_e820(void)
@@ -6705,8 +6705,8 @@ diff -urNp linux-2.6.32.48/arch/x86/boot/memory.c linux-2.6.32.48/arch/x86/boot/
struct e820entry *desc = boot_params.e820_map;
static struct e820entry buf; /* static so it is zeroed */
diff -urNp linux-2.6.32.48/arch/x86/boot/video.c linux-2.6.32.48/arch/x86/boot/video.c
---- linux-2.6.32.48/arch/x86/boot/video.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/boot/video.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/boot/video.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/boot/video.c 2011-11-15 19:59:42.000000000 -0500
@@ -90,7 +90,7 @@ static void store_mode_params(void)
static unsigned int get_entry(void)
{
@@ -6717,8 +6717,8 @@ diff -urNp linux-2.6.32.48/arch/x86/boot/video.c linux-2.6.32.48/arch/x86/boot/v
unsigned int v;
diff -urNp linux-2.6.32.48/arch/x86/boot/video-vesa.c linux-2.6.32.48/arch/x86/boot/video-vesa.c
---- linux-2.6.32.48/arch/x86/boot/video-vesa.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/boot/video-vesa.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/boot/video-vesa.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/boot/video-vesa.c 2011-11-15 19:59:42.000000000 -0500
@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
boot_params.screen_info.vesapm_seg = oreg.es;
@@ -6728,8 +6728,8 @@ diff -urNp linux-2.6.32.48/arch/x86/boot/video-vesa.c linux-2.6.32.48/arch/x86/b
/*
diff -urNp linux-2.6.32.48/arch/x86/crypto/aes-x86_64-asm_64.S linux-2.6.32.48/arch/x86/crypto/aes-x86_64-asm_64.S
---- linux-2.6.32.48/arch/x86/crypto/aes-x86_64-asm_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-15 19:59:42.000000000 -0500
@@ -8,6 +8,8 @@
* including this sentence is retained in full.
*/
@@ -6749,8 +6749,8 @@ diff -urNp linux-2.6.32.48/arch/x86/crypto/aes-x86_64-asm_64.S linux-2.6.32.48/a
movq r1,r2; \
movq r3,r4; \
diff -urNp linux-2.6.32.48/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-2.6.32.48/arch/x86/crypto/salsa20-x86_64-asm_64.S
---- linux-2.6.32.48/arch/x86/crypto/salsa20-x86_64-asm_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-15 19:59:42.000000000 -0500
@@ -1,3 +1,5 @@
+#include <asm/alternative-asm.h>
+
@@ -6780,8 +6780,8 @@ diff -urNp linux-2.6.32.48/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-2.6.32.
+ pax_force_retaddr
ret
diff -urNp linux-2.6.32.48/arch/x86/crypto/twofish-x86_64-asm_64.S linux-2.6.32.48/arch/x86/crypto/twofish-x86_64-asm_64.S
---- linux-2.6.32.48/arch/x86/crypto/twofish-x86_64-asm_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-15 19:59:42.000000000 -0500
@@ -21,6 +21,7 @@
.text
@@ -6805,8 +6805,8 @@ diff -urNp linux-2.6.32.48/arch/x86/crypto/twofish-x86_64-asm_64.S linux-2.6.32.
+ pax_force_retaddr
ret
diff -urNp linux-2.6.32.48/arch/x86/ia32/ia32_aout.c linux-2.6.32.48/arch/x86/ia32/ia32_aout.c
---- linux-2.6.32.48/arch/x86/ia32/ia32_aout.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/ia32/ia32_aout.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/ia32/ia32_aout.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/ia32/ia32_aout.c 2011-11-15 19:59:42.000000000 -0500
@@ -169,6 +169,8 @@ static int aout_core_dump(long signr, st
unsigned long dump_start, dump_size;
struct user32 dump;
@@ -6830,8 +6830,8 @@ diff -urNp linux-2.6.32.48/arch/x86/ia32/ia32_aout.c linux-2.6.32.48/arch/x86/ia
set_fs(fs);
return has_dumped;
diff -urNp linux-2.6.32.48/arch/x86/ia32/ia32entry.S linux-2.6.32.48/arch/x86/ia32/ia32entry.S
---- linux-2.6.32.48/arch/x86/ia32/ia32entry.S 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/ia32/ia32entry.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/ia32/ia32entry.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/ia32/ia32entry.S 2011-11-15 19:59:42.000000000 -0500
@@ -13,6 +13,7 @@
#include <asm/thread_info.h>
#include <asm/segment.h>
@@ -7009,8 +7009,8 @@ diff -urNp linux-2.6.32.48/arch/x86/ia32/ia32entry.S linux-2.6.32.48/arch/x86/ia
RESTORE_REST
cmpq $(IA32_NR_syscalls-1),%rax
diff -urNp linux-2.6.32.48/arch/x86/ia32/ia32_signal.c linux-2.6.32.48/arch/x86/ia32/ia32_signal.c
---- linux-2.6.32.48/arch/x86/ia32/ia32_signal.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/ia32/ia32_signal.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/ia32/ia32_signal.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/ia32/ia32_signal.c 2011-11-15 19:59:42.000000000 -0500
@@ -167,7 +167,7 @@ asmlinkage long sys32_sigaltstack(const
}
seg = get_fs();
@@ -7088,8 +7088,8 @@ diff -urNp linux-2.6.32.48/arch/x86/ia32/ia32_signal.c linux-2.6.32.48/arch/x86/
if (err)
diff -urNp linux-2.6.32.48/arch/x86/ia32/sys_ia32.c linux-2.6.32.48/arch/x86/ia32/sys_ia32.c
---- linux-2.6.32.48/arch/x86/ia32/sys_ia32.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/ia32/sys_ia32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/ia32/sys_ia32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/ia32/sys_ia32.c 2011-11-15 19:59:42.000000000 -0500
@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsign
*/
static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
@@ -7149,8 +7149,8 @@ diff -urNp linux-2.6.32.48/arch/x86/ia32/sys_ia32.c linux-2.6.32.48/arch/x86/ia3
set_fs(old_fs);
diff -urNp linux-2.6.32.48/arch/x86/include/asm/alternative-asm.h linux-2.6.32.48/arch/x86/include/asm/alternative-asm.h
---- linux-2.6.32.48/arch/x86/include/asm/alternative-asm.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/alternative-asm.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/alternative-asm.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/alternative-asm.h 2011-11-15 19:59:42.000000000 -0500
@@ -19,4 +19,18 @@
.endm
#endif
@@ -7171,8 +7171,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/alternative-asm.h linux-2.6.32.4
+
#endif /* __ASSEMBLY__ */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/alternative.h linux-2.6.32.48/arch/x86/include/asm/alternative.h
---- linux-2.6.32.48/arch/x86/include/asm/alternative.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/alternative.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/alternative.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/alternative.h 2011-11-15 19:59:42.000000000 -0500
@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
" .byte 662b-661b\n" /* sourcelen */ \
" .byte 664f-663f\n" /* replacementlen */ \
@@ -7183,8 +7183,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/alternative.h linux-2.6.32.48/ar
".previous"
diff -urNp linux-2.6.32.48/arch/x86/include/asm/apic.h linux-2.6.32.48/arch/x86/include/asm/apic.h
---- linux-2.6.32.48/arch/x86/include/asm/apic.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/apic.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/apic.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/apic.h 2011-11-15 19:59:42.000000000 -0500
@@ -46,7 +46,7 @@ static inline void generic_apic_probe(vo
#ifdef CONFIG_X86_LOCAL_APIC
@@ -7195,8 +7195,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/apic.h linux-2.6.32.48/arch/x86/
extern int disable_apic;
diff -urNp linux-2.6.32.48/arch/x86/include/asm/apm.h linux-2.6.32.48/arch/x86/include/asm/apm.h
---- linux-2.6.32.48/arch/x86/include/asm/apm.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/apm.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/apm.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/apm.h 2011-11-15 19:59:42.000000000 -0500
@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
__asm__ __volatile__(APM_DO_ZERO_SEGS
"pushl %%edi\n\t"
@@ -7216,8 +7216,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/apm.h linux-2.6.32.48/arch/x86/i
"popl %%ebp\n\t"
"popl %%edi\n\t"
diff -urNp linux-2.6.32.48/arch/x86/include/asm/atomic_32.h linux-2.6.32.48/arch/x86/include/asm/atomic_32.h
---- linux-2.6.32.48/arch/x86/include/asm/atomic_32.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/atomic_32.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/atomic_32.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/atomic_32.h 2011-11-15 19:59:42.000000000 -0500
@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
}
@@ -7732,8 +7732,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/atomic_32.h linux-2.6.32.48/arch
* @ptr: pointer to type atomic64_t
*
diff -urNp linux-2.6.32.48/arch/x86/include/asm/atomic_64.h linux-2.6.32.48/arch/x86/include/asm/atomic_64.h
---- linux-2.6.32.48/arch/x86/include/asm/atomic_64.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/atomic_64.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/atomic_64.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/atomic_64.h 2011-11-15 19:59:42.000000000 -0500
@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
}
@@ -8399,8 +8399,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/atomic_64.h linux-2.6.32.48/arch
/**
diff -urNp linux-2.6.32.48/arch/x86/include/asm/bitops.h linux-2.6.32.48/arch/x86/include/asm/bitops.h
---- linux-2.6.32.48/arch/x86/include/asm/bitops.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/bitops.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/bitops.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/bitops.h 2011-11-15 19:59:42.000000000 -0500
@@ -38,7 +38,7 @@
* a mask operation on a byte.
*/
@@ -8411,8 +8411,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/bitops.h linux-2.6.32.48/arch/x8
/**
diff -urNp linux-2.6.32.48/arch/x86/include/asm/boot.h linux-2.6.32.48/arch/x86/include/asm/boot.h
---- linux-2.6.32.48/arch/x86/include/asm/boot.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/boot.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/boot.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/boot.h 2011-11-15 19:59:42.000000000 -0500
@@ -11,10 +11,15 @@
#include <asm/pgtable_types.h>
@@ -8431,8 +8431,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/boot.h linux-2.6.32.48/arch/x86/
#ifdef CONFIG_X86_64
#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
diff -urNp linux-2.6.32.48/arch/x86/include/asm/cacheflush.h linux-2.6.32.48/arch/x86/include/asm/cacheflush.h
---- linux-2.6.32.48/arch/x86/include/asm/cacheflush.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/cacheflush.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/cacheflush.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/cacheflush.h 2011-11-15 19:59:42.000000000 -0500
@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
static inline unsigned long get_page_memtype(struct page *pg)
{
@@ -8452,8 +8452,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/cacheflush.h linux-2.6.32.48/arc
ClearPageWC(pg);
break;
diff -urNp linux-2.6.32.48/arch/x86/include/asm/cache.h linux-2.6.32.48/arch/x86/include/asm/cache.h
---- linux-2.6.32.48/arch/x86/include/asm/cache.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/cache.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/cache.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/cache.h 2011-11-15 19:59:42.000000000 -0500
@@ -5,9 +5,10 @@
/* L1 cache line size */
@@ -8467,8 +8467,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/cache.h linux-2.6.32.48/arch/x86
#ifdef CONFIG_X86_VSMP
/* vSMP Internode cacheline shift */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/calling.h linux-2.6.32.48/arch/x86/include/asm/calling.h
---- linux-2.6.32.48/arch/x86/include/asm/calling.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/calling.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/calling.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/calling.h 2011-11-15 19:59:42.000000000 -0500
@@ -52,32 +52,32 @@ For 32-bit we have the following convent
* for assembly code:
*/
@@ -8524,8 +8524,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/calling.h linux-2.6.32.48/arch/x
#define ARGOFFSET R11
#define SWFRAME ORIG_RAX
diff -urNp linux-2.6.32.48/arch/x86/include/asm/checksum_32.h linux-2.6.32.48/arch/x86/include/asm/checksum_32.h
---- linux-2.6.32.48/arch/x86/include/asm/checksum_32.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/checksum_32.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/checksum_32.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/checksum_32.h 2011-11-15 19:59:42.000000000 -0500
@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
int len, __wsum sum,
int *src_err_ptr, int *dst_err_ptr);
@@ -8560,8 +8560,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/checksum_32.h linux-2.6.32.48/ar
if (len)
diff -urNp linux-2.6.32.48/arch/x86/include/asm/desc_defs.h linux-2.6.32.48/arch/x86/include/asm/desc_defs.h
---- linux-2.6.32.48/arch/x86/include/asm/desc_defs.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/desc_defs.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/desc_defs.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/desc_defs.h 2011-11-15 19:59:42.000000000 -0500
@@ -31,6 +31,12 @@ struct desc_struct {
unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
@@ -8576,8 +8576,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/desc_defs.h linux-2.6.32.48/arch
} __attribute__((packed));
diff -urNp linux-2.6.32.48/arch/x86/include/asm/desc.h linux-2.6.32.48/arch/x86/include/asm/desc.h
---- linux-2.6.32.48/arch/x86/include/asm/desc.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/desc.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/desc.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/desc.h 2011-11-15 19:59:42.000000000 -0500
@@ -4,6 +4,7 @@
#include <asm/desc_defs.h>
#include <asm/ldt.h>
@@ -8759,8 +8759,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/desc.h linux-2.6.32.48/arch/x86/
+
#endif /* _ASM_X86_DESC_H */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/device.h linux-2.6.32.48/arch/x86/include/asm/device.h
---- linux-2.6.32.48/arch/x86/include/asm/device.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/device.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/device.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/device.h 2011-11-15 19:59:42.000000000 -0500
@@ -6,7 +6,7 @@ struct dev_archdata {
void *acpi_handle;
#endif
@@ -8771,8 +8771,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/device.h linux-2.6.32.48/arch/x8
#ifdef CONFIG_DMAR
void *iommu; /* hook for IOMMU specific extension */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/dma-mapping.h linux-2.6.32.48/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.32.48/arch/x86/include/asm/dma-mapping.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/dma-mapping.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/dma-mapping.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/dma-mapping.h 2011-11-15 19:59:42.000000000 -0500
@@ -25,9 +25,9 @@ extern int iommu_merge;
extern struct device x86_dma_fallback_dev;
extern int panic_on_overflow;
@@ -8813,8 +8813,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/dma-mapping.h linux-2.6.32.48/ar
WARN_ON(irqs_disabled()); /* for portability */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/e820.h linux-2.6.32.48/arch/x86/include/asm/e820.h
---- linux-2.6.32.48/arch/x86/include/asm/e820.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/e820.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/e820.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/e820.h 2011-11-15 19:59:42.000000000 -0500
@@ -133,7 +133,7 @@ extern char *default_machine_specific_me
#define ISA_END_ADDRESS 0x100000
#define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
@@ -8825,8 +8825,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/e820.h linux-2.6.32.48/arch/x86/
#ifdef __KERNEL__
diff -urNp linux-2.6.32.48/arch/x86/include/asm/elf.h linux-2.6.32.48/arch/x86/include/asm/elf.h
---- linux-2.6.32.48/arch/x86/include/asm/elf.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/elf.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/elf.h 2011-11-15 19:59:42.000000000 -0500
@@ -257,7 +257,25 @@ extern int force_personality32;
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -8882,8 +8882,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/elf.h linux-2.6.32.48/arch/x86/i
-
#endif /* _ASM_X86_ELF_H */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/emergency-restart.h linux-2.6.32.48/arch/x86/include/asm/emergency-restart.h
---- linux-2.6.32.48/arch/x86/include/asm/emergency-restart.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/emergency-restart.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/emergency-restart.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/emergency-restart.h 2011-11-15 19:59:42.000000000 -0500
@@ -15,6 +15,6 @@ enum reboot_type {
extern enum reboot_type reboot_type;
@@ -8893,8 +8893,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/emergency-restart.h linux-2.6.32
#endif /* _ASM_X86_EMERGENCY_RESTART_H */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/futex.h linux-2.6.32.48/arch/x86/include/asm/futex.h
---- linux-2.6.32.48/arch/x86/include/asm/futex.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/futex.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/futex.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/futex.h 2011-11-15 19:59:42.000000000 -0500
@@ -12,16 +12,18 @@
#include <asm/system.h>
@@ -8971,8 +8971,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/futex.h linux-2.6.32.48/arch/x86
: "memory"
);
diff -urNp linux-2.6.32.48/arch/x86/include/asm/hw_irq.h linux-2.6.32.48/arch/x86/include/asm/hw_irq.h
---- linux-2.6.32.48/arch/x86/include/asm/hw_irq.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/hw_irq.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/hw_irq.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/hw_irq.h 2011-11-15 19:59:42.000000000 -0500
@@ -92,8 +92,8 @@ extern void setup_ioapic_dest(void);
extern void enable_IO_APIC(void);
@@ -8985,8 +8985,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/hw_irq.h linux-2.6.32.48/arch/x8
/* EISA */
extern void eisa_set_level_irq(unsigned int irq);
diff -urNp linux-2.6.32.48/arch/x86/include/asm/i387.h linux-2.6.32.48/arch/x86/include/asm/i387.h
---- linux-2.6.32.48/arch/x86/include/asm/i387.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/i387.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/i387.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/i387.h 2011-11-15 19:59:42.000000000 -0500
@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
{
int err;
@@ -9037,8 +9037,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/i387.h linux-2.6.32.48/arch/x86/
clts();
}
diff -urNp linux-2.6.32.48/arch/x86/include/asm/io_32.h linux-2.6.32.48/arch/x86/include/asm/io_32.h
---- linux-2.6.32.48/arch/x86/include/asm/io_32.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/io_32.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/io_32.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/io_32.h 2011-11-15 19:59:42.000000000 -0500
@@ -3,6 +3,7 @@
#include <linux/string.h>
@@ -9066,8 +9066,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/io_32.h linux-2.6.32.48/arch/x86
#include <linux/vmalloc.h>
diff -urNp linux-2.6.32.48/arch/x86/include/asm/io_64.h linux-2.6.32.48/arch/x86/include/asm/io_64.h
---- linux-2.6.32.48/arch/x86/include/asm/io_64.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/io_64.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/io_64.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/io_64.h 2011-11-15 19:59:42.000000000 -0500
@@ -140,6 +140,17 @@ __OUTS(l)
#include <linux/vmalloc.h>
@@ -9087,8 +9087,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/io_64.h linux-2.6.32.48/arch/x86
void __memcpy_fromio(void *, unsigned long, unsigned);
diff -urNp linux-2.6.32.48/arch/x86/include/asm/iommu.h linux-2.6.32.48/arch/x86/include/asm/iommu.h
---- linux-2.6.32.48/arch/x86/include/asm/iommu.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/iommu.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/iommu.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/iommu.h 2011-11-15 19:59:42.000000000 -0500
@@ -3,7 +3,7 @@
extern void pci_iommu_shutdown(void);
@@ -9099,8 +9099,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/iommu.h linux-2.6.32.48/arch/x86
extern int iommu_detected;
extern int iommu_pass_through;
diff -urNp linux-2.6.32.48/arch/x86/include/asm/irqflags.h linux-2.6.32.48/arch/x86/include/asm/irqflags.h
---- linux-2.6.32.48/arch/x86/include/asm/irqflags.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/irqflags.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/irqflags.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/irqflags.h 2011-11-15 19:59:42.000000000 -0500
@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
sti; \
sysexit
@@ -9114,8 +9114,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/irqflags.h linux-2.6.32.48/arch/
#define INTERRUPT_RETURN iret
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
diff -urNp linux-2.6.32.48/arch/x86/include/asm/kprobes.h linux-2.6.32.48/arch/x86/include/asm/kprobes.h
---- linux-2.6.32.48/arch/x86/include/asm/kprobes.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/kprobes.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/kprobes.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/kprobes.h 2011-11-15 19:59:42.000000000 -0500
@@ -34,13 +34,8 @@ typedef u8 kprobe_opcode_t;
#define BREAKPOINT_INSTRUCTION 0xcc
#define RELATIVEJUMP_INSTRUCTION 0xe9
@@ -9133,8 +9133,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/kprobes.h linux-2.6.32.48/arch/x
#define flush_insn_slot(p) do { } while (0)
diff -urNp linux-2.6.32.48/arch/x86/include/asm/kvm_host.h linux-2.6.32.48/arch/x86/include/asm/kvm_host.h
---- linux-2.6.32.48/arch/x86/include/asm/kvm_host.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/kvm_host.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/kvm_host.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/kvm_host.h 2011-11-15 19:59:42.000000000 -0500
@@ -534,9 +534,9 @@ struct kvm_x86_ops {
bool (*gb_page_enable)(void);
@@ -9148,8 +9148,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/kvm_host.h linux-2.6.32.48/arch/
int kvm_mmu_module_init(void);
void kvm_mmu_module_exit(void);
diff -urNp linux-2.6.32.48/arch/x86/include/asm/local.h linux-2.6.32.48/arch/x86/include/asm/local.h
---- linux-2.6.32.48/arch/x86/include/asm/local.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/local.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/local.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/local.h 2011-11-15 19:59:42.000000000 -0500
@@ -18,26 +18,58 @@ typedef struct {
static inline void local_inc(local_t *l)
@@ -9303,8 +9303,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/local.h linux-2.6.32.48/arch/x86
: : "memory");
return i + __i;
diff -urNp linux-2.6.32.48/arch/x86/include/asm/microcode.h linux-2.6.32.48/arch/x86/include/asm/microcode.h
---- linux-2.6.32.48/arch/x86/include/asm/microcode.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/microcode.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/microcode.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/microcode.h 2011-11-15 19:59:42.000000000 -0500
@@ -12,13 +12,13 @@ struct device;
enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
@@ -9346,8 +9346,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/microcode.h linux-2.6.32.48/arch
return NULL;
}
diff -urNp linux-2.6.32.48/arch/x86/include/asm/mman.h linux-2.6.32.48/arch/x86/include/asm/mman.h
---- linux-2.6.32.48/arch/x86/include/asm/mman.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/mman.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/mman.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/mman.h 2011-11-15 19:59:42.000000000 -0500
@@ -5,4 +5,14 @@
#include <asm-generic/mman.h>
@@ -9364,8 +9364,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/mman.h linux-2.6.32.48/arch/x86/
+
#endif /* _ASM_X86_MMAN_H */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/mmu_context.h linux-2.6.32.48/arch/x86/include/asm/mmu_context.h
---- linux-2.6.32.48/arch/x86/include/asm/mmu_context.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/mmu_context.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/mmu_context.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/mmu_context.h 2011-11-15 19:59:42.000000000 -0500
@@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *m
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -9487,8 +9487,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/mmu_context.h linux-2.6.32.48/ar
#define activate_mm(prev, next) \
diff -urNp linux-2.6.32.48/arch/x86/include/asm/mmu.h linux-2.6.32.48/arch/x86/include/asm/mmu.h
---- linux-2.6.32.48/arch/x86/include/asm/mmu.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/mmu.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/mmu.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/mmu.h 2011-11-15 19:59:42.000000000 -0500
@@ -9,10 +9,23 @@
* we put the segment information here.
*/
@@ -9516,8 +9516,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/mmu.h linux-2.6.32.48/arch/x86/i
#ifdef CONFIG_SMP
diff -urNp linux-2.6.32.48/arch/x86/include/asm/module.h linux-2.6.32.48/arch/x86/include/asm/module.h
---- linux-2.6.32.48/arch/x86/include/asm/module.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/module.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/module.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/module.h 2011-11-15 19:59:42.000000000 -0500
@@ -5,6 +5,7 @@
#ifdef CONFIG_X86_64
@@ -9559,8 +9559,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/module.h linux-2.6.32.48/arch/x8
+
#endif /* _ASM_X86_MODULE_H */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/page_64_types.h linux-2.6.32.48/arch/x86/include/asm/page_64_types.h
---- linux-2.6.32.48/arch/x86/include/asm/page_64_types.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/page_64_types.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/page_64_types.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/page_64_types.h 2011-11-15 19:59:42.000000000 -0500
@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
/* duplicated to the one in bootmem.h */
@@ -9571,8 +9571,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/page_64_types.h linux-2.6.32.48/
extern unsigned long __phys_addr(unsigned long);
#define __phys_reloc_hide(x) (x)
diff -urNp linux-2.6.32.48/arch/x86/include/asm/paravirt.h linux-2.6.32.48/arch/x86/include/asm/paravirt.h
---- linux-2.6.32.48/arch/x86/include/asm/paravirt.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/paravirt.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/paravirt.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/paravirt.h 2011-11-15 19:59:42.000000000 -0500
@@ -648,6 +648,18 @@ static inline void set_pgd(pgd_t *pgdp,
val);
}
@@ -9646,8 +9646,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/paravirt.h linux-2.6.32.48/arch/
#endif /* __ASSEMBLY__ */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/paravirt_types.h linux-2.6.32.48/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.32.48/arch/x86/include/asm/paravirt_types.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/paravirt_types.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/paravirt_types.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/paravirt_types.h 2011-11-15 19:59:42.000000000 -0500
@@ -78,19 +78,19 @@ struct pv_init_ops {
*/
unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
@@ -9720,8 +9720,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/paravirt_types.h linux-2.6.32.48
/* This contains all the paravirt structures: we get a convenient
* number for each function using the offset which we use to indicate
diff -urNp linux-2.6.32.48/arch/x86/include/asm/pci_x86.h linux-2.6.32.48/arch/x86/include/asm/pci_x86.h
---- linux-2.6.32.48/arch/x86/include/asm/pci_x86.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/pci_x86.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/pci_x86.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/pci_x86.h 2011-11-15 19:59:42.000000000 -0500
@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
extern void (*pcibios_disable_irq)(struct pci_dev *dev);
@@ -9745,8 +9745,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/pci_x86.h linux-2.6.32.48/arch/x
/* arch_initcall level */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/percpu.h linux-2.6.32.48/arch/x86/include/asm/percpu.h
---- linux-2.6.32.48/arch/x86/include/asm/percpu.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/percpu.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/percpu.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/percpu.h 2011-11-15 19:59:42.000000000 -0500
@@ -78,6 +78,7 @@ do { \
if (0) { \
T__ tmp__; \
@@ -9756,8 +9756,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/percpu.h linux-2.6.32.48/arch/x8
switch (sizeof(var)) { \
case 1: \
diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgalloc.h linux-2.6.32.48/arch/x86/include/asm/pgalloc.h
---- linux-2.6.32.48/arch/x86/include/asm/pgalloc.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/pgalloc.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/pgalloc.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/pgalloc.h 2011-11-15 19:59:42.000000000 -0500
@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
pmd_t *pmd, pte_t *pte)
{
@@ -9773,8 +9773,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgalloc.h linux-2.6.32.48/arch/x
}
diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.48/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.32.48/arch/x86/include/asm/pgtable-2level.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/pgtable-2level.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/pgtable-2level.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/pgtable-2level.h 2011-11-15 19:59:42.000000000 -0500
@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -9786,8 +9786,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.48
static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable_32.h linux-2.6.32.48/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.32.48/arch/x86/include/asm/pgtable_32.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/pgtable_32.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/pgtable_32.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/pgtable_32.h 2011-11-15 19:59:42.000000000 -0500
@@ -26,9 +26,6 @@
struct mm_struct;
struct vm_area_struct;
@@ -9832,8 +9832,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable_32.h linux-2.6.32.48/arc
* kern_addr_valid() is (1) for FLATMEM and (0) for
* SPARSEMEM and DISCONTIGMEM
diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.48/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.32.48/arch/x86/include/asm/pgtable_32_types.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/pgtable_32_types.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/pgtable_32_types.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/pgtable_32_types.h 2011-11-15 19:59:42.000000000 -0500
@@ -8,7 +8,7 @@
*/
#ifdef CONFIG_X86_PAE
@@ -9864,8 +9864,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.
#define MODULES_END VMALLOC_END
#define MODULES_LEN (MODULES_VADDR - MODULES_END)
diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.48/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.32.48/arch/x86/include/asm/pgtable-3level.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/pgtable-3level.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/pgtable-3level.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/pgtable-3level.h 2011-11-15 19:59:42.000000000 -0500
@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -9884,8 +9884,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.48
/*
diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable_64.h linux-2.6.32.48/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.32.48/arch/x86/include/asm/pgtable_64.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/pgtable_64.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/pgtable_64.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/pgtable_64.h 2011-11-15 19:59:42.000000000 -0500
@@ -16,10 +16,13 @@
extern pud_t level3_kernel_pgt[512];
@@ -9927,8 +9927,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable_64.h linux-2.6.32.48/arc
}
diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.48/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.32.48/arch/x86/include/asm/pgtable_64_types.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/pgtable_64_types.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/pgtable_64_types.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/pgtable_64_types.h 2011-11-15 19:59:42.000000000 -0500
@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
#define MODULES_VADDR _AC(0xffffffffa0000000, UL)
#define MODULES_END _AC(0xffffffffff000000, UL)
@@ -9941,8 +9941,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.
#endif /* _ASM_X86_PGTABLE_64_DEFS_H */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable.h linux-2.6.32.48/arch/x86/include/asm/pgtable.h
---- linux-2.6.32.48/arch/x86/include/asm/pgtable.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/pgtable.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/pgtable.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/pgtable.h 2011-11-15 19:59:42.000000000 -0500
@@ -39,6 +39,7 @@ extern struct list_head pgd_list;
#ifndef __PAGETABLE_PUD_FOLDED
@@ -10121,8 +10121,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable.h linux-2.6.32.48/arch/x
#include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable_types.h linux-2.6.32.48/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.32.48/arch/x86/include/asm/pgtable_types.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/pgtable_types.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/pgtable_types.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/pgtable_types.h 2011-11-15 19:59:42.000000000 -0500
@@ -16,12 +16,11 @@
#define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
#define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -10244,8 +10244,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable_types.h linux-2.6.32.48/
#define pgprot_writecombine pgprot_writecombine
extern pgprot_t pgprot_writecombine(pgprot_t prot);
diff -urNp linux-2.6.32.48/arch/x86/include/asm/processor.h linux-2.6.32.48/arch/x86/include/asm/processor.h
---- linux-2.6.32.48/arch/x86/include/asm/processor.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/processor.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/processor.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/processor.h 2011-11-15 19:59:42.000000000 -0500
@@ -272,7 +272,7 @@ struct tss_struct {
} ____cacheline_aligned;
@@ -10349,8 +10349,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/processor.h linux-2.6.32.48/arch
/* Get/set a process' ability to use the timestamp counter instruction */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/ptrace.h linux-2.6.32.48/arch/x86/include/asm/ptrace.h
---- linux-2.6.32.48/arch/x86/include/asm/ptrace.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/ptrace.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/ptrace.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/ptrace.h 2011-11-15 19:59:42.000000000 -0500
@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
}
@@ -10388,8 +10388,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/ptrace.h linux-2.6.32.48/arch/x8
}
diff -urNp linux-2.6.32.48/arch/x86/include/asm/reboot.h linux-2.6.32.48/arch/x86/include/asm/reboot.h
---- linux-2.6.32.48/arch/x86/include/asm/reboot.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/reboot.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/reboot.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/reboot.h 2011-11-15 19:59:42.000000000 -0500
@@ -6,19 +6,19 @@
struct pt_regs;
@@ -10417,8 +10417,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/reboot.h linux-2.6.32.48/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.48/arch/x86/include/asm/rwsem.h linux-2.6.32.48/arch/x86/include/asm/rwsem.h
---- linux-2.6.32.48/arch/x86/include/asm/rwsem.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/rwsem.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/rwsem.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/rwsem.h 2011-11-15 19:59:42.000000000 -0500
@@ -118,6 +118,14 @@ static inline void __down_read(struct rw
{
asm volatile("# beginning down_read\n\t"
@@ -10544,8 +10544,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/rwsem.h linux-2.6.32.48/arch/x86
: : "memory");
diff -urNp linux-2.6.32.48/arch/x86/include/asm/segment.h linux-2.6.32.48/arch/x86/include/asm/segment.h
---- linux-2.6.32.48/arch/x86/include/asm/segment.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/segment.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/segment.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/segment.h 2011-11-15 19:59:42.000000000 -0500
@@ -62,10 +62,15 @@
* 26 - ESPFIX small SS
* 27 - per-cpu [ offset to per-cpu data area ]
@@ -10622,8 +10622,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/segment.h linux-2.6.32.48/arch/x
#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.48/arch/x86/include/asm/smp.h linux-2.6.32.48/arch/x86/include/asm/smp.h
---- linux-2.6.32.48/arch/x86/include/asm/smp.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/smp.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/smp.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/smp.h 2011-11-15 19:59:42.000000000 -0500
@@ -24,7 +24,7 @@ extern unsigned int num_processors;
DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
@@ -10672,8 +10672,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/smp.h linux-2.6.32.48/arch/x86/i
#endif
diff -urNp linux-2.6.32.48/arch/x86/include/asm/spinlock.h linux-2.6.32.48/arch/x86/include/asm/spinlock.h
---- linux-2.6.32.48/arch/x86/include/asm/spinlock.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/spinlock.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/spinlock.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/spinlock.h 2011-11-15 19:59:42.000000000 -0500
@@ -249,6 +249,14 @@ static inline int __raw_write_can_lock(r
static inline void __raw_read_lock(raw_rwlock_t *rw)
{
@@ -10737,8 +10737,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/spinlock.h linux-2.6.32.48/arch/
}
diff -urNp linux-2.6.32.48/arch/x86/include/asm/stackprotector.h linux-2.6.32.48/arch/x86/include/asm/stackprotector.h
---- linux-2.6.32.48/arch/x86/include/asm/stackprotector.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/stackprotector.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/stackprotector.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/stackprotector.h 2011-11-15 19:59:42.000000000 -0500
@@ -48,7 +48,7 @@
* head_32 for boot CPU and setup_per_cpu_areas() for others.
*/
@@ -10758,8 +10758,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/stackprotector.h linux-2.6.32.48
#endif
}
diff -urNp linux-2.6.32.48/arch/x86/include/asm/system.h linux-2.6.32.48/arch/x86/include/asm/system.h
---- linux-2.6.32.48/arch/x86/include/asm/system.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/system.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/system.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/system.h 2011-11-15 19:59:42.000000000 -0500
@@ -132,7 +132,7 @@ do { \
"thread_return:\n\t" \
"movq "__percpu_arg([current_task])",%%rsi\n\t" \
@@ -10803,8 +10803,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/system.h linux-2.6.32.48/arch/x8
/*
* Force strict CPU ordering.
diff -urNp linux-2.6.32.48/arch/x86/include/asm/thread_info.h linux-2.6.32.48/arch/x86/include/asm/thread_info.h
---- linux-2.6.32.48/arch/x86/include/asm/thread_info.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/thread_info.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/thread_info.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/thread_info.h 2011-11-15 19:59:42.000000000 -0500
@@ -10,6 +10,7 @@
#include <linux/compiler.h>
#include <asm/page.h>
@@ -10953,8 +10953,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/thread_info.h linux-2.6.32.48/ar
#endif
#endif /* _ASM_X86_THREAD_INFO_H */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/uaccess_32.h linux-2.6.32.48/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.32.48/arch/x86/include/asm/uaccess_32.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/uaccess_32.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/uaccess_32.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/uaccess_32.h 2011-11-15 19:59:42.000000000 -0500
@@ -44,6 +44,11 @@ unsigned long __must_check __copy_from_u
static __always_inline unsigned long __must_check
__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -11096,8 +11096,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/uaccess_32.h linux-2.6.32.48/arc
long count);
long __must_check __strncpy_from_user(char *dst,
diff -urNp linux-2.6.32.48/arch/x86/include/asm/uaccess_64.h linux-2.6.32.48/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.32.48/arch/x86/include/asm/uaccess_64.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/uaccess_64.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/uaccess_64.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/uaccess_64.h 2011-11-15 19:59:42.000000000 -0500
@@ -9,6 +9,9 @@
#include <linux/prefetch.h>
#include <linux/lockdep.h>
@@ -11482,8 +11482,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/uaccess_64.h linux-2.6.32.48/arc
#endif /* _ASM_X86_UACCESS_64_H */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/uaccess.h linux-2.6.32.48/arch/x86/include/asm/uaccess.h
---- linux-2.6.32.48/arch/x86/include/asm/uaccess.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/uaccess.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/uaccess.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/uaccess.h 2011-11-15 19:59:42.000000000 -0500
@@ -8,12 +8,15 @@
#include <linux/thread_info.h>
#include <linux/prefetch.h>
@@ -11712,8 +11712,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/uaccess.h linux-2.6.32.48/arch/x
# include "uaccess_32.h"
#else
diff -urNp linux-2.6.32.48/arch/x86/include/asm/vdso.h linux-2.6.32.48/arch/x86/include/asm/vdso.h
---- linux-2.6.32.48/arch/x86/include/asm/vdso.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/vdso.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/vdso.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/vdso.h 2011-11-15 19:59:42.000000000 -0500
@@ -25,7 +25,7 @@ extern const char VDSO32_PRELINK[];
#define VDSO32_SYMBOL(base, name) \
({ \
@@ -11724,8 +11724,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/vdso.h linux-2.6.32.48/arch/x86/
#endif
diff -urNp linux-2.6.32.48/arch/x86/include/asm/vgtod.h linux-2.6.32.48/arch/x86/include/asm/vgtod.h
---- linux-2.6.32.48/arch/x86/include/asm/vgtod.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/vgtod.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/vgtod.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/vgtod.h 2011-11-15 19:59:42.000000000 -0500
@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
int sysctl_enabled;
struct timezone sys_tz;
@@ -11735,8 +11735,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/vgtod.h linux-2.6.32.48/arch/x86
cycle_t cycle_last;
cycle_t mask;
diff -urNp linux-2.6.32.48/arch/x86/include/asm/vmi.h linux-2.6.32.48/arch/x86/include/asm/vmi.h
---- linux-2.6.32.48/arch/x86/include/asm/vmi.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/vmi.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/vmi.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/vmi.h 2011-11-15 19:59:42.000000000 -0500
@@ -191,6 +191,7 @@ struct vrom_header {
u8 reserved[96]; /* Reserved for headers */
char vmi_init[8]; /* VMI_Init jump point */
@@ -11746,8 +11746,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/vmi.h linux-2.6.32.48/arch/x86/i
struct pnp_header {
diff -urNp linux-2.6.32.48/arch/x86/include/asm/vmi_time.h linux-2.6.32.48/arch/x86/include/asm/vmi_time.h
---- linux-2.6.32.48/arch/x86/include/asm/vmi_time.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/vmi_time.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/vmi_time.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/vmi_time.h 2011-11-15 19:59:42.000000000 -0500
@@ -43,7 +43,7 @@ extern struct vmi_timer_ops {
int (*wallclock_updated)(void);
void (*set_alarm)(u32 flags, u64 expiry, u64 period);
@@ -11758,8 +11758,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/vmi_time.h linux-2.6.32.48/arch/
/* Prototypes */
extern void __init vmi_time_init(void);
diff -urNp linux-2.6.32.48/arch/x86/include/asm/vsyscall.h linux-2.6.32.48/arch/x86/include/asm/vsyscall.h
---- linux-2.6.32.48/arch/x86/include/asm/vsyscall.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/vsyscall.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/vsyscall.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/vsyscall.h 2011-11-15 19:59:42.000000000 -0500
@@ -15,9 +15,10 @@ enum vsyscall_num {
#ifdef __KERNEL__
@@ -11791,8 +11791,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/vsyscall.h linux-2.6.32.48/arch/
#endif /* _ASM_X86_VSYSCALL_H */
diff -urNp linux-2.6.32.48/arch/x86/include/asm/x86_init.h linux-2.6.32.48/arch/x86/include/asm/x86_init.h
---- linux-2.6.32.48/arch/x86/include/asm/x86_init.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/x86_init.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/x86_init.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/x86_init.h 2011-11-15 19:59:42.000000000 -0500
@@ -28,7 +28,7 @@ struct x86_init_mpparse {
void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
void (*find_smp_config)(unsigned int reserve);
@@ -11875,8 +11875,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/x86_init.h linux-2.6.32.48/arch/
extern struct x86_init_ops x86_init;
extern struct x86_cpuinit_ops x86_cpuinit;
diff -urNp linux-2.6.32.48/arch/x86/include/asm/xsave.h linux-2.6.32.48/arch/x86/include/asm/xsave.h
---- linux-2.6.32.48/arch/x86/include/asm/xsave.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/include/asm/xsave.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/include/asm/xsave.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/include/asm/xsave.h 2011-11-15 19:59:42.000000000 -0500
@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
static inline int xsave_user(struct xsave_struct __user *buf)
{
@@ -11908,8 +11908,8 @@ diff -urNp linux-2.6.32.48/arch/x86/include/asm/xsave.h linux-2.6.32.48/arch/x86
"2:\n"
".section .fixup,\"ax\"\n"
diff -urNp linux-2.6.32.48/arch/x86/Kconfig linux-2.6.32.48/arch/x86/Kconfig
---- linux-2.6.32.48/arch/x86/Kconfig 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/Kconfig 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/Kconfig 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/Kconfig 2011-11-15 19:59:42.000000000 -0500
@@ -223,7 +223,7 @@ config X86_TRAMPOLINE
config X86_32_LAZY_GS
@@ -11983,8 +11983,8 @@ diff -urNp linux-2.6.32.48/arch/x86/Kconfig linux-2.6.32.48/arch/x86/Kconfig
Map the 32-bit VDSO to the predictable old-style address too.
---help---
diff -urNp linux-2.6.32.48/arch/x86/Kconfig.cpu linux-2.6.32.48/arch/x86/Kconfig.cpu
---- linux-2.6.32.48/arch/x86/Kconfig.cpu 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/Kconfig.cpu 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/Kconfig.cpu 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/Kconfig.cpu 2011-11-15 19:59:42.000000000 -0500
@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -12013,8 +12013,8 @@ diff -urNp linux-2.6.32.48/arch/x86/Kconfig.cpu linux-2.6.32.48/arch/x86/Kconfig
config X86_MINIMUM_CPU_FAMILY
int
diff -urNp linux-2.6.32.48/arch/x86/Kconfig.debug linux-2.6.32.48/arch/x86/Kconfig.debug
---- linux-2.6.32.48/arch/x86/Kconfig.debug 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/Kconfig.debug 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/Kconfig.debug 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/Kconfig.debug 2011-11-15 19:59:42.000000000 -0500
@@ -99,7 +99,7 @@ config X86_PTDUMP
config DEBUG_RODATA
bool "Write protect kernel read-only data structures"
@@ -12025,8 +12025,8 @@ diff -urNp linux-2.6.32.48/arch/x86/Kconfig.debug linux-2.6.32.48/arch/x86/Kconf
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.48/arch/x86/kernel/acpi/realmode/Makefile linux-2.6.32.48/arch/x86/kernel/acpi/realmode/Makefile
---- linux-2.6.32.48/arch/x86/kernel/acpi/realmode/Makefile 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/acpi/realmode/Makefile 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/acpi/realmode/Makefile 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/acpi/realmode/Makefile 2011-11-15 19:59:42.000000000 -0500
@@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os
$(call cc-option, -fno-stack-protector) \
$(call cc-option, -mpreferred-stack-boundary=2)
@@ -12038,8 +12038,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/acpi/realmode/Makefile linux-2.6.32.4
GCOV_PROFILE := n
diff -urNp linux-2.6.32.48/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.48/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-2.6.32.48/arch/x86/kernel/acpi/realmode/wakeup.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-15 19:59:42.000000000 -0500
@@ -91,6 +91,9 @@ _start:
/* Do any other stuff... */
@@ -12068,8 +12068,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.4
pushw $0
pushw trampoline_segment
diff -urNp linux-2.6.32.48/arch/x86/kernel/acpi/sleep.c linux-2.6.32.48/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.32.48/arch/x86/kernel/acpi/sleep.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/acpi/sleep.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/acpi/sleep.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/acpi/sleep.c 2011-11-15 19:59:42.000000000 -0500
@@ -11,11 +11,12 @@
#include <linux/cpumask.h>
#include <asm/segment.h>
@@ -12117,8 +12117,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/acpi/sleep.c linux-2.6.32.48/arch/x86
diff -urNp linux-2.6.32.48/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.48/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.32.48/arch/x86/kernel/acpi/wakeup_32.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/acpi/wakeup_32.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/acpi/wakeup_32.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/acpi/wakeup_32.S 2011-11-15 19:59:42.000000000 -0500
@@ -30,13 +30,11 @@ wakeup_pmode_return:
# and restore the stack ... but you need gdt for this to work
movl saved_context_esp, %esp
@@ -12136,8 +12136,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.48/arch
bogus_magic:
jmp bogus_magic
diff -urNp linux-2.6.32.48/arch/x86/kernel/alternative.c linux-2.6.32.48/arch/x86/kernel/alternative.c
---- linux-2.6.32.48/arch/x86/kernel/alternative.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/alternative.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/alternative.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/alternative.c 2011-11-15 19:59:42.000000000 -0500
@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
BUG_ON(p->len > MAX_PATCH_LEN);
@@ -12221,8 +12221,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/alternative.c linux-2.6.32.48/arch/x8
return addr;
}
diff -urNp linux-2.6.32.48/arch/x86/kernel/amd_iommu.c linux-2.6.32.48/arch/x86/kernel/amd_iommu.c
---- linux-2.6.32.48/arch/x86/kernel/amd_iommu.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/amd_iommu.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/amd_iommu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/amd_iommu.c 2011-11-15 19:59:42.000000000 -0500
@@ -2076,7 +2076,7 @@ static void prealloc_protection_domains(
}
}
@@ -12233,8 +12233,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/amd_iommu.c linux-2.6.32.48/arch/x86/
.free_coherent = free_coherent,
.map_page = map_page,
diff -urNp linux-2.6.32.48/arch/x86/kernel/apic/apic.c linux-2.6.32.48/arch/x86/kernel/apic/apic.c
---- linux-2.6.32.48/arch/x86/kernel/apic/apic.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/apic/apic.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/apic/apic.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/apic/apic.c 2011-11-15 19:59:42.000000000 -0500
@@ -170,7 +170,7 @@ int first_system_vector = 0xfe;
/*
* Debug level, exported for io_apic.c
@@ -12263,8 +12263,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/apic/apic.c linux-2.6.32.48/arch/x86/
bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
diff -urNp linux-2.6.32.48/arch/x86/kernel/apic/io_apic.c linux-2.6.32.48/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.32.48/arch/x86/kernel/apic/io_apic.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/apic/io_apic.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/apic/io_apic.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/apic/io_apic.c 2011-11-15 19:59:42.000000000 -0500
@@ -716,7 +716,7 @@ struct IO_APIC_route_entry **alloc_ioapi
ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
GFP_ATOMIC);
@@ -12320,8 +12320,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/apic/io_apic.c linux-2.6.32.48/arch/x
__mask_and_edge_IO_APIC_irq(cfg);
__unmask_and_level_IO_APIC_irq(cfg);
diff -urNp linux-2.6.32.48/arch/x86/kernel/apm_32.c linux-2.6.32.48/arch/x86/kernel/apm_32.c
---- linux-2.6.32.48/arch/x86/kernel/apm_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/apm_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/apm_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/apm_32.c 2011-11-15 19:59:42.000000000 -0500
@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
* This is for buggy BIOS's that refer to (real mode) segment 0x40
* even though they are called in protected mode.
@@ -12403,8 +12403,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/apm_32.c linux-2.6.32.48/arch/x86/ker
proc_create("apm", 0, NULL, &apm_file_ops);
diff -urNp linux-2.6.32.48/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.48/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.32.48/arch/x86/kernel/asm-offsets_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/asm-offsets_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/asm-offsets_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/asm-offsets_32.c 2011-11-15 19:59:42.000000000 -0500
@@ -51,7 +51,6 @@ void foo(void)
OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
BLANK();
@@ -12443,8 +12443,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.48/arch
#ifdef CONFIG_XEN
diff -urNp linux-2.6.32.48/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.48/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.32.48/arch/x86/kernel/asm-offsets_64.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/asm-offsets_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/asm-offsets_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/asm-offsets_64.c 2011-11-15 19:59:42.000000000 -0500
@@ -44,6 +44,8 @@ int main(void)
ENTRY(addr_limit);
ENTRY(preempt_count);
@@ -12490,8 +12490,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.48/arch
BLANK();
OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/amd.c linux-2.6.32.48/arch/x86/kernel/cpu/amd.c
---- linux-2.6.32.48/arch/x86/kernel/cpu/amd.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/amd.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/amd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/amd.c 2011-11-15 19:59:42.000000000 -0500
@@ -602,7 +602,7 @@ static unsigned int __cpuinit amd_size_c
unsigned int size)
{
@@ -12502,8 +12502,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/amd.c linux-2.6.32.48/arch/x86/ke
if (c->x86_model == 3 && c->x86_mask == 0)
size = 64;
diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/common.c linux-2.6.32.48/arch/x86/kernel/cpu/common.c
---- linux-2.6.32.48/arch/x86/kernel/cpu/common.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/common.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/common.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/common.c 2011-11-15 19:59:42.000000000 -0500
@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -12649,8 +12649,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/common.c linux-2.6.32.48/arch/x86
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/intel.c linux-2.6.32.48/arch/x86/kernel/cpu/intel.c
---- linux-2.6.32.48/arch/x86/kernel/cpu/intel.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/intel.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/intel.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/intel.c 2011-11-15 19:59:42.000000000 -0500
@@ -162,7 +162,7 @@ static void __cpuinit trap_init_f00f_bug
* Update the IDT descriptor and reload the IDT so that
* it uses the read-only mapped virtual address.
@@ -12661,8 +12661,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/intel.c linux-2.6.32.48/arch/x86/
}
#endif
diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.48/arch/x86/kernel/cpu/intel_cacheinfo.c
---- linux-2.6.32.48/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-11-15 19:59:42.000000000 -0500
@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob
return ret;
}
@@ -12673,8 +12673,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.48
.store = store,
};
diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/Makefile linux-2.6.32.48/arch/x86/kernel/cpu/Makefile
---- linux-2.6.32.48/arch/x86/kernel/cpu/Makefile 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/Makefile 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/Makefile 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/Makefile 2011-11-15 19:59:42.000000000 -0500
@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
CFLAGS_REMOVE_common.o = -pg
endif
@@ -12687,8 +12687,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/Makefile linux-2.6.32.48/arch/x86
obj-y += proc.o capflags.o powerflags.o common.o
obj-y += vmware.o hypervisor.o sched.o
diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce_amd.c
---- linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-11-15 19:59:42.000000000 -0500
@@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kob
return ret;
}
@@ -12699,8 +12699,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.48/
.store = store,
};
diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-15 19:59:42.000000000 -0500
@@ -43,6 +43,7 @@
#include <asm/ipi.h>
#include <asm/mce.h>
@@ -12803,8 +12803,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.48/arch
atomic_set(&mce_callin, 0);
atomic_set(&global_nwo, 0);
diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce-inject.c
---- linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce-inject.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-15 19:59:42.000000000 -0500
@@ -211,7 +211,9 @@ static ssize_t mce_write(struct file *fi
static int inject_init(void)
{
@@ -12817,8 +12817,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-2.6.32.
return 0;
}
diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/amd.c
---- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/amd.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/amd.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/amd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/amd.c 2011-11-15 19:59:42.000000000 -0500
@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
return 0;
}
@@ -12829,8 +12829,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.48/arch/x
.set = amd_set_mtrr,
.get = amd_get_mtrr,
diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/centaur.c
---- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/centaur.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/centaur.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/centaur.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/centaur.c 2011-11-15 19:59:42.000000000 -0500
@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
return 0;
}
@@ -12841,8 +12841,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.48/ar
.set = centaur_set_mcr,
.get = centaur_get_mcr,
diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/cyrix.c
---- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/cyrix.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-11-15 19:59:42.000000000 -0500
@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
post_set();
}
@@ -12853,8 +12853,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.48/arch
.set_all = cyrix_set_all,
.set = cyrix_set_arr,
diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/generic.c
---- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/generic.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/generic.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/generic.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/generic.c 2011-11-15 19:59:42.000000000 -0500
@@ -752,7 +752,7 @@ int positive_have_wrcomb(void)
/*
* Generic structure...
@@ -12865,8 +12865,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.48/ar
.set_all = generic_set_all,
.get = generic_get_mtrr,
diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/main.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/main.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/main.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/main.c 2011-11-15 19:59:42.000000000 -0500
@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
u64 size_or_mask, size_and_mask;
static bool mtrr_aps_delayed_init;
@@ -12886,8 +12886,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.48/arch/
if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
mtrr_ops[ops->vendor] = ops;
diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/mtrr.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-15 19:59:42.000000000 -0500
@@ -25,14 +25,14 @@ struct mtrr_ops {
int (*validate_add_page)(unsigned long base, unsigned long size,
unsigned int type);
@@ -12919,8 +12919,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.48/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.48/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.48/arch/x86/kernel/cpu/perfctr-watchdog.c
---- linux-2.6.32.48/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-11-15 19:59:42.000000000 -0500
@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
/* Interface defining a CPU specific perfctr watchdog */
@@ -12955,8 +12955,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.4
.reserve = single_msr_reserve,
.unreserve = single_msr_unreserve,
diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.48/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.32.48/arch/x86/kernel/cpu/perf_event.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/cpu/perf_event.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/cpu/perf_event.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/cpu/perf_event.c 2011-11-15 19:59:42.000000000 -0500
@@ -723,10 +723,10 @@ x86_perf_event_update(struct perf_event
* count to the generic event atomically:
*/
@@ -12998,8 +12998,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.48/arch
}
diff -urNp linux-2.6.32.48/arch/x86/kernel/crash.c linux-2.6.32.48/arch/x86/kernel/crash.c
---- linux-2.6.32.48/arch/x86/kernel/crash.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/crash.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/crash.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/crash.c 2011-11-15 19:59:42.000000000 -0500
@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,
regs = args->regs;
@@ -13010,8 +13010,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/crash.c linux-2.6.32.48/arch/x86/kern
regs = &fixed_regs;
}
diff -urNp linux-2.6.32.48/arch/x86/kernel/doublefault_32.c linux-2.6.32.48/arch/x86/kernel/doublefault_32.c
---- linux-2.6.32.48/arch/x86/kernel/doublefault_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/doublefault_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/doublefault_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/doublefault_32.c 2011-11-15 19:59:42.000000000 -0500
@@ -11,7 +11,7 @@
#define DOUBLEFAULT_STACKSIZE (1024)
@@ -13044,8 +13044,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/doublefault_32.c linux-2.6.32.48/arch
.__cr3 = __pa_nodebug(swapper_pg_dir),
diff -urNp linux-2.6.32.48/arch/x86/kernel/dumpstack_32.c linux-2.6.32.48/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.32.48/arch/x86/kernel/dumpstack_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/dumpstack_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/dumpstack_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/dumpstack_32.c 2011-11-15 19:59:42.000000000 -0500
@@ -53,16 +53,12 @@ void dump_trace(struct task_struct *task
#endif
@@ -13112,8 +13112,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/dumpstack_32.c linux-2.6.32.48/arch/x
return 0;
if (probe_kernel_address((unsigned short *)ip, ud2))
diff -urNp linux-2.6.32.48/arch/x86/kernel/dumpstack_64.c linux-2.6.32.48/arch/x86/kernel/dumpstack_64.c
---- linux-2.6.32.48/arch/x86/kernel/dumpstack_64.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/dumpstack_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/dumpstack_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/dumpstack_64.c 2011-11-15 19:59:43.000000000 -0500
@@ -116,8 +116,8 @@ void dump_trace(struct task_struct *task
unsigned long *irq_stack_end =
(unsigned long *)per_cpu(irq_stack_ptr, cpu);
@@ -13165,8 +13165,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/dumpstack_64.c linux-2.6.32.48/arch/x
}
EXPORT_SYMBOL(dump_trace);
diff -urNp linux-2.6.32.48/arch/x86/kernel/dumpstack.c linux-2.6.32.48/arch/x86/kernel/dumpstack.c
---- linux-2.6.32.48/arch/x86/kernel/dumpstack.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/dumpstack.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/dumpstack.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/dumpstack.c 2011-11-15 19:59:43.000000000 -0500
@@ -2,6 +2,9 @@
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -13284,8 +13284,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/dumpstack.c linux-2.6.32.48/arch/x86/
if (__die(str, regs, err))
diff -urNp linux-2.6.32.48/arch/x86/kernel/dumpstack.h linux-2.6.32.48/arch/x86/kernel/dumpstack.h
---- linux-2.6.32.48/arch/x86/kernel/dumpstack.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/dumpstack.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/dumpstack.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/dumpstack.h 2011-11-15 19:59:43.000000000 -0500
@@ -15,7 +15,7 @@
#endif
@@ -13296,8 +13296,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/dumpstack.h linux-2.6.32.48/arch/x86/
const struct stacktrace_ops *ops, void *data,
unsigned long *end, int *graph);
diff -urNp linux-2.6.32.48/arch/x86/kernel/e820.c linux-2.6.32.48/arch/x86/kernel/e820.c
---- linux-2.6.32.48/arch/x86/kernel/e820.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/e820.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/e820.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/e820.c 2011-11-15 19:59:43.000000000 -0500
@@ -733,7 +733,7 @@ struct early_res {
};
static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -13308,8 +13308,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/e820.c linux-2.6.32.48/arch/x86/kerne
static int __init find_overlapped_early(u64 start, u64 end)
diff -urNp linux-2.6.32.48/arch/x86/kernel/early_printk.c linux-2.6.32.48/arch/x86/kernel/early_printk.c
---- linux-2.6.32.48/arch/x86/kernel/early_printk.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/early_printk.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/early_printk.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/early_printk.c 2011-11-15 19:59:43.000000000 -0500
@@ -7,6 +7,7 @@
#include <linux/pci_regs.h>
#include <linux/pci_ids.h>
@@ -13328,8 +13328,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/early_printk.c linux-2.6.32.48/arch/x
n = vscnprintf(buf, sizeof(buf), fmt, ap);
early_console->write(early_console, buf, n);
diff -urNp linux-2.6.32.48/arch/x86/kernel/efi_32.c linux-2.6.32.48/arch/x86/kernel/efi_32.c
---- linux-2.6.32.48/arch/x86/kernel/efi_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/efi_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/efi_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/efi_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -38,70 +38,56 @@
*/
@@ -13428,8 +13428,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/efi_32.c linux-2.6.32.48/arch/x86/ker
/*
* After the lock is released, the original page table is restored.
diff -urNp linux-2.6.32.48/arch/x86/kernel/efi_stub_32.S linux-2.6.32.48/arch/x86/kernel/efi_stub_32.S
---- linux-2.6.32.48/arch/x86/kernel/efi_stub_32.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/efi_stub_32.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/efi_stub_32.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/efi_stub_32.S 2011-11-15 19:59:43.000000000 -0500
@@ -6,7 +6,9 @@
*/
@@ -13539,8 +13539,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/efi_stub_32.S linux-2.6.32.48/arch/x8
.long 0
efi_rt_function_ptr:
diff -urNp linux-2.6.32.48/arch/x86/kernel/efi_stub_64.S linux-2.6.32.48/arch/x86/kernel/efi_stub_64.S
---- linux-2.6.32.48/arch/x86/kernel/efi_stub_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/efi_stub_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/efi_stub_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/efi_stub_64.S 2011-11-15 19:59:43.000000000 -0500
@@ -7,6 +7,7 @@
*/
@@ -13605,8 +13605,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/efi_stub_64.S linux-2.6.32.48/arch/x8
ret
ENDPROC(efi_call6)
diff -urNp linux-2.6.32.48/arch/x86/kernel/entry_32.S linux-2.6.32.48/arch/x86/kernel/entry_32.S
---- linux-2.6.32.48/arch/x86/kernel/entry_32.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/entry_32.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/entry_32.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/entry_32.S 2011-11-15 19:59:43.000000000 -0500
@@ -185,13 +185,146 @@
/*CFI_REL_OFFSET gs, PT_GS*/
.endm
@@ -14096,8 +14096,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/entry_32.S linux-2.6.32.48/arch/x86/k
lss 12+4(%esp), %esp # back to espfix stack
CFI_ADJUST_CFA_OFFSET -24
diff -urNp linux-2.6.32.48/arch/x86/kernel/entry_64.S linux-2.6.32.48/arch/x86/kernel/entry_64.S
---- linux-2.6.32.48/arch/x86/kernel/entry_64.S 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/entry_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/entry_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/entry_64.S 2011-11-15 19:59:43.000000000 -0500
@@ -53,6 +53,8 @@
#include <asm/paravirt.h>
#include <asm/ftrace.h>
@@ -14812,8 +14812,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/entry_64.S linux-2.6.32.48/arch/x86/k
nmi_userspace:
GET_THREAD_INFO(%rcx)
diff -urNp linux-2.6.32.48/arch/x86/kernel/ftrace.c linux-2.6.32.48/arch/x86/kernel/ftrace.c
---- linux-2.6.32.48/arch/x86/kernel/ftrace.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/ftrace.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/ftrace.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/ftrace.c 2011-11-15 19:59:43.000000000 -0500
@@ -103,7 +103,7 @@ static void *mod_code_ip; /* holds the
static void *mod_code_newcode; /* holds the text to write to the IP */
@@ -14900,8 +14900,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/ftrace.c linux-2.6.32.48/arch/x86/ker
return -EFAULT;
diff -urNp linux-2.6.32.48/arch/x86/kernel/head32.c linux-2.6.32.48/arch/x86/kernel/head32.c
---- linux-2.6.32.48/arch/x86/kernel/head32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/head32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/head32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/head32.c 2011-11-15 19:59:43.000000000 -0500
@@ -16,6 +16,7 @@
#include <asm/apic.h>
#include <asm/io_apic.h>
@@ -14920,8 +14920,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/head32.c linux-2.6.32.48/arch/x86/ker
#ifdef CONFIG_BLK_DEV_INITRD
/* Reserve INITRD */
diff -urNp linux-2.6.32.48/arch/x86/kernel/head_32.S linux-2.6.32.48/arch/x86/kernel/head_32.S
---- linux-2.6.32.48/arch/x86/kernel/head_32.S 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/head_32.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/head_32.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/head_32.S 2011-11-15 19:59:43.000000000 -0500
@@ -19,10 +19,17 @@
#include <asm/setup.h>
#include <asm/processor-flags.h>
@@ -15444,8 +15444,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/head_32.S linux-2.6.32.48/arch/x86/ke
+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
+ .endr
diff -urNp linux-2.6.32.48/arch/x86/kernel/head_64.S linux-2.6.32.48/arch/x86/kernel/head_64.S
---- linux-2.6.32.48/arch/x86/kernel/head_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/head_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/head_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/head_64.S 2011-11-15 19:59:43.000000000 -0500
@@ -19,6 +19,7 @@
#include <asm/cache.h>
#include <asm/processor-flags.h>
@@ -15717,8 +15717,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/head_64.S linux-2.6.32.48/arch/x86/ke
__PAGE_ALIGNED_BSS
.align PAGE_SIZE
diff -urNp linux-2.6.32.48/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.48/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.32.48/arch/x86/kernel/i386_ksyms_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/i386_ksyms_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/i386_ksyms_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/i386_ksyms_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
EXPORT_SYMBOL(cmpxchg8b_emu);
#endif
@@ -15741,8 +15741,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.48/arch/
+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
+#endif
diff -urNp linux-2.6.32.48/arch/x86/kernel/i8259.c linux-2.6.32.48/arch/x86/kernel/i8259.c
---- linux-2.6.32.48/arch/x86/kernel/i8259.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/i8259.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/i8259.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/i8259.c 2011-11-15 19:59:43.000000000 -0500
@@ -208,7 +208,7 @@ spurious_8259A_irq:
"spurious 8259A interrupt: IRQ%d.\n", irq);
spurious_irq_mask |= irqmask;
@@ -15753,8 +15753,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/i8259.c linux-2.6.32.48/arch/x86/kern
* Theoretically we do not have to handle this IRQ,
* but in Linux this does not cause problems and is
diff -urNp linux-2.6.32.48/arch/x86/kernel/init_task.c linux-2.6.32.48/arch/x86/kernel/init_task.c
---- linux-2.6.32.48/arch/x86/kernel/init_task.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/init_task.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/init_task.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/init_task.c 2011-11-15 19:59:43.000000000 -0500
@@ -20,8 +20,7 @@ static struct sighand_struct init_sighan
* way process stacks are handled. This is done by having a special
* "init_task" linker map entry..
@@ -15774,8 +15774,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/init_task.c linux-2.6.32.48/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.48/arch/x86/kernel/ioport.c linux-2.6.32.48/arch/x86/kernel/ioport.c
---- linux-2.6.32.48/arch/x86/kernel/ioport.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/ioport.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/ioport.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/ioport.c 2011-11-15 19:59:43.000000000 -0500
@@ -6,6 +6,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
@@ -15820,8 +15820,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/ioport.c linux-2.6.32.48/arch/x86/ker
return -EPERM;
}
diff -urNp linux-2.6.32.48/arch/x86/kernel/irq_32.c linux-2.6.32.48/arch/x86/kernel/irq_32.c
---- linux-2.6.32.48/arch/x86/kernel/irq_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/irq_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/irq_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/irq_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -35,7 +35,7 @@ static int check_stack_overflow(void)
__asm__ __volatile__("andl %%esp,%0" :
"=r" (sp) : "0" (THREAD_SIZE - 1));
@@ -15963,8 +15963,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/irq_32.c linux-2.6.32.48/arch/x86/ker
* Shouldnt happen, we returned above if in_interrupt():
*/
diff -urNp linux-2.6.32.48/arch/x86/kernel/irq.c linux-2.6.32.48/arch/x86/kernel/irq.c
---- linux-2.6.32.48/arch/x86/kernel/irq.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/irq.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/irq.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/irq.c 2011-11-15 19:59:43.000000000 -0500
@@ -15,7 +15,7 @@
#include <asm/mce.h>
#include <asm/hw_irq.h>
@@ -16000,8 +16000,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/irq.c linux-2.6.32.48/arch/x86/kernel
return sum;
}
diff -urNp linux-2.6.32.48/arch/x86/kernel/kgdb.c linux-2.6.32.48/arch/x86/kernel/kgdb.c
---- linux-2.6.32.48/arch/x86/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/kgdb.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/kgdb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/kgdb.c 2011-11-15 19:59:43.000000000 -0500
@@ -390,13 +390,13 @@ int kgdb_arch_handle_exception(int e_vec
/* clear the trace bit */
@@ -16037,8 +16037,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/kgdb.c linux-2.6.32.48/arch/x86/kerne
.gdb_bpt_instr = { 0xcc },
.flags = KGDB_HW_BREAKPOINT,
diff -urNp linux-2.6.32.48/arch/x86/kernel/kprobes.c linux-2.6.32.48/arch/x86/kernel/kprobes.c
---- linux-2.6.32.48/arch/x86/kernel/kprobes.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/kprobes.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/kprobes.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/kprobes.c 2011-11-15 19:59:43.000000000 -0500
@@ -168,9 +168,13 @@ static void __kprobes set_jmp_op(void *f
char op;
s32 raddr;
@@ -16141,8 +16141,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/kprobes.c linux-2.6.32.48/arch/x86/ke
switch (val) {
diff -urNp linux-2.6.32.48/arch/x86/kernel/kvm.c linux-2.6.32.48/arch/x86/kernel/kvm.c
---- linux-2.6.32.48/arch/x86/kernel/kvm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/kvm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/kvm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/kvm.c 2011-11-15 19:59:43.000000000 -0500
@@ -216,6 +216,7 @@ static void __init paravirt_ops_setup(vo
pv_mmu_ops.set_pud = kvm_set_pud;
#if PAGETABLE_LEVELS == 4
@@ -16152,8 +16152,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/kvm.c linux-2.6.32.48/arch/x86/kernel
#endif
pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
diff -urNp linux-2.6.32.48/arch/x86/kernel/ldt.c linux-2.6.32.48/arch/x86/kernel/ldt.c
---- linux-2.6.32.48/arch/x86/kernel/ldt.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/ldt.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/ldt.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/ldt.c 2011-11-15 19:59:43.000000000 -0500
@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
if (reload) {
#ifdef CONFIG_SMP
@@ -16219,8 +16219,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/ldt.c linux-2.6.32.48/arch/x86/kernel
if (oldmode)
ldt.avl = 0;
diff -urNp linux-2.6.32.48/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.48/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.32.48/arch/x86/kernel/machine_kexec_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/machine_kexec_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/machine_kexec_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/machine_kexec_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -26,7 +26,7 @@
#include <asm/system.h>
#include <asm/cacheflush.h>
@@ -16249,8 +16249,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.48/ar
relocate_kernel_ptr = control_page;
page_list[PA_CONTROL_PAGE] = __pa(control_page);
diff -urNp linux-2.6.32.48/arch/x86/kernel/microcode_amd.c linux-2.6.32.48/arch/x86/kernel/microcode_amd.c
---- linux-2.6.32.48/arch/x86/kernel/microcode_amd.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/microcode_amd.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/microcode_amd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/microcode_amd.c 2011-11-15 19:59:43.000000000 -0500
@@ -364,7 +364,7 @@ static void microcode_fini_cpu_amd(int c
uci->mc = NULL;
}
@@ -16270,8 +16270,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/microcode_amd.c linux-2.6.32.48/arch/
return &microcode_amd_ops;
}
diff -urNp linux-2.6.32.48/arch/x86/kernel/microcode_core.c linux-2.6.32.48/arch/x86/kernel/microcode_core.c
---- linux-2.6.32.48/arch/x86/kernel/microcode_core.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/microcode_core.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/microcode_core.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/microcode_core.c 2011-11-15 19:59:43.000000000 -0500
@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
#define MICROCODE_VERSION "2.00"
@@ -16282,8 +16282,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/microcode_core.c linux-2.6.32.48/arch
/*
* Synchronization.
diff -urNp linux-2.6.32.48/arch/x86/kernel/microcode_intel.c linux-2.6.32.48/arch/x86/kernel/microcode_intel.c
---- linux-2.6.32.48/arch/x86/kernel/microcode_intel.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/microcode_intel.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/microcode_intel.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/microcode_intel.c 2011-11-15 19:59:43.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)
@@ -16319,8 +16319,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/microcode_intel.c linux-2.6.32.48/arc
return &microcode_intel_ops;
}
diff -urNp linux-2.6.32.48/arch/x86/kernel/module.c linux-2.6.32.48/arch/x86/kernel/module.c
---- linux-2.6.32.48/arch/x86/kernel/module.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/module.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/module.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/module.c 2011-11-15 19:59:43.000000000 -0500
@@ -34,7 +34,7 @@
#define DEBUGP(fmt...)
#endif
@@ -16462,8 +16462,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/module.c linux-2.6.32.48/arch/x86/ker
if ((s64)val != *(s32 *)loc)
goto overflow;
diff -urNp linux-2.6.32.48/arch/x86/kernel/paravirt.c linux-2.6.32.48/arch/x86/kernel/paravirt.c
---- linux-2.6.32.48/arch/x86/kernel/paravirt.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/paravirt.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/paravirt.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/paravirt.c 2011-11-15 19:59:43.000000000 -0500
@@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
{
return x;
@@ -16612,8 +16612,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/paravirt.c linux-2.6.32.48/arch/x86/k
EXPORT_SYMBOL_GPL(pv_time_ops);
diff -urNp linux-2.6.32.48/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.48/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.32.48/arch/x86/kernel/paravirt-spinlocks.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/paravirt-spinlocks.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/paravirt-spinlocks.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/paravirt-spinlocks.c 2011-11-15 19:59:43.000000000 -0500
@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
__raw_spin_lock(lock);
}
@@ -16624,8 +16624,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.48/
.spin_is_locked = __ticket_spin_is_locked,
.spin_is_contended = __ticket_spin_is_contended,
diff -urNp linux-2.6.32.48/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.48/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.32.48/arch/x86/kernel/pci-calgary_64.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/pci-calgary_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/pci-calgary_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/pci-calgary_64.c 2011-11-15 19:59:43.000000000 -0500
@@ -477,7 +477,7 @@ static void calgary_free_coherent(struct
free_pages((unsigned long)vaddr, get_order(size));
}
@@ -16636,8 +16636,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.48/arch
.free_coherent = calgary_free_coherent,
.map_sg = calgary_map_sg,
diff -urNp linux-2.6.32.48/arch/x86/kernel/pci-dma.c linux-2.6.32.48/arch/x86/kernel/pci-dma.c
---- linux-2.6.32.48/arch/x86/kernel/pci-dma.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/pci-dma.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/pci-dma.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/pci-dma.c 2011-11-15 19:59:43.000000000 -0500
@@ -14,7 +14,7 @@
static int forbid_dac __read_mostly;
@@ -16657,8 +16657,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/pci-dma.c linux-2.6.32.48/arch/x86/ke
#ifdef CONFIG_PCI
if (mask > 0xffffffff && forbid_dac > 0) {
diff -urNp linux-2.6.32.48/arch/x86/kernel/pci-gart_64.c linux-2.6.32.48/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.32.48/arch/x86/kernel/pci-gart_64.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/pci-gart_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/pci-gart_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/pci-gart_64.c 2011-11-15 19:59:43.000000000 -0500
@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
return -1;
}
@@ -16669,8 +16669,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/pci-gart_64.c linux-2.6.32.48/arch/x8
.unmap_sg = gart_unmap_sg,
.map_page = gart_map_page,
diff -urNp linux-2.6.32.48/arch/x86/kernel/pci-nommu.c linux-2.6.32.48/arch/x86/kernel/pci-nommu.c
---- linux-2.6.32.48/arch/x86/kernel/pci-nommu.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/pci-nommu.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/pci-nommu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/pci-nommu.c 2011-11-15 19:59:43.000000000 -0500
@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
flush_write_buffers();
}
@@ -16681,8 +16681,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/pci-nommu.c linux-2.6.32.48/arch/x86/
.free_coherent = nommu_free_coherent,
.map_sg = nommu_map_sg,
diff -urNp linux-2.6.32.48/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.48/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.32.48/arch/x86/kernel/pci-swiotlb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/pci-swiotlb.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/pci-swiotlb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/pci-swiotlb.c 2011-11-15 19:59:43.000000000 -0500
@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
}
@@ -16693,8 +16693,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.48/arch/x8
.alloc_coherent = x86_swiotlb_alloc_coherent,
.free_coherent = swiotlb_free_coherent,
diff -urNp linux-2.6.32.48/arch/x86/kernel/process_32.c linux-2.6.32.48/arch/x86/kernel/process_32.c
---- linux-2.6.32.48/arch/x86/kernel/process_32.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/process_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/process_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/process_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
unsigned long thread_saved_pc(struct task_struct *tsk)
{
@@ -16796,8 +16796,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/process_32.c linux-2.6.32.48/arch/x86
}
-
diff -urNp linux-2.6.32.48/arch/x86/kernel/process_64.c linux-2.6.32.48/arch/x86/kernel/process_64.c
---- linux-2.6.32.48/arch/x86/kernel/process_64.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/process_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/process_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/process_64.c 2011-11-15 19:59:43.000000000 -0500
@@ -91,7 +91,7 @@ static void __exit_idle(void)
void exit_idle(void)
{
@@ -16872,8 +16872,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/process_64.c linux-2.6.32.48/arch/x86
ip = *(u64 *)(fp+8);
if (!in_sched_functions(ip))
diff -urNp linux-2.6.32.48/arch/x86/kernel/process.c linux-2.6.32.48/arch/x86/kernel/process.c
---- linux-2.6.32.48/arch/x86/kernel/process.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/process.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/process.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/process.c 2011-11-15 19:59:43.000000000 -0500
@@ -51,16 +51,33 @@ void free_thread_xstate(struct task_stru
void free_thread_info(struct thread_info *ti)
@@ -16989,8 +16989,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/process.c linux-2.6.32.48/arch/x86/ke
+#endif
diff -urNp linux-2.6.32.48/arch/x86/kernel/ptrace.c linux-2.6.32.48/arch/x86/kernel/ptrace.c
---- linux-2.6.32.48/arch/x86/kernel/ptrace.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/ptrace.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/ptrace.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/ptrace.c 2011-11-15 19:59:43.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)
{
@@ -17078,8 +17078,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/ptrace.c linux-2.6.32.48/arch/x86/ker
if (unlikely(current->audit_context))
audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
diff -urNp linux-2.6.32.48/arch/x86/kernel/reboot.c linux-2.6.32.48/arch/x86/kernel/reboot.c
---- linux-2.6.32.48/arch/x86/kernel/reboot.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/reboot.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/reboot.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/reboot.c 2011-11-15 19:59:43.000000000 -0500
@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
@@ -17207,8 +17207,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/reboot.c linux-2.6.32.48/arch/x86/ker
struct machine_ops machine_ops = {
diff -urNp linux-2.6.32.48/arch/x86/kernel/setup.c linux-2.6.32.48/arch/x86/kernel/setup.c
---- linux-2.6.32.48/arch/x86/kernel/setup.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/setup.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/setup.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/setup.c 2011-11-15 19:59:43.000000000 -0500
@@ -783,14 +783,14 @@ void __init setup_arch(char **cmdline_p)
if (!boot_params.hdr.root_flags)
@@ -17230,8 +17230,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/setup.c linux-2.6.32.48/arch/x86/kern
bss_resource.start = virt_to_phys(&__bss_start);
bss_resource.end = virt_to_phys(&__bss_stop)-1;
diff -urNp linux-2.6.32.48/arch/x86/kernel/setup_percpu.c linux-2.6.32.48/arch/x86/kernel/setup_percpu.c
---- linux-2.6.32.48/arch/x86/kernel/setup_percpu.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/setup_percpu.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/setup_percpu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/setup_percpu.c 2011-11-15 19:59:43.000000000 -0500
@@ -25,19 +25,17 @@
# define DBG(x...)
#endif
@@ -17296,8 +17296,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/setup_percpu.c linux-2.6.32.48/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.48/arch/x86/kernel/signal.c linux-2.6.32.48/arch/x86/kernel/signal.c
---- linux-2.6.32.48/arch/x86/kernel/signal.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/signal.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/signal.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/signal.c 2011-11-15 19:59:43.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.
@@ -17382,8 +17382,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/signal.c linux-2.6.32.48/arch/x86/ker
if (current_thread_info()->status & TS_RESTORE_SIGMASK)
diff -urNp linux-2.6.32.48/arch/x86/kernel/smpboot.c linux-2.6.32.48/arch/x86/kernel/smpboot.c
---- linux-2.6.32.48/arch/x86/kernel/smpboot.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/smpboot.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/smpboot.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/smpboot.c 2011-11-15 19:59:43.000000000 -0500
@@ -94,14 +94,14 @@ static DEFINE_PER_CPU(struct task_struct
*/
static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex);
@@ -17454,8 +17454,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/smpboot.c linux-2.6.32.48/arch/x86/ke
if (err) {
diff -urNp linux-2.6.32.48/arch/x86/kernel/step.c linux-2.6.32.48/arch/x86/kernel/step.c
---- linux-2.6.32.48/arch/x86/kernel/step.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/step.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/step.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/step.c 2011-11-15 19:59:43.000000000 -0500
@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
struct desc_struct *desc;
unsigned long base;
@@ -17499,16 +17499,16 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/step.c linux-2.6.32.48/arch/x86/kerne
return 0;
/* 64-bit mode: REX prefix */
diff -urNp linux-2.6.32.48/arch/x86/kernel/syscall_table_32.S linux-2.6.32.48/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.32.48/arch/x86/kernel/syscall_table_32.S 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/syscall_table_32.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/syscall_table_32.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/syscall_table_32.S 2011-11-15 19:59:43.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.48/arch/x86/kernel/sys_i386_32.c linux-2.6.32.48/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.32.48/arch/x86/kernel/sys_i386_32.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/sys_i386_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/sys_i386_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/sys_i386_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -24,6 +24,21 @@
#include <asm/syscalls.h>
@@ -17781,8 +17781,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/sys_i386_32.c linux-2.6.32.48/arch/x8
- return __res;
-}
diff -urNp linux-2.6.32.48/arch/x86/kernel/sys_x86_64.c linux-2.6.32.48/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.32.48/arch/x86/kernel/sys_x86_64.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/sys_x86_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/sys_x86_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/sys_x86_64.c 2011-11-15 19:59:43.000000000 -0500
@@ -32,8 +32,8 @@ out:
return error;
}
@@ -17921,8 +17921,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/sys_x86_64.c linux-2.6.32.48/arch/x86
return addr;
diff -urNp linux-2.6.32.48/arch/x86/kernel/tboot.c linux-2.6.32.48/arch/x86/kernel/tboot.c
---- linux-2.6.32.48/arch/x86/kernel/tboot.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/tboot.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/tboot.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/tboot.c 2011-11-15 19:59:43.000000000 -0500
@@ -216,7 +216,7 @@ static int tboot_setup_sleep(void)
void tboot_shutdown(u32 shutdown_type)
@@ -17972,8 +17972,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/tboot.c linux-2.6.32.48/arch/x86/kern
return 0;
}
diff -urNp linux-2.6.32.48/arch/x86/kernel/time.c linux-2.6.32.48/arch/x86/kernel/time.c
---- linux-2.6.32.48/arch/x86/kernel/time.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/time.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/time.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/time.c 2011-11-15 19:59:43.000000000 -0500
@@ -26,17 +26,13 @@
int timer_ack;
#endif
@@ -18013,8 +18013,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/time.c linux-2.6.32.48/arch/x86/kerne
return pc;
}
diff -urNp linux-2.6.32.48/arch/x86/kernel/tls.c linux-2.6.32.48/arch/x86/kernel/tls.c
---- linux-2.6.32.48/arch/x86/kernel/tls.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/tls.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/tls.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/tls.c 2011-11-15 19:59:43.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;
@@ -18028,8 +18028,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/tls.c linux-2.6.32.48/arch/x86/kernel
return 0;
diff -urNp linux-2.6.32.48/arch/x86/kernel/trampoline_32.S linux-2.6.32.48/arch/x86/kernel/trampoline_32.S
---- linux-2.6.32.48/arch/x86/kernel/trampoline_32.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/trampoline_32.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/trampoline_32.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/trampoline_32.S 2011-11-15 19:59:43.000000000 -0500
@@ -32,6 +32,12 @@
#include <asm/segment.h>
#include <asm/page_types.h>
@@ -18053,8 +18053,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/trampoline_32.S linux-2.6.32.48/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.48/arch/x86/kernel/trampoline_64.S linux-2.6.32.48/arch/x86/kernel/trampoline_64.S
---- linux-2.6.32.48/arch/x86/kernel/trampoline_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/trampoline_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/trampoline_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/trampoline_64.S 2011-11-15 19:59:43.000000000 -0500
@@ -91,7 +91,7 @@ startup_32:
movl $__KERNEL_DS, %eax # Initialize the %ds segment register
movl %eax, %ds
@@ -18083,8 +18083,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/trampoline_64.S linux-2.6.32.48/arch/
.short 0
.quad 0x00cf9b000000ffff # __KERNEL32_CS
diff -urNp linux-2.6.32.48/arch/x86/kernel/traps.c linux-2.6.32.48/arch/x86/kernel/traps.c
---- linux-2.6.32.48/arch/x86/kernel/traps.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/traps.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/traps.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/traps.c 2011-11-15 19:59:43.000000000 -0500
@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
/* Do we ignore FPU interrupts ? */
@@ -18272,7 +18272,7 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/traps.c linux-2.6.32.48/arch/x86/kern
if (!tsk_used_math(tsk)) {
local_irq_enable();
diff -urNp linux-2.6.32.48/arch/x86/kernel/verify_cpu_64.S linux-2.6.32.48/arch/x86/kernel/verify_cpu_64.S
---- linux-2.6.32.48/arch/x86/kernel/verify_cpu_64.S 2009-12-02 22:51:21.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/verify_cpu_64.S 2011-11-08 19:02:43.000000000 -0500
+++ linux-2.6.32.48/arch/x86/kernel/verify_cpu_64.S 1969-12-31 19:00:00.000000000 -0500
@@ -1,105 +0,0 @@
-/*
@@ -18382,7 +18382,7 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/verify_cpu_64.S linux-2.6.32.48/arch/
- ret
diff -urNp linux-2.6.32.48/arch/x86/kernel/verify_cpu.S linux-2.6.32.48/arch/x86/kernel/verify_cpu.S
--- linux-2.6.32.48/arch/x86/kernel/verify_cpu.S 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/verify_cpu.S 2011-11-12 12:46:42.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/verify_cpu.S 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,140 @@
+/*
+ *
@@ -18525,8 +18525,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/verify_cpu.S linux-2.6.32.48/arch/x86
+ xorl %eax, %eax
+ ret
diff -urNp linux-2.6.32.48/arch/x86/kernel/vm86_32.c linux-2.6.32.48/arch/x86/kernel/vm86_32.c
---- linux-2.6.32.48/arch/x86/kernel/vm86_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/vm86_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/vm86_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/vm86_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -41,6 +41,7 @@
#include <linux/ptrace.h>
#include <linux/audit.h>
@@ -18592,8 +18592,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/vm86_32.c linux-2.6.32.48/arch/x86/ke
goto cannot_handle;
if ((segoffs >> 16) == BIOSSEG)
diff -urNp linux-2.6.32.48/arch/x86/kernel/vmi_32.c linux-2.6.32.48/arch/x86/kernel/vmi_32.c
---- linux-2.6.32.48/arch/x86/kernel/vmi_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/vmi_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/vmi_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/vmi_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
@@ -18757,8 +18757,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/vmi_32.c linux-2.6.32.48/arch/x86/ker
local_irq_save(flags);
diff -urNp linux-2.6.32.48/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.48/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.32.48/arch/x86/kernel/vmlinux.lds.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/vmlinux.lds.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/vmlinux.lds.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/vmlinux.lds.S 2011-11-15 19:59:43.000000000 -0500
@@ -26,6 +26,13 @@
#include <asm/page_types.h>
#include <asm/cache.h>
@@ -19052,8 +19052,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.48/arch/x8
#ifdef CONFIG_SMP
diff -urNp linux-2.6.32.48/arch/x86/kernel/vsyscall_64.c linux-2.6.32.48/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.32.48/arch/x86/kernel/vsyscall_64.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/vsyscall_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/vsyscall_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/vsyscall_64.c 2011-11-15 19:59:43.000000000 -0500
@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -19072,8 +19072,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/vsyscall_64.c linux-2.6.32.48/arch/x8
} else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
/* Load per CPU data from RDTSCP */
diff -urNp linux-2.6.32.48/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.48/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.32.48/arch/x86/kernel/x8664_ksyms_64.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/x8664_ksyms_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/x8664_ksyms_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/x8664_ksyms_64.c 2011-11-15 19:59:43.000000000 -0500
@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
EXPORT_SYMBOL(copy_user_generic);
@@ -19084,8 +19084,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.48/arch
EXPORT_SYMBOL(copy_page);
diff -urNp linux-2.6.32.48/arch/x86/kernel/xsave.c linux-2.6.32.48/arch/x86/kernel/xsave.c
---- linux-2.6.32.48/arch/x86/kernel/xsave.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kernel/xsave.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kernel/xsave.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kernel/xsave.c 2011-11-15 19:59:43.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;
@@ -19114,8 +19114,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kernel/xsave.c linux-2.6.32.48/arch/x86/kern
if (unlikely(err)) {
/*
diff -urNp linux-2.6.32.48/arch/x86/kvm/emulate.c linux-2.6.32.48/arch/x86/kvm/emulate.c
---- linux-2.6.32.48/arch/x86/kvm/emulate.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kvm/emulate.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kvm/emulate.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kvm/emulate.c 2011-11-15 19:59:43.000000000 -0500
@@ -81,8 +81,8 @@
#define Src2CL (1<<29)
#define Src2ImmByte (2<<29)
@@ -19153,8 +19153,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kvm/emulate.c linux-2.6.32.48/arch/x86/kvm/e
case 1: \
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
diff -urNp linux-2.6.32.48/arch/x86/kvm/lapic.c linux-2.6.32.48/arch/x86/kvm/lapic.c
---- linux-2.6.32.48/arch/x86/kvm/lapic.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kvm/lapic.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kvm/lapic.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kvm/lapic.c 2011-11-15 19:59:43.000000000 -0500
@@ -52,7 +52,7 @@
#define APIC_BUS_CYCLE_NS 1
@@ -19165,8 +19165,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kvm/lapic.c linux-2.6.32.48/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.48/arch/x86/kvm/paging_tmpl.h linux-2.6.32.48/arch/x86/kvm/paging_tmpl.h
---- linux-2.6.32.48/arch/x86/kvm/paging_tmpl.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kvm/paging_tmpl.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kvm/paging_tmpl.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kvm/paging_tmpl.h 2011-11-15 19:59:43.000000000 -0500
@@ -416,6 +416,8 @@ static int FNAME(page_fault)(struct kvm_
int level = PT_PAGE_TABLE_LEVEL;
unsigned long mmu_seq;
@@ -19177,8 +19177,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kvm/paging_tmpl.h linux-2.6.32.48/arch/x86/k
kvm_mmu_audit(vcpu, "pre page fault");
diff -urNp linux-2.6.32.48/arch/x86/kvm/svm.c linux-2.6.32.48/arch/x86/kvm/svm.c
---- linux-2.6.32.48/arch/x86/kvm/svm.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kvm/svm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kvm/svm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kvm/svm.c 2011-11-15 19:59:43.000000000 -0500
@@ -2486,7 +2486,11 @@ static void reload_tss(struct kvm_vcpu *
int cpu = raw_smp_processor_id();
@@ -19201,8 +19201,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kvm/svm.c linux-2.6.32.48/arch/x86/kvm/svm.c
.disabled_by_bios = is_disabled,
.hardware_setup = svm_hardware_setup,
diff -urNp linux-2.6.32.48/arch/x86/kvm/vmx.c linux-2.6.32.48/arch/x86/kvm/vmx.c
---- linux-2.6.32.48/arch/x86/kvm/vmx.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kvm/vmx.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kvm/vmx.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kvm/vmx.c 2011-11-15 19:59:43.000000000 -0500
@@ -570,7 +570,11 @@ static void reload_tss(void)
kvm_get_gdt(&gdt);
@@ -19294,8 +19294,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kvm/vmx.c linux-2.6.32.48/arch/x86/kvm/vmx.c
.disabled_by_bios = vmx_disabled_by_bios,
.hardware_setup = hardware_setup,
diff -urNp linux-2.6.32.48/arch/x86/kvm/x86.c linux-2.6.32.48/arch/x86/kvm/x86.c
---- linux-2.6.32.48/arch/x86/kvm/x86.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/kvm/x86.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/kvm/x86.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/kvm/x86.c 2011-11-15 19:59:43.000000000 -0500
@@ -82,7 +82,7 @@ static void update_cr8_intercept(struct
static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
struct kvm_cpuid_entry2 __user *entries);
@@ -19376,8 +19376,8 @@ diff -urNp linux-2.6.32.48/arch/x86/kvm/x86.c linux-2.6.32.48/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.48/arch/x86/lguest/boot.c linux-2.6.32.48/arch/x86/lguest/boot.c
---- linux-2.6.32.48/arch/x86/lguest/boot.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lguest/boot.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lguest/boot.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lguest/boot.c 2011-11-15 19:59:43.000000000 -0500
@@ -1172,9 +1172,10 @@ static __init int early_put_chars(u32 vt
* Rebooting also tells the Host we're finished, but the RESTART flag tells the
* Launcher to reboot us.
@@ -19391,8 +19391,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lguest/boot.c linux-2.6.32.48/arch/x86/lgues
/*G:050
diff -urNp linux-2.6.32.48/arch/x86/lib/atomic64_32.c linux-2.6.32.48/arch/x86/lib/atomic64_32.c
---- linux-2.6.32.48/arch/x86/lib/atomic64_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/atomic64_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/atomic64_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/atomic64_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -25,6 +25,12 @@ u64 atomic64_cmpxchg(atomic64_t *ptr, u6
}
EXPORT_SYMBOL(atomic64_cmpxchg);
@@ -19616,8 +19616,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/atomic64_32.c linux-2.6.32.48/arch/x86/l
* @ptr: pointer to type atomic64_t
*
diff -urNp linux-2.6.32.48/arch/x86/lib/checksum_32.S linux-2.6.32.48/arch/x86/lib/checksum_32.S
---- linux-2.6.32.48/arch/x86/lib/checksum_32.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/checksum_32.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/checksum_32.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/checksum_32.S 2011-11-15 19:59:43.000000000 -0500
@@ -28,7 +28,8 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
@@ -19879,8 +19879,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/checksum_32.S linux-2.6.32.48/arch/x86/l
#undef ROUND
#undef ROUND1
diff -urNp linux-2.6.32.48/arch/x86/lib/clear_page_64.S linux-2.6.32.48/arch/x86/lib/clear_page_64.S
---- linux-2.6.32.48/arch/x86/lib/clear_page_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/clear_page_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/clear_page_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/clear_page_64.S 2011-11-15 19:59:43.000000000 -0500
@@ -1,5 +1,6 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
@@ -19914,8 +19914,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/clear_page_64.S linux-2.6.32.48/arch/x86
.byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
2:
diff -urNp linux-2.6.32.48/arch/x86/lib/copy_page_64.S linux-2.6.32.48/arch/x86/lib/copy_page_64.S
---- linux-2.6.32.48/arch/x86/lib/copy_page_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/copy_page_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/copy_page_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/copy_page_64.S 2011-11-15 19:59:43.000000000 -0500
@@ -2,12 +2,14 @@
#include <linux/linkage.h>
@@ -19949,8 +19949,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/copy_page_64.S linux-2.6.32.48/arch/x86/
.byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
2:
diff -urNp linux-2.6.32.48/arch/x86/lib/copy_user_64.S linux-2.6.32.48/arch/x86/lib/copy_user_64.S
---- linux-2.6.32.48/arch/x86/lib/copy_user_64.S 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/copy_user_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/copy_user_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/copy_user_64.S 2011-11-15 19:59:43.000000000 -0500
@@ -15,13 +15,15 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -20044,8 +20044,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/copy_user_64.S linux-2.6.32.48/arch/x86/
.section .fixup,"ax"
diff -urNp linux-2.6.32.48/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.48/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.32.48/arch/x86/lib/copy_user_nocache_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/copy_user_nocache_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/copy_user_nocache_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/copy_user_nocache_64.S 2011-11-15 19:59:43.000000000 -0500
@@ -8,12 +8,14 @@
#include <linux/linkage.h>
@@ -20086,8 +20086,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.48/a
.section .fixup,"ax"
diff -urNp linux-2.6.32.48/arch/x86/lib/csum-copy_64.S linux-2.6.32.48/arch/x86/lib/csum-copy_64.S
---- linux-2.6.32.48/arch/x86/lib/csum-copy_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/csum-copy_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/csum-copy_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/csum-copy_64.S 2011-11-15 19:59:43.000000000 -0500
@@ -8,6 +8,7 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
@@ -20105,8 +20105,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/csum-copy_64.S linux-2.6.32.48/arch/x86/
CFI_RESTORE_STATE
diff -urNp linux-2.6.32.48/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.48/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.32.48/arch/x86/lib/csum-wrappers_64.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/csum-wrappers_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/csum-wrappers_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/csum-wrappers_64.c 2011-11-15 19:59:43.000000000 -0500
@@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void _
len -= 2;
}
@@ -20138,8 +20138,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.48/arch/
}
EXPORT_SYMBOL(csum_partial_copy_to_user);
diff -urNp linux-2.6.32.48/arch/x86/lib/getuser.S linux-2.6.32.48/arch/x86/lib/getuser.S
---- linux-2.6.32.48/arch/x86/lib/getuser.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/getuser.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/getuser.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/getuser.S 2011-11-15 19:59:43.000000000 -0500
@@ -33,15 +33,38 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -20264,8 +20264,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/getuser.S linux-2.6.32.48/arch/x86/lib/g
CFI_ENDPROC
END(bad_get_user)
diff -urNp linux-2.6.32.48/arch/x86/lib/iomap_copy_64.S linux-2.6.32.48/arch/x86/lib/iomap_copy_64.S
---- linux-2.6.32.48/arch/x86/lib/iomap_copy_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/iomap_copy_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/iomap_copy_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/iomap_copy_64.S 2011-11-15 19:59:43.000000000 -0500
@@ -17,6 +17,7 @@
#include <linux/linkage.h>
@@ -20283,8 +20283,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/iomap_copy_64.S linux-2.6.32.48/arch/x86
CFI_ENDPROC
ENDPROC(__iowrite32_copy)
diff -urNp linux-2.6.32.48/arch/x86/lib/memcpy_64.S linux-2.6.32.48/arch/x86/lib/memcpy_64.S
---- linux-2.6.32.48/arch/x86/lib/memcpy_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/memcpy_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/memcpy_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/memcpy_64.S 2011-11-15 19:59:43.000000000 -0500
@@ -4,6 +4,7 @@
#include <asm/cpufeature.h>
@@ -20319,8 +20319,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/memcpy_64.S linux-2.6.32.48/arch/x86/lib
.byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
2:
diff -urNp linux-2.6.32.48/arch/x86/lib/memset_64.S linux-2.6.32.48/arch/x86/lib/memset_64.S
---- linux-2.6.32.48/arch/x86/lib/memset_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/memset_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/memset_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/memset_64.S 2011-11-15 19:59:43.000000000 -0500
@@ -2,6 +2,7 @@
#include <linux/linkage.h>
@@ -20355,8 +20355,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/memset_64.S linux-2.6.32.48/arch/x86/lib
.byte (memset_c - memset) - (2f - 1b) /* offset */
2:
diff -urNp linux-2.6.32.48/arch/x86/lib/mmx_32.c linux-2.6.32.48/arch/x86/lib/mmx_32.c
---- linux-2.6.32.48/arch/x86/lib/mmx_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/mmx_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/mmx_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/mmx_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
{
void *p;
@@ -20673,8 +20673,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/mmx_32.c linux-2.6.32.48/arch/x86/lib/mm
from += 64;
to += 64;
diff -urNp linux-2.6.32.48/arch/x86/lib/msr-reg.S linux-2.6.32.48/arch/x86/lib/msr-reg.S
---- linux-2.6.32.48/arch/x86/lib/msr-reg.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/msr-reg.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/msr-reg.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/msr-reg.S 2011-11-15 19:59:43.000000000 -0500
@@ -3,6 +3,7 @@
#include <asm/dwarf2.h>
#include <asm/asm.h>
@@ -20692,8 +20692,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/msr-reg.S linux-2.6.32.48/arch/x86/lib/m
3:
CFI_RESTORE_STATE
diff -urNp linux-2.6.32.48/arch/x86/lib/putuser.S linux-2.6.32.48/arch/x86/lib/putuser.S
---- linux-2.6.32.48/arch/x86/lib/putuser.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/putuser.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/putuser.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/putuser.S 2011-11-15 19:59:43.000000000 -0500
@@ -15,7 +15,9 @@
#include <asm/thread_info.h>
#include <asm/errno.h>
@@ -20834,8 +20834,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/putuser.S linux-2.6.32.48/arch/x86/lib/p
xor %eax,%eax
EXIT
diff -urNp linux-2.6.32.48/arch/x86/lib/rwlock_64.S linux-2.6.32.48/arch/x86/lib/rwlock_64.S
---- linux-2.6.32.48/arch/x86/lib/rwlock_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/rwlock_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/rwlock_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/rwlock_64.S 2011-11-15 19:59:43.000000000 -0500
@@ -17,6 +17,7 @@ ENTRY(__write_lock_failed)
LOCK_PREFIX
subl $RW_LOCK_BIAS,(%rdi)
@@ -20853,8 +20853,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/rwlock_64.S linux-2.6.32.48/arch/x86/lib
CFI_ENDPROC
END(__read_lock_failed)
diff -urNp linux-2.6.32.48/arch/x86/lib/rwsem_64.S linux-2.6.32.48/arch/x86/lib/rwsem_64.S
---- linux-2.6.32.48/arch/x86/lib/rwsem_64.S 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/rwsem_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/rwsem_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/rwsem_64.S 2011-11-15 19:59:43.000000000 -0500
@@ -48,6 +48,7 @@ ENTRY(call_rwsem_down_read_failed)
call rwsem_down_read_failed
popq %rdx
@@ -20889,8 +20889,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/rwsem_64.S linux-2.6.32.48/arch/x86/lib/
ret
ENDPROC(call_rwsem_downgrade_wake)
diff -urNp linux-2.6.32.48/arch/x86/lib/thunk_64.S linux-2.6.32.48/arch/x86/lib/thunk_64.S
---- linux-2.6.32.48/arch/x86/lib/thunk_64.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/thunk_64.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/thunk_64.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/thunk_64.S 2011-11-15 19:59:43.000000000 -0500
@@ -10,7 +10,8 @@
#include <asm/dwarf2.h>
#include <asm/calling.h>
@@ -20917,8 +20917,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/thunk_64.S linux-2.6.32.48/arch/x86/lib/
ret
CFI_ENDPROC
diff -urNp linux-2.6.32.48/arch/x86/lib/usercopy_32.c linux-2.6.32.48/arch/x86/lib/usercopy_32.c
---- linux-2.6.32.48/arch/x86/lib/usercopy_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/usercopy_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/usercopy_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/usercopy_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -43,7 +43,7 @@ do { \
__asm__ __volatile__( \
" testl %1,%1\n" \
@@ -21525,8 +21525,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/usercopy_32.c linux-2.6.32.48/arch/x86/l
+EXPORT_SYMBOL(set_fs);
+#endif
diff -urNp linux-2.6.32.48/arch/x86/lib/usercopy_64.c linux-2.6.32.48/arch/x86/lib/usercopy_64.c
---- linux-2.6.32.48/arch/x86/lib/usercopy_64.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/lib/usercopy_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/lib/usercopy_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/lib/usercopy_64.c 2011-11-15 19:59:43.000000000 -0500
@@ -42,6 +42,12 @@ long
__strncpy_from_user(char *dst, const char __user *src, long count)
{
@@ -21586,8 +21586,8 @@ diff -urNp linux-2.6.32.48/arch/x86/lib/usercopy_64.c linux-2.6.32.48/arch/x86/l
char c;
unsigned zero_len;
diff -urNp linux-2.6.32.48/arch/x86/Makefile linux-2.6.32.48/arch/x86/Makefile
---- linux-2.6.32.48/arch/x86/Makefile 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/Makefile 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/Makefile 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/Makefile 2011-11-15 19:59:43.000000000 -0500
@@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y)
else
BITS := 64
@@ -21610,8 +21610,8 @@ diff -urNp linux-2.6.32.48/arch/x86/Makefile linux-2.6.32.48/arch/x86/Makefile
+archprepare:
+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
diff -urNp linux-2.6.32.48/arch/x86/mm/extable.c linux-2.6.32.48/arch/x86/mm/extable.c
---- linux-2.6.32.48/arch/x86/mm/extable.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/extable.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/extable.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/extable.c 2011-11-15 19:59:43.000000000 -0500
@@ -1,14 +1,71 @@
#include <linux/module.h>
#include <linux/spinlock.h>
@@ -21686,8 +21686,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/extable.c linux-2.6.32.48/arch/x86/mm/ext
extern u32 pnp_bios_is_utter_crap;
pnp_bios_is_utter_crap = 1;
diff -urNp linux-2.6.32.48/arch/x86/mm/fault.c linux-2.6.32.48/arch/x86/mm/fault.c
---- linux-2.6.32.48/arch/x86/mm/fault.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/fault.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/fault.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/fault.c 2011-11-15 19:59:43.000000000 -0500
@@ -11,10 +11,19 @@
#include <linux/kprobes.h> /* __kprobes, ... */
#include <linux/mmiotrace.h> /* kmmio_handler, ... */
@@ -22375,8 +22375,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/fault.c linux-2.6.32.48/arch/x86/mm/fault
+ return ret ? -EFAULT : 0;
+}
diff -urNp linux-2.6.32.48/arch/x86/mm/gup.c linux-2.6.32.48/arch/x86/mm/gup.c
---- linux-2.6.32.48/arch/x86/mm/gup.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/gup.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/gup.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/gup.c 2011-11-15 19:59:43.000000000 -0500
@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
addr = start;
len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -22387,8 +22387,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/gup.c linux-2.6.32.48/arch/x86/mm/gup.c
return 0;
diff -urNp linux-2.6.32.48/arch/x86/mm/highmem_32.c linux-2.6.32.48/arch/x86/mm/highmem_32.c
---- linux-2.6.32.48/arch/x86/mm/highmem_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/highmem_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/highmem_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/highmem_32.c 2011-11-15 19:59:43.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);
@@ -22401,8 +22401,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/highmem_32.c linux-2.6.32.48/arch/x86/mm/
return (void *)vaddr;
}
diff -urNp linux-2.6.32.48/arch/x86/mm/hugetlbpage.c linux-2.6.32.48/arch/x86/mm/hugetlbpage.c
---- linux-2.6.32.48/arch/x86/mm/hugetlbpage.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/hugetlbpage.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/hugetlbpage.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/hugetlbpage.c 2011-11-15 19:59:43.000000000 -0500
@@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmappe
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
@@ -22611,8 +22611,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/hugetlbpage.c linux-2.6.32.48/arch/x86/mm
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
diff -urNp linux-2.6.32.48/arch/x86/mm/init_32.c linux-2.6.32.48/arch/x86/mm/init_32.c
---- linux-2.6.32.48/arch/x86/mm/init_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/init_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/init_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/init_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
}
@@ -22917,8 +22917,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/init_32.c linux-2.6.32.48/arch/x86/mm/ini
printk(KERN_INFO "Write protecting the kernel text: %luk\n",
size >> 10);
diff -urNp linux-2.6.32.48/arch/x86/mm/init_64.c linux-2.6.32.48/arch/x86/mm/init_64.c
---- linux-2.6.32.48/arch/x86/mm/init_64.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/init_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/init_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/init_64.c 2011-11-15 19:59:43.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);
@@ -22980,8 +22980,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/init_64.c linux-2.6.32.48/arch/x86/mm/ini
if (vma == &gate_vma)
return "[vsyscall]";
diff -urNp linux-2.6.32.48/arch/x86/mm/init.c linux-2.6.32.48/arch/x86/mm/init.c
---- linux-2.6.32.48/arch/x86/mm/init.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/init.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/init.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/init.c 2011-11-15 19:59:43.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.
@@ -23120,8 +23120,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/init.c linux-2.6.32.48/arch/x86/mm/init.c
(unsigned long)(&__init_begin),
(unsigned long)(&__init_end));
diff -urNp linux-2.6.32.48/arch/x86/mm/iomap_32.c linux-2.6.32.48/arch/x86/mm/iomap_32.c
---- linux-2.6.32.48/arch/x86/mm/iomap_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/iomap_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/iomap_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/iomap_32.c 2011-11-15 19:59:43.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();
@@ -23135,8 +23135,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/iomap_32.c linux-2.6.32.48/arch/x86/mm/io
return (void *)vaddr;
diff -urNp linux-2.6.32.48/arch/x86/mm/ioremap.c linux-2.6.32.48/arch/x86/mm/ioremap.c
---- linux-2.6.32.48/arch/x86/mm/ioremap.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/ioremap.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/ioremap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/ioremap.c 2011-11-15 19:59:43.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.
@@ -23184,8 +23184,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/ioremap.c linux-2.6.32.48/arch/x86/mm/ior
/*
* The boot-ioremap range spans multiple pmds, for which
diff -urNp linux-2.6.32.48/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.48/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.32.48/arch/x86/mm/kmemcheck/kmemcheck.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-15 19:59:43.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.
@@ -23199,8 +23199,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.48/arc
pte = kmemcheck_pte_lookup(address);
diff -urNp linux-2.6.32.48/arch/x86/mm/mmap.c linux-2.6.32.48/arch/x86/mm/mmap.c
---- linux-2.6.32.48/arch/x86/mm/mmap.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/mmap.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/mmap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/mmap.c 2011-11-15 19:59:43.000000000 -0500
@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
* Leave an at least ~128 MB hole with possible stack randomization.
*/
@@ -23283,8 +23283,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/mmap.c linux-2.6.32.48/arch/x86/mm/mmap.c
mm->unmap_area = arch_unmap_area_topdown;
}
diff -urNp linux-2.6.32.48/arch/x86/mm/mmio-mod.c linux-2.6.32.48/arch/x86/mm/mmio-mod.c
---- linux-2.6.32.48/arch/x86/mm/mmio-mod.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/mmio-mod.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/mmio-mod.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/mmio-mod.c 2011-11-15 19:59:43.000000000 -0500
@@ -193,7 +193,7 @@ static void pre(struct kmmio_probe *p, s
break;
default:
@@ -23313,8 +23313,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/mmio-mod.c linux-2.6.32.48/arch/x86/mm/mm
map.map_id = trace->id;
diff -urNp linux-2.6.32.48/arch/x86/mm/numa_32.c linux-2.6.32.48/arch/x86/mm/numa_32.c
---- linux-2.6.32.48/arch/x86/mm/numa_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/numa_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/numa_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/numa_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
}
#endif
@@ -23324,8 +23324,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/numa_32.c linux-2.6.32.48/arch/x86/mm/num
#define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
diff -urNp linux-2.6.32.48/arch/x86/mm/pageattr.c linux-2.6.32.48/arch/x86/mm/pageattr.c
---- linux-2.6.32.48/arch/x86/mm/pageattr.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/pageattr.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/pageattr.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/pageattr.c 2011-11-15 19:59:43.000000000 -0500
@@ -261,16 +261,17 @@ static inline pgprot_t static_protection
* PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
*/
@@ -23403,8 +23403,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/pageattr.c linux-2.6.32.48/arch/x86/mm/pa
static int
diff -urNp linux-2.6.32.48/arch/x86/mm/pageattr-test.c linux-2.6.32.48/arch/x86/mm/pageattr-test.c
---- linux-2.6.32.48/arch/x86/mm/pageattr-test.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/pageattr-test.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/pageattr-test.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/pageattr-test.c 2011-11-15 19:59:43.000000000 -0500
@@ -36,7 +36,7 @@ enum {
static int pte_testbit(pte_t pte)
@@ -23415,8 +23415,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/pageattr-test.c linux-2.6.32.48/arch/x86/
struct split_state {
diff -urNp linux-2.6.32.48/arch/x86/mm/pat.c linux-2.6.32.48/arch/x86/mm/pat.c
---- linux-2.6.32.48/arch/x86/mm/pat.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/pat.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/pat.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/pat.c 2011-11-15 19:59:43.000000000 -0500
@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
conflict:
@@ -23465,8 +23465,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/pat.c linux-2.6.32.48/arch/x86/mm/pat.c
(unsigned long long)paddr,
(unsigned long long)(paddr + size),
diff -urNp linux-2.6.32.48/arch/x86/mm/pf_in.c linux-2.6.32.48/arch/x86/mm/pf_in.c
---- linux-2.6.32.48/arch/x86/mm/pf_in.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/pf_in.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/pf_in.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/pf_in.c 2011-11-15 19:59:43.000000000 -0500
@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l
int i;
enum reason_type rv = OTHERS;
@@ -23513,8 +23513,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/pf_in.c linux-2.6.32.48/arch/x86/mm/pf_in
p += get_opcode(p, &opcode);
for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
diff -urNp linux-2.6.32.48/arch/x86/mm/pgtable_32.c linux-2.6.32.48/arch/x86/mm/pgtable_32.c
---- linux-2.6.32.48/arch/x86/mm/pgtable_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/pgtable_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/pgtable_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/pgtable_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
return;
}
@@ -23530,8 +23530,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/pgtable_32.c linux-2.6.32.48/arch/x86/mm/
/*
* It's enough to flush this one mapping.
diff -urNp linux-2.6.32.48/arch/x86/mm/pgtable.c linux-2.6.32.48/arch/x86/mm/pgtable.c
---- linux-2.6.32.48/arch/x86/mm/pgtable.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/pgtable.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/pgtable.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/pgtable.c 2011-11-15 19:59:43.000000000 -0500
@@ -83,9 +83,52 @@ static inline void pgd_list_del(pgd_t *p
list_del(&page->lru);
}
@@ -23779,8 +23779,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/pgtable.c linux-2.6.32.48/arch/x86/mm/pgt
paravirt_pgd_free(mm, pgd);
free_page((unsigned long)pgd);
diff -urNp linux-2.6.32.48/arch/x86/mm/setup_nx.c linux-2.6.32.48/arch/x86/mm/setup_nx.c
---- linux-2.6.32.48/arch/x86/mm/setup_nx.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/setup_nx.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/setup_nx.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/setup_nx.c 2011-11-15 19:59:43.000000000 -0500
@@ -4,11 +4,10 @@
#include <asm/pgtable.h>
@@ -23847,8 +23847,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/setup_nx.c linux-2.6.32.48/arch/x86/mm/se
}
#endif
diff -urNp linux-2.6.32.48/arch/x86/mm/tlb.c linux-2.6.32.48/arch/x86/mm/tlb.c
---- linux-2.6.32.48/arch/x86/mm/tlb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/mm/tlb.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/mm/tlb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/mm/tlb.c 2011-11-15 19:59:43.000000000 -0500
@@ -61,7 +61,11 @@ void leave_mm(int cpu)
BUG();
cpumask_clear_cpu(cpu,
@@ -23862,8 +23862,8 @@ diff -urNp linux-2.6.32.48/arch/x86/mm/tlb.c linux-2.6.32.48/arch/x86/mm/tlb.c
EXPORT_SYMBOL_GPL(leave_mm);
diff -urNp linux-2.6.32.48/arch/x86/oprofile/backtrace.c linux-2.6.32.48/arch/x86/oprofile/backtrace.c
---- linux-2.6.32.48/arch/x86/oprofile/backtrace.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/oprofile/backtrace.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/oprofile/backtrace.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/oprofile/backtrace.c 2011-11-15 19:59:43.000000000 -0500
@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
struct frame_head bufhead[2];
@@ -23883,8 +23883,8 @@ diff -urNp linux-2.6.32.48/arch/x86/oprofile/backtrace.c linux-2.6.32.48/arch/x8
if (depth)
dump_trace(NULL, regs, (unsigned long *)stack, 0,
diff -urNp linux-2.6.32.48/arch/x86/oprofile/op_model_p4.c linux-2.6.32.48/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.32.48/arch/x86/oprofile/op_model_p4.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/oprofile/op_model_p4.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/oprofile/op_model_p4.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/oprofile/op_model_p4.c 2011-11-15 19:59:43.000000000 -0500
@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
#endif
}
@@ -23895,8 +23895,8 @@ diff -urNp linux-2.6.32.48/arch/x86/oprofile/op_model_p4.c linux-2.6.32.48/arch/
#ifdef CONFIG_SMP
return smp_num_siblings == 2 ? 2 : 1;
diff -urNp linux-2.6.32.48/arch/x86/pci/common.c linux-2.6.32.48/arch/x86/pci/common.c
---- linux-2.6.32.48/arch/x86/pci/common.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/pci/common.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/pci/common.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/pci/common.c 2011-11-15 19:59:43.000000000 -0500
@@ -31,8 +31,8 @@ int noioapicreroute = 1;
int pcibios_last_bus = -1;
unsigned long pirq_table_addr;
@@ -23909,8 +23909,8 @@ diff -urNp linux-2.6.32.48/arch/x86/pci/common.c linux-2.6.32.48/arch/x86/pci/co
int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
int reg, int len, u32 *val)
diff -urNp linux-2.6.32.48/arch/x86/pci/direct.c linux-2.6.32.48/arch/x86/pci/direct.c
---- linux-2.6.32.48/arch/x86/pci/direct.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/pci/direct.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/pci/direct.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/pci/direct.c 2011-11-15 19:59:43.000000000 -0500
@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
#undef PCI_CONF1_ADDRESS
@@ -23939,8 +23939,8 @@ diff -urNp linux-2.6.32.48/arch/x86/pci/direct.c linux-2.6.32.48/arch/x86/pci/di
u32 x = 0;
int year, devfn;
diff -urNp linux-2.6.32.48/arch/x86/pci/mmconfig_32.c linux-2.6.32.48/arch/x86/pci/mmconfig_32.c
---- linux-2.6.32.48/arch/x86/pci/mmconfig_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/pci/mmconfig_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/pci/mmconfig_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/pci/mmconfig_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -23951,8 +23951,8 @@ diff -urNp linux-2.6.32.48/arch/x86/pci/mmconfig_32.c linux-2.6.32.48/arch/x86/p
.write = pci_mmcfg_write,
};
diff -urNp linux-2.6.32.48/arch/x86/pci/mmconfig_64.c linux-2.6.32.48/arch/x86/pci/mmconfig_64.c
---- linux-2.6.32.48/arch/x86/pci/mmconfig_64.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/pci/mmconfig_64.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/pci/mmconfig_64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/pci/mmconfig_64.c 2011-11-15 19:59:43.000000000 -0500
@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -23963,8 +23963,8 @@ diff -urNp linux-2.6.32.48/arch/x86/pci/mmconfig_64.c linux-2.6.32.48/arch/x86/p
.write = pci_mmcfg_write,
};
diff -urNp linux-2.6.32.48/arch/x86/pci/numaq_32.c linux-2.6.32.48/arch/x86/pci/numaq_32.c
---- linux-2.6.32.48/arch/x86/pci/numaq_32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/pci/numaq_32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/pci/numaq_32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/pci/numaq_32.c 2011-11-15 19:59:43.000000000 -0500
@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
#undef PCI_CONF1_MQ_ADDRESS
@@ -23975,8 +23975,8 @@ diff -urNp linux-2.6.32.48/arch/x86/pci/numaq_32.c linux-2.6.32.48/arch/x86/pci/
.write = pci_conf1_mq_write
};
diff -urNp linux-2.6.32.48/arch/x86/pci/olpc.c linux-2.6.32.48/arch/x86/pci/olpc.c
---- linux-2.6.32.48/arch/x86/pci/olpc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/pci/olpc.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/pci/olpc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/pci/olpc.c 2011-11-15 19:59:43.000000000 -0500
@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
return 0;
}
@@ -23987,8 +23987,8 @@ diff -urNp linux-2.6.32.48/arch/x86/pci/olpc.c linux-2.6.32.48/arch/x86/pci/olpc
.write = pci_olpc_write,
};
diff -urNp linux-2.6.32.48/arch/x86/pci/pcbios.c linux-2.6.32.48/arch/x86/pci/pcbios.c
---- linux-2.6.32.48/arch/x86/pci/pcbios.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/pci/pcbios.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/pci/pcbios.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/pci/pcbios.c 2011-11-15 19:59:43.000000000 -0500
@@ -56,50 +56,93 @@ union bios32 {
static struct {
unsigned long address;
@@ -24312,8 +24312,8 @@ diff -urNp linux-2.6.32.48/arch/x86/pci/pcbios.c linux-2.6.32.48/arch/x86/pci/pc
}
EXPORT_SYMBOL(pcibios_set_irq_routing);
diff -urNp linux-2.6.32.48/arch/x86/power/cpu.c linux-2.6.32.48/arch/x86/power/cpu.c
---- linux-2.6.32.48/arch/x86/power/cpu.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/power/cpu.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/power/cpu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/power/cpu.c 2011-11-15 19:59:43.000000000 -0500
@@ -129,7 +129,7 @@ static void do_fpu_end(void)
static void fix_processor_context(void)
{
@@ -24334,8 +24334,8 @@ diff -urNp linux-2.6.32.48/arch/x86/power/cpu.c linux-2.6.32.48/arch/x86/power/c
syscall_init(); /* This sets MSR_*STAR and related */
#endif
diff -urNp linux-2.6.32.48/arch/x86/vdso/Makefile linux-2.6.32.48/arch/x86/vdso/Makefile
---- linux-2.6.32.48/arch/x86/vdso/Makefile 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/vdso/Makefile 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/vdso/Makefile 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/vdso/Makefile 2011-11-15 19:59:43.000000000 -0500
@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -24346,8 +24346,8 @@ diff -urNp linux-2.6.32.48/arch/x86/vdso/Makefile linux-2.6.32.48/arch/x86/vdso/
#
diff -urNp linux-2.6.32.48/arch/x86/vdso/vclock_gettime.c linux-2.6.32.48/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.32.48/arch/x86/vdso/vclock_gettime.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/vdso/vclock_gettime.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/vdso/vclock_gettime.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/vdso/vclock_gettime.c 2011-11-15 19:59:43.000000000 -0500
@@ -22,24 +22,48 @@
#include <asm/hpet.h>
#include <asm/unistd.h>
@@ -24447,8 +24447,8 @@ diff -urNp linux-2.6.32.48/arch/x86/vdso/vclock_gettime.c linux-2.6.32.48/arch/x
int gettimeofday(struct timeval *, struct timezone *)
__attribute__((weak, alias("__vdso_gettimeofday")));
diff -urNp linux-2.6.32.48/arch/x86/vdso/vdso32-setup.c linux-2.6.32.48/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.32.48/arch/x86/vdso/vdso32-setup.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/vdso/vdso32-setup.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/vdso/vdso32-setup.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/vdso/vdso32-setup.c 2011-11-15 19:59:43.000000000 -0500
@@ -25,6 +25,7 @@
#include <asm/tlbflush.h>
#include <asm/vdso.h>
@@ -24532,8 +24532,8 @@ diff -urNp linux-2.6.32.48/arch/x86/vdso/vdso32-setup.c linux-2.6.32.48/arch/x86
return NULL;
}
diff -urNp linux-2.6.32.48/arch/x86/vdso/vdso.lds.S linux-2.6.32.48/arch/x86/vdso/vdso.lds.S
---- linux-2.6.32.48/arch/x86/vdso/vdso.lds.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/vdso/vdso.lds.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/vdso/vdso.lds.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/vdso/vdso.lds.S 2011-11-15 19:59:43.000000000 -0500
@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
#define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
#include "vextern.h"
@@ -24545,8 +24545,8 @@ diff -urNp linux-2.6.32.48/arch/x86/vdso/vdso.lds.S linux-2.6.32.48/arch/x86/vds
+VEXTERN(getcpu)
+#undef VEXTERN
diff -urNp linux-2.6.32.48/arch/x86/vdso/vextern.h linux-2.6.32.48/arch/x86/vdso/vextern.h
---- linux-2.6.32.48/arch/x86/vdso/vextern.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/vdso/vextern.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/vdso/vextern.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/vdso/vextern.h 2011-11-15 19:59:43.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. */
@@ -24555,8 +24555,8 @@ diff -urNp linux-2.6.32.48/arch/x86/vdso/vextern.h linux-2.6.32.48/arch/x86/vdso
VEXTERN(vgetcpu_mode)
VEXTERN(vsyscall_gtod_data)
diff -urNp linux-2.6.32.48/arch/x86/vdso/vma.c linux-2.6.32.48/arch/x86/vdso/vma.c
---- linux-2.6.32.48/arch/x86/vdso/vma.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/vdso/vma.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/vdso/vma.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/vdso/vma.c 2011-11-15 19:59:43.000000000 -0500
@@ -17,8 +17,6 @@
#include "vextern.h" /* Just for VMAGIC. */
#undef VEXTERN
@@ -24645,8 +24645,8 @@ diff -urNp linux-2.6.32.48/arch/x86/vdso/vma.c linux-2.6.32.48/arch/x86/vdso/vma
-}
-__setup("vdso=", vdso_setup);
diff -urNp linux-2.6.32.48/arch/x86/xen/enlighten.c linux-2.6.32.48/arch/x86/xen/enlighten.c
---- linux-2.6.32.48/arch/x86/xen/enlighten.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/xen/enlighten.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/xen/enlighten.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/xen/enlighten.c 2011-11-15 19:59:43.000000000 -0500
@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
struct shared_info xen_dummy_shared_info;
@@ -24733,8 +24733,8 @@ diff -urNp linux-2.6.32.48/arch/x86/xen/enlighten.c linux-2.6.32.48/arch/x86/xen
pgd = (pgd_t *)xen_start_info->pt_base;
diff -urNp linux-2.6.32.48/arch/x86/xen/mmu.c linux-2.6.32.48/arch/x86/xen/mmu.c
---- linux-2.6.32.48/arch/x86/xen/mmu.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/xen/mmu.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/xen/mmu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/xen/mmu.c 2011-11-15 19:59:43.000000000 -0500
@@ -1719,6 +1719,8 @@ __init pgd_t *xen_setup_kernel_pagetable
convert_pfn_mfn(init_level4_pgt);
convert_pfn_mfn(level3_ident_pgt);
@@ -24772,8 +24772,8 @@ diff -urNp linux-2.6.32.48/arch/x86/xen/mmu.c linux-2.6.32.48/arch/x86/xen/mmu.c
.alloc_pud = xen_alloc_pmd_init,
.release_pud = xen_release_pmd_init,
diff -urNp linux-2.6.32.48/arch/x86/xen/smp.c linux-2.6.32.48/arch/x86/xen/smp.c
---- linux-2.6.32.48/arch/x86/xen/smp.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/xen/smp.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/xen/smp.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/xen/smp.c 2011-11-15 19:59:43.000000000 -0500
@@ -168,11 +168,6 @@ static void __init xen_smp_prepare_boot_
{
BUG_ON(smp_processor_id() != 0);
@@ -24819,8 +24819,8 @@ diff -urNp linux-2.6.32.48/arch/x86/xen/smp.c linux-2.6.32.48/arch/x86/xen/smp.c
xen_setup_runstate_info(cpu);
xen_setup_timer(cpu);
diff -urNp linux-2.6.32.48/arch/x86/xen/xen-asm_32.S linux-2.6.32.48/arch/x86/xen/xen-asm_32.S
---- linux-2.6.32.48/arch/x86/xen/xen-asm_32.S 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/xen/xen-asm_32.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/xen/xen-asm_32.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/xen/xen-asm_32.S 2011-11-15 19:59:43.000000000 -0500
@@ -83,14 +83,14 @@ ENTRY(xen_iret)
ESP_OFFSET=4 # bytes pushed onto stack
@@ -24843,8 +24843,8 @@ diff -urNp linux-2.6.32.48/arch/x86/xen/xen-asm_32.S linux-2.6.32.48/arch/x86/xe
movl per_cpu__xen_vcpu, %eax
#endif
diff -urNp linux-2.6.32.48/arch/x86/xen/xen-head.S linux-2.6.32.48/arch/x86/xen/xen-head.S
---- linux-2.6.32.48/arch/x86/xen/xen-head.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/xen/xen-head.S 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/xen/xen-head.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/xen/xen-head.S 2011-11-15 19:59:43.000000000 -0500
@@ -19,6 +19,17 @@ ENTRY(startup_xen)
#ifdef CONFIG_X86_32
mov %esi,xen_start_info
@@ -24864,8 +24864,8 @@ diff -urNp linux-2.6.32.48/arch/x86/xen/xen-head.S linux-2.6.32.48/arch/x86/xen/
mov %rsi,xen_start_info
mov $init_thread_union+THREAD_SIZE,%rsp
diff -urNp linux-2.6.32.48/arch/x86/xen/xen-ops.h linux-2.6.32.48/arch/x86/xen/xen-ops.h
---- linux-2.6.32.48/arch/x86/xen/xen-ops.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/arch/x86/xen/xen-ops.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/arch/x86/xen/xen-ops.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/arch/x86/xen/xen-ops.h 2011-11-15 19:59:43.000000000 -0500
@@ -10,8 +10,6 @@
extern const char xen_hypervisor_callback[];
extern const char xen_failsafe_callback[];
@@ -24876,8 +24876,8 @@ diff -urNp linux-2.6.32.48/arch/x86/xen/xen-ops.h linux-2.6.32.48/arch/x86/xen/x
void xen_copy_trap_info(struct trap_info *traps);
diff -urNp linux-2.6.32.48/block/blk-integrity.c linux-2.6.32.48/block/blk-integrity.c
---- linux-2.6.32.48/block/blk-integrity.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/block/blk-integrity.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/block/blk-integrity.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/block/blk-integrity.c 2011-11-15 19:59:43.000000000 -0500
@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
NULL,
};
@@ -24888,8 +24888,8 @@ diff -urNp linux-2.6.32.48/block/blk-integrity.c linux-2.6.32.48/block/blk-integ
.store = &integrity_attr_store,
};
diff -urNp linux-2.6.32.48/block/blk-iopoll.c linux-2.6.32.48/block/blk-iopoll.c
---- linux-2.6.32.48/block/blk-iopoll.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/block/blk-iopoll.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/block/blk-iopoll.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/block/blk-iopoll.c 2011-11-15 19:59:43.000000000 -0500
@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
}
EXPORT_SYMBOL(blk_iopoll_complete);
@@ -24900,8 +24900,8 @@ diff -urNp linux-2.6.32.48/block/blk-iopoll.c linux-2.6.32.48/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.48/block/blk-map.c linux-2.6.32.48/block/blk-map.c
---- linux-2.6.32.48/block/blk-map.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/block/blk-map.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/block/blk-map.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/block/blk-map.c 2011-11-15 19:59:43.000000000 -0500
@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
* direct dma. else, set up kernel bounce buffers
*/
@@ -24937,8 +24937,8 @@ diff -urNp linux-2.6.32.48/block/blk-map.c linux-2.6.32.48/block/blk-map.c
bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
else
diff -urNp linux-2.6.32.48/block/blk-softirq.c linux-2.6.32.48/block/blk-softirq.c
---- linux-2.6.32.48/block/blk-softirq.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/block/blk-softirq.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/block/blk-softirq.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/block/blk-softirq.c 2011-11-15 19:59:43.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.
@@ -24949,8 +24949,8 @@ diff -urNp linux-2.6.32.48/block/blk-softirq.c linux-2.6.32.48/block/blk-softirq
struct list_head *cpu_list, local_list;
diff -urNp linux-2.6.32.48/block/blk-sysfs.c linux-2.6.32.48/block/blk-sysfs.c
---- linux-2.6.32.48/block/blk-sysfs.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/block/blk-sysfs.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/block/blk-sysfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/block/blk-sysfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
kmem_cache_free(blk_requestq_cachep, q);
}
@@ -24961,8 +24961,8 @@ diff -urNp linux-2.6.32.48/block/blk-sysfs.c linux-2.6.32.48/block/blk-sysfs.c
.store = queue_attr_store,
};
diff -urNp linux-2.6.32.48/block/bsg.c linux-2.6.32.48/block/bsg.c
---- linux-2.6.32.48/block/bsg.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/block/bsg.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/block/bsg.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/block/bsg.c 2011-11-15 19:59:43.000000000 -0500
@@ -175,16 +175,24 @@ static int blk_fill_sgv4_hdr_rq(struct r
struct sg_io_v4 *hdr, struct bsg_device *bd,
fmode_t has_write_perm)
@@ -25022,8 +25022,8 @@ diff -urNp linux-2.6.32.48/block/bsg.c linux-2.6.32.48/block/bsg.c
if (!ret)
hdr->response_len = len;
diff -urNp linux-2.6.32.48/block/compat_ioctl.c linux-2.6.32.48/block/compat_ioctl.c
---- linux-2.6.32.48/block/compat_ioctl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/block/compat_ioctl.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/block/compat_ioctl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/block/compat_ioctl.c 2011-11-15 19:59:43.000000000 -0500
@@ -354,7 +354,7 @@ static int compat_fd_ioctl(struct block_
err |= __get_user(f->spec1, &uf->spec1);
err |= __get_user(f->fmt_gap, &uf->fmt_gap);
@@ -25034,8 +25034,8 @@ diff -urNp linux-2.6.32.48/block/compat_ioctl.c linux-2.6.32.48/block/compat_ioc
err = -EFAULT;
goto out;
diff -urNp linux-2.6.32.48/block/elevator.c linux-2.6.32.48/block/elevator.c
---- linux-2.6.32.48/block/elevator.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/block/elevator.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/block/elevator.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/block/elevator.c 2011-11-15 19:59:43.000000000 -0500
@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
return error;
}
@@ -25046,8 +25046,8 @@ diff -urNp linux-2.6.32.48/block/elevator.c linux-2.6.32.48/block/elevator.c
.store = elv_attr_store,
};
diff -urNp linux-2.6.32.48/block/scsi_ioctl.c linux-2.6.32.48/block/scsi_ioctl.c
---- linux-2.6.32.48/block/scsi_ioctl.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/block/scsi_ioctl.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/block/scsi_ioctl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/block/scsi_ioctl.c 2011-11-15 19:59:43.000000000 -0500
@@ -220,8 +220,20 @@ EXPORT_SYMBOL(blk_verify_command);
static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
struct sg_io_hdr *hdr, fmode_t mode)
@@ -25100,8 +25100,8 @@ diff -urNp linux-2.6.32.48/block/scsi_ioctl.c linux-2.6.32.48/block/scsi_ioctl.c
goto error;
diff -urNp linux-2.6.32.48/crypto/cryptd.c linux-2.6.32.48/crypto/cryptd.c
---- linux-2.6.32.48/crypto/cryptd.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/crypto/cryptd.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/crypto/cryptd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/crypto/cryptd.c 2011-11-15 19:59:43.000000000 -0500
@@ -50,7 +50,7 @@ struct cryptd_blkcipher_ctx {
struct cryptd_blkcipher_request_ctx {
@@ -25112,8 +25112,8 @@ diff -urNp linux-2.6.32.48/crypto/cryptd.c linux-2.6.32.48/crypto/cryptd.c
struct cryptd_hash_ctx {
struct crypto_shash *child;
diff -urNp linux-2.6.32.48/crypto/gf128mul.c linux-2.6.32.48/crypto/gf128mul.c
---- linux-2.6.32.48/crypto/gf128mul.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/crypto/gf128mul.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/crypto/gf128mul.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/crypto/gf128mul.c 2011-11-15 19:59:43.000000000 -0500
@@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128
for (i = 0; i < 7; ++i)
gf128mul_x_lle(&p[i + 1], &p[i]);
@@ -25133,8 +25133,8 @@ diff -urNp linux-2.6.32.48/crypto/gf128mul.c linux-2.6.32.48/crypto/gf128mul.c
u8 ch = ((u8 *)b)[i];
diff -urNp linux-2.6.32.48/crypto/serpent.c linux-2.6.32.48/crypto/serpent.c
---- linux-2.6.32.48/crypto/serpent.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/crypto/serpent.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/crypto/serpent.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/crypto/serpent.c 2011-11-15 19:59:43.000000000 -0500
@@ -21,6 +21,7 @@
#include <asm/byteorder.h>
#include <linux/crypto.h>
@@ -25153,8 +25153,8 @@ diff -urNp linux-2.6.32.48/crypto/serpent.c linux-2.6.32.48/crypto/serpent.c
for (i = 0; i < keylen; ++i)
diff -urNp linux-2.6.32.48/Documentation/dontdiff linux-2.6.32.48/Documentation/dontdiff
---- linux-2.6.32.48/Documentation/dontdiff 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/Documentation/dontdiff 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/Documentation/dontdiff 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/Documentation/dontdiff 2011-11-15 19:59:43.000000000 -0500
@@ -1,13 +1,16 @@
*.a
*.aux
@@ -25291,8 +25291,8 @@ diff -urNp linux-2.6.32.48/Documentation/dontdiff linux-2.6.32.48/Documentation/
zconf.hash.c
+zoffset.h
diff -urNp linux-2.6.32.48/Documentation/kernel-parameters.txt linux-2.6.32.48/Documentation/kernel-parameters.txt
---- linux-2.6.32.48/Documentation/kernel-parameters.txt 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/Documentation/kernel-parameters.txt 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/Documentation/kernel-parameters.txt 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/Documentation/kernel-parameters.txt 2011-11-15 19:59:43.000000000 -0500
@@ -1837,6 +1837,13 @@ and is between 256 and 4096 characters.
the specified number of seconds. This is to be used if
your oopses keep scrolling off the screen.
@@ -25308,8 +25308,8 @@ diff -urNp linux-2.6.32.48/Documentation/kernel-parameters.txt linux-2.6.32.48/D
pcd. [PARIDE]
diff -urNp linux-2.6.32.48/drivers/acpi/acpi_pad.c linux-2.6.32.48/drivers/acpi/acpi_pad.c
---- linux-2.6.32.48/drivers/acpi/acpi_pad.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/acpi/acpi_pad.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/acpi/acpi_pad.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/acpi/acpi_pad.c 2011-11-15 19:59:43.000000000 -0500
@@ -30,7 +30,7 @@
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
@@ -25320,8 +25320,8 @@ diff -urNp linux-2.6.32.48/drivers/acpi/acpi_pad.c linux-2.6.32.48/drivers/acpi/
#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80
static DEFINE_MUTEX(isolated_cpus_lock);
diff -urNp linux-2.6.32.48/drivers/acpi/battery.c linux-2.6.32.48/drivers/acpi/battery.c
---- linux-2.6.32.48/drivers/acpi/battery.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/acpi/battery.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/acpi/battery.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/acpi/battery.c 2011-11-15 19:59:43.000000000 -0500
@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
}
@@ -25332,8 +25332,8 @@ diff -urNp linux-2.6.32.48/drivers/acpi/battery.c linux-2.6.32.48/drivers/acpi/b
const char *name;
} acpi_battery_file[] = {
diff -urNp linux-2.6.32.48/drivers/acpi/dock.c linux-2.6.32.48/drivers/acpi/dock.c
---- linux-2.6.32.48/drivers/acpi/dock.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/acpi/dock.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/acpi/dock.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/acpi/dock.c 2011-11-15 19:59:43.000000000 -0500
@@ -77,7 +77,7 @@ struct dock_dependent_device {
struct list_head list;
struct list_head hotplug_list;
@@ -25353,8 +25353,8 @@ diff -urNp linux-2.6.32.48/drivers/acpi/dock.c linux-2.6.32.48/drivers/acpi/dock
{
struct dock_dependent_device *dd;
diff -urNp linux-2.6.32.48/drivers/acpi/osl.c linux-2.6.32.48/drivers/acpi/osl.c
---- linux-2.6.32.48/drivers/acpi/osl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/acpi/osl.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/acpi/osl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/acpi/osl.c 2011-11-15 19:59:43.000000000 -0500
@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
void __iomem *virt_addr;
@@ -25374,8 +25374,8 @@ diff -urNp linux-2.6.32.48/drivers/acpi/osl.c linux-2.6.32.48/drivers/acpi/osl.c
switch (width) {
case 8:
diff -urNp linux-2.6.32.48/drivers/acpi/power_meter.c linux-2.6.32.48/drivers/acpi/power_meter.c
---- linux-2.6.32.48/drivers/acpi/power_meter.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/acpi/power_meter.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/acpi/power_meter.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/acpi/power_meter.c 2011-11-15 19:59:43.000000000 -0500
@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
return res;
@@ -25386,8 +25386,8 @@ diff -urNp linux-2.6.32.48/drivers/acpi/power_meter.c linux-2.6.32.48/drivers/ac
mutex_lock(&resource->lock);
resource->trip[attr->index - 7] = temp;
diff -urNp linux-2.6.32.48/drivers/acpi/proc.c linux-2.6.32.48/drivers/acpi/proc.c
---- linux-2.6.32.48/drivers/acpi/proc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/acpi/proc.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/acpi/proc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/acpi/proc.c 2011-11-15 19:59:43.000000000 -0500
@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
size_t count, loff_t * ppos)
{
@@ -25424,8 +25424,8 @@ diff -urNp linux-2.6.32.48/drivers/acpi/proc.c linux-2.6.32.48/drivers/acpi/proc
dev->wakeup.state.enabled ? 0 : 1;
found_dev = dev;
diff -urNp linux-2.6.32.48/drivers/acpi/processor_core.c linux-2.6.32.48/drivers/acpi/processor_core.c
---- linux-2.6.32.48/drivers/acpi/processor_core.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/acpi/processor_core.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/acpi/processor_core.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/acpi/processor_core.c 2011-11-15 19:59:43.000000000 -0500
@@ -790,7 +790,7 @@ static int __cpuinit acpi_processor_add(
return 0;
}
@@ -25436,8 +25436,8 @@ diff -urNp linux-2.6.32.48/drivers/acpi/processor_core.c linux-2.6.32.48/drivers
/*
* Buggy BIOS check
diff -urNp linux-2.6.32.48/drivers/acpi/sbshc.c linux-2.6.32.48/drivers/acpi/sbshc.c
---- linux-2.6.32.48/drivers/acpi/sbshc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/acpi/sbshc.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/acpi/sbshc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/acpi/sbshc.c 2011-11-15 19:59:43.000000000 -0500
@@ -17,7 +17,7 @@
#define PREFIX "ACPI: "
@@ -25448,8 +25448,8 @@ diff -urNp linux-2.6.32.48/drivers/acpi/sbshc.c linux-2.6.32.48/drivers/acpi/sbs
struct acpi_smb_hc {
diff -urNp linux-2.6.32.48/drivers/acpi/sleep.c linux-2.6.32.48/drivers/acpi/sleep.c
---- linux-2.6.32.48/drivers/acpi/sleep.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/acpi/sleep.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/acpi/sleep.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/acpi/sleep.c 2011-11-15 19:59:43.000000000 -0500
@@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp
}
}
@@ -25487,8 +25487,8 @@ diff -urNp linux-2.6.32.48/drivers/acpi/sleep.c linux-2.6.32.48/drivers/acpi/sle
.end = acpi_pm_end,
.pre_snapshot = acpi_hibernation_pre_snapshot_old,
diff -urNp linux-2.6.32.48/drivers/acpi/video.c linux-2.6.32.48/drivers/acpi/video.c
---- linux-2.6.32.48/drivers/acpi/video.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/acpi/video.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/acpi/video.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/acpi/video.c 2011-11-15 19:59:43.000000000 -0500
@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
vd->brightness->levels[request_level]);
}
@@ -25499,8 +25499,8 @@ diff -urNp linux-2.6.32.48/drivers/acpi/video.c linux-2.6.32.48/drivers/acpi/vid
.update_status = acpi_video_set_brightness,
};
diff -urNp linux-2.6.32.48/drivers/ata/ahci.c linux-2.6.32.48/drivers/ata/ahci.c
---- linux-2.6.32.48/drivers/ata/ahci.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/ahci.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/ahci.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/ahci.c 2011-11-15 19:59:43.000000000 -0500
@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
.sdev_attrs = ahci_sdev_attrs,
};
@@ -25532,8 +25532,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/ahci.c linux-2.6.32.48/drivers/ata/ahci.c
.softreset = ahci_sb600_softreset,
.pmp_softreset = ahci_sb600_softreset,
diff -urNp linux-2.6.32.48/drivers/ata/ata_generic.c linux-2.6.32.48/drivers/ata/ata_generic.c
---- linux-2.6.32.48/drivers/ata/ata_generic.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/ata_generic.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/ata_generic.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/ata_generic.c 2011-11-15 19:59:43.000000000 -0500
@@ -104,7 +104,7 @@ static struct scsi_host_template generic
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -25544,8 +25544,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/ata_generic.c linux-2.6.32.48/drivers/ata
.cable_detect = ata_cable_unknown,
.set_mode = generic_set_mode,
diff -urNp linux-2.6.32.48/drivers/ata/ata_piix.c linux-2.6.32.48/drivers/ata/ata_piix.c
---- linux-2.6.32.48/drivers/ata/ata_piix.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/ata_piix.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/ata_piix.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/ata_piix.c 2011-11-15 19:59:43.000000000 -0500
@@ -318,7 +318,7 @@ static struct scsi_host_template piix_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -25583,8 +25583,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/ata_piix.c linux-2.6.32.48/drivers/ata/at
.hardreset = sata_std_hardreset,
.scr_read = piix_sidpr_scr_read,
diff -urNp linux-2.6.32.48/drivers/ata/libata-acpi.c linux-2.6.32.48/drivers/ata/libata-acpi.c
---- linux-2.6.32.48/drivers/ata/libata-acpi.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/libata-acpi.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/libata-acpi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/libata-acpi.c 2011-11-15 19:59:43.000000000 -0500
@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
ata_acpi_uevent(dev->link->ap, dev, event);
}
@@ -25601,8 +25601,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/libata-acpi.c linux-2.6.32.48/drivers/ata
.uevent = ata_acpi_ap_uevent,
};
diff -urNp linux-2.6.32.48/drivers/ata/libata-core.c linux-2.6.32.48/drivers/ata/libata-core.c
---- linux-2.6.32.48/drivers/ata/libata-core.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/libata-core.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/libata-core.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/libata-core.c 2011-11-15 19:59:43.000000000 -0500
@@ -4954,7 +4954,7 @@ void ata_qc_free(struct ata_queued_cmd *
struct ata_port *ap;
unsigned int tag;
@@ -25668,8 +25668,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/libata-core.c linux-2.6.32.48/drivers/ata
.qc_issue = ata_dummy_qc_issue,
.error_handler = ata_dummy_error_handler,
diff -urNp linux-2.6.32.48/drivers/ata/libata-eh.c linux-2.6.32.48/drivers/ata/libata-eh.c
---- linux-2.6.32.48/drivers/ata/libata-eh.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/libata-eh.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/libata-eh.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/libata-eh.c 2011-11-15 19:59:43.000000000 -0500
@@ -2423,6 +2423,8 @@ void ata_eh_report(struct ata_port *ap)
{
struct ata_link *link;
@@ -25689,8 +25689,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/libata-eh.c linux-2.6.32.48/drivers/ata/l
/* ignore built-in hardreset if SCR access is not available */
diff -urNp linux-2.6.32.48/drivers/ata/libata-pmp.c linux-2.6.32.48/drivers/ata/libata-pmp.c
---- linux-2.6.32.48/drivers/ata/libata-pmp.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/libata-pmp.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/libata-pmp.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/libata-pmp.c 2011-11-15 19:59:43.000000000 -0500
@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
*/
static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -25701,8 +25701,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/libata-pmp.c linux-2.6.32.48/drivers/ata/
struct ata_link *pmp_link = &ap->link;
struct ata_device *pmp_dev = pmp_link->device;
diff -urNp linux-2.6.32.48/drivers/ata/pata_acpi.c linux-2.6.32.48/drivers/ata/pata_acpi.c
---- linux-2.6.32.48/drivers/ata/pata_acpi.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_acpi.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_acpi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_acpi.c 2011-11-15 19:59:43.000000000 -0500
@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -25713,8 +25713,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_acpi.c linux-2.6.32.48/drivers/ata/p
.qc_issue = pacpi_qc_issue,
.cable_detect = pacpi_cable_detect,
diff -urNp linux-2.6.32.48/drivers/ata/pata_ali.c linux-2.6.32.48/drivers/ata/pata_ali.c
---- linux-2.6.32.48/drivers/ata/pata_ali.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_ali.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_ali.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_ali.c 2011-11-15 19:59:43.000000000 -0500
@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
* Port operations for PIO only ALi
*/
@@ -25761,8 +25761,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_ali.c linux-2.6.32.48/drivers/ata/pa
.check_atapi_dma = ali_check_atapi_dma,
.dev_config = ali_warn_atapi_dma,
diff -urNp linux-2.6.32.48/drivers/ata/pata_amd.c linux-2.6.32.48/drivers/ata/pata_amd.c
---- linux-2.6.32.48/drivers/ata/pata_amd.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_amd.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_amd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_amd.c 2011-11-15 19:59:43.000000000 -0500
@@ -397,28 +397,28 @@ static const struct ata_port_operations
.prereset = amd_pre_reset,
};
@@ -25813,8 +25813,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_amd.c linux-2.6.32.48/drivers/ata/pa
.set_piomode = nv133_set_piomode,
.set_dmamode = nv133_set_dmamode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_artop.c linux-2.6.32.48/drivers/ata/pata_artop.c
---- linux-2.6.32.48/drivers/ata/pata_artop.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_artop.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_artop.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_artop.c 2011-11-15 19:59:43.000000000 -0500
@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -25834,8 +25834,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_artop.c linux-2.6.32.48/drivers/ata/
.cable_detect = artop6260_cable_detect,
.set_piomode = artop6260_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_at32.c linux-2.6.32.48/drivers/ata/pata_at32.c
---- linux-2.6.32.48/drivers/ata/pata_at32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_at32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_at32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_at32.c 2011-11-15 19:59:43.000000000 -0500
@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -25846,8 +25846,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_at32.c linux-2.6.32.48/drivers/ata/p
.cable_detect = ata_cable_40wire,
.set_piomode = pata_at32_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_at91.c linux-2.6.32.48/drivers/ata/pata_at91.c
---- linux-2.6.32.48/drivers/ata/pata_at91.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_at91.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_at91.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_at91.c 2011-11-15 19:59:43.000000000 -0500
@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
ATA_PIO_SHT(DRV_NAME),
};
@@ -25858,8 +25858,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_at91.c linux-2.6.32.48/drivers/ata/p
.sff_data_xfer = pata_at91_data_xfer_noirq,
diff -urNp linux-2.6.32.48/drivers/ata/pata_atiixp.c linux-2.6.32.48/drivers/ata/pata_atiixp.c
---- linux-2.6.32.48/drivers/ata/pata_atiixp.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_atiixp.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_atiixp.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_atiixp.c 2011-11-15 19:59:43.000000000 -0500
@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -25870,8 +25870,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_atiixp.c linux-2.6.32.48/drivers/ata
.qc_prep = ata_sff_dumb_qc_prep,
diff -urNp linux-2.6.32.48/drivers/ata/pata_atp867x.c linux-2.6.32.48/drivers/ata/pata_atp867x.c
---- linux-2.6.32.48/drivers/ata/pata_atp867x.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_atp867x.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_atp867x.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_atp867x.c 2011-11-15 19:59:43.000000000 -0500
@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -25882,8 +25882,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_atp867x.c linux-2.6.32.48/drivers/at
.cable_detect = atp867x_cable_detect,
.set_piomode = atp867x_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_bf54x.c linux-2.6.32.48/drivers/ata/pata_bf54x.c
---- linux-2.6.32.48/drivers/ata/pata_bf54x.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_bf54x.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_bf54x.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_bf54x.c 2011-11-15 19:59:43.000000000 -0500
@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -25894,8 +25894,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_bf54x.c linux-2.6.32.48/drivers/ata/
.set_piomode = bfin_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_cmd640.c linux-2.6.32.48/drivers/ata/pata_cmd640.c
---- linux-2.6.32.48/drivers/ata/pata_cmd640.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_cmd640.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_cmd640.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_cmd640.c 2011-11-15 19:59:43.000000000 -0500
@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -25906,8 +25906,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_cmd640.c linux-2.6.32.48/drivers/ata
/* 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.48/drivers/ata/pata_cmd64x.c linux-2.6.32.48/drivers/ata/pata_cmd64x.c
---- linux-2.6.32.48/drivers/ata/pata_cmd64x.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_cmd64x.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_cmd64x.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_cmd64x.c 2011-11-15 19:59:43.000000000 -0500
@@ -271,18 +271,18 @@ static const struct ata_port_operations
.set_dmamode = cmd64x_set_dmamode,
};
@@ -25931,8 +25931,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_cmd64x.c linux-2.6.32.48/drivers/ata
.bmdma_stop = cmd648_bmdma_stop,
.cable_detect = cmd648_cable_detect,
diff -urNp linux-2.6.32.48/drivers/ata/pata_cs5520.c linux-2.6.32.48/drivers/ata/pata_cs5520.c
---- linux-2.6.32.48/drivers/ata/pata_cs5520.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_cs5520.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_cs5520.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_cs5520.c 2011-11-15 19:59:43.000000000 -0500
@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -25943,8 +25943,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_cs5520.c linux-2.6.32.48/drivers/ata
.qc_prep = ata_sff_dumb_qc_prep,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.48/drivers/ata/pata_cs5530.c linux-2.6.32.48/drivers/ata/pata_cs5530.c
---- linux-2.6.32.48/drivers/ata/pata_cs5530.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_cs5530.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_cs5530.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_cs5530.c 2011-11-15 19:59:43.000000000 -0500
@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -25955,8 +25955,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_cs5530.c linux-2.6.32.48/drivers/ata
.qc_prep = ata_sff_dumb_qc_prep,
diff -urNp linux-2.6.32.48/drivers/ata/pata_cs5535.c linux-2.6.32.48/drivers/ata/pata_cs5535.c
---- linux-2.6.32.48/drivers/ata/pata_cs5535.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_cs5535.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_cs5535.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_cs5535.c 2011-11-15 19:59:43.000000000 -0500
@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -25967,8 +25967,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_cs5535.c linux-2.6.32.48/drivers/ata
.cable_detect = cs5535_cable_detect,
.set_piomode = cs5535_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_cs5536.c linux-2.6.32.48/drivers/ata/pata_cs5536.c
---- linux-2.6.32.48/drivers/ata/pata_cs5536.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_cs5536.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_cs5536.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_cs5536.c 2011-11-15 19:59:43.000000000 -0500
@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -25979,8 +25979,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_cs5536.c linux-2.6.32.48/drivers/ata
.cable_detect = cs5536_cable_detect,
.set_piomode = cs5536_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_cypress.c linux-2.6.32.48/drivers/ata/pata_cypress.c
---- linux-2.6.32.48/drivers/ata/pata_cypress.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_cypress.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_cypress.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_cypress.c 2011-11-15 19:59:43.000000000 -0500
@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -25991,8 +25991,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_cypress.c linux-2.6.32.48/drivers/at
.cable_detect = ata_cable_40wire,
.set_piomode = cy82c693_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_efar.c linux-2.6.32.48/drivers/ata/pata_efar.c
---- linux-2.6.32.48/drivers/ata/pata_efar.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_efar.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_efar.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_efar.c 2011-11-15 19:59:43.000000000 -0500
@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26003,8 +26003,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_efar.c linux-2.6.32.48/drivers/ata/p
.cable_detect = efar_cable_detect,
.set_piomode = efar_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_hpt366.c linux-2.6.32.48/drivers/ata/pata_hpt366.c
---- linux-2.6.32.48/drivers/ata/pata_hpt366.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_hpt366.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_hpt366.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_hpt366.c 2011-11-15 19:59:43.000000000 -0500
@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
* Configuration for HPT366/68
*/
@@ -26015,8 +26015,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_hpt366.c linux-2.6.32.48/drivers/ata
.cable_detect = hpt36x_cable_detect,
.mode_filter = hpt366_filter,
diff -urNp linux-2.6.32.48/drivers/ata/pata_hpt37x.c linux-2.6.32.48/drivers/ata/pata_hpt37x.c
---- linux-2.6.32.48/drivers/ata/pata_hpt37x.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_hpt37x.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_hpt37x.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_hpt37x.c 2011-11-15 19:59:43.000000000 -0500
@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
* Configuration for HPT370
*/
@@ -26054,8 +26054,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_hpt37x.c linux-2.6.32.48/drivers/ata
.prereset = hpt374_fn1_pre_reset,
};
diff -urNp linux-2.6.32.48/drivers/ata/pata_hpt3x2n.c linux-2.6.32.48/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.32.48/drivers/ata/pata_hpt3x2n.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_hpt3x2n.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_hpt3x2n.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_hpt3x2n.c 2011-11-15 19:59:43.000000000 -0500
@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
* Configuration for HPT3x2n.
*/
@@ -26066,8 +26066,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_hpt3x2n.c linux-2.6.32.48/drivers/at
.bmdma_stop = hpt3x2n_bmdma_stop,
diff -urNp linux-2.6.32.48/drivers/ata/pata_hpt3x3.c linux-2.6.32.48/drivers/ata/pata_hpt3x3.c
---- linux-2.6.32.48/drivers/ata/pata_hpt3x3.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_hpt3x3.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_hpt3x3.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_hpt3x3.c 2011-11-15 19:59:43.000000000 -0500
@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26078,8 +26078,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_hpt3x3.c linux-2.6.32.48/drivers/ata
.cable_detect = ata_cable_40wire,
.set_piomode = hpt3x3_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_icside.c linux-2.6.32.48/drivers/ata/pata_icside.c
---- linux-2.6.32.48/drivers/ata/pata_icside.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_icside.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_icside.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_icside.c 2011-11-15 19:59:43.000000000 -0500
@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
}
}
@@ -26090,8 +26090,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_icside.c linux-2.6.32.48/drivers/ata
/* no need to build any PRD tables for DMA */
.qc_prep = ata_noop_qc_prep,
diff -urNp linux-2.6.32.48/drivers/ata/pata_isapnp.c linux-2.6.32.48/drivers/ata/pata_isapnp.c
---- linux-2.6.32.48/drivers/ata/pata_isapnp.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_isapnp.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_isapnp.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_isapnp.c 2011-11-15 19:59:43.000000000 -0500
@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
ATA_PIO_SHT(DRV_NAME),
};
@@ -26108,8 +26108,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_isapnp.c linux-2.6.32.48/drivers/ata
.cable_detect = ata_cable_40wire,
/* No altstatus so we don't want to use the lost interrupt poll */
diff -urNp linux-2.6.32.48/drivers/ata/pata_it8213.c linux-2.6.32.48/drivers/ata/pata_it8213.c
---- linux-2.6.32.48/drivers/ata/pata_it8213.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_it8213.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_it8213.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_it8213.c 2011-11-15 19:59:43.000000000 -0500
@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
};
@@ -26120,8 +26120,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_it8213.c linux-2.6.32.48/drivers/ata
.cable_detect = it8213_cable_detect,
.set_piomode = it8213_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_it821x.c linux-2.6.32.48/drivers/ata/pata_it821x.c
---- linux-2.6.32.48/drivers/ata/pata_it821x.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_it821x.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_it821x.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_it821x.c 2011-11-15 19:59:43.000000000 -0500
@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26150,8 +26150,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_it821x.c linux-2.6.32.48/drivers/ata
.check_atapi_dma= it821x_check_atapi_dma,
diff -urNp linux-2.6.32.48/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.48/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.32.48/drivers/ata/pata_ixp4xx_cf.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_ixp4xx_cf.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_ixp4xx_cf.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_ixp4xx_cf.c 2011-11-15 19:59:43.000000000 -0500
@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
ATA_PIO_SHT(DRV_NAME),
};
@@ -26162,8 +26162,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.48/drivers/
.sff_data_xfer = ixp4xx_mmio_data_xfer,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.48/drivers/ata/pata_jmicron.c linux-2.6.32.48/drivers/ata/pata_jmicron.c
---- linux-2.6.32.48/drivers/ata/pata_jmicron.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_jmicron.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_jmicron.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_jmicron.c 2011-11-15 19:59:43.000000000 -0500
@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26174,8 +26174,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_jmicron.c linux-2.6.32.48/drivers/at
.prereset = jmicron_pre_reset,
};
diff -urNp linux-2.6.32.48/drivers/ata/pata_legacy.c linux-2.6.32.48/drivers/ata/pata_legacy.c
---- linux-2.6.32.48/drivers/ata/pata_legacy.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_legacy.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_legacy.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_legacy.c 2011-11-15 19:59:43.000000000 -0500
@@ -106,7 +106,7 @@ struct legacy_probe {
struct legacy_controller {
@@ -26288,8 +26288,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_legacy.c linux-2.6.32.48/drivers/ata
struct ata_host *host = NULL;
struct ata_port *ap;
diff -urNp linux-2.6.32.48/drivers/ata/pata_marvell.c linux-2.6.32.48/drivers/ata/pata_marvell.c
---- linux-2.6.32.48/drivers/ata/pata_marvell.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_marvell.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_marvell.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_marvell.c 2011-11-15 19:59:43.000000000 -0500
@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26300,8 +26300,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_marvell.c linux-2.6.32.48/drivers/at
.cable_detect = marvell_cable_detect,
.prereset = marvell_pre_reset,
diff -urNp linux-2.6.32.48/drivers/ata/pata_mpc52xx.c linux-2.6.32.48/drivers/ata/pata_mpc52xx.c
---- linux-2.6.32.48/drivers/ata/pata_mpc52xx.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_mpc52xx.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_mpc52xx.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_mpc52xx.c 2011-11-15 19:59:43.000000000 -0500
@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
ATA_PIO_SHT(DRV_NAME),
};
@@ -26312,8 +26312,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_mpc52xx.c linux-2.6.32.48/drivers/at
.sff_dev_select = mpc52xx_ata_dev_select,
.set_piomode = mpc52xx_ata_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_mpiix.c linux-2.6.32.48/drivers/ata/pata_mpiix.c
---- linux-2.6.32.48/drivers/ata/pata_mpiix.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_mpiix.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_mpiix.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_mpiix.c 2011-11-15 19:59:43.000000000 -0500
@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
ATA_PIO_SHT(DRV_NAME),
};
@@ -26324,8 +26324,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_mpiix.c linux-2.6.32.48/drivers/ata/
.qc_issue = mpiix_qc_issue,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.48/drivers/ata/pata_netcell.c linux-2.6.32.48/drivers/ata/pata_netcell.c
---- linux-2.6.32.48/drivers/ata/pata_netcell.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_netcell.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_netcell.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_netcell.c 2011-11-15 19:59:43.000000000 -0500
@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26336,8 +26336,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_netcell.c linux-2.6.32.48/drivers/at
.cable_detect = ata_cable_80wire,
.read_id = netcell_read_id,
diff -urNp linux-2.6.32.48/drivers/ata/pata_ninja32.c linux-2.6.32.48/drivers/ata/pata_ninja32.c
---- linux-2.6.32.48/drivers/ata/pata_ninja32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_ninja32.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_ninja32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_ninja32.c 2011-11-15 19:59:43.000000000 -0500
@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26348,8 +26348,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_ninja32.c linux-2.6.32.48/drivers/at
.sff_dev_select = ninja32_dev_select,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.48/drivers/ata/pata_ns87410.c linux-2.6.32.48/drivers/ata/pata_ns87410.c
---- linux-2.6.32.48/drivers/ata/pata_ns87410.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_ns87410.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_ns87410.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_ns87410.c 2011-11-15 19:59:43.000000000 -0500
@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
ATA_PIO_SHT(DRV_NAME),
};
@@ -26360,8 +26360,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_ns87410.c linux-2.6.32.48/drivers/at
.qc_issue = ns87410_qc_issue,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.48/drivers/ata/pata_ns87415.c linux-2.6.32.48/drivers/ata/pata_ns87415.c
---- linux-2.6.32.48/drivers/ata/pata_ns87415.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_ns87415.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_ns87415.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_ns87415.c 2011-11-15 19:59:43.000000000 -0500
@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
}
#endif /* 87560 SuperIO Support */
@@ -26381,8 +26381,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_ns87415.c linux-2.6.32.48/drivers/at
.sff_tf_read = ns87560_tf_read,
.sff_check_status = ns87560_check_status,
diff -urNp linux-2.6.32.48/drivers/ata/pata_octeon_cf.c linux-2.6.32.48/drivers/ata/pata_octeon_cf.c
---- linux-2.6.32.48/drivers/ata/pata_octeon_cf.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_octeon_cf.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_octeon_cf.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_octeon_cf.c 2011-11-15 19:59:43.000000000 -0500
@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
return 0;
}
@@ -26392,8 +26392,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_octeon_cf.c linux-2.6.32.48/drivers/
.inherits = &ata_sff_port_ops,
.check_atapi_dma = octeon_cf_check_atapi_dma,
diff -urNp linux-2.6.32.48/drivers/ata/pata_oldpiix.c linux-2.6.32.48/drivers/ata/pata_oldpiix.c
---- linux-2.6.32.48/drivers/ata/pata_oldpiix.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_oldpiix.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_oldpiix.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_oldpiix.c 2011-11-15 19:59:43.000000000 -0500
@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26404,8 +26404,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_oldpiix.c linux-2.6.32.48/drivers/at
.qc_issue = oldpiix_qc_issue,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.48/drivers/ata/pata_opti.c linux-2.6.32.48/drivers/ata/pata_opti.c
---- linux-2.6.32.48/drivers/ata/pata_opti.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_opti.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_opti.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_opti.c 2011-11-15 19:59:43.000000000 -0500
@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -26416,8 +26416,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_opti.c linux-2.6.32.48/drivers/ata/p
.cable_detect = ata_cable_40wire,
.set_piomode = opti_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_optidma.c linux-2.6.32.48/drivers/ata/pata_optidma.c
---- linux-2.6.32.48/drivers/ata/pata_optidma.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_optidma.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_optidma.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_optidma.c 2011-11-15 19:59:43.000000000 -0500
@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26437,8 +26437,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_optidma.c linux-2.6.32.48/drivers/at
.set_piomode = optiplus_set_pio_mode,
.set_dmamode = optiplus_set_dma_mode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_palmld.c linux-2.6.32.48/drivers/ata/pata_palmld.c
---- linux-2.6.32.48/drivers/ata/pata_palmld.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_palmld.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_palmld.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_palmld.c 2011-11-15 19:59:43.000000000 -0500
@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
ATA_PIO_SHT(DRV_NAME),
};
@@ -26449,8 +26449,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_palmld.c linux-2.6.32.48/drivers/ata
.sff_data_xfer = ata_sff_data_xfer_noirq,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.48/drivers/ata/pata_pcmcia.c linux-2.6.32.48/drivers/ata/pata_pcmcia.c
---- linux-2.6.32.48/drivers/ata/pata_pcmcia.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_pcmcia.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_pcmcia.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_pcmcia.c 2011-11-15 19:59:43.000000000 -0500
@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
ATA_PIO_SHT(DRV_NAME),
};
@@ -26478,8 +26478,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_pcmcia.c linux-2.6.32.48/drivers/ata
info = kzalloc(sizeof(*info), GFP_KERNEL);
if (info == NULL)
diff -urNp linux-2.6.32.48/drivers/ata/pata_pdc2027x.c linux-2.6.32.48/drivers/ata/pata_pdc2027x.c
---- linux-2.6.32.48/drivers/ata/pata_pdc2027x.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_pdc2027x.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_pdc2027x.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_pdc2027x.c 2011-11-15 19:59:43.000000000 -0500
@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26498,8 +26498,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_pdc2027x.c linux-2.6.32.48/drivers/a
.mode_filter = pdc2027x_mode_filter,
.set_piomode = pdc2027x_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.48/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.32.48/drivers/ata/pata_pdc202xx_old.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_pdc202xx_old.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_pdc202xx_old.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_pdc202xx_old.c 2011-11-15 19:59:43.000000000 -0500
@@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26519,8 +26519,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.48/drive
.check_atapi_dma = pdc2026x_check_atapi_dma,
diff -urNp linux-2.6.32.48/drivers/ata/pata_platform.c linux-2.6.32.48/drivers/ata/pata_platform.c
---- linux-2.6.32.48/drivers/ata/pata_platform.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_platform.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_platform.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_platform.c 2011-11-15 19:59:43.000000000 -0500
@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
ATA_PIO_SHT(DRV_NAME),
};
@@ -26531,8 +26531,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_platform.c linux-2.6.32.48/drivers/a
.sff_data_xfer = ata_sff_data_xfer_noirq,
.cable_detect = ata_cable_unknown,
diff -urNp linux-2.6.32.48/drivers/ata/pata_qdi.c linux-2.6.32.48/drivers/ata/pata_qdi.c
---- linux-2.6.32.48/drivers/ata/pata_qdi.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_qdi.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_qdi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_qdi.c 2011-11-15 19:59:43.000000000 -0500
@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
ATA_PIO_SHT(DRV_NAME),
};
@@ -26552,8 +26552,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_qdi.c linux-2.6.32.48/drivers/ata/pa
.set_piomode = qdi6580_set_piomode,
};
diff -urNp linux-2.6.32.48/drivers/ata/pata_radisys.c linux-2.6.32.48/drivers/ata/pata_radisys.c
---- linux-2.6.32.48/drivers/ata/pata_radisys.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_radisys.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_radisys.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_radisys.c 2011-11-15 19:59:43.000000000 -0500
@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26564,8 +26564,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_radisys.c linux-2.6.32.48/drivers/at
.qc_issue = radisys_qc_issue,
.cable_detect = ata_cable_unknown,
diff -urNp linux-2.6.32.48/drivers/ata/pata_rb532_cf.c linux-2.6.32.48/drivers/ata/pata_rb532_cf.c
---- linux-2.6.32.48/drivers/ata/pata_rb532_cf.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_rb532_cf.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_rb532_cf.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_rb532_cf.c 2011-11-15 19:59:43.000000000 -0500
@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
return IRQ_HANDLED;
}
@@ -26576,8 +26576,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_rb532_cf.c linux-2.6.32.48/drivers/a
.sff_data_xfer = ata_sff_data_xfer32,
};
diff -urNp linux-2.6.32.48/drivers/ata/pata_rdc.c linux-2.6.32.48/drivers/ata/pata_rdc.c
---- linux-2.6.32.48/drivers/ata/pata_rdc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_rdc.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_rdc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_rdc.c 2011-11-15 19:59:43.000000000 -0500
@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
pci_write_config_byte(dev, 0x48, udma_enable);
}
@@ -26588,8 +26588,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_rdc.c linux-2.6.32.48/drivers/ata/pa
.cable_detect = rdc_pata_cable_detect,
.set_piomode = rdc_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_rz1000.c linux-2.6.32.48/drivers/ata/pata_rz1000.c
---- linux-2.6.32.48/drivers/ata/pata_rz1000.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_rz1000.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_rz1000.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_rz1000.c 2011-11-15 19:59:43.000000000 -0500
@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
ATA_PIO_SHT(DRV_NAME),
};
@@ -26600,8 +26600,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_rz1000.c linux-2.6.32.48/drivers/ata
.cable_detect = ata_cable_40wire,
.set_mode = rz1000_set_mode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_sc1200.c linux-2.6.32.48/drivers/ata/pata_sc1200.c
---- linux-2.6.32.48/drivers/ata/pata_sc1200.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_sc1200.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_sc1200.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_sc1200.c 2011-11-15 19:59:43.000000000 -0500
@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -26612,8 +26612,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_sc1200.c linux-2.6.32.48/drivers/ata
.qc_prep = ata_sff_dumb_qc_prep,
.qc_issue = sc1200_qc_issue,
diff -urNp linux-2.6.32.48/drivers/ata/pata_scc.c linux-2.6.32.48/drivers/ata/pata_scc.c
---- linux-2.6.32.48/drivers/ata/pata_scc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_scc.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_scc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_scc.c 2011-11-15 19:59:43.000000000 -0500
@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26624,8 +26624,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_scc.c linux-2.6.32.48/drivers/ata/pa
.set_piomode = scc_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_sch.c linux-2.6.32.48/drivers/ata/pata_sch.c
---- linux-2.6.32.48/drivers/ata/pata_sch.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_sch.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_sch.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_sch.c 2011-11-15 19:59:43.000000000 -0500
@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26636,8 +26636,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_sch.c linux-2.6.32.48/drivers/ata/pa
.cable_detect = ata_cable_unknown,
.set_piomode = sch_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_serverworks.c linux-2.6.32.48/drivers/ata/pata_serverworks.c
---- linux-2.6.32.48/drivers/ata/pata_serverworks.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_serverworks.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_serverworks.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_serverworks.c 2011-11-15 19:59:43.000000000 -0500
@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26657,8 +26657,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_serverworks.c linux-2.6.32.48/driver
.mode_filter = serverworks_csb_filter,
};
diff -urNp linux-2.6.32.48/drivers/ata/pata_sil680.c linux-2.6.32.48/drivers/ata/pata_sil680.c
---- linux-2.6.32.48/drivers/ata/pata_sil680.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_sil680.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_sil680.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_sil680.c 2011-11-15 19:59:43.000000000 -0500
@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26669,8 +26669,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_sil680.c linux-2.6.32.48/drivers/ata
.cable_detect = sil680_cable_detect,
.set_piomode = sil680_set_piomode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_sis.c linux-2.6.32.48/drivers/ata/pata_sis.c
---- linux-2.6.32.48/drivers/ata/pata_sis.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_sis.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_sis.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_sis.c 2011-11-15 19:59:43.000000000 -0500
@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26727,8 +26727,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_sis.c linux-2.6.32.48/drivers/ata/pa
.set_piomode = sis_old_set_piomode,
.set_dmamode = sis_old_set_dmamode,
diff -urNp linux-2.6.32.48/drivers/ata/pata_sl82c105.c linux-2.6.32.48/drivers/ata/pata_sl82c105.c
---- linux-2.6.32.48/drivers/ata/pata_sl82c105.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_sl82c105.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_sl82c105.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_sl82c105.c 2011-11-15 19:59:43.000000000 -0500
@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26739,8 +26739,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_sl82c105.c linux-2.6.32.48/drivers/a
.qc_defer = sl82c105_qc_defer,
.bmdma_start = sl82c105_bmdma_start,
diff -urNp linux-2.6.32.48/drivers/ata/pata_triflex.c linux-2.6.32.48/drivers/ata/pata_triflex.c
---- linux-2.6.32.48/drivers/ata/pata_triflex.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_triflex.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_triflex.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_triflex.c 2011-11-15 19:59:43.000000000 -0500
@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26751,8 +26751,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_triflex.c linux-2.6.32.48/drivers/at
.bmdma_start = triflex_bmdma_start,
.bmdma_stop = triflex_bmdma_stop,
diff -urNp linux-2.6.32.48/drivers/ata/pata_via.c linux-2.6.32.48/drivers/ata/pata_via.c
---- linux-2.6.32.48/drivers/ata/pata_via.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_via.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_via.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_via.c 2011-11-15 19:59:43.000000000 -0500
@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26772,8 +26772,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_via.c linux-2.6.32.48/drivers/ata/pa
.sff_data_xfer = ata_sff_data_xfer_noirq,
};
diff -urNp linux-2.6.32.48/drivers/ata/pata_winbond.c linux-2.6.32.48/drivers/ata/pata_winbond.c
---- linux-2.6.32.48/drivers/ata/pata_winbond.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pata_winbond.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pata_winbond.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pata_winbond.c 2011-11-15 19:59:43.000000000 -0500
@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
ATA_PIO_SHT(DRV_NAME),
};
@@ -26784,8 +26784,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pata_winbond.c linux-2.6.32.48/drivers/at
.sff_data_xfer = winbond_data_xfer,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.48/drivers/ata/pdc_adma.c linux-2.6.32.48/drivers/ata/pdc_adma.c
---- linux-2.6.32.48/drivers/ata/pdc_adma.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/pdc_adma.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/pdc_adma.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/pdc_adma.c 2011-11-15 19:59:43.000000000 -0500
@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
.dma_boundary = ADMA_DMA_BOUNDARY,
};
@@ -26796,8 +26796,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/pdc_adma.c linux-2.6.32.48/drivers/ata/pd
.lost_interrupt = ATA_OP_NULL,
diff -urNp linux-2.6.32.48/drivers/ata/sata_fsl.c linux-2.6.32.48/drivers/ata/sata_fsl.c
---- linux-2.6.32.48/drivers/ata/sata_fsl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/sata_fsl.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/sata_fsl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/sata_fsl.c 2011-11-15 19:59:43.000000000 -0500
@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -26808,8 +26808,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/sata_fsl.c linux-2.6.32.48/drivers/ata/sa
.qc_defer = ata_std_qc_defer,
diff -urNp linux-2.6.32.48/drivers/ata/sata_inic162x.c linux-2.6.32.48/drivers/ata/sata_inic162x.c
---- linux-2.6.32.48/drivers/ata/sata_inic162x.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/sata_inic162x.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/sata_inic162x.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/sata_inic162x.c 2011-11-15 19:59:43.000000000 -0500
@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
return 0;
}
@@ -26820,8 +26820,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/sata_inic162x.c linux-2.6.32.48/drivers/a
.check_atapi_dma = inic_check_atapi_dma,
diff -urNp linux-2.6.32.48/drivers/ata/sata_mv.c linux-2.6.32.48/drivers/ata/sata_mv.c
---- linux-2.6.32.48/drivers/ata/sata_mv.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/sata_mv.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/sata_mv.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/sata_mv.c 2011-11-15 19:59:43.000000000 -0500
@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
.dma_boundary = MV_DMA_BOUNDARY,
};
@@ -26850,8 +26850,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/sata_mv.c linux-2.6.32.48/drivers/ata/sat
.dev_config = ATA_OP_NULL,
.qc_prep = mv_qc_prep_iie,
diff -urNp linux-2.6.32.48/drivers/ata/sata_nv.c linux-2.6.32.48/drivers/ata/sata_nv.c
---- linux-2.6.32.48/drivers/ata/sata_nv.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/sata_nv.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/sata_nv.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/sata_nv.c 2011-11-15 19:59:43.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.
@@ -26895,8 +26895,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/sata_nv.c linux-2.6.32.48/drivers/ata/sat
.qc_defer = ata_std_qc_defer,
diff -urNp linux-2.6.32.48/drivers/ata/sata_promise.c linux-2.6.32.48/drivers/ata/sata_promise.c
---- linux-2.6.32.48/drivers/ata/sata_promise.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/sata_promise.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/sata_promise.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/sata_promise.c 2011-11-15 19:59:43.000000000 -0500
@@ -195,7 +195,7 @@ static const struct ata_port_operations
.error_handler = pdc_error_handler,
};
@@ -26924,8 +26924,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/sata_promise.c linux-2.6.32.48/drivers/at
.cable_detect = pdc_pata_cable_detect,
.freeze = pdc_freeze,
diff -urNp linux-2.6.32.48/drivers/ata/sata_qstor.c linux-2.6.32.48/drivers/ata/sata_qstor.c
---- linux-2.6.32.48/drivers/ata/sata_qstor.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/sata_qstor.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/sata_qstor.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/sata_qstor.c 2011-11-15 19:59:43.000000000 -0500
@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
.dma_boundary = QS_DMA_BOUNDARY,
};
@@ -26936,8 +26936,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/sata_qstor.c linux-2.6.32.48/drivers/ata/
.check_atapi_dma = qs_check_atapi_dma,
diff -urNp linux-2.6.32.48/drivers/ata/sata_sil24.c linux-2.6.32.48/drivers/ata/sata_sil24.c
---- linux-2.6.32.48/drivers/ata/sata_sil24.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/sata_sil24.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/sata_sil24.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/sata_sil24.c 2011-11-15 19:59:43.000000000 -0500
@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -26948,8 +26948,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/sata_sil24.c linux-2.6.32.48/drivers/ata/
.qc_defer = sil24_qc_defer,
diff -urNp linux-2.6.32.48/drivers/ata/sata_sil.c linux-2.6.32.48/drivers/ata/sata_sil.c
---- linux-2.6.32.48/drivers/ata/sata_sil.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/sata_sil.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/sata_sil.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/sata_sil.c 2011-11-15 19:59:43.000000000 -0500
@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
.sg_tablesize = ATA_MAX_PRD
};
@@ -26960,8 +26960,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/sata_sil.c linux-2.6.32.48/drivers/ata/sa
.dev_config = sil_dev_config,
.set_mode = sil_set_mode,
diff -urNp linux-2.6.32.48/drivers/ata/sata_sis.c linux-2.6.32.48/drivers/ata/sata_sis.c
---- linux-2.6.32.48/drivers/ata/sata_sis.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/sata_sis.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/sata_sis.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/sata_sis.c 2011-11-15 19:59:43.000000000 -0500
@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -26972,8 +26972,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/sata_sis.c linux-2.6.32.48/drivers/ata/sa
.scr_read = sis_scr_read,
.scr_write = sis_scr_write,
diff -urNp linux-2.6.32.48/drivers/ata/sata_svw.c linux-2.6.32.48/drivers/ata/sata_svw.c
---- linux-2.6.32.48/drivers/ata/sata_svw.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/sata_svw.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/sata_svw.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/sata_svw.c 2011-11-15 19:59:43.000000000 -0500
@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
};
@@ -26984,8 +26984,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/sata_svw.c linux-2.6.32.48/drivers/ata/sa
.sff_tf_load = k2_sata_tf_load,
.sff_tf_read = k2_sata_tf_read,
diff -urNp linux-2.6.32.48/drivers/ata/sata_sx4.c linux-2.6.32.48/drivers/ata/sata_sx4.c
---- linux-2.6.32.48/drivers/ata/sata_sx4.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/sata_sx4.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/sata_sx4.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/sata_sx4.c 2011-11-15 19:59:43.000000000 -0500
@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
};
@@ -26996,8 +26996,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/sata_sx4.c linux-2.6.32.48/drivers/ata/sa
.check_atapi_dma = pdc_check_atapi_dma,
diff -urNp linux-2.6.32.48/drivers/ata/sata_uli.c linux-2.6.32.48/drivers/ata/sata_uli.c
---- linux-2.6.32.48/drivers/ata/sata_uli.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/sata_uli.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/sata_uli.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/sata_uli.c 2011-11-15 19:59:43.000000000 -0500
@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -27008,8 +27008,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/sata_uli.c linux-2.6.32.48/drivers/ata/sa
.scr_read = uli_scr_read,
.scr_write = uli_scr_write,
diff -urNp linux-2.6.32.48/drivers/ata/sata_via.c linux-2.6.32.48/drivers/ata/sata_via.c
---- linux-2.6.32.48/drivers/ata/sata_via.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/sata_via.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/sata_via.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/sata_via.c 2011-11-15 19:59:43.000000000 -0500
@@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -27049,8 +27049,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/sata_via.c linux-2.6.32.48/drivers/ata/sa
.hardreset = sata_std_hardreset,
.scr_read = vt8251_scr_read,
diff -urNp linux-2.6.32.48/drivers/ata/sata_vsc.c linux-2.6.32.48/drivers/ata/sata_vsc.c
---- linux-2.6.32.48/drivers/ata/sata_vsc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ata/sata_vsc.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/ata/sata_vsc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ata/sata_vsc.c 2011-11-15 19:59:43.000000000 -0500
@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
};
@@ -27061,8 +27061,8 @@ diff -urNp linux-2.6.32.48/drivers/ata/sata_vsc.c linux-2.6.32.48/drivers/ata/sa
/* The IRQ handling is not quite standard SFF behaviour so we
cannot use the default lost interrupt handler */
diff -urNp linux-2.6.32.48/drivers/atm/adummy.c linux-2.6.32.48/drivers/atm/adummy.c
---- linux-2.6.32.48/drivers/atm/adummy.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/adummy.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/adummy.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/adummy.c 2011-11-15 19:59:43.000000000 -0500
@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
vcc->pop(vcc, skb);
else
@@ -27073,8 +27073,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/adummy.c linux-2.6.32.48/drivers/atm/adum
return 0;
}
diff -urNp linux-2.6.32.48/drivers/atm/ambassador.c linux-2.6.32.48/drivers/atm/ambassador.c
---- linux-2.6.32.48/drivers/atm/ambassador.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/ambassador.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/ambassador.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/ambassador.c 2011-11-15 19:59:43.000000000 -0500
@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
@@ -27112,8 +27112,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/ambassador.c linux-2.6.32.48/drivers/atm/
}
diff -urNp linux-2.6.32.48/drivers/atm/atmtcp.c linux-2.6.32.48/drivers/atm/atmtcp.c
---- linux-2.6.32.48/drivers/atm/atmtcp.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/atmtcp.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/atmtcp.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/atmtcp.c 2011-11-15 19:59:43.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);
@@ -27164,8 +27164,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/atmtcp.c linux-2.6.32.48/drivers/atm/atmt
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
diff -urNp linux-2.6.32.48/drivers/atm/eni.c linux-2.6.32.48/drivers/atm/eni.c
---- linux-2.6.32.48/drivers/atm/eni.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/eni.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/eni.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/eni.c 2011-11-15 19:59:43.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);
@@ -27212,8 +27212,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/eni.c linux-2.6.32.48/drivers/atm/eni.c
dma_complete++;
}
diff -urNp linux-2.6.32.48/drivers/atm/firestream.c linux-2.6.32.48/drivers/atm/firestream.c
---- linux-2.6.32.48/drivers/atm/firestream.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/firestream.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/firestream.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/firestream.c 2011-11-15 19:59:43.000000000 -0500
@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
}
}
@@ -27248,8 +27248,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/firestream.c linux-2.6.32.48/drivers/atm/
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.48/drivers/atm/fore200e.c linux-2.6.32.48/drivers/atm/fore200e.c
---- linux-2.6.32.48/drivers/atm/fore200e.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/fore200e.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/fore200e.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/fore200e.c 2011-11-15 19:59:43.000000000 -0500
@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
#endif
/* check error condition */
@@ -27307,8 +27307,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/fore200e.c linux-2.6.32.48/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.48/drivers/atm/he.c linux-2.6.32.48/drivers/atm/he.c
---- linux-2.6.32.48/drivers/atm/he.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/he.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/he.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/he.c 2011-11-15 19:59:43.000000000 -0500
@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -27391,8 +27391,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/he.c linux-2.6.32.48/drivers/atm/he.c
return 0;
}
diff -urNp linux-2.6.32.48/drivers/atm/horizon.c linux-2.6.32.48/drivers/atm/horizon.c
---- linux-2.6.32.48/drivers/atm/horizon.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/horizon.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/horizon.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/horizon.c 2011-11-15 19:59:43.000000000 -0500
@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
{
struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -27412,8 +27412,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/horizon.c linux-2.6.32.48/drivers/atm/hor
// free the skb
hrz_kfree_skb (skb);
diff -urNp linux-2.6.32.48/drivers/atm/idt77252.c linux-2.6.32.48/drivers/atm/idt77252.c
---- linux-2.6.32.48/drivers/atm/idt77252.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/idt77252.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/idt77252.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/idt77252.c 2011-11-15 19:59:43.000000000 -0500
@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
else
dev_kfree_skb(skb);
@@ -27569,8 +27569,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/idt77252.c linux-2.6.32.48/drivers/atm/id
}
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
diff -urNp linux-2.6.32.48/drivers/atm/iphase.c linux-2.6.32.48/drivers/atm/iphase.c
---- linux-2.6.32.48/drivers/atm/iphase.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/iphase.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/iphase.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/iphase.c 2011-11-15 19:59:43.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))
@@ -27668,8 +27668,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/iphase.c linux-2.6.32.48/drivers/atm/ipha
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.48/drivers/atm/lanai.c linux-2.6.32.48/drivers/atm/lanai.c
---- linux-2.6.32.48/drivers/atm/lanai.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/lanai.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/lanai.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/lanai.c 2011-11-15 19:59:43.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);
@@ -27725,8 +27725,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/lanai.c linux-2.6.32.48/drivers/atm/lanai
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.48/drivers/atm/nicstar.c linux-2.6.32.48/drivers/atm/nicstar.c
---- linux-2.6.32.48/drivers/atm/nicstar.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/nicstar.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/nicstar.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/nicstar.c 2011-11-15 19:59:43.000000000 -0500
@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
if ((vc = (vc_map *) vcc->dev_data) == NULL)
{
@@ -27930,8 +27930,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/nicstar.c linux-2.6.32.48/drivers/atm/nic
}
diff -urNp linux-2.6.32.48/drivers/atm/solos-pci.c linux-2.6.32.48/drivers/atm/solos-pci.c
---- linux-2.6.32.48/drivers/atm/solos-pci.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/solos-pci.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/solos-pci.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/solos-pci.c 2011-11-15 19:59:43.000000000 -0500
@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
}
atm_charge(vcc, skb->truesize);
@@ -27960,8 +27960,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/solos-pci.c linux-2.6.32.48/drivers/atm/s
} else
dev_kfree_skb_irq(oldskb);
diff -urNp linux-2.6.32.48/drivers/atm/suni.c linux-2.6.32.48/drivers/atm/suni.c
---- linux-2.6.32.48/drivers/atm/suni.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/suni.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/suni.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/suni.c 2011-11-15 19:59:43.000000000 -0500
@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
@@ -27974,8 +27974,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/suni.c linux-2.6.32.48/drivers/atm/suni.c
static void suni_hz(unsigned long from_timer)
diff -urNp linux-2.6.32.48/drivers/atm/uPD98402.c linux-2.6.32.48/drivers/atm/uPD98402.c
---- linux-2.6.32.48/drivers/atm/uPD98402.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/uPD98402.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/uPD98402.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/uPD98402.c 2011-11-15 19:59:43.000000000 -0500
@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
struct sonet_stats tmp;
int error = 0;
@@ -28021,8 +28021,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/uPD98402.c linux-2.6.32.48/drivers/atm/uP
}
diff -urNp linux-2.6.32.48/drivers/atm/zatm.c linux-2.6.32.48/drivers/atm/zatm.c
---- linux-2.6.32.48/drivers/atm/zatm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/atm/zatm.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/atm/zatm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/atm/zatm.c 2011-11-15 19:59:43.000000000 -0500
@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
}
if (!size) {
@@ -28051,8 +28051,8 @@ diff -urNp linux-2.6.32.48/drivers/atm/zatm.c linux-2.6.32.48/drivers/atm/zatm.c
}
diff -urNp linux-2.6.32.48/drivers/base/bus.c linux-2.6.32.48/drivers/base/bus.c
---- linux-2.6.32.48/drivers/base/bus.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/base/bus.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/base/bus.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/base/bus.c 2011-11-15 19:59:43.000000000 -0500
@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
return ret;
}
@@ -28081,8 +28081,8 @@ diff -urNp linux-2.6.32.48/drivers/base/bus.c linux-2.6.32.48/drivers/base/bus.c
};
diff -urNp linux-2.6.32.48/drivers/base/class.c linux-2.6.32.48/drivers/base/class.c
---- linux-2.6.32.48/drivers/base/class.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/base/class.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/base/class.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/base/class.c 2011-11-15 19:59:43.000000000 -0500
@@ -63,7 +63,7 @@ static void class_release(struct kobject
kfree(cp);
}
@@ -28093,8 +28093,8 @@ diff -urNp linux-2.6.32.48/drivers/base/class.c linux-2.6.32.48/drivers/base/cla
.store = class_attr_store,
};
diff -urNp linux-2.6.32.48/drivers/base/core.c linux-2.6.32.48/drivers/base/core.c
---- linux-2.6.32.48/drivers/base/core.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/base/core.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/base/core.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/base/core.c 2011-11-15 19:59:43.000000000 -0500
@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
return ret;
}
@@ -28114,8 +28114,8 @@ diff -urNp linux-2.6.32.48/drivers/base/core.c linux-2.6.32.48/drivers/base/core
.name = dev_uevent_name,
.uevent = dev_uevent,
diff -urNp linux-2.6.32.48/drivers/base/memory.c linux-2.6.32.48/drivers/base/memory.c
---- linux-2.6.32.48/drivers/base/memory.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/base/memory.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/base/memory.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/base/memory.c 2011-11-15 19:59:43.000000000 -0500
@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
return retval;
}
@@ -28126,8 +28126,8 @@ diff -urNp linux-2.6.32.48/drivers/base/memory.c linux-2.6.32.48/drivers/base/me
.uevent = memory_uevent,
};
diff -urNp linux-2.6.32.48/drivers/base/sys.c linux-2.6.32.48/drivers/base/sys.c
---- linux-2.6.32.48/drivers/base/sys.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/base/sys.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/base/sys.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/base/sys.c 2011-11-15 19:59:43.000000000 -0500
@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
return -EIO;
}
@@ -28147,8 +28147,8 @@ diff -urNp linux-2.6.32.48/drivers/base/sys.c linux-2.6.32.48/drivers/base/sys.c
.store = sysdev_class_store,
};
diff -urNp linux-2.6.32.48/drivers/block/cciss.c linux-2.6.32.48/drivers/block/cciss.c
---- linux-2.6.32.48/drivers/block/cciss.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/block/cciss.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/block/cciss.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/block/cciss.c 2011-11-15 19:59:43.000000000 -0500
@@ -1011,6 +1011,8 @@ static int cciss_ioctl32_passthru(struct
int err;
u32 cp;
@@ -28259,8 +28259,8 @@ diff -urNp linux-2.6.32.48/drivers/block/cciss.c linux-2.6.32.48/drivers/block/c
/* Get the firmware version */
inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
diff -urNp linux-2.6.32.48/drivers/block/cciss.h linux-2.6.32.48/drivers/block/cciss.h
---- linux-2.6.32.48/drivers/block/cciss.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/block/cciss.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/block/cciss.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/block/cciss.h 2011-11-15 19:59:43.000000000 -0500
@@ -90,7 +90,7 @@ struct ctlr_info
// information about each logical volume
drive_info_struct *drv[CISS_MAX_LUN];
@@ -28271,8 +28271,8 @@ diff -urNp linux-2.6.32.48/drivers/block/cciss.h linux-2.6.32.48/drivers/block/c
/* queue and queue Info */
struct hlist_head reqQ;
diff -urNp linux-2.6.32.48/drivers/block/cpqarray.c linux-2.6.32.48/drivers/block/cpqarray.c
---- linux-2.6.32.48/drivers/block/cpqarray.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/block/cpqarray.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/block/cpqarray.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/block/cpqarray.c 2011-11-15 19:59:43.000000000 -0500
@@ -402,7 +402,7 @@ static int __init cpqarray_register_ctlr
if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
goto Enomem4;
@@ -28399,8 +28399,8 @@ diff -urNp linux-2.6.32.48/drivers/block/cpqarray.c linux-2.6.32.48/drivers/bloc
udelay(10); /* a short fixed delay */
} else
diff -urNp linux-2.6.32.48/drivers/block/cpqarray.h linux-2.6.32.48/drivers/block/cpqarray.h
---- linux-2.6.32.48/drivers/block/cpqarray.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/block/cpqarray.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/block/cpqarray.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/block/cpqarray.h 2011-11-15 19:59:43.000000000 -0500
@@ -99,7 +99,7 @@ struct ctlr_info {
drv_info_t drv[NWD];
struct proc_dir_entry *proc;
@@ -28411,8 +28411,8 @@ diff -urNp linux-2.6.32.48/drivers/block/cpqarray.h linux-2.6.32.48/drivers/bloc
cmdlist_t *reqQ;
cmdlist_t *cmpQ;
diff -urNp linux-2.6.32.48/drivers/block/DAC960.c linux-2.6.32.48/drivers/block/DAC960.c
---- linux-2.6.32.48/drivers/block/DAC960.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/block/DAC960.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/block/DAC960.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/block/DAC960.c 2011-11-15 19:59:43.000000000 -0500
@@ -1973,6 +1973,8 @@ static bool DAC960_V1_ReadDeviceConfigur
unsigned long flags;
int Channel, TargetID;
@@ -28423,8 +28423,8 @@ diff -urNp linux-2.6.32.48/drivers/block/DAC960.c linux-2.6.32.48/drivers/block/
DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) +
sizeof(DAC960_SCSI_Inquiry_T) +
diff -urNp linux-2.6.32.48/drivers/block/loop.c linux-2.6.32.48/drivers/block/loop.c
---- linux-2.6.32.48/drivers/block/loop.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/block/loop.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/block/loop.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/block/loop.c 2011-11-15 19:59:43.000000000 -0500
@@ -282,7 +282,7 @@ static int __do_lo_send_write(struct fil
mm_segment_t old_fs = get_fs();
@@ -28435,8 +28435,8 @@ diff -urNp linux-2.6.32.48/drivers/block/loop.c linux-2.6.32.48/drivers/block/lo
if (likely(bw == len))
return 0;
diff -urNp linux-2.6.32.48/drivers/block/nbd.c linux-2.6.32.48/drivers/block/nbd.c
---- linux-2.6.32.48/drivers/block/nbd.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/block/nbd.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/block/nbd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/block/nbd.c 2011-11-15 19:59:43.000000000 -0500
@@ -155,6 +155,8 @@ static int sock_xmit(struct nbd_device *
struct kvec iov;
sigset_t blocked, oldset;
@@ -28456,8 +28456,8 @@ diff -urNp linux-2.6.32.48/drivers/block/nbd.c linux-2.6.32.48/drivers/block/nbd
case NBD_DISCONNECT: {
struct request sreq;
diff -urNp linux-2.6.32.48/drivers/block/pktcdvd.c linux-2.6.32.48/drivers/block/pktcdvd.c
---- linux-2.6.32.48/drivers/block/pktcdvd.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/block/pktcdvd.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/block/pktcdvd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/block/pktcdvd.c 2011-11-15 19:59:43.000000000 -0500
@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
return len;
}
@@ -28468,8 +28468,8 @@ diff -urNp linux-2.6.32.48/drivers/block/pktcdvd.c linux-2.6.32.48/drivers/block
.store = kobj_pkt_store
};
diff -urNp linux-2.6.32.48/drivers/char/agp/frontend.c linux-2.6.32.48/drivers/char/agp/frontend.c
---- linux-2.6.32.48/drivers/char/agp/frontend.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/agp/frontend.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/agp/frontend.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/agp/frontend.c 2011-11-15 19:59:43.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;
@@ -28480,8 +28480,8 @@ diff -urNp linux-2.6.32.48/drivers/char/agp/frontend.c linux-2.6.32.48/drivers/c
client = agp_find_client_by_pid(reserve.pid);
diff -urNp linux-2.6.32.48/drivers/char/briq_panel.c linux-2.6.32.48/drivers/char/briq_panel.c
---- linux-2.6.32.48/drivers/char/briq_panel.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/briq_panel.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/briq_panel.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/briq_panel.c 2011-11-15 19:59:43.000000000 -0500
@@ -10,6 +10,7 @@
#include <linux/types.h>
#include <linux/errno.h>
@@ -28524,8 +28524,8 @@ diff -urNp linux-2.6.32.48/drivers/char/briq_panel.c linux-2.6.32.48/drivers/cha
return len;
}
diff -urNp linux-2.6.32.48/drivers/char/genrtc.c linux-2.6.32.48/drivers/char/genrtc.c
---- linux-2.6.32.48/drivers/char/genrtc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/genrtc.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/genrtc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/genrtc.c 2011-11-15 19:59:43.000000000 -0500
@@ -272,6 +272,7 @@ static int gen_rtc_ioctl(struct inode *i
switch (cmd) {
@@ -28535,8 +28535,8 @@ diff -urNp linux-2.6.32.48/drivers/char/genrtc.c linux-2.6.32.48/drivers/char/ge
return -EINVAL;
else
diff -urNp linux-2.6.32.48/drivers/char/hpet.c linux-2.6.32.48/drivers/char/hpet.c
---- linux-2.6.32.48/drivers/char/hpet.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/hpet.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/hpet.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/hpet.c 2011-11-15 19:59:43.000000000 -0500
@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
return 0;
}
@@ -28570,8 +28570,8 @@ diff -urNp linux-2.6.32.48/drivers/char/hpet.c linux-2.6.32.48/drivers/char/hpet
readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
info.hi_hpet = hpetp->hp_which;
diff -urNp linux-2.6.32.48/drivers/char/hvc_beat.c linux-2.6.32.48/drivers/char/hvc_beat.c
---- linux-2.6.32.48/drivers/char/hvc_beat.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/hvc_beat.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/hvc_beat.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/hvc_beat.c 2011-11-15 19:59:43.000000000 -0500
@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
return cnt;
}
@@ -28582,8 +28582,8 @@ diff -urNp linux-2.6.32.48/drivers/char/hvc_beat.c linux-2.6.32.48/drivers/char/
.put_chars = hvc_beat_put_chars,
};
diff -urNp linux-2.6.32.48/drivers/char/hvc_console.c linux-2.6.32.48/drivers/char/hvc_console.c
---- linux-2.6.32.48/drivers/char/hvc_console.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/hvc_console.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/hvc_console.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/hvc_console.c 2011-11-15 19:59:43.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.
@@ -28612,8 +28612,8 @@ diff -urNp linux-2.6.32.48/drivers/char/hvc_console.c linux-2.6.32.48/drivers/ch
struct hvc_struct *hp;
int i;
diff -urNp linux-2.6.32.48/drivers/char/hvc_console.h linux-2.6.32.48/drivers/char/hvc_console.h
---- linux-2.6.32.48/drivers/char/hvc_console.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/hvc_console.h 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/hvc_console.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/hvc_console.h 2011-11-15 19:59:43.000000000 -0500
@@ -55,7 +55,7 @@ struct hvc_struct {
int outbuf_size;
int n_outbuf;
@@ -28638,8 +28638,8 @@ diff -urNp linux-2.6.32.48/drivers/char/hvc_console.h linux-2.6.32.48/drivers/ch
extern int hvc_remove(struct hvc_struct *hp);
diff -urNp linux-2.6.32.48/drivers/char/hvc_iseries.c linux-2.6.32.48/drivers/char/hvc_iseries.c
---- linux-2.6.32.48/drivers/char/hvc_iseries.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/hvc_iseries.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/hvc_iseries.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/hvc_iseries.c 2011-11-15 19:59:43.000000000 -0500
@@ -197,7 +197,7 @@ done:
return sent;
}
@@ -28650,8 +28650,8 @@ diff -urNp linux-2.6.32.48/drivers/char/hvc_iseries.c linux-2.6.32.48/drivers/ch
.put_chars = put_chars,
.notifier_add = notifier_add_irq,
diff -urNp linux-2.6.32.48/drivers/char/hvc_iucv.c linux-2.6.32.48/drivers/char/hvc_iucv.c
---- linux-2.6.32.48/drivers/char/hvc_iucv.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/hvc_iucv.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/hvc_iucv.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/hvc_iucv.c 2011-11-15 19:59:43.000000000 -0500
@@ -924,7 +924,7 @@ static int hvc_iucv_pm_restore_thaw(stru
@@ -28662,8 +28662,8 @@ diff -urNp linux-2.6.32.48/drivers/char/hvc_iucv.c linux-2.6.32.48/drivers/char/
.put_chars = hvc_iucv_put_chars,
.notifier_add = hvc_iucv_notifier_add,
diff -urNp linux-2.6.32.48/drivers/char/hvc_rtas.c linux-2.6.32.48/drivers/char/hvc_rtas.c
---- linux-2.6.32.48/drivers/char/hvc_rtas.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/hvc_rtas.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/hvc_rtas.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/hvc_rtas.c 2011-11-15 19:59:43.000000000 -0500
@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
return i;
}
@@ -28674,8 +28674,8 @@ diff -urNp linux-2.6.32.48/drivers/char/hvc_rtas.c linux-2.6.32.48/drivers/char/
.put_chars = hvc_rtas_write_console,
};
diff -urNp linux-2.6.32.48/drivers/char/hvcs.c linux-2.6.32.48/drivers/char/hvcs.c
---- linux-2.6.32.48/drivers/char/hvcs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/hvcs.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/hvcs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/hvcs.c 2011-11-15 19:59:43.000000000 -0500
@@ -82,6 +82,7 @@
#include <asm/hvcserver.h>
#include <asm/uaccess.h>
@@ -28779,8 +28779,8 @@ diff -urNp linux-2.6.32.48/drivers/char/hvcs.c linux-2.6.32.48/drivers/char/hvcs
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
diff -urNp linux-2.6.32.48/drivers/char/hvc_udbg.c linux-2.6.32.48/drivers/char/hvc_udbg.c
---- linux-2.6.32.48/drivers/char/hvc_udbg.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/hvc_udbg.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/hvc_udbg.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/hvc_udbg.c 2011-11-15 19:59:43.000000000 -0500
@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
return i;
}
@@ -28791,8 +28791,8 @@ diff -urNp linux-2.6.32.48/drivers/char/hvc_udbg.c linux-2.6.32.48/drivers/char/
.put_chars = hvc_udbg_put,
};
diff -urNp linux-2.6.32.48/drivers/char/hvc_vio.c linux-2.6.32.48/drivers/char/hvc_vio.c
---- linux-2.6.32.48/drivers/char/hvc_vio.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/hvc_vio.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/hvc_vio.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/hvc_vio.c 2011-11-15 19:59:43.000000000 -0500
@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
return got;
}
@@ -28803,8 +28803,8 @@ diff -urNp linux-2.6.32.48/drivers/char/hvc_vio.c linux-2.6.32.48/drivers/char/h
.put_chars = hvc_put_chars,
.notifier_add = notifier_add_irq,
diff -urNp linux-2.6.32.48/drivers/char/hvc_xen.c linux-2.6.32.48/drivers/char/hvc_xen.c
---- linux-2.6.32.48/drivers/char/hvc_xen.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/hvc_xen.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/hvc_xen.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/hvc_xen.c 2011-11-15 19:59:43.000000000 -0500
@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
return recv;
}
@@ -28815,8 +28815,8 @@ diff -urNp linux-2.6.32.48/drivers/char/hvc_xen.c linux-2.6.32.48/drivers/char/h
.put_chars = write_console,
.notifier_add = notifier_add_irq,
diff -urNp linux-2.6.32.48/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.48/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.32.48/drivers/char/ipmi/ipmi_msghandler.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/ipmi/ipmi_msghandler.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/ipmi/ipmi_msghandler.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/ipmi/ipmi_msghandler.c 2011-11-15 19:59:43.000000000 -0500
@@ -414,7 +414,7 @@ struct ipmi_smi {
struct proc_dir_entry *proc_dir;
char proc_dir_name[10];
@@ -28857,8 +28857,8 @@ diff -urNp linux-2.6.32.48/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.48/d
si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
si->channel = IPMI_BMC_CHANNEL;
diff -urNp linux-2.6.32.48/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.48/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.32.48/drivers/char/ipmi/ipmi_si_intf.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/ipmi/ipmi_si_intf.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/ipmi/ipmi_si_intf.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/ipmi/ipmi_si_intf.c 2011-11-15 19:59:43.000000000 -0500
@@ -277,7 +277,7 @@ struct smi_info {
unsigned char slave_addr;
@@ -28890,8 +28890,8 @@ diff -urNp linux-2.6.32.48/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.48/driv
new_smi->interrupt_disabled = 0;
atomic_set(&new_smi->stop_operation, 0);
diff -urNp linux-2.6.32.48/drivers/char/istallion.c linux-2.6.32.48/drivers/char/istallion.c
---- linux-2.6.32.48/drivers/char/istallion.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/istallion.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/istallion.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/istallion.c 2011-11-15 19:59:43.000000000 -0500
@@ -187,7 +187,6 @@ static struct ktermios stli_deftermios
* re-used for each stats call.
*/
@@ -28927,8 +28927,8 @@ diff -urNp linux-2.6.32.48/drivers/char/istallion.c linux-2.6.32.48/drivers/char
return -EFAULT;
if (stli_dummybrd.brdnr >= STL_MAXBRDS)
diff -urNp linux-2.6.32.48/drivers/char/Kconfig linux-2.6.32.48/drivers/char/Kconfig
---- linux-2.6.32.48/drivers/char/Kconfig 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/Kconfig 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/Kconfig 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/Kconfig 2011-11-15 19:59:43.000000000 -0500
@@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING
config DEVKMEM
@@ -28948,8 +28948,8 @@ diff -urNp linux-2.6.32.48/drivers/char/Kconfig linux-2.6.32.48/drivers/char/Kco
source "drivers/s390/char/Kconfig"
diff -urNp linux-2.6.32.48/drivers/char/keyboard.c linux-2.6.32.48/drivers/char/keyboard.c
---- linux-2.6.32.48/drivers/char/keyboard.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/keyboard.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/keyboard.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/keyboard.c 2011-11-15 19:59:43.000000000 -0500
@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
kbd->kbdmode == VC_MEDIUMRAW) &&
value != KVAL(K_SAK))
@@ -28977,8 +28977,8 @@ diff -urNp linux-2.6.32.48/drivers/char/keyboard.c linux-2.6.32.48/drivers/char/
MODULE_DEVICE_TABLE(input, kbd_ids);
diff -urNp linux-2.6.32.48/drivers/char/mem.c linux-2.6.32.48/drivers/char/mem.c
---- linux-2.6.32.48/drivers/char/mem.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/mem.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/mem.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/mem.c 2011-11-15 19:59:43.000000000 -0500
@@ -18,6 +18,7 @@
#include <linux/raw.h>
#include <linux/tty.h>
@@ -29121,8 +29121,8 @@ diff -urNp linux-2.6.32.48/drivers/char/mem.c linux-2.6.32.48/drivers/char/mem.c
static int memory_open(struct inode *inode, struct file *filp)
diff -urNp linux-2.6.32.48/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.48/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.32.48/drivers/char/pcmcia/ipwireless/tty.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/pcmcia/ipwireless/tty.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/pcmcia/ipwireless/tty.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/pcmcia/ipwireless/tty.c 2011-11-15 19:59:43.000000000 -0500
@@ -29,6 +29,7 @@
#include <linux/tty_driver.h>
#include <linux/tty_flip.h>
@@ -29246,8 +29246,8 @@ diff -urNp linux-2.6.32.48/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.48/
ipwireless_disassociate_network_ttys(network,
ttyj->channel_idx);
diff -urNp linux-2.6.32.48/drivers/char/pty.c linux-2.6.32.48/drivers/char/pty.c
---- linux-2.6.32.48/drivers/char/pty.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/pty.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/pty.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/pty.c 2011-11-15 19:59:43.000000000 -0500
@@ -736,8 +736,10 @@ static void __init unix98_pty_init(void)
register_sysctl_table(pty_root_table);
@@ -29261,8 +29261,8 @@ diff -urNp linux-2.6.32.48/drivers/char/pty.c linux-2.6.32.48/drivers/char/pty.c
cdev_init(&ptmx_cdev, &ptmx_fops);
if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
diff -urNp linux-2.6.32.48/drivers/char/random.c linux-2.6.32.48/drivers/char/random.c
---- linux-2.6.32.48/drivers/char/random.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/random.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/random.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/random.c 2011-11-15 19:59:43.000000000 -0500
@@ -254,8 +254,13 @@
/*
* Configuration information
@@ -29305,8 +29305,8 @@ diff -urNp linux-2.6.32.48/drivers/char/random.c linux-2.6.32.48/drivers/char/ra
static char sysctl_bootid[16];
diff -urNp linux-2.6.32.48/drivers/char/rocket.c linux-2.6.32.48/drivers/char/rocket.c
---- linux-2.6.32.48/drivers/char/rocket.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/rocket.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/rocket.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/rocket.c 2011-11-15 19:59:43.000000000 -0500
@@ -1266,6 +1266,8 @@ static int get_ports(struct r_port *info
struct rocket_ports tmp;
int board;
@@ -29317,8 +29317,8 @@ diff -urNp linux-2.6.32.48/drivers/char/rocket.c linux-2.6.32.48/drivers/char/ro
return -EFAULT;
memset(&tmp, 0, sizeof (tmp));
diff -urNp linux-2.6.32.48/drivers/char/sonypi.c linux-2.6.32.48/drivers/char/sonypi.c
---- linux-2.6.32.48/drivers/char/sonypi.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/sonypi.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/sonypi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/sonypi.c 2011-11-15 19:59:43.000000000 -0500
@@ -55,6 +55,7 @@
#include <asm/uaccess.h>
#include <asm/io.h>
@@ -29358,8 +29358,8 @@ diff -urNp linux-2.6.32.48/drivers/char/sonypi.c linux-2.6.32.48/drivers/char/so
unlock_kernel();
return 0;
diff -urNp linux-2.6.32.48/drivers/char/stallion.c linux-2.6.32.48/drivers/char/stallion.c
---- linux-2.6.32.48/drivers/char/stallion.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/stallion.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/stallion.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/stallion.c 2011-11-15 19:59:43.000000000 -0500
@@ -2448,6 +2448,8 @@ static int stl_getportstruct(struct stlp
struct stlport stl_dummyport;
struct stlport *portp;
@@ -29370,8 +29370,8 @@ diff -urNp linux-2.6.32.48/drivers/char/stallion.c linux-2.6.32.48/drivers/char/
return -EFAULT;
portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr,
diff -urNp linux-2.6.32.48/drivers/char/tpm/tpm_bios.c linux-2.6.32.48/drivers/char/tpm/tpm_bios.c
---- linux-2.6.32.48/drivers/char/tpm/tpm_bios.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/tpm/tpm_bios.c 2011-11-12 12:46:42.000000000 -0500
+--- linux-2.6.32.48/drivers/char/tpm/tpm_bios.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/tpm/tpm_bios.c 2011-11-15 19:59:43.000000000 -0500
@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
event = addr;
@@ -29416,8 +29416,8 @@ diff -urNp linux-2.6.32.48/drivers/char/tpm/tpm_bios.c linux-2.6.32.48/drivers/c
acpi_os_unmap_memory(virt, len);
return 0;
diff -urNp linux-2.6.32.48/drivers/char/tpm/tpm.c linux-2.6.32.48/drivers/char/tpm/tpm.c
---- linux-2.6.32.48/drivers/char/tpm/tpm.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/tpm/tpm.c 2011-11-12 12:51:33.000000000 -0500
+--- linux-2.6.32.48/drivers/char/tpm/tpm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/tpm/tpm.c 2011-11-15 19:59:43.000000000 -0500
@@ -405,7 +405,7 @@ static ssize_t tpm_transmit(struct tpm_c
chip->vendor.req_complete_val)
goto out_recv;
@@ -29437,8 +29437,8 @@ diff -urNp linux-2.6.32.48/drivers/char/tpm/tpm.c linux-2.6.32.48/drivers/char/t
err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE,
"attempting to read the PUBEK");
diff -urNp linux-2.6.32.48/drivers/char/tty_io.c linux-2.6.32.48/drivers/char/tty_io.c
---- linux-2.6.32.48/drivers/char/tty_io.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/tty_io.c 2011-11-12 12:50:08.000000000 -0500
+--- linux-2.6.32.48/drivers/char/tty_io.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/tty_io.c 2011-11-15 19:59:43.000000000 -0500
@@ -1773,6 +1773,7 @@ got_driver:
if (IS_ERR(tty)) {
@@ -29478,8 +29478,8 @@ diff -urNp linux-2.6.32.48/drivers/char/tty_io.c linux-2.6.32.48/drivers/char/tt
/*
diff -urNp linux-2.6.32.48/drivers/char/tty_ldisc.c linux-2.6.32.48/drivers/char/tty_ldisc.c
---- linux-2.6.32.48/drivers/char/tty_ldisc.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/tty_ldisc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/char/tty_ldisc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/tty_ldisc.c 2011-11-15 19:59:43.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;
@@ -29526,8 +29526,8 @@ diff -urNp linux-2.6.32.48/drivers/char/tty_ldisc.c linux-2.6.32.48/drivers/char
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
}
diff -urNp linux-2.6.32.48/drivers/char/virtio_console.c linux-2.6.32.48/drivers/char/virtio_console.c
---- linux-2.6.32.48/drivers/char/virtio_console.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/virtio_console.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/char/virtio_console.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/virtio_console.c 2011-11-15 19:59:43.000000000 -0500
@@ -133,7 +133,9 @@ static int get_chars(u32 vtermno, char *
* virtqueue, so we let the drivers do some boutique early-output thing. */
int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int))
@@ -29559,8 +29559,8 @@ diff -urNp linux-2.6.32.48/drivers/char/virtio_console.c linux-2.6.32.48/drivers
/* The first argument of hvc_alloc() is the virtual console number, so
* we use zero. The second argument is the parameter for the
diff -urNp linux-2.6.32.48/drivers/char/vt.c linux-2.6.32.48/drivers/char/vt.c
---- linux-2.6.32.48/drivers/char/vt.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/vt.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/char/vt.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/vt.c 2011-11-15 19:59:43.000000000 -0500
@@ -243,7 +243,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
static void notify_write(struct vc_data *vc, unsigned int unicode)
@@ -29571,8 +29571,8 @@ diff -urNp linux-2.6.32.48/drivers/char/vt.c linux-2.6.32.48/drivers/char/vt.c
}
diff -urNp linux-2.6.32.48/drivers/char/vt_ioctl.c linux-2.6.32.48/drivers/char/vt_ioctl.c
---- linux-2.6.32.48/drivers/char/vt_ioctl.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/char/vt_ioctl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/char/vt_ioctl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/char/vt_ioctl.c 2011-11-15 19:59:43.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;
@@ -29617,8 +29617,8 @@ diff -urNp linux-2.6.32.48/drivers/char/vt_ioctl.c linux-2.6.32.48/drivers/char/
ret = -EPERM;
goto reterr;
diff -urNp linux-2.6.32.48/drivers/cpufreq/cpufreq.c linux-2.6.32.48/drivers/cpufreq/cpufreq.c
---- linux-2.6.32.48/drivers/cpufreq/cpufreq.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/cpufreq/cpufreq.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/cpufreq/cpufreq.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/cpufreq/cpufreq.c 2011-11-15 19:59:43.000000000 -0500
@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
complete(&policy->kobj_unregister);
}
@@ -29629,8 +29629,8 @@ diff -urNp linux-2.6.32.48/drivers/cpufreq/cpufreq.c linux-2.6.32.48/drivers/cpu
.store = store,
};
diff -urNp linux-2.6.32.48/drivers/cpuidle/sysfs.c linux-2.6.32.48/drivers/cpuidle/sysfs.c
---- linux-2.6.32.48/drivers/cpuidle/sysfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/cpuidle/sysfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/cpuidle/sysfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/cpuidle/sysfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
return ret;
}
@@ -29659,8 +29659,8 @@ diff -urNp linux-2.6.32.48/drivers/cpuidle/sysfs.c linux-2.6.32.48/drivers/cpuid
kobject_put(&device->kobjs[i]->kobj);
wait_for_completion(&device->kobjs[i]->kobj_unregister);
diff -urNp linux-2.6.32.48/drivers/crypto/hifn_795x.c linux-2.6.32.48/drivers/crypto/hifn_795x.c
---- linux-2.6.32.48/drivers/crypto/hifn_795x.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/crypto/hifn_795x.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/crypto/hifn_795x.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/crypto/hifn_795x.c 2011-11-15 19:59:43.000000000 -0500
@@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device
0xCA, 0x34, 0x2B, 0x2E};
struct scatterlist sg;
@@ -29671,8 +29671,8 @@ diff -urNp linux-2.6.32.48/drivers/crypto/hifn_795x.c linux-2.6.32.48/drivers/cr
memset(ctx.key, 0, sizeof(ctx.key));
diff -urNp linux-2.6.32.48/drivers/crypto/padlock-aes.c linux-2.6.32.48/drivers/crypto/padlock-aes.c
---- linux-2.6.32.48/drivers/crypto/padlock-aes.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/crypto/padlock-aes.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/crypto/padlock-aes.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/crypto/padlock-aes.c 2011-11-15 19:59:43.000000000 -0500
@@ -108,6 +108,8 @@ static int aes_set_key(struct crypto_tfm
struct crypto_aes_ctx gen_aes;
int cpu;
@@ -29683,8 +29683,8 @@ diff -urNp linux-2.6.32.48/drivers/crypto/padlock-aes.c linux-2.6.32.48/drivers/
*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
return -EINVAL;
diff -urNp linux-2.6.32.48/drivers/dma/ioat/dma.c linux-2.6.32.48/drivers/dma/ioat/dma.c
---- linux-2.6.32.48/drivers/dma/ioat/dma.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/dma/ioat/dma.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/dma/ioat/dma.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/dma/ioat/dma.c 2011-11-15 19:59:43.000000000 -0500
@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
return entry->show(&chan->common, page);
}
@@ -29695,8 +29695,8 @@ diff -urNp linux-2.6.32.48/drivers/dma/ioat/dma.c linux-2.6.32.48/drivers/dma/io
};
diff -urNp linux-2.6.32.48/drivers/dma/ioat/dma.h linux-2.6.32.48/drivers/dma/ioat/dma.h
---- linux-2.6.32.48/drivers/dma/ioat/dma.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/dma/ioat/dma.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/dma/ioat/dma.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/dma/ioat/dma.h 2011-11-15 19:59:43.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);
@@ -29707,8 +29707,8 @@ diff -urNp linux-2.6.32.48/drivers/dma/ioat/dma.h linux-2.6.32.48/drivers/dma/io
extern struct ioat_sysfs_entry ioat_cap_attr;
#endif /* IOATDMA_H */
diff -urNp linux-2.6.32.48/drivers/edac/edac_device_sysfs.c linux-2.6.32.48/drivers/edac/edac_device_sysfs.c
---- linux-2.6.32.48/drivers/edac/edac_device_sysfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/edac/edac_device_sysfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/edac/edac_device_sysfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/edac/edac_device_sysfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
}
@@ -29737,8 +29737,8 @@ diff -urNp linux-2.6.32.48/drivers/edac/edac_device_sysfs.c linux-2.6.32.48/driv
.store = edac_dev_block_store
};
diff -urNp linux-2.6.32.48/drivers/edac/edac_mc_sysfs.c linux-2.6.32.48/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.32.48/drivers/edac/edac_mc_sysfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/edac/edac_mc_sysfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/edac/edac_mc_sysfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/edac/edac_mc_sysfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
return -EIO;
}
@@ -29758,8 +29758,8 @@ diff -urNp linux-2.6.32.48/drivers/edac/edac_mc_sysfs.c linux-2.6.32.48/drivers/
.store = mcidev_store
};
diff -urNp linux-2.6.32.48/drivers/edac/edac_pci_sysfs.c linux-2.6.32.48/drivers/edac/edac_pci_sysfs.c
---- linux-2.6.32.48/drivers/edac/edac_pci_sysfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/edac/edac_pci_sysfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/edac/edac_pci_sysfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/edac/edac_pci_sysfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -25,8 +25,8 @@ static int edac_pci_log_pe = 1; /* log
static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
static int edac_pci_poll_msec = 1000; /* one second workq period */
@@ -29862,8 +29862,8 @@ diff -urNp linux-2.6.32.48/drivers/edac/edac_pci_sysfs.c linux-2.6.32.48/drivers
}
}
diff -urNp linux-2.6.32.48/drivers/firewire/core-card.c linux-2.6.32.48/drivers/firewire/core-card.c
---- linux-2.6.32.48/drivers/firewire/core-card.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/firewire/core-card.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/firewire/core-card.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/firewire/core-card.c 2011-11-15 19:59:43.000000000 -0500
@@ -558,7 +558,7 @@ void fw_card_release(struct kref *kref)
void fw_core_remove_card(struct fw_card *card)
@@ -29874,8 +29874,8 @@ diff -urNp linux-2.6.32.48/drivers/firewire/core-card.c linux-2.6.32.48/drivers/
card->driver->update_phy_reg(card, 4,
PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
diff -urNp linux-2.6.32.48/drivers/firewire/core-cdev.c linux-2.6.32.48/drivers/firewire/core-cdev.c
---- linux-2.6.32.48/drivers/firewire/core-cdev.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/firewire/core-cdev.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/firewire/core-cdev.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/firewire/core-cdev.c 2011-11-15 19:59:43.000000000 -0500
@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
int ret;
@@ -29887,8 +29887,8 @@ diff -urNp linux-2.6.32.48/drivers/firewire/core-cdev.c linux-2.6.32.48/drivers/
r = kmalloc(sizeof(*r), GFP_KERNEL);
diff -urNp linux-2.6.32.48/drivers/firewire/core.h linux-2.6.32.48/drivers/firewire/core.h
---- linux-2.6.32.48/drivers/firewire/core.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/firewire/core.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/firewire/core.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/firewire/core.h 2011-11-15 19:59:43.000000000 -0500
@@ -86,6 +86,7 @@ struct fw_card_driver {
int (*stop_iso)(struct fw_iso_context *ctx);
@@ -29898,8 +29898,8 @@ diff -urNp linux-2.6.32.48/drivers/firewire/core.h linux-2.6.32.48/drivers/firew
void fw_card_initialize(struct fw_card *card,
const struct fw_card_driver *driver, struct device *device);
diff -urNp linux-2.6.32.48/drivers/firewire/core-transaction.c linux-2.6.32.48/drivers/firewire/core-transaction.c
---- linux-2.6.32.48/drivers/firewire/core-transaction.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/firewire/core-transaction.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/firewire/core-transaction.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/firewire/core-transaction.c 2011-11-15 19:59:43.000000000 -0500
@@ -36,6 +36,7 @@
#include <linux/string.h>
#include <linux/timer.h>
@@ -29918,8 +29918,8 @@ diff -urNp linux-2.6.32.48/drivers/firewire/core-transaction.c linux-2.6.32.48/d
d.payload = payload;
fw_send_request(card, &t, tcode, destination_id, generation, speed,
diff -urNp linux-2.6.32.48/drivers/firmware/dmi_scan.c linux-2.6.32.48/drivers/firmware/dmi_scan.c
---- linux-2.6.32.48/drivers/firmware/dmi_scan.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/firmware/dmi_scan.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/firmware/dmi_scan.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/firmware/dmi_scan.c 2011-11-15 19:59:43.000000000 -0500
@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
}
}
@@ -29942,8 +29942,8 @@ diff -urNp linux-2.6.32.48/drivers/firmware/dmi_scan.c linux-2.6.32.48/drivers/f
iounmap(buf);
return 0;
diff -urNp linux-2.6.32.48/drivers/firmware/edd.c linux-2.6.32.48/drivers/firmware/edd.c
---- linux-2.6.32.48/drivers/firmware/edd.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/firmware/edd.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/firmware/edd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/firmware/edd.c 2011-11-15 19:59:43.000000000 -0500
@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
return ret;
}
@@ -29954,8 +29954,8 @@ diff -urNp linux-2.6.32.48/drivers/firmware/edd.c linux-2.6.32.48/drivers/firmwa
};
diff -urNp linux-2.6.32.48/drivers/firmware/efivars.c linux-2.6.32.48/drivers/firmware/efivars.c
---- linux-2.6.32.48/drivers/firmware/efivars.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/firmware/efivars.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/firmware/efivars.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/firmware/efivars.c 2011-11-15 19:59:43.000000000 -0500
@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
return ret;
}
@@ -29966,8 +29966,8 @@ diff -urNp linux-2.6.32.48/drivers/firmware/efivars.c linux-2.6.32.48/drivers/fi
.store = efivar_attr_store,
};
diff -urNp linux-2.6.32.48/drivers/firmware/iscsi_ibft.c linux-2.6.32.48/drivers/firmware/iscsi_ibft.c
---- linux-2.6.32.48/drivers/firmware/iscsi_ibft.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/firmware/iscsi_ibft.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/firmware/iscsi_ibft.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/firmware/iscsi_ibft.c 2011-11-15 19:59:43.000000000 -0500
@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
return ret;
}
@@ -29978,8 +29978,8 @@ diff -urNp linux-2.6.32.48/drivers/firmware/iscsi_ibft.c linux-2.6.32.48/drivers
};
diff -urNp linux-2.6.32.48/drivers/firmware/memmap.c linux-2.6.32.48/drivers/firmware/memmap.c
---- linux-2.6.32.48/drivers/firmware/memmap.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/firmware/memmap.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/firmware/memmap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/firmware/memmap.c 2011-11-15 19:59:43.000000000 -0500
@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
NULL
};
@@ -29990,8 +29990,8 @@ diff -urNp linux-2.6.32.48/drivers/firmware/memmap.c linux-2.6.32.48/drivers/fir
};
diff -urNp linux-2.6.32.48/drivers/gpio/vr41xx_giu.c linux-2.6.32.48/drivers/gpio/vr41xx_giu.c
---- linux-2.6.32.48/drivers/gpio/vr41xx_giu.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpio/vr41xx_giu.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpio/vr41xx_giu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpio/vr41xx_giu.c 2011-11-15 19:59:43.000000000 -0500
@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
maskl, pendl, maskh, pendh);
@@ -30002,8 +30002,8 @@ diff -urNp linux-2.6.32.48/drivers/gpio/vr41xx_giu.c linux-2.6.32.48/drivers/gpi
return -EINVAL;
}
diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_crtc.c linux-2.6.32.48/drivers/gpu/drm/drm_crtc.c
---- linux-2.6.32.48/drivers/gpu/drm/drm_crtc.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/drm_crtc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/drm_crtc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/drm_crtc.c 2011-11-15 19:59:43.000000000 -0500
@@ -1323,7 +1323,7 @@ int drm_mode_getconnector(struct drm_dev
*/
if ((out_resp->count_modes >= mode_count) && mode_count) {
@@ -30079,8 +30079,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_crtc.c linux-2.6.32.48/drivers/gp
ret = -EFAULT;
goto done;
diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.48/drivers/gpu/drm/drm_crtc_helper.c
---- linux-2.6.32.48/drivers/gpu/drm/drm_crtc_helper.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/drm_crtc_helper.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/drm_crtc_helper.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/drm_crtc_helper.c 2011-11-15 19:59:43.000000000 -0500
@@ -573,7 +573,7 @@ static bool drm_encoder_crtc_ok(struct d
struct drm_crtc *tmp;
int crtc_mask = 1;
@@ -30100,8 +30100,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.48/dri
if (!crtc->enabled)
diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_drv.c linux-2.6.32.48/drivers/gpu/drm/drm_drv.c
---- linux-2.6.32.48/drivers/gpu/drm/drm_drv.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/drm_drv.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/drm_drv.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/drm_drv.c 2011-11-15 19:59:43.000000000 -0500
@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
char *kdata = NULL;
@@ -30112,8 +30112,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_drv.c linux-2.6.32.48/drivers/gpu
DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_fops.c linux-2.6.32.48/drivers/gpu/drm/drm_fops.c
---- linux-2.6.32.48/drivers/gpu/drm/drm_fops.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/drm_fops.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/drm_fops.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/drm_fops.c 2011-11-15 19:59:43.000000000 -0500
@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
}
@@ -30166,8 +30166,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_fops.c linux-2.6.32.48/drivers/gp
DRM_ERROR("Device busy: %d\n",
atomic_read(&dev->ioctl_count));
diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_gem.c linux-2.6.32.48/drivers/gpu/drm/drm_gem.c
---- linux-2.6.32.48/drivers/gpu/drm/drm_gem.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/drm_gem.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/drm_gem.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/drm_gem.c 2011-11-15 19:59:43.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);
@@ -30202,8 +30202,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_gem.c linux-2.6.32.48/drivers/gpu
}
EXPORT_SYMBOL(drm_gem_object_free);
diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_info.c linux-2.6.32.48/drivers/gpu/drm/drm_info.c
---- linux-2.6.32.48/drivers/gpu/drm/drm_info.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/drm_info.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/drm_info.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/drm_info.c 2011-11-15 19:59:43.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;
@@ -30284,8 +30284,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_info.c linux-2.6.32.48/drivers/gp
#if defined(__i386__)
pgprot = pgprot_val(vma->vm_page_prot);
diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_ioc32.c linux-2.6.32.48/drivers/gpu/drm/drm_ioc32.c
---- linux-2.6.32.48/drivers/gpu/drm/drm_ioc32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/drm_ioc32.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/drm_ioc32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/drm_ioc32.c 2011-11-15 19:59:43.000000000 -0500
@@ -463,7 +463,7 @@ static int compat_drm_infobufs(struct fi
request = compat_alloc_user_space(nbytes);
if (!access_ok(VERIFY_WRITE, request, nbytes))
@@ -30305,8 +30305,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_ioc32.c linux-2.6.32.48/drivers/g
if (__put_user(count, &request->count)
|| __put_user(list, &request->list))
diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.48/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.32.48/drivers/gpu/drm/drm_ioctl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/drm_ioctl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/drm_ioctl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/drm_ioctl.c 2011-11-15 19:59:43.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);
@@ -30317,8 +30317,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.48/drivers/g
}
diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_lock.c linux-2.6.32.48/drivers/gpu/drm/drm_lock.c
---- linux-2.6.32.48/drivers/gpu/drm/drm_lock.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/drm_lock.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/drm_lock.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/drm_lock.c 2011-11-15 19:59:43.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;
@@ -30338,8 +30338,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_lock.c linux-2.6.32.48/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.48/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.48/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.32.48/drivers/gpu/drm/i810/i810_dma.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i810/i810_dma.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i810/i810_dma.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i810/i810_dma.c 2011-11-15 19:59:43.000000000 -0500
@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
dma->buflist[vertex->idx],
vertex->discard, vertex->used);
@@ -30363,8 +30363,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.48/drive
sarea_priv->last_dispatch = (int)hw_status[5];
diff -urNp linux-2.6.32.48/drivers/gpu/drm/i810/i810_drv.h linux-2.6.32.48/drivers/gpu/drm/i810/i810_drv.h
---- linux-2.6.32.48/drivers/gpu/drm/i810/i810_drv.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i810/i810_drv.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i810/i810_drv.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i810/i810_drv.h 2011-11-15 19:59:43.000000000 -0500
@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
int page_flipping;
@@ -30377,8 +30377,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i810/i810_drv.h linux-2.6.32.48/drive
int front_offset;
} drm_i810_private_t;
diff -urNp linux-2.6.32.48/drivers/gpu/drm/i830/i830_drv.h linux-2.6.32.48/drivers/gpu/drm/i830/i830_drv.h
---- linux-2.6.32.48/drivers/gpu/drm/i830/i830_drv.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i830/i830_drv.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i830/i830_drv.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i830/i830_drv.h 2011-11-15 19:59:43.000000000 -0500
@@ -115,8 +115,8 @@ typedef struct drm_i830_private {
int page_flipping;
@@ -30391,8 +30391,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i830/i830_drv.h linux-2.6.32.48/drive
int use_mi_batchbuffer_start;
diff -urNp linux-2.6.32.48/drivers/gpu/drm/i830/i830_irq.c linux-2.6.32.48/drivers/gpu/drm/i830/i830_irq.c
---- linux-2.6.32.48/drivers/gpu/drm/i830/i830_irq.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i830/i830_irq.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i830/i830_irq.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i830/i830_irq.c 2011-11-15 19:59:43.000000000 -0500
@@ -47,7 +47,7 @@ irqreturn_t i830_driver_irq_handler(DRM_
I830_WRITE16(I830REG_INT_IDENTITY_R, temp);
@@ -30449,8 +30449,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i830/i830_irq.c linux-2.6.32.48/drive
}
diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7017.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7017.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7017.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7017.c 2011-11-15 19:59:43.000000000 -0500
@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
}
}
@@ -30461,8 +30461,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.48/dri
.detect = ch7017_detect,
.mode_valid = ch7017_mode_valid,
diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7xxx.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-11-15 19:59:43.000000000 -0500
@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
}
}
@@ -30473,8 +30473,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.48/dri
.detect = ch7xxx_detect,
.mode_valid = ch7xxx_mode_valid,
diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo.h linux-2.6.32.48/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.32.48/drivers/gpu/drm/i915/dvo.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i915/dvo.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo.h 2011-11-15 19:59:43.000000000 -0500
@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
*
* \return singly-linked list of modes or NULL if no modes found.
@@ -30508,8 +30508,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo.h linux-2.6.32.48/drivers/gp
#endif /* _INTEL_DVO_H */
diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ivch.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ivch.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ivch.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ivch.c 2011-11-15 19:59:43.000000000 -0500
@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
}
}
@@ -30520,8 +30520,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.48/drive
.dpms = ivch_dpms,
.save = ivch_save,
diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.48/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.32.48/drivers/gpu/drm/i915/dvo_sil164.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo_sil164.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i915/dvo_sil164.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo_sil164.c 2011-11-15 19:59:43.000000000 -0500
@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
}
}
@@ -30532,8 +30532,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.48/dri
.detect = sil164_detect,
.mode_valid = sil164_mode_valid,
diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.48/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.32.48/drivers/gpu/drm/i915/dvo_tfp410.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo_tfp410.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i915/dvo_tfp410.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo_tfp410.c 2011-11-15 19:59:43.000000000 -0500
@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
}
}
@@ -30544,8 +30544,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.48/dri
.detect = tfp410_detect,
.mode_valid = tfp410_mode_valid,
diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.32.48/drivers/gpu/drm/i915/i915_debugfs.c
---- linux-2.6.32.48/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -192,7 +192,7 @@ static int i915_interrupt_info(struct se
I915_READ(GTIMR));
}
@@ -30556,8 +30556,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.32.48/d
seq_printf(m, "Current sequence: %d\n",
i915_get_gem_seqno(dev));
diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.c 2011-11-15 19:59:43.000000000 -0500
@@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev)
return i915_resume(dev);
}
@@ -30568,8 +30568,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.48/drive
.open = drm_gem_vm_open,
.close = drm_gem_vm_close,
diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.h linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.h
---- linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.h 2011-11-15 19:59:43.000000000 -0500
@@ -168,7 +168,7 @@ struct drm_i915_display_funcs {
/* display clock increase/decrease */
/* pll clock increase/decrease */
@@ -30589,8 +30589,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.h linux-2.6.32.48/drive
spinlock_t user_irq_lock;
/** Refcount for i915_user_irq_get() versus i915_user_irq_put(). */
diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.48/drivers/gpu/drm/i915/i915_gem.c
---- linux-2.6.32.48/drivers/gpu/drm/i915/i915_gem.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i915/i915_gem.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i915/i915_gem.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i915/i915_gem.c 2011-11-15 19:59:43.000000000 -0500
@@ -102,7 +102,7 @@ i915_gem_get_aperture_ioctl(struct drm_d
args->aper_size = dev->gtt_total;
@@ -30674,8 +30674,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.48/drive
i915_verify_inactive(dev, __FILE__, __LINE__);
}
diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/i915_irq.c linux-2.6.32.48/drivers/gpu/drm/i915/i915_irq.c
---- linux-2.6.32.48/drivers/gpu/drm/i915/i915_irq.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i915/i915_irq.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i915/i915_irq.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i915/i915_irq.c 2011-11-15 19:59:43.000000000 -0500
@@ -528,7 +528,7 @@ irqreturn_t i915_driver_irq_handler(DRM_
int irq_received;
int ret = IRQ_NONE;
@@ -30695,8 +30695,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/i915_irq.c linux-2.6.32.48/drive
INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
INIT_WORK(&dev_priv->error_work, i915_error_work_func);
diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/intel_sdvo.c linux-2.6.32.48/drivers/gpu/drm/i915/intel_sdvo.c
---- linux-2.6.32.48/drivers/gpu/drm/i915/intel_sdvo.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/i915/intel_sdvo.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/i915/intel_sdvo.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/i915/intel_sdvo.c 2011-11-15 19:59:43.000000000 -0500
@@ -2795,7 +2795,9 @@ bool intel_sdvo_init(struct drm_device *
sdvo_priv->slave_addr = intel_sdvo_get_slave_addr(dev, output_device);
@@ -30709,8 +30709,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/intel_sdvo.c linux-2.6.32.48/dri
/* Read the regs to test if we can talk to the device */
for (i = 0; i < 0x40; i++) {
diff -urNp linux-2.6.32.48/drivers/gpu/drm/mga/mga_drv.h linux-2.6.32.48/drivers/gpu/drm/mga/mga_drv.h
---- linux-2.6.32.48/drivers/gpu/drm/mga/mga_drv.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/mga/mga_drv.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/mga/mga_drv.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/mga/mga_drv.h 2011-11-15 19:59:43.000000000 -0500
@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
u32 clear_cmd;
u32 maccess;
@@ -30724,8 +30724,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/mga/mga_drv.h linux-2.6.32.48/drivers
unsigned int fb_cpp;
diff -urNp linux-2.6.32.48/drivers/gpu/drm/mga/mga_irq.c linux-2.6.32.48/drivers/gpu/drm/mga/mga_irq.c
---- linux-2.6.32.48/drivers/gpu/drm/mga/mga_irq.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/mga/mga_irq.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/mga/mga_irq.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/mga/mga_irq.c 2011-11-15 19:59:43.000000000 -0500
@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de
if (crtc != 0)
return 0;
@@ -30763,8 +30763,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/mga/mga_irq.c linux-2.6.32.48/drivers
*sequence = cur_fence;
diff -urNp linux-2.6.32.48/drivers/gpu/drm/r128/r128_cce.c linux-2.6.32.48/drivers/gpu/drm/r128/r128_cce.c
---- linux-2.6.32.48/drivers/gpu/drm/r128/r128_cce.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/r128/r128_cce.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/r128/r128_cce.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/r128/r128_cce.c 2011-11-15 19:59:43.000000000 -0500
@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d
/* GH: Simple idle check.
@@ -30775,8 +30775,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/r128/r128_cce.c linux-2.6.32.48/drive
/* We don't support anything other than bus-mastering ring mode,
* but the ring can be in either AGP or PCI space for the ring
diff -urNp linux-2.6.32.48/drivers/gpu/drm/r128/r128_drv.h linux-2.6.32.48/drivers/gpu/drm/r128/r128_drv.h
---- linux-2.6.32.48/drivers/gpu/drm/r128/r128_drv.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/r128/r128_drv.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/r128/r128_drv.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/r128/r128_drv.h 2011-11-15 19:59:43.000000000 -0500
@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
int is_pci;
unsigned long cce_buffers_offset;
@@ -30795,8 +30795,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/r128/r128_drv.h linux-2.6.32.48/drive
u32 color_fmt;
unsigned int front_offset;
diff -urNp linux-2.6.32.48/drivers/gpu/drm/r128/r128_irq.c linux-2.6.32.48/drivers/gpu/drm/r128/r128_irq.c
---- linux-2.6.32.48/drivers/gpu/drm/r128/r128_irq.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/r128/r128_irq.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/r128/r128_irq.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/r128/r128_irq.c 2011-11-15 19:59:43.000000000 -0500
@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d
if (crtc != 0)
return 0;
@@ -30816,8 +30816,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/r128/r128_irq.c linux-2.6.32.48/drive
return IRQ_HANDLED;
}
diff -urNp linux-2.6.32.48/drivers/gpu/drm/r128/r128_state.c linux-2.6.32.48/drivers/gpu/drm/r128/r128_state.c
---- linux-2.6.32.48/drivers/gpu/drm/r128/r128_state.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/r128/r128_state.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/r128/r128_state.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/r128/r128_state.c 2011-11-15 19:59:43.000000000 -0500
@@ -323,10 +323,10 @@ static void r128_clear_box(drm_r128_priv
static void r128_cce_performance_boxes(drm_r128_private_t * dev_priv)
@@ -30832,8 +30832,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/r128/r128_state.c linux-2.6.32.48/dri
}
diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/atom.c linux-2.6.32.48/drivers/gpu/drm/radeon/atom.c
---- linux-2.6.32.48/drivers/gpu/drm/radeon/atom.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/radeon/atom.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/radeon/atom.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/radeon/atom.c 2011-11-15 19:59:43.000000000 -0500
@@ -1115,6 +1115,8 @@ struct atom_context *atom_parse(struct c
char name[512];
int i;
@@ -30844,8 +30844,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/atom.c linux-2.6.32.48/drivers
ctx->bios = bios;
diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.48/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.32.48/drivers/gpu/drm/radeon/mkregtable.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/radeon/mkregtable.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/radeon/mkregtable.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/radeon/mkregtable.c 2011-11-15 19:59:43.000000000 -0500
@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
regex_t mask_rex;
regmatch_t match[4];
@@ -30864,8 +30864,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.48/d
if (regcomp
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-15 19:59:43.000000000 -0500
@@ -275,6 +275,8 @@ bool radeon_get_atom_connector_info_from
bool linkb;
struct radeon_i2c_bus_rec ddc_bus;
@@ -30900,8 +30900,8 @@ diff -urNp linux-2.6.32.48/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.48/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_display.c
---- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_display.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_display.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_display.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_display.c 2011-11-15 19:59:43.000000000 -0500
@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
@@ -30912,8 +30912,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.
error = abs(current_freq - freq);
vco_diff = abs(vco - best_vco);
diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_drv.h
---- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-15 19:59:43.000000000 -0500
@@ -253,7 +253,7 @@ typedef struct drm_radeon_private {
/* SW interrupt */
@@ -30924,8 +30924,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.32.48/d
uint32_t irq_enable_reg;
uint32_t r500_disp_irq_reg;
diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_fence.c
---- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_fence.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-15 19:59:43.000000000 -0500
@@ -47,7 +47,7 @@ int radeon_fence_emit(struct radeon_devi
write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
return 0;
@@ -30945,8 +30945,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.32.48
INIT_LIST_HEAD(&rdev->fence_drv.emited);
INIT_LIST_HEAD(&rdev->fence_drv.signaled);
diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon.h linux-2.6.32.48/drivers/gpu/drm/radeon/radeon.h
---- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon.h 2011-11-15 19:59:43.000000000 -0500
@@ -149,7 +149,7 @@ int radeon_pm_init(struct radeon_device
*/
struct radeon_fence_driver {
@@ -30966,8 +30966,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon.h linux-2.6.32.48/drive
/*
* Asic structures
diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ioc32.c
---- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ioc32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-15 19:59:43.000000000 -0500
@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(str
request = compat_alloc_user_space(sizeof(*request));
if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
@@ -30978,8 +30978,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.48
return -EFAULT;
diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_irq.c
---- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_irq.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-15 19:59:43.000000000 -0500
@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de
unsigned int ret;
RING_LOCALS;
@@ -31001,8 +31001,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.32.48/d
dev->max_vblank_count = 0x001fffff;
diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_state.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_state.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_state.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_state.c 2011-11-15 19:59:43.000000000 -0500
@@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm
{
drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -31013,8 +31013,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.48
DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ttm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-15 19:59:43.000000000 -0500
@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
DRM_INFO("radeon: ttm finalized\n");
}
@@ -31067,8 +31067,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.48/d
diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.48/drivers/gpu/drm/radeon/rs690.c
---- linux-2.6.32.48/drivers/gpu/drm/radeon/rs690.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/radeon/rs690.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/radeon/rs690.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/radeon/rs690.c 2011-11-15 19:59:43.000000000 -0500
@@ -302,9 +302,11 @@ void rs690_crtc_bandwidth_compute(struct
if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
rdev->pm.sideport_bandwidth.full)
@@ -31083,8 +31083,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.48/driver
if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
rdev->pm.k8_bandwidth.full)
diff -urNp linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo.c
---- linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo.c 2011-11-15 19:59:43.000000000 -0500
@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a
NULL
};
@@ -31095,8 +31095,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.48/drivers/
};
diff -urNp linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo_vm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-11-15 19:59:43.000000000 -0500
@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
{
struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -31118,8 +31118,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.48/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.48/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_global.c
---- linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_global.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_global.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_global.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_global.c 2011-11-15 19:59:43.000000000 -0500
@@ -36,7 +36,7 @@
struct ttm_global_item {
struct mutex mutex;
@@ -31178,8 +31178,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.48/driv
item->object = NULL;
}
diff -urNp linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_memory.c
---- linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_memory.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_memory.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_memory.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_memory.c 2011-11-15 19:59:43.000000000 -0500
@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
NULL
};
@@ -31190,8 +31190,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.48/driv
.store = &ttm_mem_zone_store
};
diff -urNp linux-2.6.32.48/drivers/gpu/drm/via/via_drv.h linux-2.6.32.48/drivers/gpu/drm/via/via_drv.h
---- linux-2.6.32.48/drivers/gpu/drm/via/via_drv.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/via/via_drv.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/via/via_drv.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/via/via_drv.h 2011-11-15 19:59:43.000000000 -0500
@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
typedef uint32_t maskarray_t[5];
@@ -31211,8 +31211,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/via/via_drv.h linux-2.6.32.48/drivers
char pci_buf[VIA_PCI_BUF_SIZE];
const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
diff -urNp linux-2.6.32.48/drivers/gpu/drm/via/via_irq.c linux-2.6.32.48/drivers/gpu/drm/via/via_irq.c
---- linux-2.6.32.48/drivers/gpu/drm/via/via_irq.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/gpu/drm/via/via_irq.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/gpu/drm/via/via_irq.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/gpu/drm/via/via_irq.c 2011-11-15 19:59:43.000000000 -0500
@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de
if (crtc != 0)
return 0;
@@ -31284,8 +31284,8 @@ diff -urNp linux-2.6.32.48/drivers/gpu/drm/via/via_irq.c linux-2.6.32.48/drivers
case VIA_IRQ_ABSOLUTE:
break;
diff -urNp linux-2.6.32.48/drivers/hid/hid-core.c linux-2.6.32.48/drivers/hid/hid-core.c
---- linux-2.6.32.48/drivers/hid/hid-core.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/hid/hid-core.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/hid/hid-core.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/hid/hid-core.c 2011-11-15 19:59:43.000000000 -0500
@@ -1752,7 +1752,7 @@ static bool hid_ignore(struct hid_device
int hid_add_device(struct hid_device *hdev)
@@ -31305,8 +31305,8 @@ diff -urNp linux-2.6.32.48/drivers/hid/hid-core.c linux-2.6.32.48/drivers/hid/hi
ret = device_add(&hdev->dev);
if (!ret)
diff -urNp linux-2.6.32.48/drivers/hid/usbhid/hiddev.c linux-2.6.32.48/drivers/hid/usbhid/hiddev.c
---- linux-2.6.32.48/drivers/hid/usbhid/hiddev.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/hid/usbhid/hiddev.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/hid/usbhid/hiddev.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/hid/usbhid/hiddev.c 2011-11-15 19:59:43.000000000 -0500
@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
return put_user(HID_VERSION, (int __user *)arg);
@@ -31317,8 +31317,8 @@ diff -urNp linux-2.6.32.48/drivers/hid/usbhid/hiddev.c linux-2.6.32.48/drivers/h
for (i = 0; i < hid->maxcollection; i++)
diff -urNp linux-2.6.32.48/drivers/hwmon/lis3lv02d.c linux-2.6.32.48/drivers/hwmon/lis3lv02d.c
---- linux-2.6.32.48/drivers/hwmon/lis3lv02d.c 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/hwmon/lis3lv02d.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/hwmon/lis3lv02d.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/hwmon/lis3lv02d.c 2011-11-15 19:59:43.000000000 -0500
@@ -146,7 +146,7 @@ static irqreturn_t lis302dl_interrupt(in
* the lid is closed. This leads to interrupts as soon as a little move
* is done.
@@ -31356,8 +31356,8 @@ diff -urNp linux-2.6.32.48/drivers/hwmon/lis3lv02d.c linux-2.6.32.48/drivers/hwm
return 0;
}
diff -urNp linux-2.6.32.48/drivers/hwmon/lis3lv02d.h linux-2.6.32.48/drivers/hwmon/lis3lv02d.h
---- linux-2.6.32.48/drivers/hwmon/lis3lv02d.h 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/drivers/hwmon/lis3lv02d.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/hwmon/lis3lv02d.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/hwmon/lis3lv02d.h 2011-11-15 19:59:43.000000000 -0500
@@ -201,7 +201,7 @@ struct lis3lv02d {
struct input_polled_dev *idev; /* input device */
@@ -31368,8 +31368,8 @@ diff -urNp linux-2.6.32.48/drivers/hwmon/lis3lv02d.h linux-2.6.32.48/drivers/hwm
int ycalib; /* calibrated null value for y */
int zcalib; /* calibrated null value for z */
diff -urNp linux-2.6.32.48/drivers/hwmon/sht15.c linux-2.6.32.48/drivers/hwmon/sht15.c
---- linux-2.6.32.48/drivers/hwmon/sht15.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/hwmon/sht15.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/hwmon/sht15.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/hwmon/sht15.c 2011-11-15 19:59:43.000000000 -0500
@@ -112,7 +112,7 @@ struct sht15_data {
int supply_uV;
int supply_uV_valid;
@@ -31419,8 +31419,8 @@ diff -urNp linux-2.6.32.48/drivers/hwmon/sht15.c linux-2.6.32.48/drivers/hwmon/s
}
/* Read the data back from the device */
diff -urNp linux-2.6.32.48/drivers/hwmon/w83791d.c linux-2.6.32.48/drivers/hwmon/w83791d.c
---- linux-2.6.32.48/drivers/hwmon/w83791d.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/hwmon/w83791d.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/hwmon/w83791d.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/hwmon/w83791d.c 2011-11-15 19:59:43.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);
@@ -31433,8 +31433,8 @@ diff -urNp linux-2.6.32.48/drivers/hwmon/w83791d.c linux-2.6.32.48/drivers/hwmon
#ifdef DEBUG
diff -urNp linux-2.6.32.48/drivers/i2c/busses/i2c-amd756-s4882.c linux-2.6.32.48/drivers/i2c/busses/i2c-amd756-s4882.c
---- linux-2.6.32.48/drivers/i2c/busses/i2c-amd756-s4882.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-15 19:59:43.000000000 -0500
@@ -43,7 +43,7 @@
extern struct i2c_adapter amd756_smbus;
@@ -31445,8 +31445,8 @@ diff -urNp linux-2.6.32.48/drivers/i2c/busses/i2c-amd756-s4882.c linux-2.6.32.48
/* Wrapper access functions for multiplexed SMBus */
static DEFINE_MUTEX(amd756_lock);
diff -urNp linux-2.6.32.48/drivers/i2c/busses/i2c-nforce2-s4985.c linux-2.6.32.48/drivers/i2c/busses/i2c-nforce2-s4985.c
---- linux-2.6.32.48/drivers/i2c/busses/i2c-nforce2-s4985.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-15 19:59:43.000000000 -0500
@@ -41,7 +41,7 @@
extern struct i2c_adapter *nforce2_smbus;
@@ -31457,8 +31457,8 @@ diff -urNp linux-2.6.32.48/drivers/i2c/busses/i2c-nforce2-s4985.c linux-2.6.32.4
/* Wrapper access functions for multiplexed SMBus */
static DEFINE_MUTEX(nforce2_lock);
diff -urNp linux-2.6.32.48/drivers/ide/ide-cd.c linux-2.6.32.48/drivers/ide/ide-cd.c
---- linux-2.6.32.48/drivers/ide/ide-cd.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/ide/ide-cd.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/ide/ide-cd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ide/ide-cd.c 2011-11-15 19:59:43.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
@@ -31469,8 +31469,8 @@ diff -urNp linux-2.6.32.48/drivers/ide/ide-cd.c linux-2.6.32.48/drivers/ide/ide-
}
}
diff -urNp linux-2.6.32.48/drivers/ide/ide-floppy.c linux-2.6.32.48/drivers/ide/ide-floppy.c
---- linux-2.6.32.48/drivers/ide/ide-floppy.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ide/ide-floppy.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/ide/ide-floppy.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ide/ide-floppy.c 2011-11-15 19:59:43.000000000 -0500
@@ -373,6 +373,8 @@ static int ide_floppy_get_capacity(ide_d
u8 pc_buf[256], header_len, desc_cnt;
int i, rc = 1, blocks, length;
@@ -31481,8 +31481,8 @@ diff -urNp linux-2.6.32.48/drivers/ide/ide-floppy.c linux-2.6.32.48/drivers/ide/
drive->bios_cyl = 0;
diff -urNp linux-2.6.32.48/drivers/ide/setup-pci.c linux-2.6.32.48/drivers/ide/setup-pci.c
---- linux-2.6.32.48/drivers/ide/setup-pci.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ide/setup-pci.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/ide/setup-pci.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ide/setup-pci.c 2011-11-15 19:59:43.000000000 -0500
@@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev
int ret, i, n_ports = dev2 ? 4 : 2;
struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL };
@@ -31493,8 +31493,8 @@ diff -urNp linux-2.6.32.48/drivers/ide/setup-pci.c linux-2.6.32.48/drivers/ide/s
ret = ide_setup_pci_controller(pdev[i], d, !i);
if (ret < 0)
diff -urNp linux-2.6.32.48/drivers/ieee1394/dv1394.c linux-2.6.32.48/drivers/ieee1394/dv1394.c
---- linux-2.6.32.48/drivers/ieee1394/dv1394.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ieee1394/dv1394.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/ieee1394/dv1394.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ieee1394/dv1394.c 2011-11-15 19:59:43.000000000 -0500
@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
based upon DIF section and sequence
*/
@@ -31505,8 +31505,8 @@ diff -urNp linux-2.6.32.48/drivers/ieee1394/dv1394.c linux-2.6.32.48/drivers/iee
{
int section_type = p->data[0] >> 5; /* section type is in bits 5 - 7 */
diff -urNp linux-2.6.32.48/drivers/ieee1394/hosts.c linux-2.6.32.48/drivers/ieee1394/hosts.c
---- linux-2.6.32.48/drivers/ieee1394/hosts.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ieee1394/hosts.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/ieee1394/hosts.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ieee1394/hosts.c 2011-11-15 19:59:43.000000000 -0500
@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
}
@@ -31516,8 +31516,8 @@ diff -urNp linux-2.6.32.48/drivers/ieee1394/hosts.c linux-2.6.32.48/drivers/ieee
.devctl = dummy_devctl,
.isoctl = dummy_isoctl
diff -urNp linux-2.6.32.48/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.48/drivers/ieee1394/init_ohci1394_dma.c
---- linux-2.6.32.48/drivers/ieee1394/init_ohci1394_dma.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ieee1394/init_ohci1394_dma.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/ieee1394/init_ohci1394_dma.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ieee1394/init_ohci1394_dma.c 2011-11-15 19:59:43.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,
@@ -31528,8 +31528,8 @@ diff -urNp linux-2.6.32.48/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.48/
if (class>>8 != PCI_CLASS_SERIAL_FIREWIRE_OHCI)
diff -urNp linux-2.6.32.48/drivers/ieee1394/ohci1394.c linux-2.6.32.48/drivers/ieee1394/ohci1394.c
---- linux-2.6.32.48/drivers/ieee1394/ohci1394.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ieee1394/ohci1394.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/ieee1394/ohci1394.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ieee1394/ohci1394.c 2011-11-15 19:59:43.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)
@@ -31543,8 +31543,8 @@ diff -urNp linux-2.6.32.48/drivers/ieee1394/ohci1394.c linux-2.6.32.48/drivers/i
static void dma_trm_tasklet(unsigned long data);
static void dma_trm_reset(struct dma_trm_ctx *d);
diff -urNp linux-2.6.32.48/drivers/ieee1394/sbp2.c linux-2.6.32.48/drivers/ieee1394/sbp2.c
---- linux-2.6.32.48/drivers/ieee1394/sbp2.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/ieee1394/sbp2.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/ieee1394/sbp2.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/ieee1394/sbp2.c 2011-11-15 19:59:43.000000000 -0500
@@ -2111,7 +2111,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot
MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME);
MODULE_LICENSE("GPL");
@@ -31555,8 +31555,8 @@ diff -urNp linux-2.6.32.48/drivers/ieee1394/sbp2.c linux-2.6.32.48/drivers/ieee1
int ret;
diff -urNp linux-2.6.32.48/drivers/infiniband/core/cm.c linux-2.6.32.48/drivers/infiniband/core/cm.c
---- linux-2.6.32.48/drivers/infiniband/core/cm.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/infiniband/core/cm.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/infiniband/core/cm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/infiniband/core/cm.c 2011-11-15 19:59:43.000000000 -0500
@@ -112,7 +112,7 @@ static char const counter_group_names[CM
struct cm_counter_group {
@@ -31701,8 +31701,8 @@ diff -urNp linux-2.6.32.48/drivers/infiniband/core/cm.c linux-2.6.32.48/drivers/
};
diff -urNp linux-2.6.32.48/drivers/infiniband/core/fmr_pool.c linux-2.6.32.48/drivers/infiniband/core/fmr_pool.c
---- linux-2.6.32.48/drivers/infiniband/core/fmr_pool.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/infiniband/core/fmr_pool.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/infiniband/core/fmr_pool.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/infiniband/core/fmr_pool.c 2011-11-15 19:59:43.000000000 -0500
@@ -97,8 +97,8 @@ struct ib_fmr_pool {
struct task_struct *thread;
@@ -31771,8 +31771,8 @@ diff -urNp linux-2.6.32.48/drivers/infiniband/core/fmr_pool.c linux-2.6.32.48/dr
}
}
diff -urNp linux-2.6.32.48/drivers/infiniband/core/sysfs.c linux-2.6.32.48/drivers/infiniband/core/sysfs.c
---- linux-2.6.32.48/drivers/infiniband/core/sysfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/infiniband/core/sysfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/infiniband/core/sysfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/infiniband/core/sysfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
return port_attr->show(p, port_attr, buf);
}
@@ -31783,8 +31783,8 @@ diff -urNp linux-2.6.32.48/drivers/infiniband/core/sysfs.c linux-2.6.32.48/drive
};
diff -urNp linux-2.6.32.48/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.48/drivers/infiniband/core/uverbs_marshall.c
---- linux-2.6.32.48/drivers/infiniband/core/uverbs_marshall.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/infiniband/core/uverbs_marshall.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/infiniband/core/uverbs_marshall.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/infiniband/core/uverbs_marshall.c 2011-11-15 19:59:43.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;
@@ -31816,8 +31816,8 @@ diff -urNp linux-2.6.32.48/drivers/infiniband/core/uverbs_marshall.c linux-2.6.3
EXPORT_SYMBOL(ib_copy_qp_attr_to_user);
diff -urNp linux-2.6.32.48/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.32.48/drivers/infiniband/hw/ipath/ipath_fs.c
---- linux-2.6.32.48/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-15 19:59:43.000000000 -0500
@@ -110,6 +110,8 @@ static ssize_t atomic_counters_read(stru
struct infinipath_counters counters;
struct ipath_devdata *dd;
@@ -31828,8 +31828,8 @@ diff -urNp linux-2.6.32.48/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.32.4
dd->ipath_f_read_counters(dd, &counters);
diff -urNp linux-2.6.32.48/drivers/infiniband/hw/nes/nes.c linux-2.6.32.48/drivers/infiniband/hw/nes/nes.c
---- linux-2.6.32.48/drivers/infiniband/hw/nes/nes.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/infiniband/hw/nes/nes.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/infiniband/hw/nes/nes.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/infiniband/hw/nes/nes.c 2011-11-15 19:59:43.000000000 -0500
@@ -102,7 +102,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi
LIST_HEAD(nes_adapter_list);
static LIST_HEAD(nes_dev_list);
@@ -31849,8 +31849,8 @@ diff -urNp linux-2.6.32.48/drivers/infiniband/hw/nes/nes.c linux-2.6.32.48/drive
/* Free the control structures */
diff -urNp linux-2.6.32.48/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.32.48/drivers/infiniband/hw/nes/nes_cm.c
---- linux-2.6.32.48/drivers/infiniband/hw/nes/nes_cm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/infiniband/hw/nes/nes_cm.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/infiniband/hw/nes/nes_cm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/infiniband/hw/nes/nes_cm.c 2011-11-15 19:59:43.000000000 -0500
@@ -69,11 +69,11 @@ u32 cm_packets_received;
u32 cm_listens_created;
u32 cm_listens_destroyed;
@@ -32025,8 +32025,8 @@ diff -urNp linux-2.6.32.48/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.32.48/dr
cm_node, cm_id, jiffies);
diff -urNp linux-2.6.32.48/drivers/infiniband/hw/nes/nes.h linux-2.6.32.48/drivers/infiniband/hw/nes/nes.h
---- linux-2.6.32.48/drivers/infiniband/hw/nes/nes.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/infiniband/hw/nes/nes.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/infiniband/hw/nes/nes.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/infiniband/hw/nes/nes.h 2011-11-15 19:59:43.000000000 -0500
@@ -174,17 +174,17 @@ extern unsigned int nes_debug_level;
extern unsigned int wqm_quanta;
extern struct list_head nes_adapter_list;
@@ -32074,8 +32074,8 @@ diff -urNp linux-2.6.32.48/drivers/infiniband/hw/nes/nes.h linux-2.6.32.48/drive
extern u32 int_mod_timer_init;
extern u32 int_mod_cq_depth_256;
diff -urNp linux-2.6.32.48/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.32.48/drivers/infiniband/hw/nes/nes_nic.c
---- linux-2.6.32.48/drivers/infiniband/hw/nes/nes_nic.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/infiniband/hw/nes/nes_nic.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/infiniband/hw/nes/nes_nic.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/infiniband/hw/nes/nes_nic.c 2011-11-15 19:59:43.000000000 -0500
@@ -1210,17 +1210,17 @@ static void nes_netdev_get_ethtool_stats
target_stat_values[++index] = mh_detected;
target_stat_values[++index] = mh_pauses_sent;
@@ -32123,8 +32123,8 @@ diff -urNp linux-2.6.32.48/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.32.48/d
target_stat_values[++index] = int_mod_cq_depth_1;
target_stat_values[++index] = int_mod_cq_depth_4;
diff -urNp linux-2.6.32.48/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.32.48/drivers/infiniband/hw/nes/nes_verbs.c
---- linux-2.6.32.48/drivers/infiniband/hw/nes/nes_verbs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-15 19:59:43.000000000 -0500
@@ -45,9 +45,9 @@
#include <rdma/ib_umem.h>
@@ -32157,8 +32157,8 @@ diff -urNp linux-2.6.32.48/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.32.48
/* Blow away the connection if it exists. */
diff -urNp linux-2.6.32.48/drivers/input/gameport/gameport.c linux-2.6.32.48/drivers/input/gameport/gameport.c
---- linux-2.6.32.48/drivers/input/gameport/gameport.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/input/gameport/gameport.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/input/gameport/gameport.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/input/gameport/gameport.c 2011-11-15 19:59:43.000000000 -0500
@@ -515,13 +515,13 @@ EXPORT_SYMBOL(gameport_set_phys);
*/
static void gameport_init_port(struct gameport *gameport)
@@ -32176,8 +32176,8 @@ diff -urNp linux-2.6.32.48/drivers/input/gameport/gameport.c linux-2.6.32.48/dri
gameport->dev.release = gameport_release_port;
if (gameport->parent)
diff -urNp linux-2.6.32.48/drivers/input/input.c linux-2.6.32.48/drivers/input/input.c
---- linux-2.6.32.48/drivers/input/input.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/input/input.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/input/input.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/input/input.c 2011-11-15 19:59:43.000000000 -0500
@@ -1558,7 +1558,7 @@ EXPORT_SYMBOL(input_set_capability);
*/
int input_register_device(struct input_dev *dev)
@@ -32197,8 +32197,8 @@ diff -urNp linux-2.6.32.48/drivers/input/input.c linux-2.6.32.48/drivers/input/i
error = device_add(&dev->dev);
if (error)
diff -urNp linux-2.6.32.48/drivers/input/joystick/sidewinder.c linux-2.6.32.48/drivers/input/joystick/sidewinder.c
---- linux-2.6.32.48/drivers/input/joystick/sidewinder.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/input/joystick/sidewinder.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/input/joystick/sidewinder.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/input/joystick/sidewinder.c 2011-11-15 19:59:43.000000000 -0500
@@ -30,6 +30,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -32217,8 +32217,8 @@ diff -urNp linux-2.6.32.48/drivers/input/joystick/sidewinder.c linux-2.6.32.48/d
if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) { /* Broken packet, try to fix */
diff -urNp linux-2.6.32.48/drivers/input/joystick/xpad.c linux-2.6.32.48/drivers/input/joystick/xpad.c
---- linux-2.6.32.48/drivers/input/joystick/xpad.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/input/joystick/xpad.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/input/joystick/xpad.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/input/joystick/xpad.c 2011-11-15 19:59:43.000000000 -0500
@@ -621,7 +621,7 @@ static void xpad_led_set(struct led_clas
static int xpad_led_probe(struct usb_xpad *xpad)
@@ -32238,8 +32238,8 @@ diff -urNp linux-2.6.32.48/drivers/input/joystick/xpad.c linux-2.6.32.48/drivers
snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
led->xpad = xpad;
diff -urNp linux-2.6.32.48/drivers/input/serio/serio.c linux-2.6.32.48/drivers/input/serio/serio.c
---- linux-2.6.32.48/drivers/input/serio/serio.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/input/serio/serio.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/input/serio/serio.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/input/serio/serio.c 2011-11-15 19:59:43.000000000 -0500
@@ -527,7 +527,7 @@ static void serio_release_port(struct de
*/
static void serio_init_port(struct serio *serio)
@@ -32259,8 +32259,8 @@ diff -urNp linux-2.6.32.48/drivers/input/serio/serio.c linux-2.6.32.48/drivers/i
serio->dev.release = serio_release_port;
if (serio->parent) {
diff -urNp linux-2.6.32.48/drivers/isdn/gigaset/common.c linux-2.6.32.48/drivers/isdn/gigaset/common.c
---- linux-2.6.32.48/drivers/isdn/gigaset/common.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/gigaset/common.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/gigaset/common.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/gigaset/common.c 2011-11-15 19:59:43.000000000 -0500
@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
cs->commands_pending = 0;
cs->cur_at_seq = 0;
@@ -32271,8 +32271,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/gigaset/common.c linux-2.6.32.48/drivers
cs->tty = NULL;
cs->tty_dev = NULL;
diff -urNp linux-2.6.32.48/drivers/isdn/gigaset/gigaset.h linux-2.6.32.48/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.32.48/drivers/isdn/gigaset/gigaset.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/gigaset/gigaset.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/gigaset/gigaset.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/gigaset/gigaset.h 2011-11-15 19:59:43.000000000 -0500
@@ -34,6 +34,7 @@
#include <linux/tty_driver.h>
#include <linux/list.h>
@@ -32291,8 +32291,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/gigaset/gigaset.h linux-2.6.32.48/driver
struct tasklet_struct if_wake_tasklet;
unsigned control_state;
diff -urNp linux-2.6.32.48/drivers/isdn/gigaset/interface.c linux-2.6.32.48/drivers/isdn/gigaset/interface.c
---- linux-2.6.32.48/drivers/isdn/gigaset/interface.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/gigaset/interface.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/gigaset/interface.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/gigaset/interface.c 2011-11-15 19:59:43.000000000 -0500
@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
return -ERESTARTSYS; // FIXME -EINTR?
tty->driver_data = cs;
@@ -32381,8 +32381,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/gigaset/interface.c linux-2.6.32.48/driv
goto out;
}
diff -urNp linux-2.6.32.48/drivers/isdn/hardware/avm/b1.c linux-2.6.32.48/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.32.48/drivers/isdn/hardware/avm/b1.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/hardware/avm/b1.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/hardware/avm/b1.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/hardware/avm/b1.c 2011-11-15 19:59:43.000000000 -0500
@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
}
if (left) {
@@ -32402,8 +32402,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/hardware/avm/b1.c linux-2.6.32.48/driver
} else {
memcpy(buf, dp, left);
diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.32.48/drivers/isdn/hardware/eicon/capidtmf.c
---- linux-2.6.32.48/drivers/isdn/hardware/eicon/capidtmf.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-15 19:59:43.000000000 -0500
@@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta
byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT];
short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES];
@@ -32413,8 +32413,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.32.4
if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE)
{
diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.32.48/drivers/isdn/hardware/eicon/capifunc.c
---- linux-2.6.32.48/drivers/isdn/hardware/eicon/capifunc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/hardware/eicon/capifunc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/hardware/eicon/capifunc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/capifunc.c 2011-11-15 19:59:43.000000000 -0500
@@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void)
IDI_SYNC_REQ req;
DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -32425,8 +32425,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.32.4
for (x = 0; x < MAX_DESCRIPTORS; x++) {
diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.32.48/drivers/isdn/hardware/eicon/diddfunc.c
---- linux-2.6.32.48/drivers/isdn/hardware/eicon/diddfunc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-15 19:59:43.000000000 -0500
@@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di
IDI_SYNC_REQ req;
DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -32437,8 +32437,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.32.4
for (x = 0; x < MAX_DESCRIPTORS; x++) {
diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.32.48/drivers/isdn/hardware/eicon/divasfunc.c
---- linux-2.6.32.48/drivers/isdn/hardware/eicon/divasfunc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-15 19:59:43.000000000 -0500
@@ -161,6 +161,8 @@ static int DIVA_INIT_FUNCTION connect_di
IDI_SYNC_REQ req;
DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -32449,8 +32449,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.32.
for (x = 0; x < MAX_DESCRIPTORS; x++) {
diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/divasync.h linux-2.6.32.48/drivers/isdn/hardware/eicon/divasync.h
---- linux-2.6.32.48/drivers/isdn/hardware/eicon/divasync.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/hardware/eicon/divasync.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/hardware/eicon/divasync.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/divasync.h 2011-11-15 19:59:43.000000000 -0500
@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
} diva_didd_add_adapter_t;
typedef struct _diva_didd_remove_adapter {
@@ -32461,8 +32461,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/divasync.h linux-2.6.32.4
void * buffer;
dword length;
diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.32.48/drivers/isdn/hardware/eicon/idifunc.c
---- linux-2.6.32.48/drivers/isdn/hardware/eicon/idifunc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/hardware/eicon/idifunc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/hardware/eicon/idifunc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/idifunc.c 2011-11-15 19:59:43.000000000 -0500
@@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di
IDI_SYNC_REQ req;
DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -32473,8 +32473,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.32.48
for (x = 0; x < MAX_DESCRIPTORS; x++) {
diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/message.c linux-2.6.32.48/drivers/isdn/hardware/eicon/message.c
---- linux-2.6.32.48/drivers/isdn/hardware/eicon/message.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/hardware/eicon/message.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/hardware/eicon/message.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/message.c 2011-11-15 19:59:43.000000000 -0500
@@ -4889,6 +4889,8 @@ static void sig_ind(PLCI *plci)
dword d;
word w;
@@ -32512,8 +32512,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/message.c linux-2.6.32.48
if(!a->group_optimization_enabled)
diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.32.48/drivers/isdn/hardware/eicon/mntfunc.c
---- linux-2.6.32.48/drivers/isdn/hardware/eicon/mntfunc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-15 19:59:43.000000000 -0500
@@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di
IDI_SYNC_REQ req;
DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -32524,8 +32524,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.32.48
for (x = 0; x < MAX_DESCRIPTORS; x++) {
diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/xdi_adapter.h linux-2.6.32.48/drivers/isdn/hardware/eicon/xdi_adapter.h
---- linux-2.6.32.48/drivers/isdn/hardware/eicon/xdi_adapter.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-15 19:59:43.000000000 -0500
@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
typedef struct _diva_os_idi_adapter_interface {
diva_init_card_proc_t cleanup_adapter_proc;
@@ -32536,8 +32536,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/xdi_adapter.h linux-2.6.3
typedef struct _diva_os_xdi_adapter {
struct list_head link;
diff -urNp linux-2.6.32.48/drivers/isdn/i4l/isdn_common.c linux-2.6.32.48/drivers/isdn/i4l/isdn_common.c
---- linux-2.6.32.48/drivers/isdn/i4l/isdn_common.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/i4l/isdn_common.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/i4l/isdn_common.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/i4l/isdn_common.c 2011-11-15 19:59:43.000000000 -0500
@@ -1290,6 +1290,8 @@ isdn_ioctl(struct inode *inode, struct f
} iocpar;
void __user *argp = (void __user *)arg;
@@ -32548,8 +32548,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/i4l/isdn_common.c linux-2.6.32.48/driver
#define bname iocpar.bname
#define iocts iocpar.iocts
diff -urNp linux-2.6.32.48/drivers/isdn/icn/icn.c linux-2.6.32.48/drivers/isdn/icn/icn.c
---- linux-2.6.32.48/drivers/isdn/icn/icn.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/icn/icn.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/icn/icn.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/icn/icn.c 2011-11-15 19:59:43.000000000 -0500
@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
if (count > len)
count = len;
@@ -32560,8 +32560,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/icn/icn.c linux-2.6.32.48/drivers/isdn/i
} else
memcpy(msg, buf, count);
diff -urNp linux-2.6.32.48/drivers/isdn/mISDN/socket.c linux-2.6.32.48/drivers/isdn/mISDN/socket.c
---- linux-2.6.32.48/drivers/isdn/mISDN/socket.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/mISDN/socket.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/mISDN/socket.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/mISDN/socket.c 2011-11-15 19:59:43.000000000 -0500
@@ -391,6 +391,7 @@ data_sock_ioctl(struct socket *sock, uns
if (dev) {
struct mISDN_devinfo di;
@@ -32579,8 +32579,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/mISDN/socket.c linux-2.6.32.48/drivers/i
di.Dprotocols = dev->Dprotocols;
di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
diff -urNp linux-2.6.32.48/drivers/isdn/sc/interrupt.c linux-2.6.32.48/drivers/isdn/sc/interrupt.c
---- linux-2.6.32.48/drivers/isdn/sc/interrupt.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/isdn/sc/interrupt.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/isdn/sc/interrupt.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/isdn/sc/interrupt.c 2011-11-15 19:59:43.000000000 -0500
@@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy,
}
else if(callid>=0x0000 && callid<=0x7FFF)
@@ -32616,8 +32616,8 @@ diff -urNp linux-2.6.32.48/drivers/isdn/sc/interrupt.c linux-2.6.32.48/drivers/i
}
diff -urNp linux-2.6.32.48/drivers/lguest/core.c linux-2.6.32.48/drivers/lguest/core.c
---- linux-2.6.32.48/drivers/lguest/core.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/lguest/core.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/lguest/core.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/lguest/core.c 2011-11-15 19:59:43.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.
@@ -32646,8 +32646,8 @@ diff -urNp linux-2.6.32.48/drivers/lguest/core.c linux-2.6.32.48/drivers/lguest/
printk(KERN_INFO "lguest: mapped switcher at %p\n",
diff -urNp linux-2.6.32.48/drivers/lguest/x86/core.c linux-2.6.32.48/drivers/lguest/x86/core.c
---- linux-2.6.32.48/drivers/lguest/x86/core.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/lguest/x86/core.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/lguest/x86/core.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/lguest/x86/core.c 2011-11-15 19:59:43.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)
@@ -32690,8 +32690,8 @@ diff -urNp linux-2.6.32.48/drivers/lguest/x86/core.c linux-2.6.32.48/drivers/lgu
/*
diff -urNp linux-2.6.32.48/drivers/lguest/x86/switcher_32.S linux-2.6.32.48/drivers/lguest/x86/switcher_32.S
---- linux-2.6.32.48/drivers/lguest/x86/switcher_32.S 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/lguest/x86/switcher_32.S 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/lguest/x86/switcher_32.S 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/lguest/x86/switcher_32.S 2011-11-15 19:59:43.000000000 -0500
@@ -87,6 +87,7 @@
#include <asm/page.h>
#include <asm/segment.h>
@@ -32751,8 +32751,8 @@ diff -urNp linux-2.6.32.48/drivers/lguest/x86/switcher_32.S linux-2.6.32.48/driv
// Every interrupt can come to us here
// But we must truly tell each apart.
diff -urNp linux-2.6.32.48/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.48/drivers/macintosh/via-pmu-backlight.c
---- linux-2.6.32.48/drivers/macintosh/via-pmu-backlight.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/macintosh/via-pmu-backlight.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/macintosh/via-pmu-backlight.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/macintosh/via-pmu-backlight.c 2011-11-15 19:59:43.000000000 -0500
@@ -15,7 +15,7 @@
#define MAX_PMU_LEVEL 0xFF
@@ -32772,8 +32772,8 @@ diff -urNp linux-2.6.32.48/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.48
.update_status = pmu_backlight_update_status,
diff -urNp linux-2.6.32.48/drivers/macintosh/via-pmu.c linux-2.6.32.48/drivers/macintosh/via-pmu.c
---- linux-2.6.32.48/drivers/macintosh/via-pmu.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/macintosh/via-pmu.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/macintosh/via-pmu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/macintosh/via-pmu.c 2011-11-15 19:59:43.000000000 -0500
@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
&& (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
}
@@ -32784,8 +32784,8 @@ diff -urNp linux-2.6.32.48/drivers/macintosh/via-pmu.c linux-2.6.32.48/drivers/m
.valid = pmu_sleep_valid,
};
diff -urNp linux-2.6.32.48/drivers/md/dm.c linux-2.6.32.48/drivers/md/dm.c
---- linux-2.6.32.48/drivers/md/dm.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/md/dm.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/md/dm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/md/dm.c 2011-11-15 19:59:43.000000000 -0500
@@ -165,9 +165,9 @@ struct mapped_device {
/*
* Event handling.
@@ -32841,8 +32841,8 @@ diff -urNp linux-2.6.32.48/drivers/md/dm.c linux-2.6.32.48/drivers/md/dm.c
void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
diff -urNp linux-2.6.32.48/drivers/md/dm-ioctl.c linux-2.6.32.48/drivers/md/dm-ioctl.c
---- linux-2.6.32.48/drivers/md/dm-ioctl.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/md/dm-ioctl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/md/dm-ioctl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/md/dm-ioctl.c 2011-11-15 19:59:43.000000000 -0500
@@ -1437,7 +1437,7 @@ static int validate_params(uint cmd, str
cmd == DM_LIST_VERSIONS_CMD)
return 0;
@@ -32853,8 +32853,8 @@ diff -urNp linux-2.6.32.48/drivers/md/dm-ioctl.c linux-2.6.32.48/drivers/md/dm-i
DMWARN("name not supplied when creating device");
return -EINVAL;
diff -urNp linux-2.6.32.48/drivers/md/dm-raid1.c linux-2.6.32.48/drivers/md/dm-raid1.c
---- linux-2.6.32.48/drivers/md/dm-raid1.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/md/dm-raid1.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/md/dm-raid1.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/md/dm-raid1.c 2011-11-15 19:59:43.000000000 -0500
@@ -41,7 +41,7 @@ enum dm_raid1_error {
struct mirror {
@@ -32928,8 +32928,8 @@ diff -urNp linux-2.6.32.48/drivers/md/dm-raid1.c linux-2.6.32.48/drivers/md/dm-r
return (test_bit(DM_RAID1_WRITE_ERROR, &(m->error_type))) ? 'D' :
diff -urNp linux-2.6.32.48/drivers/md/dm-stripe.c linux-2.6.32.48/drivers/md/dm-stripe.c
---- linux-2.6.32.48/drivers/md/dm-stripe.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/md/dm-stripe.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/md/dm-stripe.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/md/dm-stripe.c 2011-11-15 19:59:43.000000000 -0500
@@ -20,7 +20,7 @@ struct stripe {
struct dm_dev *dev;
sector_t physical_start;
@@ -32969,8 +32969,8 @@ diff -urNp linux-2.6.32.48/drivers/md/dm-stripe.c linux-2.6.32.48/drivers/md/dm-
queue_work(kstriped, &sc->kstriped_ws);
}
diff -urNp linux-2.6.32.48/drivers/md/dm-sysfs.c linux-2.6.32.48/drivers/md/dm-sysfs.c
---- linux-2.6.32.48/drivers/md/dm-sysfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/md/dm-sysfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/md/dm-sysfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/md/dm-sysfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
NULL,
};
@@ -32981,8 +32981,8 @@ diff -urNp linux-2.6.32.48/drivers/md/dm-sysfs.c linux-2.6.32.48/drivers/md/dm-s
};
diff -urNp linux-2.6.32.48/drivers/md/dm-table.c linux-2.6.32.48/drivers/md/dm-table.c
---- linux-2.6.32.48/drivers/md/dm-table.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/md/dm-table.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/md/dm-table.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/md/dm-table.c 2011-11-15 19:59:43.000000000 -0500
@@ -376,7 +376,7 @@ static int device_area_is_invalid(struct
if (!dev_size)
return 0;
@@ -32993,8 +32993,8 @@ diff -urNp linux-2.6.32.48/drivers/md/dm-table.c linux-2.6.32.48/drivers/md/dm-t
"start=%llu, len=%llu, dev_size=%llu",
dm_device_name(ti->table->md), bdevname(bdev, b),
diff -urNp linux-2.6.32.48/drivers/md/md.c linux-2.6.32.48/drivers/md/md.c
---- linux-2.6.32.48/drivers/md/md.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/md/md.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/md/md.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/md/md.c 2011-11-15 19:59:43.000000000 -0500
@@ -153,10 +153,10 @@ static int start_readonly;
* start build, activate spare
*/
@@ -33138,8 +33138,8 @@ diff -urNp linux-2.6.32.48/drivers/md/md.c linux-2.6.32.48/drivers/md/md.c
* as sync_io is counted when a request starts, and
* disk_stats is counted when it completes.
diff -urNp linux-2.6.32.48/drivers/md/md.h linux-2.6.32.48/drivers/md/md.h
---- linux-2.6.32.48/drivers/md/md.h 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/md/md.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/md/md.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/md/md.h 2011-11-15 19:59:43.000000000 -0500
@@ -94,10 +94,10 @@ struct mdk_rdev_s
* only maintained for arrays that
* support hot removal
@@ -33163,8 +33163,8 @@ diff -urNp linux-2.6.32.48/drivers/md/md.h linux-2.6.32.48/drivers/md/md.h
struct mdk_personality
diff -urNp linux-2.6.32.48/drivers/md/raid10.c linux-2.6.32.48/drivers/md/raid10.c
---- linux-2.6.32.48/drivers/md/raid10.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/md/raid10.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/md/raid10.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/md/raid10.c 2011-11-15 19:59:43.000000000 -0500
@@ -1255,7 +1255,7 @@ static void end_sync_read(struct bio *bi
if (test_bit(BIO_UPTODATE, &bio->bi_flags))
set_bit(R10BIO_Uptodate, &r10_bio->state);
@@ -33184,8 +33184,8 @@ diff -urNp linux-2.6.32.48/drivers/md/raid10.c linux-2.6.32.48/drivers/md/raid10
r10_bio->devs[sl].addr +
sect + rdev->data_offset,
diff -urNp linux-2.6.32.48/drivers/md/raid1.c linux-2.6.32.48/drivers/md/raid1.c
---- linux-2.6.32.48/drivers/md/raid1.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/md/raid1.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/md/raid1.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/md/raid1.c 2011-11-15 19:59:43.000000000 -0500
@@ -1415,7 +1415,7 @@ static void sync_request_write(mddev_t *
if (r1_bio->bios[d]->bi_end_io != end_sync_read)
continue;
@@ -33205,8 +33205,8 @@ diff -urNp linux-2.6.32.48/drivers/md/raid1.c linux-2.6.32.48/drivers/md/raid1.c
"raid1:%s: read error corrected "
"(%d sectors at %llu on %s)\n",
diff -urNp linux-2.6.32.48/drivers/md/raid5.c linux-2.6.32.48/drivers/md/raid5.c
---- linux-2.6.32.48/drivers/md/raid5.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/md/raid5.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/md/raid5.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/md/raid5.c 2011-11-15 19:59:43.000000000 -0500
@@ -482,7 +482,7 @@ static void ops_run_io(struct stripe_hea
bi->bi_next = NULL;
if ((rw & WRITE) &&
@@ -33253,8 +33253,8 @@ diff -urNp linux-2.6.32.48/drivers/md/raid5.c linux-2.6.32.48/drivers/md/raid5.c
chunk_offset = sector_div(new_sector, sectors_per_chunk);
stripe = new_sector;
diff -urNp linux-2.6.32.48/drivers/media/common/saa7146_hlp.c linux-2.6.32.48/drivers/media/common/saa7146_hlp.c
---- linux-2.6.32.48/drivers/media/common/saa7146_hlp.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/common/saa7146_hlp.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/common/saa7146_hlp.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/common/saa7146_hlp.c 2011-11-15 19:59:43.000000000 -0500
@@ -353,6 +353,8 @@ static void calculate_clipping_registers
int x[32], y[32], w[32], h[32];
@@ -33265,8 +33265,8 @@ diff -urNp linux-2.6.32.48/drivers/media/common/saa7146_hlp.c linux-2.6.32.48/dr
memset(&line_list[0], 0x00, sizeof(u32)*32);
memset(&pixel_list[0], 0x00, sizeof(u32)*32);
diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
---- linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-15 19:59:43.000000000 -0500
@@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru
u8 buf[HOST_LINK_BUF_SIZE];
int i;
@@ -33286,8 +33286,8 @@ diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6
/* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_demux.h linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_demux.h
---- linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_demux.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-15 19:59:43.000000000 -0500
@@ -71,7 +71,7 @@ struct dvb_demux_feed {
union {
dmx_ts_cb ts;
@@ -33298,8 +33298,8 @@ diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_demux.h linux-2.6.32.4
struct dvb_demux *demux;
void *priv;
diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.48/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.32.48/drivers/media/dvb/dvb-core/dvbdev.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-15 19:59:43.000000000 -0500
@@ -191,7 +191,7 @@ int dvb_register_device(struct dvb_adapt
const struct dvb_device *template, void *priv, int type)
{
@@ -33310,8 +33310,8 @@ diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.48/d
int minor;
int id;
diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-usb/cxusb.c linux-2.6.32.48/drivers/media/dvb/dvb-usb/cxusb.c
---- linux-2.6.32.48/drivers/media/dvb/dvb-usb/cxusb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-15 19:59:43.000000000 -0500
@@ -1040,7 +1040,7 @@ static struct dib0070_config dib7070p_di
struct dib0700_adapter_state {
int (*set_param_save) (struct dvb_frontend *,
@@ -33322,8 +33322,8 @@ diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-usb/cxusb.c linux-2.6.32.48/dri
static int dib7070_set_param_override(struct dvb_frontend *fe,
struct dvb_frontend_parameters *fep)
diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_core.c
---- linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_core.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-15 19:59:43.000000000 -0500
@@ -332,6 +332,8 @@ int dib0700_download_firmware(struct usb
u8 buf[260];
@@ -33334,8 +33334,8 @@ diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.32
deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",hx.addr, hx.len, hx.chk);
diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_devices.c linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_devices.c
---- linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_devices.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_devices.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_devices.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_devices.c 2011-11-15 19:59:43.000000000 -0500
@@ -28,7 +28,7 @@ MODULE_PARM_DESC(force_lna_activation, "
struct dib0700_adapter_state {
@@ -33346,8 +33346,8 @@ diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_devices.c linux-2.6
/* Hauppauge Nova-T 500 (aka Bristol)
* has a LNA on GPIO0 which is enabled by setting 1 */
diff -urNp linux-2.6.32.48/drivers/media/dvb/frontends/dib3000.h linux-2.6.32.48/drivers/media/dvb/frontends/dib3000.h
---- linux-2.6.32.48/drivers/media/dvb/frontends/dib3000.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/dvb/frontends/dib3000.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/dvb/frontends/dib3000.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/dvb/frontends/dib3000.h 2011-11-15 19:59:43.000000000 -0500
@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
@@ -33358,8 +33358,8 @@ diff -urNp linux-2.6.32.48/drivers/media/dvb/frontends/dib3000.h linux-2.6.32.48
#if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
diff -urNp linux-2.6.32.48/drivers/media/dvb/frontends/or51211.c linux-2.6.32.48/drivers/media/dvb/frontends/or51211.c
---- linux-2.6.32.48/drivers/media/dvb/frontends/or51211.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/dvb/frontends/or51211.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/dvb/frontends/or51211.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/dvb/frontends/or51211.c 2011-11-15 19:59:43.000000000 -0500
@@ -113,6 +113,8 @@ static int or51211_load_firmware (struct
u8 tudata[585];
int i;
@@ -33370,8 +33370,8 @@ diff -urNp linux-2.6.32.48/drivers/media/dvb/frontends/or51211.c linux-2.6.32.48
/* Get eprom data */
diff -urNp linux-2.6.32.48/drivers/media/radio/radio-cadet.c linux-2.6.32.48/drivers/media/radio/radio-cadet.c
---- linux-2.6.32.48/drivers/media/radio/radio-cadet.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/radio/radio-cadet.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/radio/radio-cadet.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/radio/radio-cadet.c 2011-11-15 19:59:43.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++];
@@ -33382,8 +33382,8 @@ diff -urNp linux-2.6.32.48/drivers/media/radio/radio-cadet.c linux-2.6.32.48/dri
return i;
}
diff -urNp linux-2.6.32.48/drivers/media/video/cx18/cx18-driver.c linux-2.6.32.48/drivers/media/video/cx18/cx18-driver.c
---- linux-2.6.32.48/drivers/media/video/cx18/cx18-driver.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/cx18/cx18-driver.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/cx18/cx18-driver.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/cx18/cx18-driver.c 2011-11-15 19:59:43.000000000 -0500
@@ -56,7 +56,7 @@ static struct pci_device_id cx18_pci_tbl
MODULE_DEVICE_TABLE(pci, cx18_pci_tbl);
@@ -33412,8 +33412,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/cx18/cx18-driver.c linux-2.6.32.4
printk(KERN_ERR "cx18: cannot manage card %d, driver has a "
"limit of 0 - %d\n", i, CX18_MAX_CARDS - 1);
diff -urNp linux-2.6.32.48/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.32.48/drivers/media/video/ivtv/ivtv-driver.c
---- linux-2.6.32.48/drivers/media/video/ivtv/ivtv-driver.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/ivtv/ivtv-driver.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/ivtv/ivtv-driver.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/ivtv/ivtv-driver.c 2011-11-15 19:59:43.000000000 -0500
@@ -79,7 +79,7 @@ static struct pci_device_id ivtv_pci_tbl
MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
@@ -33424,8 +33424,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.32.4
/* Parameter declarations */
static int cardtype[IVTV_MAX_CARDS];
diff -urNp linux-2.6.32.48/drivers/media/video/omap24xxcam.c linux-2.6.32.48/drivers/media/video/omap24xxcam.c
---- linux-2.6.32.48/drivers/media/video/omap24xxcam.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/omap24xxcam.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/omap24xxcam.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/omap24xxcam.c 2011-11-15 19:59:43.000000000 -0500
@@ -401,7 +401,7 @@ static void omap24xxcam_vbq_complete(str
spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags);
@@ -33436,8 +33436,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/omap24xxcam.c linux-2.6.32.48/dri
vb->state = VIDEOBUF_ERROR;
if (!atomic_read(&fh->cam->in_reset)) {
diff -urNp linux-2.6.32.48/drivers/media/video/omap24xxcam.h linux-2.6.32.48/drivers/media/video/omap24xxcam.h
---- linux-2.6.32.48/drivers/media/video/omap24xxcam.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/omap24xxcam.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/omap24xxcam.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/omap24xxcam.h 2011-11-15 19:59:43.000000000 -0500
@@ -533,7 +533,7 @@ struct omap24xxcam_fh {
spinlock_t vbq_lock; /* spinlock for the videobuf queue */
struct videobuf_queue vbq;
@@ -33448,8 +33448,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/omap24xxcam.h linux-2.6.32.48/dri
struct omap24xxcam_device *cam;
};
diff -urNp linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
---- linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-15 19:59:43.000000000 -0500
@@ -119,6 +119,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw
u8 *eeprom;
struct tveeprom tvdata;
@@ -33460,8 +33460,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2.
eeprom = pvr2_eeprom_fetch(hdw);
diff -urNp linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
---- linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-11-15 19:59:43.000000000 -0500
@@ -195,7 +195,7 @@ struct pvr2_hdw {
/* I2C stuff */
@@ -33472,8 +33472,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h li
int i2c_cx25840_hack_state;
int i2c_linked;
diff -urNp linux-2.6.32.48/drivers/media/video/saa7134/saa6752hs.c linux-2.6.32.48/drivers/media/video/saa7134/saa6752hs.c
---- linux-2.6.32.48/drivers/media/video/saa7134/saa6752hs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/saa7134/saa6752hs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/saa7134/saa6752hs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/saa7134/saa6752hs.c 2011-11-15 19:59:43.000000000 -0500
@@ -683,6 +683,8 @@ static int saa6752hs_init(struct v4l2_su
unsigned char localPAT[256];
unsigned char localPMT[256];
@@ -33484,8 +33484,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/saa7134/saa6752hs.c linux-2.6.32.
set_reg8(client, 0x41, h->video_format);
diff -urNp linux-2.6.32.48/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.32.48/drivers/media/video/saa7164/saa7164-cmd.c
---- linux-2.6.32.48/drivers/media/video/saa7164/saa7164-cmd.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-15 19:59:43.000000000 -0500
@@ -87,6 +87,8 @@ int saa7164_irq_dequeue(struct saa7164_d
wait_queue_head_t *q = 0;
dprintk(DBGLVL_CMD, "%s()\n", __func__);
@@ -33505,8 +33505,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.3
tmComResInfo_t tRsp = { 0, 0, 0, 0, 0, 0 };
diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/ibmcam.c linux-2.6.32.48/drivers/media/video/usbvideo/ibmcam.c
---- linux-2.6.32.48/drivers/media/video/usbvideo/ibmcam.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/usbvideo/ibmcam.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/usbvideo/ibmcam.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/usbvideo/ibmcam.c 2011-11-15 19:59:43.000000000 -0500
@@ -3947,15 +3947,15 @@ static struct usb_device_id id_table[] =
static int __init ibmcam_init(void)
{
@@ -33533,8 +33533,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/ibmcam.c linux-2.6.32.48
&cams,
MAX_IBMCAM,
diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.48/drivers/media/video/usbvideo/konicawc.c
---- linux-2.6.32.48/drivers/media/video/usbvideo/konicawc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/usbvideo/konicawc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/usbvideo/konicawc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/usbvideo/konicawc.c 2011-11-15 19:59:43.000000000 -0500
@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
int error;
@@ -33572,8 +33572,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.
&cams,
MAX_CAMERAS,
diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.48/drivers/media/video/usbvideo/quickcam_messenger.c
---- linux-2.6.32.48/drivers/media/video/usbvideo/quickcam_messenger.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/usbvideo/quickcam_messenger.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/usbvideo/quickcam_messenger.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/usbvideo/quickcam_messenger.c 2011-11-15 19:59:43.000000000 -0500
@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
int error;
@@ -33584,8 +33584,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/quickcam_messenger.c lin
cam->input = input_dev = input_allocate_device();
if (!input_dev) {
diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/ultracam.c linux-2.6.32.48/drivers/media/video/usbvideo/ultracam.c
---- linux-2.6.32.48/drivers/media/video/usbvideo/ultracam.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/usbvideo/ultracam.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/usbvideo/ultracam.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/usbvideo/ultracam.c 2011-11-15 19:59:43.000000000 -0500
@@ -655,14 +655,14 @@ static int __init ultracam_init(void)
{
struct usbvideo_cb cbTbl;
@@ -33610,8 +33610,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/ultracam.c linux-2.6.32.
&cams,
MAX_CAMERAS,
diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.c linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.c
---- linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.c 2011-11-15 19:59:43.000000000 -0500
@@ -697,15 +697,15 @@ int usbvideo_register(
__func__, cams, base_size, num_cams);
@@ -33634,8 +33634,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.c linux-2.6.32.
cams->num_cameras = num_cams;
cams->cam = (struct uvd *) &cams[1];
diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.h linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.h
---- linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.h 2011-11-15 19:59:43.000000000 -0500
@@ -268,7 +268,7 @@ struct usbvideo_cb {
int (*startDataPump)(struct uvd *uvd);
void (*stopDataPump)(struct uvd *uvd);
@@ -33646,8 +33646,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.h linux-2.6.32.
struct usbvideo {
int num_cameras; /* As allocated */
diff -urNp linux-2.6.32.48/drivers/media/video/usbvision/usbvision-core.c linux-2.6.32.48/drivers/media/video/usbvision/usbvision-core.c
---- linux-2.6.32.48/drivers/media/video/usbvision/usbvision-core.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/usbvision/usbvision-core.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/usbvision/usbvision-core.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/usbvision/usbvision-core.c 2011-11-15 19:59:43.000000000 -0500
@@ -820,6 +820,8 @@ static enum ParseState usbvision_parse_c
unsigned char rv, gv, bv;
static unsigned char *Y, *U, *V;
@@ -33658,8 +33658,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/usbvision/usbvision-core.c linux-
imageSize = frame->frmwidth * frame->frmheight;
if ( (frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) ||
diff -urNp linux-2.6.32.48/drivers/media/video/v4l2-device.c linux-2.6.32.48/drivers/media/video/v4l2-device.c
---- linux-2.6.32.48/drivers/media/video/v4l2-device.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/v4l2-device.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/v4l2-device.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/v4l2-device.c 2011-11-15 19:59:43.000000000 -0500
@@ -50,9 +50,9 @@ int v4l2_device_register(struct device *
EXPORT_SYMBOL_GPL(v4l2_device_register);
@@ -33673,8 +33673,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/v4l2-device.c linux-2.6.32.48/dri
if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
diff -urNp linux-2.6.32.48/drivers/media/video/videobuf-dma-sg.c linux-2.6.32.48/drivers/media/video/videobuf-dma-sg.c
---- linux-2.6.32.48/drivers/media/video/videobuf-dma-sg.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/media/video/videobuf-dma-sg.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/media/video/videobuf-dma-sg.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/media/video/videobuf-dma-sg.c 2011-11-15 19:59:43.000000000 -0500
@@ -693,6 +693,8 @@ void *videobuf_sg_alloc(size_t size)
{
struct videobuf_queue q;
@@ -33685,8 +33685,8 @@ diff -urNp linux-2.6.32.48/drivers/media/video/videobuf-dma-sg.c linux-2.6.32.48
q.int_ops = &sg_ops;
diff -urNp linux-2.6.32.48/drivers/message/fusion/mptbase.c linux-2.6.32.48/drivers/message/fusion/mptbase.c
---- linux-2.6.32.48/drivers/message/fusion/mptbase.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/message/fusion/mptbase.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/message/fusion/mptbase.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/message/fusion/mptbase.c 2011-11-15 19:59:43.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);
@@ -33703,8 +33703,8 @@ diff -urNp linux-2.6.32.48/drivers/message/fusion/mptbase.c linux-2.6.32.48/driv
* Rounding UP to nearest 4-kB boundary here...
*/
diff -urNp linux-2.6.32.48/drivers/message/fusion/mptsas.c linux-2.6.32.48/drivers/message/fusion/mptsas.c
---- linux-2.6.32.48/drivers/message/fusion/mptsas.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/message/fusion/mptsas.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/message/fusion/mptsas.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/message/fusion/mptsas.c 2011-11-15 19:59:43.000000000 -0500
@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
return 0;
}
@@ -33754,8 +33754,8 @@ diff -urNp linux-2.6.32.48/drivers/message/fusion/mptsas.c linux-2.6.32.48/drive
mptsas_get_port(struct mptsas_phyinfo *phy_info)
{
diff -urNp linux-2.6.32.48/drivers/message/fusion/mptscsih.c linux-2.6.32.48/drivers/message/fusion/mptscsih.c
---- linux-2.6.32.48/drivers/message/fusion/mptscsih.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/message/fusion/mptscsih.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/message/fusion/mptscsih.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/message/fusion/mptscsih.c 2011-11-15 19:59:43.000000000 -0500
@@ -1248,15 +1248,16 @@ mptscsih_info(struct Scsi_Host *SChost)
h = shost_priv(SChost);
@@ -33782,8 +33782,8 @@ diff -urNp linux-2.6.32.48/drivers/message/fusion/mptscsih.c linux-2.6.32.48/dri
return h->info_kbuf;
}
diff -urNp linux-2.6.32.48/drivers/message/i2o/i2o_config.c linux-2.6.32.48/drivers/message/i2o/i2o_config.c
---- linux-2.6.32.48/drivers/message/i2o/i2o_config.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/message/i2o/i2o_config.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/message/i2o/i2o_config.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/message/i2o/i2o_config.c 2011-11-15 19:59:43.000000000 -0500
@@ -787,6 +787,8 @@ static int i2o_cfg_passthru(unsigned lon
struct i2o_message *msg;
unsigned int iop;
@@ -33794,8 +33794,8 @@ diff -urNp linux-2.6.32.48/drivers/message/i2o/i2o_config.c linux-2.6.32.48/driv
return -EFAULT;
diff -urNp linux-2.6.32.48/drivers/message/i2o/i2o_proc.c linux-2.6.32.48/drivers/message/i2o/i2o_proc.c
---- linux-2.6.32.48/drivers/message/i2o/i2o_proc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/message/i2o/i2o_proc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/message/i2o/i2o_proc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/message/i2o/i2o_proc.c 2011-11-15 19:59:43.000000000 -0500
@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
"Array Controller Device"
};
@@ -33883,8 +33883,8 @@ diff -urNp linux-2.6.32.48/drivers/message/i2o/i2o_proc.c linux-2.6.32.48/driver
return 0;
}
diff -urNp linux-2.6.32.48/drivers/message/i2o/iop.c linux-2.6.32.48/drivers/message/i2o/iop.c
---- linux-2.6.32.48/drivers/message/i2o/iop.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/message/i2o/iop.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/message/i2o/iop.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/message/i2o/iop.c 2011-11-15 19:59:43.000000000 -0500
@@ -110,10 +110,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro
spin_lock_irqsave(&c->context_list_lock, flags);
@@ -33909,8 +33909,8 @@ diff -urNp linux-2.6.32.48/drivers/message/i2o/iop.c linux-2.6.32.48/drivers/mes
#endif
diff -urNp linux-2.6.32.48/drivers/mfd/wm8350-i2c.c linux-2.6.32.48/drivers/mfd/wm8350-i2c.c
---- linux-2.6.32.48/drivers/mfd/wm8350-i2c.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/mfd/wm8350-i2c.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/mfd/wm8350-i2c.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/mfd/wm8350-i2c.c 2011-11-15 19:59:43.000000000 -0500
@@ -43,6 +43,8 @@ static int wm8350_i2c_write_device(struc
u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
int ret;
@@ -33921,8 +33921,8 @@ diff -urNp linux-2.6.32.48/drivers/mfd/wm8350-i2c.c linux-2.6.32.48/drivers/mfd/
return -EINVAL;
diff -urNp linux-2.6.32.48/drivers/misc/kgdbts.c linux-2.6.32.48/drivers/misc/kgdbts.c
---- linux-2.6.32.48/drivers/misc/kgdbts.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/misc/kgdbts.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/misc/kgdbts.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/misc/kgdbts.c 2011-11-15 19:59:43.000000000 -0500
@@ -118,7 +118,7 @@
} while (0)
#define MAX_CONFIG_LEN 40
@@ -33942,8 +33942,8 @@ diff -urNp linux-2.6.32.48/drivers/misc/kgdbts.c linux-2.6.32.48/drivers/misc/kg
.read_char = kgdbts_get_char,
.write_char = kgdbts_put_char,
diff -urNp linux-2.6.32.48/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.48/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.32.48/drivers/misc/sgi-gru/gruhandles.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/misc/sgi-gru/gruhandles.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/misc/sgi-gru/gruhandles.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/misc/sgi-gru/gruhandles.c 2011-11-15 19:59:43.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)
@@ -33956,8 +33956,8 @@ diff -urNp linux-2.6.32.48/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.48/dri
mcs_op_statistics[op].max = clks;
}
diff -urNp linux-2.6.32.48/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.48/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.32.48/drivers/misc/sgi-gru/gruprocfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/misc/sgi-gru/gruprocfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/misc/sgi-gru/gruprocfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/misc/sgi-gru/gruprocfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -32,9 +32,9 @@
#define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -33982,8 +33982,8 @@ diff -urNp linux-2.6.32.48/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.48/driv
seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
count ? total / count : 0, max);
diff -urNp linux-2.6.32.48/drivers/misc/sgi-gru/grutables.h linux-2.6.32.48/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.32.48/drivers/misc/sgi-gru/grutables.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/misc/sgi-gru/grutables.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/misc/sgi-gru/grutables.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/misc/sgi-gru/grutables.h 2011-11-15 19:59:43.000000000 -0500
@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
* GRU statistics.
*/
@@ -34168,8 +34168,8 @@ diff -urNp linux-2.6.32.48/drivers/misc/sgi-gru/grutables.h linux-2.6.32.48/driv
#ifdef CONFIG_SGI_GRU_DEBUG
diff -urNp linux-2.6.32.48/drivers/misc/sgi-xp/xpc.h linux-2.6.32.48/drivers/misc/sgi-xp/xpc.h
---- linux-2.6.32.48/drivers/misc/sgi-xp/xpc.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/misc/sgi-xp/xpc.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/misc/sgi-xp/xpc.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/misc/sgi-xp/xpc.h 2011-11-15 19:59:43.000000000 -0500
@@ -876,7 +876,7 @@ extern struct xpc_registration xpc_regis
/* found in xpc_main.c */
extern struct device *xpc_part;
@@ -34180,8 +34180,8 @@ diff -urNp linux-2.6.32.48/drivers/misc/sgi-xp/xpc.h linux-2.6.32.48/drivers/mis
extern int xpc_disengage_timedout;
extern int xpc_activate_IRQ_rcvd;
diff -urNp linux-2.6.32.48/drivers/misc/sgi-xp/xpc_main.c linux-2.6.32.48/drivers/misc/sgi-xp/xpc_main.c
---- linux-2.6.32.48/drivers/misc/sgi-xp/xpc_main.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/misc/sgi-xp/xpc_main.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/misc/sgi-xp/xpc_main.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/misc/sgi-xp/xpc_main.c 2011-11-15 19:59:43.000000000 -0500
@@ -169,7 +169,7 @@ static struct notifier_block xpc_die_not
.notifier_call = xpc_system_die,
};
@@ -34192,8 +34192,8 @@ diff -urNp linux-2.6.32.48/drivers/misc/sgi-xp/xpc_main.c linux-2.6.32.48/driver
/*
* Timer function to enforce the timelimit on the partition disengage.
diff -urNp linux-2.6.32.48/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.32.48/drivers/misc/sgi-xp/xpc_sn2.c
---- linux-2.6.32.48/drivers/misc/sgi-xp/xpc_sn2.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/misc/sgi-xp/xpc_sn2.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/misc/sgi-xp/xpc_sn2.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/misc/sgi-xp/xpc_sn2.c 2011-11-15 19:59:43.000000000 -0500
@@ -2350,7 +2350,7 @@ xpc_received_payload_sn2(struct xpc_chan
xpc_acknowledge_msgs_sn2(ch, get, msg->flags);
}
@@ -34215,8 +34215,8 @@ diff -urNp linux-2.6.32.48/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.32.48/drivers
if (offsetof(struct xpc_msg_sn2, payload) > XPC_MSG_HDR_MAX_SIZE) {
dev_err(xpc_part, "header portion of struct xpc_msg_sn2 is "
diff -urNp linux-2.6.32.48/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.32.48/drivers/misc/sgi-xp/xpc_uv.c
---- linux-2.6.32.48/drivers/misc/sgi-xp/xpc_uv.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/misc/sgi-xp/xpc_uv.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/misc/sgi-xp/xpc_uv.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/misc/sgi-xp/xpc_uv.c 2011-11-15 19:59:43.000000000 -0500
@@ -1669,7 +1669,7 @@ xpc_received_payload_uv(struct xpc_chann
XPC_DEACTIVATE_PARTITION(&xpc_partitions[ch->partid], ret);
}
@@ -34238,8 +34238,8 @@ diff -urNp linux-2.6.32.48/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.32.48/drivers/
if (sizeof(struct xpc_notify_mq_msghdr_uv) > XPC_MSG_HDR_MAX_SIZE) {
dev_err(xpc_part, "xpc_notify_mq_msghdr_uv is larger than %d\n",
diff -urNp linux-2.6.32.48/drivers/misc/sgi-xp/xp.h linux-2.6.32.48/drivers/misc/sgi-xp/xp.h
---- linux-2.6.32.48/drivers/misc/sgi-xp/xp.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/misc/sgi-xp/xp.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/misc/sgi-xp/xp.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/misc/sgi-xp/xp.h 2011-11-15 19:59:43.000000000 -0500
@@ -289,7 +289,7 @@ struct xpc_interface {
xpc_notify_func, void *);
void (*received) (short, int, void *);
@@ -34250,8 +34250,8 @@ diff -urNp linux-2.6.32.48/drivers/misc/sgi-xp/xp.h linux-2.6.32.48/drivers/misc
extern struct xpc_interface xpc_interface;
diff -urNp linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0001.c
---- linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0001.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-15 19:59:43.000000000 -0500
@@ -743,6 +743,8 @@ static int chip_ready (struct map_info *
struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
unsigned long timeo = jiffies + HZ;
@@ -34280,8 +34280,8 @@ diff -urNp linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.32.48/d
retry:
diff -urNp linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0020.c
---- linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0020.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-15 19:59:43.000000000 -0500
@@ -255,6 +255,8 @@ static inline int do_read_onechip(struct
unsigned long cmd_addr;
struct cfi_private *cfi = map->fldrv_priv;
@@ -34328,8 +34328,8 @@ diff -urNp linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.32.48/d
/* Let's determine this according to the interleave only once */
diff -urNp linux-2.6.32.48/drivers/mtd/devices/doc2000.c linux-2.6.32.48/drivers/mtd/devices/doc2000.c
---- linux-2.6.32.48/drivers/mtd/devices/doc2000.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/mtd/devices/doc2000.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/mtd/devices/doc2000.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/mtd/devices/doc2000.c 2011-11-15 19:59:43.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 */
@@ -34340,8 +34340,8 @@ diff -urNp linux-2.6.32.48/drivers/mtd/devices/doc2000.c linux-2.6.32.48/drivers
"ECC needs a full sector write (adr: %lx size %lx)\n",
(long) to, (long) len);
diff -urNp linux-2.6.32.48/drivers/mtd/devices/doc2001.c linux-2.6.32.48/drivers/mtd/devices/doc2001.c
---- linux-2.6.32.48/drivers/mtd/devices/doc2001.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/mtd/devices/doc2001.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/mtd/devices/doc2001.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/mtd/devices/doc2001.c 2011-11-15 19:59:43.000000000 -0500
@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
struct Nand *mychip = &this->chips[from >> (this->chipshift)];
@@ -34352,8 +34352,8 @@ diff -urNp linux-2.6.32.48/drivers/mtd/devices/doc2001.c linux-2.6.32.48/drivers
/* Don't allow a single read to cross a 512-byte block boundary */
diff -urNp linux-2.6.32.48/drivers/mtd/ftl.c linux-2.6.32.48/drivers/mtd/ftl.c
---- linux-2.6.32.48/drivers/mtd/ftl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/mtd/ftl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/mtd/ftl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/mtd/ftl.c 2011-11-15 19:59:43.000000000 -0500
@@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *
loff_t offset;
uint16_t srcunitswap = cpu_to_le16(srcunit);
@@ -34364,8 +34364,8 @@ diff -urNp linux-2.6.32.48/drivers/mtd/ftl.c linux-2.6.32.48/drivers/mtd/ftl.c
xfer = &part->XferInfo[xferunit];
DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n",
diff -urNp linux-2.6.32.48/drivers/mtd/inftlcore.c linux-2.6.32.48/drivers/mtd/inftlcore.c
---- linux-2.6.32.48/drivers/mtd/inftlcore.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/mtd/inftlcore.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/mtd/inftlcore.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/mtd/inftlcore.c 2011-11-15 19:59:43.000000000 -0500
@@ -260,6 +260,8 @@ static u16 INFTL_foldchain(struct INFTLr
struct inftl_oob oob;
size_t retlen;
@@ -34376,8 +34376,8 @@ diff -urNp linux-2.6.32.48/drivers/mtd/inftlcore.c linux-2.6.32.48/drivers/mtd/i
"pending=%d)\n", inftl, thisVUC, pendingblock);
diff -urNp linux-2.6.32.48/drivers/mtd/inftlmount.c linux-2.6.32.48/drivers/mtd/inftlmount.c
---- linux-2.6.32.48/drivers/mtd/inftlmount.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/mtd/inftlmount.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/mtd/inftlmount.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/mtd/inftlmount.c 2011-11-15 19:59:43.000000000 -0500
@@ -54,6 +54,8 @@ static int find_boot_record(struct INFTL
struct INFTLPartition *ip;
size_t retlen;
@@ -34388,8 +34388,8 @@ diff -urNp linux-2.6.32.48/drivers/mtd/inftlmount.c linux-2.6.32.48/drivers/mtd/
/*
diff -urNp linux-2.6.32.48/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.32.48/drivers/mtd/lpddr/qinfo_probe.c
---- linux-2.6.32.48/drivers/mtd/lpddr/qinfo_probe.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/mtd/lpddr/qinfo_probe.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/mtd/lpddr/qinfo_probe.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/mtd/lpddr/qinfo_probe.c 2011-11-15 19:59:43.000000000 -0500
@@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map
{
map_word pfow_val[4];
@@ -34400,8 +34400,8 @@ diff -urNp linux-2.6.32.48/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.32.48/drive
pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P);
pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F);
diff -urNp linux-2.6.32.48/drivers/mtd/mtdchar.c linux-2.6.32.48/drivers/mtd/mtdchar.c
---- linux-2.6.32.48/drivers/mtd/mtdchar.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/mtd/mtdchar.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/mtd/mtdchar.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/mtd/mtdchar.c 2011-11-15 19:59:43.000000000 -0500
@@ -460,6 +460,8 @@ static int mtd_ioctl(struct inode *inode
u_long size;
struct mtd_info_user info;
@@ -34412,8 +34412,8 @@ diff -urNp linux-2.6.32.48/drivers/mtd/mtdchar.c linux-2.6.32.48/drivers/mtd/mtd
size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
diff -urNp linux-2.6.32.48/drivers/mtd/nftlcore.c linux-2.6.32.48/drivers/mtd/nftlcore.c
---- linux-2.6.32.48/drivers/mtd/nftlcore.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/mtd/nftlcore.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/mtd/nftlcore.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/mtd/nftlcore.c 2011-11-15 19:59:43.000000000 -0500
@@ -254,6 +254,8 @@ static u16 NFTL_foldchain (struct NFTLre
int inplace = 1;
size_t retlen;
@@ -34424,8 +34424,8 @@ diff -urNp linux-2.6.32.48/drivers/mtd/nftlcore.c linux-2.6.32.48/drivers/mtd/nf
memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
diff -urNp linux-2.6.32.48/drivers/mtd/nftlmount.c linux-2.6.32.48/drivers/mtd/nftlmount.c
---- linux-2.6.32.48/drivers/mtd/nftlmount.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/mtd/nftlmount.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/mtd/nftlmount.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/mtd/nftlmount.c 2011-11-15 19:59:43.000000000 -0500
@@ -23,6 +23,7 @@
#include <asm/errno.h>
#include <linux/delay.h>
@@ -34444,8 +34444,8 @@ diff -urNp linux-2.6.32.48/drivers/mtd/nftlmount.c linux-2.6.32.48/drivers/mtd/n
We'll sort it out later if we find a MediaHeader which says otherwise */
/* Actually, we won't. The new DiskOnChip driver has already scanned
diff -urNp linux-2.6.32.48/drivers/mtd/ubi/build.c linux-2.6.32.48/drivers/mtd/ubi/build.c
---- linux-2.6.32.48/drivers/mtd/ubi/build.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/mtd/ubi/build.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/mtd/ubi/build.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/mtd/ubi/build.c 2011-11-15 19:59:43.000000000 -0500
@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
static int __init bytes_str_to_int(const char *str)
{
@@ -34486,8 +34486,8 @@ diff -urNp linux-2.6.32.48/drivers/mtd/ubi/build.c linux-2.6.32.48/drivers/mtd/u
/**
diff -urNp linux-2.6.32.48/drivers/net/bnx2.c linux-2.6.32.48/drivers/net/bnx2.c
---- linux-2.6.32.48/drivers/net/bnx2.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/bnx2.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/bnx2.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/bnx2.c 2011-11-15 19:59:43.000000000 -0500
@@ -5809,6 +5809,8 @@ bnx2_test_nvram(struct bnx2 *bp)
int rc = 0;
u32 magic, csum;
@@ -34498,8 +34498,8 @@ diff -urNp linux-2.6.32.48/drivers/net/bnx2.c linux-2.6.32.48/drivers/net/bnx2.c
goto test_nvram_done;
diff -urNp linux-2.6.32.48/drivers/net/cxgb3/l2t.h linux-2.6.32.48/drivers/net/cxgb3/l2t.h
---- linux-2.6.32.48/drivers/net/cxgb3/l2t.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/cxgb3/l2t.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/cxgb3/l2t.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/cxgb3/l2t.h 2011-11-15 19:59:43.000000000 -0500
@@ -86,7 +86,7 @@ typedef void (*arp_failure_handler_func)
*/
struct l2t_skb_cb {
@@ -34510,8 +34510,8 @@ diff -urNp linux-2.6.32.48/drivers/net/cxgb3/l2t.h linux-2.6.32.48/drivers/net/c
#define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
diff -urNp linux-2.6.32.48/drivers/net/cxgb3/t3_hw.c linux-2.6.32.48/drivers/net/cxgb3/t3_hw.c
---- linux-2.6.32.48/drivers/net/cxgb3/t3_hw.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/cxgb3/t3_hw.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/cxgb3/t3_hw.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/cxgb3/t3_hw.c 2011-11-15 19:59:43.000000000 -0500
@@ -699,6 +699,8 @@ static int get_vpd_params(struct adapter
int i, addr, ret;
struct t3_vpd vpd;
@@ -34522,8 +34522,8 @@ diff -urNp linux-2.6.32.48/drivers/net/cxgb3/t3_hw.c linux-2.6.32.48/drivers/net
* Card information is normally at VPD_BASE but some early cards had
* it at 0.
diff -urNp linux-2.6.32.48/drivers/net/e1000e/82571.c linux-2.6.32.48/drivers/net/e1000e/82571.c
---- linux-2.6.32.48/drivers/net/e1000e/82571.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/e1000e/82571.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/e1000e/82571.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/e1000e/82571.c 2011-11-15 19:59:43.000000000 -0500
@@ -212,7 +212,7 @@ static s32 e1000_init_mac_params_82571(s
{
struct e1000_hw *hw = &adapter->hw;
@@ -34579,8 +34579,8 @@ diff -urNp linux-2.6.32.48/drivers/net/e1000e/82571.c linux-2.6.32.48/drivers/ne
.read_nvm = e1000e_read_nvm_eerd,
.release_nvm = e1000_release_nvm_82571,
diff -urNp linux-2.6.32.48/drivers/net/e1000e/e1000.h linux-2.6.32.48/drivers/net/e1000e/e1000.h
---- linux-2.6.32.48/drivers/net/e1000e/e1000.h 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/e1000e/e1000.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/e1000e/e1000.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/e1000e/e1000.h 2011-11-15 19:59:43.000000000 -0500
@@ -375,9 +375,9 @@ struct e1000_info {
u32 pba;
u32 max_hw_frame_size;
@@ -34595,8 +34595,8 @@ diff -urNp linux-2.6.32.48/drivers/net/e1000e/e1000.h linux-2.6.32.48/drivers/ne
/* hardware capability, feature, and workaround flags */
diff -urNp linux-2.6.32.48/drivers/net/e1000e/es2lan.c linux-2.6.32.48/drivers/net/e1000e/es2lan.c
---- linux-2.6.32.48/drivers/net/e1000e/es2lan.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/e1000e/es2lan.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/e1000e/es2lan.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/e1000e/es2lan.c 2011-11-15 19:59:43.000000000 -0500
@@ -207,7 +207,7 @@ static s32 e1000_init_mac_params_80003es
{
struct e1000_hw *hw = &adapter->hw;
@@ -34634,8 +34634,8 @@ diff -urNp linux-2.6.32.48/drivers/net/e1000e/es2lan.c linux-2.6.32.48/drivers/n
.read_nvm = e1000e_read_nvm_eerd,
.release_nvm = e1000_release_nvm_80003es2lan,
diff -urNp linux-2.6.32.48/drivers/net/e1000e/hw.h linux-2.6.32.48/drivers/net/e1000e/hw.h
---- linux-2.6.32.48/drivers/net/e1000e/hw.h 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/e1000e/hw.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/e1000e/hw.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/e1000e/hw.h 2011-11-15 19:59:43.000000000 -0500
@@ -753,6 +753,7 @@ struct e1000_mac_operations {
s32 (*setup_physical_interface)(struct e1000_hw *);
s32 (*setup_led)(struct e1000_hw *);
@@ -34683,8 +34683,8 @@ diff -urNp linux-2.6.32.48/drivers/net/e1000e/hw.h linux-2.6.32.48/drivers/net/e
enum e1000_nvm_type type;
enum e1000_nvm_override override;
diff -urNp linux-2.6.32.48/drivers/net/e1000e/ich8lan.c linux-2.6.32.48/drivers/net/e1000e/ich8lan.c
---- linux-2.6.32.48/drivers/net/e1000e/ich8lan.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/e1000e/ich8lan.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/e1000e/ich8lan.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/e1000e/ich8lan.c 2011-11-15 19:59:43.000000000 -0500
@@ -3463,7 +3463,7 @@ static void e1000_clear_hw_cntrs_ich8lan
}
}
@@ -34713,8 +34713,8 @@ diff -urNp linux-2.6.32.48/drivers/net/e1000e/ich8lan.c linux-2.6.32.48/drivers/
.read_nvm = e1000_read_nvm_ich8lan,
.release_nvm = e1000_release_nvm_ich8lan,
diff -urNp linux-2.6.32.48/drivers/net/hamradio/6pack.c linux-2.6.32.48/drivers/net/hamradio/6pack.c
---- linux-2.6.32.48/drivers/net/hamradio/6pack.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/hamradio/6pack.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/hamradio/6pack.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/hamradio/6pack.c 2011-11-15 19:59:43.000000000 -0500
@@ -461,6 +461,8 @@ static void sixpack_receive_buf(struct t
unsigned char buf[512];
int count1;
@@ -34725,8 +34725,8 @@ diff -urNp linux-2.6.32.48/drivers/net/hamradio/6pack.c linux-2.6.32.48/drivers/
return;
diff -urNp linux-2.6.32.48/drivers/net/ibmveth.c linux-2.6.32.48/drivers/net/ibmveth.c
---- linux-2.6.32.48/drivers/net/ibmveth.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/ibmveth.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/ibmveth.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/ibmveth.c 2011-11-15 19:59:43.000000000 -0500
@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
NULL,
};
@@ -34737,8 +34737,8 @@ diff -urNp linux-2.6.32.48/drivers/net/ibmveth.c linux-2.6.32.48/drivers/net/ibm
.store = veth_pool_store,
};
diff -urNp linux-2.6.32.48/drivers/net/igb/e1000_82575.c linux-2.6.32.48/drivers/net/igb/e1000_82575.c
---- linux-2.6.32.48/drivers/net/igb/e1000_82575.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/igb/e1000_82575.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/igb/e1000_82575.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/igb/e1000_82575.c 2011-11-15 19:59:43.000000000 -0500
@@ -1411,7 +1411,7 @@ void igb_vmdq_set_replication_pf(struct
wr32(E1000_VT_CTL, vt_ctl);
}
@@ -34765,8 +34765,8 @@ diff -urNp linux-2.6.32.48/drivers/net/igb/e1000_82575.c linux-2.6.32.48/drivers
.read = igb_read_nvm_eerd,
.release = igb_release_nvm_82575,
diff -urNp linux-2.6.32.48/drivers/net/igb/e1000_hw.h linux-2.6.32.48/drivers/net/igb/e1000_hw.h
---- linux-2.6.32.48/drivers/net/igb/e1000_hw.h 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/igb/e1000_hw.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/igb/e1000_hw.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/igb/e1000_hw.h 2011-11-15 19:59:43.000000000 -0500
@@ -288,6 +288,7 @@ struct e1000_mac_operations {
s32 (*read_mac_addr)(struct e1000_hw *);
s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
@@ -34836,8 +34836,8 @@ diff -urNp linux-2.6.32.48/drivers/net/igb/e1000_hw.h linux-2.6.32.48/drivers/ne
u32 timeout;
u32 usec_delay;
diff -urNp linux-2.6.32.48/drivers/net/igbvf/vf.h linux-2.6.32.48/drivers/net/igbvf/vf.h
---- linux-2.6.32.48/drivers/net/igbvf/vf.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/igbvf/vf.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/igbvf/vf.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/igbvf/vf.h 2011-11-15 19:59:43.000000000 -0500
@@ -187,9 +187,10 @@ struct e1000_mac_operations {
s32 (*read_mac_addr)(struct e1000_hw *);
s32 (*set_vfta)(struct e1000_hw *, u16, bool);
@@ -34868,8 +34868,8 @@ diff -urNp linux-2.6.32.48/drivers/net/igbvf/vf.h linux-2.6.32.48/drivers/net/ig
u32 timeout;
u32 usec_delay;
diff -urNp linux-2.6.32.48/drivers/net/iseries_veth.c linux-2.6.32.48/drivers/net/iseries_veth.c
---- linux-2.6.32.48/drivers/net/iseries_veth.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/iseries_veth.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/iseries_veth.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/iseries_veth.c 2011-11-15 19:59:43.000000000 -0500
@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
NULL
};
@@ -34889,8 +34889,8 @@ diff -urNp linux-2.6.32.48/drivers/net/iseries_veth.c linux-2.6.32.48/drivers/ne
};
diff -urNp linux-2.6.32.48/drivers/net/ixgb/ixgb_main.c linux-2.6.32.48/drivers/net/ixgb/ixgb_main.c
---- linux-2.6.32.48/drivers/net/ixgb/ixgb_main.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/ixgb/ixgb_main.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/ixgb/ixgb_main.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/ixgb/ixgb_main.c 2011-11-15 19:59:43.000000000 -0500
@@ -1052,6 +1052,8 @@ ixgb_set_multi(struct net_device *netdev
u32 rctl;
int i;
@@ -34901,8 +34901,8 @@ diff -urNp linux-2.6.32.48/drivers/net/ixgb/ixgb_main.c linux-2.6.32.48/drivers/
rctl = IXGB_READ_REG(hw, RCTL);
diff -urNp linux-2.6.32.48/drivers/net/ixgb/ixgb_param.c linux-2.6.32.48/drivers/net/ixgb/ixgb_param.c
---- linux-2.6.32.48/drivers/net/ixgb/ixgb_param.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/ixgb/ixgb_param.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/ixgb/ixgb_param.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/ixgb/ixgb_param.c 2011-11-15 19:59:43.000000000 -0500
@@ -260,6 +260,9 @@ void __devinit
ixgb_check_options(struct ixgb_adapter *adapter)
{
@@ -34914,8 +34914,8 @@ diff -urNp linux-2.6.32.48/drivers/net/ixgb/ixgb_param.c linux-2.6.32.48/drivers
printk(KERN_NOTICE
"Warning: no configuration for board #%i\n", bd);
diff -urNp linux-2.6.32.48/drivers/net/ixgbe/ixgbe_type.h linux-2.6.32.48/drivers/net/ixgbe/ixgbe_type.h
---- linux-2.6.32.48/drivers/net/ixgbe/ixgbe_type.h 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/ixgbe/ixgbe_type.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/ixgbe/ixgbe_type.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/ixgbe/ixgbe_type.h 2011-11-15 19:59:43.000000000 -0500
@@ -2327,6 +2327,7 @@ struct ixgbe_eeprom_operations {
s32 (*validate_checksum)(struct ixgbe_hw *, u16 *);
s32 (*update_checksum)(struct ixgbe_hw *);
@@ -34963,8 +34963,8 @@ diff -urNp linux-2.6.32.48/drivers/net/ixgbe/ixgbe_type.h linux-2.6.32.48/driver
enum ixgbe_phy_type type;
u32 id;
diff -urNp linux-2.6.32.48/drivers/net/mlx4/main.c linux-2.6.32.48/drivers/net/mlx4/main.c
---- linux-2.6.32.48/drivers/net/mlx4/main.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/mlx4/main.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/mlx4/main.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/mlx4/main.c 2011-11-15 19:59:43.000000000 -0500
@@ -38,6 +38,7 @@
#include <linux/errno.h>
#include <linux/pci.h>
@@ -34983,8 +34983,8 @@ diff -urNp linux-2.6.32.48/drivers/net/mlx4/main.c linux-2.6.32.48/drivers/net/m
if (err) {
if (err == -EACCES)
diff -urNp linux-2.6.32.48/drivers/net/niu.c linux-2.6.32.48/drivers/net/niu.c
---- linux-2.6.32.48/drivers/net/niu.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/niu.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/niu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/niu.c 2011-11-15 19:59:43.000000000 -0500
@@ -9128,6 +9128,8 @@ static void __devinit niu_try_msix(struc
int i, num_irqs, err;
u8 first_ldg;
@@ -34995,8 +34995,8 @@ diff -urNp linux-2.6.32.48/drivers/net/niu.c linux-2.6.32.48/drivers/net/niu.c
for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++)
ldg_num_map[i] = first_ldg + i;
diff -urNp linux-2.6.32.48/drivers/net/pcnet32.c linux-2.6.32.48/drivers/net/pcnet32.c
---- linux-2.6.32.48/drivers/net/pcnet32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/pcnet32.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/pcnet32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/pcnet32.c 2011-11-15 19:59:43.000000000 -0500
@@ -79,7 +79,7 @@ static int cards_found;
/*
* VLB I/O addresses
@@ -35634,8 +35634,8 @@ diff -urNp linux-2.6.32.48/drivers/net/pcnet32.c linux-2.6.32.48/drivers/net/pcn
} else {
if (netif_msg_link(lp))
diff -urNp linux-2.6.32.48/drivers/net/tg3.h linux-2.6.32.48/drivers/net/tg3.h
---- linux-2.6.32.48/drivers/net/tg3.h 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/tg3.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/tg3.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/tg3.h 2011-11-15 19:59:43.000000000 -0500
@@ -95,6 +95,7 @@
#define CHIPREV_ID_5750_A0 0x4000
#define CHIPREV_ID_5750_A1 0x4001
@@ -35645,8 +35645,8 @@ diff -urNp linux-2.6.32.48/drivers/net/tg3.h linux-2.6.32.48/drivers/net/tg3.h
#define CHIPREV_ID_5752_A0_HW 0x5000
#define CHIPREV_ID_5752_A0 0x6000
diff -urNp linux-2.6.32.48/drivers/net/tokenring/abyss.c linux-2.6.32.48/drivers/net/tokenring/abyss.c
---- linux-2.6.32.48/drivers/net/tokenring/abyss.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/tokenring/abyss.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/tokenring/abyss.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/tokenring/abyss.c 2011-11-15 19:59:43.000000000 -0500
@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver =
static int __init abyss_init (void)
@@ -35664,8 +35664,8 @@ diff -urNp linux-2.6.32.48/drivers/net/tokenring/abyss.c linux-2.6.32.48/drivers
return pci_register_driver(&abyss_driver);
}
diff -urNp linux-2.6.32.48/drivers/net/tokenring/madgemc.c linux-2.6.32.48/drivers/net/tokenring/madgemc.c
---- linux-2.6.32.48/drivers/net/tokenring/madgemc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/tokenring/madgemc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/tokenring/madgemc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/tokenring/madgemc.c 2011-11-15 19:59:43.000000000 -0500
@@ -755,9 +755,11 @@ static struct mca_driver madgemc_driver
static int __init madgemc_init (void)
@@ -35682,8 +35682,8 @@ diff -urNp linux-2.6.32.48/drivers/net/tokenring/madgemc.c linux-2.6.32.48/drive
return mca_register_driver (&madgemc_driver);
}
diff -urNp linux-2.6.32.48/drivers/net/tokenring/proteon.c linux-2.6.32.48/drivers/net/tokenring/proteon.c
---- linux-2.6.32.48/drivers/net/tokenring/proteon.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/tokenring/proteon.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/tokenring/proteon.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/tokenring/proteon.c 2011-11-15 19:59:43.000000000 -0500
@@ -353,9 +353,11 @@ static int __init proteon_init(void)
struct platform_device *pdev;
int i, num = 0, err = 0;
@@ -35700,8 +35700,8 @@ diff -urNp linux-2.6.32.48/drivers/net/tokenring/proteon.c linux-2.6.32.48/drive
err = platform_driver_register(&proteon_driver);
if (err)
diff -urNp linux-2.6.32.48/drivers/net/tokenring/skisa.c linux-2.6.32.48/drivers/net/tokenring/skisa.c
---- linux-2.6.32.48/drivers/net/tokenring/skisa.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/tokenring/skisa.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/tokenring/skisa.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/tokenring/skisa.c 2011-11-15 19:59:43.000000000 -0500
@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
struct platform_device *pdev;
int i, num = 0, err = 0;
@@ -35718,8 +35718,8 @@ diff -urNp linux-2.6.32.48/drivers/net/tokenring/skisa.c linux-2.6.32.48/drivers
err = platform_driver_register(&sk_isa_driver);
if (err)
diff -urNp linux-2.6.32.48/drivers/net/tulip/de2104x.c linux-2.6.32.48/drivers/net/tulip/de2104x.c
---- linux-2.6.32.48/drivers/net/tulip/de2104x.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/tulip/de2104x.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/tulip/de2104x.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/tulip/de2104x.c 2011-11-15 19:59:43.000000000 -0500
@@ -1785,6 +1785,8 @@ static void __devinit de21041_get_srom_i
struct de_srom_info_leaf *il;
void *bufp;
@@ -35730,8 +35730,8 @@ diff -urNp linux-2.6.32.48/drivers/net/tulip/de2104x.c linux-2.6.32.48/drivers/n
for (i = 0; i < DE_EEPROM_WORDS; i++)
((__le16 *)ee_data)[i] =
diff -urNp linux-2.6.32.48/drivers/net/tulip/de4x5.c linux-2.6.32.48/drivers/net/tulip/de4x5.c
---- linux-2.6.32.48/drivers/net/tulip/de4x5.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/tulip/de4x5.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/tulip/de4x5.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/tulip/de4x5.c 2011-11-15 19:59:43.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];
@@ -35751,8 +35751,8 @@ diff -urNp linux-2.6.32.48/drivers/net/tulip/de4x5.c linux-2.6.32.48/drivers/net
break;
}
diff -urNp linux-2.6.32.48/drivers/net/usb/hso.c linux-2.6.32.48/drivers/net/usb/hso.c
---- linux-2.6.32.48/drivers/net/usb/hso.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/usb/hso.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/usb/hso.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/usb/hso.c 2011-11-15 19:59:43.000000000 -0500
@@ -71,7 +71,7 @@
#include <asm/byteorder.h>
#include <linux/serial_core.h>
@@ -35841,8 +35841,8 @@ diff -urNp linux-2.6.32.48/drivers/net/usb/hso.c linux-2.6.32.48/drivers/net/usb
hso_start_serial_device(serial_table[i], GFP_NOIO);
hso_kick_transmit(dev2ser(serial_table[i]));
diff -urNp linux-2.6.32.48/drivers/net/vxge/vxge-config.h linux-2.6.32.48/drivers/net/vxge/vxge-config.h
---- linux-2.6.32.48/drivers/net/vxge/vxge-config.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/vxge/vxge-config.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/vxge/vxge-config.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/vxge/vxge-config.h 2011-11-15 19:59:43.000000000 -0500
@@ -474,7 +474,7 @@ struct vxge_hw_uld_cbs {
void (*link_down)(struct __vxge_hw_device *devh);
void (*crit_err)(struct __vxge_hw_device *devh,
@@ -35853,8 +35853,8 @@ diff -urNp linux-2.6.32.48/drivers/net/vxge/vxge-config.h linux-2.6.32.48/driver
/*
* struct __vxge_hw_blockpool_entry - Block private data structure
diff -urNp linux-2.6.32.48/drivers/net/vxge/vxge-main.c linux-2.6.32.48/drivers/net/vxge/vxge-main.c
---- linux-2.6.32.48/drivers/net/vxge/vxge-main.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/vxge/vxge-main.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/vxge/vxge-main.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/vxge/vxge-main.c 2011-11-15 19:59:43.000000000 -0500
@@ -93,6 +93,8 @@ static inline void VXGE_COMPLETE_VPATH_T
struct sk_buff *completed[NR_SKB_COMPLETED];
int more;
@@ -35874,8 +35874,8 @@ diff -urNp linux-2.6.32.48/drivers/net/vxge/vxge-main.c linux-2.6.32.48/drivers/
* Filling
* - itable with bucket numbers
diff -urNp linux-2.6.32.48/drivers/net/vxge/vxge-traffic.h linux-2.6.32.48/drivers/net/vxge/vxge-traffic.h
---- linux-2.6.32.48/drivers/net/vxge/vxge-traffic.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/vxge/vxge-traffic.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/vxge/vxge-traffic.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/vxge/vxge-traffic.h 2011-11-15 19:59:43.000000000 -0500
@@ -2123,7 +2123,7 @@ struct vxge_hw_mempool_cbs {
struct vxge_hw_mempool_dma *dma_object,
u32 index,
@@ -35886,8 +35886,8 @@ diff -urNp linux-2.6.32.48/drivers/net/vxge/vxge-traffic.h linux-2.6.32.48/drive
void
__vxge_hw_mempool_destroy(
diff -urNp linux-2.6.32.48/drivers/net/wan/cycx_x25.c linux-2.6.32.48/drivers/net/wan/cycx_x25.c
---- linux-2.6.32.48/drivers/net/wan/cycx_x25.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wan/cycx_x25.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wan/cycx_x25.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wan/cycx_x25.c 2011-11-15 19:59:43.000000000 -0500
@@ -1017,6 +1017,8 @@ static void hex_dump(char *msg, unsigned
unsigned char hex[1024],
* phex = hex;
@@ -35898,8 +35898,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wan/cycx_x25.c linux-2.6.32.48/drivers/ne
len = (sizeof(hex) / 2) - 1;
diff -urNp linux-2.6.32.48/drivers/net/wan/hdlc_x25.c linux-2.6.32.48/drivers/net/wan/hdlc_x25.c
---- linux-2.6.32.48/drivers/net/wan/hdlc_x25.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wan/hdlc_x25.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wan/hdlc_x25.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wan/hdlc_x25.c 2011-11-15 19:59:43.000000000 -0500
@@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_bu
static int x25_open(struct net_device *dev)
@@ -35926,8 +35926,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wan/hdlc_x25.c linux-2.6.32.48/drivers/ne
if (result != LAPB_OK)
return result;
diff -urNp linux-2.6.32.48/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.32.48/drivers/net/wimax/i2400m/usb-fw.c
---- linux-2.6.32.48/drivers/net/wimax/i2400m/usb-fw.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wimax/i2400m/usb-fw.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wimax/i2400m/usb-fw.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wimax/i2400m/usb-fw.c 2011-11-15 19:59:43.000000000 -0500
@@ -263,6 +263,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru
int do_autopm = 1;
DECLARE_COMPLETION_ONSTACK(notif_completion);
@@ -35938,8 +35938,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.32.48/dri
i2400m, ack, ack_size);
BUG_ON(_ack == i2400m->bm_ack_buf);
diff -urNp linux-2.6.32.48/drivers/net/wireless/airo.c linux-2.6.32.48/drivers/net/wireless/airo.c
---- linux-2.6.32.48/drivers/net/wireless/airo.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/airo.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/airo.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/airo.c 2011-11-15 19:59:43.000000000 -0500
@@ -3003,6 +3003,8 @@ static void airo_process_scan_results (s
BSSListElement * loop_net;
BSSListElement * tmp_net;
@@ -35995,8 +35995,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/airo.c linux-2.6.32.48/drivers/n
clear_bit(JOB_WSTATS, &local->jobs);
if (local->power.event) {
diff -urNp linux-2.6.32.48/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.32.48/drivers/net/wireless/ath/ath5k/debug.c
---- linux-2.6.32.48/drivers/net/wireless/ath/ath5k/debug.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/ath/ath5k/debug.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/ath/ath5k/debug.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/ath/ath5k/debug.c 2011-11-15 19:59:43.000000000 -0500
@@ -205,6 +205,8 @@ static ssize_t read_file_beacon(struct f
unsigned int v;
u64 tsf;
@@ -36016,8 +36016,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.32.4
"DEBUG LEVEL: 0x%08x\n\n", sc->debug.level);
diff -urNp linux-2.6.32.48/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.32.48/drivers/net/wireless/ath/ath9k/debug.c
---- linux-2.6.32.48/drivers/net/wireless/ath/ath9k/debug.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/ath/ath9k/debug.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/ath/ath9k/debug.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/ath/ath9k/debug.c 2011-11-15 19:59:43.000000000 -0500
@@ -220,6 +220,8 @@ static ssize_t read_file_interrupt(struc
char buf[512];
unsigned int len = 0;
@@ -36037,8 +36037,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.32.4
"primary: %s (%s chan=%d ht=%d)\n",
wiphy_name(sc->pri_wiphy->hw->wiphy),
diff -urNp linux-2.6.32.48/drivers/net/wireless/b43/debugfs.c linux-2.6.32.48/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.32.48/drivers/net/wireless/b43/debugfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/b43/debugfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/b43/debugfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/b43/debugfs.c 2011-11-15 19:59:43.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);
@@ -36049,8 +36049,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/b43/debugfs.c linux-2.6.32.48/dr
size_t file_struct_offset;
};
diff -urNp linux-2.6.32.48/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.48/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.32.48/drivers/net/wireless/b43legacy/debugfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/b43legacy/debugfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/b43legacy/debugfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/b43legacy/debugfs.c 2011-11-15 19:59:43.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);
@@ -36061,8 +36061,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32
size_t file_struct_offset;
/* Take wl->irq_lock before calling read/write? */
diff -urNp linux-2.6.32.48/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.32.48/drivers/net/wireless/ipw2x00/ipw2100.c
---- linux-2.6.32.48/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-15 19:59:43.000000000 -0500
@@ -2014,6 +2014,8 @@ static int ipw2100_set_essid(struct ipw2
int err;
DECLARE_SSID_BUF(ssid);
@@ -36082,8 +36082,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.32.4
idx, keylen, len);
diff -urNp linux-2.6.32.48/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.32.48/drivers/net/wireless/ipw2x00/libipw_rx.c
---- linux-2.6.32.48/drivers/net/wireless/ipw2x00/libipw_rx.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-15 19:59:43.000000000 -0500
@@ -1566,6 +1566,8 @@ static void libipw_process_probe_respons
unsigned long flags;
DECLARE_SSID_BUF(ssid);
@@ -36094,8 +36094,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.32
"): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
print_ssid(ssid, info_element->data, info_element->len),
diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-1000.c
---- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-1000.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-11-15 19:59:43.000000000 -0500
@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
},
};
@@ -36106,8 +36106,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
.lib = &iwl1000_lib,
.hcmd = &iwl5000_hcmd,
diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl3945-base.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl3945-base.c
---- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl3945-base.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl3945-base.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl3945-base.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl3945-base.c 2011-11-15 19:59:43.000000000 -0500
@@ -3927,7 +3927,9 @@ static int iwl3945_pci_probe(struct pci_
*/
if (iwl3945_mod_params.disable_hw_scan) {
@@ -36120,8 +36120,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl3945-base.c linux-2.6
diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-3945.c
---- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-11-15 19:59:43.000000000 -0500
@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
.build_addsta_hcmd = iwl3945_build_addsta_hcmd,
};
@@ -36132,8 +36132,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.
.lib = &iwl3945_lib,
.hcmd = &iwl3945_hcmd,
diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-4965.c
---- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-11-15 19:59:43.000000000 -0500
@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib =
},
};
@@ -36144,8 +36144,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.
.lib = &iwl4965_lib,
.hcmd = &iwl4965_hcmd,
diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-5000.c
---- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-11-15 19:59:43.000000000 -0500
@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib =
},
};
@@ -36164,8 +36164,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.
.lib = &iwl5150_lib,
.hcmd = &iwl5000_hcmd,
diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-6000.c
---- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-6000.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-11-15 19:59:43.000000000 -0500
@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
.calc_rssi = iwl5000_calc_rssi,
};
@@ -36176,8 +36176,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
.lib = &iwl6000_lib,
.hcmd = &iwl5000_hcmd,
diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn.c
---- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn.c 2011-11-15 19:59:43.000000000 -0500
@@ -2911,7 +2911,9 @@ static int iwl_pci_probe(struct pci_dev
if (iwl_debug_level & IWL_DL_INFO)
dev_printk(KERN_DEBUG, &(pdev->dev),
@@ -36190,8 +36190,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn.c linux-2.6.32.4
hw = iwl_alloc_all(cfg, &iwl_hw_ops);
diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
---- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-15 19:59:43.000000000 -0500
@@ -857,6 +857,8 @@ static void rs_tx_status(void *priv_r, s
u8 active_index = 0;
s32 tpt = 0;
@@ -36211,8 +36211,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.3
rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debugfs.c
---- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -524,6 +524,8 @@ static ssize_t iwl_dbgfs_status_read(str
int pos = 0;
const size_t bufsz = sizeof(buf);
@@ -36232,8 +36232,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.
pos += scnprintf(buf + pos, bufsz - pos,
"\tcw_min\tcw_max\taifsn\ttxop\n");
diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debug.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-15 19:59:43.000000000 -0500
@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
#endif
@@ -36246,8 +36246,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32
void *p, u32 len)
{}
diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-dev.h
---- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-11-15 19:59:43.000000000 -0500
@@ -68,7 +68,7 @@ struct iwl_tx_queue;
/* shared structures from iwl-5000.c */
@@ -36258,8 +36258,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.4
extern struct iwl_lib_ops iwl5000_lib;
extern struct iwl_hcmd_ops iwl5000_hcmd;
diff -urNp linux-2.6.32.48/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6.32.48/drivers/net/wireless/iwmc3200wifi/debugfs.c
---- linux-2.6.32.48/drivers/net/wireless/iwmc3200wifi/debugfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -299,6 +299,8 @@ static ssize_t iwm_debugfs_fw_err_read(s
int buf_len = 512;
size_t len = 0;
@@ -36270,8 +36270,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6
return 0;
if (count < sizeof(buf))
diff -urNp linux-2.6.32.48/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.48/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.32.48/drivers/net/wireless/libertas/debugfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/libertas/debugfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/libertas/debugfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/libertas/debugfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -708,7 +708,7 @@ out_unlock:
struct lbs_debugfs_files {
const char *name;
@@ -36282,8 +36282,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
static const struct lbs_debugfs_files debugfs_files[] = {
diff -urNp linux-2.6.32.48/drivers/net/wireless/rndis_wlan.c linux-2.6.32.48/drivers/net/wireless/rndis_wlan.c
---- linux-2.6.32.48/drivers/net/wireless/rndis_wlan.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/net/wireless/rndis_wlan.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/net/wireless/rndis_wlan.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/net/wireless/rndis_wlan.c 2011-11-15 19:59:43.000000000 -0500
@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
@@ -36294,8 +36294,8 @@ diff -urNp linux-2.6.32.48/drivers/net/wireless/rndis_wlan.c linux-2.6.32.48/dri
tmp = cpu_to_le32(rts_threshold);
diff -urNp linux-2.6.32.48/drivers/oprofile/buffer_sync.c linux-2.6.32.48/drivers/oprofile/buffer_sync.c
---- linux-2.6.32.48/drivers/oprofile/buffer_sync.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/oprofile/buffer_sync.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/oprofile/buffer_sync.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/oprofile/buffer_sync.c 2011-11-15 19:59:43.000000000 -0500
@@ -341,7 +341,7 @@ static void add_data(struct op_entry *en
if (cookie == NO_COOKIE)
offset = pc;
@@ -36332,8 +36332,8 @@ diff -urNp linux-2.6.32.48/drivers/oprofile/buffer_sync.c linux-2.6.32.48/driver
}
release_mm(mm);
diff -urNp linux-2.6.32.48/drivers/oprofile/event_buffer.c linux-2.6.32.48/drivers/oprofile/event_buffer.c
---- linux-2.6.32.48/drivers/oprofile/event_buffer.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/oprofile/event_buffer.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/oprofile/event_buffer.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/oprofile/event_buffer.c 2011-11-15 19:59:43.000000000 -0500
@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
}
@@ -36344,8 +36344,8 @@ diff -urNp linux-2.6.32.48/drivers/oprofile/event_buffer.c linux-2.6.32.48/drive
}
diff -urNp linux-2.6.32.48/drivers/oprofile/oprof.c linux-2.6.32.48/drivers/oprofile/oprof.c
---- linux-2.6.32.48/drivers/oprofile/oprof.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/oprofile/oprof.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/oprofile/oprof.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/oprofile/oprof.c 2011-11-15 19:59:43.000000000 -0500
@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
if (oprofile_ops.switch_events())
return;
@@ -36356,8 +36356,8 @@ diff -urNp linux-2.6.32.48/drivers/oprofile/oprof.c linux-2.6.32.48/drivers/opro
}
diff -urNp linux-2.6.32.48/drivers/oprofile/oprofilefs.c linux-2.6.32.48/drivers/oprofile/oprofilefs.c
---- linux-2.6.32.48/drivers/oprofile/oprofilefs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/oprofile/oprofilefs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/oprofile/oprofilefs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/oprofile/oprofilefs.c 2011-11-15 19:59:43.000000000 -0500
@@ -187,7 +187,7 @@ static const struct file_operations atom
@@ -36368,8 +36368,8 @@ diff -urNp linux-2.6.32.48/drivers/oprofile/oprofilefs.c linux-2.6.32.48/drivers
struct dentry *d = __oprofilefs_create_file(sb, root, name,
&atomic_ro_fops, 0444);
diff -urNp linux-2.6.32.48/drivers/oprofile/oprofile_stats.c linux-2.6.32.48/drivers/oprofile/oprofile_stats.c
---- linux-2.6.32.48/drivers/oprofile/oprofile_stats.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/oprofile/oprofile_stats.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/oprofile/oprofile_stats.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/oprofile/oprofile_stats.c 2011-11-15 19:59:43.000000000 -0500
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
cpu_buf->sample_invalid_eip = 0;
}
@@ -36388,8 +36388,8 @@ diff -urNp linux-2.6.32.48/drivers/oprofile/oprofile_stats.c linux-2.6.32.48/dri
diff -urNp linux-2.6.32.48/drivers/oprofile/oprofile_stats.h linux-2.6.32.48/drivers/oprofile/oprofile_stats.h
---- linux-2.6.32.48/drivers/oprofile/oprofile_stats.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/oprofile/oprofile_stats.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/oprofile/oprofile_stats.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/oprofile/oprofile_stats.h 2011-11-15 19:59:43.000000000 -0500
@@ -13,11 +13,11 @@
#include <asm/atomic.h>
@@ -36408,8 +36408,8 @@ diff -urNp linux-2.6.32.48/drivers/oprofile/oprofile_stats.h linux-2.6.32.48/dri
extern struct oprofile_stat_struct oprofile_stats;
diff -urNp linux-2.6.32.48/drivers/parisc/pdc_stable.c linux-2.6.32.48/drivers/parisc/pdc_stable.c
---- linux-2.6.32.48/drivers/parisc/pdc_stable.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/parisc/pdc_stable.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/parisc/pdc_stable.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/parisc/pdc_stable.c 2011-11-15 19:59:43.000000000 -0500
@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
return ret;
}
@@ -36420,8 +36420,8 @@ diff -urNp linux-2.6.32.48/drivers/parisc/pdc_stable.c linux-2.6.32.48/drivers/p
.store = pdcspath_attr_store,
};
diff -urNp linux-2.6.32.48/drivers/parport/procfs.c linux-2.6.32.48/drivers/parport/procfs.c
---- linux-2.6.32.48/drivers/parport/procfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/parport/procfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/parport/procfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/parport/procfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
*ppos += len;
@@ -36441,8 +36441,8 @@ diff -urNp linux-2.6.32.48/drivers/parport/procfs.c linux-2.6.32.48/drivers/parp
#endif /* IEEE1284.3 support. */
diff -urNp linux-2.6.32.48/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.48/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.32.48/drivers/pci/hotplug/acpiphp_glue.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/pci/hotplug/acpiphp_glue.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/pci/hotplug/acpiphp_glue.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/pci/hotplug/acpiphp_glue.c 2011-11-15 19:59:43.000000000 -0500
@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
}
@@ -36453,8 +36453,8 @@ diff -urNp linux-2.6.32.48/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.48/dr
};
diff -urNp linux-2.6.32.48/drivers/pci/hotplug/cpci_hotplug.h linux-2.6.32.48/drivers/pci/hotplug/cpci_hotplug.h
---- linux-2.6.32.48/drivers/pci/hotplug/cpci_hotplug.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/pci/hotplug/cpci_hotplug.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/pci/hotplug/cpci_hotplug.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/pci/hotplug/cpci_hotplug.h 2011-11-15 19:59:43.000000000 -0500
@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
int (*hardware_test) (struct slot* slot, u32 value);
u8 (*get_power) (struct slot* slot);
@@ -36465,8 +36465,8 @@ diff -urNp linux-2.6.32.48/drivers/pci/hotplug/cpci_hotplug.h linux-2.6.32.48/dr
struct cpci_hp_controller {
unsigned int irq;
diff -urNp linux-2.6.32.48/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.48/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.32.48/drivers/pci/hotplug/cpqphp_nvram.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-15 19:59:43.000000000 -0500
@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
void compaq_nvram_init (void __iomem *rom_start)
@@ -36482,8 +36482,8 @@ diff -urNp linux-2.6.32.48/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.48/dr
/* initialize our int15 lock */
diff -urNp linux-2.6.32.48/drivers/pci/hotplug/fakephp.c linux-2.6.32.48/drivers/pci/hotplug/fakephp.c
---- linux-2.6.32.48/drivers/pci/hotplug/fakephp.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/pci/hotplug/fakephp.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/pci/hotplug/fakephp.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/pci/hotplug/fakephp.c 2011-11-15 19:59:43.000000000 -0500
@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
}
@@ -36494,8 +36494,8 @@ diff -urNp linux-2.6.32.48/drivers/pci/hotplug/fakephp.c linux-2.6.32.48/drivers
},
.release = &legacy_release,
diff -urNp linux-2.6.32.48/drivers/pci/intel-iommu.c linux-2.6.32.48/drivers/pci/intel-iommu.c
---- linux-2.6.32.48/drivers/pci/intel-iommu.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/pci/intel-iommu.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/pci/intel-iommu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/pci/intel-iommu.c 2011-11-15 19:59:43.000000000 -0500
@@ -2643,7 +2643,7 @@ error:
return 0;
}
@@ -36566,8 +36566,8 @@ diff -urNp linux-2.6.32.48/drivers/pci/intel-iommu.c linux-2.6.32.48/drivers/pci
.free_coherent = intel_free_coherent,
.map_sg = intel_map_sg,
diff -urNp linux-2.6.32.48/drivers/pci/pcie/aspm.c linux-2.6.32.48/drivers/pci/pcie/aspm.c
---- linux-2.6.32.48/drivers/pci/pcie/aspm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/pci/pcie/aspm.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/pci/pcie/aspm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/pci/pcie/aspm.c 2011-11-15 19:59:43.000000000 -0500
@@ -27,9 +27,9 @@
#define MODULE_PARAM_PREFIX "pcie_aspm."
@@ -36582,8 +36582,8 @@ diff -urNp linux-2.6.32.48/drivers/pci/pcie/aspm.c linux-2.6.32.48/drivers/pci/p
#define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
diff -urNp linux-2.6.32.48/drivers/pci/probe.c linux-2.6.32.48/drivers/pci/probe.c
---- linux-2.6.32.48/drivers/pci/probe.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/pci/probe.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/pci/probe.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/pci/probe.c 2011-11-15 19:59:43.000000000 -0500
@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
return ret;
}
@@ -36602,8 +36602,8 @@ diff -urNp linux-2.6.32.48/drivers/pci/probe.c linux-2.6.32.48/drivers/pci/probe
char *buf)
{
diff -urNp linux-2.6.32.48/drivers/pci/proc.c linux-2.6.32.48/drivers/pci/proc.c
---- linux-2.6.32.48/drivers/pci/proc.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/pci/proc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/pci/proc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/pci/proc.c 2011-11-15 19:59:43.000000000 -0500
@@ -480,7 +480,16 @@ static const struct file_operations proc
static int __init pci_proc_init(void)
{
@@ -36622,8 +36622,8 @@ diff -urNp linux-2.6.32.48/drivers/pci/proc.c linux-2.6.32.48/drivers/pci/proc.c
&proc_bus_pci_dev_operations);
proc_initialized = 1;
diff -urNp linux-2.6.32.48/drivers/pci/slot.c linux-2.6.32.48/drivers/pci/slot.c
---- linux-2.6.32.48/drivers/pci/slot.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/pci/slot.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/pci/slot.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/pci/slot.c 2011-11-15 19:59:43.000000000 -0500
@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
return attribute->store ? attribute->store(slot, buf, len) : -EIO;
}
@@ -36634,8 +36634,8 @@ diff -urNp linux-2.6.32.48/drivers/pci/slot.c linux-2.6.32.48/drivers/pci/slot.c
.store = pci_slot_attr_store,
};
diff -urNp linux-2.6.32.48/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.48/drivers/pcmcia/pcmcia_ioctl.c
---- linux-2.6.32.48/drivers/pcmcia/pcmcia_ioctl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/pcmcia/pcmcia_ioctl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/pcmcia/pcmcia_ioctl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/pcmcia/pcmcia_ioctl.c 2011-11-15 19:59:43.000000000 -0500
@@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode
return -EFAULT;
}
@@ -36646,8 +36646,8 @@ diff -urNp linux-2.6.32.48/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.48/drivers
return -ENOMEM;
diff -urNp linux-2.6.32.48/drivers/platform/x86/acer-wmi.c linux-2.6.32.48/drivers/platform/x86/acer-wmi.c
---- linux-2.6.32.48/drivers/platform/x86/acer-wmi.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/platform/x86/acer-wmi.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/platform/x86/acer-wmi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/platform/x86/acer-wmi.c 2011-11-15 19:59:43.000000000 -0500
@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
return 0;
}
@@ -36658,8 +36658,8 @@ diff -urNp linux-2.6.32.48/drivers/platform/x86/acer-wmi.c linux-2.6.32.48/drive
.update_status = update_bl_status,
};
diff -urNp linux-2.6.32.48/drivers/platform/x86/asus_acpi.c linux-2.6.32.48/drivers/platform/x86/asus_acpi.c
---- linux-2.6.32.48/drivers/platform/x86/asus_acpi.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/platform/x86/asus_acpi.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/platform/x86/asus_acpi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/platform/x86/asus_acpi.c 2011-11-15 19:59:43.000000000 -0500
@@ -1396,7 +1396,7 @@ static int asus_hotk_remove(struct acpi_
return 0;
}
@@ -36670,8 +36670,8 @@ diff -urNp linux-2.6.32.48/drivers/platform/x86/asus_acpi.c linux-2.6.32.48/driv
.update_status = set_brightness_status,
};
diff -urNp linux-2.6.32.48/drivers/platform/x86/asus-laptop.c linux-2.6.32.48/drivers/platform/x86/asus-laptop.c
---- linux-2.6.32.48/drivers/platform/x86/asus-laptop.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/platform/x86/asus-laptop.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/platform/x86/asus-laptop.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/platform/x86/asus-laptop.c 2011-11-15 19:59:43.000000000 -0500
@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
*/
static int read_brightness(struct backlight_device *bd);
@@ -36682,8 +36682,8 @@ diff -urNp linux-2.6.32.48/drivers/platform/x86/asus-laptop.c linux-2.6.32.48/dr
.update_status = update_bl_status,
};
diff -urNp linux-2.6.32.48/drivers/platform/x86/compal-laptop.c linux-2.6.32.48/drivers/platform/x86/compal-laptop.c
---- linux-2.6.32.48/drivers/platform/x86/compal-laptop.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/platform/x86/compal-laptop.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/platform/x86/compal-laptop.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/platform/x86/compal-laptop.c 2011-11-15 19:59:43.000000000 -0500
@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
return set_lcd_level(b->props.brightness);
}
@@ -36694,8 +36694,8 @@ diff -urNp linux-2.6.32.48/drivers/platform/x86/compal-laptop.c linux-2.6.32.48/
.update_status = bl_update_status,
};
diff -urNp linux-2.6.32.48/drivers/platform/x86/dell-laptop.c linux-2.6.32.48/drivers/platform/x86/dell-laptop.c
---- linux-2.6.32.48/drivers/platform/x86/dell-laptop.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/platform/x86/dell-laptop.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/platform/x86/dell-laptop.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/platform/x86/dell-laptop.c 2011-11-15 19:59:43.000000000 -0500
@@ -318,7 +318,7 @@ static int dell_get_intensity(struct bac
return buffer.output[1];
}
@@ -36706,8 +36706,8 @@ diff -urNp linux-2.6.32.48/drivers/platform/x86/dell-laptop.c linux-2.6.32.48/dr
.update_status = dell_send_intensity,
};
diff -urNp linux-2.6.32.48/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.48/drivers/platform/x86/eeepc-laptop.c
---- linux-2.6.32.48/drivers/platform/x86/eeepc-laptop.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/platform/x86/eeepc-laptop.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/platform/x86/eeepc-laptop.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/platform/x86/eeepc-laptop.c 2011-11-15 19:59:43.000000000 -0500
@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
*/
static int read_brightness(struct backlight_device *bd);
@@ -36718,8 +36718,8 @@ diff -urNp linux-2.6.32.48/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.48/d
.update_status = update_bl_status,
};
diff -urNp linux-2.6.32.48/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.48/drivers/platform/x86/fujitsu-laptop.c
---- linux-2.6.32.48/drivers/platform/x86/fujitsu-laptop.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/platform/x86/fujitsu-laptop.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/platform/x86/fujitsu-laptop.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/platform/x86/fujitsu-laptop.c 2011-11-15 19:59:43.000000000 -0500
@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
return ret;
}
@@ -36730,8 +36730,8 @@ diff -urNp linux-2.6.32.48/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.48
.update_status = bl_update_status,
};
diff -urNp linux-2.6.32.48/drivers/platform/x86/msi-laptop.c linux-2.6.32.48/drivers/platform/x86/msi-laptop.c
---- linux-2.6.32.48/drivers/platform/x86/msi-laptop.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/platform/x86/msi-laptop.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/platform/x86/msi-laptop.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/platform/x86/msi-laptop.c 2011-11-15 19:59:43.000000000 -0500
@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
return set_lcd_level(b->props.brightness);
}
@@ -36742,8 +36742,8 @@ diff -urNp linux-2.6.32.48/drivers/platform/x86/msi-laptop.c linux-2.6.32.48/dri
.update_status = bl_update_status,
};
diff -urNp linux-2.6.32.48/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.48/drivers/platform/x86/panasonic-laptop.c
---- linux-2.6.32.48/drivers/platform/x86/panasonic-laptop.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/platform/x86/panasonic-laptop.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/platform/x86/panasonic-laptop.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/platform/x86/panasonic-laptop.c 2011-11-15 19:59:43.000000000 -0500
@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
}
@@ -36754,8 +36754,8 @@ diff -urNp linux-2.6.32.48/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.
.update_status = bl_set_status,
};
diff -urNp linux-2.6.32.48/drivers/platform/x86/sony-laptop.c linux-2.6.32.48/drivers/platform/x86/sony-laptop.c
---- linux-2.6.32.48/drivers/platform/x86/sony-laptop.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/platform/x86/sony-laptop.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/platform/x86/sony-laptop.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/platform/x86/sony-laptop.c 2011-11-15 19:59:43.000000000 -0500
@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
}
@@ -36766,8 +36766,8 @@ diff -urNp linux-2.6.32.48/drivers/platform/x86/sony-laptop.c linux-2.6.32.48/dr
.get_brightness = sony_backlight_get_brightness,
};
diff -urNp linux-2.6.32.48/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.48/drivers/platform/x86/thinkpad_acpi.c
---- linux-2.6.32.48/drivers/platform/x86/thinkpad_acpi.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/platform/x86/thinkpad_acpi.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/platform/x86/thinkpad_acpi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/platform/x86/thinkpad_acpi.c 2011-11-15 19:59:43.000000000 -0500
@@ -2139,7 +2139,7 @@ static int hotkey_mask_get(void)
return 0;
}
@@ -36787,8 +36787,8 @@ diff -urNp linux-2.6.32.48/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.48/
.update_status = brightness_update_status,
};
diff -urNp linux-2.6.32.48/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.48/drivers/platform/x86/toshiba_acpi.c
---- linux-2.6.32.48/drivers/platform/x86/toshiba_acpi.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/platform/x86/toshiba_acpi.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/platform/x86/toshiba_acpi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/platform/x86/toshiba_acpi.c 2011-11-15 19:59:43.000000000 -0500
@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
return AE_OK;
}
@@ -36799,8 +36799,8 @@ diff -urNp linux-2.6.32.48/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.48/d
.update_status = set_lcd_status,
};
diff -urNp linux-2.6.32.48/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.48/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.32.48/drivers/pnp/pnpbios/bioscalls.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/pnp/pnpbios/bioscalls.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/pnp/pnpbios/bioscalls.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/pnp/pnpbios/bioscalls.c 2011-11-15 19:59:43.000000000 -0500
@@ -60,7 +60,7 @@ do { \
set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
} while(0)
@@ -36858,8 +36858,8 @@ diff -urNp linux-2.6.32.48/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.48/drive
+ pax_close_kernel();
}
diff -urNp linux-2.6.32.48/drivers/pnp/resource.c linux-2.6.32.48/drivers/pnp/resource.c
---- linux-2.6.32.48/drivers/pnp/resource.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/pnp/resource.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/pnp/resource.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/pnp/resource.c 2011-11-15 19:59:43.000000000 -0500
@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
return 1;
@@ -36879,8 +36879,8 @@ diff -urNp linux-2.6.32.48/drivers/pnp/resource.c linux-2.6.32.48/drivers/pnp/re
/* check if the resource is reserved */
diff -urNp linux-2.6.32.48/drivers/power/bq27x00_battery.c linux-2.6.32.48/drivers/power/bq27x00_battery.c
---- linux-2.6.32.48/drivers/power/bq27x00_battery.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/power/bq27x00_battery.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/power/bq27x00_battery.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/power/bq27x00_battery.c 2011-11-15 19:59:43.000000000 -0500
@@ -44,7 +44,7 @@ struct bq27x00_device_info;
struct bq27x00_access_methods {
int (*read)(u8 reg, int *rt_value, int b_single,
@@ -36891,8 +36891,8 @@ diff -urNp linux-2.6.32.48/drivers/power/bq27x00_battery.c linux-2.6.32.48/drive
struct bq27x00_device_info {
struct device *dev;
diff -urNp linux-2.6.32.48/drivers/rtc/rtc-dev.c linux-2.6.32.48/drivers/rtc/rtc-dev.c
---- linux-2.6.32.48/drivers/rtc/rtc-dev.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/rtc/rtc-dev.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/rtc/rtc-dev.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/rtc/rtc-dev.c 2011-11-15 19:59:43.000000000 -0500
@@ -14,6 +14,7 @@
#include <linux/module.h>
#include <linux/rtc.h>
@@ -36911,8 +36911,8 @@ diff -urNp linux-2.6.32.48/drivers/rtc/rtc-dev.c linux-2.6.32.48/drivers/rtc/rtc
case RTC_PIE_ON:
diff -urNp linux-2.6.32.48/drivers/s390/cio/qdio_perf.c linux-2.6.32.48/drivers/s390/cio/qdio_perf.c
---- linux-2.6.32.48/drivers/s390/cio/qdio_perf.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/s390/cio/qdio_perf.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/s390/cio/qdio_perf.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/s390/cio/qdio_perf.c 2011-11-15 19:59:43.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)
{
@@ -36989,8 +36989,8 @@ diff -urNp linux-2.6.32.48/drivers/s390/cio/qdio_perf.c linux-2.6.32.48/drivers/
return 0;
}
diff -urNp linux-2.6.32.48/drivers/s390/cio/qdio_perf.h linux-2.6.32.48/drivers/s390/cio/qdio_perf.h
---- linux-2.6.32.48/drivers/s390/cio/qdio_perf.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/s390/cio/qdio_perf.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/s390/cio/qdio_perf.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/s390/cio/qdio_perf.h 2011-11-15 19:59:43.000000000 -0500
@@ -13,46 +13,46 @@
struct qdio_perf_stats {
@@ -37064,8 +37064,8 @@ diff -urNp linux-2.6.32.48/drivers/s390/cio/qdio_perf.h linux-2.6.32.48/drivers/
int qdio_setup_perf_stats(void);
diff -urNp linux-2.6.32.48/drivers/scsi/aacraid/aacraid.h linux-2.6.32.48/drivers/scsi/aacraid/aacraid.h
---- linux-2.6.32.48/drivers/scsi/aacraid/aacraid.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/aacraid/aacraid.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/aacraid/aacraid.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/aacraid/aacraid.h 2011-11-15 19:59:43.000000000 -0500
@@ -471,7 +471,7 @@ struct adapter_ops
int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
/* Administrative operations */
@@ -37076,8 +37076,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/aacraid/aacraid.h linux-2.6.32.48/driver
/*
* Define which interrupt handler needs to be installed
diff -urNp linux-2.6.32.48/drivers/scsi/aacraid/commctrl.c linux-2.6.32.48/drivers/scsi/aacraid/commctrl.c
---- linux-2.6.32.48/drivers/scsi/aacraid/commctrl.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/aacraid/commctrl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/aacraid/commctrl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/aacraid/commctrl.c 2011-11-15 19:59:43.000000000 -0500
@@ -481,6 +481,7 @@ static int aac_send_raw_srb(struct aac_d
u32 actual_fibsize64, actual_fibsize = 0;
int i;
@@ -37087,8 +37087,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/aacraid/commctrl.c linux-2.6.32.48/drive
if (dev->in_reset) {
dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
diff -urNp linux-2.6.32.48/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.48/drivers/scsi/aic94xx/aic94xx_init.c
---- linux-2.6.32.48/drivers/scsi/aic94xx/aic94xx_init.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-15 19:59:43.000000000 -0500
@@ -485,7 +485,7 @@ static ssize_t asd_show_update_bios(stru
flash_error_table[i].reason);
}
@@ -37099,8 +37099,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.48/d
static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
diff -urNp linux-2.6.32.48/drivers/scsi/bfa/bfa_iocfc.h linux-2.6.32.48/drivers/scsi/bfa/bfa_iocfc.h
---- linux-2.6.32.48/drivers/scsi/bfa/bfa_iocfc.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/bfa/bfa_iocfc.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/bfa/bfa_iocfc.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/bfa/bfa_iocfc.h 2011-11-15 19:59:43.000000000 -0500
@@ -61,7 +61,7 @@ struct bfa_hwif_s {
void (*hw_isr_mode_set)(struct bfa_s *bfa, bfa_boolean_t msix);
void (*hw_msix_getvecs)(struct bfa_s *bfa, u32 *vecmap,
@@ -37111,8 +37111,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/bfa/bfa_iocfc.h linux-2.6.32.48/drivers/
struct bfa_iocfc_s {
diff -urNp linux-2.6.32.48/drivers/scsi/bfa/bfa_ioc.h linux-2.6.32.48/drivers/scsi/bfa/bfa_ioc.h
---- linux-2.6.32.48/drivers/scsi/bfa/bfa_ioc.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/bfa/bfa_ioc.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/bfa/bfa_ioc.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/bfa/bfa_ioc.h 2011-11-15 19:59:43.000000000 -0500
@@ -127,7 +127,7 @@ struct bfa_ioc_cbfn_s {
bfa_ioc_disable_cbfn_t disable_cbfn;
bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
@@ -37123,8 +37123,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/bfa/bfa_ioc.h linux-2.6.32.48/drivers/sc
/**
* Heartbeat failure notification queue element.
diff -urNp linux-2.6.32.48/drivers/scsi/BusLogic.c linux-2.6.32.48/drivers/scsi/BusLogic.c
---- linux-2.6.32.48/drivers/scsi/BusLogic.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/BusLogic.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/BusLogic.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/BusLogic.c 2011-11-15 19:59:43.000000000 -0500
@@ -961,6 +961,8 @@ static int __init BusLogic_InitializeFla
static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
*PrototypeHostAdapter)
@@ -37135,8 +37135,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/BusLogic.c linux-2.6.32.48/drivers/scsi/
If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint
Host Adapters; otherwise, default to the standard ISA MultiMaster probe.
diff -urNp linux-2.6.32.48/drivers/scsi/dpt_i2o.c linux-2.6.32.48/drivers/scsi/dpt_i2o.c
---- linux-2.6.32.48/drivers/scsi/dpt_i2o.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/dpt_i2o.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/dpt_i2o.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/dpt_i2o.c 2011-11-15 19:59:43.000000000 -0500
@@ -1804,6 +1804,8 @@ static int adpt_i2o_passthru(adpt_hba* p
dma_addr_t addr;
ulong flags = 0;
@@ -37156,8 +37156,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/dpt_i2o.c linux-2.6.32.48/drivers/scsi/d
len = scsi_bufflen(cmd);
direction = 0x00000000;
diff -urNp linux-2.6.32.48/drivers/scsi/eata.c linux-2.6.32.48/drivers/scsi/eata.c
---- linux-2.6.32.48/drivers/scsi/eata.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/eata.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/eata.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/eata.c 2011-11-15 19:59:43.000000000 -0500
@@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por
struct hostdata *ha;
char name[16];
@@ -37168,8 +37168,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/eata.c linux-2.6.32.48/drivers/scsi/eata
if (!request_region(port_base, REGION_SIZE, driver_name)) {
diff -urNp linux-2.6.32.48/drivers/scsi/fcoe/libfcoe.c linux-2.6.32.48/drivers/scsi/fcoe/libfcoe.c
---- linux-2.6.32.48/drivers/scsi/fcoe/libfcoe.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/fcoe/libfcoe.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/fcoe/libfcoe.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/fcoe/libfcoe.c 2011-11-15 19:59:43.000000000 -0500
@@ -809,6 +809,8 @@ static void fcoe_ctlr_recv_els(struct fc
size_t rlen;
size_t dlen;
@@ -37180,8 +37180,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/fcoe/libfcoe.c linux-2.6.32.48/drivers/s
sub = fiph->fip_subcode;
if (sub != FIP_SC_REQ && sub != FIP_SC_REP)
diff -urNp linux-2.6.32.48/drivers/scsi/fnic/fnic_main.c linux-2.6.32.48/drivers/scsi/fnic/fnic_main.c
---- linux-2.6.32.48/drivers/scsi/fnic/fnic_main.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/fnic/fnic_main.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/fnic/fnic_main.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/fnic/fnic_main.c 2011-11-15 19:59:43.000000000 -0500
@@ -669,7 +669,7 @@ static int __devinit fnic_probe(struct p
/* Start local port initiatialization */
@@ -37192,8 +37192,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/fnic/fnic_main.c linux-2.6.32.48/drivers
lp->max_retry_count = fnic->config.flogi_retries;
lp->max_rport_retry_count = fnic->config.plogi_retries;
diff -urNp linux-2.6.32.48/drivers/scsi/gdth.c linux-2.6.32.48/drivers/scsi/gdth.c
---- linux-2.6.32.48/drivers/scsi/gdth.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/gdth.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/gdth.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/gdth.c 2011-11-15 19:59:43.000000000 -0500
@@ -4102,6 +4102,8 @@ static int ioc_lockdrv(void __user *arg)
ulong flags;
gdth_ha_str *ha;
@@ -37232,8 +37232,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/gdth.c linux-2.6.32.48/drivers/scsi/gdth
TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
diff -urNp linux-2.6.32.48/drivers/scsi/gdth_proc.c linux-2.6.32.48/drivers/scsi/gdth_proc.c
---- linux-2.6.32.48/drivers/scsi/gdth_proc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/gdth_proc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/gdth_proc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/gdth_proc.c 2011-11-15 19:59:43.000000000 -0500
@@ -46,6 +46,9 @@ static int gdth_set_asc_info(struct Scsi
ulong64 paddr;
@@ -37254,8 +37254,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/gdth_proc.c linux-2.6.32.48/drivers/scsi
estr = kmalloc(sizeof(*estr), GFP_KERNEL);
if (!gdtcmd || !estr)
diff -urNp linux-2.6.32.48/drivers/scsi/hosts.c linux-2.6.32.48/drivers/scsi/hosts.c
---- linux-2.6.32.48/drivers/scsi/hosts.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/hosts.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/hosts.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/hosts.c 2011-11-15 19:59:43.000000000 -0500
@@ -40,7 +40,7 @@
#include "scsi_logging.h"
@@ -37275,8 +37275,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/hosts.c linux-2.6.32.48/drivers/scsi/hos
/* These three are default values which can be overridden */
diff -urNp linux-2.6.32.48/drivers/scsi/ipr.c linux-2.6.32.48/drivers/scsi/ipr.c
---- linux-2.6.32.48/drivers/scsi/ipr.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/ipr.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/ipr.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/ipr.c 2011-11-15 19:59:43.000000000 -0500
@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
return true;
}
@@ -37287,8 +37287,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/ipr.c linux-2.6.32.48/drivers/scsi/ipr.c
.hardreset = ipr_sata_reset,
.post_internal_cmd = ipr_ata_post_internal,
diff -urNp linux-2.6.32.48/drivers/scsi/ips.h linux-2.6.32.48/drivers/scsi/ips.h
---- linux-2.6.32.48/drivers/scsi/ips.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/ips.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/ips.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/ips.h 2011-11-15 19:59:43.000000000 -0500
@@ -1027,7 +1027,7 @@ typedef struct {
int (*intr)(struct ips_ha *);
void (*enableint)(struct ips_ha *);
@@ -37299,8 +37299,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/ips.h linux-2.6.32.48/drivers/scsi/ips.h
typedef struct ips_ha {
uint8_t ha_id[IPS_MAX_CHANNELS+1];
diff -urNp linux-2.6.32.48/drivers/scsi/libfc/fc_exch.c linux-2.6.32.48/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.32.48/drivers/scsi/libfc/fc_exch.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/libfc/fc_exch.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/libfc/fc_exch.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/libfc/fc_exch.c 2011-11-15 19:59:43.000000000 -0500
@@ -86,12 +86,12 @@ struct fc_exch_mgr {
* all together if not used XXX
*/
@@ -37423,8 +37423,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/libfc/fc_exch.c linux-2.6.32.48/drivers/
fc_frame_free(fp);
}
diff -urNp linux-2.6.32.48/drivers/scsi/libsas/sas_ata.c linux-2.6.32.48/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.32.48/drivers/scsi/libsas/sas_ata.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/libsas/sas_ata.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/libsas/sas_ata.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/libsas/sas_ata.c 2011-11-15 19:59:43.000000000 -0500
@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
}
}
@@ -37435,8 +37435,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/libsas/sas_ata.c linux-2.6.32.48/drivers
.post_internal_cmd = sas_ata_post_internal,
.qc_defer = ata_std_qc_defer,
diff -urNp linux-2.6.32.48/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.32.48/drivers/scsi/lpfc/lpfc_debugfs.c
---- linux-2.6.32.48/drivers/scsi/lpfc/lpfc_debugfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -124,7 +124,7 @@ struct lpfc_debug {
int len;
};
@@ -37526,8 +37526,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.32.48/driv
snprintf(name, sizeof(name), "discovery_trace");
vport->debug_disc_trc =
diff -urNp linux-2.6.32.48/drivers/scsi/lpfc/lpfc.h linux-2.6.32.48/drivers/scsi/lpfc/lpfc.h
---- linux-2.6.32.48/drivers/scsi/lpfc/lpfc.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/lpfc/lpfc.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/lpfc/lpfc.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/lpfc/lpfc.h 2011-11-15 19:59:43.000000000 -0500
@@ -400,7 +400,7 @@ struct lpfc_vport {
struct dentry *debug_nodelist;
struct dentry *vport_debugfs_root;
@@ -37558,8 +37558,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/lpfc/lpfc.h linux-2.6.32.48/drivers/scsi
/* Used for deferred freeing of ELS data buffers */
diff -urNp linux-2.6.32.48/drivers/scsi/lpfc/lpfc_init.c linux-2.6.32.48/drivers/scsi/lpfc/lpfc_init.c
---- linux-2.6.32.48/drivers/scsi/lpfc/lpfc_init.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/lpfc/lpfc_init.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/lpfc/lpfc_init.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/lpfc/lpfc_init.c 2011-11-15 19:59:43.000000000 -0500
@@ -8021,8 +8021,10 @@ lpfc_init(void)
printk(LPFC_COPYRIGHT "\n");
@@ -37574,8 +37574,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/lpfc/lpfc_init.c linux-2.6.32.48/drivers
lpfc_transport_template =
fc_attach_transport(&lpfc_transport_functions);
diff -urNp linux-2.6.32.48/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.32.48/drivers/scsi/lpfc/lpfc_scsi.c
---- linux-2.6.32.48/drivers/scsi/lpfc/lpfc_scsi.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-15 19:59:43.000000000 -0500
@@ -259,7 +259,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
uint32_t evt_posted;
@@ -37628,8 +37628,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.32.48/drivers
/**
diff -urNp linux-2.6.32.48/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.32.48/drivers/scsi/megaraid/megaraid_mbox.c
---- linux-2.6.32.48/drivers/scsi/megaraid/megaraid_mbox.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-15 19:59:43.000000000 -0500
@@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter
int rval;
int i;
@@ -37640,8 +37640,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.32.48
adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL);
diff -urNp linux-2.6.32.48/drivers/scsi/osd/osd_initiator.c linux-2.6.32.48/drivers/scsi/osd/osd_initiator.c
---- linux-2.6.32.48/drivers/scsi/osd/osd_initiator.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/osd/osd_initiator.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/osd/osd_initiator.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/osd/osd_initiator.c 2011-11-15 19:59:43.000000000 -0500
@@ -94,6 +94,8 @@ static int _osd_print_system_info(struct
int nelem = ARRAY_SIZE(get_attrs), a = 0;
int ret;
@@ -37652,8 +37652,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/osd/osd_initiator.c linux-2.6.32.48/driv
if (!or)
return -ENOMEM;
diff -urNp linux-2.6.32.48/drivers/scsi/pmcraid.c linux-2.6.32.48/drivers/scsi/pmcraid.c
---- linux-2.6.32.48/drivers/scsi/pmcraid.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/pmcraid.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/pmcraid.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/pmcraid.c 2011-11-15 19:59:43.000000000 -0500
@@ -189,8 +189,8 @@ static int pmcraid_slave_alloc(struct sc
res->scsi_dev = scsi_dev;
scsi_dev->hostdata = res;
@@ -37705,8 +37705,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/pmcraid.c linux-2.6.32.48/drivers/scsi/p
return rc;
diff -urNp linux-2.6.32.48/drivers/scsi/pmcraid.h linux-2.6.32.48/drivers/scsi/pmcraid.h
---- linux-2.6.32.48/drivers/scsi/pmcraid.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/pmcraid.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/pmcraid.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/pmcraid.h 2011-11-15 19:59:43.000000000 -0500
@@ -690,7 +690,7 @@ struct pmcraid_instance {
atomic_t outstanding_cmds;
@@ -37728,8 +37728,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/pmcraid.h linux-2.6.32.48/drivers/scsi/p
/* To indicate add/delete/modify during CCN */
u8 change_detected;
diff -urNp linux-2.6.32.48/drivers/scsi/qla2xxx/qla_def.h linux-2.6.32.48/drivers/scsi/qla2xxx/qla_def.h
---- linux-2.6.32.48/drivers/scsi/qla2xxx/qla_def.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/qla2xxx/qla_def.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/qla2xxx/qla_def.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/qla2xxx/qla_def.h 2011-11-15 19:59:43.000000000 -0500
@@ -2089,7 +2089,7 @@ struct isp_operations {
int (*get_flash_version) (struct scsi_qla_host *, void *);
@@ -37740,8 +37740,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/qla2xxx/qla_def.h linux-2.6.32.48/driver
/* MSI-X Support *************************************************************/
diff -urNp linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_def.h
---- linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_def.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_def.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_def.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_def.h 2011-11-15 19:59:43.000000000 -0500
@@ -240,7 +240,7 @@ struct ddb_entry {
atomic_t retry_relogin_timer; /* Min Time between relogins
* (4000 only) */
@@ -37752,8 +37752,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.32.48/driver
uint16_t port;
diff -urNp linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_init.c
---- linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_init.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_init.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_init.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_init.c 2011-11-15 19:59:43.000000000 -0500
@@ -482,7 +482,7 @@ static struct ddb_entry * qla4xxx_alloc_
atomic_set(&ddb_entry->port_down_timer, ha->port_down_retry_count);
atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
@@ -37773,8 +37773,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.32.48/drive
clear_bit(DF_RELOGIN, &ddb_entry->flags);
clear_bit(DF_NO_RELOGIN, &ddb_entry->flags);
diff -urNp linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_os.c
---- linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_os.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_os.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_os.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_os.c 2011-11-15 19:59:43.000000000 -0500
@@ -641,13 +641,13 @@ static void qla4xxx_timer(struct scsi_ql
ddb_entry->fw_ddb_device_state ==
DDB_DS_SESSION_FAILED) {
@@ -37792,8 +37792,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.32.48/drivers
);
start_dpc++;
diff -urNp linux-2.6.32.48/drivers/scsi/scsi.c linux-2.6.32.48/drivers/scsi/scsi.c
---- linux-2.6.32.48/drivers/scsi/scsi.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/scsi.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/scsi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/scsi.c 2011-11-15 19:59:43.000000000 -0500
@@ -652,7 +652,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
unsigned long timeout;
int rtn = 0;
@@ -37804,8 +37804,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/scsi.c linux-2.6.32.48/drivers/scsi/scsi
/* check if the device is still usable */
if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
diff -urNp linux-2.6.32.48/drivers/scsi/scsi_debug.c linux-2.6.32.48/drivers/scsi/scsi_debug.c
---- linux-2.6.32.48/drivers/scsi/scsi_debug.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/scsi_debug.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/scsi_debug.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/scsi_debug.c 2011-11-15 19:59:43.000000000 -0500
@@ -1395,6 +1395,8 @@ static int resp_mode_select(struct scsi_
unsigned char arr[SDEBUG_MAX_MSELECT_SZ];
unsigned char *cmd = (unsigned char *)scp->cmnd;
@@ -37825,8 +37825,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/scsi_debug.c linux-2.6.32.48/drivers/scs
return errsts;
memset(arr, 0, sizeof(arr));
diff -urNp linux-2.6.32.48/drivers/scsi/scsi_lib.c linux-2.6.32.48/drivers/scsi/scsi_lib.c
---- linux-2.6.32.48/drivers/scsi/scsi_lib.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/scsi_lib.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/scsi_lib.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/scsi_lib.c 2011-11-15 19:59:43.000000000 -0500
@@ -1384,7 +1384,7 @@ static void scsi_kill_request(struct req
scsi_init_cmd_errh(cmd);
@@ -37849,8 +37849,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/scsi_lib.c linux-2.6.32.48/drivers/scsi/
disposition = scsi_decide_disposition(cmd);
if (disposition != SUCCESS &&
diff -urNp linux-2.6.32.48/drivers/scsi/scsi_sysfs.c linux-2.6.32.48/drivers/scsi/scsi_sysfs.c
---- linux-2.6.32.48/drivers/scsi/scsi_sysfs.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/scsi_sysfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/scsi_sysfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/scsi_sysfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -662,7 +662,7 @@ show_iostat_##field(struct device *dev,
char *buf) \
{ \
@@ -37861,8 +37861,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/scsi_sysfs.c linux-2.6.32.48/drivers/scs
} \
static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
diff -urNp linux-2.6.32.48/drivers/scsi/scsi_tgt_lib.c linux-2.6.32.48/drivers/scsi/scsi_tgt_lib.c
---- linux-2.6.32.48/drivers/scsi/scsi_tgt_lib.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/scsi_tgt_lib.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/scsi_tgt_lib.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/scsi_tgt_lib.c 2011-11-15 19:59:43.000000000 -0500
@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct sc
int err;
@@ -37873,8 +37873,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/scsi_tgt_lib.c linux-2.6.32.48/drivers/s
/*
* TODO: need to fixup sg_tablesize, max_segment_size,
diff -urNp linux-2.6.32.48/drivers/scsi/scsi_transport_fc.c linux-2.6.32.48/drivers/scsi/scsi_transport_fc.c
---- linux-2.6.32.48/drivers/scsi/scsi_transport_fc.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/scsi_transport_fc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/scsi_transport_fc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/scsi_transport_fc.c 2011-11-15 19:59:43.000000000 -0500
@@ -480,7 +480,7 @@ MODULE_PARM_DESC(dev_loss_tmo,
* Netlink Infrastructure
*/
@@ -37903,8 +37903,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/scsi_transport_fc.c linux-2.6.32.48/driv
error = transport_class_register(&fc_host_class);
if (error)
diff -urNp linux-2.6.32.48/drivers/scsi/scsi_transport_iscsi.c linux-2.6.32.48/drivers/scsi/scsi_transport_iscsi.c
---- linux-2.6.32.48/drivers/scsi/scsi_transport_iscsi.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/scsi_transport_iscsi.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/scsi_transport_iscsi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/scsi_transport_iscsi.c 2011-11-15 19:59:43.000000000 -0500
@@ -81,7 +81,7 @@ struct iscsi_internal {
struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
};
@@ -37933,8 +37933,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/scsi_transport_iscsi.c linux-2.6.32.48/d
err = class_register(&iscsi_transport_class);
if (err)
diff -urNp linux-2.6.32.48/drivers/scsi/scsi_transport_srp.c linux-2.6.32.48/drivers/scsi/scsi_transport_srp.c
---- linux-2.6.32.48/drivers/scsi/scsi_transport_srp.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/scsi_transport_srp.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/scsi_transport_srp.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/scsi_transport_srp.c 2011-11-15 19:59:43.000000000 -0500
@@ -33,7 +33,7 @@
#include "scsi_transport_srp_internal.h"
@@ -37963,8 +37963,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/scsi_transport_srp.c linux-2.6.32.48/dri
transport_setup_device(&rport->dev);
diff -urNp linux-2.6.32.48/drivers/scsi/sg.c linux-2.6.32.48/drivers/scsi/sg.c
---- linux-2.6.32.48/drivers/scsi/sg.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/sg.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/sg.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/sg.c 2011-11-15 19:59:43.000000000 -0500
@@ -1064,7 +1064,7 @@ sg_ioctl(struct inode *inode, struct fil
sdp->disk->disk_name,
MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
@@ -37993,8 +37993,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/sg.c linux-2.6.32.48/drivers/scsi/sg.c
sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
if (!sg_proc_sgp)
diff -urNp linux-2.6.32.48/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.32.48/drivers/scsi/sym53c8xx_2/sym_glue.c
---- linux-2.6.32.48/drivers/scsi/sym53c8xx_2/sym_glue.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-15 19:59:43.000000000 -0500
@@ -1754,6 +1754,8 @@ static int __devinit sym2_probe(struct p
int do_iounmap = 0;
int do_disable_device = 1;
@@ -38005,8 +38005,8 @@ diff -urNp linux-2.6.32.48/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.32.48/d
memset(&nvram, 0, sizeof(nvram));
sym_dev.pdev = pdev;
diff -urNp linux-2.6.32.48/drivers/serial/kgdboc.c linux-2.6.32.48/drivers/serial/kgdboc.c
---- linux-2.6.32.48/drivers/serial/kgdboc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/serial/kgdboc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/serial/kgdboc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/serial/kgdboc.c 2011-11-15 19:59:43.000000000 -0500
@@ -18,7 +18,7 @@
#define MAX_CONFIG_LEN 40
@@ -38026,8 +38026,8 @@ diff -urNp linux-2.6.32.48/drivers/serial/kgdboc.c linux-2.6.32.48/drivers/seria
.read_char = kgdboc_get_char,
.write_char = kgdboc_put_char,
diff -urNp linux-2.6.32.48/drivers/spi/spi.c linux-2.6.32.48/drivers/spi/spi.c
---- linux-2.6.32.48/drivers/spi/spi.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/spi/spi.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/spi/spi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/spi/spi.c 2011-11-15 19:59:43.000000000 -0500
@@ -774,7 +774,7 @@ int spi_sync(struct spi_device *spi, str
EXPORT_SYMBOL_GPL(spi_sync);
@@ -38038,8 +38038,8 @@ diff -urNp linux-2.6.32.48/drivers/spi/spi.c linux-2.6.32.48/drivers/spi/spi.c
static u8 *buf;
diff -urNp linux-2.6.32.48/drivers/staging/android/binder.c linux-2.6.32.48/drivers/staging/android/binder.c
---- linux-2.6.32.48/drivers/staging/android/binder.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/android/binder.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/android/binder.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/android/binder.c 2011-11-15 19:59:43.000000000 -0500
@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
}
@@ -38050,8 +38050,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/android/binder.c linux-2.6.32.48/driv
.close = binder_vma_close,
};
diff -urNp linux-2.6.32.48/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.48/drivers/staging/b3dfg/b3dfg.c
---- linux-2.6.32.48/drivers/staging/b3dfg/b3dfg.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/b3dfg/b3dfg.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/b3dfg/b3dfg.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/b3dfg/b3dfg.c 2011-11-15 19:59:43.000000000 -0500
@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
return VM_FAULT_NOPAGE;
}
@@ -38071,8 +38071,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.48/drivers
.open = b3dfg_open,
.release = b3dfg_release,
diff -urNp linux-2.6.32.48/drivers/staging/comedi/comedi_fops.c linux-2.6.32.48/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.32.48/drivers/staging/comedi/comedi_fops.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/comedi/comedi_fops.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/comedi/comedi_fops.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/comedi/comedi_fops.c 2011-11-15 19:59:43.000000000 -0500
@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
mutex_unlock(&dev->mutex);
}
@@ -38083,8 +38083,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/comedi/comedi_fops.c linux-2.6.32.48/
};
diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.48/drivers/staging/dream/qdsp5/adsp_driver.c
---- linux-2.6.32.48/drivers/staging/dream/qdsp5/adsp_driver.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/dream/qdsp5/adsp_driver.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/dream/qdsp5/adsp_driver.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/adsp_driver.c 2011-11-15 19:59:43.000000000 -0500
@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
static dev_t adsp_devno;
static struct class *adsp_class;
@@ -38095,8 +38095,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3
.open = adsp_open,
.unlocked_ioctl = adsp_ioctl,
diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_aac.c
---- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_aac.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_aac.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_aac.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_aac.c 2011-11-15 19:59:43.000000000 -0500
@@ -1022,7 +1022,7 @@ done:
return rc;
}
@@ -38107,8 +38107,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.
.open = audio_open,
.release = audio_release,
diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_amrnb.c
---- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_amrnb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-11-15 19:59:43.000000000 -0500
@@ -833,7 +833,7 @@ done:
return rc;
}
@@ -38119,8 +38119,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3
.open = audamrnb_open,
.release = audamrnb_release,
diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_evrc.c
---- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_evrc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_evrc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_evrc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_evrc.c 2011-11-15 19:59:43.000000000 -0500
@@ -805,7 +805,7 @@ dma_fail:
return rc;
}
@@ -38131,8 +38131,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32
.open = audevrc_open,
.release = audevrc_release,
diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_in.c
---- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_in.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_in.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_in.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_in.c 2011-11-15 19:59:43.000000000 -0500
@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
return 0;
}
@@ -38152,8 +38152,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.4
.open = audpre_open,
.unlocked_ioctl = audpre_ioctl,
diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_mp3.c
---- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_mp3.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_mp3.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_mp3.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_mp3.c 2011-11-15 19:59:43.000000000 -0500
@@ -941,7 +941,7 @@ done:
return rc;
}
@@ -38164,8 +38164,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.
.open = audio_open,
.release = audio_release,
diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_out.c
---- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_out.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_out.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_out.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_out.c 2011-11-15 19:59:43.000000000 -0500
@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
return 0;
}
@@ -38185,8 +38185,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
.open = audpp_open,
.unlocked_ioctl = audpp_ioctl,
diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_qcelp.c
---- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_qcelp.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-11-15 19:59:43.000000000 -0500
@@ -816,7 +816,7 @@ err:
return rc;
}
@@ -38197,8 +38197,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3
.open = audqcelp_open,
.release = audqcelp_release,
diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.48/drivers/staging/dream/qdsp5/snd.c
---- linux-2.6.32.48/drivers/staging/dream/qdsp5/snd.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/dream/qdsp5/snd.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/dream/qdsp5/snd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/snd.c 2011-11-15 19:59:43.000000000 -0500
@@ -242,7 +242,7 @@ err:
return rc;
}
@@ -38209,8 +38209,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.48/dri
.open = snd_open,
.release = snd_release,
diff -urNp linux-2.6.32.48/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.48/drivers/staging/dream/smd/smd_qmi.c
---- linux-2.6.32.48/drivers/staging/dream/smd/smd_qmi.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/dream/smd/smd_qmi.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/dream/smd/smd_qmi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/dream/smd/smd_qmi.c 2011-11-15 19:59:43.000000000 -0500
@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
return 0;
}
@@ -38221,8 +38221,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.48/d
.read = qmi_read,
.write = qmi_write,
diff -urNp linux-2.6.32.48/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.48/drivers/staging/dream/smd/smd_rpcrouter_device.c
---- linux-2.6.32.48/drivers/staging/dream/smd/smd_rpcrouter_device.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/dream/smd/smd_rpcrouter_device.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/dream/smd/smd_rpcrouter_device.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/dream/smd/smd_rpcrouter_device.c 2011-11-15 19:59:43.000000000 -0500
@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
return rc;
}
@@ -38242,8 +38242,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
.open = rpcrouter_open,
.release = rpcrouter_release,
diff -urNp linux-2.6.32.48/drivers/staging/dst/dcore.c linux-2.6.32.48/drivers/staging/dst/dcore.c
---- linux-2.6.32.48/drivers/staging/dst/dcore.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/dst/dcore.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/dst/dcore.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/dst/dcore.c 2011-11-15 19:59:43.000000000 -0500
@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
return 0;
}
@@ -38263,8 +38263,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/dst/dcore.c linux-2.6.32.48/drivers/s
err = dst_node_sysfs_init(n);
diff -urNp linux-2.6.32.48/drivers/staging/dst/trans.c linux-2.6.32.48/drivers/staging/dst/trans.c
---- linux-2.6.32.48/drivers/staging/dst/trans.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/dst/trans.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/dst/trans.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/dst/trans.c 2011-11-15 19:59:43.000000000 -0500
@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
t->error = 0;
t->retries = 0;
@@ -38275,8 +38275,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/dst/trans.c linux-2.6.32.48/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.48/drivers/staging/et131x/et1310_tx.c linux-2.6.32.48/drivers/staging/et131x/et1310_tx.c
---- linux-2.6.32.48/drivers/staging/et131x/et1310_tx.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/et131x/et1310_tx.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/et131x/et1310_tx.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/et131x/et1310_tx.c 2011-11-15 19:59:43.000000000 -0500
@@ -710,11 +710,11 @@ inline void et131x_free_send_packet(stru
struct net_device_stats *stats = &etdev->net_stats;
@@ -38293,8 +38293,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/et131x/et1310_tx.c linux-2.6.32.48/dr
if (pMpTcb->Packet) {
stats->tx_bytes += pMpTcb->Packet->len;
diff -urNp linux-2.6.32.48/drivers/staging/et131x/et131x_adapter.h linux-2.6.32.48/drivers/staging/et131x/et131x_adapter.h
---- linux-2.6.32.48/drivers/staging/et131x/et131x_adapter.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/et131x/et131x_adapter.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/et131x/et131x_adapter.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/et131x/et131x_adapter.h 2011-11-15 19:59:43.000000000 -0500
@@ -145,11 +145,11 @@ typedef struct _ce_stats_t {
* operations
*/
@@ -38311,8 +38311,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/et131x/et131x_adapter.h linux-2.6.32.
u32 noxmtbuf; /* # Tx packets discarded */
diff -urNp linux-2.6.32.48/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.48/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.32.48/drivers/staging/go7007/go7007-v4l2.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/go7007/go7007-v4l2.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/go7007/go7007-v4l2.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/go7007/go7007-v4l2.c 2011-11-15 19:59:43.000000000 -0500
@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
return 0;
}
@@ -38323,8 +38323,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.48/
.close = go7007_vm_close,
.fault = go7007_vm_fault,
diff -urNp linux-2.6.32.48/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.48/drivers/staging/hv/blkvsc_drv.c
---- linux-2.6.32.48/drivers/staging/hv/blkvsc_drv.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/hv/blkvsc_drv.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/hv/blkvsc_drv.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/hv/blkvsc_drv.c 2011-11-15 19:59:43.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;
@@ -38335,8 +38335,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.48/drive
.open = blkvsc_open,
.release = blkvsc_release,
diff -urNp linux-2.6.32.48/drivers/staging/hv/Channel.c linux-2.6.32.48/drivers/staging/hv/Channel.c
---- linux-2.6.32.48/drivers/staging/hv/Channel.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/hv/Channel.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/hv/Channel.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/hv/Channel.c 2011-11-15 19:59:43.000000000 -0500
@@ -464,8 +464,8 @@ int VmbusChannelEstablishGpadl(struct vm
DPRINT_ENTER(VMBUS);
@@ -38349,8 +38349,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/hv/Channel.c linux-2.6.32.48/drivers/
VmbusChannelCreateGpadlHeader(Kbuffer, Size, &msgInfo, &msgCount);
ASSERT(msgInfo != NULL);
diff -urNp linux-2.6.32.48/drivers/staging/hv/Hv.c linux-2.6.32.48/drivers/staging/hv/Hv.c
---- linux-2.6.32.48/drivers/staging/hv/Hv.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/hv/Hv.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/hv/Hv.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/hv/Hv.c 2011-11-15 19:59:43.000000000 -0500
@@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo
u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
u32 outputAddressHi = outputAddress >> 32;
@@ -38361,8 +38361,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/hv/Hv.c linux-2.6.32.48/drivers/stagi
DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
Control, Input, Output);
diff -urNp linux-2.6.32.48/drivers/staging/hv/VmbusApi.h linux-2.6.32.48/drivers/staging/hv/VmbusApi.h
---- linux-2.6.32.48/drivers/staging/hv/VmbusApi.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/hv/VmbusApi.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/hv/VmbusApi.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/hv/VmbusApi.h 2011-11-15 19:59:43.000000000 -0500
@@ -109,7 +109,7 @@ struct vmbus_channel_interface {
u32 *GpadlHandle);
int (*TeardownGpadl)(struct hv_device *device, u32 GpadlHandle);
@@ -38373,8 +38373,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/hv/VmbusApi.h linux-2.6.32.48/drivers
/* Base driver object */
struct hv_driver {
diff -urNp linux-2.6.32.48/drivers/staging/hv/vmbus_drv.c linux-2.6.32.48/drivers/staging/hv/vmbus_drv.c
---- linux-2.6.32.48/drivers/staging/hv/vmbus_drv.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/hv/vmbus_drv.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/hv/vmbus_drv.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/hv/vmbus_drv.c 2011-11-15 19:59:43.000000000 -0500
@@ -532,7 +532,7 @@ static int vmbus_child_device_register(s
to_device_context(root_device_obj);
struct device_context *child_device_ctx =
@@ -38394,8 +38394,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/hv/vmbus_drv.c linux-2.6.32.48/driver
/* The new device belongs to this bus */
child_device_ctx->device.bus = &g_vmbus_drv.bus; /* device->dev.bus; */
diff -urNp linux-2.6.32.48/drivers/staging/hv/VmbusPrivate.h linux-2.6.32.48/drivers/staging/hv/VmbusPrivate.h
---- linux-2.6.32.48/drivers/staging/hv/VmbusPrivate.h 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/hv/VmbusPrivate.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/hv/VmbusPrivate.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/hv/VmbusPrivate.h 2011-11-15 19:59:43.000000000 -0500
@@ -59,7 +59,7 @@ enum VMBUS_CONNECT_STATE {
struct VMBUS_CONNECTION {
enum VMBUS_CONNECT_STATE ConnectState;
@@ -38406,8 +38406,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/hv/VmbusPrivate.h linux-2.6.32.48/dri
/*
* Represents channel interrupts. Each bit position represents a
diff -urNp linux-2.6.32.48/drivers/staging/iio/ring_generic.h linux-2.6.32.48/drivers/staging/iio/ring_generic.h
---- linux-2.6.32.48/drivers/staging/iio/ring_generic.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/iio/ring_generic.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/iio/ring_generic.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/iio/ring_generic.h 2011-11-15 19:59:43.000000000 -0500
@@ -87,7 +87,7 @@ struct iio_ring_access_funcs {
int (*is_enabled)(struct iio_ring_buffer *ring);
@@ -38418,8 +38418,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/iio/ring_generic.h linux-2.6.32.48/dr
/**
* struct iio_ring_buffer - general ring buffer structure
diff -urNp linux-2.6.32.48/drivers/staging/octeon/ethernet.c linux-2.6.32.48/drivers/staging/octeon/ethernet.c
---- linux-2.6.32.48/drivers/staging/octeon/ethernet.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/octeon/ethernet.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/octeon/ethernet.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/octeon/ethernet.c 2011-11-15 19:59:43.000000000 -0500
@@ -294,11 +294,11 @@ static struct net_device_stats *cvm_oct_
* since the RX tasklet also increments it.
*/
@@ -38437,8 +38437,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/octeon/ethernet.c linux-2.6.32.48/dri
}
diff -urNp linux-2.6.32.48/drivers/staging/octeon/ethernet-rx.c linux-2.6.32.48/drivers/staging/octeon/ethernet-rx.c
---- linux-2.6.32.48/drivers/staging/octeon/ethernet-rx.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/octeon/ethernet-rx.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/octeon/ethernet-rx.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/octeon/ethernet-rx.c 2011-11-15 19:59:43.000000000 -0500
@@ -406,11 +406,11 @@ void cvm_oct_tasklet_rx(unsigned long un
/* Increment RX stats for virtual ports */
if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
@@ -38468,8 +38468,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/octeon/ethernet-rx.c linux-2.6.32.48/
dev_kfree_skb_irq(skb);
}
diff -urNp linux-2.6.32.48/drivers/staging/panel/panel.c linux-2.6.32.48/drivers/staging/panel/panel.c
---- linux-2.6.32.48/drivers/staging/panel/panel.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/panel/panel.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/panel/panel.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/panel/panel.c 2011-11-15 19:59:43.000000000 -0500
@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
return 0;
}
@@ -38489,8 +38489,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/panel/panel.c linux-2.6.32.48/drivers
.open = keypad_open, /* open */
.release = keypad_release, /* close */
diff -urNp linux-2.6.32.48/drivers/staging/phison/phison.c linux-2.6.32.48/drivers/staging/phison/phison.c
---- linux-2.6.32.48/drivers/staging/phison/phison.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/phison/phison.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/phison/phison.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/phison/phison.c 2011-11-15 19:59:43.000000000 -0500
@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -38501,8 +38501,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/phison/phison.c linux-2.6.32.48/drive
.prereset = phison_pre_reset,
};
diff -urNp linux-2.6.32.48/drivers/staging/poch/poch.c linux-2.6.32.48/drivers/staging/poch/poch.c
---- linux-2.6.32.48/drivers/staging/poch/poch.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/poch/poch.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/poch/poch.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/poch/poch.c 2011-11-15 19:59:43.000000000 -0500
@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
return 0;
}
@@ -38513,8 +38513,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/poch/poch.c linux-2.6.32.48/drivers/s
.open = poch_open,
.release = poch_release,
diff -urNp linux-2.6.32.48/drivers/staging/pohmelfs/inode.c linux-2.6.32.48/drivers/staging/pohmelfs/inode.c
---- linux-2.6.32.48/drivers/staging/pohmelfs/inode.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/pohmelfs/inode.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/pohmelfs/inode.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/pohmelfs/inode.c 2011-11-15 19:59:43.000000000 -0500
@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
mutex_init(&psb->mcache_lock);
psb->mcache_root = RB_ROOT;
@@ -38534,8 +38534,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/pohmelfs/inode.c linux-2.6.32.48/driv
mutex_init(&psb->state_lock);
diff -urNp linux-2.6.32.48/drivers/staging/pohmelfs/mcache.c linux-2.6.32.48/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.32.48/drivers/staging/pohmelfs/mcache.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/pohmelfs/mcache.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/pohmelfs/mcache.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/pohmelfs/mcache.c 2011-11-15 19:59:43.000000000 -0500
@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
m->data = data;
m->start = start;
@@ -38546,8 +38546,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/pohmelfs/mcache.c linux-2.6.32.48/dri
mutex_lock(&psb->mcache_lock);
err = pohmelfs_mcache_insert(psb, m);
diff -urNp linux-2.6.32.48/drivers/staging/pohmelfs/netfs.h linux-2.6.32.48/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.32.48/drivers/staging/pohmelfs/netfs.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/pohmelfs/netfs.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/pohmelfs/netfs.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/pohmelfs/netfs.h 2011-11-15 19:59:43.000000000 -0500
@@ -570,14 +570,14 @@ struct pohmelfs_config;
struct pohmelfs_sb {
struct rb_root mcache_root;
@@ -38566,8 +38566,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/pohmelfs/netfs.h linux-2.6.32.48/driv
unsigned int crypto_attached_size;
unsigned int crypto_align_size;
diff -urNp linux-2.6.32.48/drivers/staging/pohmelfs/trans.c linux-2.6.32.48/drivers/staging/pohmelfs/trans.c
---- linux-2.6.32.48/drivers/staging/pohmelfs/trans.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/pohmelfs/trans.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/pohmelfs/trans.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/pohmelfs/trans.c 2011-11-15 19:59:43.000000000 -0500
@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran
int err;
struct netfs_cmd *cmd = t->iovec.iov_base;
@@ -38578,8 +38578,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/pohmelfs/trans.c linux-2.6.32.48/driv
cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
diff -urNp linux-2.6.32.48/drivers/staging/sep/sep_driver.c linux-2.6.32.48/drivers/staging/sep/sep_driver.c
---- linux-2.6.32.48/drivers/staging/sep/sep_driver.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/sep/sep_driver.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/sep/sep_driver.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/sep/sep_driver.c 2011-11-15 19:59:43.000000000 -0500
@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
static dev_t sep_devno;
@@ -38590,8 +38590,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/sep/sep_driver.c linux-2.6.32.48/driv
.ioctl = sep_ioctl,
.poll = sep_poll,
diff -urNp linux-2.6.32.48/drivers/staging/usbip/usbip_common.h linux-2.6.32.48/drivers/staging/usbip/usbip_common.h
---- linux-2.6.32.48/drivers/staging/usbip/usbip_common.h 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/usbip/usbip_common.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/usbip/usbip_common.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/usbip/usbip_common.h 2011-11-15 19:59:43.000000000 -0500
@@ -374,7 +374,7 @@ struct usbip_device {
void (*shutdown)(struct usbip_device *);
void (*reset)(struct usbip_device *);
@@ -38602,8 +38602,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/usbip/usbip_common.h linux-2.6.32.48/
diff -urNp linux-2.6.32.48/drivers/staging/usbip/vhci.h linux-2.6.32.48/drivers/staging/usbip/vhci.h
---- linux-2.6.32.48/drivers/staging/usbip/vhci.h 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/usbip/vhci.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/usbip/vhci.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/usbip/vhci.h 2011-11-15 19:59:43.000000000 -0500
@@ -92,7 +92,7 @@ struct vhci_hcd {
unsigned resuming:1;
unsigned long re_timeout;
@@ -38614,8 +38614,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/usbip/vhci.h linux-2.6.32.48/drivers/
/*
* NOTE:
diff -urNp linux-2.6.32.48/drivers/staging/usbip/vhci_hcd.c linux-2.6.32.48/drivers/staging/usbip/vhci_hcd.c
---- linux-2.6.32.48/drivers/staging/usbip/vhci_hcd.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/usbip/vhci_hcd.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/usbip/vhci_hcd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/usbip/vhci_hcd.c 2011-11-15 19:59:43.000000000 -0500
@@ -534,7 +534,7 @@ static void vhci_tx_urb(struct urb *urb)
return;
}
@@ -38644,8 +38644,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/usbip/vhci_hcd.c linux-2.6.32.48/driv
diff -urNp linux-2.6.32.48/drivers/staging/usbip/vhci_rx.c linux-2.6.32.48/drivers/staging/usbip/vhci_rx.c
---- linux-2.6.32.48/drivers/staging/usbip/vhci_rx.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/usbip/vhci_rx.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/usbip/vhci_rx.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/usbip/vhci_rx.c 2011-11-15 19:59:43.000000000 -0500
@@ -78,7 +78,7 @@ static void vhci_recv_ret_submit(struct
usbip_uerr("cannot find a urb of seqnum %u\n",
pdu->base.seqnum);
@@ -38656,8 +38656,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/usbip/vhci_rx.c linux-2.6.32.48/drive
return;
}
diff -urNp linux-2.6.32.48/drivers/staging/vme/devices/vme_user.c linux-2.6.32.48/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.32.48/drivers/staging/vme/devices/vme_user.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/vme/devices/vme_user.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/vme/devices/vme_user.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/vme/devices/vme_user.c 2011-11-15 19:59:43.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);
@@ -38668,8 +38668,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/vme/devices/vme_user.c linux-2.6.32.4
.release = vme_user_release,
.read = vme_user_read,
diff -urNp linux-2.6.32.48/drivers/staging/vt6655/hostap.c linux-2.6.32.48/drivers/staging/vt6655/hostap.c
---- linux-2.6.32.48/drivers/staging/vt6655/hostap.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/vt6655/hostap.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/vt6655/hostap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/vt6655/hostap.c 2011-11-15 19:59:43.000000000 -0500
@@ -84,7 +84,7 @@ static int hostap_enable_hostapd(PSDevic
PSDevice apdev_priv;
struct net_device *dev = pDevice->dev;
@@ -38680,8 +38680,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/vt6655/hostap.c linux-2.6.32.48/drive
};
diff -urNp linux-2.6.32.48/drivers/staging/vt6656/hostap.c linux-2.6.32.48/drivers/staging/vt6656/hostap.c
---- linux-2.6.32.48/drivers/staging/vt6656/hostap.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/vt6656/hostap.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/vt6656/hostap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/vt6656/hostap.c 2011-11-15 19:59:43.000000000 -0500
@@ -86,7 +86,7 @@ static int hostap_enable_hostapd(PSDevic
PSDevice apdev_priv;
struct net_device *dev = pDevice->dev;
@@ -38692,8 +38692,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/vt6656/hostap.c linux-2.6.32.48/drive
};
diff -urNp linux-2.6.32.48/drivers/staging/wlan-ng/hfa384x_usb.c linux-2.6.32.48/drivers/staging/wlan-ng/hfa384x_usb.c
---- linux-2.6.32.48/drivers/staging/wlan-ng/hfa384x_usb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-15 19:59:43.000000000 -0500
@@ -205,7 +205,7 @@ static void unlocked_usbctlx_complete(hf
struct usbctlx_completor {
@@ -38704,8 +38704,8 @@ diff -urNp linux-2.6.32.48/drivers/staging/wlan-ng/hfa384x_usb.c linux-2.6.32.48
static int
diff -urNp linux-2.6.32.48/drivers/telephony/ixj.c linux-2.6.32.48/drivers/telephony/ixj.c
---- linux-2.6.32.48/drivers/telephony/ixj.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/telephony/ixj.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/telephony/ixj.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/telephony/ixj.c 2011-11-15 19:59:43.000000000 -0500
@@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j)
bool mContinue;
char *pIn, *pOut;
@@ -38716,8 +38716,8 @@ diff -urNp linux-2.6.32.48/drivers/telephony/ixj.c linux-2.6.32.48/drivers/telep
return 0;
diff -urNp linux-2.6.32.48/drivers/uio/uio.c linux-2.6.32.48/drivers/uio/uio.c
---- linux-2.6.32.48/drivers/uio/uio.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/uio/uio.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/uio/uio.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/uio/uio.c 2011-11-15 19:59:43.000000000 -0500
@@ -23,6 +23,7 @@
#include <linux/string.h>
#include <linux/kobject.h>
@@ -38828,8 +38828,8 @@ diff -urNp linux-2.6.32.48/drivers/uio/uio.c linux-2.6.32.48/drivers/uio/uio.c
ret = uio_get_minor(idev);
if (ret)
diff -urNp linux-2.6.32.48/drivers/usb/atm/usbatm.c linux-2.6.32.48/drivers/usb/atm/usbatm.c
---- linux-2.6.32.48/drivers/usb/atm/usbatm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/usb/atm/usbatm.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/usb/atm/usbatm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/usb/atm/usbatm.c 2011-11-15 19:59:43.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",
@@ -38910,8 +38910,8 @@ diff -urNp linux-2.6.32.48/drivers/usb/atm/usbatm.c linux-2.6.32.48/drivers/usb/
if (!left--) {
if (instance->disconnected)
diff -urNp linux-2.6.32.48/drivers/usb/class/cdc-wdm.c linux-2.6.32.48/drivers/usb/class/cdc-wdm.c
---- linux-2.6.32.48/drivers/usb/class/cdc-wdm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/usb/class/cdc-wdm.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/usb/class/cdc-wdm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/usb/class/cdc-wdm.c 2011-11-15 19:59:43.000000000 -0500
@@ -314,7 +314,7 @@ static ssize_t wdm_write
if (r < 0)
goto outnp;
@@ -38922,8 +38922,8 @@ diff -urNp linux-2.6.32.48/drivers/usb/class/cdc-wdm.c linux-2.6.32.48/drivers/u
&desc->flags));
else
diff -urNp linux-2.6.32.48/drivers/usb/core/hcd.c linux-2.6.32.48/drivers/usb/core/hcd.c
---- linux-2.6.32.48/drivers/usb/core/hcd.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/usb/core/hcd.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/usb/core/hcd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/usb/core/hcd.c 2011-11-15 19:59:43.000000000 -0500
@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -38943,8 +38943,8 @@ diff -urNp linux-2.6.32.48/drivers/usb/core/hcd.c linux-2.6.32.48/drivers/usb/co
if (mon_ops)
diff -urNp linux-2.6.32.48/drivers/usb/core/hcd.h linux-2.6.32.48/drivers/usb/core/hcd.h
---- linux-2.6.32.48/drivers/usb/core/hcd.h 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/usb/core/hcd.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/usb/core/hcd.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/usb/core/hcd.h 2011-11-15 19:59:43.000000000 -0500
@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -38973,8 +38973,8 @@ diff -urNp linux-2.6.32.48/drivers/usb/core/hcd.h linux-2.6.32.48/drivers/usb/co
#else
diff -urNp linux-2.6.32.48/drivers/usb/core/message.c linux-2.6.32.48/drivers/usb/core/message.c
---- linux-2.6.32.48/drivers/usb/core/message.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/usb/core/message.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/usb/core/message.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/usb/core/message.c 2011-11-15 19:59:43.000000000 -0500
@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
if (buf) {
@@ -38987,8 +38987,8 @@ diff -urNp linux-2.6.32.48/drivers/usb/core/message.c linux-2.6.32.48/drivers/us
return buf;
memcpy(smallbuf, buf, len);
diff -urNp linux-2.6.32.48/drivers/usb/misc/appledisplay.c linux-2.6.32.48/drivers/usb/misc/appledisplay.c
---- linux-2.6.32.48/drivers/usb/misc/appledisplay.c 2011-11-12 12:44:29.000000000 -0500
-+++ linux-2.6.32.48/drivers/usb/misc/appledisplay.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/usb/misc/appledisplay.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/usb/misc/appledisplay.c 2011-11-15 19:59:43.000000000 -0500
@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
return pdata->msgdata[1];
}
@@ -38999,8 +38999,8 @@ diff -urNp linux-2.6.32.48/drivers/usb/misc/appledisplay.c linux-2.6.32.48/drive
.update_status = appledisplay_bl_update_status,
};
diff -urNp linux-2.6.32.48/drivers/usb/mon/mon_main.c linux-2.6.32.48/drivers/usb/mon/mon_main.c
---- linux-2.6.32.48/drivers/usb/mon/mon_main.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/usb/mon/mon_main.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/usb/mon/mon_main.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/usb/mon/mon_main.c 2011-11-15 19:59:43.000000000 -0500
@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
/*
* Ops
@@ -39011,8 +39011,8 @@ diff -urNp linux-2.6.32.48/drivers/usb/mon/mon_main.c linux-2.6.32.48/drivers/us
.urb_submit_error = mon_submit_error,
.urb_complete = mon_complete,
diff -urNp linux-2.6.32.48/drivers/usb/wusbcore/wa-hc.h linux-2.6.32.48/drivers/usb/wusbcore/wa-hc.h
---- linux-2.6.32.48/drivers/usb/wusbcore/wa-hc.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/usb/wusbcore/wa-hc.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/usb/wusbcore/wa-hc.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/usb/wusbcore/wa-hc.h 2011-11-15 19:59:43.000000000 -0500
@@ -192,7 +192,7 @@ struct wahc {
struct list_head xfer_delayed_list;
spinlock_t xfer_list_lock;
@@ -39032,8 +39032,8 @@ diff -urNp linux-2.6.32.48/drivers/usb/wusbcore/wa-hc.h linux-2.6.32.48/drivers/
/**
diff -urNp linux-2.6.32.48/drivers/usb/wusbcore/wa-xfer.c linux-2.6.32.48/drivers/usb/wusbcore/wa-xfer.c
---- linux-2.6.32.48/drivers/usb/wusbcore/wa-xfer.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/usb/wusbcore/wa-xfer.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/usb/wusbcore/wa-xfer.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/usb/wusbcore/wa-xfer.c 2011-11-15 19:59:43.000000000 -0500
@@ -293,7 +293,7 @@ out:
*/
static void wa_xfer_id_init(struct wa_xfer *xfer)
@@ -39044,8 +39044,8 @@ diff -urNp linux-2.6.32.48/drivers/usb/wusbcore/wa-xfer.c linux-2.6.32.48/driver
/*
diff -urNp linux-2.6.32.48/drivers/uwb/wlp/messages.c linux-2.6.32.48/drivers/uwb/wlp/messages.c
---- linux-2.6.32.48/drivers/uwb/wlp/messages.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/uwb/wlp/messages.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/uwb/wlp/messages.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/uwb/wlp/messages.c 2011-11-15 19:59:43.000000000 -0500
@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
size_t len = skb->len;
size_t used;
@@ -39056,8 +39056,8 @@ diff -urNp linux-2.6.32.48/drivers/uwb/wlp/messages.c linux-2.6.32.48/drivers/uw
char enonce_buf[WLP_WSS_NONCE_STRSIZE];
char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
diff -urNp linux-2.6.32.48/drivers/uwb/wlp/sysfs.c linux-2.6.32.48/drivers/uwb/wlp/sysfs.c
---- linux-2.6.32.48/drivers/uwb/wlp/sysfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/uwb/wlp/sysfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/uwb/wlp/sysfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/uwb/wlp/sysfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
return ret;
}
@@ -39069,8 +39069,8 @@ diff -urNp linux-2.6.32.48/drivers/uwb/wlp/sysfs.c linux-2.6.32.48/drivers/uwb/w
.store = wlp_wss_attr_store,
};
diff -urNp linux-2.6.32.48/drivers/video/atmel_lcdfb.c linux-2.6.32.48/drivers/video/atmel_lcdfb.c
---- linux-2.6.32.48/drivers/video/atmel_lcdfb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/atmel_lcdfb.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/atmel_lcdfb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/atmel_lcdfb.c 2011-11-15 19:59:43.000000000 -0500
@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
}
@@ -39081,8 +39081,8 @@ diff -urNp linux-2.6.32.48/drivers/video/atmel_lcdfb.c linux-2.6.32.48/drivers/v
.get_brightness = atmel_bl_get_brightness,
};
diff -urNp linux-2.6.32.48/drivers/video/aty/aty128fb.c linux-2.6.32.48/drivers/video/aty/aty128fb.c
---- linux-2.6.32.48/drivers/video/aty/aty128fb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/aty/aty128fb.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/aty/aty128fb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/aty/aty128fb.c 2011-11-15 19:59:43.000000000 -0500
@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -39093,8 +39093,8 @@ diff -urNp linux-2.6.32.48/drivers/video/aty/aty128fb.c linux-2.6.32.48/drivers/
.update_status = aty128_bl_update_status,
};
diff -urNp linux-2.6.32.48/drivers/video/aty/atyfb_base.c linux-2.6.32.48/drivers/video/aty/atyfb_base.c
---- linux-2.6.32.48/drivers/video/aty/atyfb_base.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/aty/atyfb_base.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/aty/atyfb_base.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/aty/atyfb_base.c 2011-11-15 19:59:43.000000000 -0500
@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
return bd->props.brightness;
}
@@ -39105,8 +39105,8 @@ diff -urNp linux-2.6.32.48/drivers/video/aty/atyfb_base.c linux-2.6.32.48/driver
.update_status = aty_bl_update_status,
};
diff -urNp linux-2.6.32.48/drivers/video/aty/radeon_backlight.c linux-2.6.32.48/drivers/video/aty/radeon_backlight.c
---- linux-2.6.32.48/drivers/video/aty/radeon_backlight.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/aty/radeon_backlight.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/aty/radeon_backlight.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/aty/radeon_backlight.c 2011-11-15 19:59:43.000000000 -0500
@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -39117,8 +39117,8 @@ diff -urNp linux-2.6.32.48/drivers/video/aty/radeon_backlight.c linux-2.6.32.48/
.update_status = radeon_bl_update_status,
};
diff -urNp linux-2.6.32.48/drivers/video/backlight/adp5520_bl.c linux-2.6.32.48/drivers/video/backlight/adp5520_bl.c
---- linux-2.6.32.48/drivers/video/backlight/adp5520_bl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/adp5520_bl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/adp5520_bl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/adp5520_bl.c 2011-11-15 19:59:43.000000000 -0500
@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
return error ? data->current_brightness : reg_val;
}
@@ -39129,8 +39129,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/adp5520_bl.c linux-2.6.32.48/
.get_brightness = adp5520_bl_get_brightness,
};
diff -urNp linux-2.6.32.48/drivers/video/backlight/adx_bl.c linux-2.6.32.48/drivers/video/backlight/adx_bl.c
---- linux-2.6.32.48/drivers/video/backlight/adx_bl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/adx_bl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/adx_bl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/adx_bl.c 2011-11-15 19:59:43.000000000 -0500
@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
return 1;
}
@@ -39141,8 +39141,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/adx_bl.c linux-2.6.32.48/driv
.update_status = adx_backlight_update_status,
.get_brightness = adx_backlight_get_brightness,
diff -urNp linux-2.6.32.48/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.48/drivers/video/backlight/atmel-pwm-bl.c
---- linux-2.6.32.48/drivers/video/backlight/atmel-pwm-bl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/atmel-pwm-bl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/atmel-pwm-bl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/atmel-pwm-bl.c 2011-11-15 19:59:43.000000000 -0500
@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
return pwm_channel_enable(&pwmbl->pwmc);
}
@@ -39153,8 +39153,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.4
.update_status = atmel_pwm_bl_set_intensity,
};
diff -urNp linux-2.6.32.48/drivers/video/backlight/backlight.c linux-2.6.32.48/drivers/video/backlight/backlight.c
---- linux-2.6.32.48/drivers/video/backlight/backlight.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/backlight.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/backlight.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/backlight.c 2011-11-15 19:59:43.000000000 -0500
@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
* ERR_PTR() or a pointer to the newly allocated device.
*/
@@ -39165,8 +39165,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/backlight.c linux-2.6.32.48/d
struct backlight_device *new_bd;
int rc;
diff -urNp linux-2.6.32.48/drivers/video/backlight/corgi_lcd.c linux-2.6.32.48/drivers/video/backlight/corgi_lcd.c
---- linux-2.6.32.48/drivers/video/backlight/corgi_lcd.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/corgi_lcd.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/corgi_lcd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/corgi_lcd.c 2011-11-15 19:59:43.000000000 -0500
@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
}
EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -39177,8 +39177,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/corgi_lcd.c linux-2.6.32.48/d
.update_status = corgi_bl_update_status,
};
diff -urNp linux-2.6.32.48/drivers/video/backlight/cr_bllcd.c linux-2.6.32.48/drivers/video/backlight/cr_bllcd.c
---- linux-2.6.32.48/drivers/video/backlight/cr_bllcd.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/cr_bllcd.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/cr_bllcd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/cr_bllcd.c 2011-11-15 19:59:43.000000000 -0500
@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
return intensity;
}
@@ -39189,8 +39189,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/cr_bllcd.c linux-2.6.32.48/dr
.update_status = cr_backlight_set_intensity,
};
diff -urNp linux-2.6.32.48/drivers/video/backlight/da903x_bl.c linux-2.6.32.48/drivers/video/backlight/da903x_bl.c
---- linux-2.6.32.48/drivers/video/backlight/da903x_bl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/da903x_bl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/da903x_bl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/da903x_bl.c 2011-11-15 19:59:43.000000000 -0500
@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
return data->current_brightness;
}
@@ -39201,8 +39201,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/da903x_bl.c linux-2.6.32.48/d
.get_brightness = da903x_backlight_get_brightness,
};
diff -urNp linux-2.6.32.48/drivers/video/backlight/generic_bl.c linux-2.6.32.48/drivers/video/backlight/generic_bl.c
---- linux-2.6.32.48/drivers/video/backlight/generic_bl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/generic_bl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/generic_bl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/generic_bl.c 2011-11-15 19:59:43.000000000 -0500
@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
}
EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -39213,8 +39213,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/generic_bl.c linux-2.6.32.48/
.get_brightness = genericbl_get_intensity,
.update_status = genericbl_send_intensity,
diff -urNp linux-2.6.32.48/drivers/video/backlight/hp680_bl.c linux-2.6.32.48/drivers/video/backlight/hp680_bl.c
---- linux-2.6.32.48/drivers/video/backlight/hp680_bl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/hp680_bl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/hp680_bl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/hp680_bl.c 2011-11-15 19:59:43.000000000 -0500
@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
return current_intensity;
}
@@ -39225,8 +39225,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/hp680_bl.c linux-2.6.32.48/dr
.update_status = hp680bl_set_intensity,
};
diff -urNp linux-2.6.32.48/drivers/video/backlight/jornada720_bl.c linux-2.6.32.48/drivers/video/backlight/jornada720_bl.c
---- linux-2.6.32.48/drivers/video/backlight/jornada720_bl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/jornada720_bl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/jornada720_bl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/jornada720_bl.c 2011-11-15 19:59:43.000000000 -0500
@@ -93,7 +93,7 @@ out:
return ret;
}
@@ -39237,8 +39237,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/jornada720_bl.c linux-2.6.32.
.update_status = jornada_bl_update_status,
.options = BL_CORE_SUSPENDRESUME,
diff -urNp linux-2.6.32.48/drivers/video/backlight/kb3886_bl.c linux-2.6.32.48/drivers/video/backlight/kb3886_bl.c
---- linux-2.6.32.48/drivers/video/backlight/kb3886_bl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/kb3886_bl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/kb3886_bl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/kb3886_bl.c 2011-11-15 19:59:43.000000000 -0500
@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
return kb3886bl_intensity;
}
@@ -39249,8 +39249,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/kb3886_bl.c linux-2.6.32.48/d
.update_status = kb3886bl_send_intensity,
};
diff -urNp linux-2.6.32.48/drivers/video/backlight/locomolcd.c linux-2.6.32.48/drivers/video/backlight/locomolcd.c
---- linux-2.6.32.48/drivers/video/backlight/locomolcd.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/locomolcd.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/locomolcd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/locomolcd.c 2011-11-15 19:59:43.000000000 -0500
@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
return current_intensity;
}
@@ -39261,8 +39261,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/locomolcd.c linux-2.6.32.48/d
.update_status = locomolcd_set_intensity,
};
diff -urNp linux-2.6.32.48/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.48/drivers/video/backlight/mbp_nvidia_bl.c
---- linux-2.6.32.48/drivers/video/backlight/mbp_nvidia_bl.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/mbp_nvidia_bl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/mbp_nvidia_bl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/mbp_nvidia_bl.c 2011-11-15 19:59:43.000000000 -0500
@@ -33,7 +33,7 @@ struct dmi_match_data {
unsigned long iostart;
unsigned long iolen;
@@ -39273,8 +39273,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.
/* Module parameters. */
diff -urNp linux-2.6.32.48/drivers/video/backlight/omap1_bl.c linux-2.6.32.48/drivers/video/backlight/omap1_bl.c
---- linux-2.6.32.48/drivers/video/backlight/omap1_bl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/omap1_bl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/omap1_bl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/omap1_bl.c 2011-11-15 19:59:43.000000000 -0500
@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
return bl->current_intensity;
}
@@ -39285,8 +39285,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/omap1_bl.c linux-2.6.32.48/dr
.update_status = omapbl_update_status,
};
diff -urNp linux-2.6.32.48/drivers/video/backlight/progear_bl.c linux-2.6.32.48/drivers/video/backlight/progear_bl.c
---- linux-2.6.32.48/drivers/video/backlight/progear_bl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/progear_bl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/progear_bl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/progear_bl.c 2011-11-15 19:59:43.000000000 -0500
@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
return intensity - HW_LEVEL_MIN;
}
@@ -39297,8 +39297,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/progear_bl.c linux-2.6.32.48/
.update_status = progearbl_set_intensity,
};
diff -urNp linux-2.6.32.48/drivers/video/backlight/pwm_bl.c linux-2.6.32.48/drivers/video/backlight/pwm_bl.c
---- linux-2.6.32.48/drivers/video/backlight/pwm_bl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/pwm_bl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/pwm_bl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/pwm_bl.c 2011-11-15 19:59:43.000000000 -0500
@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
return bl->props.brightness;
}
@@ -39309,8 +39309,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/pwm_bl.c linux-2.6.32.48/driv
.get_brightness = pwm_backlight_get_brightness,
};
diff -urNp linux-2.6.32.48/drivers/video/backlight/tosa_bl.c linux-2.6.32.48/drivers/video/backlight/tosa_bl.c
---- linux-2.6.32.48/drivers/video/backlight/tosa_bl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/tosa_bl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/tosa_bl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/tosa_bl.c 2011-11-15 19:59:43.000000000 -0500
@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
return props->brightness;
}
@@ -39321,8 +39321,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/tosa_bl.c linux-2.6.32.48/dri
.update_status = tosa_bl_update_status,
};
diff -urNp linux-2.6.32.48/drivers/video/backlight/wm831x_bl.c linux-2.6.32.48/drivers/video/backlight/wm831x_bl.c
---- linux-2.6.32.48/drivers/video/backlight/wm831x_bl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/backlight/wm831x_bl.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/backlight/wm831x_bl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/backlight/wm831x_bl.c 2011-11-15 19:59:43.000000000 -0500
@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
return data->current_brightness;
}
@@ -39333,8 +39333,8 @@ diff -urNp linux-2.6.32.48/drivers/video/backlight/wm831x_bl.c linux-2.6.32.48/d
.update_status = wm831x_backlight_update_status,
.get_brightness = wm831x_backlight_get_brightness,
diff -urNp linux-2.6.32.48/drivers/video/bf54x-lq043fb.c linux-2.6.32.48/drivers/video/bf54x-lq043fb.c
---- linux-2.6.32.48/drivers/video/bf54x-lq043fb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/bf54x-lq043fb.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/bf54x-lq043fb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/bf54x-lq043fb.c 2011-11-15 19:59:43.000000000 -0500
@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
return 0;
}
@@ -39345,8 +39345,8 @@ diff -urNp linux-2.6.32.48/drivers/video/bf54x-lq043fb.c linux-2.6.32.48/drivers
};
diff -urNp linux-2.6.32.48/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.48/drivers/video/bfin-t350mcqb-fb.c
---- linux-2.6.32.48/drivers/video/bfin-t350mcqb-fb.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/bfin-t350mcqb-fb.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/bfin-t350mcqb-fb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/bfin-t350mcqb-fb.c 2011-11-15 19:59:43.000000000 -0500
@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
return 0;
}
@@ -39357,8 +39357,8 @@ diff -urNp linux-2.6.32.48/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.48/driv
};
diff -urNp linux-2.6.32.48/drivers/video/fbcmap.c linux-2.6.32.48/drivers/video/fbcmap.c
---- linux-2.6.32.48/drivers/video/fbcmap.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/fbcmap.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/fbcmap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/fbcmap.c 2011-11-15 19:59:43.000000000 -0500
@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
rc = -ENODEV;
goto out;
@@ -39370,8 +39370,8 @@ diff -urNp linux-2.6.32.48/drivers/video/fbcmap.c linux-2.6.32.48/drivers/video/
goto out1;
}
diff -urNp linux-2.6.32.48/drivers/video/fbmem.c linux-2.6.32.48/drivers/video/fbmem.c
---- linux-2.6.32.48/drivers/video/fbmem.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/fbmem.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/fbmem.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/fbmem.c 2011-11-15 19:59:43.000000000 -0500
@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
image->dx += image->width + 8;
}
@@ -39418,8 +39418,8 @@ diff -urNp linux-2.6.32.48/drivers/video/fbmem.c linux-2.6.32.48/drivers/video/f
if (!registered_fb[con2fb.framebuffer])
request_module("fb%d", con2fb.framebuffer);
diff -urNp linux-2.6.32.48/drivers/video/i810/i810_accel.c linux-2.6.32.48/drivers/video/i810/i810_accel.c
---- linux-2.6.32.48/drivers/video/i810/i810_accel.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/i810/i810_accel.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/i810/i810_accel.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/i810/i810_accel.c 2011-11-15 19:59:43.000000000 -0500
@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
}
}
@@ -39429,8 +39429,8 @@ diff -urNp linux-2.6.32.48/drivers/video/i810/i810_accel.c linux-2.6.32.48/drive
par->dev_flags |= LOCKUP;
info->pixmap.scan_align = 1;
diff -urNp linux-2.6.32.48/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.32.48/drivers/video/logo/logo_linux_clut224.ppm
---- linux-2.6.32.48/drivers/video/logo/logo_linux_clut224.ppm 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/logo/logo_linux_clut224.ppm 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/logo/logo_linux_clut224.ppm 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/logo/logo_linux_clut224.ppm 2011-11-15 19:59:43.000000000 -0500
@@ -1,1604 +1,1123 @@
P3
-# Standard 224-color Linux logo
@@ -42157,8 +42157,8 @@ diff -urNp linux-2.6.32.48/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.3
+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
+4 4 4 4 4 4
diff -urNp linux-2.6.32.48/drivers/video/nvidia/nv_backlight.c linux-2.6.32.48/drivers/video/nvidia/nv_backlight.c
---- linux-2.6.32.48/drivers/video/nvidia/nv_backlight.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/nvidia/nv_backlight.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/nvidia/nv_backlight.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/nvidia/nv_backlight.c 2011-11-15 19:59:43.000000000 -0500
@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -42169,8 +42169,8 @@ diff -urNp linux-2.6.32.48/drivers/video/nvidia/nv_backlight.c linux-2.6.32.48/d
.update_status = nvidia_bl_update_status,
};
diff -urNp linux-2.6.32.48/drivers/video/riva/fbdev.c linux-2.6.32.48/drivers/video/riva/fbdev.c
---- linux-2.6.32.48/drivers/video/riva/fbdev.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/riva/fbdev.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/riva/fbdev.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/riva/fbdev.c 2011-11-15 19:59:43.000000000 -0500
@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
return bd->props.brightness;
}
@@ -42181,8 +42181,8 @@ diff -urNp linux-2.6.32.48/drivers/video/riva/fbdev.c linux-2.6.32.48/drivers/vi
.update_status = riva_bl_update_status,
};
diff -urNp linux-2.6.32.48/drivers/video/uvesafb.c linux-2.6.32.48/drivers/video/uvesafb.c
---- linux-2.6.32.48/drivers/video/uvesafb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/uvesafb.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/uvesafb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/uvesafb.c 2011-11-15 19:59:43.000000000 -0500
@@ -18,6 +18,7 @@
#include <linux/fb.h>
#include <linux/io.h>
@@ -42259,8 +42259,8 @@ diff -urNp linux-2.6.32.48/drivers/video/uvesafb.c linux-2.6.32.48/drivers/video
framebuffer_release(info);
diff -urNp linux-2.6.32.48/drivers/video/vesafb.c linux-2.6.32.48/drivers/video/vesafb.c
---- linux-2.6.32.48/drivers/video/vesafb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/video/vesafb.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/video/vesafb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/video/vesafb.c 2011-11-15 19:59:43.000000000 -0500
@@ -9,6 +9,7 @@
*/
@@ -42364,8 +42364,8 @@ diff -urNp linux-2.6.32.48/drivers/video/vesafb.c linux-2.6.32.48/drivers/video/
iounmap(info->screen_base);
framebuffer_release(info);
diff -urNp linux-2.6.32.48/drivers/xen/sys-hypervisor.c linux-2.6.32.48/drivers/xen/sys-hypervisor.c
---- linux-2.6.32.48/drivers/xen/sys-hypervisor.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/drivers/xen/sys-hypervisor.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/drivers/xen/sys-hypervisor.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/drivers/xen/sys-hypervisor.c 2011-11-15 19:59:43.000000000 -0500
@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
return 0;
}
@@ -42376,8 +42376,8 @@ diff -urNp linux-2.6.32.48/drivers/xen/sys-hypervisor.c linux-2.6.32.48/drivers/
.store = hyp_sysfs_store,
};
diff -urNp linux-2.6.32.48/fs/9p/vfs_inode.c linux-2.6.32.48/fs/9p/vfs_inode.c
---- linux-2.6.32.48/fs/9p/vfs_inode.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/9p/vfs_inode.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/9p/vfs_inode.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/9p/vfs_inode.c 2011-11-15 19:59:43.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)
@@ -42388,8 +42388,8 @@ diff -urNp linux-2.6.32.48/fs/9p/vfs_inode.c linux-2.6.32.48/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.48/fs/aio.c linux-2.6.32.48/fs/aio.c
---- linux-2.6.32.48/fs/aio.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/aio.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/aio.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/aio.c 2011-11-15 19:59:43.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;
@@ -42429,8 +42429,8 @@ diff -urNp linux-2.6.32.48/fs/aio.c linux-2.6.32.48/fs/aio.c
kiocb->ki_cur_seg = 0;
/* ki_nbytes/left now reflect bytes instead of segs */
diff -urNp linux-2.6.32.48/fs/attr.c linux-2.6.32.48/fs/attr.c
---- linux-2.6.32.48/fs/attr.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/attr.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/attr.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/attr.c 2011-11-15 19:59:43.000000000 -0500
@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
unsigned long limit;
@@ -42440,8 +42440,8 @@ diff -urNp linux-2.6.32.48/fs/attr.c linux-2.6.32.48/fs/attr.c
goto out_sig;
if (offset > inode->i_sb->s_maxbytes)
diff -urNp linux-2.6.32.48/fs/autofs/root.c linux-2.6.32.48/fs/autofs/root.c
---- linux-2.6.32.48/fs/autofs/root.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/autofs/root.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/autofs/root.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/autofs/root.c 2011-11-15 19:59:43.000000000 -0500
@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
set_bit(n,sbi->symlink_bitmap);
sl = &sbi->symlink[n];
@@ -42453,8 +42453,8 @@ diff -urNp linux-2.6.32.48/fs/autofs/root.c linux-2.6.32.48/fs/autofs/root.c
clear_bit(n,sbi->symlink_bitmap);
unlock_kernel();
diff -urNp linux-2.6.32.48/fs/autofs4/symlink.c linux-2.6.32.48/fs/autofs4/symlink.c
---- linux-2.6.32.48/fs/autofs4/symlink.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/autofs4/symlink.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/autofs4/symlink.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/autofs4/symlink.c 2011-11-15 19:59:43.000000000 -0500
@@ -15,7 +15,7 @@
static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
{
@@ -42465,8 +42465,8 @@ diff -urNp linux-2.6.32.48/fs/autofs4/symlink.c linux-2.6.32.48/fs/autofs4/symli
}
diff -urNp linux-2.6.32.48/fs/autofs4/waitq.c linux-2.6.32.48/fs/autofs4/waitq.c
---- linux-2.6.32.48/fs/autofs4/waitq.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/autofs4/waitq.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/autofs4/waitq.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/autofs4/waitq.c 2011-11-15 19:59:43.000000000 -0500
@@ -60,7 +60,7 @@ static int autofs4_write(struct file *fi
{
unsigned long sigpipe, flags;
@@ -42477,8 +42477,8 @@ diff -urNp linux-2.6.32.48/fs/autofs4/waitq.c linux-2.6.32.48/fs/autofs4/waitq.c
/** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
diff -urNp linux-2.6.32.48/fs/befs/linuxvfs.c linux-2.6.32.48/fs/befs/linuxvfs.c
---- linux-2.6.32.48/fs/befs/linuxvfs.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/befs/linuxvfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/befs/linuxvfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/befs/linuxvfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -498,7 +498,7 @@ static void befs_put_link(struct dentry
{
befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -42489,8 +42489,8 @@ diff -urNp linux-2.6.32.48/fs/befs/linuxvfs.c linux-2.6.32.48/fs/befs/linuxvfs.c
kfree(link);
}
diff -urNp linux-2.6.32.48/fs/binfmt_aout.c linux-2.6.32.48/fs/binfmt_aout.c
---- linux-2.6.32.48/fs/binfmt_aout.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/binfmt_aout.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/binfmt_aout.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/binfmt_aout.c 2011-11-15 19:59:43.000000000 -0500
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/fs.h>
@@ -42579,8 +42579,8 @@ diff -urNp linux-2.6.32.48/fs/binfmt_aout.c linux-2.6.32.48/fs/binfmt_aout.c
fd_offset + ex.a_text);
up_write(&current->mm->mmap_sem);
diff -urNp linux-2.6.32.48/fs/binfmt_elf.c linux-2.6.32.48/fs/binfmt_elf.c
---- linux-2.6.32.48/fs/binfmt_elf.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/binfmt_elf.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/binfmt_elf.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/binfmt_elf.c 2011-11-15 19:59:43.000000000 -0500
@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
#define elf_core_dump NULL
#endif
@@ -43255,8 +43255,8 @@ diff -urNp linux-2.6.32.48/fs/binfmt_elf.c linux-2.6.32.48/fs/binfmt_elf.c
{
return register_binfmt(&elf_format);
diff -urNp linux-2.6.32.48/fs/binfmt_flat.c linux-2.6.32.48/fs/binfmt_flat.c
---- linux-2.6.32.48/fs/binfmt_flat.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/binfmt_flat.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/binfmt_flat.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/binfmt_flat.c 2011-11-15 19:59:43.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",
@@ -43290,8 +43290,8 @@ diff -urNp linux-2.6.32.48/fs/binfmt_flat.c linux-2.6.32.48/fs/binfmt_flat.c
goto err;
}
diff -urNp linux-2.6.32.48/fs/bio.c linux-2.6.32.48/fs/bio.c
---- linux-2.6.32.48/fs/bio.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/bio.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/bio.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/bio.c 2011-11-15 19:59:43.000000000 -0500
@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
i = 0;
@@ -43311,8 +43311,8 @@ diff -urNp linux-2.6.32.48/fs/bio.c linux-2.6.32.48/fs/bio.c
__bio_for_each_segment(bvec, bio, i, 0) {
char *addr = page_address(bvec->bv_page);
diff -urNp linux-2.6.32.48/fs/block_dev.c linux-2.6.32.48/fs/block_dev.c
---- linux-2.6.32.48/fs/block_dev.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/block_dev.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/block_dev.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/block_dev.c 2011-11-15 19:59:43.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 */
@@ -43323,8 +43323,8 @@ diff -urNp linux-2.6.32.48/fs/block_dev.c linux-2.6.32.48/fs/block_dev.c
else if (bdev->bd_contains->bd_holder != NULL)
res = -EBUSY; /* is a partition of a held device */
diff -urNp linux-2.6.32.48/fs/btrfs/ctree.c linux-2.6.32.48/fs/btrfs/ctree.c
---- linux-2.6.32.48/fs/btrfs/ctree.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/btrfs/ctree.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/btrfs/ctree.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/btrfs/ctree.c 2011-11-15 19:59:43.000000000 -0500
@@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(st
free_extent_buffer(buf);
add_root_to_dirty_list(root);
@@ -43350,8 +43350,8 @@ diff -urNp linux-2.6.32.48/fs/btrfs/ctree.c linux-2.6.32.48/fs/btrfs/ctree.c
ret = fixup_low_keys(trans, root, path, &disk_key, 1);
}
diff -urNp linux-2.6.32.48/fs/btrfs/disk-io.c linux-2.6.32.48/fs/btrfs/disk-io.c
---- linux-2.6.32.48/fs/btrfs/disk-io.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/btrfs/disk-io.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/btrfs/disk-io.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/btrfs/disk-io.c 2011-11-15 19:59:43.000000000 -0500
@@ -39,7 +39,7 @@
#include "tree-log.h"
#include "free-space-cache.h"
@@ -43371,8 +43371,8 @@ diff -urNp linux-2.6.32.48/fs/btrfs/disk-io.c linux-2.6.32.48/fs/btrfs/disk-io.c
.readpage_end_io_hook = btree_readpage_end_io_hook,
.submit_bio_hook = btree_submit_bio_hook,
diff -urNp linux-2.6.32.48/fs/btrfs/extent_io.h linux-2.6.32.48/fs/btrfs/extent_io.h
---- linux-2.6.32.48/fs/btrfs/extent_io.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/btrfs/extent_io.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/btrfs/extent_io.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/btrfs/extent_io.h 2011-11-15 19:59:43.000000000 -0500
@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
struct bio *bio, int mirror_num,
unsigned long bio_flags);
@@ -43434,8 +43434,8 @@ diff -urNp linux-2.6.32.48/fs/btrfs/extent_io.h linux-2.6.32.48/fs/btrfs/extent_
struct extent_state {
diff -urNp linux-2.6.32.48/fs/btrfs/extent-tree.c linux-2.6.32.48/fs/btrfs/extent-tree.c
---- linux-2.6.32.48/fs/btrfs/extent-tree.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/btrfs/extent-tree.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/btrfs/extent-tree.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/btrfs/extent-tree.c 2011-11-15 19:59:43.000000000 -0500
@@ -7141,6 +7141,10 @@ static noinline int relocate_one_extent(
u64 group_start = group->key.objectid;
new_extents = kmalloc(sizeof(*new_extents),
@@ -43448,8 +43448,8 @@ diff -urNp linux-2.6.32.48/fs/btrfs/extent-tree.c linux-2.6.32.48/fs/btrfs/exten
ret = get_new_locations(reloc_inode,
extent_key,
diff -urNp linux-2.6.32.48/fs/btrfs/free-space-cache.c linux-2.6.32.48/fs/btrfs/free-space-cache.c
---- linux-2.6.32.48/fs/btrfs/free-space-cache.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/btrfs/free-space-cache.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/btrfs/free-space-cache.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/btrfs/free-space-cache.c 2011-11-15 19:59:43.000000000 -0500
@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
while(1) {
@@ -43469,8 +43469,8 @@ diff -urNp linux-2.6.32.48/fs/btrfs/free-space-cache.c linux-2.6.32.48/fs/btrfs/
if (entry->bitmap && entry->bytes > bytes + empty_size) {
ret = btrfs_bitmap_cluster(block_group, entry, cluster,
diff -urNp linux-2.6.32.48/fs/btrfs/inode.c linux-2.6.32.48/fs/btrfs/inode.c
---- linux-2.6.32.48/fs/btrfs/inode.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/btrfs/inode.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/btrfs/inode.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/btrfs/inode.c 2011-11-15 19:59:43.000000000 -0500
@@ -63,7 +63,7 @@ static const struct inode_operations btr
static const struct address_space_operations btrfs_aops;
static const struct address_space_operations btrfs_symlink_aops;
@@ -43531,8 +43531,8 @@ diff -urNp linux-2.6.32.48/fs/btrfs/inode.c linux-2.6.32.48/fs/btrfs/inode.c
.submit_bio_hook = btrfs_submit_bio_hook,
.merge_bio_hook = btrfs_merge_bio_hook,
diff -urNp linux-2.6.32.48/fs/btrfs/relocation.c linux-2.6.32.48/fs/btrfs/relocation.c
---- linux-2.6.32.48/fs/btrfs/relocation.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/btrfs/relocation.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/btrfs/relocation.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/btrfs/relocation.c 2011-11-15 19:59:43.000000000 -0500
@@ -884,7 +884,7 @@ static int __update_reloc_root(struct bt
}
spin_unlock(&rc->reloc_root_tree.lock);
@@ -43543,8 +43543,8 @@ diff -urNp linux-2.6.32.48/fs/btrfs/relocation.c linux-2.6.32.48/fs/btrfs/reloca
if (!del) {
spin_lock(&rc->reloc_root_tree.lock);
diff -urNp linux-2.6.32.48/fs/btrfs/sysfs.c linux-2.6.32.48/fs/btrfs/sysfs.c
---- linux-2.6.32.48/fs/btrfs/sysfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/btrfs/sysfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/btrfs/sysfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/btrfs/sysfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
complete(&root->kobj_unregister);
}
@@ -43561,8 +43561,8 @@ diff -urNp linux-2.6.32.48/fs/btrfs/sysfs.c linux-2.6.32.48/fs/btrfs/sysfs.c
.store = btrfs_root_attr_store,
};
diff -urNp linux-2.6.32.48/fs/buffer.c linux-2.6.32.48/fs/buffer.c
---- linux-2.6.32.48/fs/buffer.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/buffer.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/buffer.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/buffer.c 2011-11-15 19:59:43.000000000 -0500
@@ -25,6 +25,7 @@
#include <linux/percpu.h>
#include <linux/slab.h>
@@ -43572,8 +43572,8 @@ diff -urNp linux-2.6.32.48/fs/buffer.c linux-2.6.32.48/fs/buffer.c
#include <linux/file.h>
#include <linux/quotaops.h>
diff -urNp linux-2.6.32.48/fs/cachefiles/bind.c linux-2.6.32.48/fs/cachefiles/bind.c
---- linux-2.6.32.48/fs/cachefiles/bind.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/cachefiles/bind.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/cachefiles/bind.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/cachefiles/bind.c 2011-11-15 19:59:43.000000000 -0500
@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
args);
@@ -43591,8 +43591,8 @@ diff -urNp linux-2.6.32.48/fs/cachefiles/bind.c linux-2.6.32.48/fs/cachefiles/bi
cache->brun_percent < 100);
diff -urNp linux-2.6.32.48/fs/cachefiles/daemon.c linux-2.6.32.48/fs/cachefiles/daemon.c
---- linux-2.6.32.48/fs/cachefiles/daemon.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/cachefiles/daemon.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/cachefiles/daemon.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/cachefiles/daemon.c 2011-11-15 19:59:43.000000000 -0500
@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
if (test_bit(CACHEFILES_DEAD, &cache->flags))
return -EIO;
@@ -43621,8 +43621,8 @@ diff -urNp linux-2.6.32.48/fs/cachefiles/daemon.c linux-2.6.32.48/fs/cachefiles/
cache->bstop_percent = bstop;
diff -urNp linux-2.6.32.48/fs/cachefiles/internal.h linux-2.6.32.48/fs/cachefiles/internal.h
---- linux-2.6.32.48/fs/cachefiles/internal.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/cachefiles/internal.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/cachefiles/internal.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/cachefiles/internal.h 2011-11-15 19:59:43.000000000 -0500
@@ -56,7 +56,7 @@ struct cachefiles_cache {
wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
struct rb_root active_nodes; /* active nodes (can't be culled) */
@@ -43658,8 +43658,8 @@ diff -urNp linux-2.6.32.48/fs/cachefiles/internal.h linux-2.6.32.48/fs/cachefile
#else
diff -urNp linux-2.6.32.48/fs/cachefiles/namei.c linux-2.6.32.48/fs/cachefiles/namei.c
---- linux-2.6.32.48/fs/cachefiles/namei.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/cachefiles/namei.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/cachefiles/namei.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/cachefiles/namei.c 2011-11-15 19:59:43.000000000 -0500
@@ -250,7 +250,7 @@ try_again:
/* first step is to make up a grave dentry in the graveyard */
sprintf(nbuffer, "%08x%08x",
@@ -43670,8 +43670,8 @@ diff -urNp linux-2.6.32.48/fs/cachefiles/namei.c linux-2.6.32.48/fs/cachefiles/n
/* do the multiway lock magic */
trap = lock_rename(cache->graveyard, dir);
diff -urNp linux-2.6.32.48/fs/cachefiles/proc.c linux-2.6.32.48/fs/cachefiles/proc.c
---- linux-2.6.32.48/fs/cachefiles/proc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/cachefiles/proc.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/cachefiles/proc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/cachefiles/proc.c 2011-11-15 19:59:43.000000000 -0500
@@ -14,9 +14,9 @@
#include <linux/seq_file.h>
#include "internal.h"
@@ -43699,8 +43699,8 @@ diff -urNp linux-2.6.32.48/fs/cachefiles/proc.c linux-2.6.32.48/fs/cachefiles/pr
return 0;
diff -urNp linux-2.6.32.48/fs/cachefiles/rdwr.c linux-2.6.32.48/fs/cachefiles/rdwr.c
---- linux-2.6.32.48/fs/cachefiles/rdwr.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/cachefiles/rdwr.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/cachefiles/rdwr.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/cachefiles/rdwr.c 2011-11-15 19:59:43.000000000 -0500
@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
old_fs = get_fs();
set_fs(KERNEL_DS);
@@ -43711,8 +43711,8 @@ diff -urNp linux-2.6.32.48/fs/cachefiles/rdwr.c linux-2.6.32.48/fs/cachefiles/rd
kunmap(page);
if (ret != len)
diff -urNp linux-2.6.32.48/fs/cifs/cifs_debug.c linux-2.6.32.48/fs/cifs/cifs_debug.c
---- linux-2.6.32.48/fs/cifs/cifs_debug.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/cifs/cifs_debug.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/cifs/cifs_debug.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/cifs/cifs_debug.c 2011-11-15 19:59:43.000000000 -0500
@@ -256,25 +256,25 @@ static ssize_t cifs_stats_proc_write(str
tcon = list_entry(tmp3,
struct cifsTconInfo,
@@ -43821,8 +43821,8 @@ diff -urNp linux-2.6.32.48/fs/cifs/cifs_debug.c linux-2.6.32.48/fs/cifs/cifs_deb
}
}
diff -urNp linux-2.6.32.48/fs/cifs/cifsfs.c linux-2.6.32.48/fs/cifs/cifsfs.c
---- linux-2.6.32.48/fs/cifs/cifsfs.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/cifs/cifsfs.c 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/cifs/cifsfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/cifs/cifsfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -869,7 +869,7 @@ cifs_init_request_bufs(void)
cifs_req_cachep = kmem_cache_create("cifs_request",
CIFSMaxBufSize +
@@ -43853,8 +43853,8 @@ diff -urNp linux-2.6.32.48/fs/cifs/cifsfs.c linux-2.6.32.48/fs/cifs/cifsfs.c
atomic_set(&midCount, 0);
diff -urNp linux-2.6.32.48/fs/cifs/cifsglob.h linux-2.6.32.48/fs/cifs/cifsglob.h
---- linux-2.6.32.48/fs/cifs/cifsglob.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/cifs/cifsglob.h 2011-11-12 12:46:45.000000000 -0500
+--- linux-2.6.32.48/fs/cifs/cifsglob.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/cifs/cifsglob.h 2011-11-15 19:59:43.000000000 -0500
@@ -252,28 +252,28 @@ struct cifsTconInfo {
__u16 Flags; /* optional support bits */
enum statusEnum tidStatus;
@@ -43927,8 +43927,8 @@ diff -urNp linux-2.6.32.48/fs/cifs/cifsglob.h linux-2.6.32.48/fs/cifs/cifsglob.h
GLOBAL_EXTERN atomic_t smBufAllocCount;
GLOBAL_EXTERN atomic_t midCount;
diff -urNp linux-2.6.32.48/fs/cifs/link.c linux-2.6.32.48/fs/cifs/link.c
---- linux-2.6.32.48/fs/cifs/link.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/cifs/link.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/cifs/link.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/cifs/link.c 2011-11-15 19:59:43.000000000 -0500
@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -43939,8 +43939,8 @@ diff -urNp linux-2.6.32.48/fs/cifs/link.c linux-2.6.32.48/fs/cifs/link.c
kfree(p);
}
diff -urNp linux-2.6.32.48/fs/cifs/misc.c linux-2.6.32.48/fs/cifs/misc.c
---- linux-2.6.32.48/fs/cifs/misc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/cifs/misc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/cifs/misc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/cifs/misc.c 2011-11-15 19:59:43.000000000 -0500
@@ -155,7 +155,7 @@ cifs_buf_get(void)
memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
atomic_inc(&bufAllocCount);
@@ -43960,8 +43960,8 @@ diff -urNp linux-2.6.32.48/fs/cifs/misc.c linux-2.6.32.48/fs/cifs/misc.c
}
diff -urNp linux-2.6.32.48/fs/coda/cache.c linux-2.6.32.48/fs/coda/cache.c
---- linux-2.6.32.48/fs/coda/cache.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/coda/cache.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/coda/cache.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/coda/cache.c 2011-11-15 19:59:43.000000000 -0500
@@ -24,14 +24,14 @@
#include <linux/coda_fs_i.h>
#include <linux/coda_cache.h>
@@ -44005,8 +44005,8 @@ diff -urNp linux-2.6.32.48/fs/coda/cache.c linux-2.6.32.48/fs/coda/cache.c
return hit;
}
diff -urNp linux-2.6.32.48/fs/compat_binfmt_elf.c linux-2.6.32.48/fs/compat_binfmt_elf.c
---- linux-2.6.32.48/fs/compat_binfmt_elf.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/compat_binfmt_elf.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/compat_binfmt_elf.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/compat_binfmt_elf.c 2011-11-15 19:59:43.000000000 -0500
@@ -29,10 +29,12 @@
#undef elfhdr
#undef elf_phdr
@@ -44021,8 +44021,8 @@ diff -urNp linux-2.6.32.48/fs/compat_binfmt_elf.c linux-2.6.32.48/fs/compat_binf
/*
diff -urNp linux-2.6.32.48/fs/compat.c linux-2.6.32.48/fs/compat.c
---- linux-2.6.32.48/fs/compat.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/compat.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/compat.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/compat.c 2011-11-15 19:59:43.000000000 -0500
@@ -133,8 +133,8 @@ asmlinkage long compat_sys_utimes(char _
static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
{
@@ -44269,8 +44269,8 @@ diff -urNp linux-2.6.32.48/fs/compat.c linux-2.6.32.48/fs/compat.c
if (err)
diff -urNp linux-2.6.32.48/fs/compat_ioctl.c linux-2.6.32.48/fs/compat_ioctl.c
---- linux-2.6.32.48/fs/compat_ioctl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/compat_ioctl.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/compat_ioctl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/compat_ioctl.c 2011-11-15 19:59:43.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);
@@ -44299,8 +44299,8 @@ diff -urNp linux-2.6.32.48/fs/compat_ioctl.c linux-2.6.32.48/fs/compat_ioctl.c
return ioctl_preallocate(file, p);
diff -urNp linux-2.6.32.48/fs/configfs/dir.c linux-2.6.32.48/fs/configfs/dir.c
---- linux-2.6.32.48/fs/configfs/dir.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/configfs/dir.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/configfs/dir.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/configfs/dir.c 2011-11-15 19:59:43.000000000 -0500
@@ -1572,7 +1572,8 @@ static int configfs_readdir(struct file
}
for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
@@ -44326,8 +44326,8 @@ diff -urNp linux-2.6.32.48/fs/configfs/dir.c linux-2.6.32.48/fs/configfs/dir.c
ino = next->s_dentry->d_inode->i_ino;
else
diff -urNp linux-2.6.32.48/fs/dcache.c linux-2.6.32.48/fs/dcache.c
---- linux-2.6.32.48/fs/dcache.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/dcache.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/dcache.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/dcache.c 2011-11-15 19:59:43.000000000 -0500
@@ -45,8 +45,6 @@ EXPORT_SYMBOL(dcache_lock);
static struct kmem_cache *dentry_cache __read_mostly;
@@ -44347,8 +44347,8 @@ diff -urNp linux-2.6.32.48/fs/dcache.c linux-2.6.32.48/fs/dcache.c
dcache_init();
inode_init();
diff -urNp linux-2.6.32.48/fs/dlm/lockspace.c linux-2.6.32.48/fs/dlm/lockspace.c
---- linux-2.6.32.48/fs/dlm/lockspace.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/dlm/lockspace.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/dlm/lockspace.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/dlm/lockspace.c 2011-11-15 19:59:43.000000000 -0500
@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
kfree(ls);
}
@@ -44359,8 +44359,8 @@ diff -urNp linux-2.6.32.48/fs/dlm/lockspace.c linux-2.6.32.48/fs/dlm/lockspace.c
.store = dlm_attr_store,
};
diff -urNp linux-2.6.32.48/fs/ecryptfs/inode.c linux-2.6.32.48/fs/ecryptfs/inode.c
---- linux-2.6.32.48/fs/ecryptfs/inode.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/ecryptfs/inode.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ecryptfs/inode.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ecryptfs/inode.c 2011-11-15 19:59:43.000000000 -0500
@@ -660,7 +660,7 @@ static int ecryptfs_readlink_lower(struc
old_fs = get_fs();
set_fs(get_ds());
@@ -44380,8 +44380,8 @@ diff -urNp linux-2.6.32.48/fs/ecryptfs/inode.c linux-2.6.32.48/fs/ecryptfs/inode
if (rc < 0)
goto out_free;
diff -urNp linux-2.6.32.48/fs/exec.c linux-2.6.32.48/fs/exec.c
---- linux-2.6.32.48/fs/exec.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/exec.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/exec.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/exec.c 2011-11-15 19:59:43.000000000 -0500
@@ -56,12 +56,24 @@
#include <linux/fsnotify.h>
#include <linux/fs_struct.h>
@@ -44976,8 +44976,8 @@ diff -urNp linux-2.6.32.48/fs/exec.c linux-2.6.32.48/fs/exec.c
if (helper_argv)
argv_free(helper_argv);
diff -urNp linux-2.6.32.48/fs/ext2/balloc.c linux-2.6.32.48/fs/ext2/balloc.c
---- linux-2.6.32.48/fs/ext2/balloc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/ext2/balloc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ext2/balloc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ext2/balloc.c 2011-11-15 19:59:43.000000000 -0500
@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -44988,8 +44988,8 @@ diff -urNp linux-2.6.32.48/fs/ext2/balloc.c linux-2.6.32.48/fs/ext2/balloc.c
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
return 0;
diff -urNp linux-2.6.32.48/fs/ext3/balloc.c linux-2.6.32.48/fs/ext3/balloc.c
---- linux-2.6.32.48/fs/ext3/balloc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/ext3/balloc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ext3/balloc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ext3/balloc.c 2011-11-15 19:59:43.000000000 -0500
@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -45000,8 +45000,8 @@ diff -urNp linux-2.6.32.48/fs/ext3/balloc.c linux-2.6.32.48/fs/ext3/balloc.c
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
return 0;
diff -urNp linux-2.6.32.48/fs/ext4/balloc.c linux-2.6.32.48/fs/ext4/balloc.c
---- linux-2.6.32.48/fs/ext4/balloc.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/ext4/balloc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ext4/balloc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ext4/balloc.c 2011-11-15 19:59:43.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() ||
@@ -45012,8 +45012,8 @@ diff -urNp linux-2.6.32.48/fs/ext4/balloc.c linux-2.6.32.48/fs/ext4/balloc.c
return 1;
}
diff -urNp linux-2.6.32.48/fs/ext4/ext4.h linux-2.6.32.48/fs/ext4/ext4.h
---- linux-2.6.32.48/fs/ext4/ext4.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/ext4/ext4.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ext4/ext4.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ext4/ext4.h 2011-11-15 19:59:43.000000000 -0500
@@ -1077,19 +1077,19 @@ struct ext4_sb_info {
/* stats for buddy allocator */
@@ -45045,8 +45045,8 @@ diff -urNp linux-2.6.32.48/fs/ext4/ext4.h linux-2.6.32.48/fs/ext4/ext4.h
/* locality groups */
diff -urNp linux-2.6.32.48/fs/ext4/file.c linux-2.6.32.48/fs/ext4/file.c
---- linux-2.6.32.48/fs/ext4/file.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/ext4/file.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ext4/file.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ext4/file.c 2011-11-15 19:59:43.000000000 -0500
@@ -122,8 +122,8 @@ static int ext4_file_open(struct inode *
cp = d_path(&path, buf, sizeof(buf));
path_put(&path);
@@ -45059,8 +45059,8 @@ diff -urNp linux-2.6.32.48/fs/ext4/file.c linux-2.6.32.48/fs/ext4/file.c
}
}
diff -urNp linux-2.6.32.48/fs/ext4/mballoc.c linux-2.6.32.48/fs/ext4/mballoc.c
---- linux-2.6.32.48/fs/ext4/mballoc.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/ext4/mballoc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ext4/mballoc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ext4/mballoc.c 2011-11-15 19:59:43.000000000 -0500
@@ -1755,7 +1755,7 @@ void ext4_mb_simple_scan_group(struct ex
BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
@@ -45184,8 +45184,8 @@ diff -urNp linux-2.6.32.48/fs/ext4/mballoc.c linux-2.6.32.48/fs/ext4/mballoc.c
if (ac) {
ac->ac_sb = sb;
diff -urNp linux-2.6.32.48/fs/ext4/super.c linux-2.6.32.48/fs/ext4/super.c
---- linux-2.6.32.48/fs/ext4/super.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/ext4/super.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ext4/super.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ext4/super.c 2011-11-15 19:59:43.000000000 -0500
@@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobje
}
@@ -45196,8 +45196,8 @@ diff -urNp linux-2.6.32.48/fs/ext4/super.c linux-2.6.32.48/fs/ext4/super.c
.store = ext4_attr_store,
};
diff -urNp linux-2.6.32.48/fs/fcntl.c linux-2.6.32.48/fs/fcntl.c
---- linux-2.6.32.48/fs/fcntl.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/fcntl.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/fcntl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/fcntl.c 2011-11-15 19:59:43.000000000 -0500
@@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct
if (err)
return err;
@@ -45237,8 +45237,8 @@ diff -urNp linux-2.6.32.48/fs/fcntl.c linux-2.6.32.48/fs/fcntl.c
break;
err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
diff -urNp linux-2.6.32.48/fs/fifo.c linux-2.6.32.48/fs/fifo.c
---- linux-2.6.32.48/fs/fifo.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/fifo.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/fifo.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/fifo.c 2011-11-15 19:59:43.000000000 -0500
@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
*/
filp->f_op = &read_pipefifo_fops;
@@ -45310,8 +45310,8 @@ diff -urNp linux-2.6.32.48/fs/fifo.c linux-2.6.32.48/fs/fifo.c
err_nocleanup:
diff -urNp linux-2.6.32.48/fs/file.c linux-2.6.32.48/fs/file.c
---- linux-2.6.32.48/fs/file.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/file.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/file.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/file.c 2011-11-15 19:59:43.000000000 -0500
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -45330,8 +45330,8 @@ diff -urNp linux-2.6.32.48/fs/file.c linux-2.6.32.48/fs/file.c
return -EMFILE;
diff -urNp linux-2.6.32.48/fs/filesystems.c linux-2.6.32.48/fs/filesystems.c
---- linux-2.6.32.48/fs/filesystems.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/filesystems.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/filesystems.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/filesystems.c 2011-11-15 19:59:43.000000000 -0500
@@ -272,7 +272,12 @@ struct file_system_type *get_fs_type(con
int len = dot ? dot - name : strlen(name);
@@ -45346,8 +45346,8 @@ diff -urNp linux-2.6.32.48/fs/filesystems.c linux-2.6.32.48/fs/filesystems.c
if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
diff -urNp linux-2.6.32.48/fs/fscache/cookie.c linux-2.6.32.48/fs/fscache/cookie.c
---- linux-2.6.32.48/fs/fscache/cookie.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/fscache/cookie.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/fscache/cookie.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/fscache/cookie.c 2011-11-15 19:59:43.000000000 -0500
@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire
parent ? (char *) parent->def->name : "<no-parent>",
def->name, netfs_data);
@@ -45467,8 +45467,8 @@ diff -urNp linux-2.6.32.48/fs/fscache/cookie.c linux-2.6.32.48/fs/fscache/cookie
fscache_wait_bit, TASK_UNINTERRUPTIBLE);
}
diff -urNp linux-2.6.32.48/fs/fscache/internal.h linux-2.6.32.48/fs/fscache/internal.h
---- linux-2.6.32.48/fs/fscache/internal.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/fscache/internal.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/fscache/internal.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/fscache/internal.h 2011-11-15 19:59:43.000000000 -0500
@@ -136,94 +136,94 @@ extern void fscache_proc_cleanup(void);
extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
@@ -45673,8 +45673,8 @@ diff -urNp linux-2.6.32.48/fs/fscache/internal.h linux-2.6.32.48/fs/fscache/inte
#endif
diff -urNp linux-2.6.32.48/fs/fscache/object.c linux-2.6.32.48/fs/fscache/object.c
---- linux-2.6.32.48/fs/fscache/object.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/fscache/object.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/fscache/object.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/fscache/object.c 2011-11-15 19:59:43.000000000 -0500
@@ -144,7 +144,7 @@ static void fscache_object_state_machine
/* update the object metadata on disk */
case FSCACHE_OBJECT_UPDATING:
@@ -45787,8 +45787,8 @@ diff -urNp linux-2.6.32.48/fs/fscache/object.c linux-2.6.32.48/fs/fscache/object
default:
diff -urNp linux-2.6.32.48/fs/fscache/operation.c linux-2.6.32.48/fs/fscache/operation.c
---- linux-2.6.32.48/fs/fscache/operation.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/fscache/operation.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/fscache/operation.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/fscache/operation.c 2011-11-15 19:59:43.000000000 -0500
@@ -16,7 +16,7 @@
#include <linux/seq_file.h>
#include "internal.h"
@@ -45905,8 +45905,8 @@ diff -urNp linux-2.6.32.48/fs/fscache/operation.c linux-2.6.32.48/fs/fscache/ope
ASSERTCMP(atomic_read(&op->usage), ==, 0);
diff -urNp linux-2.6.32.48/fs/fscache/page.c linux-2.6.32.48/fs/fscache/page.c
---- linux-2.6.32.48/fs/fscache/page.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/fscache/page.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/fscache/page.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/fscache/page.c 2011-11-15 19:59:43.000000000 -0500
@@ -59,7 +59,7 @@ bool __fscache_maybe_release_page(struct
val = radix_tree_lookup(&cookie->stores, page->index);
if (!val) {
@@ -46291,8 +46291,8 @@ diff -urNp linux-2.6.32.48/fs/fscache/page.c linux-2.6.32.48/fs/fscache/page.c
for (loop = 0; loop < pagevec->nr; loop++) {
diff -urNp linux-2.6.32.48/fs/fscache/stats.c linux-2.6.32.48/fs/fscache/stats.c
---- linux-2.6.32.48/fs/fscache/stats.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/fscache/stats.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/fscache/stats.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/fscache/stats.c 2011-11-15 19:59:43.000000000 -0500
@@ -18,95 +18,95 @@
/*
* operation counters
@@ -46669,8 +46669,8 @@ diff -urNp linux-2.6.32.48/fs/fscache/stats.c linux-2.6.32.48/fs/fscache/stats.c
seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
atomic_read(&fscache_n_cop_alloc_object),
diff -urNp linux-2.6.32.48/fs/fs_struct.c linux-2.6.32.48/fs/fs_struct.c
---- linux-2.6.32.48/fs/fs_struct.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/fs_struct.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/fs_struct.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/fs_struct.c 2011-11-15 19:59:43.000000000 -0500
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -46751,8 +46751,8 @@ diff -urNp linux-2.6.32.48/fs/fs_struct.c linux-2.6.32.48/fs/fs_struct.c
task_unlock(current);
diff -urNp linux-2.6.32.48/fs/fuse/cuse.c linux-2.6.32.48/fs/fuse/cuse.c
---- linux-2.6.32.48/fs/fuse/cuse.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/fuse/cuse.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/fuse/cuse.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/fuse/cuse.c 2011-11-15 19:59:43.000000000 -0500
@@ -576,10 +576,12 @@ static int __init cuse_init(void)
INIT_LIST_HEAD(&cuse_conntbl[i]);
@@ -46771,8 +46771,8 @@ diff -urNp linux-2.6.32.48/fs/fuse/cuse.c linux-2.6.32.48/fs/fuse/cuse.c
cuse_class = class_create(THIS_MODULE, "cuse");
if (IS_ERR(cuse_class))
diff -urNp linux-2.6.32.48/fs/fuse/dev.c linux-2.6.32.48/fs/fuse/dev.c
---- linux-2.6.32.48/fs/fuse/dev.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/fuse/dev.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/fuse/dev.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/fuse/dev.c 2011-11-15 19:59:43.000000000 -0500
@@ -885,7 +885,7 @@ static int fuse_notify_inval_entry(struc
{
struct fuse_notify_inval_entry_out outarg;
@@ -46817,8 +46817,8 @@ diff -urNp linux-2.6.32.48/fs/fuse/dev.c linux-2.6.32.48/fs/fuse/dev.c
}
diff -urNp linux-2.6.32.48/fs/fuse/dir.c linux-2.6.32.48/fs/fuse/dir.c
---- linux-2.6.32.48/fs/fuse/dir.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/fuse/dir.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/fuse/dir.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/fuse/dir.c 2011-11-15 19:59:43.000000000 -0500
@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
return link;
}
@@ -46829,8 +46829,8 @@ diff -urNp linux-2.6.32.48/fs/fuse/dir.c linux-2.6.32.48/fs/fuse/dir.c
if (!IS_ERR(link))
free_page((unsigned long) link);
diff -urNp linux-2.6.32.48/fs/gfs2/ops_inode.c linux-2.6.32.48/fs/gfs2/ops_inode.c
---- linux-2.6.32.48/fs/gfs2/ops_inode.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/gfs2/ops_inode.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/gfs2/ops_inode.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/gfs2/ops_inode.c 2011-11-15 19:59:43.000000000 -0500
@@ -752,6 +752,8 @@ static int gfs2_rename(struct inode *odi
unsigned int x;
int error;
@@ -46841,8 +46841,8 @@ diff -urNp linux-2.6.32.48/fs/gfs2/ops_inode.c linux-2.6.32.48/fs/gfs2/ops_inode
nip = GFS2_I(ndentry->d_inode);
if (ip == nip)
diff -urNp linux-2.6.32.48/fs/gfs2/sys.c linux-2.6.32.48/fs/gfs2/sys.c
---- linux-2.6.32.48/fs/gfs2/sys.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/gfs2/sys.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/gfs2/sys.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/gfs2/sys.c 2011-11-15 19:59:43.000000000 -0500
@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
return a->store ? a->store(sdp, buf, len) : len;
}
@@ -46862,8 +46862,8 @@ diff -urNp linux-2.6.32.48/fs/gfs2/sys.c linux-2.6.32.48/fs/gfs2/sys.c
};
diff -urNp linux-2.6.32.48/fs/hfsplus/catalog.c linux-2.6.32.48/fs/hfsplus/catalog.c
---- linux-2.6.32.48/fs/hfsplus/catalog.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/hfsplus/catalog.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/hfsplus/catalog.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/hfsplus/catalog.c 2011-11-15 19:59:43.000000000 -0500
@@ -157,6 +157,8 @@ int hfsplus_find_cat(struct super_block
int err;
u16 type;
@@ -46892,8 +46892,8 @@ diff -urNp linux-2.6.32.48/fs/hfsplus/catalog.c linux-2.6.32.48/fs/hfsplus/catal
dst_dir->i_ino, dst_name->name);
sb = src_dir->i_sb;
diff -urNp linux-2.6.32.48/fs/hfsplus/dir.c linux-2.6.32.48/fs/hfsplus/dir.c
---- linux-2.6.32.48/fs/hfsplus/dir.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/hfsplus/dir.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/hfsplus/dir.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/hfsplus/dir.c 2011-11-15 19:59:43.000000000 -0500
@@ -121,6 +121,8 @@ static int hfsplus_readdir(struct file *
struct hfsplus_readdir_data *rd;
u16 type;
@@ -46904,8 +46904,8 @@ diff -urNp linux-2.6.32.48/fs/hfsplus/dir.c linux-2.6.32.48/fs/hfsplus/dir.c
return 0;
diff -urNp linux-2.6.32.48/fs/hfsplus/inode.c linux-2.6.32.48/fs/hfsplus/inode.c
---- linux-2.6.32.48/fs/hfsplus/inode.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/hfsplus/inode.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/hfsplus/inode.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/hfsplus/inode.c 2011-11-15 19:59:43.000000000 -0500
@@ -399,6 +399,8 @@ int hfsplus_cat_read_inode(struct inode
int res = 0;
u16 type;
@@ -46925,8 +46925,8 @@ diff -urNp linux-2.6.32.48/fs/hfsplus/inode.c linux-2.6.32.48/fs/hfsplus/inode.c
main_inode = HFSPLUS_I(inode).rsrc_inode;
diff -urNp linux-2.6.32.48/fs/hfsplus/ioctl.c linux-2.6.32.48/fs/hfsplus/ioctl.c
---- linux-2.6.32.48/fs/hfsplus/ioctl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/hfsplus/ioctl.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/hfsplus/ioctl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/hfsplus/ioctl.c 2011-11-15 19:59:43.000000000 -0500
@@ -101,6 +101,8 @@ int hfsplus_setxattr(struct dentry *dent
struct hfsplus_cat_file *file;
int res;
@@ -46946,8 +46946,8 @@ diff -urNp linux-2.6.32.48/fs/hfsplus/ioctl.c linux-2.6.32.48/fs/hfsplus/ioctl.c
return -EOPNOTSUPP;
diff -urNp linux-2.6.32.48/fs/hfsplus/super.c linux-2.6.32.48/fs/hfsplus/super.c
---- linux-2.6.32.48/fs/hfsplus/super.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/hfsplus/super.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/hfsplus/super.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/hfsplus/super.c 2011-11-15 19:59:43.000000000 -0500
@@ -312,6 +312,8 @@ static int hfsplus_fill_super(struct sup
struct nls_table *nls = NULL;
int err = -EINVAL;
@@ -46958,8 +46958,8 @@ diff -urNp linux-2.6.32.48/fs/hfsplus/super.c linux-2.6.32.48/fs/hfsplus/super.c
if (!sbi)
return -ENOMEM;
diff -urNp linux-2.6.32.48/fs/hugetlbfs/inode.c linux-2.6.32.48/fs/hugetlbfs/inode.c
---- linux-2.6.32.48/fs/hugetlbfs/inode.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/hugetlbfs/inode.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/hugetlbfs/inode.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/hugetlbfs/inode.c 2011-11-15 19:59:43.000000000 -0500
@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
.kill_sb = kill_litter_super,
};
@@ -46970,8 +46970,8 @@ diff -urNp linux-2.6.32.48/fs/hugetlbfs/inode.c linux-2.6.32.48/fs/hugetlbfs/ino
static int can_do_hugetlb_shm(void)
{
diff -urNp linux-2.6.32.48/fs/ioctl.c linux-2.6.32.48/fs/ioctl.c
---- linux-2.6.32.48/fs/ioctl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/ioctl.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ioctl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ioctl.c 2011-11-15 19:59:43.000000000 -0500
@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
u64 phys, u64 len, u32 flags)
{
@@ -47000,8 +47000,8 @@ diff -urNp linux-2.6.32.48/fs/ioctl.c linux-2.6.32.48/fs/ioctl.c
return error;
diff -urNp linux-2.6.32.48/fs/jbd/checkpoint.c linux-2.6.32.48/fs/jbd/checkpoint.c
---- linux-2.6.32.48/fs/jbd/checkpoint.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/jbd/checkpoint.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/jbd/checkpoint.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/jbd/checkpoint.c 2011-11-15 19:59:43.000000000 -0500
@@ -348,6 +348,8 @@ int log_do_checkpoint(journal_t *journal
tid_t this_tid;
int result;
@@ -47012,8 +47012,8 @@ diff -urNp linux-2.6.32.48/fs/jbd/checkpoint.c linux-2.6.32.48/fs/jbd/checkpoint
/*
diff -urNp linux-2.6.32.48/fs/jffs2/compr_rtime.c linux-2.6.32.48/fs/jffs2/compr_rtime.c
---- linux-2.6.32.48/fs/jffs2/compr_rtime.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/jffs2/compr_rtime.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/jffs2/compr_rtime.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/jffs2/compr_rtime.c 2011-11-15 19:59:43.000000000 -0500
@@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned
int outpos = 0;
int pos=0;
@@ -47033,8 +47033,8 @@ diff -urNp linux-2.6.32.48/fs/jffs2/compr_rtime.c linux-2.6.32.48/fs/jffs2/compr
while (outpos<destlen) {
diff -urNp linux-2.6.32.48/fs/jffs2/compr_rubin.c linux-2.6.32.48/fs/jffs2/compr_rubin.c
---- linux-2.6.32.48/fs/jffs2/compr_rubin.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/jffs2/compr_rubin.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/jffs2/compr_rubin.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/jffs2/compr_rubin.c 2011-11-15 19:59:43.000000000 -0500
@@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig
int ret;
uint32_t mysrclen, mydstlen;
@@ -47045,8 +47045,8 @@ diff -urNp linux-2.6.32.48/fs/jffs2/compr_rubin.c linux-2.6.32.48/fs/jffs2/compr
mydstlen = *dstlen - 8;
diff -urNp linux-2.6.32.48/fs/jffs2/erase.c linux-2.6.32.48/fs/jffs2/erase.c
---- linux-2.6.32.48/fs/jffs2/erase.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/jffs2/erase.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/jffs2/erase.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/jffs2/erase.c 2011-11-15 19:59:43.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),
@@ -47058,8 +47058,8 @@ diff -urNp linux-2.6.32.48/fs/jffs2/erase.c linux-2.6.32.48/fs/jffs2/erase.c
jffs2_prealloc_raw_node_refs(c, jeb, 1);
diff -urNp linux-2.6.32.48/fs/jffs2/wbuf.c linux-2.6.32.48/fs/jffs2/wbuf.c
---- linux-2.6.32.48/fs/jffs2/wbuf.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/jffs2/wbuf.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/jffs2/wbuf.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/jffs2/wbuf.c 2011-11-15 19:59:43.000000000 -0500
@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
{
.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -47071,8 +47071,8 @@ diff -urNp linux-2.6.32.48/fs/jffs2/wbuf.c linux-2.6.32.48/fs/jffs2/wbuf.c
/*
diff -urNp linux-2.6.32.48/fs/jffs2/xattr.c linux-2.6.32.48/fs/jffs2/xattr.c
---- linux-2.6.32.48/fs/jffs2/xattr.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/jffs2/xattr.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/jffs2/xattr.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/jffs2/xattr.c 2011-11-15 19:59:43.000000000 -0500
@@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct
BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
@@ -47083,8 +47083,8 @@ diff -urNp linux-2.6.32.48/fs/jffs2/xattr.c linux-2.6.32.48/fs/jffs2/xattr.c
for (i=0; i < XREF_TMPHASH_SIZE; i++)
xref_tmphash[i] = NULL;
diff -urNp linux-2.6.32.48/fs/jfs/super.c linux-2.6.32.48/fs/jfs/super.c
---- linux-2.6.32.48/fs/jfs/super.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/jfs/super.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/jfs/super.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/jfs/super.c 2011-11-15 19:59:43.000000000 -0500
@@ -793,7 +793,7 @@ static int __init init_jfs_fs(void)
jfs_inode_cachep =
@@ -47095,8 +47095,8 @@ diff -urNp linux-2.6.32.48/fs/jfs/super.c linux-2.6.32.48/fs/jfs/super.c
if (jfs_inode_cachep == NULL)
return -ENOMEM;
diff -urNp linux-2.6.32.48/fs/Kconfig.binfmt linux-2.6.32.48/fs/Kconfig.binfmt
---- linux-2.6.32.48/fs/Kconfig.binfmt 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/Kconfig.binfmt 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/Kconfig.binfmt 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/Kconfig.binfmt 2011-11-15 19:59:43.000000000 -0500
@@ -86,7 +86,7 @@ config HAVE_AOUT
config BINFMT_AOUT
@@ -47107,8 +47107,8 @@ diff -urNp linux-2.6.32.48/fs/Kconfig.binfmt linux-2.6.32.48/fs/Kconfig.binfmt
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.48/fs/libfs.c linux-2.6.32.48/fs/libfs.c
---- linux-2.6.32.48/fs/libfs.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/libfs.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/libfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/libfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -157,12 +157,20 @@ int dcache_readdir(struct file * filp, v
for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
@@ -47132,8 +47132,8 @@ diff -urNp linux-2.6.32.48/fs/libfs.c linux-2.6.32.48/fs/libfs.c
next->d_inode->i_ino,
dt_type(next->d_inode)) < 0)
diff -urNp linux-2.6.32.48/fs/lockd/clntproc.c linux-2.6.32.48/fs/lockd/clntproc.c
---- linux-2.6.32.48/fs/lockd/clntproc.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/lockd/clntproc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/lockd/clntproc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/lockd/clntproc.c 2011-11-15 19:59:43.000000000 -0500
@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt
/*
* Cookie counter for NLM requests
@@ -47158,8 +47158,8 @@ diff -urNp linux-2.6.32.48/fs/lockd/clntproc.c linux-2.6.32.48/fs/lockd/clntproc
memset(req, 0, sizeof(*req));
locks_init_lock(&req->a_args.lock.fl);
diff -urNp linux-2.6.32.48/fs/lockd/svc.c linux-2.6.32.48/fs/lockd/svc.c
---- linux-2.6.32.48/fs/lockd/svc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/lockd/svc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/lockd/svc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/lockd/svc.c 2011-11-15 19:59:43.000000000 -0500
@@ -43,7 +43,7 @@
static struct svc_program nlmsvc_program;
@@ -47170,8 +47170,8 @@ diff -urNp linux-2.6.32.48/fs/lockd/svc.c linux-2.6.32.48/fs/lockd/svc.c
static DEFINE_MUTEX(nlmsvc_mutex);
diff -urNp linux-2.6.32.48/fs/locks.c linux-2.6.32.48/fs/locks.c
---- linux-2.6.32.48/fs/locks.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/locks.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/locks.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/locks.c 2011-11-15 19:59:43.000000000 -0500
@@ -145,10 +145,28 @@ static LIST_HEAD(blocked_list);
static struct kmem_cache *filelock_cache __read_mostly;
@@ -47243,8 +47243,8 @@ diff -urNp linux-2.6.32.48/fs/locks.c linux-2.6.32.48/fs/locks.c
lock_kernel();
diff -urNp linux-2.6.32.48/fs/mbcache.c linux-2.6.32.48/fs/mbcache.c
---- linux-2.6.32.48/fs/mbcache.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/mbcache.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/mbcache.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/mbcache.c 2011-11-15 19:59:43.000000000 -0500
@@ -266,9 +266,9 @@ mb_cache_create(const char *name, struct
if (!cache)
goto fail;
@@ -47258,8 +47258,8 @@ diff -urNp linux-2.6.32.48/fs/mbcache.c linux-2.6.32.48/fs/mbcache.c
cache->c_bucket_bits = bucket_bits;
#ifdef MB_CACHE_INDEXES_COUNT
diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
---- linux-2.6.32.48/fs/namei.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/namei.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/namei.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/namei.c 2011-11-15 19:59:43.000000000 -0500
@@ -224,14 +224,6 @@ int generic_permission(struct inode *ino
return ret;
@@ -47713,8 +47713,8 @@ diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c
out:
return len;
diff -urNp linux-2.6.32.48/fs/namespace.c linux-2.6.32.48/fs/namespace.c
---- linux-2.6.32.48/fs/namespace.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/namespace.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/namespace.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/namespace.c 2011-11-15 19:59:43.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);
@@ -47776,8 +47776,8 @@ diff -urNp linux-2.6.32.48/fs/namespace.c linux-2.6.32.48/fs/namespace.c
root = current->fs->root;
path_get(&current->fs->root);
diff -urNp linux-2.6.32.48/fs/ncpfs/dir.c linux-2.6.32.48/fs/ncpfs/dir.c
---- linux-2.6.32.48/fs/ncpfs/dir.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/ncpfs/dir.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ncpfs/dir.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ncpfs/dir.c 2011-11-15 19:59:43.000000000 -0500
@@ -275,6 +275,8 @@ __ncp_lookup_validate(struct dentry *den
int res, val = 0, len;
__u8 __name[NCP_MAXPATHLEN + 1];
@@ -47838,8 +47838,8 @@ diff -urNp linux-2.6.32.48/fs/ncpfs/dir.c linux-2.6.32.48/fs/ncpfs/dir.c
old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
new_dentry->d_parent->d_name.name, new_dentry->d_name.name);
diff -urNp linux-2.6.32.48/fs/ncpfs/inode.c linux-2.6.32.48/fs/ncpfs/inode.c
---- linux-2.6.32.48/fs/ncpfs/inode.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/ncpfs/inode.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ncpfs/inode.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ncpfs/inode.c 2011-11-15 19:59:43.000000000 -0500
@@ -445,6 +445,8 @@ static int ncp_fill_super(struct super_b
#endif
struct ncp_entry_info finfo;
@@ -47850,8 +47850,8 @@ diff -urNp linux-2.6.32.48/fs/ncpfs/inode.c linux-2.6.32.48/fs/ncpfs/inode.c
server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
if (!server)
diff -urNp linux-2.6.32.48/fs/nfs/inode.c linux-2.6.32.48/fs/nfs/inode.c
---- linux-2.6.32.48/fs/nfs/inode.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/nfs/inode.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/nfs/inode.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/nfs/inode.c 2011-11-15 19:59:43.000000000 -0500
@@ -156,7 +156,7 @@ static void nfs_zap_caches_locked(struct
nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
nfsi->attrtimeo_timestamp = jiffies;
@@ -47882,8 +47882,8 @@ diff -urNp linux-2.6.32.48/fs/nfs/inode.c linux-2.6.32.48/fs/nfs/inode.c
void nfs_fattr_init(struct nfs_fattr *fattr)
diff -urNp linux-2.6.32.48/fs/nfsd/lockd.c linux-2.6.32.48/fs/nfsd/lockd.c
---- linux-2.6.32.48/fs/nfsd/lockd.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/nfsd/lockd.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/nfsd/lockd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/nfsd/lockd.c 2011-11-15 19:59:43.000000000 -0500
@@ -66,7 +66,7 @@ nlm_fclose(struct file *filp)
fput(filp);
}
@@ -47894,8 +47894,8 @@ diff -urNp linux-2.6.32.48/fs/nfsd/lockd.c linux-2.6.32.48/fs/nfsd/lockd.c
.fclose = nlm_fclose, /* close file */
};
diff -urNp linux-2.6.32.48/fs/nfsd/nfs4state.c linux-2.6.32.48/fs/nfsd/nfs4state.c
---- linux-2.6.32.48/fs/nfsd/nfs4state.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/nfsd/nfs4state.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/nfsd/nfs4state.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/nfsd/nfs4state.c 2011-11-15 19:59:43.000000000 -0500
@@ -3459,6 +3459,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
unsigned int cmd;
int err;
@@ -47906,8 +47906,8 @@ diff -urNp linux-2.6.32.48/fs/nfsd/nfs4state.c linux-2.6.32.48/fs/nfsd/nfs4state
(long long) lock->lk_offset,
(long long) lock->lk_length);
diff -urNp linux-2.6.32.48/fs/nfsd/nfs4xdr.c linux-2.6.32.48/fs/nfsd/nfs4xdr.c
---- linux-2.6.32.48/fs/nfsd/nfs4xdr.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/nfsd/nfs4xdr.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/nfsd/nfs4xdr.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/nfsd/nfs4xdr.c 2011-11-15 19:59:43.000000000 -0500
@@ -1751,6 +1751,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
struct nfsd4_compoundres *resp = rqstp->rq_resp;
u32 minorversion = resp->cstate.minorversion;
@@ -47918,8 +47918,8 @@ diff -urNp linux-2.6.32.48/fs/nfsd/nfs4xdr.c linux-2.6.32.48/fs/nfsd/nfs4xdr.c
BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion));
BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion));
diff -urNp linux-2.6.32.48/fs/nfsd/vfs.c linux-2.6.32.48/fs/nfsd/vfs.c
---- linux-2.6.32.48/fs/nfsd/vfs.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/nfsd/vfs.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/nfsd/vfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/nfsd/vfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
} else {
oldfs = get_fs();
@@ -47948,8 +47948,8 @@ diff -urNp linux-2.6.32.48/fs/nfsd/vfs.c linux-2.6.32.48/fs/nfsd/vfs.c
if (host_err < 0)
diff -urNp linux-2.6.32.48/fs/nilfs2/ioctl.c linux-2.6.32.48/fs/nilfs2/ioctl.c
---- linux-2.6.32.48/fs/nilfs2/ioctl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/nilfs2/ioctl.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/nilfs2/ioctl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/nilfs2/ioctl.c 2011-11-15 19:59:43.000000000 -0500
@@ -480,7 +480,7 @@ static int nilfs_ioctl_clean_segments(st
unsigned int cmd, void __user *argp)
{
@@ -47960,8 +47960,8 @@ diff -urNp linux-2.6.32.48/fs/nilfs2/ioctl.c linux-2.6.32.48/fs/nilfs2/ioctl.c
sizeof(struct nilfs_period),
sizeof(__u64),
diff -urNp linux-2.6.32.48/fs/notify/dnotify/dnotify.c linux-2.6.32.48/fs/notify/dnotify/dnotify.c
---- linux-2.6.32.48/fs/notify/dnotify/dnotify.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/notify/dnotify/dnotify.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/notify/dnotify/dnotify.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/notify/dnotify/dnotify.c 2011-11-15 19:59:43.000000000 -0500
@@ -173,7 +173,7 @@ static void dnotify_free_mark(struct fsn
kmem_cache_free(dnotify_mark_entry_cache, dnentry);
}
@@ -47972,8 +47972,8 @@ diff -urNp linux-2.6.32.48/fs/notify/dnotify/dnotify.c linux-2.6.32.48/fs/notify
.should_send_event = dnotify_should_send_event,
.free_group_priv = NULL,
diff -urNp linux-2.6.32.48/fs/notify/notification.c linux-2.6.32.48/fs/notify/notification.c
---- linux-2.6.32.48/fs/notify/notification.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/notify/notification.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/notify/notification.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/notify/notification.c 2011-11-15 19:59:43.000000000 -0500
@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event
* get set to 0 so it will never get 'freed'
*/
@@ -47993,8 +47993,8 @@ diff -urNp linux-2.6.32.48/fs/notify/notification.c linux-2.6.32.48/fs/notify/no
EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
diff -urNp linux-2.6.32.48/fs/ntfs/dir.c linux-2.6.32.48/fs/ntfs/dir.c
---- linux-2.6.32.48/fs/ntfs/dir.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/ntfs/dir.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ntfs/dir.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ntfs/dir.c 2011-11-15 19:59:43.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)));
@@ -48005,8 +48005,8 @@ diff -urNp linux-2.6.32.48/fs/ntfs/dir.c linux-2.6.32.48/fs/ntfs/dir.c
"inode 0x%lx or driver bug.", vdir->i_ino);
goto err_out;
diff -urNp linux-2.6.32.48/fs/ntfs/file.c linux-2.6.32.48/fs/ntfs/file.c
---- linux-2.6.32.48/fs/ntfs/file.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/ntfs/file.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ntfs/file.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ntfs/file.c 2011-11-15 19:59:43.000000000 -0500
@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
#endif /* NTFS_RW */
};
@@ -48017,8 +48017,8 @@ diff -urNp linux-2.6.32.48/fs/ntfs/file.c linux-2.6.32.48/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.48/fs/ocfs2/cluster/masklog.c linux-2.6.32.48/fs/ocfs2/cluster/masklog.c
---- linux-2.6.32.48/fs/ocfs2/cluster/masklog.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/ocfs2/cluster/masklog.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ocfs2/cluster/masklog.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ocfs2/cluster/masklog.c 2011-11-15 19:59:43.000000000 -0500
@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
return mlog_mask_store(mlog_attr->mask, buf, count);
}
@@ -48029,8 +48029,8 @@ diff -urNp linux-2.6.32.48/fs/ocfs2/cluster/masklog.c linux-2.6.32.48/fs/ocfs2/c
.store = mlog_store,
};
diff -urNp linux-2.6.32.48/fs/ocfs2/localalloc.c linux-2.6.32.48/fs/ocfs2/localalloc.c
---- linux-2.6.32.48/fs/ocfs2/localalloc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/ocfs2/localalloc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ocfs2/localalloc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ocfs2/localalloc.c 2011-11-15 19:59:43.000000000 -0500
@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
goto bail;
}
@@ -48041,8 +48041,8 @@ diff -urNp linux-2.6.32.48/fs/ocfs2/localalloc.c linux-2.6.32.48/fs/ocfs2/locala
status = 0;
bail:
diff -urNp linux-2.6.32.48/fs/ocfs2/namei.c linux-2.6.32.48/fs/ocfs2/namei.c
---- linux-2.6.32.48/fs/ocfs2/namei.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/ocfs2/namei.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ocfs2/namei.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ocfs2/namei.c 2011-11-15 19:59:43.000000000 -0500
@@ -1043,6 +1043,8 @@ static int ocfs2_rename(struct inode *ol
struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
struct ocfs2_dir_lookup_result target_insert = { NULL, };
@@ -48053,8 +48053,8 @@ diff -urNp linux-2.6.32.48/fs/ocfs2/namei.c linux-2.6.32.48/fs/ocfs2/namei.c
* bit. */
diff -urNp linux-2.6.32.48/fs/ocfs2/ocfs2.h linux-2.6.32.48/fs/ocfs2/ocfs2.h
---- linux-2.6.32.48/fs/ocfs2/ocfs2.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/ocfs2/ocfs2.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ocfs2/ocfs2.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ocfs2/ocfs2.h 2011-11-15 19:59:43.000000000 -0500
@@ -217,11 +217,11 @@ enum ocfs2_vol_state
struct ocfs2_alloc_stats
@@ -48073,8 +48073,8 @@ diff -urNp linux-2.6.32.48/fs/ocfs2/ocfs2.h linux-2.6.32.48/fs/ocfs2/ocfs2.h
enum ocfs2_local_alloc_state
diff -urNp linux-2.6.32.48/fs/ocfs2/suballoc.c linux-2.6.32.48/fs/ocfs2/suballoc.c
---- linux-2.6.32.48/fs/ocfs2/suballoc.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/ocfs2/suballoc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ocfs2/suballoc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ocfs2/suballoc.c 2011-11-15 19:59:43.000000000 -0500
@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
mlog_errno(status);
goto bail;
@@ -48121,8 +48121,8 @@ diff -urNp linux-2.6.32.48/fs/ocfs2/suballoc.c linux-2.6.32.48/fs/ocfs2/suballoc
}
if (status < 0) {
diff -urNp linux-2.6.32.48/fs/ocfs2/super.c linux-2.6.32.48/fs/ocfs2/super.c
---- linux-2.6.32.48/fs/ocfs2/super.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/ocfs2/super.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/ocfs2/super.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/ocfs2/super.c 2011-11-15 19:59:43.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",
@@ -48158,8 +48158,8 @@ diff -urNp linux-2.6.32.48/fs/ocfs2/super.c linux-2.6.32.48/fs/ocfs2/super.c
/* Copy the blockcheck stats from the superblock probe */
osb->osb_ecc_stats = *stats;
diff -urNp linux-2.6.32.48/fs/open.c linux-2.6.32.48/fs/open.c
---- linux-2.6.32.48/fs/open.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/open.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/open.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/open.c 2011-11-15 19:59:43.000000000 -0500
@@ -275,6 +275,10 @@ static long do_sys_truncate(const char _
error = locks_verify_truncate(inode, NULL, length);
if (!error)
@@ -48340,8 +48340,8 @@ diff -urNp linux-2.6.32.48/fs/open.c linux-2.6.32.48/fs/open.c
put_unused_fd(fd);
fd = PTR_ERR(f);
diff -urNp linux-2.6.32.48/fs/partitions/ldm.c linux-2.6.32.48/fs/partitions/ldm.c
---- linux-2.6.32.48/fs/partitions/ldm.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/partitions/ldm.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/partitions/ldm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/partitions/ldm.c 2011-11-15 19:59:43.000000000 -0500
@@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data
ldm_error ("A VBLK claims to have %d parts.", num);
return false;
@@ -48360,8 +48360,8 @@ diff -urNp linux-2.6.32.48/fs/partitions/ldm.c linux-2.6.32.48/fs/partitions/ldm
ldm_crit ("Out of memory.");
return false;
diff -urNp linux-2.6.32.48/fs/partitions/mac.c linux-2.6.32.48/fs/partitions/mac.c
---- linux-2.6.32.48/fs/partitions/mac.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/partitions/mac.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/partitions/mac.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/partitions/mac.c 2011-11-15 19:59:43.000000000 -0500
@@ -59,11 +59,11 @@ int mac_partition(struct parsed_partitio
return 0; /* not a MacOS disk */
}
@@ -48376,8 +48376,8 @@ diff -urNp linux-2.6.32.48/fs/partitions/mac.c linux-2.6.32.48/fs/partitions/mac
int pos = slot * secsize;
put_dev_sector(sect);
diff -urNp linux-2.6.32.48/fs/pipe.c linux-2.6.32.48/fs/pipe.c
---- linux-2.6.32.48/fs/pipe.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/pipe.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/pipe.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/pipe.c 2011-11-15 19:59:43.000000000 -0500
@@ -401,9 +401,9 @@ redo:
}
if (bufs) /* More to do? */
@@ -48502,8 +48502,8 @@ diff -urNp linux-2.6.32.48/fs/pipe.c linux-2.6.32.48/fs/pipe.c
/*
diff -urNp linux-2.6.32.48/fs/proc/array.c linux-2.6.32.48/fs/proc/array.c
---- linux-2.6.32.48/fs/proc/array.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/proc/array.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/proc/array.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/proc/array.c 2011-11-15 19:59:43.000000000 -0500
@@ -60,6 +60,7 @@
#include <linux/tty.h>
#include <linux/string.h>
@@ -48628,8 +48628,8 @@ diff -urNp linux-2.6.32.48/fs/proc/array.c linux-2.6.32.48/fs/proc/array.c
+}
+#endif
diff -urNp linux-2.6.32.48/fs/proc/base.c linux-2.6.32.48/fs/proc/base.c
---- linux-2.6.32.48/fs/proc/base.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/proc/base.c 2011-11-12 12:59:33.000000000 -0500
+--- linux-2.6.32.48/fs/proc/base.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/proc/base.c 2011-11-15 19:59:43.000000000 -0500
@@ -102,6 +102,22 @@ struct pid_entry {
union proc_op op;
};
@@ -49066,8 +49066,8 @@ diff -urNp linux-2.6.32.48/fs/proc/base.c linux-2.6.32.48/fs/proc/base.c
#endif
#ifdef CONFIG_SCHEDSTATS
diff -urNp linux-2.6.32.48/fs/proc/cmdline.c linux-2.6.32.48/fs/proc/cmdline.c
---- linux-2.6.32.48/fs/proc/cmdline.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/proc/cmdline.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/proc/cmdline.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/proc/cmdline.c 2011-11-15 19:59:43.000000000 -0500
@@ -23,7 +23,11 @@ static const struct file_operations cmdl
static int __init proc_cmdline_init(void)
@@ -49081,8 +49081,8 @@ diff -urNp linux-2.6.32.48/fs/proc/cmdline.c linux-2.6.32.48/fs/proc/cmdline.c
}
module_init(proc_cmdline_init);
diff -urNp linux-2.6.32.48/fs/proc/devices.c linux-2.6.32.48/fs/proc/devices.c
---- linux-2.6.32.48/fs/proc/devices.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/proc/devices.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/proc/devices.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/proc/devices.c 2011-11-15 19:59:43.000000000 -0500
@@ -64,7 +64,11 @@ static const struct file_operations proc
static int __init proc_devices_init(void)
@@ -49096,8 +49096,8 @@ diff -urNp linux-2.6.32.48/fs/proc/devices.c linux-2.6.32.48/fs/proc/devices.c
}
module_init(proc_devices_init);
diff -urNp linux-2.6.32.48/fs/proc/inode.c linux-2.6.32.48/fs/proc/inode.c
---- linux-2.6.32.48/fs/proc/inode.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/proc/inode.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/proc/inode.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/proc/inode.c 2011-11-15 19:59:43.000000000 -0500
@@ -18,12 +18,19 @@
#include <linux/module.h>
#include <linux/smp_lock.h>
@@ -49145,8 +49145,8 @@ diff -urNp linux-2.6.32.48/fs/proc/inode.c linux-2.6.32.48/fs/proc/inode.c
if (de->size)
inode->i_size = de->size;
diff -urNp linux-2.6.32.48/fs/proc/internal.h linux-2.6.32.48/fs/proc/internal.h
---- linux-2.6.32.48/fs/proc/internal.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/proc/internal.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/proc/internal.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/proc/internal.h 2011-11-15 19:59:43.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,
@@ -49158,8 +49158,8 @@ diff -urNp linux-2.6.32.48/fs/proc/internal.h linux-2.6.32.48/fs/proc/internal.h
extern const struct file_operations proc_maps_operations;
diff -urNp linux-2.6.32.48/fs/proc/Kconfig linux-2.6.32.48/fs/proc/Kconfig
---- linux-2.6.32.48/fs/proc/Kconfig 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/proc/Kconfig 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/proc/Kconfig 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/proc/Kconfig 2011-11-15 19:59:43.000000000 -0500
@@ -30,12 +30,12 @@ config PROC_FS
config PROC_KCORE
@@ -49188,8 +49188,8 @@ diff -urNp linux-2.6.32.48/fs/proc/Kconfig linux-2.6.32.48/fs/proc/Kconfig
help
Various /proc files exist to monitor process memory utilization:
diff -urNp linux-2.6.32.48/fs/proc/kcore.c linux-2.6.32.48/fs/proc/kcore.c
---- linux-2.6.32.48/fs/proc/kcore.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/proc/kcore.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/proc/kcore.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/proc/kcore.c 2011-11-15 19:59:43.000000000 -0500
@@ -320,6 +320,8 @@ static void elf_kcore_store_hdr(char *bu
off_t offset = 0;
struct kcore_list *m;
@@ -49258,8 +49258,8 @@ diff -urNp linux-2.6.32.48/fs/proc/kcore.c linux-2.6.32.48/fs/proc/kcore.c
return -EPERM;
if (kcore_need_update)
diff -urNp linux-2.6.32.48/fs/proc/meminfo.c linux-2.6.32.48/fs/proc/meminfo.c
---- linux-2.6.32.48/fs/proc/meminfo.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/proc/meminfo.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/proc/meminfo.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/proc/meminfo.c 2011-11-15 19:59:43.000000000 -0500
@@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_
unsigned long pages[NR_LRU_LISTS];
int lru;
@@ -49279,8 +49279,8 @@ diff -urNp linux-2.6.32.48/fs/proc/meminfo.c linux-2.6.32.48/fs/proc/meminfo.c
);
diff -urNp linux-2.6.32.48/fs/proc/nommu.c linux-2.6.32.48/fs/proc/nommu.c
---- linux-2.6.32.48/fs/proc/nommu.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/proc/nommu.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/proc/nommu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/proc/nommu.c 2011-11-15 19:59:43.000000000 -0500
@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
if (len < 1)
len = 1;
@@ -49291,8 +49291,8 @@ diff -urNp linux-2.6.32.48/fs/proc/nommu.c linux-2.6.32.48/fs/proc/nommu.c
seq_putc(m, '\n');
diff -urNp linux-2.6.32.48/fs/proc/proc_net.c linux-2.6.32.48/fs/proc/proc_net.c
---- linux-2.6.32.48/fs/proc/proc_net.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/proc/proc_net.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/proc/proc_net.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/proc/proc_net.c 2011-11-15 19:59:43.000000000 -0500
@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
struct task_struct *task;
struct nsproxy *ns;
@@ -49312,8 +49312,8 @@ diff -urNp linux-2.6.32.48/fs/proc/proc_net.c linux-2.6.32.48/fs/proc/proc_net.c
rcu_read_lock();
task = pid_task(proc_pid(dir), PIDTYPE_PID);
diff -urNp linux-2.6.32.48/fs/proc/proc_sysctl.c linux-2.6.32.48/fs/proc/proc_sysctl.c
---- linux-2.6.32.48/fs/proc/proc_sysctl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/proc/proc_sysctl.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/proc/proc_sysctl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/proc/proc_sysctl.c 2011-11-15 19:59:43.000000000 -0500
@@ -7,11 +7,13 @@
#include <linux/security.h>
#include "internal.h"
@@ -49397,8 +49397,8 @@ diff -urNp linux-2.6.32.48/fs/proc/proc_sysctl.c linux-2.6.32.48/fs/proc/proc_sy
.permission = proc_sys_permission,
.setattr = proc_sys_setattr,
diff -urNp linux-2.6.32.48/fs/proc/root.c linux-2.6.32.48/fs/proc/root.c
---- linux-2.6.32.48/fs/proc/root.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/proc/root.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/proc/root.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/proc/root.c 2011-11-15 19:59:43.000000000 -0500
@@ -134,7 +134,15 @@ void __init proc_root_init(void)
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
@@ -49416,8 +49416,8 @@ diff -urNp linux-2.6.32.48/fs/proc/root.c linux-2.6.32.48/fs/proc/root.c
}
diff -urNp linux-2.6.32.48/fs/proc/task_mmu.c linux-2.6.32.48/fs/proc/task_mmu.c
---- linux-2.6.32.48/fs/proc/task_mmu.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/proc/task_mmu.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/proc/task_mmu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/proc/task_mmu.c 2011-11-15 19:59:43.000000000 -0500
@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
"VmStk:\t%8lu kB\n"
"VmExe:\t%8lu kB\n"
@@ -49564,8 +49564,8 @@ diff -urNp linux-2.6.32.48/fs/proc/task_mmu.c linux-2.6.32.48/fs/proc/task_mmu.c
(unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
mss.shared_clean >> 10,
diff -urNp linux-2.6.32.48/fs/proc/task_nommu.c linux-2.6.32.48/fs/proc/task_nommu.c
---- linux-2.6.32.48/fs/proc/task_nommu.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/proc/task_nommu.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/proc/task_nommu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/proc/task_nommu.c 2011-11-15 19:59:43.000000000 -0500
@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
else
bytes += kobjsize(mm);
@@ -49585,8 +49585,8 @@ diff -urNp linux-2.6.32.48/fs/proc/task_nommu.c linux-2.6.32.48/fs/proc/task_nom
seq_putc(m, '\n');
diff -urNp linux-2.6.32.48/fs/readdir.c linux-2.6.32.48/fs/readdir.c
---- linux-2.6.32.48/fs/readdir.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/readdir.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/readdir.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/readdir.c 2011-11-15 19:59:43.000000000 -0500
@@ -16,6 +16,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
@@ -49686,8 +49686,8 @@ diff -urNp linux-2.6.32.48/fs/readdir.c linux-2.6.32.48/fs/readdir.c
error = -EFAULT;
else
diff -urNp linux-2.6.32.48/fs/reiserfs/dir.c linux-2.6.32.48/fs/reiserfs/dir.c
---- linux-2.6.32.48/fs/reiserfs/dir.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/reiserfs/dir.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/reiserfs/dir.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/reiserfs/dir.c 2011-11-15 19:59:43.000000000 -0500
@@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr
struct reiserfs_dir_entry de;
int ret = 0;
@@ -49698,8 +49698,8 @@ diff -urNp linux-2.6.32.48/fs/reiserfs/dir.c linux-2.6.32.48/fs/reiserfs/dir.c
reiserfs_check_lock_depth(inode->i_sb, "readdir");
diff -urNp linux-2.6.32.48/fs/reiserfs/do_balan.c linux-2.6.32.48/fs/reiserfs/do_balan.c
---- linux-2.6.32.48/fs/reiserfs/do_balan.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/reiserfs/do_balan.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/reiserfs/do_balan.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/reiserfs/do_balan.c 2011-11-15 19:59:43.000000000 -0500
@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
return;
}
@@ -49710,8 +49710,8 @@ diff -urNp linux-2.6.32.48/fs/reiserfs/do_balan.c linux-2.6.32.48/fs/reiserfs/do
/* balance leaf returns 0 except if combining L R and S into
diff -urNp linux-2.6.32.48/fs/reiserfs/item_ops.c linux-2.6.32.48/fs/reiserfs/item_ops.c
---- linux-2.6.32.48/fs/reiserfs/item_ops.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/reiserfs/item_ops.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/reiserfs/item_ops.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/reiserfs/item_ops.c 2011-11-15 19:59:43.000000000 -0500
@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
vi->vi_index, vi->vi_type, vi->vi_ih);
}
@@ -49767,8 +49767,8 @@ diff -urNp linux-2.6.32.48/fs/reiserfs/item_ops.c linux-2.6.32.48/fs/reiserfs/it
&indirect_ops,
&direct_ops,
diff -urNp linux-2.6.32.48/fs/reiserfs/journal.c linux-2.6.32.48/fs/reiserfs/journal.c
---- linux-2.6.32.48/fs/reiserfs/journal.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/reiserfs/journal.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/reiserfs/journal.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/reiserfs/journal.c 2011-11-15 19:59:43.000000000 -0500
@@ -2329,6 +2329,8 @@ static struct buffer_head *reiserfs_brea
struct buffer_head *bh;
int i, j;
@@ -49779,8 +49779,8 @@ diff -urNp linux-2.6.32.48/fs/reiserfs/journal.c linux-2.6.32.48/fs/reiserfs/jou
if (buffer_uptodate(bh))
return (bh);
diff -urNp linux-2.6.32.48/fs/reiserfs/namei.c linux-2.6.32.48/fs/reiserfs/namei.c
---- linux-2.6.32.48/fs/reiserfs/namei.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/reiserfs/namei.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/reiserfs/namei.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/reiserfs/namei.c 2011-11-15 19:59:43.000000000 -0500
@@ -1214,6 +1214,8 @@ static int reiserfs_rename(struct inode
unsigned long savelink = 1;
struct timespec ctime;
@@ -49791,8 +49791,8 @@ diff -urNp linux-2.6.32.48/fs/reiserfs/namei.c linux-2.6.32.48/fs/reiserfs/namei
and (3) maybe "save" link insertion
stat data updates: (1) old directory,
diff -urNp linux-2.6.32.48/fs/reiserfs/procfs.c linux-2.6.32.48/fs/reiserfs/procfs.c
---- linux-2.6.32.48/fs/reiserfs/procfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/reiserfs/procfs.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/reiserfs/procfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/reiserfs/procfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
"SMALL_TAILS " : "NO_TAILS ",
replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -49812,8 +49812,8 @@ diff -urNp linux-2.6.32.48/fs/reiserfs/procfs.c linux-2.6.32.48/fs/reiserfs/proc
"jp_journal_1st_block: \t%i\n"
"jp_journal_dev: \t%s[%x]\n"
diff -urNp linux-2.6.32.48/fs/reiserfs/stree.c linux-2.6.32.48/fs/reiserfs/stree.c
---- linux-2.6.32.48/fs/reiserfs/stree.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/reiserfs/stree.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/reiserfs/stree.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/reiserfs/stree.c 2011-11-15 19:59:43.000000000 -0500
@@ -1159,6 +1159,8 @@ int reiserfs_delete_item(struct reiserfs
int iter = 0;
#endif
@@ -49860,8 +49860,8 @@ diff -urNp linux-2.6.32.48/fs/reiserfs/stree.c linux-2.6.32.48/fs/reiserfs/stree
if (inode) { /* Do we count quotas for item? */
diff -urNp linux-2.6.32.48/fs/reiserfs/super.c linux-2.6.32.48/fs/reiserfs/super.c
---- linux-2.6.32.48/fs/reiserfs/super.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/reiserfs/super.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/reiserfs/super.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/reiserfs/super.c 2011-11-15 19:59:43.000000000 -0500
@@ -912,6 +912,8 @@ static int reiserfs_parse_options(struct
{.option_name = NULL}
};
@@ -49872,8 +49872,8 @@ diff -urNp linux-2.6.32.48/fs/reiserfs/super.c linux-2.6.32.48/fs/reiserfs/super
if (!options || !*options)
/* use default configuration: create tails, journaling on, no
diff -urNp linux-2.6.32.48/fs/select.c linux-2.6.32.48/fs/select.c
---- linux-2.6.32.48/fs/select.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/select.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/select.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/select.c 2011-11-15 19:59:43.000000000 -0500
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/slab.h>
@@ -49911,8 +49911,8 @@ diff -urNp linux-2.6.32.48/fs/select.c linux-2.6.32.48/fs/select.c
return -EINVAL;
diff -urNp linux-2.6.32.48/fs/seq_file.c linux-2.6.32.48/fs/seq_file.c
---- linux-2.6.32.48/fs/seq_file.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/seq_file.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/seq_file.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/seq_file.c 2011-11-15 19:59:43.000000000 -0500
@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
return 0;
}
@@ -49963,8 +49963,8 @@ diff -urNp linux-2.6.32.48/fs/seq_file.c linux-2.6.32.48/fs/seq_file.c
if (op) {
diff -urNp linux-2.6.32.48/fs/smbfs/proc.c linux-2.6.32.48/fs/smbfs/proc.c
---- linux-2.6.32.48/fs/smbfs/proc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/smbfs/proc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/smbfs/proc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/smbfs/proc.c 2011-11-15 19:59:43.000000000 -0500
@@ -266,9 +266,9 @@ int smb_setcodepage(struct smb_sb_info *
out:
@@ -49999,8 +49999,8 @@ diff -urNp linux-2.6.32.48/fs/smbfs/proc.c linux-2.6.32.48/fs/smbfs/proc.c
/* < LANMAN2 */
diff -urNp linux-2.6.32.48/fs/smbfs/symlink.c linux-2.6.32.48/fs/smbfs/symlink.c
---- linux-2.6.32.48/fs/smbfs/symlink.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/smbfs/symlink.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/smbfs/symlink.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/smbfs/symlink.c 2011-11-15 19:59:43.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)
@@ -50011,8 +50011,8 @@ diff -urNp linux-2.6.32.48/fs/smbfs/symlink.c linux-2.6.32.48/fs/smbfs/symlink.c
__putname(s);
}
diff -urNp linux-2.6.32.48/fs/splice.c linux-2.6.32.48/fs/splice.c
---- linux-2.6.32.48/fs/splice.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/splice.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/splice.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/splice.c 2011-11-15 19:59:43.000000000 -0500
@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
pipe_lock(pipe);
@@ -50179,8 +50179,8 @@ diff -urNp linux-2.6.32.48/fs/splice.c linux-2.6.32.48/fs/splice.c
pipe_unlock(ipipe);
diff -urNp linux-2.6.32.48/fs/sysfs/file.c linux-2.6.32.48/fs/sysfs/file.c
---- linux-2.6.32.48/fs/sysfs/file.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/sysfs/file.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/sysfs/file.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/sysfs/file.c 2011-11-15 19:59:43.000000000 -0500
@@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent
struct sysfs_open_dirent {
@@ -50263,8 +50263,8 @@ diff -urNp linux-2.6.32.48/fs/sysfs/file.c linux-2.6.32.48/fs/sysfs/file.c
}
diff -urNp linux-2.6.32.48/fs/sysfs/mount.c linux-2.6.32.48/fs/sysfs/mount.c
---- linux-2.6.32.48/fs/sysfs/mount.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/sysfs/mount.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/sysfs/mount.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/sysfs/mount.c 2011-11-15 19:59:43.000000000 -0500
@@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
.s_name = "",
.s_count = ATOMIC_INIT(1),
@@ -50278,8 +50278,8 @@ diff -urNp linux-2.6.32.48/fs/sysfs/mount.c linux-2.6.32.48/fs/sysfs/mount.c
};
diff -urNp linux-2.6.32.48/fs/sysfs/symlink.c linux-2.6.32.48/fs/sysfs/symlink.c
---- linux-2.6.32.48/fs/sysfs/symlink.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/sysfs/symlink.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/sysfs/symlink.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/sysfs/symlink.c 2011-11-15 19:59:43.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)
@@ -50290,8 +50290,8 @@ diff -urNp linux-2.6.32.48/fs/sysfs/symlink.c linux-2.6.32.48/fs/sysfs/symlink.c
free_page((unsigned long)page);
}
diff -urNp linux-2.6.32.48/fs/udf/balloc.c linux-2.6.32.48/fs/udf/balloc.c
---- linux-2.6.32.48/fs/udf/balloc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/udf/balloc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/udf/balloc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/udf/balloc.c 2011-11-15 19:59:43.000000000 -0500
@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
mutex_lock(&sbi->s_alloc_mutex);
@@ -50315,8 +50315,8 @@ diff -urNp linux-2.6.32.48/fs/udf/balloc.c linux-2.6.32.48/fs/udf/balloc.c
bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
partmap->s_partition_len);
diff -urNp linux-2.6.32.48/fs/udf/inode.c linux-2.6.32.48/fs/udf/inode.c
---- linux-2.6.32.48/fs/udf/inode.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/udf/inode.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/udf/inode.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/udf/inode.c 2011-11-15 19:59:43.000000000 -0500
@@ -484,6 +484,8 @@ static struct buffer_head *inode_getblk(
int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
int lastblock = 0;
@@ -50327,8 +50327,8 @@ diff -urNp linux-2.6.32.48/fs/udf/inode.c linux-2.6.32.48/fs/udf/inode.c
prev_epos.block = iinfo->i_location;
prev_epos.bh = NULL;
diff -urNp linux-2.6.32.48/fs/udf/misc.c linux-2.6.32.48/fs/udf/misc.c
---- linux-2.6.32.48/fs/udf/misc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/udf/misc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/udf/misc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/udf/misc.c 2011-11-15 19:59:43.000000000 -0500
@@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
u8 udf_tag_checksum(const struct tag *t)
@@ -50339,8 +50339,8 @@ diff -urNp linux-2.6.32.48/fs/udf/misc.c linux-2.6.32.48/fs/udf/misc.c
int i;
for (i = 0; i < sizeof(struct tag); ++i)
diff -urNp linux-2.6.32.48/fs/utimes.c linux-2.6.32.48/fs/utimes.c
---- linux-2.6.32.48/fs/utimes.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/utimes.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/utimes.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/utimes.c 2011-11-15 19:59:43.000000000 -0500
@@ -1,6 +1,7 @@
#include <linux/compiler.h>
#include <linux/file.h>
@@ -50363,8 +50363,8 @@ diff -urNp linux-2.6.32.48/fs/utimes.c linux-2.6.32.48/fs/utimes.c
error = notify_change(path->dentry, &newattrs);
mutex_unlock(&inode->i_mutex);
diff -urNp linux-2.6.32.48/fs/xattr_acl.c linux-2.6.32.48/fs/xattr_acl.c
---- linux-2.6.32.48/fs/xattr_acl.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/xattr_acl.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/xattr_acl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/xattr_acl.c 2011-11-15 19:59:43.000000000 -0500
@@ -17,8 +17,8 @@
struct posix_acl *
posix_acl_from_xattr(const void *value, size_t size)
@@ -50377,8 +50377,8 @@ diff -urNp linux-2.6.32.48/fs/xattr_acl.c linux-2.6.32.48/fs/xattr_acl.c
struct posix_acl *acl;
struct posix_acl_entry *acl_e;
diff -urNp linux-2.6.32.48/fs/xattr.c linux-2.6.32.48/fs/xattr.c
---- linux-2.6.32.48/fs/xattr.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/xattr.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/xattr.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/xattr.c 2011-11-15 19:59:43.000000000 -0500
@@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
* Extended attribute SET operations
*/
@@ -50442,8 +50442,8 @@ diff -urNp linux-2.6.32.48/fs/xattr.c linux-2.6.32.48/fs/xattr.c
}
fput(f);
diff -urNp linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl32.c
---- linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-11-15 19:59:43.000000000 -0500
@@ -75,6 +75,7 @@ xfs_compat_ioc_fsgeometry_v1(
xfs_fsop_geom_t fsgeo;
int error;
@@ -50453,8 +50453,8 @@ diff -urNp linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.48/fs/xfs
if (error)
return -error;
diff -urNp linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl.c 2011-11-15 19:59:43.000000000 -0500
@@ -134,7 +134,7 @@ xfs_find_handle(
}
@@ -50483,8 +50483,8 @@ diff -urNp linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.48/fs/xfs/l
error = xfs_fs_geometry(mp, &fsgeo, 3);
diff -urNp linux-2.6.32.48/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.48/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.32.48/fs/xfs/linux-2.6/xfs_iops.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/fs/xfs/linux-2.6/xfs_iops.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/xfs/linux-2.6/xfs_iops.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/xfs/linux-2.6/xfs_iops.c 2011-11-15 19:59:43.000000000 -0500
@@ -468,7 +468,7 @@ xfs_vn_put_link(
struct nameidata *nd,
void *p)
@@ -50495,8 +50495,8 @@ diff -urNp linux-2.6.32.48/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.48/fs/xfs/li
if (!IS_ERR(s))
kfree(s);
diff -urNp linux-2.6.32.48/fs/xfs/xfs_bmap.c linux-2.6.32.48/fs/xfs/xfs_bmap.c
---- linux-2.6.32.48/fs/xfs/xfs_bmap.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/xfs/xfs_bmap.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/xfs/xfs_bmap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/xfs/xfs_bmap.c 2011-11-15 19:59:43.000000000 -0500
@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
int nmap,
int ret_nmap);
@@ -50507,8 +50507,8 @@ diff -urNp linux-2.6.32.48/fs/xfs/xfs_bmap.c linux-2.6.32.48/fs/xfs/xfs_bmap.c
#if defined(XFS_RW_TRACE)
diff -urNp linux-2.6.32.48/fs/xfs/xfs_dir2_sf.c linux-2.6.32.48/fs/xfs/xfs_dir2_sf.c
---- linux-2.6.32.48/fs/xfs/xfs_dir2_sf.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/fs/xfs/xfs_dir2_sf.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/fs/xfs/xfs_dir2_sf.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/fs/xfs/xfs_dir2_sf.c 2011-11-15 19:59:43.000000000 -0500
@@ -779,7 +779,15 @@ xfs_dir2_sf_getdents(
}
@@ -50528,7 +50528,7 @@ diff -urNp linux-2.6.32.48/fs/xfs/xfs_dir2_sf.c linux-2.6.32.48/fs/xfs/xfs_dir2_
return 0;
diff -urNp linux-2.6.32.48/grsecurity/gracl_alloc.c linux-2.6.32.48/grsecurity/gracl_alloc.c
--- linux-2.6.32.48/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/gracl_alloc.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/gracl_alloc.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,105 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -50637,7 +50637,7 @@ diff -urNp linux-2.6.32.48/grsecurity/gracl_alloc.c linux-2.6.32.48/grsecurity/g
+}
diff -urNp linux-2.6.32.48/grsecurity/gracl.c linux-2.6.32.48/grsecurity/gracl.c
--- linux-2.6.32.48/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/gracl.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/gracl.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,4140 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -54781,7 +54781,7 @@ diff -urNp linux-2.6.32.48/grsecurity/gracl.c linux-2.6.32.48/grsecurity/gracl.c
+
diff -urNp linux-2.6.32.48/grsecurity/gracl_cap.c linux-2.6.32.48/grsecurity/gracl_cap.c
--- linux-2.6.32.48/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/gracl_cap.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/gracl_cap.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,101 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -54886,7 +54886,7 @@ diff -urNp linux-2.6.32.48/grsecurity/gracl_cap.c linux-2.6.32.48/grsecurity/gra
+
diff -urNp linux-2.6.32.48/grsecurity/gracl_fs.c linux-2.6.32.48/grsecurity/gracl_fs.c
--- linux-2.6.32.48/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/gracl_fs.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/gracl_fs.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,431 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -55321,7 +55321,7 @@ diff -urNp linux-2.6.32.48/grsecurity/gracl_fs.c linux-2.6.32.48/grsecurity/grac
+}
diff -urNp linux-2.6.32.48/grsecurity/gracl_ip.c linux-2.6.32.48/grsecurity/gracl_ip.c
--- linux-2.6.32.48/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/gracl_ip.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/gracl_ip.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,382 @@
+#include <linux/kernel.h>
+#include <asm/uaccess.h>
@@ -55707,7 +55707,7 @@ diff -urNp linux-2.6.32.48/grsecurity/gracl_ip.c linux-2.6.32.48/grsecurity/grac
+}
diff -urNp linux-2.6.32.48/grsecurity/gracl_learn.c linux-2.6.32.48/grsecurity/gracl_learn.c
--- linux-2.6.32.48/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/gracl_learn.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/gracl_learn.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,208 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -55919,7 +55919,7 @@ diff -urNp linux-2.6.32.48/grsecurity/gracl_learn.c linux-2.6.32.48/grsecurity/g
+};
diff -urNp linux-2.6.32.48/grsecurity/gracl_res.c linux-2.6.32.48/grsecurity/gracl_res.c
--- linux-2.6.32.48/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/gracl_res.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/gracl_res.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,67 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -55990,8 +55990,8 @@ diff -urNp linux-2.6.32.48/grsecurity/gracl_res.c linux-2.6.32.48/grsecurity/gra
+}
diff -urNp linux-2.6.32.48/grsecurity/gracl_segv.c linux-2.6.32.48/grsecurity/gracl_segv.c
--- linux-2.6.32.48/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/gracl_segv.c 2011-11-12 12:46:47.000000000 -0500
-@@ -0,0 +1,284 @@
++++ linux-2.6.32.48/grsecurity/gracl_segv.c 2011-11-15 19:59:43.000000000 -0500
+@@ -0,0 +1,287 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <asm/uaccess.h>
@@ -56205,15 +56205,18 @@ diff -urNp linux-2.6.32.48/grsecurity/gracl_segv.c linux-2.6.32.48/grsecurity/gr
+ } else {
+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
+ read_lock(&tasklist_lock);
++ read_lock(&grsec_exec_file_lock);
+ do_each_thread(tsk2, tsk) {
+ if (likely(tsk != task)) {
+ curr2 = tsk->acl;
+
-+ if (curr2->device == curr->device &&
-+ curr2->inode == curr->inode)
++ // if this thread has the same subject as the one that triggered
++ // RES_CRASH and it's the same binary, kill it
++ if (tsk->acl == task->acl && tsk->exec_file == task->exec_file)
+ gr_fake_force_sig(SIGKILL, tsk);
+ }
+ } while_each_thread(tsk2, tsk);
++ read_unlock(&grsec_exec_file_lock);
+ read_unlock(&tasklist_lock);
+ }
+ rcu_read_unlock();
@@ -56278,7 +56281,7 @@ diff -urNp linux-2.6.32.48/grsecurity/gracl_segv.c linux-2.6.32.48/grsecurity/gr
+}
diff -urNp linux-2.6.32.48/grsecurity/gracl_shm.c linux-2.6.32.48/grsecurity/gracl_shm.c
--- linux-2.6.32.48/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/gracl_shm.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/gracl_shm.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,40 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -56322,7 +56325,7 @@ diff -urNp linux-2.6.32.48/grsecurity/gracl_shm.c linux-2.6.32.48/grsecurity/gra
+}
diff -urNp linux-2.6.32.48/grsecurity/grsec_chdir.c linux-2.6.32.48/grsecurity/grsec_chdir.c
--- linux-2.6.32.48/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_chdir.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_chdir.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,19 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -56345,7 +56348,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_chdir.c linux-2.6.32.48/grsecurity/g
+}
diff -urNp linux-2.6.32.48/grsecurity/grsec_chroot.c linux-2.6.32.48/grsecurity/grsec_chroot.c
--- linux-2.6.32.48/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_chroot.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_chroot.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,386 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -56735,7 +56738,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_chroot.c linux-2.6.32.48/grsecurity/
+}
diff -urNp linux-2.6.32.48/grsecurity/grsec_disabled.c linux-2.6.32.48/grsecurity/grsec_disabled.c
--- linux-2.6.32.48/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_disabled.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_disabled.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,439 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -57178,7 +57181,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_disabled.c linux-2.6.32.48/grsecurit
+#endif
diff -urNp linux-2.6.32.48/grsecurity/grsec_exec.c linux-2.6.32.48/grsecurity/grsec_exec.c
--- linux-2.6.32.48/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_exec.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_exec.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,204 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -57386,7 +57389,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_exec.c linux-2.6.32.48/grsecurity/gr
+EXPORT_SYMBOL(gr_is_capable_nolog);
diff -urNp linux-2.6.32.48/grsecurity/grsec_fifo.c linux-2.6.32.48/grsecurity/grsec_fifo.c
--- linux-2.6.32.48/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_fifo.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_fifo.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,24 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -57414,7 +57417,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_fifo.c linux-2.6.32.48/grsecurity/gr
+}
diff -urNp linux-2.6.32.48/grsecurity/grsec_fork.c linux-2.6.32.48/grsecurity/grsec_fork.c
--- linux-2.6.32.48/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_fork.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_fork.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,23 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -57441,7 +57444,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_fork.c linux-2.6.32.48/grsecurity/gr
+}
diff -urNp linux-2.6.32.48/grsecurity/grsec_init.c linux-2.6.32.48/grsecurity/grsec_init.c
--- linux-2.6.32.48/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_init.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_init.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,270 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -57715,7 +57718,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_init.c linux-2.6.32.48/grsecurity/gr
+}
diff -urNp linux-2.6.32.48/grsecurity/grsec_link.c linux-2.6.32.48/grsecurity/grsec_link.c
--- linux-2.6.32.48/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_link.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_link.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,43 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -57762,8 +57765,8 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_link.c linux-2.6.32.48/grsecurity/gr
+}
diff -urNp linux-2.6.32.48/grsecurity/grsec_log.c linux-2.6.32.48/grsecurity/grsec_log.c
--- linux-2.6.32.48/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_log.c 2011-11-12 12:46:47.000000000 -0500
-@@ -0,0 +1,315 @@
++++ linux-2.6.32.48/grsecurity/grsec_log.c 2011-11-15 19:59:43.000000000 -0500
+@@ -0,0 +1,322 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/file.h>
@@ -57885,12 +57888,15 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_log.c linux-2.6.32.48/grsecurity/grs
+ return;
+}
+
-+static void gr_log_end(int audit)
++static void gr_log_end(int audit, int append_default)
+{
+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
-+ unsigned int len = strlen(buf);
+
-+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
++ if (append_default) {
++ unsigned int len = strlen(buf);
++ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
++ }
++
+ printk("%s\n", buf);
+
+ return;
@@ -58076,12 +58082,16 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_log.c linux-2.6.32.48/grsecurity/grs
+ gr_log_middle(audit, msg, ap);
+ }
+ va_end(ap);
-+ gr_log_end(audit);
++ // these don't need DEFAULTSECARGS printed on the end
++ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
++ gr_log_end(audit, 0);
++ else
++ gr_log_end(audit, 1);
+ END_LOCKS(audit);
+}
diff -urNp linux-2.6.32.48/grsecurity/grsec_mem.c linux-2.6.32.48/grsecurity/grsec_mem.c
--- linux-2.6.32.48/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_mem.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_mem.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,33 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -58118,7 +58128,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_mem.c linux-2.6.32.48/grsecurity/grs
+}
diff -urNp linux-2.6.32.48/grsecurity/grsec_mount.c linux-2.6.32.48/grsecurity/grsec_mount.c
--- linux-2.6.32.48/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_mount.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_mount.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,62 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -58184,7 +58194,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_mount.c linux-2.6.32.48/grsecurity/g
+}
diff -urNp linux-2.6.32.48/grsecurity/grsec_pax.c linux-2.6.32.48/grsecurity/grsec_pax.c
--- linux-2.6.32.48/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_pax.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_pax.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,36 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -58224,7 +58234,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_pax.c linux-2.6.32.48/grsecurity/grs
+}
diff -urNp linux-2.6.32.48/grsecurity/grsec_ptrace.c linux-2.6.32.48/grsecurity/grsec_ptrace.c
--- linux-2.6.32.48/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_ptrace.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_ptrace.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,14 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -58242,7 +58252,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_ptrace.c linux-2.6.32.48/grsecurity/
+}
diff -urNp linux-2.6.32.48/grsecurity/grsec_sig.c linux-2.6.32.48/grsecurity/grsec_sig.c
--- linux-2.6.32.48/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_sig.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_sig.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,205 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -58451,7 +58461,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_sig.c linux-2.6.32.48/grsecurity/grs
+}
diff -urNp linux-2.6.32.48/grsecurity/grsec_sock.c linux-2.6.32.48/grsecurity/grsec_sock.c
--- linux-2.6.32.48/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_sock.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_sock.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,275 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -58730,7 +58740,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_sock.c linux-2.6.32.48/grsecurity/gr
+}
diff -urNp linux-2.6.32.48/grsecurity/grsec_sysctl.c linux-2.6.32.48/grsecurity/grsec_sysctl.c
--- linux-2.6.32.48/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_sysctl.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_sysctl.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,479 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -59213,7 +59223,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_sysctl.c linux-2.6.32.48/grsecurity/
+#endif
diff -urNp linux-2.6.32.48/grsecurity/grsec_time.c linux-2.6.32.48/grsecurity/grsec_time.c
--- linux-2.6.32.48/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_time.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_time.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,16 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -59233,7 +59243,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_time.c linux-2.6.32.48/grsecurity/gr
+EXPORT_SYMBOL(gr_log_timechange);
diff -urNp linux-2.6.32.48/grsecurity/grsec_tpe.c linux-2.6.32.48/grsecurity/grsec_tpe.c
--- linux-2.6.32.48/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsec_tpe.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsec_tpe.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,39 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -59276,7 +59286,7 @@ diff -urNp linux-2.6.32.48/grsecurity/grsec_tpe.c linux-2.6.32.48/grsecurity/grs
+}
diff -urNp linux-2.6.32.48/grsecurity/grsum.c linux-2.6.32.48/grsecurity/grsum.c
--- linux-2.6.32.48/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/grsum.c 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/grsum.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,61 @@
+#include <linux/err.h>
+#include <linux/kernel.h>
@@ -59341,8 +59351,8 @@ diff -urNp linux-2.6.32.48/grsecurity/grsum.c linux-2.6.32.48/grsecurity/grsum.c
+}
diff -urNp linux-2.6.32.48/grsecurity/Kconfig linux-2.6.32.48/grsecurity/Kconfig
--- linux-2.6.32.48/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/Kconfig 2011-11-12 12:46:47.000000000 -0500
-@@ -0,0 +1,1037 @@
++++ linux-2.6.32.48/grsecurity/Kconfig 2011-11-15 19:59:43.000000000 -0500
+@@ -0,0 +1,1036 @@
+#
+# grecurity configuration
+#
@@ -59439,7 +59449,7 @@ diff -urNp linux-2.6.32.48/grsecurity/Kconfig linux-2.6.32.48/grsecurity/Kconfig
+ - Deny mknod in chroot
+ - Deny access to abstract AF_UNIX sockets out of chroot
+ - Deny pivot_root in chroot
-+ - Denied writes of /dev/kmem, /dev/mem, and /dev/port
++ - Denied reads/writes of /dev/kmem, /dev/mem, and /dev/port
+ - /proc restrictions with special GID set to 10 (usually wheel)
+ - Address Space Layout Randomization (ASLR)
+ - Prevent exploitation of most refcount overflows
@@ -59529,7 +59539,6 @@ diff -urNp linux-2.6.32.48/grsecurity/Kconfig linux-2.6.32.48/grsecurity/Kconfig
+ - Kernel stack randomization
+ - Mount/unmount/remount logging
+ - Kernel symbol hiding
-+ - Prevention of memory exhaustion-based exploits
+ - Hardening of module auto-loading
+ - Ptrace restrictions
+ - Restricted vm86 mode
@@ -59552,12 +59561,12 @@ diff -urNp linux-2.6.32.48/grsecurity/Kconfig linux-2.6.32.48/grsecurity/Kconfig
+depends on GRKERNSEC
+
+config GRKERNSEC_KMEM
-+ bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port"
++ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
+ help
+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
-+ be written to via mmap or otherwise to modify the running kernel.
-+ /dev/port will also not be allowed to be opened. If you have module
++ be written to or read from to modify or leak the contents of the running
++ kernel. /dev/port will also not be allowed to be opened. If you have module
+ support disabled, enabling this will close up four ways that are
+ currently used to insert malicious code into the running kernel.
+ Even with all these features enabled, we still highly recommend that
@@ -60382,7 +60391,7 @@ diff -urNp linux-2.6.32.48/grsecurity/Kconfig linux-2.6.32.48/grsecurity/Kconfig
+endmenu
diff -urNp linux-2.6.32.48/grsecurity/Makefile linux-2.6.32.48/grsecurity/Makefile
--- linux-2.6.32.48/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/grsecurity/Makefile 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/grsecurity/Makefile 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,36 @@
+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
+# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -60421,8 +60430,8 @@ diff -urNp linux-2.6.32.48/grsecurity/Makefile linux-2.6.32.48/grsecurity/Makefi
+ @echo ' grsec: protected kernel image paths'
+endif
diff -urNp linux-2.6.32.48/include/acpi/acpi_bus.h linux-2.6.32.48/include/acpi/acpi_bus.h
---- linux-2.6.32.48/include/acpi/acpi_bus.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/acpi/acpi_bus.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/acpi/acpi_bus.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/acpi/acpi_bus.h 2011-11-15 19:59:43.000000000 -0500
@@ -107,7 +107,7 @@ struct acpi_device_ops {
acpi_op_bind bind;
acpi_op_unbind unbind;
@@ -60433,8 +60442,8 @@ diff -urNp linux-2.6.32.48/include/acpi/acpi_bus.h linux-2.6.32.48/include/acpi/
#define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
diff -urNp linux-2.6.32.48/include/acpi/acpi_drivers.h linux-2.6.32.48/include/acpi/acpi_drivers.h
---- linux-2.6.32.48/include/acpi/acpi_drivers.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/acpi/acpi_drivers.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/acpi/acpi_drivers.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/acpi/acpi_drivers.h 2011-11-15 19:59:43.000000000 -0500
@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
Dock Station
-------------------------------------------------------------------------- */
@@ -60465,8 +60474,8 @@ diff -urNp linux-2.6.32.48/include/acpi/acpi_drivers.h linux-2.6.32.48/include/a
{
return -ENODEV;
diff -urNp linux-2.6.32.48/include/asm-generic/atomic-long.h linux-2.6.32.48/include/asm-generic/atomic-long.h
---- linux-2.6.32.48/include/asm-generic/atomic-long.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/asm-generic/atomic-long.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/asm-generic/atomic-long.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/asm-generic/atomic-long.h 2011-11-15 19:59:43.000000000 -0500
@@ -22,6 +22,12 @@
typedef atomic64_t atomic_long_t;
@@ -60734,8 +60743,8 @@ diff -urNp linux-2.6.32.48/include/asm-generic/atomic-long.h linux-2.6.32.48/inc
+
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
diff -urNp linux-2.6.32.48/include/asm-generic/bug.h linux-2.6.32.48/include/asm-generic/bug.h
---- linux-2.6.32.48/include/asm-generic/bug.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/asm-generic/bug.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/asm-generic/bug.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/asm-generic/bug.h 2011-11-15 19:59:43.000000000 -0500
@@ -105,11 +105,11 @@ extern void warn_slowpath_null(const cha
#else /* !CONFIG_BUG */
@@ -60751,8 +60760,8 @@ diff -urNp linux-2.6.32.48/include/asm-generic/bug.h linux-2.6.32.48/include/asm
#ifndef HAVE_ARCH_WARN_ON
diff -urNp linux-2.6.32.48/include/asm-generic/cache.h linux-2.6.32.48/include/asm-generic/cache.h
---- linux-2.6.32.48/include/asm-generic/cache.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/asm-generic/cache.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/asm-generic/cache.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/asm-generic/cache.h 2011-11-15 19:59:43.000000000 -0500
@@ -6,7 +6,7 @@
* cache lines need to provide their own cache.h.
*/
@@ -60764,8 +60773,8 @@ diff -urNp linux-2.6.32.48/include/asm-generic/cache.h linux-2.6.32.48/include/a
#endif /* __ASM_GENERIC_CACHE_H */
diff -urNp linux-2.6.32.48/include/asm-generic/dma-mapping-common.h linux-2.6.32.48/include/asm-generic/dma-mapping-common.h
---- linux-2.6.32.48/include/asm-generic/dma-mapping-common.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/asm-generic/dma-mapping-common.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/asm-generic/dma-mapping-common.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/asm-generic/dma-mapping-common.h 2011-11-15 19:59:43.000000000 -0500
@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
enum dma_data_direction dir,
struct dma_attrs *attrs)
@@ -60875,8 +60884,8 @@ diff -urNp linux-2.6.32.48/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.48/include/asm-generic/emergency-restart.h linux-2.6.32.48/include/asm-generic/emergency-restart.h
---- linux-2.6.32.48/include/asm-generic/emergency-restart.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/asm-generic/emergency-restart.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/asm-generic/emergency-restart.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/asm-generic/emergency-restart.h 2011-11-15 19:59:43.000000000 -0500
@@ -1,7 +1,7 @@
#ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
#define _ASM_GENERIC_EMERGENCY_RESTART_H
@@ -60887,8 +60896,8 @@ diff -urNp linux-2.6.32.48/include/asm-generic/emergency-restart.h linux-2.6.32.
machine_restart(NULL);
}
diff -urNp linux-2.6.32.48/include/asm-generic/futex.h linux-2.6.32.48/include/asm-generic/futex.h
---- linux-2.6.32.48/include/asm-generic/futex.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/asm-generic/futex.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/asm-generic/futex.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/asm-generic/futex.h 2011-11-15 19:59:43.000000000 -0500
@@ -6,7 +6,7 @@
#include <asm/errno.h>
@@ -60908,8 +60917,8 @@ diff -urNp linux-2.6.32.48/include/asm-generic/futex.h linux-2.6.32.48/include/a
return -ENOSYS;
}
diff -urNp linux-2.6.32.48/include/asm-generic/int-l64.h linux-2.6.32.48/include/asm-generic/int-l64.h
---- linux-2.6.32.48/include/asm-generic/int-l64.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/asm-generic/int-l64.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/asm-generic/int-l64.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/asm-generic/int-l64.h 2011-11-15 19:59:43.000000000 -0500
@@ -46,6 +46,8 @@ typedef unsigned int u32;
typedef signed long s64;
typedef unsigned long u64;
@@ -60920,8 +60929,8 @@ diff -urNp linux-2.6.32.48/include/asm-generic/int-l64.h linux-2.6.32.48/include
#define U8_C(x) x ## U
#define S16_C(x) x
diff -urNp linux-2.6.32.48/include/asm-generic/int-ll64.h linux-2.6.32.48/include/asm-generic/int-ll64.h
---- linux-2.6.32.48/include/asm-generic/int-ll64.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/asm-generic/int-ll64.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/asm-generic/int-ll64.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/asm-generic/int-ll64.h 2011-11-15 19:59:43.000000000 -0500
@@ -51,6 +51,8 @@ typedef unsigned int u32;
typedef signed long long s64;
typedef unsigned long long u64;
@@ -60932,8 +60941,8 @@ diff -urNp linux-2.6.32.48/include/asm-generic/int-ll64.h linux-2.6.32.48/includ
#define U8_C(x) x ## U
#define S16_C(x) x
diff -urNp linux-2.6.32.48/include/asm-generic/kmap_types.h linux-2.6.32.48/include/asm-generic/kmap_types.h
---- linux-2.6.32.48/include/asm-generic/kmap_types.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/asm-generic/kmap_types.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/asm-generic/kmap_types.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/asm-generic/kmap_types.h 2011-11-15 19:59:43.000000000 -0500
@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
KMAP_D(16) KM_IRQ_PTE,
KMAP_D(17) KM_NMI,
@@ -60945,8 +60954,8 @@ diff -urNp linux-2.6.32.48/include/asm-generic/kmap_types.h linux-2.6.32.48/incl
#undef KMAP_D
diff -urNp linux-2.6.32.48/include/asm-generic/pgtable.h linux-2.6.32.48/include/asm-generic/pgtable.h
---- linux-2.6.32.48/include/asm-generic/pgtable.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/asm-generic/pgtable.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/asm-generic/pgtable.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/asm-generic/pgtable.h 2011-11-15 19:59:43.000000000 -0500
@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
unsigned long size);
#endif
@@ -60963,8 +60972,8 @@ diff -urNp linux-2.6.32.48/include/asm-generic/pgtable.h linux-2.6.32.48/include
#endif /* _ASM_GENERIC_PGTABLE_H */
diff -urNp linux-2.6.32.48/include/asm-generic/pgtable-nopmd.h linux-2.6.32.48/include/asm-generic/pgtable-nopmd.h
---- linux-2.6.32.48/include/asm-generic/pgtable-nopmd.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/asm-generic/pgtable-nopmd.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/asm-generic/pgtable-nopmd.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/asm-generic/pgtable-nopmd.h 2011-11-15 19:59:43.000000000 -0500
@@ -1,14 +1,19 @@
#ifndef _PGTABLE_NOPMD_H
#define _PGTABLE_NOPMD_H
@@ -61002,8 +61011,8 @@ diff -urNp linux-2.6.32.48/include/asm-generic/pgtable-nopmd.h linux-2.6.32.48/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.48/include/asm-generic/pgtable-nopud.h linux-2.6.32.48/include/asm-generic/pgtable-nopud.h
---- linux-2.6.32.48/include/asm-generic/pgtable-nopud.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/asm-generic/pgtable-nopud.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/asm-generic/pgtable-nopud.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/asm-generic/pgtable-nopud.h 2011-11-15 19:59:43.000000000 -0500
@@ -1,10 +1,15 @@
#ifndef _PGTABLE_NOPUD_H
#define _PGTABLE_NOPUD_H
@@ -61035,8 +61044,8 @@ diff -urNp linux-2.6.32.48/include/asm-generic/pgtable-nopud.h linux-2.6.32.48/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.48/include/asm-generic/vmlinux.lds.h linux-2.6.32.48/include/asm-generic/vmlinux.lds.h
---- linux-2.6.32.48/include/asm-generic/vmlinux.lds.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/asm-generic/vmlinux.lds.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/asm-generic/vmlinux.lds.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/asm-generic/vmlinux.lds.h 2011-11-15 19:59:43.000000000 -0500
@@ -199,6 +199,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -61076,8 +61085,8 @@ diff -urNp linux-2.6.32.48/include/asm-generic/vmlinux.lds.h linux-2.6.32.48/inc
/**
* PERCPU - define output section for percpu area, simple version
diff -urNp linux-2.6.32.48/include/drm/drm_crtc_helper.h linux-2.6.32.48/include/drm/drm_crtc_helper.h
---- linux-2.6.32.48/include/drm/drm_crtc_helper.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/drm/drm_crtc_helper.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/drm/drm_crtc_helper.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/drm/drm_crtc_helper.h 2011-11-15 19:59:43.000000000 -0500
@@ -64,7 +64,7 @@ struct drm_crtc_helper_funcs {
/* reload the current crtc LUT */
@@ -61097,8 +61106,8 @@ diff -urNp linux-2.6.32.48/include/drm/drm_crtc_helper.h linux-2.6.32.48/include
struct drm_connector_helper_funcs {
int (*get_modes)(struct drm_connector *connector);
diff -urNp linux-2.6.32.48/include/drm/drmP.h linux-2.6.32.48/include/drm/drmP.h
---- linux-2.6.32.48/include/drm/drmP.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/drm/drmP.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/drm/drmP.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/drm/drmP.h 2011-11-15 19:59:43.000000000 -0500
@@ -71,6 +71,7 @@
#include <linux/workqueue.h>
#include <linux/poll.h>
@@ -61159,8 +61168,8 @@ diff -urNp linux-2.6.32.48/include/drm/drmP.h linux-2.6.32.48/include/drm/drmP.h
uint32_t invalidate_domains; /* domains pending invalidation */
uint32_t flush_domains; /* domains pending flush */
diff -urNp linux-2.6.32.48/include/drm/ttm/ttm_memory.h linux-2.6.32.48/include/drm/ttm/ttm_memory.h
---- linux-2.6.32.48/include/drm/ttm/ttm_memory.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/drm/ttm/ttm_memory.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/drm/ttm/ttm_memory.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/drm/ttm/ttm_memory.h 2011-11-15 19:59:43.000000000 -0500
@@ -47,7 +47,7 @@
struct ttm_mem_shrink {
@@ -61171,8 +61180,8 @@ diff -urNp linux-2.6.32.48/include/drm/ttm/ttm_memory.h linux-2.6.32.48/include/
/**
* struct ttm_mem_global - Global memory accounting structure.
diff -urNp linux-2.6.32.48/include/linux/a.out.h linux-2.6.32.48/include/linux/a.out.h
---- linux-2.6.32.48/include/linux/a.out.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/a.out.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/a.out.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/a.out.h 2011-11-15 19:59:43.000000000 -0500
@@ -39,6 +39,14 @@ enum machine_type {
M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
};
@@ -61189,8 +61198,8 @@ diff -urNp linux-2.6.32.48/include/linux/a.out.h linux-2.6.32.48/include/linux/a
#define N_MAGIC(exec) ((exec).a_info & 0xffff)
#endif
diff -urNp linux-2.6.32.48/include/linux/atmdev.h linux-2.6.32.48/include/linux/atmdev.h
---- linux-2.6.32.48/include/linux/atmdev.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/atmdev.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/atmdev.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/atmdev.h 2011-11-15 19:59:43.000000000 -0500
@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
#endif
@@ -61201,8 +61210,8 @@ diff -urNp linux-2.6.32.48/include/linux/atmdev.h linux-2.6.32.48/include/linux/
#undef __HANDLE_ITEM
};
diff -urNp linux-2.6.32.48/include/linux/backlight.h linux-2.6.32.48/include/linux/backlight.h
---- linux-2.6.32.48/include/linux/backlight.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/backlight.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/backlight.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/backlight.h 2011-11-15 19:59:43.000000000 -0500
@@ -36,18 +36,18 @@ struct backlight_device;
struct fb_info;
@@ -61245,8 +61254,8 @@ diff -urNp linux-2.6.32.48/include/linux/backlight.h linux-2.6.32.48/include/lin
extern void backlight_force_update(struct backlight_device *bd,
enum backlight_update_reason reason);
diff -urNp linux-2.6.32.48/include/linux/binfmts.h linux-2.6.32.48/include/linux/binfmts.h
---- linux-2.6.32.48/include/linux/binfmts.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/binfmts.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/binfmts.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/binfmts.h 2011-11-15 19:59:43.000000000 -0500
@@ -83,6 +83,7 @@ struct linux_binfmt {
int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
int (*load_shlib)(struct file *);
@@ -61256,8 +61265,8 @@ diff -urNp linux-2.6.32.48/include/linux/binfmts.h linux-2.6.32.48/include/linux
int hasvdso;
};
diff -urNp linux-2.6.32.48/include/linux/blkdev.h linux-2.6.32.48/include/linux/blkdev.h
---- linux-2.6.32.48/include/linux/blkdev.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/blkdev.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/blkdev.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/blkdev.h 2011-11-15 19:59:43.000000000 -0500
@@ -1278,7 +1278,7 @@ struct block_device_operations {
int (*revalidate_disk) (struct gendisk *);
int (*getgeo)(struct block_device *, struct hd_geometry *);
@@ -61268,8 +61277,8 @@ diff -urNp linux-2.6.32.48/include/linux/blkdev.h linux-2.6.32.48/include/linux/
extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
unsigned long);
diff -urNp linux-2.6.32.48/include/linux/blktrace_api.h linux-2.6.32.48/include/linux/blktrace_api.h
---- linux-2.6.32.48/include/linux/blktrace_api.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/blktrace_api.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/blktrace_api.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/blktrace_api.h 2011-11-15 19:59:43.000000000 -0500
@@ -160,7 +160,7 @@ struct blk_trace {
struct dentry *dir;
struct dentry *dropped_file;
@@ -61280,8 +61289,8 @@ diff -urNp linux-2.6.32.48/include/linux/blktrace_api.h linux-2.6.32.48/include/
extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
diff -urNp linux-2.6.32.48/include/linux/byteorder/little_endian.h linux-2.6.32.48/include/linux/byteorder/little_endian.h
---- linux-2.6.32.48/include/linux/byteorder/little_endian.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/byteorder/little_endian.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/byteorder/little_endian.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/byteorder/little_endian.h 2011-11-15 19:59:43.000000000 -0500
@@ -42,51 +42,51 @@
static inline __le64 __cpu_to_le64p(const __u64 *p)
@@ -61347,8 +61356,8 @@ diff -urNp linux-2.6.32.48/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.48/include/linux/cache.h linux-2.6.32.48/include/linux/cache.h
---- linux-2.6.32.48/include/linux/cache.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/cache.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/cache.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/cache.h 2011-11-15 19:59:43.000000000 -0500
@@ -16,6 +16,10 @@
#define __read_mostly
#endif
@@ -61361,8 +61370,8 @@ diff -urNp linux-2.6.32.48/include/linux/cache.h linux-2.6.32.48/include/linux/c
#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
#endif
diff -urNp linux-2.6.32.48/include/linux/capability.h linux-2.6.32.48/include/linux/capability.h
---- linux-2.6.32.48/include/linux/capability.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/capability.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/capability.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/capability.h 2011-11-15 19:59:43.000000000 -0500
@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
(security_real_capable_noaudit((t), (cap)) == 0)
@@ -61372,8 +61381,8 @@ diff -urNp linux-2.6.32.48/include/linux/capability.h linux-2.6.32.48/include/li
/* audit system wants to get cap info from files as well */
struct dentry;
diff -urNp linux-2.6.32.48/include/linux/compiler-gcc4.h linux-2.6.32.48/include/linux/compiler-gcc4.h
---- linux-2.6.32.48/include/linux/compiler-gcc4.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/compiler-gcc4.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/compiler-gcc4.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/compiler-gcc4.h 2011-11-15 19:59:43.000000000 -0500
@@ -36,4 +36,16 @@
the kernel context */
#define __cold __attribute__((__cold__))
@@ -61392,8 +61401,8 @@ diff -urNp linux-2.6.32.48/include/linux/compiler-gcc4.h linux-2.6.32.48/include
+
#endif
diff -urNp linux-2.6.32.48/include/linux/compiler.h linux-2.6.32.48/include/linux/compiler.h
---- linux-2.6.32.48/include/linux/compiler.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/compiler.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/compiler.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/compiler.h 2011-11-15 19:59:43.000000000 -0500
@@ -5,11 +5,14 @@
#ifdef __CHECKER__
@@ -61492,8 +61501,8 @@ diff -urNp linux-2.6.32.48/include/linux/compiler.h linux-2.6.32.48/include/linu
#endif /* __LINUX_COMPILER_H */
diff -urNp linux-2.6.32.48/include/linux/crypto.h linux-2.6.32.48/include/linux/crypto.h
---- linux-2.6.32.48/include/linux/crypto.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/crypto.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/crypto.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/crypto.h 2011-11-15 19:59:43.000000000 -0500
@@ -394,7 +394,7 @@ struct cipher_tfm {
const u8 *key, unsigned int keylen);
void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
@@ -61520,8 +61529,8 @@ diff -urNp linux-2.6.32.48/include/linux/crypto.h linux-2.6.32.48/include/linux/
#define crt_ablkcipher crt_u.ablkcipher
#define crt_aead crt_u.aead
diff -urNp linux-2.6.32.48/include/linux/dcache.h linux-2.6.32.48/include/linux/dcache.h
---- linux-2.6.32.48/include/linux/dcache.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/dcache.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/dcache.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/dcache.h 2011-11-15 19:59:43.000000000 -0500
@@ -119,6 +119,8 @@ struct dentry {
unsigned char d_iname[DNAME_INLINE_LEN_MIN]; /* small names */
};
@@ -61532,8 +61541,8 @@ diff -urNp linux-2.6.32.48/include/linux/dcache.h linux-2.6.32.48/include/linux/
* dentry->d_lock spinlock nesting subclasses:
*
diff -urNp linux-2.6.32.48/include/linux/decompress/mm.h linux-2.6.32.48/include/linux/decompress/mm.h
---- linux-2.6.32.48/include/linux/decompress/mm.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/decompress/mm.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/decompress/mm.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/decompress/mm.h 2011-11-15 19:59:43.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 */
@@ -61544,8 +61553,8 @@ diff -urNp linux-2.6.32.48/include/linux/decompress/mm.h linux-2.6.32.48/include
#define large_malloc(a) vmalloc(a)
diff -urNp linux-2.6.32.48/include/linux/dma-mapping.h linux-2.6.32.48/include/linux/dma-mapping.h
---- linux-2.6.32.48/include/linux/dma-mapping.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/dma-mapping.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/dma-mapping.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/dma-mapping.h 2011-11-15 19:59:43.000000000 -0500
@@ -16,51 +16,51 @@ enum dma_data_direction {
};
@@ -61614,8 +61623,8 @@ diff -urNp linux-2.6.32.48/include/linux/dma-mapping.h linux-2.6.32.48/include/l
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
diff -urNp linux-2.6.32.48/include/linux/dst.h linux-2.6.32.48/include/linux/dst.h
---- linux-2.6.32.48/include/linux/dst.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/dst.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/dst.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/dst.h 2011-11-15 19:59:43.000000000 -0500
@@ -380,7 +380,7 @@ struct dst_node
struct thread_pool *pool;
@@ -61626,8 +61635,8 @@ diff -urNp linux-2.6.32.48/include/linux/dst.h linux-2.6.32.48/include/linux/dst
/*
* How frequently and how many times transaction
diff -urNp linux-2.6.32.48/include/linux/elf.h linux-2.6.32.48/include/linux/elf.h
---- linux-2.6.32.48/include/linux/elf.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/elf.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/elf.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/elf.h 2011-11-15 19:59:43.000000000 -0500
@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
#define PT_GNU_EH_FRAME 0x6474e550
@@ -61701,8 +61710,8 @@ diff -urNp linux-2.6.32.48/include/linux/elf.h linux-2.6.32.48/include/linux/elf
#endif
diff -urNp linux-2.6.32.48/include/linux/fscache-cache.h linux-2.6.32.48/include/linux/fscache-cache.h
---- linux-2.6.32.48/include/linux/fscache-cache.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/fscache-cache.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/fscache-cache.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/fscache-cache.h 2011-11-15 19:59:43.000000000 -0500
@@ -116,7 +116,7 @@ struct fscache_operation {
#endif
};
@@ -61722,8 +61731,8 @@ diff -urNp linux-2.6.32.48/include/linux/fscache-cache.h linux-2.6.32.48/include
INIT_LIST_HEAD(&op->pend_link);
fscache_set_op_state(op, "Init");
diff -urNp linux-2.6.32.48/include/linux/fs.h linux-2.6.32.48/include/linux/fs.h
---- linux-2.6.32.48/include/linux/fs.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/fs.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/fs.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/fs.h 2011-11-15 19:59:43.000000000 -0500
@@ -90,6 +90,11 @@ struct inodes_stat_t {
/* Expect random access pattern */
#define FMODE_RANDOM ((__force fmode_t)4096)
@@ -61896,8 +61905,8 @@ diff -urNp linux-2.6.32.48/include/linux/fs.h linux-2.6.32.48/include/linux/fs.h
/*
diff -urNp linux-2.6.32.48/include/linux/fs_struct.h linux-2.6.32.48/include/linux/fs_struct.h
---- linux-2.6.32.48/include/linux/fs_struct.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/fs_struct.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/fs_struct.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/fs_struct.h 2011-11-15 19:59:43.000000000 -0500
@@ -4,7 +4,7 @@
#include <linux/path.h>
@@ -61908,8 +61917,8 @@ diff -urNp linux-2.6.32.48/include/linux/fs_struct.h linux-2.6.32.48/include/lin
int umask;
int in_exec;
diff -urNp linux-2.6.32.48/include/linux/ftrace_event.h linux-2.6.32.48/include/linux/ftrace_event.h
---- linux-2.6.32.48/include/linux/ftrace_event.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/ftrace_event.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/ftrace_event.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/ftrace_event.h 2011-11-15 19:59:43.000000000 -0500
@@ -163,7 +163,7 @@ extern int trace_define_field(struct ftr
int filter_type);
extern int trace_define_common_fields(struct ftrace_event_call *call);
@@ -61920,8 +61929,8 @@ diff -urNp linux-2.6.32.48/include/linux/ftrace_event.h linux-2.6.32.48/include/
int trace_set_clr_event(const char *system, const char *event, int set);
diff -urNp linux-2.6.32.48/include/linux/genhd.h linux-2.6.32.48/include/linux/genhd.h
---- linux-2.6.32.48/include/linux/genhd.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/genhd.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/genhd.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/genhd.h 2011-11-15 19:59:43.000000000 -0500
@@ -161,7 +161,7 @@ struct gendisk {
struct timer_rand_state *random;
@@ -61933,7 +61942,7 @@ diff -urNp linux-2.6.32.48/include/linux/genhd.h linux-2.6.32.48/include/linux/g
struct blk_integrity *integrity;
diff -urNp linux-2.6.32.48/include/linux/gracl.h linux-2.6.32.48/include/linux/gracl.h
--- linux-2.6.32.48/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/include/linux/gracl.h 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/include/linux/gracl.h 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,317 @@
+#ifndef GR_ACL_H
+#define GR_ACL_H
@@ -62254,7 +62263,7 @@ diff -urNp linux-2.6.32.48/include/linux/gracl.h linux-2.6.32.48/include/linux/g
+
diff -urNp linux-2.6.32.48/include/linux/gralloc.h linux-2.6.32.48/include/linux/gralloc.h
--- linux-2.6.32.48/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/include/linux/gralloc.h 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/include/linux/gralloc.h 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,9 @@
+#ifndef __GRALLOC_H
+#define __GRALLOC_H
@@ -62267,7 +62276,7 @@ diff -urNp linux-2.6.32.48/include/linux/gralloc.h linux-2.6.32.48/include/linux
+#endif
diff -urNp linux-2.6.32.48/include/linux/grdefs.h linux-2.6.32.48/include/linux/grdefs.h
--- linux-2.6.32.48/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/include/linux/grdefs.h 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/include/linux/grdefs.h 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,140 @@
+#ifndef GRDEFS_H
+#define GRDEFS_H
@@ -62411,7 +62420,7 @@ diff -urNp linux-2.6.32.48/include/linux/grdefs.h linux-2.6.32.48/include/linux/
+#endif
diff -urNp linux-2.6.32.48/include/linux/grinternal.h linux-2.6.32.48/include/linux/grinternal.h
--- linux-2.6.32.48/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/include/linux/grinternal.h 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/include/linux/grinternal.h 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,218 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
@@ -62633,7 +62642,7 @@ diff -urNp linux-2.6.32.48/include/linux/grinternal.h linux-2.6.32.48/include/li
+#endif
diff -urNp linux-2.6.32.48/include/linux/grmsg.h linux-2.6.32.48/include/linux/grmsg.h
--- linux-2.6.32.48/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/include/linux/grmsg.h 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/include/linux/grmsg.h 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,108 @@
+#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
@@ -62745,7 +62754,7 @@ diff -urNp linux-2.6.32.48/include/linux/grmsg.h linux-2.6.32.48/include/linux/g
+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
diff -urNp linux-2.6.32.48/include/linux/grsecurity.h linux-2.6.32.48/include/linux/grsecurity.h
--- linux-2.6.32.48/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/include/linux/grsecurity.h 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/include/linux/grsecurity.h 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,218 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
@@ -62966,8 +62975,8 @@ diff -urNp linux-2.6.32.48/include/linux/grsecurity.h linux-2.6.32.48/include/li
+
+#endif
diff -urNp linux-2.6.32.48/include/linux/hdpu_features.h linux-2.6.32.48/include/linux/hdpu_features.h
---- linux-2.6.32.48/include/linux/hdpu_features.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/hdpu_features.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/hdpu_features.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/hdpu_features.h 2011-11-15 19:59:43.000000000 -0500
@@ -3,7 +3,7 @@
struct cpustate_t {
spinlock_t lock;
@@ -62978,8 +62987,8 @@ diff -urNp linux-2.6.32.48/include/linux/hdpu_features.h linux-2.6.32.48/include
int inited;
unsigned long *set_addr;
diff -urNp linux-2.6.32.48/include/linux/highmem.h linux-2.6.32.48/include/linux/highmem.h
---- linux-2.6.32.48/include/linux/highmem.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/highmem.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/highmem.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/highmem.h 2011-11-15 19:59:43.000000000 -0500
@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
kunmap_atomic(kaddr, KM_USER0);
}
@@ -63000,8 +63009,8 @@ diff -urNp linux-2.6.32.48/include/linux/highmem.h linux-2.6.32.48/include/linux
unsigned start1, unsigned end1,
unsigned start2, unsigned end2)
diff -urNp linux-2.6.32.48/include/linux/i2c.h linux-2.6.32.48/include/linux/i2c.h
---- linux-2.6.32.48/include/linux/i2c.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/i2c.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/i2c.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/i2c.h 2011-11-15 19:59:43.000000000 -0500
@@ -325,6 +325,7 @@ struct i2c_algorithm {
/* To determine what the adapter supports */
u32 (*functionality) (struct i2c_adapter *);
@@ -63011,8 +63020,8 @@ diff -urNp linux-2.6.32.48/include/linux/i2c.h linux-2.6.32.48/include/linux/i2c
/*
* i2c_adapter is the structure used to identify a physical i2c bus along
diff -urNp linux-2.6.32.48/include/linux/i2o.h linux-2.6.32.48/include/linux/i2o.h
---- linux-2.6.32.48/include/linux/i2o.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/i2o.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/i2o.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/i2o.h 2011-11-15 19:59:43.000000000 -0500
@@ -564,7 +564,7 @@ struct i2o_controller {
struct i2o_device *exec; /* Executive */
#if BITS_PER_LONG == 64
@@ -63023,8 +63032,8 @@ diff -urNp linux-2.6.32.48/include/linux/i2o.h linux-2.6.32.48/include/linux/i2o
and pointers */
#endif
diff -urNp linux-2.6.32.48/include/linux/init_task.h linux-2.6.32.48/include/linux/init_task.h
---- linux-2.6.32.48/include/linux/init_task.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/init_task.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/init_task.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/init_task.h 2011-11-15 19:59:43.000000000 -0500
@@ -83,6 +83,12 @@ extern struct group_info init_groups;
#define INIT_IDS
#endif
@@ -63047,8 +63056,8 @@ diff -urNp linux-2.6.32.48/include/linux/init_task.h linux-2.6.32.48/include/lin
.files = &init_files, \
.signal = &init_signals, \
diff -urNp linux-2.6.32.48/include/linux/intel-iommu.h linux-2.6.32.48/include/linux/intel-iommu.h
---- linux-2.6.32.48/include/linux/intel-iommu.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/intel-iommu.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/intel-iommu.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/intel-iommu.h 2011-11-15 19:59:43.000000000 -0500
@@ -296,7 +296,7 @@ struct iommu_flush {
u8 fm, u64 type);
void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
@@ -63059,8 +63068,8 @@ diff -urNp linux-2.6.32.48/include/linux/intel-iommu.h linux-2.6.32.48/include/l
enum {
SR_DMAR_FECTL_REG,
diff -urNp linux-2.6.32.48/include/linux/interrupt.h linux-2.6.32.48/include/linux/interrupt.h
---- linux-2.6.32.48/include/linux/interrupt.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/interrupt.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/interrupt.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/interrupt.h 2011-11-15 19:59:43.000000000 -0500
@@ -363,7 +363,7 @@ enum
/* map softirq index to softirq name. update 'softirq_to_name' in
* kernel/softirq.c when adding a new softirq.
@@ -63086,8 +63095,8 @@ diff -urNp linux-2.6.32.48/include/linux/interrupt.h linux-2.6.32.48/include/lin
#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.48/include/linux/irq.h linux-2.6.32.48/include/linux/irq.h
---- linux-2.6.32.48/include/linux/irq.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/irq.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/irq.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/irq.h 2011-11-15 19:59:43.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)
@@ -63103,8 +63112,8 @@ diff -urNp linux-2.6.32.48/include/linux/irq.h linux-2.6.32.48/include/linux/irq
return false;
diff -urNp linux-2.6.32.48/include/linux/kallsyms.h linux-2.6.32.48/include/linux/kallsyms.h
---- linux-2.6.32.48/include/linux/kallsyms.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/kallsyms.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/kallsyms.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/kallsyms.h 2011-11-15 19:59:43.000000000 -0500
@@ -15,7 +15,8 @@
struct module;
@@ -63132,8 +63141,8 @@ diff -urNp linux-2.6.32.48/include/linux/kallsyms.h linux-2.6.32.48/include/linu
/* This macro allows us to keep printk typechecking */
static void __check_printsym_format(const char *fmt, ...)
diff -urNp linux-2.6.32.48/include/linux/kgdb.h linux-2.6.32.48/include/linux/kgdb.h
---- linux-2.6.32.48/include/linux/kgdb.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/kgdb.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/kgdb.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/kgdb.h 2011-11-15 19:59:43.000000000 -0500
@@ -74,8 +74,8 @@ void kgdb_breakpoint(void);
extern int kgdb_connected;
@@ -63174,8 +63183,8 @@ diff -urNp linux-2.6.32.48/include/linux/kgdb.h linux-2.6.32.48/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.48/include/linux/kmod.h linux-2.6.32.48/include/linux/kmod.h
---- linux-2.6.32.48/include/linux/kmod.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/kmod.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/kmod.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/kmod.h 2011-11-15 19:59:43.000000000 -0500
@@ -31,6 +31,8 @@
* usually useless though. */
extern int __request_module(bool wait, const char *name, ...) \
@@ -63186,8 +63195,8 @@ diff -urNp linux-2.6.32.48/include/linux/kmod.h linux-2.6.32.48/include/linux/km
#define request_module_nowait(mod...) __request_module(false, mod)
#define try_then_request_module(x, mod...) \
diff -urNp linux-2.6.32.48/include/linux/kobject.h linux-2.6.32.48/include/linux/kobject.h
---- linux-2.6.32.48/include/linux/kobject.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/kobject.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/kobject.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/kobject.h 2011-11-15 19:59:43.000000000 -0500
@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
struct kobj_type {
@@ -63237,8 +63246,8 @@ diff -urNp linux-2.6.32.48/include/linux/kobject.h linux-2.6.32.48/include/linux
static inline struct kset *to_kset(struct kobject *kobj)
diff -urNp linux-2.6.32.48/include/linux/kvm_host.h linux-2.6.32.48/include/linux/kvm_host.h
---- linux-2.6.32.48/include/linux/kvm_host.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/kvm_host.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/kvm_host.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/kvm_host.h 2011-11-15 19:59:43.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);
@@ -63258,8 +63267,8 @@ diff -urNp linux-2.6.32.48/include/linux/kvm_host.h linux-2.6.32.48/include/linu
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
diff -urNp linux-2.6.32.48/include/linux/libata.h linux-2.6.32.48/include/linux/libata.h
---- linux-2.6.32.48/include/linux/libata.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/libata.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/libata.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/libata.h 2011-11-15 19:59:43.000000000 -0500
@@ -525,11 +525,11 @@ struct ata_ioports {
struct ata_host {
@@ -63320,8 +63329,8 @@ diff -urNp linux-2.6.32.48/include/linux/libata.h linux-2.6.32.48/include/linux/
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.48/include/linux/lockd/bind.h linux-2.6.32.48/include/linux/lockd/bind.h
---- linux-2.6.32.48/include/linux/lockd/bind.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/lockd/bind.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/lockd/bind.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/lockd/bind.h 2011-11-15 19:59:43.000000000 -0500
@@ -23,13 +23,13 @@ struct svc_rqst;
* This is the set of functions for lockd->nfsd communication
*/
@@ -63340,8 +63349,8 @@ diff -urNp linux-2.6.32.48/include/linux/lockd/bind.h linux-2.6.32.48/include/li
/*
* Similar to nfs_client_initdata, but without the NFS-specific
diff -urNp linux-2.6.32.48/include/linux/mca.h linux-2.6.32.48/include/linux/mca.h
---- linux-2.6.32.48/include/linux/mca.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/mca.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/mca.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/mca.h 2011-11-15 19:59:43.000000000 -0500
@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
int region);
void * (*mca_transform_memory)(struct mca_device *,
@@ -63352,8 +63361,8 @@ diff -urNp linux-2.6.32.48/include/linux/mca.h linux-2.6.32.48/include/linux/mca
struct mca_bus {
u64 default_dma_mask;
diff -urNp linux-2.6.32.48/include/linux/memory.h linux-2.6.32.48/include/linux/memory.h
---- linux-2.6.32.48/include/linux/memory.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/memory.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/memory.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/memory.h 2011-11-15 19:59:43.000000000 -0500
@@ -108,7 +108,7 @@ struct memory_accessor {
size_t count);
ssize_t (*write)(struct memory_accessor *, const char *buf,
@@ -63364,8 +63373,8 @@ diff -urNp linux-2.6.32.48/include/linux/memory.h linux-2.6.32.48/include/linux/
/*
* Kernel text modification mutex, used for code patching. Users of this lock
diff -urNp linux-2.6.32.48/include/linux/mm.h linux-2.6.32.48/include/linux/mm.h
---- linux-2.6.32.48/include/linux/mm.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/mm.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/mm.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/mm.h 2011-11-15 19:59:43.000000000 -0500
@@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
@@ -63446,8 +63455,8 @@ diff -urNp linux-2.6.32.48/include/linux/mm.h linux-2.6.32.48/include/linux/mm.h
#endif /* __KERNEL__ */
#endif /* _LINUX_MM_H */
diff -urNp linux-2.6.32.48/include/linux/mm_types.h linux-2.6.32.48/include/linux/mm_types.h
---- linux-2.6.32.48/include/linux/mm_types.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/mm_types.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/mm_types.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/mm_types.h 2011-11-15 19:59:43.000000000 -0500
@@ -186,6 +186,8 @@ struct vm_area_struct {
#ifdef CONFIG_NUMA
struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -63483,8 +63492,8 @@ diff -urNp linux-2.6.32.48/include/linux/mm_types.h linux-2.6.32.48/include/linu
/* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
diff -urNp linux-2.6.32.48/include/linux/mmu_notifier.h linux-2.6.32.48/include/linux/mmu_notifier.h
---- linux-2.6.32.48/include/linux/mmu_notifier.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/mmu_notifier.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/mmu_notifier.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/mmu_notifier.h 2011-11-15 19:59:43.000000000 -0500
@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
*/
#define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -63502,8 +63511,8 @@ diff -urNp linux-2.6.32.48/include/linux/mmu_notifier.h linux-2.6.32.48/include/
#define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
diff -urNp linux-2.6.32.48/include/linux/mmzone.h linux-2.6.32.48/include/linux/mmzone.h
---- linux-2.6.32.48/include/linux/mmzone.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/mmzone.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/mmzone.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/mmzone.h 2011-11-15 19:59:43.000000000 -0500
@@ -350,7 +350,7 @@ struct zone {
unsigned long flags; /* zone flags, see below */
@@ -63514,8 +63523,8 @@ diff -urNp linux-2.6.32.48/include/linux/mmzone.h linux-2.6.32.48/include/linux/
/*
* prev_priority holds the scanning priority for this zone. It is
diff -urNp linux-2.6.32.48/include/linux/mod_devicetable.h linux-2.6.32.48/include/linux/mod_devicetable.h
---- linux-2.6.32.48/include/linux/mod_devicetable.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/mod_devicetable.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/mod_devicetable.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/mod_devicetable.h 2011-11-15 19:59:43.000000000 -0500
@@ -12,7 +12,7 @@
typedef unsigned long kernel_ulong_t;
#endif
@@ -63535,8 +63544,8 @@ diff -urNp linux-2.6.32.48/include/linux/mod_devicetable.h linux-2.6.32.48/inclu
struct hid_device_id {
__u16 bus;
diff -urNp linux-2.6.32.48/include/linux/module.h linux-2.6.32.48/include/linux/module.h
---- linux-2.6.32.48/include/linux/module.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/module.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/module.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/module.h 2011-11-15 19:59:43.000000000 -0500
@@ -16,6 +16,7 @@
#include <linux/kobject.h>
#include <linux/moduleparam.h>
@@ -63629,8 +63638,8 @@ diff -urNp linux-2.6.32.48/include/linux/module.h linux-2.6.32.48/include/linux/
/* Search for module by name: must hold module_mutex. */
diff -urNp linux-2.6.32.48/include/linux/moduleloader.h linux-2.6.32.48/include/linux/moduleloader.h
---- linux-2.6.32.48/include/linux/moduleloader.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/moduleloader.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/moduleloader.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/moduleloader.h 2011-11-15 19:59:43.000000000 -0500
@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
sections. Returns NULL on failure. */
void *module_alloc(unsigned long size);
@@ -63654,8 +63663,8 @@ diff -urNp linux-2.6.32.48/include/linux/moduleloader.h linux-2.6.32.48/include/
or 0. */
int apply_relocate(Elf_Shdr *sechdrs,
diff -urNp linux-2.6.32.48/include/linux/moduleparam.h linux-2.6.32.48/include/linux/moduleparam.h
---- linux-2.6.32.48/include/linux/moduleparam.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/moduleparam.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/moduleparam.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/moduleparam.h 2011-11-15 19:59:43.000000000 -0500
@@ -132,7 +132,7 @@ struct kparam_array
/* Actually copy string: maxlen param is usually sizeof(string). */
@@ -63675,8 +63684,8 @@ diff -urNp linux-2.6.32.48/include/linux/moduleparam.h linux-2.6.32.48/include/l
sizeof(array[0]), array }; \
__module_param_call(MODULE_PARAM_PREFIX, name, \
diff -urNp linux-2.6.32.48/include/linux/mutex.h linux-2.6.32.48/include/linux/mutex.h
---- linux-2.6.32.48/include/linux/mutex.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/mutex.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/mutex.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/mutex.h 2011-11-15 19:59:43.000000000 -0500
@@ -51,7 +51,7 @@ struct mutex {
spinlock_t wait_lock;
struct list_head wait_list;
@@ -63687,8 +63696,8 @@ diff -urNp linux-2.6.32.48/include/linux/mutex.h linux-2.6.32.48/include/linux/m
#ifdef CONFIG_DEBUG_MUTEXES
const char *name;
diff -urNp linux-2.6.32.48/include/linux/namei.h linux-2.6.32.48/include/linux/namei.h
---- linux-2.6.32.48/include/linux/namei.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/namei.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/namei.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/namei.h 2011-11-15 19:59:43.000000000 -0500
@@ -22,7 +22,7 @@ struct nameidata {
unsigned int flags;
int last_type;
@@ -63714,8 +63723,8 @@ diff -urNp linux-2.6.32.48/include/linux/namei.h linux-2.6.32.48/include/linux/n
return nd->saved_names[nd->depth];
}
diff -urNp linux-2.6.32.48/include/linux/netdevice.h linux-2.6.32.48/include/linux/netdevice.h
---- linux-2.6.32.48/include/linux/netdevice.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/netdevice.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/netdevice.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/netdevice.h 2011-11-15 19:59:43.000000000 -0500
@@ -637,6 +637,7 @@ struct net_device_ops {
u16 xid);
#endif
@@ -63726,7 +63735,7 @@ diff -urNp linux-2.6.32.48/include/linux/netdevice.h linux-2.6.32.48/include/lin
* The DEVICE structure.
diff -urNp linux-2.6.32.48/include/linux/netfilter/xt_gradm.h linux-2.6.32.48/include/linux/netfilter/xt_gradm.h
--- linux-2.6.32.48/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/include/linux/netfilter/xt_gradm.h 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/include/linux/netfilter/xt_gradm.h 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,9 @@
+#ifndef _LINUX_NETFILTER_XT_GRADM_H
+#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -63738,8 +63747,8 @@ diff -urNp linux-2.6.32.48/include/linux/netfilter/xt_gradm.h linux-2.6.32.48/in
+
+#endif
diff -urNp linux-2.6.32.48/include/linux/nodemask.h linux-2.6.32.48/include/linux/nodemask.h
---- linux-2.6.32.48/include/linux/nodemask.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/nodemask.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/nodemask.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/nodemask.h 2011-11-15 19:59:43.000000000 -0500
@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
#define any_online_node(mask) \
@@ -63757,8 +63766,8 @@ diff -urNp linux-2.6.32.48/include/linux/nodemask.h linux-2.6.32.48/include/linu
#define num_online_nodes() num_node_state(N_ONLINE)
diff -urNp linux-2.6.32.48/include/linux/oprofile.h linux-2.6.32.48/include/linux/oprofile.h
---- linux-2.6.32.48/include/linux/oprofile.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/oprofile.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/oprofile.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/oprofile.h 2011-11-15 19:59:43.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);
@@ -63772,8 +63781,8 @@ diff -urNp linux-2.6.32.48/include/linux/oprofile.h linux-2.6.32.48/include/linu
/** create a directory */
struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
diff -urNp linux-2.6.32.48/include/linux/pagemap.h linux-2.6.32.48/include/linux/pagemap.h
---- linux-2.6.32.48/include/linux/pagemap.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/pagemap.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/pagemap.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/pagemap.h 2011-11-15 19:59:43.000000000 -0500
@@ -425,6 +425,7 @@ static inline int fault_in_pages_readabl
if (((unsigned long)uaddr & PAGE_MASK) !=
((unsigned long)end & PAGE_MASK))
@@ -63783,8 +63792,8 @@ diff -urNp linux-2.6.32.48/include/linux/pagemap.h linux-2.6.32.48/include/linux
return ret;
}
diff -urNp linux-2.6.32.48/include/linux/perf_event.h linux-2.6.32.48/include/linux/perf_event.h
---- linux-2.6.32.48/include/linux/perf_event.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/perf_event.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/perf_event.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/perf_event.h 2011-11-15 19:59:43.000000000 -0500
@@ -476,7 +476,7 @@ struct hw_perf_event {
struct hrtimer hrtimer;
};
@@ -63815,8 +63824,8 @@ diff -urNp linux-2.6.32.48/include/linux/perf_event.h linux-2.6.32.48/include/li
/*
* Protect attach/detach and child_list:
diff -urNp linux-2.6.32.48/include/linux/pipe_fs_i.h linux-2.6.32.48/include/linux/pipe_fs_i.h
---- linux-2.6.32.48/include/linux/pipe_fs_i.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/pipe_fs_i.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/pipe_fs_i.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/pipe_fs_i.h 2011-11-15 19:59:43.000000000 -0500
@@ -46,9 +46,9 @@ struct pipe_inode_info {
wait_queue_head_t wait;
unsigned int nrbufs, curbuf;
@@ -63831,8 +63840,8 @@ diff -urNp linux-2.6.32.48/include/linux/pipe_fs_i.h linux-2.6.32.48/include/lin
unsigned int w_counter;
struct fasync_struct *fasync_readers;
diff -urNp linux-2.6.32.48/include/linux/poison.h linux-2.6.32.48/include/linux/poison.h
---- linux-2.6.32.48/include/linux/poison.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/poison.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/poison.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/poison.h 2011-11-15 19:59:43.000000000 -0500
@@ -19,8 +19,8 @@
* under normal circumstances, used to verify that nobody uses
* non-initialized list entries.
@@ -63845,8 +63854,8 @@ diff -urNp linux-2.6.32.48/include/linux/poison.h linux-2.6.32.48/include/linux/
/********** include/linux/timer.h **********/
/*
diff -urNp linux-2.6.32.48/include/linux/posix-timers.h linux-2.6.32.48/include/linux/posix-timers.h
---- linux-2.6.32.48/include/linux/posix-timers.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/posix-timers.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/posix-timers.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/posix-timers.h 2011-11-15 19:59:43.000000000 -0500
@@ -67,7 +67,7 @@ struct k_itimer {
};
@@ -63857,8 +63866,8 @@ diff -urNp linux-2.6.32.48/include/linux/posix-timers.h linux-2.6.32.48/include/
int (*clock_set) (const clockid_t which_clock, struct timespec * tp);
int (*clock_get) (const clockid_t which_clock, struct timespec * tp);
diff -urNp linux-2.6.32.48/include/linux/preempt.h linux-2.6.32.48/include/linux/preempt.h
---- linux-2.6.32.48/include/linux/preempt.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/preempt.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/preempt.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/preempt.h 2011-11-15 19:59:43.000000000 -0500
@@ -110,7 +110,7 @@ struct preempt_ops {
void (*sched_in)(struct preempt_notifier *notifier, int cpu);
void (*sched_out)(struct preempt_notifier *notifier,
@@ -63869,8 +63878,8 @@ diff -urNp linux-2.6.32.48/include/linux/preempt.h linux-2.6.32.48/include/linux
/**
* preempt_notifier - key for installing preemption notifiers
diff -urNp linux-2.6.32.48/include/linux/proc_fs.h linux-2.6.32.48/include/linux/proc_fs.h
---- linux-2.6.32.48/include/linux/proc_fs.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/proc_fs.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/proc_fs.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/proc_fs.h 2011-11-15 19:59:43.000000000 -0500
@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
return proc_create_data(name, mode, parent, proc_fops, NULL);
}
@@ -63901,8 +63910,8 @@ diff -urNp linux-2.6.32.48/include/linux/proc_fs.h linux-2.6.32.48/include/linux
struct ctl_table_header;
struct ctl_table;
diff -urNp linux-2.6.32.48/include/linux/ptrace.h linux-2.6.32.48/include/linux/ptrace.h
---- linux-2.6.32.48/include/linux/ptrace.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/ptrace.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/ptrace.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/ptrace.h 2011-11-15 19:59:43.000000000 -0500
@@ -96,10 +96,10 @@ extern void __ptrace_unlink(struct task_
extern void exit_ptrace(struct task_struct *tracer);
#define PTRACE_MODE_READ 1
@@ -63917,8 +63926,8 @@ diff -urNp linux-2.6.32.48/include/linux/ptrace.h linux-2.6.32.48/include/linux/
static inline int ptrace_reparented(struct task_struct *child)
{
diff -urNp linux-2.6.32.48/include/linux/random.h linux-2.6.32.48/include/linux/random.h
---- linux-2.6.32.48/include/linux/random.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/random.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/random.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/random.h 2011-11-15 19:59:43.000000000 -0500
@@ -63,6 +63,11 @@ unsigned long randomize_range(unsigned l
u32 random32(void);
void srandom32(u32 seed);
@@ -63932,8 +63941,8 @@ diff -urNp linux-2.6.32.48/include/linux/random.h linux-2.6.32.48/include/linux/
#endif /* _LINUX_RANDOM_H */
diff -urNp linux-2.6.32.48/include/linux/reboot.h linux-2.6.32.48/include/linux/reboot.h
---- linux-2.6.32.48/include/linux/reboot.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/reboot.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/reboot.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/reboot.h 2011-11-15 19:59:43.000000000 -0500
@@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st
* Architecture-specific implementations of sys_reboot commands.
*/
@@ -63970,8 +63979,8 @@ diff -urNp linux-2.6.32.48/include/linux/reboot.h linux-2.6.32.48/include/linux/
#endif
diff -urNp linux-2.6.32.48/include/linux/reiserfs_fs.h linux-2.6.32.48/include/linux/reiserfs_fs.h
---- linux-2.6.32.48/include/linux/reiserfs_fs.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/reiserfs_fs.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/reiserfs_fs.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/reiserfs_fs.h 2011-11-15 19:59:43.000000000 -0500
@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
#define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
@@ -64019,8 +64028,8 @@ diff -urNp linux-2.6.32.48/include/linux/reiserfs_fs.h linux-2.6.32.48/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.48/include/linux/reiserfs_fs_sb.h linux-2.6.32.48/include/linux/reiserfs_fs_sb.h
---- linux-2.6.32.48/include/linux/reiserfs_fs_sb.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/reiserfs_fs_sb.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/reiserfs_fs_sb.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/reiserfs_fs_sb.h 2011-11-15 19:59:43.000000000 -0500
@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
/* Comment? -Hans */
wait_queue_head_t s_wait;
@@ -64031,8 +64040,8 @@ diff -urNp linux-2.6.32.48/include/linux/reiserfs_fs_sb.h linux-2.6.32.48/includ
unsigned long s_properties; /* File system properties. Currently holds
on-disk FS format */
diff -urNp linux-2.6.32.48/include/linux/relay.h linux-2.6.32.48/include/linux/relay.h
---- linux-2.6.32.48/include/linux/relay.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/relay.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/relay.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/relay.h 2011-11-15 19:59:43.000000000 -0500
@@ -159,7 +159,7 @@ struct rchan_callbacks
* The callback should return 0 if successful, negative if not.
*/
@@ -64043,8 +64052,8 @@ diff -urNp linux-2.6.32.48/include/linux/relay.h linux-2.6.32.48/include/linux/r
/*
* CONFIG_RELAY kernel API, kernel/relay.c
diff -urNp linux-2.6.32.48/include/linux/rfkill.h linux-2.6.32.48/include/linux/rfkill.h
---- linux-2.6.32.48/include/linux/rfkill.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/rfkill.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/rfkill.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/rfkill.h 2011-11-15 19:59:43.000000000 -0500
@@ -144,6 +144,7 @@ struct rfkill_ops {
void (*query)(struct rfkill *rfkill, void *data);
int (*set_block)(void *data, bool blocked);
@@ -64054,8 +64063,8 @@ diff -urNp linux-2.6.32.48/include/linux/rfkill.h linux-2.6.32.48/include/linux/
#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
/**
diff -urNp linux-2.6.32.48/include/linux/sched.h linux-2.6.32.48/include/linux/sched.h
---- linux-2.6.32.48/include/linux/sched.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/sched.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/sched.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/sched.h 2011-11-15 19:59:43.000000000 -0500
@@ -101,6 +101,7 @@ struct bio;
struct fs_struct;
struct bts_context;
@@ -64317,8 +64326,8 @@ diff -urNp linux-2.6.32.48/include/linux/sched.h linux-2.6.32.48/include/linux/s
#ifdef CONFIG_DEBUG_STACK_USAGE
diff -urNp linux-2.6.32.48/include/linux/screen_info.h linux-2.6.32.48/include/linux/screen_info.h
---- linux-2.6.32.48/include/linux/screen_info.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/screen_info.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/screen_info.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/screen_info.h 2011-11-15 19:59:43.000000000 -0500
@@ -42,7 +42,8 @@ struct screen_info {
__u16 pages; /* 0x32 */
__u16 vesa_attributes; /* 0x34 */
@@ -64330,8 +64339,8 @@ diff -urNp linux-2.6.32.48/include/linux/screen_info.h linux-2.6.32.48/include/l
#define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
diff -urNp linux-2.6.32.48/include/linux/security.h linux-2.6.32.48/include/linux/security.h
---- linux-2.6.32.48/include/linux/security.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/security.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/security.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/security.h 2011-11-15 19:59:43.000000000 -0500
@@ -34,6 +34,7 @@
#include <linux/key.h>
#include <linux/xfrm.h>
@@ -64341,8 +64350,8 @@ diff -urNp linux-2.6.32.48/include/linux/security.h linux-2.6.32.48/include/linu
/* Maximum number of letters for an LSM name string */
diff -urNp linux-2.6.32.48/include/linux/seq_file.h linux-2.6.32.48/include/linux/seq_file.h
---- linux-2.6.32.48/include/linux/seq_file.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/seq_file.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/seq_file.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/seq_file.h 2011-11-15 19:59:43.000000000 -0500
@@ -32,6 +32,7 @@ struct seq_operations {
void * (*next) (struct seq_file *m, void *v, loff_t *pos);
int (*show) (struct seq_file *m, void *v);
@@ -64352,8 +64361,8 @@ diff -urNp linux-2.6.32.48/include/linux/seq_file.h linux-2.6.32.48/include/linu
#define SEQ_SKIP 1
diff -urNp linux-2.6.32.48/include/linux/shm.h linux-2.6.32.48/include/linux/shm.h
---- linux-2.6.32.48/include/linux/shm.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/shm.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/shm.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/shm.h 2011-11-15 19:59:43.000000000 -0500
@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
pid_t shm_cprid;
pid_t shm_lprid;
@@ -64366,8 +64375,8 @@ diff -urNp linux-2.6.32.48/include/linux/shm.h linux-2.6.32.48/include/linux/shm
/* shm_mode upper byte flags */
diff -urNp linux-2.6.32.48/include/linux/skbuff.h linux-2.6.32.48/include/linux/skbuff.h
---- linux-2.6.32.48/include/linux/skbuff.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/skbuff.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/skbuff.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/skbuff.h 2011-11-15 19:59:43.000000000 -0500
@@ -14,6 +14,7 @@
#ifndef _LINUX_SKBUFF_H
#define _LINUX_SKBUFF_H
@@ -64413,8 +64422,8 @@ diff -urNp linux-2.6.32.48/include/linux/skbuff.h linux-2.6.32.48/include/linux/
extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
diff -urNp linux-2.6.32.48/include/linux/slab_def.h linux-2.6.32.48/include/linux/slab_def.h
---- linux-2.6.32.48/include/linux/slab_def.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/slab_def.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/slab_def.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/slab_def.h 2011-11-15 19:59:43.000000000 -0500
@@ -69,10 +69,10 @@ struct kmem_cache {
unsigned long node_allocs;
unsigned long node_frees;
@@ -64431,8 +64440,8 @@ diff -urNp linux-2.6.32.48/include/linux/slab_def.h linux-2.6.32.48/include/linu
/*
* If debugging is enabled, then the allocator can add additional
diff -urNp linux-2.6.32.48/include/linux/slab.h linux-2.6.32.48/include/linux/slab.h
---- linux-2.6.32.48/include/linux/slab.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/slab.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/slab.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/slab.h 2011-11-15 19:59:43.000000000 -0500
@@ -11,12 +11,20 @@
#include <linux/gfp.h>
@@ -64518,8 +64527,8 @@ diff -urNp linux-2.6.32.48/include/linux/slab.h linux-2.6.32.48/include/linux/sl
+
#endif /* _LINUX_SLAB_H */
diff -urNp linux-2.6.32.48/include/linux/slub_def.h linux-2.6.32.48/include/linux/slub_def.h
---- linux-2.6.32.48/include/linux/slub_def.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/slub_def.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/slub_def.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/slub_def.h 2011-11-15 19:59:43.000000000 -0500
@@ -86,7 +86,7 @@ struct kmem_cache {
struct kmem_cache_order_objects max;
struct kmem_cache_order_objects min;
@@ -64539,8 +64548,8 @@ diff -urNp linux-2.6.32.48/include/linux/slub_def.h linux-2.6.32.48/include/linu
#ifdef CONFIG_KMEMTRACE
extern void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags);
diff -urNp linux-2.6.32.48/include/linux/sonet.h linux-2.6.32.48/include/linux/sonet.h
---- linux-2.6.32.48/include/linux/sonet.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/sonet.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/sonet.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/sonet.h 2011-11-15 19:59:43.000000000 -0500
@@ -61,7 +61,7 @@ struct sonet_stats {
#include <asm/atomic.h>
@@ -64551,8 +64560,8 @@ diff -urNp linux-2.6.32.48/include/linux/sonet.h linux-2.6.32.48/include/linux/s
#undef __HANDLE_ITEM
};
diff -urNp linux-2.6.32.48/include/linux/sunrpc/cache.h linux-2.6.32.48/include/linux/sunrpc/cache.h
---- linux-2.6.32.48/include/linux/sunrpc/cache.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/sunrpc/cache.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/sunrpc/cache.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/sunrpc/cache.h 2011-11-15 19:59:43.000000000 -0500
@@ -125,7 +125,7 @@ struct cache_detail {
*/
struct cache_req {
@@ -64563,8 +64572,8 @@ diff -urNp linux-2.6.32.48/include/linux/sunrpc/cache.h linux-2.6.32.48/include/
* delayed awaiting cache-fill
*/
diff -urNp linux-2.6.32.48/include/linux/sunrpc/clnt.h linux-2.6.32.48/include/linux/sunrpc/clnt.h
---- linux-2.6.32.48/include/linux/sunrpc/clnt.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/sunrpc/clnt.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/sunrpc/clnt.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/sunrpc/clnt.h 2011-11-15 19:59:43.000000000 -0500
@@ -167,9 +167,9 @@ static inline unsigned short rpc_get_por
{
switch (sap->sa_family) {
@@ -64596,8 +64605,8 @@ diff -urNp linux-2.6.32.48/include/linux/sunrpc/clnt.h linux-2.6.32.48/include/l
#endif /* __KERNEL__ */
diff -urNp linux-2.6.32.48/include/linux/sunrpc/svc_rdma.h linux-2.6.32.48/include/linux/sunrpc/svc_rdma.h
---- linux-2.6.32.48/include/linux/sunrpc/svc_rdma.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/sunrpc/svc_rdma.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/sunrpc/svc_rdma.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/sunrpc/svc_rdma.h 2011-11-15 19:59:43.000000000 -0500
@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
extern unsigned int svcrdma_max_requests;
extern unsigned int svcrdma_max_req_size;
@@ -64624,8 +64633,8 @@ diff -urNp linux-2.6.32.48/include/linux/sunrpc/svc_rdma.h linux-2.6.32.48/inclu
#define RPCRDMA_VERSION 1
diff -urNp linux-2.6.32.48/include/linux/suspend.h linux-2.6.32.48/include/linux/suspend.h
---- linux-2.6.32.48/include/linux/suspend.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/suspend.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/suspend.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/suspend.h 2011-11-15 19:59:43.000000000 -0500
@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
* which require special recovery actions in that situation.
*/
@@ -64715,8 +64724,8 @@ diff -urNp linux-2.6.32.48/include/linux/suspend.h linux-2.6.32.48/include/linux
static inline bool system_entering_hibernation(void) { return false; }
#endif /* CONFIG_HIBERNATION */
diff -urNp linux-2.6.32.48/include/linux/sysctl.h linux-2.6.32.48/include/linux/sysctl.h
---- linux-2.6.32.48/include/linux/sysctl.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/sysctl.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/sysctl.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/sysctl.h 2011-11-15 19:59:43.000000000 -0500
@@ -164,7 +164,11 @@ enum
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
};
@@ -64748,8 +64757,8 @@ diff -urNp linux-2.6.32.48/include/linux/sysctl.h linux-2.6.32.48/include/linux/
extern ctl_handler sysctl_jiffies;
extern ctl_handler sysctl_ms_jiffies;
diff -urNp linux-2.6.32.48/include/linux/sysfs.h linux-2.6.32.48/include/linux/sysfs.h
---- linux-2.6.32.48/include/linux/sysfs.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/sysfs.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/sysfs.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/sysfs.h 2011-11-15 19:59:43.000000000 -0500
@@ -75,8 +75,8 @@ struct bin_attribute {
};
@@ -64762,8 +64771,8 @@ diff -urNp linux-2.6.32.48/include/linux/sysfs.h linux-2.6.32.48/include/linux/s
struct sysfs_dirent;
diff -urNp linux-2.6.32.48/include/linux/thread_info.h linux-2.6.32.48/include/linux/thread_info.h
---- linux-2.6.32.48/include/linux/thread_info.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/thread_info.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/thread_info.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/thread_info.h 2011-11-15 19:59:43.000000000 -0500
@@ -23,7 +23,7 @@ struct restart_block {
};
/* For futex_wait and futex_wait_requeue_pi */
@@ -64774,8 +64783,8 @@ diff -urNp linux-2.6.32.48/include/linux/thread_info.h linux-2.6.32.48/include/l
u32 flags;
u32 bitset;
diff -urNp linux-2.6.32.48/include/linux/tty.h linux-2.6.32.48/include/linux/tty.h
---- linux-2.6.32.48/include/linux/tty.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/tty.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/tty.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/tty.h 2011-11-15 19:59:43.000000000 -0500
@@ -493,7 +493,6 @@ extern void tty_ldisc_begin(void);
/* This last one is just for the tty layer internals and shouldn't be used elsewhere */
extern void tty_ldisc_enable(struct tty_struct *tty);
@@ -64785,8 +64794,8 @@ diff -urNp linux-2.6.32.48/include/linux/tty.h linux-2.6.32.48/include/linux/tty
extern struct tty_ldisc_ops tty_ldisc_N_TTY;
diff -urNp linux-2.6.32.48/include/linux/tty_ldisc.h linux-2.6.32.48/include/linux/tty_ldisc.h
---- linux-2.6.32.48/include/linux/tty_ldisc.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/tty_ldisc.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/tty_ldisc.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/tty_ldisc.h 2011-11-15 19:59:43.000000000 -0500
@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
struct module *owner;
@@ -64797,8 +64806,8 @@ diff -urNp linux-2.6.32.48/include/linux/tty_ldisc.h linux-2.6.32.48/include/lin
struct tty_ldisc {
diff -urNp linux-2.6.32.48/include/linux/types.h linux-2.6.32.48/include/linux/types.h
---- linux-2.6.32.48/include/linux/types.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/types.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/types.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/types.h 2011-11-15 19:59:43.000000000 -0500
@@ -191,10 +191,26 @@ typedef struct {
volatile int counter;
} atomic_t;
@@ -64827,8 +64836,8 @@ diff -urNp linux-2.6.32.48/include/linux/types.h linux-2.6.32.48/include/linux/t
struct ustat {
diff -urNp linux-2.6.32.48/include/linux/uaccess.h linux-2.6.32.48/include/linux/uaccess.h
---- linux-2.6.32.48/include/linux/uaccess.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/uaccess.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/uaccess.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/uaccess.h 2011-11-15 19:59:43.000000000 -0500
@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
long ret; \
mm_segment_t old_fs = get_fs(); \
@@ -64862,8 +64871,8 @@ diff -urNp linux-2.6.32.48/include/linux/uaccess.h linux-2.6.32.48/include/linux
#endif /* __LINUX_UACCESS_H__ */
diff -urNp linux-2.6.32.48/include/linux/unaligned/access_ok.h linux-2.6.32.48/include/linux/unaligned/access_ok.h
---- linux-2.6.32.48/include/linux/unaligned/access_ok.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/unaligned/access_ok.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/unaligned/access_ok.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/unaligned/access_ok.h 2011-11-15 19:59:43.000000000 -0500
@@ -6,32 +6,32 @@
static inline u16 get_unaligned_le16(const void *p)
@@ -64904,8 +64913,8 @@ diff -urNp linux-2.6.32.48/include/linux/unaligned/access_ok.h linux-2.6.32.48/i
static inline void put_unaligned_le16(u16 val, void *p)
diff -urNp linux-2.6.32.48/include/linux/vermagic.h linux-2.6.32.48/include/linux/vermagic.h
---- linux-2.6.32.48/include/linux/vermagic.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/linux/vermagic.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/vermagic.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/vermagic.h 2011-11-15 19:59:43.000000000 -0500
@@ -26,9 +26,28 @@
#define MODULE_ARCH_VERMAGIC ""
#endif
@@ -64937,8 +64946,8 @@ diff -urNp linux-2.6.32.48/include/linux/vermagic.h linux-2.6.32.48/include/linu
+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_GRSEC
diff -urNp linux-2.6.32.48/include/linux/vmalloc.h linux-2.6.32.48/include/linux/vmalloc.h
---- linux-2.6.32.48/include/linux/vmalloc.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/vmalloc.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/vmalloc.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/vmalloc.h 2011-11-15 19:59:43.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 */
@@ -65034,8 +65043,8 @@ diff -urNp linux-2.6.32.48/include/linux/vmalloc.h linux-2.6.32.48/include/linux
+
#endif /* _LINUX_VMALLOC_H */
diff -urNp linux-2.6.32.48/include/linux/vmstat.h linux-2.6.32.48/include/linux/vmstat.h
---- linux-2.6.32.48/include/linux/vmstat.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/linux/vmstat.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/linux/vmstat.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/linux/vmstat.h 2011-11-15 19:59:43.000000000 -0500
@@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in
/*
* Zone based page accounting with per cpu differentials.
@@ -65100,8 +65109,8 @@ diff -urNp linux-2.6.32.48/include/linux/vmstat.h linux-2.6.32.48/include/linux/
static inline void __dec_zone_page_state(struct page *page,
diff -urNp linux-2.6.32.48/include/media/saa7146_vv.h linux-2.6.32.48/include/media/saa7146_vv.h
---- linux-2.6.32.48/include/media/saa7146_vv.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/media/saa7146_vv.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/media/saa7146_vv.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/media/saa7146_vv.h 2011-11-15 19:59:43.000000000 -0500
@@ -167,7 +167,7 @@ struct saa7146_ext_vv
int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
@@ -65112,8 +65121,8 @@ diff -urNp linux-2.6.32.48/include/media/saa7146_vv.h linux-2.6.32.48/include/me
const struct v4l2_ioctl_ops *core_ops;
diff -urNp linux-2.6.32.48/include/media/v4l2-dev.h linux-2.6.32.48/include/media/v4l2-dev.h
---- linux-2.6.32.48/include/media/v4l2-dev.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/media/v4l2-dev.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/media/v4l2-dev.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/media/v4l2-dev.h 2011-11-15 19:59:43.000000000 -0500
@@ -34,7 +34,7 @@ struct v4l2_device;
#define V4L2_FL_UNREGISTERED (0)
@@ -65132,8 +65141,8 @@ diff -urNp linux-2.6.32.48/include/media/v4l2-dev.h linux-2.6.32.48/include/medi
/*
* Newer version of video_device, handled by videodev2.c
diff -urNp linux-2.6.32.48/include/media/v4l2-device.h linux-2.6.32.48/include/media/v4l2-device.h
---- linux-2.6.32.48/include/media/v4l2-device.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/media/v4l2-device.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/media/v4l2-device.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/media/v4l2-device.h 2011-11-15 19:59:43.000000000 -0500
@@ -71,7 +71,7 @@ int __must_check v4l2_device_register(st
this function returns 0. If the name ends with a digit (e.g. cx18),
then the name will be set to cx18-0 since cx180 looks really odd. */
@@ -65144,8 +65153,8 @@ diff -urNp linux-2.6.32.48/include/media/v4l2-device.h linux-2.6.32.48/include/m
/* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
Since the parent disappears this ensures that v4l2_dev doesn't have an
diff -urNp linux-2.6.32.48/include/media/v4l2-ioctl.h linux-2.6.32.48/include/media/v4l2-ioctl.h
---- linux-2.6.32.48/include/media/v4l2-ioctl.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/media/v4l2-ioctl.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/media/v4l2-ioctl.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/media/v4l2-ioctl.h 2011-11-15 19:59:43.000000000 -0500
@@ -243,6 +243,7 @@ struct v4l2_ioctl_ops {
long (*vidioc_default) (struct file *file, void *fh,
int cmd, void *arg);
@@ -65155,8 +65164,8 @@ diff -urNp linux-2.6.32.48/include/media/v4l2-ioctl.h linux-2.6.32.48/include/me
/* v4l debugging and diagnostics */
diff -urNp linux-2.6.32.48/include/net/flow.h linux-2.6.32.48/include/net/flow.h
---- linux-2.6.32.48/include/net/flow.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/net/flow.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/net/flow.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/net/flow.h 2011-11-15 19:59:43.000000000 -0500
@@ -92,7 +92,7 @@ typedef int (*flow_resolve_t)(struct net
extern void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family,
u8 dir, flow_resolve_t resolver);
@@ -65167,8 +65176,8 @@ diff -urNp linux-2.6.32.48/include/net/flow.h linux-2.6.32.48/include/net/flow.h
static inline int flow_cache_uli_match(struct flowi *fl1, struct flowi *fl2)
{
diff -urNp linux-2.6.32.48/include/net/inetpeer.h linux-2.6.32.48/include/net/inetpeer.h
---- linux-2.6.32.48/include/net/inetpeer.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/net/inetpeer.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/net/inetpeer.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/net/inetpeer.h 2011-11-15 19:59:43.000000000 -0500
@@ -24,7 +24,7 @@ struct inet_peer
__u32 dtime; /* the time of last use of not
* referenced entries */
@@ -65179,8 +65188,8 @@ diff -urNp linux-2.6.32.48/include/net/inetpeer.h linux-2.6.32.48/include/net/in
unsigned long tcp_ts_stamp;
};
diff -urNp linux-2.6.32.48/include/net/ip_vs.h linux-2.6.32.48/include/net/ip_vs.h
---- linux-2.6.32.48/include/net/ip_vs.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/net/ip_vs.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/net/ip_vs.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/net/ip_vs.h 2011-11-15 19:59:43.000000000 -0500
@@ -365,7 +365,7 @@ struct ip_vs_conn {
struct ip_vs_conn *control; /* Master control connection */
atomic_t n_control; /* Number of controlled ones */
@@ -65200,8 +65209,8 @@ diff -urNp linux-2.6.32.48/include/net/ip_vs.h linux-2.6.32.48/include/net/ip_vs
atomic_t refcnt; /* reference counter */
diff -urNp linux-2.6.32.48/include/net/irda/ircomm_core.h linux-2.6.32.48/include/net/irda/ircomm_core.h
---- linux-2.6.32.48/include/net/irda/ircomm_core.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/net/irda/ircomm_core.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/net/irda/ircomm_core.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/net/irda/ircomm_core.h 2011-11-15 19:59:43.000000000 -0500
@@ -51,7 +51,7 @@ typedef struct {
int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
@@ -65212,8 +65221,8 @@ diff -urNp linux-2.6.32.48/include/net/irda/ircomm_core.h linux-2.6.32.48/includ
struct ircomm_cb {
irda_queue_t queue;
diff -urNp linux-2.6.32.48/include/net/irda/ircomm_tty.h linux-2.6.32.48/include/net/irda/ircomm_tty.h
---- linux-2.6.32.48/include/net/irda/ircomm_tty.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/net/irda/ircomm_tty.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/net/irda/ircomm_tty.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/net/irda/ircomm_tty.h 2011-11-15 19:59:43.000000000 -0500
@@ -35,6 +35,7 @@
#include <linux/termios.h>
#include <linux/timer.h>
@@ -65234,8 +65243,8 @@ diff -urNp linux-2.6.32.48/include/net/irda/ircomm_tty.h linux-2.6.32.48/include
/* Protect concurent access to :
* o self->open_count
diff -urNp linux-2.6.32.48/include/net/iucv/af_iucv.h linux-2.6.32.48/include/net/iucv/af_iucv.h
---- linux-2.6.32.48/include/net/iucv/af_iucv.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/net/iucv/af_iucv.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/net/iucv/af_iucv.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/net/iucv/af_iucv.h 2011-11-15 19:59:43.000000000 -0500
@@ -87,7 +87,7 @@ struct iucv_sock {
struct iucv_sock_list {
struct hlist_head head;
@@ -65246,8 +65255,8 @@ diff -urNp linux-2.6.32.48/include/net/iucv/af_iucv.h linux-2.6.32.48/include/ne
unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
diff -urNp linux-2.6.32.48/include/net/lapb.h linux-2.6.32.48/include/net/lapb.h
---- linux-2.6.32.48/include/net/lapb.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/net/lapb.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/net/lapb.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/net/lapb.h 2011-11-15 19:59:43.000000000 -0500
@@ -95,7 +95,7 @@ struct lapb_cb {
struct sk_buff_head write_queue;
struct sk_buff_head ack_queue;
@@ -65258,8 +65267,8 @@ diff -urNp linux-2.6.32.48/include/net/lapb.h linux-2.6.32.48/include/net/lapb.h
/* FRMR control information */
struct lapb_frame frmr_data;
diff -urNp linux-2.6.32.48/include/net/neighbour.h linux-2.6.32.48/include/net/neighbour.h
---- linux-2.6.32.48/include/net/neighbour.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/net/neighbour.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/net/neighbour.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/net/neighbour.h 2011-11-15 19:59:43.000000000 -0500
@@ -131,7 +131,7 @@ struct neigh_ops
int (*connected_output)(struct sk_buff*);
int (*hh_output)(struct sk_buff*);
@@ -65270,8 +65279,8 @@ diff -urNp linux-2.6.32.48/include/net/neighbour.h linux-2.6.32.48/include/net/n
struct pneigh_entry
{
diff -urNp linux-2.6.32.48/include/net/netlink.h linux-2.6.32.48/include/net/netlink.h
---- linux-2.6.32.48/include/net/netlink.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/net/netlink.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/net/netlink.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/net/netlink.h 2011-11-15 19:59:43.000000000 -0500
@@ -335,7 +335,7 @@ static inline int nlmsg_ok(const struct
{
return (remaining >= (int) sizeof(struct nlmsghdr) &&
@@ -65291,8 +65300,8 @@ diff -urNp linux-2.6.32.48/include/net/netlink.h linux-2.6.32.48/include/net/net
/**
diff -urNp linux-2.6.32.48/include/net/netns/ipv4.h linux-2.6.32.48/include/net/netns/ipv4.h
---- linux-2.6.32.48/include/net/netns/ipv4.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/net/netns/ipv4.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/net/netns/ipv4.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/net/netns/ipv4.h 2011-11-15 19:59:43.000000000 -0500
@@ -54,7 +54,7 @@ struct netns_ipv4 {
int current_rt_cache_rebuild_count;
@@ -65303,8 +65312,8 @@ diff -urNp linux-2.6.32.48/include/net/netns/ipv4.h linux-2.6.32.48/include/net/
#ifdef CONFIG_IP_MROUTE
struct sock *mroute_sk;
diff -urNp linux-2.6.32.48/include/net/sctp/sctp.h linux-2.6.32.48/include/net/sctp/sctp.h
---- linux-2.6.32.48/include/net/sctp/sctp.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/net/sctp/sctp.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/net/sctp/sctp.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/net/sctp/sctp.h 2011-11-15 19:59:43.000000000 -0500
@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
#else /* SCTP_DEBUG */
@@ -65317,8 +65326,8 @@ diff -urNp linux-2.6.32.48/include/net/sctp/sctp.h linux-2.6.32.48/include/net/s
#define SCTP_DISABLE_DEBUG
#define SCTP_ASSERT(expr, str, func)
diff -urNp linux-2.6.32.48/include/net/secure_seq.h linux-2.6.32.48/include/net/secure_seq.h
---- linux-2.6.32.48/include/net/secure_seq.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/net/secure_seq.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/net/secure_seq.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/net/secure_seq.h 2011-11-15 19:59:43.000000000 -0500
@@ -7,14 +7,14 @@ extern __u32 secure_ip_id(__be32 daddr);
extern __u32 secure_ipv6_id(const __be32 daddr[4]);
extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
@@ -65339,8 +65348,8 @@ diff -urNp linux-2.6.32.48/include/net/secure_seq.h linux-2.6.32.48/include/net/
#endif /* _NET_SECURE_SEQ */
diff -urNp linux-2.6.32.48/include/net/sock.h linux-2.6.32.48/include/net/sock.h
---- linux-2.6.32.48/include/net/sock.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/net/sock.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/net/sock.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/net/sock.h 2011-11-15 19:59:43.000000000 -0500
@@ -272,7 +272,7 @@ struct sock {
rwlock_t sk_callback_lock;
int sk_err,
@@ -65360,8 +65369,8 @@ diff -urNp linux-2.6.32.48/include/net/sock.h linux-2.6.32.48/include/net/sock.h
{
}
diff -urNp linux-2.6.32.48/include/net/tcp.h linux-2.6.32.48/include/net/tcp.h
---- linux-2.6.32.48/include/net/tcp.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/net/tcp.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/net/tcp.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/net/tcp.h 2011-11-15 19:59:43.000000000 -0500
@@ -1444,8 +1444,8 @@ enum tcp_seq_states {
struct tcp_seq_afinfo {
char *name;
@@ -65374,8 +65383,8 @@ diff -urNp linux-2.6.32.48/include/net/tcp.h linux-2.6.32.48/include/net/tcp.h
struct tcp_iter_state {
diff -urNp linux-2.6.32.48/include/net/udp.h linux-2.6.32.48/include/net/udp.h
---- linux-2.6.32.48/include/net/udp.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/net/udp.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/net/udp.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/net/udp.h 2011-11-15 19:59:43.000000000 -0500
@@ -187,8 +187,8 @@ struct udp_seq_afinfo {
char *name;
sa_family_t family;
@@ -65388,8 +65397,8 @@ diff -urNp linux-2.6.32.48/include/net/udp.h linux-2.6.32.48/include/net/udp.h
struct udp_iter_state {
diff -urNp linux-2.6.32.48/include/rdma/iw_cm.h linux-2.6.32.48/include/rdma/iw_cm.h
---- linux-2.6.32.48/include/rdma/iw_cm.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/rdma/iw_cm.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/rdma/iw_cm.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/rdma/iw_cm.h 2011-11-15 19:59:43.000000000 -0500
@@ -129,7 +129,7 @@ struct iw_cm_verbs {
int backlog);
@@ -65400,8 +65409,8 @@ diff -urNp linux-2.6.32.48/include/rdma/iw_cm.h linux-2.6.32.48/include/rdma/iw_
/**
* iw_create_cm_id - Create an IW CM identifier.
diff -urNp linux-2.6.32.48/include/scsi/libfc.h linux-2.6.32.48/include/scsi/libfc.h
---- linux-2.6.32.48/include/scsi/libfc.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/scsi/libfc.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/scsi/libfc.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/scsi/libfc.h 2011-11-15 19:59:43.000000000 -0500
@@ -675,6 +675,7 @@ struct libfc_function_template {
*/
void (*disc_stop_final) (struct fc_lport *);
@@ -65420,8 +65429,8 @@ diff -urNp linux-2.6.32.48/include/scsi/libfc.h linux-2.6.32.48/include/scsi/lib
u8 qfull;
enum fc_lport_state state;
diff -urNp linux-2.6.32.48/include/scsi/scsi_device.h linux-2.6.32.48/include/scsi/scsi_device.h
---- linux-2.6.32.48/include/scsi/scsi_device.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/include/scsi/scsi_device.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/scsi/scsi_device.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/scsi/scsi_device.h 2011-11-15 19:59:43.000000000 -0500
@@ -156,9 +156,9 @@ struct scsi_device {
unsigned int max_device_blocked; /* what device_blocked counts down from */
#define SCSI_DEFAULT_DEVICE_BLOCKED 3
@@ -65436,8 +65445,8 @@ diff -urNp linux-2.6.32.48/include/scsi/scsi_device.h linux-2.6.32.48/include/sc
struct device sdev_gendev,
sdev_dev;
diff -urNp linux-2.6.32.48/include/scsi/scsi_transport_fc.h linux-2.6.32.48/include/scsi/scsi_transport_fc.h
---- linux-2.6.32.48/include/scsi/scsi_transport_fc.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/scsi/scsi_transport_fc.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/scsi/scsi_transport_fc.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/scsi/scsi_transport_fc.h 2011-11-15 19:59:43.000000000 -0500
@@ -708,7 +708,7 @@ struct fc_function_template {
unsigned long show_host_system_hostname:1;
@@ -65448,8 +65457,8 @@ diff -urNp linux-2.6.32.48/include/scsi/scsi_transport_fc.h linux-2.6.32.48/incl
/**
diff -urNp linux-2.6.32.48/include/sound/ac97_codec.h linux-2.6.32.48/include/sound/ac97_codec.h
---- linux-2.6.32.48/include/sound/ac97_codec.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/sound/ac97_codec.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/sound/ac97_codec.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/sound/ac97_codec.h 2011-11-15 19:59:43.000000000 -0500
@@ -419,15 +419,15 @@
struct snd_ac97;
@@ -65483,8 +65492,8 @@ diff -urNp linux-2.6.32.48/include/sound/ac97_codec.h linux-2.6.32.48/include/so
void (*private_free) (struct snd_ac97 *ac97);
/* --- */
diff -urNp linux-2.6.32.48/include/sound/ak4xxx-adda.h linux-2.6.32.48/include/sound/ak4xxx-adda.h
---- linux-2.6.32.48/include/sound/ak4xxx-adda.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/sound/ak4xxx-adda.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/sound/ak4xxx-adda.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/sound/ak4xxx-adda.h 2011-11-15 19:59:43.000000000 -0500
@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
unsigned char val);
@@ -65495,8 +65504,8 @@ diff -urNp linux-2.6.32.48/include/sound/ak4xxx-adda.h linux-2.6.32.48/include/s
#define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
diff -urNp linux-2.6.32.48/include/sound/hwdep.h linux-2.6.32.48/include/sound/hwdep.h
---- linux-2.6.32.48/include/sound/hwdep.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/sound/hwdep.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/sound/hwdep.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/sound/hwdep.h 2011-11-15 19:59:43.000000000 -0500
@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
struct snd_hwdep_dsp_status *status);
int (*dsp_load)(struct snd_hwdep *hw,
@@ -65507,8 +65516,8 @@ diff -urNp linux-2.6.32.48/include/sound/hwdep.h linux-2.6.32.48/include/sound/h
struct snd_hwdep {
struct snd_card *card;
diff -urNp linux-2.6.32.48/include/sound/info.h linux-2.6.32.48/include/sound/info.h
---- linux-2.6.32.48/include/sound/info.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/sound/info.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/sound/info.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/sound/info.h 2011-11-15 19:59:43.000000000 -0500
@@ -44,7 +44,7 @@ struct snd_info_entry_text {
struct snd_info_buffer *buffer);
void (*write)(struct snd_info_entry *entry,
@@ -65519,8 +65528,8 @@ diff -urNp linux-2.6.32.48/include/sound/info.h linux-2.6.32.48/include/sound/in
struct snd_info_entry_ops {
int (*open)(struct snd_info_entry *entry,
diff -urNp linux-2.6.32.48/include/sound/pcm.h linux-2.6.32.48/include/sound/pcm.h
---- linux-2.6.32.48/include/sound/pcm.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/sound/pcm.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/sound/pcm.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/sound/pcm.h 2011-11-15 19:59:43.000000000 -0500
@@ -80,6 +80,7 @@ struct snd_pcm_ops {
int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
int (*ack)(struct snd_pcm_substream *substream);
@@ -65530,8 +65539,8 @@ diff -urNp linux-2.6.32.48/include/sound/pcm.h linux-2.6.32.48/include/sound/pcm
/*
*
diff -urNp linux-2.6.32.48/include/sound/sb16_csp.h linux-2.6.32.48/include/sound/sb16_csp.h
---- linux-2.6.32.48/include/sound/sb16_csp.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/sound/sb16_csp.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/sound/sb16_csp.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/sound/sb16_csp.h 2011-11-15 19:59:43.000000000 -0500
@@ -139,7 +139,7 @@ struct snd_sb_csp_ops {
int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
int (*csp_stop) (struct snd_sb_csp * p);
@@ -65542,8 +65551,8 @@ diff -urNp linux-2.6.32.48/include/sound/sb16_csp.h linux-2.6.32.48/include/soun
/*
* CSP private data
diff -urNp linux-2.6.32.48/include/sound/ymfpci.h linux-2.6.32.48/include/sound/ymfpci.h
---- linux-2.6.32.48/include/sound/ymfpci.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/sound/ymfpci.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/sound/ymfpci.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/sound/ymfpci.h 2011-11-15 19:59:43.000000000 -0500
@@ -358,7 +358,7 @@ struct snd_ymfpci {
spinlock_t reg_lock;
spinlock_t voice_lock;
@@ -65554,8 +65563,8 @@ diff -urNp linux-2.6.32.48/include/sound/ymfpci.h linux-2.6.32.48/include/sound/
const struct firmware *dsp_microcode;
const struct firmware *controller_microcode;
diff -urNp linux-2.6.32.48/include/trace/events/irq.h linux-2.6.32.48/include/trace/events/irq.h
---- linux-2.6.32.48/include/trace/events/irq.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/trace/events/irq.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/trace/events/irq.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/trace/events/irq.h 2011-11-15 19:59:43.000000000 -0500
@@ -34,7 +34,7 @@
*/
TRACE_EVENT(irq_handler_entry,
@@ -65593,8 +65602,8 @@ diff -urNp linux-2.6.32.48/include/trace/events/irq.h linux-2.6.32.48/include/tr
TP_ARGS(h, vec),
diff -urNp linux-2.6.32.48/include/video/uvesafb.h linux-2.6.32.48/include/video/uvesafb.h
---- linux-2.6.32.48/include/video/uvesafb.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/include/video/uvesafb.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/include/video/uvesafb.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/include/video/uvesafb.h 2011-11-15 19:59:43.000000000 -0500
@@ -177,6 +177,7 @@ struct uvesafb_par {
u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
u8 pmi_setpal; /* PMI for palette changes */
@@ -65604,8 +65613,8 @@ diff -urNp linux-2.6.32.48/include/video/uvesafb.h linux-2.6.32.48/include/video
void *pmi_pal;
u8 *vbe_state_orig; /*
diff -urNp linux-2.6.32.48/init/do_mounts.c linux-2.6.32.48/init/do_mounts.c
---- linux-2.6.32.48/init/do_mounts.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/init/do_mounts.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/init/do_mounts.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/init/do_mounts.c 2011-11-15 19:59: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)
@@ -65652,8 +65661,8 @@ diff -urNp linux-2.6.32.48/init/do_mounts.c linux-2.6.32.48/init/do_mounts.c
+ sys_chroot((__force char __user *)".");
}
diff -urNp linux-2.6.32.48/init/do_mounts.h linux-2.6.32.48/init/do_mounts.h
---- linux-2.6.32.48/init/do_mounts.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/init/do_mounts.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/init/do_mounts.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/init/do_mounts.h 2011-11-15 19:59:43.000000000 -0500
@@ -15,15 +15,15 @@ extern int root_mountflags;
static inline int create_dev(char *name, dev_t dev)
@@ -65683,8 +65692,8 @@ diff -urNp linux-2.6.32.48/init/do_mounts.h linux-2.6.32.48/init/do_mounts.h
if (!S_ISBLK(stat.st_mode))
return 0;
diff -urNp linux-2.6.32.48/init/do_mounts_initrd.c linux-2.6.32.48/init/do_mounts_initrd.c
---- linux-2.6.32.48/init/do_mounts_initrd.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/init/do_mounts_initrd.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/init/do_mounts_initrd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/init/do_mounts_initrd.c 2011-11-15 19:59:43.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);
@@ -65769,8 +65778,8 @@ diff -urNp linux-2.6.32.48/init/do_mounts_initrd.c linux-2.6.32.48/init/do_mount
return 0;
}
diff -urNp linux-2.6.32.48/init/do_mounts_md.c linux-2.6.32.48/init/do_mounts_md.c
---- linux-2.6.32.48/init/do_mounts_md.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/init/do_mounts_md.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/init/do_mounts_md.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/init/do_mounts_md.c 2011-11-15 19:59:43.000000000 -0500
@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
partitioned ? "_d" : "", minor,
md_setup_args[ent].device_names);
@@ -65799,8 +65808,8 @@ diff -urNp linux-2.6.32.48/init/do_mounts_md.c linux-2.6.32.48/init/do_mounts_md
sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
sys_close(fd);
diff -urNp linux-2.6.32.48/init/initramfs.c linux-2.6.32.48/init/initramfs.c
---- linux-2.6.32.48/init/initramfs.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/init/initramfs.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/init/initramfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/init/initramfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -74,7 +74,7 @@ static void __init free_hash(void)
}
}
@@ -65910,8 +65919,8 @@ diff -urNp linux-2.6.32.48/init/initramfs.c linux-2.6.32.48/init/initramfs.c
next_state = Reset;
return 0;
diff -urNp linux-2.6.32.48/init/Kconfig linux-2.6.32.48/init/Kconfig
---- linux-2.6.32.48/init/Kconfig 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/init/Kconfig 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/init/Kconfig 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/init/Kconfig 2011-11-15 19:59:43.000000000 -0500
@@ -1004,7 +1004,7 @@ config SLUB_DEBUG
config COMPAT_BRK
@@ -65922,8 +65931,8 @@ diff -urNp linux-2.6.32.48/init/Kconfig linux-2.6.32.48/init/Kconfig
Randomizing heap placement makes heap exploits harder, but it
also breaks ancient binaries (including anything libc5 based).
diff -urNp linux-2.6.32.48/init/main.c linux-2.6.32.48/init/main.c
---- linux-2.6.32.48/init/main.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/init/main.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/init/main.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/init/main.c 2011-11-15 19:59:43.000000000 -0500
@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
#ifdef CONFIG_TC
extern void tc_init(void);
@@ -66068,8 +66077,8 @@ diff -urNp linux-2.6.32.48/init/main.c linux-2.6.32.48/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.48/init/noinitramfs.c linux-2.6.32.48/init/noinitramfs.c
---- linux-2.6.32.48/init/noinitramfs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/init/noinitramfs.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/init/noinitramfs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/init/noinitramfs.c 2011-11-15 19:59:43.000000000 -0500
@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
{
int err;
@@ -66089,8 +66098,8 @@ diff -urNp linux-2.6.32.48/init/noinitramfs.c linux-2.6.32.48/init/noinitramfs.c
goto out;
diff -urNp linux-2.6.32.48/ipc/mqueue.c linux-2.6.32.48/ipc/mqueue.c
---- linux-2.6.32.48/ipc/mqueue.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/ipc/mqueue.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/ipc/mqueue.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/ipc/mqueue.c 2011-11-15 19:59:43.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));
@@ -66100,8 +66109,8 @@ diff -urNp linux-2.6.32.48/ipc/mqueue.c linux-2.6.32.48/ipc/mqueue.c
if (u->mq_bytes + mq_bytes < u->mq_bytes ||
u->mq_bytes + mq_bytes >
diff -urNp linux-2.6.32.48/ipc/msg.c linux-2.6.32.48/ipc/msg.c
---- linux-2.6.32.48/ipc/msg.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/ipc/msg.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/ipc/msg.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/ipc/msg.c 2011-11-15 19:59:43.000000000 -0500
@@ -310,18 +310,19 @@ static inline int msg_security(struct ke
return security_msg_queue_associate(msq, msgflg);
}
@@ -66128,8 +66137,8 @@ diff -urNp linux-2.6.32.48/ipc/msg.c linux-2.6.32.48/ipc/msg.c
msg_params.flg = msgflg;
diff -urNp linux-2.6.32.48/ipc/sem.c linux-2.6.32.48/ipc/sem.c
---- linux-2.6.32.48/ipc/sem.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/ipc/sem.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/ipc/sem.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/ipc/sem.c 2011-11-15 19:59:43.000000000 -0500
@@ -309,10 +309,15 @@ static inline int sem_more_checks(struct
return 0;
}
@@ -66177,8 +66186,8 @@ diff -urNp linux-2.6.32.48/ipc/sem.c linux-2.6.32.48/ipc/sem.c
if (nsops < 1 || semid < 0)
diff -urNp linux-2.6.32.48/ipc/shm.c linux-2.6.32.48/ipc/shm.c
---- linux-2.6.32.48/ipc/shm.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/ipc/shm.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/ipc/shm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/ipc/shm.c 2011-11-15 19:59:43.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
@@ -66257,8 +66266,8 @@ diff -urNp linux-2.6.32.48/ipc/shm.c linux-2.6.32.48/ipc/shm.c
shm_unlock(shp);
diff -urNp linux-2.6.32.48/kernel/acct.c linux-2.6.32.48/kernel/acct.c
---- linux-2.6.32.48/kernel/acct.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/acct.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/acct.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/acct.c 2011-11-15 19:59:43.000000000 -0500
@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
*/
flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -66269,8 +66278,8 @@ diff -urNp linux-2.6.32.48/kernel/acct.c linux-2.6.32.48/kernel/acct.c
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
set_fs(fs);
diff -urNp linux-2.6.32.48/kernel/audit.c linux-2.6.32.48/kernel/audit.c
---- linux-2.6.32.48/kernel/audit.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/audit.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/audit.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/audit.c 2011-11-15 19:59:43.000000000 -0500
@@ -110,7 +110,7 @@ u32 audit_sig_sid = 0;
3) suppressed due to audit_rate_limit
4) suppressed due to audit_backlog_limit
@@ -66321,8 +66330,8 @@ diff -urNp linux-2.6.32.48/kernel/audit.c linux-2.6.32.48/kernel/audit.c
}
case AUDIT_TTY_SET: {
diff -urNp linux-2.6.32.48/kernel/auditsc.c linux-2.6.32.48/kernel/auditsc.c
---- linux-2.6.32.48/kernel/auditsc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/auditsc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/auditsc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/auditsc.c 2011-11-15 19:59:43.000000000 -0500
@@ -2113,7 +2113,7 @@ int auditsc_get_stamp(struct audit_conte
}
@@ -66342,8 +66351,8 @@ diff -urNp linux-2.6.32.48/kernel/auditsc.c linux-2.6.32.48/kernel/auditsc.c
if (context && context->in_syscall) {
diff -urNp linux-2.6.32.48/kernel/capability.c linux-2.6.32.48/kernel/capability.c
---- linux-2.6.32.48/kernel/capability.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/capability.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/capability.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/capability.c 2011-11-15 19:59:43.000000000 -0500
@@ -305,10 +305,26 @@ int capable(int cap)
BUG();
}
@@ -66373,8 +66382,8 @@ diff -urNp linux-2.6.32.48/kernel/capability.c linux-2.6.32.48/kernel/capability
EXPORT_SYMBOL(capable);
+EXPORT_SYMBOL(capable_nolog);
diff -urNp linux-2.6.32.48/kernel/cgroup.c linux-2.6.32.48/kernel/cgroup.c
---- linux-2.6.32.48/kernel/cgroup.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/cgroup.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/cgroup.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/cgroup.c 2011-11-15 19:59:43.000000000 -0500
@@ -536,6 +536,8 @@ static struct css_set *find_css_set(
struct hlist_head *hhead;
struct cg_cgroup_link *link;
@@ -66385,8 +66394,8 @@ diff -urNp linux-2.6.32.48/kernel/cgroup.c linux-2.6.32.48/kernel/cgroup.c
* the desired set */
read_lock(&css_set_lock);
diff -urNp linux-2.6.32.48/kernel/compat.c linux-2.6.32.48/kernel/compat.c
---- linux-2.6.32.48/kernel/compat.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/compat.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/compat.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/compat.c 2011-11-15 19:59:43.000000000 -0500
@@ -108,7 +108,7 @@ static long compat_nanosleep_restart(str
mm_segment_t oldfs;
long ret;
@@ -66536,8 +66545,8 @@ diff -urNp linux-2.6.32.48/kernel/compat.c linux-2.6.32.48/kernel/compat.c
if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
diff -urNp linux-2.6.32.48/kernel/configs.c linux-2.6.32.48/kernel/configs.c
---- linux-2.6.32.48/kernel/configs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/configs.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/configs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/configs.c 2011-11-15 19:59:43.000000000 -0500
@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
struct proc_dir_entry *entry;
@@ -66559,8 +66568,8 @@ diff -urNp linux-2.6.32.48/kernel/configs.c linux-2.6.32.48/kernel/configs.c
return -ENOMEM;
diff -urNp linux-2.6.32.48/kernel/cpu.c linux-2.6.32.48/kernel/cpu.c
---- linux-2.6.32.48/kernel/cpu.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/cpu.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/cpu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/cpu.c 2011-11-15 19:59:43.000000000 -0500
@@ -19,7 +19,7 @@
/* Serializes the updates to cpu_online_mask, cpu_present_mask */
static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -66571,8 +66580,8 @@ diff -urNp linux-2.6.32.48/kernel/cpu.c linux-2.6.32.48/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.48/kernel/cred.c linux-2.6.32.48/kernel/cred.c
---- linux-2.6.32.48/kernel/cred.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/cred.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/cred.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/cred.c 2011-11-15 19:59:43.000000000 -0500
@@ -160,6 +160,8 @@ static void put_cred_rcu(struct rcu_head
*/
void __put_cred(struct cred *cred)
@@ -66722,8 +66731,8 @@ diff -urNp linux-2.6.32.48/kernel/cred.c linux-2.6.32.48/kernel/cred.c
if (ret < 0)
return ret;
diff -urNp linux-2.6.32.48/kernel/exit.c linux-2.6.32.48/kernel/exit.c
---- linux-2.6.32.48/kernel/exit.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/exit.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/exit.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/exit.c 2011-11-15 19:59:43.000000000 -0500
@@ -55,6 +55,10 @@
#include <asm/pgtable.h>
#include <asm/mmu_context.h>
@@ -66855,8 +66864,8 @@ diff -urNp linux-2.6.32.48/kernel/exit.c linux-2.6.32.48/kernel/exit.c
get_task_struct(p);
read_unlock(&tasklist_lock);
diff -urNp linux-2.6.32.48/kernel/fork.c linux-2.6.32.48/kernel/fork.c
---- linux-2.6.32.48/kernel/fork.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/fork.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/fork.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/fork.c 2011-11-15 19:59:43.000000000 -0500
@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
*stackend = STACK_END_MAGIC; /* for overflow detection */
@@ -66999,8 +67008,8 @@ diff -urNp linux-2.6.32.48/kernel/fork.c linux-2.6.32.48/kernel/fork.c
else
new_fs = fs;
diff -urNp linux-2.6.32.48/kernel/futex.c linux-2.6.32.48/kernel/futex.c
---- linux-2.6.32.48/kernel/futex.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/futex.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/futex.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/futex.c 2011-11-15 19:59:43.000000000 -0500
@@ -54,6 +54,7 @@
#include <linux/mount.h>
#include <linux/pagemap.h>
@@ -67104,8 +67113,8 @@ diff -urNp linux-2.6.32.48/kernel/futex.c linux-2.6.32.48/kernel/futex.c
futex_cmpxchg_enabled = 1;
diff -urNp linux-2.6.32.48/kernel/futex_compat.c linux-2.6.32.48/kernel/futex_compat.c
---- linux-2.6.32.48/kernel/futex_compat.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/futex_compat.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/futex_compat.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/futex_compat.c 2011-11-15 19:59:43.000000000 -0500
@@ -10,6 +10,7 @@
#include <linux/compat.h>
#include <linux/nsproxy.h>
@@ -67144,8 +67153,8 @@ diff -urNp linux-2.6.32.48/kernel/futex_compat.c linux-2.6.32.48/kernel/futex_co
read_unlock(&tasklist_lock);
}
diff -urNp linux-2.6.32.48/kernel/gcov/base.c linux-2.6.32.48/kernel/gcov/base.c
---- linux-2.6.32.48/kernel/gcov/base.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/gcov/base.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/gcov/base.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/gcov/base.c 2011-11-15 19:59:43.000000000 -0500
@@ -102,11 +102,6 @@ void gcov_enable_events(void)
}
@@ -67168,8 +67177,8 @@ diff -urNp linux-2.6.32.48/kernel/gcov/base.c linux-2.6.32.48/kernel/gcov/base.c
prev->next = info->next;
else
diff -urNp linux-2.6.32.48/kernel/hrtimer.c linux-2.6.32.48/kernel/hrtimer.c
---- linux-2.6.32.48/kernel/hrtimer.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/hrtimer.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/hrtimer.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/hrtimer.c 2011-11-15 19:59:43.000000000 -0500
@@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
local_irq_restore(flags);
}
@@ -67180,8 +67189,8 @@ diff -urNp linux-2.6.32.48/kernel/hrtimer.c linux-2.6.32.48/kernel/hrtimer.c
hrtimer_peek_ahead_timers();
}
diff -urNp linux-2.6.32.48/kernel/kallsyms.c linux-2.6.32.48/kernel/kallsyms.c
---- linux-2.6.32.48/kernel/kallsyms.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/kallsyms.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/kallsyms.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/kallsyms.c 2011-11-15 19:59:43.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)
@@ -67285,8 +67294,8 @@ diff -urNp linux-2.6.32.48/kernel/kallsyms.c linux-2.6.32.48/kernel/kallsyms.c
return -ENOMEM;
reset_iter(iter, 0);
diff -urNp linux-2.6.32.48/kernel/kexec.c linux-2.6.32.48/kernel/kexec.c
---- linux-2.6.32.48/kernel/kexec.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/kexec.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/kexec.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/kexec.c 2011-11-15 19:59:43.000000000 -0500
@@ -1028,7 +1028,8 @@ asmlinkage long compat_sys_kexec_load(un
unsigned long flags)
{
@@ -67298,8 +67307,8 @@ diff -urNp linux-2.6.32.48/kernel/kexec.c linux-2.6.32.48/kernel/kexec.c
/* Don't allow clients that don't understand the native
diff -urNp linux-2.6.32.48/kernel/kgdb.c linux-2.6.32.48/kernel/kgdb.c
---- linux-2.6.32.48/kernel/kgdb.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/kgdb.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/kgdb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/kgdb.c 2011-11-15 19:59:43.000000000 -0500
@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
/* Guard for recursive entry */
static int exception_level;
@@ -67380,8 +67389,8 @@ diff -urNp linux-2.6.32.48/kernel/kgdb.c linux-2.6.32.48/kernel/kgdb.c
EXPORT_SYMBOL_GPL(kgdb_breakpoint);
diff -urNp linux-2.6.32.48/kernel/kmod.c linux-2.6.32.48/kernel/kmod.c
---- linux-2.6.32.48/kernel/kmod.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/kmod.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/kmod.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/kmod.c 2011-11-15 19:59:43.000000000 -0500
@@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb
* If module auto-loading support is disabled then this function
* becomes a no-operation.
@@ -67485,8 +67494,8 @@ diff -urNp linux-2.6.32.48/kernel/kmod.c linux-2.6.32.48/kernel/kmod.c
/*
* If ret is 0, either ____call_usermodehelper failed and the
diff -urNp linux-2.6.32.48/kernel/kprobes.c linux-2.6.32.48/kernel/kprobes.c
---- linux-2.6.32.48/kernel/kprobes.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/kprobes.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/kprobes.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/kprobes.c 2011-11-15 19:59:43.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.
@@ -67524,8 +67533,8 @@ diff -urNp linux-2.6.32.48/kernel/kprobes.c linux-2.6.32.48/kernel/kprobes.c
head = &kprobe_table[i];
preempt_disable();
diff -urNp linux-2.6.32.48/kernel/lockdep.c linux-2.6.32.48/kernel/lockdep.c
---- linux-2.6.32.48/kernel/lockdep.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/lockdep.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/lockdep.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/lockdep.c 2011-11-15 19:59:43.000000000 -0500
@@ -421,20 +421,20 @@ static struct stack_trace lockdep_init_t
/*
* Various lockdep statistics:
@@ -67600,8 +67609,8 @@ diff -urNp linux-2.6.32.48/kernel/lockdep.c linux-2.6.32.48/kernel/lockdep.c
printk("\nacquire class [%p] %s", class->key, class->name);
if (class->name_version > 1)
diff -urNp linux-2.6.32.48/kernel/lockdep_internals.h linux-2.6.32.48/kernel/lockdep_internals.h
---- linux-2.6.32.48/kernel/lockdep_internals.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/lockdep_internals.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/lockdep_internals.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/lockdep_internals.h 2011-11-15 19:59:43.000000000 -0500
@@ -113,26 +113,26 @@ lockdep_count_backward_deps(struct lock_
/*
* Various lockdep statistics:
@@ -67650,8 +67659,8 @@ diff -urNp linux-2.6.32.48/kernel/lockdep_internals.h linux-2.6.32.48/kernel/loc
# define debug_atomic_inc(ptr) do { } while (0)
# define debug_atomic_dec(ptr) do { } while (0)
diff -urNp linux-2.6.32.48/kernel/lockdep_proc.c linux-2.6.32.48/kernel/lockdep_proc.c
---- linux-2.6.32.48/kernel/lockdep_proc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/lockdep_proc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/lockdep_proc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/lockdep_proc.c 2011-11-15 19:59:43.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)
@@ -67662,8 +67671,8 @@ diff -urNp linux-2.6.32.48/kernel/lockdep_proc.c linux-2.6.32.48/kernel/lockdep_
if (!name) {
diff -urNp linux-2.6.32.48/kernel/module.c linux-2.6.32.48/kernel/module.c
---- linux-2.6.32.48/kernel/module.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/module.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/module.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/module.c 2011-11-15 19:59:43.000000000 -0500
@@ -55,6 +55,7 @@
#include <linux/async.h>
#include <linux/percpu.h>
@@ -68305,8 +68314,8 @@ diff -urNp linux-2.6.32.48/kernel/module.c linux-2.6.32.48/kernel/module.c
}
return mod;
diff -urNp linux-2.6.32.48/kernel/mutex.c linux-2.6.32.48/kernel/mutex.c
---- linux-2.6.32.48/kernel/mutex.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/mutex.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/mutex.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/mutex.c 2011-11-15 19:59:43.000000000 -0500
@@ -169,7 +169,7 @@ __mutex_lock_common(struct mutex *lock,
*/
@@ -68345,8 +68354,8 @@ diff -urNp linux-2.6.32.48/kernel/mutex.c linux-2.6.32.48/kernel/mutex.c
/* set it to 0 if there are no waiters left: */
diff -urNp linux-2.6.32.48/kernel/mutex-debug.c linux-2.6.32.48/kernel/mutex-debug.c
---- linux-2.6.32.48/kernel/mutex-debug.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/mutex-debug.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/mutex-debug.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/mutex-debug.c 2011-11-15 19:59:43.000000000 -0500
@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
}
@@ -68385,8 +68394,8 @@ diff -urNp linux-2.6.32.48/kernel/mutex-debug.c linux-2.6.32.48/kernel/mutex-deb
mutex_clear_owner(lock);
}
diff -urNp linux-2.6.32.48/kernel/mutex-debug.h linux-2.6.32.48/kernel/mutex-debug.h
---- linux-2.6.32.48/kernel/mutex-debug.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/mutex-debug.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/mutex-debug.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/mutex-debug.h 2011-11-15 19:59:43.000000000 -0500
@@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(stru
extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
extern void debug_mutex_add_waiter(struct mutex *lock,
@@ -68408,8 +68417,8 @@ diff -urNp linux-2.6.32.48/kernel/mutex-debug.h linux-2.6.32.48/kernel/mutex-deb
static inline void mutex_clear_owner(struct mutex *lock)
diff -urNp linux-2.6.32.48/kernel/mutex.h linux-2.6.32.48/kernel/mutex.h
---- linux-2.6.32.48/kernel/mutex.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/mutex.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/mutex.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/mutex.h 2011-11-15 19:59:43.000000000 -0500
@@ -19,7 +19,7 @@
#ifdef CONFIG_SMP
static inline void mutex_set_owner(struct mutex *lock)
@@ -68420,8 +68429,8 @@ diff -urNp linux-2.6.32.48/kernel/mutex.h linux-2.6.32.48/kernel/mutex.h
static inline void mutex_clear_owner(struct mutex *lock)
diff -urNp linux-2.6.32.48/kernel/panic.c linux-2.6.32.48/kernel/panic.c
---- linux-2.6.32.48/kernel/panic.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/panic.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/panic.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/panic.c 2011-11-15 19:59:43.000000000 -0500
@@ -352,7 +352,7 @@ static void warn_slowpath_common(const c
const char *board;
@@ -68442,8 +68451,8 @@ diff -urNp linux-2.6.32.48/kernel/panic.c linux-2.6.32.48/kernel/panic.c
}
EXPORT_SYMBOL(__stack_chk_fail);
diff -urNp linux-2.6.32.48/kernel/params.c linux-2.6.32.48/kernel/params.c
---- linux-2.6.32.48/kernel/params.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/params.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/params.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/params.c 2011-11-15 19:59:43.000000000 -0500
@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
return ret;
}
@@ -68463,8 +68472,8 @@ diff -urNp linux-2.6.32.48/kernel/params.c linux-2.6.32.48/kernel/params.c
};
diff -urNp linux-2.6.32.48/kernel/perf_event.c linux-2.6.32.48/kernel/perf_event.c
---- linux-2.6.32.48/kernel/perf_event.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/perf_event.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/perf_event.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/perf_event.c 2011-11-15 19:59:43.000000000 -0500
@@ -77,7 +77,7 @@ int sysctl_perf_event_mlock __read_mostl
*/
int sysctl_perf_event_sample_rate __read_mostly = 100000;
@@ -68686,8 +68695,8 @@ diff -urNp linux-2.6.32.48/kernel/perf_event.c linux-2.6.32.48/kernel/perf_event
/*
diff -urNp linux-2.6.32.48/kernel/pid.c linux-2.6.32.48/kernel/pid.c
---- linux-2.6.32.48/kernel/pid.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/pid.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/pid.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/pid.c 2011-11-15 19:59:43.000000000 -0500
@@ -33,6 +33,7 @@
#include <linux/rculist.h>
#include <linux/bootmem.h>
@@ -68734,8 +68743,8 @@ diff -urNp linux-2.6.32.48/kernel/pid.c linux-2.6.32.48/kernel/pid.c
{
struct pid *pid;
diff -urNp linux-2.6.32.48/kernel/posix-cpu-timers.c linux-2.6.32.48/kernel/posix-cpu-timers.c
---- linux-2.6.32.48/kernel/posix-cpu-timers.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/posix-cpu-timers.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/posix-cpu-timers.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/posix-cpu-timers.c 2011-11-15 19:59:43.000000000 -0500
@@ -6,6 +6,7 @@
#include <linux/posix-timers.h>
#include <linux/errno.h>
@@ -68763,8 +68772,8 @@ diff -urNp linux-2.6.32.48/kernel/posix-cpu-timers.c linux-2.6.32.48/kernel/posi
.clock_get = thread_cpu_clock_get,
.clock_set = do_posix_clock_nosettime,
diff -urNp linux-2.6.32.48/kernel/posix-timers.c linux-2.6.32.48/kernel/posix-timers.c
---- linux-2.6.32.48/kernel/posix-timers.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/posix-timers.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/posix-timers.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/posix-timers.c 2011-11-15 19:59:43.000000000 -0500
@@ -42,6 +42,7 @@
#include <linux/compiler.h>
#include <linux/idr.h>
@@ -68884,8 +68893,8 @@ diff -urNp linux-2.6.32.48/kernel/posix-timers.c linux-2.6.32.48/kernel/posix-ti
}
diff -urNp linux-2.6.32.48/kernel/power/hibernate.c linux-2.6.32.48/kernel/power/hibernate.c
---- linux-2.6.32.48/kernel/power/hibernate.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/power/hibernate.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/power/hibernate.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/power/hibernate.c 2011-11-15 19:59:43.000000000 -0500
@@ -48,14 +48,14 @@ enum {
static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -68904,8 +68913,8 @@ diff -urNp linux-2.6.32.48/kernel/power/hibernate.c linux-2.6.32.48/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.48/kernel/power/poweroff.c linux-2.6.32.48/kernel/power/poweroff.c
---- linux-2.6.32.48/kernel/power/poweroff.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/power/poweroff.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/power/poweroff.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/power/poweroff.c 2011-11-15 19:59:43.000000000 -0500
@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
.enable_mask = SYSRQ_ENABLE_BOOT,
};
@@ -68916,8 +68925,8 @@ diff -urNp linux-2.6.32.48/kernel/power/poweroff.c linux-2.6.32.48/kernel/power/
register_sysrq_key('o', &sysrq_poweroff_op);
return 0;
diff -urNp linux-2.6.32.48/kernel/power/process.c linux-2.6.32.48/kernel/power/process.c
---- linux-2.6.32.48/kernel/power/process.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/power/process.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/power/process.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/power/process.c 2011-11-15 19:59:43.000000000 -0500
@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
struct timeval start, end;
u64 elapsed_csecs64;
@@ -68958,8 +68967,8 @@ diff -urNp linux-2.6.32.48/kernel/power/process.c linux-2.6.32.48/kernel/power/p
do_gettimeofday(&end);
elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
diff -urNp linux-2.6.32.48/kernel/power/suspend.c linux-2.6.32.48/kernel/power/suspend.c
---- linux-2.6.32.48/kernel/power/suspend.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/power/suspend.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/power/suspend.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/power/suspend.c 2011-11-15 19:59:43.000000000 -0500
@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
[PM_SUSPEND_MEM] = "mem",
};
@@ -68977,8 +68986,8 @@ diff -urNp linux-2.6.32.48/kernel/power/suspend.c linux-2.6.32.48/kernel/power/s
mutex_lock(&pm_mutex);
suspend_ops = ops;
diff -urNp linux-2.6.32.48/kernel/printk.c linux-2.6.32.48/kernel/printk.c
---- linux-2.6.32.48/kernel/printk.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/printk.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/printk.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/printk.c 2011-11-15 19:59:43.000000000 -0500
@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
char c;
int error = 0;
@@ -68992,8 +69001,8 @@ diff -urNp linux-2.6.32.48/kernel/printk.c linux-2.6.32.48/kernel/printk.c
if (error)
return error;
diff -urNp linux-2.6.32.48/kernel/profile.c linux-2.6.32.48/kernel/profile.c
---- linux-2.6.32.48/kernel/profile.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/profile.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/profile.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/profile.c 2011-11-15 19:59:43.000000000 -0500
@@ -39,7 +39,7 @@ struct profile_hit {
/* Oprofile timer tick hook */
static int (*timer_hook)(struct pt_regs *) __read_mostly;
@@ -69052,8 +69061,8 @@ diff -urNp linux-2.6.32.48/kernel/profile.c linux-2.6.32.48/kernel/profile.c
}
diff -urNp linux-2.6.32.48/kernel/ptrace.c linux-2.6.32.48/kernel/ptrace.c
---- linux-2.6.32.48/kernel/ptrace.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/ptrace.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/ptrace.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/ptrace.c 2011-11-15 19:59:43.000000000 -0500
@@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_stru
return ret;
}
@@ -69236,8 +69245,8 @@ diff -urNp linux-2.6.32.48/kernel/ptrace.c linux-2.6.32.48/kernel/ptrace.c
}
diff -urNp linux-2.6.32.48/kernel/rcutorture.c linux-2.6.32.48/kernel/rcutorture.c
---- linux-2.6.32.48/kernel/rcutorture.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/rcutorture.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/rcutorture.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/rcutorture.c 2011-11-15 19:59:43.000000000 -0500
@@ -118,12 +118,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_
{ 0 };
static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
@@ -69388,8 +69397,8 @@ diff -urNp linux-2.6.32.48/kernel/rcutorture.c linux-2.6.32.48/kernel/rcutorture
for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
per_cpu(rcu_torture_count, cpu)[i] = 0;
diff -urNp linux-2.6.32.48/kernel/rcutree.c linux-2.6.32.48/kernel/rcutree.c
---- linux-2.6.32.48/kernel/rcutree.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/rcutree.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/rcutree.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/rcutree.c 2011-11-15 19:59:43.000000000 -0500
@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
/*
* Do softirq processing for the current CPU.
@@ -69400,8 +69409,8 @@ diff -urNp linux-2.6.32.48/kernel/rcutree.c linux-2.6.32.48/kernel/rcutree.c
/*
* Memory references from any prior RCU read-side critical sections
diff -urNp linux-2.6.32.48/kernel/rcutree_plugin.h linux-2.6.32.48/kernel/rcutree_plugin.h
---- linux-2.6.32.48/kernel/rcutree_plugin.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/rcutree_plugin.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/rcutree_plugin.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/rcutree_plugin.h 2011-11-15 19:59:43.000000000 -0500
@@ -145,7 +145,7 @@ static void rcu_preempt_note_context_swi
*/
void __rcu_read_lock(void)
@@ -69421,8 +69430,8 @@ diff -urNp linux-2.6.32.48/kernel/rcutree_plugin.h linux-2.6.32.48/kernel/rcutre
rcu_read_unlock_special(t);
}
diff -urNp linux-2.6.32.48/kernel/relay.c linux-2.6.32.48/kernel/relay.c
---- linux-2.6.32.48/kernel/relay.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/relay.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/relay.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/relay.c 2011-11-15 19:59:43.000000000 -0500
@@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct fi
unsigned int flags,
int *nonpad_ret)
@@ -69443,8 +69452,8 @@ diff -urNp linux-2.6.32.48/kernel/relay.c linux-2.6.32.48/kernel/relay.c
if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
return 0;
diff -urNp linux-2.6.32.48/kernel/resource.c linux-2.6.32.48/kernel/resource.c
---- linux-2.6.32.48/kernel/resource.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/resource.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/resource.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/resource.c 2011-11-15 19:59:43.000000000 -0500
@@ -132,8 +132,18 @@ static const struct file_operations proc
static int __init ioresources_init(void)
@@ -69465,8 +69474,8 @@ diff -urNp linux-2.6.32.48/kernel/resource.c linux-2.6.32.48/kernel/resource.c
}
__initcall(ioresources_init);
diff -urNp linux-2.6.32.48/kernel/rtmutex.c linux-2.6.32.48/kernel/rtmutex.c
---- linux-2.6.32.48/kernel/rtmutex.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/rtmutex.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/rtmutex.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/rtmutex.c 2011-11-15 19:59:43.000000000 -0500
@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
*/
spin_lock_irqsave(&pendowner->pi_lock, flags);
@@ -69477,8 +69486,8 @@ diff -urNp linux-2.6.32.48/kernel/rtmutex.c linux-2.6.32.48/kernel/rtmutex.c
WARN_ON(pendowner->pi_blocked_on->lock != lock);
diff -urNp linux-2.6.32.48/kernel/rtmutex-tester.c linux-2.6.32.48/kernel/rtmutex-tester.c
---- linux-2.6.32.48/kernel/rtmutex-tester.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/rtmutex-tester.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/rtmutex-tester.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/rtmutex-tester.c 2011-11-15 19:59:43.000000000 -0500
@@ -21,7 +21,7 @@
#define MAX_RT_TEST_MUTEXES 8
@@ -69570,8 +69579,8 @@ diff -urNp linux-2.6.32.48/kernel/rtmutex-tester.c linux-2.6.32.48/kernel/rtmute
case RTTEST_LOCKBKL:
diff -urNp linux-2.6.32.48/kernel/sched.c linux-2.6.32.48/kernel/sched.c
---- linux-2.6.32.48/kernel/sched.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/sched.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/sched.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/sched.c 2011-11-15 19:59:43.000000000 -0500
@@ -2764,9 +2764,10 @@ void wake_up_new_task(struct task_struct
{
unsigned long flags;
@@ -69662,8 +69671,8 @@ diff -urNp linux-2.6.32.48/kernel/sched.c linux-2.6.32.48/kernel/sched.c
if (cpu != group_first_cpu(sd->groups))
return;
diff -urNp linux-2.6.32.48/kernel/signal.c linux-2.6.32.48/kernel/signal.c
---- linux-2.6.32.48/kernel/signal.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/signal.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/signal.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/signal.c 2011-11-15 19:59:43.000000000 -0500
@@ -41,12 +41,12 @@
static struct kmem_cache *sigqueue_cachep;
@@ -69797,8 +69806,8 @@ diff -urNp linux-2.6.32.48/kernel/signal.c linux-2.6.32.48/kernel/signal.c
error = check_kill_permission(sig, info, p);
/*
diff -urNp linux-2.6.32.48/kernel/smp.c linux-2.6.32.48/kernel/smp.c
---- linux-2.6.32.48/kernel/smp.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/smp.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/smp.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/smp.c 2011-11-15 19:59:43.000000000 -0500
@@ -522,22 +522,22 @@ int smp_call_function(void (*func)(void
}
EXPORT_SYMBOL(smp_call_function);
@@ -69827,8 +69836,8 @@ diff -urNp linux-2.6.32.48/kernel/smp.c linux-2.6.32.48/kernel/smp.c
spin_unlock_irq(&call_function.lock);
}
diff -urNp linux-2.6.32.48/kernel/softirq.c linux-2.6.32.48/kernel/softirq.c
---- linux-2.6.32.48/kernel/softirq.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/softirq.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/softirq.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/softirq.c 2011-11-15 19:59:43.000000000 -0500
@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -69889,8 +69898,8 @@ diff -urNp linux-2.6.32.48/kernel/softirq.c linux-2.6.32.48/kernel/softirq.c
struct tasklet_struct *list;
diff -urNp linux-2.6.32.48/kernel/sys.c linux-2.6.32.48/kernel/sys.c
---- linux-2.6.32.48/kernel/sys.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/sys.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/sys.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/sys.c 2011-11-15 19:59:43.000000000 -0500
@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
error = -EACCES;
goto out;
@@ -70051,8 +70060,8 @@ diff -urNp linux-2.6.32.48/kernel/sys.c linux-2.6.32.48/kernel/sys.c
break;
}
diff -urNp linux-2.6.32.48/kernel/sysctl.c linux-2.6.32.48/kernel/sysctl.c
---- linux-2.6.32.48/kernel/sysctl.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/sysctl.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/sysctl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/sysctl.c 2011-11-15 19:59:43.000000000 -0500
@@ -63,6 +63,13 @@
static int deprecated_sysctl_warning(struct __sysctl_args *args);
@@ -70285,8 +70294,8 @@ diff -urNp linux-2.6.32.48/kernel/sysctl.c linux-2.6.32.48/kernel/sysctl.c
EXPORT_SYMBOL(sysctl_data);
EXPORT_SYMBOL(unregister_sysctl_table);
diff -urNp linux-2.6.32.48/kernel/sysctl_check.c linux-2.6.32.48/kernel/sysctl_check.c
---- linux-2.6.32.48/kernel/sysctl_check.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/sysctl_check.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/sysctl_check.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/sysctl_check.c 2011-11-15 19:59:43.000000000 -0500
@@ -1489,10 +1489,12 @@ int sysctl_check_table(struct nsproxy *n
} else {
if ((table->strategy == sysctl_data) ||
@@ -70301,8 +70310,8 @@ diff -urNp linux-2.6.32.48/kernel/sysctl_check.c linux-2.6.32.48/kernel/sysctl_c
(table->proc_handler == proc_dointvec_minmax) ||
(table->proc_handler == proc_dointvec_jiffies) ||
diff -urNp linux-2.6.32.48/kernel/taskstats.c linux-2.6.32.48/kernel/taskstats.c
---- linux-2.6.32.48/kernel/taskstats.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/taskstats.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/taskstats.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/taskstats.c 2011-11-15 19:59:43.000000000 -0500
@@ -26,9 +26,12 @@
#include <linux/cgroup.h>
#include <linux/fs.h>
@@ -70327,8 +70336,8 @@ diff -urNp linux-2.6.32.48/kernel/taskstats.c linux-2.6.32.48/kernel/taskstats.c
return -ENOMEM;
diff -urNp linux-2.6.32.48/kernel/time/tick-broadcast.c linux-2.6.32.48/kernel/time/tick-broadcast.c
---- linux-2.6.32.48/kernel/time/tick-broadcast.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/time/tick-broadcast.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/time/tick-broadcast.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/time/tick-broadcast.c 2011-11-15 19:59:43.000000000 -0500
@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
* then clear the broadcast bit.
*/
@@ -70339,8 +70348,8 @@ diff -urNp linux-2.6.32.48/kernel/time/tick-broadcast.c linux-2.6.32.48/kernel/t
cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
tick_broadcast_clear_oneshot(cpu);
diff -urNp linux-2.6.32.48/kernel/time/timekeeping.c linux-2.6.32.48/kernel/time/timekeeping.c
---- linux-2.6.32.48/kernel/time/timekeeping.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/time/timekeeping.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/time/timekeeping.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/time/timekeeping.c 2011-11-15 19:59:43.000000000 -0500
@@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/mm.h>
@@ -70368,8 +70377,8 @@ diff -urNp linux-2.6.32.48/kernel/time/timekeeping.c linux-2.6.32.48/kernel/time
timekeeping_forward_now();
diff -urNp linux-2.6.32.48/kernel/time/timer_list.c linux-2.6.32.48/kernel/time/timer_list.c
---- linux-2.6.32.48/kernel/time/timer_list.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/time/timer_list.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/time/timer_list.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/time/timer_list.c 2011-11-15 19:59:43.000000000 -0500
@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
static void print_name_offset(struct seq_file *m, void *sym)
@@ -70412,8 +70421,8 @@ diff -urNp linux-2.6.32.48/kernel/time/timer_list.c linux-2.6.32.48/kernel/time/
return -ENOMEM;
return 0;
diff -urNp linux-2.6.32.48/kernel/time/timer_stats.c linux-2.6.32.48/kernel/time/timer_stats.c
---- linux-2.6.32.48/kernel/time/timer_stats.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/time/timer_stats.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/time/timer_stats.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/time/timer_stats.c 2011-11-15 19:59:43.000000000 -0500
@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
static unsigned long nr_entries;
static struct entry entries[MAX_ENTRIES];
@@ -70483,8 +70492,8 @@ diff -urNp linux-2.6.32.48/kernel/time/timer_stats.c linux-2.6.32.48/kernel/time
return -ENOMEM;
return 0;
diff -urNp linux-2.6.32.48/kernel/time.c linux-2.6.32.48/kernel/time.c
---- linux-2.6.32.48/kernel/time.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/time.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/time.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/time.c 2011-11-15 19:59:43.000000000 -0500
@@ -165,6 +165,11 @@ int do_sys_settimeofday(struct timespec
return error;
@@ -70516,8 +70525,8 @@ diff -urNp linux-2.6.32.48/kernel/time.c linux-2.6.32.48/kernel/time.c
#if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
return (USEC_PER_SEC / HZ) * j;
diff -urNp linux-2.6.32.48/kernel/timer.c linux-2.6.32.48/kernel/timer.c
---- linux-2.6.32.48/kernel/timer.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/timer.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/timer.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/timer.c 2011-11-15 19:59:43.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.
@@ -70528,8 +70537,8 @@ diff -urNp linux-2.6.32.48/kernel/timer.c linux-2.6.32.48/kernel/timer.c
struct tvec_base *base = __get_cpu_var(tvec_bases);
diff -urNp linux-2.6.32.48/kernel/trace/blktrace.c linux-2.6.32.48/kernel/trace/blktrace.c
---- linux-2.6.32.48/kernel/trace/blktrace.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/trace/blktrace.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/trace/blktrace.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/trace/blktrace.c 2011-11-15 19:59:43.000000000 -0500
@@ -313,7 +313,7 @@ static ssize_t blk_dropped_read(struct f
struct blk_trace *bt = filp->private_data;
char buf[16];
@@ -70558,8 +70567,8 @@ diff -urNp linux-2.6.32.48/kernel/trace/blktrace.c linux-2.6.32.48/kernel/trace/
ret = -EIO;
bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
diff -urNp linux-2.6.32.48/kernel/trace/ftrace.c linux-2.6.32.48/kernel/trace/ftrace.c
---- linux-2.6.32.48/kernel/trace/ftrace.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/trace/ftrace.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/trace/ftrace.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/trace/ftrace.c 2011-11-15 19:59:43.000000000 -0500
@@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod,
ip = rec->ip;
@@ -70582,8 +70591,8 @@ diff -urNp linux-2.6.32.48/kernel/trace/ftrace.c linux-2.6.32.48/kernel/trace/ft
/*
diff -urNp linux-2.6.32.48/kernel/trace/ring_buffer.c linux-2.6.32.48/kernel/trace/ring_buffer.c
---- linux-2.6.32.48/kernel/trace/ring_buffer.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/trace/ring_buffer.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/trace/ring_buffer.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/trace/ring_buffer.c 2011-11-15 19:59:43.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.
@@ -70594,8 +70603,8 @@ diff -urNp linux-2.6.32.48/kernel/trace/ring_buffer.c linux-2.6.32.48/kernel/tra
struct buffer_page *page, struct list_head *list)
{
diff -urNp linux-2.6.32.48/kernel/trace/trace.c linux-2.6.32.48/kernel/trace/trace.c
---- linux-2.6.32.48/kernel/trace/trace.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/trace/trace.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/trace/trace.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/trace/trace.c 2011-11-15 19:59:43.000000000 -0500
@@ -3193,6 +3193,8 @@ static ssize_t tracing_splice_read_pipe(
size_t rem;
unsigned int i;
@@ -70639,8 +70648,8 @@ diff -urNp linux-2.6.32.48/kernel/trace/trace.c linux-2.6.32.48/kernel/trace/tra
struct dentry *d_tracer;
diff -urNp linux-2.6.32.48/kernel/trace/trace_events.c linux-2.6.32.48/kernel/trace/trace_events.c
---- linux-2.6.32.48/kernel/trace/trace_events.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/trace/trace_events.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/trace/trace_events.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/trace/trace_events.c 2011-11-15 19:59:43.000000000 -0500
@@ -951,13 +951,10 @@ static LIST_HEAD(ftrace_module_file_list
* Modules must own their file_operations to keep up with
* reference counting.
@@ -70692,8 +70701,8 @@ diff -urNp linux-2.6.32.48/kernel/trace/trace_events.c linux-2.6.32.48/kernel/tr
}
diff -urNp linux-2.6.32.48/kernel/trace/trace_mmiotrace.c linux-2.6.32.48/kernel/trace/trace_mmiotrace.c
---- linux-2.6.32.48/kernel/trace/trace_mmiotrace.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/trace/trace_mmiotrace.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/trace/trace_mmiotrace.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/trace/trace_mmiotrace.c 2011-11-15 19:59:43.000000000 -0500
@@ -23,7 +23,7 @@ struct header_iter {
static struct trace_array *mmio_trace_array;
static bool overrun_detected;
@@ -70731,8 +70740,8 @@ diff -urNp linux-2.6.32.48/kernel/trace/trace_mmiotrace.c linux-2.6.32.48/kernel
}
entry = ring_buffer_event_data(event);
diff -urNp linux-2.6.32.48/kernel/trace/trace_output.c linux-2.6.32.48/kernel/trace/trace_output.c
---- linux-2.6.32.48/kernel/trace/trace_output.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/trace/trace_output.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/trace/trace_output.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/trace/trace_output.c 2011-11-15 19:59:43.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);
@@ -70743,8 +70752,8 @@ diff -urNp linux-2.6.32.48/kernel/trace/trace_output.c linux-2.6.32.48/kernel/tr
s->len = p - s->buffer;
return 1;
diff -urNp linux-2.6.32.48/kernel/trace/trace_stack.c linux-2.6.32.48/kernel/trace/trace_stack.c
---- linux-2.6.32.48/kernel/trace/trace_stack.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/trace/trace_stack.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/trace/trace_stack.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/trace/trace_stack.c 2011-11-15 19:59:43.000000000 -0500
@@ -50,7 +50,7 @@ static inline void check_stack(void)
return;
@@ -70755,8 +70764,8 @@ diff -urNp linux-2.6.32.48/kernel/trace/trace_stack.c linux-2.6.32.48/kernel/tra
local_irq_save(flags);
diff -urNp linux-2.6.32.48/kernel/trace/trace_workqueue.c linux-2.6.32.48/kernel/trace/trace_workqueue.c
---- linux-2.6.32.48/kernel/trace/trace_workqueue.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/kernel/trace/trace_workqueue.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/trace/trace_workqueue.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/trace/trace_workqueue.c 2011-11-15 19:59:43.000000000 -0500
@@ -21,7 +21,7 @@ struct cpu_workqueue_stats {
int cpu;
pid_t pid;
@@ -70785,8 +70794,8 @@ diff -urNp linux-2.6.32.48/kernel/trace/trace_workqueue.c linux-2.6.32.48/kernel
put_task_struct(tsk);
}
diff -urNp linux-2.6.32.48/kernel/user.c linux-2.6.32.48/kernel/user.c
---- linux-2.6.32.48/kernel/user.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/kernel/user.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/kernel/user.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/kernel/user.c 2011-11-15 19:59:43.000000000 -0500
@@ -159,6 +159,7 @@ struct user_struct *alloc_uid(struct use
spin_lock_irq(&uidhash_lock);
up = uid_hash_find(uid, hashent);
@@ -70796,8 +70805,8 @@ diff -urNp linux-2.6.32.48/kernel/user.c linux-2.6.32.48/kernel/user.c
key_put(new->session_keyring);
kmem_cache_free(uid_cachep, new);
diff -urNp linux-2.6.32.48/lib/bitmap.c linux-2.6.32.48/lib/bitmap.c
---- linux-2.6.32.48/lib/bitmap.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/lib/bitmap.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/lib/bitmap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/lib/bitmap.c 2011-11-15 19:59:43.000000000 -0500
@@ -341,7 +341,7 @@ int __bitmap_parse(const char *buf, unsi
{
int c, old_c, totaldigits, ndigits, nchunks, nbits;
@@ -70817,8 +70826,8 @@ diff -urNp linux-2.6.32.48/lib/bitmap.c linux-2.6.32.48/lib/bitmap.c
EXPORT_SYMBOL(bitmap_parse_user);
diff -urNp linux-2.6.32.48/lib/bug.c linux-2.6.32.48/lib/bug.c
---- linux-2.6.32.48/lib/bug.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/lib/bug.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/lib/bug.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/lib/bug.c 2011-11-15 19:59:43.000000000 -0500
@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
return BUG_TRAP_TYPE_NONE;
@@ -70829,8 +70838,8 @@ diff -urNp linux-2.6.32.48/lib/bug.c linux-2.6.32.48/lib/bug.c
printk(KERN_EMERG "------------[ cut here ]------------\n");
diff -urNp linux-2.6.32.48/lib/debugobjects.c linux-2.6.32.48/lib/debugobjects.c
---- linux-2.6.32.48/lib/debugobjects.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/lib/debugobjects.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/lib/debugobjects.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/lib/debugobjects.c 2011-11-15 19:59:43.000000000 -0500
@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
if (limit > 4)
return;
@@ -70841,8 +70850,8 @@ diff -urNp linux-2.6.32.48/lib/debugobjects.c linux-2.6.32.48/lib/debugobjects.c
return;
diff -urNp linux-2.6.32.48/lib/devres.c linux-2.6.32.48/lib/devres.c
---- linux-2.6.32.48/lib/devres.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/lib/devres.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/lib/devres.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/lib/devres.c 2011-11-15 19:59:43.000000000 -0500
@@ -80,7 +80,7 @@ void devm_iounmap(struct device *dev, vo
{
iounmap(addr);
@@ -70862,8 +70871,8 @@ diff -urNp linux-2.6.32.48/lib/devres.c linux-2.6.32.48/lib/devres.c
EXPORT_SYMBOL(devm_ioport_unmap);
diff -urNp linux-2.6.32.48/lib/dma-debug.c linux-2.6.32.48/lib/dma-debug.c
---- linux-2.6.32.48/lib/dma-debug.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/lib/dma-debug.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/lib/dma-debug.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/lib/dma-debug.c 2011-11-15 19:59:43.000000000 -0500
@@ -861,7 +861,7 @@ out:
static void check_for_stack(struct device *dev, void *addr)
@@ -70874,8 +70883,8 @@ diff -urNp linux-2.6.32.48/lib/dma-debug.c linux-2.6.32.48/lib/dma-debug.c
"stack [addr=%p]\n", addr);
}
diff -urNp linux-2.6.32.48/lib/idr.c linux-2.6.32.48/lib/idr.c
---- linux-2.6.32.48/lib/idr.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/lib/idr.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/lib/idr.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/lib/idr.c 2011-11-15 19:59:43.000000000 -0500
@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
@@ -70886,8 +70895,8 @@ diff -urNp linux-2.6.32.48/lib/idr.c linux-2.6.32.48/lib/idr.c
return IDR_NEED_TO_GROW;
}
diff -urNp linux-2.6.32.48/lib/inflate.c linux-2.6.32.48/lib/inflate.c
---- linux-2.6.32.48/lib/inflate.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/lib/inflate.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/lib/inflate.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/lib/inflate.c 2011-11-15 19:59:43.000000000 -0500
@@ -266,7 +266,7 @@ static void free(void *where)
malloc_ptr = free_mem_ptr;
}
@@ -70898,8 +70907,8 @@ diff -urNp linux-2.6.32.48/lib/inflate.c linux-2.6.32.48/lib/inflate.c
#endif
diff -urNp linux-2.6.32.48/lib/Kconfig.debug linux-2.6.32.48/lib/Kconfig.debug
---- linux-2.6.32.48/lib/Kconfig.debug 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/lib/Kconfig.debug 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/lib/Kconfig.debug 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/lib/Kconfig.debug 2011-11-15 19:59:43.000000000 -0500
@@ -905,7 +905,7 @@ config LATENCYTOP
select STACKTRACE
select SCHEDSTATS
@@ -70910,8 +70919,8 @@ diff -urNp linux-2.6.32.48/lib/Kconfig.debug linux-2.6.32.48/lib/Kconfig.debug
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.48/lib/kobject.c linux-2.6.32.48/lib/kobject.c
---- linux-2.6.32.48/lib/kobject.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/lib/kobject.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/lib/kobject.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/lib/kobject.c 2011-11-15 19:59:43.000000000 -0500
@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
return ret;
}
@@ -70940,8 +70949,8 @@ diff -urNp linux-2.6.32.48/lib/kobject.c linux-2.6.32.48/lib/kobject.c
{
struct kset *kset;
diff -urNp linux-2.6.32.48/lib/kobject_uevent.c linux-2.6.32.48/lib/kobject_uevent.c
---- linux-2.6.32.48/lib/kobject_uevent.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/lib/kobject_uevent.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/lib/kobject_uevent.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/lib/kobject_uevent.c 2011-11-15 19:59:43.000000000 -0500
@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
const char *subsystem;
struct kobject *top_kobj;
@@ -70952,8 +70961,8 @@ diff -urNp linux-2.6.32.48/lib/kobject_uevent.c linux-2.6.32.48/lib/kobject_ueve
int i = 0;
int retval = 0;
diff -urNp linux-2.6.32.48/lib/kref.c linux-2.6.32.48/lib/kref.c
---- linux-2.6.32.48/lib/kref.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/lib/kref.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/lib/kref.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/lib/kref.c 2011-11-15 19:59:43.000000000 -0500
@@ -61,7 +61,7 @@ void kref_get(struct kref *kref)
*/
int kref_put(struct kref *kref, void (*release)(struct kref *kref))
@@ -70964,8 +70973,8 @@ diff -urNp linux-2.6.32.48/lib/kref.c linux-2.6.32.48/lib/kref.c
if (atomic_dec_and_test(&kref->refcount)) {
diff -urNp linux-2.6.32.48/lib/parser.c linux-2.6.32.48/lib/parser.c
---- linux-2.6.32.48/lib/parser.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/lib/parser.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/lib/parser.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/lib/parser.c 2011-11-15 19:59:43.000000000 -0500
@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
char *buf;
int ret;
@@ -70976,8 +70985,8 @@ diff -urNp linux-2.6.32.48/lib/parser.c linux-2.6.32.48/lib/parser.c
return -ENOMEM;
memcpy(buf, s->from, s->to - s->from);
diff -urNp linux-2.6.32.48/lib/radix-tree.c linux-2.6.32.48/lib/radix-tree.c
---- linux-2.6.32.48/lib/radix-tree.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/lib/radix-tree.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/lib/radix-tree.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/lib/radix-tree.c 2011-11-15 19:59:43.000000000 -0500
@@ -81,7 +81,7 @@ struct radix_tree_preload {
int nr;
struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -70988,8 +70997,8 @@ diff -urNp linux-2.6.32.48/lib/radix-tree.c linux-2.6.32.48/lib/radix-tree.c
static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
{
diff -urNp linux-2.6.32.48/lib/random32.c linux-2.6.32.48/lib/random32.c
---- linux-2.6.32.48/lib/random32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/lib/random32.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/lib/random32.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/lib/random32.c 2011-11-15 19:59:43.000000000 -0500
@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
*/
static inline u32 __seed(u32 x, u32 m)
@@ -71000,8 +71009,8 @@ diff -urNp linux-2.6.32.48/lib/random32.c linux-2.6.32.48/lib/random32.c
/**
diff -urNp linux-2.6.32.48/lib/vsprintf.c linux-2.6.32.48/lib/vsprintf.c
---- linux-2.6.32.48/lib/vsprintf.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/lib/vsprintf.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/lib/vsprintf.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/lib/vsprintf.c 2011-11-15 19:59:43.000000000 -0500
@@ -16,6 +16,9 @@
* - scnprintf and vscnprintf
*/
@@ -71104,12 +71113,12 @@ diff -urNp linux-2.6.32.48/lib/vsprintf.c linux-2.6.32.48/lib/vsprintf.c
diff -urNp linux-2.6.32.48/localversion-grsec linux-2.6.32.48/localversion-grsec
--- linux-2.6.32.48/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/localversion-grsec 2011-11-12 12:46:47.000000000 -0500
++++ linux-2.6.32.48/localversion-grsec 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1 @@
+-grsec
diff -urNp linux-2.6.32.48/Makefile linux-2.6.32.48/Makefile
---- linux-2.6.32.48/Makefile 2011-11-12 12:44:28.000000000 -0500
-+++ linux-2.6.32.48/Makefile 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/Makefile 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/Makefile 2011-11-15 19:59:43.000000000 -0500
@@ -221,8 +221,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
HOSTCC = gcc
@@ -71327,8 +71336,8 @@ diff -urNp linux-2.6.32.48/Makefile linux-2.6.32.48/Makefile
$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
$(build)=$(build-dir) $(@:.ko=.o)
diff -urNp linux-2.6.32.48/mm/backing-dev.c linux-2.6.32.48/mm/backing-dev.c
---- linux-2.6.32.48/mm/backing-dev.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/mm/backing-dev.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/backing-dev.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/backing-dev.c 2011-11-15 19:59:43.000000000 -0500
@@ -272,7 +272,7 @@ static void bdi_task_init(struct backing
list_add_tail_rcu(&wb->list, &bdi->wb_list);
spin_unlock(&bdi->wb_lock);
@@ -71348,8 +71357,8 @@ diff -urNp linux-2.6.32.48/mm/backing-dev.c linux-2.6.32.48/mm/backing-dev.c
if (!bdi_cap_writeback_dirty(bdi))
return;
diff -urNp linux-2.6.32.48/mm/filemap.c linux-2.6.32.48/mm/filemap.c
---- linux-2.6.32.48/mm/filemap.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/filemap.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/filemap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/filemap.c 2011-11-15 19:59:43.000000000 -0500
@@ -1631,7 +1631,7 @@ int generic_file_mmap(struct file * file
struct address_space *mapping = file->f_mapping;
@@ -71368,8 +71377,8 @@ diff -urNp linux-2.6.32.48/mm/filemap.c linux-2.6.32.48/mm/filemap.c
send_sig(SIGXFSZ, current, 0);
return -EFBIG;
diff -urNp linux-2.6.32.48/mm/fremap.c linux-2.6.32.48/mm/fremap.c
---- linux-2.6.32.48/mm/fremap.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/mm/fremap.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/fremap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/fremap.c 2011-11-15 19:59:43.000000000 -0500
@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
retry:
vma = find_vma(mm, start);
@@ -71392,8 +71401,8 @@ diff -urNp linux-2.6.32.48/mm/fremap.c linux-2.6.32.48/mm/fremap.c
vma->vm_flags = saved_flags;
}
diff -urNp linux-2.6.32.48/mm/highmem.c linux-2.6.32.48/mm/highmem.c
---- linux-2.6.32.48/mm/highmem.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/mm/highmem.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/highmem.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/highmem.c 2011-11-15 19:59:43.000000000 -0500
@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
* So no dangers, even with speculative execution.
*/
@@ -71420,8 +71429,8 @@ diff -urNp linux-2.6.32.48/mm/highmem.c linux-2.6.32.48/mm/highmem.c
set_page_address(page, (void *)vaddr);
diff -urNp linux-2.6.32.48/mm/hugetlb.c linux-2.6.32.48/mm/hugetlb.c
---- linux-2.6.32.48/mm/hugetlb.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/hugetlb.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/hugetlb.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/hugetlb.c 2011-11-15 19:59:43.000000000 -0500
@@ -1933,6 +1933,26 @@ static int unmap_ref_private(struct mm_s
return 1;
}
@@ -71502,8 +71511,8 @@ diff -urNp linux-2.6.32.48/mm/hugetlb.c linux-2.6.32.48/mm/hugetlb.c
if (!ptep)
return VM_FAULT_OOM;
diff -urNp linux-2.6.32.48/mm/internal.h linux-2.6.32.48/mm/internal.h
---- linux-2.6.32.48/mm/internal.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/internal.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/internal.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/internal.h 2011-11-15 19:59:43.000000000 -0500
@@ -49,6 +49,7 @@ extern void putback_lru_page(struct page
* in mm/page_alloc.c
*/
@@ -71513,8 +71522,8 @@ diff -urNp linux-2.6.32.48/mm/internal.h linux-2.6.32.48/mm/internal.h
diff -urNp linux-2.6.32.48/mm/Kconfig linux-2.6.32.48/mm/Kconfig
---- linux-2.6.32.48/mm/Kconfig 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/Kconfig 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/Kconfig 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/Kconfig 2011-11-15 19:59:43.000000000 -0500
@@ -228,7 +228,7 @@ config KSM
config DEFAULT_MMAP_MIN_ADDR
int "Low address space to protect from user allocation"
@@ -71525,8 +71534,8 @@ diff -urNp linux-2.6.32.48/mm/Kconfig linux-2.6.32.48/mm/Kconfig
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.48/mm/kmemleak.c linux-2.6.32.48/mm/kmemleak.c
---- linux-2.6.32.48/mm/kmemleak.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/kmemleak.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/kmemleak.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/kmemleak.c 2011-11-15 19:59:43.000000000 -0500
@@ -358,7 +358,7 @@ static void print_unreferenced(struct se
for (i = 0; i < object->trace_len; i++) {
@@ -71537,8 +71546,8 @@ diff -urNp linux-2.6.32.48/mm/kmemleak.c linux-2.6.32.48/mm/kmemleak.c
}
diff -urNp linux-2.6.32.48/mm/maccess.c linux-2.6.32.48/mm/maccess.c
---- linux-2.6.32.48/mm/maccess.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/mm/maccess.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/maccess.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/maccess.c 2011-11-15 19:59:43.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.
@@ -71575,8 +71584,8 @@ diff -urNp linux-2.6.32.48/mm/maccess.c linux-2.6.32.48/mm/maccess.c
set_fs(old_fs);
diff -urNp linux-2.6.32.48/mm/madvise.c linux-2.6.32.48/mm/madvise.c
---- linux-2.6.32.48/mm/madvise.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/mm/madvise.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/madvise.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/madvise.c 2011-11-15 19:59:43.000000000 -0500
@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
pgoff_t pgoff;
unsigned long new_flags = vma->vm_flags;
@@ -71654,8 +71663,8 @@ diff -urNp linux-2.6.32.48/mm/madvise.c linux-2.6.32.48/mm/madvise.c
if (end == start)
goto out;
diff -urNp linux-2.6.32.48/mm/memory.c linux-2.6.32.48/mm/memory.c
---- linux-2.6.32.48/mm/memory.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/memory.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/memory.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/memory.c 2011-11-15 19:59:43.000000000 -0500
@@ -187,8 +187,12 @@ static inline void free_pmd_range(struct
return;
@@ -72186,8 +72195,8 @@ diff -urNp linux-2.6.32.48/mm/memory.c linux-2.6.32.48/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.48/mm/memory-failure.c linux-2.6.32.48/mm/memory-failure.c
---- linux-2.6.32.48/mm/memory-failure.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/memory-failure.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/memory-failure.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/memory-failure.c 2011-11-15 19:59:43.000000000 -0500
@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -72216,8 +72225,8 @@ diff -urNp linux-2.6.32.48/mm/memory-failure.c linux-2.6.32.48/mm/memory-failure
/*
* We need/can do nothing about count=0 pages.
diff -urNp linux-2.6.32.48/mm/mempolicy.c linux-2.6.32.48/mm/mempolicy.c
---- linux-2.6.32.48/mm/mempolicy.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/mempolicy.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/mempolicy.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/mempolicy.c 2011-11-15 19:59:43.000000000 -0500
@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
struct vm_area_struct *next;
int err;
@@ -72299,8 +72308,8 @@ diff -urNp linux-2.6.32.48/mm/mempolicy.c linux-2.6.32.48/mm/mempolicy.c
seq_printf(m, " heap");
} else if (vma->vm_start <= mm->start_stack &&
diff -urNp linux-2.6.32.48/mm/migrate.c linux-2.6.32.48/mm/migrate.c
---- linux-2.6.32.48/mm/migrate.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/migrate.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/migrate.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/migrate.c 2011-11-15 19:59:43.000000000 -0500
@@ -916,6 +916,8 @@ static int do_pages_move(struct mm_struc
unsigned long chunk_start;
int err;
@@ -72336,8 +72345,8 @@ diff -urNp linux-2.6.32.48/mm/migrate.c linux-2.6.32.48/mm/migrate.c
err = -EPERM;
goto out;
diff -urNp linux-2.6.32.48/mm/mlock.c linux-2.6.32.48/mm/mlock.c
---- linux-2.6.32.48/mm/mlock.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/mlock.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/mlock.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/mlock.c 2011-11-15 19:59:43.000000000 -0500
@@ -13,6 +13,7 @@
#include <linux/pagemap.h>
#include <linux/mempolicy.h>
@@ -72449,8 +72458,8 @@ diff -urNp linux-2.6.32.48/mm/mlock.c linux-2.6.32.48/mm/mlock.c
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
diff -urNp linux-2.6.32.48/mm/mmap.c linux-2.6.32.48/mm/mmap.c
---- linux-2.6.32.48/mm/mmap.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/mmap.c 2011-11-12 12:55:30.000000000 -0500
+--- linux-2.6.32.48/mm/mmap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/mmap.c 2011-11-15 19:59:43.000000000 -0500
@@ -45,6 +45,16 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
@@ -73670,8 +73679,8 @@ diff -urNp linux-2.6.32.48/mm/mmap.c linux-2.6.32.48/mm/mmap.c
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
diff -urNp linux-2.6.32.48/mm/mprotect.c linux-2.6.32.48/mm/mprotect.c
---- linux-2.6.32.48/mm/mprotect.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/mprotect.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/mprotect.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/mprotect.c 2011-11-15 19:59:43.000000000 -0500
@@ -24,10 +24,16 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
@@ -73895,8 +73904,8 @@ diff -urNp linux-2.6.32.48/mm/mprotect.c linux-2.6.32.48/mm/mprotect.c
if (nstart < prev->vm_end)
diff -urNp linux-2.6.32.48/mm/mremap.c linux-2.6.32.48/mm/mremap.c
---- linux-2.6.32.48/mm/mremap.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/mremap.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/mremap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/mremap.c 2011-11-15 19:59:43.000000000 -0500
@@ -112,6 +112,12 @@ static void move_ptes(struct vm_area_str
continue;
pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -74002,8 +74011,8 @@ diff -urNp linux-2.6.32.48/mm/mremap.c linux-2.6.32.48/mm/mremap.c
out:
if (ret & ~PAGE_MASK)
diff -urNp linux-2.6.32.48/mm/nommu.c linux-2.6.32.48/mm/nommu.c
---- linux-2.6.32.48/mm/nommu.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/nommu.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/nommu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/nommu.c 2011-11-15 19:59:43.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;
@@ -74029,8 +74038,8 @@ diff -urNp linux-2.6.32.48/mm/nommu.c linux-2.6.32.48/mm/nommu.c
* - not supported under NOMMU conditions
*/
diff -urNp linux-2.6.32.48/mm/page_alloc.c linux-2.6.32.48/mm/page_alloc.c
---- linux-2.6.32.48/mm/page_alloc.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/page_alloc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/page_alloc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/page_alloc.c 2011-11-15 19:59:43.000000000 -0500
@@ -289,7 +289,7 @@ out:
* This usage means that zero-order pages may not be compound.
*/
@@ -74106,8 +74115,8 @@ diff -urNp linux-2.6.32.48/mm/page_alloc.c linux-2.6.32.48/mm/page_alloc.c
#endif /* CONFIG_SPARSEMEM */
diff -urNp linux-2.6.32.48/mm/percpu.c linux-2.6.32.48/mm/percpu.c
---- linux-2.6.32.48/mm/percpu.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/percpu.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/percpu.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/percpu.c 2011-11-15 19:59:43.000000000 -0500
@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
static unsigned int pcpu_last_unit_cpu __read_mostly;
@@ -74118,8 +74127,8 @@ diff -urNp linux-2.6.32.48/mm/percpu.c linux-2.6.32.48/mm/percpu.c
static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
diff -urNp linux-2.6.32.48/mm/rmap.c linux-2.6.32.48/mm/rmap.c
---- linux-2.6.32.48/mm/rmap.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/mm/rmap.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/rmap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/rmap.c 2011-11-15 19:59:43.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);
@@ -74139,8 +74148,8 @@ diff -urNp linux-2.6.32.48/mm/rmap.c linux-2.6.32.48/mm/rmap.c
list_add_tail(&vma->anon_vma_node, &anon_vma->head);
allocated = NULL;
diff -urNp linux-2.6.32.48/mm/shmem.c linux-2.6.32.48/mm/shmem.c
---- linux-2.6.32.48/mm/shmem.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/shmem.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/shmem.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/shmem.c 2011-11-15 19:59:43.000000000 -0500
@@ -31,7 +31,7 @@
#include <linux/swap.h>
#include <linux/ima.h>
@@ -74188,8 +74197,8 @@ diff -urNp linux-2.6.32.48/mm/shmem.c linux-2.6.32.48/mm/shmem.c
return -ENOMEM;
diff -urNp linux-2.6.32.48/mm/slab.c linux-2.6.32.48/mm/slab.c
---- linux-2.6.32.48/mm/slab.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/slab.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/slab.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/slab.c 2011-11-15 19:59:43.000000000 -0500
@@ -174,7 +174,7 @@
/* Legal flag mask for kmem_cache_create(). */
@@ -74353,8 +74362,8 @@ diff -urNp linux-2.6.32.48/mm/slab.c linux-2.6.32.48/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.48/mm/slob.c linux-2.6.32.48/mm/slob.c
---- linux-2.6.32.48/mm/slob.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/mm/slob.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/slob.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/slob.c 2011-11-15 19:59:43.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
@@ -74705,8 +74714,8 @@ diff -urNp linux-2.6.32.48/mm/slob.c linux-2.6.32.48/mm/slob.c
EXPORT_SYMBOL(kmem_cache_free);
diff -urNp linux-2.6.32.48/mm/slub.c linux-2.6.32.48/mm/slub.c
---- linux-2.6.32.48/mm/slub.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/mm/slub.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/slub.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/slub.c 2011-11-15 19:59:43.000000000 -0500
@@ -201,7 +201,7 @@ struct track {
enum track_item { TRACK_ALLOC, TRACK_FREE };
@@ -74959,8 +74968,8 @@ diff -urNp linux-2.6.32.48/mm/slub.c linux-2.6.32.48/mm/slub.c
}
module_init(slab_proc_init);
diff -urNp linux-2.6.32.48/mm/swap.c linux-2.6.32.48/mm/swap.c
---- linux-2.6.32.48/mm/swap.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/mm/swap.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/swap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/swap.c 2011-11-15 19:59:43.000000000 -0500
@@ -30,6 +30,7 @@
#include <linux/notifier.h>
#include <linux/backing-dev.h>
@@ -74979,8 +74988,8 @@ diff -urNp linux-2.6.32.48/mm/swap.c linux-2.6.32.48/mm/swap.c
}
}
diff -urNp linux-2.6.32.48/mm/util.c linux-2.6.32.48/mm/util.c
---- linux-2.6.32.48/mm/util.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/util.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/util.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/util.c 2011-11-15 19:59:43.000000000 -0500
@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
void arch_pick_mmap_layout(struct mm_struct *mm)
{
@@ -74995,8 +75004,8 @@ diff -urNp linux-2.6.32.48/mm/util.c linux-2.6.32.48/mm/util.c
mm->unmap_area = arch_unmap_area;
}
diff -urNp linux-2.6.32.48/mm/vmalloc.c linux-2.6.32.48/mm/vmalloc.c
---- linux-2.6.32.48/mm/vmalloc.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/vmalloc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/vmalloc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/vmalloc.c 2011-11-15 19:59:43.000000000 -0500
@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
pte = pte_offset_kernel(pmd, addr);
@@ -75234,8 +75243,8 @@ diff -urNp linux-2.6.32.48/mm/vmalloc.c linux-2.6.32.48/mm/vmalloc.c
return -EINVAL;
diff -urNp linux-2.6.32.48/mm/vmstat.c linux-2.6.32.48/mm/vmstat.c
---- linux-2.6.32.48/mm/vmstat.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/mm/vmstat.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/mm/vmstat.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/mm/vmstat.c 2011-11-15 19:59:43.000000000 -0500
@@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu)
*
* vm_stat contains the global counters
@@ -75289,8 +75298,8 @@ diff -urNp linux-2.6.32.48/mm/vmstat.c linux-2.6.32.48/mm/vmstat.c
return 0;
}
diff -urNp linux-2.6.32.48/net/8021q/vlan.c linux-2.6.32.48/net/8021q/vlan.c
---- linux-2.6.32.48/net/8021q/vlan.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/8021q/vlan.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/net/8021q/vlan.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/8021q/vlan.c 2011-11-15 19:59:43.000000000 -0500
@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
err = -EPERM;
if (!capable(CAP_NET_ADMIN))
@@ -75302,8 +75311,8 @@ diff -urNp linux-2.6.32.48/net/8021q/vlan.c linux-2.6.32.48/net/8021q/vlan.c
vn = net_generic(net, vlan_net_id);
diff -urNp linux-2.6.32.48/net/9p/trans_fd.c linux-2.6.32.48/net/9p/trans_fd.c
---- linux-2.6.32.48/net/9p/trans_fd.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/9p/trans_fd.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/net/9p/trans_fd.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/9p/trans_fd.c 2011-11-15 19:59:43.000000000 -0500
@@ -419,7 +419,7 @@ static int p9_fd_write(struct p9_client
oldfs = get_fs();
set_fs(get_ds());
@@ -75314,8 +75323,8 @@ diff -urNp linux-2.6.32.48/net/9p/trans_fd.c linux-2.6.32.48/net/9p/trans_fd.c
if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
diff -urNp linux-2.6.32.48/net/atm/atm_misc.c linux-2.6.32.48/net/atm/atm_misc.c
---- linux-2.6.32.48/net/atm/atm_misc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/atm/atm_misc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/net/atm/atm_misc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/atm/atm_misc.c 2011-11-15 19:59:43.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;
@@ -75353,8 +75362,8 @@ diff -urNp linux-2.6.32.48/net/atm/atm_misc.c linux-2.6.32.48/net/atm/atm_misc.c
#undef __HANDLE_ITEM
}
diff -urNp linux-2.6.32.48/net/atm/lec.h linux-2.6.32.48/net/atm/lec.h
---- linux-2.6.32.48/net/atm/lec.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/atm/lec.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/net/atm/lec.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/atm/lec.h 2011-11-15 19:59:43.000000000 -0500
@@ -48,7 +48,7 @@ struct lane2_ops {
const u8 *tlvs, u32 sizeoftlvs);
void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
@@ -75365,8 +75374,8 @@ diff -urNp linux-2.6.32.48/net/atm/lec.h linux-2.6.32.48/net/atm/lec.h
/*
* ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
diff -urNp linux-2.6.32.48/net/atm/mpc.h linux-2.6.32.48/net/atm/mpc.h
---- linux-2.6.32.48/net/atm/mpc.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/atm/mpc.h 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/net/atm/mpc.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/atm/mpc.h 2011-11-15 19:59:43.000000000 -0500
@@ -33,7 +33,7 @@ struct mpoa_client {
struct mpc_parameters parameters; /* parameters for this client */
@@ -75377,8 +75386,8 @@ diff -urNp linux-2.6.32.48/net/atm/mpc.h linux-2.6.32.48/net/atm/mpc.h
diff -urNp linux-2.6.32.48/net/atm/mpoa_caches.c linux-2.6.32.48/net/atm/mpoa_caches.c
---- linux-2.6.32.48/net/atm/mpoa_caches.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/atm/mpoa_caches.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/net/atm/mpoa_caches.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/atm/mpoa_caches.c 2011-11-15 19:59:43.000000000 -0500
@@ -498,6 +498,8 @@ static void clear_expired(struct mpoa_cl
struct timeval now;
struct k_message msg;
@@ -75389,8 +75398,8 @@ diff -urNp linux-2.6.32.48/net/atm/mpoa_caches.c linux-2.6.32.48/net/atm/mpoa_ca
write_lock_irq(&client->egress_lock);
diff -urNp linux-2.6.32.48/net/atm/proc.c linux-2.6.32.48/net/atm/proc.c
---- linux-2.6.32.48/net/atm/proc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/atm/proc.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/net/atm/proc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/atm/proc.c 2011-11-15 19:59:43.000000000 -0500
@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
const struct k_atm_aal_stats *stats)
{
@@ -75430,8 +75439,8 @@ diff -urNp linux-2.6.32.48/net/atm/proc.c linux-2.6.32.48/net/atm/proc.c
seq_printf(seq, "%3d %3d %5d ",
vcc->dev->number, vcc->vpi, vcc->vci);
diff -urNp linux-2.6.32.48/net/atm/resources.c linux-2.6.32.48/net/atm/resources.c
---- linux-2.6.32.48/net/atm/resources.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/atm/resources.c 2011-11-12 12:46:47.000000000 -0500
+--- linux-2.6.32.48/net/atm/resources.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/atm/resources.c 2011-11-15 19:59:43.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)
@@ -75451,8 +75460,8 @@ diff -urNp linux-2.6.32.48/net/atm/resources.c linux-2.6.32.48/net/atm/resources
#undef __HANDLE_ITEM
}
diff -urNp linux-2.6.32.48/net/bridge/br_private.h linux-2.6.32.48/net/bridge/br_private.h
---- linux-2.6.32.48/net/bridge/br_private.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/bridge/br_private.h 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/bridge/br_private.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/bridge/br_private.h 2011-11-15 19:59:43.000000000 -0500
@@ -255,7 +255,7 @@ extern void br_ifinfo_notify(int event,
#ifdef CONFIG_SYSFS
@@ -75463,8 +75472,8 @@ diff -urNp linux-2.6.32.48/net/bridge/br_private.h linux-2.6.32.48/net/bridge/br
/* br_sysfs_br.c */
diff -urNp linux-2.6.32.48/net/bridge/br_stp_if.c linux-2.6.32.48/net/bridge/br_stp_if.c
---- linux-2.6.32.48/net/bridge/br_stp_if.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/bridge/br_stp_if.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/bridge/br_stp_if.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/bridge/br_stp_if.c 2011-11-15 19:59:43.000000000 -0500
@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
char *envp[] = { NULL };
@@ -75475,8 +75484,8 @@ diff -urNp linux-2.6.32.48/net/bridge/br_stp_if.c linux-2.6.32.48/net/bridge/br_
br->dev->name, r);
diff -urNp linux-2.6.32.48/net/bridge/br_sysfs_if.c linux-2.6.32.48/net/bridge/br_sysfs_if.c
---- linux-2.6.32.48/net/bridge/br_sysfs_if.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/bridge/br_sysfs_if.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/bridge/br_sysfs_if.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/bridge/br_sysfs_if.c 2011-11-15 19:59:43.000000000 -0500
@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
return ret;
}
@@ -75487,8 +75496,8 @@ diff -urNp linux-2.6.32.48/net/bridge/br_sysfs_if.c linux-2.6.32.48/net/bridge/b
.store = brport_store,
};
diff -urNp linux-2.6.32.48/net/bridge/netfilter/ebtables.c linux-2.6.32.48/net/bridge/netfilter/ebtables.c
---- linux-2.6.32.48/net/bridge/netfilter/ebtables.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/bridge/netfilter/ebtables.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/bridge/netfilter/ebtables.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/bridge/netfilter/ebtables.c 2011-11-15 19:59:43.000000000 -0500
@@ -1337,6 +1337,8 @@ static int copy_everything_to_user(struc
unsigned int entries_size, nentries;
char *entries;
@@ -75499,8 +75508,8 @@ diff -urNp linux-2.6.32.48/net/bridge/netfilter/ebtables.c linux-2.6.32.48/net/b
entries_size = t->private->entries_size;
nentries = t->private->nentries;
diff -urNp linux-2.6.32.48/net/can/bcm.c linux-2.6.32.48/net/can/bcm.c
---- linux-2.6.32.48/net/can/bcm.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/can/bcm.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/can/bcm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/can/bcm.c 2011-11-15 19:59:43.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;
@@ -75518,8 +75527,8 @@ diff -urNp linux-2.6.32.48/net/can/bcm.c linux-2.6.32.48/net/can/bcm.c
seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex));
seq_printf(m, " <<<\n");
diff -urNp linux-2.6.32.48/net/compat.c linux-2.6.32.48/net/compat.c
---- linux-2.6.32.48/net/compat.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/compat.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/compat.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/compat.c 2011-11-15 19:59:43.000000000 -0500
@@ -69,9 +69,9 @@ int get_compat_msghdr(struct msghdr *kms
__get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
__get_user(kmsg->msg_flags, &umsg->msg_flags))
@@ -75621,8 +75630,8 @@ diff -urNp linux-2.6.32.48/net/compat.c linux-2.6.32.48/net/compat.c
u32 interface, fmode, numsrc;
diff -urNp linux-2.6.32.48/net/core/dev.c linux-2.6.32.48/net/core/dev.c
---- linux-2.6.32.48/net/core/dev.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/core/dev.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/core/dev.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/core/dev.c 2011-11-15 19:59:43.000000000 -0500
@@ -1047,10 +1047,14 @@ void dev_load(struct net *net, const cha
if (no_module && capable(CAP_NET_ADMIN))
no_module = request_module("netdev-%s", name);
@@ -75666,8 +75675,8 @@ diff -urNp linux-2.6.32.48/net/core/dev.c linux-2.6.32.48/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.48/net/core/flow.c linux-2.6.32.48/net/core/flow.c
---- linux-2.6.32.48/net/core/flow.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/core/flow.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/core/flow.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/core/flow.c 2011-11-15 19:59:43.000000000 -0500
@@ -35,11 +35,11 @@ struct flow_cache_entry {
atomic_t *object_ref;
};
@@ -75728,8 +75737,8 @@ diff -urNp linux-2.6.32.48/net/core/flow.c linux-2.6.32.48/net/core/flow.c
if (!fle->object || fle->genid == genid)
continue;
diff -urNp linux-2.6.32.48/net/core/rtnetlink.c linux-2.6.32.48/net/core/rtnetlink.c
---- linux-2.6.32.48/net/core/rtnetlink.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/core/rtnetlink.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/core/rtnetlink.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/core/rtnetlink.c 2011-11-15 19:59:43.000000000 -0500
@@ -57,7 +57,7 @@ struct rtnl_link
{
rtnl_doit_func doit;
@@ -75740,8 +75749,8 @@ diff -urNp linux-2.6.32.48/net/core/rtnetlink.c linux-2.6.32.48/net/core/rtnetli
static DEFINE_MUTEX(rtnl_mutex);
diff -urNp linux-2.6.32.48/net/core/scm.c linux-2.6.32.48/net/core/scm.c
---- linux-2.6.32.48/net/core/scm.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/core/scm.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/core/scm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/core/scm.c 2011-11-15 19:59:43.000000000 -0500
@@ -191,7 +191,7 @@ error:
int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
{
@@ -75779,8 +75788,8 @@ diff -urNp linux-2.6.32.48/net/core/scm.c linux-2.6.32.48/net/core/scm.c
{
int new_fd;
diff -urNp linux-2.6.32.48/net/core/secure_seq.c linux-2.6.32.48/net/core/secure_seq.c
---- linux-2.6.32.48/net/core/secure_seq.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/core/secure_seq.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/core/secure_seq.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/core/secure_seq.c 2011-11-15 19:59:43.000000000 -0500
@@ -57,7 +57,7 @@ __u32 secure_tcpv6_sequence_number(__be3
EXPORT_SYMBOL(secure_tcpv6_sequence_number);
@@ -75799,8 +75808,8 @@ diff -urNp linux-2.6.32.48/net/core/secure_seq.c linux-2.6.32.48/net/core/secure
}
#endif
diff -urNp linux-2.6.32.48/net/core/skbuff.c linux-2.6.32.48/net/core/skbuff.c
---- linux-2.6.32.48/net/core/skbuff.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/core/skbuff.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/core/skbuff.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/core/skbuff.c 2011-11-15 19:59:43.000000000 -0500
@@ -1544,6 +1544,8 @@ int skb_splice_bits(struct sk_buff *skb,
struct sk_buff *frag_iter;
struct sock *sk = skb->sk;
@@ -75811,8 +75820,8 @@ diff -urNp linux-2.6.32.48/net/core/skbuff.c linux-2.6.32.48/net/core/skbuff.c
* __skb_splice_bits() only fails if the output has no room left,
* so no point in going over the frag_list for the error case.
diff -urNp linux-2.6.32.48/net/core/sock.c linux-2.6.32.48/net/core/sock.c
---- linux-2.6.32.48/net/core/sock.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/core/sock.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/core/sock.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/core/sock.c 2011-11-15 19:59:43.000000000 -0500
@@ -864,11 +864,15 @@ int sock_getsockopt(struct socket *sock,
break;
@@ -75840,8 +75849,8 @@ diff -urNp linux-2.6.32.48/net/core/sock.c linux-2.6.32.48/net/core/sock.c
EXPORT_SYMBOL(sock_init_data);
diff -urNp linux-2.6.32.48/net/decnet/sysctl_net_decnet.c linux-2.6.32.48/net/decnet/sysctl_net_decnet.c
---- linux-2.6.32.48/net/decnet/sysctl_net_decnet.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/decnet/sysctl_net_decnet.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/decnet/sysctl_net_decnet.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/decnet/sysctl_net_decnet.c 2011-11-15 19:59:43.000000000 -0500
@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
if (len > *lenp) len = *lenp;
@@ -75861,8 +75870,8 @@ diff -urNp linux-2.6.32.48/net/decnet/sysctl_net_decnet.c linux-2.6.32.48/net/de
*lenp = len;
diff -urNp linux-2.6.32.48/net/econet/Kconfig linux-2.6.32.48/net/econet/Kconfig
---- linux-2.6.32.48/net/econet/Kconfig 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/econet/Kconfig 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/econet/Kconfig 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/econet/Kconfig 2011-11-15 19:59:43.000000000 -0500
@@ -4,7 +4,7 @@
config ECONET
@@ -75873,8 +75882,8 @@ diff -urNp linux-2.6.32.48/net/econet/Kconfig linux-2.6.32.48/net/econet/Kconfig
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.48/net/ieee802154/dgram.c linux-2.6.32.48/net/ieee802154/dgram.c
---- linux-2.6.32.48/net/ieee802154/dgram.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/ieee802154/dgram.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ieee802154/dgram.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ieee802154/dgram.c 2011-11-15 19:59:43.000000000 -0500
@@ -318,7 +318,7 @@ out:
static int dgram_rcv_skb(struct sock *sk, struct sk_buff *skb)
{
@@ -75885,8 +75894,8 @@ diff -urNp linux-2.6.32.48/net/ieee802154/dgram.c linux-2.6.32.48/net/ieee802154
return NET_RX_DROP;
}
diff -urNp linux-2.6.32.48/net/ieee802154/raw.c linux-2.6.32.48/net/ieee802154/raw.c
---- linux-2.6.32.48/net/ieee802154/raw.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/ieee802154/raw.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ieee802154/raw.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ieee802154/raw.c 2011-11-15 19:59:43.000000000 -0500
@@ -206,7 +206,7 @@ out:
static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
{
@@ -75897,8 +75906,8 @@ diff -urNp linux-2.6.32.48/net/ieee802154/raw.c linux-2.6.32.48/net/ieee802154/r
return NET_RX_DROP;
}
diff -urNp linux-2.6.32.48/net/ipv4/inet_diag.c linux-2.6.32.48/net/ipv4/inet_diag.c
---- linux-2.6.32.48/net/ipv4/inet_diag.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/inet_diag.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/inet_diag.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/inet_diag.c 2011-11-15 19:59:43.000000000 -0500
@@ -113,8 +113,13 @@ static int inet_csk_diag_fill(struct soc
r->idiag_retrans = 0;
@@ -75960,8 +75969,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/inet_diag.c linux-2.6.32.48/net/ipv4/inet_di
tmo = req->expires - jiffies;
if (tmo < 0)
diff -urNp linux-2.6.32.48/net/ipv4/inet_hashtables.c linux-2.6.32.48/net/ipv4/inet_hashtables.c
---- linux-2.6.32.48/net/ipv4/inet_hashtables.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/inet_hashtables.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/inet_hashtables.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/inet_hashtables.c 2011-11-15 19:59:43.000000000 -0500
@@ -18,12 +18,15 @@
#include <linux/sched.h>
#include <linux/slab.h>
@@ -75988,8 +75997,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/inet_hashtables.c linux-2.6.32.48/net/ipv4/i
inet_twsk_deschedule(tw, death_row);
inet_twsk_put(tw);
diff -urNp linux-2.6.32.48/net/ipv4/inetpeer.c linux-2.6.32.48/net/ipv4/inetpeer.c
---- linux-2.6.32.48/net/ipv4/inetpeer.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/inetpeer.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/inetpeer.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/inetpeer.c 2011-11-15 19:59:43.000000000 -0500
@@ -367,6 +367,8 @@ struct inet_peer *inet_getpeer(__be32 da
struct inet_peer *p, *n;
struct inet_peer **stack[PEER_MAXDEPTH], ***stackptr;
@@ -76009,8 +76018,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/inetpeer.c linux-2.6.32.48/net/ipv4/inetpeer
n->tcp_ts_stamp = 0;
diff -urNp linux-2.6.32.48/net/ipv4/ipconfig.c linux-2.6.32.48/net/ipv4/ipconfig.c
---- linux-2.6.32.48/net/ipv4/ipconfig.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/ipconfig.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/ipconfig.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/ipconfig.c 2011-11-15 19:59:43.000000000 -0500
@@ -295,7 +295,7 @@ static int __init ic_devinet_ioctl(unsig
mm_segment_t oldfs = get_fs();
@@ -76039,8 +76048,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/ipconfig.c linux-2.6.32.48/net/ipv4/ipconfig
return res;
}
diff -urNp linux-2.6.32.48/net/ipv4/ip_fragment.c linux-2.6.32.48/net/ipv4/ip_fragment.c
---- linux-2.6.32.48/net/ipv4/ip_fragment.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/ip_fragment.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/ip_fragment.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/ip_fragment.c 2011-11-15 19:59:43.000000000 -0500
@@ -255,7 +255,7 @@ static inline int ip_frag_too_far(struct
return 0;
@@ -76051,8 +76060,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/ip_fragment.c linux-2.6.32.48/net/ipv4/ip_fr
rc = qp->q.fragments && (end - start) > max;
diff -urNp linux-2.6.32.48/net/ipv4/ip_sockglue.c linux-2.6.32.48/net/ipv4/ip_sockglue.c
---- linux-2.6.32.48/net/ipv4/ip_sockglue.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/ip_sockglue.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/ip_sockglue.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/ip_sockglue.c 2011-11-15 19:59:43.000000000 -0500
@@ -1015,6 +1015,8 @@ static int do_ip_getsockopt(struct sock
int val;
int len;
@@ -76072,8 +76081,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/ip_sockglue.c linux-2.6.32.48/net/ipv4/ip_so
msg.msg_flags = 0;
diff -urNp linux-2.6.32.48/net/ipv4/netfilter/arp_tables.c linux-2.6.32.48/net/ipv4/netfilter/arp_tables.c
---- linux-2.6.32.48/net/ipv4/netfilter/arp_tables.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/netfilter/arp_tables.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/netfilter/arp_tables.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/netfilter/arp_tables.c 2011-11-15 19:59:43.000000000 -0500
@@ -934,6 +934,7 @@ static int get_info(struct net *net, voi
private = &tmp;
}
@@ -76083,8 +76092,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/netfilter/arp_tables.c linux-2.6.32.48/net/i
memcpy(info.hook_entry, private->hook_entry,
sizeof(info.hook_entry));
diff -urNp linux-2.6.32.48/net/ipv4/netfilter/ip_queue.c linux-2.6.32.48/net/ipv4/netfilter/ip_queue.c
---- linux-2.6.32.48/net/ipv4/netfilter/ip_queue.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/netfilter/ip_queue.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/netfilter/ip_queue.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/netfilter/ip_queue.c 2011-11-15 19:59:43.000000000 -0500
@@ -286,6 +286,9 @@ ipq_mangle_ipv4(ipq_verdict_msg_t *v, st
if (v->data_len < sizeof(*user_iph))
@@ -76106,8 +76115,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/netfilter/ip_queue.c linux-2.6.32.48/net/ipv
skblen = skb->len;
diff -urNp linux-2.6.32.48/net/ipv4/netfilter/ip_tables.c linux-2.6.32.48/net/ipv4/netfilter/ip_tables.c
---- linux-2.6.32.48/net/ipv4/netfilter/ip_tables.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/netfilter/ip_tables.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/netfilter/ip_tables.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/netfilter/ip_tables.c 2011-11-15 19:59:43.000000000 -0500
@@ -1141,6 +1141,7 @@ static int get_info(struct net *net, voi
private = &tmp;
}
@@ -76117,8 +76126,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/netfilter/ip_tables.c linux-2.6.32.48/net/ip
memcpy(info.hook_entry, private->hook_entry,
sizeof(info.hook_entry));
diff -urNp linux-2.6.32.48/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.48/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.32.48/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-15 19:59:43.000000000 -0500
@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
*len = 0;
@@ -76129,8 +76138,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.4
if (net_ratelimit())
printk("OOM in bsalg (%d)\n", __LINE__);
diff -urNp linux-2.6.32.48/net/ipv4/raw.c linux-2.6.32.48/net/ipv4/raw.c
---- linux-2.6.32.48/net/ipv4/raw.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/raw.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/raw.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/raw.c 2011-11-15 19:59:43.000000000 -0500
@@ -292,7 +292,7 @@ static int raw_rcv_skb(struct sock * sk,
/* Charge it to the socket. */
@@ -76202,8 +76211,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/raw.c linux-2.6.32.48/net/ipv4/raw.c
static int raw_seq_show(struct seq_file *seq, void *v)
diff -urNp linux-2.6.32.48/net/ipv4/route.c linux-2.6.32.48/net/ipv4/route.c
---- linux-2.6.32.48/net/ipv4/route.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/route.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/route.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/route.c 2011-11-15 19:59:43.000000000 -0500
@@ -269,7 +269,7 @@ static inline unsigned int rt_hash(__be3
static inline int rt_genid(struct net *net)
@@ -76232,8 +76241,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/route.c linux-2.6.32.48/net/ipv4/route.c
(jiffies ^ (jiffies >> 7))));
diff -urNp linux-2.6.32.48/net/ipv4/tcp.c linux-2.6.32.48/net/ipv4/tcp.c
---- linux-2.6.32.48/net/ipv4/tcp.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/tcp.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/tcp.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/tcp.c 2011-11-15 19:59:43.000000000 -0500
@@ -2085,6 +2085,8 @@ static int do_tcp_setsockopt(struct sock
int val;
int err = 0;
@@ -76253,8 +76262,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/tcp.c linux-2.6.32.48/net/ipv4/tcp.c
return -EFAULT;
diff -urNp linux-2.6.32.48/net/ipv4/tcp_ipv4.c linux-2.6.32.48/net/ipv4/tcp_ipv4.c
---- linux-2.6.32.48/net/ipv4/tcp_ipv4.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/tcp_ipv4.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/tcp_ipv4.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/tcp_ipv4.c 2011-11-15 19:59:43.000000000 -0500
@@ -85,6 +85,9 @@
int sysctl_tcp_tw_reuse __read_mostly;
int sysctl_tcp_low_latency __read_mostly;
@@ -76351,8 +76360,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/tcp_ipv4.c linux-2.6.32.48/net/ipv4/tcp_ipv4
#define TMPSZ 150
diff -urNp linux-2.6.32.48/net/ipv4/tcp_minisocks.c linux-2.6.32.48/net/ipv4/tcp_minisocks.c
---- linux-2.6.32.48/net/ipv4/tcp_minisocks.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/tcp_minisocks.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/tcp_minisocks.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/tcp_minisocks.c 2011-11-15 19:59:43.000000000 -0500
@@ -26,6 +26,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
@@ -76376,8 +76385,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/tcp_minisocks.c linux-2.6.32.48/net/ipv4/tcp
req->rsk_ops->send_reset(sk, skb);
diff -urNp linux-2.6.32.48/net/ipv4/tcp_output.c linux-2.6.32.48/net/ipv4/tcp_output.c
---- linux-2.6.32.48/net/ipv4/tcp_output.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/tcp_output.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/tcp_output.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/tcp_output.c 2011-11-15 19:59:43.000000000 -0500
@@ -2234,6 +2234,8 @@ struct sk_buff *tcp_make_synack(struct s
__u8 *md5_hash_location;
int mss;
@@ -76388,8 +76397,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/tcp_output.c linux-2.6.32.48/net/ipv4/tcp_ou
if (skb == NULL)
return NULL;
diff -urNp linux-2.6.32.48/net/ipv4/tcp_probe.c linux-2.6.32.48/net/ipv4/tcp_probe.c
---- linux-2.6.32.48/net/ipv4/tcp_probe.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/tcp_probe.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/tcp_probe.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/tcp_probe.c 2011-11-15 19:59:43.000000000 -0500
@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
if (cnt + width >= len)
break;
@@ -76400,8 +76409,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/tcp_probe.c linux-2.6.32.48/net/ipv4/tcp_pro
cnt += width;
}
diff -urNp linux-2.6.32.48/net/ipv4/tcp_timer.c linux-2.6.32.48/net/ipv4/tcp_timer.c
---- linux-2.6.32.48/net/ipv4/tcp_timer.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/tcp_timer.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/tcp_timer.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/tcp_timer.c 2011-11-15 19:59:43.000000000 -0500
@@ -21,6 +21,10 @@
#include <linux/module.h>
#include <net/tcp.h>
@@ -76428,8 +76437,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/tcp_timer.c linux-2.6.32.48/net/ipv4/tcp_tim
/* Has it gone just too far? */
tcp_write_err(sk);
diff -urNp linux-2.6.32.48/net/ipv4/udp.c linux-2.6.32.48/net/ipv4/udp.c
---- linux-2.6.32.48/net/ipv4/udp.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv4/udp.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv4/udp.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv4/udp.c 2011-11-15 19:59:43.000000000 -0500
@@ -86,6 +86,7 @@
#include <linux/types.h>
#include <linux/fcntl.h>
@@ -76525,8 +76534,8 @@ diff -urNp linux-2.6.32.48/net/ipv4/udp.c linux-2.6.32.48/net/ipv4/udp.c
int udp4_seq_show(struct seq_file *seq, void *v)
diff -urNp linux-2.6.32.48/net/ipv6/addrconf.c linux-2.6.32.48/net/ipv6/addrconf.c
---- linux-2.6.32.48/net/ipv6/addrconf.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv6/addrconf.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv6/addrconf.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv6/addrconf.c 2011-11-15 19:59:43.000000000 -0500
@@ -2053,7 +2053,7 @@ int addrconf_set_dstaddr(struct net *net
p.iph.ihl = 5;
p.iph.protocol = IPPROTO_IPV6;
@@ -76537,8 +76546,8 @@ diff -urNp linux-2.6.32.48/net/ipv6/addrconf.c linux-2.6.32.48/net/ipv6/addrconf
if (ops->ndo_do_ioctl) {
mm_segment_t oldfs = get_fs();
diff -urNp linux-2.6.32.48/net/ipv6/inet6_connection_sock.c linux-2.6.32.48/net/ipv6/inet6_connection_sock.c
---- linux-2.6.32.48/net/ipv6/inet6_connection_sock.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/ipv6/inet6_connection_sock.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv6/inet6_connection_sock.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv6/inet6_connection_sock.c 2011-11-15 19:59:43.000000000 -0500
@@ -152,7 +152,7 @@ void __inet6_csk_dst_store(struct sock *
#ifdef CONFIG_XFRM
{
@@ -76558,8 +76567,8 @@ diff -urNp linux-2.6.32.48/net/ipv6/inet6_connection_sock.c linux-2.6.32.48/net/
dst_release(dst);
dst = NULL;
diff -urNp linux-2.6.32.48/net/ipv6/inet6_hashtables.c linux-2.6.32.48/net/ipv6/inet6_hashtables.c
---- linux-2.6.32.48/net/ipv6/inet6_hashtables.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv6/inet6_hashtables.c 2011-11-12 12:46:51.000000000 -0500
+--- linux-2.6.32.48/net/ipv6/inet6_hashtables.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv6/inet6_hashtables.c 2011-11-15 19:59:43.000000000 -0500
@@ -119,7 +119,7 @@ out:
}
EXPORT_SYMBOL(__inet6_lookup_established);
@@ -76570,8 +76579,8 @@ diff -urNp linux-2.6.32.48/net/ipv6/inet6_hashtables.c linux-2.6.32.48/net/ipv6/
const struct in6_addr *daddr,
const int dif)
diff -urNp linux-2.6.32.48/net/ipv6/ipv6_sockglue.c linux-2.6.32.48/net/ipv6/ipv6_sockglue.c
---- linux-2.6.32.48/net/ipv6/ipv6_sockglue.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/ipv6/ipv6_sockglue.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/ipv6/ipv6_sockglue.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv6/ipv6_sockglue.c 2011-11-15 19:59:43.000000000 -0500
@@ -130,6 +130,8 @@ static int do_ipv6_setsockopt(struct soc
int val, valbool;
int retv = -ENOPROTOOPT;
@@ -76600,8 +76609,8 @@ diff -urNp linux-2.6.32.48/net/ipv6/ipv6_sockglue.c linux-2.6.32.48/net/ipv6/ipv
msg.msg_flags = 0;
diff -urNp linux-2.6.32.48/net/ipv6/netfilter/ip6_queue.c linux-2.6.32.48/net/ipv6/netfilter/ip6_queue.c
---- linux-2.6.32.48/net/ipv6/netfilter/ip6_queue.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/ipv6/netfilter/ip6_queue.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/ipv6/netfilter/ip6_queue.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv6/netfilter/ip6_queue.c 2011-11-15 19:59:43.000000000 -0500
@@ -287,6 +287,9 @@ ipq_mangle_ipv6(ipq_verdict_msg_t *v, st
if (v->data_len < sizeof(*user_iph))
@@ -76623,8 +76632,8 @@ diff -urNp linux-2.6.32.48/net/ipv6/netfilter/ip6_queue.c linux-2.6.32.48/net/ip
skblen = skb->len;
diff -urNp linux-2.6.32.48/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.48/net/ipv6/netfilter/ip6_tables.c
---- linux-2.6.32.48/net/ipv6/netfilter/ip6_tables.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv6/netfilter/ip6_tables.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/ipv6/netfilter/ip6_tables.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv6/netfilter/ip6_tables.c 2011-11-15 19:59:43.000000000 -0500
@@ -1173,6 +1173,7 @@ static int get_info(struct net *net, voi
private = &tmp;
}
@@ -76634,8 +76643,8 @@ diff -urNp linux-2.6.32.48/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.48/net/i
memcpy(info.hook_entry, private->hook_entry,
sizeof(info.hook_entry));
diff -urNp linux-2.6.32.48/net/ipv6/raw.c linux-2.6.32.48/net/ipv6/raw.c
---- linux-2.6.32.48/net/ipv6/raw.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/ipv6/raw.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/ipv6/raw.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv6/raw.c 2011-11-15 19:59:43.000000000 -0500
@@ -375,14 +375,14 @@ static inline int rawv6_rcv_skb(struct s
{
if ((raw6_sk(sk)->checksum || sk->sk_filter) &&
@@ -76751,8 +76760,8 @@ diff -urNp linux-2.6.32.48/net/ipv6/raw.c linux-2.6.32.48/net/ipv6/raw.c
static int raw6_seq_show(struct seq_file *seq, void *v)
diff -urNp linux-2.6.32.48/net/ipv6/tcp_ipv6.c linux-2.6.32.48/net/ipv6/tcp_ipv6.c
---- linux-2.6.32.48/net/ipv6/tcp_ipv6.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv6/tcp_ipv6.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/ipv6/tcp_ipv6.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv6/tcp_ipv6.c 2011-11-15 19:59:43.000000000 -0500
@@ -89,6 +89,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
}
#endif
@@ -76853,8 +76862,8 @@ diff -urNp linux-2.6.32.48/net/ipv6/tcp_ipv6.c linux-2.6.32.48/net/ipv6/tcp_ipv6
static int tcp6_seq_show(struct seq_file *seq, void *v)
diff -urNp linux-2.6.32.48/net/ipv6/udp.c linux-2.6.32.48/net/ipv6/udp.c
---- linux-2.6.32.48/net/ipv6/udp.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/ipv6/udp.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/ipv6/udp.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/ipv6/udp.c 2011-11-15 19:59:43.000000000 -0500
@@ -49,6 +49,10 @@
#include <linux/seq_file.h>
#include "udp_impl.h"
@@ -76902,8 +76911,8 @@ diff -urNp linux-2.6.32.48/net/ipv6/udp.c linux-2.6.32.48/net/ipv6/udp.c
int udp6_seq_show(struct seq_file *seq, void *v)
diff -urNp linux-2.6.32.48/net/irda/ircomm/ircomm_tty.c linux-2.6.32.48/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.32.48/net/irda/ircomm/ircomm_tty.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/irda/ircomm/ircomm_tty.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/irda/ircomm/ircomm_tty.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/irda/ircomm/ircomm_tty.c 2011-11-15 19:59:43.000000000 -0500
@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
add_wait_queue(&self->open_wait, &wait);
@@ -77027,8 +77036,8 @@ diff -urNp linux-2.6.32.48/net/irda/ircomm/ircomm_tty.c linux-2.6.32.48/net/irda
seq_printf(m, "Max header size: %d\n", self->max_header_size);
diff -urNp linux-2.6.32.48/net/iucv/af_iucv.c linux-2.6.32.48/net/iucv/af_iucv.c
---- linux-2.6.32.48/net/iucv/af_iucv.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/iucv/af_iucv.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/iucv/af_iucv.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/iucv/af_iucv.c 2011-11-15 19:59:43.000000000 -0500
@@ -651,10 +651,10 @@ static int iucv_sock_autobind(struct soc
write_lock_bh(&iucv_sk_list.lock);
@@ -77043,8 +77052,8 @@ diff -urNp linux-2.6.32.48/net/iucv/af_iucv.c linux-2.6.32.48/net/iucv/af_iucv.c
write_unlock_bh(&iucv_sk_list.lock);
diff -urNp linux-2.6.32.48/net/key/af_key.c linux-2.6.32.48/net/key/af_key.c
---- linux-2.6.32.48/net/key/af_key.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/key/af_key.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/key/af_key.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/key/af_key.c 2011-11-15 19:59:43.000000000 -0500
@@ -2489,6 +2489,8 @@ static int pfkey_migrate(struct sock *sk
struct xfrm_migrate m[XFRM_MAX_DEPTH];
struct xfrm_kmaddress k;
@@ -77067,8 +77076,8 @@ diff -urNp linux-2.6.32.48/net/key/af_key.c linux-2.6.32.48/net/key/af_key.c
sk_rmem_alloc_get(s),
sk_wmem_alloc_get(s),
diff -urNp linux-2.6.32.48/net/lapb/lapb_iface.c linux-2.6.32.48/net/lapb/lapb_iface.c
---- linux-2.6.32.48/net/lapb/lapb_iface.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/lapb/lapb_iface.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/lapb/lapb_iface.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/lapb/lapb_iface.c 2011-11-15 19:59:43.000000000 -0500
@@ -157,7 +157,7 @@ int lapb_register(struct net_device *dev
goto out;
@@ -77133,8 +77142,8 @@ diff -urNp linux-2.6.32.48/net/lapb/lapb_iface.c linux-2.6.32.48/net/lapb/lapb_i
}
diff -urNp linux-2.6.32.48/net/mac80211/cfg.c linux-2.6.32.48/net/mac80211/cfg.c
---- linux-2.6.32.48/net/mac80211/cfg.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/mac80211/cfg.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/mac80211/cfg.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/mac80211/cfg.c 2011-11-15 19:59:43.000000000 -0500
@@ -1369,7 +1369,7 @@ static int ieee80211_set_bitrate_mask(st
return err;
}
@@ -77145,8 +77154,8 @@ diff -urNp linux-2.6.32.48/net/mac80211/cfg.c linux-2.6.32.48/net/mac80211/cfg.c
.del_virtual_intf = ieee80211_del_iface,
.change_virtual_intf = ieee80211_change_iface,
diff -urNp linux-2.6.32.48/net/mac80211/cfg.h linux-2.6.32.48/net/mac80211/cfg.h
---- linux-2.6.32.48/net/mac80211/cfg.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/mac80211/cfg.h 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/mac80211/cfg.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/mac80211/cfg.h 2011-11-15 19:59:43.000000000 -0500
@@ -4,6 +4,6 @@
#ifndef __CFG_H
#define __CFG_H
@@ -77156,8 +77165,8 @@ diff -urNp linux-2.6.32.48/net/mac80211/cfg.h linux-2.6.32.48/net/mac80211/cfg.h
#endif /* __CFG_H */
diff -urNp linux-2.6.32.48/net/mac80211/debugfs_key.c linux-2.6.32.48/net/mac80211/debugfs_key.c
---- linux-2.6.32.48/net/mac80211/debugfs_key.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/mac80211/debugfs_key.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/mac80211/debugfs_key.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/mac80211/debugfs_key.c 2011-11-15 19:59:43.000000000 -0500
@@ -211,9 +211,13 @@ static ssize_t key_key_read(struct file
size_t count, loff_t *ppos)
{
@@ -77174,8 +77183,8 @@ diff -urNp linux-2.6.32.48/net/mac80211/debugfs_key.c linux-2.6.32.48/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.48/net/mac80211/debugfs_sta.c linux-2.6.32.48/net/mac80211/debugfs_sta.c
---- linux-2.6.32.48/net/mac80211/debugfs_sta.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/mac80211/debugfs_sta.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/mac80211/debugfs_sta.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/mac80211/debugfs_sta.c 2011-11-15 19:59:43.000000000 -0500
@@ -124,6 +124,8 @@ static ssize_t sta_agg_status_read(struc
int i;
struct sta_info *sta = file->private_data;
@@ -77186,8 +77195,8 @@ diff -urNp linux-2.6.32.48/net/mac80211/debugfs_sta.c linux-2.6.32.48/net/mac802
p += scnprintf(p, sizeof(buf)+buf-p, "next dialog_token is %#02x\n",
sta->ampdu_mlme.dialog_token_allocator + 1);
diff -urNp linux-2.6.32.48/net/mac80211/ieee80211_i.h linux-2.6.32.48/net/mac80211/ieee80211_i.h
---- linux-2.6.32.48/net/mac80211/ieee80211_i.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/mac80211/ieee80211_i.h 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/mac80211/ieee80211_i.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/mac80211/ieee80211_i.h 2011-11-15 19:59:43.000000000 -0500
@@ -25,6 +25,7 @@
#include <linux/etherdevice.h>
#include <net/cfg80211.h>
@@ -77206,8 +77215,8 @@ diff -urNp linux-2.6.32.48/net/mac80211/ieee80211_i.h linux-2.6.32.48/net/mac802
/* 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.48/net/mac80211/iface.c linux-2.6.32.48/net/mac80211/iface.c
---- linux-2.6.32.48/net/mac80211/iface.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/mac80211/iface.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/mac80211/iface.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/mac80211/iface.c 2011-11-15 19:59:43.000000000 -0500
@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
break;
}
@@ -77263,8 +77272,8 @@ diff -urNp linux-2.6.32.48/net/mac80211/iface.c linux-2.6.32.48/net/mac80211/ifa
ieee80211_stop_device(local);
diff -urNp linux-2.6.32.48/net/mac80211/main.c linux-2.6.32.48/net/mac80211/main.c
---- linux-2.6.32.48/net/mac80211/main.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/mac80211/main.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/mac80211/main.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/mac80211/main.c 2011-11-15 19:59:43.000000000 -0500
@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
local->hw.conf.power_level = power;
}
@@ -77275,8 +77284,8 @@ diff -urNp linux-2.6.32.48/net/mac80211/main.c linux-2.6.32.48/net/mac80211/main
/*
* Goal:
diff -urNp linux-2.6.32.48/net/mac80211/mlme.c linux-2.6.32.48/net/mac80211/mlme.c
---- linux-2.6.32.48/net/mac80211/mlme.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/mac80211/mlme.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/mac80211/mlme.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/mac80211/mlme.c 2011-11-15 19:59:43.000000000 -0500
@@ -1438,6 +1438,8 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee
bool have_higher_than_11mbit = false, newsta = false;
u16 ap_ht_cap_flags;
@@ -77287,8 +77296,8 @@ diff -urNp linux-2.6.32.48/net/mac80211/mlme.c linux-2.6.32.48/net/mac80211/mlme
* AssocResp and ReassocResp have identical structure, so process both
* of them in this function.
diff -urNp linux-2.6.32.48/net/mac80211/pm.c linux-2.6.32.48/net/mac80211/pm.c
---- linux-2.6.32.48/net/mac80211/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/mac80211/pm.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/mac80211/pm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/mac80211/pm.c 2011-11-15 19:59:43.000000000 -0500
@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
}
@@ -77299,8 +77308,8 @@ diff -urNp linux-2.6.32.48/net/mac80211/pm.c linux-2.6.32.48/net/mac80211/pm.c
local->suspended = true;
diff -urNp linux-2.6.32.48/net/mac80211/rate.c linux-2.6.32.48/net/mac80211/rate.c
---- linux-2.6.32.48/net/mac80211/rate.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/mac80211/rate.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/mac80211/rate.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/mac80211/rate.c 2011-11-15 19:59:43.000000000 -0500
@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
struct rate_control_ref *ref, *old;
@@ -77311,8 +77320,8 @@ diff -urNp linux-2.6.32.48/net/mac80211/rate.c linux-2.6.32.48/net/mac80211/rate
ref = rate_control_alloc(name, local);
diff -urNp linux-2.6.32.48/net/mac80211/tx.c linux-2.6.32.48/net/mac80211/tx.c
---- linux-2.6.32.48/net/mac80211/tx.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/mac80211/tx.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/mac80211/tx.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/mac80211/tx.c 2011-11-15 19:59:43.000000000 -0500
@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
return cpu_to_le16(dur);
}
@@ -77323,8 +77332,8 @@ diff -urNp linux-2.6.32.48/net/mac80211/tx.c linux-2.6.32.48/net/mac80211/tx.c
{
return local == wdev_priv(dev->ieee80211_ptr);
diff -urNp linux-2.6.32.48/net/mac80211/util.c linux-2.6.32.48/net/mac80211/util.c
---- linux-2.6.32.48/net/mac80211/util.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/mac80211/util.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/mac80211/util.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/mac80211/util.c 2011-11-15 19:59:43.000000000 -0500
@@ -1042,7 +1042,7 @@ int ieee80211_reconfig(struct ieee80211_
local->resuming = true;
@@ -77335,8 +77344,8 @@ diff -urNp linux-2.6.32.48/net/mac80211/util.c linux-2.6.32.48/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.48/net/netfilter/ipvs/ip_vs_app.c linux-2.6.32.48/net/netfilter/ipvs/ip_vs_app.c
---- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_app.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_app.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_app.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_app.c 2011-11-15 19:59:43.000000000 -0500
@@ -564,7 +564,7 @@ static const struct file_operations ip_v
.open = ip_vs_app_open,
.read = seq_read,
@@ -77347,8 +77356,8 @@ diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_app.c linux-2.6.32.48/net/ne
#endif
diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.32.48/net/netfilter/ipvs/ip_vs_conn.c
---- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_conn.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_conn.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_conn.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_conn.c 2011-11-15 19:59:43.000000000 -0500
@@ -453,10 +453,10 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s
/* if the connection is not template and is created
* by sync, preserve the activity flag.
@@ -77399,8 +77408,8 @@ diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.32.48/net/n
if (!todrop_rate[i]) return 0;
diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_core.c linux-2.6.32.48/net/netfilter/ipvs/ip_vs_core.c
---- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_core.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_core.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_core.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_core.c 2011-11-15 19:59:43.000000000 -0500
@@ -485,7 +485,7 @@ int ip_vs_leave(struct ip_vs_service *sv
ret = cp->packet_xmit(skb, cp, pp);
/* do not touch skb anymore */
@@ -77420,8 +77429,8 @@ diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_core.c linux-2.6.32.48/net/n
(ip_vs_sync_state & IP_VS_STATE_MASTER) &&
(((cp->protocol != IPPROTO_TCP ||
diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.32.48/net/netfilter/ipvs/ip_vs_ctl.c
---- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-15 19:59:43.000000000 -0500
@@ -792,7 +792,7 @@ __ip_vs_update_dest(struct ip_vs_service
ip_vs_rs_hash(dest);
write_unlock_bh(&__ip_vs_rs_lock);
@@ -77495,8 +77504,8 @@ diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.32.48/net/ne
NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.32.48/net/netfilter/ipvs/ip_vs_sync.c
---- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_sync.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_sync.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_sync.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_sync.c 2011-11-15 19:59:43.000000000 -0500
@@ -438,7 +438,7 @@ static void ip_vs_process_message(const
if (opt)
@@ -77507,8 +77516,8 @@ diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.32.48/net/n
cp->old_state = cp->state;
/*
diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.32.48/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_xmit.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-15 19:59:43.000000000 -0500
@@ -875,7 +875,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
else
rc = NF_ACCEPT;
@@ -77528,8 +77537,8 @@ diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.32.48/net/n
}
diff -urNp linux-2.6.32.48/net/netfilter/Kconfig linux-2.6.32.48/net/netfilter/Kconfig
---- linux-2.6.32.48/net/netfilter/Kconfig 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/netfilter/Kconfig 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/netfilter/Kconfig 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/netfilter/Kconfig 2011-11-15 19:59:43.000000000 -0500
@@ -635,6 +635,16 @@ config NETFILTER_XT_MATCH_ESP
To compile it as a module, choose M here. If unsure, say N.
@@ -77548,8 +77557,8 @@ diff -urNp linux-2.6.32.48/net/netfilter/Kconfig linux-2.6.32.48/net/netfilter/K
tristate '"hashlimit" match support'
depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
diff -urNp linux-2.6.32.48/net/netfilter/Makefile linux-2.6.32.48/net/netfilter/Makefile
---- linux-2.6.32.48/net/netfilter/Makefile 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/netfilter/Makefile 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/netfilter/Makefile 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/netfilter/Makefile 2011-11-15 19:59:43.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
@@ -77559,8 +77568,8 @@ diff -urNp linux-2.6.32.48/net/netfilter/Makefile linux-2.6.32.48/net/netfilter/
obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
diff -urNp linux-2.6.32.48/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.48/net/netfilter/nf_conntrack_netlink.c
---- linux-2.6.32.48/net/netfilter/nf_conntrack_netlink.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/netfilter/nf_conntrack_netlink.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/netfilter/nf_conntrack_netlink.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/netfilter/nf_conntrack_netlink.c 2011-11-15 19:59:43.000000000 -0500
@@ -706,7 +706,7 @@ ctnetlink_parse_tuple_proto(struct nlatt
static int
ctnetlink_parse_tuple(const struct nlattr * const cda[],
@@ -77571,8 +77580,8 @@ diff -urNp linux-2.6.32.48/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.48/
struct nlattr *tb[CTA_TUPLE_MAX+1];
int err;
diff -urNp linux-2.6.32.48/net/netfilter/nfnetlink_log.c linux-2.6.32.48/net/netfilter/nfnetlink_log.c
---- linux-2.6.32.48/net/netfilter/nfnetlink_log.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/netfilter/nfnetlink_log.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/netfilter/nfnetlink_log.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/netfilter/nfnetlink_log.c 2011-11-15 19:59:43.000000000 -0500
@@ -68,7 +68,7 @@ struct nfulnl_instance {
};
@@ -77593,7 +77602,7 @@ diff -urNp linux-2.6.32.48/net/netfilter/nfnetlink_log.c linux-2.6.32.48/net/net
struct nlattr *nla;
diff -urNp linux-2.6.32.48/net/netfilter/xt_gradm.c linux-2.6.32.48/net/netfilter/xt_gradm.c
--- linux-2.6.32.48/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/net/netfilter/xt_gradm.c 2011-11-12 12:46:53.000000000 -0500
++++ linux-2.6.32.48/net/netfilter/xt_gradm.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,51 @@
+/*
+ * gradm match for netfilter
@@ -77647,8 +77656,8 @@ diff -urNp linux-2.6.32.48/net/netfilter/xt_gradm.c linux-2.6.32.48/net/netfilte
+MODULE_ALIAS("ipt_gradm");
+MODULE_ALIAS("ip6t_gradm");
diff -urNp linux-2.6.32.48/net/netlink/af_netlink.c linux-2.6.32.48/net/netlink/af_netlink.c
---- linux-2.6.32.48/net/netlink/af_netlink.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/netlink/af_netlink.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/netlink/af_netlink.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/netlink/af_netlink.c 2011-11-15 19:59:43.000000000 -0500
@@ -733,7 +733,7 @@ static void netlink_overrun(struct sock
sk->sk_error_report(sk);
}
@@ -77684,8 +77693,8 @@ diff -urNp linux-2.6.32.48/net/netlink/af_netlink.c linux-2.6.32.48/net/netlink/
}
diff -urNp linux-2.6.32.48/net/netrom/af_netrom.c linux-2.6.32.48/net/netrom/af_netrom.c
---- linux-2.6.32.48/net/netrom/af_netrom.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/netrom/af_netrom.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/netrom/af_netrom.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/netrom/af_netrom.c 2011-11-15 19:59:43.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);
@@ -77703,8 +77712,8 @@ diff -urNp linux-2.6.32.48/net/netrom/af_netrom.c linux-2.6.32.48/net/netrom/af_
*uaddr_len = sizeof(struct sockaddr_ax25);
}
diff -urNp linux-2.6.32.48/net/packet/af_packet.c linux-2.6.32.48/net/packet/af_packet.c
---- linux-2.6.32.48/net/packet/af_packet.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/packet/af_packet.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/packet/af_packet.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/packet/af_packet.c 2011-11-15 19:59:43.000000000 -0500
@@ -2429,7 +2429,11 @@ static int packet_seq_show(struct seq_fi
seq_printf(seq,
@@ -77718,8 +77727,8 @@ diff -urNp linux-2.6.32.48/net/packet/af_packet.c linux-2.6.32.48/net/packet/af_
s->sk_type,
ntohs(po->num),
diff -urNp linux-2.6.32.48/net/phonet/af_phonet.c linux-2.6.32.48/net/phonet/af_phonet.c
---- linux-2.6.32.48/net/phonet/af_phonet.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/phonet/af_phonet.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/phonet/af_phonet.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/phonet/af_phonet.c 2011-11-15 19:59:43.000000000 -0500
@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
{
struct phonet_protocol *pp;
@@ -77739,8 +77748,8 @@ diff -urNp linux-2.6.32.48/net/phonet/af_phonet.c linux-2.6.32.48/net/phonet/af_
err = proto_register(pp->prot, 1);
diff -urNp linux-2.6.32.48/net/phonet/datagram.c linux-2.6.32.48/net/phonet/datagram.c
---- linux-2.6.32.48/net/phonet/datagram.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/phonet/datagram.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/phonet/datagram.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/phonet/datagram.c 2011-11-15 19:59:43.000000000 -0500
@@ -162,7 +162,7 @@ static int pn_backlog_rcv(struct sock *s
if (err < 0) {
kfree_skb(skb);
@@ -77751,8 +77760,8 @@ diff -urNp linux-2.6.32.48/net/phonet/datagram.c linux-2.6.32.48/net/phonet/data
return err ? NET_RX_DROP : NET_RX_SUCCESS;
}
diff -urNp linux-2.6.32.48/net/phonet/pep.c linux-2.6.32.48/net/phonet/pep.c
---- linux-2.6.32.48/net/phonet/pep.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/phonet/pep.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/phonet/pep.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/phonet/pep.c 2011-11-15 19:59:43.000000000 -0500
@@ -348,7 +348,7 @@ static int pipe_do_rcv(struct sock *sk,
case PNS_PEP_CTRL_REQ:
@@ -77778,8 +77787,8 @@ diff -urNp linux-2.6.32.48/net/phonet/pep.c linux-2.6.32.48/net/phonet/pep.c
break;
}
diff -urNp linux-2.6.32.48/net/phonet/socket.c linux-2.6.32.48/net/phonet/socket.c
---- linux-2.6.32.48/net/phonet/socket.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/phonet/socket.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/phonet/socket.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/phonet/socket.c 2011-11-15 19:59:43.000000000 -0500
@@ -482,8 +482,13 @@ static int pn_sock_seq_show(struct seq_f
sk->sk_state,
sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
@@ -77797,8 +77806,8 @@ diff -urNp linux-2.6.32.48/net/phonet/socket.c linux-2.6.32.48/net/phonet/socket
seq_printf(seq, "%*s\n", 127 - len, "");
return 0;
diff -urNp linux-2.6.32.48/net/rds/cong.c linux-2.6.32.48/net/rds/cong.c
---- linux-2.6.32.48/net/rds/cong.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rds/cong.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rds/cong.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rds/cong.c 2011-11-15 19:59:43.000000000 -0500
@@ -77,7 +77,7 @@
* finds that the saved generation number is smaller than the global generation
* number, it wakes up the process.
@@ -77827,8 +77836,8 @@ diff -urNp linux-2.6.32.48/net/rds/cong.c linux-2.6.32.48/net/rds/cong.c
if (likely(*recent == gen))
return 0;
diff -urNp linux-2.6.32.48/net/rds/iw_rdma.c linux-2.6.32.48/net/rds/iw_rdma.c
---- linux-2.6.32.48/net/rds/iw_rdma.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rds/iw_rdma.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rds/iw_rdma.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rds/iw_rdma.c 2011-11-15 19:59:43.000000000 -0500
@@ -181,6 +181,8 @@ int rds_iw_update_cm_id(struct rds_iw_de
struct rdma_cm_id *pcm_id;
int rc;
@@ -77839,8 +77848,8 @@ diff -urNp linux-2.6.32.48/net/rds/iw_rdma.c linux-2.6.32.48/net/rds/iw_rdma.c
dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr;
diff -urNp linux-2.6.32.48/net/rds/Kconfig linux-2.6.32.48/net/rds/Kconfig
---- linux-2.6.32.48/net/rds/Kconfig 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rds/Kconfig 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rds/Kconfig 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rds/Kconfig 2011-11-15 19:59:43.000000000 -0500
@@ -1,7 +1,7 @@
config RDS
@@ -77851,8 +77860,8 @@ diff -urNp linux-2.6.32.48/net/rds/Kconfig linux-2.6.32.48/net/rds/Kconfig
The RDS (Reliable Datagram Sockets) protocol provides reliable,
sequenced delivery of datagrams over Infiniband, iWARP,
diff -urNp linux-2.6.32.48/net/rds/tcp.c linux-2.6.32.48/net/rds/tcp.c
---- linux-2.6.32.48/net/rds/tcp.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rds/tcp.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rds/tcp.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rds/tcp.c 2011-11-15 19:59:43.000000000 -0500
@@ -57,7 +57,7 @@ void rds_tcp_nonagle(struct socket *sock
int val = 1;
@@ -77863,8 +77872,8 @@ diff -urNp linux-2.6.32.48/net/rds/tcp.c linux-2.6.32.48/net/rds/tcp.c
set_fs(oldfs);
}
diff -urNp linux-2.6.32.48/net/rds/tcp_send.c linux-2.6.32.48/net/rds/tcp_send.c
---- linux-2.6.32.48/net/rds/tcp_send.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rds/tcp_send.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rds/tcp_send.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rds/tcp_send.c 2011-11-15 19:59:43.000000000 -0500
@@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *
oldfs = get_fs();
@@ -77875,8 +77884,8 @@ diff -urNp linux-2.6.32.48/net/rds/tcp_send.c linux-2.6.32.48/net/rds/tcp_send.c
set_fs(oldfs);
}
diff -urNp linux-2.6.32.48/net/rxrpc/af_rxrpc.c linux-2.6.32.48/net/rxrpc/af_rxrpc.c
---- linux-2.6.32.48/net/rxrpc/af_rxrpc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rxrpc/af_rxrpc.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rxrpc/af_rxrpc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rxrpc/af_rxrpc.c 2011-11-15 19:59:43.000000000 -0500
@@ -38,7 +38,7 @@ static const struct proto_ops rxrpc_rpc_
__be32 rxrpc_epoch;
@@ -77887,8 +77896,8 @@ diff -urNp linux-2.6.32.48/net/rxrpc/af_rxrpc.c linux-2.6.32.48/net/rxrpc/af_rxr
/* count of skbs currently in use */
atomic_t rxrpc_n_skbs;
diff -urNp linux-2.6.32.48/net/rxrpc/ar-ack.c linux-2.6.32.48/net/rxrpc/ar-ack.c
---- linux-2.6.32.48/net/rxrpc/ar-ack.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rxrpc/ar-ack.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rxrpc/ar-ack.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rxrpc/ar-ack.c 2011-11-15 19:59:43.000000000 -0500
@@ -174,7 +174,7 @@ static void rxrpc_resend(struct rxrpc_ca
_enter("{%d,%d,%d,%d},",
@@ -77962,8 +77971,8 @@ diff -urNp linux-2.6.32.48/net/rxrpc/ar-ack.c linux-2.6.32.48/net/rxrpc/ar-ack.c
send_message_2:
diff -urNp linux-2.6.32.48/net/rxrpc/ar-call.c linux-2.6.32.48/net/rxrpc/ar-call.c
---- linux-2.6.32.48/net/rxrpc/ar-call.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rxrpc/ar-call.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rxrpc/ar-call.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rxrpc/ar-call.c 2011-11-15 19:59:43.000000000 -0500
@@ -82,7 +82,7 @@ static struct rxrpc_call *rxrpc_alloc_ca
spin_lock_init(&call->lock);
rwlock_init(&call->state_lock);
@@ -77974,8 +77983,8 @@ diff -urNp linux-2.6.32.48/net/rxrpc/ar-call.c linux-2.6.32.48/net/rxrpc/ar-call
memset(&call->sock_node, 0xed, sizeof(call->sock_node));
diff -urNp linux-2.6.32.48/net/rxrpc/ar-connection.c linux-2.6.32.48/net/rxrpc/ar-connection.c
---- linux-2.6.32.48/net/rxrpc/ar-connection.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rxrpc/ar-connection.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rxrpc/ar-connection.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rxrpc/ar-connection.c 2011-11-15 19:59:43.000000000 -0500
@@ -205,7 +205,7 @@ static struct rxrpc_connection *rxrpc_al
rwlock_init(&conn->lock);
spin_lock_init(&conn->state_lock);
@@ -77986,8 +77995,8 @@ diff -urNp linux-2.6.32.48/net/rxrpc/ar-connection.c linux-2.6.32.48/net/rxrpc/a
conn->size_align = 4;
conn->header_size = sizeof(struct rxrpc_header);
diff -urNp linux-2.6.32.48/net/rxrpc/ar-connevent.c linux-2.6.32.48/net/rxrpc/ar-connevent.c
---- linux-2.6.32.48/net/rxrpc/ar-connevent.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rxrpc/ar-connevent.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rxrpc/ar-connevent.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rxrpc/ar-connevent.c 2011-11-15 19:59:43.000000000 -0500
@@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct
len = iov[0].iov_len + iov[1].iov_len;
@@ -77998,8 +78007,8 @@ diff -urNp linux-2.6.32.48/net/rxrpc/ar-connevent.c linux-2.6.32.48/net/rxrpc/ar
ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
diff -urNp linux-2.6.32.48/net/rxrpc/ar-input.c linux-2.6.32.48/net/rxrpc/ar-input.c
---- linux-2.6.32.48/net/rxrpc/ar-input.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rxrpc/ar-input.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rxrpc/ar-input.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rxrpc/ar-input.c 2011-11-15 19:59:43.000000000 -0500
@@ -339,9 +339,9 @@ void rxrpc_fast_process_packet(struct rx
/* track the latest serial number on this connection for ACK packet
* information */
@@ -78013,8 +78022,8 @@ diff -urNp linux-2.6.32.48/net/rxrpc/ar-input.c linux-2.6.32.48/net/rxrpc/ar-inp
/* request ACK generation for any ACK or DATA packet that requests
diff -urNp linux-2.6.32.48/net/rxrpc/ar-internal.h linux-2.6.32.48/net/rxrpc/ar-internal.h
---- linux-2.6.32.48/net/rxrpc/ar-internal.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rxrpc/ar-internal.h 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rxrpc/ar-internal.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rxrpc/ar-internal.h 2011-11-15 19:59:43.000000000 -0500
@@ -272,8 +272,8 @@ struct rxrpc_connection {
int error; /* error code for local abort */
int debug_id; /* debug ID for printks */
@@ -78045,8 +78054,8 @@ diff -urNp linux-2.6.32.48/net/rxrpc/ar-internal.h linux-2.6.32.48/net/rxrpc/ar-
/*
diff -urNp linux-2.6.32.48/net/rxrpc/ar-key.c linux-2.6.32.48/net/rxrpc/ar-key.c
---- linux-2.6.32.48/net/rxrpc/ar-key.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rxrpc/ar-key.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rxrpc/ar-key.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rxrpc/ar-key.c 2011-11-15 19:59:43.000000000 -0500
@@ -88,11 +88,11 @@ static int rxrpc_instantiate_xdr_rxkad(s
return ret;
@@ -78075,8 +78084,8 @@ diff -urNp linux-2.6.32.48/net/rxrpc/ar-key.c linux-2.6.32.48/net/rxrpc/ar-key.c
goto error_free;
diff -urNp linux-2.6.32.48/net/rxrpc/ar-local.c linux-2.6.32.48/net/rxrpc/ar-local.c
---- linux-2.6.32.48/net/rxrpc/ar-local.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rxrpc/ar-local.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rxrpc/ar-local.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rxrpc/ar-local.c 2011-11-15 19:59:43.000000000 -0500
@@ -44,7 +44,7 @@ struct rxrpc_local *rxrpc_alloc_local(st
spin_lock_init(&local->lock);
rwlock_init(&local->services_lock);
@@ -78087,8 +78096,8 @@ diff -urNp linux-2.6.32.48/net/rxrpc/ar-local.c linux-2.6.32.48/net/rxrpc/ar-loc
}
diff -urNp linux-2.6.32.48/net/rxrpc/ar-output.c linux-2.6.32.48/net/rxrpc/ar-output.c
---- linux-2.6.32.48/net/rxrpc/ar-output.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rxrpc/ar-output.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rxrpc/ar-output.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rxrpc/ar-output.c 2011-11-15 19:59:43.000000000 -0500
@@ -680,9 +680,9 @@ static int rxrpc_send_data(struct kiocb
sp->hdr.cid = call->cid;
sp->hdr.callNumber = call->call_id;
@@ -78102,8 +78111,8 @@ diff -urNp linux-2.6.32.48/net/rxrpc/ar-output.c linux-2.6.32.48/net/rxrpc/ar-ou
sp->hdr.userStatus = 0;
sp->hdr.securityIndex = conn->security_ix;
diff -urNp linux-2.6.32.48/net/rxrpc/ar-peer.c linux-2.6.32.48/net/rxrpc/ar-peer.c
---- linux-2.6.32.48/net/rxrpc/ar-peer.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rxrpc/ar-peer.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rxrpc/ar-peer.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rxrpc/ar-peer.c 2011-11-15 19:59:43.000000000 -0500
@@ -86,7 +86,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe
INIT_LIST_HEAD(&peer->error_targets);
spin_lock_init(&peer->lock);
@@ -78114,8 +78123,8 @@ diff -urNp linux-2.6.32.48/net/rxrpc/ar-peer.c linux-2.6.32.48/net/rxrpc/ar-peer
rxrpc_assess_MTU_size(peer);
diff -urNp linux-2.6.32.48/net/rxrpc/ar-proc.c linux-2.6.32.48/net/rxrpc/ar-proc.c
---- linux-2.6.32.48/net/rxrpc/ar-proc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rxrpc/ar-proc.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rxrpc/ar-proc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rxrpc/ar-proc.c 2011-11-15 19:59:43.000000000 -0500
@@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str
atomic_read(&conn->usage),
rxrpc_conn_states[conn->state],
@@ -78128,8 +78137,8 @@ diff -urNp linux-2.6.32.48/net/rxrpc/ar-proc.c linux-2.6.32.48/net/rxrpc/ar-proc
return 0;
}
diff -urNp linux-2.6.32.48/net/rxrpc/ar-transport.c linux-2.6.32.48/net/rxrpc/ar-transport.c
---- linux-2.6.32.48/net/rxrpc/ar-transport.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rxrpc/ar-transport.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rxrpc/ar-transport.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rxrpc/ar-transport.c 2011-11-15 19:59:43.000000000 -0500
@@ -46,7 +46,7 @@ static struct rxrpc_transport *rxrpc_all
spin_lock_init(&trans->client_lock);
rwlock_init(&trans->conn_lock);
@@ -78140,8 +78149,8 @@ diff -urNp linux-2.6.32.48/net/rxrpc/ar-transport.c linux-2.6.32.48/net/rxrpc/ar
if (peer->srx.transport.family == AF_INET) {
switch (peer->srx.transport_type) {
diff -urNp linux-2.6.32.48/net/rxrpc/rxkad.c linux-2.6.32.48/net/rxrpc/rxkad.c
---- linux-2.6.32.48/net/rxrpc/rxkad.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/rxrpc/rxkad.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/rxrpc/rxkad.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/rxrpc/rxkad.c 2011-11-15 19:59:43.000000000 -0500
@@ -210,6 +210,8 @@ static int rxkad_secure_packet_encrypt(c
u16 check;
int nsg;
@@ -78179,8 +78188,8 @@ diff -urNp linux-2.6.32.48/net/rxrpc/rxkad.c linux-2.6.32.48/net/rxrpc/rxkad.c
ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
diff -urNp linux-2.6.32.48/net/sctp/proc.c linux-2.6.32.48/net/sctp/proc.c
---- linux-2.6.32.48/net/sctp/proc.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/sctp/proc.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/sctp/proc.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/sctp/proc.c 2011-11-15 19:59:43.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);
@@ -78210,8 +78219,8 @@ diff -urNp linux-2.6.32.48/net/sctp/proc.c linux-2.6.32.48/net/sctp/proc.c
assoc->assoc_id,
assoc->sndbuf_used,
diff -urNp linux-2.6.32.48/net/sctp/socket.c linux-2.6.32.48/net/sctp/socket.c
---- linux-2.6.32.48/net/sctp/socket.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/sctp/socket.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/sctp/socket.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/sctp/socket.c 2011-11-15 19:59:43.000000000 -0500
@@ -5802,7 +5802,6 @@ pp_found:
*/
int reuse = sk->sk_reuse;
@@ -78221,8 +78230,8 @@ diff -urNp linux-2.6.32.48/net/sctp/socket.c linux-2.6.32.48/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.48/net/socket.c linux-2.6.32.48/net/socket.c
---- linux-2.6.32.48/net/socket.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/socket.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/socket.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/socket.c 2011-11-15 19:59:43.000000000 -0500
@@ -87,6 +87,7 @@
#include <linux/wireless.h>
#include <linux/nsproxy.h>
@@ -78405,8 +78414,8 @@ diff -urNp linux-2.6.32.48/net/socket.c linux-2.6.32.48/net/socket.c
if (MSG_CMSG_COMPAT & flags) {
err = verify_compat_iovec(&msg_sys, iov,
diff -urNp linux-2.6.32.48/net/sunrpc/sched.c linux-2.6.32.48/net/sunrpc/sched.c
---- linux-2.6.32.48/net/sunrpc/sched.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/sunrpc/sched.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/sunrpc/sched.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/sunrpc/sched.c 2011-11-15 19:59:43.000000000 -0500
@@ -234,10 +234,10 @@ static int rpc_wait_bit_killable(void *w
#ifdef RPC_DEBUG
static void rpc_task_set_debuginfo(struct rpc_task *task)
@@ -78421,8 +78430,8 @@ diff -urNp linux-2.6.32.48/net/sunrpc/sched.c linux-2.6.32.48/net/sunrpc/sched.c
#else
static inline void rpc_task_set_debuginfo(struct rpc_task *task)
diff -urNp linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-15 19:59:43.000000000 -0500
@@ -59,15 +59,15 @@ unsigned int svcrdma_max_req_size = RPCR
static unsigned int min_max_inline = 4096;
static unsigned int max_max_inline = 65536;
@@ -78531,8 +78540,8 @@ diff -urNp linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.48/net/su
.proc_handler = &read_reset_stat,
},
diff -urNp linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
---- linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-15 19:59:43.000000000 -0500
@@ -495,7 +495,7 @@ next_sge:
svc_rdma_put_context(ctxt, 0);
goto out;
@@ -78561,8 +78570,8 @@ diff -urNp linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.32.
/* Build up the XDR from the receive buffers. */
rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
diff -urNp linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_sendto.c
---- linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-15 19:59:43.000000000 -0500
@@ -328,7 +328,7 @@ static int send_write(struct svcxprt_rdm
write_wr.wr.rdma.remote_addr = to;
@@ -78573,8 +78582,8 @@ diff -urNp linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.32.48
goto err;
return 0;
diff -urNp linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_transport.c
---- linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_transport.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-15 19:59:43.000000000 -0500
@@ -292,7 +292,7 @@ static void rq_cq_reap(struct svcxprt_rd
return;
@@ -78621,8 +78630,8 @@ diff -urNp linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.32
/* See if we can opportunistically reap SQ WR to make room */
sq_cq_reap(xprt);
diff -urNp linux-2.6.32.48/net/sysctl_net.c linux-2.6.32.48/net/sysctl_net.c
---- linux-2.6.32.48/net/sysctl_net.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/sysctl_net.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/sysctl_net.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/sysctl_net.c 2011-11-15 19:59:43.000000000 -0500
@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
struct ctl_table *table)
{
@@ -78633,8 +78642,8 @@ diff -urNp linux-2.6.32.48/net/sysctl_net.c linux-2.6.32.48/net/sysctl_net.c
return (mode << 6) | (mode << 3) | mode;
}
diff -urNp linux-2.6.32.48/net/tipc/link.c linux-2.6.32.48/net/tipc/link.c
---- linux-2.6.32.48/net/tipc/link.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/tipc/link.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/tipc/link.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/tipc/link.c 2011-11-15 19:59:43.000000000 -0500
@@ -1418,7 +1418,7 @@ again:
if (!sect_rest) {
@@ -78654,8 +78663,8 @@ diff -urNp linux-2.6.32.48/net/tipc/link.c linux-2.6.32.48/net/tipc/link.c
sect_rest -= sz;
fragm_crs += sz;
diff -urNp linux-2.6.32.48/net/tipc/subscr.c linux-2.6.32.48/net/tipc/subscr.c
---- linux-2.6.32.48/net/tipc/subscr.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/tipc/subscr.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/tipc/subscr.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/tipc/subscr.c 2011-11-15 19:59:43.000000000 -0500
@@ -104,7 +104,7 @@ static void subscr_send_event(struct sub
{
struct iovec msg_sect;
@@ -78666,8 +78675,8 @@ diff -urNp linux-2.6.32.48/net/tipc/subscr.c linux-2.6.32.48/net/tipc/subscr.c
sub->evt.event = htohl(event, sub->swap);
diff -urNp linux-2.6.32.48/net/unix/af_unix.c linux-2.6.32.48/net/unix/af_unix.c
---- linux-2.6.32.48/net/unix/af_unix.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/unix/af_unix.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/unix/af_unix.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/unix/af_unix.c 2011-11-15 19:59:43.000000000 -0500
@@ -745,6 +745,12 @@ static struct sock *unix_find_other(stru
err = -ECONNREFUSED;
if (!S_ISSOCK(inode->i_mode))
@@ -78727,8 +78736,8 @@ diff -urNp linux-2.6.32.48/net/unix/af_unix.c linux-2.6.32.48/net/unix/af_unix.c
0,
s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
diff -urNp linux-2.6.32.48/net/wireless/core.h linux-2.6.32.48/net/wireless/core.h
---- linux-2.6.32.48/net/wireless/core.h 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/wireless/core.h 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/wireless/core.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/wireless/core.h 2011-11-15 19:59:43.000000000 -0500
@@ -27,7 +27,7 @@ struct cfg80211_registered_device {
struct mutex mtx;
@@ -78739,8 +78748,8 @@ diff -urNp linux-2.6.32.48/net/wireless/core.h linux-2.6.32.48/net/wireless/core
struct work_struct rfkill_sync;
diff -urNp linux-2.6.32.48/net/wireless/wext.c linux-2.6.32.48/net/wireless/wext.c
---- linux-2.6.32.48/net/wireless/wext.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/net/wireless/wext.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/wireless/wext.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/wireless/wext.c 2011-11-15 19:59:43.000000000 -0500
@@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc
*/
@@ -78775,8 +78784,8 @@ diff -urNp linux-2.6.32.48/net/wireless/wext.c linux-2.6.32.48/net/wireless/wext
iwp->length += essid_compat;
diff -urNp linux-2.6.32.48/net/xfrm/xfrm_policy.c linux-2.6.32.48/net/xfrm/xfrm_policy.c
---- linux-2.6.32.48/net/xfrm/xfrm_policy.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/xfrm/xfrm_policy.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/xfrm/xfrm_policy.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/xfrm/xfrm_policy.c 2011-11-15 19:59:43.000000000 -0500
@@ -586,7 +586,7 @@ int xfrm_policy_insert(int dir, struct x
hlist_add_head(&policy->bydst, chain);
xfrm_pol_hold(policy);
@@ -78868,8 +78877,8 @@ diff -urNp linux-2.6.32.48/net/xfrm/xfrm_policy.c linux-2.6.32.48/net/xfrm/xfrm_
goto restart;
}
diff -urNp linux-2.6.32.48/net/xfrm/xfrm_user.c linux-2.6.32.48/net/xfrm/xfrm_user.c
---- linux-2.6.32.48/net/xfrm/xfrm_user.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/net/xfrm/xfrm_user.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/net/xfrm/xfrm_user.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/net/xfrm/xfrm_user.c 2011-11-15 19:59:43.000000000 -0500
@@ -1169,6 +1169,8 @@ static int copy_to_user_tmpl(struct xfrm
struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH];
int i;
@@ -78889,8 +78898,8 @@ diff -urNp linux-2.6.32.48/net/xfrm/xfrm_user.c linux-2.6.32.48/net/xfrm/xfrm_us
return -EINVAL;
diff -urNp linux-2.6.32.48/samples/kobject/kset-example.c linux-2.6.32.48/samples/kobject/kset-example.c
---- linux-2.6.32.48/samples/kobject/kset-example.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/samples/kobject/kset-example.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/samples/kobject/kset-example.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/samples/kobject/kset-example.c 2011-11-15 19:59:43.000000000 -0500
@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
}
@@ -78901,8 +78910,8 @@ diff -urNp linux-2.6.32.48/samples/kobject/kset-example.c linux-2.6.32.48/sample
.store = foo_attr_store,
};
diff -urNp linux-2.6.32.48/scripts/basic/fixdep.c linux-2.6.32.48/scripts/basic/fixdep.c
---- linux-2.6.32.48/scripts/basic/fixdep.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/scripts/basic/fixdep.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/scripts/basic/fixdep.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/scripts/basic/fixdep.c 2011-11-15 19:59:43.000000000 -0500
@@ -162,7 +162,7 @@ static void grow_config(int len)
/*
* Lookup a value in the configuration string.
@@ -78944,13 +78953,13 @@ diff -urNp linux-2.6.32.48/scripts/basic/fixdep.c linux-2.6.32.48/scripts/basic/
fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
diff -urNp linux-2.6.32.48/scripts/gcc-plugin.sh linux-2.6.32.48/scripts/gcc-plugin.sh
--- linux-2.6.32.48/scripts/gcc-plugin.sh 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/scripts/gcc-plugin.sh 2011-11-12 12:46:53.000000000 -0500
++++ linux-2.6.32.48/scripts/gcc-plugin.sh 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "#include \"gcc-plugin.h\"\n#include \"rtl.h\"" | $1 -x c -shared - -o /dev/null -I`$2 -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y"
diff -urNp linux-2.6.32.48/scripts/Makefile.build linux-2.6.32.48/scripts/Makefile.build
---- linux-2.6.32.48/scripts/Makefile.build 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/scripts/Makefile.build 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/scripts/Makefile.build 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/scripts/Makefile.build 2011-11-15 19:59:43.000000000 -0500
@@ -59,7 +59,7 @@ endif
endif
@@ -78961,8 +78970,8 @@ diff -urNp linux-2.6.32.48/scripts/Makefile.build linux-2.6.32.48/scripts/Makefi
endif
diff -urNp linux-2.6.32.48/scripts/Makefile.clean linux-2.6.32.48/scripts/Makefile.clean
---- linux-2.6.32.48/scripts/Makefile.clean 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/scripts/Makefile.clean 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/scripts/Makefile.clean 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/scripts/Makefile.clean 2011-11-15 19:59:43.000000000 -0500
@@ -43,7 +43,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subd
__clean-files := $(extra-y) $(always) \
$(targets) $(clean-files) \
@@ -78974,8 +78983,8 @@ diff -urNp linux-2.6.32.48/scripts/Makefile.clean linux-2.6.32.48/scripts/Makefi
# as clean-files is given relative to the current directory, this adds
# a $(obj) prefix, except for absolute paths
diff -urNp linux-2.6.32.48/scripts/Makefile.host linux-2.6.32.48/scripts/Makefile.host
---- linux-2.6.32.48/scripts/Makefile.host 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/scripts/Makefile.host 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/scripts/Makefile.host 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/scripts/Makefile.host 2011-11-15 19:59:43.000000000 -0500
@@ -31,6 +31,7 @@
# Note: Shared libraries consisting of C++ files are not supported
@@ -78993,8 +79002,8 @@ diff -urNp linux-2.6.32.48/scripts/Makefile.host linux-2.6.32.48/scripts/Makefil
host-cobjs := $(filter-out %.so,$(host-cobjs))
diff -urNp linux-2.6.32.48/scripts/mod/file2alias.c linux-2.6.32.48/scripts/mod/file2alias.c
---- linux-2.6.32.48/scripts/mod/file2alias.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/scripts/mod/file2alias.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/scripts/mod/file2alias.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/scripts/mod/file2alias.c 2011-11-15 19:59:43.000000000 -0500
@@ -72,7 +72,7 @@ static void device_id_check(const char *
unsigned long size, unsigned long id_size,
void *symval)
@@ -79059,8 +79068,8 @@ diff -urNp linux-2.6.32.48/scripts/mod/file2alias.c linux-2.6.32.48/scripts/mod/
sprintf(alias, "dmi*");
diff -urNp linux-2.6.32.48/scripts/mod/modpost.c linux-2.6.32.48/scripts/mod/modpost.c
---- linux-2.6.32.48/scripts/mod/modpost.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/scripts/mod/modpost.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/scripts/mod/modpost.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/scripts/mod/modpost.c 2011-11-15 19:59:43.000000000 -0500
@@ -835,6 +835,7 @@ enum mismatch {
INIT_TO_EXIT,
EXIT_TO_INIT,
@@ -79138,8 +79147,8 @@ diff -urNp linux-2.6.32.48/scripts/mod/modpost.c linux-2.6.32.48/scripts/mod/mod
tmp = NOFAIL(malloc(b->pos));
diff -urNp linux-2.6.32.48/scripts/mod/modpost.h linux-2.6.32.48/scripts/mod/modpost.h
---- linux-2.6.32.48/scripts/mod/modpost.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/scripts/mod/modpost.h 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/scripts/mod/modpost.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/scripts/mod/modpost.h 2011-11-15 19:59:43.000000000 -0500
@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
struct buffer {
@@ -79160,8 +79169,8 @@ diff -urNp linux-2.6.32.48/scripts/mod/modpost.h linux-2.6.32.48/scripts/mod/mod
struct module {
struct module *next;
diff -urNp linux-2.6.32.48/scripts/mod/sumversion.c linux-2.6.32.48/scripts/mod/sumversion.c
---- linux-2.6.32.48/scripts/mod/sumversion.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/scripts/mod/sumversion.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/scripts/mod/sumversion.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/scripts/mod/sumversion.c 2011-11-15 19:59:43.000000000 -0500
@@ -455,7 +455,7 @@ static void write_version(const char *fi
goto out;
}
@@ -79172,8 +79181,8 @@ diff -urNp linux-2.6.32.48/scripts/mod/sumversion.c linux-2.6.32.48/scripts/mod/
filename, strerror(errno));
goto out;
diff -urNp linux-2.6.32.48/scripts/package/mkspec linux-2.6.32.48/scripts/package/mkspec
---- linux-2.6.32.48/scripts/package/mkspec 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/scripts/package/mkspec 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/scripts/package/mkspec 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/scripts/package/mkspec 2011-11-15 19:59:43.000000000 -0500
@@ -70,7 +70,7 @@ echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM
echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'
echo "%endif"
@@ -79184,8 +79193,8 @@ diff -urNp linux-2.6.32.48/scripts/package/mkspec linux-2.6.32.48/scripts/packag
echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
diff -urNp linux-2.6.32.48/scripts/pnmtologo.c linux-2.6.32.48/scripts/pnmtologo.c
---- linux-2.6.32.48/scripts/pnmtologo.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/scripts/pnmtologo.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/scripts/pnmtologo.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/scripts/pnmtologo.c 2011-11-15 19:59:43.000000000 -0500
@@ -237,14 +237,14 @@ static void write_header(void)
fprintf(out, " * Linux logo %s\n", logoname);
fputs(" */\n\n", out);
@@ -79213,8 +79222,8 @@ diff -urNp linux-2.6.32.48/scripts/pnmtologo.c linux-2.6.32.48/scripts/pnmtologo
write_hex_cnt = 0;
for (i = 0; i < logo_clutsize; i++) {
diff -urNp linux-2.6.32.48/scripts/tags.sh linux-2.6.32.48/scripts/tags.sh
---- linux-2.6.32.48/scripts/tags.sh 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/scripts/tags.sh 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/scripts/tags.sh 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/scripts/tags.sh 2011-11-15 19:59:43.000000000 -0500
@@ -93,6 +93,11 @@ docscope()
cscope -b -f cscope.out
}
@@ -79239,8 +79248,8 @@ diff -urNp linux-2.6.32.48/scripts/tags.sh linux-2.6.32.48/scripts/tags.sh
rm -f tags
xtags ctags
diff -urNp linux-2.6.32.48/security/capability.c linux-2.6.32.48/security/capability.c
---- linux-2.6.32.48/security/capability.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/security/capability.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/capability.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/capability.c 2011-11-15 19:59:43.000000000 -0500
@@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *ls
}
#endif /* CONFIG_AUDIT */
@@ -79251,8 +79260,8 @@ diff -urNp linux-2.6.32.48/security/capability.c linux-2.6.32.48/security/capabi
};
diff -urNp linux-2.6.32.48/security/commoncap.c linux-2.6.32.48/security/commoncap.c
---- linux-2.6.32.48/security/commoncap.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/security/commoncap.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/commoncap.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/commoncap.c 2011-11-15 19:59:43.000000000 -0500
@@ -27,7 +27,7 @@
#include <linux/sched.h>
#include <linux/prctl.h>
@@ -79292,8 +79301,8 @@ diff -urNp linux-2.6.32.48/security/commoncap.c linux-2.6.32.48/security/commonc
if (bprm->cap_effective)
return 1;
diff -urNp linux-2.6.32.48/security/integrity/ima/ima_api.c linux-2.6.32.48/security/integrity/ima/ima_api.c
---- linux-2.6.32.48/security/integrity/ima/ima_api.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/security/integrity/ima/ima_api.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/integrity/ima/ima_api.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/integrity/ima/ima_api.c 2011-11-15 19:59:43.000000000 -0500
@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
int result;
@@ -79304,8 +79313,8 @@ diff -urNp linux-2.6.32.48/security/integrity/ima/ima_api.c linux-2.6.32.48/secu
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry) {
diff -urNp linux-2.6.32.48/security/integrity/ima/ima_fs.c linux-2.6.32.48/security/integrity/ima/ima_fs.c
---- linux-2.6.32.48/security/integrity/ima/ima_fs.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/security/integrity/ima/ima_fs.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/integrity/ima/ima_fs.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/integrity/ima/ima_fs.c 2011-11-15 19:59:43.000000000 -0500
@@ -27,12 +27,12 @@
static int valid_policy = 1;
#define TMPBUFLEN 12
@@ -79322,8 +79331,8 @@ diff -urNp linux-2.6.32.48/security/integrity/ima/ima_fs.c linux-2.6.32.48/secur
}
diff -urNp linux-2.6.32.48/security/integrity/ima/ima.h linux-2.6.32.48/security/integrity/ima/ima.h
---- linux-2.6.32.48/security/integrity/ima/ima.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/security/integrity/ima/ima.h 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/integrity/ima/ima.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/integrity/ima/ima.h 2011-11-15 19:59:43.000000000 -0500
@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
extern spinlock_t ima_queue_lock;
@@ -79336,8 +79345,8 @@ diff -urNp linux-2.6.32.48/security/integrity/ima/ima.h linux-2.6.32.48/security
};
extern struct ima_h_table ima_htable;
diff -urNp linux-2.6.32.48/security/integrity/ima/ima_queue.c linux-2.6.32.48/security/integrity/ima/ima_queue.c
---- linux-2.6.32.48/security/integrity/ima/ima_queue.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/security/integrity/ima/ima_queue.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/integrity/ima/ima_queue.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/integrity/ima/ima_queue.c 2011-11-15 19:59:43.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);
@@ -79348,8 +79357,8 @@ diff -urNp linux-2.6.32.48/security/integrity/ima/ima_queue.c linux-2.6.32.48/se
hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
return 0;
diff -urNp linux-2.6.32.48/security/Kconfig linux-2.6.32.48/security/Kconfig
---- linux-2.6.32.48/security/Kconfig 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/security/Kconfig 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/Kconfig 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/Kconfig 2011-11-15 19:59:43.000000000 -0500
@@ -4,6 +4,559 @@
menu "Security options"
@@ -79920,8 +79929,8 @@ diff -urNp linux-2.6.32.48/security/Kconfig linux-2.6.32.48/security/Kconfig
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.48/security/keys/keyring.c linux-2.6.32.48/security/keys/keyring.c
---- linux-2.6.32.48/security/keys/keyring.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/security/keys/keyring.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/keys/keyring.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/keys/keyring.c 2011-11-15 19:59:43.000000000 -0500
@@ -214,15 +214,15 @@ static long keyring_read(const struct ke
ret = -EFAULT;
@@ -79942,8 +79951,8 @@ diff -urNp linux-2.6.32.48/security/keys/keyring.c linux-2.6.32.48/security/keys
buflen -= tmp;
diff -urNp linux-2.6.32.48/security/min_addr.c linux-2.6.32.48/security/min_addr.c
---- linux-2.6.32.48/security/min_addr.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/security/min_addr.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/min_addr.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/min_addr.c 2011-11-15 19:59:43.000000000 -0500
@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
*/
static void update_mmap_min_addr(void)
@@ -79961,8 +79970,8 @@ diff -urNp linux-2.6.32.48/security/min_addr.c linux-2.6.32.48/security/min_addr
/*
diff -urNp linux-2.6.32.48/security/root_plug.c linux-2.6.32.48/security/root_plug.c
---- linux-2.6.32.48/security/root_plug.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/security/root_plug.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/root_plug.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/root_plug.c 2011-11-15 19:59:43.000000000 -0500
@@ -70,7 +70,7 @@ static int rootplug_bprm_check_security
return 0;
}
@@ -79973,8 +79982,8 @@ diff -urNp linux-2.6.32.48/security/root_plug.c linux-2.6.32.48/security/root_pl
};
diff -urNp linux-2.6.32.48/security/security.c linux-2.6.32.48/security/security.c
---- linux-2.6.32.48/security/security.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/security/security.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/security.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/security.c 2011-11-15 19:59:43.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);
@@ -79994,8 +80003,8 @@ diff -urNp linux-2.6.32.48/security/security.c linux-2.6.32.48/security/security
if (verify(ops)) {
printk(KERN_DEBUG "%s could not verify "
diff -urNp linux-2.6.32.48/security/selinux/hooks.c linux-2.6.32.48/security/selinux/hooks.c
---- linux-2.6.32.48/security/selinux/hooks.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/security/selinux/hooks.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/selinux/hooks.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/selinux/hooks.c 2011-11-15 19:59:43.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.
@@ -80025,8 +80034,8 @@ diff -urNp linux-2.6.32.48/security/selinux/hooks.c linux-2.6.32.48/security/sel
/* Unregister netfilter hooks. */
selinux_nf_ip_exit();
diff -urNp linux-2.6.32.48/security/selinux/include/xfrm.h linux-2.6.32.48/security/selinux/include/xfrm.h
---- linux-2.6.32.48/security/selinux/include/xfrm.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/security/selinux/include/xfrm.h 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/selinux/include/xfrm.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/selinux/include/xfrm.h 2011-11-15 19:59:43.000000000 -0500
@@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s
static inline void selinux_xfrm_notify_policyload(void)
@@ -80037,8 +80046,8 @@ diff -urNp linux-2.6.32.48/security/selinux/include/xfrm.h linux-2.6.32.48/secur
#else
static inline int selinux_xfrm_enabled(void)
diff -urNp linux-2.6.32.48/security/selinux/ss/services.c linux-2.6.32.48/security/selinux/ss/services.c
---- linux-2.6.32.48/security/selinux/ss/services.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/security/selinux/ss/services.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/selinux/ss/services.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/selinux/ss/services.c 2011-11-15 19:59:43.000000000 -0500
@@ -1715,6 +1715,8 @@ int security_load_policy(void *data, siz
int rc = 0;
struct policy_file file = { data, len }, *fp = &file;
@@ -80049,8 +80058,8 @@ diff -urNp linux-2.6.32.48/security/selinux/ss/services.c linux-2.6.32.48/securi
avtab_cache_init();
if (policydb_read(&policydb, fp)) {
diff -urNp linux-2.6.32.48/security/smack/smack_lsm.c linux-2.6.32.48/security/smack/smack_lsm.c
---- linux-2.6.32.48/security/smack/smack_lsm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/security/smack/smack_lsm.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/smack/smack_lsm.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/smack/smack_lsm.c 2011-11-15 19:59:43.000000000 -0500
@@ -3073,7 +3073,7 @@ static int smack_inode_getsecctx(struct
return 0;
}
@@ -80061,8 +80070,8 @@ diff -urNp linux-2.6.32.48/security/smack/smack_lsm.c linux-2.6.32.48/security/s
.ptrace_access_check = smack_ptrace_access_check,
diff -urNp linux-2.6.32.48/security/tomoyo/tomoyo.c linux-2.6.32.48/security/tomoyo/tomoyo.c
---- linux-2.6.32.48/security/tomoyo/tomoyo.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/security/tomoyo/tomoyo.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/security/tomoyo/tomoyo.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/security/tomoyo/tomoyo.c 2011-11-15 19:59:43.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.
@@ -80073,8 +80082,8 @@ diff -urNp linux-2.6.32.48/security/tomoyo/tomoyo.c linux-2.6.32.48/security/tom
.cred_alloc_blank = tomoyo_cred_alloc_blank,
.cred_prepare = tomoyo_cred_prepare,
diff -urNp linux-2.6.32.48/sound/aoa/codecs/onyx.c linux-2.6.32.48/sound/aoa/codecs/onyx.c
---- linux-2.6.32.48/sound/aoa/codecs/onyx.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/aoa/codecs/onyx.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/aoa/codecs/onyx.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/aoa/codecs/onyx.c 2011-11-15 19:59:43.000000000 -0500
@@ -53,7 +53,7 @@ struct onyx {
spdif_locked:1,
analog_locked:1,
@@ -80104,8 +80113,8 @@ diff -urNp linux-2.6.32.48/sound/aoa/codecs/onyx.c linux-2.6.32.48/sound/aoa/cod
mutex_unlock(&onyx->mutex);
diff -urNp linux-2.6.32.48/sound/aoa/codecs/onyx.h linux-2.6.32.48/sound/aoa/codecs/onyx.h
---- linux-2.6.32.48/sound/aoa/codecs/onyx.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/aoa/codecs/onyx.h 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/aoa/codecs/onyx.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/aoa/codecs/onyx.h 2011-11-15 19:59:43.000000000 -0500
@@ -11,6 +11,7 @@
#include <linux/i2c.h>
#include <asm/pmac_low_i2c.h>
@@ -80115,8 +80124,8 @@ diff -urNp linux-2.6.32.48/sound/aoa/codecs/onyx.h linux-2.6.32.48/sound/aoa/cod
/* PCM3052 register definitions */
diff -urNp linux-2.6.32.48/sound/core/oss/pcm_oss.c linux-2.6.32.48/sound/core/oss/pcm_oss.c
---- linux-2.6.32.48/sound/core/oss/pcm_oss.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/core/oss/pcm_oss.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/core/oss/pcm_oss.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/core/oss/pcm_oss.c 2011-11-15 19:59:43.000000000 -0500
@@ -1395,7 +1395,7 @@ static ssize_t snd_pcm_oss_write1(struct
}
} else {
@@ -80136,8 +80145,8 @@ diff -urNp linux-2.6.32.48/sound/core/oss/pcm_oss.c linux-2.6.32.48/sound/core/o
if (tmp <= 0)
goto err;
diff -urNp linux-2.6.32.48/sound/core/pcm_compat.c linux-2.6.32.48/sound/core/pcm_compat.c
---- linux-2.6.32.48/sound/core/pcm_compat.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/sound/core/pcm_compat.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/core/pcm_compat.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/core/pcm_compat.c 2011-11-15 19:59:43.000000000 -0500
@@ -30,7 +30,7 @@ static int snd_pcm_ioctl_delay_compat(st
int err;
@@ -80148,8 +80157,8 @@ diff -urNp linux-2.6.32.48/sound/core/pcm_compat.c linux-2.6.32.48/sound/core/pc
if (err < 0)
return err;
diff -urNp linux-2.6.32.48/sound/core/pcm_native.c linux-2.6.32.48/sound/core/pcm_native.c
---- linux-2.6.32.48/sound/core/pcm_native.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/sound/core/pcm_native.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/core/pcm_native.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/core/pcm_native.c 2011-11-15 19:59:43.000000000 -0500
@@ -2747,11 +2747,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_
switch (substream->stream) {
case SNDRV_PCM_STREAM_PLAYBACK:
@@ -80165,8 +80174,8 @@ diff -urNp linux-2.6.32.48/sound/core/pcm_native.c linux-2.6.32.48/sound/core/pc
default:
result = -EINVAL;
diff -urNp linux-2.6.32.48/sound/core/seq/seq_device.c linux-2.6.32.48/sound/core/seq/seq_device.c
---- linux-2.6.32.48/sound/core/seq/seq_device.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/core/seq/seq_device.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/core/seq/seq_device.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/core/seq/seq_device.c 2011-11-15 19:59:43.000000000 -0500
@@ -63,7 +63,7 @@ struct ops_list {
int argsize; /* argument size */
@@ -80204,8 +80213,8 @@ diff -urNp linux-2.6.32.48/sound/core/seq/seq_device.c linux-2.6.32.48/sound/cor
dev->driver_data = NULL;
ops->num_init_devices--;
diff -urNp linux-2.6.32.48/sound/drivers/mts64.c linux-2.6.32.48/sound/drivers/mts64.c
---- linux-2.6.32.48/sound/drivers/mts64.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/drivers/mts64.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/drivers/mts64.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/drivers/mts64.c 2011-11-15 19:59:43.000000000 -0500
@@ -27,6 +27,7 @@
#include <sound/initval.h>
#include <sound/rawmidi.h>
@@ -80263,8 +80272,8 @@ diff -urNp linux-2.6.32.48/sound/drivers/mts64.c linux-2.6.32.48/sound/drivers/m
return 0;
}
diff -urNp linux-2.6.32.48/sound/drivers/opl4/opl4_lib.c linux-2.6.32.48/sound/drivers/opl4/opl4_lib.c
---- linux-2.6.32.48/sound/drivers/opl4/opl4_lib.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/drivers/opl4/opl4_lib.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/drivers/opl4/opl4_lib.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/drivers/opl4/opl4_lib.c 2011-11-15 19:59:43.000000000 -0500
@@ -27,7 +27,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@
MODULE_DESCRIPTION("OPL4 driver");
MODULE_LICENSE("GPL");
@@ -80275,8 +80284,8 @@ diff -urNp linux-2.6.32.48/sound/drivers/opl4/opl4_lib.c linux-2.6.32.48/sound/d
int timeout = 10;
while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
diff -urNp linux-2.6.32.48/sound/drivers/portman2x4.c linux-2.6.32.48/sound/drivers/portman2x4.c
---- linux-2.6.32.48/sound/drivers/portman2x4.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/drivers/portman2x4.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/drivers/portman2x4.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/drivers/portman2x4.c 2011-11-15 19:59:43.000000000 -0500
@@ -46,6 +46,7 @@
#include <sound/initval.h>
#include <sound/rawmidi.h>
@@ -80295,8 +80304,8 @@ diff -urNp linux-2.6.32.48/sound/drivers/portman2x4.c linux-2.6.32.48/sound/driv
struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
};
diff -urNp linux-2.6.32.48/sound/isa/cmi8330.c linux-2.6.32.48/sound/isa/cmi8330.c
---- linux-2.6.32.48/sound/isa/cmi8330.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/isa/cmi8330.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/isa/cmi8330.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/isa/cmi8330.c 2011-11-15 19:59:43.000000000 -0500
@@ -173,7 +173,7 @@ struct snd_cmi8330 {
struct snd_pcm *pcm;
@@ -80307,8 +80316,8 @@ diff -urNp linux-2.6.32.48/sound/isa/cmi8330.c linux-2.6.32.48/sound/isa/cmi8330
void *private_data; /* sb or wss */
} streams[2];
diff -urNp linux-2.6.32.48/sound/oss/sb_audio.c linux-2.6.32.48/sound/oss/sb_audio.c
---- linux-2.6.32.48/sound/oss/sb_audio.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/oss/sb_audio.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/oss/sb_audio.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/oss/sb_audio.c 2011-11-15 19:59:43.000000000 -0500
@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
buf16 = (signed short *)(localbuf + localoffs);
while (c)
@@ -80319,8 +80328,8 @@ diff -urNp linux-2.6.32.48/sound/oss/sb_audio.c linux-2.6.32.48/sound/oss/sb_aud
userbuf+useroffs + p,
locallen))
diff -urNp linux-2.6.32.48/sound/oss/swarm_cs4297a.c linux-2.6.32.48/sound/oss/swarm_cs4297a.c
---- linux-2.6.32.48/sound/oss/swarm_cs4297a.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/oss/swarm_cs4297a.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/oss/swarm_cs4297a.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/oss/swarm_cs4297a.c 2011-11-15 19:59:43.000000000 -0500
@@ -2577,7 +2577,6 @@ static int __init cs4297a_init(void)
{
struct cs4297a_state *s;
@@ -80356,8 +80365,8 @@ diff -urNp linux-2.6.32.48/sound/oss/swarm_cs4297a.c linux-2.6.32.48/sound/oss/s
list_add(&s->list, &cs4297a_devs);
diff -urNp linux-2.6.32.48/sound/pci/ac97/ac97_codec.c linux-2.6.32.48/sound/pci/ac97/ac97_codec.c
---- linux-2.6.32.48/sound/pci/ac97/ac97_codec.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/pci/ac97/ac97_codec.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/pci/ac97/ac97_codec.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/pci/ac97/ac97_codec.c 2011-11-15 19:59:43.000000000 -0500
@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
}
@@ -80368,8 +80377,8 @@ diff -urNp linux-2.6.32.48/sound/pci/ac97/ac97_codec.c linux-2.6.32.48/sound/pci
#ifdef CONFIG_SND_AC97_POWER_SAVE
static void do_update_power(struct work_struct *work)
diff -urNp linux-2.6.32.48/sound/pci/ac97/ac97_patch.c linux-2.6.32.48/sound/pci/ac97/ac97_patch.c
---- linux-2.6.32.48/sound/pci/ac97/ac97_patch.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/sound/pci/ac97/ac97_patch.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/pci/ac97/ac97_patch.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/pci/ac97/ac97_patch.c 2011-11-15 19:59:43.000000000 -0500
@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
return 0;
}
@@ -80659,8 +80668,8 @@ diff -urNp linux-2.6.32.48/sound/pci/ac97/ac97_patch.c linux-2.6.32.48/sound/pci
};
diff -urNp linux-2.6.32.48/sound/pci/hda/hda_codec.h linux-2.6.32.48/sound/pci/hda/hda_codec.h
---- linux-2.6.32.48/sound/pci/hda/hda_codec.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/pci/hda/hda_codec.h 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/pci/hda/hda_codec.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/pci/hda/hda_codec.h 2011-11-15 19:59:43.000000000 -0500
@@ -580,7 +580,7 @@ struct hda_bus_ops {
/* notify power-up/down from codec to controller */
void (*pm_notify)(struct hda_bus *bus);
@@ -80697,8 +80706,8 @@ diff -urNp linux-2.6.32.48/sound/pci/hda/hda_codec.h linux-2.6.32.48/sound/pci/h
/* PCM to create, set by patch_ops.build_pcms callback */
unsigned int num_pcms;
diff -urNp linux-2.6.32.48/sound/pci/hda/patch_atihdmi.c linux-2.6.32.48/sound/pci/hda/patch_atihdmi.c
---- linux-2.6.32.48/sound/pci/hda/patch_atihdmi.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/pci/hda/patch_atihdmi.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/pci/hda/patch_atihdmi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/pci/hda/patch_atihdmi.c 2011-11-15 19:59:43.000000000 -0500
@@ -177,7 +177,7 @@ static int patch_atihdmi(struct hda_code
*/
spec->multiout.dig_out_nid = CVT_NID;
@@ -80709,8 +80718,8 @@ diff -urNp linux-2.6.32.48/sound/pci/hda/patch_atihdmi.c linux-2.6.32.48/sound/p
return 0;
}
diff -urNp linux-2.6.32.48/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.48/sound/pci/hda/patch_intelhdmi.c
---- linux-2.6.32.48/sound/pci/hda/patch_intelhdmi.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/sound/pci/hda/patch_intelhdmi.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/pci/hda/patch_intelhdmi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/pci/hda/patch_intelhdmi.c 2011-11-15 19:59:43.000000000 -0500
@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
cp_ready);
@@ -80736,8 +80745,8 @@ diff -urNp linux-2.6.32.48/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.48/sound
snd_hda_eld_proc_new(codec, &spec->sink_eld);
diff -urNp linux-2.6.32.48/sound/pci/hda/patch_nvhdmi.c linux-2.6.32.48/sound/pci/hda/patch_nvhdmi.c
---- linux-2.6.32.48/sound/pci/hda/patch_nvhdmi.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/pci/hda/patch_nvhdmi.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/pci/hda/patch_nvhdmi.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/pci/hda/patch_nvhdmi.c 2011-11-15 19:59:43.000000000 -0500
@@ -367,7 +367,7 @@ static int patch_nvhdmi_8ch(struct hda_c
spec->multiout.max_channels = 8;
spec->multiout.dig_out_nid = Nv_Master_Convert_nid;
@@ -80757,8 +80766,8 @@ diff -urNp linux-2.6.32.48/sound/pci/hda/patch_nvhdmi.c linux-2.6.32.48/sound/pc
return 0;
}
diff -urNp linux-2.6.32.48/sound/pci/hda/patch_sigmatel.c linux-2.6.32.48/sound/pci/hda/patch_sigmatel.c
---- linux-2.6.32.48/sound/pci/hda/patch_sigmatel.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/sound/pci/hda/patch_sigmatel.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/pci/hda/patch_sigmatel.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/pci/hda/patch_sigmatel.c 2011-11-15 19:59:43.000000000 -0500
@@ -5220,7 +5220,7 @@ again:
snd_hda_codec_write_cache(codec, nid, 0,
AC_VERB_SET_CONNECT_SEL, num_dacs);
@@ -80778,8 +80787,8 @@ diff -urNp linux-2.6.32.48/sound/pci/hda/patch_sigmatel.c linux-2.6.32.48/sound/
switch (codec->vendor_id) {
case 0x111d76b6:
diff -urNp linux-2.6.32.48/sound/pci/ice1712/ice1712.h linux-2.6.32.48/sound/pci/ice1712/ice1712.h
---- linux-2.6.32.48/sound/pci/ice1712/ice1712.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/pci/ice1712/ice1712.h 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/pci/ice1712/ice1712.h 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/pci/ice1712/ice1712.h 2011-11-15 19:59:43.000000000 -0500
@@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
unsigned int mask_flags; /* total mask bits */
struct snd_akm4xxx_ops {
@@ -80799,8 +80808,8 @@ diff -urNp linux-2.6.32.48/sound/pci/ice1712/ice1712.h linux-2.6.32.48/sound/pci
diff -urNp linux-2.6.32.48/sound/pci/intel8x0m.c linux-2.6.32.48/sound/pci/intel8x0m.c
---- linux-2.6.32.48/sound/pci/intel8x0m.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/pci/intel8x0m.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/pci/intel8x0m.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/pci/intel8x0m.c 2011-11-15 19:59:43.000000000 -0500
@@ -1264,7 +1264,7 @@ static struct shortname_table {
{ 0x5455, "ALi M5455" },
{ 0x746d, "AMD AMD8111" },
@@ -80811,8 +80820,8 @@ diff -urNp linux-2.6.32.48/sound/pci/intel8x0m.c linux-2.6.32.48/sound/pci/intel
static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
diff -urNp linux-2.6.32.48/sound/pci/ymfpci/ymfpci_main.c linux-2.6.32.48/sound/pci/ymfpci/ymfpci_main.c
---- linux-2.6.32.48/sound/pci/ymfpci/ymfpci_main.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/pci/ymfpci/ymfpci_main.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/pci/ymfpci/ymfpci_main.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/pci/ymfpci/ymfpci_main.c 2011-11-15 19:59:43.000000000 -0500
@@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn
if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
break;
@@ -80854,8 +80863,8 @@ diff -urNp linux-2.6.32.48/sound/pci/ymfpci/ymfpci_main.c linux-2.6.32.48/sound/
chip->pci = pci;
chip->irq = -1;
diff -urNp linux-2.6.32.48/sound/soc/soc-core.c linux-2.6.32.48/sound/soc/soc-core.c
---- linux-2.6.32.48/sound/soc/soc-core.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/sound/soc/soc-core.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/soc/soc-core.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/soc/soc-core.c 2011-11-15 19:59:43.000000000 -0500
@@ -609,7 +609,7 @@ static int soc_pcm_trigger(struct snd_pc
}
@@ -80866,8 +80875,8 @@ diff -urNp linux-2.6.32.48/sound/soc/soc-core.c linux-2.6.32.48/sound/soc/soc-co
.close = soc_codec_close,
.hw_params = soc_pcm_hw_params,
diff -urNp linux-2.6.32.48/sound/usb/usbaudio.c linux-2.6.32.48/sound/usb/usbaudio.c
---- linux-2.6.32.48/sound/usb/usbaudio.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/sound/usb/usbaudio.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/sound/usb/usbaudio.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/sound/usb/usbaudio.c 2011-11-15 19:59:43.000000000 -0500
@@ -963,12 +963,12 @@ static int snd_usb_pcm_playback_trigger(
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
@@ -80931,7 +80940,7 @@ diff -urNp linux-2.6.32.48/sound/usb/usbaudio.c linux-2.6.32.48/sound/usb/usbaud
}
diff -urNp linux-2.6.32.48/tools/gcc/checker_plugin.c linux-2.6.32.48/tools/gcc/checker_plugin.c
--- linux-2.6.32.48/tools/gcc/checker_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/tools/gcc/checker_plugin.c 2011-11-12 12:46:53.000000000 -0500
++++ linux-2.6.32.48/tools/gcc/checker_plugin.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -81104,7 +81113,7 @@ diff -urNp linux-2.6.32.48/tools/gcc/checker_plugin.c linux-2.6.32.48/tools/gcc/
+}
diff -urNp linux-2.6.32.48/tools/gcc/constify_plugin.c linux-2.6.32.48/tools/gcc/constify_plugin.c
--- linux-2.6.32.48/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/tools/gcc/constify_plugin.c 2011-11-12 12:46:53.000000000 -0500
++++ linux-2.6.32.48/tools/gcc/constify_plugin.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,293 @@
+/*
+ * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
@@ -81401,7 +81410,7 @@ diff -urNp linux-2.6.32.48/tools/gcc/constify_plugin.c linux-2.6.32.48/tools/gcc
+}
diff -urNp linux-2.6.32.48/tools/gcc/kallocstat_plugin.c linux-2.6.32.48/tools/gcc/kallocstat_plugin.c
--- linux-2.6.32.48/tools/gcc/kallocstat_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/tools/gcc/kallocstat_plugin.c 2011-11-12 12:46:53.000000000 -0500
++++ linux-2.6.32.48/tools/gcc/kallocstat_plugin.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -81570,7 +81579,7 @@ diff -urNp linux-2.6.32.48/tools/gcc/kallocstat_plugin.c linux-2.6.32.48/tools/g
+}
diff -urNp linux-2.6.32.48/tools/gcc/kernexec_plugin.c linux-2.6.32.48/tools/gcc/kernexec_plugin.c
--- linux-2.6.32.48/tools/gcc/kernexec_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/tools/gcc/kernexec_plugin.c 2011-11-12 12:46:53.000000000 -0500
++++ linux-2.6.32.48/tools/gcc/kernexec_plugin.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,273 @@
+/*
+ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -81847,7 +81856,7 @@ diff -urNp linux-2.6.32.48/tools/gcc/kernexec_plugin.c linux-2.6.32.48/tools/gcc
+}
diff -urNp linux-2.6.32.48/tools/gcc/Makefile linux-2.6.32.48/tools/gcc/Makefile
--- linux-2.6.32.48/tools/gcc/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/tools/gcc/Makefile 2011-11-12 12:46:53.000000000 -0500
++++ linux-2.6.32.48/tools/gcc/Makefile 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,21 @@
+#CC := gcc
+#PLUGIN_SOURCE_FILES := pax_plugin.c
@@ -81872,7 +81881,7 @@ diff -urNp linux-2.6.32.48/tools/gcc/Makefile linux-2.6.32.48/tools/gcc/Makefile
+checker_plugin-objs := checker_plugin.o
diff -urNp linux-2.6.32.48/tools/gcc/stackleak_plugin.c linux-2.6.32.48/tools/gcc/stackleak_plugin.c
--- linux-2.6.32.48/tools/gcc/stackleak_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.48/tools/gcc/stackleak_plugin.c 2011-11-12 12:46:53.000000000 -0500
++++ linux-2.6.32.48/tools/gcc/stackleak_plugin.c 2011-11-15 19:59:43.000000000 -0500
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -82126,8 +82135,8 @@ diff -urNp linux-2.6.32.48/tools/gcc/stackleak_plugin.c linux-2.6.32.48/tools/gc
+ return 0;
+}
diff -urNp linux-2.6.32.48/usr/gen_init_cpio.c linux-2.6.32.48/usr/gen_init_cpio.c
---- linux-2.6.32.48/usr/gen_init_cpio.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.48/usr/gen_init_cpio.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/usr/gen_init_cpio.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/usr/gen_init_cpio.c 2011-11-15 19:59:43.000000000 -0500
@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
int retval;
int rc = -1;
@@ -82151,8 +82160,8 @@ diff -urNp linux-2.6.32.48/usr/gen_init_cpio.c linux-2.6.32.48/usr/gen_init_cpio
break;
}
diff -urNp linux-2.6.32.48/virt/kvm/kvm_main.c linux-2.6.32.48/virt/kvm/kvm_main.c
---- linux-2.6.32.48/virt/kvm/kvm_main.c 2011-11-12 12:44:30.000000000 -0500
-+++ linux-2.6.32.48/virt/kvm/kvm_main.c 2011-11-12 12:46:53.000000000 -0500
+--- linux-2.6.32.48/virt/kvm/kvm_main.c 2011-11-08 19:02:43.000000000 -0500
++++ linux-2.6.32.48/virt/kvm/kvm_main.c 2011-11-15 19:59:43.000000000 -0500
@@ -2494,7 +2494,7 @@ asmlinkage void kvm_handle_fault_on_rebo
if (kvm_rebooting)
/* spin while reset goes on */
diff --git a/3.0.9/0000_README b/3.0.9/0000_README
index fdfc980..6fac81e 100644
--- a/3.0.9/0000_README
+++ b/3.0.9/0000_README
@@ -11,7 +11,7 @@ Patch: 1008_linux-3.0.9.patch
From: http://www.kernel.org
Desc: Linux 3.0.9
-Patch: 4420_grsecurity-2.2.2-3.0.9-201111121310.patch
+Patch: 4420_grsecurity-2.2.2-3.0.9-201111152003.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/3.0.9/4420_grsecurity-2.2.2-3.0.9-201111121310.patch b/3.0.9/4420_grsecurity-2.2.2-3.0.9-201111152003.patch
index 036623b..4d8edda 100644
--- a/3.0.9/4420_grsecurity-2.2.2-3.0.9-201111121310.patch
+++ b/3.0.9/4420_grsecurity-2.2.2-3.0.9-201111152003.patch
@@ -1,6 +1,6 @@
diff -urNp linux-3.0.9/arch/alpha/include/asm/elf.h linux-3.0.9/arch/alpha/include/asm/elf.h
--- linux-3.0.9/arch/alpha/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/alpha/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/alpha/include/asm/elf.h 2011-11-15 20:02:59.000000000 -0500
@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
@@ -17,7 +17,7 @@ diff -urNp linux-3.0.9/arch/alpha/include/asm/elf.h linux-3.0.9/arch/alpha/inclu
linker to call DT_FINI functions for shared libraries that have
diff -urNp linux-3.0.9/arch/alpha/include/asm/pgtable.h linux-3.0.9/arch/alpha/include/asm/pgtable.h
--- linux-3.0.9/arch/alpha/include/asm/pgtable.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/alpha/include/asm/pgtable.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/alpha/include/asm/pgtable.h 2011-11-15 20:02:59.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)
@@ -38,7 +38,7 @@ diff -urNp linux-3.0.9/arch/alpha/include/asm/pgtable.h linux-3.0.9/arch/alpha/i
#define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
diff -urNp linux-3.0.9/arch/alpha/kernel/module.c linux-3.0.9/arch/alpha/kernel/module.c
--- linux-3.0.9/arch/alpha/kernel/module.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/alpha/kernel/module.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/alpha/kernel/module.c 2011-11-15 20:02:59.000000000 -0500
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -50,7 +50,7 @@ diff -urNp linux-3.0.9/arch/alpha/kernel/module.c linux-3.0.9/arch/alpha/kernel/
for (i = 0; i < n; i++) {
diff -urNp linux-3.0.9/arch/alpha/kernel/osf_sys.c linux-3.0.9/arch/alpha/kernel/osf_sys.c
--- linux-3.0.9/arch/alpha/kernel/osf_sys.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/alpha/kernel/osf_sys.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/alpha/kernel/osf_sys.c 2011-11-15 20:02:59.000000000 -0500
@@ -1145,7 +1145,7 @@ arch_get_unmapped_area_1(unsigned long a
/* At this point: (!vma || addr < vma->vm_end). */
if (limit - len < addr)
@@ -84,7 +84,7 @@ diff -urNp linux-3.0.9/arch/alpha/kernel/osf_sys.c linux-3.0.9/arch/alpha/kernel
diff -urNp linux-3.0.9/arch/alpha/mm/fault.c linux-3.0.9/arch/alpha/mm/fault.c
--- linux-3.0.9/arch/alpha/mm/fault.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/alpha/mm/fault.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/alpha/mm/fault.c 2011-11-15 20:02:59.000000000 -0500
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
@@ -243,7 +243,7 @@ diff -urNp linux-3.0.9/arch/alpha/mm/fault.c linux-3.0.9/arch/alpha/mm/fault.c
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
diff -urNp linux-3.0.9/arch/arm/include/asm/elf.h linux-3.0.9/arch/arm/include/asm/elf.h
--- linux-3.0.9/arch/arm/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/arm/include/asm/elf.h 2011-11-15 20:02:59.000000000 -0500
@@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -273,7 +273,7 @@ diff -urNp linux-3.0.9/arch/arm/include/asm/elf.h linux-3.0.9/arch/arm/include/a
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES
diff -urNp linux-3.0.9/arch/arm/include/asm/kmap_types.h linux-3.0.9/arch/arm/include/asm/kmap_types.h
--- linux-3.0.9/arch/arm/include/asm/kmap_types.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/include/asm/kmap_types.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/arm/include/asm/kmap_types.h 2011-11-15 20:02:59.000000000 -0500
@@ -21,6 +21,7 @@ enum km_type {
KM_L1_CACHE,
KM_L2_CACHE,
@@ -284,7 +284,7 @@ diff -urNp linux-3.0.9/arch/arm/include/asm/kmap_types.h linux-3.0.9/arch/arm/in
diff -urNp linux-3.0.9/arch/arm/include/asm/uaccess.h linux-3.0.9/arch/arm/include/asm/uaccess.h
--- linux-3.0.9/arch/arm/include/asm/uaccess.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/include/asm/uaccess.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/arm/include/asm/uaccess.h 2011-11-15 20:02:59.000000000 -0500
@@ -22,6 +22,8 @@
#define VERIFY_READ 0
#define VERIFY_WRITE 1
@@ -342,7 +342,7 @@ diff -urNp linux-3.0.9/arch/arm/include/asm/uaccess.h linux-3.0.9/arch/arm/inclu
return n;
diff -urNp linux-3.0.9/arch/arm/kernel/armksyms.c linux-3.0.9/arch/arm/kernel/armksyms.c
--- linux-3.0.9/arch/arm/kernel/armksyms.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/kernel/armksyms.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/arm/kernel/armksyms.c 2011-11-15 20:02:59.000000000 -0500
@@ -98,8 +98,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
#ifdef CONFIG_MMU
EXPORT_SYMBOL(copy_page);
@@ -356,7 +356,7 @@ diff -urNp linux-3.0.9/arch/arm/kernel/armksyms.c linux-3.0.9/arch/arm/kernel/ar
EXPORT_SYMBOL(__get_user_1);
diff -urNp linux-3.0.9/arch/arm/kernel/process.c linux-3.0.9/arch/arm/kernel/process.c
--- linux-3.0.9/arch/arm/kernel/process.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/kernel/process.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/arm/kernel/process.c 2011-11-15 20:02:59.000000000 -0500
@@ -28,7 +28,6 @@
#include <linux/tick.h>
#include <linux/utsname.h>
@@ -380,7 +380,7 @@ diff -urNp linux-3.0.9/arch/arm/kernel/process.c linux-3.0.9/arch/arm/kernel/pro
* The vectors page is always readable from user space for the
diff -urNp linux-3.0.9/arch/arm/kernel/traps.c linux-3.0.9/arch/arm/kernel/traps.c
--- linux-3.0.9/arch/arm/kernel/traps.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/kernel/traps.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/arm/kernel/traps.c 2011-11-15 20:02:59.000000000 -0500
@@ -257,6 +257,8 @@ static int __die(const char *str, int er
static DEFINE_SPINLOCK(die_lock);
@@ -402,7 +402,7 @@ diff -urNp linux-3.0.9/arch/arm/kernel/traps.c linux-3.0.9/arch/arm/kernel/traps
}
diff -urNp linux-3.0.9/arch/arm/lib/copy_from_user.S linux-3.0.9/arch/arm/lib/copy_from_user.S
--- linux-3.0.9/arch/arm/lib/copy_from_user.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/lib/copy_from_user.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/arm/lib/copy_from_user.S 2011-11-15 20:02:59.000000000 -0500
@@ -16,7 +16,7 @@
/*
* Prototype:
@@ -428,7 +428,7 @@ diff -urNp linux-3.0.9/arch/arm/lib/copy_from_user.S linux-3.0.9/arch/arm/lib/co
.align 0
diff -urNp linux-3.0.9/arch/arm/lib/copy_to_user.S linux-3.0.9/arch/arm/lib/copy_to_user.S
--- linux-3.0.9/arch/arm/lib/copy_to_user.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/lib/copy_to_user.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/arm/lib/copy_to_user.S 2011-11-15 20:02:59.000000000 -0500
@@ -16,7 +16,7 @@
/*
* Prototype:
@@ -454,7 +454,7 @@ diff -urNp linux-3.0.9/arch/arm/lib/copy_to_user.S linux-3.0.9/arch/arm/lib/copy
.pushsection .fixup,"ax"
diff -urNp linux-3.0.9/arch/arm/lib/uaccess.S linux-3.0.9/arch/arm/lib/uaccess.S
--- linux-3.0.9/arch/arm/lib/uaccess.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/lib/uaccess.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/arm/lib/uaccess.S 2011-11-15 20:02:59.000000000 -0500
@@ -20,7 +20,7 @@
#define PAGE_SHIFT 12
@@ -510,7 +510,7 @@ diff -urNp linux-3.0.9/arch/arm/lib/uaccess.S linux-3.0.9/arch/arm/lib/uaccess.S
.align 0
diff -urNp linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c
--- linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c 2011-11-15 20:02:59.000000000 -0500
@@ -103,7 +103,7 @@ out:
}
@@ -522,7 +522,7 @@ diff -urNp linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.9/arch/arm/l
* This test is stubbed out of the main function above to keep
diff -urNp linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c
--- linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c 2011-11-15 20:02:59.000000000 -0500
@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev
return sprintf(buf, "0x%X\n", mbox_value);
}
@@ -534,7 +534,7 @@ diff -urNp linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.9/arch/arm/ma
{
diff -urNp linux-3.0.9/arch/arm/mm/fault.c linux-3.0.9/arch/arm/mm/fault.c
--- linux-3.0.9/arch/arm/mm/fault.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/mm/fault.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/arm/mm/fault.c 2011-11-15 20:02:59.000000000 -0500
@@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk,
}
#endif
@@ -585,7 +585,7 @@ diff -urNp linux-3.0.9/arch/arm/mm/fault.c linux-3.0.9/arch/arm/mm/fault.c
*
diff -urNp linux-3.0.9/arch/arm/mm/mmap.c linux-3.0.9/arch/arm/mm/mmap.c
--- linux-3.0.9/arch/arm/mm/mmap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/arm/mm/mmap.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/arm/mm/mmap.c 2011-11-15 20:02:59.000000000 -0500
@@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -637,7 +637,7 @@ diff -urNp linux-3.0.9/arch/arm/mm/mmap.c linux-3.0.9/arch/arm/mm/mmap.c
*/
diff -urNp linux-3.0.9/arch/avr32/include/asm/elf.h linux-3.0.9/arch/avr32/include/asm/elf.h
--- linux-3.0.9/arch/avr32/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/avr32/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/avr32/include/asm/elf.h 2011-11-15 20:02:59.000000000 -0500
@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -656,7 +656,7 @@ diff -urNp linux-3.0.9/arch/avr32/include/asm/elf.h linux-3.0.9/arch/avr32/inclu
instruction set this CPU supports. This could be done in user space,
diff -urNp linux-3.0.9/arch/avr32/include/asm/kmap_types.h linux-3.0.9/arch/avr32/include/asm/kmap_types.h
--- linux-3.0.9/arch/avr32/include/asm/kmap_types.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/avr32/include/asm/kmap_types.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/avr32/include/asm/kmap_types.h 2011-11-15 20:02:59.000000000 -0500
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
@@ -669,7 +669,7 @@ diff -urNp linux-3.0.9/arch/avr32/include/asm/kmap_types.h linux-3.0.9/arch/avr3
#undef D
diff -urNp linux-3.0.9/arch/avr32/mm/fault.c linux-3.0.9/arch/avr32/mm/fault.c
--- linux-3.0.9/arch/avr32/mm/fault.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/avr32/mm/fault.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/avr32/mm/fault.c 2011-11-15 20:02:59.000000000 -0500
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -713,7 +713,7 @@ diff -urNp linux-3.0.9/arch/avr32/mm/fault.c linux-3.0.9/arch/avr32/mm/fault.c
"sp %08lx ecr %lu\n",
diff -urNp linux-3.0.9/arch/frv/include/asm/kmap_types.h linux-3.0.9/arch/frv/include/asm/kmap_types.h
--- linux-3.0.9/arch/frv/include/asm/kmap_types.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/frv/include/asm/kmap_types.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/frv/include/asm/kmap_types.h 2011-11-15 20:02:59.000000000 -0500
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -724,7 +724,7 @@ diff -urNp linux-3.0.9/arch/frv/include/asm/kmap_types.h linux-3.0.9/arch/frv/in
diff -urNp linux-3.0.9/arch/frv/mm/elf-fdpic.c linux-3.0.9/arch/frv/mm/elf-fdpic.c
--- linux-3.0.9/arch/frv/mm/elf-fdpic.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/frv/mm/elf-fdpic.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/frv/mm/elf-fdpic.c 2011-11-15 20:02:59.000000000 -0500
@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
if (addr) {
addr = PAGE_ALIGN(addr);
@@ -755,7 +755,7 @@ diff -urNp linux-3.0.9/arch/frv/mm/elf-fdpic.c linux-3.0.9/arch/frv/mm/elf-fdpic
}
diff -urNp linux-3.0.9/arch/ia64/include/asm/elf.h linux-3.0.9/arch/ia64/include/asm/elf.h
--- linux-3.0.9/arch/ia64/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/ia64/include/asm/elf.h 2011-11-15 20:02:59.000000000 -0500
@@ -42,6 +42,13 @@
*/
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -772,7 +772,7 @@ diff -urNp linux-3.0.9/arch/ia64/include/asm/elf.h linux-3.0.9/arch/ia64/include
/* IA-64 relocations: */
diff -urNp linux-3.0.9/arch/ia64/include/asm/pgtable.h linux-3.0.9/arch/ia64/include/asm/pgtable.h
--- linux-3.0.9/arch/ia64/include/asm/pgtable.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/include/asm/pgtable.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/ia64/include/asm/pgtable.h 2011-11-15 20:02:59.000000000 -0500
@@ -12,7 +12,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
@@ -802,7 +802,7 @@ diff -urNp linux-3.0.9/arch/ia64/include/asm/pgtable.h linux-3.0.9/arch/ia64/inc
#define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
diff -urNp linux-3.0.9/arch/ia64/include/asm/spinlock.h linux-3.0.9/arch/ia64/include/asm/spinlock.h
--- linux-3.0.9/arch/ia64/include/asm/spinlock.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/include/asm/spinlock.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/ia64/include/asm/spinlock.h 2011-11-15 20:02:59.000000000 -0500
@@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
@@ -814,7 +814,7 @@ diff -urNp linux-3.0.9/arch/ia64/include/asm/spinlock.h linux-3.0.9/arch/ia64/in
static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
diff -urNp linux-3.0.9/arch/ia64/include/asm/uaccess.h linux-3.0.9/arch/ia64/include/asm/uaccess.h
--- linux-3.0.9/arch/ia64/include/asm/uaccess.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/include/asm/uaccess.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/ia64/include/asm/uaccess.h 2011-11-15 20:02:59.000000000 -0500
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
const void *__cu_from = (from); \
long __cu_len = (n); \
@@ -835,7 +835,7 @@ diff -urNp linux-3.0.9/arch/ia64/include/asm/uaccess.h linux-3.0.9/arch/ia64/inc
})
diff -urNp linux-3.0.9/arch/ia64/kernel/module.c linux-3.0.9/arch/ia64/kernel/module.c
--- linux-3.0.9/arch/ia64/kernel/module.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/kernel/module.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/ia64/kernel/module.c 2011-11-15 20:02:59.000000000 -0500
@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
void
module_free (struct module *mod, void *module_region)
@@ -926,7 +926,7 @@ diff -urNp linux-3.0.9/arch/ia64/kernel/module.c linux-3.0.9/arch/ia64/kernel/mo
}
diff -urNp linux-3.0.9/arch/ia64/kernel/sys_ia64.c linux-3.0.9/arch/ia64/kernel/sys_ia64.c
--- linux-3.0.9/arch/ia64/kernel/sys_ia64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/kernel/sys_ia64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/ia64/kernel/sys_ia64.c 2011-11-15 20:02:59.000000000 -0500
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
@@ -961,7 +961,7 @@ diff -urNp linux-3.0.9/arch/ia64/kernel/sys_ia64.c linux-3.0.9/arch/ia64/kernel/
return addr;
diff -urNp linux-3.0.9/arch/ia64/kernel/vmlinux.lds.S linux-3.0.9/arch/ia64/kernel/vmlinux.lds.S
--- linux-3.0.9/arch/ia64/kernel/vmlinux.lds.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/kernel/vmlinux.lds.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/ia64/kernel/vmlinux.lds.S 2011-11-15 20:02:59.000000000 -0500
@@ -199,7 +199,7 @@ SECTIONS {
/* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE);
@@ -973,7 +973,7 @@ diff -urNp linux-3.0.9/arch/ia64/kernel/vmlinux.lds.S linux-3.0.9/arch/ia64/kern
* into percpu page size
diff -urNp linux-3.0.9/arch/ia64/mm/fault.c linux-3.0.9/arch/ia64/mm/fault.c
--- linux-3.0.9/arch/ia64/mm/fault.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/mm/fault.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/ia64/mm/fault.c 2011-11-15 20:02:59.000000000 -0500
@@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned
return pte_present(pte);
}
@@ -1025,7 +1025,7 @@ diff -urNp linux-3.0.9/arch/ia64/mm/fault.c linux-3.0.9/arch/ia64/mm/fault.c
* sure we exit gracefully rather than endlessly redo the
diff -urNp linux-3.0.9/arch/ia64/mm/hugetlbpage.c linux-3.0.9/arch/ia64/mm/hugetlbpage.c
--- linux-3.0.9/arch/ia64/mm/hugetlbpage.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/mm/hugetlbpage.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/ia64/mm/hugetlbpage.c 2011-11-15 20:02:59.000000000 -0500
@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(
/* At this point: (!vmm || addr < vmm->vm_end). */
if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
@@ -1037,7 +1037,7 @@ diff -urNp linux-3.0.9/arch/ia64/mm/hugetlbpage.c linux-3.0.9/arch/ia64/mm/huget
}
diff -urNp linux-3.0.9/arch/ia64/mm/init.c linux-3.0.9/arch/ia64/mm/init.c
--- linux-3.0.9/arch/ia64/mm/init.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/ia64/mm/init.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/ia64/mm/init.c 2011-11-15 20:02:59.000000000 -0500
@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1060,7 +1060,7 @@ diff -urNp linux-3.0.9/arch/ia64/mm/init.c linux-3.0.9/arch/ia64/mm/init.c
if (insert_vm_struct(current->mm, vma)) {
diff -urNp linux-3.0.9/arch/m32r/lib/usercopy.c linux-3.0.9/arch/m32r/lib/usercopy.c
--- linux-3.0.9/arch/m32r/lib/usercopy.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/m32r/lib/usercopy.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/m32r/lib/usercopy.c 2011-11-15 20:02:59.000000000 -0500
@@ -14,6 +14,9 @@
unsigned long
__generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1083,7 +1083,7 @@ diff -urNp linux-3.0.9/arch/m32r/lib/usercopy.c linux-3.0.9/arch/m32r/lib/userco
__copy_user_zeroing(to,from,n);
diff -urNp linux-3.0.9/arch/mips/include/asm/elf.h linux-3.0.9/arch/mips/include/asm/elf.h
--- linux-3.0.9/arch/mips/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/mips/include/asm/elf.h 2011-11-15 20:02:59.000000000 -0500
@@ -372,13 +372,16 @@ extern const char *__elf_platform;
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
#endif
@@ -1107,7 +1107,7 @@ diff -urNp linux-3.0.9/arch/mips/include/asm/elf.h linux-3.0.9/arch/mips/include
#endif /* _ASM_ELF_H */
diff -urNp linux-3.0.9/arch/mips/include/asm/page.h linux-3.0.9/arch/mips/include/asm/page.h
--- linux-3.0.9/arch/mips/include/asm/page.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/include/asm/page.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/mips/include/asm/page.h 2011-11-15 20:02:59.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;
@@ -1119,7 +1119,7 @@ diff -urNp linux-3.0.9/arch/mips/include/asm/page.h linux-3.0.9/arch/mips/includ
#define pte_val(x) ((x).pte)
diff -urNp linux-3.0.9/arch/mips/include/asm/system.h linux-3.0.9/arch/mips/include/asm/system.h
--- linux-3.0.9/arch/mips/include/asm/system.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/include/asm/system.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/mips/include/asm/system.h 2011-11-15 20:02:59.000000000 -0500
@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
*/
#define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1130,7 +1130,7 @@ diff -urNp linux-3.0.9/arch/mips/include/asm/system.h linux-3.0.9/arch/mips/incl
#endif /* _ASM_SYSTEM_H */
diff -urNp linux-3.0.9/arch/mips/kernel/binfmt_elfn32.c linux-3.0.9/arch/mips/kernel/binfmt_elfn32.c
--- linux-3.0.9/arch/mips/kernel/binfmt_elfn32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/kernel/binfmt_elfn32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/mips/kernel/binfmt_elfn32.c 2011-11-15 20:02:59.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)
@@ -1147,7 +1147,7 @@ diff -urNp linux-3.0.9/arch/mips/kernel/binfmt_elfn32.c linux-3.0.9/arch/mips/ke
#include <linux/elfcore.h>
diff -urNp linux-3.0.9/arch/mips/kernel/binfmt_elfo32.c linux-3.0.9/arch/mips/kernel/binfmt_elfo32.c
--- linux-3.0.9/arch/mips/kernel/binfmt_elfo32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/kernel/binfmt_elfo32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/mips/kernel/binfmt_elfo32.c 2011-11-15 20:02:59.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)
@@ -1164,7 +1164,7 @@ diff -urNp linux-3.0.9/arch/mips/kernel/binfmt_elfo32.c linux-3.0.9/arch/mips/ke
/*
diff -urNp linux-3.0.9/arch/mips/kernel/process.c linux-3.0.9/arch/mips/kernel/process.c
--- linux-3.0.9/arch/mips/kernel/process.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/kernel/process.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/mips/kernel/process.c 2011-11-15 20:02:59.000000000 -0500
@@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru
out:
return pc;
@@ -1183,7 +1183,7 @@ diff -urNp linux-3.0.9/arch/mips/kernel/process.c linux-3.0.9/arch/mips/kernel/p
-}
diff -urNp linux-3.0.9/arch/mips/mm/fault.c linux-3.0.9/arch/mips/mm/fault.c
--- linux-3.0.9/arch/mips/mm/fault.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/mm/fault.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/mips/mm/fault.c 2011-11-15 20:02:59.000000000 -0500
@@ -28,6 +28,23 @@
#include <asm/highmem.h> /* For VMALLOC_END */
#include <linux/kdebug.h>
@@ -1210,7 +1210,7 @@ diff -urNp linux-3.0.9/arch/mips/mm/fault.c linux-3.0.9/arch/mips/mm/fault.c
* and the problem, and then passes it off to one of the appropriate
diff -urNp linux-3.0.9/arch/mips/mm/mmap.c linux-3.0.9/arch/mips/mm/mmap.c
--- linux-3.0.9/arch/mips/mm/mmap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/mips/mm/mmap.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/mips/mm/mmap.c 2011-11-15 20:02:59.000000000 -0500
@@ -48,14 +48,18 @@ unsigned long arch_get_unmapped_area(str
do_color_align = 0;
if (filp || (flags & MAP_SHARED))
@@ -1274,7 +1274,7 @@ diff -urNp linux-3.0.9/arch/mips/mm/mmap.c linux-3.0.9/arch/mips/mm/mmap.c
-}
diff -urNp linux-3.0.9/arch/parisc/include/asm/elf.h linux-3.0.9/arch/parisc/include/asm/elf.h
--- linux-3.0.9/arch/parisc/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/parisc/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/parisc/include/asm/elf.h 2011-11-15 20:02:59.000000000 -0500
@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration..
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1291,7 +1291,7 @@ diff -urNp linux-3.0.9/arch/parisc/include/asm/elf.h linux-3.0.9/arch/parisc/inc
but it's not easy, and we've already done it here. */
diff -urNp linux-3.0.9/arch/parisc/include/asm/pgtable.h linux-3.0.9/arch/parisc/include/asm/pgtable.h
--- linux-3.0.9/arch/parisc/include/asm/pgtable.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/parisc/include/asm/pgtable.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/parisc/include/asm/pgtable.h 2011-11-15 20:02:59.000000000 -0500
@@ -210,6 +210,17 @@ struct vm_area_struct;
#define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
#define PAGE_COPY PAGE_EXECREAD
@@ -1312,7 +1312,7 @@ diff -urNp linux-3.0.9/arch/parisc/include/asm/pgtable.h linux-3.0.9/arch/parisc
#define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
diff -urNp linux-3.0.9/arch/parisc/kernel/module.c linux-3.0.9/arch/parisc/kernel/module.c
--- linux-3.0.9/arch/parisc/kernel/module.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/parisc/kernel/module.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/parisc/kernel/module.c 2011-11-15 20:02:59.000000000 -0500
@@ -98,16 +98,38 @@
/* three functions to determine where in the module core
@@ -1415,7 +1415,7 @@ diff -urNp linux-3.0.9/arch/parisc/kernel/module.c linux-3.0.9/arch/parisc/kerne
me->arch.unwind_section, table, end, gp);
diff -urNp linux-3.0.9/arch/parisc/kernel/sys_parisc.c linux-3.0.9/arch/parisc/kernel/sys_parisc.c
--- linux-3.0.9/arch/parisc/kernel/sys_parisc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/parisc/kernel/sys_parisc.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/parisc/kernel/sys_parisc.c 2011-11-15 20:02:59.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)
@@ -1445,7 +1445,7 @@ diff -urNp linux-3.0.9/arch/parisc/kernel/sys_parisc.c linux-3.0.9/arch/parisc/k
addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
diff -urNp linux-3.0.9/arch/parisc/kernel/traps.c linux-3.0.9/arch/parisc/kernel/traps.c
--- linux-3.0.9/arch/parisc/kernel/traps.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/parisc/kernel/traps.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/parisc/kernel/traps.c 2011-11-15 20:02:59.000000000 -0500
@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
down_read(&current->mm->mmap_sem);
@@ -1459,7 +1459,7 @@ diff -urNp linux-3.0.9/arch/parisc/kernel/traps.c linux-3.0.9/arch/parisc/kernel
diff -urNp linux-3.0.9/arch/parisc/mm/fault.c linux-3.0.9/arch/parisc/mm/fault.c
--- linux-3.0.9/arch/parisc/mm/fault.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/parisc/mm/fault.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/parisc/mm/fault.c 2011-11-15 20:02:59.000000000 -0500
@@ -15,6 +15,7 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -1631,7 +1631,7 @@ diff -urNp linux-3.0.9/arch/parisc/mm/fault.c linux-3.0.9/arch/parisc/mm/fault.c
* If for any reason at all we couldn't handle the fault, make
diff -urNp linux-3.0.9/arch/powerpc/include/asm/elf.h linux-3.0.9/arch/powerpc/include/asm/elf.h
--- linux-3.0.9/arch/powerpc/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/include/asm/elf.h 2011-11-15 20:02:59.000000000 -0500
@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -1666,7 +1666,7 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/elf.h linux-3.0.9/arch/powerpc/i
/*
diff -urNp linux-3.0.9/arch/powerpc/include/asm/kmap_types.h linux-3.0.9/arch/powerpc/include/asm/kmap_types.h
--- linux-3.0.9/arch/powerpc/include/asm/kmap_types.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/kmap_types.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/include/asm/kmap_types.h 2011-11-15 20:02:59.000000000 -0500
@@ -27,6 +27,7 @@ enum km_type {
KM_PPC_SYNC_PAGE,
KM_PPC_SYNC_ICACHE,
@@ -1677,7 +1677,7 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/kmap_types.h linux-3.0.9/arch/po
diff -urNp linux-3.0.9/arch/powerpc/include/asm/mman.h linux-3.0.9/arch/powerpc/include/asm/mman.h
--- linux-3.0.9/arch/powerpc/include/asm/mman.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/mman.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/include/asm/mman.h 2011-11-15 20:02:59.000000000 -0500
@@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm
}
#define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
@@ -1689,7 +1689,7 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/mman.h linux-3.0.9/arch/powerpc/
}
diff -urNp linux-3.0.9/arch/powerpc/include/asm/page_64.h linux-3.0.9/arch/powerpc/include/asm/page_64.h
--- linux-3.0.9/arch/powerpc/include/asm/page_64.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/page_64.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/include/asm/page_64.h 2011-11-15 20:02:59.000000000 -0500
@@ -155,15 +155,18 @@ do { \
* stack by default, so in the absence of a PT_GNU_STACK program header
* we turn execute permission off.
@@ -1713,7 +1713,7 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/page_64.h linux-3.0.9/arch/power
diff -urNp linux-3.0.9/arch/powerpc/include/asm/page.h linux-3.0.9/arch/powerpc/include/asm/page.h
--- linux-3.0.9/arch/powerpc/include/asm/page.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/page.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/include/asm/page.h 2011-11-15 20:02:59.000000000 -0500
@@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr;
* and needs to be executable. This means the whole heap ends
* up being executable.
@@ -1738,7 +1738,7 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/page.h linux-3.0.9/arch/powerpc/
#undef STRICT_MM_TYPECHECKS
diff -urNp linux-3.0.9/arch/powerpc/include/asm/pgtable.h linux-3.0.9/arch/powerpc/include/asm/pgtable.h
--- linux-3.0.9/arch/powerpc/include/asm/pgtable.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/pgtable.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/include/asm/pgtable.h 2011-11-15 20:02:59.000000000 -0500
@@ -2,6 +2,7 @@
#define _ASM_POWERPC_PGTABLE_H
#ifdef __KERNEL__
@@ -1749,7 +1749,7 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/pgtable.h linux-3.0.9/arch/power
#include <asm/mmu.h>
diff -urNp linux-3.0.9/arch/powerpc/include/asm/pte-hash32.h linux-3.0.9/arch/powerpc/include/asm/pte-hash32.h
--- linux-3.0.9/arch/powerpc/include/asm/pte-hash32.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/pte-hash32.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/include/asm/pte-hash32.h 2011-11-15 20:02:59.000000000 -0500
@@ -21,6 +21,7 @@
#define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
#define _PAGE_USER 0x004 /* usermode access allowed */
@@ -1760,7 +1760,7 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/pte-hash32.h linux-3.0.9/arch/po
#define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
diff -urNp linux-3.0.9/arch/powerpc/include/asm/reg.h linux-3.0.9/arch/powerpc/include/asm/reg.h
--- linux-3.0.9/arch/powerpc/include/asm/reg.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/reg.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/include/asm/reg.h 2011-11-15 20:02:59.000000000 -0500
@@ -209,6 +209,7 @@
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -1771,7 +1771,7 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/reg.h linux-3.0.9/arch/powerpc/i
#define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
diff -urNp linux-3.0.9/arch/powerpc/include/asm/system.h linux-3.0.9/arch/powerpc/include/asm/system.h
--- linux-3.0.9/arch/powerpc/include/asm/system.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/system.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/include/asm/system.h 2011-11-15 20:02:59.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
@@ -1783,7 +1783,7 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/system.h linux-3.0.9/arch/powerp
extern unsigned long reloc_offset(void);
diff -urNp linux-3.0.9/arch/powerpc/include/asm/uaccess.h linux-3.0.9/arch/powerpc/include/asm/uaccess.h
--- linux-3.0.9/arch/powerpc/include/asm/uaccess.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/include/asm/uaccess.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/include/asm/uaccess.h 2011-11-15 20:02:59.000000000 -0500
@@ -13,6 +13,8 @@
#define VERIFY_READ 0
#define VERIFY_WRITE 1
@@ -1963,7 +1963,7 @@ diff -urNp linux-3.0.9/arch/powerpc/include/asm/uaccess.h linux-3.0.9/arch/power
static inline unsigned long clear_user(void __user *addr, unsigned long size)
diff -urNp linux-3.0.9/arch/powerpc/kernel/exceptions-64e.S linux-3.0.9/arch/powerpc/kernel/exceptions-64e.S
--- linux-3.0.9/arch/powerpc/kernel/exceptions-64e.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/exceptions-64e.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/kernel/exceptions-64e.S 2011-11-15 20:02:59.000000000 -0500
@@ -567,6 +567,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
@@ -1984,7 +1984,7 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/exceptions-64e.S linux-3.0.9/arch/pow
bl .bad_page_fault
diff -urNp linux-3.0.9/arch/powerpc/kernel/exceptions-64s.S linux-3.0.9/arch/powerpc/kernel/exceptions-64s.S
--- linux-3.0.9/arch/powerpc/kernel/exceptions-64s.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/exceptions-64s.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/kernel/exceptions-64s.S 2011-11-15 20:02:59.000000000 -0500
@@ -956,10 +956,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
@@ -1999,7 +1999,7 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/exceptions-64s.S linux-3.0.9/arch/pow
lwz r4,_DAR(r1)
diff -urNp linux-3.0.9/arch/powerpc/kernel/module_32.c linux-3.0.9/arch/powerpc/kernel/module_32.c
--- linux-3.0.9/arch/powerpc/kernel/module_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/module_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/kernel/module_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
me->arch.core_plt_section = i;
}
@@ -2031,7 +2031,7 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/module_32.c linux-3.0.9/arch/powerpc/
while (entry->jump[0]) {
diff -urNp linux-3.0.9/arch/powerpc/kernel/module.c linux-3.0.9/arch/powerpc/kernel/module.c
--- linux-3.0.9/arch/powerpc/kernel/module.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/module.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/kernel/module.c 2011-11-15 20:02:59.000000000 -0500
@@ -31,11 +31,24 @@
LIST_HEAD(module_bug_list);
@@ -2073,7 +2073,7 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/module.c linux-3.0.9/arch/powerpc/ker
const char *name)
diff -urNp linux-3.0.9/arch/powerpc/kernel/process.c linux-3.0.9/arch/powerpc/kernel/process.c
--- linux-3.0.9/arch/powerpc/kernel/process.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/process.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/kernel/process.c 2011-11-15 20:02:59.000000000 -0500
@@ -676,8 +676,8 @@ void show_regs(struct pt_regs * regs)
* Lookup NIP late so we have the best change of getting the
* above info out without failing
@@ -2168,7 +2168,7 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/process.c linux-3.0.9/arch/powerpc/ke
-}
diff -urNp linux-3.0.9/arch/powerpc/kernel/signal_32.c linux-3.0.9/arch/powerpc/kernel/signal_32.c
--- linux-3.0.9/arch/powerpc/kernel/signal_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/signal_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/kernel/signal_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -859,7 +859,7 @@ int handle_rt_signal32(unsigned long sig
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
@@ -2180,7 +2180,7 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/signal_32.c linux-3.0.9/arch/powerpc/
regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
diff -urNp linux-3.0.9/arch/powerpc/kernel/signal_64.c linux-3.0.9/arch/powerpc/kernel/signal_64.c
--- linux-3.0.9/arch/powerpc/kernel/signal_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/signal_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/kernel/signal_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -430,7 +430,7 @@ int handle_rt_signal64(int signr, struct
current->thread.fpscr.val = 0;
@@ -2192,7 +2192,7 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/signal_64.c linux-3.0.9/arch/powerpc/
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
diff -urNp linux-3.0.9/arch/powerpc/kernel/traps.c linux-3.0.9/arch/powerpc/kernel/traps.c
--- linux-3.0.9/arch/powerpc/kernel/traps.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/traps.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/kernel/traps.c 2011-11-15 20:02:59.000000000 -0500
@@ -98,6 +98,8 @@ static void pmac_backlight_unblank(void)
static inline void pmac_backlight_unblank(void) { }
#endif
@@ -2213,7 +2213,7 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/traps.c linux-3.0.9/arch/powerpc/kern
diff -urNp linux-3.0.9/arch/powerpc/kernel/vdso.c linux-3.0.9/arch/powerpc/kernel/vdso.c
--- linux-3.0.9/arch/powerpc/kernel/vdso.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/kernel/vdso.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/kernel/vdso.c 2011-11-15 20:02:59.000000000 -0500
@@ -36,6 +36,7 @@
#include <asm/firmware.h>
#include <asm/vdso.h>
@@ -2242,7 +2242,7 @@ diff -urNp linux-3.0.9/arch/powerpc/kernel/vdso.c linux-3.0.9/arch/powerpc/kerne
goto fail_mmapsem;
diff -urNp linux-3.0.9/arch/powerpc/lib/usercopy_64.c linux-3.0.9/arch/powerpc/lib/usercopy_64.c
--- linux-3.0.9/arch/powerpc/lib/usercopy_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/lib/usercopy_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/lib/usercopy_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -9,22 +9,6 @@
#include <linux/module.h>
#include <asm/uaccess.h>
@@ -2276,7 +2276,7 @@ diff -urNp linux-3.0.9/arch/powerpc/lib/usercopy_64.c linux-3.0.9/arch/powerpc/l
diff -urNp linux-3.0.9/arch/powerpc/mm/fault.c linux-3.0.9/arch/powerpc/mm/fault.c
--- linux-3.0.9/arch/powerpc/mm/fault.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/mm/fault.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/mm/fault.c 2011-11-15 20:02:59.000000000 -0500
@@ -32,6 +32,10 @@
#include <linux/perf_event.h>
#include <linux/magic.h>
@@ -2383,7 +2383,7 @@ diff -urNp linux-3.0.9/arch/powerpc/mm/fault.c linux-3.0.9/arch/powerpc/mm/fault
}
diff -urNp linux-3.0.9/arch/powerpc/mm/mmap_64.c linux-3.0.9/arch/powerpc/mm/mmap_64.c
--- linux-3.0.9/arch/powerpc/mm/mmap_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/mm/mmap_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/mm/mmap_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -2409,7 +2409,7 @@ diff -urNp linux-3.0.9/arch/powerpc/mm/mmap_64.c linux-3.0.9/arch/powerpc/mm/mma
}
diff -urNp linux-3.0.9/arch/powerpc/mm/slice.c linux-3.0.9/arch/powerpc/mm/slice.c
--- linux-3.0.9/arch/powerpc/mm/slice.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/powerpc/mm/slice.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/powerpc/mm/slice.c 2011-11-15 20:02:59.000000000 -0500
@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
if ((mm->task_size - len) < addr)
return 0;
@@ -2478,7 +2478,7 @@ diff -urNp linux-3.0.9/arch/powerpc/mm/slice.c linux-3.0.9/arch/powerpc/mm/slice
addr = _ALIGN_UP(addr, 1ul << pshift);
diff -urNp linux-3.0.9/arch/s390/include/asm/elf.h linux-3.0.9/arch/s390/include/asm/elf.h
--- linux-3.0.9/arch/s390/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/s390/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/s390/include/asm/elf.h 2011-11-15 20:02:59.000000000 -0500
@@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -2506,7 +2506,7 @@ diff -urNp linux-3.0.9/arch/s390/include/asm/elf.h linux-3.0.9/arch/s390/include
#endif
diff -urNp linux-3.0.9/arch/s390/include/asm/system.h linux-3.0.9/arch/s390/include/asm/system.h
--- linux-3.0.9/arch/s390/include/asm/system.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/s390/include/asm/system.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/s390/include/asm/system.h 2011-11-15 20:02:59.000000000 -0500
@@ -255,7 +255,7 @@ extern void (*_machine_restart)(char *co
extern void (*_machine_halt)(void);
extern void (*_machine_power_off)(void);
@@ -2518,7 +2518,7 @@ diff -urNp linux-3.0.9/arch/s390/include/asm/system.h linux-3.0.9/arch/s390/incl
{
diff -urNp linux-3.0.9/arch/s390/include/asm/uaccess.h linux-3.0.9/arch/s390/include/asm/uaccess.h
--- linux-3.0.9/arch/s390/include/asm/uaccess.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/s390/include/asm/uaccess.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/s390/include/asm/uaccess.h 2011-11-15 20:02:59.000000000 -0500
@@ -235,6 +235,10 @@ static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long n)
{
@@ -2553,7 +2553,7 @@ diff -urNp linux-3.0.9/arch/s390/include/asm/uaccess.h linux-3.0.9/arch/s390/inc
return n;
diff -urNp linux-3.0.9/arch/s390/kernel/module.c linux-3.0.9/arch/s390/kernel/module.c
--- linux-3.0.9/arch/s390/kernel/module.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/s390/kernel/module.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/s390/kernel/module.c 2011-11-15 20:02:59.000000000 -0500
@@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
/* Increase core size by size of got & plt and set start
@@ -2627,7 +2627,7 @@ diff -urNp linux-3.0.9/arch/s390/kernel/module.c linux-3.0.9/arch/s390/kernel/mo
*(unsigned int *) loc = val;
diff -urNp linux-3.0.9/arch/s390/kernel/process.c linux-3.0.9/arch/s390/kernel/process.c
--- linux-3.0.9/arch/s390/kernel/process.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/s390/kernel/process.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/s390/kernel/process.c 2011-11-15 20:02:59.000000000 -0500
@@ -319,39 +319,3 @@ unsigned long get_wchan(struct task_stru
}
return 0;
@@ -2670,7 +2670,7 @@ diff -urNp linux-3.0.9/arch/s390/kernel/process.c linux-3.0.9/arch/s390/kernel/p
-}
diff -urNp linux-3.0.9/arch/s390/kernel/setup.c linux-3.0.9/arch/s390/kernel/setup.c
--- linux-3.0.9/arch/s390/kernel/setup.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/s390/kernel/setup.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/s390/kernel/setup.c 2011-11-15 20:02:59.000000000 -0500
@@ -271,7 +271,7 @@ static int __init early_parse_mem(char *
}
early_param("mem", early_parse_mem);
@@ -2682,7 +2682,7 @@ diff -urNp linux-3.0.9/arch/s390/kernel/setup.c linux-3.0.9/arch/s390/kernel/set
static int set_amode_and_uaccess(unsigned long user_amode,
diff -urNp linux-3.0.9/arch/s390/mm/mmap.c linux-3.0.9/arch/s390/mm/mmap.c
--- linux-3.0.9/arch/s390/mm/mmap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/s390/mm/mmap.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/s390/mm/mmap.c 2011-11-15 20:02:59.000000000 -0500
@@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -2731,7 +2731,7 @@ diff -urNp linux-3.0.9/arch/s390/mm/mmap.c linux-3.0.9/arch/s390/mm/mmap.c
}
diff -urNp linux-3.0.9/arch/score/include/asm/system.h linux-3.0.9/arch/score/include/asm/system.h
--- linux-3.0.9/arch/score/include/asm/system.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/score/include/asm/system.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/score/include/asm/system.h 2011-11-15 20:02:59.000000000 -0500
@@ -17,7 +17,7 @@ do { \
#define finish_arch_switch(prev) do {} while (0)
@@ -2743,7 +2743,7 @@ diff -urNp linux-3.0.9/arch/score/include/asm/system.h linux-3.0.9/arch/score/in
#define rmb() barrier()
diff -urNp linux-3.0.9/arch/score/kernel/process.c linux-3.0.9/arch/score/kernel/process.c
--- linux-3.0.9/arch/score/kernel/process.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/score/kernel/process.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/score/kernel/process.c 2011-11-15 20:02:59.000000000 -0500
@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
return task_pt_regs(task)->cp0_epc;
@@ -2755,7 +2755,7 @@ diff -urNp linux-3.0.9/arch/score/kernel/process.c linux-3.0.9/arch/score/kernel
-}
diff -urNp linux-3.0.9/arch/sh/mm/mmap.c linux-3.0.9/arch/sh/mm/mmap.c
--- linux-3.0.9/arch/sh/mm/mmap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sh/mm/mmap.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sh/mm/mmap.c 2011-11-15 20:02:59.000000000 -0500
@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
addr = PAGE_ALIGN(addr);
@@ -2832,7 +2832,7 @@ diff -urNp linux-3.0.9/arch/sh/mm/mmap.c linux-3.0.9/arch/sh/mm/mmap.c
/*
diff -urNp linux-3.0.9/arch/sparc/include/asm/atomic_64.h linux-3.0.9/arch/sparc/include/asm/atomic_64.h
--- linux-3.0.9/arch/sparc/include/asm/atomic_64.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/atomic_64.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/include/asm/atomic_64.h 2011-11-15 20:02:59.000000000 -0500
@@ -14,18 +14,40 @@
#define ATOMIC64_INIT(i) { (i) }
@@ -3027,7 +3027,7 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/atomic_64.h linux-3.0.9/arch/sparc
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
diff -urNp linux-3.0.9/arch/sparc/include/asm/cache.h linux-3.0.9/arch/sparc/include/asm/cache.h
--- linux-3.0.9/arch/sparc/include/asm/cache.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/cache.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/include/asm/cache.h 2011-11-15 20:02:59.000000000 -0500
@@ -10,7 +10,7 @@
#define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
@@ -3039,7 +3039,7 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/cache.h linux-3.0.9/arch/sparc/inc
#define SMP_CACHE_BYTES_SHIFT 5
diff -urNp linux-3.0.9/arch/sparc/include/asm/elf_32.h linux-3.0.9/arch/sparc/include/asm/elf_32.h
--- linux-3.0.9/arch/sparc/include/asm/elf_32.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/elf_32.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/include/asm/elf_32.h 2011-11-15 20:02:59.000000000 -0500
@@ -114,6 +114,13 @@ typedef struct {
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -3056,7 +3056,7 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/elf_32.h linux-3.0.9/arch/sparc/in
on Sparc. */
diff -urNp linux-3.0.9/arch/sparc/include/asm/elf_64.h linux-3.0.9/arch/sparc/include/asm/elf_64.h
--- linux-3.0.9/arch/sparc/include/asm/elf_64.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/elf_64.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/include/asm/elf_64.h 2011-11-15 20:02:59.000000000 -0500
@@ -180,6 +180,13 @@ typedef struct {
#define ELF_ET_DYN_BASE 0x0000010000000000UL
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -3073,7 +3073,7 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/elf_64.h linux-3.0.9/arch/sparc/in
diff -urNp linux-3.0.9/arch/sparc/include/asm/pgtable_32.h linux-3.0.9/arch/sparc/include/asm/pgtable_32.h
--- linux-3.0.9/arch/sparc/include/asm/pgtable_32.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/pgtable_32.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/include/asm/pgtable_32.h 2011-11-15 20:02:59.000000000 -0500
@@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
BTFIXUPDEF_INT(page_none)
BTFIXUPDEF_INT(page_copy)
@@ -3107,7 +3107,7 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/pgtable_32.h linux-3.0.9/arch/spar
#ifdef MODULE
diff -urNp linux-3.0.9/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.9/arch/sparc/include/asm/pgtsrmmu.h
--- linux-3.0.9/arch/sparc/include/asm/pgtsrmmu.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/pgtsrmmu.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/include/asm/pgtsrmmu.h 2011-11-15 20:02:59.000000000 -0500
@@ -115,6 +115,13 @@
SRMMU_EXEC | SRMMU_REF)
#define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3124,7 +3124,7 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.9/arch/sparc/
diff -urNp linux-3.0.9/arch/sparc/include/asm/spinlock_64.h linux-3.0.9/arch/sparc/include/asm/spinlock_64.h
--- linux-3.0.9/arch/sparc/include/asm/spinlock_64.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/spinlock_64.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/include/asm/spinlock_64.h 2011-11-15 20:02:59.000000000 -0500
@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(
/* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
@@ -3224,7 +3224,7 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/spinlock_64.h linux-3.0.9/arch/spa
diff -urNp linux-3.0.9/arch/sparc/include/asm/thread_info_32.h linux-3.0.9/arch/sparc/include/asm/thread_info_32.h
--- linux-3.0.9/arch/sparc/include/asm/thread_info_32.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/thread_info_32.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/include/asm/thread_info_32.h 2011-11-15 20:02:59.000000000 -0500
@@ -50,6 +50,8 @@ struct thread_info {
unsigned long w_saved;
@@ -3236,7 +3236,7 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/thread_info_32.h linux-3.0.9/arch/
/*
diff -urNp linux-3.0.9/arch/sparc/include/asm/thread_info_64.h linux-3.0.9/arch/sparc/include/asm/thread_info_64.h
--- linux-3.0.9/arch/sparc/include/asm/thread_info_64.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/thread_info_64.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/include/asm/thread_info_64.h 2011-11-15 20:02:59.000000000 -0500
@@ -63,6 +63,8 @@ struct thread_info {
struct pt_regs *kern_una_regs;
unsigned int kern_una_insn;
@@ -3248,7 +3248,7 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/thread_info_64.h linux-3.0.9/arch/
diff -urNp linux-3.0.9/arch/sparc/include/asm/uaccess_32.h linux-3.0.9/arch/sparc/include/asm/uaccess_32.h
--- linux-3.0.9/arch/sparc/include/asm/uaccess_32.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/uaccess_32.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/include/asm/uaccess_32.h 2011-11-15 20:02:59.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)
@@ -3302,7 +3302,7 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/uaccess_32.h linux-3.0.9/arch/spar
diff -urNp linux-3.0.9/arch/sparc/include/asm/uaccess_64.h linux-3.0.9/arch/sparc/include/asm/uaccess_64.h
--- linux-3.0.9/arch/sparc/include/asm/uaccess_64.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/uaccess_64.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/include/asm/uaccess_64.h 2011-11-15 20:02:59.000000000 -0500
@@ -10,6 +10,7 @@
#include <linux/compiler.h>
#include <linux/string.h>
@@ -3347,7 +3347,7 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/uaccess_64.h linux-3.0.9/arch/spar
return ret;
diff -urNp linux-3.0.9/arch/sparc/include/asm/uaccess.h linux-3.0.9/arch/sparc/include/asm/uaccess.h
--- linux-3.0.9/arch/sparc/include/asm/uaccess.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/include/asm/uaccess.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/include/asm/uaccess.h 2011-11-15 20:02:59.000000000 -0500
@@ -1,5 +1,13 @@
#ifndef ___ASM_SPARC_UACCESS_H
#define ___ASM_SPARC_UACCESS_H
@@ -3364,7 +3364,7 @@ diff -urNp linux-3.0.9/arch/sparc/include/asm/uaccess.h linux-3.0.9/arch/sparc/i
#else
diff -urNp linux-3.0.9/arch/sparc/kernel/Makefile linux-3.0.9/arch/sparc/kernel/Makefile
--- linux-3.0.9/arch/sparc/kernel/Makefile 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/Makefile 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/kernel/Makefile 2011-11-15 20:02:59.000000000 -0500
@@ -3,7 +3,7 @@
#
@@ -3376,7 +3376,7 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/Makefile linux-3.0.9/arch/sparc/kernel/
extra-y += init_task.o
diff -urNp linux-3.0.9/arch/sparc/kernel/process_32.c linux-3.0.9/arch/sparc/kernel/process_32.c
--- linux-3.0.9/arch/sparc/kernel/process_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/process_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/kernel/process_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp)
rw->ins[4], rw->ins[5],
rw->ins[6],
@@ -3414,7 +3414,7 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/process_32.c linux-3.0.9/arch/sparc/ker
printk("\n");
diff -urNp linux-3.0.9/arch/sparc/kernel/process_64.c linux-3.0.9/arch/sparc/kernel/process_64.c
--- linux-3.0.9/arch/sparc/kernel/process_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/process_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/kernel/process_64.c 2011-11-15 20:02:59.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]);
@@ -3452,7 +3452,7 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/process_64.c linux-3.0.9/arch/sparc/ker
(void *) gp->i7,
diff -urNp linux-3.0.9/arch/sparc/kernel/sys_sparc_32.c linux-3.0.9/arch/sparc/kernel/sys_sparc_32.c
--- linux-3.0.9/arch/sparc/kernel/sys_sparc_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/sys_sparc_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/kernel/sys_sparc_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str
if (ARCH_SUN4C && len > 0x20000000)
return -ENOMEM;
@@ -3473,7 +3473,7 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/sys_sparc_32.c linux-3.0.9/arch/sparc/k
if (flags & MAP_SHARED)
diff -urNp linux-3.0.9/arch/sparc/kernel/sys_sparc_64.c linux-3.0.9/arch/sparc/kernel/sys_sparc_64.c
--- linux-3.0.9/arch/sparc/kernel/sys_sparc_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/sys_sparc_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/kernel/sys_sparc_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str
/* We do not accept a shared mapping if it would violate
* cache aliasing constraints.
@@ -3623,7 +3623,7 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/sys_sparc_64.c linux-3.0.9/arch/sparc/k
}
diff -urNp linux-3.0.9/arch/sparc/kernel/traps_32.c linux-3.0.9/arch/sparc/kernel/traps_32.c
--- linux-3.0.9/arch/sparc/kernel/traps_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/traps_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/kernel/traps_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -44,6 +44,8 @@ static void instruction_dump(unsigned lo
#define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
#define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
@@ -3655,7 +3655,7 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/traps_32.c linux-3.0.9/arch/sparc/kerne
diff -urNp linux-3.0.9/arch/sparc/kernel/traps_64.c linux-3.0.9/arch/sparc/kernel/traps_64.c
--- linux-3.0.9/arch/sparc/kernel/traps_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/traps_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/kernel/traps_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_
i + 1,
p->trapstack[i].tstate, p->trapstack[i].tpc,
@@ -3795,7 +3795,7 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/traps_64.c linux-3.0.9/arch/sparc/kerne
EXPORT_SYMBOL(die_if_kernel);
diff -urNp linux-3.0.9/arch/sparc/kernel/unaligned_64.c linux-3.0.9/arch/sparc/kernel/unaligned_64.c
--- linux-3.0.9/arch/sparc/kernel/unaligned_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/kernel/unaligned_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/kernel/unaligned_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs
static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
@@ -3807,7 +3807,7 @@ diff -urNp linux-3.0.9/arch/sparc/kernel/unaligned_64.c linux-3.0.9/arch/sparc/k
}
diff -urNp linux-3.0.9/arch/sparc/lib/atomic_64.S linux-3.0.9/arch/sparc/lib/atomic_64.S
--- linux-3.0.9/arch/sparc/lib/atomic_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/lib/atomic_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/lib/atomic_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -18,7 +18,12 @@
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
@@ -4044,7 +4044,7 @@ diff -urNp linux-3.0.9/arch/sparc/lib/atomic_64.S linux-3.0.9/arch/sparc/lib/ato
bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
diff -urNp linux-3.0.9/arch/sparc/lib/ksyms.c linux-3.0.9/arch/sparc/lib/ksyms.c
--- linux-3.0.9/arch/sparc/lib/ksyms.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/lib/ksyms.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/lib/ksyms.c 2011-11-15 20:02:59.000000000 -0500
@@ -142,12 +142,18 @@ EXPORT_SYMBOL(__downgrade_write);
/* Atomic counter implementation. */
@@ -4066,7 +4066,7 @@ diff -urNp linux-3.0.9/arch/sparc/lib/ksyms.c linux-3.0.9/arch/sparc/lib/ksyms.c
/* Atomic bit operations. */
diff -urNp linux-3.0.9/arch/sparc/lib/Makefile linux-3.0.9/arch/sparc/lib/Makefile
--- linux-3.0.9/arch/sparc/lib/Makefile 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/lib/Makefile 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/lib/Makefile 2011-11-15 20:02:59.000000000 -0500
@@ -2,7 +2,7 @@
#
@@ -4078,7 +4078,7 @@ diff -urNp linux-3.0.9/arch/sparc/lib/Makefile linux-3.0.9/arch/sparc/lib/Makefi
lib-$(CONFIG_SPARC32) += memcpy.o memset.o
diff -urNp linux-3.0.9/arch/sparc/Makefile linux-3.0.9/arch/sparc/Makefile
--- linux-3.0.9/arch/sparc/Makefile 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/Makefile 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/Makefile 2011-11-15 20:02:59.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
@@ -4090,7 +4090,7 @@ diff -urNp linux-3.0.9/arch/sparc/Makefile linux-3.0.9/arch/sparc/Makefile
diff -urNp linux-3.0.9/arch/sparc/mm/fault_32.c linux-3.0.9/arch/sparc/mm/fault_32.c
--- linux-3.0.9/arch/sparc/mm/fault_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/mm/fault_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/mm/fault_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -22,6 +22,9 @@
#include <linux/interrupt.h>
#include <linux/module.h>
@@ -4397,7 +4397,7 @@ diff -urNp linux-3.0.9/arch/sparc/mm/fault_32.c linux-3.0.9/arch/sparc/mm/fault_
goto bad_area;
diff -urNp linux-3.0.9/arch/sparc/mm/fault_64.c linux-3.0.9/arch/sparc/mm/fault_64.c
--- linux-3.0.9/arch/sparc/mm/fault_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/mm/fault_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/mm/fault_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -21,6 +21,9 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -4907,7 +4907,7 @@ diff -urNp linux-3.0.9/arch/sparc/mm/fault_64.c linux-3.0.9/arch/sparc/mm/fault_
* was no match. So in such a case we (carefully) read the
diff -urNp linux-3.0.9/arch/sparc/mm/hugetlbpage.c linux-3.0.9/arch/sparc/mm/hugetlbpage.c
--- linux-3.0.9/arch/sparc/mm/hugetlbpage.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/mm/hugetlbpage.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/mm/hugetlbpage.c 2011-11-15 20:02:59.000000000 -0500
@@ -68,7 +68,7 @@ full_search:
}
return -ENOMEM;
@@ -4969,7 +4969,7 @@ diff -urNp linux-3.0.9/arch/sparc/mm/hugetlbpage.c linux-3.0.9/arch/sparc/mm/hug
if (mm->get_unmapped_area == arch_get_unmapped_area)
diff -urNp linux-3.0.9/arch/sparc/mm/init_32.c linux-3.0.9/arch/sparc/mm/init_32.c
--- linux-3.0.9/arch/sparc/mm/init_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/mm/init_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/mm/init_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -316,6 +316,9 @@ extern void device_scan(void);
pgprot_t PAGE_SHARED __read_mostly;
EXPORT_SYMBOL(PAGE_SHARED);
@@ -5006,7 +5006,7 @@ diff -urNp linux-3.0.9/arch/sparc/mm/init_32.c linux-3.0.9/arch/sparc/mm/init_32
protection_map[14] = PAGE_SHARED;
diff -urNp linux-3.0.9/arch/sparc/mm/Makefile linux-3.0.9/arch/sparc/mm/Makefile
--- linux-3.0.9/arch/sparc/mm/Makefile 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/mm/Makefile 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/mm/Makefile 2011-11-15 20:02:59.000000000 -0500
@@ -2,7 +2,7 @@
#
@@ -5018,7 +5018,7 @@ diff -urNp linux-3.0.9/arch/sparc/mm/Makefile linux-3.0.9/arch/sparc/mm/Makefile
obj-y += fault_$(BITS).o
diff -urNp linux-3.0.9/arch/sparc/mm/srmmu.c linux-3.0.9/arch/sparc/mm/srmmu.c
--- linux-3.0.9/arch/sparc/mm/srmmu.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/sparc/mm/srmmu.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/sparc/mm/srmmu.c 2011-11-15 20:02:59.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));
@@ -5035,7 +5035,7 @@ diff -urNp linux-3.0.9/arch/sparc/mm/srmmu.c linux-3.0.9/arch/sparc/mm/srmmu.c
diff -urNp linux-3.0.9/arch/um/include/asm/kmap_types.h linux-3.0.9/arch/um/include/asm/kmap_types.h
--- linux-3.0.9/arch/um/include/asm/kmap_types.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/um/include/asm/kmap_types.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/um/include/asm/kmap_types.h 2011-11-15 20:02:59.000000000 -0500
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -5046,7 +5046,7 @@ diff -urNp linux-3.0.9/arch/um/include/asm/kmap_types.h linux-3.0.9/arch/um/incl
diff -urNp linux-3.0.9/arch/um/include/asm/page.h linux-3.0.9/arch/um/include/asm/page.h
--- linux-3.0.9/arch/um/include/asm/page.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/um/include/asm/page.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/um/include/asm/page.h 2011-11-15 20:02:59.000000000 -0500
@@ -14,6 +14,9 @@
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
@@ -5059,7 +5059,7 @@ diff -urNp linux-3.0.9/arch/um/include/asm/page.h linux-3.0.9/arch/um/include/as
struct page;
diff -urNp linux-3.0.9/arch/um/kernel/process.c linux-3.0.9/arch/um/kernel/process.c
--- linux-3.0.9/arch/um/kernel/process.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/um/kernel/process.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/um/kernel/process.c 2011-11-15 20:02:59.000000000 -0500
@@ -404,22 +404,6 @@ int singlestepping(void * t)
return 2;
}
@@ -5085,7 +5085,7 @@ diff -urNp linux-3.0.9/arch/um/kernel/process.c linux-3.0.9/arch/um/kernel/proce
unsigned long stack_page, sp, ip;
diff -urNp linux-3.0.9/arch/um/Makefile linux-3.0.9/arch/um/Makefile
--- linux-3.0.9/arch/um/Makefile 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/um/Makefile 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/um/Makefile 2011-11-15 20:02:59.000000000 -0500
@@ -49,6 +49,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINE
$(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
$(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64
@@ -5099,7 +5099,7 @@ diff -urNp linux-3.0.9/arch/um/Makefile linux-3.0.9/arch/um/Makefile
#This will adjust *FLAGS accordingly to the platform.
diff -urNp linux-3.0.9/arch/um/sys-i386/shared/sysdep/system.h linux-3.0.9/arch/um/sys-i386/shared/sysdep/system.h
--- linux-3.0.9/arch/um/sys-i386/shared/sysdep/system.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/um/sys-i386/shared/sysdep/system.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/um/sys-i386/shared/sysdep/system.h 2011-11-15 20:02:59.000000000 -0500
@@ -17,7 +17,7 @@
# define AT_VECTOR_SIZE_ARCH 1
#endif
@@ -5111,7 +5111,7 @@ diff -urNp linux-3.0.9/arch/um/sys-i386/shared/sysdep/system.h linux-3.0.9/arch/
diff -urNp linux-3.0.9/arch/um/sys-i386/syscalls.c linux-3.0.9/arch/um/sys-i386/syscalls.c
--- linux-3.0.9/arch/um/sys-i386/syscalls.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/um/sys-i386/syscalls.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/um/sys-i386/syscalls.c 2011-11-15 20:02:59.000000000 -0500
@@ -11,6 +11,21 @@
#include "asm/uaccess.h"
#include "asm/unistd.h"
@@ -5136,7 +5136,7 @@ diff -urNp linux-3.0.9/arch/um/sys-i386/syscalls.c linux-3.0.9/arch/um/sys-i386/
*
diff -urNp linux-3.0.9/arch/um/sys-x86_64/shared/sysdep/system.h linux-3.0.9/arch/um/sys-x86_64/shared/sysdep/system.h
--- linux-3.0.9/arch/um/sys-x86_64/shared/sysdep/system.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/um/sys-x86_64/shared/sysdep/system.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/um/sys-x86_64/shared/sysdep/system.h 2011-11-15 20:02:59.000000000 -0500
@@ -17,7 +17,7 @@
# define AT_VECTOR_SIZE_ARCH 1
#endif
@@ -5148,7 +5148,7 @@ diff -urNp linux-3.0.9/arch/um/sys-x86_64/shared/sysdep/system.h linux-3.0.9/arc
diff -urNp linux-3.0.9/arch/x86/boot/bitops.h linux-3.0.9/arch/x86/boot/bitops.h
--- linux-3.0.9/arch/x86/boot/bitops.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/bitops.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/boot/bitops.h 2011-11-15 20:02:59.000000000 -0500
@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
u8 v;
const u32 *p = (const u32 *)addr;
@@ -5169,7 +5169,7 @@ diff -urNp linux-3.0.9/arch/x86/boot/bitops.h linux-3.0.9/arch/x86/boot/bitops.h
#endif /* BOOT_BITOPS_H */
diff -urNp linux-3.0.9/arch/x86/boot/boot.h linux-3.0.9/arch/x86/boot/boot.h
--- linux-3.0.9/arch/x86/boot/boot.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/boot.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/boot/boot.h 2011-11-15 20:02:59.000000000 -0500
@@ -85,7 +85,7 @@ static inline void io_delay(void)
static inline u16 ds(void)
{
@@ -5190,7 +5190,7 @@ diff -urNp linux-3.0.9/arch/x86/boot/boot.h linux-3.0.9/arch/x86/boot/boot.h
}
diff -urNp linux-3.0.9/arch/x86/boot/compressed/head_32.S linux-3.0.9/arch/x86/boot/compressed/head_32.S
--- linux-3.0.9/arch/x86/boot/compressed/head_32.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/compressed/head_32.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/boot/compressed/head_32.S 2011-11-15 20:02:59.000000000 -0500
@@ -76,7 +76,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -5221,7 +5221,7 @@ diff -urNp linux-3.0.9/arch/x86/boot/compressed/head_32.S linux-3.0.9/arch/x86/b
2:
diff -urNp linux-3.0.9/arch/x86/boot/compressed/head_64.S linux-3.0.9/arch/x86/boot/compressed/head_64.S
--- linux-3.0.9/arch/x86/boot/compressed/head_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/compressed/head_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/boot/compressed/head_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -91,7 +91,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -5242,7 +5242,7 @@ diff -urNp linux-3.0.9/arch/x86/boot/compressed/head_64.S linux-3.0.9/arch/x86/b
/* Target address to relocate to for decompression */
diff -urNp linux-3.0.9/arch/x86/boot/compressed/Makefile linux-3.0.9/arch/x86/boot/compressed/Makefile
--- linux-3.0.9/arch/x86/boot/compressed/Makefile 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/compressed/Makefile 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/boot/compressed/Makefile 2011-11-15 20:02:59.000000000 -0500
@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal
KBUILD_CFLAGS += $(cflags-y)
KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
@@ -5255,7 +5255,7 @@ diff -urNp linux-3.0.9/arch/x86/boot/compressed/Makefile linux-3.0.9/arch/x86/bo
GCOV_PROFILE := n
diff -urNp linux-3.0.9/arch/x86/boot/compressed/misc.c linux-3.0.9/arch/x86/boot/compressed/misc.c
--- linux-3.0.9/arch/x86/boot/compressed/misc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/compressed/misc.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/boot/compressed/misc.c 2011-11-15 20:02:59.000000000 -0500
@@ -310,7 +310,7 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
@@ -5276,7 +5276,7 @@ diff -urNp linux-3.0.9/arch/x86/boot/compressed/misc.c linux-3.0.9/arch/x86/boot
diff -urNp linux-3.0.9/arch/x86/boot/compressed/relocs.c linux-3.0.9/arch/x86/boot/compressed/relocs.c
--- linux-3.0.9/arch/x86/boot/compressed/relocs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/compressed/relocs.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/boot/compressed/relocs.c 2011-11-15 20:02:59.000000000 -0500
@@ -13,8 +13,11 @@
static void die(char *fmt, ...);
@@ -5471,7 +5471,7 @@ diff -urNp linux-3.0.9/arch/x86/boot/compressed/relocs.c linux-3.0.9/arch/x86/bo
read_symtabs(fp);
diff -urNp linux-3.0.9/arch/x86/boot/cpucheck.c linux-3.0.9/arch/x86/boot/cpucheck.c
--- linux-3.0.9/arch/x86/boot/cpucheck.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/cpucheck.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/boot/cpucheck.c 2011-11-15 20:02:59.000000000 -0500
@@ -74,7 +74,7 @@ static int has_fpu(void)
u16 fcw = -1, fsw = -1;
u32 cr0;
@@ -5569,7 +5569,7 @@ diff -urNp linux-3.0.9/arch/x86/boot/cpucheck.c linux-3.0.9/arch/x86/boot/cpuche
}
diff -urNp linux-3.0.9/arch/x86/boot/header.S linux-3.0.9/arch/x86/boot/header.S
--- linux-3.0.9/arch/x86/boot/header.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/header.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/boot/header.S 2011-11-15 20:02:59.000000000 -0500
@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
# single linked list of
# struct setup_data
@@ -5581,7 +5581,7 @@ diff -urNp linux-3.0.9/arch/x86/boot/header.S linux-3.0.9/arch/x86/boot/header.S
#define VO_INIT_SIZE (VO__end - VO__text)
diff -urNp linux-3.0.9/arch/x86/boot/Makefile linux-3.0.9/arch/x86/boot/Makefile
--- linux-3.0.9/arch/x86/boot/Makefile 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/Makefile 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/boot/Makefile 2011-11-15 20:02:59.000000000 -0500
@@ -69,6 +69,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os
$(call cc-option, -fno-stack-protector) \
$(call cc-option, -mpreferred-stack-boundary=2)
@@ -5594,7 +5594,7 @@ diff -urNp linux-3.0.9/arch/x86/boot/Makefile linux-3.0.9/arch/x86/boot/Makefile
diff -urNp linux-3.0.9/arch/x86/boot/memory.c linux-3.0.9/arch/x86/boot/memory.c
--- linux-3.0.9/arch/x86/boot/memory.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/memory.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/boot/memory.c 2011-11-15 20:02:59.000000000 -0500
@@ -19,7 +19,7 @@
static int detect_memory_e820(void)
@@ -5606,7 +5606,7 @@ diff -urNp linux-3.0.9/arch/x86/boot/memory.c linux-3.0.9/arch/x86/boot/memory.c
static struct e820entry buf; /* static so it is zeroed */
diff -urNp linux-3.0.9/arch/x86/boot/video.c linux-3.0.9/arch/x86/boot/video.c
--- linux-3.0.9/arch/x86/boot/video.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/video.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/boot/video.c 2011-11-15 20:02:59.000000000 -0500
@@ -96,7 +96,7 @@ static void store_mode_params(void)
static unsigned int get_entry(void)
{
@@ -5618,7 +5618,7 @@ diff -urNp linux-3.0.9/arch/x86/boot/video.c linux-3.0.9/arch/x86/boot/video.c
diff -urNp linux-3.0.9/arch/x86/boot/video-vesa.c linux-3.0.9/arch/x86/boot/video-vesa.c
--- linux-3.0.9/arch/x86/boot/video-vesa.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/boot/video-vesa.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/boot/video-vesa.c 2011-11-15 20:02:59.000000000 -0500
@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5629,7 +5629,7 @@ diff -urNp linux-3.0.9/arch/x86/boot/video-vesa.c linux-3.0.9/arch/x86/boot/vide
/*
diff -urNp linux-3.0.9/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.0.9/arch/x86/crypto/aes-x86_64-asm_64.S
--- linux-3.0.9/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -8,6 +8,8 @@
* including this sentence is retained in full.
*/
@@ -5650,7 +5650,7 @@ diff -urNp linux-3.0.9/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.0.9/arch/x86/
movq r3,r4; \
diff -urNp linux-3.0.9/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.0.9/arch/x86/crypto/salsa20-x86_64-asm_64.S
--- linux-3.0.9/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -1,3 +1,5 @@
+#include <asm/alternative-asm.h>
+
@@ -5681,7 +5681,7 @@ diff -urNp linux-3.0.9/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.0.9/arch/
ret
diff -urNp linux-3.0.9/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.0.9/arch/x86/crypto/twofish-x86_64-asm_64.S
--- linux-3.0.9/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -21,6 +21,7 @@
.text
@@ -5706,7 +5706,7 @@ diff -urNp linux-3.0.9/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.0.9/arch/
ret
diff -urNp linux-3.0.9/arch/x86/ia32/ia32_aout.c linux-3.0.9/arch/x86/ia32/ia32_aout.c
--- linux-3.0.9/arch/x86/ia32/ia32_aout.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/ia32/ia32_aout.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/ia32/ia32_aout.c 2011-11-15 20:02:59.000000000 -0500
@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
unsigned long dump_start, dump_size;
struct user32 dump;
@@ -5718,7 +5718,7 @@ diff -urNp linux-3.0.9/arch/x86/ia32/ia32_aout.c linux-3.0.9/arch/x86/ia32/ia32_
has_dumped = 1;
diff -urNp linux-3.0.9/arch/x86/ia32/ia32entry.S linux-3.0.9/arch/x86/ia32/ia32entry.S
--- linux-3.0.9/arch/x86/ia32/ia32entry.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/ia32/ia32entry.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/ia32/ia32entry.S 2011-11-15 20:02:59.000000000 -0500
@@ -13,7 +13,9 @@
#include <asm/thread_info.h>
#include <asm/segment.h>
@@ -5907,7 +5907,7 @@ diff -urNp linux-3.0.9/arch/x86/ia32/ia32entry.S linux-3.0.9/arch/x86/ia32/ia32e
diff -urNp linux-3.0.9/arch/x86/ia32/ia32_signal.c linux-3.0.9/arch/x86/ia32/ia32_signal.c
--- linux-3.0.9/arch/x86/ia32/ia32_signal.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/ia32/ia32_signal.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/ia32/ia32_signal.c 2011-11-15 20:02:59.000000000 -0500
@@ -167,7 +167,7 @@ asmlinkage long sys32_sigaltstack(const
}
seg = get_fs();
@@ -5986,7 +5986,7 @@ diff -urNp linux-3.0.9/arch/x86/ia32/ia32_signal.c linux-3.0.9/arch/x86/ia32/ia3
if (err)
diff -urNp linux-3.0.9/arch/x86/ia32/sys_ia32.c linux-3.0.9/arch/x86/ia32/sys_ia32.c
--- linux-3.0.9/arch/x86/ia32/sys_ia32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/ia32/sys_ia32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/ia32/sys_ia32.c 2011-11-15 20:02:59.000000000 -0500
@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsign
*/
static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
@@ -6056,7 +6056,7 @@ diff -urNp linux-3.0.9/arch/x86/ia32/sys_ia32.c linux-3.0.9/arch/x86/ia32/sys_ia
diff -urNp linux-3.0.9/arch/x86/include/asm/alternative-asm.h linux-3.0.9/arch/x86/include/asm/alternative-asm.h
--- linux-3.0.9/arch/x86/include/asm/alternative-asm.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/alternative-asm.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/alternative-asm.h 2011-11-15 20:02:59.000000000 -0500
@@ -15,6 +15,20 @@
.endm
#endif
@@ -6080,7 +6080,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/alternative-asm.h linux-3.0.9/arch/x
.quad \orig
diff -urNp linux-3.0.9/arch/x86/include/asm/alternative.h linux-3.0.9/arch/x86/include/asm/alternative.h
--- linux-3.0.9/arch/x86/include/asm/alternative.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/alternative.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/alternative.h 2011-11-15 20:02:59.000000000 -0500
@@ -93,7 +93,7 @@ static inline int alternatives_text_rese
".section .discard,\"aw\",@progbits\n" \
" .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
@@ -6092,7 +6092,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/alternative.h linux-3.0.9/arch/x86/i
diff -urNp linux-3.0.9/arch/x86/include/asm/apic.h linux-3.0.9/arch/x86/include/asm/apic.h
--- linux-3.0.9/arch/x86/include/asm/apic.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/apic.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/apic.h 2011-11-15 20:02:59.000000000 -0500
@@ -45,7 +45,7 @@ static inline void generic_apic_probe(vo
#ifdef CONFIG_X86_LOCAL_APIC
@@ -6104,7 +6104,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/apic.h linux-3.0.9/arch/x86/include/
extern int disable_apic;
diff -urNp linux-3.0.9/arch/x86/include/asm/apm.h linux-3.0.9/arch/x86/include/asm/apm.h
--- linux-3.0.9/arch/x86/include/asm/apm.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/apm.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/apm.h 2011-11-15 20:02:59.000000000 -0500
@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
__asm__ __volatile__(APM_DO_ZERO_SEGS
"pushl %%edi\n\t"
@@ -6125,7 +6125,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/apm.h linux-3.0.9/arch/x86/include/a
"popl %%edi\n\t"
diff -urNp linux-3.0.9/arch/x86/include/asm/atomic64_32.h linux-3.0.9/arch/x86/include/asm/atomic64_32.h
--- linux-3.0.9/arch/x86/include/asm/atomic64_32.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/atomic64_32.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/atomic64_32.h 2011-11-15 20:02:59.000000000 -0500
@@ -12,6 +12,14 @@ typedef struct {
u64 __aligned(8) counter;
} atomic64_t;
@@ -6277,7 +6277,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/atomic64_32.h linux-3.0.9/arch/x86/i
* @v: pointer to type atomic64_t
diff -urNp linux-3.0.9/arch/x86/include/asm/atomic64_64.h linux-3.0.9/arch/x86/include/asm/atomic64_64.h
--- linux-3.0.9/arch/x86/include/asm/atomic64_64.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/atomic64_64.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/atomic64_64.h 2011-11-15 20:02:59.000000000 -0500
@@ -18,7 +18,19 @@
*/
static inline long atomic64_read(const atomic64_t *v)
@@ -6601,7 +6601,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/atomic64_64.h linux-3.0.9/arch/x86/i
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
diff -urNp linux-3.0.9/arch/x86/include/asm/atomic.h linux-3.0.9/arch/x86/include/asm/atomic.h
--- linux-3.0.9/arch/x86/include/asm/atomic.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/atomic.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/atomic.h 2011-11-15 20:02:59.000000000 -0500
@@ -22,7 +22,18 @@
*/
static inline int atomic_read(const atomic_t *v)
@@ -7016,7 +7016,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/atomic.h linux-3.0.9/arch/x86/includ
* @v: pointer of type atomic_t
diff -urNp linux-3.0.9/arch/x86/include/asm/bitops.h linux-3.0.9/arch/x86/include/asm/bitops.h
--- linux-3.0.9/arch/x86/include/asm/bitops.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/bitops.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/bitops.h 2011-11-15 20:02:59.000000000 -0500
@@ -38,7 +38,7 @@
* a mask operation on a byte.
*/
@@ -7028,7 +7028,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/bitops.h linux-3.0.9/arch/x86/includ
/**
diff -urNp linux-3.0.9/arch/x86/include/asm/boot.h linux-3.0.9/arch/x86/include/asm/boot.h
--- linux-3.0.9/arch/x86/include/asm/boot.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/boot.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/boot.h 2011-11-15 20:02:59.000000000 -0500
@@ -11,10 +11,15 @@
#include <asm/pgtable_types.h>
@@ -7048,7 +7048,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/boot.h linux-3.0.9/arch/x86/include/
#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
diff -urNp linux-3.0.9/arch/x86/include/asm/cacheflush.h linux-3.0.9/arch/x86/include/asm/cacheflush.h
--- linux-3.0.9/arch/x86/include/asm/cacheflush.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/cacheflush.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/cacheflush.h 2011-11-15 20:02:59.000000000 -0500
@@ -26,7 +26,7 @@ static inline unsigned long get_page_mem
unsigned long pg_flags = pg->flags & _PGMT_MASK;
@@ -7060,7 +7060,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/cacheflush.h linux-3.0.9/arch/x86/in
else if (pg_flags == _PGMT_UC_MINUS)
diff -urNp linux-3.0.9/arch/x86/include/asm/cache.h linux-3.0.9/arch/x86/include/asm/cache.h
--- linux-3.0.9/arch/x86/include/asm/cache.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/cache.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/cache.h 2011-11-15 20:02:59.000000000 -0500
@@ -5,12 +5,13 @@
/* L1 cache line size */
@@ -7079,7 +7079,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/cache.h linux-3.0.9/arch/x86/include
#ifdef CONFIG_SMP
diff -urNp linux-3.0.9/arch/x86/include/asm/checksum_32.h linux-3.0.9/arch/x86/include/asm/checksum_32.h
--- linux-3.0.9/arch/x86/include/asm/checksum_32.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/checksum_32.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/checksum_32.h 2011-11-15 20:02:59.000000000 -0500
@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
int len, __wsum sum,
int *src_err_ptr, int *dst_err_ptr);
@@ -7115,7 +7115,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/checksum_32.h linux-3.0.9/arch/x86/i
if (len)
diff -urNp linux-3.0.9/arch/x86/include/asm/cpufeature.h linux-3.0.9/arch/x86/include/asm/cpufeature.h
--- linux-3.0.9/arch/x86/include/asm/cpufeature.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/cpufeature.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/cpufeature.h 2011-11-15 20:02:59.000000000 -0500
@@ -358,7 +358,7 @@ static __always_inline __pure bool __sta
".section .discard,\"aw\",@progbits\n"
" .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
@@ -7127,7 +7127,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/cpufeature.h linux-3.0.9/arch/x86/in
".previous\n"
diff -urNp linux-3.0.9/arch/x86/include/asm/desc_defs.h linux-3.0.9/arch/x86/include/asm/desc_defs.h
--- linux-3.0.9/arch/x86/include/asm/desc_defs.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/desc_defs.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/desc_defs.h 2011-11-15 20:02:59.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;
@@ -7143,7 +7143,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/desc_defs.h linux-3.0.9/arch/x86/inc
diff -urNp linux-3.0.9/arch/x86/include/asm/desc.h linux-3.0.9/arch/x86/include/asm/desc.h
--- linux-3.0.9/arch/x86/include/asm/desc.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/desc.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/desc.h 2011-11-15 20:02:59.000000000 -0500
@@ -4,6 +4,7 @@
#include <asm/desc_defs.h>
#include <asm/ldt.h>
@@ -7324,7 +7324,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/desc.h linux-3.0.9/arch/x86/include/
#endif /* _ASM_X86_DESC_H */
diff -urNp linux-3.0.9/arch/x86/include/asm/e820.h linux-3.0.9/arch/x86/include/asm/e820.h
--- linux-3.0.9/arch/x86/include/asm/e820.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/e820.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/e820.h 2011-11-15 20:02:59.000000000 -0500
@@ -69,7 +69,7 @@ struct e820map {
#define ISA_START_ADDRESS 0xa0000
#define ISA_END_ADDRESS 0x100000
@@ -7336,7 +7336,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/e820.h linux-3.0.9/arch/x86/include/
#define BIOS_ROM_BASE 0xffe00000
diff -urNp linux-3.0.9/arch/x86/include/asm/elf.h linux-3.0.9/arch/x86/include/asm/elf.h
--- linux-3.0.9/arch/x86/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/elf.h 2011-11-15 20:02:59.000000000 -0500
@@ -237,7 +237,25 @@ extern int force_personality32;
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -7393,7 +7393,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/elf.h linux-3.0.9/arch/x86/include/a
#endif /* _ASM_X86_ELF_H */
diff -urNp linux-3.0.9/arch/x86/include/asm/emergency-restart.h linux-3.0.9/arch/x86/include/asm/emergency-restart.h
--- linux-3.0.9/arch/x86/include/asm/emergency-restart.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/emergency-restart.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/emergency-restart.h 2011-11-15 20:02:59.000000000 -0500
@@ -15,6 +15,6 @@ enum reboot_type {
extern enum reboot_type reboot_type;
@@ -7404,7 +7404,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/emergency-restart.h linux-3.0.9/arch
#endif /* _ASM_X86_EMERGENCY_RESTART_H */
diff -urNp linux-3.0.9/arch/x86/include/asm/futex.h linux-3.0.9/arch/x86/include/asm/futex.h
--- linux-3.0.9/arch/x86/include/asm/futex.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/futex.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/futex.h 2011-11-15 20:02:59.000000000 -0500
@@ -12,16 +12,18 @@
#include <asm/system.h>
@@ -7465,7 +7465,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/futex.h linux-3.0.9/arch/x86/include
);
diff -urNp linux-3.0.9/arch/x86/include/asm/hw_irq.h linux-3.0.9/arch/x86/include/asm/hw_irq.h
--- linux-3.0.9/arch/x86/include/asm/hw_irq.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/hw_irq.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/hw_irq.h 2011-11-15 20:02:59.000000000 -0500
@@ -137,8 +137,8 @@ extern void setup_ioapic_dest(void);
extern void enable_IO_APIC(void);
@@ -7479,7 +7479,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/hw_irq.h linux-3.0.9/arch/x86/includ
extern void eisa_set_level_irq(unsigned int irq);
diff -urNp linux-3.0.9/arch/x86/include/asm/i387.h linux-3.0.9/arch/x86/include/asm/i387.h
--- linux-3.0.9/arch/x86/include/asm/i387.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/i387.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/i387.h 2011-11-15 20:02:59.000000000 -0500
@@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
{
int err;
@@ -7531,7 +7531,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/i387.h linux-3.0.9/arch/x86/include/
}
diff -urNp linux-3.0.9/arch/x86/include/asm/io.h linux-3.0.9/arch/x86/include/asm/io.h
--- linux-3.0.9/arch/x86/include/asm/io.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/io.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/io.h 2011-11-15 20:02:59.000000000 -0500
@@ -196,6 +196,17 @@ extern void set_iounmap_nonlazy(void);
#include <linux/vmalloc.h>
@@ -7552,7 +7552,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/io.h linux-3.0.9/arch/x86/include/as
*/
diff -urNp linux-3.0.9/arch/x86/include/asm/irqflags.h linux-3.0.9/arch/x86/include/asm/irqflags.h
--- linux-3.0.9/arch/x86/include/asm/irqflags.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/irqflags.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/irqflags.h 2011-11-15 20:02:59.000000000 -0500
@@ -140,6 +140,11 @@ static inline unsigned long arch_local_i
sti; \
sysexit
@@ -7567,7 +7567,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/irqflags.h linux-3.0.9/arch/x86/incl
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
diff -urNp linux-3.0.9/arch/x86/include/asm/kprobes.h linux-3.0.9/arch/x86/include/asm/kprobes.h
--- linux-3.0.9/arch/x86/include/asm/kprobes.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/kprobes.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/kprobes.h 2011-11-15 20:02:59.000000000 -0500
@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
#define RELATIVEJUMP_SIZE 5
#define RELATIVECALL_OPCODE 0xe8
@@ -7586,7 +7586,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/kprobes.h linux-3.0.9/arch/x86/inclu
diff -urNp linux-3.0.9/arch/x86/include/asm/kvm_host.h linux-3.0.9/arch/x86/include/asm/kvm_host.h
--- linux-3.0.9/arch/x86/include/asm/kvm_host.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/kvm_host.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/kvm_host.h 2011-11-15 20:02:59.000000000 -0500
@@ -441,7 +441,7 @@ struct kvm_arch {
unsigned int n_used_mmu_pages;
unsigned int n_requested_mmu_pages;
@@ -7607,7 +7607,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/kvm_host.h linux-3.0.9/arch/x86/incl
u32 token;
diff -urNp linux-3.0.9/arch/x86/include/asm/local.h linux-3.0.9/arch/x86/include/asm/local.h
--- linux-3.0.9/arch/x86/include/asm/local.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/local.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/local.h 2011-11-15 20:02:59.000000000 -0500
@@ -18,26 +18,58 @@ typedef struct {
static inline void local_inc(local_t *l)
@@ -7762,7 +7762,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/local.h linux-3.0.9/arch/x86/include
return i + __i;
diff -urNp linux-3.0.9/arch/x86/include/asm/mman.h linux-3.0.9/arch/x86/include/asm/mman.h
--- linux-3.0.9/arch/x86/include/asm/mman.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/mman.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/mman.h 2011-11-15 20:02:59.000000000 -0500
@@ -5,4 +5,14 @@
#include <asm-generic/mman.h>
@@ -7780,7 +7780,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/mman.h linux-3.0.9/arch/x86/include/
#endif /* _ASM_X86_MMAN_H */
diff -urNp linux-3.0.9/arch/x86/include/asm/mmu_context.h linux-3.0.9/arch/x86/include/asm/mmu_context.h
--- linux-3.0.9/arch/x86/include/asm/mmu_context.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/mmu_context.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/mmu_context.h 2011-11-15 20:02:59.000000000 -0500
@@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *m
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -7903,7 +7903,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/mmu_context.h linux-3.0.9/arch/x86/i
#define activate_mm(prev, next) \
diff -urNp linux-3.0.9/arch/x86/include/asm/mmu.h linux-3.0.9/arch/x86/include/asm/mmu.h
--- linux-3.0.9/arch/x86/include/asm/mmu.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/mmu.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/mmu.h 2011-11-15 20:02:59.000000000 -0500
@@ -9,7 +9,7 @@
* we put the segment information here.
*/
@@ -7936,7 +7936,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/mmu.h linux-3.0.9/arch/x86/include/a
#ifdef CONFIG_SMP
diff -urNp linux-3.0.9/arch/x86/include/asm/module.h linux-3.0.9/arch/x86/include/asm/module.h
--- linux-3.0.9/arch/x86/include/asm/module.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/module.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/module.h 2011-11-15 20:02:59.000000000 -0500
@@ -5,6 +5,7 @@
#ifdef CONFIG_X86_64
@@ -7968,7 +7968,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/module.h linux-3.0.9/arch/x86/includ
#endif /* _ASM_X86_MODULE_H */
diff -urNp linux-3.0.9/arch/x86/include/asm/page_64_types.h linux-3.0.9/arch/x86/include/asm/page_64_types.h
--- linux-3.0.9/arch/x86/include/asm/page_64_types.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/page_64_types.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/page_64_types.h 2011-11-15 20:02:59.000000000 -0500
@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
/* duplicated to the one in bootmem.h */
@@ -7980,7 +7980,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/page_64_types.h linux-3.0.9/arch/x86
#define __phys_reloc_hide(x) (x)
diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt.h linux-3.0.9/arch/x86/include/asm/paravirt.h
--- linux-3.0.9/arch/x86/include/asm/paravirt.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/paravirt.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/paravirt.h 2011-11-15 20:02:59.000000000 -0500
@@ -658,6 +658,18 @@ static inline void set_pgd(pgd_t *pgdp,
val);
}
@@ -8055,7 +8055,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt.h linux-3.0.9/arch/x86/incl
#endif /* __ASSEMBLY__ */
diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt_types.h linux-3.0.9/arch/x86/include/asm/paravirt_types.h
--- linux-3.0.9/arch/x86/include/asm/paravirt_types.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/paravirt_types.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/paravirt_types.h 2011-11-15 20:02:59.000000000 -0500
@@ -78,19 +78,19 @@ struct pv_init_ops {
*/
unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
@@ -8129,7 +8129,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt_types.h linux-3.0.9/arch/x8
* number for each function using the offset which we use to indicate
diff -urNp linux-3.0.9/arch/x86/include/asm/pgalloc.h linux-3.0.9/arch/x86/include/asm/pgalloc.h
--- linux-3.0.9/arch/x86/include/asm/pgalloc.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgalloc.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/pgalloc.h 2011-11-15 20:02:59.000000000 -0500
@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
pmd_t *pmd, pte_t *pte)
{
@@ -8146,7 +8146,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgalloc.h linux-3.0.9/arch/x86/inclu
diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable-2level.h linux-3.0.9/arch/x86/include/asm/pgtable-2level.h
--- linux-3.0.9/arch/x86/include/asm/pgtable-2level.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable-2level.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/pgtable-2level.h 2011-11-15 20:02:59.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)
@@ -8159,7 +8159,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable-2level.h linux-3.0.9/arch/x8
static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_32.h linux-3.0.9/arch/x86/include/asm/pgtable_32.h
--- linux-3.0.9/arch/x86/include/asm/pgtable_32.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable_32.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/pgtable_32.h 2011-11-15 20:02:59.000000000 -0500
@@ -25,9 +25,6 @@
struct mm_struct;
struct vm_area_struct;
@@ -8205,7 +8205,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_32.h linux-3.0.9/arch/x86/in
* SPARSEMEM and DISCONTIGMEM
diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_32_types.h linux-3.0.9/arch/x86/include/asm/pgtable_32_types.h
--- linux-3.0.9/arch/x86/include/asm/pgtable_32_types.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable_32_types.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/pgtable_32_types.h 2011-11-15 20:02:59.000000000 -0500
@@ -8,7 +8,7 @@
*/
#ifdef CONFIG_X86_PAE
@@ -8237,7 +8237,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_32_types.h linux-3.0.9/arch/
#define MODULES_LEN (MODULES_VADDR - MODULES_END)
diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable-3level.h linux-3.0.9/arch/x86/include/asm/pgtable-3level.h
--- linux-3.0.9/arch/x86/include/asm/pgtable-3level.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable-3level.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/pgtable-3level.h 2011-11-15 20:02:59.000000000 -0500
@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8257,7 +8257,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable-3level.h linux-3.0.9/arch/x8
/*
diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_64.h linux-3.0.9/arch/x86/include/asm/pgtable_64.h
--- linux-3.0.9/arch/x86/include/asm/pgtable_64.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable_64.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/pgtable_64.h 2011-11-15 20:02:59.000000000 -0500
@@ -16,10 +16,13 @@
extern pud_t level3_kernel_pgt[512];
@@ -8300,7 +8300,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_64.h linux-3.0.9/arch/x86/in
diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_64_types.h linux-3.0.9/arch/x86/include/asm/pgtable_64_types.h
--- linux-3.0.9/arch/x86/include/asm/pgtable_64_types.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable_64_types.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/pgtable_64_types.h 2011-11-15 20:02:59.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)
@@ -8314,7 +8314,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_64_types.h linux-3.0.9/arch/
#endif /* _ASM_X86_PGTABLE_64_DEFS_H */
diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable.h linux-3.0.9/arch/x86/include/asm/pgtable.h
--- linux-3.0.9/arch/x86/include/asm/pgtable.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/pgtable.h 2011-11-15 20:02:59.000000000 -0500
@@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm
#ifndef __PAGETABLE_PUD_FOLDED
@@ -8494,7 +8494,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable.h linux-3.0.9/arch/x86/inclu
#endif /* __ASSEMBLY__ */
diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_types.h linux-3.0.9/arch/x86/include/asm/pgtable_types.h
--- linux-3.0.9/arch/x86/include/asm/pgtable_types.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/pgtable_types.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/pgtable_types.h 2011-11-15 20:02:59.000000000 -0500
@@ -16,13 +16,12 @@
#define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
#define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -8610,7 +8610,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_types.h linux-3.0.9/arch/x86
extern pgprot_t pgprot_writecombine(pgprot_t prot);
diff -urNp linux-3.0.9/arch/x86/include/asm/processor.h linux-3.0.9/arch/x86/include/asm/processor.h
--- linux-3.0.9/arch/x86/include/asm/processor.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/processor.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/processor.h 2011-11-15 20:02:59.000000000 -0500
@@ -266,7 +266,7 @@ struct tss_struct {
} ____cacheline_aligned;
@@ -8715,7 +8715,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/processor.h linux-3.0.9/arch/x86/inc
/* Get/set a process' ability to use the timestamp counter instruction */
diff -urNp linux-3.0.9/arch/x86/include/asm/ptrace.h linux-3.0.9/arch/x86/include/asm/ptrace.h
--- linux-3.0.9/arch/x86/include/asm/ptrace.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/ptrace.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/ptrace.h 2011-11-15 20:02:59.000000000 -0500
@@ -153,28 +153,29 @@ static inline unsigned long regs_return_
}
@@ -8754,7 +8754,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/ptrace.h linux-3.0.9/arch/x86/includ
diff -urNp linux-3.0.9/arch/x86/include/asm/reboot.h linux-3.0.9/arch/x86/include/asm/reboot.h
--- linux-3.0.9/arch/x86/include/asm/reboot.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/reboot.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/reboot.h 2011-11-15 20:02:59.000000000 -0500
@@ -6,19 +6,19 @@
struct pt_regs;
@@ -8783,7 +8783,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/reboot.h linux-3.0.9/arch/x86/includ
#define MRR_APM 1
diff -urNp linux-3.0.9/arch/x86/include/asm/rwsem.h linux-3.0.9/arch/x86/include/asm/rwsem.h
--- linux-3.0.9/arch/x86/include/asm/rwsem.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/rwsem.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/rwsem.h 2011-11-15 20:02:59.000000000 -0500
@@ -64,6 +64,14 @@ static inline void __down_read(struct rw
{
asm volatile("# beginning down_read\n\t"
@@ -8910,7 +8910,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/rwsem.h linux-3.0.9/arch/x86/include
diff -urNp linux-3.0.9/arch/x86/include/asm/segment.h linux-3.0.9/arch/x86/include/asm/segment.h
--- linux-3.0.9/arch/x86/include/asm/segment.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/segment.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/segment.h 2011-11-15 20:02:59.000000000 -0500
@@ -64,10 +64,15 @@
* 26 - ESPFIX small SS
* 27 - per-cpu [ offset to per-cpu data area ]
@@ -8979,7 +8979,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/segment.h linux-3.0.9/arch/x86/inclu
#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
diff -urNp linux-3.0.9/arch/x86/include/asm/smp.h linux-3.0.9/arch/x86/include/asm/smp.h
--- linux-3.0.9/arch/x86/include/asm/smp.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/smp.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/smp.h 2011-11-15 20:02:59.000000000 -0500
@@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_
/* cpus sharing the last level cache: */
DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
@@ -9017,7 +9017,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/smp.h linux-3.0.9/arch/x86/include/a
#endif
diff -urNp linux-3.0.9/arch/x86/include/asm/spinlock.h linux-3.0.9/arch/x86/include/asm/spinlock.h
--- linux-3.0.9/arch/x86/include/asm/spinlock.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/spinlock.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/spinlock.h 2011-11-15 20:02:59.000000000 -0500
@@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar
static inline void arch_read_lock(arch_rwlock_t *rw)
{
@@ -9082,7 +9082,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/spinlock.h linux-3.0.9/arch/x86/incl
diff -urNp linux-3.0.9/arch/x86/include/asm/stackprotector.h linux-3.0.9/arch/x86/include/asm/stackprotector.h
--- linux-3.0.9/arch/x86/include/asm/stackprotector.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/stackprotector.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/stackprotector.h 2011-11-15 20:02:59.000000000 -0500
@@ -48,7 +48,7 @@
* head_32 for boot CPU and setup_per_cpu_areas() for others.
*/
@@ -9103,7 +9103,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/stackprotector.h linux-3.0.9/arch/x8
}
diff -urNp linux-3.0.9/arch/x86/include/asm/stacktrace.h linux-3.0.9/arch/x86/include/asm/stacktrace.h
--- linux-3.0.9/arch/x86/include/asm/stacktrace.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/stacktrace.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/stacktrace.h 2011-11-15 20:02:59.000000000 -0500
@@ -11,28 +11,20 @@
extern int kstack_depth_to_print;
@@ -9156,7 +9156,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/stacktrace.h linux-3.0.9/arch/x86/in
void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
diff -urNp linux-3.0.9/arch/x86/include/asm/sys_ia32.h linux-3.0.9/arch/x86/include/asm/sys_ia32.h
--- linux-3.0.9/arch/x86/include/asm/sys_ia32.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/sys_ia32.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/sys_ia32.h 2011-11-15 20:02:59.000000000 -0500
@@ -40,7 +40,7 @@ asmlinkage long sys32_rt_sigprocmask(int
compat_sigset_t __user *, unsigned int);
asmlinkage long sys32_alarm(unsigned int);
@@ -9168,7 +9168,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/sys_ia32.h linux-3.0.9/arch/x86/incl
asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,
diff -urNp linux-3.0.9/arch/x86/include/asm/system.h linux-3.0.9/arch/x86/include/asm/system.h
--- linux-3.0.9/arch/x86/include/asm/system.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/system.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/system.h 2011-11-15 20:02:59.000000000 -0500
@@ -129,7 +129,7 @@ do { \
"call __switch_to\n\t" \
"movq "__percpu_arg([current_task])",%%rsi\n\t" \
@@ -9213,7 +9213,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/system.h linux-3.0.9/arch/x86/includ
* Force strict CPU ordering.
diff -urNp linux-3.0.9/arch/x86/include/asm/thread_info.h linux-3.0.9/arch/x86/include/asm/thread_info.h
--- linux-3.0.9/arch/x86/include/asm/thread_info.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/thread_info.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/thread_info.h 2011-11-15 20:02:59.000000000 -0500
@@ -10,6 +10,7 @@
#include <linux/compiler.h>
#include <asm/page.h>
@@ -9363,7 +9363,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/thread_info.h linux-3.0.9/arch/x86/i
#endif /* _ASM_X86_THREAD_INFO_H */
diff -urNp linux-3.0.9/arch/x86/include/asm/uaccess_32.h linux-3.0.9/arch/x86/include/asm/uaccess_32.h
--- linux-3.0.9/arch/x86/include/asm/uaccess_32.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/uaccess_32.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/uaccess_32.h 2011-11-15 20:02:59.000000000 -0500
@@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_u
static __always_inline unsigned long __must_check
__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -9533,7 +9533,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/uaccess_32.h linux-3.0.9/arch/x86/in
diff -urNp linux-3.0.9/arch/x86/include/asm/uaccess_64.h linux-3.0.9/arch/x86/include/asm/uaccess_64.h
--- linux-3.0.9/arch/x86/include/asm/uaccess_64.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/uaccess_64.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/uaccess_64.h 2011-11-15 20:02:59.000000000 -0500
@@ -10,6 +10,9 @@
#include <asm/alternative.h>
#include <asm/cpufeature.h>
@@ -9947,7 +9947,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/uaccess_64.h linux-3.0.9/arch/x86/in
#endif /* _ASM_X86_UACCESS_64_H */
diff -urNp linux-3.0.9/arch/x86/include/asm/uaccess.h linux-3.0.9/arch/x86/include/asm/uaccess.h
--- linux-3.0.9/arch/x86/include/asm/uaccess.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/uaccess.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/uaccess.h 2011-11-15 20:02:59.000000000 -0500
@@ -7,12 +7,15 @@
#include <linux/compiler.h>
#include <linux/thread_info.h>
@@ -10169,7 +10169,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/uaccess.h linux-3.0.9/arch/x86/inclu
#ifdef CONFIG_X86_WP_WORKS_OK
diff -urNp linux-3.0.9/arch/x86/include/asm/vdso.h linux-3.0.9/arch/x86/include/asm/vdso.h
--- linux-3.0.9/arch/x86/include/asm/vdso.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/vdso.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/vdso.h 2011-11-15 20:02:59.000000000 -0500
@@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[];
#define VDSO32_SYMBOL(base, name) \
({ \
@@ -10181,7 +10181,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/vdso.h linux-3.0.9/arch/x86/include/
diff -urNp linux-3.0.9/arch/x86/include/asm/x86_init.h linux-3.0.9/arch/x86/include/asm/x86_init.h
--- linux-3.0.9/arch/x86/include/asm/x86_init.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/x86_init.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/x86_init.h 2011-11-15 20:02:59.000000000 -0500
@@ -28,7 +28,7 @@ struct x86_init_mpparse {
void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
void (*find_smp_config)(void);
@@ -10301,7 +10301,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/x86_init.h linux-3.0.9/arch/x86/incl
extern struct x86_cpuinit_ops x86_cpuinit;
diff -urNp linux-3.0.9/arch/x86/include/asm/xsave.h linux-3.0.9/arch/x86/include/asm/xsave.h
--- linux-3.0.9/arch/x86/include/asm/xsave.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/include/asm/xsave.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/include/asm/xsave.h 2011-11-15 20:02:59.000000000 -0500
@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
{
int err;
@@ -10333,7 +10333,7 @@ diff -urNp linux-3.0.9/arch/x86/include/asm/xsave.h linux-3.0.9/arch/x86/include
".section .fixup,\"ax\"\n"
diff -urNp linux-3.0.9/arch/x86/Kconfig linux-3.0.9/arch/x86/Kconfig
--- linux-3.0.9/arch/x86/Kconfig 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/Kconfig 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/Kconfig 2011-11-15 20:02:59.000000000 -0500
@@ -229,7 +229,7 @@ config X86_HT
config X86_32_LAZY_GS
@@ -10408,7 +10408,7 @@ diff -urNp linux-3.0.9/arch/x86/Kconfig linux-3.0.9/arch/x86/Kconfig
diff -urNp linux-3.0.9/arch/x86/Kconfig.cpu linux-3.0.9/arch/x86/Kconfig.cpu
--- linux-3.0.9/arch/x86/Kconfig.cpu 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/Kconfig.cpu 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/Kconfig.cpu 2011-11-15 20:02:59.000000000 -0500
@@ -338,7 +338,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -10438,7 +10438,7 @@ diff -urNp linux-3.0.9/arch/x86/Kconfig.cpu linux-3.0.9/arch/x86/Kconfig.cpu
int
diff -urNp linux-3.0.9/arch/x86/Kconfig.debug linux-3.0.9/arch/x86/Kconfig.debug
--- linux-3.0.9/arch/x86/Kconfig.debug 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/Kconfig.debug 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/Kconfig.debug 2011-11-15 20:02:59.000000000 -0500
@@ -81,7 +81,7 @@ config X86_PTDUMP
config DEBUG_RODATA
bool "Write protect kernel read-only data structures"
@@ -10459,7 +10459,7 @@ diff -urNp linux-3.0.9/arch/x86/Kconfig.debug linux-3.0.9/arch/x86/Kconfig.debug
kernel module's text and read-only data. It also prevents execution
diff -urNp linux-3.0.9/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.9/arch/x86/kernel/acpi/realmode/Makefile
--- linux-3.0.9/arch/x86/kernel/acpi/realmode/Makefile 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/acpi/realmode/Makefile 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/acpi/realmode/Makefile 2011-11-15 20:02:59.000000000 -0500
@@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os
$(call cc-option, -fno-stack-protector) \
$(call cc-option, -mpreferred-stack-boundary=2)
@@ -10472,7 +10472,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.9/arch/x
diff -urNp linux-3.0.9/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.9/arch/x86/kernel/acpi/realmode/wakeup.S
--- linux-3.0.9/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-15 20:02:59.000000000 -0500
@@ -108,6 +108,9 @@ wakeup_code:
/* Do any other stuff... */
@@ -10493,7 +10493,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.9/arch/x
pushw trampoline_segment
diff -urNp linux-3.0.9/arch/x86/kernel/acpi/sleep.c linux-3.0.9/arch/x86/kernel/acpi/sleep.c
--- linux-3.0.9/arch/x86/kernel/acpi/sleep.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/acpi/sleep.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/acpi/sleep.c 2011-11-15 20:02:59.000000000 -0500
@@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
header->trampoline_segment = trampoline_address() >> 4;
#ifdef CONFIG_SMP
@@ -10509,7 +10509,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/acpi/sleep.c linux-3.0.9/arch/x86/kernel/
initial_code = (unsigned long)wakeup_long64;
diff -urNp linux-3.0.9/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.9/arch/x86/kernel/acpi/wakeup_32.S
--- linux-3.0.9/arch/x86/kernel/acpi/wakeup_32.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/acpi/wakeup_32.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/acpi/wakeup_32.S 2011-11-15 20:02:59.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
@@ -10528,7 +10528,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.9/arch/x86/ker
jmp bogus_magic
diff -urNp linux-3.0.9/arch/x86/kernel/alternative.c linux-3.0.9/arch/x86/kernel/alternative.c
--- linux-3.0.9/arch/x86/kernel/alternative.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/alternative.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/alternative.c 2011-11-15 20:02:59.000000000 -0500
@@ -313,7 +313,7 @@ static void alternatives_smp_lock(const
if (!*poff || ptr < text || ptr >= text_end)
continue;
@@ -10632,7 +10632,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/alternative.c linux-3.0.9/arch/x86/kernel
diff -urNp linux-3.0.9/arch/x86/kernel/apic/apic.c linux-3.0.9/arch/x86/kernel/apic/apic.c
--- linux-3.0.9/arch/x86/kernel/apic/apic.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/apic/apic.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/apic/apic.c 2011-11-15 20:02:59.000000000 -0500
@@ -173,7 +173,7 @@ int first_system_vector = 0xfe;
/*
* Debug level, exported for io_apic.c
@@ -10662,7 +10662,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/apic/apic.c linux-3.0.9/arch/x86/kernel/a
diff -urNp linux-3.0.9/arch/x86/kernel/apic/io_apic.c linux-3.0.9/arch/x86/kernel/apic/io_apic.c
--- linux-3.0.9/arch/x86/kernel/apic/io_apic.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/apic/io_apic.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/apic/io_apic.c 2011-11-15 20:02:59.000000000 -0500
@@ -1028,7 +1028,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,
}
EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
@@ -10701,7 +10701,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/apic/io_apic.c linux-3.0.9/arch/x86/kerne
}
diff -urNp linux-3.0.9/arch/x86/kernel/apm_32.c linux-3.0.9/arch/x86/kernel/apm_32.c
--- linux-3.0.9/arch/x86/kernel/apm_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/apm_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/apm_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -413,7 +413,7 @@ static DEFINE_MUTEX(apm_mutex);
* This is for buggy BIOS's that refer to (real mode) segment 0x40
* even though they are called in protected mode.
@@ -10775,7 +10775,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/apm_32.c linux-3.0.9/arch/x86/kernel/apm_
diff -urNp linux-3.0.9/arch/x86/kernel/asm-offsets_64.c linux-3.0.9/arch/x86/kernel/asm-offsets_64.c
--- linux-3.0.9/arch/x86/kernel/asm-offsets_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/asm-offsets_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/asm-offsets_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -69,6 +69,7 @@ int main(void)
BLANK();
#undef ENTRY
@@ -10786,7 +10786,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/asm-offsets_64.c linux-3.0.9/arch/x86/ker
diff -urNp linux-3.0.9/arch/x86/kernel/asm-offsets.c linux-3.0.9/arch/x86/kernel/asm-offsets.c
--- linux-3.0.9/arch/x86/kernel/asm-offsets.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/asm-offsets.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/asm-offsets.c 2011-11-15 20:02:59.000000000 -0500
@@ -33,6 +33,8 @@ void common(void) {
OFFSET(TI_status, thread_info, status);
OFFSET(TI_addr_limit, thread_info, addr_limit);
@@ -10825,7 +10825,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/asm-offsets.c linux-3.0.9/arch/x86/kernel
OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
diff -urNp linux-3.0.9/arch/x86/kernel/cpu/amd.c linux-3.0.9/arch/x86/kernel/cpu/amd.c
--- linux-3.0.9/arch/x86/kernel/cpu/amd.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/amd.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/cpu/amd.c 2011-11-15 20:02:59.000000000 -0500
@@ -647,7 +647,7 @@ static unsigned int __cpuinit amd_size_c
unsigned int size)
{
@@ -10837,7 +10837,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/amd.c linux-3.0.9/arch/x86/kernel/cpu
size = 64;
diff -urNp linux-3.0.9/arch/x86/kernel/cpu/common.c linux-3.0.9/arch/x86/kernel/cpu/common.c
--- linux-3.0.9/arch/x86/kernel/cpu/common.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/common.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/cpu/common.c 2011-11-15 20:02:59.000000000 -0500
@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -10984,7 +10984,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/common.c linux-3.0.9/arch/x86/kernel/
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
diff -urNp linux-3.0.9/arch/x86/kernel/cpu/intel.c linux-3.0.9/arch/x86/kernel/cpu/intel.c
--- linux-3.0.9/arch/x86/kernel/cpu/intel.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/intel.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/cpu/intel.c 2011-11-15 20:02:59.000000000 -0500
@@ -172,7 +172,7 @@ static void __cpuinit trap_init_f00f_bug
* Update the IDT descriptor and reload the IDT so that
* it uses the read-only mapped virtual address.
@@ -10996,7 +10996,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/intel.c linux-3.0.9/arch/x86/kernel/c
#endif
diff -urNp linux-3.0.9/arch/x86/kernel/cpu/Makefile linux-3.0.9/arch/x86/kernel/cpu/Makefile
--- linux-3.0.9/arch/x86/kernel/cpu/Makefile 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/Makefile 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/cpu/Makefile 2011-11-15 20:02:59.000000000 -0500
@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
CFLAGS_REMOVE_perf_event.o = -pg
endif
@@ -11010,7 +11010,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/Makefile linux-3.0.9/arch/x86/kernel/
obj-y += vmware.o hypervisor.o sched.o mshyperv.o
diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c
--- linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-15 20:02:59.000000000 -0500
@@ -46,6 +46,7 @@
#include <asm/ipi.h>
#include <asm/mce.h>
@@ -11114,7 +11114,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.9/arch/x86/ker
atomic_set(&global_nwo, 0);
diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce-inject.c
--- linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-15 20:02:59.000000000 -0500
@@ -215,7 +215,9 @@ static int inject_init(void)
if (!alloc_cpumask_var(&mce_inject_cpumask, GFP_KERNEL))
return -ENOMEM;
@@ -11128,7 +11128,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.9/arch/
}
diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.9/arch/x86/kernel/cpu/mtrr/main.c
--- linux-3.0.9/arch/x86/kernel/cpu/mtrr/main.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/mtrr/main.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/cpu/mtrr/main.c 2011-11-15 20:02:59.000000000 -0500
@@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
u64 size_or_mask, size_and_mask;
static bool mtrr_aps_delayed_init;
@@ -11140,7 +11140,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.9/arch/x86/kern
diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.9/arch/x86/kernel/cpu/mtrr/mtrr.h
--- linux-3.0.9/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-15 20:02:59.000000000 -0500
@@ -25,7 +25,7 @@ struct mtrr_ops {
int (*validate_add_page)(unsigned long base, unsigned long size,
unsigned int type);
@@ -11152,7 +11152,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.9/arch/x86/kern
int replace_reg);
diff -urNp linux-3.0.9/arch/x86/kernel/cpu/perf_event.c linux-3.0.9/arch/x86/kernel/cpu/perf_event.c
--- linux-3.0.9/arch/x86/kernel/cpu/perf_event.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/cpu/perf_event.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/cpu/perf_event.c 2011-11-15 20:02:59.000000000 -0500
@@ -781,6 +781,8 @@ static int x86_schedule_events(struct cp
int i, j, w, wmax, num = 0;
struct hw_perf_event *hwc;
@@ -11173,7 +11173,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/cpu/perf_event.c linux-3.0.9/arch/x86/ker
diff -urNp linux-3.0.9/arch/x86/kernel/crash.c linux-3.0.9/arch/x86/kernel/crash.c
--- linux-3.0.9/arch/x86/kernel/crash.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/crash.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/crash.c 2011-11-15 20:02:59.000000000 -0500
@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu,
regs = args->regs;
@@ -11185,7 +11185,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/crash.c linux-3.0.9/arch/x86/kernel/crash
}
diff -urNp linux-3.0.9/arch/x86/kernel/doublefault_32.c linux-3.0.9/arch/x86/kernel/doublefault_32.c
--- linux-3.0.9/arch/x86/kernel/doublefault_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/doublefault_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/doublefault_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -11,7 +11,7 @@
#define DOUBLEFAULT_STACKSIZE (1024)
@@ -11219,7 +11219,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/doublefault_32.c linux-3.0.9/arch/x86/ker
.__cr3 = __pa_nodebug(swapper_pg_dir),
diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack_32.c linux-3.0.9/arch/x86/kernel/dumpstack_32.c
--- linux-3.0.9/arch/x86/kernel/dumpstack_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/dumpstack_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/dumpstack_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task
bp = stack_frame(task, regs);
@@ -11285,7 +11285,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack_32.c linux-3.0.9/arch/x86/kerne
if (probe_kernel_address((unsigned short *)ip, ud2))
diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack_64.c linux-3.0.9/arch/x86/kernel/dumpstack_64.c
--- linux-3.0.9/arch/x86/kernel/dumpstack_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/dumpstack_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/dumpstack_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -147,9 +147,9 @@ void dump_trace(struct task_struct *task
unsigned long *irq_stack_end =
(unsigned long *)per_cpu(irq_stack_ptr, cpu);
@@ -11339,7 +11339,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack_64.c linux-3.0.9/arch/x86/kerne
EXPORT_SYMBOL(dump_trace);
diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack.c linux-3.0.9/arch/x86/kernel/dumpstack.c
--- linux-3.0.9/arch/x86/kernel/dumpstack.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/dumpstack.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/dumpstack.c 2011-11-15 20:02:59.000000000 -0500
@@ -2,6 +2,9 @@
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -11485,7 +11485,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack.c linux-3.0.9/arch/x86/kernel/d
if (__die(str, regs, err))
diff -urNp linux-3.0.9/arch/x86/kernel/early_printk.c linux-3.0.9/arch/x86/kernel/early_printk.c
--- linux-3.0.9/arch/x86/kernel/early_printk.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/early_printk.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/early_printk.c 2011-11-15 20:02:59.000000000 -0500
@@ -7,6 +7,7 @@
#include <linux/pci_regs.h>
#include <linux/pci_ids.h>
@@ -11505,7 +11505,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/early_printk.c linux-3.0.9/arch/x86/kerne
early_console->write(early_console, buf, n);
diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/entry_32.S
--- linux-3.0.9/arch/x86/kernel/entry_32.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/entry_32.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/entry_32.S 2011-11-15 20:02:59.000000000 -0500
@@ -185,13 +185,146 @@
/*CFI_REL_OFFSET gs, PT_GS*/
.endm
@@ -12285,7 +12285,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/en
/*
diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/entry_64.S
--- linux-3.0.9/arch/x86/kernel/entry_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/entry_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/entry_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -53,6 +53,8 @@
#include <asm/paravirt.h>
#include <asm/ftrace.h>
@@ -13218,7 +13218,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/en
* End of kprobes section
diff -urNp linux-3.0.9/arch/x86/kernel/ftrace.c linux-3.0.9/arch/x86/kernel/ftrace.c
--- linux-3.0.9/arch/x86/kernel/ftrace.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/ftrace.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/ftrace.c 2011-11-15 20:02:59.000000000 -0500
@@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the
static const void *mod_code_newcode; /* holds the text to write to the IP */
@@ -13278,7 +13278,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/ftrace.c linux-3.0.9/arch/x86/kernel/ftra
diff -urNp linux-3.0.9/arch/x86/kernel/head32.c linux-3.0.9/arch/x86/kernel/head32.c
--- linux-3.0.9/arch/x86/kernel/head32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/head32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/head32.c 2011-11-15 20:02:59.000000000 -0500
@@ -19,6 +19,7 @@
#include <asm/io_apic.h>
#include <asm/bios_ebda.h>
@@ -13298,7 +13298,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/head32.c linux-3.0.9/arch/x86/kernel/head
/* Reserve INITRD */
diff -urNp linux-3.0.9/arch/x86/kernel/head_32.S linux-3.0.9/arch/x86/kernel/head_32.S
--- linux-3.0.9/arch/x86/kernel/head_32.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/head_32.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/head_32.S 2011-11-15 20:02:59.000000000 -0500
@@ -25,6 +25,12 @@
/* Physical address */
#define pa(X) ((X) - __PAGE_OFFSET)
@@ -13735,7 +13735,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/head_32.S linux-3.0.9/arch/x86/kernel/hea
+ .endr
diff -urNp linux-3.0.9/arch/x86/kernel/head_64.S linux-3.0.9/arch/x86/kernel/head_64.S
--- linux-3.0.9/arch/x86/kernel/head_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/head_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/head_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -19,6 +19,7 @@
#include <asm/cache.h>
#include <asm/processor-flags.h>
@@ -14007,7 +14007,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/head_64.S linux-3.0.9/arch/x86/kernel/hea
.align PAGE_SIZE
diff -urNp linux-3.0.9/arch/x86/kernel/i386_ksyms_32.c linux-3.0.9/arch/x86/kernel/i386_ksyms_32.c
--- linux-3.0.9/arch/x86/kernel/i386_ksyms_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/i386_ksyms_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/i386_ksyms_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
EXPORT_SYMBOL(cmpxchg8b_emu);
#endif
@@ -14031,7 +14031,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/i386_ksyms_32.c linux-3.0.9/arch/x86/kern
+#endif
diff -urNp linux-3.0.9/arch/x86/kernel/i8259.c linux-3.0.9/arch/x86/kernel/i8259.c
--- linux-3.0.9/arch/x86/kernel/i8259.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/i8259.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/i8259.c 2011-11-15 20:02:59.000000000 -0500
@@ -210,7 +210,7 @@ spurious_8259A_irq:
"spurious 8259A interrupt: IRQ%d.\n", irq);
spurious_irq_mask |= irqmask;
@@ -14043,7 +14043,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/i8259.c linux-3.0.9/arch/x86/kernel/i8259
* but in Linux this does not cause problems and is
diff -urNp linux-3.0.9/arch/x86/kernel/init_task.c linux-3.0.9/arch/x86/kernel/init_task.c
--- linux-3.0.9/arch/x86/kernel/init_task.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/init_task.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/init_task.c 2011-11-15 20:02:59.000000000 -0500
@@ -20,8 +20,7 @@ static struct sighand_struct init_sighan
* way process stacks are handled. This is done by having a special
* "init_task" linker map entry..
@@ -14064,7 +14064,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/init_task.c linux-3.0.9/arch/x86/kernel/i
+EXPORT_SYMBOL(init_tss);
diff -urNp linux-3.0.9/arch/x86/kernel/ioport.c linux-3.0.9/arch/x86/kernel/ioport.c
--- linux-3.0.9/arch/x86/kernel/ioport.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/ioport.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/ioport.c 2011-11-15 20:02:59.000000000 -0500
@@ -6,6 +6,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
@@ -14110,7 +14110,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/ioport.c linux-3.0.9/arch/x86/kernel/iopo
}
diff -urNp linux-3.0.9/arch/x86/kernel/irq_32.c linux-3.0.9/arch/x86/kernel/irq_32.c
--- linux-3.0.9/arch/x86/kernel/irq_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/irq_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/irq_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -36,7 +36,7 @@ static int check_stack_overflow(void)
__asm__ __volatile__("andl %%esp,%0" :
"=r" (sp) : "0" (THREAD_SIZE - 1));
@@ -14252,7 +14252,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/irq_32.c linux-3.0.9/arch/x86/kernel/irq_
*/
diff -urNp linux-3.0.9/arch/x86/kernel/irq.c linux-3.0.9/arch/x86/kernel/irq.c
--- linux-3.0.9/arch/x86/kernel/irq.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/irq.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/irq.c 2011-11-15 20:02:59.000000000 -0500
@@ -17,7 +17,7 @@
#include <asm/mce.h>
#include <asm/hw_irq.h>
@@ -14289,7 +14289,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/irq.c linux-3.0.9/arch/x86/kernel/irq.c
}
diff -urNp linux-3.0.9/arch/x86/kernel/kgdb.c linux-3.0.9/arch/x86/kernel/kgdb.c
--- linux-3.0.9/arch/x86/kernel/kgdb.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/kgdb.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/kgdb.c 2011-11-15 20:02:59.000000000 -0500
@@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem,
#ifdef CONFIG_X86_32
switch (regno) {
@@ -14330,7 +14330,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/kgdb.c linux-3.0.9/arch/x86/kernel/kgdb.c
break;
diff -urNp linux-3.0.9/arch/x86/kernel/kprobes.c linux-3.0.9/arch/x86/kernel/kprobes.c
--- linux-3.0.9/arch/x86/kernel/kprobes.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/kprobes.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/kprobes.c 2011-11-15 20:02:59.000000000 -0500
@@ -117,8 +117,11 @@ static void __kprobes __synthesize_relat
} __attribute__((packed)) *insn;
@@ -14476,7 +14476,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/kprobes.c linux-3.0.9/arch/x86/kernel/kpr
insn_buf[0] = RELATIVEJUMP_OPCODE;
diff -urNp linux-3.0.9/arch/x86/kernel/kvm.c linux-3.0.9/arch/x86/kernel/kvm.c
--- linux-3.0.9/arch/x86/kernel/kvm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/kvm.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/kvm.c 2011-11-15 20:02:59.000000000 -0500
@@ -426,6 +426,7 @@ static void __init paravirt_ops_setup(vo
pv_mmu_ops.set_pud = kvm_set_pud;
#if PAGETABLE_LEVELS == 4
@@ -14487,7 +14487,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/kvm.c linux-3.0.9/arch/x86/kernel/kvm.c
pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
diff -urNp linux-3.0.9/arch/x86/kernel/ldt.c linux-3.0.9/arch/x86/kernel/ldt.c
--- linux-3.0.9/arch/x86/kernel/ldt.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/ldt.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/ldt.c 2011-11-15 20:02:59.000000000 -0500
@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
if (reload) {
#ifdef CONFIG_SMP
@@ -14554,7 +14554,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/ldt.c linux-3.0.9/arch/x86/kernel/ldt.c
ldt.avl = 0;
diff -urNp linux-3.0.9/arch/x86/kernel/machine_kexec_32.c linux-3.0.9/arch/x86/kernel/machine_kexec_32.c
--- linux-3.0.9/arch/x86/kernel/machine_kexec_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/machine_kexec_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/machine_kexec_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -27,7 +27,7 @@
#include <asm/cacheflush.h>
#include <asm/debugreg.h>
@@ -14584,7 +14584,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/machine_kexec_32.c linux-3.0.9/arch/x86/k
page_list[PA_CONTROL_PAGE] = __pa(control_page);
diff -urNp linux-3.0.9/arch/x86/kernel/microcode_intel.c linux-3.0.9/arch/x86/kernel/microcode_intel.c
--- linux-3.0.9/arch/x86/kernel/microcode_intel.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/microcode_intel.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/microcode_intel.c 2011-11-15 20:02:59.000000000 -0500
@@ -440,13 +440,13 @@ static enum ucode_state request_microcod
static int get_ucode_user(void *to, const void *from, size_t n)
@@ -14603,7 +14603,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/microcode_intel.c linux-3.0.9/arch/x86/ke
static void microcode_fini_cpu(int cpu)
diff -urNp linux-3.0.9/arch/x86/kernel/module.c linux-3.0.9/arch/x86/kernel/module.c
--- linux-3.0.9/arch/x86/kernel/module.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/module.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/module.c 2011-11-15 20:02:59.000000000 -0500
@@ -36,21 +36,66 @@
#define DEBUGP(fmt...)
#endif
@@ -14744,7 +14744,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/module.c linux-3.0.9/arch/x86/kernel/modu
goto overflow;
diff -urNp linux-3.0.9/arch/x86/kernel/paravirt.c linux-3.0.9/arch/x86/kernel/paravirt.c
--- linux-3.0.9/arch/x86/kernel/paravirt.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/paravirt.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/paravirt.c 2011-11-15 20:02:59.000000000 -0500
@@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
{
return x;
@@ -14895,7 +14895,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/paravirt.c linux-3.0.9/arch/x86/kernel/pa
EXPORT_SYMBOL_GPL(pv_time_ops);
diff -urNp linux-3.0.9/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.9/arch/x86/kernel/paravirt-spinlocks.c
--- linux-3.0.9/arch/x86/kernel/paravirt-spinlocks.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/paravirt-spinlocks.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/paravirt-spinlocks.c 2011-11-15 20:02:59.000000000 -0500
@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t
arch_spin_lock(lock);
}
@@ -14907,7 +14907,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.9/arch/x86
.spin_is_contended = __ticket_spin_is_contended,
diff -urNp linux-3.0.9/arch/x86/kernel/pci-iommu_table.c linux-3.0.9/arch/x86/kernel/pci-iommu_table.c
--- linux-3.0.9/arch/x86/kernel/pci-iommu_table.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/pci-iommu_table.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/pci-iommu_table.c 2011-11-15 20:02:59.000000000 -0500
@@ -2,7 +2,7 @@
#include <asm/iommu_table.h>
#include <linux/string.h>
@@ -14928,7 +14928,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/pci-iommu_table.c linux-3.0.9/arch/x86/ke
q = find_dependents_of(start, finish, p);
diff -urNp linux-3.0.9/arch/x86/kernel/process_32.c linux-3.0.9/arch/x86/kernel/process_32.c
--- linux-3.0.9/arch/x86/kernel/process_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/process_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/process_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as
unsigned long thread_saved_pc(struct task_struct *tsk)
{
@@ -15017,7 +15017,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process_32.c linux-3.0.9/arch/x86/kernel/
-
diff -urNp linux-3.0.9/arch/x86/kernel/process_64.c linux-3.0.9/arch/x86/kernel/process_64.c
--- linux-3.0.9/arch/x86/kernel/process_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/process_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/process_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -87,7 +87,7 @@ static void __exit_idle(void)
void exit_idle(void)
{
@@ -15084,7 +15084,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process_64.c linux-3.0.9/arch/x86/kernel/
if (!in_sched_functions(ip))
diff -urNp linux-3.0.9/arch/x86/kernel/process.c linux-3.0.9/arch/x86/kernel/process.c
--- linux-3.0.9/arch/x86/kernel/process.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/process.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/process.c 2011-11-15 20:02:59.000000000 -0500
@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru
void free_thread_info(struct thread_info *ti)
@@ -15224,7 +15224,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/process.c linux-3.0.9/arch/x86/kernel/pro
+#endif
diff -urNp linux-3.0.9/arch/x86/kernel/ptrace.c linux-3.0.9/arch/x86/kernel/ptrace.c
--- linux-3.0.9/arch/x86/kernel/ptrace.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/ptrace.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/ptrace.c 2011-11-15 20:02:59.000000000 -0500
@@ -821,7 +821,7 @@ long arch_ptrace(struct task_struct *chi
unsigned long addr, unsigned long data)
{
@@ -15262,7 +15262,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/ptrace.c linux-3.0.9/arch/x86/kernel/ptra
void user_single_step_siginfo(struct task_struct *tsk,
diff -urNp linux-3.0.9/arch/x86/kernel/pvclock.c linux-3.0.9/arch/x86/kernel/pvclock.c
--- linux-3.0.9/arch/x86/kernel/pvclock.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/pvclock.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/pvclock.c 2011-11-15 20:02:59.000000000 -0500
@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc
return pv_tsc_khz;
}
@@ -15293,7 +15293,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/pvclock.c linux-3.0.9/arch/x86/kernel/pvc
return ret;
diff -urNp linux-3.0.9/arch/x86/kernel/reboot.c linux-3.0.9/arch/x86/kernel/reboot.c
--- linux-3.0.9/arch/x86/kernel/reboot.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/reboot.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/reboot.c 2011-11-15 20:02:59.000000000 -0500
@@ -35,7 +35,7 @@ void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
@@ -15427,7 +15427,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/reboot.c linux-3.0.9/arch/x86/kernel/rebo
struct machine_ops machine_ops = {
diff -urNp linux-3.0.9/arch/x86/kernel/setup.c linux-3.0.9/arch/x86/kernel/setup.c
--- linux-3.0.9/arch/x86/kernel/setup.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/setup.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/setup.c 2011-11-15 20:02:59.000000000 -0500
@@ -447,7 +447,7 @@ static void __init parse_setup_data(void
switch (data->type) {
@@ -15468,7 +15468,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/setup.c linux-3.0.9/arch/x86/kernel/setup
bss_resource.end = virt_to_phys(&__bss_stop)-1;
diff -urNp linux-3.0.9/arch/x86/kernel/setup_percpu.c linux-3.0.9/arch/x86/kernel/setup_percpu.c
--- linux-3.0.9/arch/x86/kernel/setup_percpu.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/setup_percpu.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/setup_percpu.c 2011-11-15 20:02:59.000000000 -0500
@@ -21,19 +21,17 @@
#include <asm/cpu.h>
#include <asm/stackprotector.h>
@@ -15534,7 +15534,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/setup_percpu.c linux-3.0.9/arch/x86/kerne
* area. Reload any changed state for the boot CPU.
diff -urNp linux-3.0.9/arch/x86/kernel/signal.c linux-3.0.9/arch/x86/kernel/signal.c
--- linux-3.0.9/arch/x86/kernel/signal.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/signal.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/signal.c 2011-11-15 20:02:59.000000000 -0500
@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi
* Align the stack pointer according to the i386 ABI,
* i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -15620,7 +15620,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/signal.c linux-3.0.9/arch/x86/kernel/sign
if (current_thread_info()->status & TS_RESTORE_SIGMASK)
diff -urNp linux-3.0.9/arch/x86/kernel/smpboot.c linux-3.0.9/arch/x86/kernel/smpboot.c
--- linux-3.0.9/arch/x86/kernel/smpboot.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/smpboot.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/smpboot.c 2011-11-15 20:02:59.000000000 -0500
@@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int api
set_idle_for_cpu(cpu, c_idle.idle);
do_rest:
@@ -15660,7 +15660,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/smpboot.c linux-3.0.9/arch/x86/kernel/smp
pr_debug("do_boot_cpu failed %d\n", err);
diff -urNp linux-3.0.9/arch/x86/kernel/step.c linux-3.0.9/arch/x86/kernel/step.c
--- linux-3.0.9/arch/x86/kernel/step.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/step.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/step.c 2011-11-15 20:02:59.000000000 -0500
@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
struct desc_struct *desc;
unsigned long base;
@@ -15705,7 +15705,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/step.c linux-3.0.9/arch/x86/kernel/step.c
/* 64-bit mode: REX prefix */
diff -urNp linux-3.0.9/arch/x86/kernel/syscall_table_32.S linux-3.0.9/arch/x86/kernel/syscall_table_32.S
--- linux-3.0.9/arch/x86/kernel/syscall_table_32.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/syscall_table_32.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/syscall_table_32.S 2011-11-15 20:02:59.000000000 -0500
@@ -1,3 +1,4 @@
+.section .rodata,"a",@progbits
ENTRY(sys_call_table)
@@ -15713,7 +15713,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/syscall_table_32.S linux-3.0.9/arch/x86/k
.long sys_exit
diff -urNp linux-3.0.9/arch/x86/kernel/sys_i386_32.c linux-3.0.9/arch/x86/kernel/sys_i386_32.c
--- linux-3.0.9/arch/x86/kernel/sys_i386_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/sys_i386_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/sys_i386_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -24,17 +24,224 @@
#include <asm/syscalls.h>
@@ -15953,7 +15953,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/sys_i386_32.c linux-3.0.9/arch/x86/kernel
}
diff -urNp linux-3.0.9/arch/x86/kernel/sys_x86_64.c linux-3.0.9/arch/x86/kernel/sys_x86_64.c
--- linux-3.0.9/arch/x86/kernel/sys_x86_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/sys_x86_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/sys_x86_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -32,8 +32,8 @@ out:
return error;
}
@@ -16093,7 +16093,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/sys_x86_64.c linux-3.0.9/arch/x86/kernel/
return addr;
diff -urNp linux-3.0.9/arch/x86/kernel/tboot.c linux-3.0.9/arch/x86/kernel/tboot.c
--- linux-3.0.9/arch/x86/kernel/tboot.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/tboot.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/tboot.c 2011-11-15 20:02:59.000000000 -0500
@@ -217,7 +217,7 @@ static int tboot_setup_sleep(void)
void tboot_shutdown(u32 shutdown_type)
@@ -16144,7 +16144,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/tboot.c linux-3.0.9/arch/x86/kernel/tboot
}
diff -urNp linux-3.0.9/arch/x86/kernel/time.c linux-3.0.9/arch/x86/kernel/time.c
--- linux-3.0.9/arch/x86/kernel/time.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/time.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/time.c 2011-11-15 20:02:59.000000000 -0500
@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs
{
unsigned long pc = instruction_pointer(regs);
@@ -16177,7 +16177,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/time.c linux-3.0.9/arch/x86/kernel/time.c
}
diff -urNp linux-3.0.9/arch/x86/kernel/tls.c linux-3.0.9/arch/x86/kernel/tls.c
--- linux-3.0.9/arch/x86/kernel/tls.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/tls.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/tls.c 2011-11-15 20:02:59.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;
@@ -16192,7 +16192,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/tls.c linux-3.0.9/arch/x86/kernel/tls.c
return 0;
diff -urNp linux-3.0.9/arch/x86/kernel/trampoline_32.S linux-3.0.9/arch/x86/kernel/trampoline_32.S
--- linux-3.0.9/arch/x86/kernel/trampoline_32.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/trampoline_32.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/trampoline_32.S 2011-11-15 20:02:59.000000000 -0500
@@ -32,6 +32,12 @@
#include <asm/segment.h>
#include <asm/page_types.h>
@@ -16217,7 +16217,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/trampoline_32.S linux-3.0.9/arch/x86/kern
# hence we don't use the boot_gdt_descr defined in head.S
diff -urNp linux-3.0.9/arch/x86/kernel/trampoline_64.S linux-3.0.9/arch/x86/kernel/trampoline_64.S
--- linux-3.0.9/arch/x86/kernel/trampoline_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/trampoline_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/trampoline_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -90,7 +90,7 @@ startup_32:
movl $__KERNEL_DS, %eax # Initialize the %ds segment register
movl %eax, %ds
@@ -16238,7 +16238,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/trampoline_64.S linux-3.0.9/arch/x86/kern
.quad 0x00cf9b000000ffff # __KERNEL32_CS
diff -urNp linux-3.0.9/arch/x86/kernel/traps.c linux-3.0.9/arch/x86/kernel/traps.c
--- linux-3.0.9/arch/x86/kernel/traps.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/traps.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/traps.c 2011-11-15 20:02:59.000000000 -0500
@@ -70,12 +70,6 @@ asmlinkage int system_call(void);
/* Do we ignore FPU interrupts ? */
@@ -16420,7 +16420,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/traps.c linux-3.0.9/arch/x86/kernel/traps
local_irq_enable();
diff -urNp linux-3.0.9/arch/x86/kernel/verify_cpu.S linux-3.0.9/arch/x86/kernel/verify_cpu.S
--- linux-3.0.9/arch/x86/kernel/verify_cpu.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/verify_cpu.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/verify_cpu.S 2011-11-15 20:02:59.000000000 -0500
@@ -20,6 +20,7 @@
* arch/x86/boot/compressed/head_64.S: Boot cpu verification
* arch/x86/kernel/trampoline_64.S: secondary processor verification
@@ -16431,7 +16431,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/verify_cpu.S linux-3.0.9/arch/x86/kernel/
* 0: Success 1: Failure
diff -urNp linux-3.0.9/arch/x86/kernel/vm86_32.c linux-3.0.9/arch/x86/kernel/vm86_32.c
--- linux-3.0.9/arch/x86/kernel/vm86_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/vm86_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/vm86_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -41,6 +41,7 @@
#include <linux/ptrace.h>
#include <linux/audit.h>
@@ -16498,7 +16498,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/vm86_32.c linux-3.0.9/arch/x86/kernel/vm8
if ((segoffs >> 16) == BIOSSEG)
diff -urNp linux-3.0.9/arch/x86/kernel/vmlinux.lds.S linux-3.0.9/arch/x86/kernel/vmlinux.lds.S
--- linux-3.0.9/arch/x86/kernel/vmlinux.lds.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/vmlinux.lds.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/vmlinux.lds.S 2011-11-15 20:02:59.000000000 -0500
@@ -26,6 +26,13 @@
#include <asm/page_types.h>
#include <asm/cache.h>
@@ -16763,7 +16763,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/vmlinux.lds.S linux-3.0.9/arch/x86/kernel
#ifdef CONFIG_SMP
diff -urNp linux-3.0.9/arch/x86/kernel/vsyscall_64.c linux-3.0.9/arch/x86/kernel/vsyscall_64.c
--- linux-3.0.9/arch/x86/kernel/vsyscall_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/vsyscall_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/vsyscall_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -53,7 +53,7 @@ DEFINE_VVAR(int, vgetcpu_mode);
DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
{
@@ -16784,7 +16784,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/vsyscall_64.c linux-3.0.9/arch/x86/kernel
};
diff -urNp linux-3.0.9/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.9/arch/x86/kernel/x8664_ksyms_64.c
--- linux-3.0.9/arch/x86/kernel/x8664_ksyms_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/x8664_ksyms_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/x8664_ksyms_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
EXPORT_SYMBOL(copy_user_generic_string);
EXPORT_SYMBOL(copy_user_generic_unrolled);
@@ -16796,7 +16796,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.9/arch/x86/ker
EXPORT_SYMBOL(clear_page);
diff -urNp linux-3.0.9/arch/x86/kernel/xsave.c linux-3.0.9/arch/x86/kernel/xsave.c
--- linux-3.0.9/arch/x86/kernel/xsave.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kernel/xsave.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kernel/xsave.c 2011-11-15 20:02:59.000000000 -0500
@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_
fx_sw_user->xstate_size > fx_sw_user->extended_size)
return -EINVAL;
@@ -16826,7 +16826,7 @@ diff -urNp linux-3.0.9/arch/x86/kernel/xsave.c linux-3.0.9/arch/x86/kernel/xsave
/*
diff -urNp linux-3.0.9/arch/x86/kvm/emulate.c linux-3.0.9/arch/x86/kvm/emulate.c
--- linux-3.0.9/arch/x86/kvm/emulate.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kvm/emulate.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kvm/emulate.c 2011-11-15 20:02:59.000000000 -0500
@@ -96,7 +96,7 @@
#define Src2ImmByte (2<<29)
#define Src2One (3<<29)
@@ -16863,7 +16863,7 @@ diff -urNp linux-3.0.9/arch/x86/kvm/emulate.c linux-3.0.9/arch/x86/kvm/emulate.c
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
diff -urNp linux-3.0.9/arch/x86/kvm/lapic.c linux-3.0.9/arch/x86/kvm/lapic.c
--- linux-3.0.9/arch/x86/kvm/lapic.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kvm/lapic.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kvm/lapic.c 2011-11-15 20:02:59.000000000 -0500
@@ -53,7 +53,7 @@
#define APIC_BUS_CYCLE_NS 1
@@ -16875,7 +16875,7 @@ diff -urNp linux-3.0.9/arch/x86/kvm/lapic.c linux-3.0.9/arch/x86/kvm/lapic.c
/* 14 is the version for Xeon and Pentium 8.4.8*/
diff -urNp linux-3.0.9/arch/x86/kvm/mmu.c linux-3.0.9/arch/x86/kvm/mmu.c
--- linux-3.0.9/arch/x86/kvm/mmu.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kvm/mmu.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kvm/mmu.c 2011-11-15 20:02:59.000000000 -0500
@@ -3238,7 +3238,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
@@ -16896,7 +16896,7 @@ diff -urNp linux-3.0.9/arch/x86/kvm/mmu.c linux-3.0.9/arch/x86/kvm/mmu.c
++vcpu->kvm->stat.mmu_pte_write;
diff -urNp linux-3.0.9/arch/x86/kvm/paging_tmpl.h linux-3.0.9/arch/x86/kvm/paging_tmpl.h
--- linux-3.0.9/arch/x86/kvm/paging_tmpl.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kvm/paging_tmpl.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kvm/paging_tmpl.h 2011-11-15 20:02:59.000000000 -0500
@@ -182,7 +182,7 @@ walk:
break;
}
@@ -16926,7 +16926,7 @@ diff -urNp linux-3.0.9/arch/x86/kvm/paging_tmpl.h linux-3.0.9/arch/x86/kvm/pagin
diff -urNp linux-3.0.9/arch/x86/kvm/svm.c linux-3.0.9/arch/x86/kvm/svm.c
--- linux-3.0.9/arch/x86/kvm/svm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kvm/svm.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kvm/svm.c 2011-11-15 20:02:59.000000000 -0500
@@ -3377,7 +3377,11 @@ static void reload_tss(struct kvm_vcpu *
int cpu = raw_smp_processor_id();
@@ -16952,7 +16952,7 @@ diff -urNp linux-3.0.9/arch/x86/kvm/svm.c linux-3.0.9/arch/x86/kvm/svm.c
local_irq_disable();
diff -urNp linux-3.0.9/arch/x86/kvm/vmx.c linux-3.0.9/arch/x86/kvm/vmx.c
--- linux-3.0.9/arch/x86/kvm/vmx.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kvm/vmx.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kvm/vmx.c 2011-11-15 20:02:59.000000000 -0500
@@ -797,7 +797,11 @@ static void reload_tss(void)
struct desc_struct *descs;
@@ -17033,7 +17033,7 @@ diff -urNp linux-3.0.9/arch/x86/kvm/vmx.c linux-3.0.9/arch/x86/kvm/vmx.c
vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
diff -urNp linux-3.0.9/arch/x86/kvm/x86.c linux-3.0.9/arch/x86/kvm/x86.c
--- linux-3.0.9/arch/x86/kvm/x86.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/kvm/x86.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/kvm/x86.c 2011-11-15 20:02:59.000000000 -0500
@@ -1313,8 +1313,8 @@ static int xen_hvm_config(struct kvm_vcp
{
struct kvm *kvm = vcpu->kvm;
@@ -17121,7 +17121,7 @@ diff -urNp linux-3.0.9/arch/x86/kvm/x86.c linux-3.0.9/arch/x86/kvm/x86.c
struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
diff -urNp linux-3.0.9/arch/x86/lguest/boot.c linux-3.0.9/arch/x86/lguest/boot.c
--- linux-3.0.9/arch/x86/lguest/boot.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lguest/boot.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lguest/boot.c 2011-11-15 20:02:59.000000000 -0500
@@ -1176,9 +1176,10 @@ static __init int early_put_chars(u32 vt
* Rebooting also tells the Host we're finished, but the RESTART flag tells the
* Launcher to reboot us.
@@ -17136,7 +17136,7 @@ diff -urNp linux-3.0.9/arch/x86/lguest/boot.c linux-3.0.9/arch/x86/lguest/boot.c
/*G:050
diff -urNp linux-3.0.9/arch/x86/lib/atomic64_32.c linux-3.0.9/arch/x86/lib/atomic64_32.c
--- linux-3.0.9/arch/x86/lib/atomic64_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/atomic64_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/atomic64_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -8,18 +8,30 @@
long long atomic64_read_cx8(long long, const atomic64_t *v);
@@ -17217,7 +17217,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/atomic64_32.c linux-3.0.9/arch/x86/lib/atomi
int atomic64_inc_not_zero_386(atomic64_t *v);
diff -urNp linux-3.0.9/arch/x86/lib/atomic64_386_32.S linux-3.0.9/arch/x86/lib/atomic64_386_32.S
--- linux-3.0.9/arch/x86/lib/atomic64_386_32.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/atomic64_386_32.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/atomic64_386_32.S 2011-11-15 20:02:59.000000000 -0500
@@ -48,6 +48,10 @@ BEGIN(read)
movl (v), %eax
movl 4(v), %edx
@@ -17475,7 +17475,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/atomic64_386_32.S linux-3.0.9/arch/x86/lib/a
movl %edx, 4(v)
diff -urNp linux-3.0.9/arch/x86/lib/atomic64_cx8_32.S linux-3.0.9/arch/x86/lib/atomic64_cx8_32.S
--- linux-3.0.9/arch/x86/lib/atomic64_cx8_32.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/atomic64_cx8_32.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/atomic64_cx8_32.S 2011-11-15 20:02:59.000000000 -0500
@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
CFI_STARTPROC
@@ -17699,7 +17699,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/atomic64_cx8_32.S linux-3.0.9/arch/x86/lib/a
testl %edx, %edx
diff -urNp linux-3.0.9/arch/x86/lib/checksum_32.S linux-3.0.9/arch/x86/lib/checksum_32.S
--- linux-3.0.9/arch/x86/lib/checksum_32.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/checksum_32.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/checksum_32.S 2011-11-15 20:02:59.000000000 -0500
@@ -28,7 +28,8 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
@@ -17946,7 +17946,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/checksum_32.S linux-3.0.9/arch/x86/lib/check
#undef ROUND1
diff -urNp linux-3.0.9/arch/x86/lib/clear_page_64.S linux-3.0.9/arch/x86/lib/clear_page_64.S
--- linux-3.0.9/arch/x86/lib/clear_page_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/clear_page_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/clear_page_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
movl $4096/8,%ecx
xorl %eax,%eax
@@ -17982,7 +17982,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/clear_page_64.S linux-3.0.9/arch/x86/lib/cle
2: .byte 0xeb /* jmp <disp8> */
diff -urNp linux-3.0.9/arch/x86/lib/cmpxchg16b_emu.S linux-3.0.9/arch/x86/lib/cmpxchg16b_emu.S
--- linux-3.0.9/arch/x86/lib/cmpxchg16b_emu.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/cmpxchg16b_emu.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/cmpxchg16b_emu.S 2011-11-15 20:02:59.000000000 -0500
@@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
popf
@@ -17999,7 +17999,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/cmpxchg16b_emu.S linux-3.0.9/arch/x86/lib/cm
CFI_ENDPROC
diff -urNp linux-3.0.9/arch/x86/lib/copy_page_64.S linux-3.0.9/arch/x86/lib/copy_page_64.S
--- linux-3.0.9/arch/x86/lib/copy_page_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/copy_page_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/copy_page_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -2,12 +2,14 @@
#include <linux/linkage.h>
@@ -18034,7 +18034,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/copy_page_64.S linux-3.0.9/arch/x86/lib/copy
2:
diff -urNp linux-3.0.9/arch/x86/lib/copy_user_64.S linux-3.0.9/arch/x86/lib/copy_user_64.S
--- linux-3.0.9/arch/x86/lib/copy_user_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/copy_user_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/copy_user_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -16,6 +16,7 @@
#include <asm/thread_info.h>
#include <asm/cpufeature.h>
@@ -18129,7 +18129,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/copy_user_64.S linux-3.0.9/arch/x86/lib/copy
.section .fixup,"ax"
diff -urNp linux-3.0.9/arch/x86/lib/copy_user_nocache_64.S linux-3.0.9/arch/x86/lib/copy_user_nocache_64.S
--- linux-3.0.9/arch/x86/lib/copy_user_nocache_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/copy_user_nocache_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/copy_user_nocache_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -8,12 +8,14 @@
#include <linux/linkage.h>
@@ -18171,7 +18171,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/copy_user_nocache_64.S linux-3.0.9/arch/x86/
.section .fixup,"ax"
diff -urNp linux-3.0.9/arch/x86/lib/csum-copy_64.S linux-3.0.9/arch/x86/lib/csum-copy_64.S
--- linux-3.0.9/arch/x86/lib/csum-copy_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/csum-copy_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/csum-copy_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -8,6 +8,7 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
@@ -18190,7 +18190,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/csum-copy_64.S linux-3.0.9/arch/x86/lib/csum
diff -urNp linux-3.0.9/arch/x86/lib/csum-wrappers_64.c linux-3.0.9/arch/x86/lib/csum-wrappers_64.c
--- linux-3.0.9/arch/x86/lib/csum-wrappers_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/csum-wrappers_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/csum-wrappers_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void _
len -= 2;
}
@@ -18223,7 +18223,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/csum-wrappers_64.c linux-3.0.9/arch/x86/lib/
EXPORT_SYMBOL(csum_partial_copy_to_user);
diff -urNp linux-3.0.9/arch/x86/lib/getuser.S linux-3.0.9/arch/x86/lib/getuser.S
--- linux-3.0.9/arch/x86/lib/getuser.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/getuser.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/getuser.S 2011-11-15 20:02:59.000000000 -0500
@@ -33,15 +33,38 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -18349,7 +18349,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/getuser.S linux-3.0.9/arch/x86/lib/getuser.S
END(bad_get_user)
diff -urNp linux-3.0.9/arch/x86/lib/insn.c linux-3.0.9/arch/x86/lib/insn.c
--- linux-3.0.9/arch/x86/lib/insn.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/insn.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/insn.c 2011-11-15 20:02:59.000000000 -0500
@@ -21,6 +21,11 @@
#include <linux/string.h>
#include <asm/inat.h>
@@ -18375,7 +18375,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/insn.c linux-3.0.9/arch/x86/lib/insn.c
if (x86_64)
diff -urNp linux-3.0.9/arch/x86/lib/iomap_copy_64.S linux-3.0.9/arch/x86/lib/iomap_copy_64.S
--- linux-3.0.9/arch/x86/lib/iomap_copy_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/iomap_copy_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/iomap_copy_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -17,6 +17,7 @@
#include <linux/linkage.h>
@@ -18394,7 +18394,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/iomap_copy_64.S linux-3.0.9/arch/x86/lib/iom
ENDPROC(__iowrite32_copy)
diff -urNp linux-3.0.9/arch/x86/lib/memcpy_64.S linux-3.0.9/arch/x86/lib/memcpy_64.S
--- linux-3.0.9/arch/x86/lib/memcpy_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/memcpy_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/memcpy_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -34,6 +34,7 @@
rep movsq
movl %edx, %ecx
@@ -18445,7 +18445,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/memcpy_64.S linux-3.0.9/arch/x86/lib/memcpy_
ENDPROC(memcpy)
diff -urNp linux-3.0.9/arch/x86/lib/memmove_64.S linux-3.0.9/arch/x86/lib/memmove_64.S
--- linux-3.0.9/arch/x86/lib/memmove_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/memmove_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/memmove_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -9,6 +9,7 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
@@ -18472,7 +18472,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/memmove_64.S linux-3.0.9/arch/x86/lib/memmov
.previous
diff -urNp linux-3.0.9/arch/x86/lib/memset_64.S linux-3.0.9/arch/x86/lib/memset_64.S
--- linux-3.0.9/arch/x86/lib/memset_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/memset_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/memset_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -31,6 +31,7 @@
movl %r8d,%ecx
rep stosb
@@ -18499,7 +18499,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/memset_64.S linux-3.0.9/arch/x86/lib/memset_
CFI_RESTORE_STATE
diff -urNp linux-3.0.9/arch/x86/lib/mmx_32.c linux-3.0.9/arch/x86/lib/mmx_32.c
--- linux-3.0.9/arch/x86/lib/mmx_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/mmx_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/mmx_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
{
void *p;
@@ -18817,7 +18817,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/mmx_32.c linux-3.0.9/arch/x86/lib/mmx_32.c
to += 64;
diff -urNp linux-3.0.9/arch/x86/lib/msr-reg.S linux-3.0.9/arch/x86/lib/msr-reg.S
--- linux-3.0.9/arch/x86/lib/msr-reg.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/msr-reg.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/msr-reg.S 2011-11-15 20:02:59.000000000 -0500
@@ -3,6 +3,7 @@
#include <asm/dwarf2.h>
#include <asm/asm.h>
@@ -18836,7 +18836,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/msr-reg.S linux-3.0.9/arch/x86/lib/msr-reg.S
CFI_RESTORE_STATE
diff -urNp linux-3.0.9/arch/x86/lib/putuser.S linux-3.0.9/arch/x86/lib/putuser.S
--- linux-3.0.9/arch/x86/lib/putuser.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/putuser.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/putuser.S 2011-11-15 20:02:59.000000000 -0500
@@ -15,7 +15,9 @@
#include <asm/thread_info.h>
#include <asm/errno.h>
@@ -18978,7 +18978,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/putuser.S linux-3.0.9/arch/x86/lib/putuser.S
EXIT
diff -urNp linux-3.0.9/arch/x86/lib/rwlock_64.S linux-3.0.9/arch/x86/lib/rwlock_64.S
--- linux-3.0.9/arch/x86/lib/rwlock_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/rwlock_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/rwlock_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -17,6 +17,7 @@ ENTRY(__write_lock_failed)
LOCK_PREFIX
subl $RW_LOCK_BIAS,(%rdi)
@@ -18997,7 +18997,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/rwlock_64.S linux-3.0.9/arch/x86/lib/rwlock_
END(__read_lock_failed)
diff -urNp linux-3.0.9/arch/x86/lib/rwsem_64.S linux-3.0.9/arch/x86/lib/rwsem_64.S
--- linux-3.0.9/arch/x86/lib/rwsem_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/rwsem_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/rwsem_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -51,6 +51,7 @@ ENTRY(call_rwsem_down_read_failed)
popq_cfi %rdx
CFI_RESTORE rdx
@@ -19034,7 +19034,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/rwsem_64.S linux-3.0.9/arch/x86/lib/rwsem_64
ENDPROC(call_rwsem_downgrade_wake)
diff -urNp linux-3.0.9/arch/x86/lib/thunk_64.S linux-3.0.9/arch/x86/lib/thunk_64.S
--- linux-3.0.9/arch/x86/lib/thunk_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/thunk_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/thunk_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -10,7 +10,8 @@
#include <asm/dwarf2.h>
#include <asm/calling.h>
@@ -19055,7 +19055,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/thunk_64.S linux-3.0.9/arch/x86/lib/thunk_64
CFI_ENDPROC
diff -urNp linux-3.0.9/arch/x86/lib/usercopy_32.c linux-3.0.9/arch/x86/lib/usercopy_32.c
--- linux-3.0.9/arch/x86/lib/usercopy_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/usercopy_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/usercopy_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -43,7 +43,7 @@ do { \
__asm__ __volatile__( \
" testl %1,%1\n" \
@@ -19678,7 +19678,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/usercopy_32.c linux-3.0.9/arch/x86/lib/userc
+#endif
diff -urNp linux-3.0.9/arch/x86/lib/usercopy_64.c linux-3.0.9/arch/x86/lib/usercopy_64.c
--- linux-3.0.9/arch/x86/lib/usercopy_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/lib/usercopy_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/lib/usercopy_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -42,6 +42,12 @@ long
__strncpy_from_user(char *dst, const char __user *src, long count)
{
@@ -19739,7 +19739,7 @@ diff -urNp linux-3.0.9/arch/x86/lib/usercopy_64.c linux-3.0.9/arch/x86/lib/userc
unsigned zero_len;
diff -urNp linux-3.0.9/arch/x86/Makefile linux-3.0.9/arch/x86/Makefile
--- linux-3.0.9/arch/x86/Makefile 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/Makefile 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/Makefile 2011-11-15 20:02:59.000000000 -0500
@@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y)
else
BITS := 64
@@ -19763,7 +19763,7 @@ diff -urNp linux-3.0.9/arch/x86/Makefile linux-3.0.9/arch/x86/Makefile
+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
diff -urNp linux-3.0.9/arch/x86/mm/extable.c linux-3.0.9/arch/x86/mm/extable.c
--- linux-3.0.9/arch/x86/mm/extable.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/extable.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/extable.c 2011-11-15 20:02:59.000000000 -0500
@@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs
const struct exception_table_entry *fixup;
@@ -19775,7 +19775,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/extable.c linux-3.0.9/arch/x86/mm/extable.c
pnp_bios_is_utter_crap = 1;
diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
--- linux-3.0.9/arch/x86/mm/fault.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/fault.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/fault.c 2011-11-15 20:02:59.000000000 -0500
@@ -13,10 +13,18 @@
#include <linux/perf_event.h> /* perf_sw_event */
#include <linux/hugetlb.h> /* hstate_index_to_shift */
@@ -20444,7 +20444,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c
+}
diff -urNp linux-3.0.9/arch/x86/mm/gup.c linux-3.0.9/arch/x86/mm/gup.c
--- linux-3.0.9/arch/x86/mm/gup.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/gup.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/gup.c 2011-11-15 20:02:59.000000000 -0500
@@ -253,7 +253,7 @@ int __get_user_pages_fast(unsigned long
addr = start;
len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -20456,7 +20456,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/gup.c linux-3.0.9/arch/x86/mm/gup.c
diff -urNp linux-3.0.9/arch/x86/mm/highmem_32.c linux-3.0.9/arch/x86/mm/highmem_32.c
--- linux-3.0.9/arch/x86/mm/highmem_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/highmem_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/highmem_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page
idx = type + KM_TYPE_NR*smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -20470,7 +20470,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/highmem_32.c linux-3.0.9/arch/x86/mm/highmem_
}
diff -urNp linux-3.0.9/arch/x86/mm/hugetlbpage.c linux-3.0.9/arch/x86/mm/hugetlbpage.c
--- linux-3.0.9/arch/x86/mm/hugetlbpage.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/hugetlbpage.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/hugetlbpage.c 2011-11-15 20:02:59.000000000 -0500
@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
@@ -20680,7 +20680,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/hugetlbpage.c linux-3.0.9/arch/x86/mm/hugetlb
if (mm->get_unmapped_area == arch_get_unmapped_area)
diff -urNp linux-3.0.9/arch/x86/mm/init_32.c linux-3.0.9/arch/x86/mm/init_32.c
--- linux-3.0.9/arch/x86/mm/init_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/init_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/init_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
}
@@ -20957,7 +20957,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/init_32.c linux-3.0.9/arch/x86/mm/init_32.c
size >> 10);
diff -urNp linux-3.0.9/arch/x86/mm/init_64.c linux-3.0.9/arch/x86/mm/init_64.c
--- linux-3.0.9/arch/x86/mm/init_64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/init_64.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/init_64.c 2011-11-15 20:02:59.000000000 -0500
@@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpa
* around without checking the pgd every time.
*/
@@ -21089,7 +21089,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/init_64.c linux-3.0.9/arch/x86/mm/init_64.c
return "[vsyscall]";
diff -urNp linux-3.0.9/arch/x86/mm/init.c linux-3.0.9/arch/x86/mm/init.c
--- linux-3.0.9/arch/x86/mm/init.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/init.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/init.c 2011-11-15 20:02:59.000000000 -0500
@@ -31,7 +31,7 @@ int direct_gbpages
static void __init find_early_table_space(unsigned long end, int use_pse,
int use_gbpages)
@@ -21224,7 +21224,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/init.c linux-3.0.9/arch/x86/mm/init.c
(unsigned long)(&__init_end));
diff -urNp linux-3.0.9/arch/x86/mm/iomap_32.c linux-3.0.9/arch/x86/mm/iomap_32.c
--- linux-3.0.9/arch/x86/mm/iomap_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/iomap_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/iomap_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long
type = kmap_atomic_idx_push();
idx = type + KM_TYPE_NR * smp_processor_id();
@@ -21239,7 +21239,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/iomap_32.c linux-3.0.9/arch/x86/mm/iomap_32.c
return (void *)vaddr;
diff -urNp linux-3.0.9/arch/x86/mm/ioremap.c linux-3.0.9/arch/x86/mm/ioremap.c
--- linux-3.0.9/arch/x86/mm/ioremap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/ioremap.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/ioremap.c 2011-11-15 20:02:59.000000000 -0500
@@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(re
for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
int is_ram = page_is_ram(pfn);
@@ -21270,7 +21270,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/ioremap.c linux-3.0.9/arch/x86/mm/ioremap.c
* The boot-ioremap range spans multiple pmds, for which
diff -urNp linux-3.0.9/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.9/arch/x86/mm/kmemcheck/kmemcheck.c
--- linux-3.0.9/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-15 20:02:59.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.
@@ -21285,7 +21285,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.9/arch/x86/mm
pte = kmemcheck_pte_lookup(address);
diff -urNp linux-3.0.9/arch/x86/mm/mmap.c linux-3.0.9/arch/x86/mm/mmap.c
--- linux-3.0.9/arch/x86/mm/mmap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/mmap.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/mmap.c 2011-11-15 20:02:59.000000000 -0500
@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
* Leave an at least ~128 MB hole with possible stack randomization.
*/
@@ -21369,7 +21369,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/mmap.c linux-3.0.9/arch/x86/mm/mmap.c
}
diff -urNp linux-3.0.9/arch/x86/mm/mmio-mod.c linux-3.0.9/arch/x86/mm/mmio-mod.c
--- linux-3.0.9/arch/x86/mm/mmio-mod.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/mmio-mod.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/mmio-mod.c 2011-11-15 20:02:59.000000000 -0500
@@ -195,7 +195,7 @@ static void pre(struct kmmio_probe *p, s
break;
default:
@@ -21399,7 +21399,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/mmio-mod.c linux-3.0.9/arch/x86/mm/mmio-mod.c
diff -urNp linux-3.0.9/arch/x86/mm/pageattr.c linux-3.0.9/arch/x86/mm/pageattr.c
--- linux-3.0.9/arch/x86/mm/pageattr.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/pageattr.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/pageattr.c 2011-11-15 20:02:59.000000000 -0500
@@ -261,7 +261,7 @@ static inline pgprot_t static_protection
*/
#ifdef CONFIG_PCI_BIOS
@@ -21486,7 +21486,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/pageattr.c linux-3.0.9/arch/x86/mm/pageattr.c
static int
diff -urNp linux-3.0.9/arch/x86/mm/pageattr-test.c linux-3.0.9/arch/x86/mm/pageattr-test.c
--- linux-3.0.9/arch/x86/mm/pageattr-test.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/pageattr-test.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/pageattr-test.c 2011-11-15 20:02:59.000000000 -0500
@@ -36,7 +36,7 @@ enum {
static int pte_testbit(pte_t pte)
@@ -21498,7 +21498,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/pageattr-test.c linux-3.0.9/arch/x86/mm/pagea
struct split_state {
diff -urNp linux-3.0.9/arch/x86/mm/pat.c linux-3.0.9/arch/x86/mm/pat.c
--- linux-3.0.9/arch/x86/mm/pat.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/pat.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/pat.c 2011-11-15 20:02:59.000000000 -0500
@@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
if (!entry) {
@@ -21548,7 +21548,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/pat.c linux-3.0.9/arch/x86/mm/pat.c
(unsigned long long)(paddr + size),
diff -urNp linux-3.0.9/arch/x86/mm/pf_in.c linux-3.0.9/arch/x86/mm/pf_in.c
--- linux-3.0.9/arch/x86/mm/pf_in.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/pf_in.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/pf_in.c 2011-11-15 20:02:59.000000000 -0500
@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l
int i;
enum reason_type rv = OTHERS;
@@ -21596,7 +21596,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/pf_in.c linux-3.0.9/arch/x86/mm/pf_in.c
for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
diff -urNp linux-3.0.9/arch/x86/mm/pgtable_32.c linux-3.0.9/arch/x86/mm/pgtable_32.c
--- linux-3.0.9/arch/x86/mm/pgtable_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/pgtable_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/pgtable_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr,
return;
}
@@ -21613,7 +21613,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/pgtable_32.c linux-3.0.9/arch/x86/mm/pgtable_
* It's enough to flush this one mapping.
diff -urNp linux-3.0.9/arch/x86/mm/pgtable.c linux-3.0.9/arch/x86/mm/pgtable.c
--- linux-3.0.9/arch/x86/mm/pgtable.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/pgtable.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/pgtable.c 2011-11-15 20:02:59.000000000 -0500
@@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p
list_del(&page->lru);
}
@@ -21861,7 +21861,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/pgtable.c linux-3.0.9/arch/x86/mm/pgtable.c
free_page((unsigned long)pgd);
diff -urNp linux-3.0.9/arch/x86/mm/setup_nx.c linux-3.0.9/arch/x86/mm/setup_nx.c
--- linux-3.0.9/arch/x86/mm/setup_nx.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/setup_nx.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/setup_nx.c 2011-11-15 20:02:59.000000000 -0500
@@ -5,8 +5,10 @@
#include <asm/pgtable.h>
#include <asm/proto.h>
@@ -21893,7 +21893,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/setup_nx.c linux-3.0.9/arch/x86/mm/setup_nx.c
diff -urNp linux-3.0.9/arch/x86/mm/tlb.c linux-3.0.9/arch/x86/mm/tlb.c
--- linux-3.0.9/arch/x86/mm/tlb.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/mm/tlb.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/mm/tlb.c 2011-11-15 20:02:59.000000000 -0500
@@ -65,7 +65,11 @@ void leave_mm(int cpu)
BUG();
cpumask_clear_cpu(cpu,
@@ -21908,7 +21908,7 @@ diff -urNp linux-3.0.9/arch/x86/mm/tlb.c linux-3.0.9/arch/x86/mm/tlb.c
diff -urNp linux-3.0.9/arch/x86/net/bpf_jit_comp.c linux-3.0.9/arch/x86/net/bpf_jit_comp.c
--- linux-3.0.9/arch/x86/net/bpf_jit_comp.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/net/bpf_jit_comp.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/net/bpf_jit_comp.c 2011-11-15 20:02:59.000000000 -0500
@@ -589,7 +589,9 @@ cond_branch: f_offset = addrs[i + filt
module_free(NULL, image);
return;
@@ -21930,7 +21930,7 @@ diff -urNp linux-3.0.9/arch/x86/net/bpf_jit_comp.c linux-3.0.9/arch/x86/net/bpf_
if (!image)
diff -urNp linux-3.0.9/arch/x86/net/bpf_jit.S linux-3.0.9/arch/x86/net/bpf_jit.S
--- linux-3.0.9/arch/x86/net/bpf_jit.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/net/bpf_jit.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/net/bpf_jit.S 2011-11-15 20:02:59.000000000 -0500
@@ -9,6 +9,7 @@
*/
#include <linux/linkage.h>
@@ -22010,7 +22010,7 @@ diff -urNp linux-3.0.9/arch/x86/net/bpf_jit.S linux-3.0.9/arch/x86/net/bpf_jit.S
ret
diff -urNp linux-3.0.9/arch/x86/oprofile/backtrace.c linux-3.0.9/arch/x86/oprofile/backtrace.c
--- linux-3.0.9/arch/x86/oprofile/backtrace.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/oprofile/backtrace.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/oprofile/backtrace.c 2011-11-15 20:02:59.000000000 -0500
@@ -83,11 +83,11 @@ dump_user_backtrace_32(struct stack_fram
struct stack_frame_ia32 *fp;
unsigned long bytes;
@@ -22045,7 +22045,7 @@ diff -urNp linux-3.0.9/arch/x86/oprofile/backtrace.c linux-3.0.9/arch/x86/oprofi
dump_trace(NULL, regs, (unsigned long *)stack, 0,
diff -urNp linux-3.0.9/arch/x86/pci/mrst.c linux-3.0.9/arch/x86/pci/mrst.c
--- linux-3.0.9/arch/x86/pci/mrst.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/pci/mrst.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/pci/mrst.c 2011-11-15 20:02:59.000000000 -0500
@@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
pci_mmcfg_late_init();
@@ -22059,7 +22059,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/mrst.c linux-3.0.9/arch/x86/pci/mrst.c
}
diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
--- linux-3.0.9/arch/x86/pci/pcbios.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/pci/pcbios.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/pci/pcbios.c 2011-11-15 20:02:59.000000000 -0500
@@ -79,50 +79,93 @@ union bios32 {
static struct {
unsigned long address;
@@ -22366,7 +22366,7 @@ diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c
EXPORT_SYMBOL(pcibios_set_irq_routing);
diff -urNp linux-3.0.9/arch/x86/platform/efi/efi_32.c linux-3.0.9/arch/x86/platform/efi/efi_32.c
--- linux-3.0.9/arch/x86/platform/efi/efi_32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/platform/efi/efi_32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/platform/efi/efi_32.c 2011-11-15 20:02:59.000000000 -0500
@@ -38,70 +38,56 @@
*/
@@ -22466,7 +22466,7 @@ diff -urNp linux-3.0.9/arch/x86/platform/efi/efi_32.c linux-3.0.9/arch/x86/platf
* After the lock is released, the original page table is restored.
diff -urNp linux-3.0.9/arch/x86/platform/efi/efi_stub_32.S linux-3.0.9/arch/x86/platform/efi/efi_stub_32.S
--- linux-3.0.9/arch/x86/platform/efi/efi_stub_32.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/platform/efi/efi_stub_32.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/platform/efi/efi_stub_32.S 2011-11-15 20:02:59.000000000 -0500
@@ -6,7 +6,9 @@
*/
@@ -22577,7 +22577,7 @@ diff -urNp linux-3.0.9/arch/x86/platform/efi/efi_stub_32.S linux-3.0.9/arch/x86/
efi_rt_function_ptr:
diff -urNp linux-3.0.9/arch/x86/platform/efi/efi_stub_64.S linux-3.0.9/arch/x86/platform/efi/efi_stub_64.S
--- linux-3.0.9/arch/x86/platform/efi/efi_stub_64.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/platform/efi/efi_stub_64.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/platform/efi/efi_stub_64.S 2011-11-15 20:02:59.000000000 -0500
@@ -7,6 +7,7 @@
*/
@@ -22643,7 +22643,7 @@ diff -urNp linux-3.0.9/arch/x86/platform/efi/efi_stub_64.S linux-3.0.9/arch/x86/
ENDPROC(efi_call6)
diff -urNp linux-3.0.9/arch/x86/platform/mrst/mrst.c linux-3.0.9/arch/x86/platform/mrst/mrst.c
--- linux-3.0.9/arch/x86/platform/mrst/mrst.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/platform/mrst/mrst.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/platform/mrst/mrst.c 2011-11-15 20:02:59.000000000 -0500
@@ -239,14 +239,16 @@ static int mrst_i8042_detect(void)
}
@@ -22665,7 +22665,7 @@ diff -urNp linux-3.0.9/arch/x86/platform/mrst/mrst.c linux-3.0.9/arch/x86/platfo
/*
diff -urNp linux-3.0.9/arch/x86/platform/uv/tlb_uv.c linux-3.0.9/arch/x86/platform/uv/tlb_uv.c
--- linux-3.0.9/arch/x86/platform/uv/tlb_uv.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/platform/uv/tlb_uv.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/platform/uv/tlb_uv.c 2011-11-15 20:02:59.000000000 -0500
@@ -370,6 +370,8 @@ static void reset_with_ipi(struct bau_ta
cpumask_t mask;
struct reset_args reset_args;
@@ -22677,7 +22677,7 @@ diff -urNp linux-3.0.9/arch/x86/platform/uv/tlb_uv.c linux-3.0.9/arch/x86/platfo
/* find a single cpu for each uvhub in this distribution mask */
diff -urNp linux-3.0.9/arch/x86/power/cpu.c linux-3.0.9/arch/x86/power/cpu.c
--- linux-3.0.9/arch/x86/power/cpu.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/power/cpu.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/power/cpu.c 2011-11-15 20:02:59.000000000 -0500
@@ -130,7 +130,7 @@ static void do_fpu_end(void)
static void fix_processor_context(void)
{
@@ -22699,7 +22699,7 @@ diff -urNp linux-3.0.9/arch/x86/power/cpu.c linux-3.0.9/arch/x86/power/cpu.c
#endif
diff -urNp linux-3.0.9/arch/x86/vdso/Makefile linux-3.0.9/arch/x86/vdso/Makefile
--- linux-3.0.9/arch/x86/vdso/Makefile 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/vdso/Makefile 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/vdso/Makefile 2011-11-15 20:02:59.000000000 -0500
@@ -136,7 +136,7 @@ quiet_cmd_vdso = VDSO $@
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
@@ -22711,7 +22711,7 @@ diff -urNp linux-3.0.9/arch/x86/vdso/Makefile linux-3.0.9/arch/x86/vdso/Makefile
#
diff -urNp linux-3.0.9/arch/x86/vdso/vdso32-setup.c linux-3.0.9/arch/x86/vdso/vdso32-setup.c
--- linux-3.0.9/arch/x86/vdso/vdso32-setup.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/vdso/vdso32-setup.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/vdso/vdso32-setup.c 2011-11-15 20:02:59.000000000 -0500
@@ -25,6 +25,7 @@
#include <asm/tlbflush.h>
#include <asm/vdso.h>
@@ -22796,7 +22796,7 @@ diff -urNp linux-3.0.9/arch/x86/vdso/vdso32-setup.c linux-3.0.9/arch/x86/vdso/vd
}
diff -urNp linux-3.0.9/arch/x86/vdso/vma.c linux-3.0.9/arch/x86/vdso/vma.c
--- linux-3.0.9/arch/x86/vdso/vma.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/vdso/vma.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/vdso/vma.c 2011-11-15 20:02:59.000000000 -0500
@@ -15,18 +15,19 @@
#include <asm/proto.h>
#include <asm/vdso.h>
@@ -22901,7 +22901,7 @@ diff -urNp linux-3.0.9/arch/x86/vdso/vma.c linux-3.0.9/arch/x86/vdso/vma.c
-__setup("vdso=", vdso_setup);
diff -urNp linux-3.0.9/arch/x86/xen/enlighten.c linux-3.0.9/arch/x86/xen/enlighten.c
--- linux-3.0.9/arch/x86/xen/enlighten.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/xen/enlighten.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/xen/enlighten.c 2011-11-15 20:02:59.000000000 -0500
@@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
struct shared_info xen_dummy_shared_info;
@@ -22976,7 +22976,7 @@ diff -urNp linux-3.0.9/arch/x86/xen/enlighten.c linux-3.0.9/arch/x86/xen/enlight
#ifdef CONFIG_ACPI_NUMA
diff -urNp linux-3.0.9/arch/x86/xen/mmu.c linux-3.0.9/arch/x86/xen/mmu.c
--- linux-3.0.9/arch/x86/xen/mmu.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/xen/mmu.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/xen/mmu.c 2011-11-15 20:02:59.000000000 -0500
@@ -1683,6 +1683,8 @@ pgd_t * __init xen_setup_kernel_pagetabl
convert_pfn_mfn(init_level4_pgt);
convert_pfn_mfn(level3_ident_pgt);
@@ -23015,7 +23015,7 @@ diff -urNp linux-3.0.9/arch/x86/xen/mmu.c linux-3.0.9/arch/x86/xen/mmu.c
.release_pud = xen_release_pmd_init,
diff -urNp linux-3.0.9/arch/x86/xen/smp.c linux-3.0.9/arch/x86/xen/smp.c
--- linux-3.0.9/arch/x86/xen/smp.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/xen/smp.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/xen/smp.c 2011-11-15 20:02:59.000000000 -0500
@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_
{
BUG_ON(smp_processor_id() != 0);
@@ -23062,7 +23062,7 @@ diff -urNp linux-3.0.9/arch/x86/xen/smp.c linux-3.0.9/arch/x86/xen/smp.c
xen_setup_timer(cpu);
diff -urNp linux-3.0.9/arch/x86/xen/xen-asm_32.S linux-3.0.9/arch/x86/xen/xen-asm_32.S
--- linux-3.0.9/arch/x86/xen/xen-asm_32.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/xen/xen-asm_32.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/xen/xen-asm_32.S 2011-11-15 20:02:59.000000000 -0500
@@ -83,14 +83,14 @@ ENTRY(xen_iret)
ESP_OFFSET=4 # bytes pushed onto stack
@@ -23086,7 +23086,7 @@ diff -urNp linux-3.0.9/arch/x86/xen/xen-asm_32.S linux-3.0.9/arch/x86/xen/xen-as
#endif
diff -urNp linux-3.0.9/arch/x86/xen/xen-head.S linux-3.0.9/arch/x86/xen/xen-head.S
--- linux-3.0.9/arch/x86/xen/xen-head.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/xen/xen-head.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/xen/xen-head.S 2011-11-15 20:02:59.000000000 -0500
@@ -19,6 +19,17 @@ ENTRY(startup_xen)
#ifdef CONFIG_X86_32
mov %esi,xen_start_info
@@ -23107,7 +23107,7 @@ diff -urNp linux-3.0.9/arch/x86/xen/xen-head.S linux-3.0.9/arch/x86/xen/xen-head
mov $init_thread_union+THREAD_SIZE,%rsp
diff -urNp linux-3.0.9/arch/x86/xen/xen-ops.h linux-3.0.9/arch/x86/xen/xen-ops.h
--- linux-3.0.9/arch/x86/xen/xen-ops.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/arch/x86/xen/xen-ops.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/arch/x86/xen/xen-ops.h 2011-11-15 20:02:59.000000000 -0500
@@ -10,8 +10,6 @@
extern const char xen_hypervisor_callback[];
extern const char xen_failsafe_callback[];
@@ -23119,7 +23119,7 @@ diff -urNp linux-3.0.9/arch/x86/xen/xen-ops.h linux-3.0.9/arch/x86/xen/xen-ops.h
diff -urNp linux-3.0.9/block/blk-iopoll.c linux-3.0.9/block/blk-iopoll.c
--- linux-3.0.9/block/blk-iopoll.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/block/blk-iopoll.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/block/blk-iopoll.c 2011-11-15 20:02:59.000000000 -0500
@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
}
EXPORT_SYMBOL(blk_iopoll_complete);
@@ -23131,7 +23131,7 @@ diff -urNp linux-3.0.9/block/blk-iopoll.c linux-3.0.9/block/blk-iopoll.c
int rearm = 0, budget = blk_iopoll_budget;
diff -urNp linux-3.0.9/block/blk-map.c linux-3.0.9/block/blk-map.c
--- linux-3.0.9/block/blk-map.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/block/blk-map.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/block/blk-map.c 2011-11-15 20:02:59.000000000 -0500
@@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue
if (!len || !kbuf)
return -EINVAL;
@@ -23143,7 +23143,7 @@ diff -urNp linux-3.0.9/block/blk-map.c linux-3.0.9/block/blk-map.c
else
diff -urNp linux-3.0.9/block/blk-softirq.c linux-3.0.9/block/blk-softirq.c
--- linux-3.0.9/block/blk-softirq.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/block/blk-softirq.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/block/blk-softirq.c 2011-11-15 20:02:59.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.
@@ -23155,7 +23155,7 @@ diff -urNp linux-3.0.9/block/blk-softirq.c linux-3.0.9/block/blk-softirq.c
diff -urNp linux-3.0.9/block/bsg.c linux-3.0.9/block/bsg.c
--- linux-3.0.9/block/bsg.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/block/bsg.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/block/bsg.c 2011-11-15 20:02:59.000000000 -0500
@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct r
struct sg_io_v4 *hdr, struct bsg_device *bd,
fmode_t has_write_perm)
@@ -23225,7 +23225,7 @@ diff -urNp linux-3.0.9/block/bsg.c linux-3.0.9/block/bsg.c
hdr->response_len = len;
diff -urNp linux-3.0.9/block/compat_ioctl.c linux-3.0.9/block/compat_ioctl.c
--- linux-3.0.9/block/compat_ioctl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/block/compat_ioctl.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/block/compat_ioctl.c 2011-11-15 20:02:59.000000000 -0500
@@ -354,7 +354,7 @@ static int compat_fd_ioctl(struct block_
err |= __get_user(f->spec1, &uf->spec1);
err |= __get_user(f->fmt_gap, &uf->fmt_gap);
@@ -23237,7 +23237,7 @@ diff -urNp linux-3.0.9/block/compat_ioctl.c linux-3.0.9/block/compat_ioctl.c
goto out;
diff -urNp linux-3.0.9/block/scsi_ioctl.c linux-3.0.9/block/scsi_ioctl.c
--- linux-3.0.9/block/scsi_ioctl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/block/scsi_ioctl.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/block/scsi_ioctl.c 2011-11-15 20:02:59.000000000 -0500
@@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command);
static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
struct sg_io_hdr *hdr, fmode_t mode)
@@ -23291,7 +23291,7 @@ diff -urNp linux-3.0.9/block/scsi_ioctl.c linux-3.0.9/block/scsi_ioctl.c
diff -urNp linux-3.0.9/crypto/cryptd.c linux-3.0.9/crypto/cryptd.c
--- linux-3.0.9/crypto/cryptd.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/crypto/cryptd.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/crypto/cryptd.c 2011-11-15 20:02:59.000000000 -0500
@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
struct cryptd_blkcipher_request_ctx {
@@ -23312,7 +23312,7 @@ diff -urNp linux-3.0.9/crypto/cryptd.c linux-3.0.9/crypto/cryptd.c
diff -urNp linux-3.0.9/crypto/gf128mul.c linux-3.0.9/crypto/gf128mul.c
--- linux-3.0.9/crypto/gf128mul.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/crypto/gf128mul.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/crypto/gf128mul.c 2011-11-15 20:02:59.000000000 -0500
@@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128
for (i = 0; i < 7; ++i)
gf128mul_x_lle(&p[i + 1], &p[i]);
@@ -23333,7 +23333,7 @@ diff -urNp linux-3.0.9/crypto/gf128mul.c linux-3.0.9/crypto/gf128mul.c
diff -urNp linux-3.0.9/crypto/serpent.c linux-3.0.9/crypto/serpent.c
--- linux-3.0.9/crypto/serpent.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/crypto/serpent.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/crypto/serpent.c 2011-11-15 20:02:59.000000000 -0500
@@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_
u32 r0,r1,r2,r3,r4;
int i;
@@ -23345,7 +23345,7 @@ diff -urNp linux-3.0.9/crypto/serpent.c linux-3.0.9/crypto/serpent.c
for (i = 0; i < keylen; ++i)
diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff
--- linux-3.0.9/Documentation/dontdiff 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/Documentation/dontdiff 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/Documentation/dontdiff 2011-11-15 20:02:59.000000000 -0500
@@ -5,6 +5,7 @@
*.cis
*.cpio
@@ -23485,7 +23485,7 @@ diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff
wakeup.lds
diff -urNp linux-3.0.9/Documentation/kernel-parameters.txt linux-3.0.9/Documentation/kernel-parameters.txt
--- linux-3.0.9/Documentation/kernel-parameters.txt 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/Documentation/kernel-parameters.txt 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/Documentation/kernel-parameters.txt 2011-11-15 20:02:59.000000000 -0500
@@ -1883,6 +1883,13 @@ bytes respectively. Such letter suffixes
the specified number of seconds. This is to be used if
your oopses keep scrolling off the screen.
@@ -23502,7 +23502,7 @@ diff -urNp linux-3.0.9/Documentation/kernel-parameters.txt linux-3.0.9/Documenta
pcd. [PARIDE]
diff -urNp linux-3.0.9/drivers/acpi/apei/cper.c linux-3.0.9/drivers/acpi/apei/cper.c
--- linux-3.0.9/drivers/acpi/apei/cper.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/acpi/apei/cper.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/acpi/apei/cper.c 2011-11-15 20:02:59.000000000 -0500
@@ -38,12 +38,12 @@
*/
u64 cper_next_record_id(void)
@@ -23522,7 +23522,7 @@ diff -urNp linux-3.0.9/drivers/acpi/apei/cper.c linux-3.0.9/drivers/acpi/apei/cp
diff -urNp linux-3.0.9/drivers/acpi/ec_sys.c linux-3.0.9/drivers/acpi/ec_sys.c
--- linux-3.0.9/drivers/acpi/ec_sys.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/acpi/ec_sys.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/acpi/ec_sys.c 2011-11-15 20:02:59.000000000 -0500
@@ -11,6 +11,7 @@
#include <linux/kernel.h>
#include <linux/acpi.h>
@@ -23574,7 +23574,7 @@ diff -urNp linux-3.0.9/drivers/acpi/ec_sys.c linux-3.0.9/drivers/acpi/ec_sys.c
return err;
diff -urNp linux-3.0.9/drivers/acpi/proc.c linux-3.0.9/drivers/acpi/proc.c
--- linux-3.0.9/drivers/acpi/proc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/acpi/proc.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/acpi/proc.c 2011-11-15 20:02:59.000000000 -0500
@@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f
size_t count, loff_t * ppos)
{
@@ -23611,7 +23611,7 @@ diff -urNp linux-3.0.9/drivers/acpi/proc.c linux-3.0.9/drivers/acpi/proc.c
device_set_wakeup_enable(&dev->dev, enable);
diff -urNp linux-3.0.9/drivers/acpi/processor_driver.c linux-3.0.9/drivers/acpi/processor_driver.c
--- linux-3.0.9/drivers/acpi/processor_driver.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/acpi/processor_driver.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/acpi/processor_driver.c 2011-11-15 20:02:59.000000000 -0500
@@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(
return 0;
#endif
@@ -23623,7 +23623,7 @@ diff -urNp linux-3.0.9/drivers/acpi/processor_driver.c linux-3.0.9/drivers/acpi/
* Buggy BIOS check
diff -urNp linux-3.0.9/drivers/ata/libata-core.c linux-3.0.9/drivers/ata/libata-core.c
--- linux-3.0.9/drivers/ata/libata-core.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ata/libata-core.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ata/libata-core.c 2011-11-15 20:02:59.000000000 -0500
@@ -4753,7 +4753,7 @@ void ata_qc_free(struct ata_queued_cmd *
struct ata_port *ap;
unsigned int tag;
@@ -23663,7 +23663,7 @@ diff -urNp linux-3.0.9/drivers/ata/libata-core.c linux-3.0.9/drivers/ata/libata-
diff -urNp linux-3.0.9/drivers/ata/libata-eh.c linux-3.0.9/drivers/ata/libata-eh.c
--- linux-3.0.9/drivers/ata/libata-eh.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ata/libata-eh.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ata/libata-eh.c 2011-11-15 20:02:59.000000000 -0500
@@ -2518,6 +2518,8 @@ void ata_eh_report(struct ata_port *ap)
{
struct ata_link *link;
@@ -23675,7 +23675,7 @@ diff -urNp linux-3.0.9/drivers/ata/libata-eh.c linux-3.0.9/drivers/ata/libata-eh
}
diff -urNp linux-3.0.9/drivers/ata/pata_arasan_cf.c linux-3.0.9/drivers/ata/pata_arasan_cf.c
--- linux-3.0.9/drivers/ata/pata_arasan_cf.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ata/pata_arasan_cf.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ata/pata_arasan_cf.c 2011-11-15 20:02:59.000000000 -0500
@@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(str
/* Handle platform specific quirks */
if (pdata->quirk) {
@@ -23689,7 +23689,7 @@ diff -urNp linux-3.0.9/drivers/ata/pata_arasan_cf.c linux-3.0.9/drivers/ata/pata
if (pdata->quirk & CF_BROKEN_MWDMA)
diff -urNp linux-3.0.9/drivers/atm/adummy.c linux-3.0.9/drivers/atm/adummy.c
--- linux-3.0.9/drivers/atm/adummy.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/adummy.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/adummy.c 2011-11-15 20:02:59.000000000 -0500
@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct
vcc->pop(vcc, skb);
else
@@ -23701,7 +23701,7 @@ diff -urNp linux-3.0.9/drivers/atm/adummy.c linux-3.0.9/drivers/atm/adummy.c
}
diff -urNp linux-3.0.9/drivers/atm/ambassador.c linux-3.0.9/drivers/atm/ambassador.c
--- linux-3.0.9/drivers/atm/ambassador.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/ambassador.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/ambassador.c 2011-11-15 20:02:59.000000000 -0500
@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev,
PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
@@ -23740,7 +23740,7 @@ diff -urNp linux-3.0.9/drivers/atm/ambassador.c linux-3.0.9/drivers/atm/ambassad
diff -urNp linux-3.0.9/drivers/atm/atmtcp.c linux-3.0.9/drivers/atm/atmtcp.c
--- linux-3.0.9/drivers/atm/atmtcp.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/atmtcp.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/atmtcp.c 2011-11-15 20:02:59.000000000 -0500
@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
@@ -23792,7 +23792,7 @@ diff -urNp linux-3.0.9/drivers/atm/atmtcp.c linux-3.0.9/drivers/atm/atmtcp.c
else dev_kfree_skb(skb);
diff -urNp linux-3.0.9/drivers/atm/eni.c linux-3.0.9/drivers/atm/eni.c
--- linux-3.0.9/drivers/atm/eni.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/eni.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/eni.c 2011-11-15 20:02:59.000000000 -0500
@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
vcc->dev->number);
@@ -23849,7 +23849,7 @@ diff -urNp linux-3.0.9/drivers/atm/eni.c linux-3.0.9/drivers/atm/eni.c
"TAXI","09?", "10?", "11?", /* 8-11 */
diff -urNp linux-3.0.9/drivers/atm/firestream.c linux-3.0.9/drivers/atm/firestream.c
--- linux-3.0.9/drivers/atm/firestream.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/firestream.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/firestream.c 2011-11-15 20:02:59.000000000 -0500
@@ -749,7 +749,7 @@ static void process_txdone_queue (struct
}
}
@@ -23885,7 +23885,7 @@ diff -urNp linux-3.0.9/drivers/atm/firestream.c linux-3.0.9/drivers/atm/firestre
printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
diff -urNp linux-3.0.9/drivers/atm/fore200e.c linux-3.0.9/drivers/atm/fore200e.c
--- linux-3.0.9/drivers/atm/fore200e.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/fore200e.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/fore200e.c 2011-11-15 20:02:59.000000000 -0500
@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
#endif
/* check error condition */
@@ -23944,7 +23944,7 @@ diff -urNp linux-3.0.9/drivers/atm/fore200e.c linux-3.0.9/drivers/atm/fore200e.c
DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
diff -urNp linux-3.0.9/drivers/atm/he.c linux-3.0.9/drivers/atm/he.c
--- linux-3.0.9/drivers/atm/he.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/he.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/he.c 2011-11-15 20:02:59.000000000 -0500
@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -24028,7 +24028,7 @@ diff -urNp linux-3.0.9/drivers/atm/he.c linux-3.0.9/drivers/atm/he.c
}
diff -urNp linux-3.0.9/drivers/atm/horizon.c linux-3.0.9/drivers/atm/horizon.c
--- linux-3.0.9/drivers/atm/horizon.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/horizon.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/horizon.c 2011-11-15 20:02:59.000000000 -0500
@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev,
{
struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -24049,7 +24049,7 @@ diff -urNp linux-3.0.9/drivers/atm/horizon.c linux-3.0.9/drivers/atm/horizon.c
hrz_kfree_skb (skb);
diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
--- linux-3.0.9/drivers/atm/idt77252.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/idt77252.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/idt77252.c 2011-11-15 20:02:59.000000000 -0500
@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str
else
dev_kfree_skb(skb);
@@ -24206,7 +24206,7 @@ diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
diff -urNp linux-3.0.9/drivers/atm/iphase.c linux-3.0.9/drivers/atm/iphase.c
--- linux-3.0.9/drivers/atm/iphase.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/iphase.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/iphase.c 2011-11-15 20:02:59.000000000 -0500
@@ -1120,7 +1120,7 @@ static int rx_pkt(struct atm_dev *dev)
status = (u_short) (buf_desc_ptr->desc_mode);
if (status & (RX_CER | RX_PTE | RX_OFL))
@@ -24305,7 +24305,7 @@ diff -urNp linux-3.0.9/drivers/atm/iphase.c linux-3.0.9/drivers/atm/iphase.c
printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
diff -urNp linux-3.0.9/drivers/atm/lanai.c linux-3.0.9/drivers/atm/lanai.c
--- linux-3.0.9/drivers/atm/lanai.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/lanai.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/lanai.c 2011-11-15 20:02:59.000000000 -0500
@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l
vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
lanai_endtx(lanai, lvcc);
@@ -24362,7 +24362,7 @@ diff -urNp linux-3.0.9/drivers/atm/lanai.c linux-3.0.9/drivers/atm/lanai.c
cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
diff -urNp linux-3.0.9/drivers/atm/nicstar.c linux-3.0.9/drivers/atm/nicstar.c
--- linux-3.0.9/drivers/atm/nicstar.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/nicstar.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/nicstar.c 2011-11-15 20:02:59.000000000 -0500
@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc,
if ((vc = (vc_map *) vcc->dev_data) == NULL) {
printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
@@ -24566,7 +24566,7 @@ diff -urNp linux-3.0.9/drivers/atm/nicstar.c linux-3.0.9/drivers/atm/nicstar.c
diff -urNp linux-3.0.9/drivers/atm/solos-pci.c linux-3.0.9/drivers/atm/solos-pci.c
--- linux-3.0.9/drivers/atm/solos-pci.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/solos-pci.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/solos-pci.c 2011-11-15 20:02:59.000000000 -0500
@@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
}
atm_charge(vcc, skb->truesize);
@@ -24596,7 +24596,7 @@ diff -urNp linux-3.0.9/drivers/atm/solos-pci.c linux-3.0.9/drivers/atm/solos-pci
dev_kfree_skb_irq(oldskb);
diff -urNp linux-3.0.9/drivers/atm/suni.c linux-3.0.9/drivers/atm/suni.c
--- linux-3.0.9/drivers/atm/suni.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/suni.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/suni.c 2011-11-15 20:02:59.000000000 -0500
@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
@@ -24610,7 +24610,7 @@ diff -urNp linux-3.0.9/drivers/atm/suni.c linux-3.0.9/drivers/atm/suni.c
static void suni_hz(unsigned long from_timer)
diff -urNp linux-3.0.9/drivers/atm/uPD98402.c linux-3.0.9/drivers/atm/uPD98402.c
--- linux-3.0.9/drivers/atm/uPD98402.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/uPD98402.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/uPD98402.c 2011-11-15 20:02:59.000000000 -0500
@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
struct sonet_stats tmp;
int error = 0;
@@ -24657,7 +24657,7 @@ diff -urNp linux-3.0.9/drivers/atm/uPD98402.c linux-3.0.9/drivers/atm/uPD98402.c
diff -urNp linux-3.0.9/drivers/atm/zatm.c linux-3.0.9/drivers/atm/zatm.c
--- linux-3.0.9/drivers/atm/zatm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/atm/zatm.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/atm/zatm.c 2011-11-15 20:02:59.000000000 -0500
@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
}
if (!size) {
@@ -24687,7 +24687,7 @@ diff -urNp linux-3.0.9/drivers/atm/zatm.c linux-3.0.9/drivers/atm/zatm.c
diff -urNp linux-3.0.9/drivers/base/devtmpfs.c linux-3.0.9/drivers/base/devtmpfs.c
--- linux-3.0.9/drivers/base/devtmpfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/base/devtmpfs.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/base/devtmpfs.c 2011-11-15 20:02:59.000000000 -0500
@@ -357,7 +357,7 @@ int devtmpfs_mount(const char *mntdir)
if (!dev_mnt)
return 0;
@@ -24699,7 +24699,7 @@ diff -urNp linux-3.0.9/drivers/base/devtmpfs.c linux-3.0.9/drivers/base/devtmpfs
else
diff -urNp linux-3.0.9/drivers/base/power/wakeup.c linux-3.0.9/drivers/base/power/wakeup.c
--- linux-3.0.9/drivers/base/power/wakeup.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/base/power/wakeup.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/base/power/wakeup.c 2011-11-15 20:02:59.000000000 -0500
@@ -29,14 +29,14 @@ bool events_check_enabled;
* They need to be modified together atomically, so it's better to use one
* atomic variable to hold them both.
@@ -24737,7 +24737,7 @@ diff -urNp linux-3.0.9/drivers/base/power/wakeup.c linux-3.0.9/drivers/base/powe
/**
diff -urNp linux-3.0.9/drivers/block/cciss.c linux-3.0.9/drivers/block/cciss.c
--- linux-3.0.9/drivers/block/cciss.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/cciss.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/block/cciss.c 2011-11-15 20:02:59.000000000 -0500
@@ -1179,6 +1179,8 @@ static int cciss_ioctl32_passthru(struct
int err;
u32 cp;
@@ -24863,7 +24863,7 @@ diff -urNp linux-3.0.9/drivers/block/cciss.c linux-3.0.9/drivers/block/cciss.c
diff -urNp linux-3.0.9/drivers/block/cciss.h linux-3.0.9/drivers/block/cciss.h
--- linux-3.0.9/drivers/block/cciss.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/cciss.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/block/cciss.h 2011-11-15 20:02:59.000000000 -0500
@@ -100,7 +100,7 @@ struct ctlr_info
/* information about each logical volume */
drive_info_struct *drv[CISS_MAX_LUN];
@@ -24875,7 +24875,7 @@ diff -urNp linux-3.0.9/drivers/block/cciss.h linux-3.0.9/drivers/block/cciss.h
struct list_head reqQ;
diff -urNp linux-3.0.9/drivers/block/cpqarray.c linux-3.0.9/drivers/block/cpqarray.c
--- linux-3.0.9/drivers/block/cpqarray.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/cpqarray.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/block/cpqarray.c 2011-11-15 20:02:59.000000000 -0500
@@ -404,7 +404,7 @@ static int __devinit cpqarray_register_c
if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
goto Enomem4;
@@ -25003,7 +25003,7 @@ diff -urNp linux-3.0.9/drivers/block/cpqarray.c linux-3.0.9/drivers/block/cpqarr
} else
diff -urNp linux-3.0.9/drivers/block/cpqarray.h linux-3.0.9/drivers/block/cpqarray.h
--- linux-3.0.9/drivers/block/cpqarray.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/cpqarray.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/block/cpqarray.h 2011-11-15 20:02:59.000000000 -0500
@@ -99,7 +99,7 @@ struct ctlr_info {
drv_info_t drv[NWD];
struct proc_dir_entry *proc;
@@ -25015,7 +25015,7 @@ diff -urNp linux-3.0.9/drivers/block/cpqarray.h linux-3.0.9/drivers/block/cpqarr
cmdlist_t *cmpQ;
diff -urNp linux-3.0.9/drivers/block/DAC960.c linux-3.0.9/drivers/block/DAC960.c
--- linux-3.0.9/drivers/block/DAC960.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/DAC960.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/block/DAC960.c 2011-11-15 20:02:59.000000000 -0500
@@ -1980,6 +1980,8 @@ static bool DAC960_V1_ReadDeviceConfigur
unsigned long flags;
int Channel, TargetID;
@@ -25027,7 +25027,7 @@ diff -urNp linux-3.0.9/drivers/block/DAC960.c linux-3.0.9/drivers/block/DAC960.c
sizeof(DAC960_SCSI_Inquiry_T) +
diff -urNp linux-3.0.9/drivers/block/drbd/drbd_int.h linux-3.0.9/drivers/block/drbd/drbd_int.h
--- linux-3.0.9/drivers/block/drbd/drbd_int.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/drbd/drbd_int.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/block/drbd/drbd_int.h 2011-11-15 20:02:59.000000000 -0500
@@ -737,7 +737,7 @@ struct drbd_request;
struct drbd_epoch {
struct list_head list;
@@ -25087,7 +25087,7 @@ diff -urNp linux-3.0.9/drivers/block/drbd/drbd_int.h linux-3.0.9/drivers/block/d
void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
diff -urNp linux-3.0.9/drivers/block/drbd/drbd_main.c linux-3.0.9/drivers/block/drbd/drbd_main.c
--- linux-3.0.9/drivers/block/drbd/drbd_main.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/drbd/drbd_main.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/block/drbd/drbd_main.c 2011-11-15 20:02:59.000000000 -0500
@@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_co
p.sector = sector;
p.block_id = block_id;
@@ -25128,7 +25128,7 @@ diff -urNp linux-3.0.9/drivers/block/drbd/drbd_main.c linux-3.0.9/drivers/block/
mdev->read_cnt =
diff -urNp linux-3.0.9/drivers/block/drbd/drbd_nl.c linux-3.0.9/drivers/block/drbd/drbd_nl.c
--- linux-3.0.9/drivers/block/drbd/drbd_nl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/drbd/drbd_nl.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/block/drbd/drbd_nl.c 2011-11-15 20:02:59.000000000 -0500
@@ -2359,7 +2359,7 @@ static void drbd_connector_callback(stru
module_put(THIS_MODULE);
}
@@ -25176,7 +25176,7 @@ diff -urNp linux-3.0.9/drivers/block/drbd/drbd_nl.c linux-3.0.9/drivers/block/dr
(int)((char *)tl - (char *)reply->tag_list);
diff -urNp linux-3.0.9/drivers/block/drbd/drbd_receiver.c linux-3.0.9/drivers/block/drbd/drbd_receiver.c
--- linux-3.0.9/drivers/block/drbd/drbd_receiver.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/drbd/drbd_receiver.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/block/drbd/drbd_receiver.c 2011-11-15 20:02:59.000000000 -0500
@@ -894,7 +894,7 @@ retry:
sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
@@ -25264,7 +25264,7 @@ diff -urNp linux-3.0.9/drivers/block/drbd/drbd_receiver.c linux-3.0.9/drivers/bl
diff -urNp linux-3.0.9/drivers/block/loop.c linux-3.0.9/drivers/block/loop.c
--- linux-3.0.9/drivers/block/loop.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/loop.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/block/loop.c 2011-11-15 20:02:59.000000000 -0500
@@ -283,7 +283,7 @@ static int __do_lo_send_write(struct fil
mm_segment_t old_fs = get_fs();
@@ -25276,7 +25276,7 @@ diff -urNp linux-3.0.9/drivers/block/loop.c linux-3.0.9/drivers/block/loop.c
return 0;
diff -urNp linux-3.0.9/drivers/block/nbd.c linux-3.0.9/drivers/block/nbd.c
--- linux-3.0.9/drivers/block/nbd.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/block/nbd.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/block/nbd.c 2011-11-15 20:02:59.000000000 -0500
@@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device *
struct kvec iov;
sigset_t blocked, oldset;
@@ -25297,7 +25297,7 @@ diff -urNp linux-3.0.9/drivers/block/nbd.c linux-3.0.9/drivers/block/nbd.c
struct request sreq;
diff -urNp linux-3.0.9/drivers/char/agp/frontend.c linux-3.0.9/drivers/char/agp/frontend.c
--- linux-3.0.9/drivers/char/agp/frontend.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/agp/frontend.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/char/agp/frontend.c 2011-11-15 20:02:59.000000000 -0500
@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag
if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
return -EFAULT;
@@ -25309,7 +25309,7 @@ diff -urNp linux-3.0.9/drivers/char/agp/frontend.c linux-3.0.9/drivers/char/agp/
client = agp_find_client_by_pid(reserve.pid);
diff -urNp linux-3.0.9/drivers/char/briq_panel.c linux-3.0.9/drivers/char/briq_panel.c
--- linux-3.0.9/drivers/char/briq_panel.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/briq_panel.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/char/briq_panel.c 2011-11-15 20:02:59.000000000 -0500
@@ -9,6 +9,7 @@
#include <linux/types.h>
#include <linux/errno.h>
@@ -25353,7 +25353,7 @@ diff -urNp linux-3.0.9/drivers/char/briq_panel.c linux-3.0.9/drivers/char/briq_p
}
diff -urNp linux-3.0.9/drivers/char/genrtc.c linux-3.0.9/drivers/char/genrtc.c
--- linux-3.0.9/drivers/char/genrtc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/genrtc.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/char/genrtc.c 2011-11-15 20:02:59.000000000 -0500
@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi
switch (cmd) {
@@ -25364,7 +25364,7 @@ diff -urNp linux-3.0.9/drivers/char/genrtc.c linux-3.0.9/drivers/char/genrtc.c
else
diff -urNp linux-3.0.9/drivers/char/hpet.c linux-3.0.9/drivers/char/hpet.c
--- linux-3.0.9/drivers/char/hpet.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/hpet.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/char/hpet.c 2011-11-15 20:02:59.000000000 -0500
@@ -572,7 +572,7 @@ static inline unsigned long hpet_time_di
}
@@ -25376,7 +25376,7 @@ diff -urNp linux-3.0.9/drivers/char/hpet.c linux-3.0.9/drivers/char/hpet.c
struct hpet_timer __iomem *timer;
diff -urNp linux-3.0.9/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.9/drivers/char/ipmi/ipmi_msghandler.c
--- linux-3.0.9/drivers/char/ipmi/ipmi_msghandler.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/ipmi/ipmi_msghandler.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/char/ipmi/ipmi_msghandler.c 2011-11-15 20:02:59.000000000 -0500
@@ -415,7 +415,7 @@ struct ipmi_smi {
struct proc_dir_entry *proc_dir;
char proc_dir_name[10];
@@ -25418,7 +25418,7 @@ diff -urNp linux-3.0.9/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.9/drivers/c
si->channel = IPMI_BMC_CHANNEL;
diff -urNp linux-3.0.9/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.9/drivers/char/ipmi/ipmi_si_intf.c
--- linux-3.0.9/drivers/char/ipmi/ipmi_si_intf.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/ipmi/ipmi_si_intf.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/char/ipmi/ipmi_si_intf.c 2011-11-15 20:02:59.000000000 -0500
@@ -277,7 +277,7 @@ struct smi_info {
unsigned char slave_addr;
@@ -25451,7 +25451,7 @@ diff -urNp linux-3.0.9/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.9/drivers/char
atomic_set(&new_smi->stop_operation, 0);
diff -urNp linux-3.0.9/drivers/char/Kconfig linux-3.0.9/drivers/char/Kconfig
--- linux-3.0.9/drivers/char/Kconfig 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/Kconfig 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/char/Kconfig 2011-11-15 20:02:59.000000000 -0500
@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
config DEVKMEM
@@ -25472,7 +25472,7 @@ diff -urNp linux-3.0.9/drivers/char/Kconfig linux-3.0.9/drivers/char/Kconfig
source "drivers/s390/char/Kconfig"
diff -urNp linux-3.0.9/drivers/char/mbcs.c linux-3.0.9/drivers/char/mbcs.c
--- linux-3.0.9/drivers/char/mbcs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/mbcs.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/char/mbcs.c 2011-11-15 20:02:59.000000000 -0500
@@ -800,7 +800,7 @@ static int mbcs_remove(struct cx_dev *de
return 0;
}
@@ -25484,7 +25484,7 @@ diff -urNp linux-3.0.9/drivers/char/mbcs.c linux-3.0.9/drivers/char/mbcs.c
.mfg_num = MBCS_MFG_NUM,
diff -urNp linux-3.0.9/drivers/char/mem.c linux-3.0.9/drivers/char/mem.c
--- linux-3.0.9/drivers/char/mem.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/mem.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/char/mem.c 2011-11-15 20:02:59.000000000 -0500
@@ -18,6 +18,7 @@
#include <linux/raw.h>
#include <linux/tty.h>
@@ -25619,7 +25619,7 @@ diff -urNp linux-3.0.9/drivers/char/mem.c linux-3.0.9/drivers/char/mem.c
static int memory_open(struct inode *inode, struct file *filp)
diff -urNp linux-3.0.9/drivers/char/nvram.c linux-3.0.9/drivers/char/nvram.c
--- linux-3.0.9/drivers/char/nvram.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/nvram.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/char/nvram.c 2011-11-15 20:02:59.000000000 -0500
@@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f
spin_unlock_irq(&rtc_lock);
@@ -25631,7 +25631,7 @@ diff -urNp linux-3.0.9/drivers/char/nvram.c linux-3.0.9/drivers/char/nvram.c
*ppos = i;
diff -urNp linux-3.0.9/drivers/char/random.c linux-3.0.9/drivers/char/random.c
--- linux-3.0.9/drivers/char/random.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/random.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/char/random.c 2011-11-15 20:02:59.000000000 -0500
@@ -261,8 +261,13 @@
/*
* Configuration information
@@ -25684,7 +25684,7 @@ diff -urNp linux-3.0.9/drivers/char/random.c linux-3.0.9/drivers/char/random.c
diff -urNp linux-3.0.9/drivers/char/sonypi.c linux-3.0.9/drivers/char/sonypi.c
--- linux-3.0.9/drivers/char/sonypi.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/sonypi.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/char/sonypi.c 2011-11-15 20:02:59.000000000 -0500
@@ -55,6 +55,7 @@
#include <asm/uaccess.h>
#include <asm/io.h>
@@ -25725,7 +25725,7 @@ diff -urNp linux-3.0.9/drivers/char/sonypi.c linux-3.0.9/drivers/char/sonypi.c
return 0;
diff -urNp linux-3.0.9/drivers/char/tpm/tpm_bios.c linux-3.0.9/drivers/char/tpm/tpm_bios.c
--- linux-3.0.9/drivers/char/tpm/tpm_bios.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/tpm/tpm_bios.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/char/tpm/tpm_bios.c 2011-11-15 20:02:59.000000000 -0500
@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
event = addr;
@@ -25771,7 +25771,7 @@ diff -urNp linux-3.0.9/drivers/char/tpm/tpm_bios.c linux-3.0.9/drivers/char/tpm/
return 0;
diff -urNp linux-3.0.9/drivers/char/tpm/tpm.c linux-3.0.9/drivers/char/tpm/tpm.c
--- linux-3.0.9/drivers/char/tpm/tpm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/tpm/tpm.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/char/tpm/tpm.c 2011-11-15 20:02:59.000000000 -0500
@@ -414,7 +414,7 @@ static ssize_t tpm_transmit(struct tpm_c
chip->vendor.req_complete_val)
goto out_recv;
@@ -25792,7 +25792,7 @@ diff -urNp linux-3.0.9/drivers/char/tpm/tpm.c linux-3.0.9/drivers/char/tpm/tpm.c
"attempting to read the PUBEK");
diff -urNp linux-3.0.9/drivers/char/virtio_console.c linux-3.0.9/drivers/char/virtio_console.c
--- linux-3.0.9/drivers/char/virtio_console.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/char/virtio_console.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/char/virtio_console.c 2011-11-15 20:02:59.000000000 -0500
@@ -555,7 +555,7 @@ static ssize_t fill_readbuf(struct port
if (to_user) {
ssize_t ret;
@@ -25813,7 +25813,7 @@ diff -urNp linux-3.0.9/drivers/char/virtio_console.c linux-3.0.9/drivers/char/vi
static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
diff -urNp linux-3.0.9/drivers/crypto/hifn_795x.c linux-3.0.9/drivers/crypto/hifn_795x.c
--- linux-3.0.9/drivers/crypto/hifn_795x.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/crypto/hifn_795x.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/crypto/hifn_795x.c 2011-11-15 20:02:59.000000000 -0500
@@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device
0xCA, 0x34, 0x2B, 0x2E};
struct scatterlist sg;
@@ -25825,7 +25825,7 @@ diff -urNp linux-3.0.9/drivers/crypto/hifn_795x.c linux-3.0.9/drivers/crypto/hif
diff -urNp linux-3.0.9/drivers/crypto/padlock-aes.c linux-3.0.9/drivers/crypto/padlock-aes.c
--- linux-3.0.9/drivers/crypto/padlock-aes.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/crypto/padlock-aes.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/crypto/padlock-aes.c 2011-11-15 20:02:59.000000000 -0500
@@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm
struct crypto_aes_ctx gen_aes;
int cpu;
@@ -25837,7 +25837,7 @@ diff -urNp linux-3.0.9/drivers/crypto/padlock-aes.c linux-3.0.9/drivers/crypto/p
return -EINVAL;
diff -urNp linux-3.0.9/drivers/dma/ioat/dma_v3.c linux-3.0.9/drivers/dma/ioat/dma_v3.c
--- linux-3.0.9/drivers/dma/ioat/dma_v3.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/dma/ioat/dma_v3.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/dma/ioat/dma_v3.c 2011-11-15 20:02:59.000000000 -0500
@@ -73,10 +73,10 @@
/* provide a lookup table for setting the source address in the base or
* extended descriptor of an xor or pq descriptor
@@ -25855,7 +25855,7 @@ diff -urNp linux-3.0.9/drivers/dma/ioat/dma_v3.c linux-3.0.9/drivers/dma/ioat/dm
{
diff -urNp linux-3.0.9/drivers/edac/amd64_edac.c linux-3.0.9/drivers/edac/amd64_edac.c
--- linux-3.0.9/drivers/edac/amd64_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/amd64_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/amd64_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -2670,7 +2670,7 @@ static void __devexit amd64_remove_one_i
* PCI core identifies what devices are on a system during boot, and then
* inquiry this table to see if this driver is for a given device found.
@@ -25867,7 +25867,7 @@ diff -urNp linux-3.0.9/drivers/edac/amd64_edac.c linux-3.0.9/drivers/edac/amd64_
.device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
diff -urNp linux-3.0.9/drivers/edac/amd76x_edac.c linux-3.0.9/drivers/edac/amd76x_edac.c
--- linux-3.0.9/drivers/edac/amd76x_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/amd76x_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/amd76x_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one(
edac_mc_free(mci);
}
@@ -25879,7 +25879,7 @@ diff -urNp linux-3.0.9/drivers/edac/amd76x_edac.c linux-3.0.9/drivers/edac/amd76
AMD762},
diff -urNp linux-3.0.9/drivers/edac/e752x_edac.c linux-3.0.9/drivers/edac/e752x_edac.c
--- linux-3.0.9/drivers/edac/e752x_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/e752x_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/e752x_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(s
edac_mc_free(mci);
}
@@ -25891,7 +25891,7 @@ diff -urNp linux-3.0.9/drivers/edac/e752x_edac.c linux-3.0.9/drivers/edac/e752x_
E7520},
diff -urNp linux-3.0.9/drivers/edac/e7xxx_edac.c linux-3.0.9/drivers/edac/e7xxx_edac.c
--- linux-3.0.9/drivers/edac/e7xxx_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/e7xxx_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/e7xxx_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(s
edac_mc_free(mci);
}
@@ -25903,7 +25903,7 @@ diff -urNp linux-3.0.9/drivers/edac/e7xxx_edac.c linux-3.0.9/drivers/edac/e7xxx_
E7205},
diff -urNp linux-3.0.9/drivers/edac/edac_pci_sysfs.c linux-3.0.9/drivers/edac/edac_pci_sysfs.c
--- linux-3.0.9/drivers/edac/edac_pci_sysfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/edac_pci_sysfs.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/edac_pci_sysfs.c 2011-11-15 20:02:59.000000000 -0500
@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log
static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
static int edac_pci_poll_msec = 1000; /* one second workq period */
@@ -25989,7 +25989,7 @@ diff -urNp linux-3.0.9/drivers/edac/edac_pci_sysfs.c linux-3.0.9/drivers/edac/ed
}
diff -urNp linux-3.0.9/drivers/edac/i3000_edac.c linux-3.0.9/drivers/edac/i3000_edac.c
--- linux-3.0.9/drivers/edac/i3000_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i3000_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/i3000_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(s
edac_mc_free(mci);
}
@@ -26001,7 +26001,7 @@ diff -urNp linux-3.0.9/drivers/edac/i3000_edac.c linux-3.0.9/drivers/edac/i3000_
I3000},
diff -urNp linux-3.0.9/drivers/edac/i3200_edac.c linux-3.0.9/drivers/edac/i3200_edac.c
--- linux-3.0.9/drivers/edac/i3200_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i3200_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/i3200_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -456,7 +456,7 @@ static void __devexit i3200_remove_one(s
edac_mc_free(mci);
}
@@ -26013,7 +26013,7 @@ diff -urNp linux-3.0.9/drivers/edac/i3200_edac.c linux-3.0.9/drivers/edac/i3200_
I3200},
diff -urNp linux-3.0.9/drivers/edac/i5000_edac.c linux-3.0.9/drivers/edac/i5000_edac.c
--- linux-3.0.9/drivers/edac/i5000_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i5000_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/i5000_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(s
*
* The "E500P" device is the first device supported.
@@ -26025,7 +26025,7 @@ diff -urNp linux-3.0.9/drivers/edac/i5000_edac.c linux-3.0.9/drivers/edac/i5000_
diff -urNp linux-3.0.9/drivers/edac/i5100_edac.c linux-3.0.9/drivers/edac/i5100_edac.c
--- linux-3.0.9/drivers/edac/i5100_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i5100_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/i5100_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(s
edac_mc_free(mci);
}
@@ -26037,7 +26037,7 @@ diff -urNp linux-3.0.9/drivers/edac/i5100_edac.c linux-3.0.9/drivers/edac/i5100_
{ 0, }
diff -urNp linux-3.0.9/drivers/edac/i5400_edac.c linux-3.0.9/drivers/edac/i5400_edac.c
--- linux-3.0.9/drivers/edac/i5400_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i5400_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/i5400_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(s
*
* The "E500P" device is the first device supported.
@@ -26049,7 +26049,7 @@ diff -urNp linux-3.0.9/drivers/edac/i5400_edac.c linux-3.0.9/drivers/edac/i5400_
};
diff -urNp linux-3.0.9/drivers/edac/i7300_edac.c linux-3.0.9/drivers/edac/i7300_edac.c
--- linux-3.0.9/drivers/edac/i7300_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i7300_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/i7300_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -1191,7 +1191,7 @@ static void __devexit i7300_remove_one(s
*
* Has only 8086:360c PCI ID
@@ -26061,7 +26061,7 @@ diff -urNp linux-3.0.9/drivers/edac/i7300_edac.c linux-3.0.9/drivers/edac/i7300_
};
diff -urNp linux-3.0.9/drivers/edac/i7core_edac.c linux-3.0.9/drivers/edac/i7core_edac.c
--- linux-3.0.9/drivers/edac/i7core_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i7core_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/i7core_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -359,7 +359,7 @@ static const struct pci_id_table pci_dev
/*
* pci_device_id table for which devices we are looking for
@@ -26073,7 +26073,7 @@ diff -urNp linux-3.0.9/drivers/edac/i7core_edac.c linux-3.0.9/drivers/edac/i7cor
{0,} /* 0 terminated list. */
diff -urNp linux-3.0.9/drivers/edac/i82443bxgx_edac.c linux-3.0.9/drivers/edac/i82443bxgx_edac.c
--- linux-3.0.9/drivers/edac/i82443bxgx_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i82443bxgx_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/i82443bxgx_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_
EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
@@ -26085,7 +26085,7 @@ diff -urNp linux-3.0.9/drivers/edac/i82443bxgx_edac.c linux-3.0.9/drivers/edac/i
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
diff -urNp linux-3.0.9/drivers/edac/i82860_edac.c linux-3.0.9/drivers/edac/i82860_edac.c
--- linux-3.0.9/drivers/edac/i82860_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i82860_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/i82860_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -270,7 +270,7 @@ static void __devexit i82860_remove_one(
edac_mc_free(mci);
}
@@ -26097,7 +26097,7 @@ diff -urNp linux-3.0.9/drivers/edac/i82860_edac.c linux-3.0.9/drivers/edac/i8286
I82860},
diff -urNp linux-3.0.9/drivers/edac/i82875p_edac.c linux-3.0.9/drivers/edac/i82875p_edac.c
--- linux-3.0.9/drivers/edac/i82875p_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i82875p_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/i82875p_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one
edac_mc_free(mci);
}
@@ -26109,7 +26109,7 @@ diff -urNp linux-3.0.9/drivers/edac/i82875p_edac.c linux-3.0.9/drivers/edac/i828
I82875P},
diff -urNp linux-3.0.9/drivers/edac/i82975x_edac.c linux-3.0.9/drivers/edac/i82975x_edac.c
--- linux-3.0.9/drivers/edac/i82975x_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/i82975x_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/i82975x_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -604,7 +604,7 @@ static void __devexit i82975x_remove_one
edac_mc_free(mci);
}
@@ -26121,7 +26121,7 @@ diff -urNp linux-3.0.9/drivers/edac/i82975x_edac.c linux-3.0.9/drivers/edac/i829
I82975X
diff -urNp linux-3.0.9/drivers/edac/mce_amd.h linux-3.0.9/drivers/edac/mce_amd.h
--- linux-3.0.9/drivers/edac/mce_amd.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/mce_amd.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/mce_amd.h 2011-11-15 20:02:59.000000000 -0500
@@ -83,7 +83,7 @@ struct amd_decoder_ops {
bool (*dc_mce)(u16, u8);
bool (*ic_mce)(u16, u8);
@@ -26133,7 +26133,7 @@ diff -urNp linux-3.0.9/drivers/edac/mce_amd.h linux-3.0.9/drivers/edac/mce_amd.h
void amd_register_ecc_decoder(void (*f)(int, struct mce *, u32));
diff -urNp linux-3.0.9/drivers/edac/r82600_edac.c linux-3.0.9/drivers/edac/r82600_edac.c
--- linux-3.0.9/drivers/edac/r82600_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/r82600_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/r82600_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -373,7 +373,7 @@ static void __devexit r82600_remove_one(
edac_mc_free(mci);
}
@@ -26145,7 +26145,7 @@ diff -urNp linux-3.0.9/drivers/edac/r82600_edac.c linux-3.0.9/drivers/edac/r8260
},
diff -urNp linux-3.0.9/drivers/edac/x38_edac.c linux-3.0.9/drivers/edac/x38_edac.c
--- linux-3.0.9/drivers/edac/x38_edac.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/edac/x38_edac.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/edac/x38_edac.c 2011-11-15 20:02:59.000000000 -0500
@@ -440,7 +440,7 @@ static void __devexit x38_remove_one(str
edac_mc_free(mci);
}
@@ -26157,7 +26157,7 @@ diff -urNp linux-3.0.9/drivers/edac/x38_edac.c linux-3.0.9/drivers/edac/x38_edac
X38},
diff -urNp linux-3.0.9/drivers/firewire/core-card.c linux-3.0.9/drivers/firewire/core-card.c
--- linux-3.0.9/drivers/firewire/core-card.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/firewire/core-card.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/firewire/core-card.c 2011-11-15 20:02:59.000000000 -0500
@@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
void fw_core_remove_card(struct fw_card *card)
@@ -26169,7 +26169,7 @@ diff -urNp linux-3.0.9/drivers/firewire/core-card.c linux-3.0.9/drivers/firewire
PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
diff -urNp linux-3.0.9/drivers/firewire/core-cdev.c linux-3.0.9/drivers/firewire/core-cdev.c
--- linux-3.0.9/drivers/firewire/core-cdev.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/firewire/core-cdev.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/firewire/core-cdev.c 2011-11-15 20:02:59.000000000 -0500
@@ -1313,8 +1313,7 @@ static int init_iso_resource(struct clie
int ret;
@@ -26182,7 +26182,7 @@ diff -urNp linux-3.0.9/drivers/firewire/core-cdev.c linux-3.0.9/drivers/firewire
r = kmalloc(sizeof(*r), GFP_KERNEL);
diff -urNp linux-3.0.9/drivers/firewire/core.h linux-3.0.9/drivers/firewire/core.h
--- linux-3.0.9/drivers/firewire/core.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/firewire/core.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/firewire/core.h 2011-11-15 20:02:59.000000000 -0500
@@ -101,6 +101,7 @@ struct fw_card_driver {
int (*stop_iso)(struct fw_iso_context *ctx);
@@ -26193,7 +26193,7 @@ diff -urNp linux-3.0.9/drivers/firewire/core.h linux-3.0.9/drivers/firewire/core
const struct fw_card_driver *driver, struct device *device);
diff -urNp linux-3.0.9/drivers/firewire/core-transaction.c linux-3.0.9/drivers/firewire/core-transaction.c
--- linux-3.0.9/drivers/firewire/core-transaction.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/firewire/core-transaction.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/firewire/core-transaction.c 2011-11-15 20:02:59.000000000 -0500
@@ -37,6 +37,7 @@
#include <linux/timer.h>
#include <linux/types.h>
@@ -26213,7 +26213,7 @@ diff -urNp linux-3.0.9/drivers/firewire/core-transaction.c linux-3.0.9/drivers/f
d.payload = payload;
diff -urNp linux-3.0.9/drivers/firmware/dmi_scan.c linux-3.0.9/drivers/firmware/dmi_scan.c
--- linux-3.0.9/drivers/firmware/dmi_scan.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/firmware/dmi_scan.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/firmware/dmi_scan.c 2011-11-15 20:02:59.000000000 -0500
@@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
}
}
@@ -26237,7 +26237,7 @@ diff -urNp linux-3.0.9/drivers/firmware/dmi_scan.c linux-3.0.9/drivers/firmware/
return 0;
diff -urNp linux-3.0.9/drivers/gpio/vr41xx_giu.c linux-3.0.9/drivers/gpio/vr41xx_giu.c
--- linux-3.0.9/drivers/gpio/vr41xx_giu.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpio/vr41xx_giu.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpio/vr41xx_giu.c 2011-11-15 20:02:59.000000000 -0500
@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
maskl, pendl, maskh, pendh);
@@ -26249,7 +26249,7 @@ diff -urNp linux-3.0.9/drivers/gpio/vr41xx_giu.c linux-3.0.9/drivers/gpio/vr41xx
}
diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc.c linux-3.0.9/drivers/gpu/drm/drm_crtc.c
--- linux-3.0.9/drivers/gpu/drm/drm_crtc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_crtc.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/drm_crtc.c 2011-11-15 20:02:59.000000000 -0500
@@ -1372,7 +1372,7 @@ int drm_mode_getconnector(struct drm_dev
*/
if ((out_resp->count_modes >= mode_count) && mode_count) {
@@ -26344,7 +26344,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc.c linux-3.0.9/drivers/gpu/drm/dr
goto done;
diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.9/drivers/gpu/drm/drm_crtc_helper.c
--- linux-3.0.9/drivers/gpu/drm/drm_crtc_helper.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_crtc_helper.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/drm_crtc_helper.c 2011-11-15 20:02:59.000000000 -0500
@@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
struct drm_crtc *tmp;
int crtc_mask = 1;
@@ -26365,7 +26365,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.9/drivers/gpu
return true;
diff -urNp linux-3.0.9/drivers/gpu/drm/drm_drv.c linux-3.0.9/drivers/gpu/drm/drm_drv.c
--- linux-3.0.9/drivers/gpu/drm/drm_drv.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_drv.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/drm_drv.c 2011-11-15 20:02:59.000000000 -0500
@@ -307,7 +307,7 @@ module_exit(drm_core_exit);
/**
* Copy and IOCTL return string to user space
@@ -26386,7 +26386,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_drv.c linux-3.0.9/drivers/gpu/drm/drm
DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
diff -urNp linux-3.0.9/drivers/gpu/drm/drm_fops.c linux-3.0.9/drivers/gpu/drm/drm_fops.c
--- linux-3.0.9/drivers/gpu/drm/drm_fops.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_fops.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/drm_fops.c 2011-11-15 20:02:59.000000000 -0500
@@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
}
@@ -26438,7 +26438,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_fops.c linux-3.0.9/drivers/gpu/drm/dr
atomic_read(&dev->ioctl_count));
diff -urNp linux-3.0.9/drivers/gpu/drm/drm_global.c linux-3.0.9/drivers/gpu/drm/drm_global.c
--- linux-3.0.9/drivers/gpu/drm/drm_global.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_global.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/drm_global.c 2011-11-15 20:02:59.000000000 -0500
@@ -36,7 +36,7 @@
struct drm_global_item {
struct mutex mutex;
@@ -26498,7 +26498,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_global.c linux-3.0.9/drivers/gpu/drm/
}
diff -urNp linux-3.0.9/drivers/gpu/drm/drm_info.c linux-3.0.9/drivers/gpu/drm/drm_info.c
--- linux-3.0.9/drivers/gpu/drm/drm_info.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_info.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/drm_info.c 2011-11-15 20:02:59.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;
@@ -26541,7 +26541,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_info.c linux-3.0.9/drivers/gpu/drm/dr
pgprot = pgprot_val(vma->vm_page_prot);
diff -urNp linux-3.0.9/drivers/gpu/drm/drm_ioc32.c linux-3.0.9/drivers/gpu/drm/drm_ioc32.c
--- linux-3.0.9/drivers/gpu/drm/drm_ioc32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_ioc32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/drm_ioc32.c 2011-11-15 20:02:59.000000000 -0500
@@ -455,7 +455,7 @@ static int compat_drm_infobufs(struct fi
request = compat_alloc_user_space(nbytes);
if (!access_ok(VERIFY_WRITE, request, nbytes))
@@ -26562,7 +26562,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_ioc32.c linux-3.0.9/drivers/gpu/drm/d
|| __put_user(list, &request->list))
diff -urNp linux-3.0.9/drivers/gpu/drm/drm_ioctl.c linux-3.0.9/drivers/gpu/drm/drm_ioctl.c
--- linux-3.0.9/drivers/gpu/drm/drm_ioctl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_ioctl.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/drm_ioctl.c 2011-11-15 20:02:59.000000000 -0500
@@ -256,7 +256,7 @@ int drm_getstats(struct drm_device *dev,
stats->data[i].value =
(file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -26574,7 +26574,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_ioctl.c linux-3.0.9/drivers/gpu/drm/d
diff -urNp linux-3.0.9/drivers/gpu/drm/drm_lock.c linux-3.0.9/drivers/gpu/drm/drm_lock.c
--- linux-3.0.9/drivers/gpu/drm/drm_lock.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_lock.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/drm_lock.c 2011-11-15 20:02:59.000000000 -0500
@@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi
if (drm_lock_take(&master->lock, lock->context)) {
master->lock.file_priv = file_priv;
@@ -26595,7 +26595,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_lock.c linux-3.0.9/drivers/gpu/drm/dr
/* FIXME: Should really bail out here. */
diff -urNp linux-3.0.9/drivers/gpu/drm/i810/i810_dma.c linux-3.0.9/drivers/gpu/drm/i810/i810_dma.c
--- linux-3.0.9/drivers/gpu/drm/i810/i810_dma.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i810/i810_dma.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/i810/i810_dma.c 2011-11-15 20:02:59.000000000 -0500
@@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_de
dma->buflist[vertex->idx],
vertex->discard, vertex->used);
@@ -26620,7 +26620,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i810/i810_dma.c linux-3.0.9/drivers/gpu/d
diff -urNp linux-3.0.9/drivers/gpu/drm/i810/i810_drv.h linux-3.0.9/drivers/gpu/drm/i810/i810_drv.h
--- linux-3.0.9/drivers/gpu/drm/i810/i810_drv.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i810/i810_drv.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/i810/i810_drv.h 2011-11-15 20:02:59.000000000 -0500
@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
int page_flipping;
@@ -26634,7 +26634,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i810/i810_drv.h linux-3.0.9/drivers/gpu/d
} drm_i810_private_t;
diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c
--- linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-15 20:02:59.000000000 -0500
@@ -497,7 +497,7 @@ static int i915_interrupt_info(struct se
I915_READ(GTIMR));
}
@@ -26655,7 +26655,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.9/drivers/g
diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_dma.c linux-3.0.9/drivers/gpu/drm/i915/i915_dma.c
--- linux-3.0.9/drivers/gpu/drm/i915/i915_dma.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i915/i915_dma.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/i915/i915_dma.c 2011-11-15 20:02:59.000000000 -0500
@@ -1169,7 +1169,7 @@ static bool i915_switcheroo_can_switch(s
bool can_switch;
@@ -26667,7 +26667,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_dma.c linux-3.0.9/drivers/gpu/d
}
diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h
--- linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h 2011-11-15 20:02:59.000000000 -0500
@@ -219,7 +219,7 @@ struct drm_i915_display_funcs {
/* render clock increase/decrease */
/* display clock increase/decrease */
@@ -26706,7 +26706,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h linux-3.0.9/drivers/gpu/d
}
diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.9/drivers/gpu/drm/i915/i915_gem_execbuffer.c
--- linux-3.0.9/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-11-15 20:02:59.000000000 -0500
@@ -188,7 +188,7 @@ i915_gem_object_set_to_gpu_domain(struct
i915_gem_clflush_object(obj);
@@ -26718,7 +26718,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.9/dr
* pending_write_domain after we emit the accumulated flush for all
diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c
--- linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c 2011-11-15 20:02:59.000000000 -0500
@@ -473,7 +473,7 @@ static irqreturn_t ivybridge_irq_handler
u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
struct drm_i915_master_private *master_priv;
@@ -26766,7 +26766,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c linux-3.0.9/drivers/gpu/d
INIT_WORK(&dev_priv->error_work, i915_error_work_func);
diff -urNp linux-3.0.9/drivers/gpu/drm/i915/intel_display.c linux-3.0.9/drivers/gpu/drm/i915/intel_display.c
--- linux-3.0.9/drivers/gpu/drm/i915/intel_display.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/i915/intel_display.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/i915/intel_display.c 2011-11-15 20:02:59.000000000 -0500
@@ -1961,7 +1961,7 @@ intel_pipe_set_base(struct drm_crtc *crt
wait_event(dev_priv->pending_flip_queue,
@@ -26814,7 +26814,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/i915/intel_display.c linux-3.0.9/drivers/
drm_gem_object_unreference(&obj->base);
diff -urNp linux-3.0.9/drivers/gpu/drm/mga/mga_drv.h linux-3.0.9/drivers/gpu/drm/mga/mga_drv.h
--- linux-3.0.9/drivers/gpu/drm/mga/mga_drv.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/mga/mga_drv.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/mga/mga_drv.h 2011-11-15 20:02:59.000000000 -0500
@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
u32 clear_cmd;
u32 maccess;
@@ -26829,7 +26829,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/mga/mga_drv.h linux-3.0.9/drivers/gpu/drm
unsigned int fb_cpp;
diff -urNp linux-3.0.9/drivers/gpu/drm/mga/mga_irq.c linux-3.0.9/drivers/gpu/drm/mga/mga_irq.c
--- linux-3.0.9/drivers/gpu/drm/mga/mga_irq.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/mga/mga_irq.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/mga/mga_irq.c 2011-11-15 20:02:59.000000000 -0500
@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de
if (crtc != 0)
return 0;
@@ -26868,7 +26868,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/mga/mga_irq.c linux-3.0.9/drivers/gpu/drm
*sequence = cur_fence;
diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c
--- linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-11-15 20:02:59.000000000 -0500
@@ -200,7 +200,7 @@ struct methods {
const char desc[8];
void (*loadbios)(struct drm_device *, uint8_t *);
@@ -26889,7 +26889,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.9/driver
diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h
--- linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-11-15 20:02:59.000000000 -0500
@@ -227,7 +227,7 @@ struct nouveau_channel {
struct list_head pending;
uint32_t sequence;
@@ -26944,7 +26944,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.9/drivers
struct {
diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c
--- linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-11-15 20:02:59.000000000 -0500
@@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_chan
if (USE_REFCNT(dev))
sequence = nvchan_rd32(chan, 0x48);
@@ -26965,7 +26965,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.9/drive
diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_gem.c
--- linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-11-15 20:02:59.000000000 -0500
@@ -249,7 +249,7 @@ validate_init(struct nouveau_channel *ch
int trycnt = 0;
int ret, i;
@@ -26977,7 +26977,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.9/drivers
NV_ERROR(dev, "%s failed and gave up.\n", __func__);
diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_state.c
--- linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_state.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_state.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_state.c 2011-11-15 20:02:59.000000000 -0500
@@ -488,7 +488,7 @@ static bool nouveau_switcheroo_can_switc
bool can_switch;
@@ -26989,7 +26989,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.9/drive
}
diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.9/drivers/gpu/drm/nouveau/nv04_graph.c
--- linux-3.0.9/drivers/gpu/drm/nouveau/nv04_graph.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/nouveau/nv04_graph.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/nouveau/nv04_graph.c 2011-11-15 20:02:59.000000000 -0500
@@ -560,7 +560,7 @@ static int
nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
u32 class, u32 mthd, u32 data)
@@ -27001,7 +27001,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.9/drivers/
diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_cce.c linux-3.0.9/drivers/gpu/drm/r128/r128_cce.c
--- linux-3.0.9/drivers/gpu/drm/r128/r128_cce.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/r128/r128_cce.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/r128/r128_cce.c 2011-11-15 20:02:59.000000000 -0500
@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d
/* GH: Simple idle check.
@@ -27013,7 +27013,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_cce.c linux-3.0.9/drivers/gpu/d
* but the ring can be in either AGP or PCI space for the ring
diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_drv.h linux-3.0.9/drivers/gpu/drm/r128/r128_drv.h
--- linux-3.0.9/drivers/gpu/drm/r128/r128_drv.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/r128/r128_drv.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/r128/r128_drv.h 2011-11-15 20:02:59.000000000 -0500
@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
int is_pci;
unsigned long cce_buffers_offset;
@@ -27033,7 +27033,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_drv.h linux-3.0.9/drivers/gpu/d
unsigned int front_offset;
diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_irq.c linux-3.0.9/drivers/gpu/drm/r128/r128_irq.c
--- linux-3.0.9/drivers/gpu/drm/r128/r128_irq.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/r128/r128_irq.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/r128/r128_irq.c 2011-11-15 20:02:59.000000000 -0500
@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d
if (crtc != 0)
return 0;
@@ -27054,7 +27054,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_irq.c linux-3.0.9/drivers/gpu/d
}
diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_state.c linux-3.0.9/drivers/gpu/drm/r128/r128_state.c
--- linux-3.0.9/drivers/gpu/drm/r128/r128_state.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/r128/r128_state.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/r128/r128_state.c 2011-11-15 20:02:59.000000000 -0500
@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv
static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
@@ -27070,7 +27070,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_state.c linux-3.0.9/drivers/gpu
#endif
diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/atom.c linux-3.0.9/drivers/gpu/drm/radeon/atom.c
--- linux-3.0.9/drivers/gpu/drm/radeon/atom.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/atom.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/radeon/atom.c 2011-11-15 20:02:59.000000000 -0500
@@ -1254,6 +1254,8 @@ struct atom_context *atom_parse(struct c
char name[512];
int i;
@@ -27082,7 +27082,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/atom.c linux-3.0.9/drivers/gpu/drm
diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.9/drivers/gpu/drm/radeon/mkregtable.c
--- linux-3.0.9/drivers/gpu/drm/radeon/mkregtable.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/mkregtable.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/radeon/mkregtable.c 2011-11-15 20:02:59.000000000 -0500
@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
regex_t mask_rex;
regmatch_t match[4];
@@ -27102,7 +27102,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.9/drivers/g
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_atombios.c
--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-15 20:02:59.000000000 -0500
@@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from
struct radeon_gpio_rec gpio;
struct radeon_hpd hpd;
@@ -27114,7 +27114,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.9/driv
diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_device.c
--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_device.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_device.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_device.c 2011-11-15 20:02:59.000000000 -0500
@@ -678,7 +678,7 @@ static bool radeon_switcheroo_can_switch
bool can_switch;
@@ -27126,7 +27126,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.9/driver
}
diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_display.c
--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_display.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_display.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_display.c 2011-11-15 20:02:59.000000000 -0500
@@ -946,6 +946,8 @@ void radeon_compute_pll_legacy(struct ra
uint32_t post_div;
u32 pll_out_min, pll_out_max;
@@ -27138,7 +27138,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.9/drive
diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.9/drivers/gpu/drm/radeon/radeon_drv.h
--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-15 20:02:59.000000000 -0500
@@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
/* SW interrupt */
@@ -27150,7 +27150,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.9/drivers/g
uint32_t r500_disp_irq_reg;
diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_fence.c
--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-15 20:02:59.000000000 -0500
@@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_devi
write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
return 0;
@@ -27171,7 +27171,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.9/drivers
INIT_LIST_HEAD(&rdev->fence_drv.signaled);
diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon.h linux-3.0.9/drivers/gpu/drm/radeon/radeon.h
--- linux-3.0.9/drivers/gpu/drm/radeon/radeon.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon.h 2011-11-15 20:02:59.000000000 -0500
@@ -192,7 +192,7 @@ extern int sumo_get_temp(struct radeon_d
*/
struct radeon_fence_driver {
@@ -27192,7 +27192,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon.h linux-3.0.9/drivers/gpu/d
* Asic structures
diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_ioc32.c
--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-15 20:02:59.000000000 -0500
@@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str
request = compat_alloc_user_space(sizeof(*request));
if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
@@ -27204,7 +27204,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.9/drivers
diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_irq.c
--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-15 20:02:59.000000000 -0500
@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de
unsigned int ret;
RING_LOCALS;
@@ -27227,7 +27227,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.9/drivers/g
dev->max_vblank_count = 0x001fffff;
diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_state.c
--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_state.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_state.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_state.c 2011-11-15 20:02:59.000000000 -0500
@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de
if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
@@ -27248,7 +27248,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.9/drivers
diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_ttm.c
--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-15 20:02:59.000000000 -0500
@@ -649,8 +649,10 @@ int radeon_mmap(struct file *filp, struc
}
if (unlikely(ttm_vm_ops == NULL)) {
@@ -27264,7 +27264,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.9/drivers/g
return 0;
diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/rs690.c linux-3.0.9/drivers/gpu/drm/radeon/rs690.c
--- linux-3.0.9/drivers/gpu/drm/radeon/rs690.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/radeon/rs690.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/radeon/rs690.c 2011-11-15 20:02:59.000000000 -0500
@@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct
if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
rdev->pm.sideport_bandwidth.full)
@@ -27280,7 +27280,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/rs690.c linux-3.0.9/drivers/gpu/dr
rdev->pm.k8_bandwidth.full)
diff -urNp linux-3.0.9/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.9/drivers/gpu/drm/ttm/ttm_page_alloc.c
--- linux-3.0.9/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-11-15 20:02:59.000000000 -0500
@@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages
static int ttm_pool_mm_shrink(struct shrinker *shrink,
struct shrink_control *sc)
@@ -27295,7 +27295,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.9/drivers/
diff -urNp linux-3.0.9/drivers/gpu/drm/via/via_drv.h linux-3.0.9/drivers/gpu/drm/via/via_drv.h
--- linux-3.0.9/drivers/gpu/drm/via/via_drv.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/via/via_drv.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/via/via_drv.h 2011-11-15 20:02:59.000000000 -0500
@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
typedef uint32_t maskarray_t[5];
@@ -27316,7 +27316,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/via/via_drv.h linux-3.0.9/drivers/gpu/drm
const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
diff -urNp linux-3.0.9/drivers/gpu/drm/via/via_irq.c linux-3.0.9/drivers/gpu/drm/via/via_irq.c
--- linux-3.0.9/drivers/gpu/drm/via/via_irq.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/via/via_irq.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/via/via_irq.c 2011-11-15 20:02:59.000000000 -0500
@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de
if (crtc != 0)
return 0;
@@ -27389,7 +27389,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/via/via_irq.c linux-3.0.9/drivers/gpu/drm
break;
diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
--- linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-11-15 20:02:59.000000000 -0500
@@ -240,7 +240,7 @@ struct vmw_private {
* Fencing and IRQs.
*/
@@ -27401,7 +27401,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.9/drivers/g
atomic_t fence_queue_waiters;
diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
--- linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-11-15 20:02:59.000000000 -0500
@@ -610,7 +610,7 @@ int vmw_execbuf_ioctl(struct drm_device
struct drm_vmw_fence_rep fence_rep;
struct drm_vmw_fence_rep __user *user_fence_rep;
@@ -27413,7 +27413,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.0.9/drive
struct vmw_sw_context *sw_context = &dev_priv->ctx;
diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
--- linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-11-15 20:02:59.000000000 -0500
@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev
while (!vmw_lag_lt(queue, us)) {
spin_lock(&queue->lock);
@@ -27425,7 +27425,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.9/drivers
struct vmw_fence, head);
diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
--- linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-11-15 20:02:59.000000000 -0500
@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de
(unsigned int) min,
(unsigned int) fifo->capabilities);
@@ -27464,7 +27464,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.9/drivers/
if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
--- linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-11-15 20:02:59.000000000 -0500
@@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva
* emitted. Then the fence is stale and signaled.
*/
@@ -27485,7 +27485,7 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.9/drivers/g
for (;;) {
diff -urNp linux-3.0.9/drivers/hid/hid-core.c linux-3.0.9/drivers/hid/hid-core.c
--- linux-3.0.9/drivers/hid/hid-core.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/hid/hid-core.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/hid/hid-core.c 2011-11-15 20:02:59.000000000 -0500
@@ -1940,7 +1940,7 @@ static bool hid_ignore(struct hid_device
int hid_add_device(struct hid_device *hdev)
@@ -27506,7 +27506,7 @@ diff -urNp linux-3.0.9/drivers/hid/hid-core.c linux-3.0.9/drivers/hid/hid-core.c
ret = device_add(&hdev->dev);
diff -urNp linux-3.0.9/drivers/hid/usbhid/hiddev.c linux-3.0.9/drivers/hid/usbhid/hiddev.c
--- linux-3.0.9/drivers/hid/usbhid/hiddev.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/hid/usbhid/hiddev.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/hid/usbhid/hiddev.c 2011-11-15 20:02:59.000000000 -0500
@@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *fi
break;
@@ -27518,7 +27518,7 @@ diff -urNp linux-3.0.9/drivers/hid/usbhid/hiddev.c linux-3.0.9/drivers/hid/usbhi
for (i = 0; i < hid->maxcollection; i++)
diff -urNp linux-3.0.9/drivers/hwmon/acpi_power_meter.c linux-3.0.9/drivers/hwmon/acpi_power_meter.c
--- linux-3.0.9/drivers/hwmon/acpi_power_meter.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/hwmon/acpi_power_meter.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/hwmon/acpi_power_meter.c 2011-11-15 20:02:59.000000000 -0500
@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
return res;
@@ -27530,7 +27530,7 @@ diff -urNp linux-3.0.9/drivers/hwmon/acpi_power_meter.c linux-3.0.9/drivers/hwmo
resource->trip[attr->index - 7] = temp;
diff -urNp linux-3.0.9/drivers/hwmon/sht15.c linux-3.0.9/drivers/hwmon/sht15.c
--- linux-3.0.9/drivers/hwmon/sht15.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/hwmon/sht15.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/hwmon/sht15.c 2011-11-15 20:02:59.000000000 -0500
@@ -166,7 +166,7 @@ struct sht15_data {
int supply_uV;
bool supply_uV_valid;
@@ -27581,7 +27581,7 @@ diff -urNp linux-3.0.9/drivers/hwmon/sht15.c linux-3.0.9/drivers/hwmon/sht15.c
diff -urNp linux-3.0.9/drivers/hwmon/w83791d.c linux-3.0.9/drivers/hwmon/w83791d.c
--- linux-3.0.9/drivers/hwmon/w83791d.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/hwmon/w83791d.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/hwmon/w83791d.c 2011-11-15 20:02:59.000000000 -0500
@@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli
struct i2c_board_info *info);
static int w83791d_remove(struct i2c_client *client);
@@ -27595,7 +27595,7 @@ diff -urNp linux-3.0.9/drivers/hwmon/w83791d.c linux-3.0.9/drivers/hwmon/w83791d
#ifdef DEBUG
diff -urNp linux-3.0.9/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.9/drivers/i2c/busses/i2c-amd756-s4882.c
--- linux-3.0.9/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-15 20:02:59.000000000 -0500
@@ -43,7 +43,7 @@
extern struct i2c_adapter amd756_smbus;
@@ -27607,7 +27607,7 @@ diff -urNp linux-3.0.9/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.9/drivers
static DEFINE_MUTEX(amd756_lock);
diff -urNp linux-3.0.9/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.9/drivers/i2c/busses/i2c-nforce2-s4985.c
--- linux-3.0.9/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-15 20:02:59.000000000 -0500
@@ -41,7 +41,7 @@
extern struct i2c_adapter *nforce2_smbus;
@@ -27619,7 +27619,7 @@ diff -urNp linux-3.0.9/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.9/driver
static DEFINE_MUTEX(nforce2_lock);
diff -urNp linux-3.0.9/drivers/i2c/i2c-mux.c linux-3.0.9/drivers/i2c/i2c-mux.c
--- linux-3.0.9/drivers/i2c/i2c-mux.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/i2c/i2c-mux.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/i2c/i2c-mux.c 2011-11-15 20:02:59.000000000 -0500
@@ -28,7 +28,7 @@
/* multiplexer per channel data */
struct i2c_mux_priv {
@@ -27631,7 +27631,7 @@ diff -urNp linux-3.0.9/drivers/i2c/i2c-mux.c linux-3.0.9/drivers/i2c/i2c-mux.c
void *mux_dev; /* the mux chip/device */
diff -urNp linux-3.0.9/drivers/ide/aec62xx.c linux-3.0.9/drivers/ide/aec62xx.c
--- linux-3.0.9/drivers/ide/aec62xx.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/aec62xx.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/aec62xx.c 2011-11-15 20:02:59.000000000 -0500
@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_
.cable_detect = atp86x_cable_detect,
};
@@ -27643,7 +27643,7 @@ diff -urNp linux-3.0.9/drivers/ide/aec62xx.c linux-3.0.9/drivers/ide/aec62xx.c
.init_chipset = init_chipset_aec62xx,
diff -urNp linux-3.0.9/drivers/ide/alim15x3.c linux-3.0.9/drivers/ide/alim15x3.c
--- linux-3.0.9/drivers/ide/alim15x3.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/alim15x3.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/alim15x3.c 2011-11-15 20:02:59.000000000 -0500
@@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_
.dma_sff_read_status = ide_dma_sff_read_status,
};
@@ -27655,7 +27655,7 @@ diff -urNp linux-3.0.9/drivers/ide/alim15x3.c linux-3.0.9/drivers/ide/alim15x3.c
.init_hwif = init_hwif_ali15x3,
diff -urNp linux-3.0.9/drivers/ide/amd74xx.c linux-3.0.9/drivers/ide/amd74xx.c
--- linux-3.0.9/drivers/ide/amd74xx.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/amd74xx.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/amd74xx.c 2011-11-15 20:02:59.000000000 -0500
@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_por
.udma_mask = udma, \
}
@@ -27667,7 +27667,7 @@ diff -urNp linux-3.0.9/drivers/ide/amd74xx.c linux-3.0.9/drivers/ide/amd74xx.c
/* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
diff -urNp linux-3.0.9/drivers/ide/atiixp.c linux-3.0.9/drivers/ide/atiixp.c
--- linux-3.0.9/drivers/ide/atiixp.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/atiixp.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/atiixp.c 2011-11-15 20:02:59.000000000 -0500
@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_
.cable_detect = atiixp_cable_detect,
};
@@ -27679,7 +27679,7 @@ diff -urNp linux-3.0.9/drivers/ide/atiixp.c linux-3.0.9/drivers/ide/atiixp.c
.enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
diff -urNp linux-3.0.9/drivers/ide/cmd64x.c linux-3.0.9/drivers/ide/cmd64x.c
--- linux-3.0.9/drivers/ide/cmd64x.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/cmd64x.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/cmd64x.c 2011-11-15 20:02:59.000000000 -0500
@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_r
.dma_sff_read_status = ide_dma_sff_read_status,
};
@@ -27691,7 +27691,7 @@ diff -urNp linux-3.0.9/drivers/ide/cmd64x.c linux-3.0.9/drivers/ide/cmd64x.c
.init_chipset = init_chipset_cmd64x,
diff -urNp linux-3.0.9/drivers/ide/cs5520.c linux-3.0.9/drivers/ide/cs5520.c
--- linux-3.0.9/drivers/ide/cs5520.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/cs5520.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/cs5520.c 2011-11-15 20:02:59.000000000 -0500
@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_
.set_dma_mode = cs5520_set_dma_mode,
};
@@ -27703,7 +27703,7 @@ diff -urNp linux-3.0.9/drivers/ide/cs5520.c linux-3.0.9/drivers/ide/cs5520.c
.port_ops = &cs5520_port_ops,
diff -urNp linux-3.0.9/drivers/ide/cs5530.c linux-3.0.9/drivers/ide/cs5530.c
--- linux-3.0.9/drivers/ide/cs5530.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/cs5530.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/cs5530.c 2011-11-15 20:02:59.000000000 -0500
@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_
.udma_filter = cs5530_udma_filter,
};
@@ -27715,7 +27715,7 @@ diff -urNp linux-3.0.9/drivers/ide/cs5530.c linux-3.0.9/drivers/ide/cs5530.c
.init_hwif = init_hwif_cs5530,
diff -urNp linux-3.0.9/drivers/ide/cs5535.c linux-3.0.9/drivers/ide/cs5535.c
--- linux-3.0.9/drivers/ide/cs5535.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/cs5535.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/cs5535.c 2011-11-15 20:02:59.000000000 -0500
@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_
.cable_detect = cs5535_cable_detect,
};
@@ -27727,7 +27727,7 @@ diff -urNp linux-3.0.9/drivers/ide/cs5535.c linux-3.0.9/drivers/ide/cs5535.c
.host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
diff -urNp linux-3.0.9/drivers/ide/cy82c693.c linux-3.0.9/drivers/ide/cy82c693.c
--- linux-3.0.9/drivers/ide/cy82c693.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/cy82c693.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/cy82c693.c 2011-11-15 20:02:59.000000000 -0500
@@ -161,7 +161,7 @@ static const struct ide_port_ops cy82c69
.set_dma_mode = cy82c693_set_dma_mode,
};
@@ -27739,7 +27739,7 @@ diff -urNp linux-3.0.9/drivers/ide/cy82c693.c linux-3.0.9/drivers/ide/cy82c693.c
.port_ops = &cy82c693_port_ops,
diff -urNp linux-3.0.9/drivers/ide/hpt366.c linux-3.0.9/drivers/ide/hpt366.c
--- linux-3.0.9/drivers/ide/hpt366.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/hpt366.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/hpt366.c 2011-11-15 20:02:59.000000000 -0500
@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings
}
};
@@ -27850,7 +27850,7 @@ diff -urNp linux-3.0.9/drivers/ide/hpt366.c linux-3.0.9/drivers/ide/hpt366.c
.init_chipset = init_chipset_hpt366,
diff -urNp linux-3.0.9/drivers/ide/ide-cd.c linux-3.0.9/drivers/ide/ide-cd.c
--- linux-3.0.9/drivers/ide/ide-cd.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/ide-cd.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/ide-cd.c 2011-11-15 20:02:59.000000000 -0500
@@ -769,7 +769,7 @@ static void cdrom_do_block_pc(ide_drive_
alignment = queue_dma_alignment(q) | q->dma_pad_mask;
if ((unsigned long)buf & alignment
@@ -27862,7 +27862,7 @@ diff -urNp linux-3.0.9/drivers/ide/ide-cd.c linux-3.0.9/drivers/ide/ide-cd.c
}
diff -urNp linux-3.0.9/drivers/ide/ide-floppy.c linux-3.0.9/drivers/ide/ide-floppy.c
--- linux-3.0.9/drivers/ide/ide-floppy.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/ide-floppy.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/ide-floppy.c 2011-11-15 20:02:59.000000000 -0500
@@ -379,6 +379,8 @@ static int ide_floppy_get_capacity(ide_d
u8 pc_buf[256], header_len, desc_cnt;
int i, rc = 1, blocks, length;
@@ -27874,7 +27874,7 @@ diff -urNp linux-3.0.9/drivers/ide/ide-floppy.c linux-3.0.9/drivers/ide/ide-flop
drive->bios_cyl = 0;
diff -urNp linux-3.0.9/drivers/ide/ide-pci-generic.c linux-3.0.9/drivers/ide/ide-pci-generic.c
--- linux-3.0.9/drivers/ide/ide-pci-generic.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/ide-pci-generic.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/ide-pci-generic.c 2011-11-15 20:02:59.000000000 -0500
@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell
.udma_mask = ATA_UDMA6, \
}
@@ -27886,7 +27886,7 @@ diff -urNp linux-3.0.9/drivers/ide/ide-pci-generic.c linux-3.0.9/drivers/ide/ide
diff -urNp linux-3.0.9/drivers/ide/it8172.c linux-3.0.9/drivers/ide/it8172.c
--- linux-3.0.9/drivers/ide/it8172.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/it8172.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/it8172.c 2011-11-15 20:02:59.000000000 -0500
@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_
.set_dma_mode = it8172_set_dma_mode,
};
@@ -27898,7 +27898,7 @@ diff -urNp linux-3.0.9/drivers/ide/it8172.c linux-3.0.9/drivers/ide/it8172.c
.enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
diff -urNp linux-3.0.9/drivers/ide/it8213.c linux-3.0.9/drivers/ide/it8213.c
--- linux-3.0.9/drivers/ide/it8213.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/it8213.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/it8213.c 2011-11-15 20:02:59.000000000 -0500
@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_
.cable_detect = it8213_cable_detect,
};
@@ -27910,7 +27910,7 @@ diff -urNp linux-3.0.9/drivers/ide/it8213.c linux-3.0.9/drivers/ide/it8213.c
.port_ops = &it8213_port_ops,
diff -urNp linux-3.0.9/drivers/ide/it821x.c linux-3.0.9/drivers/ide/it821x.c
--- linux-3.0.9/drivers/ide/it821x.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/it821x.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/it821x.c 2011-11-15 20:02:59.000000000 -0500
@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_
.cable_detect = it821x_cable_detect,
};
@@ -27922,7 +27922,7 @@ diff -urNp linux-3.0.9/drivers/ide/it821x.c linux-3.0.9/drivers/ide/it821x.c
.init_hwif = init_hwif_it821x,
diff -urNp linux-3.0.9/drivers/ide/jmicron.c linux-3.0.9/drivers/ide/jmicron.c
--- linux-3.0.9/drivers/ide/jmicron.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/jmicron.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/jmicron.c 2011-11-15 20:02:59.000000000 -0500
@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron
.cable_detect = jmicron_cable_detect,
};
@@ -27934,7 +27934,7 @@ diff -urNp linux-3.0.9/drivers/ide/jmicron.c linux-3.0.9/drivers/ide/jmicron.c
.port_ops = &jmicron_port_ops,
diff -urNp linux-3.0.9/drivers/ide/ns87415.c linux-3.0.9/drivers/ide/ns87415.c
--- linux-3.0.9/drivers/ide/ns87415.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/ns87415.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/ns87415.c 2011-11-15 20:02:59.000000000 -0500
@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_
.dma_sff_read_status = superio_dma_sff_read_status,
};
@@ -27946,7 +27946,7 @@ diff -urNp linux-3.0.9/drivers/ide/ns87415.c linux-3.0.9/drivers/ide/ns87415.c
.tp_ops = &ns87415_tp_ops,
diff -urNp linux-3.0.9/drivers/ide/opti621.c linux-3.0.9/drivers/ide/opti621.c
--- linux-3.0.9/drivers/ide/opti621.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/opti621.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/opti621.c 2011-11-15 20:02:59.000000000 -0500
@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621
.set_pio_mode = opti621_set_pio_mode,
};
@@ -27958,7 +27958,7 @@ diff -urNp linux-3.0.9/drivers/ide/opti621.c linux-3.0.9/drivers/ide/opti621.c
.port_ops = &opti621_port_ops,
diff -urNp linux-3.0.9/drivers/ide/pdc202xx_new.c linux-3.0.9/drivers/ide/pdc202xx_new.c
--- linux-3.0.9/drivers/ide/pdc202xx_new.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/pdc202xx_new.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/pdc202xx_new.c 2011-11-15 20:02:59.000000000 -0500
@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_
.udma_mask = udma, \
}
@@ -27970,7 +27970,7 @@ diff -urNp linux-3.0.9/drivers/ide/pdc202xx_new.c linux-3.0.9/drivers/ide/pdc202
};
diff -urNp linux-3.0.9/drivers/ide/pdc202xx_old.c linux-3.0.9/drivers/ide/pdc202xx_old.c
--- linux-3.0.9/drivers/ide/pdc202xx_old.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/pdc202xx_old.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/pdc202xx_old.c 2011-11-15 20:02:59.000000000 -0500
@@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x
.max_sectors = sectors, \
}
@@ -27982,7 +27982,7 @@ diff -urNp linux-3.0.9/drivers/ide/pdc202xx_old.c linux-3.0.9/drivers/ide/pdc202
.init_chipset = init_chipset_pdc202xx,
diff -urNp linux-3.0.9/drivers/ide/piix.c linux-3.0.9/drivers/ide/piix.c
--- linux-3.0.9/drivers/ide/piix.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/piix.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/piix.c 2011-11-15 20:02:59.000000000 -0500
@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_por
.udma_mask = udma, \
}
@@ -27994,7 +27994,7 @@ diff -urNp linux-3.0.9/drivers/ide/piix.c linux-3.0.9/drivers/ide/piix.c
* MPIIX actually has only a single IDE channel mapped to
diff -urNp linux-3.0.9/drivers/ide/rz1000.c linux-3.0.9/drivers/ide/rz1000.c
--- linux-3.0.9/drivers/ide/rz1000.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/rz1000.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/rz1000.c 2011-11-15 20:02:59.000000000 -0500
@@ -38,7 +38,7 @@ static int __devinit rz1000_disable_read
}
}
@@ -28006,7 +28006,7 @@ diff -urNp linux-3.0.9/drivers/ide/rz1000.c linux-3.0.9/drivers/ide/rz1000.c
};
diff -urNp linux-3.0.9/drivers/ide/sc1200.c linux-3.0.9/drivers/ide/sc1200.c
--- linux-3.0.9/drivers/ide/sc1200.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/sc1200.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/sc1200.c 2011-11-15 20:02:59.000000000 -0500
@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_d
.dma_sff_read_status = ide_dma_sff_read_status,
};
@@ -28018,7 +28018,7 @@ diff -urNp linux-3.0.9/drivers/ide/sc1200.c linux-3.0.9/drivers/ide/sc1200.c
.dma_ops = &sc1200_dma_ops,
diff -urNp linux-3.0.9/drivers/ide/scc_pata.c linux-3.0.9/drivers/ide/scc_pata.c
--- linux-3.0.9/drivers/ide/scc_pata.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/scc_pata.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/scc_pata.c 2011-11-15 20:02:59.000000000 -0500
@@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_
.dma_sff_read_status = scc_dma_sff_read_status,
};
@@ -28030,7 +28030,7 @@ diff -urNp linux-3.0.9/drivers/ide/scc_pata.c linux-3.0.9/drivers/ide/scc_pata.c
.init_dma = scc_init_dma,
diff -urNp linux-3.0.9/drivers/ide/serverworks.c linux-3.0.9/drivers/ide/serverworks.c
--- linux-3.0.9/drivers/ide/serverworks.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/serverworks.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/serverworks.c 2011-11-15 20:02:59.000000000 -0500
@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_p
.cable_detect = svwks_cable_detect,
};
@@ -28042,7 +28042,7 @@ diff -urNp linux-3.0.9/drivers/ide/serverworks.c linux-3.0.9/drivers/ide/serverw
.init_chipset = init_chipset_svwks,
diff -urNp linux-3.0.9/drivers/ide/setup-pci.c linux-3.0.9/drivers/ide/setup-pci.c
--- linux-3.0.9/drivers/ide/setup-pci.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/setup-pci.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/setup-pci.c 2011-11-15 20:02:59.000000000 -0500
@@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev
int ret, i, n_ports = dev2 ? 4 : 2;
struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL };
@@ -28054,7 +28054,7 @@ diff -urNp linux-3.0.9/drivers/ide/setup-pci.c linux-3.0.9/drivers/ide/setup-pci
if (ret < 0)
diff -urNp linux-3.0.9/drivers/ide/siimage.c linux-3.0.9/drivers/ide/siimage.c
--- linux-3.0.9/drivers/ide/siimage.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/siimage.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/siimage.c 2011-11-15 20:02:59.000000000 -0500
@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_
.udma_mask = ATA_UDMA6, \
}
@@ -28066,7 +28066,7 @@ diff -urNp linux-3.0.9/drivers/ide/siimage.c linux-3.0.9/drivers/ide/siimage.c
};
diff -urNp linux-3.0.9/drivers/ide/sis5513.c linux-3.0.9/drivers/ide/sis5513.c
--- linux-3.0.9/drivers/ide/sis5513.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/sis5513.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/sis5513.c 2011-11-15 20:02:59.000000000 -0500
@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata
.cable_detect = sis_cable_detect,
};
@@ -28078,7 +28078,7 @@ diff -urNp linux-3.0.9/drivers/ide/sis5513.c linux-3.0.9/drivers/ide/sis5513.c
.enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
diff -urNp linux-3.0.9/drivers/ide/sl82c105.c linux-3.0.9/drivers/ide/sl82c105.c
--- linux-3.0.9/drivers/ide/sl82c105.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/sl82c105.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/sl82c105.c 2011-11-15 20:02:59.000000000 -0500
@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105
.dma_sff_read_status = ide_dma_sff_read_status,
};
@@ -28090,7 +28090,7 @@ diff -urNp linux-3.0.9/drivers/ide/sl82c105.c linux-3.0.9/drivers/ide/sl82c105.c
.enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
diff -urNp linux-3.0.9/drivers/ide/slc90e66.c linux-3.0.9/drivers/ide/slc90e66.c
--- linux-3.0.9/drivers/ide/slc90e66.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/slc90e66.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/slc90e66.c 2011-11-15 20:02:59.000000000 -0500
@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e6
.cable_detect = slc90e66_cable_detect,
};
@@ -28102,7 +28102,7 @@ diff -urNp linux-3.0.9/drivers/ide/slc90e66.c linux-3.0.9/drivers/ide/slc90e66.c
.port_ops = &slc90e66_port_ops,
diff -urNp linux-3.0.9/drivers/ide/tc86c001.c linux-3.0.9/drivers/ide/tc86c001.c
--- linux-3.0.9/drivers/ide/tc86c001.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/tc86c001.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/tc86c001.c 2011-11-15 20:02:59.000000000 -0500
@@ -191,7 +191,7 @@ static const struct ide_dma_ops tc86c001
.dma_sff_read_status = ide_dma_sff_read_status,
};
@@ -28114,7 +28114,7 @@ diff -urNp linux-3.0.9/drivers/ide/tc86c001.c linux-3.0.9/drivers/ide/tc86c001.c
.port_ops = &tc86c001_port_ops,
diff -urNp linux-3.0.9/drivers/ide/triflex.c linux-3.0.9/drivers/ide/triflex.c
--- linux-3.0.9/drivers/ide/triflex.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/triflex.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/triflex.c 2011-11-15 20:02:59.000000000 -0500
@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex
.set_dma_mode = triflex_set_mode,
};
@@ -28126,7 +28126,7 @@ diff -urNp linux-3.0.9/drivers/ide/triflex.c linux-3.0.9/drivers/ide/triflex.c
.port_ops = &triflex_port_ops,
diff -urNp linux-3.0.9/drivers/ide/trm290.c linux-3.0.9/drivers/ide/trm290.c
--- linux-3.0.9/drivers/ide/trm290.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/trm290.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/trm290.c 2011-11-15 20:02:59.000000000 -0500
@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops
.dma_check = trm290_dma_check,
};
@@ -28138,7 +28138,7 @@ diff -urNp linux-3.0.9/drivers/ide/trm290.c linux-3.0.9/drivers/ide/trm290.c
.tp_ops = &trm290_tp_ops,
diff -urNp linux-3.0.9/drivers/ide/via82cxxx.c linux-3.0.9/drivers/ide/via82cxxx.c
--- linux-3.0.9/drivers/ide/via82cxxx.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/ide/via82cxxx.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/ide/via82cxxx.c 2011-11-15 20:02:59.000000000 -0500
@@ -403,7 +403,7 @@ static const struct ide_port_ops via_por
.cable_detect = via82cxxx_cable_detect,
};
@@ -28150,7 +28150,7 @@ diff -urNp linux-3.0.9/drivers/ide/via82cxxx.c linux-3.0.9/drivers/ide/via82cxxx
.enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
diff -urNp linux-3.0.9/drivers/infiniband/core/cm.c linux-3.0.9/drivers/infiniband/core/cm.c
--- linux-3.0.9/drivers/infiniband/core/cm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/core/cm.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/infiniband/core/cm.c 2011-11-15 20:02:59.000000000 -0500
@@ -113,7 +113,7 @@ static char const counter_group_names[CM
struct cm_counter_group {
@@ -28292,7 +28292,7 @@ diff -urNp linux-3.0.9/drivers/infiniband/core/cm.c linux-3.0.9/drivers/infiniba
static const struct sysfs_ops cm_counter_ops = {
diff -urNp linux-3.0.9/drivers/infiniband/core/fmr_pool.c linux-3.0.9/drivers/infiniband/core/fmr_pool.c
--- linux-3.0.9/drivers/infiniband/core/fmr_pool.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/core/fmr_pool.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/infiniband/core/fmr_pool.c 2011-11-15 20:02:59.000000000 -0500
@@ -97,8 +97,8 @@ struct ib_fmr_pool {
struct task_struct *thread;
@@ -28362,7 +28362,7 @@ diff -urNp linux-3.0.9/drivers/infiniband/core/fmr_pool.c linux-3.0.9/drivers/in
}
diff -urNp linux-3.0.9/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.9/drivers/infiniband/hw/cxgb4/mem.c
--- linux-3.0.9/drivers/infiniband/hw/cxgb4/mem.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/cxgb4/mem.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/infiniband/hw/cxgb4/mem.c 2011-11-15 20:02:59.000000000 -0500
@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r
int err;
struct fw_ri_tpte tpt;
@@ -28383,7 +28383,7 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.9/drivers/inf
__func__, stag_state, type, pdid, stag_idx);
diff -urNp linux-3.0.9/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.9/drivers/infiniband/hw/ipath/ipath_fs.c
--- linux-3.0.9/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-15 20:02:59.000000000 -0500
@@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(stru
struct infinipath_counters counters;
struct ipath_devdata *dd;
@@ -28395,7 +28395,7 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.9/driver
diff -urNp linux-3.0.9/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.9/drivers/infiniband/hw/ipath/ipath_rc.c
--- linux-3.0.9/drivers/infiniband/hw/ipath/ipath_rc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/ipath/ipath_rc.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/infiniband/hw/ipath/ipath_rc.c 2011-11-15 20:02:59.000000000 -0500
@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de
struct ib_atomic_eth *ateth;
struct ipath_ack_entry *e;
@@ -28421,7 +28421,7 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.9/driver
sdata);
diff -urNp linux-3.0.9/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.9/drivers/infiniband/hw/ipath/ipath_ruc.c
--- linux-3.0.9/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-11-15 20:02:59.000000000 -0500
@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip
unsigned long flags;
struct ib_wc wc;
@@ -28447,7 +28447,7 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.9/drive
goto send_comp;
diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes.c linux-3.0.9/drivers/infiniband/hw/nes/nes.c
--- linux-3.0.9/drivers/infiniband/hw/nes/nes.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/nes/nes.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/infiniband/hw/nes/nes.c 2011-11-15 20:02:59.000000000 -0500
@@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi
LIST_HEAD(nes_adapter_list);
static LIST_HEAD(nes_dev_list);
@@ -28468,7 +28468,7 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes.c linux-3.0.9/drivers/infin
diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.9/drivers/infiniband/hw/nes/nes_cm.c
--- linux-3.0.9/drivers/infiniband/hw/nes/nes_cm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/nes/nes_cm.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/infiniband/hw/nes/nes_cm.c 2011-11-15 20:02:59.000000000 -0500
@@ -68,14 +68,14 @@ u32 cm_packets_dropped;
u32 cm_packets_retrans;
u32 cm_packets_created;
@@ -28667,7 +28667,7 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.9/drivers/in
diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes.h linux-3.0.9/drivers/infiniband/hw/nes/nes.h
--- linux-3.0.9/drivers/infiniband/hw/nes/nes.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/nes/nes.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/infiniband/hw/nes/nes.h 2011-11-15 20:02:59.000000000 -0500
@@ -175,17 +175,17 @@ extern unsigned int nes_debug_level;
extern unsigned int wqm_quanta;
extern struct list_head nes_adapter_list;
@@ -28721,7 +28721,7 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes.h linux-3.0.9/drivers/infin
extern u32 int_mod_cq_depth_256;
diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.9/drivers/infiniband/hw/nes/nes_nic.c
--- linux-3.0.9/drivers/infiniband/hw/nes/nes_nic.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/nes/nes_nic.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/infiniband/hw/nes/nes_nic.c 2011-11-15 20:02:59.000000000 -0500
@@ -1274,31 +1274,31 @@ static void nes_netdev_get_ethtool_stats
target_stat_values[++index] = mh_detected;
target_stat_values[++index] = mh_pauses_sent;
@@ -28774,7 +28774,7 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.9/drivers/i
target_stat_values[++index] = int_mod_timer_init;
diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c
--- linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-15 20:02:59.000000000 -0500
@@ -46,9 +46,9 @@
#include <rdma/ib_umem.h>
@@ -28808,7 +28808,7 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.9/drivers
/* Blow away the connection if it exists. */
diff -urNp linux-3.0.9/drivers/infiniband/hw/qib/qib.h linux-3.0.9/drivers/infiniband/hw/qib/qib.h
--- linux-3.0.9/drivers/infiniband/hw/qib/qib.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/infiniband/hw/qib/qib.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/infiniband/hw/qib/qib.h 2011-11-15 20:02:59.000000000 -0500
@@ -51,6 +51,7 @@
#include <linux/completion.h>
#include <linux/kref.h>
@@ -28819,7 +28819,7 @@ diff -urNp linux-3.0.9/drivers/infiniband/hw/qib/qib.h linux-3.0.9/drivers/infin
#include "qib_verbs.h"
diff -urNp linux-3.0.9/drivers/input/gameport/gameport.c linux-3.0.9/drivers/input/gameport/gameport.c
--- linux-3.0.9/drivers/input/gameport/gameport.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/input/gameport/gameport.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/input/gameport/gameport.c 2011-11-15 20:02:59.000000000 -0500
@@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
*/
static void gameport_init_port(struct gameport *gameport)
@@ -28839,7 +28839,7 @@ diff -urNp linux-3.0.9/drivers/input/gameport/gameport.c linux-3.0.9/drivers/inp
if (gameport->parent)
diff -urNp linux-3.0.9/drivers/input/input.c linux-3.0.9/drivers/input/input.c
--- linux-3.0.9/drivers/input/input.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/input/input.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/input/input.c 2011-11-15 20:02:59.000000000 -0500
@@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struc
*/
int input_register_device(struct input_dev *dev)
@@ -28860,7 +28860,7 @@ diff -urNp linux-3.0.9/drivers/input/input.c linux-3.0.9/drivers/input/input.c
if (error)
diff -urNp linux-3.0.9/drivers/input/joystick/sidewinder.c linux-3.0.9/drivers/input/joystick/sidewinder.c
--- linux-3.0.9/drivers/input/joystick/sidewinder.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/input/joystick/sidewinder.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/input/joystick/sidewinder.c 2011-11-15 20:02:59.000000000 -0500
@@ -30,6 +30,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -28880,7 +28880,7 @@ diff -urNp linux-3.0.9/drivers/input/joystick/sidewinder.c linux-3.0.9/drivers/i
if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) { /* Broken packet, try to fix */
diff -urNp linux-3.0.9/drivers/input/joystick/xpad.c linux-3.0.9/drivers/input/joystick/xpad.c
--- linux-3.0.9/drivers/input/joystick/xpad.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/input/joystick/xpad.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/input/joystick/xpad.c 2011-11-15 20:02:59.000000000 -0500
@@ -689,7 +689,7 @@ static void xpad_led_set(struct led_clas
static int xpad_led_probe(struct usb_xpad *xpad)
@@ -28901,7 +28901,7 @@ diff -urNp linux-3.0.9/drivers/input/joystick/xpad.c linux-3.0.9/drivers/input/j
led->xpad = xpad;
diff -urNp linux-3.0.9/drivers/input/mousedev.c linux-3.0.9/drivers/input/mousedev.c
--- linux-3.0.9/drivers/input/mousedev.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/input/mousedev.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/input/mousedev.c 2011-11-15 20:02:59.000000000 -0500
@@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file
spin_unlock_irq(&client->packet_lock);
@@ -28913,7 +28913,7 @@ diff -urNp linux-3.0.9/drivers/input/mousedev.c linux-3.0.9/drivers/input/moused
return count;
diff -urNp linux-3.0.9/drivers/input/serio/serio.c linux-3.0.9/drivers/input/serio/serio.c
--- linux-3.0.9/drivers/input/serio/serio.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/input/serio/serio.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/input/serio/serio.c 2011-11-15 20:02:59.000000000 -0500
@@ -497,7 +497,7 @@ static void serio_release_port(struct de
*/
static void serio_init_port(struct serio *serio)
@@ -28934,7 +28934,7 @@ diff -urNp linux-3.0.9/drivers/input/serio/serio.c linux-3.0.9/drivers/input/ser
serio->dev.groups = serio_device_attr_groups;
diff -urNp linux-3.0.9/drivers/isdn/capi/capi.c linux-3.0.9/drivers/isdn/capi/capi.c
--- linux-3.0.9/drivers/isdn/capi/capi.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/capi/capi.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/capi/capi.c 2011-11-15 20:02:59.000000000 -0500
@@ -83,8 +83,8 @@ struct capiminor {
struct capi20_appl *ap;
@@ -28974,7 +28974,7 @@ diff -urNp linux-3.0.9/drivers/isdn/capi/capi.c linux-3.0.9/drivers/isdn/capi/ca
capimsg_setu16(skb->data, 16, len); /* Data length */
diff -urNp linux-3.0.9/drivers/isdn/gigaset/common.c linux-3.0.9/drivers/isdn/gigaset/common.c
--- linux-3.0.9/drivers/isdn/gigaset/common.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/gigaset/common.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/gigaset/common.c 2011-11-15 20:02:59.000000000 -0500
@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct
cs->commands_pending = 0;
cs->cur_at_seq = 0;
@@ -28986,7 +28986,7 @@ diff -urNp linux-3.0.9/drivers/isdn/gigaset/common.c linux-3.0.9/drivers/isdn/gi
cs->tty_dev = NULL;
diff -urNp linux-3.0.9/drivers/isdn/gigaset/gigaset.h linux-3.0.9/drivers/isdn/gigaset/gigaset.h
--- linux-3.0.9/drivers/isdn/gigaset/gigaset.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/gigaset/gigaset.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/gigaset/gigaset.h 2011-11-15 20:02:59.000000000 -0500
@@ -35,6 +35,7 @@
#include <linux/tty_driver.h>
#include <linux/list.h>
@@ -29006,7 +29006,7 @@ diff -urNp linux-3.0.9/drivers/isdn/gigaset/gigaset.h linux-3.0.9/drivers/isdn/g
unsigned control_state;
diff -urNp linux-3.0.9/drivers/isdn/gigaset/interface.c linux-3.0.9/drivers/isdn/gigaset/interface.c
--- linux-3.0.9/drivers/isdn/gigaset/interface.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/gigaset/interface.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/gigaset/interface.c 2011-11-15 20:02:59.000000000 -0500
@@ -162,9 +162,7 @@ static int if_open(struct tty_struct *tt
}
tty->driver_data = cs;
@@ -29096,7 +29096,7 @@ diff -urNp linux-3.0.9/drivers/isdn/gigaset/interface.c linux-3.0.9/drivers/isdn
}
diff -urNp linux-3.0.9/drivers/isdn/hardware/avm/b1.c linux-3.0.9/drivers/isdn/hardware/avm/b1.c
--- linux-3.0.9/drivers/isdn/hardware/avm/b1.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/avm/b1.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/hardware/avm/b1.c 2011-11-15 20:02:59.000000000 -0500
@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
}
if (left) {
@@ -29117,7 +29117,7 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/avm/b1.c linux-3.0.9/drivers/isdn/h
memcpy(buf, dp, left);
diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.9/drivers/isdn/hardware/eicon/capidtmf.c
--- linux-3.0.9/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-15 20:02:59.000000000 -0500
@@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta
byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT];
short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES];
@@ -29128,7 +29128,7 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.9/driver
{
diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.9/drivers/isdn/hardware/eicon/capifunc.c
--- linux-3.0.9/drivers/isdn/hardware/eicon/capifunc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/capifunc.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/hardware/eicon/capifunc.c 2011-11-15 20:02:59.000000000 -0500
@@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void)
IDI_SYNC_REQ req;
DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -29140,7 +29140,7 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.9/driver
for (x = 0; x < MAX_DESCRIPTORS; x++) {
diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.9/drivers/isdn/hardware/eicon/diddfunc.c
--- linux-3.0.9/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-15 20:02:59.000000000 -0500
@@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di
IDI_SYNC_REQ req;
DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -29152,7 +29152,7 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.9/driver
for (x = 0; x < MAX_DESCRIPTORS; x++) {
diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.9/drivers/isdn/hardware/eicon/divasfunc.c
--- linux-3.0.9/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-15 20:02:59.000000000 -0500
@@ -160,6 +160,8 @@ static int DIVA_INIT_FUNCTION connect_di
IDI_SYNC_REQ req;
DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -29164,7 +29164,7 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.9/drive
for (x = 0; x < MAX_DESCRIPTORS; x++) {
diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/divasync.h linux-3.0.9/drivers/isdn/hardware/eicon/divasync.h
--- linux-3.0.9/drivers/isdn/hardware/eicon/divasync.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/divasync.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/hardware/eicon/divasync.h 2011-11-15 20:02:59.000000000 -0500
@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
} diva_didd_add_adapter_t;
typedef struct _diva_didd_remove_adapter {
@@ -29176,7 +29176,7 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/divasync.h linux-3.0.9/driver
dword length;
diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.9/drivers/isdn/hardware/eicon/idifunc.c
--- linux-3.0.9/drivers/isdn/hardware/eicon/idifunc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/idifunc.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/hardware/eicon/idifunc.c 2011-11-15 20:02:59.000000000 -0500
@@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di
IDI_SYNC_REQ req;
DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -29188,7 +29188,7 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.9/drivers
for (x = 0; x < MAX_DESCRIPTORS; x++) {
diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/message.c linux-3.0.9/drivers/isdn/hardware/eicon/message.c
--- linux-3.0.9/drivers/isdn/hardware/eicon/message.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/message.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/hardware/eicon/message.c 2011-11-15 20:02:59.000000000 -0500
@@ -4886,6 +4886,8 @@ static void sig_ind(PLCI *plci)
dword d;
word w;
@@ -29227,7 +29227,7 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/message.c linux-3.0.9/drivers
if(!a->group_optimization_enabled)
diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.9/drivers/isdn/hardware/eicon/mntfunc.c
--- linux-3.0.9/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-15 20:02:59.000000000 -0500
@@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di
IDI_SYNC_REQ req;
DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -29239,7 +29239,7 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.9/drivers
for (x = 0; x < MAX_DESCRIPTORS; x++) {
diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.9/drivers/isdn/hardware/eicon/xdi_adapter.h
--- linux-3.0.9/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-15 20:02:59.000000000 -0500
@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
typedef struct _diva_os_idi_adapter_interface {
diva_init_card_proc_t cleanup_adapter_proc;
@@ -29251,7 +29251,7 @@ diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.9/dri
struct list_head link;
diff -urNp linux-3.0.9/drivers/isdn/i4l/isdn_common.c linux-3.0.9/drivers/isdn/i4l/isdn_common.c
--- linux-3.0.9/drivers/isdn/i4l/isdn_common.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/i4l/isdn_common.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/i4l/isdn_common.c 2011-11-15 20:02:59.000000000 -0500
@@ -1286,6 +1286,8 @@ isdn_ioctl(struct file *file, uint cmd,
} iocpar;
void __user *argp = (void __user *)arg;
@@ -29263,7 +29263,7 @@ diff -urNp linux-3.0.9/drivers/isdn/i4l/isdn_common.c linux-3.0.9/drivers/isdn/i
#define iocts iocpar.iocts
diff -urNp linux-3.0.9/drivers/isdn/icn/icn.c linux-3.0.9/drivers/isdn/icn/icn.c
--- linux-3.0.9/drivers/isdn/icn/icn.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/isdn/icn/icn.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/isdn/icn/icn.c 2011-11-15 20:02:59.000000000 -0500
@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
if (count > len)
count = len;
@@ -29275,7 +29275,7 @@ diff -urNp linux-3.0.9/drivers/isdn/icn/icn.c linux-3.0.9/drivers/isdn/icn/icn.c
memcpy(msg, buf, count);
diff -urNp linux-3.0.9/drivers/lguest/core.c linux-3.0.9/drivers/lguest/core.c
--- linux-3.0.9/drivers/lguest/core.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/lguest/core.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/lguest/core.c 2011-11-15 20:02:59.000000000 -0500
@@ -92,9 +92,17 @@ static __init int map_switcher(void)
* it's worked so far. The end address needs +1 because __get_vm_area
* allocates an extra guard page, so we need space for that.
@@ -29305,7 +29305,7 @@ diff -urNp linux-3.0.9/drivers/lguest/core.c linux-3.0.9/drivers/lguest/core.c
printk(KERN_INFO "lguest: mapped switcher at %p\n",
diff -urNp linux-3.0.9/drivers/lguest/x86/core.c linux-3.0.9/drivers/lguest/x86/core.c
--- linux-3.0.9/drivers/lguest/x86/core.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/lguest/x86/core.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/lguest/x86/core.c 2011-11-15 20:02:59.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)
@@ -29349,7 +29349,7 @@ diff -urNp linux-3.0.9/drivers/lguest/x86/core.c linux-3.0.9/drivers/lguest/x86/
/*
diff -urNp linux-3.0.9/drivers/lguest/x86/switcher_32.S linux-3.0.9/drivers/lguest/x86/switcher_32.S
--- linux-3.0.9/drivers/lguest/x86/switcher_32.S 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/lguest/x86/switcher_32.S 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/lguest/x86/switcher_32.S 2011-11-15 20:02:59.000000000 -0500
@@ -87,6 +87,7 @@
#include <asm/page.h>
#include <asm/segment.h>
@@ -29410,7 +29410,7 @@ diff -urNp linux-3.0.9/drivers/lguest/x86/switcher_32.S linux-3.0.9/drivers/lgue
// But we must truly tell each apart.
diff -urNp linux-3.0.9/drivers/macintosh/macio_asic.c linux-3.0.9/drivers/macintosh/macio_asic.c
--- linux-3.0.9/drivers/macintosh/macio_asic.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/macintosh/macio_asic.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/macintosh/macio_asic.c 2011-11-15 20:02:59.000000000 -0500
@@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(s
* MacIO is matched against any Apple ID, it's probe() function
* will then decide wether it applies or not
@@ -29422,7 +29422,7 @@ diff -urNp linux-3.0.9/drivers/macintosh/macio_asic.c linux-3.0.9/drivers/macint
.subvendor = PCI_ANY_ID,
diff -urNp linux-3.0.9/drivers/md/dm.c linux-3.0.9/drivers/md/dm.c
--- linux-3.0.9/drivers/md/dm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/dm.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/md/dm.c 2011-11-15 20:02:59.000000000 -0500
@@ -164,9 +164,9 @@ struct mapped_device {
/*
* Event handling.
@@ -29479,7 +29479,7 @@ diff -urNp linux-3.0.9/drivers/md/dm.c linux-3.0.9/drivers/md/dm.c
void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
diff -urNp linux-3.0.9/drivers/md/dm-ioctl.c linux-3.0.9/drivers/md/dm-ioctl.c
--- linux-3.0.9/drivers/md/dm-ioctl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/dm-ioctl.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/md/dm-ioctl.c 2011-11-15 20:02:59.000000000 -0500
@@ -1551,7 +1551,7 @@ static int validate_params(uint cmd, str
cmd == DM_LIST_VERSIONS_CMD)
return 0;
@@ -29491,7 +29491,7 @@ diff -urNp linux-3.0.9/drivers/md/dm-ioctl.c linux-3.0.9/drivers/md/dm-ioctl.c
return -EINVAL;
diff -urNp linux-3.0.9/drivers/md/dm-raid1.c linux-3.0.9/drivers/md/dm-raid1.c
--- linux-3.0.9/drivers/md/dm-raid1.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/dm-raid1.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/md/dm-raid1.c 2011-11-15 20:02:59.000000000 -0500
@@ -40,7 +40,7 @@ enum dm_raid1_error {
struct mirror {
@@ -29566,7 +29566,7 @@ diff -urNp linux-3.0.9/drivers/md/dm-raid1.c linux-3.0.9/drivers/md/dm-raid1.c
return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
diff -urNp linux-3.0.9/drivers/md/dm-stripe.c linux-3.0.9/drivers/md/dm-stripe.c
--- linux-3.0.9/drivers/md/dm-stripe.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/dm-stripe.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/md/dm-stripe.c 2011-11-15 20:02:59.000000000 -0500
@@ -20,7 +20,7 @@ struct stripe {
struct dm_dev *dev;
sector_t physical_start;
@@ -29607,7 +29607,7 @@ diff -urNp linux-3.0.9/drivers/md/dm-stripe.c linux-3.0.9/drivers/md/dm-stripe.c
}
diff -urNp linux-3.0.9/drivers/md/dm-table.c linux-3.0.9/drivers/md/dm-table.c
--- linux-3.0.9/drivers/md/dm-table.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/dm-table.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/md/dm-table.c 2011-11-15 20:02:59.000000000 -0500
@@ -390,7 +390,7 @@ static int device_area_is_invalid(struct
if (!dev_size)
return 0;
@@ -29619,7 +29619,7 @@ diff -urNp linux-3.0.9/drivers/md/dm-table.c linux-3.0.9/drivers/md/dm-table.c
dm_device_name(ti->table->md), bdevname(bdev, b),
diff -urNp linux-3.0.9/drivers/md/md.c linux-3.0.9/drivers/md/md.c
--- linux-3.0.9/drivers/md/md.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/md.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/md/md.c 2011-11-15 20:02:59.000000000 -0500
@@ -231,10 +231,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
* start build, activate spare
*/
@@ -29736,7 +29736,7 @@ diff -urNp linux-3.0.9/drivers/md/md.c linux-3.0.9/drivers/md/md.c
* disk_stats is counted when it completes.
diff -urNp linux-3.0.9/drivers/md/md.h linux-3.0.9/drivers/md/md.h
--- linux-3.0.9/drivers/md/md.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/md.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/md/md.h 2011-11-15 20:02:59.000000000 -0500
@@ -97,13 +97,13 @@ struct mdk_rdev_s
* only maintained for arrays that
* support hot removal
@@ -29764,7 +29764,7 @@ diff -urNp linux-3.0.9/drivers/md/md.h linux-3.0.9/drivers/md/md.h
struct mdk_personality
diff -urNp linux-3.0.9/drivers/md/raid10.c linux-3.0.9/drivers/md/raid10.c
--- linux-3.0.9/drivers/md/raid10.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/raid10.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/md/raid10.c 2011-11-15 20:02:59.000000000 -0500
@@ -1186,7 +1186,7 @@ static void end_sync_read(struct bio *bi
if (test_bit(BIO_UPTODATE, &bio->bi_flags))
set_bit(R10BIO_Uptodate, &r10_bio->state);
@@ -29826,7 +29826,7 @@ diff -urNp linux-3.0.9/drivers/md/raid10.c linux-3.0.9/drivers/md/raid10.c
sect,
diff -urNp linux-3.0.9/drivers/md/raid1.c linux-3.0.9/drivers/md/raid1.c
--- linux-3.0.9/drivers/md/raid1.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/raid1.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/md/raid1.c 2011-11-15 20:02:59.000000000 -0500
@@ -1263,7 +1263,7 @@ static int fix_sync_read_error(r1bio_t *
rdev_dec_pending(rdev, mddev);
md_error(mddev, rdev);
@@ -29847,7 +29847,7 @@ diff -urNp linux-3.0.9/drivers/md/raid1.c linux-3.0.9/drivers/md/raid1.c
"(%d sectors at %llu on %s)\n",
diff -urNp linux-3.0.9/drivers/md/raid5.c linux-3.0.9/drivers/md/raid5.c
--- linux-3.0.9/drivers/md/raid5.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/md/raid5.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/md/raid5.c 2011-11-15 20:02:59.000000000 -0500
@@ -550,7 +550,7 @@ static void ops_run_io(struct stripe_hea
bi->bi_next = NULL;
if ((rw & WRITE) &&
@@ -29895,7 +29895,7 @@ diff -urNp linux-3.0.9/drivers/md/raid5.c linux-3.0.9/drivers/md/raid5.c
stripe = new_sector;
diff -urNp linux-3.0.9/drivers/media/common/saa7146_hlp.c linux-3.0.9/drivers/media/common/saa7146_hlp.c
--- linux-3.0.9/drivers/media/common/saa7146_hlp.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/common/saa7146_hlp.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/common/saa7146_hlp.c 2011-11-15 20:02:59.000000000 -0500
@@ -353,6 +353,8 @@ static void calculate_clipping_registers
int x[32], y[32], w[32], h[32];
@@ -29907,7 +29907,7 @@ diff -urNp linux-3.0.9/drivers/media/common/saa7146_hlp.c linux-3.0.9/drivers/me
memset(&pixel_list[0], 0x00, sizeof(u32)*32);
diff -urNp linux-3.0.9/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.9/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
--- linux-3.0.9/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-15 20:02:59.000000000 -0500
@@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru
u8 buf[HOST_LINK_BUF_SIZE];
int i;
@@ -29928,7 +29928,7 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.9/d
/* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
diff -urNp linux-3.0.9/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.9/drivers/media/dvb/dvb-core/dvb_demux.h
--- linux-3.0.9/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-15 20:02:59.000000000 -0500
@@ -68,12 +68,12 @@ struct dvb_demux_feed {
union {
struct dmx_ts_feed ts;
@@ -29946,7 +29946,7 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.9/driver
void *priv;
diff -urNp linux-3.0.9/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.9/drivers/media/dvb/dvb-core/dvbdev.c
--- linux-3.0.9/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-15 20:02:59.000000000 -0500
@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt
const struct dvb_device *template, void *priv, int type)
{
@@ -29958,7 +29958,7 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.9/drivers/m
int id;
diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.9/drivers/media/dvb/dvb-usb/cxusb.c
--- linux-3.0.9/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-15 20:02:59.000000000 -0500
@@ -1059,7 +1059,7 @@ static struct dib0070_config dib7070p_di
struct dib0700_adapter_state {
int (*set_param_save) (struct dvb_frontend *,
@@ -29970,7 +29970,7 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.9/drivers/med
struct dvb_frontend_parameters *fep)
diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.9/drivers/media/dvb/dvb-usb/dib0700_core.c
--- linux-3.0.9/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-15 20:02:59.000000000 -0500
@@ -478,6 +478,8 @@ int dib0700_download_firmware(struct usb
if (!buf)
return -ENOMEM;
@@ -29982,7 +29982,7 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.9/driv
hx.addr, hx.len, hx.chk);
diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.9/drivers/media/dvb/dvb-usb/dibusb.h
--- linux-3.0.9/drivers/media/dvb/dvb-usb/dibusb.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-usb/dibusb.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/dvb/dvb-usb/dibusb.h 2011-11-15 20:02:59.000000000 -0500
@@ -97,7 +97,7 @@
#define DIBUSB_IOCTL_CMD_DISABLE_STREAM 0x02
@@ -29994,7 +29994,7 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.9/drivers/me
};
diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.9/drivers/media/dvb/dvb-usb/dw2102.c
--- linux-3.0.9/drivers/media/dvb/dvb-usb/dw2102.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-usb/dw2102.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/dvb/dvb-usb/dw2102.c 2011-11-15 20:02:59.000000000 -0500
@@ -95,7 +95,7 @@ struct su3000_state {
struct s6x0_state {
@@ -30006,7 +30006,7 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.9/drivers/me
static int dvb_usb_dw2102_debug;
diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.9/drivers/media/dvb/dvb-usb/lmedm04.c
--- linux-3.0.9/drivers/media/dvb/dvb-usb/lmedm04.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/dvb-usb/lmedm04.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/dvb/dvb-usb/lmedm04.c 2011-11-15 20:02:59.000000000 -0500
@@ -742,6 +742,7 @@ static int lme2510_download_firmware(str
usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
0x06, 0x80, 0x0200, 0x00, data, 0x0109, 1000);
@@ -30026,7 +30026,7 @@ diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.9/drivers/m
info("FRM Firmware Cold Reset");
diff -urNp linux-3.0.9/drivers/media/dvb/frontends/dib3000.h linux-3.0.9/drivers/media/dvb/frontends/dib3000.h
--- linux-3.0.9/drivers/media/dvb/frontends/dib3000.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/frontends/dib3000.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/dvb/frontends/dib3000.h 2011-11-15 20:02:59.000000000 -0500
@@ -40,10 +40,11 @@ struct dib_fe_xfer_ops
int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
@@ -30042,7 +30042,7 @@ diff -urNp linux-3.0.9/drivers/media/dvb/frontends/dib3000.h linux-3.0.9/drivers
struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops)
diff -urNp linux-3.0.9/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.9/drivers/media/dvb/frontends/dib3000mb.c
--- linux-3.0.9/drivers/media/dvb/frontends/dib3000mb.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/frontends/dib3000mb.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/dvb/frontends/dib3000mb.c 2011-11-15 20:02:59.000000000 -0500
@@ -756,7 +756,7 @@ static int dib3000mb_tuner_pass_ctrl(str
static struct dvb_frontend_ops dib3000mb_ops;
@@ -30054,7 +30054,7 @@ diff -urNp linux-3.0.9/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.9/drive
diff -urNp linux-3.0.9/drivers/media/dvb/frontends/mb86a16.c linux-3.0.9/drivers/media/dvb/frontends/mb86a16.c
--- linux-3.0.9/drivers/media/dvb/frontends/mb86a16.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/frontends/mb86a16.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/dvb/frontends/mb86a16.c 2011-11-15 20:02:59.000000000 -0500
@@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16
int ret = -1;
int sync;
@@ -30066,7 +30066,7 @@ diff -urNp linux-3.0.9/drivers/media/dvb/frontends/mb86a16.c linux-3.0.9/drivers
fcp = 3000;
diff -urNp linux-3.0.9/drivers/media/dvb/frontends/or51211.c linux-3.0.9/drivers/media/dvb/frontends/or51211.c
--- linux-3.0.9/drivers/media/dvb/frontends/or51211.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/frontends/or51211.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/dvb/frontends/or51211.c 2011-11-15 20:02:59.000000000 -0500
@@ -113,6 +113,8 @@ static int or51211_load_firmware (struct
u8 tudata[585];
int i;
@@ -30078,7 +30078,7 @@ diff -urNp linux-3.0.9/drivers/media/dvb/frontends/or51211.c linux-3.0.9/drivers
/* Get eprom data */
diff -urNp linux-3.0.9/drivers/media/dvb/ngene/ngene-cards.c linux-3.0.9/drivers/media/dvb/ngene/ngene-cards.c
--- linux-3.0.9/drivers/media/dvb/ngene/ngene-cards.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/dvb/ngene/ngene-cards.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/dvb/ngene/ngene-cards.c 2011-11-15 20:02:59.000000000 -0500
@@ -379,7 +379,7 @@ static struct ngene_info ngene_info_m780
/****************************************************************************/
@@ -30090,7 +30090,7 @@ diff -urNp linux-3.0.9/drivers/media/dvb/ngene/ngene-cards.c linux-3.0.9/drivers
NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
diff -urNp linux-3.0.9/drivers/media/video/cx18/cx18-driver.c linux-3.0.9/drivers/media/video/cx18/cx18-driver.c
--- linux-3.0.9/drivers/media/video/cx18/cx18-driver.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/cx18/cx18-driver.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/video/cx18/cx18-driver.c 2011-11-15 20:02:59.000000000 -0500
@@ -327,6 +327,8 @@ void cx18_read_eeprom(struct cx18 *cx, s
struct i2c_client c;
u8 eedata[256];
@@ -30102,7 +30102,7 @@ diff -urNp linux-3.0.9/drivers/media/video/cx18/cx18-driver.c linux-3.0.9/driver
c.adapter = &cx->i2c_adap[0];
diff -urNp linux-3.0.9/drivers/media/video/cx23885/cx23885-input.c linux-3.0.9/drivers/media/video/cx23885/cx23885-input.c
--- linux-3.0.9/drivers/media/video/cx23885/cx23885-input.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/cx23885/cx23885-input.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/video/cx23885/cx23885-input.c 2011-11-15 20:02:59.000000000 -0500
@@ -53,6 +53,8 @@ static void cx23885_input_process_measur
bool handle = false;
struct ir_raw_event ir_core_event[64];
@@ -30114,7 +30114,7 @@ diff -urNp linux-3.0.9/drivers/media/video/cx23885/cx23885-input.c linux-3.0.9/d
v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event,
diff -urNp linux-3.0.9/drivers/media/video/cx88/cx88-alsa.c linux-3.0.9/drivers/media/video/cx88/cx88-alsa.c
--- linux-3.0.9/drivers/media/video/cx88/cx88-alsa.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/cx88/cx88-alsa.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/video/cx88/cx88-alsa.c 2011-11-15 20:02:59.000000000 -0500
@@ -764,7 +764,7 @@ static struct snd_kcontrol_new snd_cx88_
* Only boards with eeprom and byte 1 at eeprom=1 have it
*/
@@ -30126,7 +30126,7 @@ diff -urNp linux-3.0.9/drivers/media/video/cx88/cx88-alsa.c linux-3.0.9/drivers/
{0, }
diff -urNp linux-3.0.9/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.9/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
--- linux-3.0.9/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-15 20:02:59.000000000 -0500
@@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw
u8 *eeprom;
struct tveeprom tvdata;
@@ -30138,7 +30138,7 @@ diff -urNp linux-3.0.9/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.9/
eeprom = pvr2_eeprom_fetch(hdw);
diff -urNp linux-3.0.9/drivers/media/video/saa7134/saa6752hs.c linux-3.0.9/drivers/media/video/saa7134/saa6752hs.c
--- linux-3.0.9/drivers/media/video/saa7134/saa6752hs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/saa7134/saa6752hs.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/video/saa7134/saa6752hs.c 2011-11-15 20:02:59.000000000 -0500
@@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_su
unsigned char localPAT[256];
unsigned char localPMT[256];
@@ -30150,7 +30150,7 @@ diff -urNp linux-3.0.9/drivers/media/video/saa7134/saa6752hs.c linux-3.0.9/drive
diff -urNp linux-3.0.9/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.9/drivers/media/video/saa7164/saa7164-cmd.c
--- linux-3.0.9/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-15 20:02:59.000000000 -0500
@@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_d
u8 tmp[512];
dprintk(DBGLVL_CMD, "%s()\n", __func__);
@@ -30171,7 +30171,7 @@ diff -urNp linux-3.0.9/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.9/dri
struct tmComResInfo tRsp = { 0, 0, 0, 0, 0, 0 };
diff -urNp linux-3.0.9/drivers/media/video/timblogiw.c linux-3.0.9/drivers/media/video/timblogiw.c
--- linux-3.0.9/drivers/media/video/timblogiw.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/timblogiw.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/video/timblogiw.c 2011-11-15 20:02:59.000000000 -0500
@@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *f
/* Platform device functions */
@@ -30183,7 +30183,7 @@ diff -urNp linux-3.0.9/drivers/media/video/timblogiw.c linux-3.0.9/drivers/media
.vidioc_g_fmt_vid_cap = timblogiw_g_fmt,
diff -urNp linux-3.0.9/drivers/media/video/usbvision/usbvision-core.c linux-3.0.9/drivers/media/video/usbvision/usbvision-core.c
--- linux-3.0.9/drivers/media/video/usbvision/usbvision-core.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/usbvision/usbvision-core.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/video/usbvision/usbvision-core.c 2011-11-15 20:02:59.000000000 -0500
@@ -707,6 +707,8 @@ static enum parse_state usbvision_parse_
unsigned char rv, gv, bv;
static unsigned char *Y, *U, *V;
@@ -30195,7 +30195,7 @@ diff -urNp linux-3.0.9/drivers/media/video/usbvision/usbvision-core.c linux-3.0.
if ((frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) ||
diff -urNp linux-3.0.9/drivers/media/video/videobuf-dma-sg.c linux-3.0.9/drivers/media/video/videobuf-dma-sg.c
--- linux-3.0.9/drivers/media/video/videobuf-dma-sg.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/media/video/videobuf-dma-sg.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/media/video/videobuf-dma-sg.c 2011-11-15 20:02:59.000000000 -0500
@@ -606,6 +606,8 @@ void *videobuf_sg_alloc(size_t size)
{
struct videobuf_queue q;
@@ -30207,7 +30207,7 @@ diff -urNp linux-3.0.9/drivers/media/video/videobuf-dma-sg.c linux-3.0.9/drivers
diff -urNp linux-3.0.9/drivers/message/fusion/mptbase.c linux-3.0.9/drivers/message/fusion/mptbase.c
--- linux-3.0.9/drivers/message/fusion/mptbase.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/message/fusion/mptbase.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/message/fusion/mptbase.c 2011-11-15 20:02:59.000000000 -0500
@@ -6681,8 +6681,13 @@ static int mpt_iocinfo_proc_show(struct
seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
@@ -30224,7 +30224,7 @@ diff -urNp linux-3.0.9/drivers/message/fusion/mptbase.c linux-3.0.9/drivers/mess
*/
diff -urNp linux-3.0.9/drivers/message/fusion/mptsas.c linux-3.0.9/drivers/message/fusion/mptsas.c
--- linux-3.0.9/drivers/message/fusion/mptsas.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/message/fusion/mptsas.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/message/fusion/mptsas.c 2011-11-15 20:02:59.000000000 -0500
@@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
return 0;
}
@@ -30275,7 +30275,7 @@ diff -urNp linux-3.0.9/drivers/message/fusion/mptsas.c linux-3.0.9/drivers/messa
{
diff -urNp linux-3.0.9/drivers/message/fusion/mptscsih.c linux-3.0.9/drivers/message/fusion/mptscsih.c
--- linux-3.0.9/drivers/message/fusion/mptscsih.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/message/fusion/mptscsih.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/message/fusion/mptscsih.c 2011-11-15 20:02:59.000000000 -0500
@@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
h = shost_priv(SChost);
@@ -30303,7 +30303,7 @@ diff -urNp linux-3.0.9/drivers/message/fusion/mptscsih.c linux-3.0.9/drivers/mes
}
diff -urNp linux-3.0.9/drivers/message/i2o/i2o_config.c linux-3.0.9/drivers/message/i2o/i2o_config.c
--- linux-3.0.9/drivers/message/i2o/i2o_config.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/message/i2o/i2o_config.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/message/i2o/i2o_config.c 2011-11-15 20:02:59.000000000 -0500
@@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned lon
struct i2o_message *msg;
unsigned int iop;
@@ -30315,7 +30315,7 @@ diff -urNp linux-3.0.9/drivers/message/i2o/i2o_config.c linux-3.0.9/drivers/mess
diff -urNp linux-3.0.9/drivers/message/i2o/i2o_proc.c linux-3.0.9/drivers/message/i2o/i2o_proc.c
--- linux-3.0.9/drivers/message/i2o/i2o_proc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/message/i2o/i2o_proc.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/message/i2o/i2o_proc.c 2011-11-15 20:02:59.000000000 -0500
@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
"Array Controller Device"
};
@@ -30404,7 +30404,7 @@ diff -urNp linux-3.0.9/drivers/message/i2o/i2o_proc.c linux-3.0.9/drivers/messag
}
diff -urNp linux-3.0.9/drivers/message/i2o/iop.c linux-3.0.9/drivers/message/i2o/iop.c
--- linux-3.0.9/drivers/message/i2o/iop.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/message/i2o/iop.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/message/i2o/iop.c 2011-11-15 20:02:59.000000000 -0500
@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro
spin_lock_irqsave(&c->context_list_lock, flags);
@@ -30430,7 +30430,7 @@ diff -urNp linux-3.0.9/drivers/message/i2o/iop.c linux-3.0.9/drivers/message/i2o
diff -urNp linux-3.0.9/drivers/mfd/ab3100-core.c linux-3.0.9/drivers/mfd/ab3100-core.c
--- linux-3.0.9/drivers/mfd/ab3100-core.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mfd/ab3100-core.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mfd/ab3100-core.c 2011-11-15 20:02:59.000000000 -0500
@@ -809,7 +809,7 @@ struct ab_family_id {
char *name;
};
@@ -30442,7 +30442,7 @@ diff -urNp linux-3.0.9/drivers/mfd/ab3100-core.c linux-3.0.9/drivers/mfd/ab3100-
.id = 0xc0,
diff -urNp linux-3.0.9/drivers/mfd/abx500-core.c linux-3.0.9/drivers/mfd/abx500-core.c
--- linux-3.0.9/drivers/mfd/abx500-core.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mfd/abx500-core.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mfd/abx500-core.c 2011-11-15 20:02:59.000000000 -0500
@@ -14,7 +14,7 @@ static LIST_HEAD(abx500_list);
struct abx500_device_entry {
@@ -30454,7 +30454,7 @@ diff -urNp linux-3.0.9/drivers/mfd/abx500-core.c linux-3.0.9/drivers/mfd/abx500-
diff -urNp linux-3.0.9/drivers/mfd/janz-cmodio.c linux-3.0.9/drivers/mfd/janz-cmodio.c
--- linux-3.0.9/drivers/mfd/janz-cmodio.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mfd/janz-cmodio.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mfd/janz-cmodio.c 2011-11-15 20:02:59.000000000 -0500
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
@@ -30465,7 +30465,7 @@ diff -urNp linux-3.0.9/drivers/mfd/janz-cmodio.c linux-3.0.9/drivers/mfd/janz-cm
#include <linux/interrupt.h>
diff -urNp linux-3.0.9/drivers/mfd/wm8350-i2c.c linux-3.0.9/drivers/mfd/wm8350-i2c.c
--- linux-3.0.9/drivers/mfd/wm8350-i2c.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mfd/wm8350-i2c.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mfd/wm8350-i2c.c 2011-11-15 20:02:59.000000000 -0500
@@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struc
u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
int ret;
@@ -30477,7 +30477,7 @@ diff -urNp linux-3.0.9/drivers/mfd/wm8350-i2c.c linux-3.0.9/drivers/mfd/wm8350-i
diff -urNp linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.c
--- linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.c 2011-11-15 20:02:59.000000000 -0500
@@ -437,7 +437,7 @@ static irqreturn_t lis302dl_interrupt(in
* the lid is closed. This leads to interrupts as soon as a little move
* is done.
@@ -30516,7 +30516,7 @@ diff -urNp linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.9/drivers/mi
}
diff -urNp linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.h
--- linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.h 2011-11-15 20:02:59.000000000 -0500
@@ -265,7 +265,7 @@ struct lis3lv02d {
struct input_polled_dev *idev; /* input device */
struct platform_device *pdev; /* platform device */
@@ -30528,7 +30528,7 @@ diff -urNp linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.9/drivers/mi
diff -urNp linux-3.0.9/drivers/misc/sgi-gru/gruhandles.c linux-3.0.9/drivers/misc/sgi-gru/gruhandles.c
--- linux-3.0.9/drivers/misc/sgi-gru/gruhandles.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/sgi-gru/gruhandles.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/misc/sgi-gru/gruhandles.c 2011-11-15 20:02:59.000000000 -0500
@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
unsigned long nsec;
@@ -30542,7 +30542,7 @@ diff -urNp linux-3.0.9/drivers/misc/sgi-gru/gruhandles.c linux-3.0.9/drivers/mis
}
diff -urNp linux-3.0.9/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.9/drivers/misc/sgi-gru/gruprocfs.c
--- linux-3.0.9/drivers/misc/sgi-gru/gruprocfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/sgi-gru/gruprocfs.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/misc/sgi-gru/gruprocfs.c 2011-11-15 20:02:59.000000000 -0500
@@ -32,9 +32,9 @@
#define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -30568,7 +30568,7 @@ diff -urNp linux-3.0.9/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.9/drivers/misc
count ? total / count : 0, max);
diff -urNp linux-3.0.9/drivers/misc/sgi-gru/grutables.h linux-3.0.9/drivers/misc/sgi-gru/grutables.h
--- linux-3.0.9/drivers/misc/sgi-gru/grutables.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/sgi-gru/grutables.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/misc/sgi-gru/grutables.h 2011-11-15 20:02:59.000000000 -0500
@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
* GRU statistics.
*/
@@ -30750,7 +30750,7 @@ diff -urNp linux-3.0.9/drivers/misc/sgi-gru/grutables.h linux-3.0.9/drivers/misc
#ifdef CONFIG_SGI_GRU_DEBUG
diff -urNp linux-3.0.9/drivers/misc/sgi-xp/xpc.h linux-3.0.9/drivers/misc/sgi-xp/xpc.h
--- linux-3.0.9/drivers/misc/sgi-xp/xpc.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/sgi-xp/xpc.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/misc/sgi-xp/xpc.h 2011-11-15 20:02:59.000000000 -0500
@@ -835,6 +835,7 @@ struct xpc_arch_operations {
void (*received_payload) (struct xpc_channel *, void *);
void (*notify_senders_of_disconnect) (struct xpc_channel *);
@@ -30770,7 +30770,7 @@ diff -urNp linux-3.0.9/drivers/misc/sgi-xp/xpc.h linux-3.0.9/drivers/misc/sgi-xp
extern int xpc_activate_IRQ_rcvd;
diff -urNp linux-3.0.9/drivers/misc/sgi-xp/xpc_main.c linux-3.0.9/drivers/misc/sgi-xp/xpc_main.c
--- linux-3.0.9/drivers/misc/sgi-xp/xpc_main.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/sgi-xp/xpc_main.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/misc/sgi-xp/xpc_main.c 2011-11-15 20:02:59.000000000 -0500
@@ -162,7 +162,7 @@ static struct notifier_block xpc_die_not
.notifier_call = xpc_system_die,
};
@@ -30782,7 +30782,7 @@ diff -urNp linux-3.0.9/drivers/misc/sgi-xp/xpc_main.c linux-3.0.9/drivers/misc/s
* Timer function to enforce the timelimit on the partition disengage.
diff -urNp linux-3.0.9/drivers/misc/sgi-xp/xp.h linux-3.0.9/drivers/misc/sgi-xp/xp.h
--- linux-3.0.9/drivers/misc/sgi-xp/xp.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/misc/sgi-xp/xp.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/misc/sgi-xp/xp.h 2011-11-15 20:02:59.000000000 -0500
@@ -289,7 +289,7 @@ struct xpc_interface {
xpc_notify_func, void *);
void (*received) (short, int, void *);
@@ -30794,7 +30794,7 @@ diff -urNp linux-3.0.9/drivers/misc/sgi-xp/xp.h linux-3.0.9/drivers/misc/sgi-xp/
diff -urNp linux-3.0.9/drivers/mmc/host/sdhci-pci.c linux-3.0.9/drivers/mmc/host/sdhci-pci.c
--- linux-3.0.9/drivers/mmc/host/sdhci-pci.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mmc/host/sdhci-pci.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mmc/host/sdhci-pci.c 2011-11-15 20:02:59.000000000 -0500
@@ -524,7 +524,7 @@ static const struct sdhci_pci_fixes sdhc
.probe = via_probe,
};
@@ -30806,7 +30806,7 @@ diff -urNp linux-3.0.9/drivers/mmc/host/sdhci-pci.c linux-3.0.9/drivers/mmc/host
.device = PCI_DEVICE_ID_RICOH_R5C822,
diff -urNp linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0001.c
--- linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-15 20:02:59.000000000 -0500
@@ -757,6 +757,8 @@ static int chip_ready (struct map_info *
struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
unsigned long timeo = jiffies + HZ;
@@ -30836,7 +30836,7 @@ diff -urNp linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.9/drivers/m
retry:
diff -urNp linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0020.c
--- linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-15 20:02:59.000000000 -0500
@@ -255,6 +255,8 @@ static inline int do_read_onechip(struct
unsigned long cmd_addr;
struct cfi_private *cfi = map->fldrv_priv;
@@ -30884,7 +30884,7 @@ diff -urNp linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.9/drivers/m
/* Let's determine this according to the interleave only once */
diff -urNp linux-3.0.9/drivers/mtd/devices/doc2000.c linux-3.0.9/drivers/mtd/devices/doc2000.c
--- linux-3.0.9/drivers/mtd/devices/doc2000.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/devices/doc2000.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mtd/devices/doc2000.c 2011-11-15 20:02:59.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 */
@@ -30896,7 +30896,7 @@ diff -urNp linux-3.0.9/drivers/mtd/devices/doc2000.c linux-3.0.9/drivers/mtd/dev
(long) to, (long) len);
diff -urNp linux-3.0.9/drivers/mtd/devices/doc2001.c linux-3.0.9/drivers/mtd/devices/doc2001.c
--- linux-3.0.9/drivers/mtd/devices/doc2001.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/devices/doc2001.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mtd/devices/doc2001.c 2011-11-15 20:02:59.000000000 -0500
@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
struct Nand *mychip = &this->chips[from >> (this->chipshift)];
@@ -30908,7 +30908,7 @@ diff -urNp linux-3.0.9/drivers/mtd/devices/doc2001.c linux-3.0.9/drivers/mtd/dev
/* Don't allow a single read to cross a 512-byte block boundary */
diff -urNp linux-3.0.9/drivers/mtd/ftl.c linux-3.0.9/drivers/mtd/ftl.c
--- linux-3.0.9/drivers/mtd/ftl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/ftl.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mtd/ftl.c 2011-11-15 20:02:59.000000000 -0500
@@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *
loff_t offset;
uint16_t srcunitswap = cpu_to_le16(srcunit);
@@ -30920,7 +30920,7 @@ diff -urNp linux-3.0.9/drivers/mtd/ftl.c linux-3.0.9/drivers/mtd/ftl.c
DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n",
diff -urNp linux-3.0.9/drivers/mtd/inftlcore.c linux-3.0.9/drivers/mtd/inftlcore.c
--- linux-3.0.9/drivers/mtd/inftlcore.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/inftlcore.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mtd/inftlcore.c 2011-11-15 20:02:59.000000000 -0500
@@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLr
struct inftl_oob oob;
size_t retlen;
@@ -30932,7 +30932,7 @@ diff -urNp linux-3.0.9/drivers/mtd/inftlcore.c linux-3.0.9/drivers/mtd/inftlcore
diff -urNp linux-3.0.9/drivers/mtd/inftlmount.c linux-3.0.9/drivers/mtd/inftlmount.c
--- linux-3.0.9/drivers/mtd/inftlmount.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/inftlmount.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mtd/inftlmount.c 2011-11-15 20:02:59.000000000 -0500
@@ -53,6 +53,8 @@ static int find_boot_record(struct INFTL
struct INFTLPartition *ip;
size_t retlen;
@@ -30944,7 +30944,7 @@ diff -urNp linux-3.0.9/drivers/mtd/inftlmount.c linux-3.0.9/drivers/mtd/inftlmou
/*
diff -urNp linux-3.0.9/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.9/drivers/mtd/lpddr/qinfo_probe.c
--- linux-3.0.9/drivers/mtd/lpddr/qinfo_probe.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/lpddr/qinfo_probe.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mtd/lpddr/qinfo_probe.c 2011-11-15 20:02:59.000000000 -0500
@@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map
{
map_word pfow_val[4];
@@ -30956,7 +30956,7 @@ diff -urNp linux-3.0.9/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.9/drivers/mtd/l
pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F);
diff -urNp linux-3.0.9/drivers/mtd/mtdchar.c linux-3.0.9/drivers/mtd/mtdchar.c
--- linux-3.0.9/drivers/mtd/mtdchar.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/mtdchar.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mtd/mtdchar.c 2011-11-15 20:02:59.000000000 -0500
@@ -554,6 +554,8 @@ static int mtd_ioctl(struct file *file,
u_long size;
struct mtd_info_user info;
@@ -30968,7 +30968,7 @@ diff -urNp linux-3.0.9/drivers/mtd/mtdchar.c linux-3.0.9/drivers/mtd/mtdchar.c
size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
diff -urNp linux-3.0.9/drivers/mtd/nand/denali.c linux-3.0.9/drivers/mtd/nand/denali.c
--- linux-3.0.9/drivers/mtd/nand/denali.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/nand/denali.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mtd/nand/denali.c 2011-11-15 20:02:59.000000000 -0500
@@ -26,6 +26,7 @@
#include <linux/pci.h>
#include <linux/mtd/mtd.h>
@@ -30979,7 +30979,7 @@ diff -urNp linux-3.0.9/drivers/mtd/nand/denali.c linux-3.0.9/drivers/mtd/nand/de
diff -urNp linux-3.0.9/drivers/mtd/nftlcore.c linux-3.0.9/drivers/mtd/nftlcore.c
--- linux-3.0.9/drivers/mtd/nftlcore.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/nftlcore.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mtd/nftlcore.c 2011-11-15 20:02:59.000000000 -0500
@@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLre
int inplace = 1;
size_t retlen;
@@ -30991,7 +30991,7 @@ diff -urNp linux-3.0.9/drivers/mtd/nftlcore.c linux-3.0.9/drivers/mtd/nftlcore.c
diff -urNp linux-3.0.9/drivers/mtd/nftlmount.c linux-3.0.9/drivers/mtd/nftlmount.c
--- linux-3.0.9/drivers/mtd/nftlmount.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/nftlmount.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mtd/nftlmount.c 2011-11-15 20:02:59.000000000 -0500
@@ -24,6 +24,7 @@
#include <asm/errno.h>
#include <linux/delay.h>
@@ -31011,7 +31011,7 @@ diff -urNp linux-3.0.9/drivers/mtd/nftlmount.c linux-3.0.9/drivers/mtd/nftlmount
/* Actually, we won't. The new DiskOnChip driver has already scanned
diff -urNp linux-3.0.9/drivers/mtd/ubi/build.c linux-3.0.9/drivers/mtd/ubi/build.c
--- linux-3.0.9/drivers/mtd/ubi/build.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/mtd/ubi/build.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/mtd/ubi/build.c 2011-11-15 20:02:59.000000000 -0500
@@ -1287,7 +1287,7 @@ module_exit(ubi_exit);
static int __init bytes_str_to_int(const char *str)
{
@@ -31053,7 +31053,7 @@ diff -urNp linux-3.0.9/drivers/mtd/ubi/build.c linux-3.0.9/drivers/mtd/ubi/build
/**
diff -urNp linux-3.0.9/drivers/net/atlx/atl2.c linux-3.0.9/drivers/net/atlx/atl2.c
--- linux-3.0.9/drivers/net/atlx/atl2.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/atlx/atl2.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/atlx/atl2.c 2011-11-15 20:02:59.000000000 -0500
@@ -2840,7 +2840,7 @@ static void atl2_force_ps(struct atl2_hw
*/
@@ -31065,7 +31065,7 @@ diff -urNp linux-3.0.9/drivers/net/atlx/atl2.c linux-3.0.9/drivers/net/atlx/atl2
#else
diff -urNp linux-3.0.9/drivers/net/bna/bfa_ioc_ct.c linux-3.0.9/drivers/net/bna/bfa_ioc_ct.c
--- linux-3.0.9/drivers/net/bna/bfa_ioc_ct.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/bna/bfa_ioc_ct.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/bna/bfa_ioc_ct.c 2011-11-15 20:02:59.000000000 -0500
@@ -48,7 +48,21 @@ static void bfa_ioc_ct_sync_ack(struct b
static bool bfa_ioc_ct_sync_complete(struct bfa_ioc *ioc);
static enum bfa_status bfa_ioc_ct_pll_init(void __iomem *rb, bool fcmode);
@@ -31112,7 +31112,7 @@ diff -urNp linux-3.0.9/drivers/net/bna/bfa_ioc_ct.c linux-3.0.9/drivers/net/bna/
diff -urNp linux-3.0.9/drivers/net/bna/bnad.c linux-3.0.9/drivers/net/bna/bnad.c
--- linux-3.0.9/drivers/net/bna/bnad.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/bna/bnad.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/bna/bnad.c 2011-11-15 20:02:59.000000000 -0500
@@ -1681,7 +1681,14 @@ bnad_setup_tx(struct bnad *bnad, uint tx
struct bna_intr_info *intr_info =
&res_info[BNA_TX_RES_INTR_T_TXCMPL].res_u.intr_info;
@@ -31176,7 +31176,7 @@ diff -urNp linux-3.0.9/drivers/net/bna/bnad.c linux-3.0.9/drivers/net/bna/bnad.c
bna_rx_res_req(rx_config, res_info);
diff -urNp linux-3.0.9/drivers/net/bnx2.c linux-3.0.9/drivers/net/bnx2.c
--- linux-3.0.9/drivers/net/bnx2.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/bnx2.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/bnx2.c 2011-11-15 20:02:59.000000000 -0500
@@ -5831,6 +5831,8 @@ bnx2_test_nvram(struct bnx2 *bp)
int rc = 0;
u32 magic, csum;
@@ -31188,7 +31188,7 @@ diff -urNp linux-3.0.9/drivers/net/bnx2.c linux-3.0.9/drivers/net/bnx2.c
diff -urNp linux-3.0.9/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.9/drivers/net/bnx2x/bnx2x_ethtool.c
--- linux-3.0.9/drivers/net/bnx2x/bnx2x_ethtool.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/bnx2x/bnx2x_ethtool.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/bnx2x/bnx2x_ethtool.c 2011-11-15 20:02:59.000000000 -0500
@@ -1705,6 +1705,8 @@ static int bnx2x_test_nvram(struct bnx2x
int i, rc;
u32 magic, crc;
@@ -31200,7 +31200,7 @@ diff -urNp linux-3.0.9/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.9/drivers/net
diff -urNp linux-3.0.9/drivers/net/can/mscan/mscan.c linux-3.0.9/drivers/net/can/mscan/mscan.c
--- linux-3.0.9/drivers/net/can/mscan/mscan.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/can/mscan/mscan.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/can/mscan/mscan.c 2011-11-15 20:02:59.000000000 -0500
@@ -261,11 +261,13 @@ static netdev_tx_t mscan_start_xmit(stru
void __iomem *data = &regs->tx.dsr1_0;
u16 *payload = (u16 *)frame->data;
@@ -31234,7 +31234,7 @@ diff -urNp linux-3.0.9/drivers/net/can/mscan/mscan.c linux-3.0.9/drivers/net/can
out_8(&regs->canrflg, MSCAN_RXF);
diff -urNp linux-3.0.9/drivers/net/cxgb3/l2t.h linux-3.0.9/drivers/net/cxgb3/l2t.h
--- linux-3.0.9/drivers/net/cxgb3/l2t.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/cxgb3/l2t.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/cxgb3/l2t.h 2011-11-15 20:02:59.000000000 -0500
@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)
*/
struct l2t_skb_cb {
@@ -31246,7 +31246,7 @@ diff -urNp linux-3.0.9/drivers/net/cxgb3/l2t.h linux-3.0.9/drivers/net/cxgb3/l2t
diff -urNp linux-3.0.9/drivers/net/cxgb4/cxgb4_main.c linux-3.0.9/drivers/net/cxgb4/cxgb4_main.c
--- linux-3.0.9/drivers/net/cxgb4/cxgb4_main.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/cxgb4/cxgb4_main.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/cxgb4/cxgb4_main.c 2011-11-15 20:02:59.000000000 -0500
@@ -3396,6 +3396,8 @@ static int __devinit enable_msix(struct
unsigned int nchan = adap->params.nports;
struct msix_entry entries[MAX_INGQ + 1];
@@ -31258,7 +31258,7 @@ diff -urNp linux-3.0.9/drivers/net/cxgb4/cxgb4_main.c linux-3.0.9/drivers/net/cx
diff -urNp linux-3.0.9/drivers/net/cxgb4/t4_hw.c linux-3.0.9/drivers/net/cxgb4/t4_hw.c
--- linux-3.0.9/drivers/net/cxgb4/t4_hw.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/cxgb4/t4_hw.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/cxgb4/t4_hw.c 2011-11-15 20:02:59.000000000 -0500
@@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter
u8 vpd[VPD_LEN], csum;
unsigned int vpdr_len, kw_offset, id_len;
@@ -31270,7 +31270,7 @@ diff -urNp linux-3.0.9/drivers/net/cxgb4/t4_hw.c linux-3.0.9/drivers/net/cxgb4/t
return ret;
diff -urNp linux-3.0.9/drivers/net/e1000e/82571.c linux-3.0.9/drivers/net/e1000e/82571.c
--- linux-3.0.9/drivers/net/e1000e/82571.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/e1000e/82571.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/e1000e/82571.c 2011-11-15 20:02:59.000000000 -0500
@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s
{
struct e1000_hw *hw = &adapter->hw;
@@ -31282,7 +31282,7 @@ diff -urNp linux-3.0.9/drivers/net/e1000e/82571.c linux-3.0.9/drivers/net/e1000e
bool force_clear_smbi = false;
diff -urNp linux-3.0.9/drivers/net/e1000e/es2lan.c linux-3.0.9/drivers/net/e1000e/es2lan.c
--- linux-3.0.9/drivers/net/e1000e/es2lan.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/e1000e/es2lan.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/e1000e/es2lan.c 2011-11-15 20:02:59.000000000 -0500
@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es
{
struct e1000_hw *hw = &adapter->hw;
@@ -31294,7 +31294,7 @@ diff -urNp linux-3.0.9/drivers/net/e1000e/es2lan.c linux-3.0.9/drivers/net/e1000
switch (adapter->pdev->device) {
diff -urNp linux-3.0.9/drivers/net/e1000e/hw.h linux-3.0.9/drivers/net/e1000e/hw.h
--- linux-3.0.9/drivers/net/e1000e/hw.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/e1000e/hw.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/e1000e/hw.h 2011-11-15 20:02:59.000000000 -0500
@@ -776,6 +776,7 @@ struct e1000_mac_operations {
void (*write_vfta)(struct e1000_hw *, u32, u32);
s32 (*read_mac_addr)(struct e1000_hw *);
@@ -31343,7 +31343,7 @@ diff -urNp linux-3.0.9/drivers/net/e1000e/hw.h linux-3.0.9/drivers/net/e1000e/hw
enum e1000_nvm_override override;
diff -urNp linux-3.0.9/drivers/net/fealnx.c linux-3.0.9/drivers/net/fealnx.c
--- linux-3.0.9/drivers/net/fealnx.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/fealnx.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/fealnx.c 2011-11-15 20:02:59.000000000 -0500
@@ -150,7 +150,7 @@ struct chip_info {
int flags;
};
@@ -31355,7 +31355,7 @@ diff -urNp linux-3.0.9/drivers/net/fealnx.c linux-3.0.9/drivers/net/fealnx.c
{ "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
diff -urNp linux-3.0.9/drivers/net/hamradio/6pack.c linux-3.0.9/drivers/net/hamradio/6pack.c
--- linux-3.0.9/drivers/net/hamradio/6pack.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/hamradio/6pack.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/hamradio/6pack.c 2011-11-15 20:02:59.000000000 -0500
@@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct t
unsigned char buf[512];
int count1;
@@ -31367,7 +31367,7 @@ diff -urNp linux-3.0.9/drivers/net/hamradio/6pack.c linux-3.0.9/drivers/net/hamr
diff -urNp linux-3.0.9/drivers/net/igb/e1000_hw.h linux-3.0.9/drivers/net/igb/e1000_hw.h
--- linux-3.0.9/drivers/net/igb/e1000_hw.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/igb/e1000_hw.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/igb/e1000_hw.h 2011-11-15 20:02:59.000000000 -0500
@@ -314,6 +314,7 @@ struct e1000_mac_operations {
s32 (*read_mac_addr)(struct e1000_hw *);
s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
@@ -31438,7 +31438,7 @@ diff -urNp linux-3.0.9/drivers/net/igb/e1000_hw.h linux-3.0.9/drivers/net/igb/e1
u32 usec_delay;
diff -urNp linux-3.0.9/drivers/net/igbvf/vf.h linux-3.0.9/drivers/net/igbvf/vf.h
--- linux-3.0.9/drivers/net/igbvf/vf.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/igbvf/vf.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/igbvf/vf.h 2011-11-15 20:02:59.000000000 -0500
@@ -189,9 +189,10 @@ struct e1000_mac_operations {
s32 (*read_mac_addr)(struct e1000_hw *);
s32 (*set_vfta)(struct e1000_hw *, u16, bool);
@@ -31470,7 +31470,7 @@ diff -urNp linux-3.0.9/drivers/net/igbvf/vf.h linux-3.0.9/drivers/net/igbvf/vf.h
u32 usec_delay;
diff -urNp linux-3.0.9/drivers/net/ixgb/ixgb_main.c linux-3.0.9/drivers/net/ixgb/ixgb_main.c
--- linux-3.0.9/drivers/net/ixgb/ixgb_main.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/ixgb/ixgb_main.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/ixgb/ixgb_main.c 2011-11-15 20:02:59.000000000 -0500
@@ -1070,6 +1070,8 @@ ixgb_set_multi(struct net_device *netdev
u32 rctl;
int i;
@@ -31482,7 +31482,7 @@ diff -urNp linux-3.0.9/drivers/net/ixgb/ixgb_main.c linux-3.0.9/drivers/net/ixgb
rctl = IXGB_READ_REG(hw, RCTL);
diff -urNp linux-3.0.9/drivers/net/ixgb/ixgb_param.c linux-3.0.9/drivers/net/ixgb/ixgb_param.c
--- linux-3.0.9/drivers/net/ixgb/ixgb_param.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/ixgb/ixgb_param.c 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/ixgb/ixgb_param.c 2011-11-15 20:02:59.000000000 -0500
@@ -261,6 +261,9 @@ void __devinit
ixgb_check_options(struct ixgb_adapter *adapter)
{
@@ -31495,7 +31495,7 @@ diff -urNp linux-3.0.9/drivers/net/ixgb/ixgb_param.c linux-3.0.9/drivers/net/ixg
pr_notice("Using defaults for all values\n");
diff -urNp linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h
--- linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h 2011-11-15 20:02:59.000000000 -0500
@@ -2584,6 +2584,7 @@ struct ixgbe_eeprom_operations {
s32 (*update_checksum)(struct ixgbe_hw *);
u16 (*calc_checksum)(struct ixgbe_hw *);
@@ -31561,7 +31561,7 @@ diff -urNp linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h linux-3.0.9/drivers/net/ix
u32 usec_delay;
diff -urNp linux-3.0.9/drivers/net/ixgbevf/vf.h linux-3.0.9/drivers/net/ixgbevf/vf.h
--- linux-3.0.9/drivers/net/ixgbevf/vf.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/ixgbevf/vf.h 2011-11-12 12:47:13.000000000 -0500
++++ linux-3.0.9/drivers/net/ixgbevf/vf.h 2011-11-15 20:02:59.000000000 -0500
@@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
s32 (*clear_vfta)(struct ixgbe_hw *);
s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
@@ -31598,7 +31598,7 @@ diff -urNp linux-3.0.9/drivers/net/ixgbevf/vf.h linux-3.0.9/drivers/net/ixgbevf/
u32 udelay;
diff -urNp linux-3.0.9/drivers/net/ksz884x.c linux-3.0.9/drivers/net/ksz884x.c
--- linux-3.0.9/drivers/net/ksz884x.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/ksz884x.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/ksz884x.c 2011-11-15 20:02:59.000000000 -0500
@@ -6534,6 +6534,8 @@ static void netdev_get_ethtool_stats(str
int rc;
u64 counter[TOTAL_PORT_COUNTER_NUM];
@@ -31610,7 +31610,7 @@ diff -urNp linux-3.0.9/drivers/net/ksz884x.c linux-3.0.9/drivers/net/ksz884x.c
for (i = 0, p = port->first_port; i < port->mib_port_cnt; i++, p++) {
diff -urNp linux-3.0.9/drivers/net/mlx4/main.c linux-3.0.9/drivers/net/mlx4/main.c
--- linux-3.0.9/drivers/net/mlx4/main.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/mlx4/main.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/mlx4/main.c 2011-11-15 20:02:59.000000000 -0500
@@ -40,6 +40,7 @@
#include <linux/dma-mapping.h>
#include <linux/slab.h>
@@ -31630,7 +31630,7 @@ diff -urNp linux-3.0.9/drivers/net/mlx4/main.c linux-3.0.9/drivers/net/mlx4/main
if (err == -EACCES)
diff -urNp linux-3.0.9/drivers/net/niu.c linux-3.0.9/drivers/net/niu.c
--- linux-3.0.9/drivers/net/niu.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/niu.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/niu.c 2011-11-15 20:02:59.000000000 -0500
@@ -9056,6 +9056,8 @@ static void __devinit niu_try_msix(struc
int i, num_irqs, err;
u8 first_ldg;
@@ -31642,7 +31642,7 @@ diff -urNp linux-3.0.9/drivers/net/niu.c linux-3.0.9/drivers/net/niu.c
ldg_num_map[i] = first_ldg + i;
diff -urNp linux-3.0.9/drivers/net/pcnet32.c linux-3.0.9/drivers/net/pcnet32.c
--- linux-3.0.9/drivers/net/pcnet32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/pcnet32.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/pcnet32.c 2011-11-15 20:02:59.000000000 -0500
@@ -82,7 +82,7 @@ static int cards_found;
/*
* VLB I/O addresses
@@ -32267,7 +32267,7 @@ diff -urNp linux-3.0.9/drivers/net/pcnet32.c linux-3.0.9/drivers/net/pcnet32.c
netif_info(lp, link, dev, "link up\n");
diff -urNp linux-3.0.9/drivers/net/ppp_generic.c linux-3.0.9/drivers/net/ppp_generic.c
--- linux-3.0.9/drivers/net/ppp_generic.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/ppp_generic.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/ppp_generic.c 2011-11-15 20:02:59.000000000 -0500
@@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, st
void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
struct ppp_stats stats;
@@ -32288,7 +32288,7 @@ diff -urNp linux-3.0.9/drivers/net/ppp_generic.c linux-3.0.9/drivers/net/ppp_gen
break;
diff -urNp linux-3.0.9/drivers/net/r8169.c linux-3.0.9/drivers/net/r8169.c
--- linux-3.0.9/drivers/net/r8169.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/r8169.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/r8169.c 2011-11-15 20:02:59.000000000 -0500
@@ -645,12 +645,12 @@ struct rtl8169_private {
struct mdio_ops {
void (*write)(void __iomem *, int, int);
@@ -32306,7 +32306,7 @@ diff -urNp linux-3.0.9/drivers/net/r8169.c linux-3.0.9/drivers/net/r8169.c
int (*get_settings)(struct net_device *, struct ethtool_cmd *);
diff -urNp linux-3.0.9/drivers/net/sis190.c linux-3.0.9/drivers/net/sis190.c
--- linux-3.0.9/drivers/net/sis190.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/sis190.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/sis190.c 2011-11-15 20:02:59.000000000 -0500
@@ -1623,7 +1623,7 @@ static int __devinit sis190_get_mac_addr
static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
struct net_device *dev)
@@ -32318,7 +32318,7 @@ diff -urNp linux-3.0.9/drivers/net/sis190.c linux-3.0.9/drivers/net/sis190.c
u8 reg, tmp8;
diff -urNp linux-3.0.9/drivers/net/sundance.c linux-3.0.9/drivers/net/sundance.c
--- linux-3.0.9/drivers/net/sundance.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/sundance.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/sundance.c 2011-11-15 20:02:59.000000000 -0500
@@ -218,7 +218,7 @@ enum {
struct pci_id_info {
const char *name;
@@ -32330,7 +32330,7 @@ diff -urNp linux-3.0.9/drivers/net/sundance.c linux-3.0.9/drivers/net/sundance.c
{"D-Link DFE-580TX 4 port Server Adapter"},
diff -urNp linux-3.0.9/drivers/net/tg3.h linux-3.0.9/drivers/net/tg3.h
--- linux-3.0.9/drivers/net/tg3.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tg3.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/tg3.h 2011-11-15 20:02:59.000000000 -0500
@@ -134,6 +134,7 @@
#define CHIPREV_ID_5750_A0 0x4000
#define CHIPREV_ID_5750_A1 0x4001
@@ -32341,7 +32341,7 @@ diff -urNp linux-3.0.9/drivers/net/tg3.h linux-3.0.9/drivers/net/tg3.h
#define CHIPREV_ID_5752_A0 0x6000
diff -urNp linux-3.0.9/drivers/net/tokenring/abyss.c linux-3.0.9/drivers/net/tokenring/abyss.c
--- linux-3.0.9/drivers/net/tokenring/abyss.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tokenring/abyss.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/tokenring/abyss.c 2011-11-15 20:02:59.000000000 -0500
@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver =
static int __init abyss_init (void)
@@ -32360,7 +32360,7 @@ diff -urNp linux-3.0.9/drivers/net/tokenring/abyss.c linux-3.0.9/drivers/net/tok
}
diff -urNp linux-3.0.9/drivers/net/tokenring/madgemc.c linux-3.0.9/drivers/net/tokenring/madgemc.c
--- linux-3.0.9/drivers/net/tokenring/madgemc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tokenring/madgemc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/tokenring/madgemc.c 2011-11-15 20:02:59.000000000 -0500
@@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver
static int __init madgemc_init (void)
@@ -32378,7 +32378,7 @@ diff -urNp linux-3.0.9/drivers/net/tokenring/madgemc.c linux-3.0.9/drivers/net/t
}
diff -urNp linux-3.0.9/drivers/net/tokenring/proteon.c linux-3.0.9/drivers/net/tokenring/proteon.c
--- linux-3.0.9/drivers/net/tokenring/proteon.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tokenring/proteon.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/tokenring/proteon.c 2011-11-15 20:02:59.000000000 -0500
@@ -353,9 +353,11 @@ static int __init proteon_init(void)
struct platform_device *pdev;
int i, num = 0, err = 0;
@@ -32396,7 +32396,7 @@ diff -urNp linux-3.0.9/drivers/net/tokenring/proteon.c linux-3.0.9/drivers/net/t
if (err)
diff -urNp linux-3.0.9/drivers/net/tokenring/skisa.c linux-3.0.9/drivers/net/tokenring/skisa.c
--- linux-3.0.9/drivers/net/tokenring/skisa.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tokenring/skisa.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/tokenring/skisa.c 2011-11-15 20:02:59.000000000 -0500
@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
struct platform_device *pdev;
int i, num = 0, err = 0;
@@ -32414,7 +32414,7 @@ diff -urNp linux-3.0.9/drivers/net/tokenring/skisa.c linux-3.0.9/drivers/net/tok
if (err)
diff -urNp linux-3.0.9/drivers/net/tulip/de2104x.c linux-3.0.9/drivers/net/tulip/de2104x.c
--- linux-3.0.9/drivers/net/tulip/de2104x.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tulip/de2104x.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/tulip/de2104x.c 2011-11-15 20:02:59.000000000 -0500
@@ -1794,6 +1794,8 @@ static void __devinit de21041_get_srom_i
struct de_srom_info_leaf *il;
void *bufp;
@@ -32426,7 +32426,7 @@ diff -urNp linux-3.0.9/drivers/net/tulip/de2104x.c linux-3.0.9/drivers/net/tulip
((__le16 *)ee_data)[i] =
diff -urNp linux-3.0.9/drivers/net/tulip/de4x5.c linux-3.0.9/drivers/net/tulip/de4x5.c
--- linux-3.0.9/drivers/net/tulip/de4x5.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tulip/de4x5.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/tulip/de4x5.c 2011-11-15 20:02:59.000000000 -0500
@@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru
for (i=0; i<ETH_ALEN; i++) {
tmp.addr[i] = dev->dev_addr[i];
@@ -32447,7 +32447,7 @@ diff -urNp linux-3.0.9/drivers/net/tulip/de4x5.c linux-3.0.9/drivers/net/tulip/d
}
diff -urNp linux-3.0.9/drivers/net/tulip/eeprom.c linux-3.0.9/drivers/net/tulip/eeprom.c
--- linux-3.0.9/drivers/net/tulip/eeprom.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tulip/eeprom.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/tulip/eeprom.c 2011-11-15 20:02:59.000000000 -0500
@@ -81,7 +81,7 @@ static struct eeprom_fixup eeprom_fixups
{NULL}};
@@ -32459,7 +32459,7 @@ diff -urNp linux-3.0.9/drivers/net/tulip/eeprom.c linux-3.0.9/drivers/net/tulip/
"21142 Serial PHY",
diff -urNp linux-3.0.9/drivers/net/tulip/winbond-840.c linux-3.0.9/drivers/net/tulip/winbond-840.c
--- linux-3.0.9/drivers/net/tulip/winbond-840.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/tulip/winbond-840.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/tulip/winbond-840.c 2011-11-15 20:02:59.000000000 -0500
@@ -236,7 +236,7 @@ struct pci_id_info {
int drv_flags; /* Driver use, intended as capability flags. */
};
@@ -32471,7 +32471,7 @@ diff -urNp linux-3.0.9/drivers/net/tulip/winbond-840.c linux-3.0.9/drivers/net/t
{ "Winbond W89c840", CanHaveMII | HasBrokenTx},
diff -urNp linux-3.0.9/drivers/net/usb/hso.c linux-3.0.9/drivers/net/usb/hso.c
--- linux-3.0.9/drivers/net/usb/hso.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/usb/hso.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/usb/hso.c 2011-11-15 20:02:59.000000000 -0500
@@ -71,7 +71,7 @@
#include <asm/byteorder.h>
#include <linux/serial_core.h>
@@ -32570,7 +32570,7 @@ diff -urNp linux-3.0.9/drivers/net/usb/hso.c linux-3.0.9/drivers/net/usb/hso.c
hso_kick_transmit(dev2ser(serial_table[i]));
diff -urNp linux-3.0.9/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.9/drivers/net/vmxnet3/vmxnet3_ethtool.c
--- linux-3.0.9/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-11-15 20:02:59.000000000 -0500
@@ -594,8 +594,7 @@ vmxnet3_set_rss_indir(struct net_device
* Return with error code if any of the queue indices
* is out of range
@@ -32583,7 +32583,7 @@ diff -urNp linux-3.0.9/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.9/drivers
diff -urNp linux-3.0.9/drivers/net/vxge/vxge-config.h linux-3.0.9/drivers/net/vxge/vxge-config.h
--- linux-3.0.9/drivers/net/vxge/vxge-config.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/vxge/vxge-config.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/vxge/vxge-config.h 2011-11-15 20:02:59.000000000 -0500
@@ -512,7 +512,7 @@ struct vxge_hw_uld_cbs {
void (*link_down)(struct __vxge_hw_device *devh);
void (*crit_err)(struct __vxge_hw_device *devh,
@@ -32595,7 +32595,7 @@ diff -urNp linux-3.0.9/drivers/net/vxge/vxge-config.h linux-3.0.9/drivers/net/vx
* struct __vxge_hw_blockpool_entry - Block private data structure
diff -urNp linux-3.0.9/drivers/net/vxge/vxge-main.c linux-3.0.9/drivers/net/vxge/vxge-main.c
--- linux-3.0.9/drivers/net/vxge/vxge-main.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/vxge/vxge-main.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/vxge/vxge-main.c 2011-11-15 20:02:59.000000000 -0500
@@ -98,6 +98,8 @@ static inline void VXGE_COMPLETE_VPATH_T
struct sk_buff *completed[NR_SKB_COMPLETED];
int more;
@@ -32616,7 +32616,7 @@ diff -urNp linux-3.0.9/drivers/net/vxge/vxge-main.c linux-3.0.9/drivers/net/vxge
* - itable with bucket numbers
diff -urNp linux-3.0.9/drivers/net/vxge/vxge-traffic.h linux-3.0.9/drivers/net/vxge/vxge-traffic.h
--- linux-3.0.9/drivers/net/vxge/vxge-traffic.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/vxge/vxge-traffic.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/vxge/vxge-traffic.h 2011-11-15 20:02:59.000000000 -0500
@@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
struct vxge_hw_mempool_dma *dma_object,
u32 index,
@@ -32628,7 +32628,7 @@ diff -urNp linux-3.0.9/drivers/net/vxge/vxge-traffic.h linux-3.0.9/drivers/net/v
((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
diff -urNp linux-3.0.9/drivers/net/wan/cycx_x25.c linux-3.0.9/drivers/net/wan/cycx_x25.c
--- linux-3.0.9/drivers/net/wan/cycx_x25.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wan/cycx_x25.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wan/cycx_x25.c 2011-11-15 20:02:59.000000000 -0500
@@ -1018,6 +1018,8 @@ static void hex_dump(char *msg, unsigned
unsigned char hex[1024],
* phex = hex;
@@ -32640,7 +32640,7 @@ diff -urNp linux-3.0.9/drivers/net/wan/cycx_x25.c linux-3.0.9/drivers/net/wan/cy
diff -urNp linux-3.0.9/drivers/net/wan/hdlc_x25.c linux-3.0.9/drivers/net/wan/hdlc_x25.c
--- linux-3.0.9/drivers/net/wan/hdlc_x25.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wan/hdlc_x25.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wan/hdlc_x25.c 2011-11-15 20:02:59.000000000 -0500
@@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_bu
static int x25_open(struct net_device *dev)
@@ -32668,7 +32668,7 @@ diff -urNp linux-3.0.9/drivers/net/wan/hdlc_x25.c linux-3.0.9/drivers/net/wan/hd
return result;
diff -urNp linux-3.0.9/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.9/drivers/net/wimax/i2400m/usb-fw.c
--- linux-3.0.9/drivers/net/wimax/i2400m/usb-fw.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wimax/i2400m/usb-fw.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wimax/i2400m/usb-fw.c 2011-11-15 20:02:59.000000000 -0500
@@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru
int do_autopm = 1;
DECLARE_COMPLETION_ONSTACK(notif_completion);
@@ -32680,7 +32680,7 @@ diff -urNp linux-3.0.9/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.9/drivers/net
BUG_ON(_ack == i2400m->bm_ack_buf);
diff -urNp linux-3.0.9/drivers/net/wireless/airo.c linux-3.0.9/drivers/net/wireless/airo.c
--- linux-3.0.9/drivers/net/wireless/airo.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/airo.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/airo.c 2011-11-15 20:02:59.000000000 -0500
@@ -3003,6 +3003,8 @@ static void airo_process_scan_results (s
BSSListElement * loop_net;
BSSListElement * tmp_net;
@@ -32737,7 +32737,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/airo.c linux-3.0.9/drivers/net/wirel
if (local->power.event) {
diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.9/drivers/net/wireless/ath/ath5k/debug.c
--- linux-3.0.9/drivers/net/wireless/ath/ath5k/debug.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ath/ath5k/debug.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/ath/ath5k/debug.c 2011-11-15 20:02:59.000000000 -0500
@@ -204,6 +204,8 @@ static ssize_t read_file_beacon(struct f
unsigned int v;
u64 tsf;
@@ -32803,7 +32803,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.9/driver
diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_calib.c
--- linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-11-15 20:02:59.000000000 -0500
@@ -758,6 +758,8 @@ static void ar9003_hw_tx_iq_cal_post_pro
int i, im, j;
int nmeasurement;
@@ -32815,7 +32815,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.9
num_chains++;
diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
--- linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-11-15 20:02:59.000000000 -0500
@@ -356,6 +356,8 @@ static bool create_pa_curve(u32 *data_L,
int theta_low_bin = 0;
int i;
@@ -32827,7 +32827,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.9
scale_factor = 5;
diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c
--- linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c 2011-11-15 20:02:59.000000000 -0500
@@ -337,6 +337,8 @@ static ssize_t read_file_interrupt(struc
char buf[512];
unsigned int len = 0;
@@ -32848,7 +32848,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.9/driver
wiphy_name(sc->hw->wiphy),
diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.9/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
--- linux-3.0.9/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-11-15 20:02:59.000000000 -0500
@@ -31,6 +31,8 @@ static ssize_t read_file_tgt_int_stats(s
unsigned int len = 0;
int ret = 0;
@@ -32905,7 +32905,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.
diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h
--- linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h 2011-11-15 20:02:59.000000000 -0500
@@ -585,7 +585,7 @@ struct ath_hw_private_ops {
/* ANI */
@@ -32935,7 +32935,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.9/drivers/n
struct ath_common common;
diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath.h linux-3.0.9/drivers/net/wireless/ath/ath.h
--- linux-3.0.9/drivers/net/wireless/ath/ath.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ath/ath.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/ath/ath.h 2011-11-15 20:02:59.000000000 -0500
@@ -121,6 +121,7 @@ struct ath_ops {
void (*write_flush) (void *);
u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
@@ -32946,7 +32946,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath.h linux-3.0.9/drivers/net/wi
struct ath_bus_ops;
diff -urNp linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c
--- linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-15 20:02:59.000000000 -0500
@@ -2100,6 +2100,8 @@ static int ipw2100_set_essid(struct ipw2
int err;
DECLARE_SSID_BUF(ssid);
@@ -32967,7 +32967,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.9/driver
diff -urNp linux-3.0.9/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.9/drivers/net/wireless/ipw2x00/libipw_rx.c
--- linux-3.0.9/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-15 20:02:59.000000000 -0500
@@ -1565,6 +1565,8 @@ static void libipw_process_probe_respons
unsigned long flags;
DECLARE_SSID_BUF(ssid);
@@ -32979,7 +32979,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.9/driv
print_ssid(ssid, info_element->data, info_element->len),
diff -urNp linux-3.0.9/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.9/drivers/net/wireless/iwlegacy/iwl3945-base.c
--- linux-3.0.9/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-11-15 20:02:59.000000000 -0500
@@ -3962,7 +3962,9 @@ static int iwl3945_pci_probe(struct pci_
*/
if (iwl3945_mod_params.disable_hw_scan) {
@@ -32993,7 +32993,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.9/
IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
--- linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-15 20:02:59.000000000 -0500
@@ -910,6 +910,8 @@ static void rs_tx_status(void *priv_r, s
struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
struct iwl_rxon_context *ctx = sta_priv->common.ctx;
@@ -33014,7 +33014,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.9/dri
diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c
--- linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-15 20:02:59.000000000 -0500
@@ -548,6 +548,8 @@ static ssize_t iwl_dbgfs_status_read(str
int pos = 0;
const size_t bufsz = sizeof(buf);
@@ -33035,7 +33035,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.9/dr
ctx->ctxid);
diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debug.h
--- linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-15 20:02:59.000000000 -0500
@@ -68,8 +68,8 @@ do {
} while (0)
@@ -33049,7 +33049,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.9/driv
{}
diff -urNp linux-3.0.9/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.9/drivers/net/wireless/iwmc3200wifi/debugfs.c
--- linux-3.0.9/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-15 20:02:59.000000000 -0500
@@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(s
int buf_len = 512;
size_t len = 0;
@@ -33061,7 +33061,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.9/d
if (count < sizeof(buf))
diff -urNp linux-3.0.9/drivers/net/wireless/mac80211_hwsim.c linux-3.0.9/drivers/net/wireless/mac80211_hwsim.c
--- linux-3.0.9/drivers/net/wireless/mac80211_hwsim.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/mac80211_hwsim.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/mac80211_hwsim.c 2011-11-15 20:02:59.000000000 -0500
@@ -1260,9 +1260,11 @@ static int __init init_mac80211_hwsim(vo
return -EINVAL;
@@ -33079,7 +33079,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/mac80211_hwsim.c linux-3.0.9/drivers
spin_lock_init(&hwsim_radio_lock);
diff -urNp linux-3.0.9/drivers/net/wireless/rndis_wlan.c linux-3.0.9/drivers/net/wireless/rndis_wlan.c
--- linux-3.0.9/drivers/net/wireless/rndis_wlan.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/rndis_wlan.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/rndis_wlan.c 2011-11-15 20:02:59.000000000 -0500
@@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn
netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
@@ -33091,7 +33091,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/rndis_wlan.c linux-3.0.9/drivers/net
tmp = cpu_to_le32(rts_threshold);
diff -urNp linux-3.0.9/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.0.9/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
--- linux-3.0.9/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-11-15 20:02:59.000000000 -0500
@@ -837,6 +837,8 @@ bool _rtl92c_phy_sw_chnl_step_by_step(st
u8 rfpath;
u8 num_total_rfpath = rtlphy->num_total_rfpath;
@@ -33103,7 +33103,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-
MAX_PRECMD_CNT,
diff -urNp linux-3.0.9/drivers/net/wireless/wl1251/wl1251.h linux-3.0.9/drivers/net/wireless/wl1251/wl1251.h
--- linux-3.0.9/drivers/net/wireless/wl1251/wl1251.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/wl1251/wl1251.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/wl1251/wl1251.h 2011-11-15 20:02:59.000000000 -0500
@@ -266,7 +266,7 @@ struct wl1251_if_operations {
void (*reset)(struct wl1251 *wl);
void (*enable_irq)(struct wl1251 *wl);
@@ -33115,7 +33115,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/wl1251/wl1251.h linux-3.0.9/drivers/
struct ieee80211_hw *hw;
diff -urNp linux-3.0.9/drivers/net/wireless/wl12xx/spi.c linux-3.0.9/drivers/net/wireless/wl12xx/spi.c
--- linux-3.0.9/drivers/net/wireless/wl12xx/spi.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/net/wireless/wl12xx/spi.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/net/wireless/wl12xx/spi.c 2011-11-15 20:02:59.000000000 -0500
@@ -280,6 +280,8 @@ static void wl1271_spi_raw_write(struct
u32 chunk_len;
int i;
@@ -33127,7 +33127,7 @@ diff -urNp linux-3.0.9/drivers/net/wireless/wl12xx/spi.c linux-3.0.9/drivers/net
spi_message_init(&m);
diff -urNp linux-3.0.9/drivers/oprofile/buffer_sync.c linux-3.0.9/drivers/oprofile/buffer_sync.c
--- linux-3.0.9/drivers/oprofile/buffer_sync.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/oprofile/buffer_sync.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/oprofile/buffer_sync.c 2011-11-15 20:02:59.000000000 -0500
@@ -343,7 +343,7 @@ static void add_data(struct op_entry *en
if (cookie == NO_COOKIE)
offset = pc;
@@ -33165,7 +33165,7 @@ diff -urNp linux-3.0.9/drivers/oprofile/buffer_sync.c linux-3.0.9/drivers/oprofi
release_mm(mm);
diff -urNp linux-3.0.9/drivers/oprofile/event_buffer.c linux-3.0.9/drivers/oprofile/event_buffer.c
--- linux-3.0.9/drivers/oprofile/event_buffer.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/oprofile/event_buffer.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/oprofile/event_buffer.c 2011-11-15 20:02:59.000000000 -0500
@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
}
@@ -33177,7 +33177,7 @@ diff -urNp linux-3.0.9/drivers/oprofile/event_buffer.c linux-3.0.9/drivers/oprof
diff -urNp linux-3.0.9/drivers/oprofile/oprof.c linux-3.0.9/drivers/oprofile/oprof.c
--- linux-3.0.9/drivers/oprofile/oprof.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/oprofile/oprof.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/oprofile/oprof.c 2011-11-15 20:02:59.000000000 -0500
@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
if (oprofile_ops.switch_events())
return;
@@ -33189,7 +33189,7 @@ diff -urNp linux-3.0.9/drivers/oprofile/oprof.c linux-3.0.9/drivers/oprofile/opr
diff -urNp linux-3.0.9/drivers/oprofile/oprofilefs.c linux-3.0.9/drivers/oprofile/oprofilefs.c
--- linux-3.0.9/drivers/oprofile/oprofilefs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/oprofile/oprofilefs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/oprofile/oprofilefs.c 2011-11-15 20:02:59.000000000 -0500
@@ -186,7 +186,7 @@ static const struct file_operations atom
@@ -33201,7 +33201,7 @@ diff -urNp linux-3.0.9/drivers/oprofile/oprofilefs.c linux-3.0.9/drivers/oprofil
&atomic_ro_fops, 0444, val);
diff -urNp linux-3.0.9/drivers/oprofile/oprofile_stats.c linux-3.0.9/drivers/oprofile/oprofile_stats.c
--- linux-3.0.9/drivers/oprofile/oprofile_stats.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/oprofile/oprofile_stats.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/oprofile/oprofile_stats.c 2011-11-15 20:02:59.000000000 -0500
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
cpu_buf->sample_invalid_eip = 0;
}
@@ -33221,7 +33221,7 @@ diff -urNp linux-3.0.9/drivers/oprofile/oprofile_stats.c linux-3.0.9/drivers/opr
diff -urNp linux-3.0.9/drivers/oprofile/oprofile_stats.h linux-3.0.9/drivers/oprofile/oprofile_stats.h
--- linux-3.0.9/drivers/oprofile/oprofile_stats.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/oprofile/oprofile_stats.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/oprofile/oprofile_stats.h 2011-11-15 20:02:59.000000000 -0500
@@ -13,11 +13,11 @@
#include <asm/atomic.h>
@@ -33241,7 +33241,7 @@ diff -urNp linux-3.0.9/drivers/oprofile/oprofile_stats.h linux-3.0.9/drivers/opr
extern struct oprofile_stat_struct oprofile_stats;
diff -urNp linux-3.0.9/drivers/parport/procfs.c linux-3.0.9/drivers/parport/procfs.c
--- linux-3.0.9/drivers/parport/procfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/parport/procfs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/parport/procfs.c 2011-11-15 20:02:59.000000000 -0500
@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
*ppos += len;
@@ -33262,7 +33262,7 @@ diff -urNp linux-3.0.9/drivers/parport/procfs.c linux-3.0.9/drivers/parport/proc
diff -urNp linux-3.0.9/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.9/drivers/pci/hotplug/cpci_hotplug.h
--- linux-3.0.9/drivers/pci/hotplug/cpci_hotplug.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pci/hotplug/cpci_hotplug.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/pci/hotplug/cpci_hotplug.h 2011-11-15 20:02:59.000000000 -0500
@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
int (*hardware_test) (struct slot* slot, u32 value);
u8 (*get_power) (struct slot* slot);
@@ -33274,7 +33274,7 @@ diff -urNp linux-3.0.9/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.9/drivers/pc
unsigned int irq;
diff -urNp linux-3.0.9/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.9/drivers/pci/hotplug/cpqphp_nvram.c
--- linux-3.0.9/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-15 20:02:59.000000000 -0500
@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
void compaq_nvram_init (void __iomem *rom_start)
@@ -33291,7 +33291,7 @@ diff -urNp linux-3.0.9/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.9/drivers/pc
/* initialize our int15 lock */
diff -urNp linux-3.0.9/drivers/pci/pcie/aspm.c linux-3.0.9/drivers/pci/pcie/aspm.c
--- linux-3.0.9/drivers/pci/pcie/aspm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pci/pcie/aspm.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/pci/pcie/aspm.c 2011-11-15 20:02:59.000000000 -0500
@@ -27,9 +27,9 @@
#define MODULE_PARAM_PREFIX "pcie_aspm."
@@ -33307,7 +33307,7 @@ diff -urNp linux-3.0.9/drivers/pci/pcie/aspm.c linux-3.0.9/drivers/pci/pcie/aspm
diff -urNp linux-3.0.9/drivers/pci/probe.c linux-3.0.9/drivers/pci/probe.c
--- linux-3.0.9/drivers/pci/probe.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pci/probe.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/pci/probe.c 2011-11-15 20:02:59.000000000 -0500
@@ -129,7 +129,7 @@ int __pci_read_base(struct pci_dev *dev,
u32 l, sz, mask;
u16 orig_cmd;
@@ -33319,7 +33319,7 @@ diff -urNp linux-3.0.9/drivers/pci/probe.c linux-3.0.9/drivers/pci/probe.c
pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
diff -urNp linux-3.0.9/drivers/pci/proc.c linux-3.0.9/drivers/pci/proc.c
--- linux-3.0.9/drivers/pci/proc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pci/proc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/pci/proc.c 2011-11-15 20:02:59.000000000 -0500
@@ -476,7 +476,16 @@ static const struct file_operations proc
static int __init pci_proc_init(void)
{
@@ -33339,7 +33339,7 @@ diff -urNp linux-3.0.9/drivers/pci/proc.c linux-3.0.9/drivers/pci/proc.c
proc_initialized = 1;
diff -urNp linux-3.0.9/drivers/pci/xen-pcifront.c linux-3.0.9/drivers/pci/xen-pcifront.c
--- linux-3.0.9/drivers/pci/xen-pcifront.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pci/xen-pcifront.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/pci/xen-pcifront.c 2011-11-15 20:02:59.000000000 -0500
@@ -187,6 +187,8 @@ static int pcifront_bus_read(struct pci_
struct pcifront_sd *sd = bus->sysdata;
struct pcifront_device *pdev = pcifront_get_pdev(sd);
@@ -33387,7 +33387,7 @@ diff -urNp linux-3.0.9/drivers/pci/xen-pcifront.c linux-3.0.9/drivers/pci/xen-pc
vector[0] = op.value;
diff -urNp linux-3.0.9/drivers/platform/x86/thinkpad_acpi.c linux-3.0.9/drivers/platform/x86/thinkpad_acpi.c
--- linux-3.0.9/drivers/platform/x86/thinkpad_acpi.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/platform/x86/thinkpad_acpi.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/platform/x86/thinkpad_acpi.c 2011-11-15 20:02:59.000000000 -0500
@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
return 0;
}
@@ -33399,7 +33399,7 @@ diff -urNp linux-3.0.9/drivers/platform/x86/thinkpad_acpi.c linux-3.0.9/drivers/
const u32 wantedmask = hotkey_driver_mask &
diff -urNp linux-3.0.9/drivers/pnp/pnpbios/bioscalls.c linux-3.0.9/drivers/pnp/pnpbios/bioscalls.c
--- linux-3.0.9/drivers/pnp/pnpbios/bioscalls.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pnp/pnpbios/bioscalls.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/pnp/pnpbios/bioscalls.c 2011-11-15 20:02:59.000000000 -0500
@@ -59,7 +59,7 @@ do { \
set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
} while(0)
@@ -33458,7 +33458,7 @@ diff -urNp linux-3.0.9/drivers/pnp/pnpbios/bioscalls.c linux-3.0.9/drivers/pnp/p
}
diff -urNp linux-3.0.9/drivers/pnp/resource.c linux-3.0.9/drivers/pnp/resource.c
--- linux-3.0.9/drivers/pnp/resource.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/pnp/resource.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/pnp/resource.c 2011-11-15 20:02:59.000000000 -0500
@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
return 1;
@@ -33479,7 +33479,7 @@ diff -urNp linux-3.0.9/drivers/pnp/resource.c linux-3.0.9/drivers/pnp/resource.c
/* check if the resource is reserved */
diff -urNp linux-3.0.9/drivers/power/bq27x00_battery.c linux-3.0.9/drivers/power/bq27x00_battery.c
--- linux-3.0.9/drivers/power/bq27x00_battery.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/power/bq27x00_battery.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/power/bq27x00_battery.c 2011-11-15 20:02:59.000000000 -0500
@@ -67,7 +67,7 @@
struct bq27x00_device_info;
struct bq27x00_access_methods {
@@ -33491,7 +33491,7 @@ diff -urNp linux-3.0.9/drivers/power/bq27x00_battery.c linux-3.0.9/drivers/power
diff -urNp linux-3.0.9/drivers/regulator/max8660.c linux-3.0.9/drivers/regulator/max8660.c
--- linux-3.0.9/drivers/regulator/max8660.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/regulator/max8660.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/regulator/max8660.c 2011-11-15 20:02:59.000000000 -0500
@@ -383,8 +383,10 @@ static int __devinit max8660_probe(struc
max8660->shadow_regs[MAX8660_OVER1] = 5;
} else {
@@ -33507,7 +33507,7 @@ diff -urNp linux-3.0.9/drivers/regulator/max8660.c linux-3.0.9/drivers/regulator
/*
diff -urNp linux-3.0.9/drivers/regulator/mc13892-regulator.c linux-3.0.9/drivers/regulator/mc13892-regulator.c
--- linux-3.0.9/drivers/regulator/mc13892-regulator.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/regulator/mc13892-regulator.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/regulator/mc13892-regulator.c 2011-11-15 20:02:59.000000000 -0500
@@ -564,10 +564,12 @@ static int __devinit mc13892_regulator_p
}
mc13xxx_unlock(mc13892);
@@ -33525,7 +33525,7 @@ diff -urNp linux-3.0.9/drivers/regulator/mc13892-regulator.c linux-3.0.9/drivers
priv->regulators[i] = regulator_register(
diff -urNp linux-3.0.9/drivers/rtc/rtc-dev.c linux-3.0.9/drivers/rtc/rtc-dev.c
--- linux-3.0.9/drivers/rtc/rtc-dev.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/rtc/rtc-dev.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/rtc/rtc-dev.c 2011-11-15 20:02:59.000000000 -0500
@@ -14,6 +14,7 @@
#include <linux/module.h>
#include <linux/rtc.h>
@@ -33545,7 +33545,7 @@ diff -urNp linux-3.0.9/drivers/rtc/rtc-dev.c linux-3.0.9/drivers/rtc/rtc-dev.c
case RTC_PIE_ON:
diff -urNp linux-3.0.9/drivers/scsi/aacraid/aacraid.h linux-3.0.9/drivers/scsi/aacraid/aacraid.h
--- linux-3.0.9/drivers/scsi/aacraid/aacraid.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/aacraid/aacraid.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/aacraid/aacraid.h 2011-11-15 20:02:59.000000000 -0500
@@ -492,7 +492,7 @@ struct adapter_ops
int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
/* Administrative operations */
@@ -33557,7 +33557,7 @@ diff -urNp linux-3.0.9/drivers/scsi/aacraid/aacraid.h linux-3.0.9/drivers/scsi/a
* Define which interrupt handler needs to be installed
diff -urNp linux-3.0.9/drivers/scsi/aacraid/commctrl.c linux-3.0.9/drivers/scsi/aacraid/commctrl.c
--- linux-3.0.9/drivers/scsi/aacraid/commctrl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/aacraid/commctrl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/aacraid/commctrl.c 2011-11-15 20:02:59.000000000 -0500
@@ -482,6 +482,7 @@ static int aac_send_raw_srb(struct aac_d
u32 actual_fibsize64, actual_fibsize = 0;
int i;
@@ -33568,7 +33568,7 @@ diff -urNp linux-3.0.9/drivers/scsi/aacraid/commctrl.c linux-3.0.9/drivers/scsi/
dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
diff -urNp linux-3.0.9/drivers/scsi/aacraid/linit.c linux-3.0.9/drivers/scsi/aacraid/linit.c
--- linux-3.0.9/drivers/scsi/aacraid/linit.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/aacraid/linit.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/aacraid/linit.c 2011-11-15 20:02:59.000000000 -0500
@@ -92,7 +92,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_
#elif defined(__devinitconst)
static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
@@ -33580,7 +33580,7 @@ diff -urNp linux-3.0.9/drivers/scsi/aacraid/linit.c linux-3.0.9/drivers/scsi/aac
{ 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
diff -urNp linux-3.0.9/drivers/scsi/aic94xx/aic94xx_init.c linux-3.0.9/drivers/scsi/aic94xx/aic94xx_init.c
--- linux-3.0.9/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-15 20:02:59.000000000 -0500
@@ -1012,7 +1012,7 @@ static struct sas_domain_function_templa
.lldd_control_phy = asd_control_phy,
};
@@ -33592,7 +33592,7 @@ diff -urNp linux-3.0.9/drivers/scsi/aic94xx/aic94xx_init.c linux-3.0.9/drivers/s
{PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
diff -urNp linux-3.0.9/drivers/scsi/bfa/bfad.c linux-3.0.9/drivers/scsi/bfa/bfad.c
--- linux-3.0.9/drivers/scsi/bfa/bfad.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/bfa/bfad.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/bfa/bfad.c 2011-11-15 20:02:59.000000000 -0500
@@ -1032,6 +1032,8 @@ bfad_start_ops(struct bfad_s *bfad) {
struct bfad_vport_s *vport, *vport_new;
struct bfa_fcs_driver_info_s driver_info;
@@ -33604,7 +33604,7 @@ diff -urNp linux-3.0.9/drivers/scsi/bfa/bfad.c linux-3.0.9/drivers/scsi/bfa/bfad
strncpy(driver_info.version, BFAD_DRIVER_VERSION,
diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c
--- linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c 2011-11-15 20:02:59.000000000 -0500
@@ -1559,6 +1559,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc
u16 len, count;
u16 templen;
@@ -33625,7 +33625,7 @@ diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.9/drivers/scsi
*/
diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.9/drivers/scsi/bfa/bfa_fcs_rport.c
--- linux-3.0.9/drivers/scsi/bfa/bfa_fcs_rport.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/bfa/bfa_fcs_rport.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/bfa/bfa_fcs_rport.c 2011-11-15 20:02:59.000000000 -0500
@@ -1844,6 +1844,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc
struct fc_rpsc_speed_info_s speeds;
struct bfa_port_attr_s pport_attr;
@@ -33637,7 +33637,7 @@ diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.9/drivers/scsi
diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa.h linux-3.0.9/drivers/scsi/bfa/bfa.h
--- linux-3.0.9/drivers/scsi/bfa/bfa.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/bfa/bfa.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/bfa/bfa.h 2011-11-15 20:02:59.000000000 -0500
@@ -238,7 +238,7 @@ struct bfa_hwif_s {
u32 *nvecs, u32 *maxvec);
void (*hw_msix_get_rme_range) (struct bfa_s *bfa, u32 *start,
@@ -33649,7 +33649,7 @@ diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa.h linux-3.0.9/drivers/scsi/bfa/bfa.h
struct bfa_iocfc_s {
diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_ioc.h linux-3.0.9/drivers/scsi/bfa/bfa_ioc.h
--- linux-3.0.9/drivers/scsi/bfa/bfa_ioc.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/bfa/bfa_ioc.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/bfa/bfa_ioc.h 2011-11-15 20:02:59.000000000 -0500
@@ -196,7 +196,7 @@ struct bfa_ioc_cbfn_s {
bfa_ioc_disable_cbfn_t disable_cbfn;
bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
@@ -33670,7 +33670,7 @@ diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_ioc.h linux-3.0.9/drivers/scsi/bfa/b
#define bfa_ioc_devid(__ioc) ((__ioc)->pcidev.device_id)
diff -urNp linux-3.0.9/drivers/scsi/BusLogic.c linux-3.0.9/drivers/scsi/BusLogic.c
--- linux-3.0.9/drivers/scsi/BusLogic.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/BusLogic.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/BusLogic.c 2011-11-15 20:02:59.000000000 -0500
@@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla
static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
*PrototypeHostAdapter)
@@ -33682,7 +33682,7 @@ diff -urNp linux-3.0.9/drivers/scsi/BusLogic.c linux-3.0.9/drivers/scsi/BusLogic
Host Adapters; otherwise, default to the standard ISA MultiMaster probe.
diff -urNp linux-3.0.9/drivers/scsi/dpt_i2o.c linux-3.0.9/drivers/scsi/dpt_i2o.c
--- linux-3.0.9/drivers/scsi/dpt_i2o.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/dpt_i2o.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/dpt_i2o.c 2011-11-15 20:02:59.000000000 -0500
@@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* p
dma_addr_t addr;
ulong flags = 0;
@@ -33703,7 +33703,7 @@ diff -urNp linux-3.0.9/drivers/scsi/dpt_i2o.c linux-3.0.9/drivers/scsi/dpt_i2o.c
direction = 0x00000000;
diff -urNp linux-3.0.9/drivers/scsi/eata.c linux-3.0.9/drivers/scsi/eata.c
--- linux-3.0.9/drivers/scsi/eata.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/eata.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/eata.c 2011-11-15 20:02:59.000000000 -0500
@@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por
struct hostdata *ha;
char name[16];
@@ -33715,7 +33715,7 @@ diff -urNp linux-3.0.9/drivers/scsi/eata.c linux-3.0.9/drivers/scsi/eata.c
if (!request_region(port_base, REGION_SIZE, driver_name)) {
diff -urNp linux-3.0.9/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.9/drivers/scsi/fcoe/fcoe_ctlr.c
--- linux-3.0.9/drivers/scsi/fcoe/fcoe_ctlr.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/fcoe/fcoe_ctlr.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/fcoe/fcoe_ctlr.c 2011-11-15 20:02:59.000000000 -0500
@@ -2503,6 +2503,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe
} buf;
int rc;
@@ -33727,7 +33727,7 @@ diff -urNp linux-3.0.9/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.9/drivers/scsi/fc
diff -urNp linux-3.0.9/drivers/scsi/gdth.c linux-3.0.9/drivers/scsi/gdth.c
--- linux-3.0.9/drivers/scsi/gdth.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/gdth.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/gdth.c 2011-11-15 20:02:59.000000000 -0500
@@ -4107,6 +4107,8 @@ static int ioc_lockdrv(void __user *arg)
unsigned long flags;
gdth_ha_str *ha;
@@ -33767,7 +33767,7 @@ diff -urNp linux-3.0.9/drivers/scsi/gdth.c linux-3.0.9/drivers/scsi/gdth.c
TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
diff -urNp linux-3.0.9/drivers/scsi/gdth_proc.c linux-3.0.9/drivers/scsi/gdth_proc.c
--- linux-3.0.9/drivers/scsi/gdth_proc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/gdth_proc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/gdth_proc.c 2011-11-15 20:02:59.000000000 -0500
@@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi
u64 paddr;
@@ -33789,7 +33789,7 @@ diff -urNp linux-3.0.9/drivers/scsi/gdth_proc.c linux-3.0.9/drivers/scsi/gdth_pr
if (!gdtcmd || !estr)
diff -urNp linux-3.0.9/drivers/scsi/hosts.c linux-3.0.9/drivers/scsi/hosts.c
--- linux-3.0.9/drivers/scsi/hosts.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/hosts.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/hosts.c 2011-11-15 20:02:59.000000000 -0500
@@ -42,7 +42,7 @@
#include "scsi_logging.h"
@@ -33810,7 +33810,7 @@ diff -urNp linux-3.0.9/drivers/scsi/hosts.c linux-3.0.9/drivers/scsi/hosts.c
/* These three are default values which can be overridden */
diff -urNp linux-3.0.9/drivers/scsi/hpsa.c linux-3.0.9/drivers/scsi/hpsa.c
--- linux-3.0.9/drivers/scsi/hpsa.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/hpsa.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/hpsa.c 2011-11-15 20:02:59.000000000 -0500
@@ -498,7 +498,7 @@ static inline u32 next_command(struct ct
u32 a;
@@ -33927,7 +33927,7 @@ diff -urNp linux-3.0.9/drivers/scsi/hpsa.c linux-3.0.9/drivers/scsi/hpsa.c
diff -urNp linux-3.0.9/drivers/scsi/hpsa.h linux-3.0.9/drivers/scsi/hpsa.h
--- linux-3.0.9/drivers/scsi/hpsa.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/hpsa.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/hpsa.h 2011-11-15 20:02:59.000000000 -0500
@@ -73,7 +73,7 @@ struct ctlr_info {
unsigned int msix_vector;
unsigned int msi_vector;
@@ -33939,7 +33939,7 @@ diff -urNp linux-3.0.9/drivers/scsi/hpsa.h linux-3.0.9/drivers/scsi/hpsa.h
struct list_head reqQ;
diff -urNp linux-3.0.9/drivers/scsi/ips.h linux-3.0.9/drivers/scsi/ips.h
--- linux-3.0.9/drivers/scsi/ips.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/ips.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/ips.h 2011-11-15 20:02:59.000000000 -0500
@@ -1027,7 +1027,7 @@ typedef struct {
int (*intr)(struct ips_ha *);
void (*enableint)(struct ips_ha *);
@@ -33951,7 +33951,7 @@ diff -urNp linux-3.0.9/drivers/scsi/ips.h linux-3.0.9/drivers/scsi/ips.h
uint8_t ha_id[IPS_MAX_CHANNELS+1];
diff -urNp linux-3.0.9/drivers/scsi/libfc/fc_exch.c linux-3.0.9/drivers/scsi/libfc/fc_exch.c
--- linux-3.0.9/drivers/scsi/libfc/fc_exch.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/libfc/fc_exch.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/libfc/fc_exch.c 2011-11-15 20:02:59.000000000 -0500
@@ -105,12 +105,12 @@ struct fc_exch_mgr {
* all together if not used XXX
*/
@@ -34075,7 +34075,7 @@ diff -urNp linux-3.0.9/drivers/scsi/libfc/fc_exch.c linux-3.0.9/drivers/scsi/lib
}
diff -urNp linux-3.0.9/drivers/scsi/libsas/sas_ata.c linux-3.0.9/drivers/scsi/libsas/sas_ata.c
--- linux-3.0.9/drivers/scsi/libsas/sas_ata.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/libsas/sas_ata.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/libsas/sas_ata.c 2011-11-15 20:02:59.000000000 -0500
@@ -368,7 +368,7 @@ static struct ata_port_operations sas_sa
.postreset = ata_std_postreset,
.error_handler = ata_std_error_handler,
@@ -34087,7 +34087,7 @@ diff -urNp linux-3.0.9/drivers/scsi/libsas/sas_ata.c linux-3.0.9/drivers/scsi/li
.qc_fill_rtf = sas_ata_qc_fill_rtf,
diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c
--- linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-15 20:02:59.000000000 -0500
@@ -104,7 +104,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_
#include <linux/debugfs.h>
@@ -34178,7 +34178,7 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.9/drivers/scsi
vport->debug_disc_trc =
diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc.h linux-3.0.9/drivers/scsi/lpfc/lpfc.h
--- linux-3.0.9/drivers/scsi/lpfc/lpfc.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/lpfc/lpfc.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/lpfc/lpfc.h 2011-11-15 20:02:59.000000000 -0500
@@ -425,7 +425,7 @@ struct lpfc_vport {
struct dentry *debug_nodelist;
struct dentry *vport_debugfs_root;
@@ -34210,7 +34210,7 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc.h linux-3.0.9/drivers/scsi/lpfc/lp
struct dentry *idiag_pci_cfg;
diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_init.c linux-3.0.9/drivers/scsi/lpfc/lpfc_init.c
--- linux-3.0.9/drivers/scsi/lpfc/lpfc_init.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/lpfc/lpfc_init.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/lpfc/lpfc_init.c 2011-11-15 20:02:59.000000000 -0500
@@ -9971,8 +9971,10 @@ lpfc_init(void)
printk(LPFC_COPYRIGHT "\n");
@@ -34226,7 +34226,7 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_init.c linux-3.0.9/drivers/scsi/lp
fc_attach_transport(&lpfc_transport_functions);
diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.9/drivers/scsi/lpfc/lpfc_scsi.c
--- linux-3.0.9/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-15 20:02:59.000000000 -0500
@@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
uint32_t evt_posted;
@@ -34280,7 +34280,7 @@ diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.9/drivers/scsi/lp
/**
diff -urNp linux-3.0.9/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.9/drivers/scsi/megaraid/megaraid_mbox.c
--- linux-3.0.9/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-15 20:02:59.000000000 -0500
@@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter
int rval;
int i;
@@ -34292,7 +34292,7 @@ diff -urNp linux-3.0.9/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.9/drivers
diff -urNp linux-3.0.9/drivers/scsi/osd/osd_initiator.c linux-3.0.9/drivers/scsi/osd/osd_initiator.c
--- linux-3.0.9/drivers/scsi/osd/osd_initiator.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/osd/osd_initiator.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/osd/osd_initiator.c 2011-11-15 20:02:59.000000000 -0500
@@ -97,6 +97,8 @@ static int _osd_get_print_system_info(st
int nelem = ARRAY_SIZE(get_attrs), a = 0;
int ret;
@@ -34304,7 +34304,7 @@ diff -urNp linux-3.0.9/drivers/scsi/osd/osd_initiator.c linux-3.0.9/drivers/scsi
return -ENOMEM;
diff -urNp linux-3.0.9/drivers/scsi/pmcraid.c linux-3.0.9/drivers/scsi/pmcraid.c
--- linux-3.0.9/drivers/scsi/pmcraid.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/pmcraid.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/pmcraid.c 2011-11-15 20:02:59.000000000 -0500
@@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc
res->scsi_dev = scsi_dev;
scsi_dev->hostdata = res;
@@ -34377,7 +34377,7 @@ diff -urNp linux-3.0.9/drivers/scsi/pmcraid.c linux-3.0.9/drivers/scsi/pmcraid.c
diff -urNp linux-3.0.9/drivers/scsi/pmcraid.h linux-3.0.9/drivers/scsi/pmcraid.h
--- linux-3.0.9/drivers/scsi/pmcraid.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/pmcraid.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/pmcraid.h 2011-11-15 20:02:59.000000000 -0500
@@ -749,7 +749,7 @@ struct pmcraid_instance {
struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
@@ -34409,7 +34409,7 @@ diff -urNp linux-3.0.9/drivers/scsi/pmcraid.h linux-3.0.9/drivers/scsi/pmcraid.h
u8 change_detected;
diff -urNp linux-3.0.9/drivers/scsi/qla2xxx/qla_def.h linux-3.0.9/drivers/scsi/qla2xxx/qla_def.h
--- linux-3.0.9/drivers/scsi/qla2xxx/qla_def.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/qla2xxx/qla_def.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/qla2xxx/qla_def.h 2011-11-15 20:02:59.000000000 -0500
@@ -2244,7 +2244,7 @@ struct isp_operations {
int (*get_flash_version) (struct scsi_qla_host *, void *);
int (*start_scsi) (srb_t *);
@@ -34421,7 +34421,7 @@ diff -urNp linux-3.0.9/drivers/scsi/qla2xxx/qla_def.h linux-3.0.9/drivers/scsi/q
diff -urNp linux-3.0.9/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.9/drivers/scsi/qla4xxx/ql4_def.h
--- linux-3.0.9/drivers/scsi/qla4xxx/ql4_def.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/qla4xxx/ql4_def.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/qla4xxx/ql4_def.h 2011-11-15 20:02:59.000000000 -0500
@@ -256,7 +256,7 @@ struct ddb_entry {
atomic_t retry_relogin_timer; /* Min Time between relogins
* (4000 only) */
@@ -34433,7 +34433,7 @@ diff -urNp linux-3.0.9/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.9/drivers/scsi/q
uint16_t port;
diff -urNp linux-3.0.9/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.9/drivers/scsi/qla4xxx/ql4_init.c
--- linux-3.0.9/drivers/scsi/qla4xxx/ql4_init.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/qla4xxx/ql4_init.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/qla4xxx/ql4_init.c 2011-11-15 20:02:59.000000000 -0500
@@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_
ddb_entry->fw_ddb_index = fw_ddb_index;
atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
@@ -34454,7 +34454,7 @@ diff -urNp linux-3.0.9/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.9/drivers/scsi/
iscsi_unblock_session(ddb_entry->sess);
diff -urNp linux-3.0.9/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.9/drivers/scsi/qla4xxx/ql4_os.c
--- linux-3.0.9/drivers/scsi/qla4xxx/ql4_os.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/qla4xxx/ql4_os.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/qla4xxx/ql4_os.c 2011-11-15 20:02:59.000000000 -0500
@@ -811,13 +811,13 @@ static void qla4xxx_timer(struct scsi_ql
ddb_entry->fw_ddb_device_state ==
DDB_DS_SESSION_FAILED) {
@@ -34473,7 +34473,7 @@ diff -urNp linux-3.0.9/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.9/drivers/scsi/ql
start_dpc++;
diff -urNp linux-3.0.9/drivers/scsi/scsi.c linux-3.0.9/drivers/scsi/scsi.c
--- linux-3.0.9/drivers/scsi/scsi.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/scsi.c 2011-11-15 20:02:59.000000000 -0500
@@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
unsigned long timeout;
int rtn = 0;
@@ -34485,7 +34485,7 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi.c linux-3.0.9/drivers/scsi/scsi.c
if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
diff -urNp linux-3.0.9/drivers/scsi/scsi_debug.c linux-3.0.9/drivers/scsi/scsi_debug.c
--- linux-3.0.9/drivers/scsi/scsi_debug.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi_debug.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/scsi_debug.c 2011-11-15 20:02:59.000000000 -0500
@@ -1493,6 +1493,8 @@ static int resp_mode_select(struct scsi_
unsigned char arr[SDEBUG_MAX_MSELECT_SZ];
unsigned char *cmd = (unsigned char *)scp->cmnd;
@@ -34506,7 +34506,7 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi_debug.c linux-3.0.9/drivers/scsi/scsi_d
memset(arr, 0, sizeof(arr));
diff -urNp linux-3.0.9/drivers/scsi/scsi_lib.c linux-3.0.9/drivers/scsi/scsi_lib.c
--- linux-3.0.9/drivers/scsi/scsi_lib.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi_lib.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/scsi_lib.c 2011-11-15 20:02:59.000000000 -0500
@@ -1412,7 +1412,7 @@ static void scsi_kill_request(struct req
shost = sdev->host;
scsi_init_cmd_errh(cmd);
@@ -34530,7 +34530,7 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi_lib.c linux-3.0.9/drivers/scsi/scsi_lib
if (disposition != SUCCESS &&
diff -urNp linux-3.0.9/drivers/scsi/scsi_sysfs.c linux-3.0.9/drivers/scsi/scsi_sysfs.c
--- linux-3.0.9/drivers/scsi/scsi_sysfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi_sysfs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/scsi_sysfs.c 2011-11-15 20:02:59.000000000 -0500
@@ -622,7 +622,7 @@ show_iostat_##field(struct device *dev,
char *buf) \
{ \
@@ -34542,7 +34542,7 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi_sysfs.c linux-3.0.9/drivers/scsi/scsi_s
static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
diff -urNp linux-3.0.9/drivers/scsi/scsi_tgt_lib.c linux-3.0.9/drivers/scsi/scsi_tgt_lib.c
--- linux-3.0.9/drivers/scsi/scsi_tgt_lib.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi_tgt_lib.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/scsi_tgt_lib.c 2011-11-15 20:02:59.000000000 -0500
@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct sc
int err;
@@ -34554,7 +34554,7 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi_tgt_lib.c linux-3.0.9/drivers/scsi/scsi
* TODO: need to fixup sg_tablesize, max_segment_size,
diff -urNp linux-3.0.9/drivers/scsi/scsi_transport_fc.c linux-3.0.9/drivers/scsi/scsi_transport_fc.c
--- linux-3.0.9/drivers/scsi/scsi_transport_fc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi_transport_fc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/scsi_transport_fc.c 2011-11-15 20:02:59.000000000 -0500
@@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_
* Netlink Infrastructure
*/
@@ -34593,7 +34593,7 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi_transport_fc.c linux-3.0.9/drivers/scsi
* Check for overflow; dev_loss_tmo is u32
diff -urNp linux-3.0.9/drivers/scsi/scsi_transport_iscsi.c linux-3.0.9/drivers/scsi/scsi_transport_iscsi.c
--- linux-3.0.9/drivers/scsi/scsi_transport_iscsi.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi_transport_iscsi.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/scsi_transport_iscsi.c 2011-11-15 20:02:59.000000000 -0500
@@ -83,7 +83,7 @@ struct iscsi_internal {
struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
};
@@ -34623,7 +34623,7 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi_transport_iscsi.c linux-3.0.9/drivers/s
if (err)
diff -urNp linux-3.0.9/drivers/scsi/scsi_transport_srp.c linux-3.0.9/drivers/scsi/scsi_transport_srp.c
--- linux-3.0.9/drivers/scsi/scsi_transport_srp.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/scsi_transport_srp.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/scsi_transport_srp.c 2011-11-15 20:02:59.000000000 -0500
@@ -33,7 +33,7 @@
#include "scsi_transport_srp_internal.h"
@@ -34653,7 +34653,7 @@ diff -urNp linux-3.0.9/drivers/scsi/scsi_transport_srp.c linux-3.0.9/drivers/scs
transport_setup_device(&rport->dev);
diff -urNp linux-3.0.9/drivers/scsi/sg.c linux-3.0.9/drivers/scsi/sg.c
--- linux-3.0.9/drivers/scsi/sg.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/sg.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/sg.c 2011-11-15 20:02:59.000000000 -0500
@@ -1075,7 +1075,7 @@ sg_ioctl(struct file *filp, unsigned int
sdp->disk->disk_name,
MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
@@ -34683,7 +34683,7 @@ diff -urNp linux-3.0.9/drivers/scsi/sg.c linux-3.0.9/drivers/scsi/sg.c
if (!sg_proc_sgp)
diff -urNp linux-3.0.9/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.9/drivers/scsi/sym53c8xx_2/sym_glue.c
--- linux-3.0.9/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-15 20:02:59.000000000 -0500
@@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct p
int do_iounmap = 0;
int do_disable_device = 1;
@@ -34695,7 +34695,7 @@ diff -urNp linux-3.0.9/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.9/drivers/s
sym_dev.pdev = pdev;
diff -urNp linux-3.0.9/drivers/scsi/vmw_pvscsi.c linux-3.0.9/drivers/scsi/vmw_pvscsi.c
--- linux-3.0.9/drivers/scsi/vmw_pvscsi.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/scsi/vmw_pvscsi.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/scsi/vmw_pvscsi.c 2011-11-15 20:02:59.000000000 -0500
@@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const
dma_addr_t base;
unsigned i;
@@ -34707,7 +34707,7 @@ diff -urNp linux-3.0.9/drivers/scsi/vmw_pvscsi.c linux-3.0.9/drivers/scsi/vmw_pv
cmd.cmpRingNumPages = adapter->cmp_pages;
diff -urNp linux-3.0.9/drivers/spi/dw_spi_pci.c linux-3.0.9/drivers/spi/dw_spi_pci.c
--- linux-3.0.9/drivers/spi/dw_spi_pci.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/spi/dw_spi_pci.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/spi/dw_spi_pci.c 2011-11-15 20:02:59.000000000 -0500
@@ -148,7 +148,7 @@ static int spi_resume(struct pci_dev *pd
#define spi_resume NULL
#endif
@@ -34719,7 +34719,7 @@ diff -urNp linux-3.0.9/drivers/spi/dw_spi_pci.c linux-3.0.9/drivers/spi/dw_spi_p
{},
diff -urNp linux-3.0.9/drivers/spi/spi.c linux-3.0.9/drivers/spi/spi.c
--- linux-3.0.9/drivers/spi/spi.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/spi/spi.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/spi/spi.c 2011-11-15 20:02:59.000000000 -0500
@@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma
EXPORT_SYMBOL_GPL(spi_bus_unlock);
@@ -34731,7 +34731,7 @@ diff -urNp linux-3.0.9/drivers/spi/spi.c linux-3.0.9/drivers/spi/spi.c
diff -urNp linux-3.0.9/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.9/drivers/staging/ath6kl/os/linux/ar6000_drv.c
--- linux-3.0.9/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-11-15 20:02:59.000000000 -0500
@@ -362,7 +362,7 @@ static struct ar_cookie s_ar_cookie_mem[
(((ar)->arTargetType == TARGET_TYPE_AR6003) ? AR6003_HOST_INTEREST_ITEM_ADDRESS(item) : 0))
@@ -34743,7 +34743,7 @@ diff -urNp linux-3.0.9/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.9/
.ndo_stop = ar6000_close,
diff -urNp linux-3.0.9/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.0.9/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
--- linux-3.0.9/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-11-15 20:02:59.000000000 -0500
@@ -30,7 +30,7 @@ typedef bool (*ar6k_pal_recv_pkt_t)(void
typedef struct ar6k_pal_config_s
{
@@ -34755,7 +34755,7 @@ diff -urNp linux-3.0.9/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-
#endif /* _AR6K_PAL_H_ */
diff -urNp linux-3.0.9/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.9/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
--- linux-3.0.9/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-11-15 20:02:59.000000000 -0500
@@ -853,14 +853,14 @@ static void dhd_op_if(dhd_if_t *ifp)
free_netdev(ifp->net);
}
@@ -34802,7 +34802,7 @@ diff -urNp linux-3.0.9/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.
g_bus = bus;
diff -urNp linux-3.0.9/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linux-3.0.9/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h
--- linux-3.0.9/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h 2011-11-15 20:02:59.000000000 -0500
@@ -593,7 +593,7 @@ struct phy_func_ptr {
initfn_t carrsuppr;
rxsigpwrfn_t rxsigpwr;
@@ -34814,7 +34814,7 @@ diff -urNp linux-3.0.9/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linu
struct phy_info {
diff -urNp linux-3.0.9/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.9/drivers/staging/brcm80211/include/bcmsdh.h
--- linux-3.0.9/drivers/staging/brcm80211/include/bcmsdh.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/brcm80211/include/bcmsdh.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/brcm80211/include/bcmsdh.h 2011-11-15 20:02:59.000000000 -0500
@@ -185,7 +185,7 @@ typedef struct {
u16 func, uint bustype, void *regsva, void *param);
/* detach from device */
@@ -34826,7 +34826,7 @@ diff -urNp linux-3.0.9/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.9/dr
extern int bcmsdh_register(bcmsdh_driver_t *driver);
diff -urNp linux-3.0.9/drivers/staging/et131x/et1310_tx.c linux-3.0.9/drivers/staging/et131x/et1310_tx.c
--- linux-3.0.9/drivers/staging/et131x/et1310_tx.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/et131x/et1310_tx.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/et131x/et1310_tx.c 2011-11-15 20:02:59.000000000 -0500
@@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru
struct net_device_stats *stats = &etdev->net_stats;
@@ -34844,7 +34844,7 @@ diff -urNp linux-3.0.9/drivers/staging/et131x/et1310_tx.c linux-3.0.9/drivers/st
stats->tx_bytes += tcb->skb->len;
diff -urNp linux-3.0.9/drivers/staging/et131x/et131x_adapter.h linux-3.0.9/drivers/staging/et131x/et131x_adapter.h
--- linux-3.0.9/drivers/staging/et131x/et131x_adapter.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/et131x/et131x_adapter.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/et131x/et131x_adapter.h 2011-11-15 20:02:59.000000000 -0500
@@ -110,11 +110,11 @@ typedef struct _ce_stats_t {
* operations
*/
@@ -34862,7 +34862,7 @@ diff -urNp linux-3.0.9/drivers/staging/et131x/et131x_adapter.h linux-3.0.9/drive
diff -urNp linux-3.0.9/drivers/staging/hv/channel.c linux-3.0.9/drivers/staging/hv/channel.c
--- linux-3.0.9/drivers/staging/hv/channel.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/hv/channel.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/hv/channel.c 2011-11-15 20:02:59.000000000 -0500
@@ -433,8 +433,8 @@ int vmbus_establish_gpadl(struct vmbus_c
int ret = 0;
int t;
@@ -34876,7 +34876,7 @@ diff -urNp linux-3.0.9/drivers/staging/hv/channel.c linux-3.0.9/drivers/staging/
if (ret)
diff -urNp linux-3.0.9/drivers/staging/hv/hv.c linux-3.0.9/drivers/staging/hv/hv.c
--- linux-3.0.9/drivers/staging/hv/hv.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/hv/hv.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/hv/hv.c 2011-11-15 20:02:59.000000000 -0500
@@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, voi
u64 output_address = (output) ? virt_to_phys(output) : 0;
u32 output_address_hi = output_address >> 32;
@@ -34888,7 +34888,7 @@ diff -urNp linux-3.0.9/drivers/staging/hv/hv.c linux-3.0.9/drivers/staging/hv/hv
"=a"(hv_status_lo) : "d" (control_hi),
diff -urNp linux-3.0.9/drivers/staging/hv/hv_mouse.c linux-3.0.9/drivers/staging/hv/hv_mouse.c
--- linux-3.0.9/drivers/staging/hv/hv_mouse.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/hv/hv_mouse.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/hv/hv_mouse.c 2011-11-15 20:02:59.000000000 -0500
@@ -879,8 +879,10 @@ static void reportdesc_callback(struct h
if (hid_dev) {
DPRINT_INFO(INPUTVSC_DRV, "hid_device created");
@@ -34904,7 +34904,7 @@ diff -urNp linux-3.0.9/drivers/staging/hv/hv_mouse.c linux-3.0.9/drivers/staging
hid_dev->vendor = input_device_ctx->device_info.vendor;
diff -urNp linux-3.0.9/drivers/staging/hv/hyperv_vmbus.h linux-3.0.9/drivers/staging/hv/hyperv_vmbus.h
--- linux-3.0.9/drivers/staging/hv/hyperv_vmbus.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/hv/hyperv_vmbus.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/hv/hyperv_vmbus.h 2011-11-15 20:02:59.000000000 -0500
@@ -559,7 +559,7 @@ enum vmbus_connect_state {
struct vmbus_connection {
enum vmbus_connect_state conn_state;
@@ -34916,7 +34916,7 @@ diff -urNp linux-3.0.9/drivers/staging/hv/hyperv_vmbus.h linux-3.0.9/drivers/sta
* Represents channel interrupts. Each bit position represents a
diff -urNp linux-3.0.9/drivers/staging/hv/rndis_filter.c linux-3.0.9/drivers/staging/hv/rndis_filter.c
--- linux-3.0.9/drivers/staging/hv/rndis_filter.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/hv/rndis_filter.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/hv/rndis_filter.c 2011-11-15 20:02:59.000000000 -0500
@@ -43,7 +43,7 @@ struct rndis_device {
enum rndis_device_state state;
@@ -34946,7 +34946,7 @@ diff -urNp linux-3.0.9/drivers/staging/hv/rndis_filter.c linux-3.0.9/drivers/sta
rndis_filter_send_request(dev, request);
diff -urNp linux-3.0.9/drivers/staging/hv/vmbus_drv.c linux-3.0.9/drivers/staging/hv/vmbus_drv.c
--- linux-3.0.9/drivers/staging/hv/vmbus_drv.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/hv/vmbus_drv.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/hv/vmbus_drv.c 2011-11-15 20:02:59.000000000 -0500
@@ -668,11 +668,11 @@ int vmbus_child_device_register(struct h
{
int ret = 0;
@@ -34963,7 +34963,7 @@ diff -urNp linux-3.0.9/drivers/staging/hv/vmbus_drv.c linux-3.0.9/drivers/stagin
child_device_obj->device.bus = &hv_bus; /* device->dev.bus; */
diff -urNp linux-3.0.9/drivers/staging/iio/ring_generic.h linux-3.0.9/drivers/staging/iio/ring_generic.h
--- linux-3.0.9/drivers/staging/iio/ring_generic.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/iio/ring_generic.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/iio/ring_generic.h 2011-11-15 20:02:59.000000000 -0500
@@ -62,7 +62,7 @@ struct iio_ring_access_funcs {
int (*is_enabled)(struct iio_ring_buffer *ring);
@@ -34975,7 +34975,7 @@ diff -urNp linux-3.0.9/drivers/staging/iio/ring_generic.h linux-3.0.9/drivers/st
int (*preenable)(struct iio_dev *);
diff -urNp linux-3.0.9/drivers/staging/octeon/ethernet.c linux-3.0.9/drivers/staging/octeon/ethernet.c
--- linux-3.0.9/drivers/staging/octeon/ethernet.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/octeon/ethernet.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/octeon/ethernet.c 2011-11-15 20:02:59.000000000 -0500
@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_
* since the RX tasklet also increments it.
*/
@@ -34994,7 +34994,7 @@ diff -urNp linux-3.0.9/drivers/staging/octeon/ethernet.c linux-3.0.9/drivers/sta
diff -urNp linux-3.0.9/drivers/staging/octeon/ethernet-rx.c linux-3.0.9/drivers/staging/octeon/ethernet-rx.c
--- linux-3.0.9/drivers/staging/octeon/ethernet-rx.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/octeon/ethernet-rx.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/octeon/ethernet-rx.c 2011-11-15 20:02:59.000000000 -0500
@@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi
/* Increment RX stats for virtual ports */
if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
@@ -35025,7 +35025,7 @@ diff -urNp linux-3.0.9/drivers/staging/octeon/ethernet-rx.c linux-3.0.9/drivers/
}
diff -urNp linux-3.0.9/drivers/staging/pohmelfs/inode.c linux-3.0.9/drivers/staging/pohmelfs/inode.c
--- linux-3.0.9/drivers/staging/pohmelfs/inode.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/pohmelfs/inode.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/pohmelfs/inode.c 2011-11-15 20:02:59.000000000 -0500
@@ -1856,7 +1856,7 @@ static int pohmelfs_fill_super(struct su
mutex_init(&psb->mcache_lock);
psb->mcache_root = RB_ROOT;
@@ -35046,7 +35046,7 @@ diff -urNp linux-3.0.9/drivers/staging/pohmelfs/inode.c linux-3.0.9/drivers/stag
mutex_init(&psb->state_lock);
diff -urNp linux-3.0.9/drivers/staging/pohmelfs/mcache.c linux-3.0.9/drivers/staging/pohmelfs/mcache.c
--- linux-3.0.9/drivers/staging/pohmelfs/mcache.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/pohmelfs/mcache.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/pohmelfs/mcache.c 2011-11-15 20:02:59.000000000 -0500
@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
m->data = data;
m->start = start;
@@ -35058,7 +35058,7 @@ diff -urNp linux-3.0.9/drivers/staging/pohmelfs/mcache.c linux-3.0.9/drivers/sta
err = pohmelfs_mcache_insert(psb, m);
diff -urNp linux-3.0.9/drivers/staging/pohmelfs/netfs.h linux-3.0.9/drivers/staging/pohmelfs/netfs.h
--- linux-3.0.9/drivers/staging/pohmelfs/netfs.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/pohmelfs/netfs.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/pohmelfs/netfs.h 2011-11-15 20:02:59.000000000 -0500
@@ -571,14 +571,14 @@ struct pohmelfs_config;
struct pohmelfs_sb {
struct rb_root mcache_root;
@@ -35078,7 +35078,7 @@ diff -urNp linux-3.0.9/drivers/staging/pohmelfs/netfs.h linux-3.0.9/drivers/stag
unsigned int crypto_align_size;
diff -urNp linux-3.0.9/drivers/staging/pohmelfs/trans.c linux-3.0.9/drivers/staging/pohmelfs/trans.c
--- linux-3.0.9/drivers/staging/pohmelfs/trans.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/pohmelfs/trans.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/pohmelfs/trans.c 2011-11-15 20:02:59.000000000 -0500
@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran
int err;
struct netfs_cmd *cmd = t->iovec.iov_base;
@@ -35090,7 +35090,7 @@ diff -urNp linux-3.0.9/drivers/staging/pohmelfs/trans.c linux-3.0.9/drivers/stag
t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
diff -urNp linux-3.0.9/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.9/drivers/staging/rtl8712/rtl871x_io.h
--- linux-3.0.9/drivers/staging/rtl8712/rtl871x_io.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/rtl8712/rtl871x_io.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/rtl8712/rtl871x_io.h 2011-11-15 20:02:59.000000000 -0500
@@ -83,7 +83,7 @@ struct _io_ops {
u8 *pmem);
u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
@@ -35102,7 +35102,7 @@ diff -urNp linux-3.0.9/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.9/drivers/
struct list_head list;
diff -urNp linux-3.0.9/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.9/drivers/staging/sbe-2t3e3/netdev.c
--- linux-3.0.9/drivers/staging/sbe-2t3e3/netdev.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/sbe-2t3e3/netdev.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/sbe-2t3e3/netdev.c 2011-11-15 20:02:59.000000000 -0500
@@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, s
t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
@@ -35114,7 +35114,7 @@ diff -urNp linux-3.0.9/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.9/drivers/st
return 0;
diff -urNp linux-3.0.9/drivers/staging/tty/stallion.c linux-3.0.9/drivers/staging/tty/stallion.c
--- linux-3.0.9/drivers/staging/tty/stallion.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/tty/stallion.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/tty/stallion.c 2011-11-15 20:02:59.000000000 -0500
@@ -2406,6 +2406,8 @@ static int stl_getportstruct(struct stlp
struct stlport stl_dummyport;
struct stlport *portp;
@@ -35126,7 +35126,7 @@ diff -urNp linux-3.0.9/drivers/staging/tty/stallion.c linux-3.0.9/drivers/stagin
portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr,
diff -urNp linux-3.0.9/drivers/staging/usbip/usbip_common.h linux-3.0.9/drivers/staging/usbip/usbip_common.h
--- linux-3.0.9/drivers/staging/usbip/usbip_common.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/usbip/usbip_common.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/usbip/usbip_common.h 2011-11-15 20:02:59.000000000 -0500
@@ -315,7 +315,7 @@ struct usbip_device {
void (*shutdown)(struct usbip_device *);
void (*reset)(struct usbip_device *);
@@ -35138,7 +35138,7 @@ diff -urNp linux-3.0.9/drivers/staging/usbip/usbip_common.h linux-3.0.9/drivers/
void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd,
diff -urNp linux-3.0.9/drivers/staging/usbip/vhci.h linux-3.0.9/drivers/staging/usbip/vhci.h
--- linux-3.0.9/drivers/staging/usbip/vhci.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/usbip/vhci.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/usbip/vhci.h 2011-11-15 20:02:59.000000000 -0500
@@ -94,7 +94,7 @@ struct vhci_hcd {
unsigned resuming:1;
unsigned long re_timeout;
@@ -35150,7 +35150,7 @@ diff -urNp linux-3.0.9/drivers/staging/usbip/vhci.h linux-3.0.9/drivers/staging/
* NOTE:
diff -urNp linux-3.0.9/drivers/staging/usbip/vhci_hcd.c linux-3.0.9/drivers/staging/usbip/vhci_hcd.c
--- linux-3.0.9/drivers/staging/usbip/vhci_hcd.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/usbip/vhci_hcd.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/usbip/vhci_hcd.c 2011-11-15 20:02:59.000000000 -0500
@@ -511,7 +511,7 @@ static void vhci_tx_urb(struct urb *urb)
return;
}
@@ -35180,7 +35180,7 @@ diff -urNp linux-3.0.9/drivers/staging/usbip/vhci_hcd.c linux-3.0.9/drivers/stag
hcd->power_budget = 0; /* no limit */
diff -urNp linux-3.0.9/drivers/staging/usbip/vhci_rx.c linux-3.0.9/drivers/staging/usbip/vhci_rx.c
--- linux-3.0.9/drivers/staging/usbip/vhci_rx.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/usbip/vhci_rx.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/usbip/vhci_rx.c 2011-11-15 20:02:59.000000000 -0500
@@ -76,7 +76,7 @@ static void vhci_recv_ret_submit(struct
if (!urb) {
pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
@@ -35192,7 +35192,7 @@ diff -urNp linux-3.0.9/drivers/staging/usbip/vhci_rx.c linux-3.0.9/drivers/stagi
}
diff -urNp linux-3.0.9/drivers/staging/vt6655/hostap.c linux-3.0.9/drivers/staging/vt6655/hostap.c
--- linux-3.0.9/drivers/staging/vt6655/hostap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/vt6655/hostap.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/vt6655/hostap.c 2011-11-15 20:02:59.000000000 -0500
@@ -79,14 +79,13 @@ static int msglevel
*
*/
@@ -35221,7 +35221,7 @@ diff -urNp linux-3.0.9/drivers/staging/vt6655/hostap.c linux-3.0.9/drivers/stagi
pDevice->apdev->type = ARPHRD_IEEE80211;
diff -urNp linux-3.0.9/drivers/staging/vt6656/hostap.c linux-3.0.9/drivers/staging/vt6656/hostap.c
--- linux-3.0.9/drivers/staging/vt6656/hostap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/vt6656/hostap.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/vt6656/hostap.c 2011-11-15 20:02:59.000000000 -0500
@@ -80,14 +80,13 @@ static int msglevel
*
*/
@@ -35250,7 +35250,7 @@ diff -urNp linux-3.0.9/drivers/staging/vt6656/hostap.c linux-3.0.9/drivers/stagi
pDevice->apdev->type = ARPHRD_IEEE80211;
diff -urNp linux-3.0.9/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.9/drivers/staging/wlan-ng/hfa384x_usb.c
--- linux-3.0.9/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-15 20:02:59.000000000 -0500
@@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hf
struct usbctlx_completor {
@@ -35262,7 +35262,7 @@ diff -urNp linux-3.0.9/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.9/drivers
hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
diff -urNp linux-3.0.9/drivers/staging/zcache/tmem.c linux-3.0.9/drivers/staging/zcache/tmem.c
--- linux-3.0.9/drivers/staging/zcache/tmem.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/zcache/tmem.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/zcache/tmem.c 2011-11-15 20:02:59.000000000 -0500
@@ -39,7 +39,7 @@
* A tmem host implementation must use this function to register callbacks
* for memory allocation.
@@ -35283,7 +35283,7 @@ diff -urNp linux-3.0.9/drivers/staging/zcache/tmem.c linux-3.0.9/drivers/staging
{
diff -urNp linux-3.0.9/drivers/staging/zcache/tmem.h linux-3.0.9/drivers/staging/zcache/tmem.h
--- linux-3.0.9/drivers/staging/zcache/tmem.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/staging/zcache/tmem.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/staging/zcache/tmem.h 2011-11-15 20:02:59.000000000 -0500
@@ -171,6 +171,7 @@ struct tmem_pamops {
int (*get_data)(struct page *, void *, struct tmem_pool *);
void (*free)(void *, struct tmem_pool *);
@@ -35302,7 +35302,7 @@ diff -urNp linux-3.0.9/drivers/staging/zcache/tmem.h linux-3.0.9/drivers/staging
/* core tmem accessor functions */
diff -urNp linux-3.0.9/drivers/target/target_core_alua.c linux-3.0.9/drivers/target/target_core_alua.c
--- linux-3.0.9/drivers/target/target_core_alua.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/target/target_core_alua.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/target/target_core_alua.c 2011-11-15 20:02:59.000000000 -0500
@@ -695,6 +695,8 @@ static int core_alua_update_tpg_primary_
char path[ALUA_METADATA_PATH_LEN];
int len;
@@ -35323,7 +35323,7 @@ diff -urNp linux-3.0.9/drivers/target/target_core_alua.c linux-3.0.9/drivers/tar
diff -urNp linux-3.0.9/drivers/target/target_core_cdb.c linux-3.0.9/drivers/target/target_core_cdb.c
--- linux-3.0.9/drivers/target/target_core_cdb.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/target/target_core_cdb.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/target/target_core_cdb.c 2011-11-15 20:02:59.000000000 -0500
@@ -838,6 +838,8 @@ target_emulate_modesense(struct se_cmd *
int length = 0;
unsigned char buf[SE_MODE_PAGE_BUF];
@@ -35335,7 +35335,7 @@ diff -urNp linux-3.0.9/drivers/target/target_core_cdb.c linux-3.0.9/drivers/targ
switch (cdb[2] & 0x3f) {
diff -urNp linux-3.0.9/drivers/target/target_core_configfs.c linux-3.0.9/drivers/target/target_core_configfs.c
--- linux-3.0.9/drivers/target/target_core_configfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/target/target_core_configfs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/target/target_core_configfs.c 2011-11-15 20:02:59.000000000 -0500
@@ -1276,6 +1276,8 @@ static ssize_t target_core_dev_pr_show_a
ssize_t len = 0;
int reg_count = 0, prf_isid;
@@ -35347,7 +35347,7 @@ diff -urNp linux-3.0.9/drivers/target/target_core_configfs.c linux-3.0.9/drivers
diff -urNp linux-3.0.9/drivers/target/target_core_pr.c linux-3.0.9/drivers/target/target_core_pr.c
--- linux-3.0.9/drivers/target/target_core_pr.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/target/target_core_pr.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/target/target_core_pr.c 2011-11-15 20:02:59.000000000 -0500
@@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_regi
unsigned char t_port[PR_APTPL_MAX_TPORT_LEN];
u16 tpgt;
@@ -35377,7 +35377,7 @@ diff -urNp linux-3.0.9/drivers/target/target_core_pr.c linux-3.0.9/drivers/targe
diff -urNp linux-3.0.9/drivers/target/target_core_tmr.c linux-3.0.9/drivers/target/target_core_tmr.c
--- linux-3.0.9/drivers/target/target_core_tmr.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/target/target_core_tmr.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/target/target_core_tmr.c 2011-11-15 20:02:59.000000000 -0500
@@ -269,7 +269,7 @@ int core_tmr_lun_reset(
CMD_TFO(cmd)->get_task_tag(cmd), cmd->pr_res_key,
T_TASK(cmd)->t_task_cdbs,
@@ -35407,7 +35407,7 @@ diff -urNp linux-3.0.9/drivers/target/target_core_tmr.c linux-3.0.9/drivers/targ
diff -urNp linux-3.0.9/drivers/target/target_core_transport.c linux-3.0.9/drivers/target/target_core_transport.c
--- linux-3.0.9/drivers/target/target_core_transport.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/target/target_core_transport.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/target/target_core_transport.c 2011-11-15 20:02:59.000000000 -0500
@@ -1681,7 +1681,7 @@ struct se_device *transport_add_device_t
dev->queue_depth = dev_limits->queue_depth;
@@ -35485,7 +35485,7 @@ diff -urNp linux-3.0.9/drivers/target/target_core_transport.c linux-3.0.9/driver
atomic_read(&T_TASK(cmd)->t_transport_sent));
diff -urNp linux-3.0.9/drivers/telephony/ixj.c linux-3.0.9/drivers/telephony/ixj.c
--- linux-3.0.9/drivers/telephony/ixj.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/telephony/ixj.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/telephony/ixj.c 2011-11-15 20:02:59.000000000 -0500
@@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j)
bool mContinue;
char *pIn, *pOut;
@@ -35497,7 +35497,7 @@ diff -urNp linux-3.0.9/drivers/telephony/ixj.c linux-3.0.9/drivers/telephony/ixj
diff -urNp linux-3.0.9/drivers/tty/hvc/hvcs.c linux-3.0.9/drivers/tty/hvc/hvcs.c
--- linux-3.0.9/drivers/tty/hvc/hvcs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/hvc/hvcs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/tty/hvc/hvcs.c 2011-11-15 20:02:59.000000000 -0500
@@ -83,6 +83,7 @@
#include <asm/hvcserver.h>
#include <asm/uaccess.h>
@@ -35602,7 +35602,7 @@ diff -urNp linux-3.0.9/drivers/tty/hvc/hvcs.c linux-3.0.9/drivers/tty/hvc/hvcs.c
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
diff -urNp linux-3.0.9/drivers/tty/ipwireless/tty.c linux-3.0.9/drivers/tty/ipwireless/tty.c
--- linux-3.0.9/drivers/tty/ipwireless/tty.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/ipwireless/tty.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/tty/ipwireless/tty.c 2011-11-15 20:02:59.000000000 -0500
@@ -29,6 +29,7 @@
#include <linux/tty_driver.h>
#include <linux/tty_flip.h>
@@ -35727,7 +35727,7 @@ diff -urNp linux-3.0.9/drivers/tty/ipwireless/tty.c linux-3.0.9/drivers/tty/ipwi
ttyj->channel_idx);
diff -urNp linux-3.0.9/drivers/tty/n_gsm.c linux-3.0.9/drivers/tty/n_gsm.c
--- linux-3.0.9/drivers/tty/n_gsm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/n_gsm.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/tty/n_gsm.c 2011-11-15 20:02:59.000000000 -0500
@@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
return NULL;
spin_lock_init(&dlci->lock);
@@ -35739,7 +35739,7 @@ diff -urNp linux-3.0.9/drivers/tty/n_gsm.c linux-3.0.9/drivers/tty/n_gsm.c
}
diff -urNp linux-3.0.9/drivers/tty/n_tty.c linux-3.0.9/drivers/tty/n_tty.c
--- linux-3.0.9/drivers/tty/n_tty.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/n_tty.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/tty/n_tty.c 2011-11-15 20:02:59.000000000 -0500
@@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
{
*ops = tty_ldisc_N_TTY;
@@ -35751,7 +35751,7 @@ diff -urNp linux-3.0.9/drivers/tty/n_tty.c linux-3.0.9/drivers/tty/n_tty.c
EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
diff -urNp linux-3.0.9/drivers/tty/pty.c linux-3.0.9/drivers/tty/pty.c
--- linux-3.0.9/drivers/tty/pty.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/pty.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/tty/pty.c 2011-11-15 20:02:59.000000000 -0500
@@ -773,8 +773,10 @@ static void __init unix98_pty_init(void)
register_sysctl_table(pty_root_table);
@@ -35766,7 +35766,7 @@ diff -urNp linux-3.0.9/drivers/tty/pty.c linux-3.0.9/drivers/tty/pty.c
if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
diff -urNp linux-3.0.9/drivers/tty/rocket.c linux-3.0.9/drivers/tty/rocket.c
--- linux-3.0.9/drivers/tty/rocket.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/rocket.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/tty/rocket.c 2011-11-15 20:02:59.000000000 -0500
@@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info
struct rocket_ports tmp;
int board;
@@ -35778,7 +35778,7 @@ diff -urNp linux-3.0.9/drivers/tty/rocket.c linux-3.0.9/drivers/tty/rocket.c
memset(&tmp, 0, sizeof (tmp));
diff -urNp linux-3.0.9/drivers/tty/serial/kgdboc.c linux-3.0.9/drivers/tty/serial/kgdboc.c
--- linux-3.0.9/drivers/tty/serial/kgdboc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/serial/kgdboc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/tty/serial/kgdboc.c 2011-11-15 20:02:59.000000000 -0500
@@ -23,8 +23,9 @@
#define MAX_CONFIG_LEN 40
@@ -35879,7 +35879,7 @@ diff -urNp linux-3.0.9/drivers/tty/serial/kgdboc.c linux-3.0.9/drivers/tty/seria
static int __init kgdboc_early_init(char *opt)
diff -urNp linux-3.0.9/drivers/tty/serial/mfd.c linux-3.0.9/drivers/tty/serial/mfd.c
--- linux-3.0.9/drivers/tty/serial/mfd.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/serial/mfd.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/tty/serial/mfd.c 2011-11-15 20:02:59.000000000 -0500
@@ -1423,7 +1423,7 @@ static void serial_hsu_remove(struct pci
}
@@ -35891,7 +35891,7 @@ diff -urNp linux-3.0.9/drivers/tty/serial/mfd.c linux-3.0.9/drivers/tty/serial/m
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081D) },
diff -urNp linux-3.0.9/drivers/tty/serial/mrst_max3110.c linux-3.0.9/drivers/tty/serial/mrst_max3110.c
--- linux-3.0.9/drivers/tty/serial/mrst_max3110.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/serial/mrst_max3110.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/tty/serial/mrst_max3110.c 2011-11-15 20:02:59.000000000 -0500
@@ -393,6 +393,8 @@ static void max3110_con_receive(struct u
int loop = 1, num, total = 0;
u8 recv_buf[512], *pbuf;
@@ -35903,7 +35903,7 @@ diff -urNp linux-3.0.9/drivers/tty/serial/mrst_max3110.c linux-3.0.9/drivers/tty
num = max3110_read_multi(max, pbuf);
diff -urNp linux-3.0.9/drivers/tty/tty_io.c linux-3.0.9/drivers/tty/tty_io.c
--- linux-3.0.9/drivers/tty/tty_io.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/tty_io.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/tty/tty_io.c 2011-11-15 20:02:59.000000000 -0500
@@ -3238,7 +3238,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
void tty_default_fops(struct file_operations *fops)
@@ -35915,7 +35915,7 @@ diff -urNp linux-3.0.9/drivers/tty/tty_io.c linux-3.0.9/drivers/tty/tty_io.c
/*
diff -urNp linux-3.0.9/drivers/tty/tty_ldisc.c linux-3.0.9/drivers/tty/tty_ldisc.c
--- linux-3.0.9/drivers/tty/tty_ldisc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/tty_ldisc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/tty/tty_ldisc.c 2011-11-15 20:02:59.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;
@@ -35963,7 +35963,7 @@ diff -urNp linux-3.0.9/drivers/tty/tty_ldisc.c linux-3.0.9/drivers/tty/tty_ldisc
}
diff -urNp linux-3.0.9/drivers/tty/vt/keyboard.c linux-3.0.9/drivers/tty/vt/keyboard.c
--- linux-3.0.9/drivers/tty/vt/keyboard.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/vt/keyboard.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/tty/vt/keyboard.c 2011-11-15 20:02:59.000000000 -0500
@@ -656,6 +656,16 @@ static void k_spec(struct vc_data *vc, u
kbd->kbdmode == VC_OFF) &&
value != KVAL(K_SAK))
@@ -35983,7 +35983,7 @@ diff -urNp linux-3.0.9/drivers/tty/vt/keyboard.c linux-3.0.9/drivers/tty/vt/keyb
diff -urNp linux-3.0.9/drivers/tty/vt/vt.c linux-3.0.9/drivers/tty/vt/vt.c
--- linux-3.0.9/drivers/tty/vt/vt.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/vt/vt.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/tty/vt/vt.c 2011-11-15 20:02:59.000000000 -0500
@@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
static void notify_write(struct vc_data *vc, unsigned int unicode)
@@ -35995,7 +35995,7 @@ diff -urNp linux-3.0.9/drivers/tty/vt/vt.c linux-3.0.9/drivers/tty/vt/vt.c
diff -urNp linux-3.0.9/drivers/tty/vt/vt_ioctl.c linux-3.0.9/drivers/tty/vt/vt_ioctl.c
--- linux-3.0.9/drivers/tty/vt/vt_ioctl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/tty/vt/vt_ioctl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/tty/vt/vt_ioctl.c 2011-11-15 20:02:59.000000000 -0500
@@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
return -EFAULT;
@@ -36038,7 +36038,7 @@ diff -urNp linux-3.0.9/drivers/tty/vt/vt_ioctl.c linux-3.0.9/drivers/tty/vt/vt_i
goto reterr;
diff -urNp linux-3.0.9/drivers/uio/uio.c linux-3.0.9/drivers/uio/uio.c
--- linux-3.0.9/drivers/uio/uio.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/uio/uio.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/uio/uio.c 2011-11-15 20:02:59.000000000 -0500
@@ -25,6 +25,7 @@
#include <linux/kobject.h>
#include <linux/cdev.h>
@@ -36132,7 +36132,7 @@ diff -urNp linux-3.0.9/drivers/uio/uio.c linux-3.0.9/drivers/uio/uio.c
if (ret)
diff -urNp linux-3.0.9/drivers/usb/atm/cxacru.c linux-3.0.9/drivers/usb/atm/cxacru.c
--- linux-3.0.9/drivers/usb/atm/cxacru.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/atm/cxacru.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/usb/atm/cxacru.c 2011-11-15 20:02:59.000000000 -0500
@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c
ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
if (ret < 2)
@@ -36144,7 +36144,7 @@ diff -urNp linux-3.0.9/drivers/usb/atm/cxacru.c linux-3.0.9/drivers/usb/atm/cxac
diff -urNp linux-3.0.9/drivers/usb/atm/usbatm.c linux-3.0.9/drivers/usb/atm/usbatm.c
--- linux-3.0.9/drivers/usb/atm/usbatm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/atm/usbatm.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/usb/atm/usbatm.c 2011-11-15 20:02:59.000000000 -0500
@@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru
if (printk_ratelimit())
atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -36226,7 +36226,7 @@ diff -urNp linux-3.0.9/drivers/usb/atm/usbatm.c linux-3.0.9/drivers/usb/atm/usba
if (instance->disconnected)
diff -urNp linux-3.0.9/drivers/usb/core/devices.c linux-3.0.9/drivers/usb/core/devices.c
--- linux-3.0.9/drivers/usb/core/devices.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/core/devices.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/usb/core/devices.c 2011-11-15 20:02:59.000000000 -0500
@@ -126,7 +126,7 @@ static const char format_endpt[] =
* time it gets called.
*/
@@ -36256,7 +36256,7 @@ diff -urNp linux-3.0.9/drivers/usb/core/devices.c linux-3.0.9/drivers/usb/core/d
return POLLIN | POLLRDNORM;
diff -urNp linux-3.0.9/drivers/usb/core/message.c linux-3.0.9/drivers/usb/core/message.c
--- linux-3.0.9/drivers/usb/core/message.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/core/message.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/usb/core/message.c 2011-11-15 20:02:59.000000000 -0500
@@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
if (buf) {
@@ -36270,7 +36270,7 @@ diff -urNp linux-3.0.9/drivers/usb/core/message.c linux-3.0.9/drivers/usb/core/m
memcpy(smallbuf, buf, len);
diff -urNp linux-3.0.9/drivers/usb/early/ehci-dbgp.c linux-3.0.9/drivers/usb/early/ehci-dbgp.c
--- linux-3.0.9/drivers/usb/early/ehci-dbgp.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/early/ehci-dbgp.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/usb/early/ehci-dbgp.c 2011-11-15 20:02:59.000000000 -0500
@@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x,
#ifdef CONFIG_KGDB
@@ -36310,7 +36310,7 @@ diff -urNp linux-3.0.9/drivers/usb/early/ehci-dbgp.c linux-3.0.9/drivers/usb/ear
}
diff -urNp linux-3.0.9/drivers/usb/host/xhci-mem.c linux-3.0.9/drivers/usb/host/xhci-mem.c
--- linux-3.0.9/drivers/usb/host/xhci-mem.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/host/xhci-mem.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/usb/host/xhci-mem.c 2011-11-15 20:02:59.000000000 -0500
@@ -1690,6 +1690,8 @@ static int xhci_check_trb_in_td_math(str
unsigned int num_tests;
int i, ret;
@@ -36322,7 +36322,7 @@ diff -urNp linux-3.0.9/drivers/usb/host/xhci-mem.c linux-3.0.9/drivers/usb/host/
ret = xhci_test_trb_in_td(xhci,
diff -urNp linux-3.0.9/drivers/usb/wusbcore/wa-hc.h linux-3.0.9/drivers/usb/wusbcore/wa-hc.h
--- linux-3.0.9/drivers/usb/wusbcore/wa-hc.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/wusbcore/wa-hc.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/usb/wusbcore/wa-hc.h 2011-11-15 20:02:59.000000000 -0500
@@ -192,7 +192,7 @@ struct wahc {
struct list_head xfer_delayed_list;
spinlock_t xfer_list_lock;
@@ -36343,7 +36343,7 @@ diff -urNp linux-3.0.9/drivers/usb/wusbcore/wa-hc.h linux-3.0.9/drivers/usb/wusb
/**
diff -urNp linux-3.0.9/drivers/usb/wusbcore/wa-xfer.c linux-3.0.9/drivers/usb/wusbcore/wa-xfer.c
--- linux-3.0.9/drivers/usb/wusbcore/wa-xfer.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/usb/wusbcore/wa-xfer.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/usb/wusbcore/wa-xfer.c 2011-11-15 20:02:59.000000000 -0500
@@ -294,7 +294,7 @@ out:
*/
static void wa_xfer_id_init(struct wa_xfer *xfer)
@@ -36355,7 +36355,7 @@ diff -urNp linux-3.0.9/drivers/usb/wusbcore/wa-xfer.c linux-3.0.9/drivers/usb/wu
/*
diff -urNp linux-3.0.9/drivers/vhost/vhost.c linux-3.0.9/drivers/vhost/vhost.c
--- linux-3.0.9/drivers/vhost/vhost.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/vhost/vhost.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/vhost/vhost.c 2011-11-15 20:02:59.000000000 -0500
@@ -589,7 +589,7 @@ static int init_used(struct vhost_virtqu
return get_user(vq->last_used_idx, &used->idx);
}
@@ -36367,7 +36367,7 @@ diff -urNp linux-3.0.9/drivers/vhost/vhost.c linux-3.0.9/drivers/vhost/vhost.c
*pollstart = NULL, *pollstop = NULL;
diff -urNp linux-3.0.9/drivers/video/aty/aty128fb.c linux-3.0.9/drivers/video/aty/aty128fb.c
--- linux-3.0.9/drivers/video/aty/aty128fb.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/aty/aty128fb.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/video/aty/aty128fb.c 2011-11-15 20:02:59.000000000 -0500
@@ -148,7 +148,7 @@ enum {
};
@@ -36379,7 +36379,7 @@ diff -urNp linux-3.0.9/drivers/video/aty/aty128fb.c linux-3.0.9/drivers/video/at
"PRO AGP",
diff -urNp linux-3.0.9/drivers/video/fbcmap.c linux-3.0.9/drivers/video/fbcmap.c
--- linux-3.0.9/drivers/video/fbcmap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/fbcmap.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/video/fbcmap.c 2011-11-15 20:02:59.000000000 -0500
@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user
rc = -ENODEV;
goto out;
@@ -36392,7 +36392,7 @@ diff -urNp linux-3.0.9/drivers/video/fbcmap.c linux-3.0.9/drivers/video/fbcmap.c
}
diff -urNp linux-3.0.9/drivers/video/fbmem.c linux-3.0.9/drivers/video/fbmem.c
--- linux-3.0.9/drivers/video/fbmem.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/fbmem.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/video/fbmem.c 2011-11-15 20:02:59.000000000 -0500
@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_in
image->dx += image->width + 8;
}
@@ -36440,7 +36440,7 @@ diff -urNp linux-3.0.9/drivers/video/fbmem.c linux-3.0.9/drivers/video/fbmem.c
request_module("fb%d", con2fb.framebuffer);
diff -urNp linux-3.0.9/drivers/video/geode/gx1fb_core.c linux-3.0.9/drivers/video/geode/gx1fb_core.c
--- linux-3.0.9/drivers/video/geode/gx1fb_core.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/geode/gx1fb_core.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/video/geode/gx1fb_core.c 2011-11-15 20:02:59.000000000 -0500
@@ -29,7 +29,7 @@ static int crt_option = 1;
static char panel_option[32] = "";
@@ -36452,7 +36452,7 @@ diff -urNp linux-3.0.9/drivers/video/geode/gx1fb_core.c linux-3.0.9/drivers/vide
0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
diff -urNp linux-3.0.9/drivers/video/gxt4500.c linux-3.0.9/drivers/video/gxt4500.c
--- linux-3.0.9/drivers/video/gxt4500.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/gxt4500.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/video/gxt4500.c 2011-11-15 20:02:59.000000000 -0500
@@ -156,7 +156,7 @@ struct gxt4500_par {
static char *mode_option;
@@ -36473,7 +36473,7 @@ diff -urNp linux-3.0.9/drivers/video/gxt4500.c linux-3.0.9/drivers/video/gxt4500
.visual = FB_VISUAL_PSEUDOCOLOR,
diff -urNp linux-3.0.9/drivers/video/i810/i810_accel.c linux-3.0.9/drivers/video/i810/i810_accel.c
--- linux-3.0.9/drivers/video/i810/i810_accel.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/i810/i810_accel.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/video/i810/i810_accel.c 2011-11-15 20:02:59.000000000 -0500
@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
}
}
@@ -36484,7 +36484,7 @@ diff -urNp linux-3.0.9/drivers/video/i810/i810_accel.c linux-3.0.9/drivers/video
info->pixmap.scan_align = 1;
diff -urNp linux-3.0.9/drivers/video/i810/i810_main.c linux-3.0.9/drivers/video/i810/i810_main.c
--- linux-3.0.9/drivers/video/i810/i810_main.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/i810/i810_main.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/video/i810/i810_main.c 2011-11-15 20:02:59.000000000 -0500
@@ -97,7 +97,7 @@ static int i810fb_blank (int blank_
static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
@@ -36496,7 +36496,7 @@ diff -urNp linux-3.0.9/drivers/video/i810/i810_main.c linux-3.0.9/drivers/video/
"Intel(R) 810E Framebuffer Device" ,
diff -urNp linux-3.0.9/drivers/video/jz4740_fb.c linux-3.0.9/drivers/video/jz4740_fb.c
--- linux-3.0.9/drivers/video/jz4740_fb.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/jz4740_fb.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/video/jz4740_fb.c 2011-11-15 20:02:59.000000000 -0500
@@ -136,7 +136,7 @@ struct jzfb {
uint32_t pseudo_palette[16];
};
@@ -36508,7 +36508,7 @@ diff -urNp linux-3.0.9/drivers/video/jz4740_fb.c linux-3.0.9/drivers/video/jz474
.visual = FB_VISUAL_TRUECOLOR,
diff -urNp linux-3.0.9/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.9/drivers/video/logo/logo_linux_clut224.ppm
--- linux-3.0.9/drivers/video/logo/logo_linux_clut224.ppm 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/logo/logo_linux_clut224.ppm 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/video/logo/logo_linux_clut224.ppm 2011-11-15 20:02:59.000000000 -0500
@@ -1,1604 +1,1123 @@
P3
-# Standard 224-color Linux logo
@@ -39236,7 +39236,7 @@ diff -urNp linux-3.0.9/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.9/dri
+4 4 4 4 4 4
diff -urNp linux-3.0.9/drivers/video/udlfb.c linux-3.0.9/drivers/video/udlfb.c
--- linux-3.0.9/drivers/video/udlfb.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/udlfb.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/video/udlfb.c 2011-11-15 20:02:59.000000000 -0500
@@ -586,11 +586,11 @@ int dlfb_handle_damage(struct dlfb_data
dlfb_urb_completion(urb);
@@ -39322,7 +39322,7 @@ diff -urNp linux-3.0.9/drivers/video/udlfb.c linux-3.0.9/drivers/video/udlfb.c
}
diff -urNp linux-3.0.9/drivers/video/uvesafb.c linux-3.0.9/drivers/video/uvesafb.c
--- linux-3.0.9/drivers/video/uvesafb.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/uvesafb.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/video/uvesafb.c 2011-11-15 20:02:59.000000000 -0500
@@ -19,6 +19,7 @@
#include <linux/io.h>
#include <linux/mutex.h>
@@ -39400,7 +39400,7 @@ diff -urNp linux-3.0.9/drivers/video/uvesafb.c linux-3.0.9/drivers/video/uvesafb
framebuffer_release(info);
diff -urNp linux-3.0.9/drivers/video/vesafb.c linux-3.0.9/drivers/video/vesafb.c
--- linux-3.0.9/drivers/video/vesafb.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/vesafb.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/video/vesafb.c 2011-11-15 20:02:59.000000000 -0500
@@ -9,6 +9,7 @@
*/
@@ -39505,7 +39505,7 @@ diff -urNp linux-3.0.9/drivers/video/vesafb.c linux-3.0.9/drivers/video/vesafb.c
framebuffer_release(info);
diff -urNp linux-3.0.9/drivers/video/via/via_clock.h linux-3.0.9/drivers/video/via/via_clock.h
--- linux-3.0.9/drivers/video/via/via_clock.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/video/via/via_clock.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/video/via/via_clock.h 2011-11-15 20:02:59.000000000 -0500
@@ -56,7 +56,7 @@ struct via_clock {
void (*set_engine_pll_state)(u8 state);
@@ -39517,7 +39517,7 @@ diff -urNp linux-3.0.9/drivers/video/via/via_clock.h linux-3.0.9/drivers/video/v
static inline u32 get_pll_internal_frequency(u32 ref_freq,
diff -urNp linux-3.0.9/drivers/virtio/virtio_balloon.c linux-3.0.9/drivers/virtio/virtio_balloon.c
--- linux-3.0.9/drivers/virtio/virtio_balloon.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/virtio/virtio_balloon.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/drivers/virtio/virtio_balloon.c 2011-11-15 20:02:59.000000000 -0500
@@ -174,6 +174,8 @@ static void update_balloon_stats(struct
struct sysinfo i;
int idx = 0;
@@ -39529,7 +39529,7 @@ diff -urNp linux-3.0.9/drivers/virtio/virtio_balloon.c linux-3.0.9/drivers/virti
diff -urNp linux-3.0.9/fs/9p/vfs_inode.c linux-3.0.9/fs/9p/vfs_inode.c
--- linux-3.0.9/fs/9p/vfs_inode.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/9p/vfs_inode.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/9p/vfs_inode.c 2011-11-15 20:02:59.000000000 -0500
@@ -1264,7 +1264,7 @@ static void *v9fs_vfs_follow_link(struct
void
v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -39541,7 +39541,7 @@ diff -urNp linux-3.0.9/fs/9p/vfs_inode.c linux-3.0.9/fs/9p/vfs_inode.c
IS_ERR(s) ? "<error>" : s);
diff -urNp linux-3.0.9/fs/aio.c linux-3.0.9/fs/aio.c
--- linux-3.0.9/fs/aio.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/aio.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/aio.c 2011-11-15 20:02:59.000000000 -0500
@@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx
size += sizeof(struct io_event) * nr_events;
nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -39592,7 +39592,7 @@ diff -urNp linux-3.0.9/fs/aio.c linux-3.0.9/fs/aio.c
/* ki_nbytes/left now reflect bytes instead of segs */
diff -urNp linux-3.0.9/fs/attr.c linux-3.0.9/fs/attr.c
--- linux-3.0.9/fs/attr.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/attr.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/attr.c 2011-11-15 20:02:59.000000000 -0500
@@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode
unsigned long limit;
@@ -39603,7 +39603,7 @@ diff -urNp linux-3.0.9/fs/attr.c linux-3.0.9/fs/attr.c
if (offset > inode->i_sb->s_maxbytes)
diff -urNp linux-3.0.9/fs/autofs4/waitq.c linux-3.0.9/fs/autofs4/waitq.c
--- linux-3.0.9/fs/autofs4/waitq.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/autofs4/waitq.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/autofs4/waitq.c 2011-11-15 20:02:59.000000000 -0500
@@ -60,7 +60,7 @@ static int autofs4_write(struct file *fi
{
unsigned long sigpipe, flags;
@@ -39615,7 +39615,7 @@ diff -urNp linux-3.0.9/fs/autofs4/waitq.c linux-3.0.9/fs/autofs4/waitq.c
/** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
diff -urNp linux-3.0.9/fs/befs/linuxvfs.c linux-3.0.9/fs/befs/linuxvfs.c
--- linux-3.0.9/fs/befs/linuxvfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/befs/linuxvfs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/befs/linuxvfs.c 2011-11-15 20:02:59.000000000 -0500
@@ -503,7 +503,7 @@ static void befs_put_link(struct dentry
{
befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -39627,7 +39627,7 @@ diff -urNp linux-3.0.9/fs/befs/linuxvfs.c linux-3.0.9/fs/befs/linuxvfs.c
}
diff -urNp linux-3.0.9/fs/binfmt_aout.c linux-3.0.9/fs/binfmt_aout.c
--- linux-3.0.9/fs/binfmt_aout.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/binfmt_aout.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/binfmt_aout.c 2011-11-15 20:02:59.000000000 -0500
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/fs.h>
@@ -39706,7 +39706,7 @@ diff -urNp linux-3.0.9/fs/binfmt_aout.c linux-3.0.9/fs/binfmt_aout.c
up_write(&current->mm->mmap_sem);
diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
--- linux-3.0.9/fs/binfmt_elf.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/binfmt_elf.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/binfmt_elf.c 2011-11-15 20:02:59.000000000 -0500
@@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
#define elf_core_dump NULL
#endif
@@ -40412,7 +40412,7 @@ diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c
return register_binfmt(&elf_format);
diff -urNp linux-3.0.9/fs/binfmt_flat.c linux-3.0.9/fs/binfmt_flat.c
--- linux-3.0.9/fs/binfmt_flat.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/binfmt_flat.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/binfmt_flat.c 2011-11-15 20:02:59.000000000 -0500
@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b
realdatastart = (unsigned long) -ENOMEM;
printk("Unable to allocate RAM for process data, errno %d\n",
@@ -40447,7 +40447,7 @@ diff -urNp linux-3.0.9/fs/binfmt_flat.c linux-3.0.9/fs/binfmt_flat.c
}
diff -urNp linux-3.0.9/fs/bio.c linux-3.0.9/fs/bio.c
--- linux-3.0.9/fs/bio.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/bio.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/bio.c 2011-11-15 20:02:59.000000000 -0500
@@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b
const int read = bio_data_dir(bio) == READ;
struct bio_map_data *bmd = bio->bi_private;
@@ -40459,7 +40459,7 @@ diff -urNp linux-3.0.9/fs/bio.c linux-3.0.9/fs/bio.c
char *addr = page_address(bvec->bv_page);
diff -urNp linux-3.0.9/fs/block_dev.c linux-3.0.9/fs/block_dev.c
--- linux-3.0.9/fs/block_dev.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/block_dev.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/block_dev.c 2011-11-15 20:02:59.000000000 -0500
@@ -671,7 +671,7 @@ static bool bd_may_claim(struct block_de
else if (bdev->bd_contains == bdev)
return true; /* is a whole device which isn't held */
@@ -40471,7 +40471,7 @@ diff -urNp linux-3.0.9/fs/block_dev.c linux-3.0.9/fs/block_dev.c
return false; /* is a partition of a held device */
diff -urNp linux-3.0.9/fs/btrfs/ctree.c linux-3.0.9/fs/btrfs/ctree.c
--- linux-3.0.9/fs/btrfs/ctree.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/btrfs/ctree.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/btrfs/ctree.c 2011-11-15 20:02:59.000000000 -0500
@@ -454,9 +454,12 @@ static noinline int __btrfs_cow_block(st
free_extent_buffer(buf);
add_root_to_dirty_list(root);
@@ -40490,7 +40490,7 @@ diff -urNp linux-3.0.9/fs/btrfs/ctree.c linux-3.0.9/fs/btrfs/ctree.c
WARN_ON(trans->transid != btrfs_header_generation(parent));
diff -urNp linux-3.0.9/fs/btrfs/inode.c linux-3.0.9/fs/btrfs/inode.c
--- linux-3.0.9/fs/btrfs/inode.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/btrfs/inode.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/btrfs/inode.c 2011-11-15 20:02:59.000000000 -0500
@@ -6896,7 +6896,7 @@ fail:
return -ENOMEM;
}
@@ -40517,7 +40517,7 @@ diff -urNp linux-3.0.9/fs/btrfs/inode.c linux-3.0.9/fs/btrfs/inode.c
* directory.
diff -urNp linux-3.0.9/fs/btrfs/ioctl.c linux-3.0.9/fs/btrfs/ioctl.c
--- linux-3.0.9/fs/btrfs/ioctl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/btrfs/ioctl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/btrfs/ioctl.c 2011-11-15 20:02:59.000000000 -0500
@@ -2676,9 +2676,12 @@ long btrfs_ioctl_space_info(struct btrfs
for (i = 0; i < num_types; i++) {
struct btrfs_space_info *tmp;
@@ -40550,7 +40550,7 @@ diff -urNp linux-3.0.9/fs/btrfs/ioctl.c linux-3.0.9/fs/btrfs/ioctl.c
if (copy_to_user(user_dest, dest_orig, alloc_size))
diff -urNp linux-3.0.9/fs/btrfs/relocation.c linux-3.0.9/fs/btrfs/relocation.c
--- linux-3.0.9/fs/btrfs/relocation.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/btrfs/relocation.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/btrfs/relocation.c 2011-11-15 20:02:59.000000000 -0500
@@ -1242,7 +1242,7 @@ static int __update_reloc_root(struct bt
}
spin_unlock(&rc->reloc_root_tree.lock);
@@ -40562,7 +40562,7 @@ diff -urNp linux-3.0.9/fs/btrfs/relocation.c linux-3.0.9/fs/btrfs/relocation.c
spin_lock(&rc->reloc_root_tree.lock);
diff -urNp linux-3.0.9/fs/cachefiles/bind.c linux-3.0.9/fs/cachefiles/bind.c
--- linux-3.0.9/fs/cachefiles/bind.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cachefiles/bind.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/cachefiles/bind.c 2011-11-15 20:02:59.000000000 -0500
@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
args);
@@ -40581,7 +40581,7 @@ diff -urNp linux-3.0.9/fs/cachefiles/bind.c linux-3.0.9/fs/cachefiles/bind.c
diff -urNp linux-3.0.9/fs/cachefiles/daemon.c linux-3.0.9/fs/cachefiles/daemon.c
--- linux-3.0.9/fs/cachefiles/daemon.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cachefiles/daemon.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/cachefiles/daemon.c 2011-11-15 20:02:59.000000000 -0500
@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st
if (n > buflen)
return -EMSGSIZE;
@@ -40620,7 +40620,7 @@ diff -urNp linux-3.0.9/fs/cachefiles/daemon.c linux-3.0.9/fs/cachefiles/daemon.c
cache->bstop_percent = bstop;
diff -urNp linux-3.0.9/fs/cachefiles/internal.h linux-3.0.9/fs/cachefiles/internal.h
--- linux-3.0.9/fs/cachefiles/internal.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cachefiles/internal.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/cachefiles/internal.h 2011-11-15 20:02:59.000000000 -0500
@@ -57,7 +57,7 @@ struct cachefiles_cache {
wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
struct rb_root active_nodes; /* active nodes (can't be culled) */
@@ -40657,7 +40657,7 @@ diff -urNp linux-3.0.9/fs/cachefiles/internal.h linux-3.0.9/fs/cachefiles/intern
#else
diff -urNp linux-3.0.9/fs/cachefiles/namei.c linux-3.0.9/fs/cachefiles/namei.c
--- linux-3.0.9/fs/cachefiles/namei.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cachefiles/namei.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/cachefiles/namei.c 2011-11-15 20:02:59.000000000 -0500
@@ -318,7 +318,7 @@ try_again:
/* first step is to make up a grave dentry in the graveyard */
sprintf(nbuffer, "%08x%08x",
@@ -40669,7 +40669,7 @@ diff -urNp linux-3.0.9/fs/cachefiles/namei.c linux-3.0.9/fs/cachefiles/namei.c
trap = lock_rename(cache->graveyard, dir);
diff -urNp linux-3.0.9/fs/cachefiles/proc.c linux-3.0.9/fs/cachefiles/proc.c
--- linux-3.0.9/fs/cachefiles/proc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cachefiles/proc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/cachefiles/proc.c 2011-11-15 20:02:59.000000000 -0500
@@ -14,9 +14,9 @@
#include <linux/seq_file.h>
#include "internal.h"
@@ -40698,7 +40698,7 @@ diff -urNp linux-3.0.9/fs/cachefiles/proc.c linux-3.0.9/fs/cachefiles/proc.c
diff -urNp linux-3.0.9/fs/cachefiles/rdwr.c linux-3.0.9/fs/cachefiles/rdwr.c
--- linux-3.0.9/fs/cachefiles/rdwr.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cachefiles/rdwr.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/cachefiles/rdwr.c 2011-11-15 20:02:59.000000000 -0500
@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
old_fs = get_fs();
set_fs(KERNEL_DS);
@@ -40710,7 +40710,7 @@ diff -urNp linux-3.0.9/fs/cachefiles/rdwr.c linux-3.0.9/fs/cachefiles/rdwr.c
if (ret != len)
diff -urNp linux-3.0.9/fs/ceph/dir.c linux-3.0.9/fs/ceph/dir.c
--- linux-3.0.9/fs/ceph/dir.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ceph/dir.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ceph/dir.c 2011-11-15 20:02:59.000000000 -0500
@@ -226,7 +226,7 @@ static int ceph_readdir(struct file *fil
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
struct ceph_mds_client *mdsc = fsc->mdsc;
@@ -40722,7 +40722,7 @@ diff -urNp linux-3.0.9/fs/ceph/dir.c linux-3.0.9/fs/ceph/dir.c
struct ceph_mds_reply_info_parsed *rinfo;
diff -urNp linux-3.0.9/fs/cifs/cifs_debug.c linux-3.0.9/fs/cifs/cifs_debug.c
--- linux-3.0.9/fs/cifs/cifs_debug.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cifs/cifs_debug.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/cifs/cifs_debug.c 2011-11-15 20:02:59.000000000 -0500
@@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(str
if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
@@ -40854,7 +40854,7 @@ diff -urNp linux-3.0.9/fs/cifs/cifs_debug.c linux-3.0.9/fs/cifs/cifs_debug.c
}
diff -urNp linux-3.0.9/fs/cifs/cifsfs.c linux-3.0.9/fs/cifs/cifsfs.c
--- linux-3.0.9/fs/cifs/cifsfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cifs/cifsfs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/cifs/cifsfs.c 2011-11-15 20:02:59.000000000 -0500
@@ -996,7 +996,7 @@ cifs_init_request_bufs(void)
cifs_req_cachep = kmem_cache_create("cifs_request",
CIFSMaxBufSize +
@@ -40886,7 +40886,7 @@ diff -urNp linux-3.0.9/fs/cifs/cifsfs.c linux-3.0.9/fs/cifs/cifsfs.c
atomic_set(&midCount, 0);
diff -urNp linux-3.0.9/fs/cifs/cifsglob.h linux-3.0.9/fs/cifs/cifsglob.h
--- linux-3.0.9/fs/cifs/cifsglob.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cifs/cifsglob.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/cifs/cifsglob.h 2011-11-15 20:02:59.000000000 -0500
@@ -381,28 +381,28 @@ struct cifs_tcon {
__u16 Flags; /* optional support bits */
enum statusEnum tidStatus;
@@ -40960,7 +40960,7 @@ diff -urNp linux-3.0.9/fs/cifs/cifsglob.h linux-3.0.9/fs/cifs/cifsglob.h
GLOBAL_EXTERN atomic_t midCount;
diff -urNp linux-3.0.9/fs/cifs/link.c linux-3.0.9/fs/cifs/link.c
--- linux-3.0.9/fs/cifs/link.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cifs/link.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/cifs/link.c 2011-11-15 20:02:59.000000000 -0500
@@ -587,7 +587,7 @@ symlink_exit:
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -40972,7 +40972,7 @@ diff -urNp linux-3.0.9/fs/cifs/link.c linux-3.0.9/fs/cifs/link.c
}
diff -urNp linux-3.0.9/fs/cifs/misc.c linux-3.0.9/fs/cifs/misc.c
--- linux-3.0.9/fs/cifs/misc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/cifs/misc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/cifs/misc.c 2011-11-15 20:02:59.000000000 -0500
@@ -156,7 +156,7 @@ cifs_buf_get(void)
memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
atomic_inc(&bufAllocCount);
@@ -40993,7 +40993,7 @@ diff -urNp linux-3.0.9/fs/cifs/misc.c linux-3.0.9/fs/cifs/misc.c
}
diff -urNp linux-3.0.9/fs/coda/cache.c linux-3.0.9/fs/coda/cache.c
--- linux-3.0.9/fs/coda/cache.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/coda/cache.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/coda/cache.c 2011-11-15 20:02:59.000000000 -0500
@@ -24,7 +24,7 @@
#include "coda_linux.h"
#include "coda_cache.h"
@@ -41040,7 +41040,7 @@ diff -urNp linux-3.0.9/fs/coda/cache.c linux-3.0.9/fs/coda/cache.c
return hit;
diff -urNp linux-3.0.9/fs/compat_binfmt_elf.c linux-3.0.9/fs/compat_binfmt_elf.c
--- linux-3.0.9/fs/compat_binfmt_elf.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/compat_binfmt_elf.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/compat_binfmt_elf.c 2011-11-15 20:02:59.000000000 -0500
@@ -30,11 +30,13 @@
#undef elf_phdr
#undef elf_shdr
@@ -41057,7 +41057,7 @@ diff -urNp linux-3.0.9/fs/compat_binfmt_elf.c linux-3.0.9/fs/compat_binfmt_elf.c
/*
diff -urNp linux-3.0.9/fs/compat.c linux-3.0.9/fs/compat.c
--- linux-3.0.9/fs/compat.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/compat.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/compat.c 2011-11-15 20:02:59.000000000 -0500
@@ -133,8 +133,8 @@ asmlinkage long compat_sys_utimes(const
static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
{
@@ -41196,7 +41196,7 @@ diff -urNp linux-3.0.9/fs/compat.c linux-3.0.9/fs/compat.c
if (err)
diff -urNp linux-3.0.9/fs/compat_ioctl.c linux-3.0.9/fs/compat_ioctl.c
--- linux-3.0.9/fs/compat_ioctl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/compat_ioctl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/compat_ioctl.c 2011-11-15 20:02:59.000000000 -0500
@@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi
err = get_user(palp, &up->palette);
@@ -41237,7 +41237,7 @@ diff -urNp linux-3.0.9/fs/compat_ioctl.c linux-3.0.9/fs/compat_ioctl.c
if (a < b)
diff -urNp linux-3.0.9/fs/configfs/dir.c linux-3.0.9/fs/configfs/dir.c
--- linux-3.0.9/fs/configfs/dir.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/configfs/dir.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/configfs/dir.c 2011-11-15 20:02:59.000000000 -0500
@@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file
}
for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
@@ -41264,7 +41264,7 @@ diff -urNp linux-3.0.9/fs/configfs/dir.c linux-3.0.9/fs/configfs/dir.c
* We'll have a dentry and an inode for
diff -urNp linux-3.0.9/fs/dcache.c linux-3.0.9/fs/dcache.c
--- linux-3.0.9/fs/dcache.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/dcache.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/dcache.c 2011-11-15 20:02:59.000000000 -0500
@@ -3089,7 +3089,7 @@ void __init vfs_caches_init(unsigned lon
mempages -= reserve;
@@ -41276,7 +41276,7 @@ diff -urNp linux-3.0.9/fs/dcache.c linux-3.0.9/fs/dcache.c
inode_init();
diff -urNp linux-3.0.9/fs/ecryptfs/inode.c linux-3.0.9/fs/ecryptfs/inode.c
--- linux-3.0.9/fs/ecryptfs/inode.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ecryptfs/inode.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ecryptfs/inode.c 2011-11-15 20:02:59.000000000 -0500
@@ -704,7 +704,7 @@ static int ecryptfs_readlink_lower(struc
old_fs = get_fs();
set_fs(get_ds());
@@ -41306,7 +41306,7 @@ diff -urNp linux-3.0.9/fs/ecryptfs/inode.c linux-3.0.9/fs/ecryptfs/inode.c
kfree(buf);
diff -urNp linux-3.0.9/fs/ecryptfs/miscdev.c linux-3.0.9/fs/ecryptfs/miscdev.c
--- linux-3.0.9/fs/ecryptfs/miscdev.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ecryptfs/miscdev.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ecryptfs/miscdev.c 2011-11-15 20:02:59.000000000 -0500
@@ -328,7 +328,7 @@ check_list:
goto out_unlock_msg_ctx;
i = 5;
@@ -41318,7 +41318,7 @@ diff -urNp linux-3.0.9/fs/ecryptfs/miscdev.c linux-3.0.9/fs/ecryptfs/miscdev.c
if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
diff -urNp linux-3.0.9/fs/ecryptfs/read_write.c linux-3.0.9/fs/ecryptfs/read_write.c
--- linux-3.0.9/fs/ecryptfs/read_write.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ecryptfs/read_write.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ecryptfs/read_write.c 2011-11-15 20:02:59.000000000 -0500
@@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *e
return -EIO;
fs_save = get_fs();
@@ -41339,7 +41339,7 @@ diff -urNp linux-3.0.9/fs/ecryptfs/read_write.c linux-3.0.9/fs/ecryptfs/read_wri
}
diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
--- linux-3.0.9/fs/exec.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/exec.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/exec.c 2011-11-15 20:02:59.000000000 -0500
@@ -55,12 +55,24 @@
#include <linux/pipe_fs_i.h>
#include <linux/oom.h>
@@ -42025,7 +42025,7 @@ diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c
diff -urNp linux-3.0.9/fs/ext2/balloc.c linux-3.0.9/fs/ext2/balloc.c
--- linux-3.0.9/fs/ext2/balloc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext2/balloc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ext2/balloc.c 2011-11-15 20:02:59.000000000 -0500
@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -42037,7 +42037,7 @@ diff -urNp linux-3.0.9/fs/ext2/balloc.c linux-3.0.9/fs/ext2/balloc.c
return 0;
diff -urNp linux-3.0.9/fs/ext3/balloc.c linux-3.0.9/fs/ext3/balloc.c
--- linux-3.0.9/fs/ext3/balloc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext3/balloc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ext3/balloc.c 2011-11-15 20:02:59.000000000 -0500
@@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -42049,7 +42049,7 @@ diff -urNp linux-3.0.9/fs/ext3/balloc.c linux-3.0.9/fs/ext3/balloc.c
return 0;
diff -urNp linux-3.0.9/fs/ext3/ioctl.c linux-3.0.9/fs/ext3/ioctl.c
--- linux-3.0.9/fs/ext3/ioctl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext3/ioctl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ext3/ioctl.c 2011-11-15 20:02:59.000000000 -0500
@@ -285,7 +285,7 @@ group_add_out:
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
@@ -42070,7 +42070,7 @@ diff -urNp linux-3.0.9/fs/ext3/ioctl.c linux-3.0.9/fs/ext3/ioctl.c
diff -urNp linux-3.0.9/fs/ext4/balloc.c linux-3.0.9/fs/ext4/balloc.c
--- linux-3.0.9/fs/ext4/balloc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext4/balloc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ext4/balloc.c 2011-11-15 20:02:59.000000000 -0500
@@ -394,8 +394,8 @@ static int ext4_has_free_blocks(struct e
/* Hm, nope. Are (enough) root reserved blocks available? */
if (sbi->s_resuid == current_fsuid() ||
@@ -42084,7 +42084,7 @@ diff -urNp linux-3.0.9/fs/ext4/balloc.c linux-3.0.9/fs/ext4/balloc.c
return 1;
diff -urNp linux-3.0.9/fs/ext4/ext4.h linux-3.0.9/fs/ext4/ext4.h
--- linux-3.0.9/fs/ext4/ext4.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext4/ext4.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ext4/ext4.h 2011-11-15 20:02:59.000000000 -0500
@@ -1177,19 +1177,19 @@ struct ext4_sb_info {
unsigned long s_mb_last_start;
@@ -42117,7 +42117,7 @@ diff -urNp linux-3.0.9/fs/ext4/ext4.h linux-3.0.9/fs/ext4/ext4.h
/* locality groups */
diff -urNp linux-3.0.9/fs/ext4/file.c linux-3.0.9/fs/ext4/file.c
--- linux-3.0.9/fs/ext4/file.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext4/file.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ext4/file.c 2011-11-15 20:02:59.000000000 -0500
@@ -181,8 +181,8 @@ static int ext4_file_open(struct inode *
path.dentry = mnt->mnt_root;
cp = d_path(&path, buf, sizeof(buf));
@@ -42131,7 +42131,7 @@ diff -urNp linux-3.0.9/fs/ext4/file.c linux-3.0.9/fs/ext4/file.c
}
diff -urNp linux-3.0.9/fs/ext4/ioctl.c linux-3.0.9/fs/ext4/ioctl.c
--- linux-3.0.9/fs/ext4/ioctl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext4/ioctl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ext4/ioctl.c 2011-11-15 20:02:59.000000000 -0500
@@ -344,7 +344,7 @@ mext_out:
if (!blk_queue_discard(q))
return -EOPNOTSUPP;
@@ -42152,7 +42152,7 @@ diff -urNp linux-3.0.9/fs/ext4/ioctl.c linux-3.0.9/fs/ext4/ioctl.c
diff -urNp linux-3.0.9/fs/ext4/mballoc.c linux-3.0.9/fs/ext4/mballoc.c
--- linux-3.0.9/fs/ext4/mballoc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ext4/mballoc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ext4/mballoc.c 2011-11-15 20:02:59.000000000 -0500
@@ -1793,7 +1793,7 @@ void ext4_mb_simple_scan_group(struct ex
BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
@@ -42277,7 +42277,7 @@ diff -urNp linux-3.0.9/fs/ext4/mballoc.c linux-3.0.9/fs/ext4/mballoc.c
return 0;
diff -urNp linux-3.0.9/fs/fcntl.c linux-3.0.9/fs/fcntl.c
--- linux-3.0.9/fs/fcntl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fcntl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/fcntl.c 2011-11-15 20:02:59.000000000 -0500
@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
if (err)
return err;
@@ -42335,7 +42335,7 @@ diff -urNp linux-3.0.9/fs/fcntl.c linux-3.0.9/fs/fcntl.c
fasync_cache = kmem_cache_create("fasync_cache",
diff -urNp linux-3.0.9/fs/fifo.c linux-3.0.9/fs/fifo.c
--- linux-3.0.9/fs/fifo.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fifo.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/fifo.c 2011-11-15 20:02:59.000000000 -0500
@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
*/
filp->f_op = &read_pipefifo_fops;
@@ -42408,7 +42408,7 @@ diff -urNp linux-3.0.9/fs/fifo.c linux-3.0.9/fs/fifo.c
err_nocleanup:
diff -urNp linux-3.0.9/fs/file.c linux-3.0.9/fs/file.c
--- linux-3.0.9/fs/file.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/file.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/file.c 2011-11-15 20:02:59.000000000 -0500
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -42427,7 +42427,7 @@ diff -urNp linux-3.0.9/fs/file.c linux-3.0.9/fs/file.c
diff -urNp linux-3.0.9/fs/filesystems.c linux-3.0.9/fs/filesystems.c
--- linux-3.0.9/fs/filesystems.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/filesystems.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/filesystems.c 2011-11-15 20:02:59.000000000 -0500
@@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(con
int len = dot ? dot - name : strlen(name);
@@ -42443,7 +42443,7 @@ diff -urNp linux-3.0.9/fs/filesystems.c linux-3.0.9/fs/filesystems.c
if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
diff -urNp linux-3.0.9/fs/fscache/cookie.c linux-3.0.9/fs/fscache/cookie.c
--- linux-3.0.9/fs/fscache/cookie.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fscache/cookie.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/fscache/cookie.c 2011-11-15 20:02:59.000000000 -0500
@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire
parent ? (char *) parent->def->name : "<no-parent>",
def->name, netfs_data);
@@ -42564,7 +42564,7 @@ diff -urNp linux-3.0.9/fs/fscache/cookie.c linux-3.0.9/fs/fscache/cookie.c
}
diff -urNp linux-3.0.9/fs/fscache/internal.h linux-3.0.9/fs/fscache/internal.h
--- linux-3.0.9/fs/fscache/internal.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fscache/internal.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/fscache/internal.h 2011-11-15 20:02:59.000000000 -0500
@@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
@@ -42770,7 +42770,7 @@ diff -urNp linux-3.0.9/fs/fscache/internal.h linux-3.0.9/fs/fscache/internal.h
diff -urNp linux-3.0.9/fs/fscache/object.c linux-3.0.9/fs/fscache/object.c
--- linux-3.0.9/fs/fscache/object.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fscache/object.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/fscache/object.c 2011-11-15 20:02:59.000000000 -0500
@@ -128,7 +128,7 @@ static void fscache_object_state_machine
/* update the object metadata on disk */
case FSCACHE_OBJECT_UPDATING:
@@ -42884,7 +42884,7 @@ diff -urNp linux-3.0.9/fs/fscache/object.c linux-3.0.9/fs/fscache/object.c
default:
diff -urNp linux-3.0.9/fs/fscache/operation.c linux-3.0.9/fs/fscache/operation.c
--- linux-3.0.9/fs/fscache/operation.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fscache/operation.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/fscache/operation.c 2011-11-15 20:02:59.000000000 -0500
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include "internal.h"
@@ -43002,7 +43002,7 @@ diff -urNp linux-3.0.9/fs/fscache/operation.c linux-3.0.9/fs/fscache/operation.c
diff -urNp linux-3.0.9/fs/fscache/page.c linux-3.0.9/fs/fscache/page.c
--- linux-3.0.9/fs/fscache/page.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fscache/page.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/fscache/page.c 2011-11-15 20:02:59.000000000 -0500
@@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct
val = radix_tree_lookup(&cookie->stores, page->index);
if (!val) {
@@ -43388,7 +43388,7 @@ diff -urNp linux-3.0.9/fs/fscache/page.c linux-3.0.9/fs/fscache/page.c
for (loop = 0; loop < pagevec->nr; loop++) {
diff -urNp linux-3.0.9/fs/fscache/stats.c linux-3.0.9/fs/fscache/stats.c
--- linux-3.0.9/fs/fscache/stats.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fscache/stats.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/fscache/stats.c 2011-11-15 20:02:59.000000000 -0500
@@ -18,95 +18,95 @@
/*
* operation counters
@@ -43766,7 +43766,7 @@ diff -urNp linux-3.0.9/fs/fscache/stats.c linux-3.0.9/fs/fscache/stats.c
atomic_read(&fscache_n_cop_alloc_object),
diff -urNp linux-3.0.9/fs/fs_struct.c linux-3.0.9/fs/fs_struct.c
--- linux-3.0.9/fs/fs_struct.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fs_struct.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/fs_struct.c 2011-11-15 20:02:59.000000000 -0500
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -43858,7 +43858,7 @@ diff -urNp linux-3.0.9/fs/fs_struct.c linux-3.0.9/fs/fs_struct.c
task_unlock(current);
diff -urNp linux-3.0.9/fs/fuse/cuse.c linux-3.0.9/fs/fuse/cuse.c
--- linux-3.0.9/fs/fuse/cuse.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fuse/cuse.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/fuse/cuse.c 2011-11-15 20:02:59.000000000 -0500
@@ -586,10 +586,12 @@ static int __init cuse_init(void)
INIT_LIST_HEAD(&cuse_conntbl[i]);
@@ -43878,7 +43878,7 @@ diff -urNp linux-3.0.9/fs/fuse/cuse.c linux-3.0.9/fs/fuse/cuse.c
if (IS_ERR(cuse_class))
diff -urNp linux-3.0.9/fs/fuse/dev.c linux-3.0.9/fs/fuse/dev.c
--- linux-3.0.9/fs/fuse/dev.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fuse/dev.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/fuse/dev.c 2011-11-15 20:02:59.000000000 -0500
@@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(stru
ret = 0;
pipe_lock(pipe);
@@ -43890,7 +43890,7 @@ diff -urNp linux-3.0.9/fs/fuse/dev.c linux-3.0.9/fs/fuse/dev.c
ret = -EPIPE;
diff -urNp linux-3.0.9/fs/fuse/dir.c linux-3.0.9/fs/fuse/dir.c
--- linux-3.0.9/fs/fuse/dir.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/fuse/dir.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/fuse/dir.c 2011-11-15 20:02:59.000000000 -0500
@@ -1148,7 +1148,7 @@ static char *read_link(struct dentry *de
return link;
}
@@ -43902,7 +43902,7 @@ diff -urNp linux-3.0.9/fs/fuse/dir.c linux-3.0.9/fs/fuse/dir.c
free_page((unsigned long) link);
diff -urNp linux-3.0.9/fs/gfs2/inode.c linux-3.0.9/fs/gfs2/inode.c
--- linux-3.0.9/fs/gfs2/inode.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/gfs2/inode.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/gfs2/inode.c 2011-11-15 20:02:59.000000000 -0500
@@ -1525,7 +1525,7 @@ out:
static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -43914,7 +43914,7 @@ diff -urNp linux-3.0.9/fs/gfs2/inode.c linux-3.0.9/fs/gfs2/inode.c
}
diff -urNp linux-3.0.9/fs/hfsplus/catalog.c linux-3.0.9/fs/hfsplus/catalog.c
--- linux-3.0.9/fs/hfsplus/catalog.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/hfsplus/catalog.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/hfsplus/catalog.c 2011-11-15 20:02:59.000000000 -0500
@@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block
int err;
u16 type;
@@ -43944,7 +43944,7 @@ diff -urNp linux-3.0.9/fs/hfsplus/catalog.c linux-3.0.9/fs/hfsplus/catalog.c
dst_dir->i_ino, dst_name->name);
diff -urNp linux-3.0.9/fs/hfsplus/dir.c linux-3.0.9/fs/hfsplus/dir.c
--- linux-3.0.9/fs/hfsplus/dir.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/hfsplus/dir.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/hfsplus/dir.c 2011-11-15 20:02:59.000000000 -0500
@@ -129,6 +129,8 @@ static int hfsplus_readdir(struct file *
struct hfsplus_readdir_data *rd;
u16 type;
@@ -43956,7 +43956,7 @@ diff -urNp linux-3.0.9/fs/hfsplus/dir.c linux-3.0.9/fs/hfsplus/dir.c
diff -urNp linux-3.0.9/fs/hfsplus/inode.c linux-3.0.9/fs/hfsplus/inode.c
--- linux-3.0.9/fs/hfsplus/inode.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/hfsplus/inode.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/hfsplus/inode.c 2011-11-15 20:02:59.000000000 -0500
@@ -489,6 +489,8 @@ int hfsplus_cat_read_inode(struct inode
int res = 0;
u16 type;
@@ -43977,7 +43977,7 @@ diff -urNp linux-3.0.9/fs/hfsplus/inode.c linux-3.0.9/fs/hfsplus/inode.c
diff -urNp linux-3.0.9/fs/hfsplus/ioctl.c linux-3.0.9/fs/hfsplus/ioctl.c
--- linux-3.0.9/fs/hfsplus/ioctl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/hfsplus/ioctl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/hfsplus/ioctl.c 2011-11-15 20:02:59.000000000 -0500
@@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dent
struct hfsplus_cat_file *file;
int res;
@@ -43998,7 +43998,7 @@ diff -urNp linux-3.0.9/fs/hfsplus/ioctl.c linux-3.0.9/fs/hfsplus/ioctl.c
diff -urNp linux-3.0.9/fs/hfsplus/super.c linux-3.0.9/fs/hfsplus/super.c
--- linux-3.0.9/fs/hfsplus/super.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/hfsplus/super.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/hfsplus/super.c 2011-11-15 20:02:59.000000000 -0500
@@ -340,6 +340,8 @@ static int hfsplus_fill_super(struct sup
struct nls_table *nls = NULL;
int err;
@@ -44010,7 +44010,7 @@ diff -urNp linux-3.0.9/fs/hfsplus/super.c linux-3.0.9/fs/hfsplus/super.c
if (!sbi)
diff -urNp linux-3.0.9/fs/hugetlbfs/inode.c linux-3.0.9/fs/hugetlbfs/inode.c
--- linux-3.0.9/fs/hugetlbfs/inode.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/hugetlbfs/inode.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/hugetlbfs/inode.c 2011-11-15 20:02:59.000000000 -0500
@@ -914,7 +914,7 @@ static struct file_system_type hugetlbfs
.kill_sb = kill_litter_super,
};
@@ -44022,7 +44022,7 @@ diff -urNp linux-3.0.9/fs/hugetlbfs/inode.c linux-3.0.9/fs/hugetlbfs/inode.c
{
diff -urNp linux-3.0.9/fs/inode.c linux-3.0.9/fs/inode.c
--- linux-3.0.9/fs/inode.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/inode.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/inode.c 2011-11-15 20:02:59.000000000 -0500
@@ -829,8 +829,8 @@ unsigned int get_next_ino(void)
#ifdef CONFIG_SMP
@@ -44036,7 +44036,7 @@ diff -urNp linux-3.0.9/fs/inode.c linux-3.0.9/fs/inode.c
}
diff -urNp linux-3.0.9/fs/jbd/checkpoint.c linux-3.0.9/fs/jbd/checkpoint.c
--- linux-3.0.9/fs/jbd/checkpoint.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/jbd/checkpoint.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/jbd/checkpoint.c 2011-11-15 20:02:59.000000000 -0500
@@ -350,6 +350,8 @@ int log_do_checkpoint(journal_t *journal
tid_t this_tid;
int result;
@@ -44048,7 +44048,7 @@ diff -urNp linux-3.0.9/fs/jbd/checkpoint.c linux-3.0.9/fs/jbd/checkpoint.c
/*
diff -urNp linux-3.0.9/fs/jffs2/compr_rtime.c linux-3.0.9/fs/jffs2/compr_rtime.c
--- linux-3.0.9/fs/jffs2/compr_rtime.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/jffs2/compr_rtime.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/jffs2/compr_rtime.c 2011-11-15 20:02:59.000000000 -0500
@@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned
int outpos = 0;
int pos=0;
@@ -44069,7 +44069,7 @@ diff -urNp linux-3.0.9/fs/jffs2/compr_rtime.c linux-3.0.9/fs/jffs2/compr_rtime.c
while (outpos<destlen) {
diff -urNp linux-3.0.9/fs/jffs2/compr_rubin.c linux-3.0.9/fs/jffs2/compr_rubin.c
--- linux-3.0.9/fs/jffs2/compr_rubin.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/jffs2/compr_rubin.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/jffs2/compr_rubin.c 2011-11-15 20:02:59.000000000 -0500
@@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig
int ret;
uint32_t mysrclen, mydstlen;
@@ -44081,7 +44081,7 @@ diff -urNp linux-3.0.9/fs/jffs2/compr_rubin.c linux-3.0.9/fs/jffs2/compr_rubin.c
diff -urNp linux-3.0.9/fs/jffs2/erase.c linux-3.0.9/fs/jffs2/erase.c
--- linux-3.0.9/fs/jffs2/erase.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/jffs2/erase.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/jffs2/erase.c 2011-11-15 20:02:59.000000000 -0500
@@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru
struct jffs2_unknown_node marker = {
.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -44094,7 +44094,7 @@ diff -urNp linux-3.0.9/fs/jffs2/erase.c linux-3.0.9/fs/jffs2/erase.c
jffs2_prealloc_raw_node_refs(c, jeb, 1);
diff -urNp linux-3.0.9/fs/jffs2/wbuf.c linux-3.0.9/fs/jffs2/wbuf.c
--- linux-3.0.9/fs/jffs2/wbuf.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/jffs2/wbuf.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/jffs2/wbuf.c 2011-11-15 20:02:59.000000000 -0500
@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
{
.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -44107,7 +44107,7 @@ diff -urNp linux-3.0.9/fs/jffs2/wbuf.c linux-3.0.9/fs/jffs2/wbuf.c
/*
diff -urNp linux-3.0.9/fs/jffs2/xattr.c linux-3.0.9/fs/jffs2/xattr.c
--- linux-3.0.9/fs/jffs2/xattr.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/jffs2/xattr.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/jffs2/xattr.c 2011-11-15 20:02:59.000000000 -0500
@@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct
BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
@@ -44119,7 +44119,7 @@ diff -urNp linux-3.0.9/fs/jffs2/xattr.c linux-3.0.9/fs/jffs2/xattr.c
xref_tmphash[i] = NULL;
diff -urNp linux-3.0.9/fs/jfs/super.c linux-3.0.9/fs/jfs/super.c
--- linux-3.0.9/fs/jfs/super.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/jfs/super.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/jfs/super.c 2011-11-15 20:02:59.000000000 -0500
@@ -803,7 +803,7 @@ static int __init init_jfs_fs(void)
jfs_inode_cachep =
@@ -44131,7 +44131,7 @@ diff -urNp linux-3.0.9/fs/jfs/super.c linux-3.0.9/fs/jfs/super.c
return -ENOMEM;
diff -urNp linux-3.0.9/fs/Kconfig.binfmt linux-3.0.9/fs/Kconfig.binfmt
--- linux-3.0.9/fs/Kconfig.binfmt 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/Kconfig.binfmt 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/Kconfig.binfmt 2011-11-15 20:02:59.000000000 -0500
@@ -86,7 +86,7 @@ config HAVE_AOUT
config BINFMT_AOUT
@@ -44143,7 +44143,7 @@ diff -urNp linux-3.0.9/fs/Kconfig.binfmt linux-3.0.9/fs/Kconfig.binfmt
executables used in the earliest versions of UNIX. Linux used
diff -urNp linux-3.0.9/fs/libfs.c linux-3.0.9/fs/libfs.c
--- linux-3.0.9/fs/libfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/libfs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/libfs.c 2011-11-15 20:02:59.000000000 -0500
@@ -163,6 +163,9 @@ int dcache_readdir(struct file * filp, v
for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
@@ -44170,7 +44170,7 @@ diff -urNp linux-3.0.9/fs/libfs.c linux-3.0.9/fs/libfs.c
dt_type(next->d_inode)) < 0)
diff -urNp linux-3.0.9/fs/lockd/clntproc.c linux-3.0.9/fs/lockd/clntproc.c
--- linux-3.0.9/fs/lockd/clntproc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/lockd/clntproc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/lockd/clntproc.c 2011-11-15 20:02:59.000000000 -0500
@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt
/*
* Cookie counter for NLM requests
@@ -44196,7 +44196,7 @@ diff -urNp linux-3.0.9/fs/lockd/clntproc.c linux-3.0.9/fs/lockd/clntproc.c
locks_init_lock(&req->a_args.lock.fl);
diff -urNp linux-3.0.9/fs/locks.c linux-3.0.9/fs/locks.c
--- linux-3.0.9/fs/locks.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/locks.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/locks.c 2011-11-15 20:02:59.000000000 -0500
@@ -2043,16 +2043,16 @@ void locks_remove_flock(struct file *fil
return;
@@ -44220,7 +44220,7 @@ diff -urNp linux-3.0.9/fs/locks.c linux-3.0.9/fs/locks.c
lock_flocks();
diff -urNp linux-3.0.9/fs/logfs/super.c linux-3.0.9/fs/logfs/super.c
--- linux-3.0.9/fs/logfs/super.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/logfs/super.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/logfs/super.c 2011-11-15 20:02:59.000000000 -0500
@@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super
struct logfs_disk_super _ds1, *ds1 = &_ds1;
int err, valid0, valid1;
@@ -44232,7 +44232,7 @@ diff -urNp linux-3.0.9/fs/logfs/super.c linux-3.0.9/fs/logfs/super.c
if (err)
diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
--- linux-3.0.9/fs/namei.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/namei.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/namei.c 2011-11-15 20:02:59.000000000 -0500
@@ -239,21 +239,23 @@ int generic_permission(struct inode *ino
return ret;
@@ -44743,7 +44743,7 @@ diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c
return len;
diff -urNp linux-3.0.9/fs/namespace.c linux-3.0.9/fs/namespace.c
--- linux-3.0.9/fs/namespace.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/namespace.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/namespace.c 2011-11-15 20:02:59.000000000 -0500
@@ -1329,6 +1329,9 @@ static int do_umount(struct vfsmount *mn
if (!(sb->s_flags & MS_RDONLY))
retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -44805,7 +44805,7 @@ diff -urNp linux-3.0.9/fs/namespace.c linux-3.0.9/fs/namespace.c
if (error)
diff -urNp linux-3.0.9/fs/ncpfs/dir.c linux-3.0.9/fs/ncpfs/dir.c
--- linux-3.0.9/fs/ncpfs/dir.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ncpfs/dir.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ncpfs/dir.c 2011-11-15 20:02:59.000000000 -0500
@@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentr
int res, val = 0, len;
__u8 __name[NCP_MAXPATHLEN + 1];
@@ -44853,7 +44853,7 @@ diff -urNp linux-3.0.9/fs/ncpfs/dir.c linux-3.0.9/fs/ncpfs/dir.c
new_dentry->d_parent->d_name.name, new_dentry->d_name.name);
diff -urNp linux-3.0.9/fs/ncpfs/inode.c linux-3.0.9/fs/ncpfs/inode.c
--- linux-3.0.9/fs/ncpfs/inode.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ncpfs/inode.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ncpfs/inode.c 2011-11-15 20:02:59.000000000 -0500
@@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_b
#endif
struct ncp_entry_info finfo;
@@ -44865,7 +44865,7 @@ diff -urNp linux-3.0.9/fs/ncpfs/inode.c linux-3.0.9/fs/ncpfs/inode.c
if (!server)
diff -urNp linux-3.0.9/fs/nfs/inode.c linux-3.0.9/fs/nfs/inode.c
--- linux-3.0.9/fs/nfs/inode.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/nfs/inode.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/nfs/inode.c 2011-11-15 20:02:59.000000000 -0500
@@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct
nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
nfsi->attrtimeo_timestamp = jiffies;
@@ -44897,7 +44897,7 @@ diff -urNp linux-3.0.9/fs/nfs/inode.c linux-3.0.9/fs/nfs/inode.c
void nfs_fattr_init(struct nfs_fattr *fattr)
diff -urNp linux-3.0.9/fs/nfsd/nfs4state.c linux-3.0.9/fs/nfsd/nfs4state.c
--- linux-3.0.9/fs/nfsd/nfs4state.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/nfsd/nfs4state.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/nfsd/nfs4state.c 2011-11-15 20:02:59.000000000 -0500
@@ -3804,6 +3804,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
unsigned int strhashval;
int err;
@@ -44909,7 +44909,7 @@ diff -urNp linux-3.0.9/fs/nfsd/nfs4state.c linux-3.0.9/fs/nfsd/nfs4state.c
(long long) lock->lk_length);
diff -urNp linux-3.0.9/fs/nfsd/nfs4xdr.c linux-3.0.9/fs/nfsd/nfs4xdr.c
--- linux-3.0.9/fs/nfsd/nfs4xdr.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/nfsd/nfs4xdr.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/nfsd/nfs4xdr.c 2011-11-15 20:02:59.000000000 -0500
@@ -1800,6 +1800,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
.dentry = dentry,
};
@@ -44921,7 +44921,7 @@ diff -urNp linux-3.0.9/fs/nfsd/nfs4xdr.c linux-3.0.9/fs/nfsd/nfs4xdr.c
BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion));
diff -urNp linux-3.0.9/fs/nfsd/vfs.c linux-3.0.9/fs/nfsd/vfs.c
--- linux-3.0.9/fs/nfsd/vfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/nfsd/vfs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/nfsd/vfs.c 2011-11-15 20:02:59.000000000 -0500
@@ -896,7 +896,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
} else {
oldfs = get_fs();
@@ -44951,7 +44951,7 @@ diff -urNp linux-3.0.9/fs/nfsd/vfs.c linux-3.0.9/fs/nfsd/vfs.c
if (host_err < 0)
diff -urNp linux-3.0.9/fs/notify/fanotify/fanotify_user.c linux-3.0.9/fs/notify/fanotify/fanotify_user.c
--- linux-3.0.9/fs/notify/fanotify/fanotify_user.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/notify/fanotify/fanotify_user.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/notify/fanotify/fanotify_user.c 2011-11-15 20:02:59.000000000 -0500
@@ -276,7 +276,8 @@ static ssize_t copy_event_to_user(struct
goto out_close_fd;
@@ -44964,7 +44964,7 @@ diff -urNp linux-3.0.9/fs/notify/fanotify/fanotify_user.c linux-3.0.9/fs/notify/
diff -urNp linux-3.0.9/fs/notify/notification.c linux-3.0.9/fs/notify/notification.c
--- linux-3.0.9/fs/notify/notification.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/notify/notification.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/notify/notification.c 2011-11-15 20:02:59.000000000 -0500
@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event
* get set to 0 so it will never get 'freed'
*/
@@ -44985,7 +44985,7 @@ diff -urNp linux-3.0.9/fs/notify/notification.c linux-3.0.9/fs/notify/notificati
diff -urNp linux-3.0.9/fs/ntfs/dir.c linux-3.0.9/fs/ntfs/dir.c
--- linux-3.0.9/fs/ntfs/dir.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ntfs/dir.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ntfs/dir.c 2011-11-15 20:02:59.000000000 -0500
@@ -1329,7 +1329,7 @@ find_next_index_buffer:
ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
~(s64)(ndir->itype.index.block_size - 1)));
@@ -44997,7 +44997,7 @@ diff -urNp linux-3.0.9/fs/ntfs/dir.c linux-3.0.9/fs/ntfs/dir.c
goto err_out;
diff -urNp linux-3.0.9/fs/ntfs/file.c linux-3.0.9/fs/ntfs/file.c
--- linux-3.0.9/fs/ntfs/file.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ntfs/file.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ntfs/file.c 2011-11-15 20:02:59.000000000 -0500
@@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_
#endif /* NTFS_RW */
};
@@ -45009,7 +45009,7 @@ diff -urNp linux-3.0.9/fs/ntfs/file.c linux-3.0.9/fs/ntfs/file.c
+const struct inode_operations ntfs_empty_inode_ops __read_only;
diff -urNp linux-3.0.9/fs/ocfs2/localalloc.c linux-3.0.9/fs/ocfs2/localalloc.c
--- linux-3.0.9/fs/ocfs2/localalloc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ocfs2/localalloc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ocfs2/localalloc.c 2011-11-15 20:02:59.000000000 -0500
@@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_windo
goto bail;
}
@@ -45021,7 +45021,7 @@ diff -urNp linux-3.0.9/fs/ocfs2/localalloc.c linux-3.0.9/fs/ocfs2/localalloc.c
if (handle)
diff -urNp linux-3.0.9/fs/ocfs2/namei.c linux-3.0.9/fs/ocfs2/namei.c
--- linux-3.0.9/fs/ocfs2/namei.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ocfs2/namei.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ocfs2/namei.c 2011-11-15 20:02:59.000000000 -0500
@@ -1063,6 +1063,8 @@ static int ocfs2_rename(struct inode *ol
struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
struct ocfs2_dir_lookup_result target_insert = { NULL, };
@@ -45033,7 +45033,7 @@ diff -urNp linux-3.0.9/fs/ocfs2/namei.c linux-3.0.9/fs/ocfs2/namei.c
diff -urNp linux-3.0.9/fs/ocfs2/ocfs2.h linux-3.0.9/fs/ocfs2/ocfs2.h
--- linux-3.0.9/fs/ocfs2/ocfs2.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ocfs2/ocfs2.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ocfs2/ocfs2.h 2011-11-15 20:02:59.000000000 -0500
@@ -235,11 +235,11 @@ enum ocfs2_vol_state
struct ocfs2_alloc_stats
@@ -45053,7 +45053,7 @@ diff -urNp linux-3.0.9/fs/ocfs2/ocfs2.h linux-3.0.9/fs/ocfs2/ocfs2.h
enum ocfs2_local_alloc_state
diff -urNp linux-3.0.9/fs/ocfs2/suballoc.c linux-3.0.9/fs/ocfs2/suballoc.c
--- linux-3.0.9/fs/ocfs2/suballoc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ocfs2/suballoc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ocfs2/suballoc.c 2011-11-15 20:02:59.000000000 -0500
@@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(s
mlog_errno(status);
goto bail;
@@ -45110,7 +45110,7 @@ diff -urNp linux-3.0.9/fs/ocfs2/suballoc.c linux-3.0.9/fs/ocfs2/suballoc.c
}
diff -urNp linux-3.0.9/fs/ocfs2/super.c linux-3.0.9/fs/ocfs2/super.c
--- linux-3.0.9/fs/ocfs2/super.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ocfs2/super.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ocfs2/super.c 2011-11-15 20:02:59.000000000 -0500
@@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
"%10s => GlobalAllocs: %d LocalAllocs: %d "
"SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
@@ -45147,7 +45147,7 @@ diff -urNp linux-3.0.9/fs/ocfs2/super.c linux-3.0.9/fs/ocfs2/super.c
osb->osb_ecc_stats = *stats;
diff -urNp linux-3.0.9/fs/ocfs2/symlink.c linux-3.0.9/fs/ocfs2/symlink.c
--- linux-3.0.9/fs/ocfs2/symlink.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/ocfs2/symlink.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/ocfs2/symlink.c 2011-11-15 20:02:59.000000000 -0500
@@ -142,7 +142,7 @@ bail:
static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -45159,7 +45159,7 @@ diff -urNp linux-3.0.9/fs/ocfs2/symlink.c linux-3.0.9/fs/ocfs2/symlink.c
}
diff -urNp linux-3.0.9/fs/open.c linux-3.0.9/fs/open.c
--- linux-3.0.9/fs/open.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/open.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/open.c 2011-11-15 20:02:59.000000000 -0500
@@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
error = locks_verify_truncate(inode, NULL, length);
if (!error)
@@ -45294,7 +45294,7 @@ diff -urNp linux-3.0.9/fs/open.c linux-3.0.9/fs/open.c
fd = PTR_ERR(f);
diff -urNp linux-3.0.9/fs/partitions/ldm.c linux-3.0.9/fs/partitions/ldm.c
--- linux-3.0.9/fs/partitions/ldm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/partitions/ldm.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/partitions/ldm.c 2011-11-15 20:02:59.000000000 -0500
@@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data
ldm_error ("A VBLK claims to have %d parts.", num);
return false;
@@ -45314,7 +45314,7 @@ diff -urNp linux-3.0.9/fs/partitions/ldm.c linux-3.0.9/fs/partitions/ldm.c
return false;
diff -urNp linux-3.0.9/fs/pipe.c linux-3.0.9/fs/pipe.c
--- linux-3.0.9/fs/pipe.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/pipe.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/pipe.c 2011-11-15 20:02:59.000000000 -0500
@@ -420,9 +420,9 @@ redo:
}
if (bufs) /* More to do? */
@@ -45440,7 +45440,7 @@ diff -urNp linux-3.0.9/fs/pipe.c linux-3.0.9/fs/pipe.c
/*
diff -urNp linux-3.0.9/fs/proc/array.c linux-3.0.9/fs/proc/array.c
--- linux-3.0.9/fs/proc/array.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/array.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/proc/array.c 2011-11-15 20:02:59.000000000 -0500
@@ -60,6 +60,7 @@
#include <linux/tty.h>
#include <linux/string.h>
@@ -45566,7 +45566,7 @@ diff -urNp linux-3.0.9/fs/proc/array.c linux-3.0.9/fs/proc/array.c
+#endif
diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
--- linux-3.0.9/fs/proc/base.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/base.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/proc/base.c 2011-11-15 20:02:59.000000000 -0500
@@ -107,6 +107,22 @@ struct pid_entry {
union proc_op op;
};
@@ -46011,7 +46011,7 @@ diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c
#ifdef CONFIG_SCHEDSTATS
diff -urNp linux-3.0.9/fs/proc/cmdline.c linux-3.0.9/fs/proc/cmdline.c
--- linux-3.0.9/fs/proc/cmdline.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/cmdline.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/proc/cmdline.c 2011-11-15 20:02:59.000000000 -0500
@@ -23,7 +23,11 @@ static const struct file_operations cmdl
static int __init proc_cmdline_init(void)
@@ -46026,7 +46026,7 @@ diff -urNp linux-3.0.9/fs/proc/cmdline.c linux-3.0.9/fs/proc/cmdline.c
module_init(proc_cmdline_init);
diff -urNp linux-3.0.9/fs/proc/devices.c linux-3.0.9/fs/proc/devices.c
--- linux-3.0.9/fs/proc/devices.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/devices.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/proc/devices.c 2011-11-15 20:02:59.000000000 -0500
@@ -64,7 +64,11 @@ static const struct file_operations proc
static int __init proc_devices_init(void)
@@ -46041,7 +46041,7 @@ diff -urNp linux-3.0.9/fs/proc/devices.c linux-3.0.9/fs/proc/devices.c
module_init(proc_devices_init);
diff -urNp linux-3.0.9/fs/proc/inode.c linux-3.0.9/fs/proc/inode.c
--- linux-3.0.9/fs/proc/inode.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/inode.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/proc/inode.c 2011-11-15 20:02:59.000000000 -0500
@@ -18,12 +18,18 @@
#include <linux/module.h>
#include <linux/sysctl.h>
@@ -46089,7 +46089,7 @@ diff -urNp linux-3.0.9/fs/proc/inode.c linux-3.0.9/fs/proc/inode.c
inode->i_size = de->size;
diff -urNp linux-3.0.9/fs/proc/internal.h linux-3.0.9/fs/proc/internal.h
--- linux-3.0.9/fs/proc/internal.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/internal.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/proc/internal.h 2011-11-15 20:02:59.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,
@@ -46102,7 +46102,7 @@ diff -urNp linux-3.0.9/fs/proc/internal.h linux-3.0.9/fs/proc/internal.h
extern const struct file_operations proc_maps_operations;
diff -urNp linux-3.0.9/fs/proc/Kconfig linux-3.0.9/fs/proc/Kconfig
--- linux-3.0.9/fs/proc/Kconfig 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/Kconfig 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/proc/Kconfig 2011-11-15 20:02:59.000000000 -0500
@@ -30,12 +30,12 @@ config PROC_FS
config PROC_KCORE
@@ -46132,7 +46132,7 @@ diff -urNp linux-3.0.9/fs/proc/Kconfig linux-3.0.9/fs/proc/Kconfig
Various /proc files exist to monitor process memory utilization:
diff -urNp linux-3.0.9/fs/proc/kcore.c linux-3.0.9/fs/proc/kcore.c
--- linux-3.0.9/fs/proc/kcore.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/kcore.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/proc/kcore.c 2011-11-15 20:02:59.000000000 -0500
@@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bu
off_t offset = 0;
struct kcore_list *m;
@@ -46202,7 +46202,7 @@ diff -urNp linux-3.0.9/fs/proc/kcore.c linux-3.0.9/fs/proc/kcore.c
if (kcore_need_update)
diff -urNp linux-3.0.9/fs/proc/meminfo.c linux-3.0.9/fs/proc/meminfo.c
--- linux-3.0.9/fs/proc/meminfo.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/meminfo.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/proc/meminfo.c 2011-11-15 20:02:59.000000000 -0500
@@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_
unsigned long pages[NR_LRU_LISTS];
int lru;
@@ -46223,7 +46223,7 @@ diff -urNp linux-3.0.9/fs/proc/meminfo.c linux-3.0.9/fs/proc/meminfo.c
,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
diff -urNp linux-3.0.9/fs/proc/nommu.c linux-3.0.9/fs/proc/nommu.c
--- linux-3.0.9/fs/proc/nommu.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/nommu.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/proc/nommu.c 2011-11-15 20:02:59.000000000 -0500
@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
if (len < 1)
len = 1;
@@ -46235,7 +46235,7 @@ diff -urNp linux-3.0.9/fs/proc/nommu.c linux-3.0.9/fs/proc/nommu.c
seq_putc(m, '\n');
diff -urNp linux-3.0.9/fs/proc/proc_net.c linux-3.0.9/fs/proc/proc_net.c
--- linux-3.0.9/fs/proc/proc_net.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/proc_net.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/proc/proc_net.c 2011-11-15 20:02:59.000000000 -0500
@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
struct task_struct *task;
struct nsproxy *ns;
@@ -46256,7 +46256,7 @@ diff -urNp linux-3.0.9/fs/proc/proc_net.c linux-3.0.9/fs/proc/proc_net.c
task = pid_task(proc_pid(dir), PIDTYPE_PID);
diff -urNp linux-3.0.9/fs/proc/proc_sysctl.c linux-3.0.9/fs/proc/proc_sysctl.c
--- linux-3.0.9/fs/proc/proc_sysctl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/proc_sysctl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/proc/proc_sysctl.c 2011-11-15 20:02:59.000000000 -0500
@@ -8,11 +8,13 @@
#include <linux/namei.h>
#include "internal.h"
@@ -46336,7 +46336,7 @@ diff -urNp linux-3.0.9/fs/proc/proc_sysctl.c linux-3.0.9/fs/proc/proc_sysctl.c
.setattr = proc_sys_setattr,
diff -urNp linux-3.0.9/fs/proc/root.c linux-3.0.9/fs/proc/root.c
--- linux-3.0.9/fs/proc/root.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/root.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/proc/root.c 2011-11-15 20:02:59.000000000 -0500
@@ -123,7 +123,15 @@ void __init proc_root_init(void)
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
@@ -46355,7 +46355,7 @@ diff -urNp linux-3.0.9/fs/proc/root.c linux-3.0.9/fs/proc/root.c
diff -urNp linux-3.0.9/fs/proc/task_mmu.c linux-3.0.9/fs/proc/task_mmu.c
--- linux-3.0.9/fs/proc/task_mmu.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/task_mmu.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/proc/task_mmu.c 2011-11-15 20:02:59.000000000 -0500
@@ -51,8 +51,13 @@ void task_mem(struct seq_file *m, struct
"VmExe:\t%8lu kB\n"
"VmLib:\t%8lu kB\n"
@@ -46497,7 +46497,7 @@ diff -urNp linux-3.0.9/fs/proc/task_mmu.c linux-3.0.9/fs/proc/task_mmu.c
} else if (vma->vm_start <= mm->start_stack &&
diff -urNp linux-3.0.9/fs/proc/task_nommu.c linux-3.0.9/fs/proc/task_nommu.c
--- linux-3.0.9/fs/proc/task_nommu.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/proc/task_nommu.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/proc/task_nommu.c 2011-11-15 20:02:59.000000000 -0500
@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
else
bytes += kobjsize(mm);
@@ -46518,7 +46518,7 @@ diff -urNp linux-3.0.9/fs/proc/task_nommu.c linux-3.0.9/fs/proc/task_nommu.c
vma->vm_end >= mm->start_stack) {
diff -urNp linux-3.0.9/fs/quota/netlink.c linux-3.0.9/fs/quota/netlink.c
--- linux-3.0.9/fs/quota/netlink.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/quota/netlink.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/quota/netlink.c 2011-11-15 20:02:59.000000000 -0500
@@ -33,7 +33,7 @@ static struct genl_family quota_genl_fam
void quota_send_warning(short type, unsigned int id, dev_t dev,
const char warntype)
@@ -46539,7 +46539,7 @@ diff -urNp linux-3.0.9/fs/quota/netlink.c linux-3.0.9/fs/quota/netlink.c
printk(KERN_ERR
diff -urNp linux-3.0.9/fs/readdir.c linux-3.0.9/fs/readdir.c
--- linux-3.0.9/fs/readdir.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/readdir.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/readdir.c 2011-11-15 20:02:59.000000000 -0500
@@ -17,6 +17,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
@@ -46640,7 +46640,7 @@ diff -urNp linux-3.0.9/fs/readdir.c linux-3.0.9/fs/readdir.c
else
diff -urNp linux-3.0.9/fs/reiserfs/dir.c linux-3.0.9/fs/reiserfs/dir.c
--- linux-3.0.9/fs/reiserfs/dir.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/reiserfs/dir.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/reiserfs/dir.c 2011-11-15 20:02:59.000000000 -0500
@@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr
struct reiserfs_dir_entry de;
int ret = 0;
@@ -46652,7 +46652,7 @@ diff -urNp linux-3.0.9/fs/reiserfs/dir.c linux-3.0.9/fs/reiserfs/dir.c
reiserfs_check_lock_depth(inode->i_sb, "readdir");
diff -urNp linux-3.0.9/fs/reiserfs/do_balan.c linux-3.0.9/fs/reiserfs/do_balan.c
--- linux-3.0.9/fs/reiserfs/do_balan.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/reiserfs/do_balan.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/reiserfs/do_balan.c 2011-11-15 20:02:59.000000000 -0500
@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
return;
}
@@ -46664,7 +46664,7 @@ diff -urNp linux-3.0.9/fs/reiserfs/do_balan.c linux-3.0.9/fs/reiserfs/do_balan.c
/* balance leaf returns 0 except if combining L R and S into
diff -urNp linux-3.0.9/fs/reiserfs/journal.c linux-3.0.9/fs/reiserfs/journal.c
--- linux-3.0.9/fs/reiserfs/journal.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/reiserfs/journal.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/reiserfs/journal.c 2011-11-15 20:02:59.000000000 -0500
@@ -2299,6 +2299,8 @@ static struct buffer_head *reiserfs_brea
struct buffer_head *bh;
int i, j;
@@ -46676,7 +46676,7 @@ diff -urNp linux-3.0.9/fs/reiserfs/journal.c linux-3.0.9/fs/reiserfs/journal.c
return (bh);
diff -urNp linux-3.0.9/fs/reiserfs/namei.c linux-3.0.9/fs/reiserfs/namei.c
--- linux-3.0.9/fs/reiserfs/namei.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/reiserfs/namei.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/reiserfs/namei.c 2011-11-15 20:02:59.000000000 -0500
@@ -1225,6 +1225,8 @@ static int reiserfs_rename(struct inode
unsigned long savelink = 1;
struct timespec ctime;
@@ -46688,7 +46688,7 @@ diff -urNp linux-3.0.9/fs/reiserfs/namei.c linux-3.0.9/fs/reiserfs/namei.c
stat data updates: (1) old directory,
diff -urNp linux-3.0.9/fs/reiserfs/procfs.c linux-3.0.9/fs/reiserfs/procfs.c
--- linux-3.0.9/fs/reiserfs/procfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/reiserfs/procfs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/reiserfs/procfs.c 2011-11-15 20:02:59.000000000 -0500
@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
"SMALL_TAILS " : "NO_TAILS ",
replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -46709,7 +46709,7 @@ diff -urNp linux-3.0.9/fs/reiserfs/procfs.c linux-3.0.9/fs/reiserfs/procfs.c
"jp_journal_dev: \t%s[%x]\n"
diff -urNp linux-3.0.9/fs/reiserfs/stree.c linux-3.0.9/fs/reiserfs/stree.c
--- linux-3.0.9/fs/reiserfs/stree.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/reiserfs/stree.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/reiserfs/stree.c 2011-11-15 20:02:59.000000000 -0500
@@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs
int iter = 0;
#endif
@@ -46757,7 +46757,7 @@ diff -urNp linux-3.0.9/fs/reiserfs/stree.c linux-3.0.9/fs/reiserfs/stree.c
if (inode) { /* Do we count quotas for item? */
diff -urNp linux-3.0.9/fs/reiserfs/super.c linux-3.0.9/fs/reiserfs/super.c
--- linux-3.0.9/fs/reiserfs/super.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/reiserfs/super.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/reiserfs/super.c 2011-11-15 20:02:59.000000000 -0500
@@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct
{.option_name = NULL}
};
@@ -46769,7 +46769,7 @@ diff -urNp linux-3.0.9/fs/reiserfs/super.c linux-3.0.9/fs/reiserfs/super.c
/* use default configuration: create tails, journaling on, no
diff -urNp linux-3.0.9/fs/select.c linux-3.0.9/fs/select.c
--- linux-3.0.9/fs/select.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/select.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/select.c 2011-11-15 20:02:59.000000000 -0500
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/slab.h>
@@ -46808,7 +46808,7 @@ diff -urNp linux-3.0.9/fs/select.c linux-3.0.9/fs/select.c
diff -urNp linux-3.0.9/fs/seq_file.c linux-3.0.9/fs/seq_file.c
--- linux-3.0.9/fs/seq_file.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/seq_file.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/seq_file.c 2011-11-15 20:02:59.000000000 -0500
@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
return 0;
}
@@ -46860,7 +46860,7 @@ diff -urNp linux-3.0.9/fs/seq_file.c linux-3.0.9/fs/seq_file.c
if (op) {
diff -urNp linux-3.0.9/fs/splice.c linux-3.0.9/fs/splice.c
--- linux-3.0.9/fs/splice.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/splice.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/splice.c 2011-11-15 20:02:59.000000000 -0500
@@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode
pipe_lock(pipe);
@@ -47028,7 +47028,7 @@ diff -urNp linux-3.0.9/fs/splice.c linux-3.0.9/fs/splice.c
pipe_unlock(ipipe);
diff -urNp linux-3.0.9/fs/sysfs/file.c linux-3.0.9/fs/sysfs/file.c
--- linux-3.0.9/fs/sysfs/file.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/sysfs/file.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/sysfs/file.c 2011-11-15 20:02:59.000000000 -0500
@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent
struct sysfs_open_dirent {
@@ -47076,7 +47076,7 @@ diff -urNp linux-3.0.9/fs/sysfs/file.c linux-3.0.9/fs/sysfs/file.c
diff -urNp linux-3.0.9/fs/sysfs/mount.c linux-3.0.9/fs/sysfs/mount.c
--- linux-3.0.9/fs/sysfs/mount.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/sysfs/mount.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/sysfs/mount.c 2011-11-15 20:02:59.000000000 -0500
@@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
.s_name = "",
.s_count = ATOMIC_INIT(1),
@@ -47091,7 +47091,7 @@ diff -urNp linux-3.0.9/fs/sysfs/mount.c linux-3.0.9/fs/sysfs/mount.c
diff -urNp linux-3.0.9/fs/sysfs/symlink.c linux-3.0.9/fs/sysfs/symlink.c
--- linux-3.0.9/fs/sysfs/symlink.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/sysfs/symlink.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/sysfs/symlink.c 2011-11-15 20:02:59.000000000 -0500
@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de
static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -47103,7 +47103,7 @@ diff -urNp linux-3.0.9/fs/sysfs/symlink.c linux-3.0.9/fs/sysfs/symlink.c
}
diff -urNp linux-3.0.9/fs/udf/inode.c linux-3.0.9/fs/udf/inode.c
--- linux-3.0.9/fs/udf/inode.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/udf/inode.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/udf/inode.c 2011-11-15 20:02:59.000000000 -0500
@@ -560,6 +560,8 @@ static struct buffer_head *inode_getblk(
int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
int lastblock = 0;
@@ -47115,7 +47115,7 @@ diff -urNp linux-3.0.9/fs/udf/inode.c linux-3.0.9/fs/udf/inode.c
prev_epos.bh = NULL;
diff -urNp linux-3.0.9/fs/udf/misc.c linux-3.0.9/fs/udf/misc.c
--- linux-3.0.9/fs/udf/misc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/udf/misc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/udf/misc.c 2011-11-15 20:02:59.000000000 -0500
@@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
u8 udf_tag_checksum(const struct tag *t)
@@ -47127,7 +47127,7 @@ diff -urNp linux-3.0.9/fs/udf/misc.c linux-3.0.9/fs/udf/misc.c
for (i = 0; i < sizeof(struct tag); ++i)
diff -urNp linux-3.0.9/fs/utimes.c linux-3.0.9/fs/utimes.c
--- linux-3.0.9/fs/utimes.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/utimes.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/utimes.c 2011-11-15 20:02:59.000000000 -0500
@@ -1,6 +1,7 @@
#include <linux/compiler.h>
#include <linux/file.h>
@@ -47151,7 +47151,7 @@ diff -urNp linux-3.0.9/fs/utimes.c linux-3.0.9/fs/utimes.c
mutex_unlock(&inode->i_mutex);
diff -urNp linux-3.0.9/fs/xattr_acl.c linux-3.0.9/fs/xattr_acl.c
--- linux-3.0.9/fs/xattr_acl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/xattr_acl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/xattr_acl.c 2011-11-15 20:02:59.000000000 -0500
@@ -17,8 +17,8 @@
struct posix_acl *
posix_acl_from_xattr(const void *value, size_t size)
@@ -47165,7 +47165,7 @@ diff -urNp linux-3.0.9/fs/xattr_acl.c linux-3.0.9/fs/xattr_acl.c
struct posix_acl_entry *acl_e;
diff -urNp linux-3.0.9/fs/xattr.c linux-3.0.9/fs/xattr.c
--- linux-3.0.9/fs/xattr.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/xattr.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/xattr.c 2011-11-15 20:02:59.000000000 -0500
@@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
* Extended attribute SET operations
*/
@@ -47230,7 +47230,7 @@ diff -urNp linux-3.0.9/fs/xattr.c linux-3.0.9/fs/xattr.c
fput(f);
diff -urNp linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl32.c
--- linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-11-15 20:02:59.000000000 -0500
@@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1(
xfs_fsop_geom_t fsgeo;
int error;
@@ -47241,7 +47241,7 @@ diff -urNp linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.9/fs/xfs/linux-2
return -error;
diff -urNp linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl.c
--- linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl.c 2011-11-15 20:02:59.000000000 -0500
@@ -128,7 +128,7 @@ xfs_find_handle(
}
@@ -47253,7 +47253,7 @@ diff -urNp linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.9/fs/xfs/linux-2.6
diff -urNp linux-3.0.9/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.9/fs/xfs/linux-2.6/xfs_iops.c
--- linux-3.0.9/fs/xfs/linux-2.6/xfs_iops.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/xfs/linux-2.6/xfs_iops.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/xfs/linux-2.6/xfs_iops.c 2011-11-15 20:02:59.000000000 -0500
@@ -437,7 +437,7 @@ xfs_vn_put_link(
struct nameidata *nd,
void *p)
@@ -47265,7 +47265,7 @@ diff -urNp linux-3.0.9/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.9/fs/xfs/linux-2.6/
kfree(s);
diff -urNp linux-3.0.9/fs/xfs/xfs_bmap.c linux-3.0.9/fs/xfs/xfs_bmap.c
--- linux-3.0.9/fs/xfs/xfs_bmap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/xfs/xfs_bmap.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/xfs/xfs_bmap.c 2011-11-15 20:02:59.000000000 -0500
@@ -253,7 +253,7 @@ xfs_bmap_validate_ret(
int nmap,
int ret_nmap);
@@ -47277,7 +47277,7 @@ diff -urNp linux-3.0.9/fs/xfs/xfs_bmap.c linux-3.0.9/fs/xfs/xfs_bmap.c
STATIC int
diff -urNp linux-3.0.9/fs/xfs/xfs_dir2_sf.c linux-3.0.9/fs/xfs/xfs_dir2_sf.c
--- linux-3.0.9/fs/xfs/xfs_dir2_sf.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/xfs/xfs_dir2_sf.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/fs/xfs/xfs_dir2_sf.c 2011-11-15 20:02:59.000000000 -0500
@@ -780,7 +780,15 @@ xfs_dir2_sf_getdents(
}
@@ -47297,7 +47297,7 @@ diff -urNp linux-3.0.9/fs/xfs/xfs_dir2_sf.c linux-3.0.9/fs/xfs/xfs_dir2_sf.c
return 0;
diff -urNp linux-3.0.9/grsecurity/gracl_alloc.c linux-3.0.9/grsecurity/gracl_alloc.c
--- linux-3.0.9/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_alloc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/gracl_alloc.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,105 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -47406,7 +47406,7 @@ diff -urNp linux-3.0.9/grsecurity/gracl_alloc.c linux-3.0.9/grsecurity/gracl_all
+}
diff -urNp linux-3.0.9/grsecurity/gracl.c linux-3.0.9/grsecurity/gracl.c
--- linux-3.0.9/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/gracl.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,4154 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -51564,7 +51564,7 @@ diff -urNp linux-3.0.9/grsecurity/gracl.c linux-3.0.9/grsecurity/gracl.c
+
diff -urNp linux-3.0.9/grsecurity/gracl_cap.c linux-3.0.9/grsecurity/gracl_cap.c
--- linux-3.0.9/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_cap.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/gracl_cap.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,101 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -51669,7 +51669,7 @@ diff -urNp linux-3.0.9/grsecurity/gracl_cap.c linux-3.0.9/grsecurity/gracl_cap.c
+
diff -urNp linux-3.0.9/grsecurity/gracl_fs.c linux-3.0.9/grsecurity/gracl_fs.c
--- linux-3.0.9/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_fs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/gracl_fs.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,431 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -52104,7 +52104,7 @@ diff -urNp linux-3.0.9/grsecurity/gracl_fs.c linux-3.0.9/grsecurity/gracl_fs.c
+}
diff -urNp linux-3.0.9/grsecurity/gracl_ip.c linux-3.0.9/grsecurity/gracl_ip.c
--- linux-3.0.9/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_ip.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/gracl_ip.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,381 @@
+#include <linux/kernel.h>
+#include <asm/uaccess.h>
@@ -52489,7 +52489,7 @@ diff -urNp linux-3.0.9/grsecurity/gracl_ip.c linux-3.0.9/grsecurity/gracl_ip.c
+}
diff -urNp linux-3.0.9/grsecurity/gracl_learn.c linux-3.0.9/grsecurity/gracl_learn.c
--- linux-3.0.9/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_learn.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/gracl_learn.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,207 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -52700,7 +52700,7 @@ diff -urNp linux-3.0.9/grsecurity/gracl_learn.c linux-3.0.9/grsecurity/gracl_lea
+};
diff -urNp linux-3.0.9/grsecurity/gracl_res.c linux-3.0.9/grsecurity/gracl_res.c
--- linux-3.0.9/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_res.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/gracl_res.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,68 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -52772,7 +52772,7 @@ diff -urNp linux-3.0.9/grsecurity/gracl_res.c linux-3.0.9/grsecurity/gracl_res.c
+}
diff -urNp linux-3.0.9/grsecurity/gracl_segv.c linux-3.0.9/grsecurity/gracl_segv.c
--- linux-3.0.9/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_segv.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/gracl_segv.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,299 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -52955,7 +52955,6 @@ diff -urNp linux-3.0.9/grsecurity/gracl_segv.c linux-3.0.9/grsecurity/gracl_segv
+gr_handle_crash(struct task_struct *task, const int sig)
+{
+ struct acl_subject_label *curr;
-+ struct acl_subject_label *curr2;
+ struct task_struct *tsk, *tsk2;
+ const struct cred *cred;
+ const struct cred *cred2;
@@ -53002,15 +53001,16 @@ diff -urNp linux-3.0.9/grsecurity/gracl_segv.c linux-3.0.9/grsecurity/gracl_segv
+ } else {
+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
+ read_lock(&tasklist_lock);
++ read_lock(&grsec_exec_file_lock);
+ do_each_thread(tsk2, tsk) {
+ if (likely(tsk != task)) {
-+ curr2 = tsk->acl;
-+
-+ if (curr2->device == curr->device &&
-+ curr2->inode == curr->inode)
++ // if this thread has the same subject as the one that triggered
++ // RES_CRASH and it's the same binary, kill it
++ if (tsk->acl == task->acl && tsk->exec_file == task->exec_file)
+ gr_fake_force_sig(SIGKILL, tsk);
+ }
+ } while_each_thread(tsk2, tsk);
++ read_unlock(&grsec_exec_file_lock);
+ read_unlock(&tasklist_lock);
+ }
+ rcu_read_unlock();
@@ -53075,7 +53075,7 @@ diff -urNp linux-3.0.9/grsecurity/gracl_segv.c linux-3.0.9/grsecurity/gracl_segv
+}
diff -urNp linux-3.0.9/grsecurity/gracl_shm.c linux-3.0.9/grsecurity/gracl_shm.c
--- linux-3.0.9/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/gracl_shm.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/gracl_shm.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,40 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -53119,7 +53119,7 @@ diff -urNp linux-3.0.9/grsecurity/gracl_shm.c linux-3.0.9/grsecurity/gracl_shm.c
+}
diff -urNp linux-3.0.9/grsecurity/grsec_chdir.c linux-3.0.9/grsecurity/grsec_chdir.c
--- linux-3.0.9/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_chdir.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_chdir.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,19 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -53142,7 +53142,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_chdir.c linux-3.0.9/grsecurity/grsec_chd
+}
diff -urNp linux-3.0.9/grsecurity/grsec_chroot.c linux-3.0.9/grsecurity/grsec_chroot.c
--- linux-3.0.9/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_chroot.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_chroot.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,351 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -53497,7 +53497,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_chroot.c linux-3.0.9/grsecurity/grsec_ch
+}
diff -urNp linux-3.0.9/grsecurity/grsec_disabled.c linux-3.0.9/grsecurity/grsec_disabled.c
--- linux-3.0.9/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_disabled.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_disabled.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,439 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -53940,7 +53940,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_disabled.c linux-3.0.9/grsecurity/grsec_
+#endif
diff -urNp linux-3.0.9/grsecurity/grsec_exec.c linux-3.0.9/grsecurity/grsec_exec.c
--- linux-3.0.9/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_exec.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_exec.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,146 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -54090,7 +54090,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_exec.c linux-3.0.9/grsecurity/grsec_exec
+EXPORT_SYMBOL(gr_is_capable_nolog);
diff -urNp linux-3.0.9/grsecurity/grsec_fifo.c linux-3.0.9/grsecurity/grsec_fifo.c
--- linux-3.0.9/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_fifo.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_fifo.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,24 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -54118,7 +54118,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_fifo.c linux-3.0.9/grsecurity/grsec_fifo
+}
diff -urNp linux-3.0.9/grsecurity/grsec_fork.c linux-3.0.9/grsecurity/grsec_fork.c
--- linux-3.0.9/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_fork.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_fork.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,23 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -54145,7 +54145,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_fork.c linux-3.0.9/grsecurity/grsec_fork
+}
diff -urNp linux-3.0.9/grsecurity/grsec_init.c linux-3.0.9/grsecurity/grsec_init.c
--- linux-3.0.9/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_init.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_init.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,269 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -54418,7 +54418,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_init.c linux-3.0.9/grsecurity/grsec_init
+}
diff -urNp linux-3.0.9/grsecurity/grsec_link.c linux-3.0.9/grsecurity/grsec_link.c
--- linux-3.0.9/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_link.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_link.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,43 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -54465,8 +54465,8 @@ diff -urNp linux-3.0.9/grsecurity/grsec_link.c linux-3.0.9/grsecurity/grsec_link
+}
diff -urNp linux-3.0.9/grsecurity/grsec_log.c linux-3.0.9/grsecurity/grsec_log.c
--- linux-3.0.9/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_log.c 2011-11-12 12:47:14.000000000 -0500
-@@ -0,0 +1,315 @@
++++ linux-3.0.9/grsecurity/grsec_log.c 2011-11-15 20:02:59.000000000 -0500
+@@ -0,0 +1,322 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/file.h>
@@ -54588,12 +54588,15 @@ diff -urNp linux-3.0.9/grsecurity/grsec_log.c linux-3.0.9/grsecurity/grsec_log.c
+ return;
+}
+
-+static void gr_log_end(int audit)
++static void gr_log_end(int audit, int append_default)
+{
+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
-+ unsigned int len = strlen(buf);
+
-+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
++ if (append_default) {
++ unsigned int len = strlen(buf);
++ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
++ }
++
+ printk("%s\n", buf);
+
+ return;
@@ -54779,12 +54782,16 @@ diff -urNp linux-3.0.9/grsecurity/grsec_log.c linux-3.0.9/grsecurity/grsec_log.c
+ gr_log_middle(audit, msg, ap);
+ }
+ va_end(ap);
-+ gr_log_end(audit);
++ // these don't need DEFAULTSECARGS printed on the end
++ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
++ gr_log_end(audit, 0);
++ else
++ gr_log_end(audit, 1);
+ END_LOCKS(audit);
+}
diff -urNp linux-3.0.9/grsecurity/grsec_mem.c linux-3.0.9/grsecurity/grsec_mem.c
--- linux-3.0.9/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_mem.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_mem.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,33 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -54821,7 +54828,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_mem.c linux-3.0.9/grsecurity/grsec_mem.c
+}
diff -urNp linux-3.0.9/grsecurity/grsec_mount.c linux-3.0.9/grsecurity/grsec_mount.c
--- linux-3.0.9/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_mount.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_mount.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,62 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -54887,7 +54894,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_mount.c linux-3.0.9/grsecurity/grsec_mou
+}
diff -urNp linux-3.0.9/grsecurity/grsec_pax.c linux-3.0.9/grsecurity/grsec_pax.c
--- linux-3.0.9/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_pax.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_pax.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,36 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -54927,7 +54934,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_pax.c linux-3.0.9/grsecurity/grsec_pax.c
+}
diff -urNp linux-3.0.9/grsecurity/grsec_ptrace.c linux-3.0.9/grsecurity/grsec_ptrace.c
--- linux-3.0.9/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_ptrace.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_ptrace.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,14 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -54945,7 +54952,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_ptrace.c linux-3.0.9/grsecurity/grsec_pt
+}
diff -urNp linux-3.0.9/grsecurity/grsec_sig.c linux-3.0.9/grsecurity/grsec_sig.c
--- linux-3.0.9/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_sig.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_sig.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,206 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -55155,7 +55162,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_sig.c linux-3.0.9/grsecurity/grsec_sig.c
+}
diff -urNp linux-3.0.9/grsecurity/grsec_sock.c linux-3.0.9/grsecurity/grsec_sock.c
--- linux-3.0.9/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_sock.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_sock.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,244 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -55403,7 +55410,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_sock.c linux-3.0.9/grsecurity/grsec_sock
+}
diff -urNp linux-3.0.9/grsecurity/grsec_sysctl.c linux-3.0.9/grsecurity/grsec_sysctl.c
--- linux-3.0.9/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_sysctl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_sysctl.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,433 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -55840,7 +55847,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_sysctl.c linux-3.0.9/grsecurity/grsec_sy
+#endif
diff -urNp linux-3.0.9/grsecurity/grsec_time.c linux-3.0.9/grsecurity/grsec_time.c
--- linux-3.0.9/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_time.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_time.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,16 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -55860,7 +55867,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_time.c linux-3.0.9/grsecurity/grsec_time
+EXPORT_SYMBOL(gr_log_timechange);
diff -urNp linux-3.0.9/grsecurity/grsec_tpe.c linux-3.0.9/grsecurity/grsec_tpe.c
--- linux-3.0.9/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsec_tpe.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsec_tpe.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,39 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -55903,7 +55910,7 @@ diff -urNp linux-3.0.9/grsecurity/grsec_tpe.c linux-3.0.9/grsecurity/grsec_tpe.c
+}
diff -urNp linux-3.0.9/grsecurity/grsum.c linux-3.0.9/grsecurity/grsum.c
--- linux-3.0.9/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/grsum.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/grsum.c 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,61 @@
+#include <linux/err.h>
+#include <linux/kernel.h>
@@ -55968,8 +55975,8 @@ diff -urNp linux-3.0.9/grsecurity/grsum.c linux-3.0.9/grsecurity/grsum.c
+}
diff -urNp linux-3.0.9/grsecurity/Kconfig linux-3.0.9/grsecurity/Kconfig
--- linux-3.0.9/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/Kconfig 2011-11-12 12:47:14.000000000 -0500
-@@ -0,0 +1,1038 @@
++++ linux-3.0.9/grsecurity/Kconfig 2011-11-15 20:02:59.000000000 -0500
+@@ -0,0 +1,1037 @@
+#
+# grecurity configuration
+#
@@ -56066,7 +56073,7 @@ diff -urNp linux-3.0.9/grsecurity/Kconfig linux-3.0.9/grsecurity/Kconfig
+ - Deny mknod in chroot
+ - Deny access to abstract AF_UNIX sockets out of chroot
+ - Deny pivot_root in chroot
-+ - Denied writes of /dev/kmem, /dev/mem, and /dev/port
++ - Denied reads/writes of /dev/kmem, /dev/mem, and /dev/port
+ - /proc restrictions with special GID set to 10 (usually wheel)
+ - Address Space Layout Randomization (ASLR)
+ - Prevent exploitation of most refcount overflows
@@ -56156,7 +56163,6 @@ diff -urNp linux-3.0.9/grsecurity/Kconfig linux-3.0.9/grsecurity/Kconfig
+ - Kernel stack randomization
+ - Mount/unmount/remount logging
+ - Kernel symbol hiding
-+ - Prevention of memory exhaustion-based exploits
+ - Hardening of module auto-loading
+ - Ptrace restrictions
+ - Restricted vm86 mode
@@ -56179,12 +56185,12 @@ diff -urNp linux-3.0.9/grsecurity/Kconfig linux-3.0.9/grsecurity/Kconfig
+depends on GRKERNSEC
+
+config GRKERNSEC_KMEM
-+ bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port"
++ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
+ help
+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
-+ be written to via mmap or otherwise to modify the running kernel.
-+ /dev/port will also not be allowed to be opened. If you have module
++ be written to or read from to modify or leak the contents of the running
++ kernel. /dev/port will also not be allowed to be opened. If you have module
+ support disabled, enabling this will close up four ways that are
+ currently used to insert malicious code into the running kernel.
+ Even with all these features enabled, we still highly recommend that
@@ -57010,7 +57016,7 @@ diff -urNp linux-3.0.9/grsecurity/Kconfig linux-3.0.9/grsecurity/Kconfig
+endmenu
diff -urNp linux-3.0.9/grsecurity/Makefile linux-3.0.9/grsecurity/Makefile
--- linux-3.0.9/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/grsecurity/Makefile 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/grsecurity/Makefile 2011-11-15 20:02:59.000000000 -0500
@@ -0,0 +1,36 @@
+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
+# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -57050,7 +57056,7 @@ diff -urNp linux-3.0.9/grsecurity/Makefile linux-3.0.9/grsecurity/Makefile
+endif
diff -urNp linux-3.0.9/include/acpi/acpi_bus.h linux-3.0.9/include/acpi/acpi_bus.h
--- linux-3.0.9/include/acpi/acpi_bus.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/acpi/acpi_bus.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/acpi/acpi_bus.h 2011-11-15 20:02:59.000000000 -0500
@@ -107,7 +107,7 @@ struct acpi_device_ops {
acpi_op_bind bind;
acpi_op_unbind unbind;
@@ -57062,7 +57068,7 @@ diff -urNp linux-3.0.9/include/acpi/acpi_bus.h linux-3.0.9/include/acpi/acpi_bus
diff -urNp linux-3.0.9/include/asm-generic/atomic-long.h linux-3.0.9/include/asm-generic/atomic-long.h
--- linux-3.0.9/include/asm-generic/atomic-long.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/atomic-long.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/asm-generic/atomic-long.h 2011-11-15 20:02:59.000000000 -0500
@@ -22,6 +22,12 @@
typedef atomic64_t atomic_long_t;
@@ -57365,7 +57371,7 @@ diff -urNp linux-3.0.9/include/asm-generic/atomic-long.h linux-3.0.9/include/asm
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
diff -urNp linux-3.0.9/include/asm-generic/cache.h linux-3.0.9/include/asm-generic/cache.h
--- linux-3.0.9/include/asm-generic/cache.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/cache.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/asm-generic/cache.h 2011-11-15 20:02:59.000000000 -0500
@@ -6,7 +6,7 @@
* cache lines need to provide their own cache.h.
*/
@@ -57378,7 +57384,7 @@ diff -urNp linux-3.0.9/include/asm-generic/cache.h linux-3.0.9/include/asm-gener
#endif /* __ASM_GENERIC_CACHE_H */
diff -urNp linux-3.0.9/include/asm-generic/int-l64.h linux-3.0.9/include/asm-generic/int-l64.h
--- linux-3.0.9/include/asm-generic/int-l64.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/int-l64.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/asm-generic/int-l64.h 2011-11-15 20:02:59.000000000 -0500
@@ -46,6 +46,8 @@ typedef unsigned int u32;
typedef signed long s64;
typedef unsigned long u64;
@@ -57390,7 +57396,7 @@ diff -urNp linux-3.0.9/include/asm-generic/int-l64.h linux-3.0.9/include/asm-gen
#define S16_C(x) x
diff -urNp linux-3.0.9/include/asm-generic/int-ll64.h linux-3.0.9/include/asm-generic/int-ll64.h
--- linux-3.0.9/include/asm-generic/int-ll64.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/int-ll64.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/asm-generic/int-ll64.h 2011-11-15 20:02:59.000000000 -0500
@@ -51,6 +51,8 @@ typedef unsigned int u32;
typedef signed long long s64;
typedef unsigned long long u64;
@@ -57402,7 +57408,7 @@ diff -urNp linux-3.0.9/include/asm-generic/int-ll64.h linux-3.0.9/include/asm-ge
#define S16_C(x) x
diff -urNp linux-3.0.9/include/asm-generic/kmap_types.h linux-3.0.9/include/asm-generic/kmap_types.h
--- linux-3.0.9/include/asm-generic/kmap_types.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/kmap_types.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/asm-generic/kmap_types.h 2011-11-15 20:02:59.000000000 -0500
@@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
KMAP_D(17) KM_NMI,
KMAP_D(18) KM_NMI_PTE,
@@ -57418,7 +57424,7 @@ diff -urNp linux-3.0.9/include/asm-generic/kmap_types.h linux-3.0.9/include/asm-
#undef KMAP_D
diff -urNp linux-3.0.9/include/asm-generic/pgtable.h linux-3.0.9/include/asm-generic/pgtable.h
--- linux-3.0.9/include/asm-generic/pgtable.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/pgtable.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/asm-generic/pgtable.h 2011-11-15 20:02:59.000000000 -0500
@@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd)
#endif /* __HAVE_ARCH_PMD_WRITE */
#endif
@@ -57436,7 +57442,7 @@ diff -urNp linux-3.0.9/include/asm-generic/pgtable.h linux-3.0.9/include/asm-gen
#endif /* _ASM_GENERIC_PGTABLE_H */
diff -urNp linux-3.0.9/include/asm-generic/pgtable-nopmd.h linux-3.0.9/include/asm-generic/pgtable-nopmd.h
--- linux-3.0.9/include/asm-generic/pgtable-nopmd.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/pgtable-nopmd.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/asm-generic/pgtable-nopmd.h 2011-11-15 20:02:59.000000000 -0500
@@ -1,14 +1,19 @@
#ifndef _PGTABLE_NOPMD_H
#define _PGTABLE_NOPMD_H
@@ -57475,7 +57481,7 @@ diff -urNp linux-3.0.9/include/asm-generic/pgtable-nopmd.h linux-3.0.9/include/a
* setup: the pmd is never bad, and a pmd always exists (as it's folded
diff -urNp linux-3.0.9/include/asm-generic/pgtable-nopud.h linux-3.0.9/include/asm-generic/pgtable-nopud.h
--- linux-3.0.9/include/asm-generic/pgtable-nopud.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/pgtable-nopud.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/asm-generic/pgtable-nopud.h 2011-11-15 20:02:59.000000000 -0500
@@ -1,10 +1,15 @@
#ifndef _PGTABLE_NOPUD_H
#define _PGTABLE_NOPUD_H
@@ -57508,7 +57514,7 @@ diff -urNp linux-3.0.9/include/asm-generic/pgtable-nopud.h linux-3.0.9/include/a
* setup: the pud is never bad, and a pud always exists (as it's folded
diff -urNp linux-3.0.9/include/asm-generic/vmlinux.lds.h linux-3.0.9/include/asm-generic/vmlinux.lds.h
--- linux-3.0.9/include/asm-generic/vmlinux.lds.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/asm-generic/vmlinux.lds.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/asm-generic/vmlinux.lds.h 2011-11-15 20:02:59.000000000 -0500
@@ -217,6 +217,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -57542,7 +57548,7 @@ diff -urNp linux-3.0.9/include/asm-generic/vmlinux.lds.h linux-3.0.9/include/asm
* PERCPU_SECTION - define output section for percpu area, simple version
diff -urNp linux-3.0.9/include/drm/drm_crtc_helper.h linux-3.0.9/include/drm/drm_crtc_helper.h
--- linux-3.0.9/include/drm/drm_crtc_helper.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/drm/drm_crtc_helper.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/drm/drm_crtc_helper.h 2011-11-15 20:02:59.000000000 -0500
@@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
/* disable crtc when not in use - more explicit than dpms off */
@@ -57563,7 +57569,7 @@ diff -urNp linux-3.0.9/include/drm/drm_crtc_helper.h linux-3.0.9/include/drm/drm
int (*get_modes)(struct drm_connector *connector);
diff -urNp linux-3.0.9/include/drm/drmP.h linux-3.0.9/include/drm/drmP.h
--- linux-3.0.9/include/drm/drmP.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/drm/drmP.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/drm/drmP.h 2011-11-15 20:02:59.000000000 -0500
@@ -73,6 +73,7 @@
#include <linux/workqueue.h>
#include <linux/poll.h>
@@ -57592,7 +57598,7 @@ diff -urNp linux-3.0.9/include/drm/drmP.h linux-3.0.9/include/drm/drmP.h
struct list_head filelist;
diff -urNp linux-3.0.9/include/drm/ttm/ttm_memory.h linux-3.0.9/include/drm/ttm/ttm_memory.h
--- linux-3.0.9/include/drm/ttm/ttm_memory.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/drm/ttm/ttm_memory.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/drm/ttm/ttm_memory.h 2011-11-15 20:02:59.000000000 -0500
@@ -47,7 +47,7 @@
struct ttm_mem_shrink {
@@ -57604,7 +57610,7 @@ diff -urNp linux-3.0.9/include/drm/ttm/ttm_memory.h linux-3.0.9/include/drm/ttm/
* struct ttm_mem_global - Global memory accounting structure.
diff -urNp linux-3.0.9/include/linux/a.out.h linux-3.0.9/include/linux/a.out.h
--- linux-3.0.9/include/linux/a.out.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/a.out.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/a.out.h 2011-11-15 20:02:59.000000000 -0500
@@ -39,6 +39,14 @@ enum machine_type {
M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
};
@@ -57622,7 +57628,7 @@ diff -urNp linux-3.0.9/include/linux/a.out.h linux-3.0.9/include/linux/a.out.h
#endif
diff -urNp linux-3.0.9/include/linux/atmdev.h linux-3.0.9/include/linux/atmdev.h
--- linux-3.0.9/include/linux/atmdev.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/atmdev.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/atmdev.h 2011-11-15 20:02:59.000000000 -0500
@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
#endif
@@ -57634,7 +57640,7 @@ diff -urNp linux-3.0.9/include/linux/atmdev.h linux-3.0.9/include/linux/atmdev.h
};
diff -urNp linux-3.0.9/include/linux/binfmts.h linux-3.0.9/include/linux/binfmts.h
--- linux-3.0.9/include/linux/binfmts.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/binfmts.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/binfmts.h 2011-11-15 20:02:59.000000000 -0500
@@ -88,6 +88,7 @@ struct linux_binfmt {
int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
int (*load_shlib)(struct file *);
@@ -57645,7 +57651,7 @@ diff -urNp linux-3.0.9/include/linux/binfmts.h linux-3.0.9/include/linux/binfmts
diff -urNp linux-3.0.9/include/linux/blkdev.h linux-3.0.9/include/linux/blkdev.h
--- linux-3.0.9/include/linux/blkdev.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/blkdev.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/blkdev.h 2011-11-15 20:02:59.000000000 -0500
@@ -1308,7 +1308,7 @@ struct block_device_operations {
/* this callback is with swap_lock and sometimes page table lock held */
void (*swap_slot_free_notify) (struct block_device *, unsigned long);
@@ -57657,7 +57663,7 @@ diff -urNp linux-3.0.9/include/linux/blkdev.h linux-3.0.9/include/linux/blkdev.h
unsigned long);
diff -urNp linux-3.0.9/include/linux/blktrace_api.h linux-3.0.9/include/linux/blktrace_api.h
--- linux-3.0.9/include/linux/blktrace_api.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/blktrace_api.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/blktrace_api.h 2011-11-15 20:02:59.000000000 -0500
@@ -161,7 +161,7 @@ struct blk_trace {
struct dentry *dir;
struct dentry *dropped_file;
@@ -57669,7 +57675,7 @@ diff -urNp linux-3.0.9/include/linux/blktrace_api.h linux-3.0.9/include/linux/bl
extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
diff -urNp linux-3.0.9/include/linux/byteorder/little_endian.h linux-3.0.9/include/linux/byteorder/little_endian.h
--- linux-3.0.9/include/linux/byteorder/little_endian.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/byteorder/little_endian.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/byteorder/little_endian.h 2011-11-15 20:02:59.000000000 -0500
@@ -42,51 +42,51 @@
static inline __le64 __cpu_to_le64p(const __u64 *p)
@@ -57736,7 +57742,7 @@ diff -urNp linux-3.0.9/include/linux/byteorder/little_endian.h linux-3.0.9/inclu
#define __le64_to_cpus(x) do { (void)(x); } while (0)
diff -urNp linux-3.0.9/include/linux/cache.h linux-3.0.9/include/linux/cache.h
--- linux-3.0.9/include/linux/cache.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/cache.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/cache.h 2011-11-15 20:02:59.000000000 -0500
@@ -16,6 +16,10 @@
#define __read_mostly
#endif
@@ -57750,7 +57756,7 @@ diff -urNp linux-3.0.9/include/linux/cache.h linux-3.0.9/include/linux/cache.h
#endif
diff -urNp linux-3.0.9/include/linux/capability.h linux-3.0.9/include/linux/capability.h
--- linux-3.0.9/include/linux/capability.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/capability.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/capability.h 2011-11-15 20:02:59.000000000 -0500
@@ -547,6 +547,9 @@ extern bool capable(int cap);
extern bool ns_capable(struct user_namespace *ns, int cap);
extern bool task_ns_capable(struct task_struct *t, int cap);
@@ -57763,7 +57769,7 @@ diff -urNp linux-3.0.9/include/linux/capability.h linux-3.0.9/include/linux/capa
extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
diff -urNp linux-3.0.9/include/linux/cleancache.h linux-3.0.9/include/linux/cleancache.h
--- linux-3.0.9/include/linux/cleancache.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/cleancache.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/cleancache.h 2011-11-15 20:02:59.000000000 -0500
@@ -31,7 +31,7 @@ struct cleancache_ops {
void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
void (*flush_inode)(int, struct cleancache_filekey);
@@ -57775,7 +57781,7 @@ diff -urNp linux-3.0.9/include/linux/cleancache.h linux-3.0.9/include/linux/clea
cleancache_register_ops(struct cleancache_ops *ops);
diff -urNp linux-3.0.9/include/linux/compiler-gcc4.h linux-3.0.9/include/linux/compiler-gcc4.h
--- linux-3.0.9/include/linux/compiler-gcc4.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/compiler-gcc4.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/compiler-gcc4.h 2011-11-15 20:02:59.000000000 -0500
@@ -31,6 +31,12 @@
@@ -57803,7 +57809,7 @@ diff -urNp linux-3.0.9/include/linux/compiler-gcc4.h linux-3.0.9/include/linux/c
#if __GNUC_MINOR__ > 0
diff -urNp linux-3.0.9/include/linux/compiler.h linux-3.0.9/include/linux/compiler.h
--- linux-3.0.9/include/linux/compiler.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/compiler.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/compiler.h 2011-11-15 20:02:59.000000000 -0500
@@ -5,31 +5,62 @@
#ifdef __CHECKER__
@@ -57926,7 +57932,7 @@ diff -urNp linux-3.0.9/include/linux/compiler.h linux-3.0.9/include/linux/compil
#endif /* __LINUX_COMPILER_H */
diff -urNp linux-3.0.9/include/linux/cpuset.h linux-3.0.9/include/linux/cpuset.h
--- linux-3.0.9/include/linux/cpuset.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/cpuset.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/cpuset.h 2011-11-15 20:02:59.000000000 -0500
@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
* nodemask.
*/
@@ -57938,7 +57944,7 @@ diff -urNp linux-3.0.9/include/linux/cpuset.h linux-3.0.9/include/linux/cpuset.h
static inline void set_mems_allowed(nodemask_t nodemask)
diff -urNp linux-3.0.9/include/linux/crypto.h linux-3.0.9/include/linux/crypto.h
--- linux-3.0.9/include/linux/crypto.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/crypto.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/crypto.h 2011-11-15 20:02:59.000000000 -0500
@@ -361,7 +361,7 @@ struct cipher_tfm {
const u8 *key, unsigned int keylen);
void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
@@ -57966,7 +57972,7 @@ diff -urNp linux-3.0.9/include/linux/crypto.h linux-3.0.9/include/linux/crypto.h
#define crt_aead crt_u.aead
diff -urNp linux-3.0.9/include/linux/decompress/mm.h linux-3.0.9/include/linux/decompress/mm.h
--- linux-3.0.9/include/linux/decompress/mm.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/decompress/mm.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/decompress/mm.h 2011-11-15 20:02:59.000000000 -0500
@@ -77,7 +77,7 @@ static void free(void *where)
* warnings when not needed (indeed large_malloc / large_free are not
* needed by inflate */
@@ -57978,7 +57984,7 @@ diff -urNp linux-3.0.9/include/linux/decompress/mm.h linux-3.0.9/include/linux/d
#define large_malloc(a) vmalloc(a)
diff -urNp linux-3.0.9/include/linux/dma-mapping.h linux-3.0.9/include/linux/dma-mapping.h
--- linux-3.0.9/include/linux/dma-mapping.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/dma-mapping.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/dma-mapping.h 2011-11-15 20:02:59.000000000 -0500
@@ -50,7 +50,7 @@ struct dma_map_ops {
int (*dma_supported)(struct device *dev, u64 mask);
int (*set_dma_mask)(struct device *dev, u64 mask);
@@ -57990,7 +57996,7 @@ diff -urNp linux-3.0.9/include/linux/dma-mapping.h linux-3.0.9/include/linux/dma
diff -urNp linux-3.0.9/include/linux/efi.h linux-3.0.9/include/linux/efi.h
--- linux-3.0.9/include/linux/efi.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/efi.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/efi.h 2011-11-15 20:02:59.000000000 -0500
@@ -410,7 +410,7 @@ struct efivar_operations {
efi_get_variable_t *get_variable;
efi_get_next_variable_t *get_next_variable;
@@ -58002,7 +58008,7 @@ diff -urNp linux-3.0.9/include/linux/efi.h linux-3.0.9/include/linux/efi.h
/*
diff -urNp linux-3.0.9/include/linux/elf.h linux-3.0.9/include/linux/elf.h
--- linux-3.0.9/include/linux/elf.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/elf.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/elf.h 2011-11-15 20:03:00.000000000 -0500
@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
#define PT_GNU_EH_FRAME 0x6474e550
@@ -58077,7 +58083,7 @@ diff -urNp linux-3.0.9/include/linux/elf.h linux-3.0.9/include/linux/elf.h
diff -urNp linux-3.0.9/include/linux/firewire.h linux-3.0.9/include/linux/firewire.h
--- linux-3.0.9/include/linux/firewire.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/firewire.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/firewire.h 2011-11-15 20:03:00.000000000 -0500
@@ -428,7 +428,7 @@ struct fw_iso_context {
union {
fw_iso_callback_t sc;
@@ -58089,7 +58095,7 @@ diff -urNp linux-3.0.9/include/linux/firewire.h linux-3.0.9/include/linux/firewi
diff -urNp linux-3.0.9/include/linux/fscache-cache.h linux-3.0.9/include/linux/fscache-cache.h
--- linux-3.0.9/include/linux/fscache-cache.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/fscache-cache.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/fscache-cache.h 2011-11-15 20:03:00.000000000 -0500
@@ -102,7 +102,7 @@ struct fscache_operation {
fscache_operation_release_t release;
};
@@ -58110,7 +58116,7 @@ diff -urNp linux-3.0.9/include/linux/fscache-cache.h linux-3.0.9/include/linux/f
INIT_LIST_HEAD(&op->pend_link);
diff -urNp linux-3.0.9/include/linux/fs.h linux-3.0.9/include/linux/fs.h
--- linux-3.0.9/include/linux/fs.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/fs.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/fs.h 2011-11-15 20:03:00.000000000 -0500
@@ -109,6 +109,11 @@ struct inodes_stat_t {
/* File was opened by fanotify and shouldn't generate fanotify events */
#define FMODE_NONOTIFY ((__force fmode_t)0x1000000)
@@ -58135,7 +58141,7 @@ diff -urNp linux-3.0.9/include/linux/fs.h linux-3.0.9/include/linux/fs.h
diff -urNp linux-3.0.9/include/linux/fsnotify.h linux-3.0.9/include/linux/fsnotify.h
--- linux-3.0.9/include/linux/fsnotify.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/fsnotify.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/fsnotify.h 2011-11-15 20:03:00.000000000 -0500
@@ -314,7 +314,7 @@ static inline void fsnotify_change(struc
*/
static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
@@ -58147,7 +58153,7 @@ diff -urNp linux-3.0.9/include/linux/fsnotify.h linux-3.0.9/include/linux/fsnoti
/*
diff -urNp linux-3.0.9/include/linux/fs_struct.h linux-3.0.9/include/linux/fs_struct.h
--- linux-3.0.9/include/linux/fs_struct.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/fs_struct.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/fs_struct.h 2011-11-15 20:03:00.000000000 -0500
@@ -6,7 +6,7 @@
#include <linux/seqlock.h>
@@ -58159,7 +58165,7 @@ diff -urNp linux-3.0.9/include/linux/fs_struct.h linux-3.0.9/include/linux/fs_st
int umask;
diff -urNp linux-3.0.9/include/linux/ftrace_event.h linux-3.0.9/include/linux/ftrace_event.h
--- linux-3.0.9/include/linux/ftrace_event.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/ftrace_event.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/ftrace_event.h 2011-11-15 20:03:00.000000000 -0500
@@ -96,7 +96,7 @@ struct trace_event_functions {
trace_print_func raw;
trace_print_func hex;
@@ -58180,7 +58186,7 @@ diff -urNp linux-3.0.9/include/linux/ftrace_event.h linux-3.0.9/include/linux/ft
diff -urNp linux-3.0.9/include/linux/genhd.h linux-3.0.9/include/linux/genhd.h
--- linux-3.0.9/include/linux/genhd.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/genhd.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/genhd.h 2011-11-15 20:03:00.000000000 -0500
@@ -184,7 +184,7 @@ struct gendisk {
struct kobject *slave_dir;
@@ -58192,7 +58198,7 @@ diff -urNp linux-3.0.9/include/linux/genhd.h linux-3.0.9/include/linux/genhd.h
struct blk_integrity *integrity;
diff -urNp linux-3.0.9/include/linux/gracl.h linux-3.0.9/include/linux/gracl.h
--- linux-3.0.9/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/gracl.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/gracl.h 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,317 @@
+#ifndef GR_ACL_H
+#define GR_ACL_H
@@ -58513,7 +58519,7 @@ diff -urNp linux-3.0.9/include/linux/gracl.h linux-3.0.9/include/linux/gracl.h
+
diff -urNp linux-3.0.9/include/linux/gralloc.h linux-3.0.9/include/linux/gralloc.h
--- linux-3.0.9/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/gralloc.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/gralloc.h 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,9 @@
+#ifndef __GRALLOC_H
+#define __GRALLOC_H
@@ -58526,7 +58532,7 @@ diff -urNp linux-3.0.9/include/linux/gralloc.h linux-3.0.9/include/linux/gralloc
+#endif
diff -urNp linux-3.0.9/include/linux/grdefs.h linux-3.0.9/include/linux/grdefs.h
--- linux-3.0.9/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/grdefs.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/grdefs.h 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,140 @@
+#ifndef GRDEFS_H
+#define GRDEFS_H
@@ -58670,7 +58676,7 @@ diff -urNp linux-3.0.9/include/linux/grdefs.h linux-3.0.9/include/linux/grdefs.h
+#endif
diff -urNp linux-3.0.9/include/linux/grinternal.h linux-3.0.9/include/linux/grinternal.h
--- linux-3.0.9/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/grinternal.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/grinternal.h 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,220 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
@@ -58894,7 +58900,7 @@ diff -urNp linux-3.0.9/include/linux/grinternal.h linux-3.0.9/include/linux/grin
+#endif
diff -urNp linux-3.0.9/include/linux/grmsg.h linux-3.0.9/include/linux/grmsg.h
--- linux-3.0.9/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/grmsg.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/grmsg.h 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,108 @@
+#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
@@ -59006,7 +59012,7 @@ diff -urNp linux-3.0.9/include/linux/grmsg.h linux-3.0.9/include/linux/grmsg.h
+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
diff -urNp linux-3.0.9/include/linux/grsecurity.h linux-3.0.9/include/linux/grsecurity.h
--- linux-3.0.9/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/grsecurity.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/grsecurity.h 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,228 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
@@ -59238,7 +59244,7 @@ diff -urNp linux-3.0.9/include/linux/grsecurity.h linux-3.0.9/include/linux/grse
+#endif
diff -urNp linux-3.0.9/include/linux/grsock.h linux-3.0.9/include/linux/grsock.h
--- linux-3.0.9/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/grsock.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/grsock.h 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,19 @@
+#ifndef __GRSOCK_H
+#define __GRSOCK_H
@@ -59261,7 +59267,7 @@ diff -urNp linux-3.0.9/include/linux/grsock.h linux-3.0.9/include/linux/grsock.h
+#endif
diff -urNp linux-3.0.9/include/linux/hid.h linux-3.0.9/include/linux/hid.h
--- linux-3.0.9/include/linux/hid.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/hid.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/hid.h 2011-11-15 20:03:00.000000000 -0500
@@ -675,7 +675,7 @@ struct hid_ll_driver {
unsigned int code, int value);
@@ -59273,7 +59279,7 @@ diff -urNp linux-3.0.9/include/linux/hid.h linux-3.0.9/include/linux/hid.h
#define PM_HINT_NORMAL 1<<1
diff -urNp linux-3.0.9/include/linux/highmem.h linux-3.0.9/include/linux/highmem.h
--- linux-3.0.9/include/linux/highmem.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/highmem.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/highmem.h 2011-11-15 20:03:00.000000000 -0500
@@ -185,6 +185,18 @@ static inline void clear_highpage(struct
kunmap_atomic(kaddr, KM_USER0);
}
@@ -59295,7 +59301,7 @@ diff -urNp linux-3.0.9/include/linux/highmem.h linux-3.0.9/include/linux/highmem
unsigned start2, unsigned end2)
diff -urNp linux-3.0.9/include/linux/i2c.h linux-3.0.9/include/linux/i2c.h
--- linux-3.0.9/include/linux/i2c.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/i2c.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/i2c.h 2011-11-15 20:03:00.000000000 -0500
@@ -346,6 +346,7 @@ struct i2c_algorithm {
/* To determine what the adapter supports */
u32 (*functionality) (struct i2c_adapter *);
@@ -59306,7 +59312,7 @@ diff -urNp linux-3.0.9/include/linux/i2c.h linux-3.0.9/include/linux/i2c.h
* i2c_adapter is the structure used to identify a physical i2c bus along
diff -urNp linux-3.0.9/include/linux/i2o.h linux-3.0.9/include/linux/i2o.h
--- linux-3.0.9/include/linux/i2o.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/i2o.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/i2o.h 2011-11-15 20:03:00.000000000 -0500
@@ -564,7 +564,7 @@ struct i2o_controller {
struct i2o_device *exec; /* Executive */
#if BITS_PER_LONG == 64
@@ -59318,7 +59324,7 @@ diff -urNp linux-3.0.9/include/linux/i2o.h linux-3.0.9/include/linux/i2o.h
#endif
diff -urNp linux-3.0.9/include/linux/init.h linux-3.0.9/include/linux/init.h
--- linux-3.0.9/include/linux/init.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/init.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/init.h 2011-11-15 20:03:00.000000000 -0500
@@ -293,13 +293,13 @@ void __init parse_early_options(char *cm
/* Each module must use one module_init(). */
@@ -59337,7 +59343,7 @@ diff -urNp linux-3.0.9/include/linux/init.h linux-3.0.9/include/linux/init.h
diff -urNp linux-3.0.9/include/linux/init_task.h linux-3.0.9/include/linux/init_task.h
--- linux-3.0.9/include/linux/init_task.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/init_task.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/init_task.h 2011-11-15 20:03:00.000000000 -0500
@@ -126,6 +126,12 @@ extern struct cred init_cred;
# define INIT_PERF_EVENTS(tsk)
#endif
@@ -59361,7 +59367,7 @@ diff -urNp linux-3.0.9/include/linux/init_task.h linux-3.0.9/include/linux/init_
.signal = &init_signals, \
diff -urNp linux-3.0.9/include/linux/intel-iommu.h linux-3.0.9/include/linux/intel-iommu.h
--- linux-3.0.9/include/linux/intel-iommu.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/intel-iommu.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/intel-iommu.h 2011-11-15 20:03:00.000000000 -0500
@@ -296,7 +296,7 @@ struct iommu_flush {
u8 fm, u64 type);
void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
@@ -59373,7 +59379,7 @@ diff -urNp linux-3.0.9/include/linux/intel-iommu.h linux-3.0.9/include/linux/int
SR_DMAR_FECTL_REG,
diff -urNp linux-3.0.9/include/linux/interrupt.h linux-3.0.9/include/linux/interrupt.h
--- linux-3.0.9/include/linux/interrupt.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/interrupt.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/interrupt.h 2011-11-15 20:03:00.000000000 -0500
@@ -425,7 +425,7 @@ enum
/* map softirq index to softirq name. update 'softirq_to_name' in
* kernel/softirq.c when adding a new softirq.
@@ -59400,7 +59406,7 @@ diff -urNp linux-3.0.9/include/linux/interrupt.h linux-3.0.9/include/linux/inter
{
diff -urNp linux-3.0.9/include/linux/kallsyms.h linux-3.0.9/include/linux/kallsyms.h
--- linux-3.0.9/include/linux/kallsyms.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/kallsyms.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/kallsyms.h 2011-11-15 20:03:00.000000000 -0500
@@ -15,7 +15,8 @@
struct module;
@@ -59430,7 +59436,7 @@ diff -urNp linux-3.0.9/include/linux/kallsyms.h linux-3.0.9/include/linux/kallsy
static void __check_printsym_format(const char *fmt, ...)
diff -urNp linux-3.0.9/include/linux/kgdb.h linux-3.0.9/include/linux/kgdb.h
--- linux-3.0.9/include/linux/kgdb.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/kgdb.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/kgdb.h 2011-11-15 20:03:00.000000000 -0500
@@ -53,7 +53,7 @@ extern int kgdb_connected;
extern int kgdb_io_module_registered;
@@ -59460,7 +59466,7 @@ diff -urNp linux-3.0.9/include/linux/kgdb.h linux-3.0.9/include/linux/kgdb.h
diff -urNp linux-3.0.9/include/linux/kmod.h linux-3.0.9/include/linux/kmod.h
--- linux-3.0.9/include/linux/kmod.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/kmod.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/kmod.h 2011-11-15 20:03:00.000000000 -0500
@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysc
* usually useless though. */
extern int __request_module(bool wait, const char *name, ...) \
@@ -59472,7 +59478,7 @@ diff -urNp linux-3.0.9/include/linux/kmod.h linux-3.0.9/include/linux/kmod.h
#define try_then_request_module(x, mod...) \
diff -urNp linux-3.0.9/include/linux/kvm_host.h linux-3.0.9/include/linux/kvm_host.h
--- linux-3.0.9/include/linux/kvm_host.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/kvm_host.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/kvm_host.h 2011-11-15 20:03:00.000000000 -0500
@@ -307,7 +307,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
void vcpu_load(struct kvm_vcpu *vcpu);
void vcpu_put(struct kvm_vcpu *vcpu);
@@ -59493,7 +59499,7 @@ diff -urNp linux-3.0.9/include/linux/kvm_host.h linux-3.0.9/include/linux/kvm_ho
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
diff -urNp linux-3.0.9/include/linux/libata.h linux-3.0.9/include/linux/libata.h
--- linux-3.0.9/include/linux/libata.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/libata.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/libata.h 2011-11-15 20:03:00.000000000 -0500
@@ -899,7 +899,7 @@ struct ata_port_operations {
* fields must be pointers.
*/
@@ -59505,7 +59511,7 @@ diff -urNp linux-3.0.9/include/linux/libata.h linux-3.0.9/include/linux/libata.h
unsigned long flags;
diff -urNp linux-3.0.9/include/linux/mca.h linux-3.0.9/include/linux/mca.h
--- linux-3.0.9/include/linux/mca.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/mca.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/mca.h 2011-11-15 20:03:00.000000000 -0500
@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
int region);
void * (*mca_transform_memory)(struct mca_device *,
@@ -59517,7 +59523,7 @@ diff -urNp linux-3.0.9/include/linux/mca.h linux-3.0.9/include/linux/mca.h
u64 default_dma_mask;
diff -urNp linux-3.0.9/include/linux/memory.h linux-3.0.9/include/linux/memory.h
--- linux-3.0.9/include/linux/memory.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/memory.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/memory.h 2011-11-15 20:03:00.000000000 -0500
@@ -144,7 +144,7 @@ struct memory_accessor {
size_t count);
ssize_t (*write)(struct memory_accessor *, const char *buf,
@@ -59529,7 +59535,7 @@ diff -urNp linux-3.0.9/include/linux/memory.h linux-3.0.9/include/linux/memory.h
* Kernel text modification mutex, used for code patching. Users of this lock
diff -urNp linux-3.0.9/include/linux/mfd/abx500.h linux-3.0.9/include/linux/mfd/abx500.h
--- linux-3.0.9/include/linux/mfd/abx500.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/mfd/abx500.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/mfd/abx500.h 2011-11-15 20:03:00.000000000 -0500
@@ -234,6 +234,7 @@ struct abx500_ops {
int (*event_registers_startup_state_get) (struct device *, u8 *);
int (*startup_irq_enabled) (struct device *, unsigned int);
@@ -59540,7 +59546,7 @@ diff -urNp linux-3.0.9/include/linux/mfd/abx500.h linux-3.0.9/include/linux/mfd/
void abx500_remove_ops(struct device *dev);
diff -urNp linux-3.0.9/include/linux/mm.h linux-3.0.9/include/linux/mm.h
--- linux-3.0.9/include/linux/mm.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/mm.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/mm.h 2011-11-15 20:03:00.000000000 -0500
@@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
@@ -59665,7 +59671,7 @@ diff -urNp linux-3.0.9/include/linux/mm.h linux-3.0.9/include/linux/mm.h
#endif /* _LINUX_MM_H */
diff -urNp linux-3.0.9/include/linux/mm_types.h linux-3.0.9/include/linux/mm_types.h
--- linux-3.0.9/include/linux/mm_types.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/mm_types.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/mm_types.h 2011-11-15 20:03:00.000000000 -0500
@@ -198,6 +198,8 @@ struct vm_area_struct {
#ifdef CONFIG_NUMA
struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -59702,7 +59708,7 @@ diff -urNp linux-3.0.9/include/linux/mm_types.h linux-3.0.9/include/linux/mm_typ
static inline void mm_init_cpumask(struct mm_struct *mm)
diff -urNp linux-3.0.9/include/linux/mmu_notifier.h linux-3.0.9/include/linux/mmu_notifier.h
--- linux-3.0.9/include/linux/mmu_notifier.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/mmu_notifier.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/mmu_notifier.h 2011-11-15 20:03:00.000000000 -0500
@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr
*/
#define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -59721,7 +59727,7 @@ diff -urNp linux-3.0.9/include/linux/mmu_notifier.h linux-3.0.9/include/linux/mm
#define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
diff -urNp linux-3.0.9/include/linux/mmzone.h linux-3.0.9/include/linux/mmzone.h
--- linux-3.0.9/include/linux/mmzone.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/mmzone.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/mmzone.h 2011-11-15 20:03:00.000000000 -0500
@@ -350,7 +350,7 @@ struct zone {
unsigned long flags; /* zone flags, see below */
@@ -59733,7 +59739,7 @@ diff -urNp linux-3.0.9/include/linux/mmzone.h linux-3.0.9/include/linux/mmzone.h
* The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
diff -urNp linux-3.0.9/include/linux/mod_devicetable.h linux-3.0.9/include/linux/mod_devicetable.h
--- linux-3.0.9/include/linux/mod_devicetable.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/mod_devicetable.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/mod_devicetable.h 2011-11-15 20:03:00.000000000 -0500
@@ -12,7 +12,7 @@
typedef unsigned long kernel_ulong_t;
#endif
@@ -59754,7 +59760,7 @@ diff -urNp linux-3.0.9/include/linux/mod_devicetable.h linux-3.0.9/include/linux
__u16 bus;
diff -urNp linux-3.0.9/include/linux/module.h linux-3.0.9/include/linux/module.h
--- linux-3.0.9/include/linux/module.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/module.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/module.h 2011-11-15 20:03:00.000000000 -0500
@@ -16,6 +16,7 @@
#include <linux/kobject.h>
#include <linux/moduleparam.h>
@@ -59851,7 +59857,7 @@ diff -urNp linux-3.0.9/include/linux/module.h linux-3.0.9/include/linux/module.h
/* Search for module by name: must hold module_mutex. */
diff -urNp linux-3.0.9/include/linux/moduleloader.h linux-3.0.9/include/linux/moduleloader.h
--- linux-3.0.9/include/linux/moduleloader.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/moduleloader.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/moduleloader.h 2011-11-15 20:03:00.000000000 -0500
@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
sections. Returns NULL on failure. */
void *module_alloc(unsigned long size);
@@ -59876,7 +59882,7 @@ diff -urNp linux-3.0.9/include/linux/moduleloader.h linux-3.0.9/include/linux/mo
int apply_relocate(Elf_Shdr *sechdrs,
diff -urNp linux-3.0.9/include/linux/moduleparam.h linux-3.0.9/include/linux/moduleparam.h
--- linux-3.0.9/include/linux/moduleparam.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/moduleparam.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/moduleparam.h 2011-11-15 20:03:00.000000000 -0500
@@ -255,7 +255,7 @@ static inline void __kernel_param_unlock
* @len is usually just sizeof(string).
*/
@@ -59897,7 +59903,7 @@ diff -urNp linux-3.0.9/include/linux/moduleparam.h linux-3.0.9/include/linux/mod
.elemsize = sizeof(array[0]), .elem = array }; \
diff -urNp linux-3.0.9/include/linux/namei.h linux-3.0.9/include/linux/namei.h
--- linux-3.0.9/include/linux/namei.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/namei.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/namei.h 2011-11-15 20:03:00.000000000 -0500
@@ -24,7 +24,7 @@ struct nameidata {
unsigned seq;
int last_type;
@@ -59924,7 +59930,7 @@ diff -urNp linux-3.0.9/include/linux/namei.h linux-3.0.9/include/linux/namei.h
}
diff -urNp linux-3.0.9/include/linux/netdevice.h linux-3.0.9/include/linux/netdevice.h
--- linux-3.0.9/include/linux/netdevice.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/netdevice.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/netdevice.h 2011-11-15 20:03:00.000000000 -0500
@@ -979,6 +979,7 @@ struct net_device_ops {
int (*ndo_set_features)(struct net_device *dev,
u32 features);
@@ -59935,7 +59941,7 @@ diff -urNp linux-3.0.9/include/linux/netdevice.h linux-3.0.9/include/linux/netde
* The DEVICE structure.
diff -urNp linux-3.0.9/include/linux/netfilter/xt_gradm.h linux-3.0.9/include/linux/netfilter/xt_gradm.h
--- linux-3.0.9/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/include/linux/netfilter/xt_gradm.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/netfilter/xt_gradm.h 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,9 @@
+#ifndef _LINUX_NETFILTER_XT_GRADM_H
+#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -59948,7 +59954,7 @@ diff -urNp linux-3.0.9/include/linux/netfilter/xt_gradm.h linux-3.0.9/include/li
+#endif
diff -urNp linux-3.0.9/include/linux/of_pdt.h linux-3.0.9/include/linux/of_pdt.h
--- linux-3.0.9/include/linux/of_pdt.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/of_pdt.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/of_pdt.h 2011-11-15 20:03:00.000000000 -0500
@@ -32,7 +32,7 @@ struct of_pdt_ops {
/* return 0 on success; fill in 'len' with number of bytes in path */
@@ -59960,7 +59966,7 @@ diff -urNp linux-3.0.9/include/linux/of_pdt.h linux-3.0.9/include/linux/of_pdt.h
diff -urNp linux-3.0.9/include/linux/oprofile.h linux-3.0.9/include/linux/oprofile.h
--- linux-3.0.9/include/linux/oprofile.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/oprofile.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/oprofile.h 2011-11-15 20:03:00.000000000 -0500
@@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super
int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
char const * name, ulong * val);
@@ -59975,7 +59981,7 @@ diff -urNp linux-3.0.9/include/linux/oprofile.h linux-3.0.9/include/linux/oprofi
struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
diff -urNp linux-3.0.9/include/linux/padata.h linux-3.0.9/include/linux/padata.h
--- linux-3.0.9/include/linux/padata.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/padata.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/padata.h 2011-11-15 20:03:00.000000000 -0500
@@ -129,7 +129,7 @@ struct parallel_data {
struct padata_instance *pinst;
struct padata_parallel_queue __percpu *pqueue;
@@ -59987,7 +59993,7 @@ diff -urNp linux-3.0.9/include/linux/padata.h linux-3.0.9/include/linux/padata.h
unsigned int max_seq_nr;
diff -urNp linux-3.0.9/include/linux/perf_event.h linux-3.0.9/include/linux/perf_event.h
--- linux-3.0.9/include/linux/perf_event.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/perf_event.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/perf_event.h 2011-11-15 20:03:00.000000000 -0500
@@ -761,8 +761,8 @@ struct perf_event {
enum perf_event_active_state state;
@@ -60012,7 +60018,7 @@ diff -urNp linux-3.0.9/include/linux/perf_event.h linux-3.0.9/include/linux/perf
* Protect attach/detach and child_list:
diff -urNp linux-3.0.9/include/linux/pipe_fs_i.h linux-3.0.9/include/linux/pipe_fs_i.h
--- linux-3.0.9/include/linux/pipe_fs_i.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/pipe_fs_i.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/pipe_fs_i.h 2011-11-15 20:03:00.000000000 -0500
@@ -46,9 +46,9 @@ struct pipe_buffer {
struct pipe_inode_info {
wait_queue_head_t wait;
@@ -60028,7 +60034,7 @@ diff -urNp linux-3.0.9/include/linux/pipe_fs_i.h linux-3.0.9/include/linux/pipe_
struct page *tmp_page;
diff -urNp linux-3.0.9/include/linux/pm_runtime.h linux-3.0.9/include/linux/pm_runtime.h
--- linux-3.0.9/include/linux/pm_runtime.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/pm_runtime.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/pm_runtime.h 2011-11-15 20:03:00.000000000 -0500
@@ -94,7 +94,7 @@ static inline bool pm_runtime_callbacks_
static inline void pm_runtime_mark_last_busy(struct device *dev)
@@ -60040,7 +60046,7 @@ diff -urNp linux-3.0.9/include/linux/pm_runtime.h linux-3.0.9/include/linux/pm_r
#else /* !CONFIG_PM_RUNTIME */
diff -urNp linux-3.0.9/include/linux/poison.h linux-3.0.9/include/linux/poison.h
--- linux-3.0.9/include/linux/poison.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/poison.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/poison.h 2011-11-15 20:03:00.000000000 -0500
@@ -19,8 +19,8 @@
* under normal circumstances, used to verify that nobody uses
* non-initialized list entries.
@@ -60054,7 +60060,7 @@ diff -urNp linux-3.0.9/include/linux/poison.h linux-3.0.9/include/linux/poison.h
/*
diff -urNp linux-3.0.9/include/linux/preempt.h linux-3.0.9/include/linux/preempt.h
--- linux-3.0.9/include/linux/preempt.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/preempt.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/preempt.h 2011-11-15 20:03:00.000000000 -0500
@@ -115,7 +115,7 @@ struct preempt_ops {
void (*sched_in)(struct preempt_notifier *notifier, int cpu);
void (*sched_out)(struct preempt_notifier *notifier,
@@ -60066,7 +60072,7 @@ diff -urNp linux-3.0.9/include/linux/preempt.h linux-3.0.9/include/linux/preempt
* preempt_notifier - key for installing preemption notifiers
diff -urNp linux-3.0.9/include/linux/proc_fs.h linux-3.0.9/include/linux/proc_fs.h
--- linux-3.0.9/include/linux/proc_fs.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/proc_fs.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/proc_fs.h 2011-11-15 20:03:00.000000000 -0500
@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
return proc_create_data(name, mode, parent, proc_fops, NULL);
}
@@ -60098,7 +60104,7 @@ diff -urNp linux-3.0.9/include/linux/proc_fs.h linux-3.0.9/include/linux/proc_fs
struct ctl_table;
diff -urNp linux-3.0.9/include/linux/ptrace.h linux-3.0.9/include/linux/ptrace.h
--- linux-3.0.9/include/linux/ptrace.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/ptrace.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/ptrace.h 2011-11-15 20:03:00.000000000 -0500
@@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_
extern void exit_ptrace(struct task_struct *tracer);
#define PTRACE_MODE_READ 1
@@ -60114,7 +60120,7 @@ diff -urNp linux-3.0.9/include/linux/ptrace.h linux-3.0.9/include/linux/ptrace.h
{
diff -urNp linux-3.0.9/include/linux/random.h linux-3.0.9/include/linux/random.h
--- linux-3.0.9/include/linux/random.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/random.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/random.h 2011-11-15 20:03:00.000000000 -0500
@@ -69,12 +69,17 @@ void srandom32(u32 seed);
u32 prandom32(struct rnd_state *);
@@ -60136,7 +60142,7 @@ diff -urNp linux-3.0.9/include/linux/random.h linux-3.0.9/include/linux/random.h
/**
diff -urNp linux-3.0.9/include/linux/reboot.h linux-3.0.9/include/linux/reboot.h
--- linux-3.0.9/include/linux/reboot.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/reboot.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/reboot.h 2011-11-15 20:03:00.000000000 -0500
@@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st
* Architecture-specific implementations of sys_reboot commands.
*/
@@ -60174,7 +60180,7 @@ diff -urNp linux-3.0.9/include/linux/reboot.h linux-3.0.9/include/linux/reboot.h
#endif
diff -urNp linux-3.0.9/include/linux/reiserfs_fs.h linux-3.0.9/include/linux/reiserfs_fs.h
--- linux-3.0.9/include/linux/reiserfs_fs.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/reiserfs_fs.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/reiserfs_fs.h 2011-11-15 20:03:00.000000000 -0500
@@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset
#define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
@@ -60186,7 +60192,7 @@ diff -urNp linux-3.0.9/include/linux/reiserfs_fs.h linux-3.0.9/include/linux/rei
#define fs_changed(gen,s) \
diff -urNp linux-3.0.9/include/linux/reiserfs_fs_sb.h linux-3.0.9/include/linux/reiserfs_fs_sb.h
--- linux-3.0.9/include/linux/reiserfs_fs_sb.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/reiserfs_fs_sb.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/reiserfs_fs_sb.h 2011-11-15 20:03:00.000000000 -0500
@@ -386,7 +386,7 @@ struct reiserfs_sb_info {
/* Comment? -Hans */
wait_queue_head_t s_wait;
@@ -60198,7 +60204,7 @@ diff -urNp linux-3.0.9/include/linux/reiserfs_fs_sb.h linux-3.0.9/include/linux/
on-disk FS format */
diff -urNp linux-3.0.9/include/linux/relay.h linux-3.0.9/include/linux/relay.h
--- linux-3.0.9/include/linux/relay.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/relay.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/relay.h 2011-11-15 20:03:00.000000000 -0500
@@ -159,7 +159,7 @@ struct rchan_callbacks
* The callback should return 0 if successful, negative if not.
*/
@@ -60210,7 +60216,7 @@ diff -urNp linux-3.0.9/include/linux/relay.h linux-3.0.9/include/linux/relay.h
* CONFIG_RELAY kernel API, kernel/relay.c
diff -urNp linux-3.0.9/include/linux/rfkill.h linux-3.0.9/include/linux/rfkill.h
--- linux-3.0.9/include/linux/rfkill.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/rfkill.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/rfkill.h 2011-11-15 20:03:00.000000000 -0500
@@ -147,6 +147,7 @@ struct rfkill_ops {
void (*query)(struct rfkill *rfkill, void *data);
int (*set_block)(void *data, bool blocked);
@@ -60221,7 +60227,7 @@ diff -urNp linux-3.0.9/include/linux/rfkill.h linux-3.0.9/include/linux/rfkill.h
/**
diff -urNp linux-3.0.9/include/linux/rmap.h linux-3.0.9/include/linux/rmap.h
--- linux-3.0.9/include/linux/rmap.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/rmap.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/rmap.h 2011-11-15 20:03:00.000000000 -0500
@@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struc
void anon_vma_init(void); /* create anon_vma_cachep */
int anon_vma_prepare(struct vm_area_struct *);
@@ -60235,7 +60241,7 @@ diff -urNp linux-3.0.9/include/linux/rmap.h linux-3.0.9/include/linux/rmap.h
static inline void anon_vma_merge(struct vm_area_struct *vma,
diff -urNp linux-3.0.9/include/linux/sched.h linux-3.0.9/include/linux/sched.h
--- linux-3.0.9/include/linux/sched.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/sched.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/sched.h 2011-11-15 20:03:00.000000000 -0500
@@ -100,6 +100,7 @@ struct bio_list;
struct fs_struct;
struct perf_event_context;
@@ -60479,7 +60485,7 @@ diff -urNp linux-3.0.9/include/linux/sched.h linux-3.0.9/include/linux/sched.h
#ifdef CONFIG_DEBUG_STACK_USAGE
diff -urNp linux-3.0.9/include/linux/screen_info.h linux-3.0.9/include/linux/screen_info.h
--- linux-3.0.9/include/linux/screen_info.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/screen_info.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/screen_info.h 2011-11-15 20:03:00.000000000 -0500
@@ -43,7 +43,8 @@ struct screen_info {
__u16 pages; /* 0x32 */
__u16 vesa_attributes; /* 0x34 */
@@ -60492,7 +60498,7 @@ diff -urNp linux-3.0.9/include/linux/screen_info.h linux-3.0.9/include/linux/scr
#define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
diff -urNp linux-3.0.9/include/linux/security.h linux-3.0.9/include/linux/security.h
--- linux-3.0.9/include/linux/security.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/security.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/security.h 2011-11-15 20:03:00.000000000 -0500
@@ -36,6 +36,7 @@
#include <linux/key.h>
#include <linux/xfrm.h>
@@ -60503,7 +60509,7 @@ diff -urNp linux-3.0.9/include/linux/security.h linux-3.0.9/include/linux/securi
/* Maximum number of letters for an LSM name string */
diff -urNp linux-3.0.9/include/linux/seq_file.h linux-3.0.9/include/linux/seq_file.h
--- linux-3.0.9/include/linux/seq_file.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/seq_file.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/seq_file.h 2011-11-15 20:03:00.000000000 -0500
@@ -32,6 +32,7 @@ struct seq_operations {
void * (*next) (struct seq_file *m, void *v, loff_t *pos);
int (*show) (struct seq_file *m, void *v);
@@ -60514,7 +60520,7 @@ diff -urNp linux-3.0.9/include/linux/seq_file.h linux-3.0.9/include/linux/seq_fi
diff -urNp linux-3.0.9/include/linux/shmem_fs.h linux-3.0.9/include/linux/shmem_fs.h
--- linux-3.0.9/include/linux/shmem_fs.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/shmem_fs.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/shmem_fs.h 2011-11-15 20:03:00.000000000 -0500
@@ -10,7 +10,7 @@
#define SHMEM_NR_DIRECT 16
@@ -60526,7 +60532,7 @@ diff -urNp linux-3.0.9/include/linux/shmem_fs.h linux-3.0.9/include/linux/shmem_
spinlock_t lock;
diff -urNp linux-3.0.9/include/linux/shm.h linux-3.0.9/include/linux/shm.h
--- linux-3.0.9/include/linux/shm.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/shm.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/shm.h 2011-11-15 20:03:00.000000000 -0500
@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
pid_t shm_cprid;
pid_t shm_lprid;
@@ -60540,7 +60546,7 @@ diff -urNp linux-3.0.9/include/linux/shm.h linux-3.0.9/include/linux/shm.h
/* shm_mode upper byte flags */
diff -urNp linux-3.0.9/include/linux/skbuff.h linux-3.0.9/include/linux/skbuff.h
--- linux-3.0.9/include/linux/skbuff.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/skbuff.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/skbuff.h 2011-11-15 20:03:00.000000000 -0500
@@ -592,7 +592,7 @@ static inline struct skb_shared_hwtstamp
*/
static inline int skb_queue_empty(const struct sk_buff_head *list)
@@ -60579,7 +60585,7 @@ diff -urNp linux-3.0.9/include/linux/skbuff.h linux-3.0.9/include/linux/skbuff.h
extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
diff -urNp linux-3.0.9/include/linux/slab_def.h linux-3.0.9/include/linux/slab_def.h
--- linux-3.0.9/include/linux/slab_def.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/slab_def.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/slab_def.h 2011-11-15 20:03:00.000000000 -0500
@@ -96,10 +96,10 @@ struct kmem_cache {
unsigned long node_allocs;
unsigned long node_frees;
@@ -60597,7 +60603,7 @@ diff -urNp linux-3.0.9/include/linux/slab_def.h linux-3.0.9/include/linux/slab_d
* If debugging is enabled, then the allocator can add additional
diff -urNp linux-3.0.9/include/linux/slab.h linux-3.0.9/include/linux/slab.h
--- linux-3.0.9/include/linux/slab.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/slab.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/slab.h 2011-11-15 20:03:00.000000000 -0500
@@ -11,12 +11,20 @@
#include <linux/gfp.h>
@@ -60706,7 +60712,7 @@ diff -urNp linux-3.0.9/include/linux/slab.h linux-3.0.9/include/linux/slab.h
#endif /* _LINUX_SLAB_H */
diff -urNp linux-3.0.9/include/linux/slub_def.h linux-3.0.9/include/linux/slub_def.h
--- linux-3.0.9/include/linux/slub_def.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/slub_def.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/slub_def.h 2011-11-15 20:03:00.000000000 -0500
@@ -82,7 +82,7 @@ struct kmem_cache {
struct kmem_cache_order_objects max;
struct kmem_cache_order_objects min;
@@ -60727,7 +60733,7 @@ diff -urNp linux-3.0.9/include/linux/slub_def.h linux-3.0.9/include/linux/slub_d
kmalloc_order(size_t size, gfp_t flags, unsigned int order)
diff -urNp linux-3.0.9/include/linux/sonet.h linux-3.0.9/include/linux/sonet.h
--- linux-3.0.9/include/linux/sonet.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/sonet.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/sonet.h 2011-11-15 20:03:00.000000000 -0500
@@ -61,7 +61,7 @@ struct sonet_stats {
#include <asm/atomic.h>
@@ -60739,7 +60745,7 @@ diff -urNp linux-3.0.9/include/linux/sonet.h linux-3.0.9/include/linux/sonet.h
};
diff -urNp linux-3.0.9/include/linux/sunrpc/clnt.h linux-3.0.9/include/linux/sunrpc/clnt.h
--- linux-3.0.9/include/linux/sunrpc/clnt.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/sunrpc/clnt.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/sunrpc/clnt.h 2011-11-15 20:03:00.000000000 -0500
@@ -169,9 +169,9 @@ static inline unsigned short rpc_get_por
{
switch (sap->sa_family) {
@@ -60772,7 +60778,7 @@ diff -urNp linux-3.0.9/include/linux/sunrpc/clnt.h linux-3.0.9/include/linux/sun
#endif /* __KERNEL__ */
diff -urNp linux-3.0.9/include/linux/sunrpc/svc_rdma.h linux-3.0.9/include/linux/sunrpc/svc_rdma.h
--- linux-3.0.9/include/linux/sunrpc/svc_rdma.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/sunrpc/svc_rdma.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/sunrpc/svc_rdma.h 2011-11-15 20:03:00.000000000 -0500
@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
extern unsigned int svcrdma_max_requests;
extern unsigned int svcrdma_max_req_size;
@@ -60800,7 +60806,7 @@ diff -urNp linux-3.0.9/include/linux/sunrpc/svc_rdma.h linux-3.0.9/include/linux
diff -urNp linux-3.0.9/include/linux/sysctl.h linux-3.0.9/include/linux/sysctl.h
--- linux-3.0.9/include/linux/sysctl.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/sysctl.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/sysctl.h 2011-11-15 20:03:00.000000000 -0500
@@ -155,7 +155,11 @@ enum
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
};
@@ -60825,7 +60831,7 @@ diff -urNp linux-3.0.9/include/linux/sysctl.h linux-3.0.9/include/linux/sysctl.h
extern int proc_dointvec_minmax(struct ctl_table *, int,
diff -urNp linux-3.0.9/include/linux/tty_ldisc.h linux-3.0.9/include/linux/tty_ldisc.h
--- linux-3.0.9/include/linux/tty_ldisc.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/tty_ldisc.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/tty_ldisc.h 2011-11-15 20:03:00.000000000 -0500
@@ -148,7 +148,7 @@ struct tty_ldisc_ops {
struct module *owner;
@@ -60837,7 +60843,7 @@ diff -urNp linux-3.0.9/include/linux/tty_ldisc.h linux-3.0.9/include/linux/tty_l
struct tty_ldisc {
diff -urNp linux-3.0.9/include/linux/types.h linux-3.0.9/include/linux/types.h
--- linux-3.0.9/include/linux/types.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/types.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/types.h 2011-11-15 20:03:00.000000000 -0500
@@ -213,10 +213,26 @@ typedef struct {
int counter;
} atomic_t;
@@ -60867,7 +60873,7 @@ diff -urNp linux-3.0.9/include/linux/types.h linux-3.0.9/include/linux/types.h
struct list_head {
diff -urNp linux-3.0.9/include/linux/uaccess.h linux-3.0.9/include/linux/uaccess.h
--- linux-3.0.9/include/linux/uaccess.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/uaccess.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/uaccess.h 2011-11-15 20:03:00.000000000 -0500
@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
long ret; \
mm_segment_t old_fs = get_fs(); \
@@ -60885,7 +60891,7 @@ diff -urNp linux-3.0.9/include/linux/uaccess.h linux-3.0.9/include/linux/uaccess
diff -urNp linux-3.0.9/include/linux/unaligned/access_ok.h linux-3.0.9/include/linux/unaligned/access_ok.h
--- linux-3.0.9/include/linux/unaligned/access_ok.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/unaligned/access_ok.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/unaligned/access_ok.h 2011-11-15 20:03:00.000000000 -0500
@@ -6,32 +6,32 @@
static inline u16 get_unaligned_le16(const void *p)
@@ -60927,7 +60933,7 @@ diff -urNp linux-3.0.9/include/linux/unaligned/access_ok.h linux-3.0.9/include/l
static inline void put_unaligned_le16(u16 val, void *p)
diff -urNp linux-3.0.9/include/linux/vermagic.h linux-3.0.9/include/linux/vermagic.h
--- linux-3.0.9/include/linux/vermagic.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/vermagic.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/vermagic.h 2011-11-15 20:03:00.000000000 -0500
@@ -26,9 +26,28 @@
#define MODULE_ARCH_VERMAGIC ""
#endif
@@ -60960,7 +60966,7 @@ diff -urNp linux-3.0.9/include/linux/vermagic.h linux-3.0.9/include/linux/vermag
diff -urNp linux-3.0.9/include/linux/vmalloc.h linux-3.0.9/include/linux/vmalloc.h
--- linux-3.0.9/include/linux/vmalloc.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/vmalloc.h 2011-11-12 13:08:20.000000000 -0500
++++ linux-3.0.9/include/linux/vmalloc.h 2011-11-15 20:03:00.000000000 -0500
@@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining
#define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
#define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
@@ -61079,7 +61085,7 @@ diff -urNp linux-3.0.9/include/linux/vmalloc.h linux-3.0.9/include/linux/vmalloc
#endif /* _LINUX_VMALLOC_H */
diff -urNp linux-3.0.9/include/linux/vmstat.h linux-3.0.9/include/linux/vmstat.h
--- linux-3.0.9/include/linux/vmstat.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/vmstat.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/linux/vmstat.h 2011-11-15 20:03:00.000000000 -0500
@@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(in
/*
* Zone based page accounting with per cpu differentials.
@@ -61145,7 +61151,7 @@ diff -urNp linux-3.0.9/include/linux/vmstat.h linux-3.0.9/include/linux/vmstat.h
static inline void __dec_zone_page_state(struct page *page,
diff -urNp linux-3.0.9/include/media/saa7146_vv.h linux-3.0.9/include/media/saa7146_vv.h
--- linux-3.0.9/include/media/saa7146_vv.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/media/saa7146_vv.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/media/saa7146_vv.h 2011-11-15 20:03:00.000000000 -0500
@@ -163,7 +163,7 @@ struct saa7146_ext_vv
int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
@@ -61157,7 +61163,7 @@ diff -urNp linux-3.0.9/include/media/saa7146_vv.h linux-3.0.9/include/media/saa7
diff -urNp linux-3.0.9/include/media/v4l2-dev.h linux-3.0.9/include/media/v4l2-dev.h
--- linux-3.0.9/include/media/v4l2-dev.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/media/v4l2-dev.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/media/v4l2-dev.h 2011-11-15 20:03:00.000000000 -0500
@@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_sta
@@ -61177,7 +61183,7 @@ diff -urNp linux-3.0.9/include/media/v4l2-dev.h linux-3.0.9/include/media/v4l2-d
* Newer version of video_device, handled by videodev2.c
diff -urNp linux-3.0.9/include/media/v4l2-ioctl.h linux-3.0.9/include/media/v4l2-ioctl.h
--- linux-3.0.9/include/media/v4l2-ioctl.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/media/v4l2-ioctl.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/media/v4l2-ioctl.h 2011-11-15 20:03:00.000000000 -0500
@@ -272,6 +272,7 @@ struct v4l2_ioctl_ops {
long (*vidioc_default) (struct file *file, void *fh,
bool valid_prio, int cmd, void *arg);
@@ -61188,7 +61194,7 @@ diff -urNp linux-3.0.9/include/media/v4l2-ioctl.h linux-3.0.9/include/media/v4l2
/* v4l debugging and diagnostics */
diff -urNp linux-3.0.9/include/net/caif/cfctrl.h linux-3.0.9/include/net/caif/cfctrl.h
--- linux-3.0.9/include/net/caif/cfctrl.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/caif/cfctrl.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/caif/cfctrl.h 2011-11-15 20:03:00.000000000 -0500
@@ -52,7 +52,7 @@ struct cfctrl_rsp {
void (*radioset_rsp)(void);
void (*reject_rsp)(struct cflayer *layer, u8 linkid,
@@ -61211,7 +61217,7 @@ diff -urNp linux-3.0.9/include/net/caif/cfctrl.h linux-3.0.9/include/net/caif/cf
spinlock_t info_list_lock;
diff -urNp linux-3.0.9/include/net/flow.h linux-3.0.9/include/net/flow.h
--- linux-3.0.9/include/net/flow.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/flow.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/flow.h 2011-11-15 20:03:00.000000000 -0500
@@ -207,6 +207,6 @@ extern struct flow_cache_object *flow_ca
u8 dir, flow_resolve_t resolver, void *ctx);
@@ -61222,7 +61228,7 @@ diff -urNp linux-3.0.9/include/net/flow.h linux-3.0.9/include/net/flow.h
#endif
diff -urNp linux-3.0.9/include/net/inetpeer.h linux-3.0.9/include/net/inetpeer.h
--- linux-3.0.9/include/net/inetpeer.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/inetpeer.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/inetpeer.h 2011-11-15 20:03:00.000000000 -0500
@@ -43,8 +43,8 @@ struct inet_peer {
*/
union {
@@ -61245,7 +61251,7 @@ diff -urNp linux-3.0.9/include/net/inetpeer.h linux-3.0.9/include/net/inetpeer.h
#endif /* _NET_INETPEER_H */
diff -urNp linux-3.0.9/include/net/ip_fib.h linux-3.0.9/include/net/ip_fib.h
--- linux-3.0.9/include/net/ip_fib.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/ip_fib.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/ip_fib.h 2011-11-15 20:03:00.000000000 -0500
@@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(s
#define FIB_RES_SADDR(net, res) \
@@ -61257,7 +61263,7 @@ diff -urNp linux-3.0.9/include/net/ip_fib.h linux-3.0.9/include/net/ip_fib.h
#define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
diff -urNp linux-3.0.9/include/net/ip_vs.h linux-3.0.9/include/net/ip_vs.h
--- linux-3.0.9/include/net/ip_vs.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/ip_vs.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/ip_vs.h 2011-11-15 20:03:00.000000000 -0500
@@ -509,7 +509,7 @@ struct ip_vs_conn {
struct ip_vs_conn *control; /* Master control connection */
atomic_t n_control; /* Number of controlled ones */
@@ -61278,7 +61284,7 @@ diff -urNp linux-3.0.9/include/net/ip_vs.h linux-3.0.9/include/net/ip_vs.h
atomic_t refcnt; /* reference counter */
diff -urNp linux-3.0.9/include/net/irda/ircomm_core.h linux-3.0.9/include/net/irda/ircomm_core.h
--- linux-3.0.9/include/net/irda/ircomm_core.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/irda/ircomm_core.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/irda/ircomm_core.h 2011-11-15 20:03:00.000000000 -0500
@@ -51,7 +51,7 @@ typedef struct {
int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
@@ -61290,7 +61296,7 @@ diff -urNp linux-3.0.9/include/net/irda/ircomm_core.h linux-3.0.9/include/net/ir
irda_queue_t queue;
diff -urNp linux-3.0.9/include/net/irda/ircomm_tty.h linux-3.0.9/include/net/irda/ircomm_tty.h
--- linux-3.0.9/include/net/irda/ircomm_tty.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/irda/ircomm_tty.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/irda/ircomm_tty.h 2011-11-15 20:03:00.000000000 -0500
@@ -35,6 +35,7 @@
#include <linux/termios.h>
#include <linux/timer.h>
@@ -61312,7 +61318,7 @@ diff -urNp linux-3.0.9/include/net/irda/ircomm_tty.h linux-3.0.9/include/net/ird
* o self->open_count
diff -urNp linux-3.0.9/include/net/iucv/af_iucv.h linux-3.0.9/include/net/iucv/af_iucv.h
--- linux-3.0.9/include/net/iucv/af_iucv.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/iucv/af_iucv.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/iucv/af_iucv.h 2011-11-15 20:03:00.000000000 -0500
@@ -87,7 +87,7 @@ struct iucv_sock {
struct iucv_sock_list {
struct hlist_head head;
@@ -61324,7 +61330,7 @@ diff -urNp linux-3.0.9/include/net/iucv/af_iucv.h linux-3.0.9/include/net/iucv/a
unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
diff -urNp linux-3.0.9/include/net/lapb.h linux-3.0.9/include/net/lapb.h
--- linux-3.0.9/include/net/lapb.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/lapb.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/lapb.h 2011-11-15 20:03:00.000000000 -0500
@@ -95,7 +95,7 @@ struct lapb_cb {
struct sk_buff_head write_queue;
struct sk_buff_head ack_queue;
@@ -61336,7 +61342,7 @@ diff -urNp linux-3.0.9/include/net/lapb.h linux-3.0.9/include/net/lapb.h
struct lapb_frame frmr_data;
diff -urNp linux-3.0.9/include/net/neighbour.h linux-3.0.9/include/net/neighbour.h
--- linux-3.0.9/include/net/neighbour.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/neighbour.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/neighbour.h 2011-11-15 20:03:00.000000000 -0500
@@ -124,7 +124,7 @@ struct neigh_ops {
int (*connected_output)(struct sk_buff*);
int (*hh_output)(struct sk_buff*);
@@ -61348,7 +61354,7 @@ diff -urNp linux-3.0.9/include/net/neighbour.h linux-3.0.9/include/net/neighbour
struct pneigh_entry *next;
diff -urNp linux-3.0.9/include/net/netlink.h linux-3.0.9/include/net/netlink.h
--- linux-3.0.9/include/net/netlink.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/netlink.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/netlink.h 2011-11-15 20:03:00.000000000 -0500
@@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct
static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
{
@@ -61360,7 +61366,7 @@ diff -urNp linux-3.0.9/include/net/netlink.h linux-3.0.9/include/net/netlink.h
/**
diff -urNp linux-3.0.9/include/net/netns/ipv4.h linux-3.0.9/include/net/netns/ipv4.h
--- linux-3.0.9/include/net/netns/ipv4.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/netns/ipv4.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/netns/ipv4.h 2011-11-15 20:03:00.000000000 -0500
@@ -56,8 +56,8 @@ struct netns_ipv4 {
unsigned int sysctl_ping_group_range[2];
@@ -61374,7 +61380,7 @@ diff -urNp linux-3.0.9/include/net/netns/ipv4.h linux-3.0.9/include/net/netns/ip
#ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
diff -urNp linux-3.0.9/include/net/sctp/sctp.h linux-3.0.9/include/net/sctp/sctp.h
--- linux-3.0.9/include/net/sctp/sctp.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/sctp/sctp.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/sctp/sctp.h 2011-11-15 20:03:00.000000000 -0500
@@ -315,9 +315,9 @@ do { \
#else /* SCTP_DEBUG */
@@ -61390,7 +61396,7 @@ diff -urNp linux-3.0.9/include/net/sctp/sctp.h linux-3.0.9/include/net/sctp/sctp
#define SCTP_ASSERT(expr, str, func)
diff -urNp linux-3.0.9/include/net/sock.h linux-3.0.9/include/net/sock.h
--- linux-3.0.9/include/net/sock.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/sock.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/sock.h 2011-11-15 20:03:00.000000000 -0500
@@ -277,7 +277,7 @@ struct sock {
#ifdef CONFIG_RPS
__u32 sk_rxhash;
@@ -61411,7 +61417,7 @@ diff -urNp linux-3.0.9/include/net/sock.h linux-3.0.9/include/net/sock.h
if (skb->ip_summed == CHECKSUM_NONE) {
diff -urNp linux-3.0.9/include/net/tcp.h linux-3.0.9/include/net/tcp.h
--- linux-3.0.9/include/net/tcp.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/tcp.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/tcp.h 2011-11-15 20:03:00.000000000 -0500
@@ -1374,8 +1374,8 @@ enum tcp_seq_states {
struct tcp_seq_afinfo {
char *name;
@@ -61425,7 +61431,7 @@ diff -urNp linux-3.0.9/include/net/tcp.h linux-3.0.9/include/net/tcp.h
struct tcp_iter_state {
diff -urNp linux-3.0.9/include/net/udp.h linux-3.0.9/include/net/udp.h
--- linux-3.0.9/include/net/udp.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/udp.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/udp.h 2011-11-15 20:03:00.000000000 -0500
@@ -234,8 +234,8 @@ struct udp_seq_afinfo {
char *name;
sa_family_t family;
@@ -61439,7 +61445,7 @@ diff -urNp linux-3.0.9/include/net/udp.h linux-3.0.9/include/net/udp.h
struct udp_iter_state {
diff -urNp linux-3.0.9/include/net/xfrm.h linux-3.0.9/include/net/xfrm.h
--- linux-3.0.9/include/net/xfrm.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/net/xfrm.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/net/xfrm.h 2011-11-15 20:03:00.000000000 -0500
@@ -505,7 +505,7 @@ struct xfrm_policy {
struct timer_list timer;
@@ -61451,7 +61457,7 @@ diff -urNp linux-3.0.9/include/net/xfrm.h linux-3.0.9/include/net/xfrm.h
struct xfrm_mark mark;
diff -urNp linux-3.0.9/include/rdma/iw_cm.h linux-3.0.9/include/rdma/iw_cm.h
--- linux-3.0.9/include/rdma/iw_cm.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/rdma/iw_cm.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/rdma/iw_cm.h 2011-11-15 20:03:00.000000000 -0500
@@ -120,7 +120,7 @@ struct iw_cm_verbs {
int backlog);
@@ -61463,7 +61469,7 @@ diff -urNp linux-3.0.9/include/rdma/iw_cm.h linux-3.0.9/include/rdma/iw_cm.h
* iw_create_cm_id - Create an IW CM identifier.
diff -urNp linux-3.0.9/include/scsi/libfc.h linux-3.0.9/include/scsi/libfc.h
--- linux-3.0.9/include/scsi/libfc.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/scsi/libfc.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/scsi/libfc.h 2011-11-15 20:03:00.000000000 -0500
@@ -750,6 +750,7 @@ struct libfc_function_template {
*/
void (*disc_stop_final) (struct fc_lport *);
@@ -61483,7 +61489,7 @@ diff -urNp linux-3.0.9/include/scsi/libfc.h linux-3.0.9/include/scsi/libfc.h
enum fc_lport_state state;
diff -urNp linux-3.0.9/include/scsi/scsi_device.h linux-3.0.9/include/scsi/scsi_device.h
--- linux-3.0.9/include/scsi/scsi_device.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/scsi/scsi_device.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/scsi/scsi_device.h 2011-11-15 20:03:00.000000000 -0500
@@ -161,9 +161,9 @@ struct scsi_device {
unsigned int max_device_blocked; /* what device_blocked counts down from */
#define SCSI_DEFAULT_DEVICE_BLOCKED 3
@@ -61499,7 +61505,7 @@ diff -urNp linux-3.0.9/include/scsi/scsi_device.h linux-3.0.9/include/scsi/scsi_
sdev_dev;
diff -urNp linux-3.0.9/include/scsi/scsi_transport_fc.h linux-3.0.9/include/scsi/scsi_transport_fc.h
--- linux-3.0.9/include/scsi/scsi_transport_fc.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/scsi/scsi_transport_fc.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/scsi/scsi_transport_fc.h 2011-11-15 20:03:00.000000000 -0500
@@ -711,7 +711,7 @@ struct fc_function_template {
unsigned long show_host_system_hostname:1;
@@ -61511,7 +61517,7 @@ diff -urNp linux-3.0.9/include/scsi/scsi_transport_fc.h linux-3.0.9/include/scsi
/**
diff -urNp linux-3.0.9/include/sound/ak4xxx-adda.h linux-3.0.9/include/sound/ak4xxx-adda.h
--- linux-3.0.9/include/sound/ak4xxx-adda.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/sound/ak4xxx-adda.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/sound/ak4xxx-adda.h 2011-11-15 20:03:00.000000000 -0500
@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
unsigned char val);
@@ -61523,7 +61529,7 @@ diff -urNp linux-3.0.9/include/sound/ak4xxx-adda.h linux-3.0.9/include/sound/ak4
diff -urNp linux-3.0.9/include/sound/hwdep.h linux-3.0.9/include/sound/hwdep.h
--- linux-3.0.9/include/sound/hwdep.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/sound/hwdep.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/sound/hwdep.h 2011-11-15 20:03:00.000000000 -0500
@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
struct snd_hwdep_dsp_status *status);
int (*dsp_load)(struct snd_hwdep *hw,
@@ -61535,7 +61541,7 @@ diff -urNp linux-3.0.9/include/sound/hwdep.h linux-3.0.9/include/sound/hwdep.h
struct snd_card *card;
diff -urNp linux-3.0.9/include/sound/info.h linux-3.0.9/include/sound/info.h
--- linux-3.0.9/include/sound/info.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/sound/info.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/sound/info.h 2011-11-15 20:03:00.000000000 -0500
@@ -44,7 +44,7 @@ struct snd_info_entry_text {
struct snd_info_buffer *buffer);
void (*write)(struct snd_info_entry *entry,
@@ -61547,7 +61553,7 @@ diff -urNp linux-3.0.9/include/sound/info.h linux-3.0.9/include/sound/info.h
int (*open)(struct snd_info_entry *entry,
diff -urNp linux-3.0.9/include/sound/pcm.h linux-3.0.9/include/sound/pcm.h
--- linux-3.0.9/include/sound/pcm.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/sound/pcm.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/sound/pcm.h 2011-11-15 20:03:00.000000000 -0500
@@ -81,6 +81,7 @@ struct snd_pcm_ops {
int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
int (*ack)(struct snd_pcm_substream *substream);
@@ -61558,7 +61564,7 @@ diff -urNp linux-3.0.9/include/sound/pcm.h linux-3.0.9/include/sound/pcm.h
*
diff -urNp linux-3.0.9/include/sound/sb16_csp.h linux-3.0.9/include/sound/sb16_csp.h
--- linux-3.0.9/include/sound/sb16_csp.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/sound/sb16_csp.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/sound/sb16_csp.h 2011-11-15 20:03:00.000000000 -0500
@@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
int (*csp_stop) (struct snd_sb_csp * p);
@@ -61570,7 +61576,7 @@ diff -urNp linux-3.0.9/include/sound/sb16_csp.h linux-3.0.9/include/sound/sb16_c
* CSP private data
diff -urNp linux-3.0.9/include/sound/soc.h linux-3.0.9/include/sound/soc.h
--- linux-3.0.9/include/sound/soc.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/sound/soc.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/sound/soc.h 2011-11-15 20:03:00.000000000 -0500
@@ -636,7 +636,7 @@ struct snd_soc_platform_driver {
/* platform stream ops */
@@ -61582,7 +61588,7 @@ diff -urNp linux-3.0.9/include/sound/soc.h linux-3.0.9/include/sound/soc.h
const char *name;
diff -urNp linux-3.0.9/include/sound/ymfpci.h linux-3.0.9/include/sound/ymfpci.h
--- linux-3.0.9/include/sound/ymfpci.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/sound/ymfpci.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/sound/ymfpci.h 2011-11-15 20:03:00.000000000 -0500
@@ -358,7 +358,7 @@ struct snd_ymfpci {
spinlock_t reg_lock;
spinlock_t voice_lock;
@@ -61594,7 +61600,7 @@ diff -urNp linux-3.0.9/include/sound/ymfpci.h linux-3.0.9/include/sound/ymfpci.h
const struct firmware *controller_microcode;
diff -urNp linux-3.0.9/include/target/target_core_base.h linux-3.0.9/include/target/target_core_base.h
--- linux-3.0.9/include/target/target_core_base.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/target/target_core_base.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/target/target_core_base.h 2011-11-15 20:03:00.000000000 -0500
@@ -364,7 +364,7 @@ struct t10_reservation_ops {
int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
int (*t10_pr_register)(struct se_cmd *);
@@ -61626,7 +61632,7 @@ diff -urNp linux-3.0.9/include/target/target_core_base.h linux-3.0.9/include/tar
atomic_t dev_status_thr_count;
diff -urNp linux-3.0.9/include/trace/events/irq.h linux-3.0.9/include/trace/events/irq.h
--- linux-3.0.9/include/trace/events/irq.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/trace/events/irq.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/trace/events/irq.h 2011-11-15 20:03:00.000000000 -0500
@@ -36,7 +36,7 @@ struct softirq_action;
*/
TRACE_EVENT(irq_handler_entry,
@@ -61647,7 +61653,7 @@ diff -urNp linux-3.0.9/include/trace/events/irq.h linux-3.0.9/include/trace/even
diff -urNp linux-3.0.9/include/video/udlfb.h linux-3.0.9/include/video/udlfb.h
--- linux-3.0.9/include/video/udlfb.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/video/udlfb.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/video/udlfb.h 2011-11-15 20:03:00.000000000 -0500
@@ -51,10 +51,10 @@ struct dlfb_data {
int base8;
u32 pseudo_palette[256];
@@ -61665,7 +61671,7 @@ diff -urNp linux-3.0.9/include/video/udlfb.h linux-3.0.9/include/video/udlfb.h
#define NR_USB_REQUEST_I2C_SUB_IO 0x02
diff -urNp linux-3.0.9/include/video/uvesafb.h linux-3.0.9/include/video/uvesafb.h
--- linux-3.0.9/include/video/uvesafb.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/video/uvesafb.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/include/video/uvesafb.h 2011-11-15 20:03:00.000000000 -0500
@@ -177,6 +177,7 @@ struct uvesafb_par {
u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
u8 pmi_setpal; /* PMI for palette changes */
@@ -61676,7 +61682,7 @@ diff -urNp linux-3.0.9/include/video/uvesafb.h linux-3.0.9/include/video/uvesafb
u8 *vbe_state_orig; /*
diff -urNp linux-3.0.9/init/do_mounts.c linux-3.0.9/init/do_mounts.c
--- linux-3.0.9/init/do_mounts.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/init/do_mounts.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/init/do_mounts.c 2011-11-15 20:03:00.000000000 -0500
@@ -287,11 +287,11 @@ static void __init get_fs_names(char *pa
static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -61724,7 +61730,7 @@ diff -urNp linux-3.0.9/init/do_mounts.c linux-3.0.9/init/do_mounts.c
}
diff -urNp linux-3.0.9/init/do_mounts.h linux-3.0.9/init/do_mounts.h
--- linux-3.0.9/init/do_mounts.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/init/do_mounts.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/init/do_mounts.h 2011-11-15 20:03:00.000000000 -0500
@@ -15,15 +15,15 @@ extern int root_mountflags;
static inline int create_dev(char *name, dev_t dev)
@@ -61755,7 +61761,7 @@ diff -urNp linux-3.0.9/init/do_mounts.h linux-3.0.9/init/do_mounts.h
return 0;
diff -urNp linux-3.0.9/init/do_mounts_initrd.c linux-3.0.9/init/do_mounts_initrd.c
--- linux-3.0.9/init/do_mounts_initrd.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/init/do_mounts_initrd.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/init/do_mounts_initrd.c 2011-11-15 20:03:00.000000000 -0500
@@ -44,13 +44,13 @@ static void __init handle_initrd(void)
create_dev("/dev/root.old", Root_RAM0);
/* mount initrd on rootfs' /root */
@@ -61832,7 +61838,7 @@ diff -urNp linux-3.0.9/init/do_mounts_initrd.c linux-3.0.9/init/do_mounts_initrd
}
diff -urNp linux-3.0.9/init/do_mounts_md.c linux-3.0.9/init/do_mounts_md.c
--- linux-3.0.9/init/do_mounts_md.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/init/do_mounts_md.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/init/do_mounts_md.c 2011-11-15 20:03:00.000000000 -0500
@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
partitioned ? "_d" : "", minor,
md_setup_args[ent].device_names);
@@ -61862,7 +61868,7 @@ diff -urNp linux-3.0.9/init/do_mounts_md.c linux-3.0.9/init/do_mounts_md.c
sys_close(fd);
diff -urNp linux-3.0.9/init/initramfs.c linux-3.0.9/init/initramfs.c
--- linux-3.0.9/init/initramfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/init/initramfs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/init/initramfs.c 2011-11-15 20:03:00.000000000 -0500
@@ -74,7 +74,7 @@ static void __init free_hash(void)
}
}
@@ -61973,7 +61979,7 @@ diff -urNp linux-3.0.9/init/initramfs.c linux-3.0.9/init/initramfs.c
return 0;
diff -urNp linux-3.0.9/init/Kconfig linux-3.0.9/init/Kconfig
--- linux-3.0.9/init/Kconfig 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/init/Kconfig 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/init/Kconfig 2011-11-15 20:03:00.000000000 -0500
@@ -1195,7 +1195,7 @@ config SLUB_DEBUG
config COMPAT_BRK
@@ -61985,7 +61991,7 @@ diff -urNp linux-3.0.9/init/Kconfig linux-3.0.9/init/Kconfig
also breaks ancient binaries (including anything libc5 based).
diff -urNp linux-3.0.9/init/main.c linux-3.0.9/init/main.c
--- linux-3.0.9/init/main.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/init/main.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/init/main.c 2011-11-15 20:03:00.000000000 -0500
@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void)
extern void tc_init(void);
#endif
@@ -62099,7 +62105,7 @@ diff -urNp linux-3.0.9/init/main.c linux-3.0.9/init/main.c
* we're essentially up and running. Get rid of the
diff -urNp linux-3.0.9/ipc/mqueue.c linux-3.0.9/ipc/mqueue.c
--- linux-3.0.9/ipc/mqueue.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/ipc/mqueue.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/ipc/mqueue.c 2011-11-15 20:03:00.000000000 -0500
@@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(st
mq_bytes = (mq_msg_tblsz +
(info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -62110,7 +62116,7 @@ diff -urNp linux-3.0.9/ipc/mqueue.c linux-3.0.9/ipc/mqueue.c
u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) {
diff -urNp linux-3.0.9/ipc/msg.c linux-3.0.9/ipc/msg.c
--- linux-3.0.9/ipc/msg.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/ipc/msg.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/ipc/msg.c 2011-11-15 20:03:00.000000000 -0500
@@ -309,18 +309,19 @@ static inline int msg_security(struct ke
return security_msg_queue_associate(msq, msgflg);
}
@@ -62138,7 +62144,7 @@ diff -urNp linux-3.0.9/ipc/msg.c linux-3.0.9/ipc/msg.c
diff -urNp linux-3.0.9/ipc/sem.c linux-3.0.9/ipc/sem.c
--- linux-3.0.9/ipc/sem.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/ipc/sem.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/ipc/sem.c 2011-11-15 20:03:00.000000000 -0500
@@ -318,10 +318,15 @@ static inline int sem_more_checks(struct
return 0;
}
@@ -62187,7 +62193,7 @@ diff -urNp linux-3.0.9/ipc/sem.c linux-3.0.9/ipc/sem.c
if (nsops < 1 || semid < 0)
diff -urNp linux-3.0.9/ipc/shm.c linux-3.0.9/ipc/shm.c
--- linux-3.0.9/ipc/shm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/ipc/shm.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/ipc/shm.c 2011-11-15 20:03:00.000000000 -0500
@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name
static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
#endif
@@ -62276,7 +62282,7 @@ diff -urNp linux-3.0.9/ipc/shm.c linux-3.0.9/ipc/shm.c
diff -urNp linux-3.0.9/kernel/acct.c linux-3.0.9/kernel/acct.c
--- linux-3.0.9/kernel/acct.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/acct.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/acct.c 2011-11-15 20:03:00.000000000 -0500
@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
*/
flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -62288,7 +62294,7 @@ diff -urNp linux-3.0.9/kernel/acct.c linux-3.0.9/kernel/acct.c
set_fs(fs);
diff -urNp linux-3.0.9/kernel/audit.c linux-3.0.9/kernel/audit.c
--- linux-3.0.9/kernel/audit.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/audit.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/audit.c 2011-11-15 20:03:00.000000000 -0500
@@ -112,7 +112,7 @@ u32 audit_sig_sid = 0;
3) suppressed due to audit_rate_limit
4) suppressed due to audit_backlog_limit
@@ -62327,7 +62333,7 @@ diff -urNp linux-3.0.9/kernel/audit.c linux-3.0.9/kernel/audit.c
&status_set, sizeof(status_set));
diff -urNp linux-3.0.9/kernel/auditsc.c linux-3.0.9/kernel/auditsc.c
--- linux-3.0.9/kernel/auditsc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/auditsc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/auditsc.c 2011-11-15 20:03:00.000000000 -0500
@@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_conte
}
@@ -62348,7 +62354,7 @@ diff -urNp linux-3.0.9/kernel/auditsc.c linux-3.0.9/kernel/auditsc.c
if (context && context->in_syscall) {
diff -urNp linux-3.0.9/kernel/capability.c linux-3.0.9/kernel/capability.c
--- linux-3.0.9/kernel/capability.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/capability.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/capability.c 2011-11-15 20:03:00.000000000 -0500
@@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
* before modification is attempted and the application
* fails.
@@ -62411,7 +62417,7 @@ diff -urNp linux-3.0.9/kernel/capability.c linux-3.0.9/kernel/capability.c
* @cap: The capability in question
diff -urNp linux-3.0.9/kernel/cgroup.c linux-3.0.9/kernel/cgroup.c
--- linux-3.0.9/kernel/cgroup.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/cgroup.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/cgroup.c 2011-11-15 20:03:00.000000000 -0500
@@ -593,6 +593,8 @@ static struct css_set *find_css_set(
struct hlist_head *hhead;
struct cg_cgroup_link *link;
@@ -62423,7 +62429,7 @@ diff -urNp linux-3.0.9/kernel/cgroup.c linux-3.0.9/kernel/cgroup.c
read_lock(&css_set_lock);
diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
--- linux-3.0.9/kernel/compat.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/compat.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/compat.c 2011-11-15 20:03:00.000000000 -0500
@@ -13,6 +13,7 @@
#include <linux/linkage.h>
@@ -62591,7 +62597,7 @@ diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c
if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
diff -urNp linux-3.0.9/kernel/configs.c linux-3.0.9/kernel/configs.c
--- linux-3.0.9/kernel/configs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/configs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/configs.c 2011-11-15 20:03:00.000000000 -0500
@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
struct proc_dir_entry *entry;
@@ -62614,7 +62620,7 @@ diff -urNp linux-3.0.9/kernel/configs.c linux-3.0.9/kernel/configs.c
diff -urNp linux-3.0.9/kernel/cred.c linux-3.0.9/kernel/cred.c
--- linux-3.0.9/kernel/cred.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/cred.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/cred.c 2011-11-15 20:03:00.000000000 -0500
@@ -158,6 +158,8 @@ static void put_cred_rcu(struct rcu_head
*/
void __put_cred(struct cred *cred)
@@ -62765,7 +62771,7 @@ diff -urNp linux-3.0.9/kernel/cred.c linux-3.0.9/kernel/cred.c
return ret;
diff -urNp linux-3.0.9/kernel/debug/debug_core.c linux-3.0.9/kernel/debug/debug_core.c
--- linux-3.0.9/kernel/debug/debug_core.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/debug/debug_core.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/debug/debug_core.c 2011-11-15 20:03:00.000000000 -0500
@@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_loc
*/
static atomic_t masters_in_kgdb;
@@ -62828,7 +62834,7 @@ diff -urNp linux-3.0.9/kernel/debug/debug_core.c linux-3.0.9/kernel/debug/debug_
EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
diff -urNp linux-3.0.9/kernel/debug/kdb/kdb_main.c linux-3.0.9/kernel/debug/kdb/kdb_main.c
--- linux-3.0.9/kernel/debug/kdb/kdb_main.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/debug/kdb/kdb_main.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/debug/kdb/kdb_main.c 2011-11-15 20:03:00.000000000 -0500
@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
list_for_each_entry(mod, kdb_modules, list) {
@@ -62849,7 +62855,7 @@ diff -urNp linux-3.0.9/kernel/debug/kdb/kdb_main.c linux-3.0.9/kernel/debug/kdb/
{
diff -urNp linux-3.0.9/kernel/events/core.c linux-3.0.9/kernel/events/core.c
--- linux-3.0.9/kernel/events/core.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/events/core.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/events/core.c 2011-11-15 20:03:00.000000000 -0500
@@ -170,7 +170,7 @@ int perf_proc_update_handler(struct ctl_
return 0;
}
@@ -62947,7 +62953,7 @@ diff -urNp linux-3.0.9/kernel/events/core.c linux-3.0.9/kernel/events/core.c
/*
diff -urNp linux-3.0.9/kernel/exit.c linux-3.0.9/kernel/exit.c
--- linux-3.0.9/kernel/exit.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/exit.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/exit.c 2011-11-15 20:03:00.000000000 -0500
@@ -57,6 +57,10 @@
#include <asm/pgtable.h>
#include <asm/mmu_context.h>
@@ -63063,7 +63069,7 @@ diff -urNp linux-3.0.9/kernel/exit.c linux-3.0.9/kernel/exit.c
if (group_dead)
diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
--- linux-3.0.9/kernel/fork.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/fork.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/fork.c 2011-11-15 20:03:00.000000000 -0500
@@ -286,7 +286,7 @@ static struct task_struct *dup_task_stru
*stackend = STACK_END_MAGIC; /* for overflow detection */
@@ -63363,7 +63369,7 @@ diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c
new_fs = fs;
diff -urNp linux-3.0.9/kernel/futex.c linux-3.0.9/kernel/futex.c
--- linux-3.0.9/kernel/futex.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/futex.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/futex.c 2011-11-15 20:03:00.000000000 -0500
@@ -54,6 +54,7 @@
#include <linux/mount.h>
#include <linux/pagemap.h>
@@ -63453,7 +63459,7 @@ diff -urNp linux-3.0.9/kernel/futex.c linux-3.0.9/kernel/futex.c
plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock);
diff -urNp linux-3.0.9/kernel/futex_compat.c linux-3.0.9/kernel/futex_compat.c
--- linux-3.0.9/kernel/futex_compat.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/futex_compat.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/futex_compat.c 2011-11-15 20:03:00.000000000 -0500
@@ -10,6 +10,7 @@
#include <linux/compat.h>
#include <linux/nsproxy.h>
@@ -63495,7 +63501,7 @@ diff -urNp linux-3.0.9/kernel/futex_compat.c linux-3.0.9/kernel/futex_compat.c
}
diff -urNp linux-3.0.9/kernel/gcov/base.c linux-3.0.9/kernel/gcov/base.c
--- linux-3.0.9/kernel/gcov/base.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/gcov/base.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/gcov/base.c 2011-11-15 20:03:00.000000000 -0500
@@ -102,11 +102,6 @@ void gcov_enable_events(void)
}
@@ -63519,7 +63525,7 @@ diff -urNp linux-3.0.9/kernel/gcov/base.c linux-3.0.9/kernel/gcov/base.c
else
diff -urNp linux-3.0.9/kernel/hrtimer.c linux-3.0.9/kernel/hrtimer.c
--- linux-3.0.9/kernel/hrtimer.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/hrtimer.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/hrtimer.c 2011-11-15 20:03:00.000000000 -0500
@@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
local_irq_restore(flags);
}
@@ -63531,7 +63537,7 @@ diff -urNp linux-3.0.9/kernel/hrtimer.c linux-3.0.9/kernel/hrtimer.c
}
diff -urNp linux-3.0.9/kernel/jump_label.c linux-3.0.9/kernel/jump_label.c
--- linux-3.0.9/kernel/jump_label.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/jump_label.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/jump_label.c 2011-11-15 20:03:00.000000000 -0500
@@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entr
size = (((unsigned long)stop - (unsigned long)start)
@@ -63557,7 +63563,7 @@ diff -urNp linux-3.0.9/kernel/jump_label.c linux-3.0.9/kernel/jump_label.c
static int
diff -urNp linux-3.0.9/kernel/kallsyms.c linux-3.0.9/kernel/kallsyms.c
--- linux-3.0.9/kernel/kallsyms.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/kallsyms.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/kallsyms.c 2011-11-15 20:03:00.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)
@@ -63662,7 +63668,7 @@ diff -urNp linux-3.0.9/kernel/kallsyms.c linux-3.0.9/kernel/kallsyms.c
reset_iter(iter, 0);
diff -urNp linux-3.0.9/kernel/kexec.c linux-3.0.9/kernel/kexec.c
--- linux-3.0.9/kernel/kexec.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/kexec.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/kexec.c 2011-11-15 20:03:00.000000000 -0500
@@ -1033,7 +1033,8 @@ asmlinkage long compat_sys_kexec_load(un
unsigned long flags)
{
@@ -63675,7 +63681,7 @@ diff -urNp linux-3.0.9/kernel/kexec.c linux-3.0.9/kernel/kexec.c
/* Don't allow clients that don't understand the native
diff -urNp linux-3.0.9/kernel/kmod.c linux-3.0.9/kernel/kmod.c
--- linux-3.0.9/kernel/kmod.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/kmod.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/kmod.c 2011-11-15 20:03:00.000000000 -0500
@@ -73,13 +73,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb
* If module auto-loading support is disabled then this function
* becomes a no-operation.
@@ -63783,7 +63789,7 @@ diff -urNp linux-3.0.9/kernel/kmod.c linux-3.0.9/kernel/kmod.c
* If ret is 0, either ____call_usermodehelper failed and the
diff -urNp linux-3.0.9/kernel/kprobes.c linux-3.0.9/kernel/kprobes.c
--- linux-3.0.9/kernel/kprobes.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/kprobes.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/kprobes.c 2011-11-15 20:03:00.000000000 -0500
@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_
* kernel image and loaded module images reside. This is required
* so x86_64 can correctly handle the %rip-relative fixups.
@@ -63822,7 +63828,7 @@ diff -urNp linux-3.0.9/kernel/kprobes.c linux-3.0.9/kernel/kprobes.c
preempt_disable();
diff -urNp linux-3.0.9/kernel/lockdep.c linux-3.0.9/kernel/lockdep.c
--- linux-3.0.9/kernel/lockdep.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/lockdep.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/lockdep.c 2011-11-15 20:03:00.000000000 -0500
@@ -583,6 +583,10 @@ static int static_obj(void *obj)
end = (unsigned long) &_end,
addr = (unsigned long) obj;
@@ -63853,7 +63859,7 @@ diff -urNp linux-3.0.9/kernel/lockdep.c linux-3.0.9/kernel/lockdep.c
if (class->name_version > 1)
diff -urNp linux-3.0.9/kernel/lockdep_proc.c linux-3.0.9/kernel/lockdep_proc.c
--- linux-3.0.9/kernel/lockdep_proc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/lockdep_proc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/lockdep_proc.c 2011-11-15 20:03:00.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)
@@ -63865,7 +63871,7 @@ diff -urNp linux-3.0.9/kernel/lockdep_proc.c linux-3.0.9/kernel/lockdep_proc.c
if (!name) {
diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
--- linux-3.0.9/kernel/module.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/module.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/module.c 2011-11-15 20:03:00.000000000 -0500
@@ -58,6 +58,7 @@
#include <linux/jump_label.h>
#include <linux/pfn.h>
@@ -64596,7 +64602,7 @@ diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c
return mod;
diff -urNp linux-3.0.9/kernel/mutex.c linux-3.0.9/kernel/mutex.c
--- linux-3.0.9/kernel/mutex.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/mutex.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/mutex.c 2011-11-15 20:03:00.000000000 -0500
@@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock,
spin_lock_mutex(&lock->wait_lock, flags);
@@ -64627,7 +64633,7 @@ diff -urNp linux-3.0.9/kernel/mutex.c linux-3.0.9/kernel/mutex.c
/* set it to 0 if there are no waiters left: */
diff -urNp linux-3.0.9/kernel/mutex-debug.c linux-3.0.9/kernel/mutex-debug.c
--- linux-3.0.9/kernel/mutex-debug.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/mutex-debug.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/mutex-debug.c 2011-11-15 20:03:00.000000000 -0500
@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
}
@@ -64658,7 +64664,7 @@ diff -urNp linux-3.0.9/kernel/mutex-debug.c linux-3.0.9/kernel/mutex-debug.c
waiter->task = NULL;
diff -urNp linux-3.0.9/kernel/mutex-debug.h linux-3.0.9/kernel/mutex-debug.h
--- linux-3.0.9/kernel/mutex-debug.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/mutex-debug.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/mutex-debug.h 2011-11-15 20:03:00.000000000 -0500
@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(stru
extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
extern void debug_mutex_add_waiter(struct mutex *lock,
@@ -64673,7 +64679,7 @@ diff -urNp linux-3.0.9/kernel/mutex-debug.h linux-3.0.9/kernel/mutex-debug.h
struct lock_class_key *key);
diff -urNp linux-3.0.9/kernel/padata.c linux-3.0.9/kernel/padata.c
--- linux-3.0.9/kernel/padata.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/padata.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/padata.c 2011-11-15 20:03:00.000000000 -0500
@@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_ins
padata->pd = pd;
padata->cb_cpu = cb_cpu;
@@ -64699,7 +64705,7 @@ diff -urNp linux-3.0.9/kernel/padata.c linux-3.0.9/kernel/padata.c
pd->pinst = pinst;
diff -urNp linux-3.0.9/kernel/panic.c linux-3.0.9/kernel/panic.c
--- linux-3.0.9/kernel/panic.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/panic.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/panic.c 2011-11-15 20:03:00.000000000 -0500
@@ -369,7 +369,7 @@ static void warn_slowpath_common(const c
const char *board;
@@ -64721,7 +64727,7 @@ diff -urNp linux-3.0.9/kernel/panic.c linux-3.0.9/kernel/panic.c
EXPORT_SYMBOL(__stack_chk_fail);
diff -urNp linux-3.0.9/kernel/pid.c linux-3.0.9/kernel/pid.c
--- linux-3.0.9/kernel/pid.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/pid.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/pid.c 2011-11-15 20:03:00.000000000 -0500
@@ -33,6 +33,7 @@
#include <linux/rculist.h>
#include <linux/bootmem.h>
@@ -64771,7 +64777,7 @@ diff -urNp linux-3.0.9/kernel/pid.c linux-3.0.9/kernel/pid.c
struct pid *pid;
diff -urNp linux-3.0.9/kernel/posix-cpu-timers.c linux-3.0.9/kernel/posix-cpu-timers.c
--- linux-3.0.9/kernel/posix-cpu-timers.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/posix-cpu-timers.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/posix-cpu-timers.c 2011-11-15 20:03:00.000000000 -0500
@@ -6,6 +6,7 @@
#include <linux/posix-timers.h>
#include <linux/errno.h>
@@ -64799,7 +64805,7 @@ diff -urNp linux-3.0.9/kernel/posix-cpu-timers.c linux-3.0.9/kernel/posix-cpu-ti
.timer_create = thread_cpu_timer_create,
diff -urNp linux-3.0.9/kernel/posix-timers.c linux-3.0.9/kernel/posix-timers.c
--- linux-3.0.9/kernel/posix-timers.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/posix-timers.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/posix-timers.c 2011-11-15 20:03:00.000000000 -0500
@@ -43,6 +43,7 @@
#include <linux/idr.h>
#include <linux/posix-clock.h>
@@ -64905,7 +64911,7 @@ diff -urNp linux-3.0.9/kernel/posix-timers.c linux-3.0.9/kernel/posix-timers.c
diff -urNp linux-3.0.9/kernel/power/poweroff.c linux-3.0.9/kernel/power/poweroff.c
--- linux-3.0.9/kernel/power/poweroff.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/power/poweroff.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/power/poweroff.c 2011-11-15 20:03:00.000000000 -0500
@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
.enable_mask = SYSRQ_ENABLE_BOOT,
};
@@ -64917,7 +64923,7 @@ diff -urNp linux-3.0.9/kernel/power/poweroff.c linux-3.0.9/kernel/power/poweroff
return 0;
diff -urNp linux-3.0.9/kernel/power/process.c linux-3.0.9/kernel/power/process.c
--- linux-3.0.9/kernel/power/process.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/power/process.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/power/process.c 2011-11-15 20:03:00.000000000 -0500
@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_
u64 elapsed_csecs64;
unsigned int elapsed_csecs;
@@ -64962,7 +64968,7 @@ diff -urNp linux-3.0.9/kernel/power/process.c linux-3.0.9/kernel/power/process.c
if (pm_wakeup_pending()) {
diff -urNp linux-3.0.9/kernel/printk.c linux-3.0.9/kernel/printk.c
--- linux-3.0.9/kernel/printk.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/printk.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/printk.c 2011-11-15 20:03:00.000000000 -0500
@@ -313,12 +313,17 @@ static int check_syslog_permissions(int
if (from_file && type != SYSLOG_ACTION_OPEN)
return 0;
@@ -64984,7 +64990,7 @@ diff -urNp linux-3.0.9/kernel/printk.c linux-3.0.9/kernel/printk.c
}
diff -urNp linux-3.0.9/kernel/profile.c linux-3.0.9/kernel/profile.c
--- linux-3.0.9/kernel/profile.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/profile.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/profile.c 2011-11-15 20:03:00.000000000 -0500
@@ -39,7 +39,7 @@ struct profile_hit {
/* Oprofile timer tick hook */
static int (*timer_hook)(struct pt_regs *) __read_mostly;
@@ -65044,7 +65050,7 @@ diff -urNp linux-3.0.9/kernel/profile.c linux-3.0.9/kernel/profile.c
diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
--- linux-3.0.9/kernel/ptrace.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/ptrace.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/ptrace.c 2011-11-15 20:03:00.000000000 -0500
@@ -132,7 +132,8 @@ int ptrace_check_attach(struct task_stru
return ret;
}
@@ -65218,7 +65224,7 @@ diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c
diff -urNp linux-3.0.9/kernel/rcutorture.c linux-3.0.9/kernel/rcutorture.c
--- linux-3.0.9/kernel/rcutorture.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/rcutorture.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/rcutorture.c 2011-11-15 20:03:00.000000000 -0500
@@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_
{ 0 };
static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
@@ -65381,7 +65387,7 @@ diff -urNp linux-3.0.9/kernel/rcutorture.c linux-3.0.9/kernel/rcutorture.c
per_cpu(rcu_torture_count, cpu)[i] = 0;
diff -urNp linux-3.0.9/kernel/rcutree.c linux-3.0.9/kernel/rcutree.c
--- linux-3.0.9/kernel/rcutree.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/rcutree.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/rcutree.c 2011-11-15 20:03:00.000000000 -0500
@@ -356,9 +356,9 @@ void rcu_enter_nohz(void)
}
/* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
@@ -65466,7 +65472,7 @@ diff -urNp linux-3.0.9/kernel/rcutree.c linux-3.0.9/kernel/rcutree.c
&__get_cpu_var(rcu_sched_data));
diff -urNp linux-3.0.9/kernel/rcutree.h linux-3.0.9/kernel/rcutree.h
--- linux-3.0.9/kernel/rcutree.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/rcutree.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/rcutree.h 2011-11-15 20:03:00.000000000 -0500
@@ -86,7 +86,7 @@
struct rcu_dynticks {
int dynticks_nesting; /* Track irq/process nesting level. */
@@ -65478,7 +65484,7 @@ diff -urNp linux-3.0.9/kernel/rcutree.h linux-3.0.9/kernel/rcutree.h
/* RCU's kthread states for tracing. */
diff -urNp linux-3.0.9/kernel/rcutree_plugin.h linux-3.0.9/kernel/rcutree_plugin.h
--- linux-3.0.9/kernel/rcutree_plugin.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/rcutree_plugin.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/rcutree_plugin.h 2011-11-15 20:03:00.000000000 -0500
@@ -822,7 +822,7 @@ void synchronize_rcu_expedited(void)
/* Clean up and exit. */
@@ -65543,7 +65549,7 @@ diff -urNp linux-3.0.9/kernel/rcutree_plugin.h linux-3.0.9/kernel/rcutree_plugin
}
diff -urNp linux-3.0.9/kernel/relay.c linux-3.0.9/kernel/relay.c
--- linux-3.0.9/kernel/relay.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/relay.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/relay.c 2011-11-15 20:03:00.000000000 -0500
@@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struc
};
ssize_t ret;
@@ -65555,7 +65561,7 @@ diff -urNp linux-3.0.9/kernel/relay.c linux-3.0.9/kernel/relay.c
if (splice_grow_spd(pipe, &spd))
diff -urNp linux-3.0.9/kernel/resource.c linux-3.0.9/kernel/resource.c
--- linux-3.0.9/kernel/resource.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/resource.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/resource.c 2011-11-15 20:03:00.000000000 -0500
@@ -141,8 +141,18 @@ static const struct file_operations proc
static int __init ioresources_init(void)
@@ -65577,7 +65583,7 @@ diff -urNp linux-3.0.9/kernel/resource.c linux-3.0.9/kernel/resource.c
__initcall(ioresources_init);
diff -urNp linux-3.0.9/kernel/rtmutex-tester.c linux-3.0.9/kernel/rtmutex-tester.c
--- linux-3.0.9/kernel/rtmutex-tester.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/rtmutex-tester.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/rtmutex-tester.c 2011-11-15 20:03:00.000000000 -0500
@@ -20,7 +20,7 @@
#define MAX_RT_TEST_MUTEXES 8
@@ -65670,7 +65676,7 @@ diff -urNp linux-3.0.9/kernel/rtmutex-tester.c linux-3.0.9/kernel/rtmutex-tester
default:
diff -urNp linux-3.0.9/kernel/sched_autogroup.c linux-3.0.9/kernel/sched_autogroup.c
--- linux-3.0.9/kernel/sched_autogroup.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/sched_autogroup.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/sched_autogroup.c 2011-11-15 20:03:00.000000000 -0500
@@ -7,7 +7,7 @@
unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
@@ -65691,7 +65697,7 @@ diff -urNp linux-3.0.9/kernel/sched_autogroup.c linux-3.0.9/kernel/sched_autogro
/*
diff -urNp linux-3.0.9/kernel/sched.c linux-3.0.9/kernel/sched.c
--- linux-3.0.9/kernel/sched.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/sched.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/sched.c 2011-11-15 20:03:00.000000000 -0500
@@ -4227,6 +4227,8 @@ static void __sched __schedule(void)
struct rq *rq;
int cpu;
@@ -65730,7 +65736,7 @@ diff -urNp linux-3.0.9/kernel/sched.c linux-3.0.9/kernel/sched.c
return -EPERM;
diff -urNp linux-3.0.9/kernel/sched_fair.c linux-3.0.9/kernel/sched_fair.c
--- linux-3.0.9/kernel/sched_fair.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/sched_fair.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/sched_fair.c 2011-11-15 20:03:00.000000000 -0500
@@ -4050,7 +4050,7 @@ static void nohz_idle_balance(int this_c
* run_rebalance_domains is triggered when needed from the scheduler tick.
* Also triggered for nohz idle balancing (with nohz_balancing_kick set).
@@ -65742,7 +65748,7 @@ diff -urNp linux-3.0.9/kernel/sched_fair.c linux-3.0.9/kernel/sched_fair.c
struct rq *this_rq = cpu_rq(this_cpu);
diff -urNp linux-3.0.9/kernel/signal.c linux-3.0.9/kernel/signal.c
--- linux-3.0.9/kernel/signal.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/signal.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/signal.c 2011-11-15 20:03:00.000000000 -0500
@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
int print_fatal_signals __read_mostly;
@@ -65877,7 +65883,7 @@ diff -urNp linux-3.0.9/kernel/signal.c linux-3.0.9/kernel/signal.c
/*
diff -urNp linux-3.0.9/kernel/smp.c linux-3.0.9/kernel/smp.c
--- linux-3.0.9/kernel/smp.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/smp.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/smp.c 2011-11-15 20:03:00.000000000 -0500
@@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t fu
}
EXPORT_SYMBOL(smp_call_function);
@@ -65907,7 +65913,7 @@ diff -urNp linux-3.0.9/kernel/smp.c linux-3.0.9/kernel/smp.c
}
diff -urNp linux-3.0.9/kernel/softirq.c linux-3.0.9/kernel/softirq.c
--- linux-3.0.9/kernel/softirq.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/softirq.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/softirq.c 2011-11-15 20:03:00.000000000 -0500
@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -65960,7 +65966,7 @@ diff -urNp linux-3.0.9/kernel/softirq.c linux-3.0.9/kernel/softirq.c
diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c
--- linux-3.0.9/kernel/sys.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/sys.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/sys.c 2011-11-15 20:03:00.000000000 -0500
@@ -158,6 +158,12 @@ static int set_one_prio(struct task_stru
error = -EACCES;
goto out;
@@ -66132,7 +66138,7 @@ diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c
}
diff -urNp linux-3.0.9/kernel/sysctl_binary.c linux-3.0.9/kernel/sysctl_binary.c
--- linux-3.0.9/kernel/sysctl_binary.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/sysctl_binary.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/sysctl_binary.c 2011-11-15 20:03:00.000000000 -0500
@@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *f
int i;
@@ -66198,7 +66204,7 @@ diff -urNp linux-3.0.9/kernel/sysctl_binary.c linux-3.0.9/kernel/sysctl_binary.c
goto out;
diff -urNp linux-3.0.9/kernel/sysctl.c linux-3.0.9/kernel/sysctl.c
--- linux-3.0.9/kernel/sysctl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/sysctl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/sysctl.c 2011-11-15 20:03:00.000000000 -0500
@@ -85,6 +85,13 @@
@@ -66390,7 +66396,7 @@ diff -urNp linux-3.0.9/kernel/sysctl.c linux-3.0.9/kernel/sysctl.c
EXPORT_SYMBOL(register_sysctl_table);
diff -urNp linux-3.0.9/kernel/sysctl_check.c linux-3.0.9/kernel/sysctl_check.c
--- linux-3.0.9/kernel/sysctl_check.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/sysctl_check.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/sysctl_check.c 2011-11-15 20:03:00.000000000 -0500
@@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *n
set_fail(&fail, table, "Directory with extra2");
} else {
@@ -66401,7 +66407,7 @@ diff -urNp linux-3.0.9/kernel/sysctl_check.c linux-3.0.9/kernel/sysctl_check.c
(table->proc_handler == proc_dointvec_jiffies) ||
diff -urNp linux-3.0.9/kernel/taskstats.c linux-3.0.9/kernel/taskstats.c
--- linux-3.0.9/kernel/taskstats.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/taskstats.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/taskstats.c 2011-11-15 20:03:00.000000000 -0500
@@ -27,9 +27,12 @@
#include <linux/cgroup.h>
#include <linux/fs.h>
@@ -66427,7 +66433,7 @@ diff -urNp linux-3.0.9/kernel/taskstats.c linux-3.0.9/kernel/taskstats.c
else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
diff -urNp linux-3.0.9/kernel/time/alarmtimer.c linux-3.0.9/kernel/time/alarmtimer.c
--- linux-3.0.9/kernel/time/alarmtimer.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/time/alarmtimer.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/time/alarmtimer.c 2011-11-15 20:03:00.000000000 -0500
@@ -693,7 +693,7 @@ static int __init alarmtimer_init(void)
{
int error = 0;
@@ -66439,7 +66445,7 @@ diff -urNp linux-3.0.9/kernel/time/alarmtimer.c linux-3.0.9/kernel/time/alarmtim
.timer_create = alarm_timer_create,
diff -urNp linux-3.0.9/kernel/time/tick-broadcast.c linux-3.0.9/kernel/time/tick-broadcast.c
--- linux-3.0.9/kernel/time/tick-broadcast.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/time/tick-broadcast.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/time/tick-broadcast.c 2011-11-15 20:03:00.000000000 -0500
@@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct cl
* then clear the broadcast bit.
*/
@@ -66451,7 +66457,7 @@ diff -urNp linux-3.0.9/kernel/time/tick-broadcast.c linux-3.0.9/kernel/time/tick
tick_broadcast_clear_oneshot(cpu);
diff -urNp linux-3.0.9/kernel/time/timekeeping.c linux-3.0.9/kernel/time/timekeeping.c
--- linux-3.0.9/kernel/time/timekeeping.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/time/timekeeping.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/time/timekeeping.c 2011-11-15 20:03:00.000000000 -0500
@@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/mm.h>
@@ -66471,7 +66477,7 @@ diff -urNp linux-3.0.9/kernel/time/timekeeping.c linux-3.0.9/kernel/time/timekee
timekeeping_forward_now();
diff -urNp linux-3.0.9/kernel/time/timer_list.c linux-3.0.9/kernel/time/timer_list.c
--- linux-3.0.9/kernel/time/timer_list.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/time/timer_list.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/time/timer_list.c 2011-11-15 20:03:00.000000000 -0500
@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
static void print_name_offset(struct seq_file *m, void *sym)
@@ -66515,7 +66521,7 @@ diff -urNp linux-3.0.9/kernel/time/timer_list.c linux-3.0.9/kernel/time/timer_li
return 0;
diff -urNp linux-3.0.9/kernel/time/timer_stats.c linux-3.0.9/kernel/time/timer_stats.c
--- linux-3.0.9/kernel/time/timer_stats.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/time/timer_stats.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/time/timer_stats.c 2011-11-15 20:03:00.000000000 -0500
@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
static unsigned long nr_entries;
static struct entry entries[MAX_ENTRIES];
@@ -66586,7 +66592,7 @@ diff -urNp linux-3.0.9/kernel/time/timer_stats.c linux-3.0.9/kernel/time/timer_s
return 0;
diff -urNp linux-3.0.9/kernel/time.c linux-3.0.9/kernel/time.c
--- linux-3.0.9/kernel/time.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/time.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/time.c 2011-11-15 20:03:00.000000000 -0500
@@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct tim
return error;
@@ -66601,7 +66607,7 @@ diff -urNp linux-3.0.9/kernel/time.c linux-3.0.9/kernel/time.c
update_vsyscall_tz();
diff -urNp linux-3.0.9/kernel/timer.c linux-3.0.9/kernel/timer.c
--- linux-3.0.9/kernel/timer.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/timer.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/timer.c 2011-11-15 20:03:00.000000000 -0500
@@ -1304,7 +1304,7 @@ void update_process_times(int user_tick)
/*
* This function runs timers and the timer-tq in bottom half context.
@@ -66613,7 +66619,7 @@ diff -urNp linux-3.0.9/kernel/timer.c linux-3.0.9/kernel/timer.c
diff -urNp linux-3.0.9/kernel/trace/blktrace.c linux-3.0.9/kernel/trace/blktrace.c
--- linux-3.0.9/kernel/trace/blktrace.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/blktrace.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/trace/blktrace.c 2011-11-15 20:03:00.000000000 -0500
@@ -321,7 +321,7 @@ static ssize_t blk_dropped_read(struct f
struct blk_trace *bt = filp->private_data;
char buf[16];
@@ -66643,7 +66649,7 @@ diff -urNp linux-3.0.9/kernel/trace/blktrace.c linux-3.0.9/kernel/trace/blktrace
bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
diff -urNp linux-3.0.9/kernel/trace/ftrace.c linux-3.0.9/kernel/trace/ftrace.c
--- linux-3.0.9/kernel/trace/ftrace.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/ftrace.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/trace/ftrace.c 2011-11-15 20:03:00.000000000 -0500
@@ -1566,12 +1566,17 @@ ftrace_code_disable(struct module *mod,
if (unlikely(ftrace_disabled))
return 0;
@@ -66675,7 +66681,7 @@ diff -urNp linux-3.0.9/kernel/trace/ftrace.c linux-3.0.9/kernel/trace/ftrace.c
struct ftrace_page *pg;
diff -urNp linux-3.0.9/kernel/trace/trace.c linux-3.0.9/kernel/trace/trace.c
--- linux-3.0.9/kernel/trace/trace.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/trace.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/trace/trace.c 2011-11-15 20:03:00.000000000 -0500
@@ -3339,6 +3339,8 @@ static ssize_t tracing_splice_read_pipe(
size_t rem;
unsigned int i;
@@ -66720,7 +66726,7 @@ diff -urNp linux-3.0.9/kernel/trace/trace.c linux-3.0.9/kernel/trace/trace.c
diff -urNp linux-3.0.9/kernel/trace/trace_events.c linux-3.0.9/kernel/trace/trace_events.c
--- linux-3.0.9/kernel/trace/trace_events.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/trace_events.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/trace/trace_events.c 2011-11-15 20:03:00.000000000 -0500
@@ -1318,10 +1318,6 @@ static LIST_HEAD(ftrace_module_file_list
struct ftrace_module_file_ops {
struct list_head list;
@@ -66769,7 +66775,7 @@ diff -urNp linux-3.0.9/kernel/trace/trace_events.c linux-3.0.9/kernel/trace/trac
diff -urNp linux-3.0.9/kernel/trace/trace_kprobe.c linux-3.0.9/kernel/trace/trace_kprobe.c
--- linux-3.0.9/kernel/trace/trace_kprobe.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/trace_kprobe.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/trace/trace_kprobe.c 2011-11-15 20:03:00.000000000 -0500
@@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(me
long ret;
int maxlen = get_rloc_len(*(u32 *)dest);
@@ -66808,7 +66814,7 @@ diff -urNp linux-3.0.9/kernel/trace/trace_kprobe.c linux-3.0.9/kernel/trace/trac
pagefault_enable();
diff -urNp linux-3.0.9/kernel/trace/trace_mmiotrace.c linux-3.0.9/kernel/trace/trace_mmiotrace.c
--- linux-3.0.9/kernel/trace/trace_mmiotrace.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/trace_mmiotrace.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/trace/trace_mmiotrace.c 2011-11-15 20:03:00.000000000 -0500
@@ -24,7 +24,7 @@ struct header_iter {
static struct trace_array *mmio_trace_array;
static bool overrun_detected;
@@ -66847,7 +66853,7 @@ diff -urNp linux-3.0.9/kernel/trace/trace_mmiotrace.c linux-3.0.9/kernel/trace/t
entry = ring_buffer_event_data(event);
diff -urNp linux-3.0.9/kernel/trace/trace_output.c linux-3.0.9/kernel/trace/trace_output.c
--- linux-3.0.9/kernel/trace/trace_output.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/trace_output.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/trace/trace_output.c 2011-11-15 20:03:00.000000000 -0500
@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s,
p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -66859,7 +66865,7 @@ diff -urNp linux-3.0.9/kernel/trace/trace_output.c linux-3.0.9/kernel/trace/trac
return 1;
diff -urNp linux-3.0.9/kernel/trace/trace_stack.c linux-3.0.9/kernel/trace/trace_stack.c
--- linux-3.0.9/kernel/trace/trace_stack.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/trace_stack.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/trace/trace_stack.c 2011-11-15 20:03:00.000000000 -0500
@@ -50,7 +50,7 @@ static inline void check_stack(void)
return;
@@ -66871,7 +66877,7 @@ diff -urNp linux-3.0.9/kernel/trace/trace_stack.c linux-3.0.9/kernel/trace/trace
local_irq_save(flags);
diff -urNp linux-3.0.9/kernel/trace/trace_workqueue.c linux-3.0.9/kernel/trace/trace_workqueue.c
--- linux-3.0.9/kernel/trace/trace_workqueue.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/kernel/trace/trace_workqueue.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/kernel/trace/trace_workqueue.c 2011-11-15 20:03:00.000000000 -0500
@@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
int cpu;
pid_t pid;
@@ -66901,7 +66907,7 @@ diff -urNp linux-3.0.9/kernel/trace/trace_workqueue.c linux-3.0.9/kernel/trace/t
}
diff -urNp linux-3.0.9/lib/bitmap.c linux-3.0.9/lib/bitmap.c
--- linux-3.0.9/lib/bitmap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/bitmap.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/lib/bitmap.c 2011-11-15 20:03:00.000000000 -0500
@@ -421,7 +421,7 @@ int __bitmap_parse(const char *buf, unsi
{
int c, old_c, totaldigits, ndigits, nchunks, nbits;
@@ -66940,7 +66946,7 @@ diff -urNp linux-3.0.9/lib/bitmap.c linux-3.0.9/lib/bitmap.c
EXPORT_SYMBOL(bitmap_parselist_user);
diff -urNp linux-3.0.9/lib/bug.c linux-3.0.9/lib/bug.c
--- linux-3.0.9/lib/bug.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/bug.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/lib/bug.c 2011-11-15 20:03:00.000000000 -0500
@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
return BUG_TRAP_TYPE_NONE;
@@ -66952,7 +66958,7 @@ diff -urNp linux-3.0.9/lib/bug.c linux-3.0.9/lib/bug.c
line = 0;
diff -urNp linux-3.0.9/lib/debugobjects.c linux-3.0.9/lib/debugobjects.c
--- linux-3.0.9/lib/debugobjects.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/debugobjects.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/lib/debugobjects.c 2011-11-15 20:03:00.000000000 -0500
@@ -284,7 +284,7 @@ static void debug_object_is_on_stack(voi
if (limit > 4)
return;
@@ -66964,7 +66970,7 @@ diff -urNp linux-3.0.9/lib/debugobjects.c linux-3.0.9/lib/debugobjects.c
diff -urNp linux-3.0.9/lib/devres.c linux-3.0.9/lib/devres.c
--- linux-3.0.9/lib/devres.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/devres.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/lib/devres.c 2011-11-15 20:03:00.000000000 -0500
@@ -81,7 +81,7 @@ void devm_iounmap(struct device *dev, vo
{
iounmap(addr);
@@ -66985,7 +66991,7 @@ diff -urNp linux-3.0.9/lib/devres.c linux-3.0.9/lib/devres.c
diff -urNp linux-3.0.9/lib/dma-debug.c linux-3.0.9/lib/dma-debug.c
--- linux-3.0.9/lib/dma-debug.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/dma-debug.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/lib/dma-debug.c 2011-11-15 20:03:00.000000000 -0500
@@ -870,7 +870,7 @@ out:
static void check_for_stack(struct device *dev, void *addr)
@@ -66997,7 +67003,7 @@ diff -urNp linux-3.0.9/lib/dma-debug.c linux-3.0.9/lib/dma-debug.c
}
diff -urNp linux-3.0.9/lib/extable.c linux-3.0.9/lib/extable.c
--- linux-3.0.9/lib/extable.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/extable.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/lib/extable.c 2011-11-15 20:03:00.000000000 -0500
@@ -13,6 +13,7 @@
#include <linux/init.h>
#include <linux/sort.h>
@@ -67019,7 +67025,7 @@ diff -urNp linux-3.0.9/lib/extable.c linux-3.0.9/lib/extable.c
#ifdef CONFIG_MODULES
diff -urNp linux-3.0.9/lib/inflate.c linux-3.0.9/lib/inflate.c
--- linux-3.0.9/lib/inflate.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/inflate.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/lib/inflate.c 2011-11-15 20:03:00.000000000 -0500
@@ -269,7 +269,7 @@ static void free(void *where)
malloc_ptr = free_mem_ptr;
}
@@ -67031,7 +67037,7 @@ diff -urNp linux-3.0.9/lib/inflate.c linux-3.0.9/lib/inflate.c
diff -urNp linux-3.0.9/lib/Kconfig.debug linux-3.0.9/lib/Kconfig.debug
--- linux-3.0.9/lib/Kconfig.debug 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/Kconfig.debug 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/lib/Kconfig.debug 2011-11-15 20:03:00.000000000 -0500
@@ -1088,6 +1088,7 @@ config LATENCYTOP
depends on DEBUG_KERNEL
depends on STACKTRACE_SUPPORT
@@ -67042,7 +67048,7 @@ diff -urNp linux-3.0.9/lib/Kconfig.debug linux-3.0.9/lib/Kconfig.debug
select KALLSYMS_ALL
diff -urNp linux-3.0.9/lib/kref.c linux-3.0.9/lib/kref.c
--- linux-3.0.9/lib/kref.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/kref.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/lib/kref.c 2011-11-15 20:03:00.000000000 -0500
@@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
*/
int kref_put(struct kref *kref, void (*release)(struct kref *kref))
@@ -67054,7 +67060,7 @@ diff -urNp linux-3.0.9/lib/kref.c linux-3.0.9/lib/kref.c
if (atomic_dec_and_test(&kref->refcount)) {
diff -urNp linux-3.0.9/lib/radix-tree.c linux-3.0.9/lib/radix-tree.c
--- linux-3.0.9/lib/radix-tree.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/radix-tree.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/lib/radix-tree.c 2011-11-15 20:03:00.000000000 -0500
@@ -80,7 +80,7 @@ struct radix_tree_preload {
int nr;
struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -67066,7 +67072,7 @@ diff -urNp linux-3.0.9/lib/radix-tree.c linux-3.0.9/lib/radix-tree.c
{
diff -urNp linux-3.0.9/lib/vsprintf.c linux-3.0.9/lib/vsprintf.c
--- linux-3.0.9/lib/vsprintf.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/lib/vsprintf.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/lib/vsprintf.c 2011-11-15 20:03:00.000000000 -0500
@@ -16,6 +16,9 @@
* - scnprintf and vscnprintf
*/
@@ -67162,12 +67168,12 @@ diff -urNp linux-3.0.9/lib/vsprintf.c linux-3.0.9/lib/vsprintf.c
diff -urNp linux-3.0.9/localversion-grsec linux-3.0.9/localversion-grsec
--- linux-3.0.9/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/localversion-grsec 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/localversion-grsec 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1 @@
+-grsec
diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile
--- linux-3.0.9/Makefile 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/Makefile 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/Makefile 2011-11-15 20:03:00.000000000 -0500
@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
HOSTCC = gcc
@@ -67351,7 +67357,7 @@ diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile
$(build)=$(build-dir) $(@:.ko=.o)
diff -urNp linux-3.0.9/mm/filemap.c linux-3.0.9/mm/filemap.c
--- linux-3.0.9/mm/filemap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/filemap.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/filemap.c 2011-11-15 20:03:00.000000000 -0500
@@ -1763,7 +1763,7 @@ int generic_file_mmap(struct file * file
struct address_space *mapping = file->f_mapping;
@@ -67371,7 +67377,7 @@ diff -urNp linux-3.0.9/mm/filemap.c linux-3.0.9/mm/filemap.c
return -EFBIG;
diff -urNp linux-3.0.9/mm/fremap.c linux-3.0.9/mm/fremap.c
--- linux-3.0.9/mm/fremap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/fremap.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/fremap.c 2011-11-15 20:03:00.000000000 -0500
@@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
retry:
vma = find_vma(mm, start);
@@ -67386,7 +67392,7 @@ diff -urNp linux-3.0.9/mm/fremap.c linux-3.0.9/mm/fremap.c
* and that the remapped range is valid and fully within
diff -urNp linux-3.0.9/mm/highmem.c linux-3.0.9/mm/highmem.c
--- linux-3.0.9/mm/highmem.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/highmem.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/highmem.c 2011-11-15 20:03:00.000000000 -0500
@@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
* So no dangers, even with speculative execution.
*/
@@ -67414,7 +67420,7 @@ diff -urNp linux-3.0.9/mm/highmem.c linux-3.0.9/mm/highmem.c
diff -urNp linux-3.0.9/mm/huge_memory.c linux-3.0.9/mm/huge_memory.c
--- linux-3.0.9/mm/huge_memory.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/huge_memory.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/huge_memory.c 2011-11-15 20:03:00.000000000 -0500
@@ -702,7 +702,7 @@ out:
* run pte_offset_map on the pmd, if an huge pmd could
* materialize from under us from a different thread.
@@ -67426,7 +67432,7 @@ diff -urNp linux-3.0.9/mm/huge_memory.c linux-3.0.9/mm/huge_memory.c
if (unlikely(pmd_trans_huge(*pmd)))
diff -urNp linux-3.0.9/mm/hugetlb.c linux-3.0.9/mm/hugetlb.c
--- linux-3.0.9/mm/hugetlb.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/hugetlb.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/hugetlb.c 2011-11-15 20:03:00.000000000 -0500
@@ -2339,6 +2339,27 @@ static int unmap_ref_private(struct mm_s
return 1;
}
@@ -67518,7 +67524,7 @@ diff -urNp linux-3.0.9/mm/hugetlb.c linux-3.0.9/mm/hugetlb.c
return VM_FAULT_OOM;
diff -urNp linux-3.0.9/mm/internal.h linux-3.0.9/mm/internal.h
--- linux-3.0.9/mm/internal.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/internal.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/internal.h 2011-11-15 20:03:00.000000000 -0500
@@ -95,6 +95,7 @@ extern void putback_lru_page(struct page
* in mm/page_alloc.c
*/
@@ -67529,7 +67535,7 @@ diff -urNp linux-3.0.9/mm/internal.h linux-3.0.9/mm/internal.h
extern bool is_free_buddy_page(struct page *page);
diff -urNp linux-3.0.9/mm/Kconfig linux-3.0.9/mm/Kconfig
--- linux-3.0.9/mm/Kconfig 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/Kconfig 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/Kconfig 2011-11-15 20:03:00.000000000 -0500
@@ -240,7 +240,7 @@ config KSM
config DEFAULT_MMAP_MIN_ADDR
int "Low address space to protect from user allocation"
@@ -67541,7 +67547,7 @@ diff -urNp linux-3.0.9/mm/Kconfig linux-3.0.9/mm/Kconfig
from userspace allocation. Keeping a user from writing to low pages
diff -urNp linux-3.0.9/mm/kmemleak.c linux-3.0.9/mm/kmemleak.c
--- linux-3.0.9/mm/kmemleak.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/kmemleak.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/kmemleak.c 2011-11-15 20:03:00.000000000 -0500
@@ -357,7 +357,7 @@ static void print_unreferenced(struct se
for (i = 0; i < object->trace_len; i++) {
@@ -67553,7 +67559,7 @@ diff -urNp linux-3.0.9/mm/kmemleak.c linux-3.0.9/mm/kmemleak.c
diff -urNp linux-3.0.9/mm/maccess.c linux-3.0.9/mm/maccess.c
--- linux-3.0.9/mm/maccess.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/maccess.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/maccess.c 2011-11-15 20:03:00.000000000 -0500
@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, cons
set_fs(KERNEL_DS);
pagefault_disable();
@@ -67574,7 +67580,7 @@ diff -urNp linux-3.0.9/mm/maccess.c linux-3.0.9/mm/maccess.c
diff -urNp linux-3.0.9/mm/madvise.c linux-3.0.9/mm/madvise.c
--- linux-3.0.9/mm/madvise.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/madvise.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/madvise.c 2011-11-15 20:03:00.000000000 -0500
@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
pgoff_t pgoff;
unsigned long new_flags = vma->vm_flags;
@@ -67653,7 +67659,7 @@ diff -urNp linux-3.0.9/mm/madvise.c linux-3.0.9/mm/madvise.c
goto out;
diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
--- linux-3.0.9/mm/memory.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/memory.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/memory.c 2011-11-15 20:03:00.000000000 -0500
@@ -457,8 +457,12 @@ static inline void free_pmd_range(struct
return;
@@ -68219,7 +68225,7 @@ diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c
* Dumping its contents makes post-mortem fully interpretable later
diff -urNp linux-3.0.9/mm/memory-failure.c linux-3.0.9/mm/memory-failure.c
--- linux-3.0.9/mm/memory-failure.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/memory-failure.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/memory-failure.c 2011-11-15 20:03:00.000000000 -0500
@@ -59,7 +59,7 @@ int sysctl_memory_failure_early_kill __r
int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -68303,7 +68309,7 @@ diff -urNp linux-3.0.9/mm/memory-failure.c linux-3.0.9/mm/memory-failure.c
return ret;
diff -urNp linux-3.0.9/mm/mempolicy.c linux-3.0.9/mm/mempolicy.c
--- linux-3.0.9/mm/mempolicy.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/mempolicy.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/mempolicy.c 2011-11-15 20:03:00.000000000 -0500
@@ -639,6 +639,10 @@ static int mbind_range(struct mm_struct
unsigned long vmstart;
unsigned long vmend;
@@ -68377,7 +68383,7 @@ diff -urNp linux-3.0.9/mm/mempolicy.c linux-3.0.9/mm/mempolicy.c
goto out;
diff -urNp linux-3.0.9/mm/migrate.c linux-3.0.9/mm/migrate.c
--- linux-3.0.9/mm/migrate.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/migrate.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/migrate.c 2011-11-15 20:03:00.000000000 -0500
@@ -1124,6 +1124,8 @@ static int do_pages_move(struct mm_struc
unsigned long chunk_start;
int err;
@@ -68414,7 +68420,7 @@ diff -urNp linux-3.0.9/mm/migrate.c linux-3.0.9/mm/migrate.c
goto out;
diff -urNp linux-3.0.9/mm/mlock.c linux-3.0.9/mm/mlock.c
--- linux-3.0.9/mm/mlock.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/mlock.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/mlock.c 2011-11-15 20:03:00.000000000 -0500
@@ -13,6 +13,7 @@
#include <linux/pagemap.h>
#include <linux/mempolicy.h>
@@ -68490,7 +68496,7 @@ diff -urNp linux-3.0.9/mm/mlock.c linux-3.0.9/mm/mlock.c
ret = do_mlockall(flags);
diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
--- linux-3.0.9/mm/mmap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/mmap.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/mmap.c 2011-11-15 20:03:00.000000000 -0500
@@ -46,6 +46,16 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
@@ -69751,7 +69757,7 @@ diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c
diff -urNp linux-3.0.9/mm/mprotect.c linux-3.0.9/mm/mprotect.c
--- linux-3.0.9/mm/mprotect.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/mprotect.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/mprotect.c 2011-11-15 20:03:00.000000000 -0500
@@ -23,10 +23,16 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
@@ -69980,7 +69986,7 @@ diff -urNp linux-3.0.9/mm/mprotect.c linux-3.0.9/mm/mprotect.c
if (nstart < prev->vm_end)
diff -urNp linux-3.0.9/mm/mremap.c linux-3.0.9/mm/mremap.c
--- linux-3.0.9/mm/mremap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/mremap.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/mremap.c 2011-11-15 20:03:00.000000000 -0500
@@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str
continue;
pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -70087,7 +70093,7 @@ diff -urNp linux-3.0.9/mm/mremap.c linux-3.0.9/mm/mremap.c
if (ret & ~PAGE_MASK)
diff -urNp linux-3.0.9/mm/nobootmem.c linux-3.0.9/mm/nobootmem.c
--- linux-3.0.9/mm/nobootmem.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/nobootmem.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/nobootmem.c 2011-11-15 20:03:00.000000000 -0500
@@ -110,19 +110,30 @@ static void __init __free_pages_memory(u
unsigned long __init free_all_memory_core_early(int nodeid)
{
@@ -70123,7 +70129,7 @@ diff -urNp linux-3.0.9/mm/nobootmem.c linux-3.0.9/mm/nobootmem.c
}
diff -urNp linux-3.0.9/mm/nommu.c linux-3.0.9/mm/nommu.c
--- linux-3.0.9/mm/nommu.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/nommu.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/nommu.c 2011-11-15 20:03:00.000000000 -0500
@@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI
int sysctl_overcommit_ratio = 50; /* default is 50% */
int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
@@ -70158,7 +70164,7 @@ diff -urNp linux-3.0.9/mm/nommu.c linux-3.0.9/mm/nommu.c
diff -urNp linux-3.0.9/mm/page_alloc.c linux-3.0.9/mm/page_alloc.c
--- linux-3.0.9/mm/page_alloc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/page_alloc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/page_alloc.c 2011-11-15 20:03:00.000000000 -0500
@@ -340,7 +340,7 @@ out:
* This usage means that zero-order pages may not be compound.
*/
@@ -70228,7 +70234,7 @@ diff -urNp linux-3.0.9/mm/page_alloc.c linux-3.0.9/mm/page_alloc.c
return 0;
diff -urNp linux-3.0.9/mm/percpu.c linux-3.0.9/mm/percpu.c
--- linux-3.0.9/mm/percpu.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/percpu.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/percpu.c 2011-11-15 20:03:00.000000000 -0500
@@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu
static unsigned int pcpu_last_unit_cpu __read_mostly;
@@ -70240,7 +70246,7 @@ diff -urNp linux-3.0.9/mm/percpu.c linux-3.0.9/mm/percpu.c
static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
diff -urNp linux-3.0.9/mm/rmap.c linux-3.0.9/mm/rmap.c
--- linux-3.0.9/mm/rmap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/rmap.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/rmap.c 2011-11-15 20:03:00.000000000 -0500
@@ -153,6 +153,10 @@ int anon_vma_prepare(struct vm_area_stru
struct anon_vma *anon_vma = vma->anon_vma;
struct anon_vma_chain *avc;
@@ -70332,7 +70338,7 @@ diff -urNp linux-3.0.9/mm/rmap.c linux-3.0.9/mm/rmap.c
struct anon_vma *anon_vma;
diff -urNp linux-3.0.9/mm/shmem.c linux-3.0.9/mm/shmem.c
--- linux-3.0.9/mm/shmem.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/shmem.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/shmem.c 2011-11-15 20:03:00.000000000 -0500
@@ -31,7 +31,7 @@
#include <linux/percpu_counter.h>
#include <linux/swap.h>
@@ -70372,7 +70378,7 @@ diff -urNp linux-3.0.9/mm/shmem.c linux-3.0.9/mm/shmem.c
diff -urNp linux-3.0.9/mm/slab.c linux-3.0.9/mm/slab.c
--- linux-3.0.9/mm/slab.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/slab.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/slab.c 2011-11-15 20:03:00.000000000 -0500
@@ -151,7 +151,7 @@
/* Legal flag mask for kmem_cache_create(). */
@@ -70546,7 +70552,7 @@ diff -urNp linux-3.0.9/mm/slab.c linux-3.0.9/mm/slab.c
* @objp: Pointer to the object
diff -urNp linux-3.0.9/mm/slob.c linux-3.0.9/mm/slob.c
--- linux-3.0.9/mm/slob.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/slob.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/slob.c 2011-11-15 20:03:00.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
@@ -70897,7 +70903,7 @@ diff -urNp linux-3.0.9/mm/slob.c linux-3.0.9/mm/slob.c
diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
--- linux-3.0.9/mm/slub.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/slub.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/slub.c 2011-11-15 20:03:00.000000000 -0500
@@ -200,7 +200,7 @@ struct track {
enum track_item { TRACK_ALLOC, TRACK_FREE };
@@ -71139,7 +71145,7 @@ diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c
module_init(slab_proc_init);
diff -urNp linux-3.0.9/mm/swap.c linux-3.0.9/mm/swap.c
--- linux-3.0.9/mm/swap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/swap.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/swap.c 2011-11-15 20:03:00.000000000 -0500
@@ -31,6 +31,7 @@
#include <linux/backing-dev.h>
#include <linux/memcontrol.h>
@@ -71159,7 +71165,7 @@ diff -urNp linux-3.0.9/mm/swap.c linux-3.0.9/mm/swap.c
diff -urNp linux-3.0.9/mm/swapfile.c linux-3.0.9/mm/swapfile.c
--- linux-3.0.9/mm/swapfile.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/swapfile.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/swapfile.c 2011-11-15 20:03:00.000000000 -0500
@@ -62,7 +62,7 @@ static DEFINE_MUTEX(swapon_mutex);
static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
@@ -71209,7 +71215,7 @@ diff -urNp linux-3.0.9/mm/swapfile.c linux-3.0.9/mm/swapfile.c
if (S_ISREG(inode->i_mode))
diff -urNp linux-3.0.9/mm/util.c linux-3.0.9/mm/util.c
--- linux-3.0.9/mm/util.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/util.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/util.c 2011-11-15 20:03:00.000000000 -0500
@@ -114,6 +114,7 @@ EXPORT_SYMBOL(memdup_user);
* allocated buffer. Use this if you don't want to free the buffer immediately
* like, for example, with RCU.
@@ -71241,7 +71247,7 @@ diff -urNp linux-3.0.9/mm/util.c linux-3.0.9/mm/util.c
}
diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
--- linux-3.0.9/mm/vmalloc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/vmalloc.c 2011-11-12 13:03:49.000000000 -0500
++++ linux-3.0.9/mm/vmalloc.c 2011-11-15 20:03:00.000000000 -0500
@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
pte = pte_offset_kernel(pmd, addr);
@@ -71476,7 +71482,7 @@ diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c
diff -urNp linux-3.0.9/mm/vmstat.c linux-3.0.9/mm/vmstat.c
--- linux-3.0.9/mm/vmstat.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/vmstat.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/mm/vmstat.c 2011-11-15 20:03:00.000000000 -0500
@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
*
* vm_stat contains the global counters
@@ -71531,7 +71537,7 @@ diff -urNp linux-3.0.9/mm/vmstat.c linux-3.0.9/mm/vmstat.c
}
diff -urNp linux-3.0.9/net/8021q/vlan.c linux-3.0.9/net/8021q/vlan.c
--- linux-3.0.9/net/8021q/vlan.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/8021q/vlan.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/8021q/vlan.c 2011-11-15 20:03:00.000000000 -0500
@@ -591,8 +591,7 @@ static int vlan_ioctl_handler(struct net
err = -EPERM;
if (!capable(CAP_NET_ADMIN))
@@ -71544,7 +71550,7 @@ diff -urNp linux-3.0.9/net/8021q/vlan.c linux-3.0.9/net/8021q/vlan.c
vn = net_generic(net, vlan_net_id);
diff -urNp linux-3.0.9/net/9p/trans_fd.c linux-3.0.9/net/9p/trans_fd.c
--- linux-3.0.9/net/9p/trans_fd.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/9p/trans_fd.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/9p/trans_fd.c 2011-11-15 20:03:00.000000000 -0500
@@ -423,7 +423,7 @@ static int p9_fd_write(struct p9_client
oldfs = get_fs();
set_fs(get_ds());
@@ -71556,7 +71562,7 @@ diff -urNp linux-3.0.9/net/9p/trans_fd.c linux-3.0.9/net/9p/trans_fd.c
if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
diff -urNp linux-3.0.9/net/9p/trans_virtio.c linux-3.0.9/net/9p/trans_virtio.c
--- linux-3.0.9/net/9p/trans_virtio.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/9p/trans_virtio.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/9p/trans_virtio.c 2011-11-15 20:03:00.000000000 -0500
@@ -327,7 +327,7 @@ req_retry_pinned:
} else {
char *pbuf;
@@ -71577,7 +71583,7 @@ diff -urNp linux-3.0.9/net/9p/trans_virtio.c linux-3.0.9/net/9p/trans_virtio.c
diff -urNp linux-3.0.9/net/atm/atm_misc.c linux-3.0.9/net/atm/atm_misc.c
--- linux-3.0.9/net/atm/atm_misc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/atm/atm_misc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/atm/atm_misc.c 2011-11-15 20:03:00.000000000 -0500
@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int
if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
return 1;
@@ -71616,7 +71622,7 @@ diff -urNp linux-3.0.9/net/atm/atm_misc.c linux-3.0.9/net/atm/atm_misc.c
}
diff -urNp linux-3.0.9/net/atm/lec.h linux-3.0.9/net/atm/lec.h
--- linux-3.0.9/net/atm/lec.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/atm/lec.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/atm/lec.h 2011-11-15 20:03:00.000000000 -0500
@@ -48,7 +48,7 @@ struct lane2_ops {
const u8 *tlvs, u32 sizeoftlvs);
void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
@@ -71628,7 +71634,7 @@ diff -urNp linux-3.0.9/net/atm/lec.h linux-3.0.9/net/atm/lec.h
* ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
diff -urNp linux-3.0.9/net/atm/mpc.h linux-3.0.9/net/atm/mpc.h
--- linux-3.0.9/net/atm/mpc.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/atm/mpc.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/atm/mpc.h 2011-11-15 20:03:00.000000000 -0500
@@ -33,7 +33,7 @@ struct mpoa_client {
struct mpc_parameters parameters; /* parameters for this client */
@@ -71640,7 +71646,7 @@ diff -urNp linux-3.0.9/net/atm/mpc.h linux-3.0.9/net/atm/mpc.h
diff -urNp linux-3.0.9/net/atm/mpoa_caches.c linux-3.0.9/net/atm/mpoa_caches.c
--- linux-3.0.9/net/atm/mpoa_caches.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/atm/mpoa_caches.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/atm/mpoa_caches.c 2011-11-15 20:03:00.000000000 -0500
@@ -255,6 +255,8 @@ static void check_resolving_entries(stru
struct timeval now;
struct k_message msg;
@@ -71652,7 +71658,7 @@ diff -urNp linux-3.0.9/net/atm/mpoa_caches.c linux-3.0.9/net/atm/mpoa_caches.c
read_lock_bh(&client->ingress_lock);
diff -urNp linux-3.0.9/net/atm/proc.c linux-3.0.9/net/atm/proc.c
--- linux-3.0.9/net/atm/proc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/atm/proc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/atm/proc.c 2011-11-15 20:03:00.000000000 -0500
@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
const struct k_atm_aal_stats *stats)
{
@@ -71668,7 +71674,7 @@ diff -urNp linux-3.0.9/net/atm/proc.c linux-3.0.9/net/atm/proc.c
static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
diff -urNp linux-3.0.9/net/atm/resources.c linux-3.0.9/net/atm/resources.c
--- linux-3.0.9/net/atm/resources.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/atm/resources.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/atm/resources.c 2011-11-15 20:03:00.000000000 -0500
@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
static void copy_aal_stats(struct k_atm_aal_stats *from,
struct atm_aal_stats *to)
@@ -71689,7 +71695,7 @@ diff -urNp linux-3.0.9/net/atm/resources.c linux-3.0.9/net/atm/resources.c
}
diff -urNp linux-3.0.9/net/batman-adv/hard-interface.c linux-3.0.9/net/batman-adv/hard-interface.c
--- linux-3.0.9/net/batman-adv/hard-interface.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/batman-adv/hard-interface.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/batman-adv/hard-interface.c 2011-11-15 20:03:00.000000000 -0500
@@ -351,8 +351,8 @@ int hardif_enable_interface(struct hard_
hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
dev_add_pack(&hard_iface->batman_adv_ptype);
@@ -71703,7 +71709,7 @@ diff -urNp linux-3.0.9/net/batman-adv/hard-interface.c linux-3.0.9/net/batman-ad
diff -urNp linux-3.0.9/net/batman-adv/routing.c linux-3.0.9/net/batman-adv/routing.c
--- linux-3.0.9/net/batman-adv/routing.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/batman-adv/routing.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/batman-adv/routing.c 2011-11-15 20:03:00.000000000 -0500
@@ -627,7 +627,7 @@ void receive_bat_packet(struct ethhdr *e
return;
@@ -71715,7 +71721,7 @@ diff -urNp linux-3.0.9/net/batman-adv/routing.c linux-3.0.9/net/batman-adv/routi
diff -urNp linux-3.0.9/net/batman-adv/send.c linux-3.0.9/net/batman-adv/send.c
--- linux-3.0.9/net/batman-adv/send.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/batman-adv/send.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/batman-adv/send.c 2011-11-15 20:03:00.000000000 -0500
@@ -279,7 +279,7 @@ void schedule_own_packet(struct hard_ifa
/* change sequence number to network order */
@@ -71736,7 +71742,7 @@ diff -urNp linux-3.0.9/net/batman-adv/send.c linux-3.0.9/net/batman-adv/send.c
send_time = own_send_time(bat_priv);
diff -urNp linux-3.0.9/net/batman-adv/soft-interface.c linux-3.0.9/net/batman-adv/soft-interface.c
--- linux-3.0.9/net/batman-adv/soft-interface.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/batman-adv/soft-interface.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/batman-adv/soft-interface.c 2011-11-15 20:03:00.000000000 -0500
@@ -628,7 +628,7 @@ int interface_tx(struct sk_buff *skb, st
/* set broadcast sequence number */
@@ -71757,7 +71763,7 @@ diff -urNp linux-3.0.9/net/batman-adv/soft-interface.c linux-3.0.9/net/batman-ad
bat_priv->primary_if = NULL;
diff -urNp linux-3.0.9/net/batman-adv/types.h linux-3.0.9/net/batman-adv/types.h
--- linux-3.0.9/net/batman-adv/types.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/batman-adv/types.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/batman-adv/types.h 2011-11-15 20:03:00.000000000 -0500
@@ -38,8 +38,8 @@ struct hard_iface {
int16_t if_num;
char if_status;
@@ -71780,7 +71786,7 @@ diff -urNp linux-3.0.9/net/batman-adv/types.h linux-3.0.9/net/batman-adv/types.h
char num_ifaces;
diff -urNp linux-3.0.9/net/batman-adv/unicast.c linux-3.0.9/net/batman-adv/unicast.c
--- linux-3.0.9/net/batman-adv/unicast.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/batman-adv/unicast.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/batman-adv/unicast.c 2011-11-15 20:03:00.000000000 -0500
@@ -265,7 +265,7 @@ int frag_send_skb(struct sk_buff *skb, s
frag1->flags = UNI_FRAG_HEAD | large_tail;
frag2->flags = large_tail;
@@ -71792,7 +71798,7 @@ diff -urNp linux-3.0.9/net/batman-adv/unicast.c linux-3.0.9/net/batman-adv/unica
diff -urNp linux-3.0.9/net/bridge/br_multicast.c linux-3.0.9/net/bridge/br_multicast.c
--- linux-3.0.9/net/bridge/br_multicast.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/bridge/br_multicast.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/bridge/br_multicast.c 2011-11-15 20:03:00.000000000 -0500
@@ -1485,7 +1485,7 @@ static int br_multicast_ipv6_rcv(struct
nexthdr = ip6h->nexthdr;
offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
@@ -71804,7 +71810,7 @@ diff -urNp linux-3.0.9/net/bridge/br_multicast.c linux-3.0.9/net/bridge/br_multi
/* Okay, we found ICMPv6 header */
diff -urNp linux-3.0.9/net/bridge/netfilter/ebtables.c linux-3.0.9/net/bridge/netfilter/ebtables.c
--- linux-3.0.9/net/bridge/netfilter/ebtables.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/bridge/netfilter/ebtables.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/bridge/netfilter/ebtables.c 2011-11-15 20:03:00.000000000 -0500
@@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *s
tmp.valid_hooks = t->table->valid_hooks;
}
@@ -71825,7 +71831,7 @@ diff -urNp linux-3.0.9/net/bridge/netfilter/ebtables.c linux-3.0.9/net/bridge/ne
if (cmd == EBT_SO_GET_ENTRIES) {
diff -urNp linux-3.0.9/net/caif/caif_socket.c linux-3.0.9/net/caif/caif_socket.c
--- linux-3.0.9/net/caif/caif_socket.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/caif/caif_socket.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/caif/caif_socket.c 2011-11-15 20:03:00.000000000 -0500
@@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
#ifdef CONFIG_DEBUG_FS
struct debug_fs_counter {
@@ -71957,7 +71963,7 @@ diff -urNp linux-3.0.9/net/caif/caif_socket.c linux-3.0.9/net/caif/caif_socket.c
diff -urNp linux-3.0.9/net/caif/cfctrl.c linux-3.0.9/net/caif/cfctrl.c
--- linux-3.0.9/net/caif/cfctrl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/caif/cfctrl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/caif/cfctrl.c 2011-11-15 20:03:00.000000000 -0500
@@ -9,6 +9,7 @@
#include <linux/stddef.h>
#include <linux/spinlock.h>
@@ -72007,7 +72013,7 @@ diff -urNp linux-3.0.9/net/caif/cfctrl.c linux-3.0.9/net/caif/cfctrl.c
cmd = cmdrsp & CFCTRL_CMD_MASK;
diff -urNp linux-3.0.9/net/compat.c linux-3.0.9/net/compat.c
--- linux-3.0.9/net/compat.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/compat.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/compat.c 2011-11-15 20:03:00.000000000 -0500
@@ -70,9 +70,9 @@ int get_compat_msghdr(struct msghdr *kms
__get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
__get_user(kmsg->msg_flags, &umsg->msg_flags))
@@ -72137,7 +72143,7 @@ diff -urNp linux-3.0.9/net/compat.c linux-3.0.9/net/compat.c
u32 interface, fmode, numsrc;
diff -urNp linux-3.0.9/net/core/datagram.c linux-3.0.9/net/core/datagram.c
--- linux-3.0.9/net/core/datagram.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/datagram.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/core/datagram.c 2011-11-15 20:03:00.000000000 -0500
@@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s
}
@@ -72149,7 +72155,7 @@ diff -urNp linux-3.0.9/net/core/datagram.c linux-3.0.9/net/core/datagram.c
return err;
diff -urNp linux-3.0.9/net/core/dev.c linux-3.0.9/net/core/dev.c
--- linux-3.0.9/net/core/dev.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/dev.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/core/dev.c 2011-11-15 20:03:00.000000000 -0500
@@ -1125,10 +1125,14 @@ void dev_load(struct net *net, const cha
if (no_module && capable(CAP_NET_ADMIN))
no_module = request_module("netdev-%s", name);
@@ -72194,7 +72200,7 @@ diff -urNp linux-3.0.9/net/core/dev.c linux-3.0.9/net/core/dev.c
unsigned long time_limit = jiffies + 2;
diff -urNp linux-3.0.9/net/core/flow.c linux-3.0.9/net/core/flow.c
--- linux-3.0.9/net/core/flow.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/flow.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/core/flow.c 2011-11-15 20:03:00.000000000 -0500
@@ -60,7 +60,7 @@ struct flow_cache {
struct timer_list rnd_timer;
};
@@ -72233,7 +72239,7 @@ diff -urNp linux-3.0.9/net/core/flow.c linux-3.0.9/net/core/flow.c
else
diff -urNp linux-3.0.9/net/core/iovec.c linux-3.0.9/net/core/iovec.c
--- linux-3.0.9/net/core/iovec.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/iovec.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/core/iovec.c 2011-11-15 20:03:00.000000000 -0500
@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struc
if (m->msg_namelen) {
if (mode == VERIFY_READ) {
@@ -72254,7 +72260,7 @@ diff -urNp linux-3.0.9/net/core/iovec.c linux-3.0.9/net/core/iovec.c
m->msg_iov = iov;
diff -urNp linux-3.0.9/net/core/rtnetlink.c linux-3.0.9/net/core/rtnetlink.c
--- linux-3.0.9/net/core/rtnetlink.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/rtnetlink.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/core/rtnetlink.c 2011-11-15 20:03:00.000000000 -0500
@@ -56,7 +56,7 @@
struct rtnl_link {
rtnl_doit_func doit;
@@ -72266,7 +72272,7 @@ diff -urNp linux-3.0.9/net/core/rtnetlink.c linux-3.0.9/net/core/rtnetlink.c
diff -urNp linux-3.0.9/net/core/scm.c linux-3.0.9/net/core/scm.c
--- linux-3.0.9/net/core/scm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/scm.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/core/scm.c 2011-11-15 20:03:00.000000000 -0500
@@ -218,7 +218,7 @@ EXPORT_SYMBOL(__scm_send);
int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
{
@@ -72305,7 +72311,7 @@ diff -urNp linux-3.0.9/net/core/scm.c linux-3.0.9/net/core/scm.c
int new_fd;
diff -urNp linux-3.0.9/net/core/skbuff.c linux-3.0.9/net/core/skbuff.c
--- linux-3.0.9/net/core/skbuff.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/skbuff.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/core/skbuff.c 2011-11-15 20:03:00.000000000 -0500
@@ -1543,6 +1543,8 @@ int skb_splice_bits(struct sk_buff *skb,
struct sock *sk = skb->sk;
int ret = 0;
@@ -72317,7 +72323,7 @@ diff -urNp linux-3.0.9/net/core/skbuff.c linux-3.0.9/net/core/skbuff.c
diff -urNp linux-3.0.9/net/core/sock.c linux-3.0.9/net/core/sock.c
--- linux-3.0.9/net/core/sock.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/core/sock.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/core/sock.c 2011-11-15 20:03:00.000000000 -0500
@@ -291,7 +291,7 @@ int sock_queue_rcv_skb(struct sock *sk,
*/
if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
@@ -72401,7 +72407,7 @@ diff -urNp linux-3.0.9/net/core/sock.c linux-3.0.9/net/core/sock.c
diff -urNp linux-3.0.9/net/decnet/sysctl_net_decnet.c linux-3.0.9/net/decnet/sysctl_net_decnet.c
--- linux-3.0.9/net/decnet/sysctl_net_decnet.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/decnet/sysctl_net_decnet.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/decnet/sysctl_net_decnet.c 2011-11-15 20:03:00.000000000 -0500
@@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t
if (len > *lenp) len = *lenp;
@@ -72422,7 +72428,7 @@ diff -urNp linux-3.0.9/net/decnet/sysctl_net_decnet.c linux-3.0.9/net/decnet/sys
*lenp = len;
diff -urNp linux-3.0.9/net/econet/Kconfig linux-3.0.9/net/econet/Kconfig
--- linux-3.0.9/net/econet/Kconfig 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/econet/Kconfig 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/econet/Kconfig 2011-11-15 20:03:00.000000000 -0500
@@ -4,7 +4,7 @@
config ECONET
@@ -72434,7 +72440,7 @@ diff -urNp linux-3.0.9/net/econet/Kconfig linux-3.0.9/net/econet/Kconfig
Acorn computers to access file and print servers. It uses native
diff -urNp linux-3.0.9/net/ipv4/fib_frontend.c linux-3.0.9/net/ipv4/fib_frontend.c
--- linux-3.0.9/net/ipv4/fib_frontend.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/fib_frontend.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/fib_frontend.c 2011-11-15 20:03:00.000000000 -0500
@@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct not
#ifdef CONFIG_IP_ROUTE_MULTIPATH
fib_sync_up(dev);
@@ -72461,7 +72467,7 @@ diff -urNp linux-3.0.9/net/ipv4/fib_frontend.c linux-3.0.9/net/ipv4/fib_frontend
case NETDEV_DOWN:
diff -urNp linux-3.0.9/net/ipv4/fib_semantics.c linux-3.0.9/net/ipv4/fib_semantics.c
--- linux-3.0.9/net/ipv4/fib_semantics.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/fib_semantics.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/fib_semantics.c 2011-11-15 20:03:00.000000000 -0500
@@ -691,7 +691,7 @@ __be32 fib_info_update_nh_saddr(struct n
nh->nh_saddr = inet_select_addr(nh->nh_dev,
nh->nh_gw,
@@ -72473,7 +72479,7 @@ diff -urNp linux-3.0.9/net/ipv4/fib_semantics.c linux-3.0.9/net/ipv4/fib_semanti
}
diff -urNp linux-3.0.9/net/ipv4/inet_diag.c linux-3.0.9/net/ipv4/inet_diag.c
--- linux-3.0.9/net/ipv4/inet_diag.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/inet_diag.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/inet_diag.c 2011-11-15 20:03:00.000000000 -0500
@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc
r->idiag_retrans = 0;
@@ -72537,7 +72543,7 @@ diff -urNp linux-3.0.9/net/ipv4/inet_diag.c linux-3.0.9/net/ipv4/inet_diag.c
if (tmo < 0)
diff -urNp linux-3.0.9/net/ipv4/inet_hashtables.c linux-3.0.9/net/ipv4/inet_hashtables.c
--- linux-3.0.9/net/ipv4/inet_hashtables.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/inet_hashtables.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/inet_hashtables.c 2011-11-15 20:03:00.000000000 -0500
@@ -18,12 +18,15 @@
#include <linux/sched.h>
#include <linux/slab.h>
@@ -72565,7 +72571,7 @@ diff -urNp linux-3.0.9/net/ipv4/inet_hashtables.c linux-3.0.9/net/ipv4/inet_hash
while (twrefcnt) {
diff -urNp linux-3.0.9/net/ipv4/inetpeer.c linux-3.0.9/net/ipv4/inetpeer.c
--- linux-3.0.9/net/ipv4/inetpeer.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/inetpeer.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/inetpeer.c 2011-11-15 20:03:00.000000000 -0500
@@ -481,6 +481,8 @@ struct inet_peer *inet_getpeer(struct in
unsigned int sequence;
int invalidated, newrefcnt = 0;
@@ -72588,7 +72594,7 @@ diff -urNp linux-3.0.9/net/ipv4/inetpeer.c linux-3.0.9/net/ipv4/inetpeer.c
p->rate_tokens = 0;
diff -urNp linux-3.0.9/net/ipv4/ipconfig.c linux-3.0.9/net/ipv4/ipconfig.c
--- linux-3.0.9/net/ipv4/ipconfig.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/ipconfig.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/ipconfig.c 2011-11-15 20:03:00.000000000 -0500
@@ -313,7 +313,7 @@ static int __init ic_devinet_ioctl(unsig
mm_segment_t oldfs = get_fs();
@@ -72618,7 +72624,7 @@ diff -urNp linux-3.0.9/net/ipv4/ipconfig.c linux-3.0.9/net/ipv4/ipconfig.c
}
diff -urNp linux-3.0.9/net/ipv4/ip_fragment.c linux-3.0.9/net/ipv4/ip_fragment.c
--- linux-3.0.9/net/ipv4/ip_fragment.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/ip_fragment.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/ip_fragment.c 2011-11-15 20:03:00.000000000 -0500
@@ -315,7 +315,7 @@ static inline int ip_frag_too_far(struct
return 0;
@@ -72630,7 +72636,7 @@ diff -urNp linux-3.0.9/net/ipv4/ip_fragment.c linux-3.0.9/net/ipv4/ip_fragment.c
rc = qp->q.fragments && (end - start) > max;
diff -urNp linux-3.0.9/net/ipv4/ip_sockglue.c linux-3.0.9/net/ipv4/ip_sockglue.c
--- linux-3.0.9/net/ipv4/ip_sockglue.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/ip_sockglue.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/ip_sockglue.c 2011-11-15 20:03:00.000000000 -0500
@@ -1073,6 +1073,8 @@ static int do_ip_getsockopt(struct sock
int val;
int len;
@@ -72661,7 +72667,7 @@ diff -urNp linux-3.0.9/net/ipv4/ip_sockglue.c linux-3.0.9/net/ipv4/ip_sockglue.c
diff -urNp linux-3.0.9/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.9/net/ipv4/netfilter/nf_nat_snmp_basic.c
--- linux-3.0.9/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-15 20:03:00.000000000 -0500
@@ -399,7 +399,7 @@ static unsigned char asn1_octets_decode(
*len = 0;
@@ -72673,7 +72679,7 @@ diff -urNp linux-3.0.9/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.9/net/ip
pr_notice("OOM in bsalg (%d)\n", __LINE__);
diff -urNp linux-3.0.9/net/ipv4/ping.c linux-3.0.9/net/ipv4/ping.c
--- linux-3.0.9/net/ipv4/ping.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/ping.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/ping.c 2011-11-15 20:03:00.000000000 -0500
@@ -837,7 +837,7 @@ static void ping_format_sock(struct sock
sk_rmem_alloc_get(sp),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
@@ -72685,7 +72691,7 @@ diff -urNp linux-3.0.9/net/ipv4/ping.c linux-3.0.9/net/ipv4/ping.c
static int ping_seq_show(struct seq_file *seq, void *v)
diff -urNp linux-3.0.9/net/ipv4/raw.c linux-3.0.9/net/ipv4/raw.c
--- linux-3.0.9/net/ipv4/raw.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/raw.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/raw.c 2011-11-15 20:03:00.000000000 -0500
@@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk,
int raw_rcv(struct sock *sk, struct sk_buff *skb)
{
@@ -72746,7 +72752,7 @@ diff -urNp linux-3.0.9/net/ipv4/raw.c linux-3.0.9/net/ipv4/raw.c
static int raw_seq_show(struct seq_file *seq, void *v)
diff -urNp linux-3.0.9/net/ipv4/route.c linux-3.0.9/net/ipv4/route.c
--- linux-3.0.9/net/ipv4/route.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/route.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/route.c 2011-11-15 20:03:00.000000000 -0500
@@ -304,7 +304,7 @@ static inline unsigned int rt_hash(__be3
static inline int rt_genid(struct net *net)
@@ -72776,7 +72782,7 @@ diff -urNp linux-3.0.9/net/ipv4/route.c linux-3.0.9/net/ipv4/route.c
tsage = get_seconds() - peer->tcp_ts_stamp;
diff -urNp linux-3.0.9/net/ipv4/tcp.c linux-3.0.9/net/ipv4/tcp.c
--- linux-3.0.9/net/ipv4/tcp.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/tcp.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/tcp.c 2011-11-15 20:03:00.000000000 -0500
@@ -2122,6 +2122,8 @@ static int do_tcp_setsockopt(struct sock
int val;
int err = 0;
@@ -72797,7 +72803,7 @@ diff -urNp linux-3.0.9/net/ipv4/tcp.c linux-3.0.9/net/ipv4/tcp.c
diff -urNp linux-3.0.9/net/ipv4/tcp_ipv4.c linux-3.0.9/net/ipv4/tcp_ipv4.c
--- linux-3.0.9/net/ipv4/tcp_ipv4.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/tcp_ipv4.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/tcp_ipv4.c 2011-11-15 20:03:00.000000000 -0500
@@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
int sysctl_tcp_low_latency __read_mostly;
EXPORT_SYMBOL(sysctl_tcp_low_latency);
@@ -72895,7 +72901,7 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_ipv4.c linux-3.0.9/net/ipv4/tcp_ipv4.c
#define TMPSZ 150
diff -urNp linux-3.0.9/net/ipv4/tcp_minisocks.c linux-3.0.9/net/ipv4/tcp_minisocks.c
--- linux-3.0.9/net/ipv4/tcp_minisocks.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/tcp_minisocks.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/tcp_minisocks.c 2011-11-15 20:03:00.000000000 -0500
@@ -27,6 +27,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
@@ -72920,7 +72926,7 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_minisocks.c linux-3.0.9/net/ipv4/tcp_minisoc
diff -urNp linux-3.0.9/net/ipv4/tcp_output.c linux-3.0.9/net/ipv4/tcp_output.c
--- linux-3.0.9/net/ipv4/tcp_output.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/tcp_output.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/tcp_output.c 2011-11-15 20:03:00.000000000 -0500
@@ -2421,6 +2421,8 @@ struct sk_buff *tcp_make_synack(struct s
int mss;
int s_data_desired = 0;
@@ -72932,7 +72938,7 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_output.c linux-3.0.9/net/ipv4/tcp_output.c
skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15 + s_data_desired, 1, GFP_ATOMIC);
diff -urNp linux-3.0.9/net/ipv4/tcp_probe.c linux-3.0.9/net/ipv4/tcp_probe.c
--- linux-3.0.9/net/ipv4/tcp_probe.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/tcp_probe.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/tcp_probe.c 2011-11-15 20:03:00.000000000 -0500
@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
if (cnt + width >= len)
break;
@@ -72944,7 +72950,7 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_probe.c linux-3.0.9/net/ipv4/tcp_probe.c
}
diff -urNp linux-3.0.9/net/ipv4/tcp_timer.c linux-3.0.9/net/ipv4/tcp_timer.c
--- linux-3.0.9/net/ipv4/tcp_timer.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/tcp_timer.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/tcp_timer.c 2011-11-15 20:03:00.000000000 -0500
@@ -22,6 +22,10 @@
#include <linux/gfp.h>
#include <net/tcp.h>
@@ -72972,7 +72978,7 @@ diff -urNp linux-3.0.9/net/ipv4/tcp_timer.c linux-3.0.9/net/ipv4/tcp_timer.c
/* Has it gone just too far? */
diff -urNp linux-3.0.9/net/ipv4/udp.c linux-3.0.9/net/ipv4/udp.c
--- linux-3.0.9/net/ipv4/udp.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv4/udp.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv4/udp.c 2011-11-15 20:03:00.000000000 -0500
@@ -86,6 +86,7 @@
#include <linux/types.h>
#include <linux/fcntl.h>
@@ -73087,7 +73093,7 @@ diff -urNp linux-3.0.9/net/ipv4/udp.c linux-3.0.9/net/ipv4/udp.c
int udp4_seq_show(struct seq_file *seq, void *v)
diff -urNp linux-3.0.9/net/ipv6/addrconf.c linux-3.0.9/net/ipv6/addrconf.c
--- linux-3.0.9/net/ipv6/addrconf.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv6/addrconf.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv6/addrconf.c 2011-11-15 20:03:00.000000000 -0500
@@ -2072,7 +2072,7 @@ int addrconf_set_dstaddr(struct net *net
p.iph.ihl = 5;
p.iph.protocol = IPPROTO_IPV6;
@@ -73099,7 +73105,7 @@ diff -urNp linux-3.0.9/net/ipv6/addrconf.c linux-3.0.9/net/ipv6/addrconf.c
mm_segment_t oldfs = get_fs();
diff -urNp linux-3.0.9/net/ipv6/inet6_connection_sock.c linux-3.0.9/net/ipv6/inet6_connection_sock.c
--- linux-3.0.9/net/ipv6/inet6_connection_sock.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv6/inet6_connection_sock.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv6/inet6_connection_sock.c 2011-11-15 20:03:00.000000000 -0500
@@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *
#ifdef CONFIG_XFRM
{
@@ -73120,7 +73126,7 @@ diff -urNp linux-3.0.9/net/ipv6/inet6_connection_sock.c linux-3.0.9/net/ipv6/ine
}
diff -urNp linux-3.0.9/net/ipv6/ipv6_sockglue.c linux-3.0.9/net/ipv6/ipv6_sockglue.c
--- linux-3.0.9/net/ipv6/ipv6_sockglue.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv6/ipv6_sockglue.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv6/ipv6_sockglue.c 2011-11-15 20:03:00.000000000 -0500
@@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct soc
int val, valbool;
int retv = -ENOPROTOOPT;
@@ -73150,7 +73156,7 @@ diff -urNp linux-3.0.9/net/ipv6/ipv6_sockglue.c linux-3.0.9/net/ipv6/ipv6_sockgl
diff -urNp linux-3.0.9/net/ipv6/raw.c linux-3.0.9/net/ipv6/raw.c
--- linux-3.0.9/net/ipv6/raw.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv6/raw.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv6/raw.c 2011-11-15 20:03:00.000000000 -0500
@@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct s
{
if ((raw6_sk(sk)->checksum || rcu_dereference_raw(sk->sk_filter)) &&
@@ -73248,7 +73254,7 @@ diff -urNp linux-3.0.9/net/ipv6/raw.c linux-3.0.9/net/ipv6/raw.c
static int raw6_seq_show(struct seq_file *seq, void *v)
diff -urNp linux-3.0.9/net/ipv6/tcp_ipv6.c linux-3.0.9/net/ipv6/tcp_ipv6.c
--- linux-3.0.9/net/ipv6/tcp_ipv6.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv6/tcp_ipv6.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv6/tcp_ipv6.c 2011-11-15 20:03:00.000000000 -0500
@@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
}
#endif
@@ -73350,7 +73356,7 @@ diff -urNp linux-3.0.9/net/ipv6/tcp_ipv6.c linux-3.0.9/net/ipv6/tcp_ipv6.c
static int tcp6_seq_show(struct seq_file *seq, void *v)
diff -urNp linux-3.0.9/net/ipv6/udp.c linux-3.0.9/net/ipv6/udp.c
--- linux-3.0.9/net/ipv6/udp.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/ipv6/udp.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/ipv6/udp.c 2011-11-15 20:03:00.000000000 -0500
@@ -50,6 +50,10 @@
#include <linux/seq_file.h>
#include "udp_impl.h"
@@ -73417,7 +73423,7 @@ diff -urNp linux-3.0.9/net/ipv6/udp.c linux-3.0.9/net/ipv6/udp.c
int udp6_seq_show(struct seq_file *seq, void *v)
diff -urNp linux-3.0.9/net/irda/ircomm/ircomm_tty.c linux-3.0.9/net/irda/ircomm/ircomm_tty.c
--- linux-3.0.9/net/irda/ircomm/ircomm_tty.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/irda/ircomm/ircomm_tty.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/irda/ircomm/ircomm_tty.c 2011-11-15 20:03:00.000000000 -0500
@@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(st
add_wait_queue(&self->open_wait, &wait);
@@ -73542,7 +73548,7 @@ diff -urNp linux-3.0.9/net/irda/ircomm/ircomm_tty.c linux-3.0.9/net/irda/ircomm/
diff -urNp linux-3.0.9/net/iucv/af_iucv.c linux-3.0.9/net/iucv/af_iucv.c
--- linux-3.0.9/net/iucv/af_iucv.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/iucv/af_iucv.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/iucv/af_iucv.c 2011-11-15 20:03:00.000000000 -0500
@@ -648,10 +648,10 @@ static int iucv_sock_autobind(struct soc
write_lock_bh(&iucv_sk_list.lock);
@@ -73558,7 +73564,7 @@ diff -urNp linux-3.0.9/net/iucv/af_iucv.c linux-3.0.9/net/iucv/af_iucv.c
write_unlock_bh(&iucv_sk_list.lock);
diff -urNp linux-3.0.9/net/key/af_key.c linux-3.0.9/net/key/af_key.c
--- linux-3.0.9/net/key/af_key.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/key/af_key.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/key/af_key.c 2011-11-15 20:03:00.000000000 -0500
@@ -2481,6 +2481,8 @@ static int pfkey_migrate(struct sock *sk
struct xfrm_migrate m[XFRM_MAX_DEPTH];
struct xfrm_kmaddress k;
@@ -73583,7 +73589,7 @@ diff -urNp linux-3.0.9/net/key/af_key.c linux-3.0.9/net/key/af_key.c
}
diff -urNp linux-3.0.9/net/lapb/lapb_iface.c linux-3.0.9/net/lapb/lapb_iface.c
--- linux-3.0.9/net/lapb/lapb_iface.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/lapb/lapb_iface.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/lapb/lapb_iface.c 2011-11-15 20:03:00.000000000 -0500
@@ -158,7 +158,7 @@ int lapb_register(struct net_device *dev
goto out;
@@ -73649,7 +73655,7 @@ diff -urNp linux-3.0.9/net/lapb/lapb_iface.c linux-3.0.9/net/lapb/lapb_iface.c
diff -urNp linux-3.0.9/net/mac80211/debugfs_sta.c linux-3.0.9/net/mac80211/debugfs_sta.c
--- linux-3.0.9/net/mac80211/debugfs_sta.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/debugfs_sta.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/mac80211/debugfs_sta.c 2011-11-15 20:03:00.000000000 -0500
@@ -140,6 +140,8 @@ static ssize_t sta_agg_status_read(struc
struct tid_ampdu_rx *tid_rx;
struct tid_ampdu_tx *tid_tx;
@@ -73670,7 +73676,7 @@ diff -urNp linux-3.0.9/net/mac80211/debugfs_sta.c linux-3.0.9/net/mac80211/debug
if (htc->ht_supported) {
diff -urNp linux-3.0.9/net/mac80211/ieee80211_i.h linux-3.0.9/net/mac80211/ieee80211_i.h
--- linux-3.0.9/net/mac80211/ieee80211_i.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/ieee80211_i.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/mac80211/ieee80211_i.h 2011-11-15 20:03:00.000000000 -0500
@@ -27,6 +27,7 @@
#include <net/ieee80211_radiotap.h>
#include <net/cfg80211.h>
@@ -73690,7 +73696,7 @@ diff -urNp linux-3.0.9/net/mac80211/ieee80211_i.h linux-3.0.9/net/mac80211/ieee8
int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
diff -urNp linux-3.0.9/net/mac80211/iface.c linux-3.0.9/net/mac80211/iface.c
--- linux-3.0.9/net/mac80211/iface.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/iface.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/mac80211/iface.c 2011-11-15 20:03:00.000000000 -0500
@@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_
break;
}
@@ -73747,7 +73753,7 @@ diff -urNp linux-3.0.9/net/mac80211/iface.c linux-3.0.9/net/mac80211/iface.c
ieee80211_clear_tx_pending(local);
diff -urNp linux-3.0.9/net/mac80211/main.c linux-3.0.9/net/mac80211/main.c
--- linux-3.0.9/net/mac80211/main.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/main.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/mac80211/main.c 2011-11-15 20:03:00.000000000 -0500
@@ -209,7 +209,7 @@ int ieee80211_hw_config(struct ieee80211
local->hw.conf.power_level = power;
}
@@ -73759,7 +73765,7 @@ diff -urNp linux-3.0.9/net/mac80211/main.c linux-3.0.9/net/mac80211/main.c
* Goal:
diff -urNp linux-3.0.9/net/mac80211/mlme.c linux-3.0.9/net/mac80211/mlme.c
--- linux-3.0.9/net/mac80211/mlme.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/mlme.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/mac80211/mlme.c 2011-11-15 20:03:00.000000000 -0500
@@ -1447,6 +1447,8 @@ static bool ieee80211_assoc_success(stru
bool have_higher_than_11mbit = false;
u16 ap_ht_cap_flags;
@@ -73771,7 +73777,7 @@ diff -urNp linux-3.0.9/net/mac80211/mlme.c linux-3.0.9/net/mac80211/mlme.c
aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
diff -urNp linux-3.0.9/net/mac80211/pm.c linux-3.0.9/net/mac80211/pm.c
--- linux-3.0.9/net/mac80211/pm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/pm.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/mac80211/pm.c 2011-11-15 20:03:00.000000000 -0500
@@ -47,7 +47,7 @@ int __ieee80211_suspend(struct ieee80211
cancel_work_sync(&local->dynamic_ps_enable_work);
del_timer_sync(&local->dynamic_ps_timer);
@@ -73792,7 +73798,7 @@ diff -urNp linux-3.0.9/net/mac80211/pm.c linux-3.0.9/net/mac80211/pm.c
suspend:
diff -urNp linux-3.0.9/net/mac80211/rate.c linux-3.0.9/net/mac80211/rate.c
--- linux-3.0.9/net/mac80211/rate.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/rate.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/mac80211/rate.c 2011-11-15 20:03:00.000000000 -0500
@@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct
ASSERT_RTNL();
@@ -73804,7 +73810,7 @@ diff -urNp linux-3.0.9/net/mac80211/rate.c linux-3.0.9/net/mac80211/rate.c
if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
diff -urNp linux-3.0.9/net/mac80211/rc80211_pid_debugfs.c linux-3.0.9/net/mac80211/rc80211_pid_debugfs.c
--- linux-3.0.9/net/mac80211/rc80211_pid_debugfs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/rc80211_pid_debugfs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/mac80211/rc80211_pid_debugfs.c 2011-11-15 20:03:00.000000000 -0500
@@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
spin_unlock_irqrestore(&events->lock, status);
@@ -73816,7 +73822,7 @@ diff -urNp linux-3.0.9/net/mac80211/rc80211_pid_debugfs.c linux-3.0.9/net/mac802
return p;
diff -urNp linux-3.0.9/net/mac80211/util.c linux-3.0.9/net/mac80211/util.c
--- linux-3.0.9/net/mac80211/util.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/mac80211/util.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/mac80211/util.c 2011-11-15 20:03:00.000000000 -0500
@@ -1147,7 +1147,7 @@ int ieee80211_reconfig(struct ieee80211_
#endif
@@ -73828,7 +73834,7 @@ diff -urNp linux-3.0.9/net/mac80211/util.c linux-3.0.9/net/mac80211/util.c
* various platform / driver / bus issues, so restarting
diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.9/net/netfilter/ipvs/ip_vs_conn.c
--- linux-3.0.9/net/netfilter/ipvs/ip_vs_conn.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/ipvs/ip_vs_conn.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/netfilter/ipvs/ip_vs_conn.c 2011-11-15 20:03:00.000000000 -0500
@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s
/* Increase the refcnt counter of the dest */
atomic_inc(&dest->refcnt);
@@ -73858,7 +73864,7 @@ diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.9/net/netfilter
if (!todrop_rate[i]) return 0;
diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c
--- linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c 2011-11-15 20:03:00.000000000 -0500
@@ -563,7 +563,7 @@ int ip_vs_leave(struct ip_vs_service *sv
ret = cp->packet_xmit(skb, cp, pd->pp);
/* do not touch skb anymore */
@@ -73879,7 +73885,7 @@ diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c linux-3.0.9/net/netfilter
cp->protocol == IPPROTO_SCTP) {
diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c
--- linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-15 20:03:00.000000000 -0500
@@ -782,7 +782,7 @@ __ip_vs_update_dest(struct ip_vs_service
ip_vs_rs_hash(ipvs, dest);
write_unlock_bh(&ipvs->rs_lock);
@@ -73936,7 +73942,7 @@ diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.9/net/netfilter/
NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.9/net/netfilter/ipvs/ip_vs_sync.c
--- linux-3.0.9/net/netfilter/ipvs/ip_vs_sync.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/ipvs/ip_vs_sync.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/netfilter/ipvs/ip_vs_sync.c 2011-11-15 20:03:00.000000000 -0500
@@ -648,7 +648,7 @@ control:
* i.e only increment in_pkts for Templates.
*/
@@ -73957,7 +73963,7 @@ diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.9/net/netfilter
/*
diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.9/net/netfilter/ipvs/ip_vs_xmit.c
--- linux-3.0.9/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-15 20:03:00.000000000 -0500
@@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
else
rc = NF_ACCEPT;
@@ -73978,7 +73984,7 @@ diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.9/net/netfilter
diff -urNp linux-3.0.9/net/netfilter/Kconfig linux-3.0.9/net/netfilter/Kconfig
--- linux-3.0.9/net/netfilter/Kconfig 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/Kconfig 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/netfilter/Kconfig 2011-11-15 20:03:00.000000000 -0500
@@ -781,6 +781,16 @@ config NETFILTER_XT_MATCH_ESP
To compile it as a module, choose M here. If unsure, say N.
@@ -73998,7 +74004,7 @@ diff -urNp linux-3.0.9/net/netfilter/Kconfig linux-3.0.9/net/netfilter/Kconfig
depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
diff -urNp linux-3.0.9/net/netfilter/Makefile linux-3.0.9/net/netfilter/Makefile
--- linux-3.0.9/net/netfilter/Makefile 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/Makefile 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/netfilter/Makefile 2011-11-15 20:03:00.000000000 -0500
@@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) +=
obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
@@ -74009,7 +74015,7 @@ diff -urNp linux-3.0.9/net/netfilter/Makefile linux-3.0.9/net/netfilter/Makefile
obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
diff -urNp linux-3.0.9/net/netfilter/nfnetlink_log.c linux-3.0.9/net/netfilter/nfnetlink_log.c
--- linux-3.0.9/net/netfilter/nfnetlink_log.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/nfnetlink_log.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/netfilter/nfnetlink_log.c 2011-11-15 20:03:00.000000000 -0500
@@ -70,7 +70,7 @@ struct nfulnl_instance {
};
@@ -74030,7 +74036,7 @@ diff -urNp linux-3.0.9/net/netfilter/nfnetlink_log.c linux-3.0.9/net/netfilter/n
struct nlattr *nla;
diff -urNp linux-3.0.9/net/netfilter/nfnetlink_queue.c linux-3.0.9/net/netfilter/nfnetlink_queue.c
--- linux-3.0.9/net/netfilter/nfnetlink_queue.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/nfnetlink_queue.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/netfilter/nfnetlink_queue.c 2011-11-15 20:03:00.000000000 -0500
@@ -58,7 +58,7 @@ struct nfqnl_instance {
*/
spinlock_t lock;
@@ -74060,7 +74066,7 @@ diff -urNp linux-3.0.9/net/netfilter/nfnetlink_queue.c linux-3.0.9/net/netfilter
static const struct seq_operations nfqnl_seq_ops = {
diff -urNp linux-3.0.9/net/netfilter/xt_gradm.c linux-3.0.9/net/netfilter/xt_gradm.c
--- linux-3.0.9/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/net/netfilter/xt_gradm.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/netfilter/xt_gradm.c 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,51 @@
+/*
+ * gradm match for netfilter
@@ -74115,7 +74121,7 @@ diff -urNp linux-3.0.9/net/netfilter/xt_gradm.c linux-3.0.9/net/netfilter/xt_gra
+MODULE_ALIAS("ip6t_gradm");
diff -urNp linux-3.0.9/net/netfilter/xt_statistic.c linux-3.0.9/net/netfilter/xt_statistic.c
--- linux-3.0.9/net/netfilter/xt_statistic.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netfilter/xt_statistic.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/netfilter/xt_statistic.c 2011-11-15 20:03:00.000000000 -0500
@@ -18,7 +18,7 @@
#include <linux/netfilter/x_tables.h>
@@ -74148,7 +74154,7 @@ diff -urNp linux-3.0.9/net/netfilter/xt_statistic.c linux-3.0.9/net/netfilter/xt
}
diff -urNp linux-3.0.9/net/netlink/af_netlink.c linux-3.0.9/net/netlink/af_netlink.c
--- linux-3.0.9/net/netlink/af_netlink.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netlink/af_netlink.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/netlink/af_netlink.c 2011-11-15 20:03:00.000000000 -0500
@@ -742,7 +742,7 @@ static void netlink_overrun(struct sock
sk->sk_error_report(sk);
}
@@ -74169,7 +74175,7 @@ diff -urNp linux-3.0.9/net/netlink/af_netlink.c linux-3.0.9/net/netlink/af_netli
diff -urNp linux-3.0.9/net/netrom/af_netrom.c linux-3.0.9/net/netrom/af_netrom.c
--- linux-3.0.9/net/netrom/af_netrom.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/netrom/af_netrom.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/netrom/af_netrom.c 2011-11-15 20:03:00.000000000 -0500
@@ -839,6 +839,7 @@ static int nr_getname(struct socket *soc
struct sock *sk = sock->sk;
struct nr_sock *nr = nr_sk(sk);
@@ -74188,7 +74194,7 @@ diff -urNp linux-3.0.9/net/netrom/af_netrom.c linux-3.0.9/net/netrom/af_netrom.c
}
diff -urNp linux-3.0.9/net/packet/af_packet.c linux-3.0.9/net/packet/af_packet.c
--- linux-3.0.9/net/packet/af_packet.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/packet/af_packet.c 2011-11-12 13:05:59.000000000 -0500
++++ linux-3.0.9/net/packet/af_packet.c 2011-11-15 20:03:00.000000000 -0500
@@ -647,7 +647,7 @@ static int packet_rcv(struct sk_buff *sk
spin_lock(&sk->sk_receive_queue.lock);
@@ -74227,7 +74233,7 @@ diff -urNp linux-3.0.9/net/packet/af_packet.c linux-3.0.9/net/packet/af_packet.c
}
diff -urNp linux-3.0.9/net/phonet/af_phonet.c linux-3.0.9/net/phonet/af_phonet.c
--- linux-3.0.9/net/phonet/af_phonet.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/phonet/af_phonet.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/phonet/af_phonet.c 2011-11-15 20:03:00.000000000 -0500
@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
{
struct phonet_protocol *pp;
@@ -74248,7 +74254,7 @@ diff -urNp linux-3.0.9/net/phonet/af_phonet.c linux-3.0.9/net/phonet/af_phonet.c
err = proto_register(pp->prot, 1);
diff -urNp linux-3.0.9/net/phonet/pep.c linux-3.0.9/net/phonet/pep.c
--- linux-3.0.9/net/phonet/pep.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/phonet/pep.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/phonet/pep.c 2011-11-15 20:03:00.000000000 -0500
@@ -387,7 +387,7 @@ static int pipe_do_rcv(struct sock *sk,
case PNS_PEP_CTRL_REQ:
@@ -74278,7 +74284,7 @@ diff -urNp linux-3.0.9/net/phonet/pep.c linux-3.0.9/net/phonet/pep.c
}
diff -urNp linux-3.0.9/net/phonet/socket.c linux-3.0.9/net/phonet/socket.c
--- linux-3.0.9/net/phonet/socket.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/phonet/socket.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/phonet/socket.c 2011-11-15 20:03:00.000000000 -0500
@@ -612,8 +612,13 @@ static int pn_sock_seq_show(struct seq_f
pn->resource, sk->sk_state,
sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
@@ -74297,7 +74303,7 @@ diff -urNp linux-3.0.9/net/phonet/socket.c linux-3.0.9/net/phonet/socket.c
return 0;
diff -urNp linux-3.0.9/net/rds/cong.c linux-3.0.9/net/rds/cong.c
--- linux-3.0.9/net/rds/cong.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/cong.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rds/cong.c 2011-11-15 20:03:00.000000000 -0500
@@ -77,7 +77,7 @@
* finds that the saved generation number is smaller than the global generation
* number, it wakes up the process.
@@ -74327,7 +74333,7 @@ diff -urNp linux-3.0.9/net/rds/cong.c linux-3.0.9/net/rds/cong.c
return 0;
diff -urNp linux-3.0.9/net/rds/ib_cm.c linux-3.0.9/net/rds/ib_cm.c
--- linux-3.0.9/net/rds/ib_cm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/ib_cm.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rds/ib_cm.c 2011-11-15 20:03:00.000000000 -0500
@@ -720,7 +720,7 @@ void rds_ib_conn_shutdown(struct rds_con
/* Clear the ACK state */
clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
@@ -74339,7 +74345,7 @@ diff -urNp linux-3.0.9/net/rds/ib_cm.c linux-3.0.9/net/rds/ib_cm.c
#endif
diff -urNp linux-3.0.9/net/rds/ib.h linux-3.0.9/net/rds/ib.h
--- linux-3.0.9/net/rds/ib.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/ib.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rds/ib.h 2011-11-15 20:03:00.000000000 -0500
@@ -127,7 +127,7 @@ struct rds_ib_connection {
/* sending acks */
unsigned long i_ack_flags;
@@ -74351,7 +74357,7 @@ diff -urNp linux-3.0.9/net/rds/ib.h linux-3.0.9/net/rds/ib.h
u64 i_ack_next; /* next ACK to send */
diff -urNp linux-3.0.9/net/rds/ib_recv.c linux-3.0.9/net/rds/ib_recv.c
--- linux-3.0.9/net/rds/ib_recv.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/ib_recv.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rds/ib_recv.c 2011-11-15 20:03:00.000000000 -0500
@@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_
static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
int ack_required)
@@ -74372,7 +74378,7 @@ diff -urNp linux-3.0.9/net/rds/ib_recv.c linux-3.0.9/net/rds/ib_recv.c
diff -urNp linux-3.0.9/net/rds/iw_cm.c linux-3.0.9/net/rds/iw_cm.c
--- linux-3.0.9/net/rds/iw_cm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/iw_cm.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rds/iw_cm.c 2011-11-15 20:03:00.000000000 -0500
@@ -664,7 +664,7 @@ void rds_iw_conn_shutdown(struct rds_con
/* Clear the ACK state */
clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
@@ -74384,7 +74390,7 @@ diff -urNp linux-3.0.9/net/rds/iw_cm.c linux-3.0.9/net/rds/iw_cm.c
#endif
diff -urNp linux-3.0.9/net/rds/iw.h linux-3.0.9/net/rds/iw.h
--- linux-3.0.9/net/rds/iw.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/iw.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rds/iw.h 2011-11-15 20:03:00.000000000 -0500
@@ -133,7 +133,7 @@ struct rds_iw_connection {
/* sending acks */
unsigned long i_ack_flags;
@@ -74396,7 +74402,7 @@ diff -urNp linux-3.0.9/net/rds/iw.h linux-3.0.9/net/rds/iw.h
u64 i_ack_next; /* next ACK to send */
diff -urNp linux-3.0.9/net/rds/iw_rdma.c linux-3.0.9/net/rds/iw_rdma.c
--- linux-3.0.9/net/rds/iw_rdma.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/iw_rdma.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rds/iw_rdma.c 2011-11-15 20:03:00.000000000 -0500
@@ -182,6 +182,8 @@ int rds_iw_update_cm_id(struct rds_iw_de
struct rdma_cm_id *pcm_id;
int rc;
@@ -74408,7 +74414,7 @@ diff -urNp linux-3.0.9/net/rds/iw_rdma.c linux-3.0.9/net/rds/iw_rdma.c
diff -urNp linux-3.0.9/net/rds/iw_recv.c linux-3.0.9/net/rds/iw_recv.c
--- linux-3.0.9/net/rds/iw_recv.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/iw_recv.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rds/iw_recv.c 2011-11-15 20:03:00.000000000 -0500
@@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_
static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
int ack_required)
@@ -74429,7 +74435,7 @@ diff -urNp linux-3.0.9/net/rds/iw_recv.c linux-3.0.9/net/rds/iw_recv.c
diff -urNp linux-3.0.9/net/rds/tcp.c linux-3.0.9/net/rds/tcp.c
--- linux-3.0.9/net/rds/tcp.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/tcp.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rds/tcp.c 2011-11-15 20:03:00.000000000 -0500
@@ -58,7 +58,7 @@ void rds_tcp_nonagle(struct socket *sock
int val = 1;
@@ -74441,7 +74447,7 @@ diff -urNp linux-3.0.9/net/rds/tcp.c linux-3.0.9/net/rds/tcp.c
}
diff -urNp linux-3.0.9/net/rds/tcp_send.c linux-3.0.9/net/rds/tcp_send.c
--- linux-3.0.9/net/rds/tcp_send.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rds/tcp_send.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rds/tcp_send.c 2011-11-15 20:03:00.000000000 -0500
@@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *
oldfs = get_fs();
@@ -74453,7 +74459,7 @@ diff -urNp linux-3.0.9/net/rds/tcp_send.c linux-3.0.9/net/rds/tcp_send.c
}
diff -urNp linux-3.0.9/net/rxrpc/af_rxrpc.c linux-3.0.9/net/rxrpc/af_rxrpc.c
--- linux-3.0.9/net/rxrpc/af_rxrpc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/af_rxrpc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rxrpc/af_rxrpc.c 2011-11-15 20:03:00.000000000 -0500
@@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_
__be32 rxrpc_epoch;
@@ -74465,7 +74471,7 @@ diff -urNp linux-3.0.9/net/rxrpc/af_rxrpc.c linux-3.0.9/net/rxrpc/af_rxrpc.c
atomic_t rxrpc_n_skbs;
diff -urNp linux-3.0.9/net/rxrpc/ar-ack.c linux-3.0.9/net/rxrpc/ar-ack.c
--- linux-3.0.9/net/rxrpc/ar-ack.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-ack.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rxrpc/ar-ack.c 2011-11-15 20:03:00.000000000 -0500
@@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_ca
_enter("{%d,%d,%d,%d},",
@@ -74540,7 +74546,7 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-ack.c linux-3.0.9/net/rxrpc/ar-ack.c
diff -urNp linux-3.0.9/net/rxrpc/ar-call.c linux-3.0.9/net/rxrpc/ar-call.c
--- linux-3.0.9/net/rxrpc/ar-call.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-call.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rxrpc/ar-call.c 2011-11-15 20:03:00.000000000 -0500
@@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_ca
spin_lock_init(&call->lock);
rwlock_init(&call->state_lock);
@@ -74552,7 +74558,7 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-call.c linux-3.0.9/net/rxrpc/ar-call.c
memset(&call->sock_node, 0xed, sizeof(call->sock_node));
diff -urNp linux-3.0.9/net/rxrpc/ar-connection.c linux-3.0.9/net/rxrpc/ar-connection.c
--- linux-3.0.9/net/rxrpc/ar-connection.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-connection.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rxrpc/ar-connection.c 2011-11-15 20:03:00.000000000 -0500
@@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_al
rwlock_init(&conn->lock);
spin_lock_init(&conn->state_lock);
@@ -74564,7 +74570,7 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-connection.c linux-3.0.9/net/rxrpc/ar-connec
conn->header_size = sizeof(struct rxrpc_header);
diff -urNp linux-3.0.9/net/rxrpc/ar-connevent.c linux-3.0.9/net/rxrpc/ar-connevent.c
--- linux-3.0.9/net/rxrpc/ar-connevent.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-connevent.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rxrpc/ar-connevent.c 2011-11-15 20:03:00.000000000 -0500
@@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct
len = iov[0].iov_len + iov[1].iov_len;
@@ -74576,7 +74582,7 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-connevent.c linux-3.0.9/net/rxrpc/ar-conneve
ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
diff -urNp linux-3.0.9/net/rxrpc/ar-input.c linux-3.0.9/net/rxrpc/ar-input.c
--- linux-3.0.9/net/rxrpc/ar-input.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-input.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rxrpc/ar-input.c 2011-11-15 20:03:00.000000000 -0500
@@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rx
/* track the latest serial number on this connection for ACK packet
* information */
@@ -74591,7 +74597,7 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-input.c linux-3.0.9/net/rxrpc/ar-input.c
/* request ACK generation for any ACK or DATA packet that requests
diff -urNp linux-3.0.9/net/rxrpc/ar-internal.h linux-3.0.9/net/rxrpc/ar-internal.h
--- linux-3.0.9/net/rxrpc/ar-internal.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-internal.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rxrpc/ar-internal.h 2011-11-15 20:03:00.000000000 -0500
@@ -272,8 +272,8 @@ struct rxrpc_connection {
int error; /* error code for local abort */
int debug_id; /* debug ID for printks */
@@ -74623,7 +74629,7 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-internal.h linux-3.0.9/net/rxrpc/ar-internal
/*
diff -urNp linux-3.0.9/net/rxrpc/ar-local.c linux-3.0.9/net/rxrpc/ar-local.c
--- linux-3.0.9/net/rxrpc/ar-local.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-local.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rxrpc/ar-local.c 2011-11-15 20:03:00.000000000 -0500
@@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(st
spin_lock_init(&local->lock);
rwlock_init(&local->services_lock);
@@ -74635,7 +74641,7 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-local.c linux-3.0.9/net/rxrpc/ar-local.c
diff -urNp linux-3.0.9/net/rxrpc/ar-output.c linux-3.0.9/net/rxrpc/ar-output.c
--- linux-3.0.9/net/rxrpc/ar-output.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-output.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rxrpc/ar-output.c 2011-11-15 20:03:00.000000000 -0500
@@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb
sp->hdr.cid = call->cid;
sp->hdr.callNumber = call->call_id;
@@ -74650,7 +74656,7 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-output.c linux-3.0.9/net/rxrpc/ar-output.c
sp->hdr.securityIndex = conn->security_ix;
diff -urNp linux-3.0.9/net/rxrpc/ar-peer.c linux-3.0.9/net/rxrpc/ar-peer.c
--- linux-3.0.9/net/rxrpc/ar-peer.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-peer.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rxrpc/ar-peer.c 2011-11-15 20:03:00.000000000 -0500
@@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe
INIT_LIST_HEAD(&peer->error_targets);
spin_lock_init(&peer->lock);
@@ -74662,7 +74668,7 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-peer.c linux-3.0.9/net/rxrpc/ar-peer.c
rxrpc_assess_MTU_size(peer);
diff -urNp linux-3.0.9/net/rxrpc/ar-proc.c linux-3.0.9/net/rxrpc/ar-proc.c
--- linux-3.0.9/net/rxrpc/ar-proc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-proc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rxrpc/ar-proc.c 2011-11-15 20:03:00.000000000 -0500
@@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str
atomic_read(&conn->usage),
rxrpc_conn_states[conn->state],
@@ -74676,7 +74682,7 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-proc.c linux-3.0.9/net/rxrpc/ar-proc.c
}
diff -urNp linux-3.0.9/net/rxrpc/ar-transport.c linux-3.0.9/net/rxrpc/ar-transport.c
--- linux-3.0.9/net/rxrpc/ar-transport.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/ar-transport.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rxrpc/ar-transport.c 2011-11-15 20:03:00.000000000 -0500
@@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_all
spin_lock_init(&trans->client_lock);
rwlock_init(&trans->conn_lock);
@@ -74688,7 +74694,7 @@ diff -urNp linux-3.0.9/net/rxrpc/ar-transport.c linux-3.0.9/net/rxrpc/ar-transpo
switch (peer->srx.transport_type) {
diff -urNp linux-3.0.9/net/rxrpc/rxkad.c linux-3.0.9/net/rxrpc/rxkad.c
--- linux-3.0.9/net/rxrpc/rxkad.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/rxrpc/rxkad.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/rxrpc/rxkad.c 2011-11-15 20:03:00.000000000 -0500
@@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(c
u16 check;
int nsg;
@@ -74727,7 +74733,7 @@ diff -urNp linux-3.0.9/net/rxrpc/rxkad.c linux-3.0.9/net/rxrpc/rxkad.c
ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
diff -urNp linux-3.0.9/net/sctp/proc.c linux-3.0.9/net/sctp/proc.c
--- linux-3.0.9/net/sctp/proc.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sctp/proc.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/sctp/proc.c 2011-11-15 20:03:00.000000000 -0500
@@ -318,7 +318,8 @@ static int sctp_assocs_seq_show(struct s
seq_printf(seq,
"%8pK %8pK %-3d %-3d %-2d %-4d "
@@ -74740,7 +74746,7 @@ diff -urNp linux-3.0.9/net/sctp/proc.c linux-3.0.9/net/sctp/proc.c
assoc->sndbuf_used,
diff -urNp linux-3.0.9/net/sctp/socket.c linux-3.0.9/net/sctp/socket.c
--- linux-3.0.9/net/sctp/socket.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sctp/socket.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/sctp/socket.c 2011-11-15 20:03:00.000000000 -0500
@@ -4452,7 +4452,7 @@ static int sctp_getsockopt_peer_addrs(st
addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
if (space_left < addrlen)
@@ -74752,7 +74758,7 @@ diff -urNp linux-3.0.9/net/sctp/socket.c linux-3.0.9/net/sctp/socket.c
cnt++;
diff -urNp linux-3.0.9/net/socket.c linux-3.0.9/net/socket.c
--- linux-3.0.9/net/socket.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/socket.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/socket.c 2011-11-15 20:03:00.000000000 -0500
@@ -88,6 +88,7 @@
#include <linux/nsproxy.h>
#include <linux/magic.h>
@@ -75022,7 +75028,7 @@ diff -urNp linux-3.0.9/net/socket.c linux-3.0.9/net/socket.c
if (level == SOL_SOCKET)
diff -urNp linux-3.0.9/net/sunrpc/sched.c linux-3.0.9/net/sunrpc/sched.c
--- linux-3.0.9/net/sunrpc/sched.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sunrpc/sched.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/sunrpc/sched.c 2011-11-15 20:03:00.000000000 -0500
@@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w
#ifdef RPC_DEBUG
static void rpc_task_set_debuginfo(struct rpc_task *task)
@@ -75037,7 +75043,7 @@ diff -urNp linux-3.0.9/net/sunrpc/sched.c linux-3.0.9/net/sunrpc/sched.c
static inline void rpc_task_set_debuginfo(struct rpc_task *task)
diff -urNp linux-3.0.9/net/sunrpc/svcsock.c linux-3.0.9/net/sunrpc/svcsock.c
--- linux-3.0.9/net/sunrpc/svcsock.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sunrpc/svcsock.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/sunrpc/svcsock.c 2011-11-15 20:03:00.000000000 -0500
@@ -392,7 +392,7 @@ static int svc_partial_recvfrom(struct s
int buflen, unsigned int base)
{
@@ -75049,7 +75055,7 @@ diff -urNp linux-3.0.9/net/sunrpc/svcsock.c linux-3.0.9/net/sunrpc/svcsock.c
diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma.c
--- linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-15 20:03:00.000000000 -0500
@@ -61,15 +61,15 @@ unsigned int svcrdma_max_req_size = RPCR
static unsigned int min_max_inline = 4096;
static unsigned int max_max_inline = 65536;
@@ -75159,7 +75165,7 @@ diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.9/net/sunrpc/xpr
},
diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
--- linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-15 20:03:00.000000000 -0500
@@ -499,7 +499,7 @@ next_sge:
svc_rdma_put_context(ctxt, 0);
goto out;
@@ -75189,7 +75195,7 @@ diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.9/net/s
rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_sendto.c
--- linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-15 20:03:00.000000000 -0500
@@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdm
write_wr.wr.rdma.remote_addr = to;
@@ -75201,7 +75207,7 @@ diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.9/net/sun
return 0;
diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c
--- linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-15 20:03:00.000000000 -0500
@@ -298,7 +298,7 @@ static void rq_cq_reap(struct svcxprt_rd
return;
@@ -75249,7 +75255,7 @@ diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.9/net/
sq_cq_reap(xprt);
diff -urNp linux-3.0.9/net/sysctl_net.c linux-3.0.9/net/sysctl_net.c
--- linux-3.0.9/net/sysctl_net.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/sysctl_net.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/sysctl_net.c 2011-11-15 20:03:00.000000000 -0500
@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
struct ctl_table *table)
{
@@ -75261,7 +75267,7 @@ diff -urNp linux-3.0.9/net/sysctl_net.c linux-3.0.9/net/sysctl_net.c
}
diff -urNp linux-3.0.9/net/tipc/link.c linux-3.0.9/net/tipc/link.c
--- linux-3.0.9/net/tipc/link.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/tipc/link.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/tipc/link.c 2011-11-15 20:03:00.000000000 -0500
@@ -1170,7 +1170,7 @@ static int link_send_sections_long(struc
struct tipc_msg fragm_hdr;
struct sk_buff *buf, *buf_chain, *prev;
@@ -75291,7 +75297,7 @@ diff -urNp linux-3.0.9/net/tipc/link.c linux-3.0.9/net/tipc/link.c
fragm_crs += sz;
diff -urNp linux-3.0.9/net/tipc/msg.c linux-3.0.9/net/tipc/msg.c
--- linux-3.0.9/net/tipc/msg.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/tipc/msg.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/tipc/msg.c 2011-11-15 20:03:00.000000000 -0500
@@ -101,7 +101,7 @@ int tipc_msg_build(struct tipc_msg *hdr,
msg_sect[cnt].iov_len);
else
@@ -75303,7 +75309,7 @@ diff -urNp linux-3.0.9/net/tipc/msg.c linux-3.0.9/net/tipc/msg.c
}
diff -urNp linux-3.0.9/net/tipc/subscr.c linux-3.0.9/net/tipc/subscr.c
--- linux-3.0.9/net/tipc/subscr.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/tipc/subscr.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/tipc/subscr.c 2011-11-15 20:03:00.000000000 -0500
@@ -101,7 +101,7 @@ static void subscr_send_event(struct sub
{
struct iovec msg_sect;
@@ -75315,7 +75321,7 @@ diff -urNp linux-3.0.9/net/tipc/subscr.c linux-3.0.9/net/tipc/subscr.c
sub->evt.event = htohl(event, sub->swap);
diff -urNp linux-3.0.9/net/unix/af_unix.c linux-3.0.9/net/unix/af_unix.c
--- linux-3.0.9/net/unix/af_unix.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/unix/af_unix.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/unix/af_unix.c 2011-11-15 20:03:00.000000000 -0500
@@ -767,6 +767,12 @@ static struct sock *unix_find_other(stru
err = -ECONNREFUSED;
if (!S_ISSOCK(inode->i_mode))
@@ -75364,7 +75370,7 @@ diff -urNp linux-3.0.9/net/unix/af_unix.c linux-3.0.9/net/unix/af_unix.c
nd.path.dentry = dentry;
diff -urNp linux-3.0.9/net/wireless/core.h linux-3.0.9/net/wireless/core.h
--- linux-3.0.9/net/wireless/core.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/wireless/core.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/wireless/core.h 2011-11-15 20:03:00.000000000 -0500
@@ -27,7 +27,7 @@ struct cfg80211_registered_device {
struct mutex mtx;
@@ -75376,7 +75382,7 @@ diff -urNp linux-3.0.9/net/wireless/core.h linux-3.0.9/net/wireless/core.h
diff -urNp linux-3.0.9/net/wireless/wext-core.c linux-3.0.9/net/wireless/wext-core.c
--- linux-3.0.9/net/wireless/wext-core.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/wireless/wext-core.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/wireless/wext-core.c 2011-11-15 20:03:00.000000000 -0500
@@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc
*/
@@ -75412,7 +75418,7 @@ diff -urNp linux-3.0.9/net/wireless/wext-core.c linux-3.0.9/net/wireless/wext-co
iwp->length += essid_compat;
diff -urNp linux-3.0.9/net/xfrm/xfrm_policy.c linux-3.0.9/net/xfrm/xfrm_policy.c
--- linux-3.0.9/net/xfrm/xfrm_policy.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/xfrm/xfrm_policy.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/xfrm/xfrm_policy.c 2011-11-15 20:03:00.000000000 -0500
@@ -299,7 +299,7 @@ static void xfrm_policy_kill(struct xfrm
{
policy->walk.dead = 1;
@@ -75487,7 +75493,7 @@ diff -urNp linux-3.0.9/net/xfrm/xfrm_policy.c linux-3.0.9/net/xfrm/xfrm_policy.c
diff -urNp linux-3.0.9/net/xfrm/xfrm_user.c linux-3.0.9/net/xfrm/xfrm_user.c
--- linux-3.0.9/net/xfrm/xfrm_user.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/net/xfrm/xfrm_user.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/net/xfrm/xfrm_user.c 2011-11-15 20:03:00.000000000 -0500
@@ -1394,6 +1394,8 @@ static int copy_to_user_tmpl(struct xfrm
struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH];
int i;
@@ -75508,7 +75514,7 @@ diff -urNp linux-3.0.9/net/xfrm/xfrm_user.c linux-3.0.9/net/xfrm/xfrm_user.c
diff -urNp linux-3.0.9/scripts/basic/fixdep.c linux-3.0.9/scripts/basic/fixdep.c
--- linux-3.0.9/scripts/basic/fixdep.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/basic/fixdep.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/scripts/basic/fixdep.c 2011-11-15 20:03:00.000000000 -0500
@@ -161,7 +161,7 @@ static unsigned int strhash(const char *
/*
* Lookup a value in the configuration string.
@@ -75554,13 +75560,13 @@ diff -urNp linux-3.0.9/scripts/basic/fixdep.c linux-3.0.9/scripts/basic/fixdep.c
fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
diff -urNp linux-3.0.9/scripts/gcc-plugin.sh linux-3.0.9/scripts/gcc-plugin.sh
--- linux-3.0.9/scripts/gcc-plugin.sh 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/scripts/gcc-plugin.sh 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/scripts/gcc-plugin.sh 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "#include \"gcc-plugin.h\"\n#include \"rtl.h\"" | $1 -x c -shared - -o /dev/null -I`$2 -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y"
diff -urNp linux-3.0.9/scripts/Makefile.build linux-3.0.9/scripts/Makefile.build
--- linux-3.0.9/scripts/Makefile.build 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/Makefile.build 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/scripts/Makefile.build 2011-11-15 20:03:00.000000000 -0500
@@ -109,7 +109,7 @@ endif
endif
@@ -75572,7 +75578,7 @@ diff -urNp linux-3.0.9/scripts/Makefile.build linux-3.0.9/scripts/Makefile.build
diff -urNp linux-3.0.9/scripts/Makefile.clean linux-3.0.9/scripts/Makefile.clean
--- linux-3.0.9/scripts/Makefile.clean 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/Makefile.clean 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/scripts/Makefile.clean 2011-11-15 20:03:00.000000000 -0500
@@ -43,7 +43,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subd
__clean-files := $(extra-y) $(always) \
$(targets) $(clean-files) \
@@ -75585,7 +75591,7 @@ diff -urNp linux-3.0.9/scripts/Makefile.clean linux-3.0.9/scripts/Makefile.clean
diff -urNp linux-3.0.9/scripts/Makefile.host linux-3.0.9/scripts/Makefile.host
--- linux-3.0.9/scripts/Makefile.host 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/Makefile.host 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/scripts/Makefile.host 2011-11-15 20:03:00.000000000 -0500
@@ -31,6 +31,7 @@
# Note: Shared libraries consisting of C++ files are not supported
@@ -75604,7 +75610,7 @@ diff -urNp linux-3.0.9/scripts/Makefile.host linux-3.0.9/scripts/Makefile.host
diff -urNp linux-3.0.9/scripts/mod/file2alias.c linux-3.0.9/scripts/mod/file2alias.c
--- linux-3.0.9/scripts/mod/file2alias.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/mod/file2alias.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/scripts/mod/file2alias.c 2011-11-15 20:03:00.000000000 -0500
@@ -72,7 +72,7 @@ static void device_id_check(const char *
unsigned long size, unsigned long id_size,
void *symval)
@@ -75670,7 +75676,7 @@ diff -urNp linux-3.0.9/scripts/mod/file2alias.c linux-3.0.9/scripts/mod/file2ali
diff -urNp linux-3.0.9/scripts/mod/modpost.c linux-3.0.9/scripts/mod/modpost.c
--- linux-3.0.9/scripts/mod/modpost.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/mod/modpost.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/scripts/mod/modpost.c 2011-11-15 20:03:00.000000000 -0500
@@ -892,6 +892,7 @@ enum mismatch {
ANY_INIT_TO_ANY_EXIT,
ANY_EXIT_TO_ANY_INIT,
@@ -75749,7 +75755,7 @@ diff -urNp linux-3.0.9/scripts/mod/modpost.c linux-3.0.9/scripts/mod/modpost.c
tmp = NOFAIL(malloc(b->pos));
diff -urNp linux-3.0.9/scripts/mod/modpost.h linux-3.0.9/scripts/mod/modpost.h
--- linux-3.0.9/scripts/mod/modpost.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/mod/modpost.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/scripts/mod/modpost.h 2011-11-15 20:03:00.000000000 -0500
@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
struct buffer {
@@ -75771,7 +75777,7 @@ diff -urNp linux-3.0.9/scripts/mod/modpost.h linux-3.0.9/scripts/mod/modpost.h
struct module *next;
diff -urNp linux-3.0.9/scripts/mod/sumversion.c linux-3.0.9/scripts/mod/sumversion.c
--- linux-3.0.9/scripts/mod/sumversion.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/mod/sumversion.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/scripts/mod/sumversion.c 2011-11-15 20:03:00.000000000 -0500
@@ -470,7 +470,7 @@ static void write_version(const char *fi
goto out;
}
@@ -75783,7 +75789,7 @@ diff -urNp linux-3.0.9/scripts/mod/sumversion.c linux-3.0.9/scripts/mod/sumversi
goto out;
diff -urNp linux-3.0.9/scripts/pnmtologo.c linux-3.0.9/scripts/pnmtologo.c
--- linux-3.0.9/scripts/pnmtologo.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/scripts/pnmtologo.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/scripts/pnmtologo.c 2011-11-15 20:03:00.000000000 -0500
@@ -237,14 +237,14 @@ static void write_header(void)
fprintf(out, " * Linux logo %s\n", logoname);
fputs(" */\n\n", out);
@@ -75812,7 +75818,7 @@ diff -urNp linux-3.0.9/scripts/pnmtologo.c linux-3.0.9/scripts/pnmtologo.c
for (i = 0; i < logo_clutsize; i++) {
diff -urNp linux-3.0.9/security/apparmor/lsm.c linux-3.0.9/security/apparmor/lsm.c
--- linux-3.0.9/security/apparmor/lsm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/apparmor/lsm.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/apparmor/lsm.c 2011-11-15 20:03:00.000000000 -0500
@@ -621,7 +621,7 @@ static int apparmor_task_setrlimit(struc
return error;
}
@@ -75824,7 +75830,7 @@ diff -urNp linux-3.0.9/security/apparmor/lsm.c linux-3.0.9/security/apparmor/lsm
.ptrace_access_check = apparmor_ptrace_access_check,
diff -urNp linux-3.0.9/security/commoncap.c linux-3.0.9/security/commoncap.c
--- linux-3.0.9/security/commoncap.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/commoncap.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/commoncap.c 2011-11-15 20:03:00.000000000 -0500
@@ -28,6 +28,7 @@
#include <linux/prctl.h>
#include <linux/securebits.h>
@@ -75854,7 +75860,7 @@ diff -urNp linux-3.0.9/security/commoncap.c linux-3.0.9/security/commoncap.c
return 1;
diff -urNp linux-3.0.9/security/integrity/ima/ima_api.c linux-3.0.9/security/integrity/ima/ima_api.c
--- linux-3.0.9/security/integrity/ima/ima_api.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/integrity/ima/ima_api.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/integrity/ima/ima_api.c 2011-11-15 20:03:00.000000000 -0500
@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
int result;
@@ -75866,7 +75872,7 @@ diff -urNp linux-3.0.9/security/integrity/ima/ima_api.c linux-3.0.9/security/int
if (!entry) {
diff -urNp linux-3.0.9/security/integrity/ima/ima_fs.c linux-3.0.9/security/integrity/ima/ima_fs.c
--- linux-3.0.9/security/integrity/ima/ima_fs.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/integrity/ima/ima_fs.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/integrity/ima/ima_fs.c 2011-11-15 20:03:00.000000000 -0500
@@ -28,12 +28,12 @@
static int valid_policy = 1;
#define TMPBUFLEN 12
@@ -75884,7 +75890,7 @@ diff -urNp linux-3.0.9/security/integrity/ima/ima_fs.c linux-3.0.9/security/inte
diff -urNp linux-3.0.9/security/integrity/ima/ima.h linux-3.0.9/security/integrity/ima/ima.h
--- linux-3.0.9/security/integrity/ima/ima.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/integrity/ima/ima.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/integrity/ima/ima.h 2011-11-15 20:03:00.000000000 -0500
@@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino
extern spinlock_t ima_queue_lock;
@@ -75898,7 +75904,7 @@ diff -urNp linux-3.0.9/security/integrity/ima/ima.h linux-3.0.9/security/integri
extern struct ima_h_table ima_htable;
diff -urNp linux-3.0.9/security/integrity/ima/ima_queue.c linux-3.0.9/security/integrity/ima/ima_queue.c
--- linux-3.0.9/security/integrity/ima/ima_queue.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/integrity/ima/ima_queue.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/integrity/ima/ima_queue.c 2011-11-15 20:03:00.000000000 -0500
@@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i
INIT_LIST_HEAD(&qe->later);
list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -75910,7 +75916,7 @@ diff -urNp linux-3.0.9/security/integrity/ima/ima_queue.c linux-3.0.9/security/i
return 0;
diff -urNp linux-3.0.9/security/Kconfig linux-3.0.9/security/Kconfig
--- linux-3.0.9/security/Kconfig 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/Kconfig 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/Kconfig 2011-11-15 20:03:00.000000000 -0500
@@ -4,6 +4,558 @@
menu "Security options"
@@ -76481,7 +76487,7 @@ diff -urNp linux-3.0.9/security/Kconfig linux-3.0.9/security/Kconfig
This is the portion of low virtual memory which should be protected
diff -urNp linux-3.0.9/security/keys/compat.c linux-3.0.9/security/keys/compat.c
--- linux-3.0.9/security/keys/compat.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/keys/compat.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/keys/compat.c 2011-11-15 20:03:00.000000000 -0500
@@ -44,7 +44,7 @@ long compat_keyctl_instantiate_key_iov(
if (ret == 0)
goto no_payload_free;
@@ -76493,7 +76499,7 @@ diff -urNp linux-3.0.9/security/keys/compat.c linux-3.0.9/security/keys/compat.c
kfree(iov);
diff -urNp linux-3.0.9/security/keys/keyctl.c linux-3.0.9/security/keys/keyctl.c
--- linux-3.0.9/security/keys/keyctl.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/keys/keyctl.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/keys/keyctl.c 2011-11-15 20:03:00.000000000 -0500
@@ -921,7 +921,7 @@ static int keyctl_change_reqkey_auth(str
/*
* Copy the iovec data from userspace
@@ -76532,7 +76538,7 @@ diff -urNp linux-3.0.9/security/keys/keyctl.c linux-3.0.9/security/keys/keyctl.c
kfree(iov);
diff -urNp linux-3.0.9/security/keys/keyring.c linux-3.0.9/security/keys/keyring.c
--- linux-3.0.9/security/keys/keyring.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/keys/keyring.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/keys/keyring.c 2011-11-15 20:03:00.000000000 -0500
@@ -215,15 +215,15 @@ static long keyring_read(const struct ke
ret = -EFAULT;
@@ -76554,7 +76560,7 @@ diff -urNp linux-3.0.9/security/keys/keyring.c linux-3.0.9/security/keys/keyring
buflen -= tmp;
diff -urNp linux-3.0.9/security/min_addr.c linux-3.0.9/security/min_addr.c
--- linux-3.0.9/security/min_addr.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/min_addr.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/min_addr.c 2011-11-15 20:03:00.000000000 -0500
@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
*/
static void update_mmap_min_addr(void)
@@ -76573,7 +76579,7 @@ diff -urNp linux-3.0.9/security/min_addr.c linux-3.0.9/security/min_addr.c
/*
diff -urNp linux-3.0.9/security/security.c linux-3.0.9/security/security.c
--- linux-3.0.9/security/security.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/security.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/security.c 2011-11-15 20:03:00.000000000 -0500
@@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI
/* things that live in capability.c */
extern void __init security_fixup_ops(struct security_operations *ops);
@@ -76597,7 +76603,7 @@ diff -urNp linux-3.0.9/security/security.c linux-3.0.9/security/security.c
/* Save user chosen LSM */
diff -urNp linux-3.0.9/security/selinux/hooks.c linux-3.0.9/security/selinux/hooks.c
--- linux-3.0.9/security/selinux/hooks.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/selinux/hooks.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/selinux/hooks.c 2011-11-15 20:03:00.000000000 -0500
@@ -93,7 +93,6 @@
#define NUM_SEL_MNT_OPTS 5
@@ -76617,7 +76623,7 @@ diff -urNp linux-3.0.9/security/selinux/hooks.c linux-3.0.9/security/selinux/hoo
.ptrace_access_check = selinux_ptrace_access_check,
diff -urNp linux-3.0.9/security/selinux/include/xfrm.h linux-3.0.9/security/selinux/include/xfrm.h
--- linux-3.0.9/security/selinux/include/xfrm.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/selinux/include/xfrm.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/selinux/include/xfrm.h 2011-11-15 20:03:00.000000000 -0500
@@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s
static inline void selinux_xfrm_notify_policyload(void)
@@ -76629,7 +76635,7 @@ diff -urNp linux-3.0.9/security/selinux/include/xfrm.h linux-3.0.9/security/seli
static inline int selinux_xfrm_enabled(void)
diff -urNp linux-3.0.9/security/selinux/ss/services.c linux-3.0.9/security/selinux/ss/services.c
--- linux-3.0.9/security/selinux/ss/services.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/selinux/ss/services.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/selinux/ss/services.c 2011-11-15 20:03:00.000000000 -0500
@@ -1814,6 +1814,8 @@ int security_load_policy(void *data, siz
int rc = 0;
struct policy_file file = { data, len }, *fp = &file;
@@ -76641,7 +76647,7 @@ diff -urNp linux-3.0.9/security/selinux/ss/services.c linux-3.0.9/security/selin
rc = policydb_read(&policydb, fp);
diff -urNp linux-3.0.9/security/smack/smack_lsm.c linux-3.0.9/security/smack/smack_lsm.c
--- linux-3.0.9/security/smack/smack_lsm.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/smack/smack_lsm.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/smack/smack_lsm.c 2011-11-15 20:03:00.000000000 -0500
@@ -3392,7 +3392,7 @@ static int smack_inode_getsecctx(struct
return 0;
}
@@ -76653,7 +76659,7 @@ diff -urNp linux-3.0.9/security/smack/smack_lsm.c linux-3.0.9/security/smack/sma
.ptrace_access_check = smack_ptrace_access_check,
diff -urNp linux-3.0.9/security/tomoyo/tomoyo.c linux-3.0.9/security/tomoyo/tomoyo.c
--- linux-3.0.9/security/tomoyo/tomoyo.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/security/tomoyo/tomoyo.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/security/tomoyo/tomoyo.c 2011-11-15 20:03:00.000000000 -0500
@@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa
* tomoyo_security_ops is a "struct security_operations" which is used for
* registering TOMOYO.
@@ -76665,7 +76671,7 @@ diff -urNp linux-3.0.9/security/tomoyo/tomoyo.c linux-3.0.9/security/tomoyo/tomo
.cred_prepare = tomoyo_cred_prepare,
diff -urNp linux-3.0.9/sound/aoa/codecs/onyx.c linux-3.0.9/sound/aoa/codecs/onyx.c
--- linux-3.0.9/sound/aoa/codecs/onyx.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/aoa/codecs/onyx.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/aoa/codecs/onyx.c 2011-11-15 20:03:00.000000000 -0500
@@ -54,7 +54,7 @@ struct onyx {
spdif_locked:1,
analog_locked:1,
@@ -76696,7 +76702,7 @@ diff -urNp linux-3.0.9/sound/aoa/codecs/onyx.c linux-3.0.9/sound/aoa/codecs/onyx
diff -urNp linux-3.0.9/sound/aoa/codecs/onyx.h linux-3.0.9/sound/aoa/codecs/onyx.h
--- linux-3.0.9/sound/aoa/codecs/onyx.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/aoa/codecs/onyx.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/aoa/codecs/onyx.h 2011-11-15 20:03:00.000000000 -0500
@@ -11,6 +11,7 @@
#include <linux/i2c.h>
#include <asm/pmac_low_i2c.h>
@@ -76707,7 +76713,7 @@ diff -urNp linux-3.0.9/sound/aoa/codecs/onyx.h linux-3.0.9/sound/aoa/codecs/onyx
diff -urNp linux-3.0.9/sound/core/oss/pcm_oss.c linux-3.0.9/sound/core/oss/pcm_oss.c
--- linux-3.0.9/sound/core/oss/pcm_oss.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/core/oss/pcm_oss.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/core/oss/pcm_oss.c 2011-11-15 20:03:00.000000000 -0500
@@ -1189,10 +1189,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(str
if (in_kernel) {
mm_segment_t fs;
@@ -76781,7 +76787,7 @@ diff -urNp linux-3.0.9/sound/core/oss/pcm_oss.c linux-3.0.9/sound/core/oss/pcm_o
} else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
diff -urNp linux-3.0.9/sound/core/pcm_compat.c linux-3.0.9/sound/core/pcm_compat.c
--- linux-3.0.9/sound/core/pcm_compat.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/core/pcm_compat.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/core/pcm_compat.c 2011-11-15 20:03:00.000000000 -0500
@@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(st
int err;
@@ -76793,7 +76799,7 @@ diff -urNp linux-3.0.9/sound/core/pcm_compat.c linux-3.0.9/sound/core/pcm_compat
return err;
diff -urNp linux-3.0.9/sound/core/pcm_native.c linux-3.0.9/sound/core/pcm_native.c
--- linux-3.0.9/sound/core/pcm_native.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/core/pcm_native.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/core/pcm_native.c 2011-11-15 20:03:00.000000000 -0500
@@ -2770,11 +2770,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_
switch (substream->stream) {
case SNDRV_PCM_STREAM_PLAYBACK:
@@ -76810,7 +76816,7 @@ diff -urNp linux-3.0.9/sound/core/pcm_native.c linux-3.0.9/sound/core/pcm_native
result = -EINVAL;
diff -urNp linux-3.0.9/sound/core/seq/seq_device.c linux-3.0.9/sound/core/seq/seq_device.c
--- linux-3.0.9/sound/core/seq/seq_device.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/core/seq/seq_device.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/core/seq/seq_device.c 2011-11-15 20:03:00.000000000 -0500
@@ -63,7 +63,7 @@ struct ops_list {
int argsize; /* argument size */
@@ -76849,7 +76855,7 @@ diff -urNp linux-3.0.9/sound/core/seq/seq_device.c linux-3.0.9/sound/core/seq/se
ops->num_init_devices--;
diff -urNp linux-3.0.9/sound/drivers/mts64.c linux-3.0.9/sound/drivers/mts64.c
--- linux-3.0.9/sound/drivers/mts64.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/drivers/mts64.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/drivers/mts64.c 2011-11-15 20:03:00.000000000 -0500
@@ -28,6 +28,7 @@
#include <sound/initval.h>
#include <sound/rawmidi.h>
@@ -76908,7 +76914,7 @@ diff -urNp linux-3.0.9/sound/drivers/mts64.c linux-3.0.9/sound/drivers/mts64.c
}
diff -urNp linux-3.0.9/sound/drivers/opl4/opl4_lib.c linux-3.0.9/sound/drivers/opl4/opl4_lib.c
--- linux-3.0.9/sound/drivers/opl4/opl4_lib.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/drivers/opl4/opl4_lib.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/drivers/opl4/opl4_lib.c 2011-11-15 20:03:00.000000000 -0500
@@ -28,7 +28,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@
MODULE_DESCRIPTION("OPL4 driver");
MODULE_LICENSE("GPL");
@@ -76920,7 +76926,7 @@ diff -urNp linux-3.0.9/sound/drivers/opl4/opl4_lib.c linux-3.0.9/sound/drivers/o
while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
diff -urNp linux-3.0.9/sound/drivers/portman2x4.c linux-3.0.9/sound/drivers/portman2x4.c
--- linux-3.0.9/sound/drivers/portman2x4.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/drivers/portman2x4.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/drivers/portman2x4.c 2011-11-15 20:03:00.000000000 -0500
@@ -47,6 +47,7 @@
#include <sound/initval.h>
#include <sound/rawmidi.h>
@@ -76940,7 +76946,7 @@ diff -urNp linux-3.0.9/sound/drivers/portman2x4.c linux-3.0.9/sound/drivers/port
};
diff -urNp linux-3.0.9/sound/firewire/amdtp.c linux-3.0.9/sound/firewire/amdtp.c
--- linux-3.0.9/sound/firewire/amdtp.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/firewire/amdtp.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/firewire/amdtp.c 2011-11-15 20:03:00.000000000 -0500
@@ -371,7 +371,7 @@ static void queue_out_packet(struct amdt
ptr = s->pcm_buffer_pointer + data_blocks;
if (ptr >= pcm->runtime->buffer_size)
@@ -76961,7 +76967,7 @@ diff -urNp linux-3.0.9/sound/firewire/amdtp.c linux-3.0.9/sound/firewire/amdtp.c
EXPORT_SYMBOL(amdtp_out_stream_update);
diff -urNp linux-3.0.9/sound/firewire/amdtp.h linux-3.0.9/sound/firewire/amdtp.h
--- linux-3.0.9/sound/firewire/amdtp.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/firewire/amdtp.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/firewire/amdtp.h 2011-11-15 20:03:00.000000000 -0500
@@ -146,7 +146,7 @@ static inline void amdtp_out_stream_pcm_
static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
struct snd_pcm_substream *pcm)
@@ -76973,7 +76979,7 @@ diff -urNp linux-3.0.9/sound/firewire/amdtp.h linux-3.0.9/sound/firewire/amdtp.h
/**
diff -urNp linux-3.0.9/sound/firewire/isight.c linux-3.0.9/sound/firewire/isight.c
--- linux-3.0.9/sound/firewire/isight.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/firewire/isight.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/firewire/isight.c 2011-11-15 20:03:00.000000000 -0500
@@ -97,7 +97,7 @@ static void isight_update_pointers(struc
ptr += count;
if (ptr >= runtime->buffer_size)
@@ -77016,7 +77022,7 @@ diff -urNp linux-3.0.9/sound/firewire/isight.c linux-3.0.9/sound/firewire/isight
return -EINVAL;
diff -urNp linux-3.0.9/sound/isa/cmi8330.c linux-3.0.9/sound/isa/cmi8330.c
--- linux-3.0.9/sound/isa/cmi8330.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/isa/cmi8330.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/isa/cmi8330.c 2011-11-15 20:03:00.000000000 -0500
@@ -172,7 +172,7 @@ struct snd_cmi8330 {
struct snd_pcm *pcm;
@@ -77028,7 +77034,7 @@ diff -urNp linux-3.0.9/sound/isa/cmi8330.c linux-3.0.9/sound/isa/cmi8330.c
} streams[2];
diff -urNp linux-3.0.9/sound/oss/sb_audio.c linux-3.0.9/sound/oss/sb_audio.c
--- linux-3.0.9/sound/oss/sb_audio.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/oss/sb_audio.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/oss/sb_audio.c 2011-11-15 20:03:00.000000000 -0500
@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
buf16 = (signed short *)(localbuf + localoffs);
while (c)
@@ -77040,7 +77046,7 @@ diff -urNp linux-3.0.9/sound/oss/sb_audio.c linux-3.0.9/sound/oss/sb_audio.c
locallen))
diff -urNp linux-3.0.9/sound/oss/swarm_cs4297a.c linux-3.0.9/sound/oss/swarm_cs4297a.c
--- linux-3.0.9/sound/oss/swarm_cs4297a.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/oss/swarm_cs4297a.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/oss/swarm_cs4297a.c 2011-11-15 20:03:00.000000000 -0500
@@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
{
struct cs4297a_state *s;
@@ -77077,7 +77083,7 @@ diff -urNp linux-3.0.9/sound/oss/swarm_cs4297a.c linux-3.0.9/sound/oss/swarm_cs4
diff -urNp linux-3.0.9/sound/pci/hda/hda_codec.h linux-3.0.9/sound/pci/hda/hda_codec.h
--- linux-3.0.9/sound/pci/hda/hda_codec.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/pci/hda/hda_codec.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/pci/hda/hda_codec.h 2011-11-15 20:03:00.000000000 -0500
@@ -615,7 +615,7 @@ struct hda_bus_ops {
/* notify power-up/down from codec to controller */
void (*pm_notify)(struct hda_bus *bus);
@@ -77115,7 +77121,7 @@ diff -urNp linux-3.0.9/sound/pci/hda/hda_codec.h linux-3.0.9/sound/pci/hda/hda_c
unsigned int num_pcms;
diff -urNp linux-3.0.9/sound/pci/ice1712/ice1712.h linux-3.0.9/sound/pci/ice1712/ice1712.h
--- linux-3.0.9/sound/pci/ice1712/ice1712.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/pci/ice1712/ice1712.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/pci/ice1712/ice1712.h 2011-11-15 20:03:00.000000000 -0500
@@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
unsigned int mask_flags; /* total mask bits */
struct snd_akm4xxx_ops {
@@ -77136,7 +77142,7 @@ diff -urNp linux-3.0.9/sound/pci/ice1712/ice1712.h linux-3.0.9/sound/pci/ice1712
diff -urNp linux-3.0.9/sound/pci/ymfpci/ymfpci_main.c linux-3.0.9/sound/pci/ymfpci/ymfpci_main.c
--- linux-3.0.9/sound/pci/ymfpci/ymfpci_main.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/pci/ymfpci/ymfpci_main.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/pci/ymfpci/ymfpci_main.c 2011-11-15 20:03:00.000000000 -0500
@@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn
if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
break;
@@ -77179,7 +77185,7 @@ diff -urNp linux-3.0.9/sound/pci/ymfpci/ymfpci_main.c linux-3.0.9/sound/pci/ymfp
chip->irq = -1;
diff -urNp linux-3.0.9/sound/soc/soc-core.c linux-3.0.9/sound/soc/soc-core.c
--- linux-3.0.9/sound/soc/soc-core.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/soc/soc-core.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/soc/soc-core.c 2011-11-15 20:03:00.000000000 -0500
@@ -1021,7 +1021,7 @@ static snd_pcm_uframes_t soc_pcm_pointer
}
@@ -77199,7 +77205,7 @@ diff -urNp linux-3.0.9/sound/soc/soc-core.c linux-3.0.9/sound/soc/soc-core.c
soc_pcm_ops.ioctl = platform->driver->ops->ioctl;
diff -urNp linux-3.0.9/sound/usb/card.h linux-3.0.9/sound/usb/card.h
--- linux-3.0.9/sound/usb/card.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/sound/usb/card.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/sound/usb/card.h 2011-11-15 20:03:00.000000000 -0500
@@ -44,6 +44,7 @@ struct snd_urb_ops {
int (*prepare_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
int (*retire_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
@@ -77219,7 +77225,7 @@ diff -urNp linux-3.0.9/sound/usb/card.h linux-3.0.9/sound/usb/card.h
struct snd_usb_stream {
diff -urNp linux-3.0.9/tools/gcc/checker_plugin.c linux-3.0.9/tools/gcc/checker_plugin.c
--- linux-3.0.9/tools/gcc/checker_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/tools/gcc/checker_plugin.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/tools/gcc/checker_plugin.c 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -77392,7 +77398,7 @@ diff -urNp linux-3.0.9/tools/gcc/checker_plugin.c linux-3.0.9/tools/gcc/checker_
+}
diff -urNp linux-3.0.9/tools/gcc/constify_plugin.c linux-3.0.9/tools/gcc/constify_plugin.c
--- linux-3.0.9/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/tools/gcc/constify_plugin.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/tools/gcc/constify_plugin.c 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,293 @@
+/*
+ * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
@@ -77689,7 +77695,7 @@ diff -urNp linux-3.0.9/tools/gcc/constify_plugin.c linux-3.0.9/tools/gcc/constif
+}
diff -urNp linux-3.0.9/tools/gcc/kallocstat_plugin.c linux-3.0.9/tools/gcc/kallocstat_plugin.c
--- linux-3.0.9/tools/gcc/kallocstat_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/tools/gcc/kallocstat_plugin.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/tools/gcc/kallocstat_plugin.c 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -77858,7 +77864,7 @@ diff -urNp linux-3.0.9/tools/gcc/kallocstat_plugin.c linux-3.0.9/tools/gcc/kallo
+}
diff -urNp linux-3.0.9/tools/gcc/kernexec_plugin.c linux-3.0.9/tools/gcc/kernexec_plugin.c
--- linux-3.0.9/tools/gcc/kernexec_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/tools/gcc/kernexec_plugin.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/tools/gcc/kernexec_plugin.c 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,273 @@
+/*
+ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -78135,7 +78141,7 @@ diff -urNp linux-3.0.9/tools/gcc/kernexec_plugin.c linux-3.0.9/tools/gcc/kernexe
+}
diff -urNp linux-3.0.9/tools/gcc/Makefile linux-3.0.9/tools/gcc/Makefile
--- linux-3.0.9/tools/gcc/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/tools/gcc/Makefile 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/tools/gcc/Makefile 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,21 @@
+#CC := gcc
+#PLUGIN_SOURCE_FILES := pax_plugin.c
@@ -78160,7 +78166,7 @@ diff -urNp linux-3.0.9/tools/gcc/Makefile linux-3.0.9/tools/gcc/Makefile
+checker_plugin-objs := checker_plugin.o
diff -urNp linux-3.0.9/tools/gcc/stackleak_plugin.c linux-3.0.9/tools/gcc/stackleak_plugin.c
--- linux-3.0.9/tools/gcc/stackleak_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.9/tools/gcc/stackleak_plugin.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/tools/gcc/stackleak_plugin.c 2011-11-15 20:03:00.000000000 -0500
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -78415,7 +78421,7 @@ diff -urNp linux-3.0.9/tools/gcc/stackleak_plugin.c linux-3.0.9/tools/gcc/stackl
+}
diff -urNp linux-3.0.9/tools/perf/util/include/asm/alternative-asm.h linux-3.0.9/tools/perf/util/include/asm/alternative-asm.h
--- linux-3.0.9/tools/perf/util/include/asm/alternative-asm.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/tools/perf/util/include/asm/alternative-asm.h 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/tools/perf/util/include/asm/alternative-asm.h 2011-11-15 20:03:00.000000000 -0500
@@ -5,4 +5,7 @@
#define altinstruction_entry #
@@ -78426,7 +78432,7 @@ diff -urNp linux-3.0.9/tools/perf/util/include/asm/alternative-asm.h linux-3.0.9
#endif
diff -urNp linux-3.0.9/usr/gen_init_cpio.c linux-3.0.9/usr/gen_init_cpio.c
--- linux-3.0.9/usr/gen_init_cpio.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/usr/gen_init_cpio.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/usr/gen_init_cpio.c 2011-11-15 20:03:00.000000000 -0500
@@ -303,7 +303,7 @@ static int cpio_mkfile(const char *name,
int retval;
int rc = -1;
@@ -78451,7 +78457,7 @@ diff -urNp linux-3.0.9/usr/gen_init_cpio.c linux-3.0.9/usr/gen_init_cpio.c
}
diff -urNp linux-3.0.9/virt/kvm/kvm_main.c linux-3.0.9/virt/kvm/kvm_main.c
--- linux-3.0.9/virt/kvm/kvm_main.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/virt/kvm/kvm_main.c 2011-11-12 12:47:14.000000000 -0500
++++ linux-3.0.9/virt/kvm/kvm_main.c 2011-11-15 20:03:00.000000000 -0500
@@ -73,7 +73,7 @@ LIST_HEAD(vm_list);
static cpumask_var_t cpus_hardware_enabled;