aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-04-05 13:25:51 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-04-14 12:21:43 +0000
commit6dd7139df647443641f5a1a6bddc77a93e64d697 (patch)
tree8522450844b22767510247926fad0e805cbbe27f
parentdaf17465a418f319f39f5f20291d50c976a2626c (diff)
downloadalpine_aports-6dd7139df647443641f5a1a6bddc77a93e64d697.tar.bz2
alpine_aports-6dd7139df647443641f5a1a6bddc77a93e64d697.tar.xz
alpine_aports-6dd7139df647443641f5a1a6bddc77a93e64d697.zip
main/linux-grsec: upgrade to 2.1.14-2.6.32.11-201004042103
(cherry picked from commit fe31e627840a365383467b9373a818637255b2c4)
Diffstat
-rw-r--r--main/linux-grsec/APKBUILD10
-rw-r--r--main/linux-grsec/grsecurity-2.1.14-2.6.32.11-201004042103.patch (renamed from main/linux-grsec/grsecurity-2.1.14-2.6.32.10-201003211638.patch)8541
2 files changed, 4898 insertions, 3653 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 4d3765468d..0e93993e87 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,9 +2,9 @@
2 2
3_flavor=grsec 3_flavor=grsec
4pkgname=linux-${_flavor} 4pkgname=linux-${_flavor}
5pkgver=2.6.32.10 5pkgver=2.6.32.11
6_kernver=2.6.32 6_kernver=2.6.32
7pkgrel=1 7pkgrel=0
8pkgdesc="Linux kernel with grsecurity" 8pkgdesc="Linux kernel with grsecurity"
9url=http://grsecurity.net 9url=http://grsecurity.net
10depends="mkinitfs linux-firmware" 10depends="mkinitfs linux-firmware"
@@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
14install= 14install=
15source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 15source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
16 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 16 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
17 grsecurity-2.1.14-2.6.32.10-201003211638.patch 17 grsecurity-2.1.14-2.6.32.11-201004042103.patch
18 ip_gre.patch 18 ip_gre.patch
19 ip_gre2.patch 19 ip_gre2.patch
20 arp.patch 20 arp.patch
@@ -125,8 +125,8 @@ firmware() {
125} 125}
126 126
127md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 127md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
1280f1863836bf96fd0aab128d61eaa5693 patch-2.6.32.10.bz2 128855c248334a71ef5ca3d8cb89d51334f patch-2.6.32.11.bz2
129a1959ececf64be61488ed84d0252c053 grsecurity-2.1.14-2.6.32.10-201003211638.patch 12986fc90c3b2821a5dc0df726893c63297 grsecurity-2.1.14-2.6.32.11-201004042103.patch
1303ef822f3a2723b9a80c3f12954457225 ip_gre.patch 1303ef822f3a2723b9a80c3f12954457225 ip_gre.patch
13113ca9e91700e459da269c957062bbea7 ip_gre2.patch 13113ca9e91700e459da269c957062bbea7 ip_gre2.patch
1324c39a161d918e7f274292ecfd168b891 arp.patch 1324c39a161d918e7f274292ecfd168b891 arp.patch
diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.32.10-201003211638.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.32.11-201004042103.patch
index f2a180b8f1..77ce387829 100644
--- a/main/linux-grsec/grsecurity-2.1.14-2.6.32.10-201003211638.patch
+++ b/main/linux-grsec/grsecurity-2.1.14-2.6.32.11-201004042103.patch
@@ -1,6 +1,6 @@
1diff -urNp linux-2.6.32.10/arch/alpha/include/asm/elf.h linux-2.6.32.10/arch/alpha/include/asm/elf.h 1diff -urNp linux-2.6.32.11/arch/alpha/include/asm/elf.h linux-2.6.32.11/arch/alpha/include/asm/elf.h
2--- linux-2.6.32.10/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 2--- linux-2.6.32.11/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
3+++ linux-2.6.32.10/arch/alpha/include/asm/elf.h 2010-03-20 15:58:45.636971023 -0400 3+++ linux-2.6.32.11/arch/alpha/include/asm/elf.h 2010-04-04 20:46:41.472784147 -0400
4@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N 4@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
5 5
6 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) 6 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
@@ -15,9 +15,9 @@ diff -urNp linux-2.6.32.10/arch/alpha/include/asm/elf.h linux-2.6.32.10/arch/alp
15 /* $0 is set by ld.so to a pointer to a function which might be 15 /* $0 is set by ld.so to a pointer to a function which might be
16 registered using atexit. This provides a mean for the dynamic 16 registered using atexit. This provides a mean for the dynamic
17 linker to call DT_FINI functions for shared libraries that have 17 linker to call DT_FINI functions for shared libraries that have
18diff -urNp linux-2.6.32.10/arch/alpha/include/asm/pgtable.h linux-2.6.32.10/arch/alpha/include/asm/pgtable.h 18diff -urNp linux-2.6.32.11/arch/alpha/include/asm/pgtable.h linux-2.6.32.11/arch/alpha/include/asm/pgtable.h
19--- linux-2.6.32.10/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 19--- linux-2.6.32.11/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
20+++ linux-2.6.32.10/arch/alpha/include/asm/pgtable.h 2010-03-20 15:58:45.636971023 -0400 20+++ linux-2.6.32.11/arch/alpha/include/asm/pgtable.h 2010-04-04 20:46:41.472784147 -0400
21@@ -101,6 +101,17 @@ struct vm_area_struct; 21@@ -101,6 +101,17 @@ struct vm_area_struct;
22 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) 22 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
23 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) 23 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -36,9 +36,9 @@ diff -urNp linux-2.6.32.10/arch/alpha/include/asm/pgtable.h linux-2.6.32.10/arch
36 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) 36 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
37 37
38 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) 38 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
39diff -urNp linux-2.6.32.10/arch/alpha/kernel/module.c linux-2.6.32.10/arch/alpha/kernel/module.c 39diff -urNp linux-2.6.32.11/arch/alpha/kernel/module.c linux-2.6.32.11/arch/alpha/kernel/module.c
40--- linux-2.6.32.10/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 40--- linux-2.6.32.11/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
41+++ linux-2.6.32.10/arch/alpha/kernel/module.c 2010-03-20 15:58:45.636971023 -0400 41+++ linux-2.6.32.11/arch/alpha/kernel/module.c 2010-04-04 20:46:41.472784147 -0400
42@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 42@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
43 43
44 /* The small sections were sorted to the end of the segment. 44 /* The small sections were sorted to the end of the segment.
@@ -48,9 +48,9 @@ diff -urNp linux-2.6.32.10/arch/alpha/kernel/module.c linux-2.6.32.10/arch/alpha
48 got = sechdrs[me->arch.gotsecindex].sh_addr; 48 got = sechdrs[me->arch.gotsecindex].sh_addr;
49 49
50 for (i = 0; i < n; i++) { 50 for (i = 0; i < n; i++) {
51diff -urNp linux-2.6.32.10/arch/alpha/kernel/osf_sys.c linux-2.6.32.10/arch/alpha/kernel/osf_sys.c 51diff -urNp linux-2.6.32.11/arch/alpha/kernel/osf_sys.c linux-2.6.32.11/arch/alpha/kernel/osf_sys.c
52--- linux-2.6.32.10/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400 52--- linux-2.6.32.11/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400
53+++ linux-2.6.32.10/arch/alpha/kernel/osf_sys.c 2010-03-20 15:58:45.636971023 -0400 53+++ linux-2.6.32.11/arch/alpha/kernel/osf_sys.c 2010-04-04 20:46:41.472784147 -0400
54@@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp 54@@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp
55 merely specific addresses, but regions of memory -- perhaps 55 merely specific addresses, but regions of memory -- perhaps
56 this feature should be incorporated into all ports? */ 56 this feature should be incorporated into all ports? */
@@ -73,9 +73,9 @@ diff -urNp linux-2.6.32.10/arch/alpha/kernel/osf_sys.c linux-2.6.32.10/arch/alph
73 if (addr != (unsigned long) -ENOMEM) 73 if (addr != (unsigned long) -ENOMEM)
74 return addr; 74 return addr;
75 75
76diff -urNp linux-2.6.32.10/arch/alpha/mm/fault.c linux-2.6.32.10/arch/alpha/mm/fault.c 76diff -urNp linux-2.6.32.11/arch/alpha/mm/fault.c linux-2.6.32.11/arch/alpha/mm/fault.c
77--- linux-2.6.32.10/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 77--- linux-2.6.32.11/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
78+++ linux-2.6.32.10/arch/alpha/mm/fault.c 2010-03-20 15:58:45.636971023 -0400 78+++ linux-2.6.32.11/arch/alpha/mm/fault.c 2010-04-04 20:46:41.472784147 -0400
79@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * 79@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
80 __reload_thread(pcb); 80 __reload_thread(pcb);
81 } 81 }
@@ -232,9 +232,9 @@ diff -urNp linux-2.6.32.10/arch/alpha/mm/fault.c linux-2.6.32.10/arch/alpha/mm/f
232 } else if (!cause) { 232 } else if (!cause) {
233 /* Allow reads even for write-only mappings */ 233 /* Allow reads even for write-only mappings */
234 if (!(vma->vm_flags & (VM_READ | VM_WRITE))) 234 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
235diff -urNp linux-2.6.32.10/arch/arm/include/asm/elf.h linux-2.6.32.10/arch/arm/include/asm/elf.h 235diff -urNp linux-2.6.32.11/arch/arm/include/asm/elf.h linux-2.6.32.11/arch/arm/include/asm/elf.h
236--- linux-2.6.32.10/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 236--- linux-2.6.32.11/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
237+++ linux-2.6.32.10/arch/arm/include/asm/elf.h 2010-03-20 15:58:45.636971023 -0400 237+++ linux-2.6.32.11/arch/arm/include/asm/elf.h 2010-04-04 20:46:41.472784147 -0400
238@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t 238@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
239 the loader. We need to make sure that it is out of the way of the program 239 the loader. We need to make sure that it is out of the way of the program
240 that it will "exec", and that there is sufficient room for the brk. */ 240 that it will "exec", and that there is sufficient room for the brk. */
@@ -251,9 +251,9 @@ diff -urNp linux-2.6.32.10/arch/arm/include/asm/elf.h linux-2.6.32.10/arch/arm/i
251 251
252 /* When the program starts, a1 contains a pointer to a function to be 252 /* When the program starts, a1 contains a pointer to a function to be
253 registered with atexit, as per the SVR4 ABI. A value of 0 means we 253 registered with atexit, as per the SVR4 ABI. A value of 0 means we
254diff -urNp linux-2.6.32.10/arch/arm/include/asm/kmap_types.h linux-2.6.32.10/arch/arm/include/asm/kmap_types.h 254diff -urNp linux-2.6.32.11/arch/arm/include/asm/kmap_types.h linux-2.6.32.11/arch/arm/include/asm/kmap_types.h
255--- linux-2.6.32.10/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 255--- linux-2.6.32.11/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
256+++ linux-2.6.32.10/arch/arm/include/asm/kmap_types.h 2010-03-20 15:58:45.636971023 -0400 256+++ linux-2.6.32.11/arch/arm/include/asm/kmap_types.h 2010-04-04 20:46:41.472784147 -0400
257@@ -19,6 +19,7 @@ enum km_type { 257@@ -19,6 +19,7 @@ enum km_type {
258 KM_SOFTIRQ0, 258 KM_SOFTIRQ0,
259 KM_SOFTIRQ1, 259 KM_SOFTIRQ1,
@@ -262,9 +262,9 @@ diff -urNp linux-2.6.32.10/arch/arm/include/asm/kmap_types.h linux-2.6.32.10/arc
262 KM_TYPE_NR 262 KM_TYPE_NR
263 }; 263 };
264 264
265diff -urNp linux-2.6.32.10/arch/arm/include/asm/uaccess.h linux-2.6.32.10/arch/arm/include/asm/uaccess.h 265diff -urNp linux-2.6.32.11/arch/arm/include/asm/uaccess.h linux-2.6.32.11/arch/arm/include/asm/uaccess.h
266--- linux-2.6.32.10/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 266--- linux-2.6.32.11/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
267+++ linux-2.6.32.10/arch/arm/include/asm/uaccess.h 2010-03-20 15:58:45.636971023 -0400 267+++ linux-2.6.32.11/arch/arm/include/asm/uaccess.h 2010-04-04 20:46:41.472784147 -0400
268@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn 268@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
269 269
270 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) 270 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -285,9 +285,9 @@ diff -urNp linux-2.6.32.10/arch/arm/include/asm/uaccess.h linux-2.6.32.10/arch/a
285 if (access_ok(VERIFY_WRITE, to, n)) 285 if (access_ok(VERIFY_WRITE, to, n))
286 n = __copy_to_user(to, from, n); 286 n = __copy_to_user(to, from, n);
287 return n; 287 return n;
288diff -urNp linux-2.6.32.10/arch/arm/kernel/kgdb.c linux-2.6.32.10/arch/arm/kernel/kgdb.c 288diff -urNp linux-2.6.32.11/arch/arm/kernel/kgdb.c linux-2.6.32.11/arch/arm/kernel/kgdb.c
289--- linux-2.6.32.10/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 289--- linux-2.6.32.11/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
290+++ linux-2.6.32.10/arch/arm/kernel/kgdb.c 2010-03-20 15:58:45.636971023 -0400 290+++ linux-2.6.32.11/arch/arm/kernel/kgdb.c 2010-04-04 20:46:41.472784147 -0400
291@@ -190,7 +190,7 @@ void kgdb_arch_exit(void) 291@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
292 * and we handle the normal undef case within the do_undefinstr 292 * and we handle the normal undef case within the do_undefinstr
293 * handler. 293 * handler.
@@ -297,9 +297,9 @@ diff -urNp linux-2.6.32.10/arch/arm/kernel/kgdb.c linux-2.6.32.10/arch/arm/kerne
297 #ifndef __ARMEB__ 297 #ifndef __ARMEB__
298 .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} 298 .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
299 #else /* ! __ARMEB__ */ 299 #else /* ! __ARMEB__ */
300diff -urNp linux-2.6.32.10/arch/arm/mach-at91/pm.c linux-2.6.32.10/arch/arm/mach-at91/pm.c 300diff -urNp linux-2.6.32.11/arch/arm/mach-at91/pm.c linux-2.6.32.11/arch/arm/mach-at91/pm.c
301--- linux-2.6.32.10/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400 301--- linux-2.6.32.11/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400
302+++ linux-2.6.32.10/arch/arm/mach-at91/pm.c 2010-03-20 15:58:45.636971023 -0400 302+++ linux-2.6.32.11/arch/arm/mach-at91/pm.c 2010-04-04 20:46:41.472784147 -0400
303@@ -348,7 +348,7 @@ static void at91_pm_end(void) 303@@ -348,7 +348,7 @@ static void at91_pm_end(void)
304 } 304 }
305 305
@@ -309,9 +309,9 @@ diff -urNp linux-2.6.32.10/arch/arm/mach-at91/pm.c linux-2.6.32.10/arch/arm/mach
309 .valid = at91_pm_valid_state, 309 .valid = at91_pm_valid_state,
310 .begin = at91_pm_begin, 310 .begin = at91_pm_begin,
311 .enter = at91_pm_enter, 311 .enter = at91_pm_enter,
312diff -urNp linux-2.6.32.10/arch/arm/mach-omap1/pm.c linux-2.6.32.10/arch/arm/mach-omap1/pm.c 312diff -urNp linux-2.6.32.11/arch/arm/mach-omap1/pm.c linux-2.6.32.11/arch/arm/mach-omap1/pm.c
313--- linux-2.6.32.10/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400 313--- linux-2.6.32.11/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400
314+++ linux-2.6.32.10/arch/arm/mach-omap1/pm.c 2010-03-20 15:58:45.636971023 -0400 314+++ linux-2.6.32.11/arch/arm/mach-omap1/pm.c 2010-04-04 20:46:41.472784147 -0400
315@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq 315@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
316 316
317 317
@@ -321,9 +321,9 @@ diff -urNp linux-2.6.32.10/arch/arm/mach-omap1/pm.c linux-2.6.32.10/arch/arm/mac
321 .prepare = omap_pm_prepare, 321 .prepare = omap_pm_prepare,
322 .enter = omap_pm_enter, 322 .enter = omap_pm_enter,
323 .finish = omap_pm_finish, 323 .finish = omap_pm_finish,
324diff -urNp linux-2.6.32.10/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.10/arch/arm/mach-omap2/pm24xx.c 324diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c
325--- linux-2.6.32.10/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400 325--- linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400
326+++ linux-2.6.32.10/arch/arm/mach-omap2/pm24xx.c 2010-03-20 15:58:45.636971023 -0400 326+++ linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c 2010-04-04 20:46:41.472784147 -0400
327@@ -326,7 +326,7 @@ static void omap2_pm_finish(void) 327@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
328 enable_hlt(); 328 enable_hlt();
329 } 329 }
@@ -333,9 +333,9 @@ diff -urNp linux-2.6.32.10/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.10/arch/arm
333 .prepare = omap2_pm_prepare, 333 .prepare = omap2_pm_prepare,
334 .enter = omap2_pm_enter, 334 .enter = omap2_pm_enter,
335 .finish = omap2_pm_finish, 335 .finish = omap2_pm_finish,
336diff -urNp linux-2.6.32.10/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.10/arch/arm/mach-omap2/pm34xx.c 336diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c
337--- linux-2.6.32.10/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400 337--- linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400
338+++ linux-2.6.32.10/arch/arm/mach-omap2/pm34xx.c 2010-03-20 15:58:45.640844875 -0400 338+++ linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c 2010-04-04 20:46:41.472784147 -0400
339@@ -401,7 +401,7 @@ static void omap3_pm_end(void) 339@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
340 return; 340 return;
341 } 341 }
@@ -345,9 +345,9 @@ diff -urNp linux-2.6.32.10/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.10/arch/arm
345 .begin = omap3_pm_begin, 345 .begin = omap3_pm_begin,
346 .end = omap3_pm_end, 346 .end = omap3_pm_end,
347 .prepare = omap3_pm_prepare, 347 .prepare = omap3_pm_prepare,
348diff -urNp linux-2.6.32.10/arch/arm/mach-pnx4008/pm.c linux-2.6.32.10/arch/arm/mach-pnx4008/pm.c 348diff -urNp linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c
349--- linux-2.6.32.10/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400 349--- linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400
350+++ linux-2.6.32.10/arch/arm/mach-pnx4008/pm.c 2010-03-20 15:58:45.640844875 -0400 350+++ linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c 2010-04-04 20:46:41.476773136 -0400
351@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat 351@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
352 (state == PM_SUSPEND_MEM); 352 (state == PM_SUSPEND_MEM);
353 } 353 }
@@ -357,9 +357,9 @@ diff -urNp linux-2.6.32.10/arch/arm/mach-pnx4008/pm.c linux-2.6.32.10/arch/arm/m
357 .enter = pnx4008_pm_enter, 357 .enter = pnx4008_pm_enter,
358 .valid = pnx4008_pm_valid, 358 .valid = pnx4008_pm_valid,
359 }; 359 };
360diff -urNp linux-2.6.32.10/arch/arm/mach-pxa/pm.c linux-2.6.32.10/arch/arm/mach-pxa/pm.c 360diff -urNp linux-2.6.32.11/arch/arm/mach-pxa/pm.c linux-2.6.32.11/arch/arm/mach-pxa/pm.c
361--- linux-2.6.32.10/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400 361--- linux-2.6.32.11/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400
362+++ linux-2.6.32.10/arch/arm/mach-pxa/pm.c 2010-03-20 15:58:45.640844875 -0400 362+++ linux-2.6.32.11/arch/arm/mach-pxa/pm.c 2010-04-04 20:46:41.476773136 -0400
363@@ -95,7 +95,7 @@ void pxa_pm_finish(void) 363@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
364 pxa_cpu_pm_fns->finish(); 364 pxa_cpu_pm_fns->finish();
365 } 365 }
@@ -369,9 +369,9 @@ diff -urNp linux-2.6.32.10/arch/arm/mach-pxa/pm.c linux-2.6.32.10/arch/arm/mach-
369 .valid = pxa_pm_valid, 369 .valid = pxa_pm_valid,
370 .enter = pxa_pm_enter, 370 .enter = pxa_pm_enter,
371 .prepare = pxa_pm_prepare, 371 .prepare = pxa_pm_prepare,
372diff -urNp linux-2.6.32.10/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.10/arch/arm/mach-pxa/sharpsl_pm.c 372diff -urNp linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c
373--- linux-2.6.32.10/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400 373--- linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400
374+++ linux-2.6.32.10/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-20 15:58:45.640844875 -0400 374+++ linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c 2010-04-04 20:46:41.476773136 -0400
375@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status 375@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
376 } 376 }
377 377
@@ -381,9 +381,9 @@ diff -urNp linux-2.6.32.10/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.10/arch/a
381 .prepare = pxa_pm_prepare, 381 .prepare = pxa_pm_prepare,
382 .finish = pxa_pm_finish, 382 .finish = pxa_pm_finish,
383 .enter = corgi_pxa_pm_enter, 383 .enter = corgi_pxa_pm_enter,
384diff -urNp linux-2.6.32.10/arch/arm/mach-sa1100/pm.c linux-2.6.32.10/arch/arm/mach-sa1100/pm.c 384diff -urNp linux-2.6.32.11/arch/arm/mach-sa1100/pm.c linux-2.6.32.11/arch/arm/mach-sa1100/pm.c
385--- linux-2.6.32.10/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400 385--- linux-2.6.32.11/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400
386+++ linux-2.6.32.10/arch/arm/mach-sa1100/pm.c 2010-03-20 15:58:45.640844875 -0400 386+++ linux-2.6.32.11/arch/arm/mach-sa1100/pm.c 2010-04-04 20:46:41.476773136 -0400
387@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) 387@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
388 return virt_to_phys(sp); 388 return virt_to_phys(sp);
389 } 389 }
@@ -393,9 +393,9 @@ diff -urNp linux-2.6.32.10/arch/arm/mach-sa1100/pm.c linux-2.6.32.10/arch/arm/ma
393 .enter = sa11x0_pm_enter, 393 .enter = sa11x0_pm_enter,
394 .valid = suspend_valid_only_mem, 394 .valid = suspend_valid_only_mem,
395 }; 395 };
396diff -urNp linux-2.6.32.10/arch/arm/mm/fault.c linux-2.6.32.10/arch/arm/mm/fault.c 396diff -urNp linux-2.6.32.11/arch/arm/mm/fault.c linux-2.6.32.11/arch/arm/mm/fault.c
397--- linux-2.6.32.10/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 397--- linux-2.6.32.11/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
398+++ linux-2.6.32.10/arch/arm/mm/fault.c 2010-03-20 15:58:45.640844875 -0400 398+++ linux-2.6.32.11/arch/arm/mm/fault.c 2010-04-04 20:46:41.476773136 -0400
399@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, 399@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
400 } 400 }
401 #endif 401 #endif
@@ -444,9 +444,9 @@ diff -urNp linux-2.6.32.10/arch/arm/mm/fault.c linux-2.6.32.10/arch/arm/mm/fault
444 /* 444 /*
445 * First Level Translation Fault Handler 445 * First Level Translation Fault Handler
446 * 446 *
447diff -urNp linux-2.6.32.10/arch/arm/mm/mmap.c linux-2.6.32.10/arch/arm/mm/mmap.c 447diff -urNp linux-2.6.32.11/arch/arm/mm/mmap.c linux-2.6.32.11/arch/arm/mm/mmap.c
448--- linux-2.6.32.10/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 448--- linux-2.6.32.11/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
449+++ linux-2.6.32.10/arch/arm/mm/mmap.c 2010-03-20 15:58:45.640844875 -0400 449+++ linux-2.6.32.11/arch/arm/mm/mmap.c 2010-04-04 20:46:41.476773136 -0400
450@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp 450@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
451 if (len > TASK_SIZE) 451 if (len > TASK_SIZE)
452 return -ENOMEM; 452 return -ENOMEM;
@@ -483,9 +483,9 @@ diff -urNp linux-2.6.32.10/arch/arm/mm/mmap.c linux-2.6.32.10/arch/arm/mm/mmap.c
483 mm->cached_hole_size = 0; 483 mm->cached_hole_size = 0;
484 goto full_search; 484 goto full_search;
485 } 485 }
486diff -urNp linux-2.6.32.10/arch/arm/plat-s3c/pm.c linux-2.6.32.10/arch/arm/plat-s3c/pm.c 486diff -urNp linux-2.6.32.11/arch/arm/plat-s3c/pm.c linux-2.6.32.11/arch/arm/plat-s3c/pm.c
487--- linux-2.6.32.10/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400 487--- linux-2.6.32.11/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400
488+++ linux-2.6.32.10/arch/arm/plat-s3c/pm.c 2010-03-20 15:58:45.640844875 -0400 488+++ linux-2.6.32.11/arch/arm/plat-s3c/pm.c 2010-04-04 20:46:41.476773136 -0400
489@@ -355,7 +355,7 @@ static void s3c_pm_finish(void) 489@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
490 s3c_pm_check_cleanup(); 490 s3c_pm_check_cleanup();
491 } 491 }
@@ -495,9 +495,9 @@ diff -urNp linux-2.6.32.10/arch/arm/plat-s3c/pm.c linux-2.6.32.10/arch/arm/plat-
495 .enter = s3c_pm_enter, 495 .enter = s3c_pm_enter,
496 .prepare = s3c_pm_prepare, 496 .prepare = s3c_pm_prepare,
497 .finish = s3c_pm_finish, 497 .finish = s3c_pm_finish,
498diff -urNp linux-2.6.32.10/arch/avr32/include/asm/elf.h linux-2.6.32.10/arch/avr32/include/asm/elf.h 498diff -urNp linux-2.6.32.11/arch/avr32/include/asm/elf.h linux-2.6.32.11/arch/avr32/include/asm/elf.h
499--- linux-2.6.32.10/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 499--- linux-2.6.32.11/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
500+++ linux-2.6.32.10/arch/avr32/include/asm/elf.h 2010-03-20 15:58:45.640844875 -0400 500+++ linux-2.6.32.11/arch/avr32/include/asm/elf.h 2010-04-04 20:46:41.476773136 -0400
501@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg 501@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
502 the loader. We need to make sure that it is out of the way of the program 502 the loader. We need to make sure that it is out of the way of the program
503 that it will "exec", and that there is sufficient room for the brk. */ 503 that it will "exec", and that there is sufficient room for the brk. */
@@ -514,9 +514,9 @@ diff -urNp linux-2.6.32.10/arch/avr32/include/asm/elf.h linux-2.6.32.10/arch/avr
514 514
515 /* This yields a mask that user programs can use to figure out what 515 /* This yields a mask that user programs can use to figure out what
516 instruction set this CPU supports. This could be done in user space, 516 instruction set this CPU supports. This could be done in user space,
517diff -urNp linux-2.6.32.10/arch/avr32/include/asm/kmap_types.h linux-2.6.32.10/arch/avr32/include/asm/kmap_types.h 517diff -urNp linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h
518--- linux-2.6.32.10/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 518--- linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
519+++ linux-2.6.32.10/arch/avr32/include/asm/kmap_types.h 2010-03-20 15:58:45.640844875 -0400 519+++ linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400
520@@ -22,7 +22,8 @@ D(10) KM_IRQ0, 520@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
521 D(11) KM_IRQ1, 521 D(11) KM_IRQ1,
522 D(12) KM_SOFTIRQ0, 522 D(12) KM_SOFTIRQ0,
@@ -527,9 +527,9 @@ diff -urNp linux-2.6.32.10/arch/avr32/include/asm/kmap_types.h linux-2.6.32.10/a
527 }; 527 };
528 528
529 #undef D 529 #undef D
530diff -urNp linux-2.6.32.10/arch/avr32/mach-at32ap/pm.c linux-2.6.32.10/arch/avr32/mach-at32ap/pm.c 530diff -urNp linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c
531--- linux-2.6.32.10/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400 531--- linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400
532+++ linux-2.6.32.10/arch/avr32/mach-at32ap/pm.c 2010-03-20 15:58:45.640844875 -0400 532+++ linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c 2010-04-04 20:46:41.476773136 -0400
533@@ -176,7 +176,7 @@ out: 533@@ -176,7 +176,7 @@ out:
534 return 0; 534 return 0;
535 } 535 }
@@ -539,9 +539,9 @@ diff -urNp linux-2.6.32.10/arch/avr32/mach-at32ap/pm.c linux-2.6.32.10/arch/avr3
539 .valid = avr32_pm_valid_state, 539 .valid = avr32_pm_valid_state,
540 .enter = avr32_pm_enter, 540 .enter = avr32_pm_enter,
541 }; 541 };
542diff -urNp linux-2.6.32.10/arch/avr32/mm/fault.c linux-2.6.32.10/arch/avr32/mm/fault.c 542diff -urNp linux-2.6.32.11/arch/avr32/mm/fault.c linux-2.6.32.11/arch/avr32/mm/fault.c
543--- linux-2.6.32.10/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 543--- linux-2.6.32.11/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
544+++ linux-2.6.32.10/arch/avr32/mm/fault.c 2010-03-20 15:58:45.640844875 -0400 544+++ linux-2.6.32.11/arch/avr32/mm/fault.c 2010-04-04 20:46:41.476773136 -0400
545@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru 545@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
546 546
547 int exception_trace = 1; 547 int exception_trace = 1;
@@ -583,9 +583,9 @@ diff -urNp linux-2.6.32.10/arch/avr32/mm/fault.c linux-2.6.32.10/arch/avr32/mm/f
583 if (exception_trace && printk_ratelimit()) 583 if (exception_trace && printk_ratelimit())
584 printk("%s%s[%d]: segfault at %08lx pc %08lx " 584 printk("%s%s[%d]: segfault at %08lx pc %08lx "
585 "sp %08lx ecr %lu\n", 585 "sp %08lx ecr %lu\n",
586diff -urNp linux-2.6.32.10/arch/blackfin/kernel/kgdb.c linux-2.6.32.10/arch/blackfin/kernel/kgdb.c 586diff -urNp linux-2.6.32.11/arch/blackfin/kernel/kgdb.c linux-2.6.32.11/arch/blackfin/kernel/kgdb.c
587--- linux-2.6.32.10/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 587--- linux-2.6.32.11/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
588+++ linux-2.6.32.10/arch/blackfin/kernel/kgdb.c 2010-03-20 15:58:45.640844875 -0400 588+++ linux-2.6.32.11/arch/blackfin/kernel/kgdb.c 2010-04-04 20:46:41.476773136 -0400
589@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto 589@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
590 return -1; /* this means that we do not want to exit from the handler */ 590 return -1; /* this means that we do not want to exit from the handler */
591 } 591 }
@@ -595,9 +595,9 @@ diff -urNp linux-2.6.32.10/arch/blackfin/kernel/kgdb.c linux-2.6.32.10/arch/blac
595 .gdb_bpt_instr = {0xa1}, 595 .gdb_bpt_instr = {0xa1},
596 #ifdef CONFIG_SMP 596 #ifdef CONFIG_SMP
597 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, 597 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
598diff -urNp linux-2.6.32.10/arch/blackfin/mach-common/pm.c linux-2.6.32.10/arch/blackfin/mach-common/pm.c 598diff -urNp linux-2.6.32.11/arch/blackfin/mach-common/pm.c linux-2.6.32.11/arch/blackfin/mach-common/pm.c
599--- linux-2.6.32.10/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400 599--- linux-2.6.32.11/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400
600+++ linux-2.6.32.10/arch/blackfin/mach-common/pm.c 2010-03-20 15:58:45.640844875 -0400 600+++ linux-2.6.32.11/arch/blackfin/mach-common/pm.c 2010-04-04 20:46:41.476773136 -0400
601@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t 601@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
602 return 0; 602 return 0;
603 } 603 }
@@ -607,9 +607,9 @@ diff -urNp linux-2.6.32.10/arch/blackfin/mach-common/pm.c linux-2.6.32.10/arch/b
607 .enter = bfin_pm_enter, 607 .enter = bfin_pm_enter,
608 .valid = bfin_pm_valid, 608 .valid = bfin_pm_valid,
609 }; 609 };
610diff -urNp linux-2.6.32.10/arch/frv/include/asm/kmap_types.h linux-2.6.32.10/arch/frv/include/asm/kmap_types.h 610diff -urNp linux-2.6.32.11/arch/frv/include/asm/kmap_types.h linux-2.6.32.11/arch/frv/include/asm/kmap_types.h
611--- linux-2.6.32.10/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 611--- linux-2.6.32.11/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
612+++ linux-2.6.32.10/arch/frv/include/asm/kmap_types.h 2010-03-20 15:58:45.640844875 -0400 612+++ linux-2.6.32.11/arch/frv/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400
613@@ -23,6 +23,7 @@ enum km_type { 613@@ -23,6 +23,7 @@ enum km_type {
614 KM_IRQ1, 614 KM_IRQ1,
615 KM_SOFTIRQ0, 615 KM_SOFTIRQ0,
@@ -618,9 +618,9 @@ diff -urNp linux-2.6.32.10/arch/frv/include/asm/kmap_types.h linux-2.6.32.10/arc
618 KM_TYPE_NR 618 KM_TYPE_NR
619 }; 619 };
620 620
621diff -urNp linux-2.6.32.10/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.10/arch/ia64/hp/common/hwsw_iommu.c 621diff -urNp linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c
622--- linux-2.6.32.10/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400 622--- linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400
623+++ linux-2.6.32.10/arch/ia64/hp/common/hwsw_iommu.c 2010-03-20 15:58:45.640844875 -0400 623+++ linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c 2010-04-04 20:46:41.476773136 -0400
624@@ -17,7 +17,7 @@ 624@@ -17,7 +17,7 @@
625 #include <linux/swiotlb.h> 625 #include <linux/swiotlb.h>
626 #include <asm/machvec.h> 626 #include <asm/machvec.h>
@@ -639,9 +639,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.10/arch
639 { 639 {
640 if (use_swiotlb(dev)) 640 if (use_swiotlb(dev))
641 return &swiotlb_dma_ops; 641 return &swiotlb_dma_ops;
642diff -urNp linux-2.6.32.10/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.10/arch/ia64/hp/common/sba_iommu.c 642diff -urNp linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c
643--- linux-2.6.32.10/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400 643--- linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400
644+++ linux-2.6.32.10/arch/ia64/hp/common/sba_iommu.c 2010-03-20 15:58:45.640844875 -0400 644+++ linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c 2010-04-04 20:46:41.476773136 -0400
645@@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d 645@@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d
646 }, 646 },
647 }; 647 };
@@ -660,9 +660,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.10/arch/
660 .alloc_coherent = sba_alloc_coherent, 660 .alloc_coherent = sba_alloc_coherent,
661 .free_coherent = sba_free_coherent, 661 .free_coherent = sba_free_coherent,
662 .map_page = sba_map_page, 662 .map_page = sba_map_page,
663diff -urNp linux-2.6.32.10/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.10/arch/ia64/ia32/binfmt_elf32.c 663diff -urNp linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c
664--- linux-2.6.32.10/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400 664--- linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400
665+++ linux-2.6.32.10/arch/ia64/ia32/binfmt_elf32.c 2010-03-20 15:58:45.640844875 -0400 665+++ linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c 2010-04-04 20:46:41.476773136 -0400
666@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ 666@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
667 667
668 #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) 668 #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack))
@@ -677,9 +677,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.10/arch/ia
677 /* Ugly but avoids duplication */ 677 /* Ugly but avoids duplication */
678 #include "../../../fs/binfmt_elf.c" 678 #include "../../../fs/binfmt_elf.c"
679 679
680diff -urNp linux-2.6.32.10/arch/ia64/ia32/ia32priv.h linux-2.6.32.10/arch/ia64/ia32/ia32priv.h 680diff -urNp linux-2.6.32.11/arch/ia64/ia32/ia32priv.h linux-2.6.32.11/arch/ia64/ia32/ia32priv.h
681--- linux-2.6.32.10/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400 681--- linux-2.6.32.11/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400
682+++ linux-2.6.32.10/arch/ia64/ia32/ia32priv.h 2010-03-20 15:58:45.640844875 -0400 682+++ linux-2.6.32.11/arch/ia64/ia32/ia32priv.h 2010-04-04 20:46:41.476773136 -0400
683@@ -296,7 +296,14 @@ typedef struct compat_siginfo { 683@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
684 #define ELF_DATA ELFDATA2LSB 684 #define ELF_DATA ELFDATA2LSB
685 #define ELF_ARCH EM_386 685 #define ELF_ARCH EM_386
@@ -696,9 +696,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/ia32/ia32priv.h linux-2.6.32.10/arch/ia64/i
696 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET 696 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET
697 #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE 697 #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
698 698
699diff -urNp linux-2.6.32.10/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.10/arch/ia64/include/asm/dma-mapping.h 699diff -urNp linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h
700--- linux-2.6.32.10/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 700--- linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
701+++ linux-2.6.32.10/arch/ia64/include/asm/dma-mapping.h 2010-03-20 15:58:45.640844875 -0400 701+++ linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h 2010-04-04 20:46:41.476773136 -0400
702@@ -12,7 +12,7 @@ 702@@ -12,7 +12,7 @@
703 703
704 #define ARCH_HAS_DMA_GET_REQUIRED_MASK 704 #define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -742,9 +742,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.10/a
742 return ops->dma_supported(dev, mask); 742 return ops->dma_supported(dev, mask);
743 } 743 }
744 744
745diff -urNp linux-2.6.32.10/arch/ia64/include/asm/elf.h linux-2.6.32.10/arch/ia64/include/asm/elf.h 745diff -urNp linux-2.6.32.11/arch/ia64/include/asm/elf.h linux-2.6.32.11/arch/ia64/include/asm/elf.h
746--- linux-2.6.32.10/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 746--- linux-2.6.32.11/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
747+++ linux-2.6.32.10/arch/ia64/include/asm/elf.h 2010-03-20 15:58:45.640844875 -0400 747+++ linux-2.6.32.11/arch/ia64/include/asm/elf.h 2010-04-04 20:46:41.476773136 -0400
748@@ -43,6 +43,13 @@ 748@@ -43,6 +43,13 @@
749 */ 749 */
750 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) 750 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -759,9 +759,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/include/asm/elf.h linux-2.6.32.10/arch/ia64
759 #define PT_IA_64_UNWIND 0x70000001 759 #define PT_IA_64_UNWIND 0x70000001
760 760
761 /* IA-64 relocations: */ 761 /* IA-64 relocations: */
762diff -urNp linux-2.6.32.10/arch/ia64/include/asm/machvec.h linux-2.6.32.10/arch/ia64/include/asm/machvec.h 762diff -urNp linux-2.6.32.11/arch/ia64/include/asm/machvec.h linux-2.6.32.11/arch/ia64/include/asm/machvec.h
763--- linux-2.6.32.10/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400 763--- linux-2.6.32.11/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400
764+++ linux-2.6.32.10/arch/ia64/include/asm/machvec.h 2010-03-20 15:58:45.640844875 -0400 764+++ linux-2.6.32.11/arch/ia64/include/asm/machvec.h 2010-04-04 20:46:41.476773136 -0400
765@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event 765@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
766 /* DMA-mapping interface: */ 766 /* DMA-mapping interface: */
767 typedef void ia64_mv_dma_init (void); 767 typedef void ia64_mv_dma_init (void);
@@ -780,9 +780,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/include/asm/machvec.h linux-2.6.32.10/arch/
780 780
781 /* 781 /*
782 * Define default versions so we can extend machvec for new platforms without having 782 * Define default versions so we can extend machvec for new platforms without having
783diff -urNp linux-2.6.32.10/arch/ia64/include/asm/pgtable.h linux-2.6.32.10/arch/ia64/include/asm/pgtable.h 783diff -urNp linux-2.6.32.11/arch/ia64/include/asm/pgtable.h linux-2.6.32.11/arch/ia64/include/asm/pgtable.h
784--- linux-2.6.32.10/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 784--- linux-2.6.32.11/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
785+++ linux-2.6.32.10/arch/ia64/include/asm/pgtable.h 2010-03-20 15:58:45.640844875 -0400 785+++ linux-2.6.32.11/arch/ia64/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400
786@@ -143,6 +143,17 @@ 786@@ -143,6 +143,17 @@
787 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) 787 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
788 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) 788 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
@@ -801,9 +801,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/include/asm/pgtable.h linux-2.6.32.10/arch/
801 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) 801 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
802 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) 802 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
803 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) 803 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
804diff -urNp linux-2.6.32.10/arch/ia64/include/asm/uaccess.h linux-2.6.32.10/arch/ia64/include/asm/uaccess.h 804diff -urNp linux-2.6.32.11/arch/ia64/include/asm/uaccess.h linux-2.6.32.11/arch/ia64/include/asm/uaccess.h
805--- linux-2.6.32.10/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 805--- linux-2.6.32.11/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
806+++ linux-2.6.32.10/arch/ia64/include/asm/uaccess.h 2010-03-20 15:58:45.640844875 -0400 806+++ linux-2.6.32.11/arch/ia64/include/asm/uaccess.h 2010-04-04 20:46:41.480470677 -0400
807@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ 807@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
808 const void *__cu_from = (from); \ 808 const void *__cu_from = (from); \
809 long __cu_len = (n); \ 809 long __cu_len = (n); \
@@ -822,9 +822,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/include/asm/uaccess.h linux-2.6.32.10/arch/
822 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ 822 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
823 __cu_len; \ 823 __cu_len; \
824 }) 824 })
825diff -urNp linux-2.6.32.10/arch/ia64/kernel/dma-mapping.c linux-2.6.32.10/arch/ia64/kernel/dma-mapping.c 825diff -urNp linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c
826--- linux-2.6.32.10/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400 826--- linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400
827+++ linux-2.6.32.10/arch/ia64/kernel/dma-mapping.c 2010-03-20 15:58:45.640844875 -0400 827+++ linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c 2010-04-04 20:46:41.480470677 -0400
828@@ -3,7 +3,7 @@ 828@@ -3,7 +3,7 @@
829 /* Set this to 1 if there is a HW IOMMU in the system */ 829 /* Set this to 1 if there is a HW IOMMU in the system */
830 int iommu_detected __read_mostly; 830 int iommu_detected __read_mostly;
@@ -843,9 +843,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/kernel/dma-mapping.c linux-2.6.32.10/arch/i
843 { 843 {
844 return dma_ops; 844 return dma_ops;
845 } 845 }
846diff -urNp linux-2.6.32.10/arch/ia64/kernel/module.c linux-2.6.32.10/arch/ia64/kernel/module.c 846diff -urNp linux-2.6.32.11/arch/ia64/kernel/module.c linux-2.6.32.11/arch/ia64/kernel/module.c
847--- linux-2.6.32.10/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 847--- linux-2.6.32.11/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
848+++ linux-2.6.32.10/arch/ia64/kernel/module.c 2010-03-20 15:58:45.640844875 -0400 848+++ linux-2.6.32.11/arch/ia64/kernel/module.c 2010-04-04 20:46:41.480470677 -0400
849@@ -315,8 +315,7 @@ module_alloc (unsigned long size) 849@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
850 void 850 void
851 module_free (struct module *mod, void *module_region) 851 module_free (struct module *mod, void *module_region)
@@ -934,9 +934,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/kernel/module.c linux-2.6.32.10/arch/ia64/k
934 mod->arch.gp = gp; 934 mod->arch.gp = gp;
935 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); 935 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
936 } 936 }
937diff -urNp linux-2.6.32.10/arch/ia64/kernel/pci-dma.c linux-2.6.32.10/arch/ia64/kernel/pci-dma.c 937diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-dma.c linux-2.6.32.11/arch/ia64/kernel/pci-dma.c
938--- linux-2.6.32.10/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 938--- linux-2.6.32.11/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
939+++ linux-2.6.32.10/arch/ia64/kernel/pci-dma.c 2010-03-20 15:58:45.640844875 -0400 939+++ linux-2.6.32.11/arch/ia64/kernel/pci-dma.c 2010-04-04 20:46:41.480470677 -0400
940@@ -43,7 +43,7 @@ struct device fallback_dev = { 940@@ -43,7 +43,7 @@ struct device fallback_dev = {
941 .dma_mask = &fallback_dev.coherent_dma_mask, 941 .dma_mask = &fallback_dev.coherent_dma_mask,
942 }; 942 };
@@ -946,9 +946,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/kernel/pci-dma.c linux-2.6.32.10/arch/ia64/
946 946
947 static int __init pci_iommu_init(void) 947 static int __init pci_iommu_init(void)
948 { 948 {
949diff -urNp linux-2.6.32.10/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.10/arch/ia64/kernel/pci-swiotlb.c 949diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c
950--- linux-2.6.32.10/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 950--- linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
951+++ linux-2.6.32.10/arch/ia64/kernel/pci-swiotlb.c 2010-03-20 15:58:45.640844875 -0400 951+++ linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c 2010-04-04 20:46:41.480470677 -0400
952@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent 952@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
953 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); 953 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
954 } 954 }
@@ -958,9 +958,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.10/arch/i
958 .alloc_coherent = ia64_swiotlb_alloc_coherent, 958 .alloc_coherent = ia64_swiotlb_alloc_coherent,
959 .free_coherent = swiotlb_free_coherent, 959 .free_coherent = swiotlb_free_coherent,
960 .map_page = swiotlb_map_page, 960 .map_page = swiotlb_map_page,
961diff -urNp linux-2.6.32.10/arch/ia64/kernel/sys_ia64.c linux-2.6.32.10/arch/ia64/kernel/sys_ia64.c 961diff -urNp linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c
962--- linux-2.6.32.10/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400 962--- linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400
963+++ linux-2.6.32.10/arch/ia64/kernel/sys_ia64.c 2010-03-20 15:58:45.640844875 -0400 963+++ linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c 2010-04-04 20:46:41.480470677 -0400
964@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil 964@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
965 if (REGION_NUMBER(addr) == RGN_HPAGE) 965 if (REGION_NUMBER(addr) == RGN_HPAGE)
966 addr = 0; 966 addr = 0;
@@ -987,9 +987,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/kernel/sys_ia64.c linux-2.6.32.10/arch/ia64
987 goto full_search; 987 goto full_search;
988 } 988 }
989 return -ENOMEM; 989 return -ENOMEM;
990diff -urNp linux-2.6.32.10/arch/ia64/kernel/topology.c linux-2.6.32.10/arch/ia64/kernel/topology.c 990diff -urNp linux-2.6.32.11/arch/ia64/kernel/topology.c linux-2.6.32.11/arch/ia64/kernel/topology.c
991--- linux-2.6.32.10/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400 991--- linux-2.6.32.11/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400
992+++ linux-2.6.32.10/arch/ia64/kernel/topology.c 2010-03-20 15:58:45.640844875 -0400 992+++ linux-2.6.32.11/arch/ia64/kernel/topology.c 2010-04-04 20:46:41.480470677 -0400
993@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject 993@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
994 return ret; 994 return ret;
995 } 995 }
@@ -999,9 +999,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/kernel/topology.c linux-2.6.32.10/arch/ia64
999 .show = cache_show 999 .show = cache_show
1000 }; 1000 };
1001 1001
1002diff -urNp linux-2.6.32.10/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.10/arch/ia64/kernel/vmlinux.lds.S 1002diff -urNp linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S
1003--- linux-2.6.32.10/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 1003--- linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
1004+++ linux-2.6.32.10/arch/ia64/kernel/vmlinux.lds.S 2010-03-20 15:58:45.640844875 -0400 1004+++ linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S 2010-04-04 20:46:41.480470677 -0400
1005@@ -190,7 +190,7 @@ SECTIONS 1005@@ -190,7 +190,7 @@ SECTIONS
1006 /* Per-cpu data: */ 1006 /* Per-cpu data: */
1007 . = ALIGN(PERCPU_PAGE_SIZE); 1007 . = ALIGN(PERCPU_PAGE_SIZE);
@@ -1011,9 +1011,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.10/arch/i
1011 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits 1011 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
1012 * into percpu page size 1012 * into percpu page size
1013 */ 1013 */
1014diff -urNp linux-2.6.32.10/arch/ia64/mm/fault.c linux-2.6.32.10/arch/ia64/mm/fault.c 1014diff -urNp linux-2.6.32.11/arch/ia64/mm/fault.c linux-2.6.32.11/arch/ia64/mm/fault.c
1015--- linux-2.6.32.10/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 1015--- linux-2.6.32.11/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
1016+++ linux-2.6.32.10/arch/ia64/mm/fault.c 2010-03-20 15:58:45.645469621 -0400 1016+++ linux-2.6.32.11/arch/ia64/mm/fault.c 2010-04-04 20:46:41.480470677 -0400
1017@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 1017@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
1018 return pte_present(pte); 1018 return pte_present(pte);
1019 } 1019 }
@@ -1063,9 +1063,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/mm/fault.c linux-2.6.32.10/arch/ia64/mm/fau
1063 survive: 1063 survive:
1064 /* 1064 /*
1065 * If for any reason at all we couldn't handle the fault, make 1065 * If for any reason at all we couldn't handle the fault, make
1066diff -urNp linux-2.6.32.10/arch/ia64/mm/init.c linux-2.6.32.10/arch/ia64/mm/init.c 1066diff -urNp linux-2.6.32.11/arch/ia64/mm/init.c linux-2.6.32.11/arch/ia64/mm/init.c
1067--- linux-2.6.32.10/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400 1067--- linux-2.6.32.11/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400
1068+++ linux-2.6.32.10/arch/ia64/mm/init.c 2010-03-20 15:58:45.645469621 -0400 1068+++ linux-2.6.32.11/arch/ia64/mm/init.c 2010-04-04 20:46:41.480470677 -0400
1069@@ -122,6 +122,19 @@ ia64_init_addr_space (void) 1069@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
1070 vma->vm_start = current->thread.rbs_bot & PAGE_MASK; 1070 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
1071 vma->vm_end = vma->vm_start + PAGE_SIZE; 1071 vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1086,9 +1086,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/mm/init.c linux-2.6.32.10/arch/ia64/mm/init
1086 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 1086 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
1087 down_write(&current->mm->mmap_sem); 1087 down_write(&current->mm->mmap_sem);
1088 if (insert_vm_struct(current->mm, vma)) { 1088 if (insert_vm_struct(current->mm, vma)) {
1089diff -urNp linux-2.6.32.10/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.10/arch/ia64/sn/pci/pci_dma.c 1089diff -urNp linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c
1090--- linux-2.6.32.10/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400 1090--- linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400
1091+++ linux-2.6.32.10/arch/ia64/sn/pci/pci_dma.c 2010-03-20 15:58:45.645469621 -0400 1091+++ linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c 2010-04-04 20:46:41.480470677 -0400
1092@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * 1092@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
1093 return ret; 1093 return ret;
1094 } 1094 }
@@ -1098,9 +1098,9 @@ diff -urNp linux-2.6.32.10/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.10/arch/ia64/
1098 .alloc_coherent = sn_dma_alloc_coherent, 1098 .alloc_coherent = sn_dma_alloc_coherent,
1099 .free_coherent = sn_dma_free_coherent, 1099 .free_coherent = sn_dma_free_coherent,
1100 .map_page = sn_dma_map_page, 1100 .map_page = sn_dma_map_page,
1101diff -urNp linux-2.6.32.10/arch/m32r/lib/usercopy.c linux-2.6.32.10/arch/m32r/lib/usercopy.c 1101diff -urNp linux-2.6.32.11/arch/m32r/lib/usercopy.c linux-2.6.32.11/arch/m32r/lib/usercopy.c
1102--- linux-2.6.32.10/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400 1102--- linux-2.6.32.11/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400
1103+++ linux-2.6.32.10/arch/m32r/lib/usercopy.c 2010-03-20 15:58:45.645469621 -0400 1103+++ linux-2.6.32.11/arch/m32r/lib/usercopy.c 2010-04-04 20:46:41.480470677 -0400
1104@@ -14,6 +14,9 @@ 1104@@ -14,6 +14,9 @@
1105 unsigned long 1105 unsigned long
1106 __generic_copy_to_user(void __user *to, const void *from, unsigned long n) 1106 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1121,9 +1121,9 @@ diff -urNp linux-2.6.32.10/arch/m32r/lib/usercopy.c linux-2.6.32.10/arch/m32r/li
1121 prefetchw(to); 1121 prefetchw(to);
1122 if (access_ok(VERIFY_READ, from, n)) 1122 if (access_ok(VERIFY_READ, from, n))
1123 __copy_user_zeroing(to,from,n); 1123 __copy_user_zeroing(to,from,n);
1124diff -urNp linux-2.6.32.10/arch/mips/alchemy/devboards/pm.c linux-2.6.32.10/arch/mips/alchemy/devboards/pm.c 1124diff -urNp linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c
1125--- linux-2.6.32.10/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400 1125--- linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400
1126+++ linux-2.6.32.10/arch/mips/alchemy/devboards/pm.c 2010-03-20 15:58:45.645469621 -0400 1126+++ linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c 2010-04-04 20:46:41.480470677 -0400
1127@@ -78,7 +78,7 @@ static void db1x_pm_end(void) 1127@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
1128 1128
1129 } 1129 }
@@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.32.10/arch/mips/alchemy/devboards/pm.c linux-2.6.32.10/arch
1133 .valid = suspend_valid_only_mem, 1133 .valid = suspend_valid_only_mem,
1134 .begin = db1x_pm_begin, 1134 .begin = db1x_pm_begin,
1135 .enter = db1x_pm_enter, 1135 .enter = db1x_pm_enter,
1136diff -urNp linux-2.6.32.10/arch/mips/include/asm/elf.h linux-2.6.32.10/arch/mips/include/asm/elf.h 1136diff -urNp linux-2.6.32.11/arch/mips/include/asm/elf.h linux-2.6.32.11/arch/mips/include/asm/elf.h
1137--- linux-2.6.32.10/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 1137--- linux-2.6.32.11/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
1138+++ linux-2.6.32.10/arch/mips/include/asm/elf.h 2010-03-20 15:58:45.645469621 -0400 1138+++ linux-2.6.32.11/arch/mips/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400
1139@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str 1139@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
1140 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) 1140 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1141 #endif 1141 #endif
@@ -1148,9 +1148,9 @@ diff -urNp linux-2.6.32.10/arch/mips/include/asm/elf.h linux-2.6.32.10/arch/mips
1148+#endif 1148+#endif
1149+ 1149+
1150 #endif /* _ASM_ELF_H */ 1150 #endif /* _ASM_ELF_H */
1151diff -urNp linux-2.6.32.10/arch/mips/include/asm/page.h linux-2.6.32.10/arch/mips/include/asm/page.h 1151diff -urNp linux-2.6.32.11/arch/mips/include/asm/page.h linux-2.6.32.11/arch/mips/include/asm/page.h
1152--- linux-2.6.32.10/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 1152--- linux-2.6.32.11/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
1153+++ linux-2.6.32.10/arch/mips/include/asm/page.h 2010-03-20 15:58:45.645469621 -0400 1153+++ linux-2.6.32.11/arch/mips/include/asm/page.h 2010-04-04 20:46:41.480470677 -0400
1154@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa 1154@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
1155 #ifdef CONFIG_CPU_MIPS32 1155 #ifdef CONFIG_CPU_MIPS32
1156 typedef struct { unsigned long pte_low, pte_high; } pte_t; 1156 typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1160,9 +1160,9 @@ diff -urNp linux-2.6.32.10/arch/mips/include/asm/page.h linux-2.6.32.10/arch/mip
1160 #else 1160 #else
1161 typedef struct { unsigned long long pte; } pte_t; 1161 typedef struct { unsigned long long pte; } pte_t;
1162 #define pte_val(x) ((x).pte) 1162 #define pte_val(x) ((x).pte)
1163diff -urNp linux-2.6.32.10/arch/mips/include/asm/system.h linux-2.6.32.10/arch/mips/include/asm/system.h 1163diff -urNp linux-2.6.32.11/arch/mips/include/asm/system.h linux-2.6.32.11/arch/mips/include/asm/system.h
1164--- linux-2.6.32.10/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 1164--- linux-2.6.32.11/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
1165+++ linux-2.6.32.10/arch/mips/include/asm/system.h 2010-03-20 15:58:45.645469621 -0400 1165+++ linux-2.6.32.11/arch/mips/include/asm/system.h 2010-04-04 20:46:41.480470677 -0400
1166@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); 1166@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
1167 */ 1167 */
1168 #define __ARCH_WANT_UNLOCKED_CTXSW 1168 #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1171,9 +1171,9 @@ diff -urNp linux-2.6.32.10/arch/mips/include/asm/system.h linux-2.6.32.10/arch/m
1171+#define arch_align_stack(x) ((x) & ALMASK) 1171+#define arch_align_stack(x) ((x) & ALMASK)
1172 1172
1173 #endif /* _ASM_SYSTEM_H */ 1173 #endif /* _ASM_SYSTEM_H */
1174diff -urNp linux-2.6.32.10/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.10/arch/mips/kernel/binfmt_elfn32.c 1174diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c
1175--- linux-2.6.32.10/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400 1175--- linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400
1176+++ linux-2.6.32.10/arch/mips/kernel/binfmt_elfn32.c 2010-03-20 15:58:45.645469621 -0400 1176+++ linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c 2010-04-04 20:46:41.480470677 -0400
1177@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N 1177@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
1178 #undef ELF_ET_DYN_BASE 1178 #undef ELF_ET_DYN_BASE
1179 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) 1179 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1188,9 +1188,9 @@ diff -urNp linux-2.6.32.10/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.10/arch
1188 #include <asm/processor.h> 1188 #include <asm/processor.h>
1189 #include <linux/module.h> 1189 #include <linux/module.h>
1190 #include <linux/elfcore.h> 1190 #include <linux/elfcore.h>
1191diff -urNp linux-2.6.32.10/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.10/arch/mips/kernel/binfmt_elfo32.c 1191diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c
1192--- linux-2.6.32.10/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400 1192--- linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400
1193+++ linux-2.6.32.10/arch/mips/kernel/binfmt_elfo32.c 2010-03-20 15:58:45.645469621 -0400 1193+++ linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c 2010-04-04 20:46:41.480470677 -0400
1194@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N 1194@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
1195 #undef ELF_ET_DYN_BASE 1195 #undef ELF_ET_DYN_BASE
1196 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) 1196 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1205,9 +1205,9 @@ diff -urNp linux-2.6.32.10/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.10/arch
1205 #include <asm/processor.h> 1205 #include <asm/processor.h>
1206 1206
1207 /* 1207 /*
1208diff -urNp linux-2.6.32.10/arch/mips/kernel/kgdb.c linux-2.6.32.10/arch/mips/kernel/kgdb.c 1208diff -urNp linux-2.6.32.11/arch/mips/kernel/kgdb.c linux-2.6.32.11/arch/mips/kernel/kgdb.c
1209--- linux-2.6.32.10/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 1209--- linux-2.6.32.11/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
1210+++ linux-2.6.32.10/arch/mips/kernel/kgdb.c 2010-03-20 15:58:45.645469621 -0400 1210+++ linux-2.6.32.11/arch/mips/kernel/kgdb.c 2010-04-04 20:46:41.480470677 -0400
1211@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto 1211@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
1212 return -1; 1212 return -1;
1213 } 1213 }
@@ -1216,9 +1216,9 @@ diff -urNp linux-2.6.32.10/arch/mips/kernel/kgdb.c linux-2.6.32.10/arch/mips/ker
1216 struct kgdb_arch arch_kgdb_ops; 1216 struct kgdb_arch arch_kgdb_ops;
1217 1217
1218 /* 1218 /*
1219diff -urNp linux-2.6.32.10/arch/mips/kernel/process.c linux-2.6.32.10/arch/mips/kernel/process.c 1219diff -urNp linux-2.6.32.11/arch/mips/kernel/process.c linux-2.6.32.11/arch/mips/kernel/process.c
1220--- linux-2.6.32.10/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 1220--- linux-2.6.32.11/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
1221+++ linux-2.6.32.10/arch/mips/kernel/process.c 2010-03-20 15:58:45.645469621 -0400 1221+++ linux-2.6.32.11/arch/mips/kernel/process.c 2010-04-04 20:46:41.480470677 -0400
1222@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru 1222@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
1223 out: 1223 out:
1224 return pc; 1224 return pc;
@@ -1235,9 +1235,9 @@ diff -urNp linux-2.6.32.10/arch/mips/kernel/process.c linux-2.6.32.10/arch/mips/
1235- 1235-
1236- return sp & ALMASK; 1236- return sp & ALMASK;
1237-} 1237-}
1238diff -urNp linux-2.6.32.10/arch/mips/kernel/syscall.c linux-2.6.32.10/arch/mips/kernel/syscall.c 1238diff -urNp linux-2.6.32.11/arch/mips/kernel/syscall.c linux-2.6.32.11/arch/mips/kernel/syscall.c
1239--- linux-2.6.32.10/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400 1239--- linux-2.6.32.11/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400
1240+++ linux-2.6.32.10/arch/mips/kernel/syscall.c 2010-03-20 15:58:45.645469621 -0400 1240+++ linux-2.6.32.11/arch/mips/kernel/syscall.c 2010-04-04 20:46:41.480470677 -0400
1241@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str 1241@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str
1242 do_color_align = 0; 1242 do_color_align = 0;
1243 if (filp || (flags & MAP_SHARED)) 1243 if (filp || (flags & MAP_SHARED))
@@ -1259,9 +1259,9 @@ diff -urNp linux-2.6.32.10/arch/mips/kernel/syscall.c linux-2.6.32.10/arch/mips/
1259 if (do_color_align) 1259 if (do_color_align)
1260 addr = COLOUR_ALIGN(addr, pgoff); 1260 addr = COLOUR_ALIGN(addr, pgoff);
1261 else 1261 else
1262diff -urNp linux-2.6.32.10/arch/mips/mm/fault.c linux-2.6.32.10/arch/mips/mm/fault.c 1262diff -urNp linux-2.6.32.11/arch/mips/mm/fault.c linux-2.6.32.11/arch/mips/mm/fault.c
1263--- linux-2.6.32.10/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 1263--- linux-2.6.32.11/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
1264+++ linux-2.6.32.10/arch/mips/mm/fault.c 2010-03-20 15:58:45.645469621 -0400 1264+++ linux-2.6.32.11/arch/mips/mm/fault.c 2010-04-04 20:46:41.480470677 -0400
1265@@ -26,6 +26,23 @@ 1265@@ -26,6 +26,23 @@
1266 #include <asm/ptrace.h> 1266 #include <asm/ptrace.h>
1267 #include <asm/highmem.h> /* For VMALLOC_END */ 1267 #include <asm/highmem.h> /* For VMALLOC_END */
@@ -1286,9 +1286,9 @@ diff -urNp linux-2.6.32.10/arch/mips/mm/fault.c linux-2.6.32.10/arch/mips/mm/fau
1286 /* 1286 /*
1287 * This routine handles page faults. It determines the address, 1287 * This routine handles page faults. It determines the address,
1288 * and the problem, and then passes it off to one of the appropriate 1288 * and the problem, and then passes it off to one of the appropriate
1289diff -urNp linux-2.6.32.10/arch/parisc/include/asm/elf.h linux-2.6.32.10/arch/parisc/include/asm/elf.h 1289diff -urNp linux-2.6.32.11/arch/parisc/include/asm/elf.h linux-2.6.32.11/arch/parisc/include/asm/elf.h
1290--- linux-2.6.32.10/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 1290--- linux-2.6.32.11/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
1291+++ linux-2.6.32.10/arch/parisc/include/asm/elf.h 2010-03-20 15:58:45.645469621 -0400 1291+++ linux-2.6.32.11/arch/parisc/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400
1292@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. 1292@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
1293 1293
1294 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) 1294 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1303,9 +1303,9 @@ diff -urNp linux-2.6.32.10/arch/parisc/include/asm/elf.h linux-2.6.32.10/arch/pa
1303 /* This yields a mask that user programs can use to figure out what 1303 /* This yields a mask that user programs can use to figure out what
1304 instruction set this CPU supports. This could be done in user space, 1304 instruction set this CPU supports. This could be done in user space,
1305 but it's not easy, and we've already done it here. */ 1305 but it's not easy, and we've already done it here. */
1306diff -urNp linux-2.6.32.10/arch/parisc/include/asm/pgtable.h linux-2.6.32.10/arch/parisc/include/asm/pgtable.h 1306diff -urNp linux-2.6.32.11/arch/parisc/include/asm/pgtable.h linux-2.6.32.11/arch/parisc/include/asm/pgtable.h
1307--- linux-2.6.32.10/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 1307--- linux-2.6.32.11/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
1308+++ linux-2.6.32.10/arch/parisc/include/asm/pgtable.h 2010-03-20 15:58:45.649479097 -0400 1308+++ linux-2.6.32.11/arch/parisc/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400
1309@@ -207,6 +207,17 @@ 1309@@ -207,6 +207,17 @@
1310 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) 1310 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
1311 #define PAGE_COPY PAGE_EXECREAD 1311 #define PAGE_COPY PAGE_EXECREAD
@@ -1324,9 +1324,9 @@ diff -urNp linux-2.6.32.10/arch/parisc/include/asm/pgtable.h linux-2.6.32.10/arc
1324 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) 1324 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
1325 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) 1325 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
1326 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) 1326 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
1327diff -urNp linux-2.6.32.10/arch/parisc/kernel/module.c linux-2.6.32.10/arch/parisc/kernel/module.c 1327diff -urNp linux-2.6.32.11/arch/parisc/kernel/module.c linux-2.6.32.11/arch/parisc/kernel/module.c
1328--- linux-2.6.32.10/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 1328--- linux-2.6.32.11/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
1329+++ linux-2.6.32.10/arch/parisc/kernel/module.c 2010-03-20 15:58:45.649479097 -0400 1329+++ linux-2.6.32.11/arch/parisc/kernel/module.c 2010-04-04 20:46:41.480470677 -0400
1330@@ -95,16 +95,38 @@ 1330@@ -95,16 +95,38 @@
1331 1331
1332 /* three functions to determine where in the module core 1332 /* three functions to determine where in the module core
@@ -1427,9 +1427,9 @@ diff -urNp linux-2.6.32.10/arch/parisc/kernel/module.c linux-2.6.32.10/arch/pari
1427 1427
1428 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", 1428 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
1429 me->arch.unwind_section, table, end, gp); 1429 me->arch.unwind_section, table, end, gp);
1430diff -urNp linux-2.6.32.10/arch/parisc/kernel/sys_parisc.c linux-2.6.32.10/arch/parisc/kernel/sys_parisc.c 1430diff -urNp linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c
1431--- linux-2.6.32.10/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400 1431--- linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400
1432+++ linux-2.6.32.10/arch/parisc/kernel/sys_parisc.c 2010-03-20 15:58:45.649479097 -0400 1432+++ linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c 2010-04-04 20:46:41.480470677 -0400
1433@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str 1433@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str
1434 if (flags & MAP_FIXED) 1434 if (flags & MAP_FIXED)
1435 return addr; 1435 return addr;
@@ -1439,9 +1439,9 @@ diff -urNp linux-2.6.32.10/arch/parisc/kernel/sys_parisc.c linux-2.6.32.10/arch/
1439 1439
1440 if (filp) { 1440 if (filp) {
1441 addr = get_shared_area(filp->f_mapping, addr, len, pgoff); 1441 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
1442diff -urNp linux-2.6.32.10/arch/parisc/kernel/traps.c linux-2.6.32.10/arch/parisc/kernel/traps.c 1442diff -urNp linux-2.6.32.11/arch/parisc/kernel/traps.c linux-2.6.32.11/arch/parisc/kernel/traps.c
1443--- linux-2.6.32.10/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 1443--- linux-2.6.32.11/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
1444+++ linux-2.6.32.10/arch/parisc/kernel/traps.c 2010-03-20 15:58:45.649479097 -0400 1444+++ linux-2.6.32.11/arch/parisc/kernel/traps.c 2010-04-04 20:46:41.480470677 -0400
1445@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod 1445@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
1446 1446
1447 down_read(&current->mm->mmap_sem); 1447 down_read(&current->mm->mmap_sem);
@@ -1453,9 +1453,9 @@ diff -urNp linux-2.6.32.10/arch/parisc/kernel/traps.c linux-2.6.32.10/arch/paris
1453 fault_address = regs->iaoq[0]; 1453 fault_address = regs->iaoq[0];
1454 fault_space = regs->iasq[0]; 1454 fault_space = regs->iasq[0];
1455 1455
1456diff -urNp linux-2.6.32.10/arch/parisc/mm/fault.c linux-2.6.32.10/arch/parisc/mm/fault.c 1456diff -urNp linux-2.6.32.11/arch/parisc/mm/fault.c linux-2.6.32.11/arch/parisc/mm/fault.c
1457--- linux-2.6.32.10/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 1457--- linux-2.6.32.11/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
1458+++ linux-2.6.32.10/arch/parisc/mm/fault.c 2010-03-20 15:58:45.649479097 -0400 1458+++ linux-2.6.32.11/arch/parisc/mm/fault.c 2010-04-04 20:46:41.480470677 -0400
1459@@ -15,6 +15,7 @@ 1459@@ -15,6 +15,7 @@
1460 #include <linux/sched.h> 1460 #include <linux/sched.h>
1461 #include <linux/interrupt.h> 1461 #include <linux/interrupt.h>
@@ -1625,9 +1625,9 @@ diff -urNp linux-2.6.32.10/arch/parisc/mm/fault.c linux-2.6.32.10/arch/parisc/mm
1625 1625
1626 /* 1626 /*
1627 * If for any reason at all we couldn't handle the fault, make 1627 * If for any reason at all we couldn't handle the fault, make
1628diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/device.h linux-2.6.32.10/arch/powerpc/include/asm/device.h 1628diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/device.h linux-2.6.32.11/arch/powerpc/include/asm/device.h
1629--- linux-2.6.32.10/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 1629--- linux-2.6.32.11/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
1630+++ linux-2.6.32.10/arch/powerpc/include/asm/device.h 2010-03-20 15:58:45.649479097 -0400 1630+++ linux-2.6.32.11/arch/powerpc/include/asm/device.h 2010-04-04 20:46:41.485273950 -0400
1631@@ -14,7 +14,7 @@ struct dev_archdata { 1631@@ -14,7 +14,7 @@ struct dev_archdata {
1632 struct device_node *of_node; 1632 struct device_node *of_node;
1633 1633
@@ -1637,9 +1637,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/device.h linux-2.6.32.10/arc
1637 1637
1638 /* 1638 /*
1639 * When an iommu is in use, dma_data is used as a ptr to the base of the 1639 * When an iommu is in use, dma_data is used as a ptr to the base of the
1640diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.10/arch/powerpc/include/asm/dma-mapping.h 1640diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h
1641--- linux-2.6.32.10/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 1641--- linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
1642+++ linux-2.6.32.10/arch/powerpc/include/asm/dma-mapping.h 2010-03-20 15:58:45.649479097 -0400 1642+++ linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h 2010-04-04 20:46:41.485273950 -0400
1643@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma 1643@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
1644 #ifdef CONFIG_PPC64 1644 #ifdef CONFIG_PPC64
1645 extern struct dma_map_ops dma_iommu_ops; 1645 extern struct dma_map_ops dma_iommu_ops;
@@ -1706,9 +1706,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1
1706 1706
1707 if (dma_ops->mapping_error) 1707 if (dma_ops->mapping_error)
1708 return dma_ops->mapping_error(dev, dma_addr); 1708 return dma_ops->mapping_error(dev, dma_addr);
1709diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/elf.h linux-2.6.32.10/arch/powerpc/include/asm/elf.h 1709diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/elf.h linux-2.6.32.11/arch/powerpc/include/asm/elf.h
1710--- linux-2.6.32.10/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 1710--- linux-2.6.32.11/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
1711+++ linux-2.6.32.10/arch/powerpc/include/asm/elf.h 2010-03-20 15:58:45.649479097 -0400 1711+++ linux-2.6.32.11/arch/powerpc/include/asm/elf.h 2010-04-04 20:46:41.485273950 -0400
1712@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E 1712@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
1713 the loader. We need to make sure that it is out of the way of the program 1713 the loader. We need to make sure that it is out of the way of the program
1714 that it will "exec", and that there is sufficient room for the brk. */ 1714 that it will "exec", and that there is sufficient room for the brk. */
@@ -1741,9 +1741,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/elf.h linux-2.6.32.10/arch/p
1741 #endif /* __KERNEL__ */ 1741 #endif /* __KERNEL__ */
1742 1742
1743 /* 1743 /*
1744diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/iommu.h linux-2.6.32.10/arch/powerpc/include/asm/iommu.h 1744diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/iommu.h linux-2.6.32.11/arch/powerpc/include/asm/iommu.h
1745--- linux-2.6.32.10/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 1745--- linux-2.6.32.11/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
1746+++ linux-2.6.32.10/arch/powerpc/include/asm/iommu.h 2010-03-20 15:58:45.649479097 -0400 1746+++ linux-2.6.32.11/arch/powerpc/include/asm/iommu.h 2010-04-04 20:46:41.485273950 -0400
1747@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi 1747@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
1748 extern void iommu_init_early_dart(void); 1748 extern void iommu_init_early_dart(void);
1749 extern void iommu_init_early_pasemi(void); 1749 extern void iommu_init_early_pasemi(void);
@@ -1754,9 +1754,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/iommu.h linux-2.6.32.10/arch
1754 #ifdef CONFIG_PCI 1754 #ifdef CONFIG_PCI
1755 extern void pci_iommu_init(void); 1755 extern void pci_iommu_init(void);
1756 extern void pci_direct_iommu_init(void); 1756 extern void pci_direct_iommu_init(void);
1757diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.10/arch/powerpc/include/asm/kmap_types.h 1757diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h
1758--- linux-2.6.32.10/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 1758--- linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
1759+++ linux-2.6.32.10/arch/powerpc/include/asm/kmap_types.h 2010-03-20 15:58:45.649479097 -0400 1759+++ linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h 2010-04-04 20:46:41.485273950 -0400
1760@@ -26,6 +26,7 @@ enum km_type { 1760@@ -26,6 +26,7 @@ enum km_type {
1761 KM_SOFTIRQ1, 1761 KM_SOFTIRQ1,
1762 KM_PPC_SYNC_PAGE, 1762 KM_PPC_SYNC_PAGE,
@@ -1765,9 +1765,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.10
1765 KM_TYPE_NR 1765 KM_TYPE_NR
1766 }; 1766 };
1767 1767
1768diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/page_64.h linux-2.6.32.10/arch/powerpc/include/asm/page_64.h 1768diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/page_64.h linux-2.6.32.11/arch/powerpc/include/asm/page_64.h
1769--- linux-2.6.32.10/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400 1769--- linux-2.6.32.11/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400
1770+++ linux-2.6.32.10/arch/powerpc/include/asm/page_64.h 2010-03-20 15:58:45.649479097 -0400 1770+++ linux-2.6.32.11/arch/powerpc/include/asm/page_64.h 2010-04-04 20:46:41.485273950 -0400
1771@@ -180,15 +180,18 @@ do { \ 1771@@ -180,15 +180,18 @@ do { \
1772 * stack by default, so in the absense of a PT_GNU_STACK program header 1772 * stack by default, so in the absense of a PT_GNU_STACK program header
1773 * we turn execute permission off. 1773 * we turn execute permission off.
@@ -1789,9 +1789,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/page_64.h linux-2.6.32.10/ar
1789 1789
1790 #include <asm-generic/getorder.h> 1790 #include <asm-generic/getorder.h>
1791 1791
1792diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/page.h linux-2.6.32.10/arch/powerpc/include/asm/page.h 1792diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/page.h linux-2.6.32.11/arch/powerpc/include/asm/page.h
1793--- linux-2.6.32.10/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 1793--- linux-2.6.32.11/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
1794+++ linux-2.6.32.10/arch/powerpc/include/asm/page.h 2010-03-20 15:58:45.649479097 -0400 1794+++ linux-2.6.32.11/arch/powerpc/include/asm/page.h 2010-04-04 20:46:41.485273950 -0400
1795@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; 1795@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
1796 * and needs to be executable. This means the whole heap ends 1796 * and needs to be executable. This means the whole heap ends
1797 * up being executable. 1797 * up being executable.
@@ -1814,9 +1814,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/page.h linux-2.6.32.10/arch/
1814 #ifndef __ASSEMBLY__ 1814 #ifndef __ASSEMBLY__
1815 1815
1816 #undef STRICT_MM_TYPECHECKS 1816 #undef STRICT_MM_TYPECHECKS
1817diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/pci.h linux-2.6.32.10/arch/powerpc/include/asm/pci.h 1817diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pci.h linux-2.6.32.11/arch/powerpc/include/asm/pci.h
1818--- linux-2.6.32.10/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400 1818--- linux-2.6.32.11/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400
1819+++ linux-2.6.32.10/arch/powerpc/include/asm/pci.h 2010-03-20 15:58:45.649479097 -0400 1819+++ linux-2.6.32.11/arch/powerpc/include/asm/pci.h 2010-04-04 20:46:41.485273950 -0400
1820@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq 1820@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
1821 } 1821 }
1822 1822
@@ -1828,9 +1828,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/pci.h linux-2.6.32.10/arch/p
1828 #else /* CONFIG_PCI */ 1828 #else /* CONFIG_PCI */
1829 #define set_pci_dma_ops(d) 1829 #define set_pci_dma_ops(d)
1830 #define get_pci_dma_ops() NULL 1830 #define get_pci_dma_ops() NULL
1831diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.10/arch/powerpc/include/asm/pte-hash32.h 1831diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h
1832--- linux-2.6.32.10/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400 1832--- linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400
1833+++ linux-2.6.32.10/arch/powerpc/include/asm/pte-hash32.h 2010-03-20 15:58:45.649479097 -0400 1833+++ linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h 2010-04-04 20:46:41.485273950 -0400
1834@@ -21,6 +21,7 @@ 1834@@ -21,6 +21,7 @@
1835 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ 1835 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
1836 #define _PAGE_USER 0x004 /* usermode access allowed */ 1836 #define _PAGE_USER 0x004 /* usermode access allowed */
@@ -1839,9 +1839,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.10
1839 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ 1839 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
1840 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ 1840 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
1841 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ 1841 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
1842diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/reg.h linux-2.6.32.10/arch/powerpc/include/asm/reg.h 1842diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/reg.h linux-2.6.32.11/arch/powerpc/include/asm/reg.h
1843--- linux-2.6.32.10/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400 1843--- linux-2.6.32.11/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400
1844+++ linux-2.6.32.10/arch/powerpc/include/asm/reg.h 2010-03-20 15:58:45.649479097 -0400 1844+++ linux-2.6.32.11/arch/powerpc/include/asm/reg.h 2010-04-04 20:46:41.485273950 -0400
1845@@ -191,6 +191,7 @@ 1845@@ -191,6 +191,7 @@
1846 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ 1846 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
1847 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ 1847 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -1850,9 +1850,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/reg.h linux-2.6.32.10/arch/p
1850 #define DSISR_PROTFAULT 0x08000000 /* protection fault */ 1850 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
1851 #define DSISR_ISSTORE 0x02000000 /* access was a store */ 1851 #define DSISR_ISSTORE 0x02000000 /* access was a store */
1852 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ 1852 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
1853diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.10/arch/powerpc/include/asm/swiotlb.h 1853diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h
1854--- linux-2.6.32.10/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400 1854--- linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400
1855+++ linux-2.6.32.10/arch/powerpc/include/asm/swiotlb.h 2010-03-20 15:58:45.649479097 -0400 1855+++ linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h 2010-04-04 20:46:41.485273950 -0400
1856@@ -13,7 +13,7 @@ 1856@@ -13,7 +13,7 @@
1857 1857
1858 #include <linux/swiotlb.h> 1858 #include <linux/swiotlb.h>
@@ -1862,9 +1862,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.10/ar
1862 1862
1863 static inline void dma_mark_clean(void *addr, size_t size) {} 1863 static inline void dma_mark_clean(void *addr, size_t size) {}
1864 1864
1865diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/uaccess.h linux-2.6.32.10/arch/powerpc/include/asm/uaccess.h 1865diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h
1866--- linux-2.6.32.10/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 1866--- linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
1867+++ linux-2.6.32.10/arch/powerpc/include/asm/uaccess.h 2010-03-20 15:58:45.649479097 -0400 1867+++ linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h 2010-04-04 20:46:41.485273950 -0400
1868@@ -327,52 +327,6 @@ do { \ 1868@@ -327,52 +327,6 @@ do { \
1869 extern unsigned long __copy_tofrom_user(void __user *to, 1869 extern unsigned long __copy_tofrom_user(void __user *to,
1870 const void __user *from, unsigned long size); 1870 const void __user *from, unsigned long size);
@@ -2033,9 +2033,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/uaccess.h linux-2.6.32.10/ar
2033 extern unsigned long __clear_user(void __user *addr, unsigned long size); 2033 extern unsigned long __clear_user(void __user *addr, unsigned long size);
2034 2034
2035 static inline unsigned long clear_user(void __user *addr, unsigned long size) 2035 static inline unsigned long clear_user(void __user *addr, unsigned long size)
2036diff -urNp linux-2.6.32.10/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.10/arch/powerpc/kernel/cacheinfo.c 2036diff -urNp linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c
2037--- linux-2.6.32.10/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400 2037--- linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400
2038+++ linux-2.6.32.10/arch/powerpc/kernel/cacheinfo.c 2010-03-20 15:58:45.649479097 -0400 2038+++ linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c 2010-04-04 20:46:41.485273950 -0400
2039@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde 2039@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
2040 &cache_assoc_attr, 2040 &cache_assoc_attr,
2041 }; 2041 };
@@ -2045,9 +2045,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.10/arch/
2045 .show = cache_index_show, 2045 .show = cache_index_show,
2046 }; 2046 };
2047 2047
2048diff -urNp linux-2.6.32.10/arch/powerpc/kernel/dma.c linux-2.6.32.10/arch/powerpc/kernel/dma.c 2048diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma.c linux-2.6.32.11/arch/powerpc/kernel/dma.c
2049--- linux-2.6.32.10/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400 2049--- linux-2.6.32.11/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400
2050+++ linux-2.6.32.10/arch/powerpc/kernel/dma.c 2010-03-20 15:58:45.653481097 -0400 2050+++ linux-2.6.32.11/arch/powerpc/kernel/dma.c 2010-04-04 20:46:41.485273950 -0400
2051@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl 2051@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
2052 } 2052 }
2053 #endif 2053 #endif
@@ -2057,9 +2057,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/dma.c linux-2.6.32.10/arch/powerp
2057 .alloc_coherent = dma_direct_alloc_coherent, 2057 .alloc_coherent = dma_direct_alloc_coherent,
2058 .free_coherent = dma_direct_free_coherent, 2058 .free_coherent = dma_direct_free_coherent,
2059 .map_sg = dma_direct_map_sg, 2059 .map_sg = dma_direct_map_sg,
2060diff -urNp linux-2.6.32.10/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.10/arch/powerpc/kernel/dma-iommu.c 2060diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c
2061--- linux-2.6.32.10/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400 2061--- linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400
2062+++ linux-2.6.32.10/arch/powerpc/kernel/dma-iommu.c 2010-03-20 15:58:45.653481097 -0400 2062+++ linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c 2010-04-04 20:46:41.485273950 -0400
2063@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de 2063@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
2064 } 2064 }
2065 2065
@@ -2069,9 +2069,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.10/arch/
2069 { 2069 {
2070 struct iommu_table *tbl = get_iommu_table_base(dev); 2070 struct iommu_table *tbl = get_iommu_table_base(dev);
2071 2071
2072diff -urNp linux-2.6.32.10/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.10/arch/powerpc/kernel/dma-swiotlb.c 2072diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c
2073--- linux-2.6.32.10/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 2073--- linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
2074+++ linux-2.6.32.10/arch/powerpc/kernel/dma-swiotlb.c 2010-03-20 15:58:45.653481097 -0400 2074+++ linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c 2010-04-04 20:46:41.485273950 -0400
2075@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; 2075@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
2076 * map_page, and unmap_page on highmem, use normal dma_ops 2076 * map_page, and unmap_page on highmem, use normal dma_ops
2077 * for everything else. 2077 * for everything else.
@@ -2081,9 +2081,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.10/arc
2081 .alloc_coherent = dma_direct_alloc_coherent, 2081 .alloc_coherent = dma_direct_alloc_coherent,
2082 .free_coherent = dma_direct_free_coherent, 2082 .free_coherent = dma_direct_free_coherent,
2083 .map_sg = swiotlb_map_sg_attrs, 2083 .map_sg = swiotlb_map_sg_attrs,
2084diff -urNp linux-2.6.32.10/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.10/arch/powerpc/kernel/exceptions-64e.S 2084diff -urNp linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S
2085--- linux-2.6.32.10/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400 2085--- linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400
2086+++ linux-2.6.32.10/arch/powerpc/kernel/exceptions-64e.S 2010-03-20 15:58:45.653481097 -0400 2086+++ linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S 2010-04-04 20:46:41.485273950 -0400
2087@@ -455,6 +455,7 @@ storage_fault_common: 2087@@ -455,6 +455,7 @@ storage_fault_common:
2088 std r14,_DAR(r1) 2088 std r14,_DAR(r1)
2089 std r15,_DSISR(r1) 2089 std r15,_DSISR(r1)
@@ -2102,9 +2102,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.10/
2102 addi r3,r1,STACK_FRAME_OVERHEAD 2102 addi r3,r1,STACK_FRAME_OVERHEAD
2103 ld r4,_DAR(r1) 2103 ld r4,_DAR(r1)
2104 bl .bad_page_fault 2104 bl .bad_page_fault
2105diff -urNp linux-2.6.32.10/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.10/arch/powerpc/kernel/exceptions-64s.S 2105diff -urNp linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S
2106--- linux-2.6.32.10/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400 2106--- linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400
2107+++ linux-2.6.32.10/arch/powerpc/kernel/exceptions-64s.S 2010-03-20 15:58:45.653481097 -0400 2107+++ linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S 2010-04-04 20:46:41.485273950 -0400
2108@@ -818,10 +818,10 @@ handle_page_fault: 2108@@ -818,10 +818,10 @@ handle_page_fault:
2109 11: ld r4,_DAR(r1) 2109 11: ld r4,_DAR(r1)
2110 ld r5,_DSISR(r1) 2110 ld r5,_DSISR(r1)
@@ -2117,9 +2117,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.10/
2117 mr r5,r3 2117 mr r5,r3
2118 addi r3,r1,STACK_FRAME_OVERHEAD 2118 addi r3,r1,STACK_FRAME_OVERHEAD
2119 lwz r4,_DAR(r1) 2119 lwz r4,_DAR(r1)
2120diff -urNp linux-2.6.32.10/arch/powerpc/kernel/ibmebus.c linux-2.6.32.10/arch/powerpc/kernel/ibmebus.c 2120diff -urNp linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c
2121--- linux-2.6.32.10/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400 2121--- linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400
2122+++ linux-2.6.32.10/arch/powerpc/kernel/ibmebus.c 2010-03-20 15:58:45.653481097 -0400 2122+++ linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c 2010-04-04 20:46:41.485273950 -0400
2123@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct 2123@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
2124 return 1; 2124 return 1;
2125 } 2125 }
@@ -2129,9 +2129,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/ibmebus.c linux-2.6.32.10/arch/po
2129 .alloc_coherent = ibmebus_alloc_coherent, 2129 .alloc_coherent = ibmebus_alloc_coherent,
2130 .free_coherent = ibmebus_free_coherent, 2130 .free_coherent = ibmebus_free_coherent,
2131 .map_sg = ibmebus_map_sg, 2131 .map_sg = ibmebus_map_sg,
2132diff -urNp linux-2.6.32.10/arch/powerpc/kernel/kgdb.c linux-2.6.32.10/arch/powerpc/kernel/kgdb.c 2132diff -urNp linux-2.6.32.11/arch/powerpc/kernel/kgdb.c linux-2.6.32.11/arch/powerpc/kernel/kgdb.c
2133--- linux-2.6.32.10/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 2133--- linux-2.6.32.11/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
2134+++ linux-2.6.32.10/arch/powerpc/kernel/kgdb.c 2010-03-20 15:58:45.653481097 -0400 2134+++ linux-2.6.32.11/arch/powerpc/kernel/kgdb.c 2010-04-04 20:46:41.485273950 -0400
2135@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct 2135@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
2136 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) 2136 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
2137 return 0; 2137 return 0;
@@ -2150,9 +2150,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/kgdb.c linux-2.6.32.10/arch/power
2150 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, 2150 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
2151 }; 2151 };
2152 2152
2153diff -urNp linux-2.6.32.10/arch/powerpc/kernel/module_32.c linux-2.6.32.10/arch/powerpc/kernel/module_32.c 2153diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module_32.c linux-2.6.32.11/arch/powerpc/kernel/module_32.c
2154--- linux-2.6.32.10/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400 2154--- linux-2.6.32.11/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400
2155+++ linux-2.6.32.10/arch/powerpc/kernel/module_32.c 2010-03-20 15:58:45.653481097 -0400 2155+++ linux-2.6.32.11/arch/powerpc/kernel/module_32.c 2010-04-04 20:46:41.485273950 -0400
2156@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr 2156@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
2157 me->arch.core_plt_section = i; 2157 me->arch.core_plt_section = i;
2158 } 2158 }
@@ -2182,9 +2182,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/module_32.c linux-2.6.32.10/arch/
2182 2182
2183 /* Find this entry, or if that fails, the next avail. entry */ 2183 /* Find this entry, or if that fails, the next avail. entry */
2184 while (entry->jump[0]) { 2184 while (entry->jump[0]) {
2185diff -urNp linux-2.6.32.10/arch/powerpc/kernel/module.c linux-2.6.32.10/arch/powerpc/kernel/module.c 2185diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module.c linux-2.6.32.11/arch/powerpc/kernel/module.c
2186--- linux-2.6.32.10/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 2186--- linux-2.6.32.11/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
2187+++ linux-2.6.32.10/arch/powerpc/kernel/module.c 2010-03-20 15:58:45.653481097 -0400 2187+++ linux-2.6.32.11/arch/powerpc/kernel/module.c 2010-04-04 20:46:41.485273950 -0400
2188@@ -31,11 +31,24 @@ 2188@@ -31,11 +31,24 @@
2189 2189
2190 LIST_HEAD(module_bug_list); 2190 LIST_HEAD(module_bug_list);
@@ -2224,9 +2224,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/module.c linux-2.6.32.10/arch/pow
2224 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, 2224 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
2225 const Elf_Shdr *sechdrs, 2225 const Elf_Shdr *sechdrs,
2226 const char *name) 2226 const char *name)
2227diff -urNp linux-2.6.32.10/arch/powerpc/kernel/pci-common.c linux-2.6.32.10/arch/powerpc/kernel/pci-common.c 2227diff -urNp linux-2.6.32.11/arch/powerpc/kernel/pci-common.c linux-2.6.32.11/arch/powerpc/kernel/pci-common.c
2228--- linux-2.6.32.10/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400 2228--- linux-2.6.32.11/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400
2229+++ linux-2.6.32.10/arch/powerpc/kernel/pci-common.c 2010-03-20 15:58:45.653481097 -0400 2229+++ linux-2.6.32.11/arch/powerpc/kernel/pci-common.c 2010-04-04 20:46:41.485273950 -0400
2230@@ -50,14 +50,14 @@ resource_size_t isa_mem_base; 2230@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
2231 unsigned int ppc_pci_flags = 0; 2231 unsigned int ppc_pci_flags = 0;
2232 2232
@@ -2245,9 +2245,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/pci-common.c linux-2.6.32.10/arch
2245 { 2245 {
2246 return pci_dma_ops; 2246 return pci_dma_ops;
2247 } 2247 }
2248diff -urNp linux-2.6.32.10/arch/powerpc/kernel/process.c linux-2.6.32.10/arch/powerpc/kernel/process.c 2248diff -urNp linux-2.6.32.11/arch/powerpc/kernel/process.c linux-2.6.32.11/arch/powerpc/kernel/process.c
2249--- linux-2.6.32.10/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 2249--- linux-2.6.32.11/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
2250+++ linux-2.6.32.10/arch/powerpc/kernel/process.c 2010-03-20 15:58:45.653481097 -0400 2250+++ linux-2.6.32.11/arch/powerpc/kernel/process.c 2010-04-04 20:46:41.485273950 -0400
2251@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned 2251@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned
2252 sp -= get_random_int() & ~PAGE_MASK; 2252 sp -= get_random_int() & ~PAGE_MASK;
2253 return sp & ~0xf; 2253 return sp & ~0xf;
@@ -2300,9 +2300,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/process.c linux-2.6.32.10/arch/po
2300- 2300-
2301- return ret; 2301- return ret;
2302-} 2302-}
2303diff -urNp linux-2.6.32.10/arch/powerpc/kernel/signal_32.c linux-2.6.32.10/arch/powerpc/kernel/signal_32.c 2303diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_32.c linux-2.6.32.11/arch/powerpc/kernel/signal_32.c
2304--- linux-2.6.32.10/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400 2304--- linux-2.6.32.11/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400
2305+++ linux-2.6.32.10/arch/powerpc/kernel/signal_32.c 2010-03-20 15:58:45.653481097 -0400 2305+++ linux-2.6.32.11/arch/powerpc/kernel/signal_32.c 2010-04-04 20:46:41.489273754 -0400
2306@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig 2306@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
2307 /* Save user registers on the stack */ 2307 /* Save user registers on the stack */
2308 frame = &rt_sf->uc.uc_mcontext; 2308 frame = &rt_sf->uc.uc_mcontext;
@@ -2312,9 +2312,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/signal_32.c linux-2.6.32.10/arch/
2312 if (save_user_regs(regs, frame, 0, 1)) 2312 if (save_user_regs(regs, frame, 0, 1))
2313 goto badframe; 2313 goto badframe;
2314 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; 2314 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
2315diff -urNp linux-2.6.32.10/arch/powerpc/kernel/signal_64.c linux-2.6.32.10/arch/powerpc/kernel/signal_64.c 2315diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_64.c linux-2.6.32.11/arch/powerpc/kernel/signal_64.c
2316--- linux-2.6.32.10/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400 2316--- linux-2.6.32.11/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400
2317+++ linux-2.6.32.10/arch/powerpc/kernel/signal_64.c 2010-03-20 15:58:45.653481097 -0400 2317+++ linux-2.6.32.11/arch/powerpc/kernel/signal_64.c 2010-04-04 20:46:41.489273754 -0400
2318@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct 2318@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
2319 current->thread.fpscr.val = 0; 2319 current->thread.fpscr.val = 0;
2320 2320
@@ -2324,9 +2324,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/signal_64.c linux-2.6.32.10/arch/
2324 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; 2324 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
2325 } else { 2325 } else {
2326 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); 2326 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
2327diff -urNp linux-2.6.32.10/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.10/arch/powerpc/kernel/sys_ppc32.c 2327diff -urNp linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c
2328--- linux-2.6.32.10/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400 2328--- linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400
2329+++ linux-2.6.32.10/arch/powerpc/kernel/sys_ppc32.c 2010-03-20 15:58:45.653481097 -0400 2329+++ linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c 2010-04-04 20:46:41.489273754 -0400
2330@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct 2330@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
2331 if (oldlenp) { 2331 if (oldlenp) {
2332 if (!error) { 2332 if (!error) {
@@ -2340,9 +2340,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.10/arch/
2340 } 2340 }
2341 return error; 2341 return error;
2342 } 2342 }
2343diff -urNp linux-2.6.32.10/arch/powerpc/kernel/vdso.c linux-2.6.32.10/arch/powerpc/kernel/vdso.c 2343diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vdso.c linux-2.6.32.11/arch/powerpc/kernel/vdso.c
2344--- linux-2.6.32.10/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400 2344--- linux-2.6.32.11/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400
2345+++ linux-2.6.32.10/arch/powerpc/kernel/vdso.c 2010-03-20 15:58:45.653481097 -0400 2345+++ linux-2.6.32.11/arch/powerpc/kernel/vdso.c 2010-04-04 20:46:41.489273754 -0400
2346@@ -36,6 +36,7 @@ 2346@@ -36,6 +36,7 @@
2347 #include <asm/firmware.h> 2347 #include <asm/firmware.h>
2348 #include <asm/vdso.h> 2348 #include <asm/vdso.h>
@@ -2369,9 +2369,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/vdso.c linux-2.6.32.10/arch/power
2369 if (IS_ERR_VALUE(vdso_base)) { 2369 if (IS_ERR_VALUE(vdso_base)) {
2370 rc = vdso_base; 2370 rc = vdso_base;
2371 goto fail_mmapsem; 2371 goto fail_mmapsem;
2372diff -urNp linux-2.6.32.10/arch/powerpc/kernel/vio.c linux-2.6.32.10/arch/powerpc/kernel/vio.c 2372diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vio.c linux-2.6.32.11/arch/powerpc/kernel/vio.c
2373--- linux-2.6.32.10/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400 2373--- linux-2.6.32.11/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400
2374+++ linux-2.6.32.10/arch/powerpc/kernel/vio.c 2010-03-20 15:58:45.653481097 -0400 2374+++ linux-2.6.32.11/arch/powerpc/kernel/vio.c 2010-04-04 20:46:41.489273754 -0400
2375@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc 2375@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
2376 vio_cmo_dealloc(viodev, alloc_size); 2376 vio_cmo_dealloc(viodev, alloc_size);
2377 } 2377 }
@@ -2394,9 +2394,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/kernel/vio.c linux-2.6.32.10/arch/powerp
2394 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; 2394 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
2395 } 2395 }
2396 2396
2397diff -urNp linux-2.6.32.10/arch/powerpc/lib/usercopy_64.c linux-2.6.32.10/arch/powerpc/lib/usercopy_64.c 2397diff -urNp linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c
2398--- linux-2.6.32.10/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 2398--- linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400
2399+++ linux-2.6.32.10/arch/powerpc/lib/usercopy_64.c 2010-03-20 15:58:45.653481097 -0400 2399+++ linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c 2010-04-04 20:46:41.489273754 -0400
2400@@ -9,22 +9,6 @@ 2400@@ -9,22 +9,6 @@
2401 #include <linux/module.h> 2401 #include <linux/module.h>
2402 #include <asm/uaccess.h> 2402 #include <asm/uaccess.h>
@@ -2428,9 +2428,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/lib/usercopy_64.c linux-2.6.32.10/arch/p
2428-EXPORT_SYMBOL(copy_to_user); 2428-EXPORT_SYMBOL(copy_to_user);
2429 EXPORT_SYMBOL(copy_in_user); 2429 EXPORT_SYMBOL(copy_in_user);
2430 2430
2431diff -urNp linux-2.6.32.10/arch/powerpc/mm/fault.c linux-2.6.32.10/arch/powerpc/mm/fault.c 2431diff -urNp linux-2.6.32.11/arch/powerpc/mm/fault.c linux-2.6.32.11/arch/powerpc/mm/fault.c
2432--- linux-2.6.32.10/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 2432--- linux-2.6.32.11/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
2433+++ linux-2.6.32.10/arch/powerpc/mm/fault.c 2010-03-20 15:58:45.653481097 -0400 2433+++ linux-2.6.32.11/arch/powerpc/mm/fault.c 2010-04-04 20:46:41.489273754 -0400
2434@@ -30,6 +30,10 @@ 2434@@ -30,6 +30,10 @@
2435 #include <linux/kprobes.h> 2435 #include <linux/kprobes.h>
2436 #include <linux/kdebug.h> 2436 #include <linux/kdebug.h>
@@ -2535,9 +2535,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/mm/fault.c linux-2.6.32.10/arch/powerpc/
2535 _exception(SIGSEGV, regs, code, address); 2535 _exception(SIGSEGV, regs, code, address);
2536 return 0; 2536 return 0;
2537 } 2537 }
2538diff -urNp linux-2.6.32.10/arch/powerpc/mm/mmap_64.c linux-2.6.32.10/arch/powerpc/mm/mmap_64.c 2538diff -urNp linux-2.6.32.11/arch/powerpc/mm/mmap_64.c linux-2.6.32.11/arch/powerpc/mm/mmap_64.c
2539--- linux-2.6.32.10/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400 2539--- linux-2.6.32.11/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400
2540+++ linux-2.6.32.10/arch/powerpc/mm/mmap_64.c 2010-03-20 15:58:45.653481097 -0400 2540+++ linux-2.6.32.11/arch/powerpc/mm/mmap_64.c 2010-04-04 20:46:41.489273754 -0400
2541@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str 2541@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
2542 */ 2542 */
2543 if (mmap_is_legacy()) { 2543 if (mmap_is_legacy()) {
@@ -2561,9 +2561,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/mm/mmap_64.c linux-2.6.32.10/arch/powerp
2561 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 2561 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
2562 mm->unmap_area = arch_unmap_area_topdown; 2562 mm->unmap_area = arch_unmap_area_topdown;
2563 } 2563 }
2564diff -urNp linux-2.6.32.10/arch/powerpc/mm/slice.c linux-2.6.32.10/arch/powerpc/mm/slice.c 2564diff -urNp linux-2.6.32.11/arch/powerpc/mm/slice.c linux-2.6.32.11/arch/powerpc/mm/slice.c
2565--- linux-2.6.32.10/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400 2565--- linux-2.6.32.11/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400
2566+++ linux-2.6.32.10/arch/powerpc/mm/slice.c 2010-03-20 15:58:45.653481097 -0400 2566+++ linux-2.6.32.11/arch/powerpc/mm/slice.c 2010-04-04 20:46:41.489273754 -0400
2567@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un 2567@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un
2568 if (fixed && addr > (mm->task_size - len)) 2568 if (fixed && addr > (mm->task_size - len))
2569 return -EINVAL; 2569 return -EINVAL;
@@ -2576,9 +2576,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/mm/slice.c linux-2.6.32.10/arch/powerpc/
2576 /* If hint, make sure it matches our alignment restrictions */ 2576 /* If hint, make sure it matches our alignment restrictions */
2577 if (!fixed && addr) { 2577 if (!fixed && addr) {
2578 addr = _ALIGN_UP(addr, 1ul << pshift); 2578 addr = _ALIGN_UP(addr, 1ul << pshift);
2579diff -urNp linux-2.6.32.10/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.10/arch/powerpc/platforms/52xx/lite5200_pm.c 2579diff -urNp linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c
2580--- linux-2.6.32.10/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400 2580--- linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400
2581+++ linux-2.6.32.10/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-20 15:58:45.653481097 -0400 2581+++ linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-04-04 20:46:41.489273754 -0400
2582@@ -235,7 +235,7 @@ static void lite5200_pm_end(void) 2582@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
2583 lite5200_pm_target_state = PM_SUSPEND_ON; 2583 lite5200_pm_target_state = PM_SUSPEND_ON;
2584 } 2584 }
@@ -2588,9 +2588,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3
2588 .valid = lite5200_pm_valid, 2588 .valid = lite5200_pm_valid,
2589 .begin = lite5200_pm_begin, 2589 .begin = lite5200_pm_begin,
2590 .prepare = lite5200_pm_prepare, 2590 .prepare = lite5200_pm_prepare,
2591diff -urNp linux-2.6.32.10/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.10/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2591diff -urNp linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c
2592--- linux-2.6.32.10/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400 2592--- linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400
2593+++ linux-2.6.32.10/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-20 15:58:45.653481097 -0400 2593+++ linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-04-04 20:46:41.489273754 -0400
2594@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) 2594@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
2595 iounmap(mbar); 2595 iounmap(mbar);
2596 } 2596 }
@@ -2600,9 +2600,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32
2600 .valid = mpc52xx_pm_valid, 2600 .valid = mpc52xx_pm_valid,
2601 .prepare = mpc52xx_pm_prepare, 2601 .prepare = mpc52xx_pm_prepare,
2602 .enter = mpc52xx_pm_enter, 2602 .enter = mpc52xx_pm_enter,
2603diff -urNp linux-2.6.32.10/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.10/arch/powerpc/platforms/83xx/suspend.c 2603diff -urNp linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c
2604--- linux-2.6.32.10/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400 2604--- linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400
2605+++ linux-2.6.32.10/arch/powerpc/platforms/83xx/suspend.c 2010-03-20 15:58:45.653481097 -0400 2605+++ linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c 2010-04-04 20:46:41.489273754 -0400
2606@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) 2606@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
2607 return ret; 2607 return ret;
2608 } 2608 }
@@ -2612,9 +2612,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.10
2612 .valid = mpc83xx_suspend_valid, 2612 .valid = mpc83xx_suspend_valid,
2613 .begin = mpc83xx_suspend_begin, 2613 .begin = mpc83xx_suspend_begin,
2614 .enter = mpc83xx_suspend_enter, 2614 .enter = mpc83xx_suspend_enter,
2615diff -urNp linux-2.6.32.10/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.10/arch/powerpc/platforms/cell/iommu.c 2615diff -urNp linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c
2616--- linux-2.6.32.10/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400 2616--- linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400
2617+++ linux-2.6.32.10/arch/powerpc/platforms/cell/iommu.c 2010-03-20 15:58:45.657383148 -0400 2617+++ linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c 2010-04-04 20:46:41.489273754 -0400
2618@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc 2618@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
2619 2619
2620 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); 2620 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -2624,9 +2624,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.10/a
2624 .alloc_coherent = dma_fixed_alloc_coherent, 2624 .alloc_coherent = dma_fixed_alloc_coherent,
2625 .free_coherent = dma_fixed_free_coherent, 2625 .free_coherent = dma_fixed_free_coherent,
2626 .map_sg = dma_fixed_map_sg, 2626 .map_sg = dma_fixed_map_sg,
2627diff -urNp linux-2.6.32.10/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.10/arch/powerpc/platforms/ps3/system-bus.c 2627diff -urNp linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c
2628--- linux-2.6.32.10/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400 2628--- linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400
2629+++ linux-2.6.32.10/arch/powerpc/platforms/ps3/system-bus.c 2010-03-20 15:58:45.657383148 -0400 2629+++ linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c 2010-04-04 20:46:41.489273754 -0400
2630@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi 2630@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
2631 return mask >= DMA_BIT_MASK(32); 2631 return mask >= DMA_BIT_MASK(32);
2632 } 2632 }
@@ -2645,9 +2645,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
2645 .alloc_coherent = ps3_alloc_coherent, 2645 .alloc_coherent = ps3_alloc_coherent,
2646 .free_coherent = ps3_free_coherent, 2646 .free_coherent = ps3_free_coherent,
2647 .map_sg = ps3_ioc0_map_sg, 2647 .map_sg = ps3_ioc0_map_sg,
2648diff -urNp linux-2.6.32.10/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.10/arch/powerpc/platforms/pseries/Kconfig 2648diff -urNp linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig
2649--- linux-2.6.32.10/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400 2649--- linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400
2650+++ linux-2.6.32.10/arch/powerpc/platforms/pseries/Kconfig 2010-03-20 15:58:45.657383148 -0400 2650+++ linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig 2010-04-04 20:46:41.489273754 -0400
2651@@ -2,6 +2,8 @@ config PPC_PSERIES 2651@@ -2,6 +2,8 @@ config PPC_PSERIES
2652 depends on PPC64 && PPC_BOOK3S 2652 depends on PPC64 && PPC_BOOK3S
2653 bool "IBM pSeries & new (POWER5-based) iSeries" 2653 bool "IBM pSeries & new (POWER5-based) iSeries"
@@ -2657,9 +2657,9 @@ diff -urNp linux-2.6.32.10/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.1
2657 select PPC_I8259 2657 select PPC_I8259
2658 select PPC_RTAS 2658 select PPC_RTAS
2659 select RTAS_ERROR_LOGGING 2659 select RTAS_ERROR_LOGGING
2660diff -urNp linux-2.6.32.10/arch/s390/include/asm/elf.h linux-2.6.32.10/arch/s390/include/asm/elf.h 2660diff -urNp linux-2.6.32.11/arch/s390/include/asm/elf.h linux-2.6.32.11/arch/s390/include/asm/elf.h
2661--- linux-2.6.32.10/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 2661--- linux-2.6.32.11/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
2662+++ linux-2.6.32.10/arch/s390/include/asm/elf.h 2010-03-20 15:58:45.657383148 -0400 2662+++ linux-2.6.32.11/arch/s390/include/asm/elf.h 2010-04-04 20:46:41.489273754 -0400
2663@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; 2663@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
2664 that it will "exec", and that there is sufficient room for the brk. */ 2664 that it will "exec", and that there is sufficient room for the brk. */
2665 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) 2665 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
@@ -2674,9 +2674,9 @@ diff -urNp linux-2.6.32.10/arch/s390/include/asm/elf.h linux-2.6.32.10/arch/s390
2674 /* This yields a mask that user programs can use to figure out what 2674 /* This yields a mask that user programs can use to figure out what
2675 instruction set this CPU supports. */ 2675 instruction set this CPU supports. */
2676 2676
2677diff -urNp linux-2.6.32.10/arch/s390/include/asm/setup.h linux-2.6.32.10/arch/s390/include/asm/setup.h 2677diff -urNp linux-2.6.32.11/arch/s390/include/asm/setup.h linux-2.6.32.11/arch/s390/include/asm/setup.h
2678--- linux-2.6.32.10/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400 2678--- linux-2.6.32.11/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400
2679+++ linux-2.6.32.10/arch/s390/include/asm/setup.h 2010-03-20 15:58:45.657383148 -0400 2679+++ linux-2.6.32.11/arch/s390/include/asm/setup.h 2010-04-04 20:46:41.489273754 -0400
2680@@ -50,13 +50,13 @@ extern unsigned long memory_end; 2680@@ -50,13 +50,13 @@ extern unsigned long memory_end;
2681 void detect_memory_layout(struct mem_chunk chunk[]); 2681 void detect_memory_layout(struct mem_chunk chunk[]);
2682 2682
@@ -2693,9 +2693,9 @@ diff -urNp linux-2.6.32.10/arch/s390/include/asm/setup.h linux-2.6.32.10/arch/s3
2693 #else 2693 #else
2694 #define s390_noexec (0) 2694 #define s390_noexec (0)
2695 #endif 2695 #endif
2696diff -urNp linux-2.6.32.10/arch/s390/include/asm/uaccess.h linux-2.6.32.10/arch/s390/include/asm/uaccess.h 2696diff -urNp linux-2.6.32.11/arch/s390/include/asm/uaccess.h linux-2.6.32.11/arch/s390/include/asm/uaccess.h
2697--- linux-2.6.32.10/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 2697--- linux-2.6.32.11/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
2698+++ linux-2.6.32.10/arch/s390/include/asm/uaccess.h 2010-03-20 15:58:45.657383148 -0400 2698+++ linux-2.6.32.11/arch/s390/include/asm/uaccess.h 2010-04-04 20:46:41.489273754 -0400
2699@@ -232,6 +232,10 @@ static inline unsigned long __must_check 2699@@ -232,6 +232,10 @@ static inline unsigned long __must_check
2700 copy_to_user(void __user *to, const void *from, unsigned long n) 2700 copy_to_user(void __user *to, const void *from, unsigned long n)
2701 { 2701 {
@@ -2728,9 +2728,9 @@ diff -urNp linux-2.6.32.10/arch/s390/include/asm/uaccess.h linux-2.6.32.10/arch/
2728 if (access_ok(VERIFY_READ, from, n)) 2728 if (access_ok(VERIFY_READ, from, n))
2729 n = __copy_from_user(to, from, n); 2729 n = __copy_from_user(to, from, n);
2730 else 2730 else
2731diff -urNp linux-2.6.32.10/arch/s390/Kconfig linux-2.6.32.10/arch/s390/Kconfig 2731diff -urNp linux-2.6.32.11/arch/s390/Kconfig linux-2.6.32.11/arch/s390/Kconfig
2732--- linux-2.6.32.10/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400 2732--- linux-2.6.32.11/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400
2733+++ linux-2.6.32.10/arch/s390/Kconfig 2010-03-20 15:58:45.657383148 -0400 2733+++ linux-2.6.32.11/arch/s390/Kconfig 2010-04-04 20:46:41.489273754 -0400
2734@@ -194,28 +194,26 @@ config AUDIT_ARCH 2734@@ -194,28 +194,26 @@ config AUDIT_ARCH
2735 2735
2736 config S390_SWITCH_AMODE 2736 config S390_SWITCH_AMODE
@@ -2768,9 +2768,9 @@ diff -urNp linux-2.6.32.10/arch/s390/Kconfig linux-2.6.32.10/arch/s390/Kconfig
2768 2768
2769 comment "Code generation options" 2769 comment "Code generation options"
2770 2770
2771diff -urNp linux-2.6.32.10/arch/s390/kernel/module.c linux-2.6.32.10/arch/s390/kernel/module.c 2771diff -urNp linux-2.6.32.11/arch/s390/kernel/module.c linux-2.6.32.11/arch/s390/kernel/module.c
2772--- linux-2.6.32.10/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 2772--- linux-2.6.32.11/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
2773+++ linux-2.6.32.10/arch/s390/kernel/module.c 2010-03-20 15:58:45.657383148 -0400 2773+++ linux-2.6.32.11/arch/s390/kernel/module.c 2010-04-04 20:46:41.492578989 -0400
2774@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, 2774@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
2775 2775
2776 /* Increase core size by size of got & plt and set start 2776 /* Increase core size by size of got & plt and set start
@@ -2842,9 +2842,9 @@ diff -urNp linux-2.6.32.10/arch/s390/kernel/module.c linux-2.6.32.10/arch/s390/k
2842 rela->r_addend - loc; 2842 rela->r_addend - loc;
2843 if (r_type == R_390_GOTPC) 2843 if (r_type == R_390_GOTPC)
2844 *(unsigned int *) loc = val; 2844 *(unsigned int *) loc = val;
2845diff -urNp linux-2.6.32.10/arch/s390/kernel/setup.c linux-2.6.32.10/arch/s390/kernel/setup.c 2845diff -urNp linux-2.6.32.11/arch/s390/kernel/setup.c linux-2.6.32.11/arch/s390/kernel/setup.c
2846--- linux-2.6.32.10/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 2846--- linux-2.6.32.11/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
2847+++ linux-2.6.32.10/arch/s390/kernel/setup.c 2010-03-20 15:58:45.657383148 -0400 2847+++ linux-2.6.32.11/arch/s390/kernel/setup.c 2010-04-04 20:46:41.492578989 -0400
2848@@ -306,9 +306,6 @@ static int __init early_parse_mem(char * 2848@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
2849 early_param("mem", early_parse_mem); 2849 early_param("mem", early_parse_mem);
2850 2850
@@ -2898,9 +2898,9 @@ diff -urNp linux-2.6.32.10/arch/s390/kernel/setup.c linux-2.6.32.10/arch/s390/ke
2898 static void setup_addressing_mode(void) 2898 static void setup_addressing_mode(void)
2899 { 2899 {
2900 if (s390_noexec) { 2900 if (s390_noexec) {
2901diff -urNp linux-2.6.32.10/arch/s390/mm/mmap.c linux-2.6.32.10/arch/s390/mm/mmap.c 2901diff -urNp linux-2.6.32.11/arch/s390/mm/mmap.c linux-2.6.32.11/arch/s390/mm/mmap.c
2902--- linux-2.6.32.10/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 2902--- linux-2.6.32.11/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
2903+++ linux-2.6.32.10/arch/s390/mm/mmap.c 2010-03-20 15:58:45.657383148 -0400 2903+++ linux-2.6.32.11/arch/s390/mm/mmap.c 2010-04-04 20:46:41.492578989 -0400
2904@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str 2904@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
2905 */ 2905 */
2906 if (mmap_is_legacy()) { 2906 if (mmap_is_legacy()) {
@@ -2947,9 +2947,9 @@ diff -urNp linux-2.6.32.10/arch/s390/mm/mmap.c linux-2.6.32.10/arch/s390/mm/mmap
2947 mm->get_unmapped_area = s390_get_unmapped_area_topdown; 2947 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
2948 mm->unmap_area = arch_unmap_area_topdown; 2948 mm->unmap_area = arch_unmap_area_topdown;
2949 } 2949 }
2950diff -urNp linux-2.6.32.10/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.10/arch/sh/boards/mach-hp6xx/pm.c 2950diff -urNp linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c
2951--- linux-2.6.32.10/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400 2951--- linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400
2952+++ linux-2.6.32.10/arch/sh/boards/mach-hp6xx/pm.c 2010-03-20 15:58:45.666359473 -0400 2952+++ linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c 2010-04-04 20:46:41.492578989 -0400
2953@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ 2953@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
2954 return 0; 2954 return 0;
2955 } 2955 }
@@ -2959,9 +2959,9 @@ diff -urNp linux-2.6.32.10/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.10/arch/s
2959 .enter = hp6x0_pm_enter, 2959 .enter = hp6x0_pm_enter,
2960 .valid = suspend_valid_only_mem, 2960 .valid = suspend_valid_only_mem,
2961 }; 2961 };
2962diff -urNp linux-2.6.32.10/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.10/arch/sh/kernel/cpu/sh4/sq.c 2962diff -urNp linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c
2963--- linux-2.6.32.10/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400 2963--- linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400
2964+++ linux-2.6.32.10/arch/sh/kernel/cpu/sh4/sq.c 2010-03-20 15:58:45.666359473 -0400 2964+++ linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c 2010-04-04 20:46:41.492578989 -0400
2965@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ 2965@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
2966 NULL, 2966 NULL,
2967 }; 2967 };
@@ -2971,9 +2971,9 @@ diff -urNp linux-2.6.32.10/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.10/arch/sh/k
2971 .show = sq_sysfs_show, 2971 .show = sq_sysfs_show,
2972 .store = sq_sysfs_store, 2972 .store = sq_sysfs_store,
2973 }; 2973 };
2974diff -urNp linux-2.6.32.10/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.10/arch/sh/kernel/cpu/shmobile/pm.c 2974diff -urNp linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c
2975--- linux-2.6.32.10/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400 2975--- linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400
2976+++ linux-2.6.32.10/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-20 15:58:45.666359473 -0400 2976+++ linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c 2010-04-04 20:46:41.492578989 -0400
2977@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s 2977@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
2978 return 0; 2978 return 0;
2979 } 2979 }
@@ -2983,9 +2983,9 @@ diff -urNp linux-2.6.32.10/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.10/arch
2983 .enter = sh_pm_enter, 2983 .enter = sh_pm_enter,
2984 .valid = suspend_valid_only_mem, 2984 .valid = suspend_valid_only_mem,
2985 }; 2985 };
2986diff -urNp linux-2.6.32.10/arch/sh/kernel/kgdb.c linux-2.6.32.10/arch/sh/kernel/kgdb.c 2986diff -urNp linux-2.6.32.11/arch/sh/kernel/kgdb.c linux-2.6.32.11/arch/sh/kernel/kgdb.c
2987--- linux-2.6.32.10/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 2987--- linux-2.6.32.11/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
2988+++ linux-2.6.32.10/arch/sh/kernel/kgdb.c 2010-03-20 15:58:45.666359473 -0400 2988+++ linux-2.6.32.11/arch/sh/kernel/kgdb.c 2010-04-04 20:46:41.492578989 -0400
2989@@ -271,7 +271,7 @@ void kgdb_arch_exit(void) 2989@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
2990 { 2990 {
2991 } 2991 }
@@ -2995,9 +2995,9 @@ diff -urNp linux-2.6.32.10/arch/sh/kernel/kgdb.c linux-2.6.32.10/arch/sh/kernel/
2995 /* Breakpoint instruction: trapa #0x3c */ 2995 /* Breakpoint instruction: trapa #0x3c */
2996 #ifdef CONFIG_CPU_LITTLE_ENDIAN 2996 #ifdef CONFIG_CPU_LITTLE_ENDIAN
2997 .gdb_bpt_instr = { 0x3c, 0xc3 }, 2997 .gdb_bpt_instr = { 0x3c, 0xc3 },
2998diff -urNp linux-2.6.32.10/arch/sparc/include/asm/atomic_64.h linux-2.6.32.10/arch/sparc/include/asm/atomic_64.h 2998diff -urNp linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h
2999--- linux-2.6.32.10/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 2999--- linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
3000+++ linux-2.6.32.10/arch/sparc/include/asm/atomic_64.h 2010-03-20 15:58:45.666359473 -0400 3000+++ linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h 2010-04-04 20:46:41.492578989 -0400
3001@@ -14,18 +14,38 @@ 3001@@ -14,18 +14,38 @@
3002 #define ATOMIC64_INIT(i) { (i) } 3002 #define ATOMIC64_INIT(i) { (i) }
3003 3003
@@ -3127,9 +3127,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/include/asm/atomic_64.h linux-2.6.32.10/ar
3127 } 3127 }
3128 3128
3129 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) 3129 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
3130diff -urNp linux-2.6.32.10/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.10/arch/sparc/include/asm/dma-mapping.h 3130diff -urNp linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h
3131--- linux-2.6.32.10/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 3131--- linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
3132+++ linux-2.6.32.10/arch/sparc/include/asm/dma-mapping.h 2010-03-20 15:58:45.666359473 -0400 3132+++ linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h 2010-04-04 20:46:41.492578989 -0400
3133@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d 3133@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
3134 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) 3134 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
3135 #define dma_is_consistent(d, h) (1) 3135 #define dma_is_consistent(d, h) (1)
@@ -3161,9 +3161,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.10/
3161 3161
3162 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); 3162 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
3163 ops->free_coherent(dev, size, cpu_addr, dma_handle); 3163 ops->free_coherent(dev, size, cpu_addr, dma_handle);
3164diff -urNp linux-2.6.32.10/arch/sparc/include/asm/elf_32.h linux-2.6.32.10/arch/sparc/include/asm/elf_32.h 3164diff -urNp linux-2.6.32.11/arch/sparc/include/asm/elf_32.h linux-2.6.32.11/arch/sparc/include/asm/elf_32.h
3165--- linux-2.6.32.10/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400 3165--- linux-2.6.32.11/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400
3166+++ linux-2.6.32.10/arch/sparc/include/asm/elf_32.h 2010-03-20 15:58:45.666359473 -0400 3166+++ linux-2.6.32.11/arch/sparc/include/asm/elf_32.h 2010-04-04 20:46:41.492578989 -0400
3167@@ -116,6 +116,13 @@ typedef struct { 3167@@ -116,6 +116,13 @@ typedef struct {
3168 3168
3169 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) 3169 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -3178,9 +3178,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/include/asm/elf_32.h linux-2.6.32.10/arch/
3178 /* This yields a mask that user programs can use to figure out what 3178 /* This yields a mask that user programs can use to figure out what
3179 instruction set this cpu supports. This can NOT be done in userspace 3179 instruction set this cpu supports. This can NOT be done in userspace
3180 on Sparc. */ 3180 on Sparc. */
3181diff -urNp linux-2.6.32.10/arch/sparc/include/asm/elf_64.h linux-2.6.32.10/arch/sparc/include/asm/elf_64.h 3181diff -urNp linux-2.6.32.11/arch/sparc/include/asm/elf_64.h linux-2.6.32.11/arch/sparc/include/asm/elf_64.h
3182--- linux-2.6.32.10/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400 3182--- linux-2.6.32.11/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400
3183+++ linux-2.6.32.10/arch/sparc/include/asm/elf_64.h 2010-03-20 15:58:45.666359473 -0400 3183+++ linux-2.6.32.11/arch/sparc/include/asm/elf_64.h 2010-04-04 20:46:41.492578989 -0400
3184@@ -163,6 +163,12 @@ typedef struct { 3184@@ -163,6 +163,12 @@ typedef struct {
3185 #define ELF_ET_DYN_BASE 0x0000010000000000UL 3185 #define ELF_ET_DYN_BASE 0x0000010000000000UL
3186 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL 3186 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -3194,9 +3194,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/include/asm/elf_64.h linux-2.6.32.10/arch/
3194 3194
3195 /* This yields a mask that user programs can use to figure out what 3195 /* This yields a mask that user programs can use to figure out what
3196 instruction set this cpu supports. */ 3196 instruction set this cpu supports. */
3197diff -urNp linux-2.6.32.10/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.10/arch/sparc/include/asm/pgtable_32.h 3197diff -urNp linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h
3198--- linux-2.6.32.10/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 3198--- linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
3199+++ linux-2.6.32.10/arch/sparc/include/asm/pgtable_32.h 2010-03-20 15:58:45.666359473 -0400 3199+++ linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h 2010-04-04 20:46:41.492578989 -0400
3200@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) 3200@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
3201 BTFIXUPDEF_INT(page_none) 3201 BTFIXUPDEF_INT(page_none)
3202 BTFIXUPDEF_INT(page_copy) 3202 BTFIXUPDEF_INT(page_copy)
@@ -3228,9 +3228,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.10/a
3228 extern unsigned long page_kernel; 3228 extern unsigned long page_kernel;
3229 3229
3230 #ifdef MODULE 3230 #ifdef MODULE
3231diff -urNp linux-2.6.32.10/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.10/arch/sparc/include/asm/pgtsrmmu.h 3231diff -urNp linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h
3232--- linux-2.6.32.10/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400 3232--- linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400
3233+++ linux-2.6.32.10/arch/sparc/include/asm/pgtsrmmu.h 2010-03-20 15:58:45.666359473 -0400 3233+++ linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h 2010-04-04 20:46:41.492578989 -0400
3234@@ -115,6 +115,13 @@ 3234@@ -115,6 +115,13 @@
3235 SRMMU_EXEC | SRMMU_REF) 3235 SRMMU_EXEC | SRMMU_REF)
3236 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ 3236 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3245,9 +3245,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.10/arc
3245 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ 3245 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
3246 SRMMU_DIRTY | SRMMU_REF) 3246 SRMMU_DIRTY | SRMMU_REF)
3247 3247
3248diff -urNp linux-2.6.32.10/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.10/arch/sparc/include/asm/spinlock_64.h 3248diff -urNp linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h
3249--- linux-2.6.32.10/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400 3249--- linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400
3250+++ linux-2.6.32.10/arch/sparc/include/asm/spinlock_64.h 2010-03-20 15:58:45.666359473 -0400 3250+++ linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h 2010-04-04 20:46:41.492578989 -0400
3251@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw 3251@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
3252 __asm__ __volatile__ ( 3252 __asm__ __volatile__ (
3253 "1: ldsw [%2], %0\n" 3253 "1: ldsw [%2], %0\n"
@@ -3299,9 +3299,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.10/
3299 " cas [%2], %0, %1\n" 3299 " cas [%2], %0, %1\n"
3300 " cmp %0, %1\n" 3300 " cmp %0, %1\n"
3301 " bne,pn %%xcc, 1b\n" 3301 " bne,pn %%xcc, 1b\n"
3302diff -urNp linux-2.6.32.10/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.10/arch/sparc/include/asm/uaccess_32.h 3302diff -urNp linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h
3303--- linux-2.6.32.10/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 3303--- linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
3304+++ linux-2.6.32.10/arch/sparc/include/asm/uaccess_32.h 2010-03-20 15:58:45.666359473 -0400 3304+++ linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h 2010-04-04 20:46:41.492578989 -0400
3305@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ 3305@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
3306 3306
3307 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) 3307 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3353,9 +3353,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.10/a
3353 return __copy_user((__force void __user *) to, from, n); 3353 return __copy_user((__force void __user *) to, from, n);
3354 } 3354 }
3355 3355
3356diff -urNp linux-2.6.32.10/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.10/arch/sparc/include/asm/uaccess_64.h 3356diff -urNp linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h
3357--- linux-2.6.32.10/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 3357--- linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
3358+++ linux-2.6.32.10/arch/sparc/include/asm/uaccess_64.h 2010-03-20 15:58:45.666359473 -0400 3358+++ linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h 2010-04-04 20:46:41.492578989 -0400
3359@@ -9,6 +9,7 @@ 3359@@ -9,6 +9,7 @@
3360 #include <linux/compiler.h> 3360 #include <linux/compiler.h>
3361 #include <linux/string.h> 3361 #include <linux/string.h>
@@ -3406,9 +3406,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.10/a
3406 if (unlikely(ret)) 3406 if (unlikely(ret))
3407 ret = copy_to_user_fixup(to, from, size); 3407 ret = copy_to_user_fixup(to, from, size);
3408 return ret; 3408 return ret;
3409diff -urNp linux-2.6.32.10/arch/sparc/kernel/iommu.c linux-2.6.32.10/arch/sparc/kernel/iommu.c 3409diff -urNp linux-2.6.32.11/arch/sparc/kernel/iommu.c linux-2.6.32.11/arch/sparc/kernel/iommu.c
3410--- linux-2.6.32.10/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400 3410--- linux-2.6.32.11/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400
3411+++ linux-2.6.32.10/arch/sparc/kernel/iommu.c 2010-03-20 15:58:45.666359473 -0400 3411+++ linux-2.6.32.11/arch/sparc/kernel/iommu.c 2010-04-04 20:46:41.492578989 -0400
3412@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc 3412@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
3413 spin_unlock_irqrestore(&iommu->lock, flags); 3413 spin_unlock_irqrestore(&iommu->lock, flags);
3414 } 3414 }
@@ -3427,9 +3427,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/kernel/iommu.c linux-2.6.32.10/arch/sparc/
3427 EXPORT_SYMBOL(dma_ops); 3427 EXPORT_SYMBOL(dma_ops);
3428 3428
3429 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); 3429 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
3430diff -urNp linux-2.6.32.10/arch/sparc/kernel/ioport.c linux-2.6.32.10/arch/sparc/kernel/ioport.c 3430diff -urNp linux-2.6.32.11/arch/sparc/kernel/ioport.c linux-2.6.32.11/arch/sparc/kernel/ioport.c
3431--- linux-2.6.32.10/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 3431--- linux-2.6.32.11/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
3432+++ linux-2.6.32.10/arch/sparc/kernel/ioport.c 2010-03-20 15:58:45.666359473 -0400 3432+++ linux-2.6.32.11/arch/sparc/kernel/ioport.c 2010-04-04 20:46:41.492578989 -0400
3433@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru 3433@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
3434 BUG(); 3434 BUG();
3435 } 3435 }
@@ -3457,9 +3457,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/kernel/ioport.c linux-2.6.32.10/arch/sparc
3457 .alloc_coherent = pci32_alloc_coherent, 3457 .alloc_coherent = pci32_alloc_coherent,
3458 .free_coherent = pci32_free_coherent, 3458 .free_coherent = pci32_free_coherent,
3459 .map_page = pci32_map_page, 3459 .map_page = pci32_map_page,
3460diff -urNp linux-2.6.32.10/arch/sparc/kernel/kgdb_32.c linux-2.6.32.10/arch/sparc/kernel/kgdb_32.c 3460diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c
3461--- linux-2.6.32.10/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400 3461--- linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400
3462+++ linux-2.6.32.10/arch/sparc/kernel/kgdb_32.c 2010-03-20 15:58:45.666359473 -0400 3462+++ linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c 2010-04-04 20:46:41.492578989 -0400
3463@@ -158,7 +158,7 @@ void kgdb_arch_exit(void) 3463@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
3464 { 3464 {
3465 } 3465 }
@@ -3469,9 +3469,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/kernel/kgdb_32.c linux-2.6.32.10/arch/spar
3469 /* Breakpoint instruction: ta 0x7d */ 3469 /* Breakpoint instruction: ta 0x7d */
3470 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, 3470 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
3471 }; 3471 };
3472diff -urNp linux-2.6.32.10/arch/sparc/kernel/kgdb_64.c linux-2.6.32.10/arch/sparc/kernel/kgdb_64.c 3472diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c
3473--- linux-2.6.32.10/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400 3473--- linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400
3474+++ linux-2.6.32.10/arch/sparc/kernel/kgdb_64.c 2010-03-20 15:58:45.666359473 -0400 3474+++ linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c 2010-04-04 20:46:41.492578989 -0400
3475@@ -180,7 +180,7 @@ void kgdb_arch_exit(void) 3475@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
3476 { 3476 {
3477 } 3477 }
@@ -3481,9 +3481,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/kernel/kgdb_64.c linux-2.6.32.10/arch/spar
3481 /* Breakpoint instruction: ta 0x72 */ 3481 /* Breakpoint instruction: ta 0x72 */
3482 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, 3482 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
3483 }; 3483 };
3484diff -urNp linux-2.6.32.10/arch/sparc/kernel/Makefile linux-2.6.32.10/arch/sparc/kernel/Makefile 3484diff -urNp linux-2.6.32.11/arch/sparc/kernel/Makefile linux-2.6.32.11/arch/sparc/kernel/Makefile
3485--- linux-2.6.32.10/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400 3485--- linux-2.6.32.11/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400
3486+++ linux-2.6.32.10/arch/sparc/kernel/Makefile 2010-03-20 15:58:45.666359473 -0400 3486+++ linux-2.6.32.11/arch/sparc/kernel/Makefile 2010-04-04 20:46:41.492578989 -0400
3487@@ -3,7 +3,7 @@ 3487@@ -3,7 +3,7 @@
3488 # 3488 #
3489 3489
@@ -3493,9 +3493,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/kernel/Makefile linux-2.6.32.10/arch/sparc
3493 3493
3494 extra-y := head_$(BITS).o 3494 extra-y := head_$(BITS).o
3495 extra-y += init_task.o 3495 extra-y += init_task.o
3496diff -urNp linux-2.6.32.10/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.10/arch/sparc/kernel/pci_sun4v.c 3496diff -urNp linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c
3497--- linux-2.6.32.10/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400 3497--- linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400
3498+++ linux-2.6.32.10/arch/sparc/kernel/pci_sun4v.c 2010-03-20 15:58:45.666359473 -0400 3498+++ linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c 2010-04-04 20:46:41.492578989 -0400
3499@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic 3499@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
3500 spin_unlock_irqrestore(&iommu->lock, flags); 3500 spin_unlock_irqrestore(&iommu->lock, flags);
3501 } 3501 }
@@ -3505,9 +3505,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.10/arch/sp
3505 .alloc_coherent = dma_4v_alloc_coherent, 3505 .alloc_coherent = dma_4v_alloc_coherent,
3506 .free_coherent = dma_4v_free_coherent, 3506 .free_coherent = dma_4v_free_coherent,
3507 .map_page = dma_4v_map_page, 3507 .map_page = dma_4v_map_page,
3508diff -urNp linux-2.6.32.10/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.10/arch/sparc/kernel/sys_sparc_32.c 3508diff -urNp linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c
3509--- linux-2.6.32.10/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400 3509--- linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400
3510+++ linux-2.6.32.10/arch/sparc/kernel/sys_sparc_32.c 2010-03-20 15:58:45.666359473 -0400 3510+++ linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c 2010-04-04 20:46:41.492578989 -0400
3511@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str 3511@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
3512 if (ARCH_SUN4C && len > 0x20000000) 3512 if (ARCH_SUN4C && len > 0x20000000)
3513 return -ENOMEM; 3513 return -ENOMEM;
@@ -3517,9 +3517,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.10/arch
3517 3517
3518 if (flags & MAP_SHARED) 3518 if (flags & MAP_SHARED)
3519 addr = COLOUR_ALIGN(addr); 3519 addr = COLOUR_ALIGN(addr);
3520diff -urNp linux-2.6.32.10/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.10/arch/sparc/kernel/sys_sparc_64.c 3520diff -urNp linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c
3521--- linux-2.6.32.10/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400 3521--- linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400
3522+++ linux-2.6.32.10/arch/sparc/kernel/sys_sparc_64.c 2010-03-20 15:58:45.666359473 -0400 3522+++ linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c 2010-04-04 20:46:41.492578989 -0400
3523@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str 3523@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
3524 /* We do not accept a shared mapping if it would violate 3524 /* We do not accept a shared mapping if it would violate
3525 * cache aliasing constraints. 3525 * cache aliasing constraints.
@@ -3598,9 +3598,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.10/arch
3598 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 3598 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
3599 mm->unmap_area = arch_unmap_area_topdown; 3599 mm->unmap_area = arch_unmap_area_topdown;
3600 } 3600 }
3601diff -urNp linux-2.6.32.10/arch/sparc/kernel/traps_64.c linux-2.6.32.10/arch/sparc/kernel/traps_64.c 3601diff -urNp linux-2.6.32.11/arch/sparc/kernel/traps_64.c linux-2.6.32.11/arch/sparc/kernel/traps_64.c
3602--- linux-2.6.32.10/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400 3602--- linux-2.6.32.11/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400
3603+++ linux-2.6.32.10/arch/sparc/kernel/traps_64.c 2010-03-20 15:58:45.669974524 -0400 3603+++ linux-2.6.32.11/arch/sparc/kernel/traps_64.c 2010-04-04 20:46:41.496772577 -0400
3604@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long 3604@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long
3605 3605
3606 lvl -= 0x100; 3606 lvl -= 0x100;
@@ -3632,9 +3632,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/kernel/traps_64.c linux-2.6.32.10/arch/spa
3632 dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); 3632 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
3633 3633
3634 sprintf (buffer, "Bad trap %lx at tl>0", lvl); 3634 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
3635diff -urNp linux-2.6.32.10/arch/sparc/lib/atomic_64.S linux-2.6.32.10/arch/sparc/lib/atomic_64.S 3635diff -urNp linux-2.6.32.11/arch/sparc/lib/atomic_64.S linux-2.6.32.11/arch/sparc/lib/atomic_64.S
3636--- linux-2.6.32.10/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400 3636--- linux-2.6.32.11/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400
3637+++ linux-2.6.32.10/arch/sparc/lib/atomic_64.S 2010-03-20 15:58:46.916553763 -0400 3637+++ linux-2.6.32.11/arch/sparc/lib/atomic_64.S 2010-04-04 20:46:41.496772577 -0400
3638@@ -18,7 +18,12 @@ 3638@@ -18,7 +18,12 @@
3639 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ 3639 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
3640 BACKOFF_SETUP(%o2) 3640 BACKOFF_SETUP(%o2)
@@ -3828,9 +3828,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/lib/atomic_64.S linux-2.6.32.10/arch/sparc
3828 casx [%o1], %g1, %g7 3828 casx [%o1], %g1, %g7
3829 cmp %g1, %g7 3829 cmp %g1, %g7
3830 bne,pn %xcc, 2f 3830 bne,pn %xcc, 2f
3831diff -urNp linux-2.6.32.10/arch/sparc/lib/ksyms.c linux-2.6.32.10/arch/sparc/lib/ksyms.c 3831diff -urNp linux-2.6.32.11/arch/sparc/lib/ksyms.c linux-2.6.32.11/arch/sparc/lib/ksyms.c
3832--- linux-2.6.32.10/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400 3832--- linux-2.6.32.11/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400
3833+++ linux-2.6.32.10/arch/sparc/lib/ksyms.c 2010-03-20 15:58:46.916553763 -0400 3833+++ linux-2.6.32.11/arch/sparc/lib/ksyms.c 2010-04-04 20:46:41.496772577 -0400
3834@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write); 3834@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write);
3835 3835
3836 /* Atomic counter implementation. */ 3836 /* Atomic counter implementation. */
@@ -3842,9 +3842,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/lib/ksyms.c linux-2.6.32.10/arch/sparc/lib
3842 EXPORT_SYMBOL(atomic_sub_ret); 3842 EXPORT_SYMBOL(atomic_sub_ret);
3843 EXPORT_SYMBOL(atomic64_add); 3843 EXPORT_SYMBOL(atomic64_add);
3844 EXPORT_SYMBOL(atomic64_add_ret); 3844 EXPORT_SYMBOL(atomic64_add_ret);
3845diff -urNp linux-2.6.32.10/arch/sparc/lib/rwsem_64.S linux-2.6.32.10/arch/sparc/lib/rwsem_64.S 3845diff -urNp linux-2.6.32.11/arch/sparc/lib/rwsem_64.S linux-2.6.32.11/arch/sparc/lib/rwsem_64.S
3846--- linux-2.6.32.10/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400 3846--- linux-2.6.32.11/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400
3847+++ linux-2.6.32.10/arch/sparc/lib/rwsem_64.S 2010-03-20 15:58:46.916553763 -0400 3847+++ linux-2.6.32.11/arch/sparc/lib/rwsem_64.S 2010-04-04 20:46:41.496772577 -0400
3848@@ -11,7 +11,12 @@ 3848@@ -11,7 +11,12 @@
3849 .globl __down_read 3849 .globl __down_read
3850 __down_read: 3850 __down_read:
@@ -3943,9 +3943,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/lib/rwsem_64.S linux-2.6.32.10/arch/sparc/
3943 cas [%o0], %g3, %g7 3943 cas [%o0], %g3, %g7
3944 cmp %g3, %g7 3944 cmp %g3, %g7
3945 bne,pn %icc, 1b 3945 bne,pn %icc, 1b
3946diff -urNp linux-2.6.32.10/arch/sparc/Makefile linux-2.6.32.10/arch/sparc/Makefile 3946diff -urNp linux-2.6.32.11/arch/sparc/Makefile linux-2.6.32.11/arch/sparc/Makefile
3947--- linux-2.6.32.10/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400 3947--- linux-2.6.32.11/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400
3948+++ linux-2.6.32.10/arch/sparc/Makefile 2010-03-20 15:58:46.916553763 -0400 3948+++ linux-2.6.32.11/arch/sparc/Makefile 2010-04-04 20:46:41.496772577 -0400
3949@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc 3949@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
3950 # Export what is needed by arch/sparc/boot/Makefile 3950 # Export what is needed by arch/sparc/boot/Makefile
3951 export VMLINUX_INIT VMLINUX_MAIN 3951 export VMLINUX_INIT VMLINUX_MAIN
@@ -3955,9 +3955,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/Makefile linux-2.6.32.10/arch/sparc/Makefi
3955 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) 3955 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
3956 VMLINUX_MAIN += $(drivers-y) $(net-y) 3956 VMLINUX_MAIN += $(drivers-y) $(net-y)
3957 3957
3958diff -urNp linux-2.6.32.10/arch/sparc/mm/fault_32.c linux-2.6.32.10/arch/sparc/mm/fault_32.c 3958diff -urNp linux-2.6.32.11/arch/sparc/mm/fault_32.c linux-2.6.32.11/arch/sparc/mm/fault_32.c
3959--- linux-2.6.32.10/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400 3959--- linux-2.6.32.11/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400
3960+++ linux-2.6.32.10/arch/sparc/mm/fault_32.c 2010-03-20 15:58:46.916553763 -0400 3960+++ linux-2.6.32.11/arch/sparc/mm/fault_32.c 2010-04-04 20:46:41.496772577 -0400
3961@@ -21,6 +21,9 @@ 3961@@ -21,6 +21,9 @@
3962 #include <linux/interrupt.h> 3962 #include <linux/interrupt.h>
3963 #include <linux/module.h> 3963 #include <linux/module.h>
@@ -4261,9 +4261,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/mm/fault_32.c linux-2.6.32.10/arch/sparc/m
4261 /* Allow reads even for write-only mappings */ 4261 /* Allow reads even for write-only mappings */
4262 if(!(vma->vm_flags & (VM_READ | VM_EXEC))) 4262 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
4263 goto bad_area; 4263 goto bad_area;
4264diff -urNp linux-2.6.32.10/arch/sparc/mm/fault_64.c linux-2.6.32.10/arch/sparc/mm/fault_64.c 4264diff -urNp linux-2.6.32.11/arch/sparc/mm/fault_64.c linux-2.6.32.11/arch/sparc/mm/fault_64.c
4265--- linux-2.6.32.10/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400 4265--- linux-2.6.32.11/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400
4266+++ linux-2.6.32.10/arch/sparc/mm/fault_64.c 2010-03-20 15:58:46.916553763 -0400 4266+++ linux-2.6.32.11/arch/sparc/mm/fault_64.c 2010-04-04 20:46:41.496772577 -0400
4267@@ -20,6 +20,9 @@ 4267@@ -20,6 +20,9 @@
4268 #include <linux/kprobes.h> 4268 #include <linux/kprobes.h>
4269 #include <linux/kdebug.h> 4269 #include <linux/kdebug.h>
@@ -4761,9 +4761,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/mm/fault_64.c linux-2.6.32.10/arch/sparc/m
4761 /* Pure DTLB misses do not tell us whether the fault causing 4761 /* Pure DTLB misses do not tell us whether the fault causing
4762 * load/store/atomic was a write or not, it only says that there 4762 * load/store/atomic was a write or not, it only says that there
4763 * was no match. So in such a case we (carefully) read the 4763 * was no match. So in such a case we (carefully) read the
4764diff -urNp linux-2.6.32.10/arch/sparc/mm/init_32.c linux-2.6.32.10/arch/sparc/mm/init_32.c 4764diff -urNp linux-2.6.32.11/arch/sparc/mm/init_32.c linux-2.6.32.11/arch/sparc/mm/init_32.c
4765--- linux-2.6.32.10/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 4765--- linux-2.6.32.11/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
4766+++ linux-2.6.32.10/arch/sparc/mm/init_32.c 2010-03-20 15:58:46.916553763 -0400 4766+++ linux-2.6.32.11/arch/sparc/mm/init_32.c 2010-04-04 20:46:41.496772577 -0400
4767@@ -317,6 +317,9 @@ extern void device_scan(void); 4767@@ -317,6 +317,9 @@ extern void device_scan(void);
4768 pgprot_t PAGE_SHARED __read_mostly; 4768 pgprot_t PAGE_SHARED __read_mostly;
4769 EXPORT_SYMBOL(PAGE_SHARED); 4769 EXPORT_SYMBOL(PAGE_SHARED);
@@ -4798,9 +4798,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/mm/init_32.c linux-2.6.32.10/arch/sparc/mm
4798 protection_map[12] = PAGE_READONLY; 4798 protection_map[12] = PAGE_READONLY;
4799 protection_map[13] = PAGE_READONLY; 4799 protection_map[13] = PAGE_READONLY;
4800 protection_map[14] = PAGE_SHARED; 4800 protection_map[14] = PAGE_SHARED;
4801diff -urNp linux-2.6.32.10/arch/sparc/mm/Makefile linux-2.6.32.10/arch/sparc/mm/Makefile 4801diff -urNp linux-2.6.32.11/arch/sparc/mm/Makefile linux-2.6.32.11/arch/sparc/mm/Makefile
4802--- linux-2.6.32.10/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400 4802--- linux-2.6.32.11/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400
4803+++ linux-2.6.32.10/arch/sparc/mm/Makefile 2010-03-20 15:58:46.916553763 -0400 4803+++ linux-2.6.32.11/arch/sparc/mm/Makefile 2010-04-04 20:46:41.496772577 -0400
4804@@ -2,7 +2,7 @@ 4804@@ -2,7 +2,7 @@
4805 # 4805 #
4806 4806
@@ -4810,9 +4810,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/mm/Makefile linux-2.6.32.10/arch/sparc/mm/
4810 4810
4811 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o 4811 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
4812 obj-y += fault_$(BITS).o 4812 obj-y += fault_$(BITS).o
4813diff -urNp linux-2.6.32.10/arch/sparc/mm/srmmu.c linux-2.6.32.10/arch/sparc/mm/srmmu.c 4813diff -urNp linux-2.6.32.11/arch/sparc/mm/srmmu.c linux-2.6.32.11/arch/sparc/mm/srmmu.c
4814--- linux-2.6.32.10/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400 4814--- linux-2.6.32.11/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400
4815+++ linux-2.6.32.10/arch/sparc/mm/srmmu.c 2010-03-20 15:58:46.916553763 -0400 4815+++ linux-2.6.32.11/arch/sparc/mm/srmmu.c 2010-04-04 20:46:41.496772577 -0400
4816@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) 4816@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
4817 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); 4817 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
4818 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); 4818 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -4827,9 +4827,9 @@ diff -urNp linux-2.6.32.10/arch/sparc/mm/srmmu.c linux-2.6.32.10/arch/sparc/mm/s
4827 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); 4827 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
4828 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); 4828 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
4829 4829
4830diff -urNp linux-2.6.32.10/arch/um/include/asm/kmap_types.h linux-2.6.32.10/arch/um/include/asm/kmap_types.h 4830diff -urNp linux-2.6.32.11/arch/um/include/asm/kmap_types.h linux-2.6.32.11/arch/um/include/asm/kmap_types.h
4831--- linux-2.6.32.10/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 4831--- linux-2.6.32.11/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
4832+++ linux-2.6.32.10/arch/um/include/asm/kmap_types.h 2010-03-20 15:58:46.916553763 -0400 4832+++ linux-2.6.32.11/arch/um/include/asm/kmap_types.h 2010-04-04 20:46:41.496772577 -0400
4833@@ -23,6 +23,7 @@ enum km_type { 4833@@ -23,6 +23,7 @@ enum km_type {
4834 KM_IRQ1, 4834 KM_IRQ1,
4835 KM_SOFTIRQ0, 4835 KM_SOFTIRQ0,
@@ -4838,9 +4838,9 @@ diff -urNp linux-2.6.32.10/arch/um/include/asm/kmap_types.h linux-2.6.32.10/arch
4838 KM_TYPE_NR 4838 KM_TYPE_NR
4839 }; 4839 };
4840 4840
4841diff -urNp linux-2.6.32.10/arch/um/include/asm/page.h linux-2.6.32.10/arch/um/include/asm/page.h 4841diff -urNp linux-2.6.32.11/arch/um/include/asm/page.h linux-2.6.32.11/arch/um/include/asm/page.h
4842--- linux-2.6.32.10/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 4842--- linux-2.6.32.11/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
4843+++ linux-2.6.32.10/arch/um/include/asm/page.h 2010-03-20 15:58:46.916553763 -0400 4843+++ linux-2.6.32.11/arch/um/include/asm/page.h 2010-04-04 20:46:41.496772577 -0400
4844@@ -14,6 +14,9 @@ 4844@@ -14,6 +14,9 @@
4845 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) 4845 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
4846 #define PAGE_MASK (~(PAGE_SIZE-1)) 4846 #define PAGE_MASK (~(PAGE_SIZE-1))
@@ -4851,9 +4851,9 @@ diff -urNp linux-2.6.32.10/arch/um/include/asm/page.h linux-2.6.32.10/arch/um/in
4851 #ifndef __ASSEMBLY__ 4851 #ifndef __ASSEMBLY__
4852 4852
4853 struct page; 4853 struct page;
4854diff -urNp linux-2.6.32.10/arch/um/sys-i386/syscalls.c linux-2.6.32.10/arch/um/sys-i386/syscalls.c 4854diff -urNp linux-2.6.32.11/arch/um/sys-i386/syscalls.c linux-2.6.32.11/arch/um/sys-i386/syscalls.c
4855--- linux-2.6.32.10/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400 4855--- linux-2.6.32.11/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400
4856+++ linux-2.6.32.10/arch/um/sys-i386/syscalls.c 2010-03-20 15:58:46.916553763 -0400 4856+++ linux-2.6.32.11/arch/um/sys-i386/syscalls.c 2010-04-04 20:46:41.496772577 -0400
4857@@ -11,6 +11,21 @@ 4857@@ -11,6 +11,21 @@
4858 #include "asm/uaccess.h" 4858 #include "asm/uaccess.h"
4859 #include "asm/unistd.h" 4859 #include "asm/unistd.h"
@@ -4876,9 +4876,9 @@ diff -urNp linux-2.6.32.10/arch/um/sys-i386/syscalls.c linux-2.6.32.10/arch/um/s
4876 /* 4876 /*
4877 * Perform the select(nd, in, out, ex, tv) and mmap() system 4877 * Perform the select(nd, in, out, ex, tv) and mmap() system
4878 * calls. Linux/i386 didn't use to be able to handle more than 4878 * calls. Linux/i386 didn't use to be able to handle more than
4879diff -urNp linux-2.6.32.10/arch/x86/boot/bitops.h linux-2.6.32.10/arch/x86/boot/bitops.h 4879diff -urNp linux-2.6.32.11/arch/x86/boot/bitops.h linux-2.6.32.11/arch/x86/boot/bitops.h
4880--- linux-2.6.32.10/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400 4880--- linux-2.6.32.11/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400
4881+++ linux-2.6.32.10/arch/x86/boot/bitops.h 2010-03-20 15:58:46.916553763 -0400 4881+++ linux-2.6.32.11/arch/x86/boot/bitops.h 2010-04-04 20:46:41.496772577 -0400
4882@@ -26,7 +26,7 @@ static inline int variable_test_bit(int 4882@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
4883 u8 v; 4883 u8 v;
4884 const u32 *p = (const u32 *)addr; 4884 const u32 *p = (const u32 *)addr;
@@ -4897,9 +4897,9 @@ diff -urNp linux-2.6.32.10/arch/x86/boot/bitops.h linux-2.6.32.10/arch/x86/boot/
4897 } 4897 }
4898 4898
4899 #endif /* BOOT_BITOPS_H */ 4899 #endif /* BOOT_BITOPS_H */
4900diff -urNp linux-2.6.32.10/arch/x86/boot/boot.h linux-2.6.32.10/arch/x86/boot/boot.h 4900diff -urNp linux-2.6.32.11/arch/x86/boot/boot.h linux-2.6.32.11/arch/x86/boot/boot.h
4901--- linux-2.6.32.10/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400 4901--- linux-2.6.32.11/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400
4902+++ linux-2.6.32.10/arch/x86/boot/boot.h 2010-03-20 15:58:46.916553763 -0400 4902+++ linux-2.6.32.11/arch/x86/boot/boot.h 2010-04-04 20:46:41.496772577 -0400
4903@@ -82,7 +82,7 @@ static inline void io_delay(void) 4903@@ -82,7 +82,7 @@ static inline void io_delay(void)
4904 static inline u16 ds(void) 4904 static inline u16 ds(void)
4905 { 4905 {
@@ -4918,9 +4918,9 @@ diff -urNp linux-2.6.32.10/arch/x86/boot/boot.h linux-2.6.32.10/arch/x86/boot/bo
4918 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); 4918 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
4919 return diff; 4919 return diff;
4920 } 4920 }
4921diff -urNp linux-2.6.32.10/arch/x86/boot/compressed/head_32.S linux-2.6.32.10/arch/x86/boot/compressed/head_32.S 4921diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/head_32.S linux-2.6.32.11/arch/x86/boot/compressed/head_32.S
4922--- linux-2.6.32.10/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400 4922--- linux-2.6.32.11/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400
4923+++ linux-2.6.32.10/arch/x86/boot/compressed/head_32.S 2010-03-20 15:58:46.916553763 -0400 4923+++ linux-2.6.32.11/arch/x86/boot/compressed/head_32.S 2010-04-04 20:46:41.496772577 -0400
4924@@ -76,7 +76,7 @@ ENTRY(startup_32) 4924@@ -76,7 +76,7 @@ ENTRY(startup_32)
4925 notl %eax 4925 notl %eax
4926 andl %eax, %ebx 4926 andl %eax, %ebx
@@ -4949,9 +4949,9 @@ diff -urNp linux-2.6.32.10/arch/x86/boot/compressed/head_32.S linux-2.6.32.10/ar
4949 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) 4949 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
4950 jmp 1b 4950 jmp 1b
4951 2: 4951 2:
4952diff -urNp linux-2.6.32.10/arch/x86/boot/compressed/head_64.S linux-2.6.32.10/arch/x86/boot/compressed/head_64.S 4952diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/head_64.S linux-2.6.32.11/arch/x86/boot/compressed/head_64.S
4953--- linux-2.6.32.10/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400 4953--- linux-2.6.32.11/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400
4954+++ linux-2.6.32.10/arch/x86/boot/compressed/head_64.S 2010-03-20 15:58:46.916553763 -0400 4954+++ linux-2.6.32.11/arch/x86/boot/compressed/head_64.S 2010-04-04 20:46:41.496772577 -0400
4955@@ -91,7 +91,7 @@ ENTRY(startup_32) 4955@@ -91,7 +91,7 @@ ENTRY(startup_32)
4956 notl %eax 4956 notl %eax
4957 andl %eax, %ebx 4957 andl %eax, %ebx
@@ -4970,9 +4970,9 @@ diff -urNp linux-2.6.32.10/arch/x86/boot/compressed/head_64.S linux-2.6.32.10/ar
4970 #endif 4970 #endif
4971 4971
4972 /* Target address to relocate to for decompression */ 4972 /* Target address to relocate to for decompression */
4973diff -urNp linux-2.6.32.10/arch/x86/boot/compressed/misc.c linux-2.6.32.10/arch/x86/boot/compressed/misc.c 4973diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/misc.c linux-2.6.32.11/arch/x86/boot/compressed/misc.c
4974--- linux-2.6.32.10/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400 4974--- linux-2.6.32.11/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400
4975+++ linux-2.6.32.10/arch/x86/boot/compressed/misc.c 2010-03-20 15:58:46.916553763 -0400 4975+++ linux-2.6.32.11/arch/x86/boot/compressed/misc.c 2010-04-04 20:46:41.496772577 -0400
4976@@ -288,7 +288,7 @@ static void parse_elf(void *output) 4976@@ -288,7 +288,7 @@ static void parse_elf(void *output)
4977 case PT_LOAD: 4977 case PT_LOAD:
4978 #ifdef CONFIG_RELOCATABLE 4978 #ifdef CONFIG_RELOCATABLE
@@ -4991,9 +4991,9 @@ diff -urNp linux-2.6.32.10/arch/x86/boot/compressed/misc.c linux-2.6.32.10/arch/
4991 error("Wrong destination address"); 4991 error("Wrong destination address");
4992 #endif 4992 #endif
4993 4993
4994diff -urNp linux-2.6.32.10/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.10/arch/x86/boot/compressed/mkpiggy.c 4994diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c
4995--- linux-2.6.32.10/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400 4995--- linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400
4996+++ linux-2.6.32.10/arch/x86/boot/compressed/mkpiggy.c 2010-03-20 15:58:46.916553763 -0400 4996+++ linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c 2010-04-04 20:46:41.496772577 -0400
4997@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) 4997@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
4998 4998
4999 offs = (olen > ilen) ? olen - ilen : 0; 4999 offs = (olen > ilen) ? olen - ilen : 0;
@@ -5003,9 +5003,9 @@ diff -urNp linux-2.6.32.10/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.10/ar
5003 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ 5003 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
5004 5004
5005 printf(".section \".rodata.compressed\",\"a\",@progbits\n"); 5005 printf(".section \".rodata.compressed\",\"a\",@progbits\n");
5006diff -urNp linux-2.6.32.10/arch/x86/boot/compressed/relocs.c linux-2.6.32.10/arch/x86/boot/compressed/relocs.c 5006diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/relocs.c linux-2.6.32.11/arch/x86/boot/compressed/relocs.c
5007--- linux-2.6.32.10/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400 5007--- linux-2.6.32.11/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400
5008+++ linux-2.6.32.10/arch/x86/boot/compressed/relocs.c 2010-03-20 15:58:46.916553763 -0400 5008+++ linux-2.6.32.11/arch/x86/boot/compressed/relocs.c 2010-04-04 20:46:41.500459645 -0400
5009@@ -10,8 +10,11 @@ 5009@@ -10,8 +10,11 @@
5010 #define USE_BSD 5010 #define USE_BSD
5011 #include <endian.h> 5011 #include <endian.h>
@@ -5206,9 +5206,9 @@ diff -urNp linux-2.6.32.10/arch/x86/boot/compressed/relocs.c linux-2.6.32.10/arc
5206 read_shdrs(fp); 5206 read_shdrs(fp);
5207 read_strtabs(fp); 5207 read_strtabs(fp);
5208 read_symtabs(fp); 5208 read_symtabs(fp);
5209diff -urNp linux-2.6.32.10/arch/x86/boot/cpucheck.c linux-2.6.32.10/arch/x86/boot/cpucheck.c 5209diff -urNp linux-2.6.32.11/arch/x86/boot/cpucheck.c linux-2.6.32.11/arch/x86/boot/cpucheck.c
5210--- linux-2.6.32.10/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400 5210--- linux-2.6.32.11/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400
5211+++ linux-2.6.32.10/arch/x86/boot/cpucheck.c 2010-03-20 15:58:46.921536877 -0400 5211+++ linux-2.6.32.11/arch/x86/boot/cpucheck.c 2010-04-04 20:46:41.500459645 -0400
5212@@ -74,7 +74,7 @@ static int has_fpu(void) 5212@@ -74,7 +74,7 @@ static int has_fpu(void)
5213 u16 fcw = -1, fsw = -1; 5213 u16 fcw = -1, fsw = -1;
5214 u32 cr0; 5214 u32 cr0;
@@ -5304,9 +5304,9 @@ diff -urNp linux-2.6.32.10/arch/x86/boot/cpucheck.c linux-2.6.32.10/arch/x86/boo
5304 5304
5305 err = check_flags(); 5305 err = check_flags();
5306 } 5306 }
5307diff -urNp linux-2.6.32.10/arch/x86/boot/header.S linux-2.6.32.10/arch/x86/boot/header.S 5307diff -urNp linux-2.6.32.11/arch/x86/boot/header.S linux-2.6.32.11/arch/x86/boot/header.S
5308--- linux-2.6.32.10/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400 5308--- linux-2.6.32.11/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400
5309+++ linux-2.6.32.10/arch/x86/boot/header.S 2010-03-20 15:58:46.921536877 -0400 5309+++ linux-2.6.32.11/arch/x86/boot/header.S 2010-04-04 20:46:41.500459645 -0400
5310@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical 5310@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
5311 # single linked list of 5311 # single linked list of
5312 # struct setup_data 5312 # struct setup_data
@@ -5316,9 +5316,9 @@ diff -urNp linux-2.6.32.10/arch/x86/boot/header.S linux-2.6.32.10/arch/x86/boot/
5316 5316
5317 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) 5317 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
5318 #define VO_INIT_SIZE (VO__end - VO__text) 5318 #define VO_INIT_SIZE (VO__end - VO__text)
5319diff -urNp linux-2.6.32.10/arch/x86/boot/video-vesa.c linux-2.6.32.10/arch/x86/boot/video-vesa.c 5319diff -urNp linux-2.6.32.11/arch/x86/boot/video-vesa.c linux-2.6.32.11/arch/x86/boot/video-vesa.c
5320--- linux-2.6.32.10/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400 5320--- linux-2.6.32.11/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400
5321+++ linux-2.6.32.10/arch/x86/boot/video-vesa.c 2010-03-20 15:58:46.921536877 -0400 5321+++ linux-2.6.32.11/arch/x86/boot/video-vesa.c 2010-04-04 20:46:41.500459645 -0400
5322@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) 5322@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
5323 5323
5324 boot_params.screen_info.vesapm_seg = oreg.es; 5324 boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5327,9 +5327,106 @@ diff -urNp linux-2.6.32.10/arch/x86/boot/video-vesa.c linux-2.6.32.10/arch/x86/b
5327 } 5327 }
5328 5328
5329 /* 5329 /*
5330diff -urNp linux-2.6.32.10/arch/x86/ia32/ia32_signal.c linux-2.6.32.10/arch/x86/ia32/ia32_signal.c 5330diff -urNp linux-2.6.32.11/arch/x86/ia32/ia32entry.S linux-2.6.32.11/arch/x86/ia32/ia32entry.S
5331--- linux-2.6.32.10/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400 5331--- linux-2.6.32.11/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400
5332+++ linux-2.6.32.10/arch/x86/ia32/ia32_signal.c 2010-03-20 15:58:46.921536877 -0400 5332+++ linux-2.6.32.11/arch/x86/ia32/ia32entry.S 2010-04-04 20:58:33.225084964 -0400
5333@@ -13,6 +13,7 @@
5334 #include <asm/thread_info.h>
5335 #include <asm/segment.h>
5336 #include <asm/irqflags.h>
5337+#include <asm/pgtable.h>
5338 #include <linux/linkage.h>
5339
5340 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
5341@@ -114,6 +115,11 @@ ENTRY(ia32_sysenter_target)
5342 SWAPGS_UNSAFE_STACK
5343 movq PER_CPU_VAR(kernel_stack), %rsp
5344 addq $(KERNEL_STACK_OFFSET),%rsp
5345+
5346+#ifdef CONFIG_PAX_MEMORY_UDEREF
5347+ call pax_enter_kernel_user
5348+#endif
5349+
5350 /*
5351 * No need to follow this irqs on/off section: the syscall
5352 * disabled irqs, here we enable it straight after entry:
5353@@ -144,6 +150,12 @@ ENTRY(ia32_sysenter_target)
5354 SAVE_ARGS 0,0,1
5355 /* no need to do an access_ok check here because rbp has been
5356 32bit zero extended */
5357+
5358+#ifdef CONFIG_PAX_MEMORY_UDEREF
5359+ mov $PAX_USER_SHADOW_BASE,%r10
5360+ add %r10,%rbp
5361+#endif
5362+
5363 1: movl (%rbp),%ebp
5364 .section __ex_table,"a"
5365 .quad 1b,ia32_badarg
5366@@ -166,6 +178,11 @@ sysenter_dispatch:
5367 testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
5368 jnz sysexit_audit
5369 sysexit_from_sys_call:
5370+
5371+#ifdef CONFIG_PAX_MEMORY_UDEREF
5372+ call pax_exit_kernel_user
5373+#endif
5374+
5375 andl $~TS_COMPAT,TI_status(%r10)
5376 /* clear IF, that popfq doesn't enable interrupts early */
5377 andl $~0x200,EFLAGS-R11(%rsp)
5378@@ -284,6 +301,11 @@ ENTRY(ia32_cstar_target)
5379 movl %esp,%r8d
5380 CFI_REGISTER rsp,r8
5381 movq PER_CPU_VAR(kernel_stack),%rsp
5382+
5383+#ifdef CONFIG_PAX_MEMORY_UDEREF
5384+ call pax_enter_kernel_user
5385+#endif
5386+
5387 /*
5388 * No need to follow this irqs on/off section: the syscall
5389 * disabled irqs and here we enable it straight after entry:
5390@@ -305,6 +327,12 @@ ENTRY(ia32_cstar_target)
5391 /* no need to do an access_ok check here because r8 has been
5392 32bit zero extended */
5393 /* hardware stack frame is complete now */
5394+
5395+#ifdef CONFIG_PAX_MEMORY_UDEREF
5396+ mov $PAX_USER_SHADOW_BASE,%r10
5397+ add %r10,%r8
5398+#endif
5399+
5400 1: movl (%r8),%r9d
5401 .section __ex_table,"a"
5402 .quad 1b,ia32_badarg
5403@@ -327,6 +355,11 @@ cstar_dispatch:
5404 testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
5405 jnz sysretl_audit
5406 sysretl_from_sys_call:
5407+
5408+#ifdef CONFIG_PAX_MEMORY_UDEREF
5409+ call pax_exit_kernel_user
5410+#endif
5411+
5412 andl $~TS_COMPAT,TI_status(%r10)
5413 RESTORE_ARGS 1,-ARG_SKIP,1,1,1
5414 movl RIP-ARGOFFSET(%rsp),%ecx
5415@@ -409,6 +442,11 @@ ENTRY(ia32_syscall)
5416 CFI_REL_OFFSET rip,RIP-RIP
5417 PARAVIRT_ADJUST_EXCEPTION_FRAME
5418 SWAPGS
5419+
5420+#ifdef CONFIG_PAX_MEMORY_UDEREF
5421+ call pax_enter_kernel_user
5422+#endif
5423+
5424 /*
5425 * No need to follow this irqs on/off section: the syscall
5426 * disabled irqs and here we enable it straight after entry:
5427diff -urNp linux-2.6.32.11/arch/x86/ia32/ia32_signal.c linux-2.6.32.11/arch/x86/ia32/ia32_signal.c
5428--- linux-2.6.32.11/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400
5429+++ linux-2.6.32.11/arch/x86/ia32/ia32_signal.c 2010-04-04 20:46:41.500459645 -0400
5333@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 5430@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
5334 sp -= frame_size; 5431 sp -= frame_size;
5335 /* Align the stack pointer according to the i386 ABI, 5432 /* Align the stack pointer according to the i386 ABI,
@@ -5348,9 +5445,9 @@ diff -urNp linux-2.6.32.10/arch/x86/ia32/ia32_signal.c linux-2.6.32.10/arch/x86/
5348 }; 5445 };
5349 5446
5350 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); 5447 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
5351diff -urNp linux-2.6.32.10/arch/x86/include/asm/alternative.h linux-2.6.32.10/arch/x86/include/asm/alternative.h 5448diff -urNp linux-2.6.32.11/arch/x86/include/asm/alternative.h linux-2.6.32.11/arch/x86/include/asm/alternative.h
5352--- linux-2.6.32.10/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400 5449--- linux-2.6.32.11/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400
5353+++ linux-2.6.32.10/arch/x86/include/asm/alternative.h 2010-03-20 15:58:46.921536877 -0400 5450+++ linux-2.6.32.11/arch/x86/include/asm/alternative.h 2010-04-04 20:46:41.500459645 -0400
5354@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit 5451@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
5355 " .byte 662b-661b\n" /* sourcelen */ \ 5452 " .byte 662b-661b\n" /* sourcelen */ \
5356 " .byte 664f-663f\n" /* replacementlen */ \ 5453 " .byte 664f-663f\n" /* replacementlen */ \
@@ -5360,9 +5457,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/alternative.h linux-2.6.32.10/ar
5360 "663:\n\t" newinstr "\n664:\n" /* replacement */ \ 5457 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
5361 ".previous" 5458 ".previous"
5362 5459
5363diff -urNp linux-2.6.32.10/arch/x86/include/asm/apm.h linux-2.6.32.10/arch/x86/include/asm/apm.h 5460diff -urNp linux-2.6.32.11/arch/x86/include/asm/apm.h linux-2.6.32.11/arch/x86/include/asm/apm.h
5364--- linux-2.6.32.10/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400 5461--- linux-2.6.32.11/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400
5365+++ linux-2.6.32.10/arch/x86/include/asm/apm.h 2010-03-20 15:58:46.921536877 -0400 5462+++ linux-2.6.32.11/arch/x86/include/asm/apm.h 2010-04-04 20:46:41.500459645 -0400
5366@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 5463@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
5367 __asm__ __volatile__(APM_DO_ZERO_SEGS 5464 __asm__ __volatile__(APM_DO_ZERO_SEGS
5368 "pushl %%edi\n\t" 5465 "pushl %%edi\n\t"
@@ -5381,9 +5478,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/apm.h linux-2.6.32.10/arch/x86/i
5381 "setc %%bl\n\t" 5478 "setc %%bl\n\t"
5382 "popl %%ebp\n\t" 5479 "popl %%ebp\n\t"
5383 "popl %%edi\n\t" 5480 "popl %%edi\n\t"
5384diff -urNp linux-2.6.32.10/arch/x86/include/asm/atomic_32.h linux-2.6.32.10/arch/x86/include/asm/atomic_32.h 5481diff -urNp linux-2.6.32.11/arch/x86/include/asm/atomic_32.h linux-2.6.32.11/arch/x86/include/asm/atomic_32.h
5385--- linux-2.6.32.10/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400 5482--- linux-2.6.32.11/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400
5386+++ linux-2.6.32.10/arch/x86/include/asm/atomic_32.h 2010-03-20 15:58:46.921536877 -0400 5483+++ linux-2.6.32.11/arch/x86/include/asm/atomic_32.h 2010-04-04 20:46:41.500459645 -0400
5387@@ -25,6 +25,17 @@ static inline int atomic_read(const atom 5484@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
5388 } 5485 }
5389 5486
@@ -5714,9 +5811,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/atomic_32.h linux-2.6.32.10/arch
5714 #define ATOMIC64_INIT(val) { (val) } 5811 #define ATOMIC64_INIT(val) { (val) }
5715 5812
5716 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); 5813 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
5717diff -urNp linux-2.6.32.10/arch/x86/include/asm/atomic_64.h linux-2.6.32.10/arch/x86/include/asm/atomic_64.h 5814diff -urNp linux-2.6.32.11/arch/x86/include/asm/atomic_64.h linux-2.6.32.11/arch/x86/include/asm/atomic_64.h
5718--- linux-2.6.32.10/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 5815--- linux-2.6.32.11/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
5719+++ linux-2.6.32.10/arch/x86/include/asm/atomic_64.h 2010-03-20 15:58:46.921536877 -0400 5816+++ linux-2.6.32.11/arch/x86/include/asm/atomic_64.h 2010-04-04 20:46:41.500459645 -0400
5720@@ -24,6 +24,17 @@ static inline int atomic_read(const atom 5817@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
5721 } 5818 }
5722 5819
@@ -6294,9 +6391,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/atomic_64.h linux-2.6.32.10/arch
6294 } 6391 }
6295 6392
6296 /** 6393 /**
6297diff -urNp linux-2.6.32.10/arch/x86/include/asm/boot.h linux-2.6.32.10/arch/x86/include/asm/boot.h 6394diff -urNp linux-2.6.32.11/arch/x86/include/asm/boot.h linux-2.6.32.11/arch/x86/include/asm/boot.h
6298--- linux-2.6.32.10/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400 6395--- linux-2.6.32.11/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400
6299+++ linux-2.6.32.10/arch/x86/include/asm/boot.h 2010-03-20 15:58:46.921536877 -0400 6396+++ linux-2.6.32.11/arch/x86/include/asm/boot.h 2010-04-04 20:46:41.500459645 -0400
6300@@ -11,10 +11,15 @@ 6397@@ -11,10 +11,15 @@
6301 #include <asm/pgtable_types.h> 6398 #include <asm/pgtable_types.h>
6302 6399
@@ -6314,9 +6411,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/boot.h linux-2.6.32.10/arch/x86/
6314 /* Minimum kernel alignment, as a power of two */ 6411 /* Minimum kernel alignment, as a power of two */
6315 #ifdef CONFIG_X86_64 6412 #ifdef CONFIG_X86_64
6316 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT 6413 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
6317diff -urNp linux-2.6.32.10/arch/x86/include/asm/cache.h linux-2.6.32.10/arch/x86/include/asm/cache.h 6414diff -urNp linux-2.6.32.11/arch/x86/include/asm/cache.h linux-2.6.32.11/arch/x86/include/asm/cache.h
6318--- linux-2.6.32.10/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400 6415--- linux-2.6.32.11/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400
6319+++ linux-2.6.32.10/arch/x86/include/asm/cache.h 2010-03-20 15:58:46.921536877 -0400 6416+++ linux-2.6.32.11/arch/x86/include/asm/cache.h 2010-04-04 20:46:41.500459645 -0400
6320@@ -8,6 +8,7 @@ 6417@@ -8,6 +8,7 @@
6321 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) 6418 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6322 6419
@@ -6325,9 +6422,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/cache.h linux-2.6.32.10/arch/x86
6325 6422
6326 #ifdef CONFIG_X86_VSMP 6423 #ifdef CONFIG_X86_VSMP
6327 /* vSMP Internode cacheline shift */ 6424 /* vSMP Internode cacheline shift */
6328diff -urNp linux-2.6.32.10/arch/x86/include/asm/checksum_32.h linux-2.6.32.10/arch/x86/include/asm/checksum_32.h 6425diff -urNp linux-2.6.32.11/arch/x86/include/asm/checksum_32.h linux-2.6.32.11/arch/x86/include/asm/checksum_32.h
6329--- linux-2.6.32.10/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400 6426--- linux-2.6.32.11/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400
6330+++ linux-2.6.32.10/arch/x86/include/asm/checksum_32.h 2010-03-20 15:58:46.921536877 -0400 6427+++ linux-2.6.32.11/arch/x86/include/asm/checksum_32.h 2010-04-04 20:46:41.500459645 -0400
6331@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene 6428@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
6332 int len, __wsum sum, 6429 int len, __wsum sum,
6333 int *src_err_ptr, int *dst_err_ptr); 6430 int *src_err_ptr, int *dst_err_ptr);
@@ -6361,9 +6458,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/checksum_32.h linux-2.6.32.10/ar
6361 len, sum, NULL, err_ptr); 6458 len, sum, NULL, err_ptr);
6362 6459
6363 if (len) 6460 if (len)
6364diff -urNp linux-2.6.32.10/arch/x86/include/asm/desc.h linux-2.6.32.10/arch/x86/include/asm/desc.h 6461diff -urNp linux-2.6.32.11/arch/x86/include/asm/desc.h linux-2.6.32.11/arch/x86/include/asm/desc.h
6365--- linux-2.6.32.10/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400 6462--- linux-2.6.32.11/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400
6366+++ linux-2.6.32.10/arch/x86/include/asm/desc.h 2010-03-20 15:58:46.921536877 -0400 6463+++ linux-2.6.32.11/arch/x86/include/asm/desc.h 2010-04-04 20:46:41.500459645 -0400
6367@@ -4,6 +4,7 @@ 6464@@ -4,6 +4,7 @@
6368 #include <asm/desc_defs.h> 6465 #include <asm/desc_defs.h>
6369 #include <asm/ldt.h> 6466 #include <asm/ldt.h>
@@ -6474,9 +6571,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/desc.h linux-2.6.32.10/arch/x86/
6474+#endif 6571+#endif
6475+ 6572+
6476 #endif /* _ASM_X86_DESC_H */ 6573 #endif /* _ASM_X86_DESC_H */
6477diff -urNp linux-2.6.32.10/arch/x86/include/asm/device.h linux-2.6.32.10/arch/x86/include/asm/device.h 6574diff -urNp linux-2.6.32.11/arch/x86/include/asm/device.h linux-2.6.32.11/arch/x86/include/asm/device.h
6478--- linux-2.6.32.10/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 6575--- linux-2.6.32.11/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
6479+++ linux-2.6.32.10/arch/x86/include/asm/device.h 2010-03-20 15:58:46.921536877 -0400 6576+++ linux-2.6.32.11/arch/x86/include/asm/device.h 2010-04-04 20:46:41.500459645 -0400
6480@@ -6,7 +6,7 @@ struct dev_archdata { 6577@@ -6,7 +6,7 @@ struct dev_archdata {
6481 void *acpi_handle; 6578 void *acpi_handle;
6482 #endif 6579 #endif
@@ -6486,9 +6583,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/device.h linux-2.6.32.10/arch/x8
6486 #endif 6583 #endif
6487 #ifdef CONFIG_DMAR 6584 #ifdef CONFIG_DMAR
6488 void *iommu; /* hook for IOMMU specific extension */ 6585 void *iommu; /* hook for IOMMU specific extension */
6489diff -urNp linux-2.6.32.10/arch/x86/include/asm/dma-mapping.h linux-2.6.32.10/arch/x86/include/asm/dma-mapping.h 6586diff -urNp linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h
6490--- linux-2.6.32.10/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 6587--- linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
6491+++ linux-2.6.32.10/arch/x86/include/asm/dma-mapping.h 2010-03-20 15:58:46.921536877 -0400 6588+++ linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h 2010-04-04 20:46:41.500459645 -0400
6492@@ -25,9 +25,9 @@ extern int iommu_merge; 6589@@ -25,9 +25,9 @@ extern int iommu_merge;
6493 extern struct device x86_dma_fallback_dev; 6590 extern struct device x86_dma_fallback_dev;
6494 extern int panic_on_overflow; 6591 extern int panic_on_overflow;
@@ -6528,9 +6625,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/dma-mapping.h linux-2.6.32.10/ar
6528 6625
6529 WARN_ON(irqs_disabled()); /* for portability */ 6626 WARN_ON(irqs_disabled()); /* for portability */
6530 6627
6531diff -urNp linux-2.6.32.10/arch/x86/include/asm/e820.h linux-2.6.32.10/arch/x86/include/asm/e820.h 6628diff -urNp linux-2.6.32.11/arch/x86/include/asm/e820.h linux-2.6.32.11/arch/x86/include/asm/e820.h
6532--- linux-2.6.32.10/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400 6629--- linux-2.6.32.11/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400
6533+++ linux-2.6.32.10/arch/x86/include/asm/e820.h 2010-03-20 15:58:46.921536877 -0400 6630+++ linux-2.6.32.11/arch/x86/include/asm/e820.h 2010-04-04 20:46:41.500459645 -0400
6534@@ -133,7 +133,7 @@ extern char *default_machine_specific_me 6631@@ -133,7 +133,7 @@ extern char *default_machine_specific_me
6535 #define ISA_END_ADDRESS 0x100000 6632 #define ISA_END_ADDRESS 0x100000
6536 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) 6633 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
@@ -6540,9 +6637,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/e820.h linux-2.6.32.10/arch/x86/
6540 #define BIOS_END 0x00100000 6637 #define BIOS_END 0x00100000
6541 6638
6542 #ifdef __KERNEL__ 6639 #ifdef __KERNEL__
6543diff -urNp linux-2.6.32.10/arch/x86/include/asm/elf.h linux-2.6.32.10/arch/x86/include/asm/elf.h 6640diff -urNp linux-2.6.32.11/arch/x86/include/asm/elf.h linux-2.6.32.11/arch/x86/include/asm/elf.h
6544--- linux-2.6.32.10/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 6641--- linux-2.6.32.11/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
6545+++ linux-2.6.32.10/arch/x86/include/asm/elf.h 2010-03-20 15:58:46.921536877 -0400 6642+++ linux-2.6.32.11/arch/x86/include/asm/elf.h 2010-04-04 20:58:33.220592413 -0400
6546@@ -257,7 +257,25 @@ extern int force_personality32; 6643@@ -257,7 +257,25 @@ extern int force_personality32;
6547 the loader. We need to make sure that it is out of the way of the program 6644 the loader. We need to make sure that it is out of the way of the program
6548 that it will "exec", and that there is sufficient room for the brk. */ 6645 that it will "exec", and that there is sufficient room for the brk. */
@@ -6562,8 +6659,8 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/elf.h linux-2.6.32.10/arch/x86/i
6562+#else 6659+#else
6563+#define PAX_ELF_ET_DYN_BASE 0x400000UL 6660+#define PAX_ELF_ET_DYN_BASE 0x400000UL
6564+ 6661+
6565+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_IA32)) ? 16 : 32) 6662+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
6566+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_IA32)) ? 16 : 32) 6663+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
6567+#endif 6664+#endif
6568+#endif 6665+#endif
6569 6666
@@ -6596,15 +6693,15 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/elf.h linux-2.6.32.10/arch/x86/i
6596-#define arch_randomize_brk arch_randomize_brk 6693-#define arch_randomize_brk arch_randomize_brk
6597- 6694-
6598 #endif /* _ASM_X86_ELF_H */ 6695 #endif /* _ASM_X86_ELF_H */
6599diff -urNp linux-2.6.32.10/arch/x86/include/asm/futex.h linux-2.6.32.10/arch/x86/include/asm/futex.h 6696diff -urNp linux-2.6.32.11/arch/x86/include/asm/futex.h linux-2.6.32.11/arch/x86/include/asm/futex.h
6600--- linux-2.6.32.10/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400 6697--- linux-2.6.32.11/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400
6601+++ linux-2.6.32.10/arch/x86/include/asm/futex.h 2010-03-20 15:58:46.921536877 -0400 6698+++ linux-2.6.32.11/arch/x86/include/asm/futex.h 2010-04-04 20:58:33.220592413 -0400
6602@@ -11,6 +11,40 @@ 6699@@ -11,17 +11,54 @@
6603 #include <asm/processor.h> 6700 #include <asm/processor.h>
6604 #include <asm/system.h> 6701 #include <asm/system.h>
6605 6702
6606+#ifdef CONFIG_X86_32 6703+#ifdef CONFIG_X86_32
6607+#define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \ 6704 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
6608+ asm volatile( \ 6705+ asm volatile( \
6609+ "movw\t%w6, %%ds\n" \ 6706+ "movw\t%w6, %%ds\n" \
6610+ "1:\t" insn "\n" \ 6707+ "1:\t" insn "\n" \
@@ -6637,12 +6734,31 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/futex.h linux-2.6.32.10/arch/x86
6637+ "+m" (*uaddr), "=&r" (tem) \ 6734+ "+m" (*uaddr), "=&r" (tem) \
6638+ : "r" (oparg), "i" (-EFAULT), "1" (0), "r" (__USER_DS)) 6735+ : "r" (oparg), "i" (-EFAULT), "1" (0), "r" (__USER_DS))
6639+#else 6736+#else
6640 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \ 6737+#define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
6738+ typecheck(u32 *, uaddr); \
6641 asm volatile("1:\t" insn "\n" \ 6739 asm volatile("1:\t" insn "\n" \
6642 "2:\t.section .fixup,\"ax\"\n" \ 6740 "2:\t.section .fixup,\"ax\"\n" \
6643@@ -36,8 +70,9 @@ 6741 "3:\tmov\t%3, %1\n" \
6742 "\tjmp\t2b\n" \
6743 "\t.previous\n" \
6744 _ASM_EXTABLE(1b, 3b) \
6745- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
6746+ : "=r" (oldval), "=r" (ret), \
6747+ "+m" (*(uaddr + PAX_USER_SHADOW_BASE / 4))\
6748 : "i" (-EFAULT), "0" (oparg), "1" (0))
6749
6750 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
6751+ typecheck(u32 *, uaddr); \
6752 asm volatile("1:\tmovl %2, %0\n" \
6753 "\tmovl\t%0, %3\n" \
6754 "\t" insn "\n" \
6755@@ -34,10 +71,12 @@
6756 _ASM_EXTABLE(1b, 4b) \
6757 _ASM_EXTABLE(2b, 4b) \
6644 : "=&a" (oldval), "=&r" (ret), \ 6758 : "=&a" (oldval), "=&r" (ret), \
6645 "+m" (*uaddr), "=&r" (tem) \ 6759- "+m" (*uaddr), "=&r" (tem) \
6760+ "+m" (*(uaddr + PAX_USER_SHADOW_BASE / 4)),\
6761+ "=&r" (tem) \
6646 : "r" (oparg), "i" (-EFAULT), "1" (0)) 6762 : "r" (oparg), "i" (-EFAULT), "1" (0))
6647+#endif 6763+#endif
6648 6764
@@ -6651,7 +6767,7 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/futex.h linux-2.6.32.10/arch/x86
6651 { 6767 {
6652 int op = (encoded_op >> 28) & 7; 6768 int op = (encoded_op >> 28) & 7;
6653 int cmp = (encoded_op >> 24) & 15; 6769 int cmp = (encoded_op >> 24) & 15;
6654@@ -61,11 +96,20 @@ static inline int futex_atomic_op_inuser 6770@@ -61,11 +100,20 @@ static inline int futex_atomic_op_inuser
6655 6771
6656 switch (op) { 6772 switch (op) {
6657 case FUTEX_OP_SET: 6773 case FUTEX_OP_SET:
@@ -6672,7 +6788,7 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/futex.h linux-2.6.32.10/arch/x86
6672 break; 6788 break;
6673 case FUTEX_OP_OR: 6789 case FUTEX_OP_OR:
6674 __futex_atomic_op2("orl %4, %3", ret, oldval, uaddr, oparg); 6790 __futex_atomic_op2("orl %4, %3", ret, oldval, uaddr, oparg);
6675@@ -109,7 +153,7 @@ static inline int futex_atomic_op_inuser 6791@@ -109,7 +157,7 @@ static inline int futex_atomic_op_inuser
6676 return ret; 6792 return ret;
6677 } 6793 }
6678 6794
@@ -6681,39 +6797,69 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/futex.h linux-2.6.32.10/arch/x86
6681 int newval) 6797 int newval)
6682 { 6798 {
6683 6799
6684@@ -122,14 +166,27 @@ static inline int futex_atomic_cmpxchg_i 6800@@ -119,17 +167,31 @@ static inline int futex_atomic_cmpxchg_i
6685 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int))) 6801 return -ENOSYS;
6802 #endif
6803
6804- if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
6805+ if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
6686 return -EFAULT; 6806 return -EFAULT;
6687 6807
6688- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n" 6808- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
6809- "2:\t.section .fixup, \"ax\"\n"
6689+ asm volatile( 6810+ asm volatile(
6690+#ifdef CONFIG_X86_32 6811+#ifdef CONFIG_X86_32
6691+ "\tmovw %w5, %%ds\n" 6812+ "\tmovw %w5, %%ds\n"
6692+ "1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n" 6813+ "1:\t" LOCK_PREFIX "cmpxchgl %3, %%ds:%1\n"
6693+ "2:\tpushl %%ss\n" 6814+ "2:\tpushl %%ss\n"
6694+ "\tpopl %%ds\n" 6815+ "\tpopl %%ds\n"
6695+ "\t.section .fixup, \"ax\"\n"
6696+#else 6816+#else
6697+ "1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n" 6817+ "1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
6698 "2:\t.section .fixup, \"ax\"\n" 6818+ "2:\n"
6699+#endif 6819+#endif
6820+ "\t.section .fixup, \"ax\"\n"
6700 "3:\tmov %2, %0\n" 6821 "3:\tmov %2, %0\n"
6701 "\tjmp 2b\n" 6822 "\tjmp 2b\n"
6702 "\t.previous\n" 6823 "\t.previous\n"
6703 _ASM_EXTABLE(1b, 3b) 6824 _ASM_EXTABLE(1b, 3b)
6704 : "=a" (oldval), "+m" (*uaddr)
6705+#ifdef CONFIG_X86_32 6825+#ifdef CONFIG_X86_32
6826 : "=a" (oldval), "+m" (*uaddr)
6706+ : "i" (-EFAULT), "r" (newval), "0" (oldval), "r" (__USER_DS) 6827+ : "i" (-EFAULT), "r" (newval), "0" (oldval), "r" (__USER_DS)
6707+#else 6828+#else
6829+ : "=a" (oldval), "+m" (*(uaddr + PAX_USER_SHADOW_BASE / 4))
6708 : "i" (-EFAULT), "r" (newval), "0" (oldval) 6830 : "i" (-EFAULT), "r" (newval), "0" (oldval)
6709+#endif 6831+#endif
6710 : "memory" 6832 : "memory"
6711 ); 6833 );
6712 6834
6713diff -urNp linux-2.6.32.10/arch/x86/include/asm/i387.h linux-2.6.32.10/arch/x86/include/asm/i387.h 6835diff -urNp linux-2.6.32.11/arch/x86/include/asm/i387.h linux-2.6.32.11/arch/x86/include/asm/i387.h
6714--- linux-2.6.32.10/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400 6836--- linux-2.6.32.11/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400
6715+++ linux-2.6.32.10/arch/x86/include/asm/i387.h 2010-03-20 15:58:46.921536877 -0400 6837+++ linux-2.6.32.11/arch/x86/include/asm/i387.h 2010-04-04 20:58:33.220592413 -0400
6716@@ -195,13 +195,8 @@ static inline int fxrstor_checking(struc 6838@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
6839 {
6840 int err;
6841
6842+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
6843+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
6844+ fx = (struct i387_fxsave_struct *)((void *)fx + PAX_USER_SHADOW_BASE);
6845+#endif
6846+
6847 asm volatile("1: rex64/fxrstor (%[fx])\n\t"
6848 "2:\n"
6849 ".section .fixup,\"ax\"\n"
6850@@ -105,6 +110,11 @@ static inline int fxsave_user(struct i38
6851 {
6852 int err;
6853
6854+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
6855+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
6856+ fx = (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_USER_SHADOW_BASE);
6857+#endif
6858+
6859 asm volatile("1: rex64/fxsave (%[fx])\n\t"
6860 "2:\n"
6861 ".section .fixup,\"ax\"\n"
6862@@ -195,13 +205,8 @@ static inline int fxrstor_checking(struc
6717 } 6863 }
6718 6864
6719 /* We need a safe address that is cheap to find and that is already 6865 /* We need a safe address that is cheap to find and that is already
@@ -6729,9 +6875,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/i387.h linux-2.6.32.10/arch/x86/
6729 6875
6730 /* 6876 /*
6731 * These must be called with preempt disabled 6877 * These must be called with preempt disabled
6732diff -urNp linux-2.6.32.10/arch/x86/include/asm/io_64.h linux-2.6.32.10/arch/x86/include/asm/io_64.h 6878diff -urNp linux-2.6.32.11/arch/x86/include/asm/io_64.h linux-2.6.32.11/arch/x86/include/asm/io_64.h
6733--- linux-2.6.32.10/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400 6879--- linux-2.6.32.11/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400
6734+++ linux-2.6.32.10/arch/x86/include/asm/io_64.h 2010-03-20 15:58:46.921536877 -0400 6880+++ linux-2.6.32.11/arch/x86/include/asm/io_64.h 2010-04-04 20:46:41.500459645 -0400
6735@@ -140,6 +140,17 @@ __OUTS(l) 6881@@ -140,6 +140,17 @@ __OUTS(l)
6736 6882
6737 #include <linux/vmalloc.h> 6883 #include <linux/vmalloc.h>
@@ -6750,9 +6896,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/io_64.h linux-2.6.32.10/arch/x86
6750 #include <asm-generic/iomap.h> 6896 #include <asm-generic/iomap.h>
6751 6897
6752 void __memcpy_fromio(void *, unsigned long, unsigned); 6898 void __memcpy_fromio(void *, unsigned long, unsigned);
6753diff -urNp linux-2.6.32.10/arch/x86/include/asm/iommu.h linux-2.6.32.10/arch/x86/include/asm/iommu.h 6899diff -urNp linux-2.6.32.11/arch/x86/include/asm/iommu.h linux-2.6.32.11/arch/x86/include/asm/iommu.h
6754--- linux-2.6.32.10/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 6900--- linux-2.6.32.11/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
6755+++ linux-2.6.32.10/arch/x86/include/asm/iommu.h 2010-03-20 15:58:46.921536877 -0400 6901+++ linux-2.6.32.11/arch/x86/include/asm/iommu.h 2010-04-04 20:46:41.500459645 -0400
6756@@ -3,7 +3,7 @@ 6902@@ -3,7 +3,7 @@
6757 6903
6758 extern void pci_iommu_shutdown(void); 6904 extern void pci_iommu_shutdown(void);
@@ -6762,94 +6908,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/iommu.h linux-2.6.32.10/arch/x86
6762 extern int force_iommu, no_iommu; 6908 extern int force_iommu, no_iommu;
6763 extern int iommu_detected; 6909 extern int iommu_detected;
6764 extern int iommu_pass_through; 6910 extern int iommu_pass_through;
6765diff -urNp linux-2.6.32.10/arch/x86/include/asm/irqflags.h linux-2.6.32.10/arch/x86/include/asm/irqflags.h 6911diff -urNp linux-2.6.32.11/arch/x86/include/asm/kvm_host.h linux-2.6.32.11/arch/x86/include/asm/kvm_host.h
6766--- linux-2.6.32.10/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400 6912--- linux-2.6.32.11/arch/x86/include/asm/kvm_host.h 2010-03-15 11:52:04.000000000 -0400
6767+++ linux-2.6.32.10/arch/x86/include/asm/irqflags.h 2010-03-21 16:37:01.886719099 -0400 6913+++ linux-2.6.32.11/arch/x86/include/asm/kvm_host.h 2010-04-04 20:46:41.500459645 -0400
6768@@ -142,10 +142,81 @@ static inline unsigned long __raw_local_
6769 sti; \
6770 sysexit
6771
6772+/* PaX: special register usage in entry_64.S, beware */
6773+#ifdef CONFIG_PAX_KERNEXEC
6774+ .macro ljmpq sel, off
6775+#if defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
6776+ .byte 0x48; ljmp *1234f(%rip)
6777+ .pushsection .rodata
6778+ .align 16
6779+ 1234: .quad \off; .word \sel
6780+ .popsection
6781+#else
6782+ push $\sel
6783+ push $\off
6784+ lretq
6785+#endif
6786+ .endm
6787+
6788+#define PAX_EXIT_KERNEL \
6789+ mov %cs, %rsi; \
6790+ cmp $__KERNEXEC_KERNEL_CS, %esi;\
6791+ jnz 2f; \
6792+ mov %cr0, %rsi; \
6793+ btc $16, %rsi; \
6794+ ljmpq __KERNEL_CS, 1f; \
6795+1: mov %rsi, %cr0; \
6796+2:
6797+
6798+#define PAX_ENTER_KERNEL \
6799+ mov %cr0, %rsi; \
6800+ bts $16, %rsi; \
6801+ jnc 1f; \
6802+ mov %cs, %esi; \
6803+ cmp $__KERNEL_CS, %esi; \
6804+ jz 3f; \
6805+ ljmpq __KERNEL_CS, 3f; \
6806+1: ljmpq __KERNEXEC_KERNEL_CS, 2f; \
6807+2: mov %rsi, %cr0; \
6808+3:
6809+#else
6810+#define PAX_EXIT_KERNEL
6811+#define PAX_ENTER_KERNEL
6812+#endif
6813+
6814 #else
6815 #define INTERRUPT_RETURN iret
6816 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
6817 #define GET_CR0_INTO_EAX movl %cr0, %eax
6818+
6819+/* PaX: special register usage in entry_32.S, beware */
6820+#ifdef CONFIG_PAX_KERNEXEC
6821+#define PAX_EXIT_KERNEL \
6822+ mov %cs, %esi; \
6823+ cmp $__KERNEXEC_KERNEL_CS, %esi;\
6824+ jnz 2f; \
6825+ mov %cr0, %esi; \
6826+ btc $16, %esi; \
6827+ ljmp $__KERNEL_CS, $1f; \
6828+1: mov %esi, %cr0; \
6829+2:
6830+
6831+#define PAX_ENTER_KERNEL \
6832+ mov %cr0, %esi; \
6833+ bts $16, %esi; \
6834+ jnc 1f; \
6835+ mov %cs, %esi; \
6836+ cmp $__KERNEL_CS, %esi; \
6837+ jz 3f; \
6838+ ljmp $__KERNEL_CS, $3f; \
6839+1: ljmp $__KERNEXEC_KERNEL_CS, $2f;\
6840+2: mov %esi, %cr0; \
6841+3:
6842+#else
6843+#define PAX_EXIT_KERNEL
6844+#define PAX_ENTER_KERNEL
6845+#endif
6846+
6847 #endif
6848
6849
6850diff -urNp linux-2.6.32.10/arch/x86/include/asm/kvm_host.h linux-2.6.32.10/arch/x86/include/asm/kvm_host.h
6851--- linux-2.6.32.10/arch/x86/include/asm/kvm_host.h 2010-03-15 11:52:04.000000000 -0400
6852+++ linux-2.6.32.10/arch/x86/include/asm/kvm_host.h 2010-03-20 15:58:46.921536877 -0400
6853@@ -531,7 +531,7 @@ struct kvm_x86_ops { 6914@@ -531,7 +531,7 @@ struct kvm_x86_ops {
6854 const struct trace_print_flags *exit_reasons_str; 6915 const struct trace_print_flags *exit_reasons_str;
6855 }; 6916 };
@@ -6859,9 +6920,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/kvm_host.h linux-2.6.32.10/arch/
6859 6920
6860 int kvm_mmu_module_init(void); 6921 int kvm_mmu_module_init(void);
6861 void kvm_mmu_module_exit(void); 6922 void kvm_mmu_module_exit(void);
6862diff -urNp linux-2.6.32.10/arch/x86/include/asm/local.h linux-2.6.32.10/arch/x86/include/asm/local.h 6923diff -urNp linux-2.6.32.11/arch/x86/include/asm/local.h linux-2.6.32.11/arch/x86/include/asm/local.h
6863--- linux-2.6.32.10/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400 6924--- linux-2.6.32.11/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400
6864+++ linux-2.6.32.10/arch/x86/include/asm/local.h 2010-03-20 15:58:46.921536877 -0400 6925+++ linux-2.6.32.11/arch/x86/include/asm/local.h 2010-04-04 20:46:41.500459645 -0400
6865@@ -18,26 +18,90 @@ typedef struct { 6926@@ -18,26 +18,90 @@ typedef struct {
6866 6927
6867 static inline void local_inc(local_t *l) 6928 static inline void local_inc(local_t *l)
@@ -7086,9 +7147,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/local.h linux-2.6.32.10/arch/x86
7086 : "+r" (i), "+m" (l->a.counter) 7147 : "+r" (i), "+m" (l->a.counter)
7087 : : "memory"); 7148 : : "memory");
7088 return i + __i; 7149 return i + __i;
7089diff -urNp linux-2.6.32.10/arch/x86/include/asm/microcode.h linux-2.6.32.10/arch/x86/include/asm/microcode.h 7150diff -urNp linux-2.6.32.11/arch/x86/include/asm/microcode.h linux-2.6.32.11/arch/x86/include/asm/microcode.h
7090--- linux-2.6.32.10/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400 7151--- linux-2.6.32.11/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400
7091+++ linux-2.6.32.10/arch/x86/include/asm/microcode.h 2010-03-20 15:58:46.921536877 -0400 7152+++ linux-2.6.32.11/arch/x86/include/asm/microcode.h 2010-04-04 20:46:41.500459645 -0400
7092@@ -12,13 +12,13 @@ struct device; 7153@@ -12,13 +12,13 @@ struct device;
7093 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; 7154 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
7094 7155
@@ -7129,9 +7190,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/microcode.h linux-2.6.32.10/arch
7129 { 7190 {
7130 return NULL; 7191 return NULL;
7131 } 7192 }
7132diff -urNp linux-2.6.32.10/arch/x86/include/asm/mman.h linux-2.6.32.10/arch/x86/include/asm/mman.h 7193diff -urNp linux-2.6.32.11/arch/x86/include/asm/mman.h linux-2.6.32.11/arch/x86/include/asm/mman.h
7133--- linux-2.6.32.10/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400 7194--- linux-2.6.32.11/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400
7134+++ linux-2.6.32.10/arch/x86/include/asm/mman.h 2010-03-20 15:58:46.921536877 -0400 7195+++ linux-2.6.32.11/arch/x86/include/asm/mman.h 2010-04-04 20:46:41.500459645 -0400
7135@@ -5,4 +5,14 @@ 7196@@ -5,4 +5,14 @@
7136 7197
7137 #include <asm-generic/mman.h> 7198 #include <asm-generic/mman.h>
@@ -7147,10 +7208,33 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/mman.h linux-2.6.32.10/arch/x86/
7147+#endif 7208+#endif
7148+ 7209+
7149 #endif /* _ASM_X86_MMAN_H */ 7210 #endif /* _ASM_X86_MMAN_H */
7150diff -urNp linux-2.6.32.10/arch/x86/include/asm/mmu_context.h linux-2.6.32.10/arch/x86/include/asm/mmu_context.h 7211diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu_context.h linux-2.6.32.11/arch/x86/include/asm/mmu_context.h
7151--- linux-2.6.32.10/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400 7212--- linux-2.6.32.11/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400
7152+++ linux-2.6.32.10/arch/x86/include/asm/mmu_context.h 2010-03-20 15:58:46.921536877 -0400 7213+++ linux-2.6.32.11/arch/x86/include/asm/mmu_context.h 2010-04-04 20:58:33.220592413 -0400
7153@@ -34,11 +34,17 @@ static inline void switch_mm(struct mm_s 7214@@ -24,6 +24,22 @@ void destroy_context(struct mm_struct *m
7215
7216 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
7217 {
7218+
7219+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
7220+ unsigned int i;
7221+ pgd_t *pgd;
7222+
7223+ pax_open_kernel();
7224+ pgd = get_cpu_pgd(smp_processor_id());
7225+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
7226+#ifdef CONFIG_PARAVIRT
7227+ set_pgd(pgd+i, native_make_pgd(0));
7228+#else
7229+ pgd[i] = native_make_pgd(0);
7230+#endif
7231+ pax_close_kernel();
7232+#endif
7233+
7234 #ifdef CONFIG_SMP
7235 if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
7236 percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
7237@@ -34,37 +50,96 @@ static inline void switch_mm(struct mm_s
7154 struct task_struct *tsk) 7238 struct task_struct *tsk)
7155 { 7239 {
7156 unsigned cpu = smp_processor_id(); 7240 unsigned cpu = smp_processor_id();
@@ -7168,7 +7252,21 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/mmu_context.h linux-2.6.32.10/ar
7168 percpu_write(cpu_tlbstate.state, TLBSTATE_OK); 7252 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
7169 percpu_write(cpu_tlbstate.active_mm, next); 7253 percpu_write(cpu_tlbstate.active_mm, next);
7170 #endif 7254 #endif
7171@@ -52,6 +58,26 @@ static inline void switch_mm(struct mm_s 7255 cpumask_set_cpu(cpu, mm_cpumask(next));
7256
7257 /* Re-load page tables */
7258+#ifdef CONFIG_PAX_PER_CPU_PGD
7259+ pax_open_kernel();
7260+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
7261+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
7262+ pax_close_kernel();
7263+ load_cr3(get_cpu_pgd(cpu));
7264+#else
7265 load_cr3(next->pgd);
7266+#endif
7267
7268 /*
7269 * load the LDT, if the LDT is different:
7172 */ 7270 */
7173 if (unlikely(prev->context.ldt != next->context.ldt)) 7271 if (unlikely(prev->context.ldt != next->context.ldt))
7174 load_LDT_nolock(&next->context); 7272 load_LDT_nolock(&next->context);
@@ -7195,9 +7293,27 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/mmu_context.h linux-2.6.32.10/ar
7195 } 7293 }
7196 #ifdef CONFIG_SMP 7294 #ifdef CONFIG_SMP
7197 else { 7295 else {
7198@@ -65,6 +91,19 @@ static inline void switch_mm(struct mm_s 7296 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
7297 BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
7298
7299+#ifdef CONFIG_PAX_PER_CPU_PGD
7300+ pax_open_kernel();
7301+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
7302+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
7303+ pax_close_kernel();
7304+ load_cr3(get_cpu_pgd(cpu));
7305+#endif
7306+
7307 if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next))) {
7308 /* We were in lazy tlb mode and leave_mm disabled
7309 * tlb flush IPI delivery. We must reload CR3
7310 * to make sure to use no freed page tables.
7199 */ 7311 */
7312+
7313+#ifndef CONFIG_PAX_PER_CPU_PGD
7200 load_cr3(next->pgd); 7314 load_cr3(next->pgd);
7315+#endif
7316+
7201 load_LDT_nolock(&next->context); 7317 load_LDT_nolock(&next->context);
7202+ 7318+
7203+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) 7319+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
@@ -7215,9 +7331,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/mmu_context.h linux-2.6.32.10/ar
7215 } 7331 }
7216 } 7332 }
7217 #endif 7333 #endif
7218diff -urNp linux-2.6.32.10/arch/x86/include/asm/mmu.h linux-2.6.32.10/arch/x86/include/asm/mmu.h 7334diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu.h linux-2.6.32.11/arch/x86/include/asm/mmu.h
7219--- linux-2.6.32.10/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400 7335--- linux-2.6.32.11/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400
7220+++ linux-2.6.32.10/arch/x86/include/asm/mmu.h 2010-03-20 15:58:46.921536877 -0400 7336+++ linux-2.6.32.11/arch/x86/include/asm/mmu.h 2010-04-04 20:46:41.500459645 -0400
7221@@ -9,10 +9,23 @@ 7337@@ -9,10 +9,23 @@
7222 * we put the segment information here. 7338 * we put the segment information here.
7223 */ 7339 */
@@ -7244,26 +7360,45 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/mmu.h linux-2.6.32.10/arch/x86/i
7244 } mm_context_t; 7360 } mm_context_t;
7245 7361
7246 #ifdef CONFIG_SMP 7362 #ifdef CONFIG_SMP
7247diff -urNp linux-2.6.32.10/arch/x86/include/asm/module.h linux-2.6.32.10/arch/x86/include/asm/module.h 7363diff -urNp linux-2.6.32.11/arch/x86/include/asm/module.h linux-2.6.32.11/arch/x86/include/asm/module.h
7248--- linux-2.6.32.10/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400 7364--- linux-2.6.32.11/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400
7249+++ linux-2.6.32.10/arch/x86/include/asm/module.h 2010-03-20 15:58:46.925538200 -0400 7365+++ linux-2.6.32.11/arch/x86/include/asm/module.h 2010-04-04 21:01:05.305858196 -0400
7250@@ -65,7 +65,12 @@ 7366@@ -59,13 +59,31 @@
7367 #error unknown processor family
7368 #endif
7369
7370+#ifdef CONFIG_PAX_MEMORY_UDEREF
7371+#define MODULE_PAX_UDEREF "UDEREF "
7372+#else
7373+#define MODULE_PAX_UDEREF ""
7374+#endif
7375+
7376 #ifdef CONFIG_X86_32
7377 # ifdef CONFIG_4KSTACKS
7378 # define MODULE_STACKSIZE "4KSTACKS "
7251 # else 7379 # else
7252 # define MODULE_STACKSIZE "" 7380 # define MODULE_STACKSIZE ""
7253 # endif 7381 # endif
7254-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE 7382-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE
7383+# ifdef CONFIG_PAX_KERNEXEC
7384+# define MODULE_PAX_KERNEXEC "KERNEXEC "
7385+# else
7386+# define MODULE_PAX_KERNEXEC ""
7387+# endif
7255+# ifdef CONFIG_GRKERNSEC 7388+# ifdef CONFIG_GRKERNSEC
7256+# define MODULE_GRSEC "GRSECURITY " 7389+# define MODULE_GRSEC "GRSECURITY "
7257+# else 7390+# else
7258+# define MODULE_GRSEC "" 7391+# define MODULE_GRSEC ""
7259+# endif 7392+# endif
7260+# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODULE_GRSEC 7393+# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
7394+#else
7395+# define MODULE_ARCH_VERMAGIC MODULE_PAX_UDEREF
7261 #endif 7396 #endif
7262 7397
7263 #endif /* _ASM_X86_MODULE_H */ 7398 #endif /* _ASM_X86_MODULE_H */
7264diff -urNp linux-2.6.32.10/arch/x86/include/asm/page_32_types.h linux-2.6.32.10/arch/x86/include/asm/page_32_types.h 7399diff -urNp linux-2.6.32.11/arch/x86/include/asm/page_32_types.h linux-2.6.32.11/arch/x86/include/asm/page_32_types.h
7265--- linux-2.6.32.10/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400 7400--- linux-2.6.32.11/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400
7266+++ linux-2.6.32.10/arch/x86/include/asm/page_32_types.h 2010-03-20 15:58:46.925538200 -0400 7401+++ linux-2.6.32.11/arch/x86/include/asm/page_32_types.h 2010-04-04 20:46:41.505526780 -0400
7267@@ -15,6 +15,10 @@ 7402@@ -15,6 +15,10 @@
7268 */ 7403 */
7269 #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) 7404 #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
@@ -7275,9 +7410,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/page_32_types.h linux-2.6.32.10/
7275 #ifdef CONFIG_4KSTACKS 7410 #ifdef CONFIG_4KSTACKS
7276 #define THREAD_ORDER 0 7411 #define THREAD_ORDER 0
7277 #else 7412 #else
7278diff -urNp linux-2.6.32.10/arch/x86/include/asm/page_64_types.h linux-2.6.32.10/arch/x86/include/asm/page_64_types.h 7413diff -urNp linux-2.6.32.11/arch/x86/include/asm/page_64_types.h linux-2.6.32.11/arch/x86/include/asm/page_64_types.h
7279--- linux-2.6.32.10/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400 7414--- linux-2.6.32.11/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400
7280+++ linux-2.6.32.10/arch/x86/include/asm/page_64_types.h 2010-03-20 15:58:46.925538200 -0400 7415+++ linux-2.6.32.11/arch/x86/include/asm/page_64_types.h 2010-04-04 20:46:41.505526780 -0400
7281@@ -39,6 +39,9 @@ 7416@@ -39,6 +39,9 @@
7282 #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) 7417 #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START)
7283 #define __START_KERNEL_map _AC(0xffffffff80000000, UL) 7418 #define __START_KERNEL_map _AC(0xffffffff80000000, UL)
@@ -7288,9 +7423,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/page_64_types.h linux-2.6.32.10/
7288 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ 7423 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
7289 #define __PHYSICAL_MASK_SHIFT 46 7424 #define __PHYSICAL_MASK_SHIFT 46
7290 #define __VIRTUAL_MASK_SHIFT 47 7425 #define __VIRTUAL_MASK_SHIFT 47
7291diff -urNp linux-2.6.32.10/arch/x86/include/asm/paravirt.h linux-2.6.32.10/arch/x86/include/asm/paravirt.h 7426diff -urNp linux-2.6.32.11/arch/x86/include/asm/paravirt.h linux-2.6.32.11/arch/x86/include/asm/paravirt.h
7292--- linux-2.6.32.10/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400 7427--- linux-2.6.32.11/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400
7293+++ linux-2.6.32.10/arch/x86/include/asm/paravirt.h 2010-03-21 16:37:01.902719167 -0400 7428+++ linux-2.6.32.11/arch/x86/include/asm/paravirt.h 2010-04-04 20:47:28.952733264 -0400
7294@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned 7429@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
7295 pv_mmu_ops.set_fixmap(idx, phys, flags); 7430 pv_mmu_ops.set_fixmap(idx, phys, flags);
7296 } 7431 }
@@ -7322,97 +7457,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/paravirt.h linux-2.6.32.10/arch/
7322 #endif 7457 #endif
7323 7458
7324 #define INTERRUPT_RETURN \ 7459 #define INTERRUPT_RETURN \
7325@@ -980,6 +995,34 @@ extern void default_banner(void); 7460diff -urNp linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h
7326 CLBR_NONE, \ 7461--- linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400
7327 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit)) 7462+++ linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h 2010-04-04 20:46:41.505526780 -0400
7328
7329+#ifdef CONFIG_PAX_KERNEXEC
7330+#define PAX_EXIT_KERNEL \
7331+ push %eax; push %ecx; \
7332+ mov %cs, %eax; \
7333+ cmp $__KERNEXEC_KERNEL_CS, %eax; \
7334+ jnz 2f; \
7335+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
7336+ btc $16, %eax; \
7337+ ljmp $__KERNEL_CS, $1f; \
7338+1: call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);\
7339+2: pop %ecx; pop %eax; \
7340+
7341+#define PAX_ENTER_KERNEL \
7342+ push %eax; push %ecx; \
7343+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
7344+ bts $16, %eax; \
7345+ jnc 1f; \
7346+ mov %cs, %ecx; \
7347+ cmp $__KERNEL_CS, %ecx; \
7348+ jz 3f; \
7349+ ljmp $__KERNEL_CS, $3f; \
7350+1: ljmp $__KERNEXEC_KERNEL_CS, $2f; \
7351+2: call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);\
7352+3: pop %ecx; pop %eax;
7353+#else
7354+#define PAX_EXIT_KERNEL
7355+#define PAX_ENTER_KERNEL
7356+#endif
7357
7358 #else /* !CONFIG_X86_32 */
7359
7360@@ -1022,6 +1065,52 @@ extern void default_banner(void);
7361 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
7362 CLBR_NONE, \
7363 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
7364+
7365+#ifdef CONFIG_PAX_KERNEXEC
7366+ .macro ljmpq sel, off
7367+#if defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
7368+ .byte 0x48; ljmp *1234f(%rip)
7369+ .pushsection .rodata
7370+ .align 16
7371+ 1234: .quad \off; .word \sel
7372+ .popsection
7373+#else
7374+ push $\sel
7375+ push $\off
7376+ lretq
7377+#endif
7378+ .endm
7379+
7380+#define PAX_EXIT_KERNEL \
7381+ PV_SAVE_REGS(CLBR_NONE); \
7382+ mov %cs, %rax; \
7383+ cmp $__KERNEXEC_KERNEL_CS, %eax; \
7384+ jnz 2f; \
7385+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
7386+ btc $16, %rax; \
7387+ mov %rax, %rdi; \
7388+ ljmpq __KERNEL_CS, 1f; \
7389+1: call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);\
7390+2: PV_RESTORE_REGS(CLBR_NONE);
7391+
7392+#define PAX_ENTER_KERNEL \
7393+ PV_SAVE_REGS(CLBR_NONE); \
7394+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
7395+ bts $16, %rax; \
7396+ jnc 1f; \
7397+ mov %cs, %rax; \
7398+ cmp $__KERNEL_CS, %eax; \
7399+ jz 3f; \
7400+ ljmpq __KERNEL_CS, 3f; \
7401+1: mov %rax, %rdi; \
7402+ ljmpq __KERNEXEC_KERNEL_CS, 2f; \
7403+2: call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);\
7404+3: PV_RESTORE_REGS(CLBR_NONE);
7405+#else
7406+#define PAX_EXIT_KERNEL
7407+#define PAX_ENTER_KERNEL
7408+#endif
7409+
7410 #endif /* CONFIG_X86_32 */
7411
7412 #endif /* __ASSEMBLY__ */
7413diff -urNp linux-2.6.32.10/arch/x86/include/asm/paravirt_types.h linux-2.6.32.10/arch/x86/include/asm/paravirt_types.h
7414--- linux-2.6.32.10/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400
7415+++ linux-2.6.32.10/arch/x86/include/asm/paravirt_types.h 2010-03-20 15:58:46.925538200 -0400
7416@@ -316,6 +316,12 @@ struct pv_mmu_ops { 7463@@ -316,6 +316,12 @@ struct pv_mmu_ops {
7417 an mfn. We can tell which is which from the index. */ 7464 an mfn. We can tell which is which from the index. */
7418 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, 7465 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
@@ -7426,9 +7473,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/paravirt_types.h linux-2.6.32.10
7426 }; 7473 };
7427 7474
7428 struct raw_spinlock; 7475 struct raw_spinlock;
7429diff -urNp linux-2.6.32.10/arch/x86/include/asm/pci_x86.h linux-2.6.32.10/arch/x86/include/asm/pci_x86.h 7476diff -urNp linux-2.6.32.11/arch/x86/include/asm/pci_x86.h linux-2.6.32.11/arch/x86/include/asm/pci_x86.h
7430--- linux-2.6.32.10/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400 7477--- linux-2.6.32.11/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400
7431+++ linux-2.6.32.10/arch/x86/include/asm/pci_x86.h 2010-03-20 15:58:46.925538200 -0400 7478+++ linux-2.6.32.11/arch/x86/include/asm/pci_x86.h 2010-04-04 20:46:41.505526780 -0400
7432@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct 7479@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
7433 extern void (*pcibios_disable_irq)(struct pci_dev *dev); 7480 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
7434 7481
@@ -7451,9 +7498,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/pci_x86.h linux-2.6.32.10/arch/x
7451 extern bool port_cf9_safe; 7498 extern bool port_cf9_safe;
7452 7499
7453 /* arch_initcall level */ 7500 /* arch_initcall level */
7454diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgalloc.h linux-2.6.32.10/arch/x86/include/asm/pgalloc.h 7501diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgalloc.h linux-2.6.32.11/arch/x86/include/asm/pgalloc.h
7455--- linux-2.6.32.10/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400 7502--- linux-2.6.32.11/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400
7456+++ linux-2.6.32.10/arch/x86/include/asm/pgalloc.h 2010-03-20 15:58:46.925538200 -0400 7503+++ linux-2.6.32.11/arch/x86/include/asm/pgalloc.h 2010-04-04 20:46:41.505526780 -0400
7457@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s 7504@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
7458 pmd_t *pmd, pte_t *pte) 7505 pmd_t *pmd, pte_t *pte)
7459 { 7506 {
@@ -7468,9 +7515,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgalloc.h linux-2.6.32.10/arch/x
7468 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); 7515 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
7469 } 7516 }
7470 7517
7471diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.10/arch/x86/include/asm/pgtable-2level.h 7518diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h
7472--- linux-2.6.32.10/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400 7519--- linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400
7473+++ linux-2.6.32.10/arch/x86/include/asm/pgtable-2level.h 2010-03-20 15:58:46.925538200 -0400 7520+++ linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h 2010-04-04 20:46:41.505526780 -0400
7474@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 7521@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
7475 7522
7476 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 7523 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7481,9 +7528,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.10
7481 } 7528 }
7482 7529
7483 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) 7530 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
7484diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable_32.h linux-2.6.32.10/arch/x86/include/asm/pgtable_32.h 7531diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h
7485--- linux-2.6.32.10/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 7532--- linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
7486+++ linux-2.6.32.10/arch/x86/include/asm/pgtable_32.h 2010-03-20 15:58:46.925538200 -0400 7533+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h 2010-04-04 20:46:41.505526780 -0400
7487@@ -26,8 +26,6 @@ 7534@@ -26,8 +26,6 @@
7488 struct mm_struct; 7535 struct mm_struct;
7489 struct vm_area_struct; 7536 struct vm_area_struct;
@@ -7525,9 +7572,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable_32.h linux-2.6.32.10/arc
7525 /* 7572 /*
7526 * kern_addr_valid() is (1) for FLATMEM and (0) for 7573 * kern_addr_valid() is (1) for FLATMEM and (0) for
7527 * SPARSEMEM and DISCONTIGMEM 7574 * SPARSEMEM and DISCONTIGMEM
7528diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.10/arch/x86/include/asm/pgtable_32_types.h 7575diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.11/arch/x86/include/asm/pgtable_32_types.h
7529--- linux-2.6.32.10/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400 7576--- linux-2.6.32.11/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400
7530+++ linux-2.6.32.10/arch/x86/include/asm/pgtable_32_types.h 2010-03-20 15:58:46.925538200 -0400 7577+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_32_types.h 2010-04-04 20:46:41.505526780 -0400
7531@@ -8,7 +8,7 @@ 7578@@ -8,7 +8,7 @@
7532 */ 7579 */
7533 #ifdef CONFIG_X86_PAE 7580 #ifdef CONFIG_X86_PAE
@@ -7557,9 +7604,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.
7557 #define MODULES_VADDR VMALLOC_START 7604 #define MODULES_VADDR VMALLOC_START
7558 #define MODULES_END VMALLOC_END 7605 #define MODULES_END VMALLOC_END
7559 #define MODULES_LEN (MODULES_VADDR - MODULES_END) 7606 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
7560diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.10/arch/x86/include/asm/pgtable-3level.h 7607diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.11/arch/x86/include/asm/pgtable-3level.h
7561--- linux-2.6.32.10/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400 7608--- linux-2.6.32.11/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400
7562+++ linux-2.6.32.10/arch/x86/include/asm/pgtable-3level.h 2010-03-20 15:58:46.925538200 -0400 7609+++ linux-2.6.32.11/arch/x86/include/asm/pgtable-3level.h 2010-04-04 20:46:41.505526780 -0400
7563@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic 7610@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
7564 7611
7565 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 7612 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7577,10 +7624,10 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.10
7577 } 7624 }
7578 7625
7579 /* 7626 /*
7580diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable_64.h linux-2.6.32.10/arch/x86/include/asm/pgtable_64.h 7627diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h
7581--- linux-2.6.32.10/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400 7628--- linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400
7582+++ linux-2.6.32.10/arch/x86/include/asm/pgtable_64.h 2010-03-20 15:58:46.925538200 -0400 7629+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h 2010-04-04 20:58:33.220592413 -0400
7583@@ -16,9 +16,12 @@ 7630@@ -16,10 +16,13 @@
7584 7631
7585 extern pud_t level3_kernel_pgt[512]; 7632 extern pud_t level3_kernel_pgt[512];
7586 extern pud_t level3_ident_pgt[512]; 7633 extern pud_t level3_ident_pgt[512];
@@ -7590,10 +7637,12 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable_64.h linux-2.6.32.10/arc
7590 extern pmd_t level2_kernel_pgt[512]; 7637 extern pmd_t level2_kernel_pgt[512];
7591 extern pmd_t level2_fixmap_pgt[512]; 7638 extern pmd_t level2_fixmap_pgt[512];
7592-extern pmd_t level2_ident_pgt[512]; 7639-extern pmd_t level2_ident_pgt[512];
7640-extern pgd_t init_level4_pgt[];
7593+extern pmd_t level2_ident_pgt[512*2]; 7641+extern pmd_t level2_ident_pgt[512*2];
7594 extern pgd_t init_level4_pgt[]; 7642+extern pgd_t init_level4_pgt[512];
7595 7643
7596 #define swapper_pg_dir init_level4_pgt 7644 #define swapper_pg_dir init_level4_pgt
7645
7597@@ -74,7 +77,9 @@ static inline pte_t native_ptep_get_and_ 7646@@ -74,7 +77,9 @@ static inline pte_t native_ptep_get_and_
7598 7647
7599 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 7648 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7604,7 +7653,7 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable_64.h linux-2.6.32.10/arc
7604 } 7653 }
7605 7654
7606 static inline void native_pmd_clear(pmd_t *pmd) 7655 static inline void native_pmd_clear(pmd_t *pmd)
7607@@ -94,7 +99,9 @@ static inline void native_pud_clear(pud_ 7656@@ -94,12 +99,18 @@ static inline void native_pud_clear(pud_
7608 7657
7609 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd) 7658 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
7610 { 7659 {
@@ -7614,9 +7663,18 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable_64.h linux-2.6.32.10/arc
7614 } 7663 }
7615 7664
7616 static inline void native_pgd_clear(pgd_t *pgd) 7665 static inline void native_pgd_clear(pgd_t *pgd)
7617diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable.h linux-2.6.32.10/arch/x86/include/asm/pgtable.h 7666 {
7618--- linux-2.6.32.10/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 7667+
7619+++ linux-2.6.32.10/arch/x86/include/asm/pgtable.h 2010-03-20 15:58:46.925538200 -0400 7668+#ifndef CONFIG_PAX_PER_CPU_PGD
7669 native_set_pgd(pgd, native_make_pgd(0));
7670+#endif
7671+
7672 }
7673
7674 /*
7675diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable.h linux-2.6.32.11/arch/x86/include/asm/pgtable.h
7676--- linux-2.6.32.11/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
7677+++ linux-2.6.32.11/arch/x86/include/asm/pgtable.h 2010-04-04 20:58:33.220592413 -0400
7620@@ -74,12 +74,51 @@ extern struct list_head pgd_list; 7678@@ -74,12 +74,51 @@ extern struct list_head pgd_list;
7621 7679
7622 #define arch_end_context_switch(prev) do {} while(0) 7680 #define arch_end_context_switch(prev) do {} while(0)
@@ -7700,7 +7758,23 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable.h linux-2.6.32.10/arch/x
7700 } 7758 }
7701 7759
7702 static inline pte_t pte_mkdirty(pte_t pte) 7760 static inline pte_t pte_mkdirty(pte_t pte)
7703@@ -472,7 +531,7 @@ static inline pud_t *pud_offset(pgd_t *p 7761@@ -302,6 +361,15 @@ pte_t *populate_extra_pte(unsigned long
7762 #endif
7763
7764 #ifndef __ASSEMBLY__
7765+
7766+#ifdef CONFIG_PAX_PER_CPU_PGD
7767+extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD];
7768+static inline pgd_t *get_cpu_pgd(unsigned int cpu)
7769+{
7770+ return cpu_pgd[cpu];
7771+}
7772+#endif
7773+
7774 #include <linux/mm_types.h>
7775
7776 static inline int pte_none(pte_t pte)
7777@@ -472,7 +540,7 @@ static inline pud_t *pud_offset(pgd_t *p
7704 7778
7705 static inline int pgd_bad(pgd_t pgd) 7779 static inline int pgd_bad(pgd_t pgd)
7706 { 7780 {
@@ -7709,7 +7783,42 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable.h linux-2.6.32.10/arch/x
7709 } 7783 }
7710 7784
7711 static inline int pgd_none(pgd_t pgd) 7785 static inline int pgd_none(pgd_t pgd)
7712@@ -611,9 +670,12 @@ static inline void ptep_set_wrprotect(st 7786@@ -495,7 +563,12 @@ static inline int pgd_none(pgd_t pgd)
7787 * pgd_offset() returns a (pgd_t *)
7788 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
7789 */
7790-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
7791+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
7792+
7793+#ifdef CONFIG_PAX_PER_CPU_PGD
7794+#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(address))
7795+#endif
7796+
7797 /*
7798 * a shortcut which implies the use of the kernel's pgd, instead
7799 * of a process's
7800@@ -506,6 +579,20 @@ static inline int pgd_none(pgd_t pgd)
7801 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
7802 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
7803
7804+#ifdef CONFIG_X86_32
7805+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
7806+#else
7807+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
7808+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
7809+
7810+#ifdef CONFIG_PAX_MEMORY_UDEREF
7811+#define PAX_USER_SHADOW_BASE (_AC(1,UL) << TASK_SIZE_MAX_SHIFT)
7812+#else
7813+#define PAX_USER_SHADOW_BASE (_AC(0,UL))
7814+#endif
7815+
7816+#endif
7817+
7818 #ifndef __ASSEMBLY__
7819
7820 extern int direct_gbpages;
7821@@ -611,11 +698,18 @@ static inline void ptep_set_wrprotect(st
7713 * dst and src can be on the same page, but the range must not overlap, 7822 * dst and src can be on the same page, but the range must not overlap,
7714 * and must not cross a page boundary. 7823 * and must not cross a page boundary.
7715 */ 7824 */
@@ -7723,10 +7832,16 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable.h linux-2.6.32.10/arch/x
7723+ pax_close_kernel(); 7832+ pax_close_kernel();
7724 } 7833 }
7725 7834
7835+#ifdef CONFIG_PAX_PER_CPU_PGD
7836+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count);
7837+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count);
7838+#endif
7726 7839
7727diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable_types.h linux-2.6.32.10/arch/x86/include/asm/pgtable_types.h 7840 #include <asm-generic/pgtable.h>
7728--- linux-2.6.32.10/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400 7841 #endif /* __ASSEMBLY__ */
7729+++ linux-2.6.32.10/arch/x86/include/asm/pgtable_types.h 2010-03-20 15:58:46.925538200 -0400 7842diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h
7843--- linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400
7844+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h 2010-04-04 20:46:41.505526780 -0400
7730@@ -16,12 +16,11 @@ 7845@@ -16,12 +16,11 @@
7731 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ 7846 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
7732 #define _PAGE_BIT_PAT 7 /* on 4KB pages */ 7847 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -7811,9 +7926,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable_types.h linux-2.6.32.10/
7811 7926
7812 #define pgprot_writecombine pgprot_writecombine 7927 #define pgprot_writecombine pgprot_writecombine
7813 extern pgprot_t pgprot_writecombine(pgprot_t prot); 7928 extern pgprot_t pgprot_writecombine(pgprot_t prot);
7814diff -urNp linux-2.6.32.10/arch/x86/include/asm/processor.h linux-2.6.32.10/arch/x86/include/asm/processor.h 7929diff -urNp linux-2.6.32.11/arch/x86/include/asm/processor.h linux-2.6.32.11/arch/x86/include/asm/processor.h
7815--- linux-2.6.32.10/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400 7930--- linux-2.6.32.11/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400
7816+++ linux-2.6.32.10/arch/x86/include/asm/processor.h 2010-03-20 15:58:46.925538200 -0400 7931+++ linux-2.6.32.11/arch/x86/include/asm/processor.h 2010-04-04 20:58:33.220592413 -0400
7817@@ -272,7 +272,7 @@ struct tss_struct { 7932@@ -272,7 +272,7 @@ struct tss_struct {
7818 7933
7819 } ____cacheline_aligned; 7934 } ____cacheline_aligned;
@@ -7871,7 +7986,14 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/processor.h linux-2.6.32.10/arch
7871 __regs__ - 1; \ 7986 __regs__ - 1; \
7872 }) 7987 })
7873 7988
7874@@ -975,7 +978,7 @@ extern unsigned long thread_saved_pc(str 7989@@ -969,13 +972,13 @@ extern unsigned long thread_saved_pc(str
7990 /*
7991 * User space process size. 47bits minus one guard page.
7992 */
7993-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
7994+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
7995
7996 /* This decides where the kernel will search for a free chunk of vm
7875 * space during mmap's. 7997 * space during mmap's.
7876 */ 7998 */
7877 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \ 7999 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
@@ -7891,9 +8013,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/processor.h linux-2.6.32.10/arch
7891 #define KSTK_EIP(task) (task_pt_regs(task)->ip) 8013 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
7892 8014
7893 /* Get/set a process' ability to use the timestamp counter instruction */ 8015 /* Get/set a process' ability to use the timestamp counter instruction */
7894diff -urNp linux-2.6.32.10/arch/x86/include/asm/ptrace.h linux-2.6.32.10/arch/x86/include/asm/ptrace.h 8016diff -urNp linux-2.6.32.11/arch/x86/include/asm/ptrace.h linux-2.6.32.11/arch/x86/include/asm/ptrace.h
7895--- linux-2.6.32.10/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400 8017--- linux-2.6.32.11/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400
7896+++ linux-2.6.32.10/arch/x86/include/asm/ptrace.h 2010-03-20 15:58:46.925538200 -0400 8018+++ linux-2.6.32.11/arch/x86/include/asm/ptrace.h 2010-04-04 20:46:41.505526780 -0400
7897@@ -151,28 +151,29 @@ static inline unsigned long regs_return_ 8019@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
7898 } 8020 }
7899 8021
@@ -7930,9 +8052,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/ptrace.h linux-2.6.32.10/arch/x8
7930 #endif 8052 #endif
7931 } 8053 }
7932 8054
7933diff -urNp linux-2.6.32.10/arch/x86/include/asm/reboot.h linux-2.6.32.10/arch/x86/include/asm/reboot.h 8055diff -urNp linux-2.6.32.11/arch/x86/include/asm/reboot.h linux-2.6.32.11/arch/x86/include/asm/reboot.h
7934--- linux-2.6.32.10/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400 8056--- linux-2.6.32.11/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400
7935+++ linux-2.6.32.10/arch/x86/include/asm/reboot.h 2010-03-20 15:58:46.925538200 -0400 8057+++ linux-2.6.32.11/arch/x86/include/asm/reboot.h 2010-04-04 20:46:41.505526780 -0400
7936@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; 8058@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
7937 8059
7938 void native_machine_crash_shutdown(struct pt_regs *regs); 8060 void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -7942,9 +8064,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/reboot.h linux-2.6.32.10/arch/x8
7942 8064
7943 typedef void (*nmi_shootdown_cb)(int, struct die_args*); 8065 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
7944 void nmi_shootdown_cpus(nmi_shootdown_cb callback); 8066 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
7945diff -urNp linux-2.6.32.10/arch/x86/include/asm/rwsem.h linux-2.6.32.10/arch/x86/include/asm/rwsem.h 8067diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86/include/asm/rwsem.h
7946--- linux-2.6.32.10/arch/x86/include/asm/rwsem.h 2010-03-15 11:52:04.000000000 -0400 8068--- linux-2.6.32.11/arch/x86/include/asm/rwsem.h 2010-03-15 11:52:04.000000000 -0400
7947+++ linux-2.6.32.10/arch/x86/include/asm/rwsem.h 2010-03-20 15:58:46.925538200 -0400 8069+++ linux-2.6.32.11/arch/x86/include/asm/rwsem.h 2010-04-04 20:46:41.505526780 -0400
7948@@ -106,10 +106,26 @@ static inline void __down_read(struct rw 8070@@ -106,10 +106,26 @@ static inline void __down_read(struct rw
7949 { 8071 {
7950 asm volatile("# beginning down_read\n\t" 8072 asm volatile("# beginning down_read\n\t"
@@ -8177,9 +8299,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/rwsem.h linux-2.6.32.10/arch/x86
8177 : "+r" (tmp), "+m" (sem->count) 8299 : "+r" (tmp), "+m" (sem->count)
8178 : : "memory"); 8300 : : "memory");
8179 8301
8180diff -urNp linux-2.6.32.10/arch/x86/include/asm/segment.h linux-2.6.32.10/arch/x86/include/asm/segment.h 8302diff -urNp linux-2.6.32.11/arch/x86/include/asm/segment.h linux-2.6.32.11/arch/x86/include/asm/segment.h
8181--- linux-2.6.32.10/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400 8303--- linux-2.6.32.11/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400
8182+++ linux-2.6.32.10/arch/x86/include/asm/segment.h 2010-03-20 15:58:46.925538200 -0400 8304+++ linux-2.6.32.11/arch/x86/include/asm/segment.h 2010-04-04 20:46:41.505526780 -0400
8183@@ -62,8 +62,8 @@ 8305@@ -62,8 +62,8 @@
8184 * 26 - ESPFIX small SS 8306 * 26 - ESPFIX small SS
8185 * 27 - per-cpu [ offset to per-cpu data area ] 8307 * 27 - per-cpu [ offset to per-cpu data area ]
@@ -8248,9 +8370,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/segment.h linux-2.6.32.10/arch/x
8248 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) 8370 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
8249 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) 8371 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
8250 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) 8372 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
8251diff -urNp linux-2.6.32.10/arch/x86/include/asm/spinlock.h linux-2.6.32.10/arch/x86/include/asm/spinlock.h 8373diff -urNp linux-2.6.32.11/arch/x86/include/asm/spinlock.h linux-2.6.32.11/arch/x86/include/asm/spinlock.h
8252--- linux-2.6.32.10/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400 8374--- linux-2.6.32.11/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400
8253+++ linux-2.6.32.10/arch/x86/include/asm/spinlock.h 2010-03-20 15:58:46.930703824 -0400 8375+++ linux-2.6.32.11/arch/x86/include/asm/spinlock.h 2010-04-04 20:46:41.505526780 -0400
8254@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r 8376@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r
8255 static inline void __raw_read_lock(raw_rwlock_t *rw) 8377 static inline void __raw_read_lock(raw_rwlock_t *rw)
8256 { 8378 {
@@ -8354,9 +8476,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/spinlock.h linux-2.6.32.10/arch/
8354 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); 8476 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
8355 } 8477 }
8356 8478
8357diff -urNp linux-2.6.32.10/arch/x86/include/asm/system.h linux-2.6.32.10/arch/x86/include/asm/system.h 8479diff -urNp linux-2.6.32.11/arch/x86/include/asm/system.h linux-2.6.32.11/arch/x86/include/asm/system.h
8358--- linux-2.6.32.10/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 8480--- linux-2.6.32.11/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
8359+++ linux-2.6.32.10/arch/x86/include/asm/system.h 2010-03-20 15:58:46.930703824 -0400 8481+++ linux-2.6.32.11/arch/x86/include/asm/system.h 2010-04-04 20:46:41.505526780 -0400
8360@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un 8482@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
8361 { 8483 {
8362 unsigned long __limit; 8484 unsigned long __limit;
@@ -8375,9 +8497,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/system.h linux-2.6.32.10/arch/x8
8375 extern void free_init_pages(char *what, unsigned long begin, unsigned long end); 8497 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
8376 8498
8377 void default_idle(void); 8499 void default_idle(void);
8378diff -urNp linux-2.6.32.10/arch/x86/include/asm/uaccess_32.h linux-2.6.32.10/arch/x86/include/asm/uaccess_32.h 8500diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess_32.h linux-2.6.32.11/arch/x86/include/asm/uaccess_32.h
8379--- linux-2.6.32.10/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 8501--- linux-2.6.32.11/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
8380+++ linux-2.6.32.10/arch/x86/include/asm/uaccess_32.h 2010-03-20 15:58:46.930703824 -0400 8502+++ linux-2.6.32.11/arch/x86/include/asm/uaccess_32.h 2010-04-04 20:46:41.505526780 -0400
8381@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u 8503@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
8382 static __always_inline unsigned long __must_check 8504 static __always_inline unsigned long __must_check
8383 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) 8505 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -8507,19 +8629,20 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/uaccess_32.h linux-2.6.32.10/arc
8507 long __must_check strncpy_from_user(char *dst, const char __user *src, 8629 long __must_check strncpy_from_user(char *dst, const char __user *src,
8508 long count); 8630 long count);
8509 long __must_check __strncpy_from_user(char *dst, 8631 long __must_check __strncpy_from_user(char *dst,
8510diff -urNp linux-2.6.32.10/arch/x86/include/asm/uaccess_64.h linux-2.6.32.10/arch/x86/include/asm/uaccess_64.h 8632diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess_64.h linux-2.6.32.11/arch/x86/include/asm/uaccess_64.h
8511--- linux-2.6.32.10/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 8633--- linux-2.6.32.11/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
8512+++ linux-2.6.32.10/arch/x86/include/asm/uaccess_64.h 2010-03-20 15:58:46.930703824 -0400 8634+++ linux-2.6.32.11/arch/x86/include/asm/uaccess_64.h 2010-04-04 20:58:33.220592413 -0400
8513@@ -10,6 +10,8 @@ 8635@@ -9,6 +9,9 @@
8636 #include <linux/prefetch.h>
8514 #include <linux/lockdep.h> 8637 #include <linux/lockdep.h>
8515 #include <asm/page.h> 8638 #include <asm/page.h>
8516 8639+#include <asm/pgtable.h>
8517+#define set_fs(x) (current_thread_info()->addr_limit = (x))
8518+ 8640+
8641+#define set_fs(x) (current_thread_info()->addr_limit = (x))
8642
8519 /* 8643 /*
8520 * Copy To/From Userspace 8644 * Copy To/From Userspace
8521 */ 8645@@ -19,20 +22,24 @@ __must_check unsigned long
8522@@ -19,20 +21,22 @@ __must_check unsigned long
8523 copy_user_generic(void *to, const void *from, unsigned len); 8646 copy_user_generic(void *to, const void *from, unsigned len);
8524 8647
8525 __must_check unsigned long 8648 __must_check unsigned long
@@ -8544,12 +8667,21 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/uaccess_64.h linux-2.6.32.10/arc
8544+ 8667+
8545+ if (!__builtin_constant_p(size)) { 8668+ if (!__builtin_constant_p(size)) {
8546+ check_object_size(dst, size, false); 8669+ check_object_size(dst, size, false);
8670+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
8671+ src += PAX_USER_SHADOW_BASE;
8547 return copy_user_generic(dst, (__force void *)src, size); 8672 return copy_user_generic(dst, (__force void *)src, size);
8548+ } 8673+ }
8549 switch (size) { 8674 switch (size) {
8550 case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src, 8675 case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
8551 ret, "b", "b", "=q", 1); 8676 ret, "b", "b", "=q", 1);
8552@@ -70,13 +74,19 @@ int __copy_from_user(void *dst, const vo 8677@@ -65,18 +72,28 @@ int __copy_from_user(void *dst, const vo
8678 ret, "q", "", "=r", 8);
8679 return ret;
8680 default:
8681+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
8682+ src += PAX_USER_SHADOW_BASE;
8683 return copy_user_generic(dst, (__force void *)src, size);
8684 }
8553 } 8685 }
8554 8686
8555 static __always_inline __must_check 8687 static __always_inline __must_check
@@ -8567,19 +8699,27 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/uaccess_64.h linux-2.6.32.10/arc
8567+ 8699+
8568+ if (!__builtin_constant_p(size)) { 8700+ if (!__builtin_constant_p(size)) {
8569+ check_object_size(src, size, true); 8701+ check_object_size(src, size, true);
8702+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
8703+ dst += PAX_USER_SHADOW_BASE;
8570 return copy_user_generic((__force void *)dst, src, size); 8704 return copy_user_generic((__force void *)dst, src, size);
8571+ } 8705+ }
8572 switch (size) { 8706 switch (size) {
8573 case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst, 8707 case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
8574 ret, "b", "b", "iq", 1); 8708 ret, "b", "b", "iq", 1);
8575@@ -114,11 +124,39 @@ int __copy_to_user(void __user *dst, con 8709@@ -109,19 +126,54 @@ int __copy_to_user(void __user *dst, con
8710 ret, "q", "", "er", 8);
8711 return ret;
8712 default:
8713+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
8714+ dst += PAX_USER_SHADOW_BASE;
8715 return copy_user_generic((__force void *)dst, src, size);
8716 }
8576 } 8717 }
8577 8718
8578 static __always_inline __must_check 8719 static __always_inline __must_check
8579-int __copy_in_user(void __user *dst, const void __user *src, unsigned size) 8720-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
8580+unsigned long copy_to_user(void __user *to, const void *from, unsigned len) 8721+unsigned long copy_to_user(void __user *to, const void *from, unsigned len)
8581 { 8722+{
8582- int ret = 0;
8583+ if (access_ok(VERIFY_WRITE, to, len)) 8723+ if (access_ok(VERIFY_WRITE, to, len))
8584+ len = __copy_to_user(to, from, len); 8724+ len = __copy_to_user(to, from, len);
8585+ return len; 8725+ return len;
@@ -8603,18 +8743,39 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/uaccess_64.h linux-2.6.32.10/arc
8603+ 8743+
8604+static __always_inline __must_check 8744+static __always_inline __must_check
8605+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size) 8745+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
8606+{ 8746 {
8747- int ret = 0;
8607+ unsigned ret = 0; 8748+ unsigned ret = 0;
8608 8749
8609 might_fault(); 8750 might_fault();
8751- if (!__builtin_constant_p(size))
8610+ 8752+
8611+ if ((int)size < 0) 8753+ if ((int)size < 0)
8612+ return size; 8754+ return size;
8613+ 8755+
8614 if (!__builtin_constant_p(size)) 8756+ if (!__builtin_constant_p(size)) {
8757+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
8758+ src += PAX_USER_SHADOW_BASE;
8759+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
8760+ dst += PAX_USER_SHADOW_BASE;
8615 return copy_user_generic((__force void *)dst, 8761 return copy_user_generic((__force void *)dst,
8616 (__force void *)src, size); 8762 (__force void *)src, size);
8617@@ -179,30 +217,38 @@ __must_check unsigned long __clear_user( 8763+ }
8764 switch (size) {
8765 case 1: {
8766 u8 tmp;
8767@@ -161,6 +213,10 @@ int __copy_in_user(void __user *dst, con
8768 return ret;
8769 }
8770 default:
8771+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
8772+ src += PAX_USER_SHADOW_BASE;
8773+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
8774+ dst += PAX_USER_SHADOW_BASE;
8775 return copy_user_generic((__force void *)dst,
8776 (__force void *)src, size);
8777 }
8778@@ -179,30 +235,40 @@ __must_check unsigned long __clear_user(
8618 __must_check long __copy_from_user_inatomic(void *dst, const void __user *src, 8779 __must_check long __copy_from_user_inatomic(void *dst, const void __user *src,
8619 unsigned size); 8780 unsigned size);
8620 8781
@@ -8625,6 +8786,8 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/uaccess_64.h linux-2.6.32.10/arc
8625+ if ((int)size < 0) 8786+ if ((int)size < 0)
8626+ return size; 8787+ return size;
8627+ 8788+
8789+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
8790+ dst += PAX_USER_SHADOW_BASE;
8628 return copy_user_generic((__force void *)dst, src, size); 8791 return copy_user_generic((__force void *)dst, src, size);
8629 } 8792 }
8630 8793
@@ -8660,9 +8823,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/uaccess_64.h linux-2.6.32.10/arc
8660 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); 8823 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
8661 8824
8662 #endif /* _ASM_X86_UACCESS_64_H */ 8825 #endif /* _ASM_X86_UACCESS_64_H */
8663diff -urNp linux-2.6.32.10/arch/x86/include/asm/uaccess.h linux-2.6.32.10/arch/x86/include/asm/uaccess.h 8826diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x86/include/asm/uaccess.h
8664--- linux-2.6.32.10/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 8827--- linux-2.6.32.11/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
8665+++ linux-2.6.32.10/arch/x86/include/asm/uaccess.h 2010-03-20 15:58:46.930703824 -0400 8828+++ linux-2.6.32.11/arch/x86/include/asm/uaccess.h 2010-04-04 20:58:33.220592413 -0400
8666@@ -8,8 +8,11 @@ 8829@@ -8,8 +8,11 @@
8667 #include <linux/thread_info.h> 8830 #include <linux/thread_info.h>
8668 #include <linux/prefetch.h> 8831 #include <linux/prefetch.h>
@@ -8808,7 +8971,7 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/uaccess.h linux-2.6.32.10/arch/x
8808 8971
8809 #define __put_user_nocheck(x, ptr, size) \ 8972 #define __put_user_nocheck(x, ptr, size) \
8810 ({ \ 8973 ({ \
8811@@ -424,7 +473,7 @@ do { \ 8974@@ -424,13 +473,24 @@ do { \
8812 int __gu_err; \ 8975 int __gu_err; \
8813 unsigned long __gu_val; \ 8976 unsigned long __gu_val; \
8814 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ 8977 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
@@ -8817,7 +8980,25 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/uaccess.h linux-2.6.32.10/arch/x
8817 __gu_err; \ 8980 __gu_err; \
8818 }) 8981 })
8819 8982
8820@@ -438,21 +487,26 @@ struct __large_struct { unsigned long bu 8983 /* FIXME: this hack is definitely wrong -AK */
8984 struct __large_struct { unsigned long buf[100]; };
8985-#define __m(x) (*(struct __large_struct __user *)(x))
8986+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
8987+#define ____m(x) \
8988+({ \
8989+ unsigned long ____x = (unsigned long)(x); \
8990+ if (____x < PAX_USER_SHADOW_BASE) \
8991+ ____x += PAX_USER_SHADOW_BASE; \
8992+ (void __user *)____x; \
8993+})
8994+#else
8995+#define ____m(x) (x)
8996+#endif
8997+#define __m(x) (*(struct __large_struct __user *)____m(x))
8998
8999 /*
9000 * Tell gcc we read from memory instead of writing: this is because
9001@@ -438,21 +498,26 @@ struct __large_struct { unsigned long bu
8821 * aliasing issues. 9002 * aliasing issues.
8822 */ 9003 */
8823 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \ 9004 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
@@ -8848,7 +9029,7 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/uaccess.h linux-2.6.32.10/arch/x
8848 9029
8849 /* 9030 /*
8850 * uaccess_try and catch 9031 * uaccess_try and catch
8851@@ -530,7 +584,7 @@ struct __large_struct { unsigned long bu 9032@@ -530,7 +595,7 @@ struct __large_struct { unsigned long bu
8852 #define get_user_ex(x, ptr) do { \ 9033 #define get_user_ex(x, ptr) do { \
8853 unsigned long __gue_val; \ 9034 unsigned long __gue_val; \
8854 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \ 9035 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
@@ -8857,7 +9038,7 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/uaccess.h linux-2.6.32.10/arch/x
8857 } while (0) 9038 } while (0)
8858 9039
8859 #ifdef CONFIG_X86_WP_WORKS_OK 9040 #ifdef CONFIG_X86_WP_WORKS_OK
8860@@ -567,6 +621,7 @@ extern struct movsl_mask { 9041@@ -567,6 +632,7 @@ extern struct movsl_mask {
8861 9042
8862 #define ARCH_HAS_NOCACHE_UACCESS 1 9043 #define ARCH_HAS_NOCACHE_UACCESS 1
8863 9044
@@ -8865,9 +9046,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/uaccess.h linux-2.6.32.10/arch/x
8865 #ifdef CONFIG_X86_32 9046 #ifdef CONFIG_X86_32
8866 # include "uaccess_32.h" 9047 # include "uaccess_32.h"
8867 #else 9048 #else
8868diff -urNp linux-2.6.32.10/arch/x86/include/asm/vgtod.h linux-2.6.32.10/arch/x86/include/asm/vgtod.h 9049diff -urNp linux-2.6.32.11/arch/x86/include/asm/vgtod.h linux-2.6.32.11/arch/x86/include/asm/vgtod.h
8869--- linux-2.6.32.10/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400 9050--- linux-2.6.32.11/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400
8870+++ linux-2.6.32.10/arch/x86/include/asm/vgtod.h 2010-03-20 15:58:46.930703824 -0400 9051+++ linux-2.6.32.11/arch/x86/include/asm/vgtod.h 2010-04-04 20:46:41.509696869 -0400
8871@@ -14,6 +14,7 @@ struct vsyscall_gtod_data { 9052@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
8872 int sysctl_enabled; 9053 int sysctl_enabled;
8873 struct timezone sys_tz; 9054 struct timezone sys_tz;
@@ -8876,9 +9057,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/vgtod.h linux-2.6.32.10/arch/x86
8876 cycle_t (*vread)(void); 9057 cycle_t (*vread)(void);
8877 cycle_t cycle_last; 9058 cycle_t cycle_last;
8878 cycle_t mask; 9059 cycle_t mask;
8879diff -urNp linux-2.6.32.10/arch/x86/include/asm/vmi.h linux-2.6.32.10/arch/x86/include/asm/vmi.h 9060diff -urNp linux-2.6.32.11/arch/x86/include/asm/vmi.h linux-2.6.32.11/arch/x86/include/asm/vmi.h
8880--- linux-2.6.32.10/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400 9061--- linux-2.6.32.11/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400
8881+++ linux-2.6.32.10/arch/x86/include/asm/vmi.h 2010-03-20 15:58:46.930703824 -0400 9062+++ linux-2.6.32.11/arch/x86/include/asm/vmi.h 2010-04-04 20:46:41.509696869 -0400
8882@@ -191,6 +191,7 @@ struct vrom_header { 9063@@ -191,6 +191,7 @@ struct vrom_header {
8883 u8 reserved[96]; /* Reserved for headers */ 9064 u8 reserved[96]; /* Reserved for headers */
8884 char vmi_init[8]; /* VMI_Init jump point */ 9065 char vmi_init[8]; /* VMI_Init jump point */
@@ -8887,9 +9068,9 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/vmi.h linux-2.6.32.10/arch/x86/i
8887 } __attribute__((packed)); 9068 } __attribute__((packed));
8888 9069
8889 struct pnp_header { 9070 struct pnp_header {
8890diff -urNp linux-2.6.32.10/arch/x86/include/asm/vsyscall.h linux-2.6.32.10/arch/x86/include/asm/vsyscall.h 9071diff -urNp linux-2.6.32.11/arch/x86/include/asm/vsyscall.h linux-2.6.32.11/arch/x86/include/asm/vsyscall.h
8891--- linux-2.6.32.10/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400 9072--- linux-2.6.32.11/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400
8892+++ linux-2.6.32.10/arch/x86/include/asm/vsyscall.h 2010-03-20 15:58:46.930703824 -0400 9073+++ linux-2.6.32.11/arch/x86/include/asm/vsyscall.h 2010-04-04 20:46:41.509696869 -0400
8893@@ -15,9 +15,10 @@ enum vsyscall_num { 9074@@ -15,9 +15,10 @@ enum vsyscall_num {
8894 9075
8895 #ifdef __KERNEL__ 9076 #ifdef __KERNEL__
@@ -8920,9 +9101,37 @@ diff -urNp linux-2.6.32.10/arch/x86/include/asm/vsyscall.h linux-2.6.32.10/arch/
8920 #endif /* __KERNEL__ */ 9101 #endif /* __KERNEL__ */
8921 9102
8922 #endif /* _ASM_X86_VSYSCALL_H */ 9103 #endif /* _ASM_X86_VSYSCALL_H */
8923diff -urNp linux-2.6.32.10/arch/x86/Kconfig linux-2.6.32.10/arch/x86/Kconfig 9104diff -urNp linux-2.6.32.11/arch/x86/include/asm/xsave.h linux-2.6.32.11/arch/x86/include/asm/xsave.h
8924--- linux-2.6.32.10/arch/x86/Kconfig 2010-03-15 11:52:04.000000000 -0400 9105--- linux-2.6.32.11/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400
8925+++ linux-2.6.32.10/arch/x86/Kconfig 2010-03-20 15:58:46.930703824 -0400 9106+++ linux-2.6.32.11/arch/x86/include/asm/xsave.h 2010-04-04 20:58:33.225084964 -0400
9107@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
9108 static inline int xsave_user(struct xsave_struct __user *buf)
9109 {
9110 int err;
9111+
9112+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
9113+ if ((unsigned long)buf < PAX_USER_SHADOW_BASE)
9114+ buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE);
9115+#endif
9116+
9117 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
9118 "2:\n"
9119 ".section .fixup,\"ax\"\n"
9120@@ -82,6 +88,11 @@ static inline int xrestore_user(struct x
9121 u32 lmask = mask;
9122 u32 hmask = mask >> 32;
9123
9124+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
9125+ if ((unsigned long)xstate < PAX_USER_SHADOW_BASE)
9126+ xstate = (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_BASE);
9127+#endif
9128+
9129 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
9130 "2:\n"
9131 ".section .fixup,\"ax\"\n"
9132diff -urNp linux-2.6.32.11/arch/x86/Kconfig linux-2.6.32.11/arch/x86/Kconfig
9133--- linux-2.6.32.11/arch/x86/Kconfig 2010-03-15 11:52:04.000000000 -0400
9134+++ linux-2.6.32.11/arch/x86/Kconfig 2010-04-04 20:46:41.509696869 -0400
8926@@ -1083,7 +1083,7 @@ config PAGE_OFFSET 9135@@ -1083,7 +1083,7 @@ config PAGE_OFFSET
8927 hex 9136 hex
8928 default 0xB0000000 if VMSPLIT_3G_OPT 9137 default 0xB0000000 if VMSPLIT_3G_OPT
@@ -8969,9 +9178,9 @@ diff -urNp linux-2.6.32.10/arch/x86/Kconfig linux-2.6.32.10/arch/x86/Kconfig
8969 ---help--- 9178 ---help---
8970 Map the 32-bit VDSO to the predictable old-style address too. 9179 Map the 32-bit VDSO to the predictable old-style address too.
8971 ---help--- 9180 ---help---
8972diff -urNp linux-2.6.32.10/arch/x86/Kconfig.cpu linux-2.6.32.10/arch/x86/Kconfig.cpu 9181diff -urNp linux-2.6.32.11/arch/x86/Kconfig.cpu linux-2.6.32.11/arch/x86/Kconfig.cpu
8973--- linux-2.6.32.10/arch/x86/Kconfig.cpu 2010-03-15 11:52:04.000000000 -0400 9182--- linux-2.6.32.11/arch/x86/Kconfig.cpu 2010-03-15 11:52:04.000000000 -0400
8974+++ linux-2.6.32.10/arch/x86/Kconfig.cpu 2010-03-20 15:58:46.930703824 -0400 9183+++ linux-2.6.32.11/arch/x86/Kconfig.cpu 2010-04-04 20:46:41.509696869 -0400
8975@@ -340,7 +340,7 @@ config X86_PPRO_FENCE 9184@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
8976 9185
8977 config X86_F00F_BUG 9186 config X86_F00F_BUG
@@ -8999,9 +9208,9 @@ diff -urNp linux-2.6.32.10/arch/x86/Kconfig.cpu linux-2.6.32.10/arch/x86/Kconfig
8999 9208
9000 config X86_MINIMUM_CPU_FAMILY 9209 config X86_MINIMUM_CPU_FAMILY
9001 int 9210 int
9002diff -urNp linux-2.6.32.10/arch/x86/Kconfig.debug linux-2.6.32.10/arch/x86/Kconfig.debug 9211diff -urNp linux-2.6.32.11/arch/x86/Kconfig.debug linux-2.6.32.11/arch/x86/Kconfig.debug
9003--- linux-2.6.32.10/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 9212--- linux-2.6.32.11/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400
9004+++ linux-2.6.32.10/arch/x86/Kconfig.debug 2010-03-20 15:58:46.930703824 -0400 9213+++ linux-2.6.32.11/arch/x86/Kconfig.debug 2010-04-04 20:46:41.509696869 -0400
9005@@ -99,7 +99,7 @@ config X86_PTDUMP 9214@@ -99,7 +99,7 @@ config X86_PTDUMP
9006 config DEBUG_RODATA 9215 config DEBUG_RODATA
9007 bool "Write protect kernel read-only data structures" 9216 bool "Write protect kernel read-only data structures"
@@ -9011,10 +9220,10 @@ diff -urNp linux-2.6.32.10/arch/x86/Kconfig.debug linux-2.6.32.10/arch/x86/Kconf
9011 ---help--- 9220 ---help---
9012 Mark the kernel read-only data as write-protected in the pagetables, 9221 Mark the kernel read-only data as write-protected in the pagetables,
9013 in order to catch accidental (and incorrect) writes to such const 9222 in order to catch accidental (and incorrect) writes to such const
9014diff -urNp linux-2.6.32.10/arch/x86/kernel/acpi/boot.c linux-2.6.32.10/arch/x86/kernel/acpi/boot.c 9223diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/boot.c linux-2.6.32.11/arch/x86/kernel/acpi/boot.c
9015--- linux-2.6.32.10/arch/x86/kernel/acpi/boot.c 2010-03-15 11:52:04.000000000 -0400 9224--- linux-2.6.32.11/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400
9016+++ linux-2.6.32.10/arch/x86/kernel/acpi/boot.c 2010-03-20 15:58:46.930703824 -0400 9225+++ linux-2.6.32.11/arch/x86/kernel/acpi/boot.c 2010-04-04 20:46:41.509696869 -0400
9017@@ -1507,7 +1507,7 @@ static struct dmi_system_id __initdata a 9226@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a
9018 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), 9227 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
9019 }, 9228 },
9020 }, 9229 },
@@ -9023,9 +9232,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/acpi/boot.c linux-2.6.32.10/arch/x86/
9023 }; 9232 };
9024 9233
9025 /* 9234 /*
9026diff -urNp linux-2.6.32.10/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.10/arch/x86/kernel/acpi/realmode/wakeup.S 9235diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S
9027--- linux-2.6.32.10/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400 9236--- linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400
9028+++ linux-2.6.32.10/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-20 15:58:46.930703824 -0400 9237+++ linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S 2010-04-04 20:46:41.509696869 -0400
9029@@ -104,7 +104,7 @@ _start: 9238@@ -104,7 +104,7 @@ _start:
9030 movl %eax, %ecx 9239 movl %eax, %ecx
9031 orl %edx, %ecx 9240 orl %edx, %ecx
@@ -9035,9 +9244,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.1
9035 wrmsr 9244 wrmsr
9036 1: 9245 1:
9037 9246
9038diff -urNp linux-2.6.32.10/arch/x86/kernel/acpi/sleep.c linux-2.6.32.10/arch/x86/kernel/acpi/sleep.c 9247diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c
9039--- linux-2.6.32.10/arch/x86/kernel/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400 9248--- linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400
9040+++ linux-2.6.32.10/arch/x86/kernel/acpi/sleep.c 2010-03-20 15:58:46.930703824 -0400 9249+++ linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c 2010-04-04 20:46:41.509696869 -0400
9041@@ -11,11 +11,12 @@ 9250@@ -11,11 +11,12 @@
9042 #include <linux/cpumask.h> 9251 #include <linux/cpumask.h>
9043 #include <asm/segment.h> 9252 #include <asm/segment.h>
@@ -9082,9 +9291,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/acpi/sleep.c linux-2.6.32.10/arch/x86
9082 } 9291 }
9083 9292
9084 9293
9085diff -urNp linux-2.6.32.10/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.10/arch/x86/kernel/acpi/wakeup_32.S 9294diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S
9086--- linux-2.6.32.10/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400 9295--- linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400
9087+++ linux-2.6.32.10/arch/x86/kernel/acpi/wakeup_32.S 2010-03-20 15:58:46.930703824 -0400 9296+++ linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S 2010-04-04 20:46:41.509696869 -0400
9088@@ -30,13 +30,11 @@ wakeup_pmode_return: 9297@@ -30,13 +30,11 @@ wakeup_pmode_return:
9089 # and restore the stack ... but you need gdt for this to work 9298 # and restore the stack ... but you need gdt for this to work
9090 movl saved_context_esp, %esp 9299 movl saved_context_esp, %esp
@@ -9101,9 +9310,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.10/arch
9101 9310
9102 bogus_magic: 9311 bogus_magic:
9103 jmp bogus_magic 9312 jmp bogus_magic
9104diff -urNp linux-2.6.32.10/arch/x86/kernel/alternative.c linux-2.6.32.10/arch/x86/kernel/alternative.c 9313diff -urNp linux-2.6.32.11/arch/x86/kernel/alternative.c linux-2.6.32.11/arch/x86/kernel/alternative.c
9105--- linux-2.6.32.10/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400 9314--- linux-2.6.32.11/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400
9106+++ linux-2.6.32.10/arch/x86/kernel/alternative.c 2010-03-20 15:58:46.933535080 -0400 9315+++ linux-2.6.32.11/arch/x86/kernel/alternative.c 2010-04-04 20:46:41.509696869 -0400
9107@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str 9316@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
9108 9317
9109 BUG_ON(p->len > MAX_PATCH_LEN); 9318 BUG_ON(p->len > MAX_PATCH_LEN);
@@ -9176,9 +9385,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/alternative.c linux-2.6.32.10/arch/x8
9176+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); 9385+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]);
9177 return addr; 9386 return addr;
9178 } 9387 }
9179diff -urNp linux-2.6.32.10/arch/x86/kernel/amd_iommu.c linux-2.6.32.10/arch/x86/kernel/amd_iommu.c 9388diff -urNp linux-2.6.32.11/arch/x86/kernel/amd_iommu.c linux-2.6.32.11/arch/x86/kernel/amd_iommu.c
9180--- linux-2.6.32.10/arch/x86/kernel/amd_iommu.c 2010-03-15 11:52:04.000000000 -0400 9389--- linux-2.6.32.11/arch/x86/kernel/amd_iommu.c 2010-03-15 11:52:04.000000000 -0400
9181+++ linux-2.6.32.10/arch/x86/kernel/amd_iommu.c 2010-03-20 15:58:46.933535080 -0400 9390+++ linux-2.6.32.11/arch/x86/kernel/amd_iommu.c 2010-04-04 20:46:41.509696869 -0400
9182@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( 9391@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains(
9183 } 9392 }
9184 } 9393 }
@@ -9188,9 +9397,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/amd_iommu.c linux-2.6.32.10/arch/x86/
9188 .alloc_coherent = alloc_coherent, 9397 .alloc_coherent = alloc_coherent,
9189 .free_coherent = free_coherent, 9398 .free_coherent = free_coherent,
9190 .map_page = map_page, 9399 .map_page = map_page,
9191diff -urNp linux-2.6.32.10/arch/x86/kernel/apic/io_apic.c linux-2.6.32.10/arch/x86/kernel/apic/io_apic.c 9400diff -urNp linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c
9192--- linux-2.6.32.10/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400 9401--- linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400
9193+++ linux-2.6.32.10/arch/x86/kernel/apic/io_apic.c 2010-03-20 15:58:46.933535080 -0400 9402+++ linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c 2010-04-04 20:46:41.509696869 -0400
9194@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi 9403@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi
9195 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, 9404 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
9196 GFP_ATOMIC); 9405 GFP_ATOMIC);
@@ -9227,9 +9436,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/apic/io_apic.c linux-2.6.32.10/arch/x
9227 { 9436 {
9228 spin_unlock(&vector_lock); 9437 spin_unlock(&vector_lock);
9229 } 9438 }
9230diff -urNp linux-2.6.32.10/arch/x86/kernel/apm_32.c linux-2.6.32.10/arch/x86/kernel/apm_32.c 9439diff -urNp linux-2.6.32.11/arch/x86/kernel/apm_32.c linux-2.6.32.11/arch/x86/kernel/apm_32.c
9231--- linux-2.6.32.10/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400 9440--- linux-2.6.32.11/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400
9232+++ linux-2.6.32.10/arch/x86/kernel/apm_32.c 2010-03-20 15:58:46.933535080 -0400 9441+++ linux-2.6.32.11/arch/x86/kernel/apm_32.c 2010-04-04 20:46:41.513555986 -0400
9233@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); 9442@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
9234 * This is for buggy BIOS's that refer to (real mode) segment 0x40 9443 * This is for buggy BIOS's that refer to (real mode) segment 0x40
9235 * even though they are called in protected mode. 9444 * even though they are called in protected mode.
@@ -9331,9 +9540,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/apm_32.c linux-2.6.32.10/arch/x86/ker
9331 9540
9332 proc_create("apm", 0, NULL, &apm_file_ops); 9541 proc_create("apm", 0, NULL, &apm_file_ops);
9333 9542
9334diff -urNp linux-2.6.32.10/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.10/arch/x86/kernel/asm-offsets_32.c 9543diff -urNp linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c
9335--- linux-2.6.32.10/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400 9544--- linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400
9336+++ linux-2.6.32.10/arch/x86/kernel/asm-offsets_32.c 2010-03-20 15:58:46.933535080 -0400 9545+++ linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c 2010-04-04 20:46:41.513555986 -0400
9337@@ -115,6 +115,11 @@ void foo(void) 9546@@ -115,6 +115,11 @@ void foo(void)
9338 OFFSET(PV_CPU_iret, pv_cpu_ops, iret); 9547 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
9339 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 9548 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
@@ -9346,10 +9555,10 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.10/arch
9346 #endif 9555 #endif
9347 9556
9348 #ifdef CONFIG_XEN 9557 #ifdef CONFIG_XEN
9349diff -urNp linux-2.6.32.10/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.10/arch/x86/kernel/asm-offsets_64.c 9558diff -urNp linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c
9350--- linux-2.6.32.10/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400 9559--- linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400
9351+++ linux-2.6.32.10/arch/x86/kernel/asm-offsets_64.c 2010-03-20 15:58:46.933535080 -0400 9560+++ linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c 2010-04-04 20:58:33.220592413 -0400
9352@@ -63,6 +63,12 @@ int main(void) 9561@@ -63,6 +63,18 @@ int main(void)
9353 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 9562 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
9354 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); 9563 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
9355 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2); 9564 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
@@ -9359,10 +9568,16 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.10/arch
9359+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0); 9568+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
9360+#endif 9569+#endif
9361+ 9570+
9571+#ifdef CONFIG_PAX_MEMORY_UDEREF
9572+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
9573+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
9574+ OFFSET(PV_MMU_set_pgd, pv_mmu_ops, set_pgd);
9575+#endif
9576+
9362 #endif 9577 #endif
9363 9578
9364 9579
9365@@ -115,6 +121,7 @@ int main(void) 9580@@ -115,6 +127,7 @@ int main(void)
9366 ENTRY(cr8); 9581 ENTRY(cr8);
9367 BLANK(); 9582 BLANK();
9368 #undef ENTRY 9583 #undef ENTRY
@@ -9370,9 +9585,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.10/arch
9370 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); 9585 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
9371 BLANK(); 9586 BLANK();
9372 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); 9587 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
9373diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/common.c linux-2.6.32.10/arch/x86/kernel/cpu/common.c 9588diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/common.c linux-2.6.32.11/arch/x86/kernel/cpu/common.c
9374--- linux-2.6.32.10/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400 9589--- linux-2.6.32.11/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400
9375+++ linux-2.6.32.10/arch/x86/kernel/cpu/common.c 2010-03-20 15:58:46.933535080 -0400 9590+++ linux-2.6.32.11/arch/x86/kernel/cpu/common.c 2010-04-04 20:47:28.952733264 -0400
9376@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon 9591@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
9377 9592
9378 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; 9593 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -9463,6 +9678,15 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/common.c linux-2.6.32.10/arch/x86
9463 orig_ist = &per_cpu(orig_ist, cpu); 9678 orig_ist = &per_cpu(orig_ist, cpu);
9464 9679
9465 #ifdef CONFIG_NUMA 9680 #ifdef CONFIG_NUMA
9681@@ -1127,7 +1077,7 @@ void __cpuinit cpu_init(void)
9682 switch_to_new_gdt(cpu);
9683 loadsegment(fs, 0);
9684
9685- load_idt((const struct desc_ptr *)&idt_descr);
9686+ load_idt(&idt_descr);
9687
9688 memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
9689 syscall_init();
9466@@ -1199,7 +1149,7 @@ void __cpuinit cpu_init(void) 9690@@ -1199,7 +1149,7 @@ void __cpuinit cpu_init(void)
9467 { 9691 {
9468 int cpu = smp_processor_id(); 9692 int cpu = smp_processor_id();
@@ -9472,9 +9696,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/common.c linux-2.6.32.10/arch/x86
9472 struct thread_struct *thread = &curr->thread; 9696 struct thread_struct *thread = &curr->thread;
9473 9697
9474 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { 9698 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
9475diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.10/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 9699diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
9476--- linux-2.6.32.10/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400 9700--- linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400
9477+++ linux-2.6.32.10/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-20 15:58:46.933535080 -0400 9701+++ linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-04-04 20:46:41.513555986 -0400
9478@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any 9702@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
9479 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), 9703 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
9480 }, 9704 },
@@ -9484,9 +9708,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.
9484 }; 9708 };
9485 9709
9486 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) 9710 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
9487diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.10/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 9711diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
9488--- linux-2.6.32.10/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400 9712--- linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400
9489+++ linux-2.6.32.10/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-20 15:58:46.933535080 -0400 9713+++ linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-04-04 20:46:41.513555986 -0400
9490@@ -225,7 +225,7 @@ static struct cpu_model models[] = 9714@@ -225,7 +225,7 @@ static struct cpu_model models[] =
9491 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, 9715 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
9492 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, 9716 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
@@ -9496,10 +9720,10 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu
9496 }; 9720 };
9497 #undef _BANIAS 9721 #undef _BANIAS
9498 #undef BANIAS 9722 #undef BANIAS
9499diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/intel.c linux-2.6.32.10/arch/x86/kernel/cpu/intel.c 9723diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/intel.c linux-2.6.32.11/arch/x86/kernel/cpu/intel.c
9500--- linux-2.6.32.10/arch/x86/kernel/cpu/intel.c 2010-03-15 11:52:04.000000000 -0400 9724--- linux-2.6.32.11/arch/x86/kernel/cpu/intel.c 2010-04-04 20:41:49.916475305 -0400
9501+++ linux-2.6.32.10/arch/x86/kernel/cpu/intel.c 2010-03-20 15:58:46.933535080 -0400 9725+++ linux-2.6.32.11/arch/x86/kernel/cpu/intel.c 2010-04-04 20:46:41.513555986 -0400
9502@@ -139,7 +139,7 @@ static void __cpuinit trap_init_f00f_bug 9726@@ -140,7 +140,7 @@ static void __cpuinit trap_init_f00f_bug
9503 * Update the IDT descriptor and reload the IDT so that 9727 * Update the IDT descriptor and reload the IDT so that
9504 * it uses the read-only mapped virtual address. 9728 * it uses the read-only mapped virtual address.
9505 */ 9729 */
@@ -9508,9 +9732,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/intel.c linux-2.6.32.10/arch/x86/
9508 load_idt(&idt_descr); 9732 load_idt(&idt_descr);
9509 } 9733 }
9510 #endif 9734 #endif
9511diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.10/arch/x86/kernel/cpu/intel_cacheinfo.c 9735diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c
9512--- linux-2.6.32.10/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-03-15 11:52:04.000000000 -0400 9736--- linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-03-15 11:52:04.000000000 -0400
9513+++ linux-2.6.32.10/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-03-20 15:58:46.933535080 -0400 9737+++ linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-04-04 20:46:41.513555986 -0400
9514@@ -863,7 +863,7 @@ static ssize_t store(struct kobject *kob 9738@@ -863,7 +863,7 @@ static ssize_t store(struct kobject *kob
9515 return ret; 9739 return ret;
9516 } 9740 }
@@ -9520,9 +9744,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.10
9520 .show = show, 9744 .show = show,
9521 .store = store, 9745 .store = store,
9522 }; 9746 };
9523diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/Makefile linux-2.6.32.10/arch/x86/kernel/cpu/Makefile 9747diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/Makefile linux-2.6.32.11/arch/x86/kernel/cpu/Makefile
9524--- linux-2.6.32.10/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400 9748--- linux-2.6.32.11/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400
9525+++ linux-2.6.32.10/arch/x86/kernel/cpu/Makefile 2010-03-20 15:58:46.933535080 -0400 9749+++ linux-2.6.32.11/arch/x86/kernel/cpu/Makefile 2010-04-04 20:46:41.513555986 -0400
9526@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER 9750@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
9527 CFLAGS_REMOVE_common.o = -pg 9751 CFLAGS_REMOVE_common.o = -pg
9528 endif 9752 endif
@@ -9534,9 +9758,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/Makefile linux-2.6.32.10/arch/x86
9534 obj-y := intel_cacheinfo.o addon_cpuid_features.o 9758 obj-y := intel_cacheinfo.o addon_cpuid_features.o
9535 obj-y += proc.o capflags.o powerflags.o common.o 9759 obj-y += proc.o capflags.o powerflags.o common.o
9536 obj-y += vmware.o hypervisor.o sched.o 9760 obj-y += vmware.o hypervisor.o sched.o
9537diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.10/arch/x86/kernel/cpu/mcheck/mce_amd.c 9761diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c
9538--- linux-2.6.32.10/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400 9762--- linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400
9539+++ linux-2.6.32.10/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-20 15:58:46.933535080 -0400 9763+++ linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-04-04 20:46:41.513555986 -0400
9540@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob 9764@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob
9541 return ret; 9765 return ret;
9542 } 9766 }
@@ -9546,9 +9770,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.10/
9546 .show = show, 9770 .show = show,
9547 .store = store, 9771 .store = store,
9548 }; 9772 };
9549diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.10/arch/x86/kernel/cpu/mcheck/mce.c 9773diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c
9550--- linux-2.6.32.10/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400 9774--- linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400
9551+++ linux-2.6.32.10/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-20 15:58:46.933535080 -0400 9775+++ linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c 2010-04-04 20:46:41.513555986 -0400
9552@@ -187,7 +187,7 @@ static void print_mce(struct mce *m) 9776@@ -187,7 +187,7 @@ static void print_mce(struct mce *m)
9553 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", 9777 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
9554 m->cs, m->ip); 9778 m->cs, m->ip);
@@ -9601,9 +9825,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.10/arch
9601 }; 9825 };
9602 9826
9603 /* 9827 /*
9604diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/amd.c 9828diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c
9605--- linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400 9829--- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400
9606+++ linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-20 15:58:46.933535080 -0400 9830+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c 2010-04-04 20:46:41.513555986 -0400
9607@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base 9831@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
9608 return 0; 9832 return 0;
9609 } 9833 }
@@ -9613,9 +9837,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.10/arch/x
9613 .vendor = X86_VENDOR_AMD, 9837 .vendor = X86_VENDOR_AMD,
9614 .set = amd_set_mtrr, 9838 .set = amd_set_mtrr,
9615 .get = amd_get_mtrr, 9839 .get = amd_get_mtrr,
9616diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/centaur.c 9840diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c
9617--- linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400 9841--- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400
9618+++ linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-20 15:58:46.933535080 -0400 9842+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c 2010-04-04 20:46:41.513555986 -0400
9619@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long 9843@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
9620 return 0; 9844 return 0;
9621 } 9845 }
@@ -9625,9 +9849,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.10/ar
9625 .vendor = X86_VENDOR_CENTAUR, 9849 .vendor = X86_VENDOR_CENTAUR,
9626 .set = centaur_set_mcr, 9850 .set = centaur_set_mcr,
9627 .get = centaur_get_mcr, 9851 .get = centaur_get_mcr,
9628diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/cyrix.c 9852diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c
9629--- linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400 9853--- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400
9630+++ linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-20 15:58:46.937540924 -0400 9854+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-04-04 20:46:41.513555986 -0400
9631@@ -265,7 +265,7 @@ static void cyrix_set_all(void) 9855@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
9632 post_set(); 9856 post_set();
9633 } 9857 }
@@ -9637,9 +9861,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.10/arch
9637 .vendor = X86_VENDOR_CYRIX, 9861 .vendor = X86_VENDOR_CYRIX,
9638 .set_all = cyrix_set_all, 9862 .set_all = cyrix_set_all,
9639 .set = cyrix_set_arr, 9863 .set = cyrix_set_arr,
9640diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/generic.c 9864diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c
9641--- linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400 9865--- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400
9642+++ linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-20 15:58:46.937540924 -0400 9866+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c 2010-04-04 20:46:41.513555986 -0400
9643@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra 9867@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
9644 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ 9868 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
9645 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ 9869 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
@@ -9658,9 +9882,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.10/ar
9658 .use_intel_if = 1, 9882 .use_intel_if = 1,
9659 .set_all = generic_set_all, 9883 .set_all = generic_set_all,
9660 .get = generic_get_mtrr, 9884 .get = generic_get_mtrr,
9661diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/main.c 9885diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c
9662--- linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400 9886--- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400
9663+++ linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/main.c 2010-03-20 15:58:46.937540924 -0400 9887+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c 2010-04-04 20:46:41.513555986 -0400
9664@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); 9888@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
9665 u64 size_or_mask, size_and_mask; 9889 u64 size_or_mask, size_and_mask;
9666 static bool mtrr_aps_delayed_init; 9890 static bool mtrr_aps_delayed_init;
@@ -9679,9 +9903,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.10/arch/
9679 { 9903 {
9680 if (ops->vendor && ops->vendor < X86_VENDOR_NUM) 9904 if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
9681 mtrr_ops[ops->vendor] = ops; 9905 mtrr_ops[ops->vendor] = ops;
9682diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/mtrr.h 9906diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h
9683--- linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400 9907--- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400
9684+++ linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-20 15:58:46.937540924 -0400 9908+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-04-04 20:46:41.517551870 -0400
9685@@ -12,19 +12,19 @@ 9909@@ -12,19 +12,19 @@
9686 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; 9910 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
9687 9911
@@ -9732,9 +9956,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.10/arch/
9732 9956
9733 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) 9957 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
9734 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) 9958 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
9735diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.10/arch/x86/kernel/cpu/perfctr-watchdog.c 9959diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.11/arch/x86/kernel/cpu/perfctr-watchdog.c
9736--- linux-2.6.32.10/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400 9960--- linux-2.6.32.11/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400
9737+++ linux-2.6.32.10/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-20 15:58:46.937540924 -0400 9961+++ linux-2.6.32.11/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-04-04 20:46:41.517551870 -0400
9738@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { 9962@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
9739 9963
9740 /* Interface defining a CPU specific perfctr watchdog */ 9964 /* Interface defining a CPU specific perfctr watchdog */
@@ -9768,9 +9992,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.1
9768 static struct wd_ops intel_arch_wd_ops __read_mostly = { 9992 static struct wd_ops intel_arch_wd_ops __read_mostly = {
9769 .reserve = single_msr_reserve, 9993 .reserve = single_msr_reserve,
9770 .unreserve = single_msr_unreserve, 9994 .unreserve = single_msr_unreserve,
9771diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.10/arch/x86/kernel/cpu/perf_event.c 9995diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c
9772--- linux-2.6.32.10/arch/x86/kernel/cpu/perf_event.c 2010-03-15 11:52:04.000000000 -0400 9996--- linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c 2010-03-15 11:52:04.000000000 -0400
9773+++ linux-2.6.32.10/arch/x86/kernel/cpu/perf_event.c 2010-03-20 15:58:46.945539132 -0400 9997+++ linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c 2010-04-04 20:46:41.517551870 -0400
9774@@ -2252,7 +2252,7 @@ perf_callchain_user(struct pt_regs *regs 9998@@ -2252,7 +2252,7 @@ perf_callchain_user(struct pt_regs *regs
9775 break; 9999 break;
9776 10000
@@ -9780,9 +10004,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.10/arch
9780 } 10004 }
9781 } 10005 }
9782 10006
9783diff -urNp linux-2.6.32.10/arch/x86/kernel/crash.c linux-2.6.32.10/arch/x86/kernel/crash.c 10007diff -urNp linux-2.6.32.11/arch/x86/kernel/crash.c linux-2.6.32.11/arch/x86/kernel/crash.c
9784--- linux-2.6.32.10/arch/x86/kernel/crash.c 2010-03-15 11:52:04.000000000 -0400 10008--- linux-2.6.32.11/arch/x86/kernel/crash.c 2010-03-15 11:52:04.000000000 -0400
9785+++ linux-2.6.32.10/arch/x86/kernel/crash.c 2010-03-20 15:58:46.945539132 -0400 10009+++ linux-2.6.32.11/arch/x86/kernel/crash.c 2010-04-04 20:46:41.517551870 -0400
9786@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, 10010@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu,
9787 regs = args->regs; 10011 regs = args->regs;
9788 10012
@@ -9792,9 +10016,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/crash.c linux-2.6.32.10/arch/x86/kern
9792 crash_fixup_ss_esp(&fixed_regs, regs); 10016 crash_fixup_ss_esp(&fixed_regs, regs);
9793 regs = &fixed_regs; 10017 regs = &fixed_regs;
9794 } 10018 }
9795diff -urNp linux-2.6.32.10/arch/x86/kernel/doublefault_32.c linux-2.6.32.10/arch/x86/kernel/doublefault_32.c 10019diff -urNp linux-2.6.32.11/arch/x86/kernel/doublefault_32.c linux-2.6.32.11/arch/x86/kernel/doublefault_32.c
9796--- linux-2.6.32.10/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400 10020--- linux-2.6.32.11/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400
9797+++ linux-2.6.32.10/arch/x86/kernel/doublefault_32.c 2010-03-20 15:58:46.945539132 -0400 10021+++ linux-2.6.32.11/arch/x86/kernel/doublefault_32.c 2010-04-04 20:46:41.517551870 -0400
9798@@ -11,7 +11,7 @@ 10022@@ -11,7 +11,7 @@
9799 10023
9800 #define DOUBLEFAULT_STACKSIZE (1024) 10024 #define DOUBLEFAULT_STACKSIZE (1024)
@@ -9826,9 +10050,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/doublefault_32.c linux-2.6.32.10/arch
9826 .fs = __KERNEL_PERCPU, 10050 .fs = __KERNEL_PERCPU,
9827 10051
9828 .__cr3 = __pa_nodebug(swapper_pg_dir), 10052 .__cr3 = __pa_nodebug(swapper_pg_dir),
9829diff -urNp linux-2.6.32.10/arch/x86/kernel/dumpstack_32.c linux-2.6.32.10/arch/x86/kernel/dumpstack_32.c 10053diff -urNp linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c
9830--- linux-2.6.32.10/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400 10054--- linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400
9831+++ linux-2.6.32.10/arch/x86/kernel/dumpstack_32.c 2010-03-20 15:58:46.945539132 -0400 10055+++ linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c 2010-04-04 20:46:41.517551870 -0400
9832@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs 10056@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs
9833 * When in-kernel, we also print out the stack and code at the 10057 * When in-kernel, we also print out the stack and code at the
9834 * time of the fault.. 10058 * time of the fault..
@@ -9873,9 +10097,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/dumpstack_32.c linux-2.6.32.10/arch/x
9873 if (ip < PAGE_OFFSET) 10097 if (ip < PAGE_OFFSET)
9874 return 0; 10098 return 0;
9875 if (probe_kernel_address((unsigned short *)ip, ud2)) 10099 if (probe_kernel_address((unsigned short *)ip, ud2))
9876diff -urNp linux-2.6.32.10/arch/x86/kernel/dumpstack.c linux-2.6.32.10/arch/x86/kernel/dumpstack.c 10100diff -urNp linux-2.6.32.11/arch/x86/kernel/dumpstack.c linux-2.6.32.11/arch/x86/kernel/dumpstack.c
9877--- linux-2.6.32.10/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400 10101--- linux-2.6.32.11/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400
9878+++ linux-2.6.32.10/arch/x86/kernel/dumpstack.c 2010-03-20 15:58:46.945539132 -0400 10102+++ linux-2.6.32.11/arch/x86/kernel/dumpstack.c 2010-04-04 20:46:41.517551870 -0400
9879@@ -180,7 +180,7 @@ void dump_stack(void) 10103@@ -180,7 +180,7 @@ void dump_stack(void)
9880 #endif 10104 #endif
9881 10105
@@ -9903,9 +10127,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/dumpstack.c linux-2.6.32.10/arch/x86/
9903 report_bug(regs->ip, regs); 10127 report_bug(regs->ip, regs);
9904 10128
9905 if (__die(str, regs, err)) 10129 if (__die(str, regs, err))
9906diff -urNp linux-2.6.32.10/arch/x86/kernel/e820.c linux-2.6.32.10/arch/x86/kernel/e820.c 10130diff -urNp linux-2.6.32.11/arch/x86/kernel/e820.c linux-2.6.32.11/arch/x86/kernel/e820.c
9907--- linux-2.6.32.10/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400 10131--- linux-2.6.32.11/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400
9908+++ linux-2.6.32.10/arch/x86/kernel/e820.c 2010-03-20 15:58:46.945539132 -0400 10132+++ linux-2.6.32.11/arch/x86/kernel/e820.c 2010-04-04 20:46:41.517551870 -0400
9909@@ -733,7 +733,7 @@ struct early_res { 10133@@ -733,7 +733,7 @@ struct early_res {
9910 }; 10134 };
9911 static struct early_res early_res[MAX_EARLY_RES] __initdata = { 10135 static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -9915,9 +10139,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/e820.c linux-2.6.32.10/arch/x86/kerne
9915 }; 10139 };
9916 10140
9917 static int __init find_overlapped_early(u64 start, u64 end) 10141 static int __init find_overlapped_early(u64 start, u64 end)
9918diff -urNp linux-2.6.32.10/arch/x86/kernel/efi_32.c linux-2.6.32.10/arch/x86/kernel/efi_32.c 10142diff -urNp linux-2.6.32.11/arch/x86/kernel/efi_32.c linux-2.6.32.11/arch/x86/kernel/efi_32.c
9919--- linux-2.6.32.10/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400 10143--- linux-2.6.32.11/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400
9920+++ linux-2.6.32.10/arch/x86/kernel/efi_32.c 2010-03-20 15:58:46.945539132 -0400 10144+++ linux-2.6.32.11/arch/x86/kernel/efi_32.c 2010-04-04 20:46:41.517551870 -0400
9921@@ -38,70 +38,38 @@ 10145@@ -38,70 +38,38 @@
9922 */ 10146 */
9923 10147
@@ -9998,9 +10222,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/efi_32.c linux-2.6.32.10/arch/x86/ker
9998 10222
9999 /* 10223 /*
10000 * After the lock is released, the original page table is restored. 10224 * After the lock is released, the original page table is restored.
10001diff -urNp linux-2.6.32.10/arch/x86/kernel/efi_stub_32.S linux-2.6.32.10/arch/x86/kernel/efi_stub_32.S 10225diff -urNp linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S
10002--- linux-2.6.32.10/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400 10226--- linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400
10003+++ linux-2.6.32.10/arch/x86/kernel/efi_stub_32.S 2010-03-20 15:58:46.945539132 -0400 10227+++ linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S 2010-04-04 20:46:41.517551870 -0400
10004@@ -6,6 +6,7 @@ 10228@@ -6,6 +6,7 @@
10005 */ 10229 */
10006 10230
@@ -10099,19 +10323,79 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/efi_stub_32.S linux-2.6.32.10/arch/x8
10099 saved_return_addr: 10323 saved_return_addr:
10100 .long 0 10324 .long 0
10101 efi_rt_function_ptr: 10325 efi_rt_function_ptr:
10102diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/kernel/entry_32.S 10326diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_32.S linux-2.6.32.11/arch/x86/kernel/entry_32.S
10103--- linux-2.6.32.10/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400 10327--- linux-2.6.32.11/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400
10104+++ linux-2.6.32.10/arch/x86/kernel/entry_32.S 2010-03-20 15:58:46.945539132 -0400 10328+++ linux-2.6.32.11/arch/x86/kernel/entry_32.S 2010-04-04 20:47:28.952733264 -0400
10105@@ -191,7 +191,7 @@ 10329@@ -191,7 +191,67 @@
10106 10330
10107 #endif /* CONFIG_X86_32_LAZY_GS */ 10331 #endif /* CONFIG_X86_32_LAZY_GS */
10108 10332
10109-.macro SAVE_ALL 10333-.macro SAVE_ALL
10334+.macro PAX_EXIT_KERNEL
10335+#ifdef CONFIG_PAX_KERNEXEC
10336+#ifdef CONFIG_PARAVIRT
10337+ push %eax; push %ecx;
10338+#endif
10339+ mov %cs, %esi
10340+ cmp $__KERNEXEC_KERNEL_CS, %esi
10341+ jnz 2f
10342+#ifdef CONFIG_PARAVIRT
10343+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
10344+ mov %eax, %esi
10345+#else
10346+ mov %cr0, %esi
10347+#endif
10348+ btr $16, %esi
10349+ ljmp $__KERNEL_CS, $1f
10350+1:
10351+#ifdef CONFIG_PARAVIRT
10352+ mov %esi, %eax
10353+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
10354+#else
10355+ mov %esi, %cr0
10356+#endif
10357+2:
10358+#ifdef CONFIG_PARAVIRT
10359+ pop %ecx; pop %eax
10360+#endif
10361+#endif
10362+.endm
10363+
10364+.macro PAX_ENTER_KERNEL
10365+#ifdef CONFIG_PAX_KERNEXEC
10366+#ifdef CONFIG_PARAVIRT
10367+ push %eax; push %ecx;
10368+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
10369+ mov %eax, %esi
10370+#else
10371+ mov %cr0, %esi
10372+#endif
10373+ bts $16, %esi
10374+ jnc 1f
10375+ mov %cs, %esi
10376+ cmp $__KERNEL_CS, %esi
10377+ jz 3f
10378+ ljmp $__KERNEL_CS, $3f
10379+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
10380+2:
10381+#ifdef CONFIG_PARAVIRT
10382+ mov %esi, %eax
10383+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
10384+#else
10385+ mov %esi, %cr0
10386+#endif
10387+3:
10388+#ifdef CONFIG_PARAVIRT
10389+ pop %ecx; pop %eax
10390+#endif
10391+#endif
10392+.endm
10393+
10110+.macro __SAVE_ALL _DS 10394+.macro __SAVE_ALL _DS
10111 cld 10395 cld
10112 PUSH_GS 10396 PUSH_GS
10113 pushl %fs 10397 pushl %fs
10114@@ -224,7 +224,7 @@ 10398@@ -224,7 +284,7 @@
10115 pushl %ebx 10399 pushl %ebx
10116 CFI_ADJUST_CFA_OFFSET 4 10400 CFI_ADJUST_CFA_OFFSET 4
10117 CFI_REL_OFFSET ebx, 0 10401 CFI_REL_OFFSET ebx, 0
@@ -10120,7 +10404,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10120 movl %edx, %ds 10404 movl %edx, %ds
10121 movl %edx, %es 10405 movl %edx, %es
10122 movl $(__KERNEL_PERCPU), %edx 10406 movl $(__KERNEL_PERCPU), %edx
10123@@ -232,6 +232,15 @@ 10407@@ -232,6 +292,15 @@
10124 SET_KERNEL_GS %edx 10408 SET_KERNEL_GS %edx
10125 .endm 10409 .endm
10126 10410
@@ -10136,7 +10420,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10136 .macro RESTORE_INT_REGS 10420 .macro RESTORE_INT_REGS
10137 popl %ebx 10421 popl %ebx
10138 CFI_ADJUST_CFA_OFFSET -4 10422 CFI_ADJUST_CFA_OFFSET -4
10139@@ -352,7 +361,15 @@ check_userspace: 10423@@ -352,7 +421,15 @@ check_userspace:
10140 movb PT_CS(%esp), %al 10424 movb PT_CS(%esp), %al
10141 andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax 10425 andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
10142 cmpl $USER_RPL, %eax 10426 cmpl $USER_RPL, %eax
@@ -10152,7 +10436,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10152 10436
10153 ENTRY(resume_userspace) 10437 ENTRY(resume_userspace)
10154 LOCKDEP_SYS_EXIT 10438 LOCKDEP_SYS_EXIT
10155@@ -414,10 +431,9 @@ sysenter_past_esp: 10439@@ -414,10 +491,9 @@ sysenter_past_esp:
10156 /*CFI_REL_OFFSET cs, 0*/ 10440 /*CFI_REL_OFFSET cs, 0*/
10157 /* 10441 /*
10158 * Push current_thread_info()->sysenter_return to the stack. 10442 * Push current_thread_info()->sysenter_return to the stack.
@@ -10165,7 +10449,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10165 CFI_ADJUST_CFA_OFFSET 4 10449 CFI_ADJUST_CFA_OFFSET 4
10166 CFI_REL_OFFSET eip, 0 10450 CFI_REL_OFFSET eip, 0
10167 10451
10168@@ -430,9 +446,19 @@ sysenter_past_esp: 10452@@ -430,9 +506,19 @@ sysenter_past_esp:
10169 * Load the potential sixth argument from user stack. 10453 * Load the potential sixth argument from user stack.
10170 * Careful about security. 10454 * Careful about security.
10171 */ 10455 */
@@ -10185,7 +10469,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10185 movl %ebp,PT_EBP(%esp) 10469 movl %ebp,PT_EBP(%esp)
10186 .section __ex_table,"a" 10470 .section __ex_table,"a"
10187 .align 4 10471 .align 4
10188@@ -455,12 +481,23 @@ sysenter_do_call: 10472@@ -455,12 +541,23 @@ sysenter_do_call:
10189 testl $_TIF_ALLWORK_MASK, %ecx 10473 testl $_TIF_ALLWORK_MASK, %ecx
10190 jne sysexit_audit 10474 jne sysexit_audit
10191 sysenter_exit: 10475 sysenter_exit:
@@ -10209,7 +10493,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10209 PTGS_TO_GS 10493 PTGS_TO_GS
10210 ENABLE_INTERRUPTS_SYSEXIT 10494 ENABLE_INTERRUPTS_SYSEXIT
10211 10495
10212@@ -504,11 +541,17 @@ sysexit_audit: 10496@@ -504,11 +601,17 @@ sysexit_audit:
10213 10497
10214 CFI_ENDPROC 10498 CFI_ENDPROC
10215 .pushsection .fixup,"ax" 10499 .pushsection .fixup,"ax"
@@ -10229,7 +10513,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10229 .popsection 10513 .popsection
10230 PTGS_TO_GS_EX 10514 PTGS_TO_GS_EX
10231 ENDPROC(ia32_sysenter_target) 10515 ENDPROC(ia32_sysenter_target)
10232@@ -538,6 +581,10 @@ syscall_exit: 10516@@ -538,6 +641,10 @@ syscall_exit:
10233 testl $_TIF_ALLWORK_MASK, %ecx # current->work 10517 testl $_TIF_ALLWORK_MASK, %ecx # current->work
10234 jne syscall_exit_work 10518 jne syscall_exit_work
10235 10519
@@ -10240,7 +10524,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10240 restore_all: 10524 restore_all:
10241 TRACE_IRQS_IRET 10525 TRACE_IRQS_IRET
10242 restore_all_notrace: 10526 restore_all_notrace:
10243@@ -602,7 +649,13 @@ ldt_ss: 10527@@ -602,7 +709,13 @@ ldt_ss:
10244 mov PT_OLDESP(%esp), %eax /* load userspace esp */ 10528 mov PT_OLDESP(%esp), %eax /* load userspace esp */
10245 mov %dx, %ax /* eax: new kernel esp */ 10529 mov %dx, %ax /* eax: new kernel esp */
10246 sub %eax, %edx /* offset (low word is 0) */ 10530 sub %eax, %edx /* offset (low word is 0) */
@@ -10255,7 +10539,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10255 shr $16, %edx 10539 shr $16, %edx
10256 mov %dl, GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx) /* bits 16..23 */ 10540 mov %dl, GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx) /* bits 16..23 */
10257 mov %dh, GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx) /* bits 24..31 */ 10541 mov %dh, GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx) /* bits 24..31 */
10258@@ -642,25 +695,19 @@ work_resched: 10542@@ -642,25 +755,19 @@ work_resched:
10259 10543
10260 work_notifysig: # deal with pending signals and 10544 work_notifysig: # deal with pending signals and
10261 # notify-resume requests 10545 # notify-resume requests
@@ -10284,7 +10568,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10284 #endif 10568 #endif
10285 xorl %edx, %edx 10569 xorl %edx, %edx
10286 call do_notify_resume 10570 call do_notify_resume
10287@@ -695,6 +742,10 @@ END(syscall_exit_work) 10571@@ -695,6 +802,10 @@ END(syscall_exit_work)
10288 10572
10289 RING0_INT_FRAME # can't unwind into user space anyway 10573 RING0_INT_FRAME # can't unwind into user space anyway
10290 syscall_fault: 10574 syscall_fault:
@@ -10295,7 +10579,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10295 GET_THREAD_INFO(%ebp) 10579 GET_THREAD_INFO(%ebp)
10296 movl $-EFAULT,PT_EAX(%esp) 10580 movl $-EFAULT,PT_EAX(%esp)
10297 jmp resume_userspace 10581 jmp resume_userspace
10298@@ -735,7 +786,13 @@ PTREGSCALL(vm86old) 10582@@ -735,7 +846,13 @@ PTREGSCALL(vm86old)
10299 * normal stack and adjusts ESP with the matching offset. 10583 * normal stack and adjusts ESP with the matching offset.
10300 */ 10584 */
10301 /* fixup the stack */ 10585 /* fixup the stack */
@@ -10310,7 +10594,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10310 mov GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx), %al /* bits 16..23 */ 10594 mov GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx), %al /* bits 16..23 */
10311 mov GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx), %ah /* bits 24..31 */ 10595 mov GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx), %ah /* bits 24..31 */
10312 shl $16, %eax 10596 shl $16, %eax
10313@@ -1198,7 +1255,6 @@ return_to_handler: 10597@@ -1198,7 +1315,6 @@ return_to_handler:
10314 ret 10598 ret
10315 #endif 10599 #endif
10316 10600
@@ -10318,7 +10602,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10318 #include "syscall_table_32.S" 10602 #include "syscall_table_32.S"
10319 10603
10320 syscall_table_size=(.-sys_call_table) 10604 syscall_table_size=(.-sys_call_table)
10321@@ -1250,12 +1306,15 @@ error_code: 10605@@ -1250,12 +1366,15 @@ error_code:
10322 movl %ecx, %fs 10606 movl %ecx, %fs
10323 UNWIND_ESPFIX_STACK 10607 UNWIND_ESPFIX_STACK
10324 GS_TO_REG %ecx 10608 GS_TO_REG %ecx
@@ -10335,7 +10619,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10335 movl %ecx, %ds 10619 movl %ecx, %ds
10336 movl %ecx, %es 10620 movl %ecx, %es
10337 TRACE_IRQS_OFF 10621 TRACE_IRQS_OFF
10338@@ -1351,6 +1410,9 @@ nmi_stack_correct: 10622@@ -1351,6 +1470,9 @@ nmi_stack_correct:
10339 xorl %edx,%edx # zero error code 10623 xorl %edx,%edx # zero error code
10340 movl %esp,%eax # pt_regs pointer 10624 movl %esp,%eax # pt_regs pointer
10341 call do_nmi 10625 call do_nmi
@@ -10345,7 +10629,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10345 jmp restore_all_notrace 10629 jmp restore_all_notrace
10346 CFI_ENDPROC 10630 CFI_ENDPROC
10347 10631
10348@@ -1391,6 +1453,9 @@ nmi_espfix_stack: 10632@@ -1391,6 +1513,9 @@ nmi_espfix_stack:
10349 FIXUP_ESPFIX_STACK # %eax == %esp 10633 FIXUP_ESPFIX_STACK # %eax == %esp
10350 xorl %edx,%edx # zero error code 10634 xorl %edx,%edx # zero error code
10351 call do_nmi 10635 call do_nmi
@@ -10355,9 +10639,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/k
10355 RESTORE_REGS 10639 RESTORE_REGS
10356 lss 12+4(%esp), %esp # back to espfix stack 10640 lss 12+4(%esp), %esp # back to espfix stack
10357 CFI_ADJUST_CFA_OFFSET -24 10641 CFI_ADJUST_CFA_OFFSET -24
10358diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_64.S linux-2.6.32.10/arch/x86/kernel/entry_64.S 10642diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_64.S linux-2.6.32.11/arch/x86/kernel/entry_64.S
10359--- linux-2.6.32.10/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400 10643--- linux-2.6.32.11/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400
10360+++ linux-2.6.32.10/arch/x86/kernel/entry_64.S 2010-03-20 15:58:46.945539132 -0400 10644+++ linux-2.6.32.11/arch/x86/kernel/entry_64.S 2010-04-04 20:58:33.220592413 -0400
10361@@ -53,6 +53,7 @@ 10645@@ -53,6 +53,7 @@
10362 #include <asm/paravirt.h> 10646 #include <asm/paravirt.h>
10363 #include <asm/ftrace.h> 10647 #include <asm/ftrace.h>
@@ -10366,44 +10650,319 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_64.S linux-2.6.32.10/arch/x86/k
10366 10650
10367 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */ 10651 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
10368 #include <linux/elf-em.h> 10652 #include <linux/elf-em.h>
10369@@ -800,6 +801,7 @@ END(interrupt) 10653@@ -174,6 +175,200 @@ ENTRY(native_usergs_sysret64)
10654 ENDPROC(native_usergs_sysret64)
10655 #endif /* CONFIG_PARAVIRT */
10656
10657+ .macro ljmpq sel, off
10658+#if defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
10659+ .byte 0x48; ljmp *1234f(%rip)
10660+ .pushsection .rodata
10661+ .align 16
10662+ 1234: .quad \off; .word \sel
10663+ .popsection
10664+#else
10665+ push $\sel
10666+ push $\off
10667+ lretq
10668+#endif
10669+ .endm
10670+
10671+ENTRY(pax_enter_kernel)
10672+
10673+#ifdef CONFIG_PAX_KERNEXEC
10674+ push %rax
10675+ push %rdi
10676+
10677+#ifdef CONFIG_PARAVIRT
10678+ PV_SAVE_REGS(CLBR_NONE | CLBR_RAX | CLBR_RDI)
10679+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
10680+ mov %rax,%rdi
10681+#else
10682+ mov %cr0,%rdi
10683+#endif
10684+ bts $16,%rdi
10685+ jnc 1f
10686+ mov %cs,%edi
10687+ cmp $__KERNEL_CS,%edi
10688+ jz 3f
10689+ ljmpq __KERNEL_CS,3f
10690+1: ljmpq __KERNEXEC_KERNEL_CS,2f
10691+2:
10692+#ifdef CONFIG_PARAVIRT
10693+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
10694+3: PV_RESTORE_REGS(CLBR_NONE | CLBR_RAX | CLBR_RDI)
10695+#else
10696+ mov %rdi,%cr0
10697+3:
10698+#endif
10699+
10700+ pop %rdi
10701+ pop %rax
10702+#endif
10703+
10704+ retq
10705+ENDPROC(pax_enter_kernel)
10706+
10707+ENTRY(pax_exit_kernel)
10708+
10709+#ifdef CONFIG_PAX_KERNEXEC
10710+ push %rax
10711+ push %rdi
10712+
10713+#ifdef CONFIG_PARAVIRT
10714+ PV_SAVE_REGS(CLBR_NONE | CLBR_RAX | CLBR_RDI)
10715+#endif
10716+ mov %cs,%rdi
10717+ cmp $__KERNEXEC_KERNEL_CS,%edi
10718+ jnz 2f
10719+#ifdef CONFIG_PARAVIRT
10720+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
10721+ mov %rax,%rdi
10722+#else
10723+ mov %cr0,%rdi
10724+#endif
10725+ btr $16,%rdi
10726+ ljmpq __KERNEL_CS,1f
10727+1:
10728+#ifdef CONFIG_PARAVIRT
10729+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
10730+2: PV_RESTORE_REGS(CLBR_NONE | CLBR_RAX | CLBR_RDI);
10731+#else
10732+ mov %rdi,%cr0
10733+2:
10734+#endif
10735+
10736+ pop %rdi
10737+ pop %rax
10738+#endif
10739+
10740+ retq
10741+ENDPROC(pax_exit_kernel)
10742+
10743+ENTRY(pax_enter_kernel_user)
10744+
10745+#ifdef CONFIG_PAX_MEMORY_UDEREF
10746+ push %rax
10747+ push %rdi
10748+
10749+#ifdef CONFIG_PARAVIRT
10750+ PV_SAVE_REGS(CLBR_NONE | CLBR_RAX | CLBR_RDI)
10751+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3)
10752+#else
10753+ mov %cr3,%rax
10754+#endif
10755+
10756+ mov %rax,%rdi
10757+ add $__START_KERNEL_map,%rax
10758+ sub phys_base(%rip),%rax
10759+
10760+ i = 0
10761+ .rept USER_PGD_PTRS
10762+#ifdef CONFIG_PARAVIRT
10763+ mov i*8(%rax),%rsi
10764+ mov $0,$sil
10765+ lea i*8(%rax),%rdi
10766+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set+pgd)
10767+#else
10768+ movb $0,i*8(%rax)
10769+#endif
10770+ i = i + 1
10771+ .endr
10772+
10773+#ifdef CONFIG_PARAVIRT
10774+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
10775+ PV_RESTORE_REGS(CLBR_NONE | CLBR_RAX | CLBR_RDI)
10776+#else
10777+ mov %rdi,%cr3
10778+#endif
10779+
10780+#ifdef CONFIG_PAX_KERNEXEC
10781+#ifdef CONFIG_PARAVIRT
10782+ PV_SAVE_REGS(CLBR_NONE | CLBR_RAX | CLBR_RDI)
10783+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
10784+ mov %rax,%rdi
10785+#else
10786+ mov %cr0,%rdi
10787+#endif
10788+ bts $16,%rdi
10789+#ifdef CONFIG_PARAVIRT
10790+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
10791+ PV_RESTORE_REGS(CLBR_NONE | CLBR_RAX | CLBR_RDI)
10792+#else
10793+ mov %rdi,%cr0
10794+#endif
10795+#endif
10796+
10797+ pop %rdi
10798+ pop %rax
10799+#endif
10800+
10801+ retq
10802+ENDPROC(pax_enter_kernel_user)
10803+
10804+ENTRY(pax_exit_kernel_user)
10805+ push %rax
10806+ push %rdi
10807+
10808+#ifdef CONFIG_PAX_KERNEXEC
10809+#ifdef CONFIG_PARAVIRT
10810+ PV_SAVE_REGS(CLBR_NONE | CLBR_RAX | CLBR_RDI)
10811+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
10812+ mov %rax,%rdi
10813+#else
10814+ mov %cr0,%rdi
10815+#endif
10816+ btr $16,%rdi
10817+#ifdef CONFIG_PARAVIRT
10818+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
10819+ PV_RESTORE_REGS(CLBR_NONE | CLBR_RAX | CLBR_RDI)
10820+#else
10821+ mov %rdi,%cr0
10822+#endif
10823+#endif
10824+
10825+#ifdef CONFIG_PARAVIRT
10826+ PV_SAVE_REGS(CLBR_NONE | CLBR_RAX | CLBR_RDI)
10827+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3)
10828+#else
10829+ mov %cr3,%rax
10830+#endif
10831+ add $__START_KERNEL_map,%rax
10832+ sub phys_base(%rip),%rax
10833+
10834+ i = 0
10835+ .rept USER_PGD_PTRS
10836+#ifdef CONFIG_PARAVIRT
10837+ mov i*8(%rax),%rsi
10838+ mov $0x67,$sil
10839+ lea i*8(%rax),%rdi
10840+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set+pgd)
10841+#else
10842+ movb $0x67,i*8(%rax)
10843+#endif
10844+ i = i + 1
10845+ .endr
10846+
10847+ pop %rdi
10848+ pop %rax
10849+ retq
10850+ENDPROC(pax_exit_kernel_user)
10851
10852 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
10853 #ifdef CONFIG_TRACE_IRQFLAGS
10854@@ -468,6 +663,11 @@ ENTRY(system_call_after_swapgs)
10855
10856 movq %rsp,PER_CPU_VAR(old_rsp)
10857 movq PER_CPU_VAR(kernel_stack),%rsp
10858+
10859+#ifdef CONFIG_PAX_MEMORY_UDEREF
10860+ call pax_enter_kernel_user
10861+#endif
10862+
10863 /*
10864 * No need to follow this irqs off/on section - it's straight
10865 * and short:
10866@@ -502,6 +702,11 @@ sysret_check:
10867 andl %edi,%edx
10868 jnz sysret_careful
10869 CFI_REMEMBER_STATE
10870+
10871+#ifdef CONFIG_PAX_MEMORY_UDEREF
10872+ call pax_exit_kernel_user
10873+#endif
10874+
10875 /*
10876 * sysretq will re-enable interrupts:
10877 */
10878@@ -800,7 +1005,16 @@ END(interrupt)
10370 CFI_ADJUST_CFA_OFFSET 10*8 10879 CFI_ADJUST_CFA_OFFSET 10*8
10371 call save_args 10880 call save_args
10372 PARTIAL_FRAME 0 10881 PARTIAL_FRAME 0
10373+ PAX_ENTER_KERNEL 10882- call \func
10374 call \func 10883+#ifdef CONFIG_PAX_MEMORY_UDEREF
10884+ testl $3, CS(%rdi)
10885+ jnz 1f
10886+ call pax_enter_kernel
10887+ jmp 2f
10888+1: call pax_enter_kernel_user
10889+#else
10890+ call pax_enter_kernel
10891+#endif
10892+2: call \func
10375 .endm 10893 .endm
10376 10894
10377@@ -821,6 +823,7 @@ ret_from_intr: 10895 /*
10378 CFI_DEF_CFA_REGISTER rsp 10896@@ -844,12 +1058,18 @@ retint_swapgs: /* return to user-space
10379 CFI_ADJUST_CFA_OFFSET -8 10897 * The iretq could re-enable interrupts:
10380 exit_intr: 10898 */
10381+ PAX_EXIT_KERNEL 10899 DISABLE_INTERRUPTS(CLBR_ANY)
10382 GET_THREAD_INFO(%rcx) 10900+
10383 testl $3,CS-ARGOFFSET(%rsp) 10901+#ifdef CONFIG_PAX_MEMORY_UDEREF
10384 je retint_kernel 10902+ call pax_exit_kernel_user
10385@@ -1032,6 +1035,7 @@ ENTRY(\sym) 10903+#endif
10904+
10905 TRACE_IRQS_IRETQ
10906 SWAPGS
10907 jmp restore_args
10908
10909 retint_restore_args: /* return to kernel space */
10910 DISABLE_INTERRUPTS(CLBR_ANY)
10911+ call pax_exit_kernel
10912 /*
10913 * The iretq could re-enable interrupts:
10914 */
10915@@ -1032,7 +1252,16 @@ ENTRY(\sym)
10386 CFI_ADJUST_CFA_OFFSET 15*8 10916 CFI_ADJUST_CFA_OFFSET 15*8
10387 call error_entry 10917 call error_entry
10388 DEFAULT_FRAME 0 10918 DEFAULT_FRAME 0
10389+ PAX_ENTER_KERNEL 10919- movq %rsp,%rdi /* pt_regs pointer */
10390 movq %rsp,%rdi /* pt_regs pointer */ 10920+#ifdef CONFIG_PAX_MEMORY_UDEREF
10921+ testl $3, CS(%rsp)
10922+ jnz 1f
10923+ call pax_enter_kernel
10924+ jmp 2f
10925+1: call pax_enter_kernel_user
10926+#else
10927+ call pax_enter_kernel
10928+#endif
10929+2: movq %rsp,%rdi /* pt_regs pointer */
10391 xorl %esi,%esi /* no error code */ 10930 xorl %esi,%esi /* no error code */
10392 call \do_sym 10931 call \do_sym
10393@@ -1049,6 +1053,7 @@ ENTRY(\sym) 10932 jmp error_exit /* %ebx: no swapgs flag */
10933@@ -1049,7 +1278,16 @@ ENTRY(\sym)
10394 subq $15*8, %rsp 10934 subq $15*8, %rsp
10395 call save_paranoid 10935 call save_paranoid
10396 TRACE_IRQS_OFF 10936 TRACE_IRQS_OFF
10397+ PAX_ENTER_KERNEL 10937- movq %rsp,%rdi /* pt_regs pointer */
10398 movq %rsp,%rdi /* pt_regs pointer */ 10938+#ifdef CONFIG_PAX_MEMORY_UDEREF
10939+ testl $3, CS(%rsp)
10940+ jnz 1f
10941+ call pax_enter_kernel
10942+ jmp 2f
10943+1: call pax_enter_kernel_user
10944+#else
10945+ call pax_enter_kernel
10946+#endif
10947+2: movq %rsp,%rdi /* pt_regs pointer */
10399 xorl %esi,%esi /* no error code */ 10948 xorl %esi,%esi /* no error code */
10400 call \do_sym 10949 call \do_sym
10401@@ -1066,9 +1071,15 @@ ENTRY(\sym) 10950 jmp paranoid_exit /* %ebx: no swapgs flag */
10951@@ -1066,9 +1304,23 @@ ENTRY(\sym)
10402 subq $15*8, %rsp 10952 subq $15*8, %rsp
10403 call save_paranoid 10953 call save_paranoid
10404 TRACE_IRQS_OFF 10954 TRACE_IRQS_OFF
10405+ PAX_ENTER_KERNEL 10955- movq %rsp,%rdi /* pt_regs pointer */
10406 movq %rsp,%rdi /* pt_regs pointer */ 10956+#ifdef CONFIG_PAX_MEMORY_UDEREF
10957+ testl $3, CS(%rsp)
10958+ jnz 1f
10959+ call pax_enter_kernel
10960+ jmp 2f
10961+1: call pax_enter_kernel_user
10962+#else
10963+ call pax_enter_kernel
10964+#endif
10965+2: movq %rsp,%rdi /* pt_regs pointer */
10407 xorl %esi,%esi /* no error code */ 10966 xorl %esi,%esi /* no error code */
10408- PER_CPU(init_tss, %rbp) 10967- PER_CPU(init_tss, %rbp)
10409+#ifdef CONFIG_SMP 10968+#ifdef CONFIG_SMP
@@ -10415,55 +10974,84 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_64.S linux-2.6.32.10/arch/x86/k
10415 subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) 10974 subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
10416 call \do_sym 10975 call \do_sym
10417 addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) 10976 addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
10418@@ -1085,6 +1096,7 @@ ENTRY(\sym) 10977@@ -1085,7 +1337,16 @@ ENTRY(\sym)
10419 CFI_ADJUST_CFA_OFFSET 15*8 10978 CFI_ADJUST_CFA_OFFSET 15*8
10420 call error_entry 10979 call error_entry
10421 DEFAULT_FRAME 0 10980 DEFAULT_FRAME 0
10422+ PAX_ENTER_KERNEL 10981- movq %rsp,%rdi /* pt_regs pointer */
10423 movq %rsp,%rdi /* pt_regs pointer */ 10982+#ifdef CONFIG_PAX_MEMORY_UDEREF
10983+ testl $3, CS(%rsp)
10984+ jnz 1f
10985+ call pax_enter_kernel
10986+ jmp 2f
10987+1: call pax_enter_kernel_user
10988+#else
10989+ call pax_enter_kernel
10990+#endif
10991+2: movq %rsp,%rdi /* pt_regs pointer */
10424 movq ORIG_RAX(%rsp),%rsi /* get error code */ 10992 movq ORIG_RAX(%rsp),%rsi /* get error code */
10425 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ 10993 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
10426@@ -1104,6 +1116,7 @@ ENTRY(\sym) 10994 call \do_sym
10995@@ -1104,7 +1365,16 @@ ENTRY(\sym)
10427 call save_paranoid 10996 call save_paranoid
10428 DEFAULT_FRAME 0 10997 DEFAULT_FRAME 0
10429 TRACE_IRQS_OFF 10998 TRACE_IRQS_OFF
10430+ PAX_ENTER_KERNEL 10999- movq %rsp,%rdi /* pt_regs pointer */
10431 movq %rsp,%rdi /* pt_regs pointer */ 11000+#ifdef CONFIG_PAX_MEMORY_UDEREF
11001+ testl $3, CS(%rsp)
11002+ jnz 1f
11003+ call pax_enter_kernel
11004+ jmp 2f
11005+1: call pax_enter_kernel_user
11006+#else
11007+ call pax_enter_kernel
11008+#endif
11009+2: movq %rsp,%rdi /* pt_regs pointer */
10432 movq ORIG_RAX(%rsp),%rsi /* get error code */ 11010 movq ORIG_RAX(%rsp),%rsi /* get error code */
10433 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ 11011 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
10434@@ -1408,11 +1421,13 @@ ENTRY(paranoid_exit) 11012 call \do_sym
11013@@ -1408,11 +1678,13 @@ ENTRY(paranoid_exit)
10435 testl $3,CS(%rsp) 11014 testl $3,CS(%rsp)
10436 jnz paranoid_userspace 11015 jnz paranoid_userspace
10437 paranoid_swapgs: 11016 paranoid_swapgs:
10438+ PAX_EXIT_KERNEL 11017+ call pax_exit_kernel
10439 TRACE_IRQS_IRETQ 0 11018 TRACE_IRQS_IRETQ 0
10440 SWAPGS_UNSAFE_STACK 11019 SWAPGS_UNSAFE_STACK
10441 RESTORE_ALL 8 11020 RESTORE_ALL 8
10442 jmp irq_return 11021 jmp irq_return
10443 paranoid_restore: 11022 paranoid_restore:
10444+ PAX_EXIT_KERNEL 11023+ call pax_exit_kernel
10445 TRACE_IRQS_IRETQ 0 11024 TRACE_IRQS_IRETQ 0
10446 RESTORE_ALL 8 11025 RESTORE_ALL 8
10447 jmp irq_return 11026 jmp irq_return
10448@@ -1529,6 +1544,7 @@ ENTRY(nmi) 11027@@ -1529,6 +1801,16 @@ ENTRY(nmi)
10449 CFI_ADJUST_CFA_OFFSET 15*8 11028 CFI_ADJUST_CFA_OFFSET 15*8
10450 call save_paranoid 11029 call save_paranoid
10451 DEFAULT_FRAME 0 11030 DEFAULT_FRAME 0
10452+ PAX_ENTER_KERNEL 11031+#ifdef CONFIG_PAX_MEMORY_UDEREF
11032+ testl $3, CS(%rsp)
11033+ jnz 1f
11034+ call pax_enter_kernel
11035+ jmp 2f
11036+1: call pax_enter_kernel_user
11037+#else
11038+ call pax_enter_kernel
11039+#endif
11040+2:
10453 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */ 11041 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
10454 movq %rsp,%rdi 11042 movq %rsp,%rdi
10455 movq $-1,%rsi 11043 movq $-1,%rsi
10456@@ -1544,6 +1560,7 @@ ENTRY(nmi) 11044@@ -1544,6 +1826,7 @@ ENTRY(nmi)
10457 nmi_swapgs: 11045 nmi_swapgs:
10458 SWAPGS_UNSAFE_STACK 11046 SWAPGS_UNSAFE_STACK
10459 nmi_restore: 11047 nmi_restore:
10460+ PAX_EXIT_KERNEL 11048+ call pax_exit_kernel
10461 RESTORE_ALL 8 11049 RESTORE_ALL 8
10462 jmp irq_return 11050 jmp irq_return
10463 nmi_userspace: 11051 nmi_userspace:
10464diff -urNp linux-2.6.32.10/arch/x86/kernel/ftrace.c linux-2.6.32.10/arch/x86/kernel/ftrace.c 11052diff -urNp linux-2.6.32.11/arch/x86/kernel/ftrace.c linux-2.6.32.11/arch/x86/kernel/ftrace.c
10465--- linux-2.6.32.10/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400 11053--- linux-2.6.32.11/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400
10466+++ linux-2.6.32.10/arch/x86/kernel/ftrace.c 2010-03-20 15:58:46.945539132 -0400 11054+++ linux-2.6.32.11/arch/x86/kernel/ftrace.c 2010-04-04 20:46:41.517551870 -0400
10467@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) 11055@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
10468 { 11056 {
10469 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { 11057 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -10529,9 +11117,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/ftrace.c linux-2.6.32.10/arch/x86/ker
10529 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) 11117 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
10530 return -EFAULT; 11118 return -EFAULT;
10531 11119
10532diff -urNp linux-2.6.32.10/arch/x86/kernel/head32.c linux-2.6.32.10/arch/x86/kernel/head32.c 11120diff -urNp linux-2.6.32.11/arch/x86/kernel/head32.c linux-2.6.32.11/arch/x86/kernel/head32.c
10533--- linux-2.6.32.10/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400 11121--- linux-2.6.32.11/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400
10534+++ linux-2.6.32.10/arch/x86/kernel/head32.c 2010-03-20 15:58:46.945539132 -0400 11122+++ linux-2.6.32.11/arch/x86/kernel/head32.c 2010-04-04 20:46:41.517551870 -0400
10535@@ -16,6 +16,7 @@ 11123@@ -16,6 +16,7 @@
10536 #include <asm/apic.h> 11124 #include <asm/apic.h>
10537 #include <asm/io_apic.h> 11125 #include <asm/io_apic.h>
@@ -10549,9 +11137,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/head32.c linux-2.6.32.10/arch/x86/ker
10549 11137
10550 #ifdef CONFIG_BLK_DEV_INITRD 11138 #ifdef CONFIG_BLK_DEV_INITRD
10551 /* Reserve INITRD */ 11139 /* Reserve INITRD */
10552diff -urNp linux-2.6.32.10/arch/x86/kernel/head_32.S linux-2.6.32.10/arch/x86/kernel/head_32.S 11140diff -urNp linux-2.6.32.11/arch/x86/kernel/head_32.S linux-2.6.32.11/arch/x86/kernel/head_32.S
10553--- linux-2.6.32.10/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400 11141--- linux-2.6.32.11/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400
10554+++ linux-2.6.32.10/arch/x86/kernel/head_32.S 2010-03-20 15:58:46.945539132 -0400 11142+++ linux-2.6.32.11/arch/x86/kernel/head_32.S 2010-04-04 20:58:33.220592413 -0400
10555@@ -19,10 +19,17 @@ 11143@@ -19,10 +19,17 @@
10556 #include <asm/setup.h> 11144 #include <asm/setup.h>
10557 #include <asm/processor-flags.h> 11145 #include <asm/processor-flags.h>
@@ -10842,7 +11430,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/head_32.S linux-2.6.32.10/arch/x86/ke
10842 pushl 16(%esp) 11430 pushl 16(%esp)
10843 pushl 24(%esp) 11431 pushl 24(%esp)
10844 pushl 32(%esp) 11432 pushl 32(%esp)
10845@@ -608,27 +679,37 @@ ENTRY(initial_code) 11433@@ -608,27 +679,45 @@ ENTRY(initial_code)
10846 /* 11434 /*
10847 * BSS section 11435 * BSS section
10848 */ 11436 */
@@ -10882,10 +11470,18 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/head_32.S linux-2.6.32.10/arch/x86/ke
10882- /* Page-aligned for the benefit of paravirt? */ 11470- /* Page-aligned for the benefit of paravirt? */
10883- .align PAGE_SIZE_asm 11471- .align PAGE_SIZE_asm
10884+.section .swapper_pg_dir,"a",@progbits 11472+.section .swapper_pg_dir,"a",@progbits
11473+
11474+#ifdef CONFIG_PAX_PER_CPU_PGD
11475+ENTRY(cpu_pgd)
11476+ .rept NR_CPUS
11477+ .fill 512,8,0
11478+ .endr
11479+#endif
11480+
10885 ENTRY(swapper_pg_dir) 11481 ENTRY(swapper_pg_dir)
10886 .long pa(swapper_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */ 11482 .long pa(swapper_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
10887 # if KPMDS == 3 11483 # if KPMDS == 3
10888@@ -651,11 +732,12 @@ ENTRY(swapper_pg_dir) 11484@@ -651,11 +740,12 @@ ENTRY(swapper_pg_dir)
10889 11485
10890 .data 11486 .data
10891 ENTRY(stack_start) 11487 ENTRY(stack_start)
@@ -10899,7 +11495,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/head_32.S linux-2.6.32.10/arch/x86/ke
10899 early_recursion_flag: 11495 early_recursion_flag:
10900 .long 0 11496 .long 0
10901 11497
10902@@ -691,7 +773,7 @@ fault_msg: 11498@@ -691,7 +781,7 @@ fault_msg:
10903 .word 0 # 32 bit align gdt_desc.address 11499 .word 0 # 32 bit align gdt_desc.address
10904 boot_gdt_descr: 11500 boot_gdt_descr:
10905 .word __BOOT_DS+7 11501 .word __BOOT_DS+7
@@ -10908,7 +11504,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/head_32.S linux-2.6.32.10/arch/x86/ke
10908 11504
10909 .word 0 # 32-bit align idt_desc.address 11505 .word 0 # 32-bit align idt_desc.address
10910 idt_descr: 11506 idt_descr:
10911@@ -702,7 +784,7 @@ idt_descr: 11507@@ -702,7 +792,7 @@ idt_descr:
10912 .word 0 # 32 bit align gdt_desc.address 11508 .word 0 # 32 bit align gdt_desc.address
10913 ENTRY(early_gdt_descr) 11509 ENTRY(early_gdt_descr)
10914 .word GDT_ENTRIES*8-1 11510 .word GDT_ENTRIES*8-1
@@ -10917,7 +11513,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/head_32.S linux-2.6.32.10/arch/x86/ke
10917 11513
10918 /* 11514 /*
10919 * The boot_gdt must mirror the equivalent in setup.S and is 11515 * The boot_gdt must mirror the equivalent in setup.S and is
10920@@ -711,5 +793,65 @@ ENTRY(early_gdt_descr) 11516@@ -711,5 +801,65 @@ ENTRY(early_gdt_descr)
10921 .align L1_CACHE_BYTES 11517 .align L1_CACHE_BYTES
10922 ENTRY(boot_gdt) 11518 ENTRY(boot_gdt)
10923 .fill GDT_ENTRY_BOOT_CS,8,0 11519 .fill GDT_ENTRY_BOOT_CS,8,0
@@ -10985,9 +11581,26 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/head_32.S linux-2.6.32.10/arch/x86/ke
10985+ /* Be sure this is zeroed to avoid false validations in Xen */ 11581+ /* Be sure this is zeroed to avoid false validations in Xen */
10986+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0 11582+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
10987+ .endr 11583+ .endr
10988diff -urNp linux-2.6.32.10/arch/x86/kernel/head_64.S linux-2.6.32.10/arch/x86/kernel/head_64.S 11584diff -urNp linux-2.6.32.11/arch/x86/kernel/head64.c linux-2.6.32.11/arch/x86/kernel/head64.c
10989--- linux-2.6.32.10/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400 11585--- linux-2.6.32.11/arch/x86/kernel/head64.c 2010-03-15 11:52:04.000000000 -0400
10990+++ linux-2.6.32.10/arch/x86/kernel/head_64.S 2010-03-20 15:58:46.945539132 -0400 11586+++ linux-2.6.32.11/arch/x86/kernel/head64.c 2010-04-04 20:58:33.225084964 -0400
11587@@ -29,7 +29,13 @@
11588 static void __init zap_identity_mappings(void)
11589 {
11590 pgd_t *pgd = pgd_offset_k(0UL);
11591+
11592+#ifdef CONFIG_PAX_PER_CPU_PGD
11593+ set_pgd(pgd, native_make_pgd(0));
11594+#else
11595 pgd_clear(pgd);
11596+#endif
11597+
11598 __flush_tlb_all();
11599 }
11600
11601diff -urNp linux-2.6.32.11/arch/x86/kernel/head_64.S linux-2.6.32.11/arch/x86/kernel/head_64.S
11602--- linux-2.6.32.11/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400
11603+++ linux-2.6.32.11/arch/x86/kernel/head_64.S 2010-04-04 20:58:33.220592413 -0400
10991@@ -19,6 +19,7 @@ 11604@@ -19,6 +19,7 @@
10992 #include <asm/cache.h> 11605 #include <asm/cache.h>
10993 #include <asm/processor-flags.h> 11606 #include <asm/processor-flags.h>
@@ -11053,6 +11666,17 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/head_64.S linux-2.6.32.10/arch/x86/ke
11053 11666
11054 /* 11667 /*
11055 * Fixup the kernel text+data virtual addresses. Note that 11668 * Fixup the kernel text+data virtual addresses. Note that
11669@@ -161,8 +153,8 @@ ENTRY(secondary_startup_64)
11670 * after the boot processor executes this code.
11671 */
11672
11673- /* Enable PAE mode and PGE */
11674- movl $(X86_CR4_PAE | X86_CR4_PGE), %eax
11675+ /* Enable PAE mode and PSE/PGE */
11676+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
11677 movq %rax, %cr4
11678
11679 /* Setup early boot stage 4 level pagetables. */
11056@@ -184,9 +176,13 @@ ENTRY(secondary_startup_64) 11680@@ -184,9 +176,13 @@ ENTRY(secondary_startup_64)
11057 movl $MSR_EFER, %ecx 11681 movl $MSR_EFER, %ecx
11058 rdmsr 11682 rdmsr
@@ -11112,7 +11736,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/head_64.S linux-2.6.32.10/arch/x86/ke
11112 #define NEXT_PAGE(name) \ 11736 #define NEXT_PAGE(name) \
11113 .balign PAGE_SIZE; \ 11737 .balign PAGE_SIZE; \
11114 ENTRY(name) 11738 ENTRY(name)
11115@@ -350,13 +351,29 @@ NEXT_PAGE(init_level4_pgt) 11739@@ -350,13 +351,36 @@ NEXT_PAGE(init_level4_pgt)
11116 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE 11740 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
11117 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0 11741 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
11118 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE 11742 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
@@ -11124,6 +11748,13 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/head_64.S linux-2.6.32.10/arch/x86/ke
11124 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */ 11748 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
11125 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE 11749 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
11126 11750
11751+#ifdef CONFIG_PAX_PER_CPU_PGD
11752+NEXT_PAGE(cpu_pgd)
11753+ .rept NR_CPUS
11754+ .fill 512,8,0
11755+ .endr
11756+#endif
11757+
11127 NEXT_PAGE(level3_ident_pgt) 11758 NEXT_PAGE(level3_ident_pgt)
11128 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE 11759 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
11129+#ifdef CONFIG_XEN 11760+#ifdef CONFIG_XEN
@@ -11142,7 +11773,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/head_64.S linux-2.6.32.10/arch/x86/ke
11142 11773
11143 NEXT_PAGE(level3_kernel_pgt) 11774 NEXT_PAGE(level3_kernel_pgt)
11144 .fill L3_START_KERNEL,8,0 11775 .fill L3_START_KERNEL,8,0
11145@@ -364,20 +381,23 @@ NEXT_PAGE(level3_kernel_pgt) 11776@@ -364,20 +388,23 @@ NEXT_PAGE(level3_kernel_pgt)
11146 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE 11777 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
11147 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE 11778 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
11148 11779
@@ -11174,7 +11805,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/head_64.S linux-2.6.32.10/arch/x86/ke
11174 11805
11175 NEXT_PAGE(level2_kernel_pgt) 11806 NEXT_PAGE(level2_kernel_pgt)
11176 /* 11807 /*
11177@@ -390,33 +410,55 @@ NEXT_PAGE(level2_kernel_pgt) 11808@@ -390,33 +417,55 @@ NEXT_PAGE(level2_kernel_pgt)
11178 * If you want to increase this then increase MODULES_VADDR 11809 * If you want to increase this then increase MODULES_VADDR
11179 * too.) 11810 * too.)
11180 */ 11811 */
@@ -11240,9 +11871,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/head_64.S linux-2.6.32.10/arch/x86/ke
11240 11871
11241 __PAGE_ALIGNED_BSS 11872 __PAGE_ALIGNED_BSS
11242 .align PAGE_SIZE 11873 .align PAGE_SIZE
11243diff -urNp linux-2.6.32.10/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.10/arch/x86/kernel/i386_ksyms_32.c 11874diff -urNp linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c
11244--- linux-2.6.32.10/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400 11875--- linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400
11245+++ linux-2.6.32.10/arch/x86/kernel/i386_ksyms_32.c 2010-03-20 15:58:46.945539132 -0400 11876+++ linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c 2010-04-04 20:46:41.517551870 -0400
11246@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); 11877@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
11247 EXPORT_SYMBOL(cmpxchg8b_emu); 11878 EXPORT_SYMBOL(cmpxchg8b_emu);
11248 #endif 11879 #endif
@@ -11264,9 +11895,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.10/arch/
11264+#ifdef CONFIG_PAX_KERNEXEC 11895+#ifdef CONFIG_PAX_KERNEXEC
11265+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); 11896+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
11266+#endif 11897+#endif
11267diff -urNp linux-2.6.32.10/arch/x86/kernel/init_task.c linux-2.6.32.10/arch/x86/kernel/init_task.c 11898diff -urNp linux-2.6.32.11/arch/x86/kernel/init_task.c linux-2.6.32.11/arch/x86/kernel/init_task.c
11268--- linux-2.6.32.10/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400 11899--- linux-2.6.32.11/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400
11269+++ linux-2.6.32.10/arch/x86/kernel/init_task.c 2010-03-20 15:58:46.945539132 -0400 11900+++ linux-2.6.32.11/arch/x86/kernel/init_task.c 2010-04-04 20:46:41.517551870 -0400
11270@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); 11901@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
11271 * section. Since TSS's are completely CPU-local, we want them 11902 * section. Since TSS's are completely CPU-local, we want them
11272 * on exact cacheline boundaries, to eliminate cacheline ping-pong. 11903 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -11275,9 +11906,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/init_task.c linux-2.6.32.10/arch/x86/
11275- 11906-
11276+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; 11907+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
11277+EXPORT_SYMBOL(init_tss); 11908+EXPORT_SYMBOL(init_tss);
11278diff -urNp linux-2.6.32.10/arch/x86/kernel/ioport.c linux-2.6.32.10/arch/x86/kernel/ioport.c 11909diff -urNp linux-2.6.32.11/arch/x86/kernel/ioport.c linux-2.6.32.11/arch/x86/kernel/ioport.c
11279--- linux-2.6.32.10/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 11910--- linux-2.6.32.11/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
11280+++ linux-2.6.32.10/arch/x86/kernel/ioport.c 2010-03-20 15:58:46.945539132 -0400 11911+++ linux-2.6.32.11/arch/x86/kernel/ioport.c 2010-04-04 20:46:41.517551870 -0400
11281@@ -6,6 +6,7 @@ 11912@@ -6,6 +6,7 @@
11282 #include <linux/sched.h> 11913 #include <linux/sched.h>
11283 #include <linux/kernel.h> 11914 #include <linux/kernel.h>
@@ -11322,9 +11953,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/ioport.c linux-2.6.32.10/arch/x86/ker
11322 } 11953 }
11323 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); 11954 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
11324 11955
11325diff -urNp linux-2.6.32.10/arch/x86/kernel/irq_32.c linux-2.6.32.10/arch/x86/kernel/irq_32.c 11956diff -urNp linux-2.6.32.11/arch/x86/kernel/irq_32.c linux-2.6.32.11/arch/x86/kernel/irq_32.c
11326--- linux-2.6.32.10/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400 11957--- linux-2.6.32.11/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400
11327+++ linux-2.6.32.10/arch/x86/kernel/irq_32.c 2010-03-20 15:58:46.945539132 -0400 11958+++ linux-2.6.32.11/arch/x86/kernel/irq_32.c 2010-04-04 20:46:41.521777445 -0400
11328@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc 11959@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
11329 return 0; 11960 return 0;
11330 11961
@@ -11343,9 +11974,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/irq_32.c linux-2.6.32.10/arch/x86/ker
11343 11974
11344 call_on_stack(__do_softirq, isp); 11975 call_on_stack(__do_softirq, isp);
11345 /* 11976 /*
11346diff -urNp linux-2.6.32.10/arch/x86/kernel/kgdb.c linux-2.6.32.10/arch/x86/kernel/kgdb.c 11977diff -urNp linux-2.6.32.11/arch/x86/kernel/kgdb.c linux-2.6.32.11/arch/x86/kernel/kgdb.c
11347--- linux-2.6.32.10/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 11978--- linux-2.6.32.11/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
11348+++ linux-2.6.32.10/arch/x86/kernel/kgdb.c 2010-03-20 15:58:46.945539132 -0400 11979+++ linux-2.6.32.11/arch/x86/kernel/kgdb.c 2010-04-04 20:46:41.521777445 -0400
11349@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception 11980@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
11350 return instruction_pointer(regs); 11981 return instruction_pointer(regs);
11351 } 11982 }
@@ -11355,9 +11986,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/kgdb.c linux-2.6.32.10/arch/x86/kerne
11355 /* Breakpoint instruction: */ 11986 /* Breakpoint instruction: */
11356 .gdb_bpt_instr = { 0xcc }, 11987 .gdb_bpt_instr = { 0xcc },
11357 .flags = KGDB_HW_BREAKPOINT, 11988 .flags = KGDB_HW_BREAKPOINT,
11358diff -urNp linux-2.6.32.10/arch/x86/kernel/kprobes.c linux-2.6.32.10/arch/x86/kernel/kprobes.c 11989diff -urNp linux-2.6.32.11/arch/x86/kernel/kprobes.c linux-2.6.32.11/arch/x86/kernel/kprobes.c
11359--- linux-2.6.32.10/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 11990--- linux-2.6.32.11/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400
11360+++ linux-2.6.32.10/arch/x86/kernel/kprobes.c 2010-03-20 15:58:46.949540167 -0400 11991+++ linux-2.6.32.11/arch/x86/kernel/kprobes.c 2010-04-04 20:46:41.521777445 -0400
11361@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f 11992@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
11362 char op; 11993 char op;
11363 s32 raddr; 11994 s32 raddr;
@@ -11440,9 +12071,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/kprobes.c linux-2.6.32.10/arch/x86/ke
11440 return ret; 12071 return ret;
11441 12072
11442 switch (val) { 12073 switch (val) {
11443diff -urNp linux-2.6.32.10/arch/x86/kernel/ldt.c linux-2.6.32.10/arch/x86/kernel/ldt.c 12074diff -urNp linux-2.6.32.11/arch/x86/kernel/ldt.c linux-2.6.32.11/arch/x86/kernel/ldt.c
11444--- linux-2.6.32.10/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400 12075--- linux-2.6.32.11/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400
11445+++ linux-2.6.32.10/arch/x86/kernel/ldt.c 2010-03-20 15:58:46.949540167 -0400 12076+++ linux-2.6.32.11/arch/x86/kernel/ldt.c 2010-04-04 20:46:41.521777445 -0400
11446@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i 12077@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
11447 if (reload) { 12078 if (reload) {
11448 #ifdef CONFIG_SMP 12079 #ifdef CONFIG_SMP
@@ -11507,9 +12138,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/ldt.c linux-2.6.32.10/arch/x86/kernel
11507 fill_ldt(&ldt, &ldt_info); 12138 fill_ldt(&ldt, &ldt_info);
11508 if (oldmode) 12139 if (oldmode)
11509 ldt.avl = 0; 12140 ldt.avl = 0;
11510diff -urNp linux-2.6.32.10/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.10/arch/x86/kernel/machine_kexec_32.c 12141diff -urNp linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c
11511--- linux-2.6.32.10/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400 12142--- linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400
11512+++ linux-2.6.32.10/arch/x86/kernel/machine_kexec_32.c 2010-03-20 15:58:46.949540167 -0400 12143+++ linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c 2010-04-04 20:46:41.521777445 -0400
11513@@ -26,7 +26,7 @@ 12144@@ -26,7 +26,7 @@
11514 #include <asm/system.h> 12145 #include <asm/system.h>
11515 #include <asm/cacheflush.h> 12146 #include <asm/cacheflush.h>
@@ -11537,9 +12168,26 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.10/ar
11537 12168
11538 relocate_kernel_ptr = control_page; 12169 relocate_kernel_ptr = control_page;
11539 page_list[PA_CONTROL_PAGE] = __pa(control_page); 12170 page_list[PA_CONTROL_PAGE] = __pa(control_page);
11540diff -urNp linux-2.6.32.10/arch/x86/kernel/microcode_amd.c linux-2.6.32.10/arch/x86/kernel/microcode_amd.c 12171diff -urNp linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c
11541--- linux-2.6.32.10/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400 12172--- linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c 2010-03-15 11:52:04.000000000 -0400
11542+++ linux-2.6.32.10/arch/x86/kernel/microcode_amd.c 2010-03-20 15:58:46.949540167 -0400 12173+++ linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c 2010-04-04 20:58:33.225084964 -0400
12174@@ -126,7 +126,13 @@ static int init_level4_page(struct kimag
12175 }
12176 /* clear the unused entries */
12177 while (addr < end_addr) {
12178+
12179+#ifdef CONFIG_PAX_PER_CPU_PGD
12180+ set_pgd(level4p++, native_make_pgd(0));
12181+#else
12182 pgd_clear(level4p++);
12183+#endif
12184+
12185 addr += PGDIR_SIZE;
12186 }
12187 out:
12188diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_amd.c linux-2.6.32.11/arch/x86/kernel/microcode_amd.c
12189--- linux-2.6.32.11/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400
12190+++ linux-2.6.32.11/arch/x86/kernel/microcode_amd.c 2010-04-04 20:46:41.521777445 -0400
11543@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c 12191@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
11544 uci->mc = NULL; 12192 uci->mc = NULL;
11545 } 12193 }
@@ -11558,9 +12206,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/microcode_amd.c linux-2.6.32.10/arch/
11558 { 12206 {
11559 return &microcode_amd_ops; 12207 return &microcode_amd_ops;
11560 } 12208 }
11561diff -urNp linux-2.6.32.10/arch/x86/kernel/microcode_core.c linux-2.6.32.10/arch/x86/kernel/microcode_core.c 12209diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_core.c linux-2.6.32.11/arch/x86/kernel/microcode_core.c
11562--- linux-2.6.32.10/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400 12210--- linux-2.6.32.11/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400
11563+++ linux-2.6.32.10/arch/x86/kernel/microcode_core.c 2010-03-20 15:58:46.949540167 -0400 12211+++ linux-2.6.32.11/arch/x86/kernel/microcode_core.c 2010-04-04 20:46:41.521777445 -0400
11564@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); 12212@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
11565 12213
11566 #define MICROCODE_VERSION "2.00" 12214 #define MICROCODE_VERSION "2.00"
@@ -11570,9 +12218,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/microcode_core.c linux-2.6.32.10/arch
11570 12218
11571 /* 12219 /*
11572 * Synchronization. 12220 * Synchronization.
11573diff -urNp linux-2.6.32.10/arch/x86/kernel/microcode_intel.c linux-2.6.32.10/arch/x86/kernel/microcode_intel.c 12221diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_intel.c linux-2.6.32.11/arch/x86/kernel/microcode_intel.c
11574--- linux-2.6.32.10/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400 12222--- linux-2.6.32.11/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400
11575+++ linux-2.6.32.10/arch/x86/kernel/microcode_intel.c 2010-03-20 15:58:46.949540167 -0400 12223+++ linux-2.6.32.11/arch/x86/kernel/microcode_intel.c 2010-04-04 20:46:41.521777445 -0400
11576@@ -443,13 +443,13 @@ static enum ucode_state request_microcod 12224@@ -443,13 +443,13 @@ static enum ucode_state request_microcod
11577 12225
11578 static int get_ucode_user(void *to, const void *from, size_t n) 12226 static int get_ucode_user(void *to, const void *from, size_t n)
@@ -11607,9 +12255,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/microcode_intel.c linux-2.6.32.10/arc
11607 { 12255 {
11608 return &microcode_intel_ops; 12256 return &microcode_intel_ops;
11609 } 12257 }
11610diff -urNp linux-2.6.32.10/arch/x86/kernel/module.c linux-2.6.32.10/arch/x86/kernel/module.c 12258diff -urNp linux-2.6.32.11/arch/x86/kernel/module.c linux-2.6.32.11/arch/x86/kernel/module.c
11611--- linux-2.6.32.10/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 12259--- linux-2.6.32.11/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
11612+++ linux-2.6.32.10/arch/x86/kernel/module.c 2010-03-20 15:58:46.949540167 -0400 12260+++ linux-2.6.32.11/arch/x86/kernel/module.c 2010-04-04 20:46:41.521777445 -0400
11613@@ -34,7 +34,7 @@ 12261@@ -34,7 +34,7 @@
11614 #define DEBUGP(fmt...) 12262 #define DEBUGP(fmt...)
11615 #endif 12263 #endif
@@ -11750,9 +12398,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/module.c linux-2.6.32.10/arch/x86/ker
11750 #if 0 12398 #if 0
11751 if ((s64)val != *(s32 *)loc) 12399 if ((s64)val != *(s32 *)loc)
11752 goto overflow; 12400 goto overflow;
11753diff -urNp linux-2.6.32.10/arch/x86/kernel/paravirt.c linux-2.6.32.10/arch/x86/kernel/paravirt.c 12401diff -urNp linux-2.6.32.11/arch/x86/kernel/paravirt.c linux-2.6.32.11/arch/x86/kernel/paravirt.c
11754--- linux-2.6.32.10/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400 12402--- linux-2.6.32.11/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400
11755+++ linux-2.6.32.10/arch/x86/kernel/paravirt.c 2010-03-20 15:58:46.949540167 -0400 12403+++ linux-2.6.32.11/arch/x86/kernel/paravirt.c 2010-04-04 20:46:41.521777445 -0400
11756@@ -120,9 +120,9 @@ unsigned paravirt_patch_jmp(void *insnbu 12404@@ -120,9 +120,9 @@ unsigned paravirt_patch_jmp(void *insnbu
11757 12405
11758 /* Neat trick to map patch type back to the call within the 12406 /* Neat trick to map patch type back to the call within the
@@ -11857,9 +12505,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/paravirt.c linux-2.6.32.10/arch/x86/k
11857 }; 12505 };
11858 12506
11859 EXPORT_SYMBOL_GPL(pv_time_ops); 12507 EXPORT_SYMBOL_GPL(pv_time_ops);
11860diff -urNp linux-2.6.32.10/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.10/arch/x86/kernel/paravirt-spinlocks.c 12508diff -urNp linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c
11861--- linux-2.6.32.10/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400 12509--- linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400
11862+++ linux-2.6.32.10/arch/x86/kernel/paravirt-spinlocks.c 2010-03-20 15:58:46.949540167 -0400 12510+++ linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c 2010-04-04 20:46:41.521777445 -0400
11863@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * 12511@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
11864 __raw_spin_lock(lock); 12512 __raw_spin_lock(lock);
11865 } 12513 }
@@ -11869,9 +12517,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.10/
11869 #ifdef CONFIG_SMP 12517 #ifdef CONFIG_SMP
11870 .spin_is_locked = __ticket_spin_is_locked, 12518 .spin_is_locked = __ticket_spin_is_locked,
11871 .spin_is_contended = __ticket_spin_is_contended, 12519 .spin_is_contended = __ticket_spin_is_contended,
11872diff -urNp linux-2.6.32.10/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.10/arch/x86/kernel/pci-calgary_64.c 12520diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c
11873--- linux-2.6.32.10/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400 12521--- linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400
11874+++ linux-2.6.32.10/arch/x86/kernel/pci-calgary_64.c 2010-03-20 15:58:46.949540167 -0400 12522+++ linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c 2010-04-04 20:46:41.521777445 -0400
11875@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct 12523@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct
11876 free_pages((unsigned long)vaddr, get_order(size)); 12524 free_pages((unsigned long)vaddr, get_order(size));
11877 } 12525 }
@@ -11881,9 +12529,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.10/arch
11881 .alloc_coherent = calgary_alloc_coherent, 12529 .alloc_coherent = calgary_alloc_coherent,
11882 .free_coherent = calgary_free_coherent, 12530 .free_coherent = calgary_free_coherent,
11883 .map_sg = calgary_map_sg, 12531 .map_sg = calgary_map_sg,
11884diff -urNp linux-2.6.32.10/arch/x86/kernel/pci-dma.c linux-2.6.32.10/arch/x86/kernel/pci-dma.c 12532diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-dma.c linux-2.6.32.11/arch/x86/kernel/pci-dma.c
11885--- linux-2.6.32.10/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 12533--- linux-2.6.32.11/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
11886+++ linux-2.6.32.10/arch/x86/kernel/pci-dma.c 2010-03-20 15:58:46.949540167 -0400 12534+++ linux-2.6.32.11/arch/x86/kernel/pci-dma.c 2010-04-04 20:46:41.521777445 -0400
11887@@ -14,7 +14,7 @@ 12535@@ -14,7 +14,7 @@
11888 12536
11889 static int forbid_dac __read_mostly; 12537 static int forbid_dac __read_mostly;
@@ -11902,9 +12550,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/pci-dma.c linux-2.6.32.10/arch/x86/ke
11902 12550
11903 #ifdef CONFIG_PCI 12551 #ifdef CONFIG_PCI
11904 if (mask > 0xffffffff && forbid_dac > 0) { 12552 if (mask > 0xffffffff && forbid_dac > 0) {
11905diff -urNp linux-2.6.32.10/arch/x86/kernel/pci-gart_64.c linux-2.6.32.10/arch/x86/kernel/pci-gart_64.c 12553diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c
11906--- linux-2.6.32.10/arch/x86/kernel/pci-gart_64.c 2010-03-15 11:52:04.000000000 -0400 12554--- linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c 2010-03-15 11:52:04.000000000 -0400
11907+++ linux-2.6.32.10/arch/x86/kernel/pci-gart_64.c 2010-03-20 15:58:46.949540167 -0400 12555+++ linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c 2010-04-04 20:46:41.521777445 -0400
11908@@ -679,7 +679,7 @@ static __init int init_k8_gatt(struct ag 12556@@ -679,7 +679,7 @@ static __init int init_k8_gatt(struct ag
11909 return -1; 12557 return -1;
11910 } 12558 }
@@ -11914,9 +12562,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/pci-gart_64.c linux-2.6.32.10/arch/x8
11914 .map_sg = gart_map_sg, 12562 .map_sg = gart_map_sg,
11915 .unmap_sg = gart_unmap_sg, 12563 .unmap_sg = gart_unmap_sg,
11916 .map_page = gart_map_page, 12564 .map_page = gart_map_page,
11917diff -urNp linux-2.6.32.10/arch/x86/kernel/pci-nommu.c linux-2.6.32.10/arch/x86/kernel/pci-nommu.c 12565diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-nommu.c linux-2.6.32.11/arch/x86/kernel/pci-nommu.c
11918--- linux-2.6.32.10/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400 12566--- linux-2.6.32.11/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400
11919+++ linux-2.6.32.10/arch/x86/kernel/pci-nommu.c 2010-03-20 15:58:46.949540167 -0400 12567+++ linux-2.6.32.11/arch/x86/kernel/pci-nommu.c 2010-04-04 20:46:41.521777445 -0400
11920@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str 12568@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
11921 flush_write_buffers(); 12569 flush_write_buffers();
11922 } 12570 }
@@ -11926,9 +12574,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/pci-nommu.c linux-2.6.32.10/arch/x86/
11926 .alloc_coherent = dma_generic_alloc_coherent, 12574 .alloc_coherent = dma_generic_alloc_coherent,
11927 .free_coherent = nommu_free_coherent, 12575 .free_coherent = nommu_free_coherent,
11928 .map_sg = nommu_map_sg, 12576 .map_sg = nommu_map_sg,
11929diff -urNp linux-2.6.32.10/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.10/arch/x86/kernel/pci-swiotlb.c 12577diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c
11930--- linux-2.6.32.10/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 12578--- linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
11931+++ linux-2.6.32.10/arch/x86/kernel/pci-swiotlb.c 2010-03-20 15:58:46.949540167 -0400 12579+++ linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c 2010-04-04 20:46:41.521777445 -0400
11932@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( 12580@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
11933 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); 12581 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
11934 } 12582 }
@@ -11938,9 +12586,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.10/arch/x8
11938 .mapping_error = swiotlb_dma_mapping_error, 12586 .mapping_error = swiotlb_dma_mapping_error,
11939 .alloc_coherent = x86_swiotlb_alloc_coherent, 12587 .alloc_coherent = x86_swiotlb_alloc_coherent,
11940 .free_coherent = swiotlb_free_coherent, 12588 .free_coherent = swiotlb_free_coherent,
11941diff -urNp linux-2.6.32.10/arch/x86/kernel/process_32.c linux-2.6.32.10/arch/x86/kernel/process_32.c 12589diff -urNp linux-2.6.32.11/arch/x86/kernel/process_32.c linux-2.6.32.11/arch/x86/kernel/process_32.c
11942--- linux-2.6.32.10/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400 12590--- linux-2.6.32.11/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400
11943+++ linux-2.6.32.10/arch/x86/kernel/process_32.c 2010-03-20 15:58:46.949540167 -0400 12591+++ linux-2.6.32.11/arch/x86/kernel/process_32.c 2010-04-04 20:46:41.521777445 -0400
11944@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as 12592@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
11945 unsigned long thread_saved_pc(struct task_struct *tsk) 12593 unsigned long thread_saved_pc(struct task_struct *tsk)
11946 { 12594 {
@@ -12035,9 +12683,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/process_32.c linux-2.6.32.10/arch/x86
12035+ load_sp0(init_tss + smp_processor_id(), thread); 12683+ load_sp0(init_tss + smp_processor_id(), thread);
12036+} 12684+}
12037+#endif 12685+#endif
12038diff -urNp linux-2.6.32.10/arch/x86/kernel/process_64.c linux-2.6.32.10/arch/x86/kernel/process_64.c 12686diff -urNp linux-2.6.32.11/arch/x86/kernel/process_64.c linux-2.6.32.11/arch/x86/kernel/process_64.c
12039--- linux-2.6.32.10/arch/x86/kernel/process_64.c 2010-03-15 11:52:04.000000000 -0400 12687--- linux-2.6.32.11/arch/x86/kernel/process_64.c 2010-04-04 20:41:49.920655481 -0400
12040+++ linux-2.6.32.10/arch/x86/kernel/process_64.c 2010-03-20 15:58:46.949540167 -0400 12688+++ linux-2.6.32.11/arch/x86/kernel/process_64.c 2010-04-04 20:46:41.521777445 -0400
12041@@ -91,7 +91,7 @@ static void __exit_idle(void) 12689@@ -91,7 +91,7 @@ static void __exit_idle(void)
12042 void exit_idle(void) 12690 void exit_idle(void)
12043 { 12691 {
@@ -12065,7 +12713,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/process_64.c linux-2.6.32.10/arch/x86
12065 unsigned fsindex, gsindex; 12713 unsigned fsindex, gsindex;
12066 bool preload_fpu; 12714 bool preload_fpu;
12067 12715
12068@@ -560,12 +560,11 @@ unsigned long get_wchan(struct task_stru 12716@@ -561,12 +561,11 @@ unsigned long get_wchan(struct task_stru
12069 if (!p || p == current || p->state == TASK_RUNNING) 12717 if (!p || p == current || p->state == TASK_RUNNING)
12070 return 0; 12718 return 0;
12071 stack = (unsigned long)task_stack_page(p); 12719 stack = (unsigned long)task_stack_page(p);
@@ -12080,9 +12728,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/process_64.c linux-2.6.32.10/arch/x86
12080 return 0; 12728 return 0;
12081 ip = *(u64 *)(fp+8); 12729 ip = *(u64 *)(fp+8);
12082 if (!in_sched_functions(ip)) 12730 if (!in_sched_functions(ip))
12083diff -urNp linux-2.6.32.10/arch/x86/kernel/process.c linux-2.6.32.10/arch/x86/kernel/process.c 12731diff -urNp linux-2.6.32.11/arch/x86/kernel/process.c linux-2.6.32.11/arch/x86/kernel/process.c
12084--- linux-2.6.32.10/arch/x86/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 12732--- linux-2.6.32.11/arch/x86/kernel/process.c 2010-04-04 20:41:49.920655481 -0400
12085+++ linux-2.6.32.10/arch/x86/kernel/process.c 2010-03-20 15:58:46.949540167 -0400 12733+++ linux-2.6.32.11/arch/x86/kernel/process.c 2010-04-04 20:46:41.521777445 -0400
12086@@ -73,7 +73,7 @@ void exit_thread(void) 12734@@ -73,7 +73,7 @@ void exit_thread(void)
12087 unsigned long *bp = t->io_bitmap_ptr; 12735 unsigned long *bp = t->io_bitmap_ptr;
12088 12736
@@ -12102,7 +12750,7 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/process.c linux-2.6.32.10/arch/x86/ke
12102 tsk->thread.debugreg0 = 0; 12750 tsk->thread.debugreg0 = 0;
12103 tsk->thread.debugreg1 = 0; 12751 tsk->thread.debugreg1 = 0;
12104 tsk->thread.debugreg2 = 0; 12752 tsk->thread.debugreg2 = 0;
12105@@ -584,17 +587,3 @@ static int __init idle_setup(char *str) 12753@@ -600,17 +603,3 @@ static int __init idle_setup(char *str)
12106 return 0; 12754 return 0;
12107 } 12755 }
12108 early_param("idle", idle_setup); 12756 early_param("idle", idle_setup);
@@ -12120,9 +12768,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/process.c linux-2.6.32.10/arch/x86/ke
12120- return randomize_range(mm->brk, range_end, 0) ? : mm->brk; 12768- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
12121-} 12769-}
12122- 12770-
12123diff -urNp linux-2.6.32.10/arch/x86/kernel/ptrace.c linux-2.6.32.10/arch/x86/kernel/ptrace.c 12771diff -urNp linux-2.6.32.11/arch/x86/kernel/ptrace.c linux-2.6.32.11/arch/x86/kernel/ptrace.c
12124--- linux-2.6.32.10/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 12772--- linux-2.6.32.11/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400
12125+++ linux-2.6.32.10/arch/x86/kernel/ptrace.c 2010-03-20 15:58:46.949540167 -0400 12773+++ linux-2.6.32.11/arch/x86/kernel/ptrace.c 2010-04-04 20:46:41.525738446 -0400
12126@@ -925,7 +925,7 @@ static const struct user_regset_view use 12774@@ -925,7 +925,7 @@ static const struct user_regset_view use
12127 long arch_ptrace(struct task_struct *child, long request, long addr, long data) 12775 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
12128 { 12776 {
@@ -12191,9 +12839,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/ptrace.c linux-2.6.32.10/arch/x86/ker
12191 12839
12192 /* Send us the fake SIGTRAP */ 12840 /* Send us the fake SIGTRAP */
12193 force_sig_info(SIGTRAP, &info, tsk); 12841 force_sig_info(SIGTRAP, &info, tsk);
12194diff -urNp linux-2.6.32.10/arch/x86/kernel/reboot.c linux-2.6.32.10/arch/x86/kernel/reboot.c 12842diff -urNp linux-2.6.32.11/arch/x86/kernel/reboot.c linux-2.6.32.11/arch/x86/kernel/reboot.c
12195--- linux-2.6.32.10/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400 12843--- linux-2.6.32.11/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400
12196+++ linux-2.6.32.10/arch/x86/kernel/reboot.c 2010-03-20 15:58:46.949540167 -0400 12844+++ linux-2.6.32.11/arch/x86/kernel/reboot.c 2010-04-04 20:46:41.525738446 -0400
12197@@ -33,7 +33,7 @@ void (*pm_power_off)(void); 12845@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
12198 EXPORT_SYMBOL(pm_power_off); 12846 EXPORT_SYMBOL(pm_power_off);
12199 12847
@@ -12270,9 +12918,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/reboot.c linux-2.6.32.10/arch/x86/ker
12270 12918
12271 /* Set up the IDT for real mode. */ 12919 /* Set up the IDT for real mode. */
12272 load_idt(&real_mode_idt); 12920 load_idt(&real_mode_idt);
12273diff -urNp linux-2.6.32.10/arch/x86/kernel/setup.c linux-2.6.32.10/arch/x86/kernel/setup.c 12921diff -urNp linux-2.6.32.11/arch/x86/kernel/setup.c linux-2.6.32.11/arch/x86/kernel/setup.c
12274--- linux-2.6.32.10/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 12922--- linux-2.6.32.11/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
12275+++ linux-2.6.32.10/arch/x86/kernel/setup.c 2010-03-20 15:58:46.949540167 -0400 12923+++ linux-2.6.32.11/arch/x86/kernel/setup.c 2010-04-04 20:46:41.525738446 -0400
12276@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p) 12924@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p)
12277 12925
12278 if (!boot_params.hdr.root_flags) 12926 if (!boot_params.hdr.root_flags)
@@ -12293,9 +12941,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/setup.c linux-2.6.32.10/arch/x86/kern
12293 data_resource.end = virt_to_phys(_edata)-1; 12941 data_resource.end = virt_to_phys(_edata)-1;
12294 bss_resource.start = virt_to_phys(&__bss_start); 12942 bss_resource.start = virt_to_phys(&__bss_start);
12295 bss_resource.end = virt_to_phys(&__bss_stop)-1; 12943 bss_resource.end = virt_to_phys(&__bss_stop)-1;
12296diff -urNp linux-2.6.32.10/arch/x86/kernel/setup_percpu.c linux-2.6.32.10/arch/x86/kernel/setup_percpu.c 12944diff -urNp linux-2.6.32.11/arch/x86/kernel/setup_percpu.c linux-2.6.32.11/arch/x86/kernel/setup_percpu.c
12297--- linux-2.6.32.10/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400 12945--- linux-2.6.32.11/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400
12298+++ linux-2.6.32.10/arch/x86/kernel/setup_percpu.c 2010-03-20 15:58:46.949540167 -0400 12946+++ linux-2.6.32.11/arch/x86/kernel/setup_percpu.c 2010-04-04 20:46:41.525738446 -0400
12299@@ -25,19 +25,17 @@ 12947@@ -25,19 +25,17 @@
12300 # define DBG(x...) 12948 # define DBG(x...)
12301 #endif 12949 #endif
@@ -12358,9 +13006,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/setup_percpu.c linux-2.6.32.10/arch/x
12358 /* 13006 /*
12359 * Up to this point, the boot CPU has been using .data.init 13007 * Up to this point, the boot CPU has been using .data.init
12360 * area. Reload any changed state for the boot CPU. 13008 * area. Reload any changed state for the boot CPU.
12361diff -urNp linux-2.6.32.10/arch/x86/kernel/signal.c linux-2.6.32.10/arch/x86/kernel/signal.c 13009diff -urNp linux-2.6.32.11/arch/x86/kernel/signal.c linux-2.6.32.11/arch/x86/kernel/signal.c
12362--- linux-2.6.32.10/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 13010--- linux-2.6.32.11/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400
12363+++ linux-2.6.32.10/arch/x86/kernel/signal.c 2010-03-20 15:58:46.949540167 -0400 13011+++ linux-2.6.32.11/arch/x86/kernel/signal.c 2010-04-04 20:46:41.525738446 -0400
12364@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi 13012@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
12365 * Align the stack pointer according to the i386 ABI, 13013 * Align the stack pointer according to the i386 ABI,
12366 * i.e. so that on function entry ((sp + 4) & 15) == 0. 13014 * i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -12432,9 +13080,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/signal.c linux-2.6.32.10/arch/x86/ker
12432 return; 13080 return;
12433 13081
12434 if (current_thread_info()->status & TS_RESTORE_SIGMASK) 13082 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
12435diff -urNp linux-2.6.32.10/arch/x86/kernel/smpboot.c linux-2.6.32.10/arch/x86/kernel/smpboot.c 13083diff -urNp linux-2.6.32.11/arch/x86/kernel/smpboot.c linux-2.6.32.11/arch/x86/kernel/smpboot.c
12436--- linux-2.6.32.10/arch/x86/kernel/smpboot.c 2010-03-15 11:52:04.000000000 -0400 13084--- linux-2.6.32.11/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400
12437+++ linux-2.6.32.10/arch/x86/kernel/smpboot.c 2010-03-20 15:58:46.949540167 -0400 13085+++ linux-2.6.32.11/arch/x86/kernel/smpboot.c 2010-04-04 20:58:33.225084964 -0400
12438@@ -729,7 +729,11 @@ do_rest: 13086@@ -729,7 +729,11 @@ do_rest:
12439 (unsigned long)task_stack_page(c_idle.idle) - 13087 (unsigned long)task_stack_page(c_idle.idle) -
12440 KERNEL_STACK_OFFSET + THREAD_SIZE; 13088 KERNEL_STACK_OFFSET + THREAD_SIZE;
@@ -12447,9 +13095,22 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/smpboot.c linux-2.6.32.10/arch/x86/ke
12447 initial_code = (unsigned long)start_secondary; 13095 initial_code = (unsigned long)start_secondary;
12448 stack_start.sp = (void *) c_idle.idle->thread.sp; 13096 stack_start.sp = (void *) c_idle.idle->thread.sp;
12449 13097
12450diff -urNp linux-2.6.32.10/arch/x86/kernel/step.c linux-2.6.32.10/arch/x86/kernel/step.c 13098@@ -866,6 +870,12 @@ int __cpuinit native_cpu_up(unsigned int
12451--- linux-2.6.32.10/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400 13099
12452+++ linux-2.6.32.10/arch/x86/kernel/step.c 2010-03-20 15:58:46.953540376 -0400 13100 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
13101
13102+#ifdef CONFIG_PAX_PER_CPU_PGD
13103+ clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
13104+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
13105+ KERNEL_PGD_PTRS);
13106+#endif
13107+
13108 #ifdef CONFIG_X86_32
13109 /* init low mem mapping */
13110 clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
13111diff -urNp linux-2.6.32.11/arch/x86/kernel/step.c linux-2.6.32.11/arch/x86/kernel/step.c
13112--- linux-2.6.32.11/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400
13113+++ linux-2.6.32.11/arch/x86/kernel/step.c 2010-04-04 20:46:41.525738446 -0400
12453@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc 13114@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
12454 struct desc_struct *desc; 13115 struct desc_struct *desc;
12455 unsigned long base; 13116 unsigned long base;
@@ -12482,17 +13143,17 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/step.c linux-2.6.32.10/arch/x86/kerne
12482 /* 32-bit mode: register increment */ 13143 /* 32-bit mode: register increment */
12483 return 0; 13144 return 0;
12484 /* 64-bit mode: REX prefix */ 13145 /* 64-bit mode: REX prefix */
12485diff -urNp linux-2.6.32.10/arch/x86/kernel/syscall_table_32.S linux-2.6.32.10/arch/x86/kernel/syscall_table_32.S 13146diff -urNp linux-2.6.32.11/arch/x86/kernel/syscall_table_32.S linux-2.6.32.11/arch/x86/kernel/syscall_table_32.S
12486--- linux-2.6.32.10/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400 13147--- linux-2.6.32.11/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400
12487+++ linux-2.6.32.10/arch/x86/kernel/syscall_table_32.S 2010-03-20 15:58:46.953540376 -0400 13148+++ linux-2.6.32.11/arch/x86/kernel/syscall_table_32.S 2010-04-04 20:46:41.525738446 -0400
12488@@ -1,3 +1,4 @@ 13149@@ -1,3 +1,4 @@
12489+.section .rodata,"a",@progbits 13150+.section .rodata,"a",@progbits
12490 ENTRY(sys_call_table) 13151 ENTRY(sys_call_table)
12491 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ 13152 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
12492 .long sys_exit 13153 .long sys_exit
12493diff -urNp linux-2.6.32.10/arch/x86/kernel/sys_i386_32.c linux-2.6.32.10/arch/x86/kernel/sys_i386_32.c 13154diff -urNp linux-2.6.32.11/arch/x86/kernel/sys_i386_32.c linux-2.6.32.11/arch/x86/kernel/sys_i386_32.c
12494--- linux-2.6.32.10/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400 13155--- linux-2.6.32.11/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400
12495+++ linux-2.6.32.10/arch/x86/kernel/sys_i386_32.c 2010-03-20 15:58:46.953540376 -0400 13156+++ linux-2.6.32.11/arch/x86/kernel/sys_i386_32.c 2010-04-04 20:46:41.525738446 -0400
12496@@ -24,6 +24,21 @@ 13157@@ -24,6 +24,21 @@
12497 13158
12498 #include <asm/syscalls.h> 13159 #include <asm/syscalls.h>
@@ -12739,9 +13400,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/sys_i386_32.c linux-2.6.32.10/arch/x8
12739 } 13400 }
12740 case 1: /* iBCS2 emulator entry point */ 13401 case 1: /* iBCS2 emulator entry point */
12741 if (!segment_eq(get_fs(), get_ds())) 13402 if (!segment_eq(get_fs(), get_ds()))
12742diff -urNp linux-2.6.32.10/arch/x86/kernel/sys_x86_64.c linux-2.6.32.10/arch/x86/kernel/sys_x86_64.c 13403diff -urNp linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c
12743--- linux-2.6.32.10/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400 13404--- linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400
12744+++ linux-2.6.32.10/arch/x86/kernel/sys_x86_64.c 2010-03-20 15:58:46.953540376 -0400 13405+++ linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c 2010-04-04 20:46:41.525738446 -0400
12745@@ -32,8 +32,8 @@ out: 13406@@ -32,8 +32,8 @@ out:
12746 return error; 13407 return error;
12747 } 13408 }
@@ -12823,9 +13484,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/sys_x86_64.c linux-2.6.32.10/arch/x86
12823 mm->cached_hole_size = ~0UL; 13484 mm->cached_hole_size = ~0UL;
12824 13485
12825 return addr; 13486 return addr;
12826diff -urNp linux-2.6.32.10/arch/x86/kernel/time.c linux-2.6.32.10/arch/x86/kernel/time.c 13487diff -urNp linux-2.6.32.11/arch/x86/kernel/time.c linux-2.6.32.11/arch/x86/kernel/time.c
12827--- linux-2.6.32.10/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 13488--- linux-2.6.32.11/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400
12828+++ linux-2.6.32.10/arch/x86/kernel/time.c 2010-03-20 15:58:46.953540376 -0400 13489+++ linux-2.6.32.11/arch/x86/kernel/time.c 2010-04-04 20:46:41.525738446 -0400
12829@@ -26,17 +26,13 @@ 13490@@ -26,17 +26,13 @@
12830 int timer_ack; 13491 int timer_ack;
12831 #endif 13492 #endif
@@ -12864,9 +13525,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/time.c linux-2.6.32.10/arch/x86/kerne
12864 } 13525 }
12865 return pc; 13526 return pc;
12866 } 13527 }
12867diff -urNp linux-2.6.32.10/arch/x86/kernel/tls.c linux-2.6.32.10/arch/x86/kernel/tls.c 13528diff -urNp linux-2.6.32.11/arch/x86/kernel/tls.c linux-2.6.32.11/arch/x86/kernel/tls.c
12868--- linux-2.6.32.10/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400 13529--- linux-2.6.32.11/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400
12869+++ linux-2.6.32.10/arch/x86/kernel/tls.c 2010-03-20 15:58:46.953540376 -0400 13530+++ linux-2.6.32.11/arch/x86/kernel/tls.c 2010-04-04 20:46:41.525738446 -0400
12870@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc 13531@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
12871 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) 13532 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
12872 return -EINVAL; 13533 return -EINVAL;
@@ -12879,9 +13540,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/tls.c linux-2.6.32.10/arch/x86/kernel
12879 set_tls_desc(p, idx, &info, 1); 13540 set_tls_desc(p, idx, &info, 1);
12880 13541
12881 return 0; 13542 return 0;
12882diff -urNp linux-2.6.32.10/arch/x86/kernel/trampoline_32.S linux-2.6.32.10/arch/x86/kernel/trampoline_32.S 13543diff -urNp linux-2.6.32.11/arch/x86/kernel/trampoline_32.S linux-2.6.32.11/arch/x86/kernel/trampoline_32.S
12883--- linux-2.6.32.10/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400 13544--- linux-2.6.32.11/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400
12884+++ linux-2.6.32.10/arch/x86/kernel/trampoline_32.S 2010-03-20 15:58:46.953540376 -0400 13545+++ linux-2.6.32.11/arch/x86/kernel/trampoline_32.S 2010-04-04 20:46:41.525738446 -0400
12885@@ -32,6 +32,12 @@ 13546@@ -32,6 +32,12 @@
12886 #include <asm/segment.h> 13547 #include <asm/segment.h>
12887 #include <asm/page_types.h> 13548 #include <asm/page_types.h>
@@ -12904,9 +13565,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/trampoline_32.S linux-2.6.32.10/arch/
12904 13565
12905 # These need to be in the same 64K segment as the above; 13566 # These need to be in the same 64K segment as the above;
12906 # hence we don't use the boot_gdt_descr defined in head.S 13567 # hence we don't use the boot_gdt_descr defined in head.S
12907diff -urNp linux-2.6.32.10/arch/x86/kernel/traps.c linux-2.6.32.10/arch/x86/kernel/traps.c 13568diff -urNp linux-2.6.32.11/arch/x86/kernel/traps.c linux-2.6.32.11/arch/x86/kernel/traps.c
12908--- linux-2.6.32.10/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 13569--- linux-2.6.32.11/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
12909+++ linux-2.6.32.10/arch/x86/kernel/traps.c 2010-03-20 15:58:46.953540376 -0400 13570+++ linux-2.6.32.11/arch/x86/kernel/traps.c 2010-04-04 20:46:41.525738446 -0400
12910@@ -69,12 +69,6 @@ asmlinkage int system_call(void); 13571@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
12911 13572
12912 /* Do we ignore FPU interrupts ? */ 13573 /* Do we ignore FPU interrupts ? */
@@ -13056,9 +13717,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/traps.c linux-2.6.32.10/arch/x86/kern
13056 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); 13717 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
13057 return; 13718 return;
13058 } 13719 }
13059diff -urNp linux-2.6.32.10/arch/x86/kernel/tsc.c linux-2.6.32.10/arch/x86/kernel/tsc.c 13720diff -urNp linux-2.6.32.11/arch/x86/kernel/tsc.c linux-2.6.32.11/arch/x86/kernel/tsc.c
13060--- linux-2.6.32.10/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400 13721--- linux-2.6.32.11/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400
13061+++ linux-2.6.32.10/arch/x86/kernel/tsc.c 2010-03-20 15:58:46.953540376 -0400 13722+++ linux-2.6.32.11/arch/x86/kernel/tsc.c 2010-04-04 20:46:41.525738446 -0400
13062@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b 13723@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b
13063 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), 13724 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
13064 }, 13725 },
@@ -13068,9 +13729,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/tsc.c linux-2.6.32.10/arch/x86/kernel
13068 }; 13729 };
13069 13730
13070 static void __init check_system_tsc_reliable(void) 13731 static void __init check_system_tsc_reliable(void)
13071diff -urNp linux-2.6.32.10/arch/x86/kernel/vm86_32.c linux-2.6.32.10/arch/x86/kernel/vm86_32.c 13732diff -urNp linux-2.6.32.11/arch/x86/kernel/vm86_32.c linux-2.6.32.11/arch/x86/kernel/vm86_32.c
13072--- linux-2.6.32.10/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400 13733--- linux-2.6.32.11/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400
13073+++ linux-2.6.32.10/arch/x86/kernel/vm86_32.c 2010-03-20 15:58:46.953540376 -0400 13734+++ linux-2.6.32.11/arch/x86/kernel/vm86_32.c 2010-04-04 20:46:41.525738446 -0400
13074@@ -41,6 +41,7 @@ 13735@@ -41,6 +41,7 @@
13075 #include <linux/ptrace.h> 13736 #include <linux/ptrace.h>
13076 #include <linux/audit.h> 13737 #include <linux/audit.h>
@@ -13135,9 +13796,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/vm86_32.c linux-2.6.32.10/arch/x86/ke
13135 if (get_user(segoffs, intr_ptr)) 13796 if (get_user(segoffs, intr_ptr))
13136 goto cannot_handle; 13797 goto cannot_handle;
13137 if ((segoffs >> 16) == BIOSSEG) 13798 if ((segoffs >> 16) == BIOSSEG)
13138diff -urNp linux-2.6.32.10/arch/x86/kernel/vmi_32.c linux-2.6.32.10/arch/x86/kernel/vmi_32.c 13799diff -urNp linux-2.6.32.11/arch/x86/kernel/vmi_32.c linux-2.6.32.11/arch/x86/kernel/vmi_32.c
13139--- linux-2.6.32.10/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400 13800--- linux-2.6.32.11/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400
13140+++ linux-2.6.32.10/arch/x86/kernel/vmi_32.c 2010-03-20 15:58:46.953540376 -0400 13801+++ linux-2.6.32.11/arch/x86/kernel/vmi_32.c 2010-04-04 20:46:41.525738446 -0400
13141@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) 13802@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
13142 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); 13803 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
13143 13804
@@ -13297,9 +13958,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/vmi_32.c linux-2.6.32.10/arch/x86/ker
13297 return; 13958 return;
13298 13959
13299 local_irq_save(flags); 13960 local_irq_save(flags);
13300diff -urNp linux-2.6.32.10/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.10/arch/x86/kernel/vmlinux.lds.S 13961diff -urNp linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S
13301--- linux-2.6.32.10/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 13962--- linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
13302+++ linux-2.6.32.10/arch/x86/kernel/vmlinux.lds.S 2010-03-20 15:58:46.953540376 -0400 13963+++ linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S 2010-04-04 20:46:41.529538490 -0400
13303@@ -26,6 +26,22 @@ 13964@@ -26,6 +26,22 @@
13304 #include <asm/page_types.h> 13965 #include <asm/page_types.h>
13305 #include <asm/cache.h> 13966 #include <asm/cache.h>
@@ -13587,9 +14248,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.10/arch/x8
13587 "kernel image bigger than KERNEL_IMAGE_SIZE"); 14248 "kernel image bigger than KERNEL_IMAGE_SIZE");
13588 14249
13589 #ifdef CONFIG_SMP 14250 #ifdef CONFIG_SMP
13590diff -urNp linux-2.6.32.10/arch/x86/kernel/vsyscall_64.c linux-2.6.32.10/arch/x86/kernel/vsyscall_64.c 14251diff -urNp linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c
13591--- linux-2.6.32.10/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400 14252--- linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400
13592+++ linux-2.6.32.10/arch/x86/kernel/vsyscall_64.c 2010-03-20 15:58:46.953540376 -0400 14253+++ linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c 2010-04-04 20:46:41.529538490 -0400
13593@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa 14254@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa
13594 14255
13595 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); 14256 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -13623,9 +14284,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/vsyscall_64.c linux-2.6.32.10/arch/x8
13623 }; 14284 };
13624 #endif 14285 #endif
13625 14286
13626diff -urNp linux-2.6.32.10/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.10/arch/x86/kernel/x8664_ksyms_64.c 14287diff -urNp linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c
13627--- linux-2.6.32.10/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400 14288--- linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400
13628+++ linux-2.6.32.10/arch/x86/kernel/x8664_ksyms_64.c 2010-03-20 15:58:46.953540376 -0400 14289+++ linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c 2010-04-04 20:46:41.529538490 -0400
13629@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); 14290@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
13630 14291
13631 EXPORT_SYMBOL(copy_user_generic); 14292 EXPORT_SYMBOL(copy_user_generic);
@@ -13635,9 +14296,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.10/arch
13635 EXPORT_SYMBOL(__copy_from_user_inatomic); 14296 EXPORT_SYMBOL(__copy_from_user_inatomic);
13636 14297
13637 EXPORT_SYMBOL(copy_page); 14298 EXPORT_SYMBOL(copy_page);
13638diff -urNp linux-2.6.32.10/arch/x86/kernel/xsave.c linux-2.6.32.10/arch/x86/kernel/xsave.c 14299diff -urNp linux-2.6.32.11/arch/x86/kernel/xsave.c linux-2.6.32.11/arch/x86/kernel/xsave.c
13639--- linux-2.6.32.10/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400 14300--- linux-2.6.32.11/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400
13640+++ linux-2.6.32.10/arch/x86/kernel/xsave.c 2010-03-20 15:58:46.953540376 -0400 14301+++ linux-2.6.32.11/arch/x86/kernel/xsave.c 2010-04-04 20:46:41.529538490 -0400
13641@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ 14302@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
13642 fx_sw_user->xstate_size > fx_sw_user->extended_size) 14303 fx_sw_user->xstate_size > fx_sw_user->extended_size)
13643 return -1; 14304 return -1;
@@ -13665,9 +14326,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kernel/xsave.c linux-2.6.32.10/arch/x86/kern
13665 buf); 14326 buf);
13666 if (unlikely(err)) { 14327 if (unlikely(err)) {
13667 /* 14328 /*
13668diff -urNp linux-2.6.32.10/arch/x86/kvm/emulate.c linux-2.6.32.10/arch/x86/kvm/emulate.c 14329diff -urNp linux-2.6.32.11/arch/x86/kvm/emulate.c linux-2.6.32.11/arch/x86/kvm/emulate.c
13669--- linux-2.6.32.10/arch/x86/kvm/emulate.c 2010-03-15 11:52:04.000000000 -0400 14330--- linux-2.6.32.11/arch/x86/kvm/emulate.c 2010-03-15 11:52:04.000000000 -0400
13670+++ linux-2.6.32.10/arch/x86/kvm/emulate.c 2010-03-20 15:58:46.953540376 -0400 14331+++ linux-2.6.32.11/arch/x86/kvm/emulate.c 2010-04-04 20:46:41.529538490 -0400
13671@@ -404,6 +404,7 @@ static u32 group2_table[] = { 14332@@ -404,6 +404,7 @@ static u32 group2_table[] = {
13672 14333
13673 #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \ 14334 #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \
@@ -13693,9 +14354,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kvm/emulate.c linux-2.6.32.10/arch/x86/kvm/e
13693 switch ((_dst).bytes) { \ 14354 switch ((_dst).bytes) { \
13694 case 1: \ 14355 case 1: \
13695 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ 14356 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
13696diff -urNp linux-2.6.32.10/arch/x86/kvm/svm.c linux-2.6.32.10/arch/x86/kvm/svm.c 14357diff -urNp linux-2.6.32.11/arch/x86/kvm/svm.c linux-2.6.32.11/arch/x86/kvm/svm.c
13697--- linux-2.6.32.10/arch/x86/kvm/svm.c 2010-03-15 11:52:04.000000000 -0400 14358--- linux-2.6.32.11/arch/x86/kvm/svm.c 2010-03-15 11:52:04.000000000 -0400
13698+++ linux-2.6.32.10/arch/x86/kvm/svm.c 2010-03-20 15:58:46.953540376 -0400 14359+++ linux-2.6.32.11/arch/x86/kvm/svm.c 2010-04-04 20:46:41.529538490 -0400
13699@@ -2389,9 +2389,12 @@ static int handle_exit(struct kvm_run *k 14360@@ -2389,9 +2389,12 @@ static int handle_exit(struct kvm_run *k
13700 static void reload_tss(struct kvm_vcpu *vcpu) 14361 static void reload_tss(struct kvm_vcpu *vcpu)
13701 { 14362 {
@@ -13719,9 +14380,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kvm/svm.c linux-2.6.32.10/arch/x86/kvm/svm.c
13719 .cpu_has_kvm_support = has_svm, 14380 .cpu_has_kvm_support = has_svm,
13720 .disabled_by_bios = is_disabled, 14381 .disabled_by_bios = is_disabled,
13721 .hardware_setup = svm_hardware_setup, 14382 .hardware_setup = svm_hardware_setup,
13722diff -urNp linux-2.6.32.10/arch/x86/kvm/vmx.c linux-2.6.32.10/arch/x86/kvm/vmx.c 14383diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c
13723--- linux-2.6.32.10/arch/x86/kvm/vmx.c 2010-03-15 11:52:04.000000000 -0400 14384--- linux-2.6.32.11/arch/x86/kvm/vmx.c 2010-03-15 11:52:04.000000000 -0400
13724+++ linux-2.6.32.10/arch/x86/kvm/vmx.c 2010-03-20 15:58:46.953540376 -0400 14385+++ linux-2.6.32.11/arch/x86/kvm/vmx.c 2010-04-04 20:46:41.529538490 -0400
13725@@ -566,7 +566,11 @@ static void reload_tss(void) 14386@@ -566,7 +566,11 @@ static void reload_tss(void)
13726 14387
13727 kvm_get_gdt(&gdt); 14388 kvm_get_gdt(&gdt);
@@ -13800,9 +14461,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kvm/vmx.c linux-2.6.32.10/arch/x86/kvm/vmx.c
13800 .cpu_has_kvm_support = cpu_has_kvm_support, 14461 .cpu_has_kvm_support = cpu_has_kvm_support,
13801 .disabled_by_bios = vmx_disabled_by_bios, 14462 .disabled_by_bios = vmx_disabled_by_bios,
13802 .hardware_setup = hardware_setup, 14463 .hardware_setup = hardware_setup,
13803diff -urNp linux-2.6.32.10/arch/x86/kvm/x86.c linux-2.6.32.10/arch/x86/kvm/x86.c 14464diff -urNp linux-2.6.32.11/arch/x86/kvm/x86.c linux-2.6.32.11/arch/x86/kvm/x86.c
13804--- linux-2.6.32.10/arch/x86/kvm/x86.c 2010-03-15 11:52:04.000000000 -0400 14465--- linux-2.6.32.11/arch/x86/kvm/x86.c 2010-03-15 11:52:04.000000000 -0400
13805+++ linux-2.6.32.10/arch/x86/kvm/x86.c 2010-03-20 15:58:46.973540531 -0400 14466+++ linux-2.6.32.11/arch/x86/kvm/x86.c 2010-04-04 20:46:41.529538490 -0400
13806@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct 14467@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct
13807 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, 14468 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
13808 struct kvm_cpuid_entry2 __user *entries); 14469 struct kvm_cpuid_entry2 __user *entries);
@@ -13904,9 +14565,9 @@ diff -urNp linux-2.6.32.10/arch/x86/kvm/x86.c linux-2.6.32.10/arch/x86/kvm/x86.c
13904 14565
13905 if (kvm_x86_ops) { 14566 if (kvm_x86_ops) {
13906 printk(KERN_ERR "kvm: already loaded the other module\n"); 14567 printk(KERN_ERR "kvm: already loaded the other module\n");
13907diff -urNp linux-2.6.32.10/arch/x86/lib/checksum_32.S linux-2.6.32.10/arch/x86/lib/checksum_32.S 14568diff -urNp linux-2.6.32.11/arch/x86/lib/checksum_32.S linux-2.6.32.11/arch/x86/lib/checksum_32.S
13908--- linux-2.6.32.10/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400 14569--- linux-2.6.32.11/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400
13909+++ linux-2.6.32.10/arch/x86/lib/checksum_32.S 2010-03-20 15:58:46.973540531 -0400 14570+++ linux-2.6.32.11/arch/x86/lib/checksum_32.S 2010-04-04 20:46:41.529538490 -0400
13910@@ -28,7 +28,8 @@ 14571@@ -28,7 +28,8 @@
13911 #include <linux/linkage.h> 14572 #include <linux/linkage.h>
13912 #include <asm/dwarf2.h> 14573 #include <asm/dwarf2.h>
@@ -14152,9 +14813,9 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/checksum_32.S linux-2.6.32.10/arch/x86/l
14152 14813
14153 #undef ROUND 14814 #undef ROUND
14154 #undef ROUND1 14815 #undef ROUND1
14155diff -urNp linux-2.6.32.10/arch/x86/lib/clear_page_64.S linux-2.6.32.10/arch/x86/lib/clear_page_64.S 14816diff -urNp linux-2.6.32.11/arch/x86/lib/clear_page_64.S linux-2.6.32.11/arch/x86/lib/clear_page_64.S
14156--- linux-2.6.32.10/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400 14817--- linux-2.6.32.11/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400
14157+++ linux-2.6.32.10/arch/x86/lib/clear_page_64.S 2010-03-20 15:58:46.973540531 -0400 14818+++ linux-2.6.32.11/arch/x86/lib/clear_page_64.S 2010-04-04 20:46:41.529538490 -0400
14158@@ -43,7 +43,7 @@ ENDPROC(clear_page) 14819@@ -43,7 +43,7 @@ ENDPROC(clear_page)
14159 14820
14160 #include <asm/cpufeature.h> 14821 #include <asm/cpufeature.h>
@@ -14164,9 +14825,9 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/clear_page_64.S linux-2.6.32.10/arch/x86
14164 1: .byte 0xeb /* jmp <disp8> */ 14825 1: .byte 0xeb /* jmp <disp8> */
14165 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 14826 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
14166 2: 14827 2:
14167diff -urNp linux-2.6.32.10/arch/x86/lib/copy_page_64.S linux-2.6.32.10/arch/x86/lib/copy_page_64.S 14828diff -urNp linux-2.6.32.11/arch/x86/lib/copy_page_64.S linux-2.6.32.11/arch/x86/lib/copy_page_64.S
14168--- linux-2.6.32.10/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400 14829--- linux-2.6.32.11/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400
14169+++ linux-2.6.32.10/arch/x86/lib/copy_page_64.S 2010-03-20 15:58:46.973540531 -0400 14830+++ linux-2.6.32.11/arch/x86/lib/copy_page_64.S 2010-04-04 20:46:41.529538490 -0400
14170@@ -104,7 +104,7 @@ ENDPROC(copy_page) 14831@@ -104,7 +104,7 @@ ENDPROC(copy_page)
14171 14832
14172 #include <asm/cpufeature.h> 14833 #include <asm/cpufeature.h>
@@ -14176,10 +14837,17 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/copy_page_64.S linux-2.6.32.10/arch/x86/
14176 1: .byte 0xeb /* jmp <disp8> */ 14837 1: .byte 0xeb /* jmp <disp8> */
14177 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 14838 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
14178 2: 14839 2:
14179diff -urNp linux-2.6.32.10/arch/x86/lib/copy_user_64.S linux-2.6.32.10/arch/x86/lib/copy_user_64.S 14840diff -urNp linux-2.6.32.11/arch/x86/lib/copy_user_64.S linux-2.6.32.11/arch/x86/lib/copy_user_64.S
14180--- linux-2.6.32.10/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400 14841--- linux-2.6.32.11/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400
14181+++ linux-2.6.32.10/arch/x86/lib/copy_user_64.S 2010-03-20 15:58:46.973540531 -0400 14842+++ linux-2.6.32.11/arch/x86/lib/copy_user_64.S 2010-04-04 20:58:33.225084964 -0400
14182@@ -21,7 +21,7 @@ 14843@@ -15,13 +15,14 @@
14844 #include <asm/asm-offsets.h>
14845 #include <asm/thread_info.h>
14846 #include <asm/cpufeature.h>
14847+#include <asm/pgtable.h>
14848
14849 .macro ALTERNATIVE_JUMP feature,orig,alt
14850 0:
14183 .byte 0xe9 /* 32bit jump */ 14851 .byte 0xe9 /* 32bit jump */
14184 .long \orig-1f /* by default jump to orig */ 14852 .long \orig-1f /* by default jump to orig */
14185 1: 14853 1:
@@ -14188,7 +14856,7 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/copy_user_64.S linux-2.6.32.10/arch/x86/
14188 2: .byte 0xe9 /* near jump with 32bit immediate */ 14856 2: .byte 0xe9 /* near jump with 32bit immediate */
14189 .long \alt-1b /* offset */ /* or alternatively to alt */ 14857 .long \alt-1b /* offset */ /* or alternatively to alt */
14190 .previous 14858 .previous
14191@@ -64,32 +64,6 @@ 14859@@ -64,32 +65,6 @@
14192 #endif 14860 #endif
14193 .endm 14861 .endm
14194 14862
@@ -14221,7 +14889,23 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/copy_user_64.S linux-2.6.32.10/arch/x86/
14221 ENTRY(copy_user_generic) 14889 ENTRY(copy_user_generic)
14222 CFI_STARTPROC 14890 CFI_STARTPROC
14223 ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string 14891 ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
14224@@ -107,6 +81,8 @@ ENDPROC(__copy_from_user_inatomic) 14892@@ -98,6 +73,15 @@ ENDPROC(copy_user_generic)
14893
14894 ENTRY(__copy_from_user_inatomic)
14895 CFI_STARTPROC
14896+
14897+#ifdef CONFIG_PAX_MEMORY_UDEREF
14898+ mov $PAX_USER_SHADOW_BASE,%rcx
14899+ cmp %rcx,%rsi
14900+ jae 1f
14901+ add %rcx,%rsi
14902+1:
14903+#endif
14904+
14905 ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
14906 CFI_ENDPROC
14907 ENDPROC(__copy_from_user_inatomic)
14908@@ -107,6 +91,8 @@ ENDPROC(__copy_from_user_inatomic)
14225 ENTRY(bad_from_user) 14909 ENTRY(bad_from_user)
14226 bad_from_user: 14910 bad_from_user:
14227 CFI_STARTPROC 14911 CFI_STARTPROC
@@ -14230,14 +14914,63 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/copy_user_64.S linux-2.6.32.10/arch/x86/
14230 movl %edx,%ecx 14914 movl %edx,%ecx
14231 xorl %eax,%eax 14915 xorl %eax,%eax
14232 rep 14916 rep
14233diff -urNp linux-2.6.32.10/arch/x86/lib/getuser.S linux-2.6.32.10/arch/x86/lib/getuser.S 14917diff -urNp linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S
14234--- linux-2.6.32.10/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400 14918--- linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400
14235+++ linux-2.6.32.10/arch/x86/lib/getuser.S 2010-03-20 15:58:46.973540531 -0400 14919+++ linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S 2010-04-04 20:58:33.225084964 -0400
14236@@ -33,14 +33,28 @@ 14920@@ -14,6 +14,7 @@
14921 #include <asm/current.h>
14922 #include <asm/asm-offsets.h>
14923 #include <asm/thread_info.h>
14924+#include <asm/pgtable.h>
14925
14926 .macro ALIGN_DESTINATION
14927 #ifdef FIX_ALIGNMENT
14928@@ -50,6 +51,15 @@
14929 */
14930 ENTRY(__copy_user_nocache)
14931 CFI_STARTPROC
14932+
14933+#ifdef CONFIG_PAX_MEMORY_UDEREF
14934+ mov $PAX_USER_SHADOW_BASE,%rcx
14935+ cmp %rcx,%rsi
14936+ jae 1f
14937+ add %rcx,%rsi
14938+1:
14939+#endif
14940+
14941 cmpl $8,%edx
14942 jb 20f /* less then 8 bytes, go to byte copy loop */
14943 ALIGN_DESTINATION
14944diff -urNp linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c
14945--- linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400
14946+++ linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c 2010-04-04 20:58:33.225084964 -0400
14947@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
14948 len -= 2;
14949 }
14950 }
14951+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
14952+ src += PAX_USER_SHADOW_BASE;
14953 isum = csum_partial_copy_generic((__force const void *)src,
14954 dst, len, isum, errp, NULL);
14955 if (unlikely(*errp))
14956@@ -105,6 +107,8 @@ csum_partial_copy_to_user(const void *sr
14957 }
14958
14959 *errp = 0;
14960+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
14961+ dst += PAX_USER_SHADOW_BASE;
14962 return csum_partial_copy_generic(src, (void __force *)dst,
14963 len, isum, NULL, errp);
14964 }
14965diff -urNp linux-2.6.32.11/arch/x86/lib/getuser.S linux-2.6.32.11/arch/x86/lib/getuser.S
14966--- linux-2.6.32.11/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400
14967+++ linux-2.6.32.11/arch/x86/lib/getuser.S 2010-04-04 20:58:33.225084964 -0400
14968@@ -33,14 +33,38 @@
14237 #include <asm/asm-offsets.h> 14969 #include <asm/asm-offsets.h>
14238 #include <asm/thread_info.h> 14970 #include <asm/thread_info.h>
14239 #include <asm/asm.h> 14971 #include <asm/asm.h>
14240+#include <asm/segment.h> 14972+#include <asm/segment.h>
14973+#include <asm/pgtable.h>
14241 14974
14242 .text 14975 .text
14243 ENTRY(__get_user_1) 14976 ENTRY(__get_user_1)
@@ -14250,6 +14983,15 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/getuser.S linux-2.6.32.10/arch/x86/lib/g
14250 GET_THREAD_INFO(%_ASM_DX) 14983 GET_THREAD_INFO(%_ASM_DX)
14251 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX 14984 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
14252 jae bad_get_user 14985 jae bad_get_user
14986+
14987+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
14988+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
14989+ cmp %_ASM_DX,%_ASM_AX
14990+ jae 1234f
14991+ add %_ASM_DX,%_ASM_AX
14992+1234:
14993+#endif
14994+
14253+#endif 14995+#endif
14254+ 14996+
14255 1: movzb (%_ASM_AX),%edx 14997 1: movzb (%_ASM_AX),%edx
@@ -14262,7 +15004,7 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/getuser.S linux-2.6.32.10/arch/x86/lib/g
14262 xor %eax,%eax 15004 xor %eax,%eax
14263 ret 15005 ret
14264 CFI_ENDPROC 15006 CFI_ENDPROC
14265@@ -49,11 +63,24 @@ ENDPROC(__get_user_1) 15007@@ -49,11 +73,33 @@ ENDPROC(__get_user_1)
14266 ENTRY(__get_user_2) 15008 ENTRY(__get_user_2)
14267 CFI_STARTPROC 15009 CFI_STARTPROC
14268 add $1,%_ASM_AX 15010 add $1,%_ASM_AX
@@ -14275,6 +15017,15 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/getuser.S linux-2.6.32.10/arch/x86/lib/g
14275 GET_THREAD_INFO(%_ASM_DX) 15017 GET_THREAD_INFO(%_ASM_DX)
14276 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX 15018 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
14277 jae bad_get_user 15019 jae bad_get_user
15020+
15021+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
15022+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
15023+ cmp %_ASM_DX,%_ASM_AX
15024+ jae 1234f
15025+ add %_ASM_DX,%_ASM_AX
15026+1234:
15027+#endif
15028+
14278+#endif 15029+#endif
14279+ 15030+
14280 2: movzwl -1(%_ASM_AX),%edx 15031 2: movzwl -1(%_ASM_AX),%edx
@@ -14287,7 +15038,7 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/getuser.S linux-2.6.32.10/arch/x86/lib/g
14287 xor %eax,%eax 15038 xor %eax,%eax
14288 ret 15039 ret
14289 CFI_ENDPROC 15040 CFI_ENDPROC
14290@@ -62,11 +89,24 @@ ENDPROC(__get_user_2) 15041@@ -62,11 +108,33 @@ ENDPROC(__get_user_2)
14291 ENTRY(__get_user_4) 15042 ENTRY(__get_user_4)
14292 CFI_STARTPROC 15043 CFI_STARTPROC
14293 add $3,%_ASM_AX 15044 add $3,%_ASM_AX
@@ -14300,6 +15051,15 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/getuser.S linux-2.6.32.10/arch/x86/lib/g
14300 GET_THREAD_INFO(%_ASM_DX) 15051 GET_THREAD_INFO(%_ASM_DX)
14301 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX 15052 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
14302 jae bad_get_user 15053 jae bad_get_user
15054+
15055+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
15056+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
15057+ cmp %_ASM_DX,%_ASM_AX
15058+ jae 1234f
15059+ add %_ASM_DX,%_ASM_AX
15060+1234:
15061+#endif
15062+
14303+#endif 15063+#endif
14304+ 15064+
14305 3: mov -3(%_ASM_AX),%edx 15065 3: mov -3(%_ASM_AX),%edx
@@ -14312,7 +15072,23 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/getuser.S linux-2.6.32.10/arch/x86/lib/g
14312 xor %eax,%eax 15072 xor %eax,%eax
14313 ret 15073 ret
14314 CFI_ENDPROC 15074 CFI_ENDPROC
14315@@ -89,6 +129,12 @@ ENDPROC(__get_user_8) 15075@@ -80,6 +148,15 @@ ENTRY(__get_user_8)
15076 GET_THREAD_INFO(%_ASM_DX)
15077 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
15078 jae bad_get_user
15079+
15080+#ifdef CONFIG_PAX_MEMORY_UDEREF
15081+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
15082+ cmp %_ASM_DX,%_ASM_AX
15083+ jae 1234f
15084+ add %_ASM_DX,%_ASM_AX
15085+1234:
15086+#endif
15087+
15088 4: movq -7(%_ASM_AX),%_ASM_DX
15089 xor %eax,%eax
15090 ret
15091@@ -89,6 +166,12 @@ ENDPROC(__get_user_8)
14316 15092
14317 bad_get_user: 15093 bad_get_user:
14318 CFI_STARTPROC 15094 CFI_STARTPROC
@@ -14325,9 +15101,9 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/getuser.S linux-2.6.32.10/arch/x86/lib/g
14325 xor %edx,%edx 15101 xor %edx,%edx
14326 mov $(-EFAULT),%_ASM_AX 15102 mov $(-EFAULT),%_ASM_AX
14327 ret 15103 ret
14328diff -urNp linux-2.6.32.10/arch/x86/lib/memcpy_64.S linux-2.6.32.10/arch/x86/lib/memcpy_64.S 15104diff -urNp linux-2.6.32.11/arch/x86/lib/memcpy_64.S linux-2.6.32.11/arch/x86/lib/memcpy_64.S
14329--- linux-2.6.32.10/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400 15105--- linux-2.6.32.11/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400
14330+++ linux-2.6.32.10/arch/x86/lib/memcpy_64.S 2010-03-20 15:58:46.973540531 -0400 15106+++ linux-2.6.32.11/arch/x86/lib/memcpy_64.S 2010-04-04 20:46:41.529538490 -0400
14331@@ -128,7 +128,7 @@ ENDPROC(__memcpy) 15107@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
14332 * It is also a lot simpler. Use this when possible: 15108 * It is also a lot simpler. Use this when possible:
14333 */ 15109 */
@@ -14337,9 +15113,9 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/memcpy_64.S linux-2.6.32.10/arch/x86/lib
14337 1: .byte 0xeb /* jmp <disp8> */ 15113 1: .byte 0xeb /* jmp <disp8> */
14338 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 15114 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
14339 2: 15115 2:
14340diff -urNp linux-2.6.32.10/arch/x86/lib/memset_64.S linux-2.6.32.10/arch/x86/lib/memset_64.S 15116diff -urNp linux-2.6.32.11/arch/x86/lib/memset_64.S linux-2.6.32.11/arch/x86/lib/memset_64.S
14341--- linux-2.6.32.10/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400 15117--- linux-2.6.32.11/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400
14342+++ linux-2.6.32.10/arch/x86/lib/memset_64.S 2010-03-20 15:58:46.973540531 -0400 15118+++ linux-2.6.32.11/arch/x86/lib/memset_64.S 2010-04-04 20:46:41.529538490 -0400
14343@@ -118,7 +118,7 @@ ENDPROC(__memset) 15119@@ -118,7 +118,7 @@ ENDPROC(__memset)
14344 15120
14345 #include <asm/cpufeature.h> 15121 #include <asm/cpufeature.h>
@@ -14349,9 +15125,9 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/memset_64.S linux-2.6.32.10/arch/x86/lib
14349 1: .byte 0xeb /* jmp <disp8> */ 15125 1: .byte 0xeb /* jmp <disp8> */
14350 .byte (memset_c - memset) - (2f - 1b) /* offset */ 15126 .byte (memset_c - memset) - (2f - 1b) /* offset */
14351 2: 15127 2:
14352diff -urNp linux-2.6.32.10/arch/x86/lib/mmx_32.c linux-2.6.32.10/arch/x86/lib/mmx_32.c 15128diff -urNp linux-2.6.32.11/arch/x86/lib/mmx_32.c linux-2.6.32.11/arch/x86/lib/mmx_32.c
14353--- linux-2.6.32.10/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400 15129--- linux-2.6.32.11/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400
14354+++ linux-2.6.32.10/arch/x86/lib/mmx_32.c 2010-03-20 15:58:46.973540531 -0400 15130+++ linux-2.6.32.11/arch/x86/lib/mmx_32.c 2010-04-04 20:46:41.533557286 -0400
14355@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * 15131@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
14356 { 15132 {
14357 void *p; 15133 void *p;
@@ -14667,18 +15443,20 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/mmx_32.c linux-2.6.32.10/arch/x86/lib/mm
14667 15443
14668 from += 64; 15444 from += 64;
14669 to += 64; 15445 to += 64;
14670diff -urNp linux-2.6.32.10/arch/x86/lib/putuser.S linux-2.6.32.10/arch/x86/lib/putuser.S 15446diff -urNp linux-2.6.32.11/arch/x86/lib/putuser.S linux-2.6.32.11/arch/x86/lib/putuser.S
14671--- linux-2.6.32.10/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400 15447--- linux-2.6.32.11/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400
14672+++ linux-2.6.32.10/arch/x86/lib/putuser.S 2010-03-20 15:58:46.973540531 -0400 15448+++ linux-2.6.32.11/arch/x86/lib/putuser.S 2010-04-04 20:58:33.225084964 -0400
14673@@ -15,6 +15,7 @@ 15449@@ -15,7 +15,8 @@
14674 #include <asm/thread_info.h> 15450 #include <asm/thread_info.h>
14675 #include <asm/errno.h> 15451 #include <asm/errno.h>
14676 #include <asm/asm.h> 15452 #include <asm/asm.h>
15453-
14677+#include <asm/segment.h> 15454+#include <asm/segment.h>
14678 15455+#include <asm/pgtable.h>
14679 15456
14680 /* 15457 /*
14681@@ -29,59 +30,120 @@ 15458 * __put_user_X
15459@@ -29,59 +30,156 @@
14682 * as they get called from within inline assembly. 15460 * as they get called from within inline assembly.
14683 */ 15461 */
14684 15462
@@ -14699,6 +15477,15 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/putuser.S linux-2.6.32.10/arch/x86/lib/p
14699+ GET_THREAD_INFO(%_ASM_BX) 15477+ GET_THREAD_INFO(%_ASM_BX)
14700 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX 15478 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
14701 jae bad_put_user 15479 jae bad_put_user
15480+
15481+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
15482+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
15483+ cmp %_ASM_BX,%_ASM_CX
15484+ jae 1234f
15485+ add %_ASM_BX,%_ASM_CX
15486+1234:
15487+#endif
15488+
14702+#endif 15489+#endif
14703+ 15490+
14704 1: movb %al,(%_ASM_CX) 15491 1: movb %al,(%_ASM_CX)
@@ -14724,6 +15511,15 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/putuser.S linux-2.6.32.10/arch/x86/lib/p
14724 sub $1,%_ASM_BX 15511 sub $1,%_ASM_BX
14725 cmp %_ASM_BX,%_ASM_CX 15512 cmp %_ASM_BX,%_ASM_CX
14726 jae bad_put_user 15513 jae bad_put_user
15514+
15515+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
15516+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
15517+ cmp %_ASM_BX,%_ASM_CX
15518+ jae 1234f
15519+ add %_ASM_BX,%_ASM_CX
15520+1234:
15521+#endif
15522+
14727+#endif 15523+#endif
14728+ 15524+
14729 2: movw %ax,(%_ASM_CX) 15525 2: movw %ax,(%_ASM_CX)
@@ -14749,6 +15545,15 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/putuser.S linux-2.6.32.10/arch/x86/lib/p
14749 sub $3,%_ASM_BX 15545 sub $3,%_ASM_BX
14750 cmp %_ASM_BX,%_ASM_CX 15546 cmp %_ASM_BX,%_ASM_CX
14751 jae bad_put_user 15547 jae bad_put_user
15548+
15549+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
15550+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
15551+ cmp %_ASM_BX,%_ASM_CX
15552+ jae 1234f
15553+ add %_ASM_BX,%_ASM_CX
15554+1234:
15555+#endif
15556+
14752+#endif 15557+#endif
14753+ 15558+
14754 3: movl %eax,(%_ASM_CX) 15559 3: movl %eax,(%_ASM_CX)
@@ -14774,6 +15579,15 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/putuser.S linux-2.6.32.10/arch/x86/lib/p
14774 sub $7,%_ASM_BX 15579 sub $7,%_ASM_BX
14775 cmp %_ASM_BX,%_ASM_CX 15580 cmp %_ASM_BX,%_ASM_CX
14776 jae bad_put_user 15581 jae bad_put_user
15582+
15583+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
15584+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
15585+ cmp %_ASM_BX,%_ASM_CX
15586+ jae 1234f
15587+ add %_ASM_BX,%_ASM_CX
15588+1234:
15589+#endif
15590+
14777+#endif 15591+#endif
14778+ 15592+
14779 4: mov %_ASM_AX,(%_ASM_CX) 15593 4: mov %_ASM_AX,(%_ASM_CX)
@@ -14801,9 +15615,9 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/putuser.S linux-2.6.32.10/arch/x86/lib/p
14801 movl $-EFAULT,%eax 15615 movl $-EFAULT,%eax
14802 EXIT 15616 EXIT
14803 END(bad_put_user) 15617 END(bad_put_user)
14804diff -urNp linux-2.6.32.10/arch/x86/lib/usercopy_32.c linux-2.6.32.10/arch/x86/lib/usercopy_32.c 15618diff -urNp linux-2.6.32.11/arch/x86/lib/usercopy_32.c linux-2.6.32.11/arch/x86/lib/usercopy_32.c
14805--- linux-2.6.32.10/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400 15619--- linux-2.6.32.11/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400
14806+++ linux-2.6.32.10/arch/x86/lib/usercopy_32.c 2010-03-20 15:58:46.973540531 -0400 15620+++ linux-2.6.32.11/arch/x86/lib/usercopy_32.c 2010-04-04 20:46:41.533557286 -0400
14807@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned 15621@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
14808 * Copy a null terminated string from userspace. 15622 * Copy a null terminated string from userspace.
14809 */ 15623 */
@@ -15772,9 +16586,48 @@ diff -urNp linux-2.6.32.10/arch/x86/lib/usercopy_32.c linux-2.6.32.10/arch/x86/l
15772+#endif 16586+#endif
15773+ 16587+
15774+EXPORT_SYMBOL(set_fs); 16588+EXPORT_SYMBOL(set_fs);
15775diff -urNp linux-2.6.32.10/arch/x86/Makefile linux-2.6.32.10/arch/x86/Makefile 16589diff -urNp linux-2.6.32.11/arch/x86/lib/usercopy_64.c linux-2.6.32.11/arch/x86/lib/usercopy_64.c
15776--- linux-2.6.32.10/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400 16590--- linux-2.6.32.11/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400
15777+++ linux-2.6.32.10/arch/x86/Makefile 2010-03-20 15:58:46.973540531 -0400 16591+++ linux-2.6.32.11/arch/x86/lib/usercopy_64.c 2010-04-04 20:58:33.225084964 -0400
16592@@ -42,6 +42,8 @@ long
16593 __strncpy_from_user(char *dst, const char __user *src, long count)
16594 {
16595 long res;
16596+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
16597+ src += PAX_USER_SHADOW_BASE;
16598 __do_strncpy_from_user(dst, src, count, res);
16599 return res;
16600 }
16601@@ -65,6 +67,8 @@ unsigned long __clear_user(void __user *
16602 {
16603 long __d0;
16604 might_fault();
16605+ if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
16606+ addr += PAX_USER_SHADOW_BASE;
16607 /* no memory constraint because it doesn't change any memory gcc knows
16608 about */
16609 asm volatile(
16610@@ -151,10 +155,14 @@ EXPORT_SYMBOL(strlen_user);
16611
16612 unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
16613 {
16614- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
16615+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
16616+ if ((unsigned long)to < PAX_USER_SHADOW_BASE)
16617+ to += PAX_USER_SHADOW_BASE;
16618+ if ((unsigned long)from < PAX_USER_SHADOW_BASE)
16619+ from += PAX_USER_SHADOW_BASE;
16620 return copy_user_generic((__force void *)to, (__force void *)from, len);
16621- }
16622- return len;
16623+ }
16624+ return len;
16625 }
16626 EXPORT_SYMBOL(copy_in_user);
16627
16628diff -urNp linux-2.6.32.11/arch/x86/Makefile linux-2.6.32.11/arch/x86/Makefile
16629--- linux-2.6.32.11/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400
16630+++ linux-2.6.32.11/arch/x86/Makefile 2010-04-04 20:46:41.533557286 -0400
15778@@ -189,3 +189,12 @@ define archhelp 16631@@ -189,3 +189,12 @@ define archhelp
15779 echo ' FDARGS="..." arguments for the booted kernel' 16632 echo ' FDARGS="..." arguments for the booted kernel'
15780 echo ' FDINITRD=file initrd for the booted kernel' 16633 echo ' FDINITRD=file initrd for the booted kernel'
@@ -15788,9 +16641,9 @@ diff -urNp linux-2.6.32.10/arch/x86/Makefile linux-2.6.32.10/arch/x86/Makefile
15788+ 16641+
15789+archprepare: 16642+archprepare:
15790+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) 16643+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
15791diff -urNp linux-2.6.32.10/arch/x86/mm/extable.c linux-2.6.32.10/arch/x86/mm/extable.c 16644diff -urNp linux-2.6.32.11/arch/x86/mm/extable.c linux-2.6.32.11/arch/x86/mm/extable.c
15792--- linux-2.6.32.10/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400 16645--- linux-2.6.32.11/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400
15793+++ linux-2.6.32.10/arch/x86/mm/extable.c 2010-03-20 15:58:46.973540531 -0400 16646+++ linux-2.6.32.11/arch/x86/mm/extable.c 2010-04-04 20:46:41.533557286 -0400
15794@@ -1,14 +1,71 @@ 16647@@ -1,14 +1,71 @@
15795 #include <linux/module.h> 16648 #include <linux/module.h>
15796 #include <linux/spinlock.h> 16649 #include <linux/spinlock.h>
@@ -15864,10 +16717,10 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/extable.c linux-2.6.32.10/arch/x86/mm/ext
15864 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; 16717 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
15865 extern u32 pnp_bios_is_utter_crap; 16718 extern u32 pnp_bios_is_utter_crap;
15866 pnp_bios_is_utter_crap = 1; 16719 pnp_bios_is_utter_crap = 1;
15867diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault.c 16720diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault.c
15868--- linux-2.6.32.10/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 16721--- linux-2.6.32.11/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
15869+++ linux-2.6.32.10/arch/x86/mm/fault.c 2010-03-20 15:58:46.977545072 -0400 16722+++ linux-2.6.32.11/arch/x86/mm/fault.c 2010-04-04 20:58:33.225084964 -0400
15870@@ -11,10 +11,14 @@ 16723@@ -11,10 +11,19 @@
15871 #include <linux/kprobes.h> /* __kprobes, ... */ 16724 #include <linux/kprobes.h> /* __kprobes, ... */
15872 #include <linux/mmiotrace.h> /* kmmio_handler, ... */ 16725 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
15873 #include <linux/perf_event.h> /* perf_sw_event */ 16726 #include <linux/perf_event.h> /* perf_sw_event */
@@ -15879,10 +16732,15 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault
15879 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */ 16732 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
15880+#include <asm/vsyscall.h> 16733+#include <asm/vsyscall.h>
15881+#include <asm/tlbflush.h> 16734+#include <asm/tlbflush.h>
16735+
16736+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16737+#include <asm/stacktrace.h>
16738+#include "../kernel/dumpstack.h"
16739+#endif
15882 16740
15883 /* 16741 /*
15884 * Page fault error code bits: 16742 * Page fault error code bits:
15885@@ -51,7 +55,7 @@ static inline int notify_page_fault(stru 16743@@ -51,7 +60,7 @@ static inline int notify_page_fault(stru
15886 int ret = 0; 16744 int ret = 0;
15887 16745
15888 /* kprobe_running() needs smp_processor_id() */ 16746 /* kprobe_running() needs smp_processor_id() */
@@ -15891,7 +16749,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault
15891 preempt_disable(); 16749 preempt_disable();
15892 if (kprobe_running() && kprobe_fault_handler(regs, 14)) 16750 if (kprobe_running() && kprobe_fault_handler(regs, 14))
15893 ret = 1; 16751 ret = 1;
15894@@ -172,6 +176,30 @@ force_sig_info_fault(int si_signo, int s 16752@@ -172,6 +181,30 @@ force_sig_info_fault(int si_signo, int s
15895 force_sig_info(si_signo, &info, tsk); 16753 force_sig_info(si_signo, &info, tsk);
15896 } 16754 }
15897 16755
@@ -15922,7 +16780,50 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault
15922 DEFINE_SPINLOCK(pgd_lock); 16780 DEFINE_SPINLOCK(pgd_lock);
15923 LIST_HEAD(pgd_list); 16781 LIST_HEAD(pgd_list);
15924 16782
15925@@ -535,7 +563,7 @@ static int is_errata93(struct pt_regs *r 16783@@ -332,15 +365,27 @@ void vmalloc_sync_all(void)
16784
16785 const pgd_t *pgd_ref = pgd_offset_k(address);
16786 unsigned long flags;
16787+
16788+#ifdef CONFIG_PAX_PER_CPU_PGD
16789+ unsigned long cpu;
16790+#else
16791 struct page *page;
16792+#endif
16793
16794 if (pgd_none(*pgd_ref))
16795 continue;
16796
16797 spin_lock_irqsave(&pgd_lock, flags);
16798+
16799+#ifdef CONFIG_PAX_PER_CPU_PGD
16800+ for (cpu = 0; cpu < NR_CPUS; ++cpu) {
16801+ pgd_t *pgd = pgd_offset_cpu(cpu, address);
16802+#else
16803 list_for_each_entry(page, &pgd_list, lru) {
16804 pgd_t *pgd;
16805 pgd = (pgd_t *)page_address(page) + pgd_index(address);
16806+#endif
16807+
16808 if (pgd_none(*pgd))
16809 set_pgd(pgd, *pgd_ref);
16810 else
16811@@ -373,7 +418,14 @@ static noinline int vmalloc_fault(unsign
16812 * happen within a race in page table update. In the later
16813 * case just flush:
16814 */
16815+
16816+#ifdef CONFIG_PAX_PER_CPU_PGD
16817+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
16818+ pgd = pgd_offset_cpu(smp_processor_id(), address);
16819+#else
16820 pgd = pgd_offset(current->active_mm, address);
16821+#endif
16822+
16823 pgd_ref = pgd_offset_k(address);
16824 if (pgd_none(*pgd_ref))
16825 return -1;
16826@@ -535,7 +587,7 @@ static int is_errata93(struct pt_regs *r
15926 static int is_errata100(struct pt_regs *regs, unsigned long address) 16827 static int is_errata100(struct pt_regs *regs, unsigned long address)
15927 { 16828 {
15928 #ifdef CONFIG_X86_64 16829 #ifdef CONFIG_X86_64
@@ -15931,7 +16832,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault
15931 return 1; 16832 return 1;
15932 #endif 16833 #endif
15933 return 0; 16834 return 0;
15934@@ -562,7 +590,7 @@ static int is_f00f_bug(struct pt_regs *r 16835@@ -562,7 +614,7 @@ static int is_f00f_bug(struct pt_regs *r
15935 } 16836 }
15936 16837
15937 static const char nx_warning[] = KERN_CRIT 16838 static const char nx_warning[] = KERN_CRIT
@@ -15940,7 +16841,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault
15940 16841
15941 static void 16842 static void
15942 show_fault_oops(struct pt_regs *regs, unsigned long error_code, 16843 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
15943@@ -571,15 +599,26 @@ show_fault_oops(struct pt_regs *regs, un 16844@@ -571,15 +623,26 @@ show_fault_oops(struct pt_regs *regs, un
15944 if (!oops_may_print()) 16845 if (!oops_may_print())
15945 return; 16846 return;
15946 16847
@@ -15969,7 +16870,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault
15969 printk(KERN_ALERT "BUG: unable to handle kernel "); 16870 printk(KERN_ALERT "BUG: unable to handle kernel ");
15970 if (address < PAGE_SIZE) 16871 if (address < PAGE_SIZE)
15971 printk(KERN_CONT "NULL pointer dereference"); 16872 printk(KERN_CONT "NULL pointer dereference");
15972@@ -704,6 +743,68 @@ __bad_area_nosemaphore(struct pt_regs *r 16873@@ -704,6 +767,68 @@ __bad_area_nosemaphore(struct pt_regs *r
15973 unsigned long address, int si_code) 16874 unsigned long address, int si_code)
15974 { 16875 {
15975 struct task_struct *tsk = current; 16876 struct task_struct *tsk = current;
@@ -16038,7 +16939,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault
16038 16939
16039 /* User mode accesses just cause a SIGSEGV */ 16940 /* User mode accesses just cause a SIGSEGV */
16040 if (error_code & PF_USER) { 16941 if (error_code & PF_USER) {
16041@@ -848,6 +949,106 @@ static int spurious_fault_check(unsigned 16942@@ -848,6 +973,106 @@ static int spurious_fault_check(unsigned
16042 return 1; 16943 return 1;
16043 } 16944 }
16044 16945
@@ -16145,7 +17046,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault
16145 /* 17046 /*
16146 * Handle a spurious fault caused by a stale TLB entry. 17047 * Handle a spurious fault caused by a stale TLB entry.
16147 * 17048 *
16148@@ -914,6 +1115,9 @@ int show_unhandled_signals = 1; 17049@@ -914,6 +1139,9 @@ int show_unhandled_signals = 1;
16149 static inline int 17050 static inline int
16150 access_error(unsigned long error_code, int write, struct vm_area_struct *vma) 17051 access_error(unsigned long error_code, int write, struct vm_area_struct *vma)
16151 { 17052 {
@@ -16155,7 +17056,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault
16155 if (write) { 17056 if (write) {
16156 /* write, present and write, not present: */ 17057 /* write, present and write, not present: */
16157 if (unlikely(!(vma->vm_flags & VM_WRITE))) 17058 if (unlikely(!(vma->vm_flags & VM_WRITE)))
16158@@ -947,17 +1151,16 @@ do_page_fault(struct pt_regs *regs, unsi 17059@@ -947,17 +1175,29 @@ do_page_fault(struct pt_regs *regs, unsi
16159 { 17060 {
16160 struct vm_area_struct *vma; 17061 struct vm_area_struct *vma;
16161 struct task_struct *tsk; 17062 struct task_struct *tsk;
@@ -16165,7 +17066,20 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault
16165 int fault; 17066 int fault;
16166 17067
16167+ /* Get the faulting address: */ 17068+ /* Get the faulting address: */
16168+ const unsigned long address = read_cr2(); 17069+ unsigned long address = read_cr2();
17070+
17071+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17072+ if (!user_mode(regs)) {
17073+ if (address < PAX_USER_SHADOW_BASE) {
17074+ if (search_exception_tables(regs->ip)) {
17075+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
17076+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
17077+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
17078+ }
17079+ } else if (address < 2 * PAX_USER_SHADOW_BASE)
17080+ address -= PAX_USER_SHADOW_BASE;
17081+ }
17082+#endif
16169+ 17083+
16170 tsk = current; 17084 tsk = current;
16171 mm = tsk->mm; 17085 mm = tsk->mm;
@@ -16176,7 +17090,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault
16176 /* 17090 /*
16177 * Detect and handle instructions that would cause a page fault for 17091 * Detect and handle instructions that would cause a page fault for
16178 * both a tracked kernel page and a userspace page. 17092 * both a tracked kernel page and a userspace page.
16179@@ -1017,7 +1220,7 @@ do_page_fault(struct pt_regs *regs, unsi 17093@@ -1017,7 +1257,7 @@ do_page_fault(struct pt_regs *regs, unsi
16180 * User-mode registers count as a user access even for any 17094 * User-mode registers count as a user access even for any
16181 * potential system fault or CPU buglet: 17095 * potential system fault or CPU buglet:
16182 */ 17096 */
@@ -16185,7 +17099,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault
16185 local_irq_enable(); 17099 local_irq_enable();
16186 error_code |= PF_USER; 17100 error_code |= PF_USER;
16187 } else { 17101 } else {
16188@@ -1071,6 +1274,11 @@ do_page_fault(struct pt_regs *regs, unsi 17102@@ -1071,6 +1311,11 @@ do_page_fault(struct pt_regs *regs, unsi
16189 might_sleep(); 17103 might_sleep();
16190 } 17104 }
16191 17105
@@ -16197,7 +17111,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault
16197 vma = find_vma(mm, address); 17111 vma = find_vma(mm, address);
16198 if (unlikely(!vma)) { 17112 if (unlikely(!vma)) {
16199 bad_area(regs, error_code, address); 17113 bad_area(regs, error_code, address);
16200@@ -1082,18 +1290,24 @@ do_page_fault(struct pt_regs *regs, unsi 17114@@ -1082,18 +1327,24 @@ do_page_fault(struct pt_regs *regs, unsi
16201 bad_area(regs, error_code, address); 17115 bad_area(regs, error_code, address);
16202 return; 17116 return;
16203 } 17117 }
@@ -16233,7 +17147,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault
16233 if (unlikely(expand_stack(vma, address))) { 17147 if (unlikely(expand_stack(vma, address))) {
16234 bad_area(regs, error_code, address); 17148 bad_area(regs, error_code, address);
16235 return; 17149 return;
16236@@ -1137,3 +1351,199 @@ good_area: 17150@@ -1137,3 +1388,199 @@ good_area:
16237 17151
16238 up_read(&mm->mmap_sem); 17152 up_read(&mm->mmap_sem);
16239 } 17153 }
@@ -16433,9 +17347,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault
16433+ 17347+
16434+ return ret ? -EFAULT : 0; 17348+ return ret ? -EFAULT : 0;
16435+} 17349+}
16436diff -urNp linux-2.6.32.10/arch/x86/mm/gup.c linux-2.6.32.10/arch/x86/mm/gup.c 17350diff -urNp linux-2.6.32.11/arch/x86/mm/gup.c linux-2.6.32.11/arch/x86/mm/gup.c
16437--- linux-2.6.32.10/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400 17351--- linux-2.6.32.11/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400
16438+++ linux-2.6.32.10/arch/x86/mm/gup.c 2010-03-20 15:58:46.977545072 -0400 17352+++ linux-2.6.32.11/arch/x86/mm/gup.c 2010-04-04 20:46:41.533557286 -0400
16439@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long 17353@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
16440 addr = start; 17354 addr = start;
16441 len = (unsigned long) nr_pages << PAGE_SHIFT; 17355 len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -16445,9 +17359,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/gup.c linux-2.6.32.10/arch/x86/mm/gup.c
16445 (void __user *)start, len))) 17359 (void __user *)start, len)))
16446 return 0; 17360 return 0;
16447 17361
16448diff -urNp linux-2.6.32.10/arch/x86/mm/highmem_32.c linux-2.6.32.10/arch/x86/mm/highmem_32.c 17362diff -urNp linux-2.6.32.11/arch/x86/mm/highmem_32.c linux-2.6.32.11/arch/x86/mm/highmem_32.c
16449--- linux-2.6.32.10/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400 17363--- linux-2.6.32.11/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400
16450+++ linux-2.6.32.10/arch/x86/mm/highmem_32.c 2010-03-20 15:58:46.977545072 -0400 17364+++ linux-2.6.32.11/arch/x86/mm/highmem_32.c 2010-04-04 20:46:41.533557286 -0400
16451@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page 17365@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
16452 idx = type + KM_TYPE_NR*smp_processor_id(); 17366 idx = type + KM_TYPE_NR*smp_processor_id();
16453 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); 17367 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -16459,9 +17373,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/highmem_32.c linux-2.6.32.10/arch/x86/mm/
16459 17373
16460 return (void *)vaddr; 17374 return (void *)vaddr;
16461 } 17375 }
16462diff -urNp linux-2.6.32.10/arch/x86/mm/hugetlbpage.c linux-2.6.32.10/arch/x86/mm/hugetlbpage.c 17376diff -urNp linux-2.6.32.11/arch/x86/mm/hugetlbpage.c linux-2.6.32.11/arch/x86/mm/hugetlbpage.c
16463--- linux-2.6.32.10/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400 17377--- linux-2.6.32.11/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400
16464+++ linux-2.6.32.10/arch/x86/mm/hugetlbpage.c 2010-03-20 15:58:46.977545072 -0400 17378+++ linux-2.6.32.11/arch/x86/mm/hugetlbpage.c 2010-04-04 20:46:41.533557286 -0400
16465@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe 17379@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe
16466 struct hstate *h = hstate_file(file); 17380 struct hstate *h = hstate_file(file);
16467 struct mm_struct *mm = current->mm; 17381 struct mm_struct *mm = current->mm;
@@ -16596,9 +17510,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/hugetlbpage.c linux-2.6.32.10/arch/x86/mm
16596 (!vma || addr + len <= vma->vm_start)) 17510 (!vma || addr + len <= vma->vm_start))
16597 return addr; 17511 return addr;
16598 } 17512 }
16599diff -urNp linux-2.6.32.10/arch/x86/mm/init_32.c linux-2.6.32.10/arch/x86/mm/init_32.c 17513diff -urNp linux-2.6.32.11/arch/x86/mm/init_32.c linux-2.6.32.11/arch/x86/mm/init_32.c
16600--- linux-2.6.32.10/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 17514--- linux-2.6.32.11/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
16601+++ linux-2.6.32.10/arch/x86/mm/init_32.c 2010-03-20 15:58:46.977545072 -0400 17515+++ linux-2.6.32.11/arch/x86/mm/init_32.c 2010-04-04 20:58:33.225084964 -0400
16602@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) 17516@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
16603 } 17517 }
16604 17518
@@ -16842,7 +17756,20 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/init_32.c linux-2.6.32.10/arch/x86/mm/ini
16842 PAGE_SIZE); 17756 PAGE_SIZE);
16843 if (bootmap == -1L) 17757 if (bootmap == -1L)
16844 panic("Cannot find bootmem map of size %ld\n", bootmap_size); 17758 panic("Cannot find bootmem map of size %ld\n", bootmap_size);
16845@@ -881,7 +880,7 @@ void __init mem_init(void) 17759@@ -864,6 +863,12 @@ void __init mem_init(void)
17760
17761 pci_iommu_alloc();
17762
17763+#ifdef CONFIG_PAX_PER_CPU_PGD
17764+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
17765+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
17766+ KERNEL_PGD_PTRS);
17767+#endif
17768+
17769 #ifdef CONFIG_FLATMEM
17770 BUG_ON(!mem_map);
17771 #endif
17772@@ -881,7 +886,7 @@ void __init mem_init(void)
16846 set_highmem_pages_init(); 17773 set_highmem_pages_init();
16847 17774
16848 codesize = (unsigned long) &_etext - (unsigned long) &_text; 17775 codesize = (unsigned long) &_etext - (unsigned long) &_text;
@@ -16851,7 +17778,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/init_32.c linux-2.6.32.10/arch/x86/mm/ini
16851 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; 17778 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
16852 17779
16853 printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, " 17780 printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
16854@@ -923,10 +922,10 @@ void __init mem_init(void) 17781@@ -923,10 +928,10 @@ void __init mem_init(void)
16855 ((unsigned long)&__init_end - 17782 ((unsigned long)&__init_end -
16856 (unsigned long)&__init_begin) >> 10, 17783 (unsigned long)&__init_begin) >> 10,
16857 17784
@@ -16865,7 +17792,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/init_32.c linux-2.6.32.10/arch/x86/mm/ini
16865 ((unsigned long)&_etext - (unsigned long)&_text) >> 10); 17792 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
16866 17793
16867 /* 17794 /*
16868@@ -1007,6 +1006,7 @@ void set_kernel_text_rw(void) 17795@@ -1007,6 +1012,7 @@ void set_kernel_text_rw(void)
16869 if (!kernel_set_to_readonly) 17796 if (!kernel_set_to_readonly)
16870 return; 17797 return;
16871 17798
@@ -16873,7 +17800,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/init_32.c linux-2.6.32.10/arch/x86/mm/ini
16873 pr_debug("Set kernel text: %lx - %lx for read write\n", 17800 pr_debug("Set kernel text: %lx - %lx for read write\n",
16874 start, start+size); 17801 start, start+size);
16875 17802
16876@@ -1021,6 +1021,7 @@ void set_kernel_text_ro(void) 17803@@ -1021,6 +1027,7 @@ void set_kernel_text_ro(void)
16877 if (!kernel_set_to_readonly) 17804 if (!kernel_set_to_readonly)
16878 return; 17805 return;
16879 17806
@@ -16881,7 +17808,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/init_32.c linux-2.6.32.10/arch/x86/mm/ini
16881 pr_debug("Set kernel text: %lx - %lx for read only\n", 17808 pr_debug("Set kernel text: %lx - %lx for read only\n",
16882 start, start+size); 17809 start, start+size);
16883 17810
16884@@ -1032,6 +1033,7 @@ void mark_rodata_ro(void) 17811@@ -1032,6 +1039,7 @@ void mark_rodata_ro(void)
16885 unsigned long start = PFN_ALIGN(_text); 17812 unsigned long start = PFN_ALIGN(_text);
16886 unsigned long size = PFN_ALIGN(_etext) - start; 17813 unsigned long size = PFN_ALIGN(_etext) - start;
16887 17814
@@ -16889,9 +17816,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/init_32.c linux-2.6.32.10/arch/x86/mm/ini
16889 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); 17816 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
16890 printk(KERN_INFO "Write protecting the kernel text: %luk\n", 17817 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
16891 size >> 10); 17818 size >> 10);
16892diff -urNp linux-2.6.32.10/arch/x86/mm/init_64.c linux-2.6.32.10/arch/x86/mm/init_64.c 17819diff -urNp linux-2.6.32.11/arch/x86/mm/init_64.c linux-2.6.32.11/arch/x86/mm/init_64.c
16893--- linux-2.6.32.10/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400 17820--- linux-2.6.32.11/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400
16894+++ linux-2.6.32.10/arch/x86/mm/init_64.c 2010-03-20 15:58:46.977545072 -0400 17821+++ linux-2.6.32.11/arch/x86/mm/init_64.c 2010-04-04 20:58:33.225084964 -0400
16895@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 17822@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
16896 pmd = fill_pmd(pud, vaddr); 17823 pmd = fill_pmd(pud, vaddr);
16897 pte = fill_pte(pmd, vaddr); 17824 pte = fill_pte(pmd, vaddr);
@@ -16919,7 +17846,20 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/init_64.c linux-2.6.32.10/arch/x86/mm/ini
16919 } 17846 }
16920 pmd = pmd_offset(pud, phys); 17847 pmd = pmd_offset(pud, phys);
16921 BUG_ON(!pmd_none(*pmd)); 17848 BUG_ON(!pmd_none(*pmd));
16922@@ -842,8 +842,8 @@ int kern_addr_valid(unsigned long addr) 17849@@ -656,6 +656,12 @@ void __init mem_init(void)
17850
17851 pci_iommu_alloc();
17852
17853+#ifdef CONFIG_PAX_PER_CPU_PGD
17854+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
17855+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
17856+ KERNEL_PGD_PTRS);
17857+#endif
17858+
17859 /* clear_bss() already clear the empty_zero_page */
17860
17861 reservedpages = 0;
17862@@ -842,8 +848,8 @@ int kern_addr_valid(unsigned long addr)
16923 static struct vm_area_struct gate_vma = { 17863 static struct vm_area_struct gate_vma = {
16924 .vm_start = VSYSCALL_START, 17864 .vm_start = VSYSCALL_START,
16925 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE), 17865 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
@@ -16930,7 +17870,7 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/init_64.c linux-2.6.32.10/arch/x86/mm/ini
16930 }; 17870 };
16931 17871
16932 struct vm_area_struct *get_gate_vma(struct task_struct *tsk) 17872 struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
16933@@ -877,7 +877,7 @@ int in_gate_area_no_task(unsigned long a 17873@@ -877,7 +883,7 @@ int in_gate_area_no_task(unsigned long a
16934 17874
16935 const char *arch_vma_name(struct vm_area_struct *vma) 17875 const char *arch_vma_name(struct vm_area_struct *vma)
16936 { 17876 {
@@ -16939,9 +17879,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/init_64.c linux-2.6.32.10/arch/x86/mm/ini
16939 return "[vdso]"; 17879 return "[vdso]";
16940 if (vma == &gate_vma) 17880 if (vma == &gate_vma)
16941 return "[vsyscall]"; 17881 return "[vsyscall]";
16942diff -urNp linux-2.6.32.10/arch/x86/mm/init.c linux-2.6.32.10/arch/x86/mm/init.c 17882diff -urNp linux-2.6.32.11/arch/x86/mm/init.c linux-2.6.32.11/arch/x86/mm/init.c
16943--- linux-2.6.32.10/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400 17883--- linux-2.6.32.11/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400
16944+++ linux-2.6.32.10/arch/x86/mm/init.c 2010-03-20 15:58:46.977545072 -0400 17884+++ linux-2.6.32.11/arch/x86/mm/init.c 2010-04-04 20:46:41.533557286 -0400
16945@@ -69,11 +69,7 @@ static void __init find_early_table_spac 17885@@ -69,11 +69,7 @@ static void __init find_early_table_spac
16946 * cause a hotspot and fill up ZONE_DMA. The page tables 17886 * cause a hotspot and fill up ZONE_DMA. The page tables
16947 * need roughly 0.5KB per GB. 17887 * need roughly 0.5KB per GB.
@@ -17058,9 +17998,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/init.c linux-2.6.32.10/arch/x86/mm/init.c
17058 free_init_pages("unused kernel memory", 17998 free_init_pages("unused kernel memory",
17059 (unsigned long)(&__init_begin), 17999 (unsigned long)(&__init_begin),
17060 (unsigned long)(&__init_end)); 18000 (unsigned long)(&__init_end));
17061diff -urNp linux-2.6.32.10/arch/x86/mm/iomap_32.c linux-2.6.32.10/arch/x86/mm/iomap_32.c 18001diff -urNp linux-2.6.32.11/arch/x86/mm/iomap_32.c linux-2.6.32.11/arch/x86/mm/iomap_32.c
17062--- linux-2.6.32.10/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400 18002--- linux-2.6.32.11/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400
17063+++ linux-2.6.32.10/arch/x86/mm/iomap_32.c 2010-03-20 15:58:46.977545072 -0400 18003+++ linux-2.6.32.11/arch/x86/mm/iomap_32.c 2010-04-04 20:46:41.533557286 -0400
17064@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long 18004@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
17065 debug_kmap_atomic(type); 18005 debug_kmap_atomic(type);
17066 idx = type + KM_TYPE_NR * smp_processor_id(); 18006 idx = type + KM_TYPE_NR * smp_processor_id();
@@ -17073,9 +18013,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/iomap_32.c linux-2.6.32.10/arch/x86/mm/io
17073 arch_flush_lazy_mmu_mode(); 18013 arch_flush_lazy_mmu_mode();
17074 18014
17075 return (void *)vaddr; 18015 return (void *)vaddr;
17076diff -urNp linux-2.6.32.10/arch/x86/mm/ioremap.c linux-2.6.32.10/arch/x86/mm/ioremap.c 18016diff -urNp linux-2.6.32.11/arch/x86/mm/ioremap.c linux-2.6.32.11/arch/x86/mm/ioremap.c
17077--- linux-2.6.32.10/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400 18017--- linux-2.6.32.11/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400
17078+++ linux-2.6.32.10/arch/x86/mm/ioremap.c 2010-03-20 15:58:46.977545072 -0400 18018+++ linux-2.6.32.11/arch/x86/mm/ioremap.c 2010-04-04 20:46:41.533557286 -0400
17079@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) 18019@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
17080 * Second special case: Some BIOSen report the PC BIOS 18020 * Second special case: Some BIOSen report the PC BIOS
17081 * area (640->1Mb) as ram even though it is not. 18021 * area (640->1Mb) as ram even though it is not.
@@ -17122,9 +18062,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/ioremap.c linux-2.6.32.10/arch/x86/mm/ior
17122 18062
17123 /* 18063 /*
17124 * The boot-ioremap range spans multiple pmds, for which 18064 * The boot-ioremap range spans multiple pmds, for which
17125diff -urNp linux-2.6.32.10/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.10/arch/x86/mm/kmemcheck/kmemcheck.c 18065diff -urNp linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c
17126--- linux-2.6.32.10/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400 18066--- linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400
17127+++ linux-2.6.32.10/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-20 15:58:46.977545072 -0400 18067+++ linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c 2010-04-04 20:46:41.533557286 -0400
17128@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg 18068@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
17129 * memory (e.g. tracked pages)? For now, we need this to avoid 18069 * memory (e.g. tracked pages)? For now, we need this to avoid
17130 * invoking kmemcheck for PnP BIOS calls. 18070 * invoking kmemcheck for PnP BIOS calls.
@@ -17137,9 +18077,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.10/arc
17137 return false; 18077 return false;
17138 18078
17139 pte = kmemcheck_pte_lookup(address); 18079 pte = kmemcheck_pte_lookup(address);
17140diff -urNp linux-2.6.32.10/arch/x86/mm/mmap.c linux-2.6.32.10/arch/x86/mm/mmap.c 18080diff -urNp linux-2.6.32.11/arch/x86/mm/mmap.c linux-2.6.32.11/arch/x86/mm/mmap.c
17141--- linux-2.6.32.10/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 18081--- linux-2.6.32.11/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
17142+++ linux-2.6.32.10/arch/x86/mm/mmap.c 2010-03-20 15:58:46.977545072 -0400 18082+++ linux-2.6.32.11/arch/x86/mm/mmap.c 2010-04-04 20:46:41.537568318 -0400
17143@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size 18083@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
17144 * Leave an at least ~128 MB hole with possible stack randomization. 18084 * Leave an at least ~128 MB hole with possible stack randomization.
17145 */ 18085 */
@@ -17221,9 +18161,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/mmap.c linux-2.6.32.10/arch/x86/mm/mmap.c
17221 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 18161 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
17222 mm->unmap_area = arch_unmap_area_topdown; 18162 mm->unmap_area = arch_unmap_area_topdown;
17223 } 18163 }
17224diff -urNp linux-2.6.32.10/arch/x86/mm/numa_32.c linux-2.6.32.10/arch/x86/mm/numa_32.c 18164diff -urNp linux-2.6.32.11/arch/x86/mm/numa_32.c linux-2.6.32.11/arch/x86/mm/numa_32.c
17225--- linux-2.6.32.10/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400 18165--- linux-2.6.32.11/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400
17226+++ linux-2.6.32.10/arch/x86/mm/numa_32.c 2010-03-20 15:58:46.977545072 -0400 18166+++ linux-2.6.32.11/arch/x86/mm/numa_32.c 2010-04-04 20:46:41.537568318 -0400
17227@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int 18167@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
17228 } 18168 }
17229 #endif 18169 #endif
@@ -17232,9 +18172,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/numa_32.c linux-2.6.32.10/arch/x86/mm/num
17232 extern unsigned long highend_pfn, highstart_pfn; 18172 extern unsigned long highend_pfn, highstart_pfn;
17233 18173
17234 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) 18174 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
17235diff -urNp linux-2.6.32.10/arch/x86/mm/pageattr.c linux-2.6.32.10/arch/x86/mm/pageattr.c 18175diff -urNp linux-2.6.32.11/arch/x86/mm/pageattr.c linux-2.6.32.11/arch/x86/mm/pageattr.c
17236--- linux-2.6.32.10/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400 18176--- linux-2.6.32.11/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400
17237+++ linux-2.6.32.10/arch/x86/mm/pageattr.c 2010-03-20 15:58:46.977545072 -0400 18177+++ linux-2.6.32.11/arch/x86/mm/pageattr.c 2010-04-04 20:46:41.537568318 -0400
17238@@ -268,9 +268,10 @@ static inline pgprot_t static_protection 18178@@ -268,9 +268,10 @@ static inline pgprot_t static_protection
17239 * Does not cover __inittext since that is gone later on. On 18179 * Does not cover __inittext since that is gone later on. On
17240 * 64bit we do not enforce !NX on the low mapping 18180 * 64bit we do not enforce !NX on the low mapping
@@ -17266,9 +18206,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/pageattr.c linux-2.6.32.10/arch/x86/mm/pa
17266 #ifdef CONFIG_X86_32 18206 #ifdef CONFIG_X86_32
17267 if (!SHARED_KERNEL_PMD) { 18207 if (!SHARED_KERNEL_PMD) {
17268 struct page *page; 18208 struct page *page;
17269diff -urNp linux-2.6.32.10/arch/x86/mm/pageattr-test.c linux-2.6.32.10/arch/x86/mm/pageattr-test.c 18209diff -urNp linux-2.6.32.11/arch/x86/mm/pageattr-test.c linux-2.6.32.11/arch/x86/mm/pageattr-test.c
17270--- linux-2.6.32.10/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400 18210--- linux-2.6.32.11/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400
17271+++ linux-2.6.32.10/arch/x86/mm/pageattr-test.c 2010-03-20 15:58:46.977545072 -0400 18211+++ linux-2.6.32.11/arch/x86/mm/pageattr-test.c 2010-04-04 20:46:41.537568318 -0400
17272@@ -36,7 +36,7 @@ enum { 18212@@ -36,7 +36,7 @@ enum {
17273 18213
17274 static int pte_testbit(pte_t pte) 18214 static int pte_testbit(pte_t pte)
@@ -17278,9 +18218,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/pageattr-test.c linux-2.6.32.10/arch/x86/
17278 } 18218 }
17279 18219
17280 struct split_state { 18220 struct split_state {
17281diff -urNp linux-2.6.32.10/arch/x86/mm/pat.c linux-2.6.32.10/arch/x86/mm/pat.c 18221diff -urNp linux-2.6.32.11/arch/x86/mm/pat.c linux-2.6.32.11/arch/x86/mm/pat.c
17282--- linux-2.6.32.10/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400 18222--- linux-2.6.32.11/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400
17283+++ linux-2.6.32.10/arch/x86/mm/pat.c 2010-03-20 15:58:46.977545072 -0400 18223+++ linux-2.6.32.11/arch/x86/mm/pat.c 2010-04-04 20:46:41.537568318 -0400
17284@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct 18224@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
17285 18225
17286 conflict: 18226 conflict:
@@ -17317,9 +18257,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/pat.c linux-2.6.32.10/arch/x86/mm/pat.c
17317 cattr_name(want_flags), 18257 cattr_name(want_flags),
17318 (unsigned long long)paddr, 18258 (unsigned long long)paddr,
17319 (unsigned long long)(paddr + size), 18259 (unsigned long long)(paddr + size),
17320diff -urNp linux-2.6.32.10/arch/x86/mm/pgtable_32.c linux-2.6.32.10/arch/x86/mm/pgtable_32.c 18260diff -urNp linux-2.6.32.11/arch/x86/mm/pgtable_32.c linux-2.6.32.11/arch/x86/mm/pgtable_32.c
17321--- linux-2.6.32.10/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400 18261--- linux-2.6.32.11/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400
17322+++ linux-2.6.32.10/arch/x86/mm/pgtable_32.c 2010-03-20 15:58:46.977545072 -0400 18262+++ linux-2.6.32.11/arch/x86/mm/pgtable_32.c 2010-04-04 20:46:41.537568318 -0400
17323@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, 18263@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
17324 return; 18264 return;
17325 } 18265 }
@@ -17334,9 +18274,281 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/pgtable_32.c linux-2.6.32.10/arch/x86/mm/
17334 18274
17335 /* 18275 /*
17336 * It's enough to flush this one mapping. 18276 * It's enough to flush this one mapping.
17337diff -urNp linux-2.6.32.10/arch/x86/mm/setup_nx.c linux-2.6.32.10/arch/x86/mm/setup_nx.c 18277diff -urNp linux-2.6.32.11/arch/x86/mm/pgtable.c linux-2.6.32.11/arch/x86/mm/pgtable.c
17338--- linux-2.6.32.10/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400 18278--- linux-2.6.32.11/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400
17339+++ linux-2.6.32.10/arch/x86/mm/setup_nx.c 2010-03-20 15:58:46.977545072 -0400 18279+++ linux-2.6.32.11/arch/x86/mm/pgtable.c 2010-04-04 20:58:33.225084964 -0400
18280@@ -63,8 +63,12 @@ void ___pmd_free_tlb(struct mmu_gather *
18281 #if PAGETABLE_LEVELS > 3
18282 void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud)
18283 {
18284+
18285+#ifndef CONFIG_PAX_PER_CPU_PGD
18286 paravirt_release_pud(__pa(pud) >> PAGE_SHIFT);
18287 tlb_remove_page(tlb, virt_to_page(pud));
18288+#endif
18289+
18290 }
18291 #endif /* PAGETABLE_LEVELS > 3 */
18292 #endif /* PAGETABLE_LEVELS > 2 */
18293@@ -83,8 +87,62 @@ static inline void pgd_list_del(pgd_t *p
18294 list_del(&page->lru);
18295 }
18296
18297-#define UNSHARED_PTRS_PER_PGD \
18298- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
18299+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18300+pteval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
18301+#endif
18302+
18303+#ifdef CONFIG_PAX_PER_CPU_PGD
18304+void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count)
18305+{
18306+ while (count--)
18307+
18308+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18309+ *dst++ = __pgd(pgd_val(*src++) & clone_pgd_mask);
18310+#else
18311+ *dst++ = *src++;
18312+#endif
18313+
18314+}
18315+
18316+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
18317+{
18318+
18319+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18320+ while (count--)
18321+ *dst++ = __pgd((pgd_val(*src++) | _PAGE_NX) & ~_PAGE_USER);
18322+#endif
18323+
18324+}
18325+#endif
18326+
18327+#ifdef CONFIG_PAX_PER_CPU_PGD
18328+static inline void pgd_ctor(pgd_t *pgd) {}
18329+static inline void pgd_dtor(pgd_t *pgd) {}
18330+#ifdef CONFIG_X86_64
18331+#define pxd_t pud_t
18332+#define pyd_t pgd_t
18333+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
18334+#define pxd_free(mm, pud) pud_free((mm), (pud))
18335+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
18336+#define pyd_offset(mm ,address) pgd_offset((mm), (address))
18337+#define PYD_SIZE PGDIR_SIZE
18338+#else
18339+#define pxd_t pmd_t
18340+#define pyd_t pud_t
18341+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
18342+#define pxd_free(mm, pud) pmd_free((mm), (pud))
18343+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
18344+#define pyd_offset(mm ,address) pud_offset((mm), (address))
18345+#define PYD_SIZE PUD_SIZE
18346+#endif
18347+#else
18348+#define pxd_t pmd_t
18349+#define pyd_t pud_t
18350+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
18351+#define pxd_free(mm, pmd) pmd_free((mm), (pmd))
18352+#define pyd_populate(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
18353+#define pyd_offset(mm ,address) pud_offset((mm), (address))
18354+#define PYD_SIZE PUD_SIZE
18355
18356 static void pgd_ctor(pgd_t *pgd)
18357 {
18358@@ -119,6 +177,7 @@ static void pgd_dtor(pgd_t *pgd)
18359 pgd_list_del(pgd);
18360 spin_unlock_irqrestore(&pgd_lock, flags);
18361 }
18362+#endif
18363
18364 /*
18365 * List of all pgd's needed for non-PAE so it can invalidate entries
18366@@ -131,7 +190,7 @@ static void pgd_dtor(pgd_t *pgd)
18367 * -- wli
18368 */
18369
18370-#ifdef CONFIG_X86_PAE
18371+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
18372 /*
18373 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
18374 * updating the top-level pagetable entries to guarantee the
18375@@ -143,7 +202,7 @@ static void pgd_dtor(pgd_t *pgd)
18376 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
18377 * and initialize the kernel pmds here.
18378 */
18379-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
18380+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
18381
18382 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
18383 {
18384@@ -162,36 +221,38 @@ void pud_populate(struct mm_struct *mm,
18385 if (mm == current->active_mm)
18386 write_cr3(read_cr3());
18387 }
18388+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
18389+#define PREALLOCATED_PXDS USER_PGD_PTRS
18390 #else /* !CONFIG_X86_PAE */
18391
18392 /* No need to prepopulate any pagetable entries in non-PAE modes. */
18393-#define PREALLOCATED_PMDS 0
18394+#define PREALLOCATED_PXDS 0
18395
18396 #endif /* CONFIG_X86_PAE */
18397
18398-static void free_pmds(pmd_t *pmds[])
18399+static void free_pxds(pxd_t *pxds[])
18400 {
18401 int i;
18402
18403- for(i = 0; i < PREALLOCATED_PMDS; i++)
18404- if (pmds[i])
18405- free_page((unsigned long)pmds[i]);
18406+ for(i = 0; i < PREALLOCATED_PXDS; i++)
18407+ if (pxds[i])
18408+ free_page((unsigned long)pxds[i]);
18409 }
18410
18411-static int preallocate_pmds(pmd_t *pmds[])
18412+static int preallocate_pxds(pxd_t *pxds[])
18413 {
18414 int i;
18415 bool failed = false;
18416
18417- for(i = 0; i < PREALLOCATED_PMDS; i++) {
18418- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
18419- if (pmd == NULL)
18420+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
18421+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
18422+ if (pxd == NULL)
18423 failed = true;
18424- pmds[i] = pmd;
18425+ pxds[i] = pxd;
18426 }
18427
18428 if (failed) {
18429- free_pmds(pmds);
18430+ free_pxds(pxds);
18431 return -ENOMEM;
18432 }
18433
18434@@ -204,51 +265,56 @@ static int preallocate_pmds(pmd_t *pmds[
18435 * preallocate which never got a corresponding vma will need to be
18436 * freed manually.
18437 */
18438-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
18439+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
18440 {
18441 int i;
18442
18443- for(i = 0; i < PREALLOCATED_PMDS; i++) {
18444+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
18445 pgd_t pgd = pgdp[i];
18446
18447 if (pgd_val(pgd) != 0) {
18448- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
18449+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
18450
18451- pgdp[i] = native_make_pgd(0);
18452+ set_pgd(pgdp + i, native_make_pgd(0));
18453
18454- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
18455- pmd_free(mm, pmd);
18456+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
18457+ pxd_free(mm, pxd);
18458 }
18459 }
18460 }
18461
18462-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
18463+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
18464 {
18465- pud_t *pud;
18466+ pyd_t *pyd;
18467 unsigned long addr;
18468 int i;
18469
18470- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
18471+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
18472 return;
18473
18474- pud = pud_offset(pgd, 0);
18475+#ifdef CONFIG_X86_64
18476+ pyd = pyd_offset(mm, 0L);
18477+#else
18478+ pyd = pyd_offset(pgd, 0L);
18479+#endif
18480
18481- for (addr = i = 0; i < PREALLOCATED_PMDS;
18482- i++, pud++, addr += PUD_SIZE) {
18483- pmd_t *pmd = pmds[i];
18484+ for (addr = i = 0; i < PREALLOCATED_PXDS;
18485+ i++, pyd++, addr += PYD_SIZE) {
18486+ pxd_t *pxd = pxds[i];
18487
18488 if (i >= KERNEL_PGD_BOUNDARY)
18489- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
18490- sizeof(pmd_t) * PTRS_PER_PMD);
18491+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
18492+ sizeof(pxd_t) * PTRS_PER_PMD);
18493
18494- pud_populate(mm, pud, pmd);
18495+ pyd_populate(mm, pyd, pxd);
18496 }
18497 }
18498
18499 pgd_t *pgd_alloc(struct mm_struct *mm)
18500 {
18501 pgd_t *pgd;
18502- pmd_t *pmds[PREALLOCATED_PMDS];
18503+ pxd_t *pxds[PREALLOCATED_PXDS];
18504+
18505 unsigned long flags;
18506
18507 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
18508@@ -258,11 +324,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
18509
18510 mm->pgd = pgd;
18511
18512- if (preallocate_pmds(pmds) != 0)
18513+ if (preallocate_pxds(pxds) != 0)
18514 goto out_free_pgd;
18515
18516 if (paravirt_pgd_alloc(mm) != 0)
18517- goto out_free_pmds;
18518+ goto out_free_pxds;
18519
18520 /*
18521 * Make sure that pre-populating the pmds is atomic with
18522@@ -272,14 +338,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
18523 spin_lock_irqsave(&pgd_lock, flags);
18524
18525 pgd_ctor(pgd);
18526- pgd_prepopulate_pmd(mm, pgd, pmds);
18527+ pgd_prepopulate_pxd(mm, pgd, pxds);
18528
18529 spin_unlock_irqrestore(&pgd_lock, flags);
18530
18531 return pgd;
18532
18533-out_free_pmds:
18534- free_pmds(pmds);
18535+out_free_pxds:
18536+ free_pxds(pxds);
18537 out_free_pgd:
18538 free_page((unsigned long)pgd);
18539 out:
18540@@ -288,7 +354,7 @@ out:
18541
18542 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
18543 {
18544- pgd_mop_up_pmds(mm, pgd);
18545+ pgd_mop_up_pxds(mm, pgd);
18546 pgd_dtor(pgd);
18547 paravirt_pgd_free(mm, pgd);
18548 free_page((unsigned long)pgd);
18549diff -urNp linux-2.6.32.11/arch/x86/mm/setup_nx.c linux-2.6.32.11/arch/x86/mm/setup_nx.c
18550--- linux-2.6.32.11/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400
18551+++ linux-2.6.32.11/arch/x86/mm/setup_nx.c 2010-04-04 20:46:41.537568318 -0400
17340@@ -4,11 +4,10 @@ 18552@@ -4,11 +4,10 @@
17341 18553
17342 #include <asm/pgtable.h> 18554 #include <asm/pgtable.h>
@@ -17402,9 +18614,9 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/setup_nx.c linux-2.6.32.10/arch/x86/mm/se
17402 __supported_pte_mask &= ~_PAGE_NX; 18614 __supported_pte_mask &= ~_PAGE_NX;
17403 } 18615 }
17404 #endif 18616 #endif
17405diff -urNp linux-2.6.32.10/arch/x86/mm/tlb.c linux-2.6.32.10/arch/x86/mm/tlb.c 18617diff -urNp linux-2.6.32.11/arch/x86/mm/tlb.c linux-2.6.32.11/arch/x86/mm/tlb.c
17406--- linux-2.6.32.10/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400 18618--- linux-2.6.32.11/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400
17407+++ linux-2.6.32.10/arch/x86/mm/tlb.c 2010-03-20 15:58:46.977545072 -0400 18619+++ linux-2.6.32.11/arch/x86/mm/tlb.c 2010-04-04 20:58:33.225084964 -0400
17408@@ -12,7 +12,7 @@ 18620@@ -12,7 +12,7 @@
17409 #include <asm/uv/uv.h> 18621 #include <asm/uv/uv.h>
17410 18622
@@ -17414,9 +18626,21 @@ diff -urNp linux-2.6.32.10/arch/x86/mm/tlb.c linux-2.6.32.10/arch/x86/mm/tlb.c
17414 18626
17415 /* 18627 /*
17416 * Smarter SMP flushing macros. 18628 * Smarter SMP flushing macros.
17417diff -urNp linux-2.6.32.10/arch/x86/oprofile/backtrace.c linux-2.6.32.10/arch/x86/oprofile/backtrace.c 18629@@ -61,7 +61,11 @@ void leave_mm(int cpu)
17418--- linux-2.6.32.10/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400 18630 BUG();
17419+++ linux-2.6.32.10/arch/x86/oprofile/backtrace.c 2010-03-20 17:00:22.628580380 -0400 18631 cpumask_clear_cpu(cpu,
18632 mm_cpumask(percpu_read(cpu_tlbstate.active_mm)));
18633+
18634+#ifndef CONFIG_PAX_PER_CPU_PGD
18635 load_cr3(swapper_pg_dir);
18636+#endif
18637+
18638 }
18639 EXPORT_SYMBOL_GPL(leave_mm);
18640
18641diff -urNp linux-2.6.32.11/arch/x86/oprofile/backtrace.c linux-2.6.32.11/arch/x86/oprofile/backtrace.c
18642--- linux-2.6.32.11/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400
18643+++ linux-2.6.32.11/arch/x86/oprofile/backtrace.c 2010-04-04 20:46:41.537568318 -0400
17420@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back 18644@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
17421 struct frame_head bufhead[2]; 18645 struct frame_head bufhead[2];
17422 18646
@@ -17435,9 +18659,9 @@ diff -urNp linux-2.6.32.10/arch/x86/oprofile/backtrace.c linux-2.6.32.10/arch/x8
17435 unsigned long stack = kernel_stack_pointer(regs); 18659 unsigned long stack = kernel_stack_pointer(regs);
17436 if (depth) 18660 if (depth)
17437 dump_trace(NULL, regs, (unsigned long *)stack, 0, 18661 dump_trace(NULL, regs, (unsigned long *)stack, 0,
17438diff -urNp linux-2.6.32.10/arch/x86/oprofile/op_model_p4.c linux-2.6.32.10/arch/x86/oprofile/op_model_p4.c 18662diff -urNp linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c
17439--- linux-2.6.32.10/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400 18663--- linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400
17440+++ linux-2.6.32.10/arch/x86/oprofile/op_model_p4.c 2010-03-20 15:58:46.977545072 -0400 18664+++ linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c 2010-04-04 20:46:41.537568318 -0400
17441@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo 18665@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
17442 #endif 18666 #endif
17443 } 18667 }
@@ -17447,9 +18671,9 @@ diff -urNp linux-2.6.32.10/arch/x86/oprofile/op_model_p4.c linux-2.6.32.10/arch/
17447 { 18671 {
17448 #ifdef CONFIG_SMP 18672 #ifdef CONFIG_SMP
17449 return smp_num_siblings == 2 ? 2 : 1; 18673 return smp_num_siblings == 2 ? 2 : 1;
17450diff -urNp linux-2.6.32.10/arch/x86/pci/common.c linux-2.6.32.10/arch/x86/pci/common.c 18674diff -urNp linux-2.6.32.11/arch/x86/pci/common.c linux-2.6.32.11/arch/x86/pci/common.c
17451--- linux-2.6.32.10/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400 18675--- linux-2.6.32.11/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400
17452+++ linux-2.6.32.10/arch/x86/pci/common.c 2010-03-20 15:58:46.977545072 -0400 18676+++ linux-2.6.32.11/arch/x86/pci/common.c 2010-04-04 20:46:41.537568318 -0400
17453@@ -31,8 +31,8 @@ int noioapicreroute = 1; 18677@@ -31,8 +31,8 @@ int noioapicreroute = 1;
17454 int pcibios_last_bus = -1; 18678 int pcibios_last_bus = -1;
17455 unsigned long pirq_table_addr; 18679 unsigned long pirq_table_addr;
@@ -17470,9 +18694,9 @@ diff -urNp linux-2.6.32.10/arch/x86/pci/common.c linux-2.6.32.10/arch/x86/pci/co
17470 }; 18694 };
17471 18695
17472 void __init dmi_check_pciprobe(void) 18696 void __init dmi_check_pciprobe(void)
17473diff -urNp linux-2.6.32.10/arch/x86/pci/direct.c linux-2.6.32.10/arch/x86/pci/direct.c 18697diff -urNp linux-2.6.32.11/arch/x86/pci/direct.c linux-2.6.32.11/arch/x86/pci/direct.c
17474--- linux-2.6.32.10/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400 18698--- linux-2.6.32.11/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400
17475+++ linux-2.6.32.10/arch/x86/pci/direct.c 2010-03-20 15:58:46.977545072 -0400 18699+++ linux-2.6.32.11/arch/x86/pci/direct.c 2010-04-04 20:46:41.537568318 -0400
17476@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 18700@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
17477 18701
17478 #undef PCI_CONF1_ADDRESS 18702 #undef PCI_CONF1_ADDRESS
@@ -17500,9 +18724,9 @@ diff -urNp linux-2.6.32.10/arch/x86/pci/direct.c linux-2.6.32.10/arch/x86/pci/di
17500 { 18724 {
17501 u32 x = 0; 18725 u32 x = 0;
17502 int year, devfn; 18726 int year, devfn;
17503diff -urNp linux-2.6.32.10/arch/x86/pci/fixup.c linux-2.6.32.10/arch/x86/pci/fixup.c 18727diff -urNp linux-2.6.32.11/arch/x86/pci/fixup.c linux-2.6.32.11/arch/x86/pci/fixup.c
17504--- linux-2.6.32.10/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400 18728--- linux-2.6.32.11/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400
17505+++ linux-2.6.32.10/arch/x86/pci/fixup.c 2010-03-20 15:58:46.977545072 -0400 18729+++ linux-2.6.32.11/arch/x86/pci/fixup.c 2010-04-04 20:46:41.537568318 -0400
17506@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi 18730@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
17507 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), 18731 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
17508 }, 18732 },
@@ -17521,9 +18745,9 @@ diff -urNp linux-2.6.32.10/arch/x86/pci/fixup.c linux-2.6.32.10/arch/x86/pci/fix
17521 }; 18745 };
17522 18746
17523 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) 18747 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
17524diff -urNp linux-2.6.32.10/arch/x86/pci/irq.c linux-2.6.32.10/arch/x86/pci/irq.c 18748diff -urNp linux-2.6.32.11/arch/x86/pci/irq.c linux-2.6.32.11/arch/x86/pci/irq.c
17525--- linux-2.6.32.10/arch/x86/pci/irq.c 2010-03-15 11:52:04.000000000 -0400 18749--- linux-2.6.32.11/arch/x86/pci/irq.c 2010-03-15 11:52:04.000000000 -0400
17526+++ linux-2.6.32.10/arch/x86/pci/irq.c 2010-03-20 15:58:46.981539860 -0400 18750+++ linux-2.6.32.11/arch/x86/pci/irq.c 2010-04-04 20:46:41.537568318 -0400
17527@@ -543,7 +543,7 @@ static __init int intel_router_probe(str 18751@@ -543,7 +543,7 @@ static __init int intel_router_probe(str
17528 static struct pci_device_id __initdata pirq_440gx[] = { 18752 static struct pci_device_id __initdata pirq_440gx[] = {
17529 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, 18753 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
@@ -17542,9 +18766,9 @@ diff -urNp linux-2.6.32.10/arch/x86/pci/irq.c linux-2.6.32.10/arch/x86/pci/irq.c
17542 }; 18766 };
17543 18767
17544 int __init pcibios_irq_init(void) 18768 int __init pcibios_irq_init(void)
17545diff -urNp linux-2.6.32.10/arch/x86/pci/mmconfig_32.c linux-2.6.32.10/arch/x86/pci/mmconfig_32.c 18769diff -urNp linux-2.6.32.11/arch/x86/pci/mmconfig_32.c linux-2.6.32.11/arch/x86/pci/mmconfig_32.c
17546--- linux-2.6.32.10/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400 18770--- linux-2.6.32.11/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400
17547+++ linux-2.6.32.10/arch/x86/pci/mmconfig_32.c 2010-03-20 15:58:46.981539860 -0400 18771+++ linux-2.6.32.11/arch/x86/pci/mmconfig_32.c 2010-04-04 20:46:41.537568318 -0400
17548@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int 18772@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
17549 return 0; 18773 return 0;
17550 } 18774 }
@@ -17554,9 +18778,9 @@ diff -urNp linux-2.6.32.10/arch/x86/pci/mmconfig_32.c linux-2.6.32.10/arch/x86/p
17554 .read = pci_mmcfg_read, 18778 .read = pci_mmcfg_read,
17555 .write = pci_mmcfg_write, 18779 .write = pci_mmcfg_write,
17556 }; 18780 };
17557diff -urNp linux-2.6.32.10/arch/x86/pci/mmconfig_64.c linux-2.6.32.10/arch/x86/pci/mmconfig_64.c 18781diff -urNp linux-2.6.32.11/arch/x86/pci/mmconfig_64.c linux-2.6.32.11/arch/x86/pci/mmconfig_64.c
17558--- linux-2.6.32.10/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400 18782--- linux-2.6.32.11/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400
17559+++ linux-2.6.32.10/arch/x86/pci/mmconfig_64.c 2010-03-20 15:58:46.981539860 -0400 18783+++ linux-2.6.32.11/arch/x86/pci/mmconfig_64.c 2010-04-04 20:46:41.537568318 -0400
17560@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int 18784@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
17561 return 0; 18785 return 0;
17562 } 18786 }
@@ -17566,9 +18790,9 @@ diff -urNp linux-2.6.32.10/arch/x86/pci/mmconfig_64.c linux-2.6.32.10/arch/x86/p
17566 .read = pci_mmcfg_read, 18790 .read = pci_mmcfg_read,
17567 .write = pci_mmcfg_write, 18791 .write = pci_mmcfg_write,
17568 }; 18792 };
17569diff -urNp linux-2.6.32.10/arch/x86/pci/numaq_32.c linux-2.6.32.10/arch/x86/pci/numaq_32.c 18793diff -urNp linux-2.6.32.11/arch/x86/pci/numaq_32.c linux-2.6.32.11/arch/x86/pci/numaq_32.c
17570--- linux-2.6.32.10/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400 18794--- linux-2.6.32.11/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400
17571+++ linux-2.6.32.10/arch/x86/pci/numaq_32.c 2010-03-20 15:58:46.981539860 -0400 18795+++ linux-2.6.32.11/arch/x86/pci/numaq_32.c 2010-04-04 20:46:41.537568318 -0400
17572@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i 18796@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
17573 18797
17574 #undef PCI_CONF1_MQ_ADDRESS 18798 #undef PCI_CONF1_MQ_ADDRESS
@@ -17578,9 +18802,9 @@ diff -urNp linux-2.6.32.10/arch/x86/pci/numaq_32.c linux-2.6.32.10/arch/x86/pci/
17578 .read = pci_conf1_mq_read, 18802 .read = pci_conf1_mq_read,
17579 .write = pci_conf1_mq_write 18803 .write = pci_conf1_mq_write
17580 }; 18804 };
17581diff -urNp linux-2.6.32.10/arch/x86/pci/olpc.c linux-2.6.32.10/arch/x86/pci/olpc.c 18805diff -urNp linux-2.6.32.11/arch/x86/pci/olpc.c linux-2.6.32.11/arch/x86/pci/olpc.c
17582--- linux-2.6.32.10/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400 18806--- linux-2.6.32.11/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400
17583+++ linux-2.6.32.10/arch/x86/pci/olpc.c 2010-03-20 15:58:46.981539860 -0400 18807+++ linux-2.6.32.11/arch/x86/pci/olpc.c 2010-04-04 20:46:41.537568318 -0400
17584@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s 18808@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
17585 return 0; 18809 return 0;
17586 } 18810 }
@@ -17590,9 +18814,9 @@ diff -urNp linux-2.6.32.10/arch/x86/pci/olpc.c linux-2.6.32.10/arch/x86/pci/olpc
17590 .read = pci_olpc_read, 18814 .read = pci_olpc_read,
17591 .write = pci_olpc_write, 18815 .write = pci_olpc_write,
17592 }; 18816 };
17593diff -urNp linux-2.6.32.10/arch/x86/pci/pcbios.c linux-2.6.32.10/arch/x86/pci/pcbios.c 18817diff -urNp linux-2.6.32.11/arch/x86/pci/pcbios.c linux-2.6.32.11/arch/x86/pci/pcbios.c
17594--- linux-2.6.32.10/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400 18818--- linux-2.6.32.11/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400
17595+++ linux-2.6.32.10/arch/x86/pci/pcbios.c 2010-03-20 15:58:46.981539860 -0400 18819+++ linux-2.6.32.11/arch/x86/pci/pcbios.c 2010-04-04 20:46:41.537568318 -0400
17596@@ -56,50 +56,93 @@ union bios32 { 18820@@ -56,50 +56,93 @@ union bios32 {
17597 static struct { 18821 static struct {
17598 unsigned long address; 18822 unsigned long address;
@@ -17915,9 +19139,9 @@ diff -urNp linux-2.6.32.10/arch/x86/pci/pcbios.c linux-2.6.32.10/arch/x86/pci/pc
17915 return !(ret & 0xff00); 19139 return !(ret & 0xff00);
17916 } 19140 }
17917 EXPORT_SYMBOL(pcibios_set_irq_routing); 19141 EXPORT_SYMBOL(pcibios_set_irq_routing);
17918diff -urNp linux-2.6.32.10/arch/x86/power/cpu.c linux-2.6.32.10/arch/x86/power/cpu.c 19142diff -urNp linux-2.6.32.11/arch/x86/power/cpu.c linux-2.6.32.11/arch/x86/power/cpu.c
17919--- linux-2.6.32.10/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400 19143--- linux-2.6.32.11/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400
17920+++ linux-2.6.32.10/arch/x86/power/cpu.c 2010-03-20 15:58:46.981539860 -0400 19144+++ linux-2.6.32.11/arch/x86/power/cpu.c 2010-04-04 20:46:41.537568318 -0400
17921@@ -126,7 +126,7 @@ static void do_fpu_end(void) 19145@@ -126,7 +126,7 @@ static void do_fpu_end(void)
17922 static void fix_processor_context(void) 19146 static void fix_processor_context(void)
17923 { 19147 {
@@ -17937,9 +19161,9 @@ diff -urNp linux-2.6.32.10/arch/x86/power/cpu.c linux-2.6.32.10/arch/x86/power/c
17937 19161
17938 syscall_init(); /* This sets MSR_*STAR and related */ 19162 syscall_init(); /* This sets MSR_*STAR and related */
17939 #endif 19163 #endif
17940diff -urNp linux-2.6.32.10/arch/x86/vdso/Makefile linux-2.6.32.10/arch/x86/vdso/Makefile 19164diff -urNp linux-2.6.32.11/arch/x86/vdso/Makefile linux-2.6.32.11/arch/x86/vdso/Makefile
17941--- linux-2.6.32.10/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400 19165--- linux-2.6.32.11/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400
17942+++ linux-2.6.32.10/arch/x86/vdso/Makefile 2010-03-20 15:58:46.981539860 -0400 19166+++ linux-2.6.32.11/arch/x86/vdso/Makefile 2010-04-04 20:46:41.537568318 -0400
17943@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ 19167@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
17944 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ 19168 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
17945 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) 19169 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -17949,9 +19173,9 @@ diff -urNp linux-2.6.32.10/arch/x86/vdso/Makefile linux-2.6.32.10/arch/x86/vdso/
17949 GCOV_PROFILE := n 19173 GCOV_PROFILE := n
17950 19174
17951 # 19175 #
17952diff -urNp linux-2.6.32.10/arch/x86/vdso/vclock_gettime.c linux-2.6.32.10/arch/x86/vdso/vclock_gettime.c 19176diff -urNp linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c
17953--- linux-2.6.32.10/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400 19177--- linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400
17954+++ linux-2.6.32.10/arch/x86/vdso/vclock_gettime.c 2010-03-20 15:58:46.981539860 -0400 19178+++ linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c 2010-04-04 20:46:41.541133870 -0400
17955@@ -22,24 +22,48 @@ 19179@@ -22,24 +22,48 @@
17956 #include <asm/hpet.h> 19180 #include <asm/hpet.h>
17957 #include <asm/unistd.h> 19181 #include <asm/unistd.h>
@@ -18050,9 +19274,9 @@ diff -urNp linux-2.6.32.10/arch/x86/vdso/vclock_gettime.c linux-2.6.32.10/arch/x
18050 } 19274 }
18051 int gettimeofday(struct timeval *, struct timezone *) 19275 int gettimeofday(struct timeval *, struct timezone *)
18052 __attribute__((weak, alias("__vdso_gettimeofday"))); 19276 __attribute__((weak, alias("__vdso_gettimeofday")));
18053diff -urNp linux-2.6.32.10/arch/x86/vdso/vdso32-setup.c linux-2.6.32.10/arch/x86/vdso/vdso32-setup.c 19277diff -urNp linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c
18054--- linux-2.6.32.10/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400 19278--- linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400
18055+++ linux-2.6.32.10/arch/x86/vdso/vdso32-setup.c 2010-03-20 15:58:46.981539860 -0400 19279+++ linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c 2010-04-04 20:46:41.541133870 -0400
18056@@ -25,6 +25,7 @@ 19280@@ -25,6 +25,7 @@
18057 #include <asm/tlbflush.h> 19281 #include <asm/tlbflush.h>
18058 #include <asm/vdso.h> 19282 #include <asm/vdso.h>
@@ -18153,9 +19377,9 @@ diff -urNp linux-2.6.32.10/arch/x86/vdso/vdso32-setup.c linux-2.6.32.10/arch/x86
18153 return &gate_vma; 19377 return &gate_vma;
18154 return NULL; 19378 return NULL;
18155 } 19379 }
18156diff -urNp linux-2.6.32.10/arch/x86/vdso/vdso.lds.S linux-2.6.32.10/arch/x86/vdso/vdso.lds.S 19380diff -urNp linux-2.6.32.11/arch/x86/vdso/vdso.lds.S linux-2.6.32.11/arch/x86/vdso/vdso.lds.S
18157--- linux-2.6.32.10/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400 19381--- linux-2.6.32.11/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400
18158+++ linux-2.6.32.10/arch/x86/vdso/vdso.lds.S 2010-03-20 15:58:46.981539860 -0400 19382+++ linux-2.6.32.11/arch/x86/vdso/vdso.lds.S 2010-04-04 20:46:41.541133870 -0400
18159@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; 19383@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
18160 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; 19384 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
18161 #include "vextern.h" 19385 #include "vextern.h"
@@ -18166,9 +19390,9 @@ diff -urNp linux-2.6.32.10/arch/x86/vdso/vdso.lds.S linux-2.6.32.10/arch/x86/vds
18166+VEXTERN(fallback_time) 19390+VEXTERN(fallback_time)
18167+VEXTERN(getcpu) 19391+VEXTERN(getcpu)
18168+#undef VEXTERN 19392+#undef VEXTERN
18169diff -urNp linux-2.6.32.10/arch/x86/vdso/vextern.h linux-2.6.32.10/arch/x86/vdso/vextern.h 19393diff -urNp linux-2.6.32.11/arch/x86/vdso/vextern.h linux-2.6.32.11/arch/x86/vdso/vextern.h
18170--- linux-2.6.32.10/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400 19394--- linux-2.6.32.11/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400
18171+++ linux-2.6.32.10/arch/x86/vdso/vextern.h 2010-03-20 15:58:46.981539860 -0400 19395+++ linux-2.6.32.11/arch/x86/vdso/vextern.h 2010-04-04 20:46:41.541133870 -0400
18172@@ -11,6 +11,5 @@ 19396@@ -11,6 +11,5 @@
18173 put into vextern.h and be referenced as a pointer with vdso prefix. 19397 put into vextern.h and be referenced as a pointer with vdso prefix.
18174 The main kernel later fills in the values. */ 19398 The main kernel later fills in the values. */
@@ -18176,9 +19400,9 @@ diff -urNp linux-2.6.32.10/arch/x86/vdso/vextern.h linux-2.6.32.10/arch/x86/vdso
18176-VEXTERN(jiffies) 19400-VEXTERN(jiffies)
18177 VEXTERN(vgetcpu_mode) 19401 VEXTERN(vgetcpu_mode)
18178 VEXTERN(vsyscall_gtod_data) 19402 VEXTERN(vsyscall_gtod_data)
18179diff -urNp linux-2.6.32.10/arch/x86/vdso/vma.c linux-2.6.32.10/arch/x86/vdso/vma.c 19403diff -urNp linux-2.6.32.11/arch/x86/vdso/vma.c linux-2.6.32.11/arch/x86/vdso/vma.c
18180--- linux-2.6.32.10/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400 19404--- linux-2.6.32.11/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400
18181+++ linux-2.6.32.10/arch/x86/vdso/vma.c 2010-03-20 15:58:46.981539860 -0400 19405+++ linux-2.6.32.11/arch/x86/vdso/vma.c 2010-04-04 20:46:41.541133870 -0400
18182@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) 19406@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
18183 if (!vbase) 19407 if (!vbase)
18184 goto oom; 19408 goto oom;
@@ -18225,9 +19449,9 @@ diff -urNp linux-2.6.32.10/arch/x86/vdso/vma.c linux-2.6.32.10/arch/x86/vdso/vma
18225- return 0; 19449- return 0;
18226-} 19450-}
18227-__setup("vdso=", vdso_setup); 19451-__setup("vdso=", vdso_setup);
18228diff -urNp linux-2.6.32.10/arch/x86/xen/enlighten.c linux-2.6.32.10/arch/x86/xen/enlighten.c 19452diff -urNp linux-2.6.32.11/arch/x86/xen/enlighten.c linux-2.6.32.11/arch/x86/xen/enlighten.c
18229--- linux-2.6.32.10/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400 19453--- linux-2.6.32.11/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400
18230+++ linux-2.6.32.10/arch/x86/xen/enlighten.c 2010-03-20 15:58:46.981539860 -0400 19454+++ linux-2.6.32.11/arch/x86/xen/enlighten.c 2010-04-04 20:46:41.541133870 -0400
18231@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); 19455@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
18232 19456
18233 struct shared_info xen_dummy_shared_info; 19457 struct shared_info xen_dummy_shared_info;
@@ -18260,9 +19484,9 @@ diff -urNp linux-2.6.32.10/arch/x86/xen/enlighten.c linux-2.6.32.10/arch/x86/xen
18260 xen_smp_init(); 19484 xen_smp_init();
18261 19485
18262 pgd = (pgd_t *)xen_start_info->pt_base; 19486 pgd = (pgd_t *)xen_start_info->pt_base;
18263diff -urNp linux-2.6.32.10/arch/x86/xen/mmu.c linux-2.6.32.10/arch/x86/xen/mmu.c 19487diff -urNp linux-2.6.32.11/arch/x86/xen/mmu.c linux-2.6.32.11/arch/x86/xen/mmu.c
18264--- linux-2.6.32.10/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400 19488--- linux-2.6.32.11/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400
18265+++ linux-2.6.32.10/arch/x86/xen/mmu.c 2010-03-20 15:58:46.981539860 -0400 19489+++ linux-2.6.32.11/arch/x86/xen/mmu.c 2010-04-04 20:46:41.541133870 -0400
18266@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable 19490@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable
18267 convert_pfn_mfn(init_level4_pgt); 19491 convert_pfn_mfn(init_level4_pgt);
18268 convert_pfn_mfn(level3_ident_pgt); 19492 convert_pfn_mfn(level3_ident_pgt);
@@ -18283,9 +19507,9 @@ diff -urNp linux-2.6.32.10/arch/x86/xen/mmu.c linux-2.6.32.10/arch/x86/xen/mmu.c
18283 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); 19507 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
18284 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); 19508 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
18285 19509
18286diff -urNp linux-2.6.32.10/arch/x86/xen/smp.c linux-2.6.32.10/arch/x86/xen/smp.c 19510diff -urNp linux-2.6.32.11/arch/x86/xen/smp.c linux-2.6.32.11/arch/x86/xen/smp.c
18287--- linux-2.6.32.10/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400 19511--- linux-2.6.32.11/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400
18288+++ linux-2.6.32.10/arch/x86/xen/smp.c 2010-03-20 15:58:46.981539860 -0400 19512+++ linux-2.6.32.11/arch/x86/xen/smp.c 2010-04-04 20:46:41.541133870 -0400
18289@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ 19513@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
18290 { 19514 {
18291 BUG_ON(smp_processor_id() != 0); 19515 BUG_ON(smp_processor_id() != 0);
@@ -18309,9 +19533,9 @@ diff -urNp linux-2.6.32.10/arch/x86/xen/smp.c linux-2.6.32.10/arch/x86/xen/smp.c
18309 ctxt->user_regs.ss = __KERNEL_DS; 19533 ctxt->user_regs.ss = __KERNEL_DS;
18310 #ifdef CONFIG_X86_32 19534 #ifdef CONFIG_X86_32
18311 ctxt->user_regs.fs = __KERNEL_PERCPU; 19535 ctxt->user_regs.fs = __KERNEL_PERCPU;
18312diff -urNp linux-2.6.32.10/arch/x86/xen/xen-ops.h linux-2.6.32.10/arch/x86/xen/xen-ops.h 19536diff -urNp linux-2.6.32.11/arch/x86/xen/xen-ops.h linux-2.6.32.11/arch/x86/xen/xen-ops.h
18313--- linux-2.6.32.10/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400 19537--- linux-2.6.32.11/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400
18314+++ linux-2.6.32.10/arch/x86/xen/xen-ops.h 2010-03-20 15:58:46.981539860 -0400 19538+++ linux-2.6.32.11/arch/x86/xen/xen-ops.h 2010-04-04 20:46:41.541133870 -0400
18315@@ -10,8 +10,6 @@ 19539@@ -10,8 +10,6 @@
18316 extern const char xen_hypervisor_callback[]; 19540 extern const char xen_hypervisor_callback[];
18317 extern const char xen_failsafe_callback[]; 19541 extern const char xen_failsafe_callback[];
@@ -18321,9 +19545,9 @@ diff -urNp linux-2.6.32.10/arch/x86/xen/xen-ops.h linux-2.6.32.10/arch/x86/xen/x
18321 struct trap_info; 19545 struct trap_info;
18322 void xen_copy_trap_info(struct trap_info *traps); 19546 void xen_copy_trap_info(struct trap_info *traps);
18323 19547
18324diff -urNp linux-2.6.32.10/block/blk-integrity.c linux-2.6.32.10/block/blk-integrity.c 19548diff -urNp linux-2.6.32.11/block/blk-integrity.c linux-2.6.32.11/block/blk-integrity.c
18325--- linux-2.6.32.10/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400 19549--- linux-2.6.32.11/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400
18326+++ linux-2.6.32.10/block/blk-integrity.c 2010-03-20 15:58:46.981539860 -0400 19550+++ linux-2.6.32.11/block/blk-integrity.c 2010-04-04 20:46:41.541133870 -0400
18327@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs 19551@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
18328 NULL, 19552 NULL,
18329 }; 19553 };
@@ -18333,9 +19557,9 @@ diff -urNp linux-2.6.32.10/block/blk-integrity.c linux-2.6.32.10/block/blk-integ
18333 .show = &integrity_attr_show, 19557 .show = &integrity_attr_show,
18334 .store = &integrity_attr_store, 19558 .store = &integrity_attr_store,
18335 }; 19559 };
18336diff -urNp linux-2.6.32.10/block/blk-iopoll.c linux-2.6.32.10/block/blk-iopoll.c 19560diff -urNp linux-2.6.32.11/block/blk-iopoll.c linux-2.6.32.11/block/blk-iopoll.c
18337--- linux-2.6.32.10/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400 19561--- linux-2.6.32.11/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400
18338+++ linux-2.6.32.10/block/blk-iopoll.c 2010-03-20 15:58:46.981539860 -0400 19562+++ linux-2.6.32.11/block/blk-iopoll.c 2010-04-04 20:46:41.541133870 -0400
18339@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo 19563@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
18340 } 19564 }
18341 EXPORT_SYMBOL(blk_iopoll_complete); 19565 EXPORT_SYMBOL(blk_iopoll_complete);
@@ -18345,9 +19569,9 @@ diff -urNp linux-2.6.32.10/block/blk-iopoll.c linux-2.6.32.10/block/blk-iopoll.c
18345 { 19569 {
18346 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); 19570 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
18347 int rearm = 0, budget = blk_iopoll_budget; 19571 int rearm = 0, budget = blk_iopoll_budget;
18348diff -urNp linux-2.6.32.10/block/blk-map.c linux-2.6.32.10/block/blk-map.c 19572diff -urNp linux-2.6.32.11/block/blk-map.c linux-2.6.32.11/block/blk-map.c
18349--- linux-2.6.32.10/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400 19573--- linux-2.6.32.11/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400
18350+++ linux-2.6.32.10/block/blk-map.c 2010-03-20 15:58:46.981539860 -0400 19574+++ linux-2.6.32.11/block/blk-map.c 2010-04-04 20:46:41.541133870 -0400
18351@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ 19575@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
18352 * direct dma. else, set up kernel bounce buffers 19576 * direct dma. else, set up kernel bounce buffers
18353 */ 19577 */
@@ -18366,9 +19590,9 @@ diff -urNp linux-2.6.32.10/block/blk-map.c linux-2.6.32.10/block/blk-map.c
18366 if (do_copy) 19590 if (do_copy)
18367 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); 19591 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
18368 else 19592 else
18369diff -urNp linux-2.6.32.10/block/blk-softirq.c linux-2.6.32.10/block/blk-softirq.c 19593diff -urNp linux-2.6.32.11/block/blk-softirq.c linux-2.6.32.11/block/blk-softirq.c
18370--- linux-2.6.32.10/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400 19594--- linux-2.6.32.11/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400
18371+++ linux-2.6.32.10/block/blk-softirq.c 2010-03-20 15:58:46.985539063 -0400 19595+++ linux-2.6.32.11/block/blk-softirq.c 2010-04-04 20:46:41.541133870 -0400
18372@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 19596@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
18373 * Softirq action handler - move entries to local list and loop over them 19597 * Softirq action handler - move entries to local list and loop over them
18374 * while passing them to the queue registered handler. 19598 * while passing them to the queue registered handler.
@@ -18378,9 +19602,9 @@ diff -urNp linux-2.6.32.10/block/blk-softirq.c linux-2.6.32.10/block/blk-softirq
18378 { 19602 {
18379 struct list_head *cpu_list, local_list; 19603 struct list_head *cpu_list, local_list;
18380 19604
18381diff -urNp linux-2.6.32.10/block/blk-sysfs.c linux-2.6.32.10/block/blk-sysfs.c 19605diff -urNp linux-2.6.32.11/block/blk-sysfs.c linux-2.6.32.11/block/blk-sysfs.c
18382--- linux-2.6.32.10/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400 19606--- linux-2.6.32.11/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400
18383+++ linux-2.6.32.10/block/blk-sysfs.c 2010-03-20 15:58:46.985539063 -0400 19607+++ linux-2.6.32.11/block/blk-sysfs.c 2010-04-04 20:46:41.541133870 -0400
18384@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob 19608@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
18385 kmem_cache_free(blk_requestq_cachep, q); 19609 kmem_cache_free(blk_requestq_cachep, q);
18386 } 19610 }
@@ -18390,9 +19614,9 @@ diff -urNp linux-2.6.32.10/block/blk-sysfs.c linux-2.6.32.10/block/blk-sysfs.c
18390 .show = queue_attr_show, 19614 .show = queue_attr_show,
18391 .store = queue_attr_store, 19615 .store = queue_attr_store,
18392 }; 19616 };
18393diff -urNp linux-2.6.32.10/block/elevator.c linux-2.6.32.10/block/elevator.c 19617diff -urNp linux-2.6.32.11/block/elevator.c linux-2.6.32.11/block/elevator.c
18394--- linux-2.6.32.10/block/elevator.c 2010-03-15 11:52:04.000000000 -0400 19618--- linux-2.6.32.11/block/elevator.c 2010-03-15 11:52:04.000000000 -0400
18395+++ linux-2.6.32.10/block/elevator.c 2010-03-20 15:58:46.985539063 -0400 19619+++ linux-2.6.32.11/block/elevator.c 2010-04-04 20:46:41.541133870 -0400
18396@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str 19620@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
18397 return error; 19621 return error;
18398 } 19622 }
@@ -18402,9 +19626,9 @@ diff -urNp linux-2.6.32.10/block/elevator.c linux-2.6.32.10/block/elevator.c
18402 .show = elv_attr_show, 19626 .show = elv_attr_show,
18403 .store = elv_attr_store, 19627 .store = elv_attr_store,
18404 }; 19628 };
18405diff -urNp linux-2.6.32.10/crypto/lrw.c linux-2.6.32.10/crypto/lrw.c 19629diff -urNp linux-2.6.32.11/crypto/lrw.c linux-2.6.32.11/crypto/lrw.c
18406--- linux-2.6.32.10/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400 19630--- linux-2.6.32.11/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400
18407+++ linux-2.6.32.10/crypto/lrw.c 2010-03-20 15:58:46.985539063 -0400 19631+++ linux-2.6.32.11/crypto/lrw.c 2010-04-04 20:46:41.541133870 -0400
18408@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par 19632@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
18409 struct priv *ctx = crypto_tfm_ctx(parent); 19633 struct priv *ctx = crypto_tfm_ctx(parent);
18410 struct crypto_cipher *child = ctx->child; 19634 struct crypto_cipher *child = ctx->child;
@@ -18414,9 +19638,9 @@ diff -urNp linux-2.6.32.10/crypto/lrw.c linux-2.6.32.10/crypto/lrw.c
18414 int bsize = crypto_cipher_blocksize(child); 19638 int bsize = crypto_cipher_blocksize(child);
18415 19639
18416 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); 19640 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
18417diff -urNp linux-2.6.32.10/Documentation/dontdiff linux-2.6.32.10/Documentation/dontdiff 19641diff -urNp linux-2.6.32.11/Documentation/dontdiff linux-2.6.32.11/Documentation/dontdiff
18418--- linux-2.6.32.10/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400 19642--- linux-2.6.32.11/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400
18419+++ linux-2.6.32.10/Documentation/dontdiff 2010-03-20 15:58:46.985539063 -0400 19643+++ linux-2.6.32.11/Documentation/dontdiff 2010-04-04 20:47:28.952733264 -0400
18420@@ -3,6 +3,7 @@ 19644@@ -3,6 +3,7 @@
18421 *.bin 19645 *.bin
18422 *.cpio 19646 *.cpio
@@ -18450,17 +19674,18 @@ diff -urNp linux-2.6.32.10/Documentation/dontdiff linux-2.6.32.10/Documentation/
18450 SCCS 19674 SCCS
18451 System.map* 19675 System.map*
18452 TAGS 19676 TAGS
18453@@ -76,7 +83,9 @@ btfixupprep 19677@@ -76,7 +83,10 @@ btfixupprep
18454 build 19678 build
18455 bvmlinux 19679 bvmlinux
18456 bzImage* 19680 bzImage*
18457+capflags.c 19681+capflags.c
18458 classlist.h* 19682 classlist.h*
19683+clut_vga16.c
18459+common-cmds.h 19684+common-cmds.h
18460 comp*.log 19685 comp*.log
18461 compile.h* 19686 compile.h*
18462 conf 19687 conf
18463@@ -103,13 +112,14 @@ gen_crc32table 19688@@ -103,13 +113,14 @@ gen_crc32table
18464 gen_init_cpio 19689 gen_init_cpio
18465 genksyms 19690 genksyms
18466 *_gray256.c 19691 *_gray256.c
@@ -18476,7 +19701,7 @@ diff -urNp linux-2.6.32.10/Documentation/dontdiff linux-2.6.32.10/Documentation/
18476 keywords.c 19701 keywords.c
18477 ksym.c* 19702 ksym.c*
18478 ksym.h* 19703 ksym.h*
18479@@ -133,7 +143,9 @@ mkboot 19704@@ -133,7 +144,9 @@ mkboot
18480 mkbugboot 19705 mkbugboot
18481 mkcpustr 19706 mkcpustr
18482 mkdep 19707 mkdep
@@ -18486,7 +19711,7 @@ diff -urNp linux-2.6.32.10/Documentation/dontdiff linux-2.6.32.10/Documentation/
18486 mktables 19711 mktables
18487 mktree 19712 mktree
18488 modpost 19713 modpost
18489@@ -149,6 +161,7 @@ patches* 19714@@ -149,6 +162,7 @@ patches*
18490 pca200e.bin 19715 pca200e.bin
18491 pca200e_ecd.bin2 19716 pca200e_ecd.bin2
18492 piggy.gz 19717 piggy.gz
@@ -18494,7 +19719,7 @@ diff -urNp linux-2.6.32.10/Documentation/dontdiff linux-2.6.32.10/Documentation/
18494 piggyback 19719 piggyback
18495 pnmtologo 19720 pnmtologo
18496 ppc_defs.h* 19721 ppc_defs.h*
18497@@ -163,6 +176,7 @@ setup 19722@@ -163,6 +177,7 @@ setup
18498 setup.bin 19723 setup.bin
18499 setup.elf 19724 setup.elf
18500 sImage 19725 sImage
@@ -18502,7 +19727,7 @@ diff -urNp linux-2.6.32.10/Documentation/dontdiff linux-2.6.32.10/Documentation/
18502 sm_tbl* 19727 sm_tbl*
18503 split-include 19728 split-include
18504 syscalltab.h 19729 syscalltab.h
18505@@ -186,14 +200,20 @@ version.h* 19730@@ -186,14 +201,20 @@ version.h*
18506 vmlinux 19731 vmlinux
18507 vmlinux-* 19732 vmlinux-*
18508 vmlinux.aout 19733 vmlinux.aout
@@ -18523,9 +19748,9 @@ diff -urNp linux-2.6.32.10/Documentation/dontdiff linux-2.6.32.10/Documentation/
18523 zImage* 19748 zImage*
18524 zconf.hash.c 19749 zconf.hash.c
18525+zoffset.h 19750+zoffset.h
18526diff -urNp linux-2.6.32.10/Documentation/kernel-parameters.txt linux-2.6.32.10/Documentation/kernel-parameters.txt 19751diff -urNp linux-2.6.32.11/Documentation/kernel-parameters.txt linux-2.6.32.11/Documentation/kernel-parameters.txt
18527--- linux-2.6.32.10/Documentation/kernel-parameters.txt 2010-03-15 11:52:04.000000000 -0400 19752--- linux-2.6.32.11/Documentation/kernel-parameters.txt 2010-03-15 11:52:04.000000000 -0400
18528+++ linux-2.6.32.10/Documentation/kernel-parameters.txt 2010-03-20 15:58:46.985539063 -0400 19753+++ linux-2.6.32.11/Documentation/kernel-parameters.txt 2010-04-04 20:46:41.541133870 -0400
18529@@ -1833,6 +1833,12 @@ and is between 256 and 4096 characters. 19754@@ -1833,6 +1833,12 @@ and is between 256 and 4096 characters.
18530 the specified number of seconds. This is to be used if 19755 the specified number of seconds. This is to be used if
18531 your oopses keep scrolling off the screen. 19756 your oopses keep scrolling off the screen.
@@ -18539,9 +19764,9 @@ diff -urNp linux-2.6.32.10/Documentation/kernel-parameters.txt linux-2.6.32.10/D
18539 pcbit= [HW,ISDN] 19764 pcbit= [HW,ISDN]
18540 19765
18541 pcd. [PARIDE] 19766 pcd. [PARIDE]
18542diff -urNp linux-2.6.32.10/drivers/acpi/battery.c linux-2.6.32.10/drivers/acpi/battery.c 19767diff -urNp linux-2.6.32.11/drivers/acpi/battery.c linux-2.6.32.11/drivers/acpi/battery.c
18543--- linux-2.6.32.10/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400 19768--- linux-2.6.32.11/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400
18544+++ linux-2.6.32.10/drivers/acpi/battery.c 2010-03-20 15:58:46.985539063 -0400 19769+++ linux-2.6.32.11/drivers/acpi/battery.c 2010-04-04 20:46:41.541133870 -0400
18545@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); 19770@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
18546 } 19771 }
18547 19772
@@ -18551,9 +19776,9 @@ diff -urNp linux-2.6.32.10/drivers/acpi/battery.c linux-2.6.32.10/drivers/acpi/b
18551 mode_t mode; 19776 mode_t mode;
18552 const char *name; 19777 const char *name;
18553 } acpi_battery_file[] = { 19778 } acpi_battery_file[] = {
18554diff -urNp linux-2.6.32.10/drivers/acpi/blacklist.c linux-2.6.32.10/drivers/acpi/blacklist.c 19779diff -urNp linux-2.6.32.11/drivers/acpi/blacklist.c linux-2.6.32.11/drivers/acpi/blacklist.c
18555--- linux-2.6.32.10/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400 19780--- linux-2.6.32.11/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400
18556+++ linux-2.6.32.10/drivers/acpi/blacklist.c 2010-03-20 15:58:46.985539063 -0400 19781+++ linux-2.6.32.11/drivers/acpi/blacklist.c 2010-04-04 20:46:41.541133870 -0400
18557@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b 19782@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
18558 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, 19783 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
18559 "Incorrect _ADR", 1}, 19784 "Incorrect _ADR", 1},
@@ -18563,9 +19788,9 @@ diff -urNp linux-2.6.32.10/drivers/acpi/blacklist.c linux-2.6.32.10/drivers/acpi
18563 }; 19788 };
18564 19789
18565 #if CONFIG_ACPI_BLACKLIST_YEAR 19790 #if CONFIG_ACPI_BLACKLIST_YEAR
18566diff -urNp linux-2.6.32.10/drivers/acpi/dock.c linux-2.6.32.10/drivers/acpi/dock.c 19791diff -urNp linux-2.6.32.11/drivers/acpi/dock.c linux-2.6.32.11/drivers/acpi/dock.c
18567--- linux-2.6.32.10/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400 19792--- linux-2.6.32.11/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400
18568+++ linux-2.6.32.10/drivers/acpi/dock.c 2010-03-20 15:58:46.985539063 -0400 19793+++ linux-2.6.32.11/drivers/acpi/dock.c 2010-04-04 20:46:41.544756868 -0400
18569@@ -77,7 +77,7 @@ struct dock_dependent_device { 19794@@ -77,7 +77,7 @@ struct dock_dependent_device {
18570 struct list_head list; 19795 struct list_head list;
18571 struct list_head hotplug_list; 19796 struct list_head hotplug_list;
@@ -18584,9 +19809,9 @@ diff -urNp linux-2.6.32.10/drivers/acpi/dock.c linux-2.6.32.10/drivers/acpi/dock
18584 void *context) 19809 void *context)
18585 { 19810 {
18586 struct dock_dependent_device *dd; 19811 struct dock_dependent_device *dd;
18587diff -urNp linux-2.6.32.10/drivers/acpi/osl.c linux-2.6.32.10/drivers/acpi/osl.c 19812diff -urNp linux-2.6.32.11/drivers/acpi/osl.c linux-2.6.32.11/drivers/acpi/osl.c
18588--- linux-2.6.32.10/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400 19813--- linux-2.6.32.11/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400
18589+++ linux-2.6.32.10/drivers/acpi/osl.c 2010-03-20 15:58:46.985539063 -0400 19814+++ linux-2.6.32.11/drivers/acpi/osl.c 2010-04-04 20:46:41.544756868 -0400
18590@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres 19815@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
18591 void __iomem *virt_addr; 19816 void __iomem *virt_addr;
18592 19817
@@ -18605,9 +19830,9 @@ diff -urNp linux-2.6.32.10/drivers/acpi/osl.c linux-2.6.32.10/drivers/acpi/osl.c
18605 19830
18606 switch (width) { 19831 switch (width) {
18607 case 8: 19832 case 8:
18608diff -urNp linux-2.6.32.10/drivers/acpi/processor_core.c linux-2.6.32.10/drivers/acpi/processor_core.c 19833diff -urNp linux-2.6.32.11/drivers/acpi/processor_core.c linux-2.6.32.11/drivers/acpi/processor_core.c
18609--- linux-2.6.32.10/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400 19834--- linux-2.6.32.11/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400
18610+++ linux-2.6.32.10/drivers/acpi/processor_core.c 2010-03-20 15:58:46.985539063 -0400 19835+++ linux-2.6.32.11/drivers/acpi/processor_core.c 2010-04-04 20:46:41.544756868 -0400
18611@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( 19836@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add(
18612 return 0; 19837 return 0;
18613 } 19838 }
@@ -18617,9 +19842,9 @@ diff -urNp linux-2.6.32.10/drivers/acpi/processor_core.c linux-2.6.32.10/drivers
18617 19842
18618 /* 19843 /*
18619 * Buggy BIOS check 19844 * Buggy BIOS check
18620diff -urNp linux-2.6.32.10/drivers/acpi/processor_idle.c linux-2.6.32.10/drivers/acpi/processor_idle.c 19845diff -urNp linux-2.6.32.11/drivers/acpi/processor_idle.c linux-2.6.32.11/drivers/acpi/processor_idle.c
18621--- linux-2.6.32.10/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400 19846--- linux-2.6.32.11/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400
18622+++ linux-2.6.32.10/drivers/acpi/processor_idle.c 2010-03-20 15:58:46.985539063 -0400 19847+++ linux-2.6.32.11/drivers/acpi/processor_idle.c 2010-04-04 20:46:41.544756868 -0400
18623@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat 19848@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat
18624 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), 19849 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
18625 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, 19850 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
@@ -18629,9 +19854,9 @@ diff -urNp linux-2.6.32.10/drivers/acpi/processor_idle.c linux-2.6.32.10/drivers
18629 }; 19854 };
18630 19855
18631 19856
18632diff -urNp linux-2.6.32.10/drivers/acpi/sleep.c linux-2.6.32.10/drivers/acpi/sleep.c 19857diff -urNp linux-2.6.32.11/drivers/acpi/sleep.c linux-2.6.32.11/drivers/acpi/sleep.c
18633--- linux-2.6.32.10/drivers/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400 19858--- linux-2.6.32.11/drivers/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400
18634+++ linux-2.6.32.10/drivers/acpi/sleep.c 2010-03-20 15:58:46.985539063 -0400 19859+++ linux-2.6.32.11/drivers/acpi/sleep.c 2010-04-04 20:46:41.544756868 -0400
18635@@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp 19860@@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp
18636 } 19861 }
18637 } 19862 }
@@ -18668,9 +19893,9 @@ diff -urNp linux-2.6.32.10/drivers/acpi/sleep.c linux-2.6.32.10/drivers/acpi/sle
18668 .begin = acpi_hibernation_begin_old, 19893 .begin = acpi_hibernation_begin_old,
18669 .end = acpi_pm_end, 19894 .end = acpi_pm_end,
18670 .pre_snapshot = acpi_hibernation_pre_snapshot_old, 19895 .pre_snapshot = acpi_hibernation_pre_snapshot_old,
18671diff -urNp linux-2.6.32.10/drivers/acpi/video.c linux-2.6.32.10/drivers/acpi/video.c 19896diff -urNp linux-2.6.32.11/drivers/acpi/video.c linux-2.6.32.11/drivers/acpi/video.c
18672--- linux-2.6.32.10/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400 19897--- linux-2.6.32.11/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400
18673+++ linux-2.6.32.10/drivers/acpi/video.c 2010-03-20 15:58:46.985539063 -0400 19898+++ linux-2.6.32.11/drivers/acpi/video.c 2010-04-04 20:46:41.544756868 -0400
18674@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str 19899@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
18675 vd->brightness->levels[request_level]); 19900 vd->brightness->levels[request_level]);
18676 } 19901 }
@@ -18680,9 +19905,9 @@ diff -urNp linux-2.6.32.10/drivers/acpi/video.c linux-2.6.32.10/drivers/acpi/vid
18680 .get_brightness = acpi_video_get_brightness, 19905 .get_brightness = acpi_video_get_brightness,
18681 .update_status = acpi_video_set_brightness, 19906 .update_status = acpi_video_set_brightness,
18682 }; 19907 };
18683diff -urNp linux-2.6.32.10/drivers/ata/ahci.c linux-2.6.32.10/drivers/ata/ahci.c 19908diff -urNp linux-2.6.32.11/drivers/ata/ahci.c linux-2.6.32.11/drivers/ata/ahci.c
18684--- linux-2.6.32.10/drivers/ata/ahci.c 2010-03-15 11:52:04.000000000 -0400 19909--- linux-2.6.32.11/drivers/ata/ahci.c 2010-04-04 20:41:49.920655481 -0400
18685+++ linux-2.6.32.10/drivers/ata/ahci.c 2010-03-20 15:58:47.005788900 -0400 19910+++ linux-2.6.32.11/drivers/ata/ahci.c 2010-04-04 20:46:41.544756868 -0400
18686@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh 19911@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
18687 .sdev_attrs = ahci_sdev_attrs, 19912 .sdev_attrs = ahci_sdev_attrs,
18688 }; 19913 };
@@ -18722,9 +19947,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/ahci.c linux-2.6.32.10/drivers/ata/ahci.c
18722 }; 19947 };
18723 19948
18724 19949
18725diff -urNp linux-2.6.32.10/drivers/ata/ata_generic.c linux-2.6.32.10/drivers/ata/ata_generic.c 19950diff -urNp linux-2.6.32.11/drivers/ata/ata_generic.c linux-2.6.32.11/drivers/ata/ata_generic.c
18726--- linux-2.6.32.10/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400 19951--- linux-2.6.32.11/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400
18727+++ linux-2.6.32.10/drivers/ata/ata_generic.c 2010-03-20 15:58:47.005788900 -0400 19952+++ linux-2.6.32.11/drivers/ata/ata_generic.c 2010-04-04 20:46:41.544756868 -0400
18728@@ -95,7 +95,7 @@ static struct scsi_host_template generic 19953@@ -95,7 +95,7 @@ static struct scsi_host_template generic
18729 ATA_BMDMA_SHT(DRV_NAME), 19954 ATA_BMDMA_SHT(DRV_NAME),
18730 }; 19955 };
@@ -18734,9 +19959,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/ata_generic.c linux-2.6.32.10/drivers/ata
18734 .inherits = &ata_bmdma_port_ops, 19959 .inherits = &ata_bmdma_port_ops,
18735 .cable_detect = ata_cable_unknown, 19960 .cable_detect = ata_cable_unknown,
18736 .set_mode = generic_set_mode, 19961 .set_mode = generic_set_mode,
18737diff -urNp linux-2.6.32.10/drivers/ata/ata_piix.c linux-2.6.32.10/drivers/ata/ata_piix.c 19962diff -urNp linux-2.6.32.11/drivers/ata/ata_piix.c linux-2.6.32.11/drivers/ata/ata_piix.c
18738--- linux-2.6.32.10/drivers/ata/ata_piix.c 2010-03-15 11:52:04.000000000 -0400 19963--- linux-2.6.32.11/drivers/ata/ata_piix.c 2010-03-15 11:52:04.000000000 -0400
18739+++ linux-2.6.32.10/drivers/ata/ata_piix.c 2010-03-20 15:58:47.005788900 -0400 19964+++ linux-2.6.32.11/drivers/ata/ata_piix.c 2010-04-04 20:46:41.544756868 -0400
18740@@ -291,7 +291,7 @@ static const struct pci_device_id piix_p 19965@@ -291,7 +291,7 @@ static const struct pci_device_id piix_p
18741 { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, 19966 { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
18742 /* SATA Controller IDE (PCH) */ 19967 /* SATA Controller IDE (PCH) */
@@ -18800,9 +20025,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/ata_piix.c linux-2.6.32.10/drivers/ata/at
18800 }; 20025 };
18801 static const char *oemstrs[] = { 20026 static const char *oemstrs[] = {
18802 "Tecra M3,", 20027 "Tecra M3,",
18803diff -urNp linux-2.6.32.10/drivers/ata/libata-acpi.c linux-2.6.32.10/drivers/ata/libata-acpi.c 20028diff -urNp linux-2.6.32.11/drivers/ata/libata-acpi.c linux-2.6.32.11/drivers/ata/libata-acpi.c
18804--- linux-2.6.32.10/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400 20029--- linux-2.6.32.11/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400
18805+++ linux-2.6.32.10/drivers/ata/libata-acpi.c 2010-03-20 15:58:47.005788900 -0400 20030+++ linux-2.6.32.11/drivers/ata/libata-acpi.c 2010-04-04 20:46:41.544756868 -0400
18806@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han 20031@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
18807 ata_acpi_uevent(dev->link->ap, dev, event); 20032 ata_acpi_uevent(dev->link->ap, dev, event);
18808 } 20033 }
@@ -18818,9 +20043,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/libata-acpi.c linux-2.6.32.10/drivers/ata
18818 .handler = ata_acpi_ap_notify_dock, 20043 .handler = ata_acpi_ap_notify_dock,
18819 .uevent = ata_acpi_ap_uevent, 20044 .uevent = ata_acpi_ap_uevent,
18820 }; 20045 };
18821diff -urNp linux-2.6.32.10/drivers/ata/libata-core.c linux-2.6.32.10/drivers/ata/libata-core.c 20046diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata/libata-core.c
18822--- linux-2.6.32.10/drivers/ata/libata-core.c 2010-03-15 11:52:04.000000000 -0400 20047--- linux-2.6.32.11/drivers/ata/libata-core.c 2010-03-15 11:52:04.000000000 -0400
18823+++ linux-2.6.32.10/drivers/ata/libata-core.c 2010-03-20 15:58:47.005788900 -0400 20048+++ linux-2.6.32.11/drivers/ata/libata-core.c 2010-04-04 20:46:41.544756868 -0400
18824@@ -896,7 +896,7 @@ static const struct ata_xfer_ent { 20049@@ -896,7 +896,7 @@ static const struct ata_xfer_ent {
18825 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, 20050 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
18826 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, 20051 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
@@ -18894,9 +20119,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/libata-core.c linux-2.6.32.10/drivers/ata
18894 .qc_prep = ata_noop_qc_prep, 20119 .qc_prep = ata_noop_qc_prep,
18895 .qc_issue = ata_dummy_qc_issue, 20120 .qc_issue = ata_dummy_qc_issue,
18896 .error_handler = ata_dummy_error_handler, 20121 .error_handler = ata_dummy_error_handler,
18897diff -urNp linux-2.6.32.10/drivers/ata/libata-eh.c linux-2.6.32.10/drivers/ata/libata-eh.c 20122diff -urNp linux-2.6.32.11/drivers/ata/libata-eh.c linux-2.6.32.11/drivers/ata/libata-eh.c
18898--- linux-2.6.32.10/drivers/ata/libata-eh.c 2010-03-15 11:52:04.000000000 -0400 20123--- linux-2.6.32.11/drivers/ata/libata-eh.c 2010-03-15 11:52:04.000000000 -0400
18899+++ linux-2.6.32.10/drivers/ata/libata-eh.c 2010-03-20 15:58:47.005788900 -0400 20124+++ linux-2.6.32.11/drivers/ata/libata-eh.c 2010-04-04 20:46:41.544756868 -0400
18900@@ -3581,7 +3581,7 @@ void ata_do_eh(struct ata_port *ap, ata_ 20125@@ -3581,7 +3581,7 @@ void ata_do_eh(struct ata_port *ap, ata_
18901 */ 20126 */
18902 void ata_std_error_handler(struct ata_port *ap) 20127 void ata_std_error_handler(struct ata_port *ap)
@@ -18906,9 +20131,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/libata-eh.c linux-2.6.32.10/drivers/ata/l
18906 ata_reset_fn_t hardreset = ops->hardreset; 20131 ata_reset_fn_t hardreset = ops->hardreset;
18907 20132
18908 /* ignore built-in hardreset if SCR access is not available */ 20133 /* ignore built-in hardreset if SCR access is not available */
18909diff -urNp linux-2.6.32.10/drivers/ata/libata-pmp.c linux-2.6.32.10/drivers/ata/libata-pmp.c 20134diff -urNp linux-2.6.32.11/drivers/ata/libata-pmp.c linux-2.6.32.11/drivers/ata/libata-pmp.c
18910--- linux-2.6.32.10/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400 20135--- linux-2.6.32.11/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400
18911+++ linux-2.6.32.10/drivers/ata/libata-pmp.c 2010-03-20 15:58:47.005788900 -0400 20136+++ linux-2.6.32.11/drivers/ata/libata-pmp.c 2010-04-04 20:46:41.544756868 -0400
18912@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str 20137@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
18913 */ 20138 */
18914 static int sata_pmp_eh_recover(struct ata_port *ap) 20139 static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -18918,9 +20143,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/libata-pmp.c linux-2.6.32.10/drivers/ata/
18918 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; 20143 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
18919 struct ata_link *pmp_link = &ap->link; 20144 struct ata_link *pmp_link = &ap->link;
18920 struct ata_device *pmp_dev = pmp_link->device; 20145 struct ata_device *pmp_dev = pmp_link->device;
18921diff -urNp linux-2.6.32.10/drivers/ata/pata_acpi.c linux-2.6.32.10/drivers/ata/pata_acpi.c 20146diff -urNp linux-2.6.32.11/drivers/ata/pata_acpi.c linux-2.6.32.11/drivers/ata/pata_acpi.c
18922--- linux-2.6.32.10/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400 20147--- linux-2.6.32.11/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400
18923+++ linux-2.6.32.10/drivers/ata/pata_acpi.c 2010-03-20 15:58:47.005788900 -0400 20148+++ linux-2.6.32.11/drivers/ata/pata_acpi.c 2010-04-04 20:46:41.549452547 -0400
18924@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s 20149@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
18925 ATA_BMDMA_SHT(DRV_NAME), 20150 ATA_BMDMA_SHT(DRV_NAME),
18926 }; 20151 };
@@ -18930,9 +20155,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_acpi.c linux-2.6.32.10/drivers/ata/p
18930 .inherits = &ata_bmdma_port_ops, 20155 .inherits = &ata_bmdma_port_ops,
18931 .qc_issue = pacpi_qc_issue, 20156 .qc_issue = pacpi_qc_issue,
18932 .cable_detect = pacpi_cable_detect, 20157 .cable_detect = pacpi_cable_detect,
18933diff -urNp linux-2.6.32.10/drivers/ata/pata_ali.c linux-2.6.32.10/drivers/ata/pata_ali.c 20158diff -urNp linux-2.6.32.11/drivers/ata/pata_ali.c linux-2.6.32.11/drivers/ata/pata_ali.c
18934--- linux-2.6.32.10/drivers/ata/pata_ali.c 2010-03-15 11:52:04.000000000 -0400 20159--- linux-2.6.32.11/drivers/ata/pata_ali.c 2010-03-15 11:52:04.000000000 -0400
18935+++ linux-2.6.32.10/drivers/ata/pata_ali.c 2010-03-20 15:58:47.009545415 -0400 20160+++ linux-2.6.32.11/drivers/ata/pata_ali.c 2010-04-04 20:46:41.549452547 -0400
18936@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht 20161@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
18937 * Port operations for PIO only ALi 20162 * Port operations for PIO only ALi
18938 */ 20163 */
@@ -18978,9 +20203,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_ali.c linux-2.6.32.10/drivers/ata/pa
18978 .inherits = &ali_dma_base_ops, 20203 .inherits = &ali_dma_base_ops,
18979 .check_atapi_dma = ali_check_atapi_dma, 20204 .check_atapi_dma = ali_check_atapi_dma,
18980 .dev_config = ali_warn_atapi_dma, 20205 .dev_config = ali_warn_atapi_dma,
18981diff -urNp linux-2.6.32.10/drivers/ata/pata_amd.c linux-2.6.32.10/drivers/ata/pata_amd.c 20206diff -urNp linux-2.6.32.11/drivers/ata/pata_amd.c linux-2.6.32.11/drivers/ata/pata_amd.c
18982--- linux-2.6.32.10/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400 20207--- linux-2.6.32.11/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400
18983+++ linux-2.6.32.10/drivers/ata/pata_amd.c 2010-03-20 15:58:47.009545415 -0400 20208+++ linux-2.6.32.11/drivers/ata/pata_amd.c 2010-04-04 20:46:41.549452547 -0400
18984@@ -397,28 +397,28 @@ static const struct ata_port_operations 20209@@ -397,28 +397,28 @@ static const struct ata_port_operations
18985 .prereset = amd_pre_reset, 20210 .prereset = amd_pre_reset,
18986 }; 20211 };
@@ -19030,9 +20255,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_amd.c linux-2.6.32.10/drivers/ata/pa
19030 .inherits = &nv_base_port_ops, 20255 .inherits = &nv_base_port_ops,
19031 .set_piomode = nv133_set_piomode, 20256 .set_piomode = nv133_set_piomode,
19032 .set_dmamode = nv133_set_dmamode, 20257 .set_dmamode = nv133_set_dmamode,
19033diff -urNp linux-2.6.32.10/drivers/ata/pata_artop.c linux-2.6.32.10/drivers/ata/pata_artop.c 20258diff -urNp linux-2.6.32.11/drivers/ata/pata_artop.c linux-2.6.32.11/drivers/ata/pata_artop.c
19034--- linux-2.6.32.10/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400 20259--- linux-2.6.32.11/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400
19035+++ linux-2.6.32.10/drivers/ata/pata_artop.c 2010-03-20 15:58:47.009545415 -0400 20260+++ linux-2.6.32.11/drivers/ata/pata_artop.c 2010-04-04 20:46:41.549452547 -0400
19036@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s 20261@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
19037 ATA_BMDMA_SHT(DRV_NAME), 20262 ATA_BMDMA_SHT(DRV_NAME),
19038 }; 20263 };
@@ -19051,9 +20276,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_artop.c linux-2.6.32.10/drivers/ata/
19051 .inherits = &ata_bmdma_port_ops, 20276 .inherits = &ata_bmdma_port_ops,
19052 .cable_detect = artop6260_cable_detect, 20277 .cable_detect = artop6260_cable_detect,
19053 .set_piomode = artop6260_set_piomode, 20278 .set_piomode = artop6260_set_piomode,
19054diff -urNp linux-2.6.32.10/drivers/ata/pata_at32.c linux-2.6.32.10/drivers/ata/pata_at32.c 20279diff -urNp linux-2.6.32.11/drivers/ata/pata_at32.c linux-2.6.32.11/drivers/ata/pata_at32.c
19055--- linux-2.6.32.10/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400 20280--- linux-2.6.32.11/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400
19056+++ linux-2.6.32.10/drivers/ata/pata_at32.c 2010-03-20 15:58:47.009545415 -0400 20281+++ linux-2.6.32.11/drivers/ata/pata_at32.c 2010-04-04 20:46:41.549452547 -0400
19057@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh 20282@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
19058 ATA_PIO_SHT(DRV_NAME), 20283 ATA_PIO_SHT(DRV_NAME),
19059 }; 20284 };
@@ -19063,9 +20288,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_at32.c linux-2.6.32.10/drivers/ata/p
19063 .inherits = &ata_sff_port_ops, 20288 .inherits = &ata_sff_port_ops,
19064 .cable_detect = ata_cable_40wire, 20289 .cable_detect = ata_cable_40wire,
19065 .set_piomode = pata_at32_set_piomode, 20290 .set_piomode = pata_at32_set_piomode,
19066diff -urNp linux-2.6.32.10/drivers/ata/pata_at91.c linux-2.6.32.10/drivers/ata/pata_at91.c 20291diff -urNp linux-2.6.32.11/drivers/ata/pata_at91.c linux-2.6.32.11/drivers/ata/pata_at91.c
19067--- linux-2.6.32.10/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400 20292--- linux-2.6.32.11/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400
19068+++ linux-2.6.32.10/drivers/ata/pata_at91.c 2010-03-20 15:58:47.009545415 -0400 20293+++ linux-2.6.32.11/drivers/ata/pata_at91.c 2010-04-04 20:46:41.549452547 -0400
19069@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at 20294@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
19070 ATA_PIO_SHT(DRV_NAME), 20295 ATA_PIO_SHT(DRV_NAME),
19071 }; 20296 };
@@ -19075,9 +20300,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_at91.c linux-2.6.32.10/drivers/ata/p
19075 .inherits = &ata_sff_port_ops, 20300 .inherits = &ata_sff_port_ops,
19076 20301
19077 .sff_data_xfer = pata_at91_data_xfer_noirq, 20302 .sff_data_xfer = pata_at91_data_xfer_noirq,
19078diff -urNp linux-2.6.32.10/drivers/ata/pata_atiixp.c linux-2.6.32.10/drivers/ata/pata_atiixp.c 20303diff -urNp linux-2.6.32.11/drivers/ata/pata_atiixp.c linux-2.6.32.11/drivers/ata/pata_atiixp.c
19079--- linux-2.6.32.10/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400 20304--- linux-2.6.32.11/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400
19080+++ linux-2.6.32.10/drivers/ata/pata_atiixp.c 2010-03-20 15:58:47.009545415 -0400 20305+++ linux-2.6.32.11/drivers/ata/pata_atiixp.c 2010-04-04 20:46:41.549452547 -0400
19081@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ 20306@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
19082 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 20307 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
19083 }; 20308 };
@@ -19087,9 +20312,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_atiixp.c linux-2.6.32.10/drivers/ata
19087 .inherits = &ata_bmdma_port_ops, 20312 .inherits = &ata_bmdma_port_ops,
19088 20313
19089 .qc_prep = ata_sff_dumb_qc_prep, 20314 .qc_prep = ata_sff_dumb_qc_prep,
19090diff -urNp linux-2.6.32.10/drivers/ata/pata_atp867x.c linux-2.6.32.10/drivers/ata/pata_atp867x.c 20315diff -urNp linux-2.6.32.11/drivers/ata/pata_atp867x.c linux-2.6.32.11/drivers/ata/pata_atp867x.c
19091--- linux-2.6.32.10/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400 20316--- linux-2.6.32.11/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400
19092+++ linux-2.6.32.10/drivers/ata/pata_atp867x.c 2010-03-20 15:58:47.009545415 -0400 20317+++ linux-2.6.32.11/drivers/ata/pata_atp867x.c 2010-04-04 20:46:41.549452547 -0400
19093@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x 20318@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
19094 ATA_BMDMA_SHT(DRV_NAME), 20319 ATA_BMDMA_SHT(DRV_NAME),
19095 }; 20320 };
@@ -19099,9 +20324,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_atp867x.c linux-2.6.32.10/drivers/at
19099 .inherits = &ata_bmdma_port_ops, 20324 .inherits = &ata_bmdma_port_ops,
19100 .cable_detect = atp867x_cable_detect, 20325 .cable_detect = atp867x_cable_detect,
19101 .set_piomode = atp867x_set_piomode, 20326 .set_piomode = atp867x_set_piomode,
19102diff -urNp linux-2.6.32.10/drivers/ata/pata_bf54x.c linux-2.6.32.10/drivers/ata/pata_bf54x.c 20327diff -urNp linux-2.6.32.11/drivers/ata/pata_bf54x.c linux-2.6.32.11/drivers/ata/pata_bf54x.c
19103--- linux-2.6.32.10/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400 20328--- linux-2.6.32.11/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400
19104+++ linux-2.6.32.10/drivers/ata/pata_bf54x.c 2010-03-20 15:58:47.009545415 -0400 20329+++ linux-2.6.32.11/drivers/ata/pata_bf54x.c 2010-04-04 20:46:41.549452547 -0400
19105@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh 20330@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
19106 .dma_boundary = ATA_DMA_BOUNDARY, 20331 .dma_boundary = ATA_DMA_BOUNDARY,
19107 }; 20332 };
@@ -19111,9 +20336,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_bf54x.c linux-2.6.32.10/drivers/ata/
19111 .inherits = &ata_sff_port_ops, 20336 .inherits = &ata_sff_port_ops,
19112 20337
19113 .set_piomode = bfin_set_piomode, 20338 .set_piomode = bfin_set_piomode,
19114diff -urNp linux-2.6.32.10/drivers/ata/pata_cmd640.c linux-2.6.32.10/drivers/ata/pata_cmd640.c 20339diff -urNp linux-2.6.32.11/drivers/ata/pata_cmd640.c linux-2.6.32.11/drivers/ata/pata_cmd640.c
19115--- linux-2.6.32.10/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400 20340--- linux-2.6.32.11/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400
19116+++ linux-2.6.32.10/drivers/ata/pata_cmd640.c 2010-03-20 15:58:47.009545415 -0400 20341+++ linux-2.6.32.11/drivers/ata/pata_cmd640.c 2010-04-04 20:46:41.549452547 -0400
19117@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ 20342@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
19118 ATA_BMDMA_SHT(DRV_NAME), 20343 ATA_BMDMA_SHT(DRV_NAME),
19119 }; 20344 };
@@ -19123,9 +20348,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_cmd640.c linux-2.6.32.10/drivers/ata
19123 .inherits = &ata_bmdma_port_ops, 20348 .inherits = &ata_bmdma_port_ops,
19124 /* In theory xfer_noirq is not needed once we kill the prefetcher */ 20349 /* In theory xfer_noirq is not needed once we kill the prefetcher */
19125 .sff_data_xfer = ata_sff_data_xfer_noirq, 20350 .sff_data_xfer = ata_sff_data_xfer_noirq,
19126diff -urNp linux-2.6.32.10/drivers/ata/pata_cmd64x.c linux-2.6.32.10/drivers/ata/pata_cmd64x.c 20351diff -urNp linux-2.6.32.11/drivers/ata/pata_cmd64x.c linux-2.6.32.11/drivers/ata/pata_cmd64x.c
19127--- linux-2.6.32.10/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400 20352--- linux-2.6.32.11/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400
19128+++ linux-2.6.32.10/drivers/ata/pata_cmd64x.c 2010-03-20 15:58:47.009545415 -0400 20353+++ linux-2.6.32.11/drivers/ata/pata_cmd64x.c 2010-04-04 20:46:41.549452547 -0400
19129@@ -275,18 +275,18 @@ static const struct ata_port_operations 20354@@ -275,18 +275,18 @@ static const struct ata_port_operations
19130 .set_dmamode = cmd64x_set_dmamode, 20355 .set_dmamode = cmd64x_set_dmamode,
19131 }; 20356 };
@@ -19148,9 +20373,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_cmd64x.c linux-2.6.32.10/drivers/ata
19148 .inherits = &cmd64x_base_ops, 20373 .inherits = &cmd64x_base_ops,
19149 .bmdma_stop = cmd648_bmdma_stop, 20374 .bmdma_stop = cmd648_bmdma_stop,
19150 .cable_detect = cmd648_cable_detect, 20375 .cable_detect = cmd648_cable_detect,
19151diff -urNp linux-2.6.32.10/drivers/ata/pata_cs5520.c linux-2.6.32.10/drivers/ata/pata_cs5520.c 20376diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5520.c linux-2.6.32.11/drivers/ata/pata_cs5520.c
19152--- linux-2.6.32.10/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400 20377--- linux-2.6.32.11/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400
19153+++ linux-2.6.32.10/drivers/ata/pata_cs5520.c 2010-03-20 15:58:47.009545415 -0400 20378+++ linux-2.6.32.11/drivers/ata/pata_cs5520.c 2010-04-04 20:46:41.549452547 -0400
19154@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ 20379@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
19155 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 20380 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
19156 }; 20381 };
@@ -19160,9 +20385,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_cs5520.c linux-2.6.32.10/drivers/ata
19160 .inherits = &ata_bmdma_port_ops, 20385 .inherits = &ata_bmdma_port_ops,
19161 .qc_prep = ata_sff_dumb_qc_prep, 20386 .qc_prep = ata_sff_dumb_qc_prep,
19162 .cable_detect = ata_cable_40wire, 20387 .cable_detect = ata_cable_40wire,
19163diff -urNp linux-2.6.32.10/drivers/ata/pata_cs5530.c linux-2.6.32.10/drivers/ata/pata_cs5530.c 20388diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5530.c linux-2.6.32.11/drivers/ata/pata_cs5530.c
19164--- linux-2.6.32.10/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400 20389--- linux-2.6.32.11/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400
19165+++ linux-2.6.32.10/drivers/ata/pata_cs5530.c 2010-03-20 15:58:47.009545415 -0400 20390+++ linux-2.6.32.11/drivers/ata/pata_cs5530.c 2010-04-04 20:46:41.549452547 -0400
19166@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ 20391@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
19167 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 20392 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
19168 }; 20393 };
@@ -19172,9 +20397,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_cs5530.c linux-2.6.32.10/drivers/ata
19172 .inherits = &ata_bmdma_port_ops, 20397 .inherits = &ata_bmdma_port_ops,
19173 20398
19174 .qc_prep = ata_sff_dumb_qc_prep, 20399 .qc_prep = ata_sff_dumb_qc_prep,
19175diff -urNp linux-2.6.32.10/drivers/ata/pata_cs5535.c linux-2.6.32.10/drivers/ata/pata_cs5535.c 20400diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5535.c linux-2.6.32.11/drivers/ata/pata_cs5535.c
19176--- linux-2.6.32.10/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400 20401--- linux-2.6.32.11/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400
19177+++ linux-2.6.32.10/drivers/ata/pata_cs5535.c 2010-03-20 15:58:47.009545415 -0400 20402+++ linux-2.6.32.11/drivers/ata/pata_cs5535.c 2010-04-04 20:46:41.549452547 -0400
19178@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ 20403@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
19179 ATA_BMDMA_SHT(DRV_NAME), 20404 ATA_BMDMA_SHT(DRV_NAME),
19180 }; 20405 };
@@ -19184,9 +20409,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_cs5535.c linux-2.6.32.10/drivers/ata
19184 .inherits = &ata_bmdma_port_ops, 20409 .inherits = &ata_bmdma_port_ops,
19185 .cable_detect = cs5535_cable_detect, 20410 .cable_detect = cs5535_cable_detect,
19186 .set_piomode = cs5535_set_piomode, 20411 .set_piomode = cs5535_set_piomode,
19187diff -urNp linux-2.6.32.10/drivers/ata/pata_cs5536.c linux-2.6.32.10/drivers/ata/pata_cs5536.c 20412diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5536.c linux-2.6.32.11/drivers/ata/pata_cs5536.c
19188--- linux-2.6.32.10/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400 20413--- linux-2.6.32.11/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400
19189+++ linux-2.6.32.10/drivers/ata/pata_cs5536.c 2010-03-20 15:58:47.009545415 -0400 20414+++ linux-2.6.32.11/drivers/ata/pata_cs5536.c 2010-04-04 20:46:41.549452547 -0400
19190@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ 20415@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
19191 ATA_BMDMA_SHT(DRV_NAME), 20416 ATA_BMDMA_SHT(DRV_NAME),
19192 }; 20417 };
@@ -19196,9 +20421,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_cs5536.c linux-2.6.32.10/drivers/ata
19196 .inherits = &ata_bmdma_port_ops, 20421 .inherits = &ata_bmdma_port_ops,
19197 .cable_detect = cs5536_cable_detect, 20422 .cable_detect = cs5536_cable_detect,
19198 .set_piomode = cs5536_set_piomode, 20423 .set_piomode = cs5536_set_piomode,
19199diff -urNp linux-2.6.32.10/drivers/ata/pata_cypress.c linux-2.6.32.10/drivers/ata/pata_cypress.c 20424diff -urNp linux-2.6.32.11/drivers/ata/pata_cypress.c linux-2.6.32.11/drivers/ata/pata_cypress.c
19200--- linux-2.6.32.10/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400 20425--- linux-2.6.32.11/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400
19201+++ linux-2.6.32.10/drivers/ata/pata_cypress.c 2010-03-20 15:58:47.009545415 -0400 20426+++ linux-2.6.32.11/drivers/ata/pata_cypress.c 2010-04-04 20:46:41.549452547 -0400
19202@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 20427@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
19203 ATA_BMDMA_SHT(DRV_NAME), 20428 ATA_BMDMA_SHT(DRV_NAME),
19204 }; 20429 };
@@ -19208,9 +20433,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_cypress.c linux-2.6.32.10/drivers/at
19208 .inherits = &ata_bmdma_port_ops, 20433 .inherits = &ata_bmdma_port_ops,
19209 .cable_detect = ata_cable_40wire, 20434 .cable_detect = ata_cable_40wire,
19210 .set_piomode = cy82c693_set_piomode, 20435 .set_piomode = cy82c693_set_piomode,
19211diff -urNp linux-2.6.32.10/drivers/ata/pata_efar.c linux-2.6.32.10/drivers/ata/pata_efar.c 20436diff -urNp linux-2.6.32.11/drivers/ata/pata_efar.c linux-2.6.32.11/drivers/ata/pata_efar.c
19212--- linux-2.6.32.10/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400 20437--- linux-2.6.32.11/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400
19213+++ linux-2.6.32.10/drivers/ata/pata_efar.c 2010-03-20 15:58:47.009545415 -0400 20438+++ linux-2.6.32.11/drivers/ata/pata_efar.c 2010-04-04 20:46:41.549452547 -0400
19214@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh 20439@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
19215 ATA_BMDMA_SHT(DRV_NAME), 20440 ATA_BMDMA_SHT(DRV_NAME),
19216 }; 20441 };
@@ -19220,9 +20445,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_efar.c linux-2.6.32.10/drivers/ata/p
19220 .inherits = &ata_bmdma_port_ops, 20445 .inherits = &ata_bmdma_port_ops,
19221 .cable_detect = efar_cable_detect, 20446 .cable_detect = efar_cable_detect,
19222 .set_piomode = efar_set_piomode, 20447 .set_piomode = efar_set_piomode,
19223diff -urNp linux-2.6.32.10/drivers/ata/pata_hpt366.c linux-2.6.32.10/drivers/ata/pata_hpt366.c 20448diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt366.c linux-2.6.32.11/drivers/ata/pata_hpt366.c
19224--- linux-2.6.32.10/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400 20449--- linux-2.6.32.11/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400
19225+++ linux-2.6.32.10/drivers/ata/pata_hpt366.c 2010-03-20 15:58:47.009545415 -0400 20450+++ linux-2.6.32.11/drivers/ata/pata_hpt366.c 2010-04-04 20:46:41.549452547 -0400
19226@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ 20451@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
19227 * Configuration for HPT366/68 20452 * Configuration for HPT366/68
19228 */ 20453 */
@@ -19232,9 +20457,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_hpt366.c linux-2.6.32.10/drivers/ata
19232 .inherits = &ata_bmdma_port_ops, 20457 .inherits = &ata_bmdma_port_ops,
19233 .cable_detect = hpt36x_cable_detect, 20458 .cable_detect = hpt36x_cable_detect,
19234 .mode_filter = hpt366_filter, 20459 .mode_filter = hpt366_filter,
19235diff -urNp linux-2.6.32.10/drivers/ata/pata_hpt37x.c linux-2.6.32.10/drivers/ata/pata_hpt37x.c 20460diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt37x.c linux-2.6.32.11/drivers/ata/pata_hpt37x.c
19236--- linux-2.6.32.10/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400 20461--- linux-2.6.32.11/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400
19237+++ linux-2.6.32.10/drivers/ata/pata_hpt37x.c 2010-03-20 15:58:47.009545415 -0400 20462+++ linux-2.6.32.11/drivers/ata/pata_hpt37x.c 2010-04-04 20:46:41.552552724 -0400
19238@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ 20463@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
19239 * Configuration for HPT370 20464 * Configuration for HPT370
19240 */ 20465 */
@@ -19271,9 +20496,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_hpt37x.c linux-2.6.32.10/drivers/ata
19271 .inherits = &hpt372_port_ops, 20496 .inherits = &hpt372_port_ops,
19272 .prereset = hpt374_fn1_pre_reset, 20497 .prereset = hpt374_fn1_pre_reset,
19273 }; 20498 };
19274diff -urNp linux-2.6.32.10/drivers/ata/pata_hpt3x2n.c linux-2.6.32.10/drivers/ata/pata_hpt3x2n.c 20499diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c
19275--- linux-2.6.32.10/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400 20500--- linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400
19276+++ linux-2.6.32.10/drivers/ata/pata_hpt3x2n.c 2010-03-20 15:58:47.009545415 -0400 20501+++ linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c 2010-04-04 20:46:41.552552724 -0400
19277@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n 20502@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
19278 * Configuration for HPT3x2n. 20503 * Configuration for HPT3x2n.
19279 */ 20504 */
@@ -19283,9 +20508,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_hpt3x2n.c linux-2.6.32.10/drivers/at
19283 .inherits = &ata_bmdma_port_ops, 20508 .inherits = &ata_bmdma_port_ops,
19284 20509
19285 .bmdma_stop = hpt3x2n_bmdma_stop, 20510 .bmdma_stop = hpt3x2n_bmdma_stop,
19286diff -urNp linux-2.6.32.10/drivers/ata/pata_hpt3x3.c linux-2.6.32.10/drivers/ata/pata_hpt3x3.c 20511diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt3x3.c linux-2.6.32.11/drivers/ata/pata_hpt3x3.c
19287--- linux-2.6.32.10/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400 20512--- linux-2.6.32.11/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400
19288+++ linux-2.6.32.10/drivers/ata/pata_hpt3x3.c 2010-03-20 15:58:47.009545415 -0400 20513+++ linux-2.6.32.11/drivers/ata/pata_hpt3x3.c 2010-04-04 20:46:41.552552724 -0400
19289@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ 20514@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
19290 ATA_BMDMA_SHT(DRV_NAME), 20515 ATA_BMDMA_SHT(DRV_NAME),
19291 }; 20516 };
@@ -19295,9 +20520,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_hpt3x3.c linux-2.6.32.10/drivers/ata
19295 .inherits = &ata_bmdma_port_ops, 20520 .inherits = &ata_bmdma_port_ops,
19296 .cable_detect = ata_cable_40wire, 20521 .cable_detect = ata_cable_40wire,
19297 .set_piomode = hpt3x3_set_piomode, 20522 .set_piomode = hpt3x3_set_piomode,
19298diff -urNp linux-2.6.32.10/drivers/ata/pata_icside.c linux-2.6.32.10/drivers/ata/pata_icside.c 20523diff -urNp linux-2.6.32.11/drivers/ata/pata_icside.c linux-2.6.32.11/drivers/ata/pata_icside.c
19299--- linux-2.6.32.10/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400 20524--- linux-2.6.32.11/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400
19300+++ linux-2.6.32.10/drivers/ata/pata_icside.c 2010-03-20 15:58:47.009545415 -0400 20525+++ linux-2.6.32.11/drivers/ata/pata_icside.c 2010-04-04 20:46:41.552552724 -0400
19301@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct 20526@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
19302 } 20527 }
19303 } 20528 }
@@ -19307,9 +20532,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_icside.c linux-2.6.32.10/drivers/ata
19307 .inherits = &ata_sff_port_ops, 20532 .inherits = &ata_sff_port_ops,
19308 /* no need to build any PRD tables for DMA */ 20533 /* no need to build any PRD tables for DMA */
19309 .qc_prep = ata_noop_qc_prep, 20534 .qc_prep = ata_noop_qc_prep,
19310diff -urNp linux-2.6.32.10/drivers/ata/pata_isapnp.c linux-2.6.32.10/drivers/ata/pata_isapnp.c 20535diff -urNp linux-2.6.32.11/drivers/ata/pata_isapnp.c linux-2.6.32.11/drivers/ata/pata_isapnp.c
19311--- linux-2.6.32.10/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400 20536--- linux-2.6.32.11/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400
19312+++ linux-2.6.32.10/drivers/ata/pata_isapnp.c 2010-03-20 15:58:47.009545415 -0400 20537+++ linux-2.6.32.11/drivers/ata/pata_isapnp.c 2010-04-04 20:46:41.552552724 -0400
19313@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ 20538@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
19314 ATA_PIO_SHT(DRV_NAME), 20539 ATA_PIO_SHT(DRV_NAME),
19315 }; 20540 };
@@ -19325,9 +20550,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_isapnp.c linux-2.6.32.10/drivers/ata
19325 .inherits = &ata_sff_port_ops, 20550 .inherits = &ata_sff_port_ops,
19326 .cable_detect = ata_cable_40wire, 20551 .cable_detect = ata_cable_40wire,
19327 /* No altstatus so we don't want to use the lost interrupt poll */ 20552 /* No altstatus so we don't want to use the lost interrupt poll */
19328diff -urNp linux-2.6.32.10/drivers/ata/pata_it8213.c linux-2.6.32.10/drivers/ata/pata_it8213.c 20553diff -urNp linux-2.6.32.11/drivers/ata/pata_it8213.c linux-2.6.32.11/drivers/ata/pata_it8213.c
19329--- linux-2.6.32.10/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400 20554--- linux-2.6.32.11/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400
19330+++ linux-2.6.32.10/drivers/ata/pata_it8213.c 2010-03-20 15:58:47.009545415 -0400 20555+++ linux-2.6.32.11/drivers/ata/pata_it8213.c 2010-04-04 20:46:41.552552724 -0400
19331@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ 20556@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
19332 }; 20557 };
19333 20558
@@ -19337,9 +20562,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_it8213.c linux-2.6.32.10/drivers/ata
19337 .inherits = &ata_bmdma_port_ops, 20562 .inherits = &ata_bmdma_port_ops,
19338 .cable_detect = it8213_cable_detect, 20563 .cable_detect = it8213_cable_detect,
19339 .set_piomode = it8213_set_piomode, 20564 .set_piomode = it8213_set_piomode,
19340diff -urNp linux-2.6.32.10/drivers/ata/pata_it821x.c linux-2.6.32.10/drivers/ata/pata_it821x.c 20565diff -urNp linux-2.6.32.11/drivers/ata/pata_it821x.c linux-2.6.32.11/drivers/ata/pata_it821x.c
19341--- linux-2.6.32.10/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400 20566--- linux-2.6.32.11/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400
19342+++ linux-2.6.32.10/drivers/ata/pata_it821x.c 2010-03-20 15:58:47.009545415 -0400 20567+++ linux-2.6.32.11/drivers/ata/pata_it821x.c 2010-04-04 20:46:41.552552724 -0400
19343@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ 20568@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
19344 ATA_BMDMA_SHT(DRV_NAME), 20569 ATA_BMDMA_SHT(DRV_NAME),
19345 }; 20570 };
@@ -19367,9 +20592,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_it821x.c linux-2.6.32.10/drivers/ata
19367 .inherits = &ata_bmdma_port_ops, 20592 .inherits = &ata_bmdma_port_ops,
19368 20593
19369 .check_atapi_dma= it821x_check_atapi_dma, 20594 .check_atapi_dma= it821x_check_atapi_dma,
19370diff -urNp linux-2.6.32.10/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.10/drivers/ata/pata_ixp4xx_cf.c 20595diff -urNp linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c
19371--- linux-2.6.32.10/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400 20596--- linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400
19372+++ linux-2.6.32.10/drivers/ata/pata_ixp4xx_cf.c 2010-03-20 15:58:47.009545415 -0400 20597+++ linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c 2010-04-04 20:46:41.552552724 -0400
19373@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ 20598@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
19374 ATA_PIO_SHT(DRV_NAME), 20599 ATA_PIO_SHT(DRV_NAME),
19375 }; 20600 };
@@ -19379,9 +20604,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.10/drivers/
19379 .inherits = &ata_sff_port_ops, 20604 .inherits = &ata_sff_port_ops,
19380 .sff_data_xfer = ixp4xx_mmio_data_xfer, 20605 .sff_data_xfer = ixp4xx_mmio_data_xfer,
19381 .cable_detect = ata_cable_40wire, 20606 .cable_detect = ata_cable_40wire,
19382diff -urNp linux-2.6.32.10/drivers/ata/pata_jmicron.c linux-2.6.32.10/drivers/ata/pata_jmicron.c 20607diff -urNp linux-2.6.32.11/drivers/ata/pata_jmicron.c linux-2.6.32.11/drivers/ata/pata_jmicron.c
19383--- linux-2.6.32.10/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400 20608--- linux-2.6.32.11/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400
19384+++ linux-2.6.32.10/drivers/ata/pata_jmicron.c 2010-03-20 15:58:47.009545415 -0400 20609+++ linux-2.6.32.11/drivers/ata/pata_jmicron.c 2010-04-04 20:46:41.552552724 -0400
19385@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron 20610@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
19386 ATA_BMDMA_SHT(DRV_NAME), 20611 ATA_BMDMA_SHT(DRV_NAME),
19387 }; 20612 };
@@ -19391,9 +20616,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_jmicron.c linux-2.6.32.10/drivers/at
19391 .inherits = &ata_bmdma_port_ops, 20616 .inherits = &ata_bmdma_port_ops,
19392 .prereset = jmicron_pre_reset, 20617 .prereset = jmicron_pre_reset,
19393 }; 20618 };
19394diff -urNp linux-2.6.32.10/drivers/ata/pata_legacy.c linux-2.6.32.10/drivers/ata/pata_legacy.c 20619diff -urNp linux-2.6.32.11/drivers/ata/pata_legacy.c linux-2.6.32.11/drivers/ata/pata_legacy.c
19395--- linux-2.6.32.10/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400 20620--- linux-2.6.32.11/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400
19396+++ linux-2.6.32.10/drivers/ata/pata_legacy.c 2010-03-20 15:58:47.009545415 -0400 20621+++ linux-2.6.32.11/drivers/ata/pata_legacy.c 2010-04-04 20:46:41.552552724 -0400
19397@@ -106,7 +106,7 @@ struct legacy_probe { 20622@@ -106,7 +106,7 @@ struct legacy_probe {
19398 20623
19399 struct legacy_controller { 20624 struct legacy_controller {
@@ -19505,9 +20730,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_legacy.c linux-2.6.32.10/drivers/ata
19505 struct legacy_data *ld = &legacy_data[probe->slot]; 20730 struct legacy_data *ld = &legacy_data[probe->slot];
19506 struct ata_host *host = NULL; 20731 struct ata_host *host = NULL;
19507 struct ata_port *ap; 20732 struct ata_port *ap;
19508diff -urNp linux-2.6.32.10/drivers/ata/pata_marvell.c linux-2.6.32.10/drivers/ata/pata_marvell.c 20733diff -urNp linux-2.6.32.11/drivers/ata/pata_marvell.c linux-2.6.32.11/drivers/ata/pata_marvell.c
19509--- linux-2.6.32.10/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400 20734--- linux-2.6.32.11/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400
19510+++ linux-2.6.32.10/drivers/ata/pata_marvell.c 2010-03-20 15:58:47.014066622 -0400 20735+++ linux-2.6.32.11/drivers/ata/pata_marvell.c 2010-04-04 20:46:41.552552724 -0400
19511@@ -100,7 +100,7 @@ static struct scsi_host_template marvell 20736@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
19512 ATA_BMDMA_SHT(DRV_NAME), 20737 ATA_BMDMA_SHT(DRV_NAME),
19513 }; 20738 };
@@ -19517,9 +20742,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_marvell.c linux-2.6.32.10/drivers/at
19517 .inherits = &ata_bmdma_port_ops, 20742 .inherits = &ata_bmdma_port_ops,
19518 .cable_detect = marvell_cable_detect, 20743 .cable_detect = marvell_cable_detect,
19519 .prereset = marvell_pre_reset, 20744 .prereset = marvell_pre_reset,
19520diff -urNp linux-2.6.32.10/drivers/ata/pata_mpc52xx.c linux-2.6.32.10/drivers/ata/pata_mpc52xx.c 20745diff -urNp linux-2.6.32.11/drivers/ata/pata_mpc52xx.c linux-2.6.32.11/drivers/ata/pata_mpc52xx.c
19521--- linux-2.6.32.10/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400 20746--- linux-2.6.32.11/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400
19522+++ linux-2.6.32.10/drivers/ata/pata_mpc52xx.c 2010-03-20 15:58:47.014066622 -0400 20747+++ linux-2.6.32.11/drivers/ata/pata_mpc52xx.c 2010-04-04 20:46:41.552552724 -0400
19523@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx 20748@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
19524 ATA_PIO_SHT(DRV_NAME), 20749 ATA_PIO_SHT(DRV_NAME),
19525 }; 20750 };
@@ -19529,9 +20754,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_mpc52xx.c linux-2.6.32.10/drivers/at
19529 .inherits = &ata_sff_port_ops, 20754 .inherits = &ata_sff_port_ops,
19530 .sff_dev_select = mpc52xx_ata_dev_select, 20755 .sff_dev_select = mpc52xx_ata_dev_select,
19531 .set_piomode = mpc52xx_ata_set_piomode, 20756 .set_piomode = mpc52xx_ata_set_piomode,
19532diff -urNp linux-2.6.32.10/drivers/ata/pata_mpiix.c linux-2.6.32.10/drivers/ata/pata_mpiix.c 20757diff -urNp linux-2.6.32.11/drivers/ata/pata_mpiix.c linux-2.6.32.11/drivers/ata/pata_mpiix.c
19533--- linux-2.6.32.10/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400 20758--- linux-2.6.32.11/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400
19534+++ linux-2.6.32.10/drivers/ata/pata_mpiix.c 2010-03-20 15:58:47.014066622 -0400 20759+++ linux-2.6.32.11/drivers/ata/pata_mpiix.c 2010-04-04 20:46:41.552552724 -0400
19535@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s 20760@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
19536 ATA_PIO_SHT(DRV_NAME), 20761 ATA_PIO_SHT(DRV_NAME),
19537 }; 20762 };
@@ -19541,9 +20766,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_mpiix.c linux-2.6.32.10/drivers/ata/
19541 .inherits = &ata_sff_port_ops, 20766 .inherits = &ata_sff_port_ops,
19542 .qc_issue = mpiix_qc_issue, 20767 .qc_issue = mpiix_qc_issue,
19543 .cable_detect = ata_cable_40wire, 20768 .cable_detect = ata_cable_40wire,
19544diff -urNp linux-2.6.32.10/drivers/ata/pata_netcell.c linux-2.6.32.10/drivers/ata/pata_netcell.c 20769diff -urNp linux-2.6.32.11/drivers/ata/pata_netcell.c linux-2.6.32.11/drivers/ata/pata_netcell.c
19545--- linux-2.6.32.10/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400 20770--- linux-2.6.32.11/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400
19546+++ linux-2.6.32.10/drivers/ata/pata_netcell.c 2010-03-20 15:58:47.014066622 -0400 20771+++ linux-2.6.32.11/drivers/ata/pata_netcell.c 2010-04-04 20:46:41.552552724 -0400
19547@@ -34,7 +34,7 @@ static struct scsi_host_template netcell 20772@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
19548 ATA_BMDMA_SHT(DRV_NAME), 20773 ATA_BMDMA_SHT(DRV_NAME),
19549 }; 20774 };
@@ -19553,9 +20778,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_netcell.c linux-2.6.32.10/drivers/at
19553 .inherits = &ata_bmdma_port_ops, 20778 .inherits = &ata_bmdma_port_ops,
19554 .cable_detect = ata_cable_80wire, 20779 .cable_detect = ata_cable_80wire,
19555 .read_id = netcell_read_id, 20780 .read_id = netcell_read_id,
19556diff -urNp linux-2.6.32.10/drivers/ata/pata_ninja32.c linux-2.6.32.10/drivers/ata/pata_ninja32.c 20781diff -urNp linux-2.6.32.11/drivers/ata/pata_ninja32.c linux-2.6.32.11/drivers/ata/pata_ninja32.c
19557--- linux-2.6.32.10/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400 20782--- linux-2.6.32.11/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400
19558+++ linux-2.6.32.10/drivers/ata/pata_ninja32.c 2010-03-20 15:58:47.014066622 -0400 20783+++ linux-2.6.32.11/drivers/ata/pata_ninja32.c 2010-04-04 20:46:41.552552724 -0400
19559@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 20784@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
19560 ATA_BMDMA_SHT(DRV_NAME), 20785 ATA_BMDMA_SHT(DRV_NAME),
19561 }; 20786 };
@@ -19565,9 +20790,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_ninja32.c linux-2.6.32.10/drivers/at
19565 .inherits = &ata_bmdma_port_ops, 20790 .inherits = &ata_bmdma_port_ops,
19566 .sff_dev_select = ninja32_dev_select, 20791 .sff_dev_select = ninja32_dev_select,
19567 .cable_detect = ata_cable_40wire, 20792 .cable_detect = ata_cable_40wire,
19568diff -urNp linux-2.6.32.10/drivers/ata/pata_ns87410.c linux-2.6.32.10/drivers/ata/pata_ns87410.c 20793diff -urNp linux-2.6.32.11/drivers/ata/pata_ns87410.c linux-2.6.32.11/drivers/ata/pata_ns87410.c
19569--- linux-2.6.32.10/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400 20794--- linux-2.6.32.11/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400
19570+++ linux-2.6.32.10/drivers/ata/pata_ns87410.c 2010-03-20 15:58:47.014066622 -0400 20795+++ linux-2.6.32.11/drivers/ata/pata_ns87410.c 2010-04-04 20:46:41.552552724 -0400
19571@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 20796@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
19572 ATA_PIO_SHT(DRV_NAME), 20797 ATA_PIO_SHT(DRV_NAME),
19573 }; 20798 };
@@ -19577,9 +20802,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_ns87410.c linux-2.6.32.10/drivers/at
19577 .inherits = &ata_sff_port_ops, 20802 .inherits = &ata_sff_port_ops,
19578 .qc_issue = ns87410_qc_issue, 20803 .qc_issue = ns87410_qc_issue,
19579 .cable_detect = ata_cable_40wire, 20804 .cable_detect = ata_cable_40wire,
19580diff -urNp linux-2.6.32.10/drivers/ata/pata_ns87415.c linux-2.6.32.10/drivers/ata/pata_ns87415.c 20805diff -urNp linux-2.6.32.11/drivers/ata/pata_ns87415.c linux-2.6.32.11/drivers/ata/pata_ns87415.c
19581--- linux-2.6.32.10/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400 20806--- linux-2.6.32.11/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400
19582+++ linux-2.6.32.10/drivers/ata/pata_ns87415.c 2010-03-20 15:58:47.014066622 -0400 20807+++ linux-2.6.32.11/drivers/ata/pata_ns87415.c 2010-04-04 20:46:41.552552724 -0400
19583@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at 20808@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
19584 } 20809 }
19585 #endif /* 87560 SuperIO Support */ 20810 #endif /* 87560 SuperIO Support */
@@ -19598,9 +20823,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_ns87415.c linux-2.6.32.10/drivers/at
19598 .inherits = &ns87415_pata_ops, 20823 .inherits = &ns87415_pata_ops,
19599 .sff_tf_read = ns87560_tf_read, 20824 .sff_tf_read = ns87560_tf_read,
19600 .sff_check_status = ns87560_check_status, 20825 .sff_check_status = ns87560_check_status,
19601diff -urNp linux-2.6.32.10/drivers/ata/pata_octeon_cf.c linux-2.6.32.10/drivers/ata/pata_octeon_cf.c 20826diff -urNp linux-2.6.32.11/drivers/ata/pata_octeon_cf.c linux-2.6.32.11/drivers/ata/pata_octeon_cf.c
19602--- linux-2.6.32.10/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400 20827--- linux-2.6.32.11/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400
19603+++ linux-2.6.32.10/drivers/ata/pata_octeon_cf.c 2010-03-20 15:58:47.014066622 -0400 20828+++ linux-2.6.32.11/drivers/ata/pata_octeon_cf.c 2010-04-04 20:46:41.552552724 -0400
19604@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s 20829@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
19605 return 0; 20830 return 0;
19606 } 20831 }
@@ -19609,9 +20834,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_octeon_cf.c linux-2.6.32.10/drivers/
19609 static struct ata_port_operations octeon_cf_ops = { 20834 static struct ata_port_operations octeon_cf_ops = {
19610 .inherits = &ata_sff_port_ops, 20835 .inherits = &ata_sff_port_ops,
19611 .check_atapi_dma = octeon_cf_check_atapi_dma, 20836 .check_atapi_dma = octeon_cf_check_atapi_dma,
19612diff -urNp linux-2.6.32.10/drivers/ata/pata_oldpiix.c linux-2.6.32.10/drivers/ata/pata_oldpiix.c 20837diff -urNp linux-2.6.32.11/drivers/ata/pata_oldpiix.c linux-2.6.32.11/drivers/ata/pata_oldpiix.c
19613--- linux-2.6.32.10/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400 20838--- linux-2.6.32.11/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400
19614+++ linux-2.6.32.10/drivers/ata/pata_oldpiix.c 2010-03-20 15:58:47.014066622 -0400 20839+++ linux-2.6.32.11/drivers/ata/pata_oldpiix.c 2010-04-04 20:46:41.552552724 -0400
19615@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix 20840@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
19616 ATA_BMDMA_SHT(DRV_NAME), 20841 ATA_BMDMA_SHT(DRV_NAME),
19617 }; 20842 };
@@ -19621,9 +20846,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_oldpiix.c linux-2.6.32.10/drivers/at
19621 .inherits = &ata_bmdma_port_ops, 20846 .inherits = &ata_bmdma_port_ops,
19622 .qc_issue = oldpiix_qc_issue, 20847 .qc_issue = oldpiix_qc_issue,
19623 .cable_detect = ata_cable_40wire, 20848 .cable_detect = ata_cable_40wire,
19624diff -urNp linux-2.6.32.10/drivers/ata/pata_opti.c linux-2.6.32.10/drivers/ata/pata_opti.c 20849diff -urNp linux-2.6.32.11/drivers/ata/pata_opti.c linux-2.6.32.11/drivers/ata/pata_opti.c
19625--- linux-2.6.32.10/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400 20850--- linux-2.6.32.11/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400
19626+++ linux-2.6.32.10/drivers/ata/pata_opti.c 2010-03-20 15:58:47.014066622 -0400 20851+++ linux-2.6.32.11/drivers/ata/pata_opti.c 2010-04-04 20:46:41.552552724 -0400
19627@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh 20852@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
19628 ATA_PIO_SHT(DRV_NAME), 20853 ATA_PIO_SHT(DRV_NAME),
19629 }; 20854 };
@@ -19633,9 +20858,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_opti.c linux-2.6.32.10/drivers/ata/p
19633 .inherits = &ata_sff_port_ops, 20858 .inherits = &ata_sff_port_ops,
19634 .cable_detect = ata_cable_40wire, 20859 .cable_detect = ata_cable_40wire,
19635 .set_piomode = opti_set_piomode, 20860 .set_piomode = opti_set_piomode,
19636diff -urNp linux-2.6.32.10/drivers/ata/pata_optidma.c linux-2.6.32.10/drivers/ata/pata_optidma.c 20861diff -urNp linux-2.6.32.11/drivers/ata/pata_optidma.c linux-2.6.32.11/drivers/ata/pata_optidma.c
19637--- linux-2.6.32.10/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400 20862--- linux-2.6.32.11/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400
19638+++ linux-2.6.32.10/drivers/ata/pata_optidma.c 2010-03-20 15:58:47.014066622 -0400 20863+++ linux-2.6.32.11/drivers/ata/pata_optidma.c 2010-04-04 20:46:41.552552724 -0400
19639@@ -337,7 +337,7 @@ static struct scsi_host_template optidma 20864@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
19640 ATA_BMDMA_SHT(DRV_NAME), 20865 ATA_BMDMA_SHT(DRV_NAME),
19641 }; 20866 };
@@ -19654,9 +20879,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_optidma.c linux-2.6.32.10/drivers/at
19654 .inherits = &optidma_port_ops, 20879 .inherits = &optidma_port_ops,
19655 .set_piomode = optiplus_set_pio_mode, 20880 .set_piomode = optiplus_set_pio_mode,
19656 .set_dmamode = optiplus_set_dma_mode, 20881 .set_dmamode = optiplus_set_dma_mode,
19657diff -urNp linux-2.6.32.10/drivers/ata/pata_palmld.c linux-2.6.32.10/drivers/ata/pata_palmld.c 20882diff -urNp linux-2.6.32.11/drivers/ata/pata_palmld.c linux-2.6.32.11/drivers/ata/pata_palmld.c
19658--- linux-2.6.32.10/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400 20883--- linux-2.6.32.11/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400
19659+++ linux-2.6.32.10/drivers/ata/pata_palmld.c 2010-03-20 15:58:47.014066622 -0400 20884+++ linux-2.6.32.11/drivers/ata/pata_palmld.c 2010-04-04 20:46:41.552552724 -0400
19660@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ 20885@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
19661 ATA_PIO_SHT(DRV_NAME), 20886 ATA_PIO_SHT(DRV_NAME),
19662 }; 20887 };
@@ -19666,9 +20891,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_palmld.c linux-2.6.32.10/drivers/ata
19666 .inherits = &ata_sff_port_ops, 20891 .inherits = &ata_sff_port_ops,
19667 .sff_data_xfer = ata_sff_data_xfer_noirq, 20892 .sff_data_xfer = ata_sff_data_xfer_noirq,
19668 .cable_detect = ata_cable_40wire, 20893 .cable_detect = ata_cable_40wire,
19669diff -urNp linux-2.6.32.10/drivers/ata/pata_pcmcia.c linux-2.6.32.10/drivers/ata/pata_pcmcia.c 20894diff -urNp linux-2.6.32.11/drivers/ata/pata_pcmcia.c linux-2.6.32.11/drivers/ata/pata_pcmcia.c
19670--- linux-2.6.32.10/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400 20895--- linux-2.6.32.11/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400
19671+++ linux-2.6.32.10/drivers/ata/pata_pcmcia.c 2010-03-20 15:58:47.014066622 -0400 20896+++ linux-2.6.32.11/drivers/ata/pata_pcmcia.c 2010-04-04 20:46:41.552552724 -0400
19672@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ 20897@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
19673 ATA_PIO_SHT(DRV_NAME), 20898 ATA_PIO_SHT(DRV_NAME),
19674 }; 20899 };
@@ -19695,9 +20920,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_pcmcia.c linux-2.6.32.10/drivers/ata
19695 20920
19696 info = kzalloc(sizeof(*info), GFP_KERNEL); 20921 info = kzalloc(sizeof(*info), GFP_KERNEL);
19697 if (info == NULL) 20922 if (info == NULL)
19698diff -urNp linux-2.6.32.10/drivers/ata/pata_pdc2027x.c linux-2.6.32.10/drivers/ata/pata_pdc2027x.c 20923diff -urNp linux-2.6.32.11/drivers/ata/pata_pdc2027x.c linux-2.6.32.11/drivers/ata/pata_pdc2027x.c
19699--- linux-2.6.32.10/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400 20924--- linux-2.6.32.11/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400
19700+++ linux-2.6.32.10/drivers/ata/pata_pdc2027x.c 2010-03-20 15:58:47.014066622 -0400 20925+++ linux-2.6.32.11/drivers/ata/pata_pdc2027x.c 2010-04-04 20:46:41.552552724 -0400
19701@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 20926@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
19702 ATA_BMDMA_SHT(DRV_NAME), 20927 ATA_BMDMA_SHT(DRV_NAME),
19703 }; 20928 };
@@ -19715,9 +20940,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_pdc2027x.c linux-2.6.32.10/drivers/a
19715 .inherits = &pdc2027x_pata100_ops, 20940 .inherits = &pdc2027x_pata100_ops,
19716 .mode_filter = pdc2027x_mode_filter, 20941 .mode_filter = pdc2027x_mode_filter,
19717 .set_piomode = pdc2027x_set_piomode, 20942 .set_piomode = pdc2027x_set_piomode,
19718diff -urNp linux-2.6.32.10/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.10/drivers/ata/pata_pdc202xx_old.c 20943diff -urNp linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c
19719--- linux-2.6.32.10/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400 20944--- linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400
19720+++ linux-2.6.32.10/drivers/ata/pata_pdc202xx_old.c 2010-03-20 15:58:47.014066622 -0400 20945+++ linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c 2010-04-04 20:46:41.552552724 -0400
19721@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x 20946@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x
19722 ATA_BMDMA_SHT(DRV_NAME), 20947 ATA_BMDMA_SHT(DRV_NAME),
19723 }; 20948 };
@@ -19736,9 +20961,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.10/drive
19736 .inherits = &pdc2024x_port_ops, 20961 .inherits = &pdc2024x_port_ops,
19737 20962
19738 .check_atapi_dma = pdc2026x_check_atapi_dma, 20963 .check_atapi_dma = pdc2026x_check_atapi_dma,
19739diff -urNp linux-2.6.32.10/drivers/ata/pata_platform.c linux-2.6.32.10/drivers/ata/pata_platform.c 20964diff -urNp linux-2.6.32.11/drivers/ata/pata_platform.c linux-2.6.32.11/drivers/ata/pata_platform.c
19740--- linux-2.6.32.10/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400 20965--- linux-2.6.32.11/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400
19741+++ linux-2.6.32.10/drivers/ata/pata_platform.c 2010-03-20 15:58:47.014066622 -0400 20966+++ linux-2.6.32.11/drivers/ata/pata_platform.c 2010-04-04 20:46:41.552552724 -0400
19742@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl 20967@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
19743 ATA_PIO_SHT(DRV_NAME), 20968 ATA_PIO_SHT(DRV_NAME),
19744 }; 20969 };
@@ -19748,9 +20973,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_platform.c linux-2.6.32.10/drivers/a
19748 .inherits = &ata_sff_port_ops, 20973 .inherits = &ata_sff_port_ops,
19749 .sff_data_xfer = ata_sff_data_xfer_noirq, 20974 .sff_data_xfer = ata_sff_data_xfer_noirq,
19750 .cable_detect = ata_cable_unknown, 20975 .cable_detect = ata_cable_unknown,
19751diff -urNp linux-2.6.32.10/drivers/ata/pata_qdi.c linux-2.6.32.10/drivers/ata/pata_qdi.c 20976diff -urNp linux-2.6.32.11/drivers/ata/pata_qdi.c linux-2.6.32.11/drivers/ata/pata_qdi.c
19752--- linux-2.6.32.10/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400 20977--- linux-2.6.32.11/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400
19753+++ linux-2.6.32.10/drivers/ata/pata_qdi.c 2010-03-20 15:58:47.014066622 -0400 20978+++ linux-2.6.32.11/drivers/ata/pata_qdi.c 2010-04-04 20:46:41.552552724 -0400
19754@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht 20979@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
19755 ATA_PIO_SHT(DRV_NAME), 20980 ATA_PIO_SHT(DRV_NAME),
19756 }; 20981 };
@@ -19769,9 +20994,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_qdi.c linux-2.6.32.10/drivers/ata/pa
19769 .inherits = &qdi6500_port_ops, 20994 .inherits = &qdi6500_port_ops,
19770 .set_piomode = qdi6580_set_piomode, 20995 .set_piomode = qdi6580_set_piomode,
19771 }; 20996 };
19772diff -urNp linux-2.6.32.10/drivers/ata/pata_radisys.c linux-2.6.32.10/drivers/ata/pata_radisys.c 20997diff -urNp linux-2.6.32.11/drivers/ata/pata_radisys.c linux-2.6.32.11/drivers/ata/pata_radisys.c
19773--- linux-2.6.32.10/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400 20998--- linux-2.6.32.11/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400
19774+++ linux-2.6.32.10/drivers/ata/pata_radisys.c 2010-03-20 15:58:47.014066622 -0400 20999+++ linux-2.6.32.11/drivers/ata/pata_radisys.c 2010-04-04 20:46:41.556857392 -0400
19775@@ -187,7 +187,7 @@ static struct scsi_host_template radisys 21000@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
19776 ATA_BMDMA_SHT(DRV_NAME), 21001 ATA_BMDMA_SHT(DRV_NAME),
19777 }; 21002 };
@@ -19781,9 +21006,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_radisys.c linux-2.6.32.10/drivers/at
19781 .inherits = &ata_bmdma_port_ops, 21006 .inherits = &ata_bmdma_port_ops,
19782 .qc_issue = radisys_qc_issue, 21007 .qc_issue = radisys_qc_issue,
19783 .cable_detect = ata_cable_unknown, 21008 .cable_detect = ata_cable_unknown,
19784diff -urNp linux-2.6.32.10/drivers/ata/pata_rb532_cf.c linux-2.6.32.10/drivers/ata/pata_rb532_cf.c 21009diff -urNp linux-2.6.32.11/drivers/ata/pata_rb532_cf.c linux-2.6.32.11/drivers/ata/pata_rb532_cf.c
19785--- linux-2.6.32.10/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400 21010--- linux-2.6.32.11/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400
19786+++ linux-2.6.32.10/drivers/ata/pata_rb532_cf.c 2010-03-20 15:58:47.014066622 -0400 21011+++ linux-2.6.32.11/drivers/ata/pata_rb532_cf.c 2010-04-04 20:46:41.556857392 -0400
19787@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle 21012@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
19788 return IRQ_HANDLED; 21013 return IRQ_HANDLED;
19789 } 21014 }
@@ -19793,9 +21018,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_rb532_cf.c linux-2.6.32.10/drivers/a
19793 .inherits = &ata_sff_port_ops, 21018 .inherits = &ata_sff_port_ops,
19794 .sff_data_xfer = ata_sff_data_xfer32, 21019 .sff_data_xfer = ata_sff_data_xfer32,
19795 }; 21020 };
19796diff -urNp linux-2.6.32.10/drivers/ata/pata_rdc.c linux-2.6.32.10/drivers/ata/pata_rdc.c 21021diff -urNp linux-2.6.32.11/drivers/ata/pata_rdc.c linux-2.6.32.11/drivers/ata/pata_rdc.c
19797--- linux-2.6.32.10/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400 21022--- linux-2.6.32.11/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400
19798+++ linux-2.6.32.10/drivers/ata/pata_rdc.c 2010-03-20 15:58:47.014066622 -0400 21023+++ linux-2.6.32.11/drivers/ata/pata_rdc.c 2010-04-04 20:46:41.556857392 -0400
19799@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p 21024@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
19800 pci_write_config_byte(dev, 0x48, udma_enable); 21025 pci_write_config_byte(dev, 0x48, udma_enable);
19801 } 21026 }
@@ -19805,9 +21030,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_rdc.c linux-2.6.32.10/drivers/ata/pa
19805 .inherits = &ata_bmdma32_port_ops, 21030 .inherits = &ata_bmdma32_port_ops,
19806 .cable_detect = rdc_pata_cable_detect, 21031 .cable_detect = rdc_pata_cable_detect,
19807 .set_piomode = rdc_set_piomode, 21032 .set_piomode = rdc_set_piomode,
19808diff -urNp linux-2.6.32.10/drivers/ata/pata_rz1000.c linux-2.6.32.10/drivers/ata/pata_rz1000.c 21033diff -urNp linux-2.6.32.11/drivers/ata/pata_rz1000.c linux-2.6.32.11/drivers/ata/pata_rz1000.c
19809--- linux-2.6.32.10/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400 21034--- linux-2.6.32.11/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400
19810+++ linux-2.6.32.10/drivers/ata/pata_rz1000.c 2010-03-20 15:58:47.014066622 -0400 21035+++ linux-2.6.32.11/drivers/ata/pata_rz1000.c 2010-04-04 20:46:41.556857392 -0400
19811@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ 21036@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
19812 ATA_PIO_SHT(DRV_NAME), 21037 ATA_PIO_SHT(DRV_NAME),
19813 }; 21038 };
@@ -19817,9 +21042,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_rz1000.c linux-2.6.32.10/drivers/ata
19817 .inherits = &ata_sff_port_ops, 21042 .inherits = &ata_sff_port_ops,
19818 .cable_detect = ata_cable_40wire, 21043 .cable_detect = ata_cable_40wire,
19819 .set_mode = rz1000_set_mode, 21044 .set_mode = rz1000_set_mode,
19820diff -urNp linux-2.6.32.10/drivers/ata/pata_sc1200.c linux-2.6.32.10/drivers/ata/pata_sc1200.c 21045diff -urNp linux-2.6.32.11/drivers/ata/pata_sc1200.c linux-2.6.32.11/drivers/ata/pata_sc1200.c
19821--- linux-2.6.32.10/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400 21046--- linux-2.6.32.11/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400
19822+++ linux-2.6.32.10/drivers/ata/pata_sc1200.c 2010-03-20 15:58:47.014066622 -0400 21047+++ linux-2.6.32.11/drivers/ata/pata_sc1200.c 2010-04-04 20:46:41.556857392 -0400
19823@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ 21048@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
19824 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 21049 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
19825 }; 21050 };
@@ -19829,9 +21054,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_sc1200.c linux-2.6.32.10/drivers/ata
19829 .inherits = &ata_bmdma_port_ops, 21054 .inherits = &ata_bmdma_port_ops,
19830 .qc_prep = ata_sff_dumb_qc_prep, 21055 .qc_prep = ata_sff_dumb_qc_prep,
19831 .qc_issue = sc1200_qc_issue, 21056 .qc_issue = sc1200_qc_issue,
19832diff -urNp linux-2.6.32.10/drivers/ata/pata_scc.c linux-2.6.32.10/drivers/ata/pata_scc.c 21057diff -urNp linux-2.6.32.11/drivers/ata/pata_scc.c linux-2.6.32.11/drivers/ata/pata_scc.c
19833--- linux-2.6.32.10/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400 21058--- linux-2.6.32.11/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400
19834+++ linux-2.6.32.10/drivers/ata/pata_scc.c 2010-03-20 15:58:47.014066622 -0400 21059+++ linux-2.6.32.11/drivers/ata/pata_scc.c 2010-04-04 20:46:41.556857392 -0400
19835@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht 21060@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
19836 ATA_BMDMA_SHT(DRV_NAME), 21061 ATA_BMDMA_SHT(DRV_NAME),
19837 }; 21062 };
@@ -19841,9 +21066,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_scc.c linux-2.6.32.10/drivers/ata/pa
19841 .inherits = &ata_bmdma_port_ops, 21066 .inherits = &ata_bmdma_port_ops,
19842 21067
19843 .set_piomode = scc_set_piomode, 21068 .set_piomode = scc_set_piomode,
19844diff -urNp linux-2.6.32.10/drivers/ata/pata_sch.c linux-2.6.32.10/drivers/ata/pata_sch.c 21069diff -urNp linux-2.6.32.11/drivers/ata/pata_sch.c linux-2.6.32.11/drivers/ata/pata_sch.c
19845--- linux-2.6.32.10/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400 21070--- linux-2.6.32.11/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400
19846+++ linux-2.6.32.10/drivers/ata/pata_sch.c 2010-03-20 15:58:47.014066622 -0400 21071+++ linux-2.6.32.11/drivers/ata/pata_sch.c 2010-04-04 20:46:41.556857392 -0400
19847@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht 21072@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
19848 ATA_BMDMA_SHT(DRV_NAME), 21073 ATA_BMDMA_SHT(DRV_NAME),
19849 }; 21074 };
@@ -19853,9 +21078,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_sch.c linux-2.6.32.10/drivers/ata/pa
19853 .inherits = &ata_bmdma_port_ops, 21078 .inherits = &ata_bmdma_port_ops,
19854 .cable_detect = ata_cable_unknown, 21079 .cable_detect = ata_cable_unknown,
19855 .set_piomode = sch_set_piomode, 21080 .set_piomode = sch_set_piomode,
19856diff -urNp linux-2.6.32.10/drivers/ata/pata_serverworks.c linux-2.6.32.10/drivers/ata/pata_serverworks.c 21081diff -urNp linux-2.6.32.11/drivers/ata/pata_serverworks.c linux-2.6.32.11/drivers/ata/pata_serverworks.c
19857--- linux-2.6.32.10/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400 21082--- linux-2.6.32.11/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400
19858+++ linux-2.6.32.10/drivers/ata/pata_serverworks.c 2010-03-20 15:58:47.018046884 -0400 21083+++ linux-2.6.32.11/drivers/ata/pata_serverworks.c 2010-04-04 20:46:41.556857392 -0400
19859@@ -299,7 +299,7 @@ static struct scsi_host_template serverw 21084@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
19860 ATA_BMDMA_SHT(DRV_NAME), 21085 ATA_BMDMA_SHT(DRV_NAME),
19861 }; 21086 };
@@ -19874,9 +21099,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_serverworks.c linux-2.6.32.10/driver
19874 .inherits = &serverworks_osb4_port_ops, 21099 .inherits = &serverworks_osb4_port_ops,
19875 .mode_filter = serverworks_csb_filter, 21100 .mode_filter = serverworks_csb_filter,
19876 }; 21101 };
19877diff -urNp linux-2.6.32.10/drivers/ata/pata_sil680.c linux-2.6.32.10/drivers/ata/pata_sil680.c 21102diff -urNp linux-2.6.32.11/drivers/ata/pata_sil680.c linux-2.6.32.11/drivers/ata/pata_sil680.c
19878--- linux-2.6.32.10/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400 21103--- linux-2.6.32.11/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400
19879+++ linux-2.6.32.10/drivers/ata/pata_sil680.c 2010-03-20 15:58:47.018046884 -0400 21104+++ linux-2.6.32.11/drivers/ata/pata_sil680.c 2010-04-04 20:46:41.556857392 -0400
19880@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ 21105@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
19881 ATA_BMDMA_SHT(DRV_NAME), 21106 ATA_BMDMA_SHT(DRV_NAME),
19882 }; 21107 };
@@ -19886,9 +21111,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_sil680.c linux-2.6.32.10/drivers/ata
19886 .inherits = &ata_bmdma32_port_ops, 21111 .inherits = &ata_bmdma32_port_ops,
19887 .cable_detect = sil680_cable_detect, 21112 .cable_detect = sil680_cable_detect,
19888 .set_piomode = sil680_set_piomode, 21113 .set_piomode = sil680_set_piomode,
19889diff -urNp linux-2.6.32.10/drivers/ata/pata_sis.c linux-2.6.32.10/drivers/ata/pata_sis.c 21114diff -urNp linux-2.6.32.11/drivers/ata/pata_sis.c linux-2.6.32.11/drivers/ata/pata_sis.c
19890--- linux-2.6.32.10/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400 21115--- linux-2.6.32.11/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400
19891+++ linux-2.6.32.10/drivers/ata/pata_sis.c 2010-03-20 15:58:47.018046884 -0400 21116+++ linux-2.6.32.11/drivers/ata/pata_sis.c 2010-04-04 20:46:41.556857392 -0400
19892@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht 21117@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
19893 ATA_BMDMA_SHT(DRV_NAME), 21118 ATA_BMDMA_SHT(DRV_NAME),
19894 }; 21119 };
@@ -19944,9 +21169,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_sis.c linux-2.6.32.10/drivers/ata/pa
19944 .inherits = &sis_base_ops, 21169 .inherits = &sis_base_ops,
19945 .set_piomode = sis_old_set_piomode, 21170 .set_piomode = sis_old_set_piomode,
19946 .set_dmamode = sis_old_set_dmamode, 21171 .set_dmamode = sis_old_set_dmamode,
19947diff -urNp linux-2.6.32.10/drivers/ata/pata_sl82c105.c linux-2.6.32.10/drivers/ata/pata_sl82c105.c 21172diff -urNp linux-2.6.32.11/drivers/ata/pata_sl82c105.c linux-2.6.32.11/drivers/ata/pata_sl82c105.c
19948--- linux-2.6.32.10/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400 21173--- linux-2.6.32.11/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400
19949+++ linux-2.6.32.10/drivers/ata/pata_sl82c105.c 2010-03-20 15:58:47.018046884 -0400 21174+++ linux-2.6.32.11/drivers/ata/pata_sl82c105.c 2010-04-04 20:46:41.556857392 -0400
19950@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 21175@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
19951 ATA_BMDMA_SHT(DRV_NAME), 21176 ATA_BMDMA_SHT(DRV_NAME),
19952 }; 21177 };
@@ -19956,9 +21181,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_sl82c105.c linux-2.6.32.10/drivers/a
19956 .inherits = &ata_bmdma_port_ops, 21181 .inherits = &ata_bmdma_port_ops,
19957 .qc_defer = sl82c105_qc_defer, 21182 .qc_defer = sl82c105_qc_defer,
19958 .bmdma_start = sl82c105_bmdma_start, 21183 .bmdma_start = sl82c105_bmdma_start,
19959diff -urNp linux-2.6.32.10/drivers/ata/pata_triflex.c linux-2.6.32.10/drivers/ata/pata_triflex.c 21184diff -urNp linux-2.6.32.11/drivers/ata/pata_triflex.c linux-2.6.32.11/drivers/ata/pata_triflex.c
19960--- linux-2.6.32.10/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400 21185--- linux-2.6.32.11/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400
19961+++ linux-2.6.32.10/drivers/ata/pata_triflex.c 2010-03-20 15:58:47.018046884 -0400 21186+++ linux-2.6.32.11/drivers/ata/pata_triflex.c 2010-04-04 20:46:41.556857392 -0400
19962@@ -178,7 +178,7 @@ static struct scsi_host_template triflex 21187@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
19963 ATA_BMDMA_SHT(DRV_NAME), 21188 ATA_BMDMA_SHT(DRV_NAME),
19964 }; 21189 };
@@ -19968,9 +21193,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_triflex.c linux-2.6.32.10/drivers/at
19968 .inherits = &ata_bmdma_port_ops, 21193 .inherits = &ata_bmdma_port_ops,
19969 .bmdma_start = triflex_bmdma_start, 21194 .bmdma_start = triflex_bmdma_start,
19970 .bmdma_stop = triflex_bmdma_stop, 21195 .bmdma_stop = triflex_bmdma_stop,
19971diff -urNp linux-2.6.32.10/drivers/ata/pata_via.c linux-2.6.32.10/drivers/ata/pata_via.c 21196diff -urNp linux-2.6.32.11/drivers/ata/pata_via.c linux-2.6.32.11/drivers/ata/pata_via.c
19972--- linux-2.6.32.10/drivers/ata/pata_via.c 2010-03-15 11:52:04.000000000 -0400 21197--- linux-2.6.32.11/drivers/ata/pata_via.c 2010-03-15 11:52:04.000000000 -0400
19973+++ linux-2.6.32.10/drivers/ata/pata_via.c 2010-03-20 15:58:47.018046884 -0400 21198+++ linux-2.6.32.11/drivers/ata/pata_via.c 2010-04-04 20:46:41.556857392 -0400
19974@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht 21199@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
19975 ATA_BMDMA_SHT(DRV_NAME), 21200 ATA_BMDMA_SHT(DRV_NAME),
19976 }; 21201 };
@@ -19989,9 +21214,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_via.c linux-2.6.32.10/drivers/ata/pa
19989 .inherits = &via_port_ops, 21214 .inherits = &via_port_ops,
19990 .sff_data_xfer = ata_sff_data_xfer_noirq, 21215 .sff_data_xfer = ata_sff_data_xfer_noirq,
19991 }; 21216 };
19992diff -urNp linux-2.6.32.10/drivers/ata/pata_winbond.c linux-2.6.32.10/drivers/ata/pata_winbond.c 21217diff -urNp linux-2.6.32.11/drivers/ata/pata_winbond.c linux-2.6.32.11/drivers/ata/pata_winbond.c
19993--- linux-2.6.32.10/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400 21218--- linux-2.6.32.11/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400
19994+++ linux-2.6.32.10/drivers/ata/pata_winbond.c 2010-03-20 15:58:47.018046884 -0400 21219+++ linux-2.6.32.11/drivers/ata/pata_winbond.c 2010-04-04 20:46:41.556857392 -0400
19995@@ -125,7 +125,7 @@ static struct scsi_host_template winbond 21220@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
19996 ATA_PIO_SHT(DRV_NAME), 21221 ATA_PIO_SHT(DRV_NAME),
19997 }; 21222 };
@@ -20001,9 +21226,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pata_winbond.c linux-2.6.32.10/drivers/at
20001 .inherits = &ata_sff_port_ops, 21226 .inherits = &ata_sff_port_ops,
20002 .sff_data_xfer = winbond_data_xfer, 21227 .sff_data_xfer = winbond_data_xfer,
20003 .cable_detect = ata_cable_40wire, 21228 .cable_detect = ata_cable_40wire,
20004diff -urNp linux-2.6.32.10/drivers/ata/pdc_adma.c linux-2.6.32.10/drivers/ata/pdc_adma.c 21229diff -urNp linux-2.6.32.11/drivers/ata/pdc_adma.c linux-2.6.32.11/drivers/ata/pdc_adma.c
20005--- linux-2.6.32.10/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400 21230--- linux-2.6.32.11/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400
20006+++ linux-2.6.32.10/drivers/ata/pdc_adma.c 2010-03-20 15:58:47.018046884 -0400 21231+++ linux-2.6.32.11/drivers/ata/pdc_adma.c 2010-04-04 20:46:41.556857392 -0400
20007@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at 21232@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
20008 .dma_boundary = ADMA_DMA_BOUNDARY, 21233 .dma_boundary = ADMA_DMA_BOUNDARY,
20009 }; 21234 };
@@ -20013,9 +21238,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/pdc_adma.c linux-2.6.32.10/drivers/ata/pd
20013 .inherits = &ata_sff_port_ops, 21238 .inherits = &ata_sff_port_ops,
20014 21239
20015 .lost_interrupt = ATA_OP_NULL, 21240 .lost_interrupt = ATA_OP_NULL,
20016diff -urNp linux-2.6.32.10/drivers/ata/sata_fsl.c linux-2.6.32.10/drivers/ata/sata_fsl.c 21241diff -urNp linux-2.6.32.11/drivers/ata/sata_fsl.c linux-2.6.32.11/drivers/ata/sata_fsl.c
20017--- linux-2.6.32.10/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400 21242--- linux-2.6.32.11/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400
20018+++ linux-2.6.32.10/drivers/ata/sata_fsl.c 2010-03-20 15:58:47.018046884 -0400 21243+++ linux-2.6.32.11/drivers/ata/sata_fsl.c 2010-04-04 20:46:41.556857392 -0400
20019@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs 21244@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
20020 .dma_boundary = ATA_DMA_BOUNDARY, 21245 .dma_boundary = ATA_DMA_BOUNDARY,
20021 }; 21246 };
@@ -20025,9 +21250,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/sata_fsl.c linux-2.6.32.10/drivers/ata/sa
20025 .inherits = &sata_pmp_port_ops, 21250 .inherits = &sata_pmp_port_ops,
20026 21251
20027 .qc_defer = ata_std_qc_defer, 21252 .qc_defer = ata_std_qc_defer,
20028diff -urNp linux-2.6.32.10/drivers/ata/sata_inic162x.c linux-2.6.32.10/drivers/ata/sata_inic162x.c 21253diff -urNp linux-2.6.32.11/drivers/ata/sata_inic162x.c linux-2.6.32.11/drivers/ata/sata_inic162x.c
20029--- linux-2.6.32.10/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400 21254--- linux-2.6.32.11/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400
20030+++ linux-2.6.32.10/drivers/ata/sata_inic162x.c 2010-03-20 15:58:47.018046884 -0400 21255+++ linux-2.6.32.11/drivers/ata/sata_inic162x.c 2010-04-04 20:46:41.556857392 -0400
20031@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po 21256@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
20032 return 0; 21257 return 0;
20033 } 21258 }
@@ -20037,9 +21262,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/sata_inic162x.c linux-2.6.32.10/drivers/a
20037 .inherits = &sata_port_ops, 21262 .inherits = &sata_port_ops,
20038 21263
20039 .check_atapi_dma = inic_check_atapi_dma, 21264 .check_atapi_dma = inic_check_atapi_dma,
20040diff -urNp linux-2.6.32.10/drivers/ata/sata_mv.c linux-2.6.32.10/drivers/ata/sata_mv.c 21265diff -urNp linux-2.6.32.11/drivers/ata/sata_mv.c linux-2.6.32.11/drivers/ata/sata_mv.c
20041--- linux-2.6.32.10/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400 21266--- linux-2.6.32.11/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400
20042+++ linux-2.6.32.10/drivers/ata/sata_mv.c 2010-03-20 15:58:47.018046884 -0400 21267+++ linux-2.6.32.11/drivers/ata/sata_mv.c 2010-04-04 20:46:41.556857392 -0400
20043@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht 21268@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
20044 .dma_boundary = MV_DMA_BOUNDARY, 21269 .dma_boundary = MV_DMA_BOUNDARY,
20045 }; 21270 };
@@ -20067,9 +21292,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/sata_mv.c linux-2.6.32.10/drivers/ata/sat
20067 .inherits = &mv6_ops, 21292 .inherits = &mv6_ops,
20068 .dev_config = ATA_OP_NULL, 21293 .dev_config = ATA_OP_NULL,
20069 .qc_prep = mv_qc_prep_iie, 21294 .qc_prep = mv_qc_prep_iie,
20070diff -urNp linux-2.6.32.10/drivers/ata/sata_nv.c linux-2.6.32.10/drivers/ata/sata_nv.c 21295diff -urNp linux-2.6.32.11/drivers/ata/sata_nv.c linux-2.6.32.11/drivers/ata/sata_nv.c
20071--- linux-2.6.32.10/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400 21296--- linux-2.6.32.11/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400
20072+++ linux-2.6.32.10/drivers/ata/sata_nv.c 2010-03-20 15:58:47.018046884 -0400 21297+++ linux-2.6.32.11/drivers/ata/sata_nv.c 2010-04-04 20:46:41.556857392 -0400
20073@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc 21298@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
20074 * cases. Define nv_hardreset() which only kicks in for post-boot 21299 * cases. Define nv_hardreset() which only kicks in for post-boot
20075 * probing and use it for all variants. 21300 * probing and use it for all variants.
@@ -20112,9 +21337,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/sata_nv.c linux-2.6.32.10/drivers/ata/sat
20112 .inherits = &nv_generic_ops, 21337 .inherits = &nv_generic_ops,
20113 21338
20114 .qc_defer = ata_std_qc_defer, 21339 .qc_defer = ata_std_qc_defer,
20115diff -urNp linux-2.6.32.10/drivers/ata/sata_promise.c linux-2.6.32.10/drivers/ata/sata_promise.c 21340diff -urNp linux-2.6.32.11/drivers/ata/sata_promise.c linux-2.6.32.11/drivers/ata/sata_promise.c
20116--- linux-2.6.32.10/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400 21341--- linux-2.6.32.11/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400
20117+++ linux-2.6.32.10/drivers/ata/sata_promise.c 2010-03-20 15:58:47.018046884 -0400 21342+++ linux-2.6.32.11/drivers/ata/sata_promise.c 2010-04-04 20:46:41.556857392 -0400
20118@@ -195,7 +195,7 @@ static const struct ata_port_operations 21343@@ -195,7 +195,7 @@ static const struct ata_port_operations
20119 .error_handler = pdc_error_handler, 21344 .error_handler = pdc_error_handler,
20120 }; 21345 };
@@ -20141,9 +21366,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/sata_promise.c linux-2.6.32.10/drivers/at
20141 .inherits = &pdc_common_ops, 21366 .inherits = &pdc_common_ops,
20142 .cable_detect = pdc_pata_cable_detect, 21367 .cable_detect = pdc_pata_cable_detect,
20143 .freeze = pdc_freeze, 21368 .freeze = pdc_freeze,
20144diff -urNp linux-2.6.32.10/drivers/ata/sata_qstor.c linux-2.6.32.10/drivers/ata/sata_qstor.c 21369diff -urNp linux-2.6.32.11/drivers/ata/sata_qstor.c linux-2.6.32.11/drivers/ata/sata_qstor.c
20145--- linux-2.6.32.10/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400 21370--- linux-2.6.32.11/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400
20146+++ linux-2.6.32.10/drivers/ata/sata_qstor.c 2010-03-20 15:58:47.018046884 -0400 21371+++ linux-2.6.32.11/drivers/ata/sata_qstor.c 2010-04-04 20:46:41.556857392 -0400
20147@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ 21372@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
20148 .dma_boundary = QS_DMA_BOUNDARY, 21373 .dma_boundary = QS_DMA_BOUNDARY,
20149 }; 21374 };
@@ -20153,9 +21378,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/sata_qstor.c linux-2.6.32.10/drivers/ata/
20153 .inherits = &ata_sff_port_ops, 21378 .inherits = &ata_sff_port_ops,
20154 21379
20155 .check_atapi_dma = qs_check_atapi_dma, 21380 .check_atapi_dma = qs_check_atapi_dma,
20156diff -urNp linux-2.6.32.10/drivers/ata/sata_sil24.c linux-2.6.32.10/drivers/ata/sata_sil24.c 21381diff -urNp linux-2.6.32.11/drivers/ata/sata_sil24.c linux-2.6.32.11/drivers/ata/sata_sil24.c
20157--- linux-2.6.32.10/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400 21382--- linux-2.6.32.11/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400
20158+++ linux-2.6.32.10/drivers/ata/sata_sil24.c 2010-03-20 15:58:47.018046884 -0400 21383+++ linux-2.6.32.11/drivers/ata/sata_sil24.c 2010-04-04 20:46:41.556857392 -0400
20159@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s 21384@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
20160 .dma_boundary = ATA_DMA_BOUNDARY, 21385 .dma_boundary = ATA_DMA_BOUNDARY,
20161 }; 21386 };
@@ -20165,9 +21390,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/sata_sil24.c linux-2.6.32.10/drivers/ata/
20165 .inherits = &sata_pmp_port_ops, 21390 .inherits = &sata_pmp_port_ops,
20166 21391
20167 .qc_defer = sil24_qc_defer, 21392 .qc_defer = sil24_qc_defer,
20168diff -urNp linux-2.6.32.10/drivers/ata/sata_sil.c linux-2.6.32.10/drivers/ata/sata_sil.c 21393diff -urNp linux-2.6.32.11/drivers/ata/sata_sil.c linux-2.6.32.11/drivers/ata/sata_sil.c
20169--- linux-2.6.32.10/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400 21394--- linux-2.6.32.11/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400
20170+++ linux-2.6.32.10/drivers/ata/sata_sil.c 2010-03-20 15:58:47.018046884 -0400 21395+++ linux-2.6.32.11/drivers/ata/sata_sil.c 2010-04-04 20:46:41.556857392 -0400
20171@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht 21396@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
20172 .sg_tablesize = ATA_MAX_PRD 21397 .sg_tablesize = ATA_MAX_PRD
20173 }; 21398 };
@@ -20177,9 +21402,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/sata_sil.c linux-2.6.32.10/drivers/ata/sa
20177 .inherits = &ata_bmdma32_port_ops, 21402 .inherits = &ata_bmdma32_port_ops,
20178 .dev_config = sil_dev_config, 21403 .dev_config = sil_dev_config,
20179 .set_mode = sil_set_mode, 21404 .set_mode = sil_set_mode,
20180diff -urNp linux-2.6.32.10/drivers/ata/sata_sis.c linux-2.6.32.10/drivers/ata/sata_sis.c 21405diff -urNp linux-2.6.32.11/drivers/ata/sata_sis.c linux-2.6.32.11/drivers/ata/sata_sis.c
20181--- linux-2.6.32.10/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400 21406--- linux-2.6.32.11/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400
20182+++ linux-2.6.32.10/drivers/ata/sata_sis.c 2010-03-20 15:58:47.018046884 -0400 21407+++ linux-2.6.32.11/drivers/ata/sata_sis.c 2010-04-04 20:46:41.561786507 -0400
20183@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht 21408@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
20184 ATA_BMDMA_SHT(DRV_NAME), 21409 ATA_BMDMA_SHT(DRV_NAME),
20185 }; 21410 };
@@ -20189,9 +21414,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/sata_sis.c linux-2.6.32.10/drivers/ata/sa
20189 .inherits = &ata_bmdma_port_ops, 21414 .inherits = &ata_bmdma_port_ops,
20190 .scr_read = sis_scr_read, 21415 .scr_read = sis_scr_read,
20191 .scr_write = sis_scr_write, 21416 .scr_write = sis_scr_write,
20192diff -urNp linux-2.6.32.10/drivers/ata/sata_svw.c linux-2.6.32.10/drivers/ata/sata_svw.c 21417diff -urNp linux-2.6.32.11/drivers/ata/sata_svw.c linux-2.6.32.11/drivers/ata/sata_svw.c
20193--- linux-2.6.32.10/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400 21418--- linux-2.6.32.11/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400
20194+++ linux-2.6.32.10/drivers/ata/sata_svw.c 2010-03-20 15:58:47.022039994 -0400 21419+++ linux-2.6.32.11/drivers/ata/sata_svw.c 2010-04-04 20:46:41.561786507 -0400
20195@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata 21420@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
20196 }; 21421 };
20197 21422
@@ -20201,9 +21426,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/sata_svw.c linux-2.6.32.10/drivers/ata/sa
20201 .inherits = &ata_bmdma_port_ops, 21426 .inherits = &ata_bmdma_port_ops,
20202 .sff_tf_load = k2_sata_tf_load, 21427 .sff_tf_load = k2_sata_tf_load,
20203 .sff_tf_read = k2_sata_tf_read, 21428 .sff_tf_read = k2_sata_tf_read,
20204diff -urNp linux-2.6.32.10/drivers/ata/sata_sx4.c linux-2.6.32.10/drivers/ata/sata_sx4.c 21429diff -urNp linux-2.6.32.11/drivers/ata/sata_sx4.c linux-2.6.32.11/drivers/ata/sata_sx4.c
20205--- linux-2.6.32.10/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400 21430--- linux-2.6.32.11/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400
20206+++ linux-2.6.32.10/drivers/ata/sata_sx4.c 2010-03-20 15:58:47.022039994 -0400 21431+++ linux-2.6.32.11/drivers/ata/sata_sx4.c 2010-04-04 20:46:41.561786507 -0400
20207@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat 21432@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
20208 }; 21433 };
20209 21434
@@ -20213,9 +21438,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/sata_sx4.c linux-2.6.32.10/drivers/ata/sa
20213 .inherits = &ata_sff_port_ops, 21438 .inherits = &ata_sff_port_ops,
20214 21439
20215 .check_atapi_dma = pdc_check_atapi_dma, 21440 .check_atapi_dma = pdc_check_atapi_dma,
20216diff -urNp linux-2.6.32.10/drivers/ata/sata_uli.c linux-2.6.32.10/drivers/ata/sata_uli.c 21441diff -urNp linux-2.6.32.11/drivers/ata/sata_uli.c linux-2.6.32.11/drivers/ata/sata_uli.c
20217--- linux-2.6.32.10/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400 21442--- linux-2.6.32.11/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400
20218+++ linux-2.6.32.10/drivers/ata/sata_uli.c 2010-03-20 15:58:47.022039994 -0400 21443+++ linux-2.6.32.11/drivers/ata/sata_uli.c 2010-04-04 20:46:41.561786507 -0400
20219@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht 21444@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
20220 ATA_BMDMA_SHT(DRV_NAME), 21445 ATA_BMDMA_SHT(DRV_NAME),
20221 }; 21446 };
@@ -20225,9 +21450,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/sata_uli.c linux-2.6.32.10/drivers/ata/sa
20225 .inherits = &ata_bmdma_port_ops, 21450 .inherits = &ata_bmdma_port_ops,
20226 .scr_read = uli_scr_read, 21451 .scr_read = uli_scr_read,
20227 .scr_write = uli_scr_write, 21452 .scr_write = uli_scr_write,
20228diff -urNp linux-2.6.32.10/drivers/ata/sata_via.c linux-2.6.32.10/drivers/ata/sata_via.c 21453diff -urNp linux-2.6.32.11/drivers/ata/sata_via.c linux-2.6.32.11/drivers/ata/sata_via.c
20229--- linux-2.6.32.10/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400 21454--- linux-2.6.32.11/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400
20230+++ linux-2.6.32.10/drivers/ata/sata_via.c 2010-03-20 15:58:47.022039994 -0400 21455+++ linux-2.6.32.11/drivers/ata/sata_via.c 2010-04-04 20:46:41.561786507 -0400
20231@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh 21456@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
20232 ATA_BMDMA_SHT(DRV_NAME), 21457 ATA_BMDMA_SHT(DRV_NAME),
20233 }; 21458 };
@@ -20265,9 +21490,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/sata_via.c linux-2.6.32.10/drivers/ata/sa
20265 .inherits = &svia_base_ops, 21490 .inherits = &svia_base_ops,
20266 .hardreset = sata_std_hardreset, 21491 .hardreset = sata_std_hardreset,
20267 .scr_read = vt8251_scr_read, 21492 .scr_read = vt8251_scr_read,
20268diff -urNp linux-2.6.32.10/drivers/ata/sata_vsc.c linux-2.6.32.10/drivers/ata/sata_vsc.c 21493diff -urNp linux-2.6.32.11/drivers/ata/sata_vsc.c linux-2.6.32.11/drivers/ata/sata_vsc.c
20269--- linux-2.6.32.10/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400 21494--- linux-2.6.32.11/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400
20270+++ linux-2.6.32.10/drivers/ata/sata_vsc.c 2010-03-20 15:58:47.022039994 -0400 21495+++ linux-2.6.32.11/drivers/ata/sata_vsc.c 2010-04-04 20:46:41.561786507 -0400
20271@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat 21496@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
20272 }; 21497 };
20273 21498
@@ -20277,9 +21502,9 @@ diff -urNp linux-2.6.32.10/drivers/ata/sata_vsc.c linux-2.6.32.10/drivers/ata/sa
20277 .inherits = &ata_bmdma_port_ops, 21502 .inherits = &ata_bmdma_port_ops,
20278 /* The IRQ handling is not quite standard SFF behaviour so we 21503 /* The IRQ handling is not quite standard SFF behaviour so we
20279 cannot use the default lost interrupt handler */ 21504 cannot use the default lost interrupt handler */
20280diff -urNp linux-2.6.32.10/drivers/atm/adummy.c linux-2.6.32.10/drivers/atm/adummy.c 21505diff -urNp linux-2.6.32.11/drivers/atm/adummy.c linux-2.6.32.11/drivers/atm/adummy.c
20281--- linux-2.6.32.10/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400 21506--- linux-2.6.32.11/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400
20282+++ linux-2.6.32.10/drivers/atm/adummy.c 2010-03-20 15:58:47.022039994 -0400 21507+++ linux-2.6.32.11/drivers/atm/adummy.c 2010-04-04 20:46:41.561786507 -0400
20283@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct 21508@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
20284 vcc->pop(vcc, skb); 21509 vcc->pop(vcc, skb);
20285 else 21510 else
@@ -20289,9 +21514,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/adummy.c linux-2.6.32.10/drivers/atm/adum
20289 21514
20290 return 0; 21515 return 0;
20291 } 21516 }
20292diff -urNp linux-2.6.32.10/drivers/atm/ambassador.c linux-2.6.32.10/drivers/atm/ambassador.c 21517diff -urNp linux-2.6.32.11/drivers/atm/ambassador.c linux-2.6.32.11/drivers/atm/ambassador.c
20293--- linux-2.6.32.10/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400 21518--- linux-2.6.32.11/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400
20294+++ linux-2.6.32.10/drivers/atm/ambassador.c 2010-03-20 15:58:47.022039994 -0400 21519+++ linux-2.6.32.11/drivers/atm/ambassador.c 2010-04-04 20:46:41.561786507 -0400
20295@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, 21520@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
20296 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); 21521 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
20297 21522
@@ -20328,9 +21553,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/ambassador.c linux-2.6.32.10/drivers/atm/
20328 return -ENOMEM; // ? 21553 return -ENOMEM; // ?
20329 } 21554 }
20330 21555
20331diff -urNp linux-2.6.32.10/drivers/atm/atmtcp.c linux-2.6.32.10/drivers/atm/atmtcp.c 21556diff -urNp linux-2.6.32.11/drivers/atm/atmtcp.c linux-2.6.32.11/drivers/atm/atmtcp.c
20332--- linux-2.6.32.10/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400 21557--- linux-2.6.32.11/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400
20333+++ linux-2.6.32.10/drivers/atm/atmtcp.c 2010-03-20 15:58:47.022039994 -0400 21558+++ linux-2.6.32.11/drivers/atm/atmtcp.c 2010-04-04 20:46:41.561786507 -0400
20334@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc 21559@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc
20335 if (vcc->pop) vcc->pop(vcc,skb); 21560 if (vcc->pop) vcc->pop(vcc,skb);
20336 else dev_kfree_skb(skb); 21561 else dev_kfree_skb(skb);
@@ -20380,9 +21605,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/atmtcp.c linux-2.6.32.10/drivers/atm/atmt
20380 done: 21605 done:
20381 if (vcc->pop) vcc->pop(vcc,skb); 21606 if (vcc->pop) vcc->pop(vcc,skb);
20382 else dev_kfree_skb(skb); 21607 else dev_kfree_skb(skb);
20383diff -urNp linux-2.6.32.10/drivers/atm/eni.c linux-2.6.32.10/drivers/atm/eni.c 21608diff -urNp linux-2.6.32.11/drivers/atm/eni.c linux-2.6.32.11/drivers/atm/eni.c
20384--- linux-2.6.32.10/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400 21609--- linux-2.6.32.11/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400
20385+++ linux-2.6.32.10/drivers/atm/eni.c 2010-03-20 15:58:47.022039994 -0400 21610+++ linux-2.6.32.11/drivers/atm/eni.c 2010-04-04 20:46:41.561786507 -0400
20386@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) 21611@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
20387 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", 21612 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
20388 vcc->dev->number); 21613 vcc->dev->number);
@@ -20428,9 +21653,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/eni.c linux-2.6.32.10/drivers/atm/eni.c
20428 wake_up(&eni_dev->tx_wait); 21653 wake_up(&eni_dev->tx_wait);
20429 dma_complete++; 21654 dma_complete++;
20430 } 21655 }
20431diff -urNp linux-2.6.32.10/drivers/atm/firestream.c linux-2.6.32.10/drivers/atm/firestream.c 21656diff -urNp linux-2.6.32.11/drivers/atm/firestream.c linux-2.6.32.11/drivers/atm/firestream.c
20432--- linux-2.6.32.10/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400 21657--- linux-2.6.32.11/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400
20433+++ linux-2.6.32.10/drivers/atm/firestream.c 2010-03-20 15:58:47.022039994 -0400 21658+++ linux-2.6.32.11/drivers/atm/firestream.c 2010-04-04 20:46:41.561786507 -0400
20434@@ -748,7 +748,7 @@ static void process_txdone_queue (struct 21659@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
20435 } 21660 }
20436 } 21661 }
@@ -20464,9 +21689,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/firestream.c linux-2.6.32.10/drivers/atm/
20464 break; 21689 break;
20465 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ 21690 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
20466 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 21691 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
20467diff -urNp linux-2.6.32.10/drivers/atm/fore200e.c linux-2.6.32.10/drivers/atm/fore200e.c 21692diff -urNp linux-2.6.32.11/drivers/atm/fore200e.c linux-2.6.32.11/drivers/atm/fore200e.c
20468--- linux-2.6.32.10/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400 21693--- linux-2.6.32.11/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400
20469+++ linux-2.6.32.10/drivers/atm/fore200e.c 2010-03-20 15:58:47.022039994 -0400 21694+++ linux-2.6.32.11/drivers/atm/fore200e.c 2010-04-04 20:46:41.561786507 -0400
20470@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 21695@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
20471 #endif 21696 #endif
20472 /* check error condition */ 21697 /* check error condition */
@@ -20523,9 +21748,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/fore200e.c linux-2.6.32.10/drivers/atm/fo
20523 21748
20524 fore200e->tx_sat++; 21749 fore200e->tx_sat++;
20525 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", 21750 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
20526diff -urNp linux-2.6.32.10/drivers/atm/he.c linux-2.6.32.10/drivers/atm/he.c 21751diff -urNp linux-2.6.32.11/drivers/atm/he.c linux-2.6.32.11/drivers/atm/he.c
20527--- linux-2.6.32.10/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400 21752--- linux-2.6.32.11/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400
20528+++ linux-2.6.32.10/drivers/atm/he.c 2010-03-20 15:58:47.022039994 -0400 21753+++ linux-2.6.32.11/drivers/atm/he.c 2010-04-04 20:46:41.565779517 -0400
20529@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i 21754@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
20530 21755
20531 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { 21756 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -20607,9 +21832,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/he.c linux-2.6.32.10/drivers/atm/he.c
20607 21832
20608 return 0; 21833 return 0;
20609 } 21834 }
20610diff -urNp linux-2.6.32.10/drivers/atm/horizon.c linux-2.6.32.10/drivers/atm/horizon.c 21835diff -urNp linux-2.6.32.11/drivers/atm/horizon.c linux-2.6.32.11/drivers/atm/horizon.c
20611--- linux-2.6.32.10/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400 21836--- linux-2.6.32.11/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400
20612+++ linux-2.6.32.10/drivers/atm/horizon.c 2010-03-20 15:58:47.026036446 -0400 21837+++ linux-2.6.32.11/drivers/atm/horizon.c 2010-04-04 20:46:41.565779517 -0400
20613@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, 21838@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
20614 { 21839 {
20615 struct atm_vcc * vcc = ATM_SKB(skb)->vcc; 21840 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -20628,9 +21853,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/horizon.c linux-2.6.32.10/drivers/atm/hor
20628 21853
20629 // free the skb 21854 // free the skb
20630 hrz_kfree_skb (skb); 21855 hrz_kfree_skb (skb);
20631diff -urNp linux-2.6.32.10/drivers/atm/idt77252.c linux-2.6.32.10/drivers/atm/idt77252.c 21856diff -urNp linux-2.6.32.11/drivers/atm/idt77252.c linux-2.6.32.11/drivers/atm/idt77252.c
20632--- linux-2.6.32.10/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400 21857--- linux-2.6.32.11/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400
20633+++ linux-2.6.32.10/drivers/atm/idt77252.c 2010-03-20 15:58:47.026036446 -0400 21858+++ linux-2.6.32.11/drivers/atm/idt77252.c 2010-04-04 20:46:41.565779517 -0400
20634@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str 21859@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
20635 else 21860 else
20636 dev_kfree_skb(skb); 21861 dev_kfree_skb(skb);
@@ -20785,9 +22010,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/idt77252.c linux-2.6.32.10/drivers/atm/id
20785 return -ENOMEM; 22010 return -ENOMEM;
20786 } 22011 }
20787 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); 22012 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
20788diff -urNp linux-2.6.32.10/drivers/atm/iphase.c linux-2.6.32.10/drivers/atm/iphase.c 22013diff -urNp linux-2.6.32.11/drivers/atm/iphase.c linux-2.6.32.11/drivers/atm/iphase.c
20789--- linux-2.6.32.10/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400 22014--- linux-2.6.32.11/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400
20790+++ linux-2.6.32.10/drivers/atm/iphase.c 2010-03-20 15:58:47.026036446 -0400 22015+++ linux-2.6.32.11/drivers/atm/iphase.c 2010-04-04 20:46:41.565779517 -0400
20791@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) 22016@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)
20792 status = (u_short) (buf_desc_ptr->desc_mode); 22017 status = (u_short) (buf_desc_ptr->desc_mode);
20793 if (status & (RX_CER | RX_PTE | RX_OFL)) 22018 if (status & (RX_CER | RX_PTE | RX_OFL))
@@ -20884,9 +22109,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/iphase.c linux-2.6.32.10/drivers/atm/ipha
20884 if (iavcc->vc_desc_cnt > 10) { 22109 if (iavcc->vc_desc_cnt > 10) {
20885 vcc->tx_quota = vcc->tx_quota * 3 / 4; 22110 vcc->tx_quota = vcc->tx_quota * 3 / 4;
20886 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); 22111 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
20887diff -urNp linux-2.6.32.10/drivers/atm/lanai.c linux-2.6.32.10/drivers/atm/lanai.c 22112diff -urNp linux-2.6.32.11/drivers/atm/lanai.c linux-2.6.32.11/drivers/atm/lanai.c
20888--- linux-2.6.32.10/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400 22113--- linux-2.6.32.11/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400
20889+++ linux-2.6.32.10/drivers/atm/lanai.c 2010-03-20 15:58:47.026036446 -0400 22114+++ linux-2.6.32.11/drivers/atm/lanai.c 2010-04-04 20:46:41.565779517 -0400
20890@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l 22115@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
20891 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); 22116 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
20892 lanai_endtx(lanai, lvcc); 22117 lanai_endtx(lanai, lvcc);
@@ -20941,9 +22166,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/lanai.c linux-2.6.32.10/drivers/atm/lanai
20941 lvcc->stats.x.aal5.service_rxcrc++; 22166 lvcc->stats.x.aal5.service_rxcrc++;
20942 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; 22167 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
20943 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); 22168 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
20944diff -urNp linux-2.6.32.10/drivers/atm/nicstar.c linux-2.6.32.10/drivers/atm/nicstar.c 22169diff -urNp linux-2.6.32.11/drivers/atm/nicstar.c linux-2.6.32.11/drivers/atm/nicstar.c
20945--- linux-2.6.32.10/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400 22170--- linux-2.6.32.11/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400
20946+++ linux-2.6.32.10/drivers/atm/nicstar.c 2010-03-20 15:58:47.026036446 -0400 22171+++ linux-2.6.32.11/drivers/atm/nicstar.c 2010-04-04 20:46:41.565779517 -0400
20947@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, 22172@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
20948 if ((vc = (vc_map *) vcc->dev_data) == NULL) 22173 if ((vc = (vc_map *) vcc->dev_data) == NULL)
20949 { 22174 {
@@ -21146,9 +22371,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/nicstar.c linux-2.6.32.10/drivers/atm/nic
21146 } 22371 }
21147 } 22372 }
21148 22373
21149diff -urNp linux-2.6.32.10/drivers/atm/solos-pci.c linux-2.6.32.10/drivers/atm/solos-pci.c 22374diff -urNp linux-2.6.32.11/drivers/atm/solos-pci.c linux-2.6.32.11/drivers/atm/solos-pci.c
21150--- linux-2.6.32.10/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400 22375--- linux-2.6.32.11/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400
21151+++ linux-2.6.32.10/drivers/atm/solos-pci.c 2010-03-20 15:58:47.026036446 -0400 22376+++ linux-2.6.32.11/drivers/atm/solos-pci.c 2010-04-04 20:46:41.565779517 -0400
21152@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) 22377@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
21153 } 22378 }
21154 atm_charge(vcc, skb->truesize); 22379 atm_charge(vcc, skb->truesize);
@@ -21167,9 +22392,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/solos-pci.c linux-2.6.32.10/drivers/atm/s
21167 solos_pop(vcc, oldskb); 22392 solos_pop(vcc, oldskb);
21168 } else 22393 } else
21169 dev_kfree_skb_irq(oldskb); 22394 dev_kfree_skb_irq(oldskb);
21170diff -urNp linux-2.6.32.10/drivers/atm/suni.c linux-2.6.32.10/drivers/atm/suni.c 22395diff -urNp linux-2.6.32.11/drivers/atm/suni.c linux-2.6.32.11/drivers/atm/suni.c
21171--- linux-2.6.32.10/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400 22396--- linux-2.6.32.11/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400
21172+++ linux-2.6.32.10/drivers/atm/suni.c 2010-03-20 15:58:47.026036446 -0400 22397+++ linux-2.6.32.11/drivers/atm/suni.c 2010-04-04 20:46:41.565779517 -0400
21173@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); 22398@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
21174 22399
21175 22400
@@ -21181,9 +22406,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/suni.c linux-2.6.32.10/drivers/atm/suni.c
21181 22406
21182 22407
21183 static void suni_hz(unsigned long from_timer) 22408 static void suni_hz(unsigned long from_timer)
21184diff -urNp linux-2.6.32.10/drivers/atm/uPD98402.c linux-2.6.32.10/drivers/atm/uPD98402.c 22409diff -urNp linux-2.6.32.11/drivers/atm/uPD98402.c linux-2.6.32.11/drivers/atm/uPD98402.c
21185--- linux-2.6.32.10/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400 22410--- linux-2.6.32.11/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400
21186+++ linux-2.6.32.10/drivers/atm/uPD98402.c 2010-03-20 15:58:47.026036446 -0400 22411+++ linux-2.6.32.11/drivers/atm/uPD98402.c 2010-04-04 20:46:41.565779517 -0400
21187@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d 22412@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
21188 struct sonet_stats tmp; 22413 struct sonet_stats tmp;
21189 int error = 0; 22414 int error = 0;
@@ -21228,9 +22453,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/uPD98402.c linux-2.6.32.10/drivers/atm/uP
21228 return 0; 22453 return 0;
21229 } 22454 }
21230 22455
21231diff -urNp linux-2.6.32.10/drivers/atm/zatm.c linux-2.6.32.10/drivers/atm/zatm.c 22456diff -urNp linux-2.6.32.11/drivers/atm/zatm.c linux-2.6.32.11/drivers/atm/zatm.c
21232--- linux-2.6.32.10/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400 22457--- linux-2.6.32.11/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400
21233+++ linux-2.6.32.10/drivers/atm/zatm.c 2010-03-20 15:58:47.030038477 -0400 22458+++ linux-2.6.32.11/drivers/atm/zatm.c 2010-04-04 20:46:41.569782507 -0400
21234@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy 22459@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
21235 } 22460 }
21236 if (!size) { 22461 if (!size) {
@@ -21258,9 +22483,9 @@ diff -urNp linux-2.6.32.10/drivers/atm/zatm.c linux-2.6.32.10/drivers/atm/zatm.c
21258 wake_up(&zatm_vcc->tx_wait); 22483 wake_up(&zatm_vcc->tx_wait);
21259 } 22484 }
21260 22485
21261diff -urNp linux-2.6.32.10/drivers/base/bus.c linux-2.6.32.10/drivers/base/bus.c 22486diff -urNp linux-2.6.32.11/drivers/base/bus.c linux-2.6.32.11/drivers/base/bus.c
21262--- linux-2.6.32.10/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400 22487--- linux-2.6.32.11/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400
21263+++ linux-2.6.32.10/drivers/base/bus.c 2010-03-20 15:58:47.030038477 -0400 22488+++ linux-2.6.32.11/drivers/base/bus.c 2010-04-04 20:46:41.569782507 -0400
21264@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob 22489@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
21265 return ret; 22490 return ret;
21266 } 22491 }
@@ -21288,9 +22513,9 @@ diff -urNp linux-2.6.32.10/drivers/base/bus.c linux-2.6.32.10/drivers/base/bus.c
21288 .filter = bus_uevent_filter, 22513 .filter = bus_uevent_filter,
21289 }; 22514 };
21290 22515
21291diff -urNp linux-2.6.32.10/drivers/base/class.c linux-2.6.32.10/drivers/base/class.c 22516diff -urNp linux-2.6.32.11/drivers/base/class.c linux-2.6.32.11/drivers/base/class.c
21292--- linux-2.6.32.10/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400 22517--- linux-2.6.32.11/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400
21293+++ linux-2.6.32.10/drivers/base/class.c 2010-03-20 15:58:47.030038477 -0400 22518+++ linux-2.6.32.11/drivers/base/class.c 2010-04-04 20:46:41.569782507 -0400
21294@@ -63,7 +63,7 @@ static void class_release(struct kobject 22519@@ -63,7 +63,7 @@ static void class_release(struct kobject
21295 kfree(cp); 22520 kfree(cp);
21296 } 22521 }
@@ -21300,9 +22525,9 @@ diff -urNp linux-2.6.32.10/drivers/base/class.c linux-2.6.32.10/drivers/base/cla
21300 .show = class_attr_show, 22525 .show = class_attr_show,
21301 .store = class_attr_store, 22526 .store = class_attr_store,
21302 }; 22527 };
21303diff -urNp linux-2.6.32.10/drivers/base/core.c linux-2.6.32.10/drivers/base/core.c 22528diff -urNp linux-2.6.32.11/drivers/base/core.c linux-2.6.32.11/drivers/base/core.c
21304--- linux-2.6.32.10/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400 22529--- linux-2.6.32.11/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400
21305+++ linux-2.6.32.10/drivers/base/core.c 2010-03-20 15:58:47.030038477 -0400 22530+++ linux-2.6.32.11/drivers/base/core.c 2010-04-04 20:46:41.569782507 -0400
21306@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob 22531@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
21307 return ret; 22532 return ret;
21308 } 22533 }
@@ -21321,9 +22546,9 @@ diff -urNp linux-2.6.32.10/drivers/base/core.c linux-2.6.32.10/drivers/base/core
21321 .filter = dev_uevent_filter, 22546 .filter = dev_uevent_filter,
21322 .name = dev_uevent_name, 22547 .name = dev_uevent_name,
21323 .uevent = dev_uevent, 22548 .uevent = dev_uevent,
21324diff -urNp linux-2.6.32.10/drivers/base/memory.c linux-2.6.32.10/drivers/base/memory.c 22549diff -urNp linux-2.6.32.11/drivers/base/memory.c linux-2.6.32.11/drivers/base/memory.c
21325--- linux-2.6.32.10/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400 22550--- linux-2.6.32.11/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400
21326+++ linux-2.6.32.10/drivers/base/memory.c 2010-03-20 15:58:47.030038477 -0400 22551+++ linux-2.6.32.11/drivers/base/memory.c 2010-04-04 20:46:41.569782507 -0400
21327@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks 22552@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
21328 return retval; 22553 return retval;
21329 } 22554 }
@@ -21333,9 +22558,9 @@ diff -urNp linux-2.6.32.10/drivers/base/memory.c linux-2.6.32.10/drivers/base/me
21333 .name = memory_uevent_name, 22558 .name = memory_uevent_name,
21334 .uevent = memory_uevent, 22559 .uevent = memory_uevent,
21335 }; 22560 };
21336diff -urNp linux-2.6.32.10/drivers/base/sys.c linux-2.6.32.10/drivers/base/sys.c 22561diff -urNp linux-2.6.32.11/drivers/base/sys.c linux-2.6.32.11/drivers/base/sys.c
21337--- linux-2.6.32.10/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400 22562--- linux-2.6.32.11/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400
21338+++ linux-2.6.32.10/drivers/base/sys.c 2010-03-20 15:58:47.030038477 -0400 22563+++ linux-2.6.32.11/drivers/base/sys.c 2010-04-04 20:46:41.569782507 -0400
21339@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc 22564@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
21340 return -EIO; 22565 return -EIO;
21341 } 22566 }
@@ -21354,9 +22579,9 @@ diff -urNp linux-2.6.32.10/drivers/base/sys.c linux-2.6.32.10/drivers/base/sys.c
21354 .show = sysdev_class_show, 22579 .show = sysdev_class_show,
21355 .store = sysdev_class_store, 22580 .store = sysdev_class_store,
21356 }; 22581 };
21357diff -urNp linux-2.6.32.10/drivers/block/pktcdvd.c linux-2.6.32.10/drivers/block/pktcdvd.c 22582diff -urNp linux-2.6.32.11/drivers/block/pktcdvd.c linux-2.6.32.11/drivers/block/pktcdvd.c
21358--- linux-2.6.32.10/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400 22583--- linux-2.6.32.11/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400
21359+++ linux-2.6.32.10/drivers/block/pktcdvd.c 2010-03-20 15:58:47.030038477 -0400 22584+++ linux-2.6.32.11/drivers/block/pktcdvd.c 2010-04-04 20:46:41.569782507 -0400
21360@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob 22585@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
21361 return len; 22586 return len;
21362 } 22587 }
@@ -21366,9 +22591,9 @@ diff -urNp linux-2.6.32.10/drivers/block/pktcdvd.c linux-2.6.32.10/drivers/block
21366 .show = kobj_pkt_show, 22591 .show = kobj_pkt_show,
21367 .store = kobj_pkt_store 22592 .store = kobj_pkt_store
21368 }; 22593 };
21369diff -urNp linux-2.6.32.10/drivers/char/agp/frontend.c linux-2.6.32.10/drivers/char/agp/frontend.c 22594diff -urNp linux-2.6.32.11/drivers/char/agp/frontend.c linux-2.6.32.11/drivers/char/agp/frontend.c
21370--- linux-2.6.32.10/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400 22595--- linux-2.6.32.11/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400
21371+++ linux-2.6.32.10/drivers/char/agp/frontend.c 2010-03-20 15:58:47.030038477 -0400 22596+++ linux-2.6.32.11/drivers/char/agp/frontend.c 2010-04-04 20:46:41.569782507 -0400
21372@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag 22597@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
21373 if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) 22598 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
21374 return -EFAULT; 22599 return -EFAULT;
@@ -21378,9 +22603,9 @@ diff -urNp linux-2.6.32.10/drivers/char/agp/frontend.c linux-2.6.32.10/drivers/c
21378 return -EFAULT; 22603 return -EFAULT;
21379 22604
21380 client = agp_find_client_by_pid(reserve.pid); 22605 client = agp_find_client_by_pid(reserve.pid);
21381diff -urNp linux-2.6.32.10/drivers/char/agp/intel-agp.c linux-2.6.32.10/drivers/char/agp/intel-agp.c 22606diff -urNp linux-2.6.32.11/drivers/char/agp/intel-agp.c linux-2.6.32.11/drivers/char/agp/intel-agp.c
21382--- linux-2.6.32.10/drivers/char/agp/intel-agp.c 2010-03-15 11:52:04.000000000 -0400 22607--- linux-2.6.32.11/drivers/char/agp/intel-agp.c 2010-03-15 11:52:04.000000000 -0400
21383+++ linux-2.6.32.10/drivers/char/agp/intel-agp.c 2010-03-20 15:58:47.045148884 -0400 22608+++ linux-2.6.32.11/drivers/char/agp/intel-agp.c 2010-04-04 20:46:41.569782507 -0400
21384@@ -2571,7 +2571,7 @@ static struct pci_device_id agp_intel_pc 22609@@ -2571,7 +2571,7 @@ static struct pci_device_id agp_intel_pc
21385 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), 22610 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
21386 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), 22611 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
@@ -21390,9 +22615,9 @@ diff -urNp linux-2.6.32.10/drivers/char/agp/intel-agp.c linux-2.6.32.10/drivers/
21390 }; 22615 };
21391 22616
21392 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); 22617 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
21393diff -urNp linux-2.6.32.10/drivers/char/hpet.c linux-2.6.32.10/drivers/char/hpet.c 22618diff -urNp linux-2.6.32.11/drivers/char/hpet.c linux-2.6.32.11/drivers/char/hpet.c
21394--- linux-2.6.32.10/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400 22619--- linux-2.6.32.11/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400
21395+++ linux-2.6.32.10/drivers/char/hpet.c 2010-03-20 15:58:47.045148884 -0400 22620+++ linux-2.6.32.11/drivers/char/hpet.c 2010-04-04 20:46:41.569782507 -0400
21396@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv 22621@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv
21397 }, 22622 },
21398 }; 22623 };
@@ -21402,9 +22627,9 @@ diff -urNp linux-2.6.32.10/drivers/char/hpet.c linux-2.6.32.10/drivers/char/hpet
21402 22627
21403 static int __init hpet_init(void) 22628 static int __init hpet_init(void)
21404 { 22629 {
21405diff -urNp linux-2.6.32.10/drivers/char/hvc_beat.c linux-2.6.32.10/drivers/char/hvc_beat.c 22630diff -urNp linux-2.6.32.11/drivers/char/hvc_beat.c linux-2.6.32.11/drivers/char/hvc_beat.c
21406--- linux-2.6.32.10/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400 22631--- linux-2.6.32.11/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400
21407+++ linux-2.6.32.10/drivers/char/hvc_beat.c 2010-03-20 15:58:47.045148884 -0400 22632+++ linux-2.6.32.11/drivers/char/hvc_beat.c 2010-04-04 20:46:41.569782507 -0400
21408@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v 22633@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
21409 return cnt; 22634 return cnt;
21410 } 22635 }
@@ -21414,9 +22639,9 @@ diff -urNp linux-2.6.32.10/drivers/char/hvc_beat.c linux-2.6.32.10/drivers/char/
21414 .get_chars = hvc_beat_get_chars, 22639 .get_chars = hvc_beat_get_chars,
21415 .put_chars = hvc_beat_put_chars, 22640 .put_chars = hvc_beat_put_chars,
21416 }; 22641 };
21417diff -urNp linux-2.6.32.10/drivers/char/hvc_console.c linux-2.6.32.10/drivers/char/hvc_console.c 22642diff -urNp linux-2.6.32.11/drivers/char/hvc_console.c linux-2.6.32.11/drivers/char/hvc_console.c
21418--- linux-2.6.32.10/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400 22643--- linux-2.6.32.11/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400
21419+++ linux-2.6.32.10/drivers/char/hvc_console.c 2010-03-20 15:58:47.045148884 -0400 22644+++ linux-2.6.32.11/drivers/char/hvc_console.c 2010-04-04 20:46:41.569782507 -0400
21420@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind 22645@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
21421 * console interfaces but can still be used as a tty device. This has to be 22646 * console interfaces but can still be used as a tty device. This has to be
21422 * static because kmalloc will not work during early console init. 22647 * static because kmalloc will not work during early console init.
@@ -21444,9 +22669,9 @@ diff -urNp linux-2.6.32.10/drivers/char/hvc_console.c linux-2.6.32.10/drivers/ch
21444 { 22669 {
21445 struct hvc_struct *hp; 22670 struct hvc_struct *hp;
21446 int i; 22671 int i;
21447diff -urNp linux-2.6.32.10/drivers/char/hvc_console.h linux-2.6.32.10/drivers/char/hvc_console.h 22672diff -urNp linux-2.6.32.11/drivers/char/hvc_console.h linux-2.6.32.11/drivers/char/hvc_console.h
21448--- linux-2.6.32.10/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400 22673--- linux-2.6.32.11/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400
21449+++ linux-2.6.32.10/drivers/char/hvc_console.h 2010-03-20 15:58:47.045148884 -0400 22674+++ linux-2.6.32.11/drivers/char/hvc_console.h 2010-04-04 20:46:41.569782507 -0400
21450@@ -55,7 +55,7 @@ struct hvc_struct { 22675@@ -55,7 +55,7 @@ struct hvc_struct {
21451 int outbuf_size; 22676 int outbuf_size;
21452 int n_outbuf; 22677 int n_outbuf;
@@ -21470,9 +22695,9 @@ diff -urNp linux-2.6.32.10/drivers/char/hvc_console.h linux-2.6.32.10/drivers/ch
21470 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ 22695 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
21471 extern int hvc_remove(struct hvc_struct *hp); 22696 extern int hvc_remove(struct hvc_struct *hp);
21472 22697
21473diff -urNp linux-2.6.32.10/drivers/char/hvc_iseries.c linux-2.6.32.10/drivers/char/hvc_iseries.c 22698diff -urNp linux-2.6.32.11/drivers/char/hvc_iseries.c linux-2.6.32.11/drivers/char/hvc_iseries.c
21474--- linux-2.6.32.10/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400 22699--- linux-2.6.32.11/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400
21475+++ linux-2.6.32.10/drivers/char/hvc_iseries.c 2010-03-20 15:58:47.045148884 -0400 22700+++ linux-2.6.32.11/drivers/char/hvc_iseries.c 2010-04-04 20:46:41.569782507 -0400
21476@@ -197,7 +197,7 @@ done: 22701@@ -197,7 +197,7 @@ done:
21477 return sent; 22702 return sent;
21478 } 22703 }
@@ -21482,9 +22707,9 @@ diff -urNp linux-2.6.32.10/drivers/char/hvc_iseries.c linux-2.6.32.10/drivers/ch
21482 .get_chars = get_chars, 22707 .get_chars = get_chars,
21483 .put_chars = put_chars, 22708 .put_chars = put_chars,
21484 .notifier_add = notifier_add_irq, 22709 .notifier_add = notifier_add_irq,
21485diff -urNp linux-2.6.32.10/drivers/char/hvc_iucv.c linux-2.6.32.10/drivers/char/hvc_iucv.c 22710diff -urNp linux-2.6.32.11/drivers/char/hvc_iucv.c linux-2.6.32.11/drivers/char/hvc_iucv.c
21486--- linux-2.6.32.10/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400 22711--- linux-2.6.32.11/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400
21487+++ linux-2.6.32.10/drivers/char/hvc_iucv.c 2010-03-20 15:58:47.045148884 -0400 22712+++ linux-2.6.32.11/drivers/char/hvc_iucv.c 2010-04-04 20:46:41.569782507 -0400
21488@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru 22713@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
21489 22714
21490 22715
@@ -21494,9 +22719,9 @@ diff -urNp linux-2.6.32.10/drivers/char/hvc_iucv.c linux-2.6.32.10/drivers/char/
21494 .get_chars = hvc_iucv_get_chars, 22719 .get_chars = hvc_iucv_get_chars,
21495 .put_chars = hvc_iucv_put_chars, 22720 .put_chars = hvc_iucv_put_chars,
21496 .notifier_add = hvc_iucv_notifier_add, 22721 .notifier_add = hvc_iucv_notifier_add,
21497diff -urNp linux-2.6.32.10/drivers/char/hvc_rtas.c linux-2.6.32.10/drivers/char/hvc_rtas.c 22722diff -urNp linux-2.6.32.11/drivers/char/hvc_rtas.c linux-2.6.32.11/drivers/char/hvc_rtas.c
21498--- linux-2.6.32.10/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400 22723--- linux-2.6.32.11/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400
21499+++ linux-2.6.32.10/drivers/char/hvc_rtas.c 2010-03-20 15:58:47.045148884 -0400 22724+++ linux-2.6.32.11/drivers/char/hvc_rtas.c 2010-04-04 20:46:41.569782507 -0400
21500@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ 22725@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
21501 return i; 22726 return i;
21502 } 22727 }
@@ -21506,9 +22731,9 @@ diff -urNp linux-2.6.32.10/drivers/char/hvc_rtas.c linux-2.6.32.10/drivers/char/
21506 .get_chars = hvc_rtas_read_console, 22731 .get_chars = hvc_rtas_read_console,
21507 .put_chars = hvc_rtas_write_console, 22732 .put_chars = hvc_rtas_write_console,
21508 }; 22733 };
21509diff -urNp linux-2.6.32.10/drivers/char/hvcs.c linux-2.6.32.10/drivers/char/hvcs.c 22734diff -urNp linux-2.6.32.11/drivers/char/hvcs.c linux-2.6.32.11/drivers/char/hvcs.c
21510--- linux-2.6.32.10/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400 22735--- linux-2.6.32.11/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400
21511+++ linux-2.6.32.10/drivers/char/hvcs.c 2010-03-20 15:58:47.045148884 -0400 22736+++ linux-2.6.32.11/drivers/char/hvcs.c 2010-04-04 20:46:41.573523483 -0400
21512@@ -269,7 +269,7 @@ struct hvcs_struct { 22737@@ -269,7 +269,7 @@ struct hvcs_struct {
21513 unsigned int index; 22738 unsigned int index;
21514 22739
@@ -21603,9 +22828,9 @@ diff -urNp linux-2.6.32.10/drivers/char/hvcs.c linux-2.6.32.10/drivers/char/hvcs
21603 return 0; 22828 return 0;
21604 22829
21605 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; 22830 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
21606diff -urNp linux-2.6.32.10/drivers/char/hvc_udbg.c linux-2.6.32.10/drivers/char/hvc_udbg.c 22831diff -urNp linux-2.6.32.11/drivers/char/hvc_udbg.c linux-2.6.32.11/drivers/char/hvc_udbg.c
21607--- linux-2.6.32.10/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400 22832--- linux-2.6.32.11/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400
21608+++ linux-2.6.32.10/drivers/char/hvc_udbg.c 2010-03-20 15:58:47.045148884 -0400 22833+++ linux-2.6.32.11/drivers/char/hvc_udbg.c 2010-04-04 20:46:41.573523483 -0400
21609@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno 22834@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
21610 return i; 22835 return i;
21611 } 22836 }
@@ -21615,9 +22840,9 @@ diff -urNp linux-2.6.32.10/drivers/char/hvc_udbg.c linux-2.6.32.10/drivers/char/
21615 .get_chars = hvc_udbg_get, 22840 .get_chars = hvc_udbg_get,
21616 .put_chars = hvc_udbg_put, 22841 .put_chars = hvc_udbg_put,
21617 }; 22842 };
21618diff -urNp linux-2.6.32.10/drivers/char/hvc_vio.c linux-2.6.32.10/drivers/char/hvc_vio.c 22843diff -urNp linux-2.6.32.11/drivers/char/hvc_vio.c linux-2.6.32.11/drivers/char/hvc_vio.c
21619--- linux-2.6.32.10/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400 22844--- linux-2.6.32.11/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400
21620+++ linux-2.6.32.10/drivers/char/hvc_vio.c 2010-03-20 15:58:47.045148884 -0400 22845+++ linux-2.6.32.11/drivers/char/hvc_vio.c 2010-04-04 20:46:41.573523483 -0400
21621@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v 22846@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
21622 return got; 22847 return got;
21623 } 22848 }
@@ -21627,9 +22852,9 @@ diff -urNp linux-2.6.32.10/drivers/char/hvc_vio.c linux-2.6.32.10/drivers/char/h
21627 .get_chars = filtered_get_chars, 22852 .get_chars = filtered_get_chars,
21628 .put_chars = hvc_put_chars, 22853 .put_chars = hvc_put_chars,
21629 .notifier_add = notifier_add_irq, 22854 .notifier_add = notifier_add_irq,
21630diff -urNp linux-2.6.32.10/drivers/char/hvc_xen.c linux-2.6.32.10/drivers/char/hvc_xen.c 22855diff -urNp linux-2.6.32.11/drivers/char/hvc_xen.c linux-2.6.32.11/drivers/char/hvc_xen.c
21631--- linux-2.6.32.10/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400 22856--- linux-2.6.32.11/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400
21632+++ linux-2.6.32.10/drivers/char/hvc_xen.c 2010-03-20 15:58:47.045148884 -0400 22857+++ linux-2.6.32.11/drivers/char/hvc_xen.c 2010-04-04 20:46:41.573523483 -0400
21633@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno 22858@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
21634 return recv; 22859 return recv;
21635 } 22860 }
@@ -21639,9 +22864,9 @@ diff -urNp linux-2.6.32.10/drivers/char/hvc_xen.c linux-2.6.32.10/drivers/char/h
21639 .get_chars = read_console, 22864 .get_chars = read_console,
21640 .put_chars = write_console, 22865 .put_chars = write_console,
21641 .notifier_add = notifier_add_irq, 22866 .notifier_add = notifier_add_irq,
21642diff -urNp linux-2.6.32.10/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.10/drivers/char/ipmi/ipmi_msghandler.c 22867diff -urNp linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c
21643--- linux-2.6.32.10/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400 22868--- linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400
21644+++ linux-2.6.32.10/drivers/char/ipmi/ipmi_msghandler.c 2010-03-20 15:58:47.050048266 -0400 22869+++ linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c 2010-04-04 20:46:41.573523483 -0400
21645@@ -414,7 +414,7 @@ struct ipmi_smi { 22870@@ -414,7 +414,7 @@ struct ipmi_smi {
21646 struct proc_dir_entry *proc_dir; 22871 struct proc_dir_entry *proc_dir;
21647 char proc_dir_name[10]; 22872 char proc_dir_name[10];
@@ -21672,9 +22897,9 @@ diff -urNp linux-2.6.32.10/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.10/d
21672 22897
21673 intf->proc_dir = NULL; 22898 intf->proc_dir = NULL;
21674 22899
21675diff -urNp linux-2.6.32.10/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.10/drivers/char/ipmi/ipmi_si_intf.c 22900diff -urNp linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c
21676--- linux-2.6.32.10/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400 22901--- linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400
21677+++ linux-2.6.32.10/drivers/char/ipmi/ipmi_si_intf.c 2010-03-20 15:58:47.050048266 -0400 22902+++ linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c 2010-04-04 20:46:41.573523483 -0400
21678@@ -277,7 +277,7 @@ struct smi_info { 22903@@ -277,7 +277,7 @@ struct smi_info {
21679 unsigned char slave_addr; 22904 unsigned char slave_addr;
21680 22905
@@ -21705,9 +22930,9 @@ diff -urNp linux-2.6.32.10/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.10/driv
21705 22930
21706 new_smi->interrupt_disabled = 0; 22931 new_smi->interrupt_disabled = 0;
21707 atomic_set(&new_smi->stop_operation, 0); 22932 atomic_set(&new_smi->stop_operation, 0);
21708diff -urNp linux-2.6.32.10/drivers/char/keyboard.c linux-2.6.32.10/drivers/char/keyboard.c 22933diff -urNp linux-2.6.32.11/drivers/char/keyboard.c linux-2.6.32.11/drivers/char/keyboard.c
21709--- linux-2.6.32.10/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400 22934--- linux-2.6.32.11/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400
21710+++ linux-2.6.32.10/drivers/char/keyboard.c 2010-03-20 15:58:47.050048266 -0400 22935+++ linux-2.6.32.11/drivers/char/keyboard.c 2010-04-04 20:46:41.573523483 -0400
21711@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u 22936@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
21712 kbd->kbdmode == VC_MEDIUMRAW) && 22937 kbd->kbdmode == VC_MEDIUMRAW) &&
21713 value != KVAL(K_SAK)) 22938 value != KVAL(K_SAK))
@@ -21734,9 +22959,9 @@ diff -urNp linux-2.6.32.10/drivers/char/keyboard.c linux-2.6.32.10/drivers/char/
21734 }; 22959 };
21735 22960
21736 MODULE_DEVICE_TABLE(input, kbd_ids); 22961 MODULE_DEVICE_TABLE(input, kbd_ids);
21737diff -urNp linux-2.6.32.10/drivers/char/mem.c linux-2.6.32.10/drivers/char/mem.c 22962diff -urNp linux-2.6.32.11/drivers/char/mem.c linux-2.6.32.11/drivers/char/mem.c
21738--- linux-2.6.32.10/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400 22963--- linux-2.6.32.11/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400
21739+++ linux-2.6.32.10/drivers/char/mem.c 2010-03-20 15:58:47.050048266 -0400 22964+++ linux-2.6.32.11/drivers/char/mem.c 2010-04-04 20:46:41.573523483 -0400
21740@@ -18,6 +18,7 @@ 22965@@ -18,6 +18,7 @@
21741 #include <linux/raw.h> 22966 #include <linux/raw.h>
21742 #include <linux/tty.h> 22967 #include <linux/tty.h>
@@ -21827,9 +23052,9 @@ diff -urNp linux-2.6.32.10/drivers/char/mem.c linux-2.6.32.10/drivers/char/mem.c
21827 }; 23052 };
21828 23053
21829 static int memory_open(struct inode *inode, struct file *filp) 23054 static int memory_open(struct inode *inode, struct file *filp)
21830diff -urNp linux-2.6.32.10/drivers/char/nvram.c linux-2.6.32.10/drivers/char/nvram.c 23055diff -urNp linux-2.6.32.11/drivers/char/nvram.c linux-2.6.32.11/drivers/char/nvram.c
21831--- linux-2.6.32.10/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400 23056--- linux-2.6.32.11/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400
21832+++ linux-2.6.32.10/drivers/char/nvram.c 2010-03-20 15:58:47.050048266 -0400 23057+++ linux-2.6.32.11/drivers/char/nvram.c 2010-04-04 20:46:41.573523483 -0400
21833@@ -429,7 +429,10 @@ static const struct file_operations nvra 23058@@ -429,7 +429,10 @@ static const struct file_operations nvra
21834 static struct miscdevice nvram_dev = { 23059 static struct miscdevice nvram_dev = {
21835 NVRAM_MINOR, 23060 NVRAM_MINOR,
@@ -21842,9 +23067,9 @@ diff -urNp linux-2.6.32.10/drivers/char/nvram.c linux-2.6.32.10/drivers/char/nvr
21842 }; 23067 };
21843 23068
21844 static int __init nvram_init(void) 23069 static int __init nvram_init(void)
21845diff -urNp linux-2.6.32.10/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.10/drivers/char/pcmcia/ipwireless/tty.c 23070diff -urNp linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c
21846--- linux-2.6.32.10/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400 23071--- linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400
21847+++ linux-2.6.32.10/drivers/char/pcmcia/ipwireless/tty.c 2010-03-20 15:58:47.050048266 -0400 23072+++ linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c 2010-04-04 20:46:41.573523483 -0400
21848@@ -51,7 +51,7 @@ struct ipw_tty { 23073@@ -51,7 +51,7 @@ struct ipw_tty {
21849 int tty_type; 23074 int tty_type;
21850 struct ipw_network *network; 23075 struct ipw_network *network;
@@ -21959,9 +23184,9 @@ diff -urNp linux-2.6.32.10/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.10/
21959 do_ipw_close(ttyj); 23184 do_ipw_close(ttyj);
21960 ipwireless_disassociate_network_ttys(network, 23185 ipwireless_disassociate_network_ttys(network,
21961 ttyj->channel_idx); 23186 ttyj->channel_idx);
21962diff -urNp linux-2.6.32.10/drivers/char/pty.c linux-2.6.32.10/drivers/char/pty.c 23187diff -urNp linux-2.6.32.11/drivers/char/pty.c linux-2.6.32.11/drivers/char/pty.c
21963--- linux-2.6.32.10/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400 23188--- linux-2.6.32.11/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400
21964+++ linux-2.6.32.10/drivers/char/pty.c 2010-03-20 15:58:47.050048266 -0400 23189+++ linux-2.6.32.11/drivers/char/pty.c 2010-04-04 20:46:41.573523483 -0400
21965@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode 23190@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
21966 return ret; 23191 return ret;
21967 } 23192 }
@@ -21992,9 +23217,9 @@ diff -urNp linux-2.6.32.10/drivers/char/pty.c linux-2.6.32.10/drivers/char/pty.c
21992 cdev_init(&ptmx_cdev, &ptmx_fops); 23217 cdev_init(&ptmx_cdev, &ptmx_fops);
21993 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || 23218 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
21994 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) 23219 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
21995diff -urNp linux-2.6.32.10/drivers/char/random.c linux-2.6.32.10/drivers/char/random.c 23220diff -urNp linux-2.6.32.11/drivers/char/random.c linux-2.6.32.11/drivers/char/random.c
21996--- linux-2.6.32.10/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400 23221--- linux-2.6.32.11/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400
21997+++ linux-2.6.32.10/drivers/char/random.c 2010-03-20 15:58:47.050048266 -0400 23222+++ linux-2.6.32.11/drivers/char/random.c 2010-04-04 20:46:41.573523483 -0400
21998@@ -254,8 +254,13 @@ 23223@@ -254,8 +254,13 @@
21999 /* 23224 /*
22000 * Configuration information 23225 * Configuration information
@@ -22036,9 +23261,9 @@ diff -urNp linux-2.6.32.10/drivers/char/random.c linux-2.6.32.10/drivers/char/ra
22036 static int max_write_thresh = INPUT_POOL_WORDS * 32; 23261 static int max_write_thresh = INPUT_POOL_WORDS * 32;
22037 static char sysctl_bootid[16]; 23262 static char sysctl_bootid[16];
22038 23263
22039diff -urNp linux-2.6.32.10/drivers/char/sonypi.c linux-2.6.32.10/drivers/char/sonypi.c 23264diff -urNp linux-2.6.32.11/drivers/char/sonypi.c linux-2.6.32.11/drivers/char/sonypi.c
22040--- linux-2.6.32.10/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400 23265--- linux-2.6.32.11/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400
22041+++ linux-2.6.32.10/drivers/char/sonypi.c 2010-03-20 15:58:47.050048266 -0400 23266+++ linux-2.6.32.11/drivers/char/sonypi.c 2010-04-04 20:46:41.573523483 -0400
22042@@ -491,7 +491,7 @@ static struct sonypi_device { 23267@@ -491,7 +491,7 @@ static struct sonypi_device {
22043 spinlock_t fifo_lock; 23268 spinlock_t fifo_lock;
22044 wait_queue_head_t fifo_proc_list; 23269 wait_queue_head_t fifo_proc_list;
@@ -22069,9 +23294,9 @@ diff -urNp linux-2.6.32.10/drivers/char/sonypi.c linux-2.6.32.10/drivers/char/so
22069 mutex_unlock(&sonypi_device.lock); 23294 mutex_unlock(&sonypi_device.lock);
22070 unlock_kernel(); 23295 unlock_kernel();
22071 return 0; 23296 return 0;
22072diff -urNp linux-2.6.32.10/drivers/char/tpm/tpm_bios.c linux-2.6.32.10/drivers/char/tpm/tpm_bios.c 23297diff -urNp linux-2.6.32.11/drivers/char/tpm/tpm_bios.c linux-2.6.32.11/drivers/char/tpm/tpm_bios.c
22073--- linux-2.6.32.10/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400 23298--- linux-2.6.32.11/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400
22074+++ linux-2.6.32.10/drivers/char/tpm/tpm_bios.c 2010-03-20 15:58:47.050048266 -0400 23299+++ linux-2.6.32.11/drivers/char/tpm/tpm_bios.c 2010-04-04 20:46:41.573523483 -0400
22075@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start 23300@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
22076 event = addr; 23301 event = addr;
22077 23302
@@ -22112,9 +23337,9 @@ diff -urNp linux-2.6.32.10/drivers/char/tpm/tpm_bios.c linux-2.6.32.10/drivers/c
22112 23337
22113 memcpy(log->bios_event_log, virt, len); 23338 memcpy(log->bios_event_log, virt, len);
22114 23339
22115diff -urNp linux-2.6.32.10/drivers/char/tty_io.c linux-2.6.32.10/drivers/char/tty_io.c 23340diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tty_io.c
22116--- linux-2.6.32.10/drivers/char/tty_io.c 2010-03-15 11:52:04.000000000 -0400 23341--- linux-2.6.32.11/drivers/char/tty_io.c 2010-03-15 11:52:04.000000000 -0400
22117+++ linux-2.6.32.10/drivers/char/tty_io.c 2010-03-20 15:58:47.050048266 -0400 23342+++ linux-2.6.32.11/drivers/char/tty_io.c 2010-04-04 20:46:41.577798214 -0400
22118@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list 23343@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
22119 DEFINE_MUTEX(tty_mutex); 23344 DEFINE_MUTEX(tty_mutex);
22120 EXPORT_SYMBOL(tty_mutex); 23345 EXPORT_SYMBOL(tty_mutex);
@@ -22253,9 +23478,9 @@ diff -urNp linux-2.6.32.10/drivers/char/tty_io.c linux-2.6.32.10/drivers/char/tt
22253 /* 23478 /*
22254 * Initialize the console device. This is called *early*, so 23479 * Initialize the console device. This is called *early*, so
22255 * we can't necessarily depend on lots of kernel help here. 23480 * we can't necessarily depend on lots of kernel help here.
22256diff -urNp linux-2.6.32.10/drivers/char/tty_ldisc.c linux-2.6.32.10/drivers/char/tty_ldisc.c 23481diff -urNp linux-2.6.32.11/drivers/char/tty_ldisc.c linux-2.6.32.11/drivers/char/tty_ldisc.c
22257--- linux-2.6.32.10/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400 23482--- linux-2.6.32.11/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400
22258+++ linux-2.6.32.10/drivers/char/tty_ldisc.c 2010-03-20 15:58:47.050048266 -0400 23483+++ linux-2.6.32.11/drivers/char/tty_ldisc.c 2010-04-04 20:46:41.577798214 -0400
22259@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * 23484@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc *
22260 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { 23485 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
22261 struct tty_ldisc_ops *ldo = ld->ops; 23486 struct tty_ldisc_ops *ldo = ld->ops;
@@ -22301,9 +23526,9 @@ diff -urNp linux-2.6.32.10/drivers/char/tty_ldisc.c linux-2.6.32.10/drivers/char
22301 module_put(ldops->owner); 23526 module_put(ldops->owner);
22302 spin_unlock_irqrestore(&tty_ldisc_lock, flags); 23527 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
22303 } 23528 }
22304diff -urNp linux-2.6.32.10/drivers/char/virtio_console.c linux-2.6.32.10/drivers/char/virtio_console.c 23529diff -urNp linux-2.6.32.11/drivers/char/virtio_console.c linux-2.6.32.11/drivers/char/virtio_console.c
22305--- linux-2.6.32.10/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400 23530--- linux-2.6.32.11/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400
22306+++ linux-2.6.32.10/drivers/char/virtio_console.c 2010-03-20 15:58:47.054065670 -0400 23531+++ linux-2.6.32.11/drivers/char/virtio_console.c 2010-04-04 20:46:41.577798214 -0400
22307@@ -44,6 +44,7 @@ static unsigned int in_len; 23532@@ -44,6 +44,7 @@ static unsigned int in_len;
22308 static char *in, *inbuf; 23533 static char *in, *inbuf;
22309 23534
@@ -22312,9 +23537,9 @@ diff -urNp linux-2.6.32.10/drivers/char/virtio_console.c linux-2.6.32.10/drivers
22312 static struct hv_ops virtio_cons; 23537 static struct hv_ops virtio_cons;
22313 23538
22314 /* The hvc device */ 23539 /* The hvc device */
22315diff -urNp linux-2.6.32.10/drivers/char/vt_ioctl.c linux-2.6.32.10/drivers/char/vt_ioctl.c 23540diff -urNp linux-2.6.32.11/drivers/char/vt_ioctl.c linux-2.6.32.11/drivers/char/vt_ioctl.c
22316--- linux-2.6.32.10/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400 23541--- linux-2.6.32.11/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400
22317+++ linux-2.6.32.10/drivers/char/vt_ioctl.c 2010-03-20 15:58:47.054065670 -0400 23542+++ linux-2.6.32.11/drivers/char/vt_ioctl.c 2010-04-04 20:46:41.577798214 -0400
22318@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ 23543@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __
22319 case KDSKBENT: 23544 case KDSKBENT:
22320 if (!perm) 23545 if (!perm)
@@ -22342,9 +23567,9 @@ diff -urNp linux-2.6.32.10/drivers/char/vt_ioctl.c linux-2.6.32.10/drivers/char/
22342 q = func_table[i]; 23567 q = func_table[i];
22343 first_free = funcbufptr + (funcbufsize - funcbufleft); 23568 first_free = funcbufptr + (funcbufsize - funcbufleft);
22344 for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 23569 for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++)
22345diff -urNp linux-2.6.32.10/drivers/cpufreq/cpufreq.c linux-2.6.32.10/drivers/cpufreq/cpufreq.c 23570diff -urNp linux-2.6.32.11/drivers/cpufreq/cpufreq.c linux-2.6.32.11/drivers/cpufreq/cpufreq.c
22346--- linux-2.6.32.10/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400 23571--- linux-2.6.32.11/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400
22347+++ linux-2.6.32.10/drivers/cpufreq/cpufreq.c 2010-03-20 15:58:47.054065670 -0400 23572+++ linux-2.6.32.11/drivers/cpufreq/cpufreq.c 2010-04-04 20:46:41.577798214 -0400
22348@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct 23573@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
22349 complete(&policy->kobj_unregister); 23574 complete(&policy->kobj_unregister);
22350 } 23575 }
@@ -22354,9 +23579,9 @@ diff -urNp linux-2.6.32.10/drivers/cpufreq/cpufreq.c linux-2.6.32.10/drivers/cpu
22354 .show = show, 23579 .show = show,
22355 .store = store, 23580 .store = store,
22356 }; 23581 };
22357diff -urNp linux-2.6.32.10/drivers/cpuidle/sysfs.c linux-2.6.32.10/drivers/cpuidle/sysfs.c 23582diff -urNp linux-2.6.32.11/drivers/cpuidle/sysfs.c linux-2.6.32.11/drivers/cpuidle/sysfs.c
22358--- linux-2.6.32.10/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400 23583--- linux-2.6.32.11/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400
22359+++ linux-2.6.32.10/drivers/cpuidle/sysfs.c 2010-03-20 15:58:47.054065670 -0400 23584+++ linux-2.6.32.11/drivers/cpuidle/sysfs.c 2010-04-04 20:46:41.577798214 -0400
22360@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj 23585@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
22361 return ret; 23586 return ret;
22362 } 23587 }
@@ -22375,9 +23600,9 @@ diff -urNp linux-2.6.32.10/drivers/cpuidle/sysfs.c linux-2.6.32.10/drivers/cpuid
22375 .show = cpuidle_state_show, 23600 .show = cpuidle_state_show,
22376 }; 23601 };
22377 23602
22378diff -urNp linux-2.6.32.10/drivers/dma/ioat/dma.c linux-2.6.32.10/drivers/dma/ioat/dma.c 23603diff -urNp linux-2.6.32.11/drivers/dma/ioat/dma.c linux-2.6.32.11/drivers/dma/ioat/dma.c
22379--- linux-2.6.32.10/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400 23604--- linux-2.6.32.11/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400
22380+++ linux-2.6.32.10/drivers/dma/ioat/dma.c 2010-03-20 15:58:47.054065670 -0400 23605+++ linux-2.6.32.11/drivers/dma/ioat/dma.c 2010-04-04 20:46:41.577798214 -0400
22381@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str 23606@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
22382 return entry->show(&chan->common, page); 23607 return entry->show(&chan->common, page);
22383 } 23608 }
@@ -22387,9 +23612,9 @@ diff -urNp linux-2.6.32.10/drivers/dma/ioat/dma.c linux-2.6.32.10/drivers/dma/io
22387 .show = ioat_attr_show, 23612 .show = ioat_attr_show,
22388 }; 23613 };
22389 23614
22390diff -urNp linux-2.6.32.10/drivers/dma/ioat/dma.h linux-2.6.32.10/drivers/dma/ioat/dma.h 23615diff -urNp linux-2.6.32.11/drivers/dma/ioat/dma.h linux-2.6.32.11/drivers/dma/ioat/dma.h
22391--- linux-2.6.32.10/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400 23616--- linux-2.6.32.11/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400
22392+++ linux-2.6.32.10/drivers/dma/ioat/dma.h 2010-03-20 15:58:47.054065670 -0400 23617+++ linux-2.6.32.11/drivers/dma/ioat/dma.h 2010-04-04 20:46:41.577798214 -0400
22393@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c 23618@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
22394 unsigned long *phys_complete); 23619 unsigned long *phys_complete);
22395 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); 23620 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
@@ -22399,9 +23624,9 @@ diff -urNp linux-2.6.32.10/drivers/dma/ioat/dma.h linux-2.6.32.10/drivers/dma/io
22399 extern struct ioat_sysfs_entry ioat_version_attr; 23624 extern struct ioat_sysfs_entry ioat_version_attr;
22400 extern struct ioat_sysfs_entry ioat_cap_attr; 23625 extern struct ioat_sysfs_entry ioat_cap_attr;
22401 #endif /* IOATDMA_H */ 23626 #endif /* IOATDMA_H */
22402diff -urNp linux-2.6.32.10/drivers/edac/edac_core.h linux-2.6.32.10/drivers/edac/edac_core.h 23627diff -urNp linux-2.6.32.11/drivers/edac/edac_core.h linux-2.6.32.11/drivers/edac/edac_core.h
22403--- linux-2.6.32.10/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400 23628--- linux-2.6.32.11/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400
22404+++ linux-2.6.32.10/drivers/edac/edac_core.h 2010-03-20 15:58:47.054065670 -0400 23629+++ linux-2.6.32.11/drivers/edac/edac_core.h 2010-04-04 20:46:41.577798214 -0400
22405@@ -99,11 +99,11 @@ extern int edac_debug_level; 23630@@ -99,11 +99,11 @@ extern int edac_debug_level;
22406 23631
22407 #else /* !CONFIG_EDAC_DEBUG */ 23632 #else /* !CONFIG_EDAC_DEBUG */
@@ -22419,9 +23644,9 @@ diff -urNp linux-2.6.32.10/drivers/edac/edac_core.h linux-2.6.32.10/drivers/edac
22419 23644
22420 #endif /* !CONFIG_EDAC_DEBUG */ 23645 #endif /* !CONFIG_EDAC_DEBUG */
22421 23646
22422diff -urNp linux-2.6.32.10/drivers/edac/edac_device_sysfs.c linux-2.6.32.10/drivers/edac/edac_device_sysfs.c 23647diff -urNp linux-2.6.32.11/drivers/edac/edac_device_sysfs.c linux-2.6.32.11/drivers/edac/edac_device_sysfs.c
22423--- linux-2.6.32.10/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400 23648--- linux-2.6.32.11/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400
22424+++ linux-2.6.32.10/drivers/edac/edac_device_sysfs.c 2010-03-20 15:58:47.054065670 -0400 23649+++ linux-2.6.32.11/drivers/edac/edac_device_sysfs.c 2010-04-04 20:46:41.577798214 -0400
22425@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s 23650@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
22426 } 23651 }
22427 23652
@@ -22449,9 +23674,9 @@ diff -urNp linux-2.6.32.10/drivers/edac/edac_device_sysfs.c linux-2.6.32.10/driv
22449 .show = edac_dev_block_show, 23674 .show = edac_dev_block_show,
22450 .store = edac_dev_block_store 23675 .store = edac_dev_block_store
22451 }; 23676 };
22452diff -urNp linux-2.6.32.10/drivers/edac/edac_mc_sysfs.c linux-2.6.32.10/drivers/edac/edac_mc_sysfs.c 23677diff -urNp linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c
22453--- linux-2.6.32.10/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400 23678--- linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400
22454+++ linux-2.6.32.10/drivers/edac/edac_mc_sysfs.c 2010-03-20 15:58:47.054065670 -0400 23679+++ linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c 2010-04-04 20:46:41.577798214 -0400
22455@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob 23680@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
22456 return -EIO; 23681 return -EIO;
22457 } 23682 }
@@ -22470,9 +23695,9 @@ diff -urNp linux-2.6.32.10/drivers/edac/edac_mc_sysfs.c linux-2.6.32.10/drivers/
22470 .show = mcidev_show, 23695 .show = mcidev_show,
22471 .store = mcidev_store 23696 .store = mcidev_store
22472 }; 23697 };
22473diff -urNp linux-2.6.32.10/drivers/edac/edac_pci_sysfs.c linux-2.6.32.10/drivers/edac/edac_pci_sysfs.c 23698diff -urNp linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c
22474--- linux-2.6.32.10/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400 23699--- linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400
22475+++ linux-2.6.32.10/drivers/edac/edac_pci_sysfs.c 2010-03-20 15:58:47.054065670 -0400 23700+++ linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c 2010-04-04 20:46:41.577798214 -0400
22476@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s 23701@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
22477 } 23702 }
22478 23703
@@ -22491,9 +23716,9 @@ diff -urNp linux-2.6.32.10/drivers/edac/edac_pci_sysfs.c linux-2.6.32.10/drivers
22491 .show = edac_pci_dev_show, 23716 .show = edac_pci_dev_show,
22492 .store = edac_pci_dev_store 23717 .store = edac_pci_dev_store
22493 }; 23718 };
22494diff -urNp linux-2.6.32.10/drivers/firmware/dmi_scan.c linux-2.6.32.10/drivers/firmware/dmi_scan.c 23719diff -urNp linux-2.6.32.11/drivers/firmware/dmi_scan.c linux-2.6.32.11/drivers/firmware/dmi_scan.c
22495--- linux-2.6.32.10/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400 23720--- linux-2.6.32.11/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400
22496+++ linux-2.6.32.10/drivers/firmware/dmi_scan.c 2010-03-20 15:58:47.054065670 -0400 23721+++ linux-2.6.32.11/drivers/firmware/dmi_scan.c 2010-04-04 20:46:41.577798214 -0400
22497@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) 23722@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
22498 } 23723 }
22499 } 23724 }
@@ -22506,9 +23731,9 @@ diff -urNp linux-2.6.32.10/drivers/firmware/dmi_scan.c linux-2.6.32.10/drivers/f
22506 p = dmi_ioremap(0xF0000, 0x10000); 23731 p = dmi_ioremap(0xF0000, 0x10000);
22507 if (p == NULL) 23732 if (p == NULL)
22508 goto error; 23733 goto error;
22509diff -urNp linux-2.6.32.10/drivers/firmware/edd.c linux-2.6.32.10/drivers/firmware/edd.c 23734diff -urNp linux-2.6.32.11/drivers/firmware/edd.c linux-2.6.32.11/drivers/firmware/edd.c
22510--- linux-2.6.32.10/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400 23735--- linux-2.6.32.11/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400
22511+++ linux-2.6.32.10/drivers/firmware/edd.c 2010-03-20 15:58:47.054065670 -0400 23736+++ linux-2.6.32.11/drivers/firmware/edd.c 2010-04-04 20:46:41.577798214 -0400
22512@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str 23737@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
22513 return ret; 23738 return ret;
22514 } 23739 }
@@ -22518,9 +23743,9 @@ diff -urNp linux-2.6.32.10/drivers/firmware/edd.c linux-2.6.32.10/drivers/firmwa
22518 .show = edd_attr_show, 23743 .show = edd_attr_show,
22519 }; 23744 };
22520 23745
22521diff -urNp linux-2.6.32.10/drivers/firmware/efivars.c linux-2.6.32.10/drivers/firmware/efivars.c 23746diff -urNp linux-2.6.32.11/drivers/firmware/efivars.c linux-2.6.32.11/drivers/firmware/efivars.c
22522--- linux-2.6.32.10/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400 23747--- linux-2.6.32.11/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400
22523+++ linux-2.6.32.10/drivers/firmware/efivars.c 2010-03-20 15:58:47.054065670 -0400 23748+++ linux-2.6.32.11/drivers/firmware/efivars.c 2010-04-04 20:46:41.577798214 -0400
22524@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct 23749@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
22525 return ret; 23750 return ret;
22526 } 23751 }
@@ -22530,9 +23755,9 @@ diff -urNp linux-2.6.32.10/drivers/firmware/efivars.c linux-2.6.32.10/drivers/fi
22530 .show = efivar_attr_show, 23755 .show = efivar_attr_show,
22531 .store = efivar_attr_store, 23756 .store = efivar_attr_store,
22532 }; 23757 };
22533diff -urNp linux-2.6.32.10/drivers/firmware/iscsi_ibft.c linux-2.6.32.10/drivers/firmware/iscsi_ibft.c 23758diff -urNp linux-2.6.32.11/drivers/firmware/iscsi_ibft.c linux-2.6.32.11/drivers/firmware/iscsi_ibft.c
22534--- linux-2.6.32.10/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400 23759--- linux-2.6.32.11/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400
22535+++ linux-2.6.32.10/drivers/firmware/iscsi_ibft.c 2010-03-20 15:58:47.054065670 -0400 23760+++ linux-2.6.32.11/drivers/firmware/iscsi_ibft.c 2010-04-04 20:46:41.581454607 -0400
22536@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc 23761@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
22537 return ret; 23762 return ret;
22538 } 23763 }
@@ -22542,9 +23767,9 @@ diff -urNp linux-2.6.32.10/drivers/firmware/iscsi_ibft.c linux-2.6.32.10/drivers
22542 .show = ibft_show_attribute, 23767 .show = ibft_show_attribute,
22543 }; 23768 };
22544 23769
22545diff -urNp linux-2.6.32.10/drivers/firmware/memmap.c linux-2.6.32.10/drivers/firmware/memmap.c 23770diff -urNp linux-2.6.32.11/drivers/firmware/memmap.c linux-2.6.32.11/drivers/firmware/memmap.c
22546--- linux-2.6.32.10/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400 23771--- linux-2.6.32.11/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400
22547+++ linux-2.6.32.10/drivers/firmware/memmap.c 2010-03-20 15:58:47.054065670 -0400 23772+++ linux-2.6.32.11/drivers/firmware/memmap.c 2010-04-04 20:46:41.581454607 -0400
22548@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { 23773@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
22549 NULL 23774 NULL
22550 }; 23775 };
@@ -22554,9 +23779,9 @@ diff -urNp linux-2.6.32.10/drivers/firmware/memmap.c linux-2.6.32.10/drivers/fir
22554 .show = memmap_attr_show, 23779 .show = memmap_attr_show,
22555 }; 23780 };
22556 23781
22557diff -urNp linux-2.6.32.10/drivers/gpu/drm/drm_drv.c linux-2.6.32.10/drivers/gpu/drm/drm_drv.c 23782diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_drv.c linux-2.6.32.11/drivers/gpu/drm/drm_drv.c
22558--- linux-2.6.32.10/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400 23783--- linux-2.6.32.11/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400
22559+++ linux-2.6.32.10/drivers/gpu/drm/drm_drv.c 2010-03-20 15:58:47.054065670 -0400 23784+++ linux-2.6.32.11/drivers/gpu/drm/drm_drv.c 2010-04-04 20:46:41.581454607 -0400
22560@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc 23785@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
22561 char *kdata = NULL; 23786 char *kdata = NULL;
22562 23787
@@ -22566,9 +23791,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/drm_drv.c linux-2.6.32.10/drivers/gpu
22566 ++file_priv->ioctl_count; 23791 ++file_priv->ioctl_count;
22567 23792
22568 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", 23793 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
22569diff -urNp linux-2.6.32.10/drivers/gpu/drm/drm_fops.c linux-2.6.32.10/drivers/gpu/drm/drm_fops.c 23794diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_fops.c linux-2.6.32.11/drivers/gpu/drm/drm_fops.c
22570--- linux-2.6.32.10/drivers/gpu/drm/drm_fops.c 2010-03-15 11:52:04.000000000 -0400 23795--- linux-2.6.32.11/drivers/gpu/drm/drm_fops.c 2010-03-15 11:52:04.000000000 -0400
22571+++ linux-2.6.32.10/drivers/gpu/drm/drm_fops.c 2010-03-20 15:58:47.054065670 -0400 23796+++ linux-2.6.32.11/drivers/gpu/drm/drm_fops.c 2010-04-04 20:46:41.581454607 -0400
22572@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * 23797@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
22573 } 23798 }
22574 23799
@@ -22620,9 +23845,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/drm_fops.c linux-2.6.32.10/drivers/gp
22620 if (atomic_read(&dev->ioctl_count)) { 23845 if (atomic_read(&dev->ioctl_count)) {
22621 DRM_ERROR("Device busy: %d\n", 23846 DRM_ERROR("Device busy: %d\n",
22622 atomic_read(&dev->ioctl_count)); 23847 atomic_read(&dev->ioctl_count));
22623diff -urNp linux-2.6.32.10/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.10/drivers/gpu/drm/drm_ioctl.c 23848diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c
22624--- linux-2.6.32.10/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400 23849--- linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400
22625+++ linux-2.6.32.10/drivers/gpu/drm/drm_ioctl.c 2010-03-20 15:58:47.054065670 -0400 23850+++ linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c 2010-04-04 20:46:41.581454607 -0400
22626@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, 23851@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
22627 stats->data[i].value = 23852 stats->data[i].value =
22628 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); 23853 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -22632,9 +23857,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.10/drivers/g
22632 stats->data[i].type = dev->types[i]; 23857 stats->data[i].type = dev->types[i];
22633 } 23858 }
22634 23859
22635diff -urNp linux-2.6.32.10/drivers/gpu/drm/drm_lock.c linux-2.6.32.10/drivers/gpu/drm/drm_lock.c 23860diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_lock.c linux-2.6.32.11/drivers/gpu/drm/drm_lock.c
22636--- linux-2.6.32.10/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400 23861--- linux-2.6.32.11/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400
22637+++ linux-2.6.32.10/drivers/gpu/drm/drm_lock.c 2010-03-20 15:58:47.054065670 -0400 23862+++ linux-2.6.32.11/drivers/gpu/drm/drm_lock.c 2010-04-04 20:46:41.581454607 -0400
22638@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi 23863@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
22639 if (drm_lock_take(&master->lock, lock->context)) { 23864 if (drm_lock_take(&master->lock, lock->context)) {
22640 master->lock.file_priv = file_priv; 23865 master->lock.file_priv = file_priv;
@@ -22653,9 +23878,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/drm_lock.c linux-2.6.32.10/drivers/gp
22653 23878
22654 /* kernel_context_switch isn't used by any of the x86 drm 23879 /* kernel_context_switch isn't used by any of the x86 drm
22655 * modules but is required by the Sparc driver. 23880 * modules but is required by the Sparc driver.
22656diff -urNp linux-2.6.32.10/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.10/drivers/gpu/drm/i810/i810_dma.c 23881diff -urNp linux-2.6.32.11/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.11/drivers/gpu/drm/i810/i810_dma.c
22657--- linux-2.6.32.10/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400 23882--- linux-2.6.32.11/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400
22658+++ linux-2.6.32.10/drivers/gpu/drm/i810/i810_dma.c 2010-03-20 15:58:47.058045612 -0400 23883+++ linux-2.6.32.11/drivers/gpu/drm/i810/i810_dma.c 2010-04-04 20:46:41.581454607 -0400
22659@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de 23884@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
22660 dma->buflist[vertex->idx], 23885 dma->buflist[vertex->idx],
22661 vertex->discard, vertex->used); 23886 vertex->discard, vertex->used);
@@ -22678,9 +23903,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.10/drive
22678 sarea_priv->last_enqueue = dev_priv->counter - 1; 23903 sarea_priv->last_enqueue = dev_priv->counter - 1;
22679 sarea_priv->last_dispatch = (int)hw_status[5]; 23904 sarea_priv->last_dispatch = (int)hw_status[5];
22680 23905
22681diff -urNp linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ch7017.c 23906diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c
22682--- linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400 23907--- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400
22683+++ linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-20 15:58:47.058045612 -0400 23908+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c 2010-04-04 20:46:41.581454607 -0400
22684@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ 23909@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
22685 } 23910 }
22686 } 23911 }
@@ -22690,9 +23915,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.10/dri
22690 .init = ch7017_init, 23915 .init = ch7017_init,
22691 .detect = ch7017_detect, 23916 .detect = ch7017_detect,
22692 .mode_valid = ch7017_mode_valid, 23917 .mode_valid = ch7017_mode_valid,
22693diff -urNp linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ch7xxx.c 23918diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c
22694--- linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400 23919--- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400
22695+++ linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-20 15:58:47.058045612 -0400 23920+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-04-04 20:46:41.581454607 -0400
22696@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ 23921@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
22697 } 23922 }
22698 } 23923 }
@@ -22702,9 +23927,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.10/dri
22702 .init = ch7xxx_init, 23927 .init = ch7xxx_init,
22703 .detect = ch7xxx_detect, 23928 .detect = ch7xxx_detect,
22704 .mode_valid = ch7xxx_mode_valid, 23929 .mode_valid = ch7xxx_mode_valid,
22705diff -urNp linux-2.6.32.10/drivers/gpu/drm/i915/dvo.h linux-2.6.32.10/drivers/gpu/drm/i915/dvo.h 23930diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h
22706--- linux-2.6.32.10/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400 23931--- linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400
22707+++ linux-2.6.32.10/drivers/gpu/drm/i915/dvo.h 2010-03-20 15:58:47.058045612 -0400 23932+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h 2010-04-04 20:46:41.581454607 -0400
22708@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { 23933@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
22709 * 23934 *
22710 * \return singly-linked list of modes or NULL if no modes found. 23935 * \return singly-linked list of modes or NULL if no modes found.
@@ -22737,9 +23962,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/i915/dvo.h linux-2.6.32.10/drivers/gp
22737+extern const struct intel_dvo_dev_ops ch7017_ops; 23962+extern const struct intel_dvo_dev_ops ch7017_ops;
22738 23963
22739 #endif /* _INTEL_DVO_H */ 23964 #endif /* _INTEL_DVO_H */
22740diff -urNp linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ivch.c 23965diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c
22741--- linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400 23966--- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400
22742+++ linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-20 15:58:47.058045612 -0400 23967+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c 2010-04-04 20:46:41.581454607 -0400
22743@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv 23968@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
22744 } 23969 }
22745 } 23970 }
@@ -22749,9 +23974,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.10/drive
22749 .init = ivch_init, 23974 .init = ivch_init,
22750 .dpms = ivch_dpms, 23975 .dpms = ivch_dpms,
22751 .save = ivch_save, 23976 .save = ivch_save,
22752diff -urNp linux-2.6.32.10/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.10/drivers/gpu/drm/i915/dvo_sil164.c 23977diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c
22753--- linux-2.6.32.10/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400 23978--- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400
22754+++ linux-2.6.32.10/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-20 15:58:47.058045612 -0400 23979+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c 2010-04-04 20:46:41.581454607 -0400
22755@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ 23980@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
22756 } 23981 }
22757 } 23982 }
@@ -22761,9 +23986,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.10/dri
22761 .init = sil164_init, 23986 .init = sil164_init,
22762 .detect = sil164_detect, 23987 .detect = sil164_detect,
22763 .mode_valid = sil164_mode_valid, 23988 .mode_valid = sil164_mode_valid,
22764diff -urNp linux-2.6.32.10/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.10/drivers/gpu/drm/i915/dvo_tfp410.c 23989diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c
22765--- linux-2.6.32.10/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400 23990--- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400
22766+++ linux-2.6.32.10/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-20 15:58:47.058045612 -0400 23991+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c 2010-04-04 20:46:41.581454607 -0400
22767@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ 23992@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
22768 } 23993 }
22769 } 23994 }
@@ -22773,9 +23998,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.10/dri
22773 .init = tfp410_init, 23998 .init = tfp410_init,
22774 .detect = tfp410_detect, 23999 .detect = tfp410_detect,
22775 .mode_valid = tfp410_mode_valid, 24000 .mode_valid = tfp410_mode_valid,
22776diff -urNp linux-2.6.32.10/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.10/drivers/gpu/drm/i915/i915_drv.c 24001diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c
22777--- linux-2.6.32.10/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400 24002--- linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400
22778+++ linux-2.6.32.10/drivers/gpu/drm/i915/i915_drv.c 2010-03-20 15:58:47.058045612 -0400 24003+++ linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c 2010-04-04 20:46:41.581454607 -0400
22779@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) 24004@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev)
22780 return i915_resume(dev); 24005 return i915_resume(dev);
22781 } 24006 }
@@ -22785,9 +24010,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.10/drive
22785 .fault = i915_gem_fault, 24010 .fault = i915_gem_fault,
22786 .open = drm_gem_vm_open, 24011 .open = drm_gem_vm_open,
22787 .close = drm_gem_vm_close, 24012 .close = drm_gem_vm_close,
22788diff -urNp linux-2.6.32.10/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.10/drivers/gpu/drm/radeon/mkregtable.c 24013diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c
22789--- linux-2.6.32.10/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400 24014--- linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400
22790+++ linux-2.6.32.10/drivers/gpu/drm/radeon/mkregtable.c 2010-03-20 15:58:47.058045612 -0400 24015+++ linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c 2010-04-04 20:46:41.581454607 -0400
22791@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 24016@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
22792 regex_t mask_rex; 24017 regex_t mask_rex;
22793 regmatch_t match[4]; 24018 regmatch_t match[4];
@@ -22805,9 +24030,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.10/d
22805 24030
22806 if (regcomp 24031 if (regcomp
22807 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { 24032 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
22808diff -urNp linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_atombios.c 24033diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c
22809--- linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400 24034--- linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400
22810+++ linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-20 15:58:47.058045612 -0400 24035+++ linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c 2010-04-04 20:46:41.581454607 -0400
22811@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o 24036@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o
22812 } 24037 }
22813 } 24038 }
@@ -22832,9 +24057,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32
22832 24057
22833 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); 24058 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
22834 24059
22835diff -urNp linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_state.c 24060diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_state.c
22836--- linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400 24061--- linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400
22837+++ linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_state.c 2010-03-20 15:58:47.058045612 -0400 24062+++ linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_state.c 2010-04-04 20:46:41.581454607 -0400
22838@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm 24063@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm
22839 { 24064 {
22840 drm_radeon_private_t *dev_priv = dev->dev_private; 24065 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -22844,9 +24069,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.10
22844 24069
22845 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); 24070 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
22846 24071
22847diff -urNp linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_ttm.c 24072diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c
22848--- linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400 24073--- linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400
22849+++ linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-20 15:58:47.058045612 -0400 24074+++ linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c 2010-04-04 20:46:41.581454607 -0400
22850@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic 24075@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
22851 DRM_INFO("radeon: ttm finalized\n"); 24076 DRM_INFO("radeon: ttm finalized\n");
22852 } 24077 }
@@ -22898,9 +24123,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.10/d
22898 } 24123 }
22899 24124
22900 24125
22901diff -urNp linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_bo.c 24126diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c
22902--- linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400 24127--- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400
22903+++ linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-20 15:58:47.058045612 -0400 24128+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c 2010-04-04 20:46:41.581454607 -0400
22904@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a 24129@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a
22905 NULL 24130 NULL
22906 }; 24131 };
@@ -22910,9 +24135,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.10/drivers/
22910 .show = &ttm_bo_global_show 24135 .show = &ttm_bo_global_show
22911 }; 24136 };
22912 24137
22913diff -urNp linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_bo_vm.c 24138diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c
22914--- linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400 24139--- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400
22915+++ linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-20 15:58:47.058045612 -0400 24140+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-04-04 20:46:41.585591308 -0400
22916@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are 24141@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
22917 { 24142 {
22918 struct ttm_buffer_object *bo = (struct ttm_buffer_object *) 24143 struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -22933,9 +24158,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.10/drive
22933 /* 24158 /*
22934 * Work around locking order reversal in fault / nopfn 24159 * Work around locking order reversal in fault / nopfn
22935 * between mmap_sem and bo_reserve: Perform a trylock operation 24160 * between mmap_sem and bo_reserve: Perform a trylock operation
22936diff -urNp linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_global.c 24161diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_global.c
22937--- linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400 24162--- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400
22938+++ linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_global.c 2010-03-20 15:58:47.058045612 -0400 24163+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_global.c 2010-04-04 20:46:41.585591308 -0400
22939@@ -36,7 +36,7 @@ 24164@@ -36,7 +36,7 @@
22940 struct ttm_global_item { 24165 struct ttm_global_item {
22941 struct mutex mutex; 24166 struct mutex mutex;
@@ -22993,9 +24218,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.10/driv
22993 ref->release(ref); 24218 ref->release(ref);
22994 item->object = NULL; 24219 item->object = NULL;
22995 } 24220 }
22996diff -urNp linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_memory.c 24221diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c
22997--- linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400 24222--- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400
22998+++ linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-20 15:58:47.062125591 -0400 24223+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c 2010-04-04 20:46:41.585591308 -0400
22999@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at 24224@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
23000 NULL 24225 NULL
23001 }; 24226 };
@@ -23005,9 +24230,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.10/driv
23005 .show = &ttm_mem_zone_show, 24230 .show = &ttm_mem_zone_show,
23006 .store = &ttm_mem_zone_store 24231 .store = &ttm_mem_zone_store
23007 }; 24232 };
23008diff -urNp linux-2.6.32.10/drivers/gpu/vga/vgaarb.c linux-2.6.32.10/drivers/gpu/vga/vgaarb.c 24233diff -urNp linux-2.6.32.11/drivers/gpu/vga/vgaarb.c linux-2.6.32.11/drivers/gpu/vga/vgaarb.c
23009--- linux-2.6.32.10/drivers/gpu/vga/vgaarb.c 2010-03-15 11:52:04.000000000 -0400 24234--- linux-2.6.32.11/drivers/gpu/vga/vgaarb.c 2010-03-15 11:52:04.000000000 -0400
23010+++ linux-2.6.32.10/drivers/gpu/vga/vgaarb.c 2010-03-20 15:58:47.062125591 -0400 24235+++ linux-2.6.32.11/drivers/gpu/vga/vgaarb.c 2010-04-04 20:46:41.585591308 -0400
23011@@ -961,7 +961,7 @@ static ssize_t vga_arb_write(struct file 24236@@ -961,7 +961,7 @@ static ssize_t vga_arb_write(struct file
23012 remaining -= 7; 24237 remaining -= 7;
23013 pr_devel("client 0x%p called 'target'\n", priv); 24238 pr_devel("client 0x%p called 'target'\n", priv);
@@ -23017,9 +24242,9 @@ diff -urNp linux-2.6.32.10/drivers/gpu/vga/vgaarb.c linux-2.6.32.10/drivers/gpu/
23017 pdev = pci_dev_get(vga_default_device()); 24242 pdev = pci_dev_get(vga_default_device());
23018 else { 24243 else {
23019 if (!vga_pci_str_to_vars(curr_pos, remaining, 24244 if (!vga_pci_str_to_vars(curr_pos, remaining,
23020diff -urNp linux-2.6.32.10/drivers/hwmon/k8temp.c linux-2.6.32.10/drivers/hwmon/k8temp.c 24245diff -urNp linux-2.6.32.11/drivers/hwmon/k8temp.c linux-2.6.32.11/drivers/hwmon/k8temp.c
23021--- linux-2.6.32.10/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400 24246--- linux-2.6.32.11/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400
23022+++ linux-2.6.32.10/drivers/hwmon/k8temp.c 2010-03-20 15:58:47.062125591 -0400 24247+++ linux-2.6.32.11/drivers/hwmon/k8temp.c 2010-04-04 20:46:41.585591308 -0400
23023@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n 24248@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
23024 24249
23025 static struct pci_device_id k8temp_ids[] = { 24250 static struct pci_device_id k8temp_ids[] = {
@@ -23029,9 +24254,9 @@ diff -urNp linux-2.6.32.10/drivers/hwmon/k8temp.c linux-2.6.32.10/drivers/hwmon/
23029 }; 24254 };
23030 24255
23031 MODULE_DEVICE_TABLE(pci, k8temp_ids); 24256 MODULE_DEVICE_TABLE(pci, k8temp_ids);
23032diff -urNp linux-2.6.32.10/drivers/hwmon/sis5595.c linux-2.6.32.10/drivers/hwmon/sis5595.c 24257diff -urNp linux-2.6.32.11/drivers/hwmon/sis5595.c linux-2.6.32.11/drivers/hwmon/sis5595.c
23033--- linux-2.6.32.10/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400 24258--- linux-2.6.32.11/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400
23034+++ linux-2.6.32.10/drivers/hwmon/sis5595.c 2010-03-20 15:58:47.062125591 -0400 24259+++ linux-2.6.32.11/drivers/hwmon/sis5595.c 2010-04-04 20:46:41.585591308 -0400
23035@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda 24260@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
23036 24261
23037 static struct pci_device_id sis5595_pci_ids[] = { 24262 static struct pci_device_id sis5595_pci_ids[] = {
@@ -23041,9 +24266,9 @@ diff -urNp linux-2.6.32.10/drivers/hwmon/sis5595.c linux-2.6.32.10/drivers/hwmon
23041 }; 24266 };
23042 24267
23043 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); 24268 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
23044diff -urNp linux-2.6.32.10/drivers/hwmon/via686a.c linux-2.6.32.10/drivers/hwmon/via686a.c 24269diff -urNp linux-2.6.32.11/drivers/hwmon/via686a.c linux-2.6.32.11/drivers/hwmon/via686a.c
23045--- linux-2.6.32.10/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400 24270--- linux-2.6.32.11/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400
23046+++ linux-2.6.32.10/drivers/hwmon/via686a.c 2010-03-20 15:58:47.062125591 -0400 24271+++ linux-2.6.32.11/drivers/hwmon/via686a.c 2010-04-04 20:46:41.585591308 -0400
23047@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda 24272@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
23048 24273
23049 static struct pci_device_id via686a_pci_ids[] = { 24274 static struct pci_device_id via686a_pci_ids[] = {
@@ -23053,9 +24278,9 @@ diff -urNp linux-2.6.32.10/drivers/hwmon/via686a.c linux-2.6.32.10/drivers/hwmon
23053 }; 24278 };
23054 24279
23055 MODULE_DEVICE_TABLE(pci, via686a_pci_ids); 24280 MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
23056diff -urNp linux-2.6.32.10/drivers/hwmon/vt8231.c linux-2.6.32.10/drivers/hwmon/vt8231.c 24281diff -urNp linux-2.6.32.11/drivers/hwmon/vt8231.c linux-2.6.32.11/drivers/hwmon/vt8231.c
23057--- linux-2.6.32.10/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400 24282--- linux-2.6.32.11/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400
23058+++ linux-2.6.32.10/drivers/hwmon/vt8231.c 2010-03-20 15:58:47.062125591 -0400 24283+++ linux-2.6.32.11/drivers/hwmon/vt8231.c 2010-04-04 20:46:41.585591308 -0400
23059@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri 24284@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
23060 24285
23061 static struct pci_device_id vt8231_pci_ids[] = { 24286 static struct pci_device_id vt8231_pci_ids[] = {
@@ -23065,9 +24290,9 @@ diff -urNp linux-2.6.32.10/drivers/hwmon/vt8231.c linux-2.6.32.10/drivers/hwmon/
23065 }; 24290 };
23066 24291
23067 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); 24292 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
23068diff -urNp linux-2.6.32.10/drivers/hwmon/w83791d.c linux-2.6.32.10/drivers/hwmon/w83791d.c 24293diff -urNp linux-2.6.32.11/drivers/hwmon/w83791d.c linux-2.6.32.11/drivers/hwmon/w83791d.c
23069--- linux-2.6.32.10/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400 24294--- linux-2.6.32.11/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400
23070+++ linux-2.6.32.10/drivers/hwmon/w83791d.c 2010-03-20 15:58:47.062125591 -0400 24295+++ linux-2.6.32.11/drivers/hwmon/w83791d.c 2010-04-04 20:46:41.585591308 -0400
23071@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli 24296@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
23072 struct i2c_board_info *info); 24297 struct i2c_board_info *info);
23073 static int w83791d_remove(struct i2c_client *client); 24298 static int w83791d_remove(struct i2c_client *client);
@@ -23079,10 +24304,10 @@ diff -urNp linux-2.6.32.10/drivers/hwmon/w83791d.c linux-2.6.32.10/drivers/hwmon
23079 static struct w83791d_data *w83791d_update_device(struct device *dev); 24304 static struct w83791d_data *w83791d_update_device(struct device *dev);
23080 24305
23081 #ifdef DEBUG 24306 #ifdef DEBUG
23082diff -urNp linux-2.6.32.10/drivers/i2c/busses/i2c-i801.c linux-2.6.32.10/drivers/i2c/busses/i2c-i801.c 24307diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c
23083--- linux-2.6.32.10/drivers/i2c/busses/i2c-i801.c 2010-03-15 11:52:04.000000000 -0400 24308--- linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c 2010-04-04 20:41:49.952923765 -0400
23084+++ linux-2.6.32.10/drivers/i2c/busses/i2c-i801.c 2010-03-20 15:58:47.062125591 -0400 24309+++ linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c 2010-04-04 20:46:41.585591308 -0400
23085@@ -578,7 +578,7 @@ static struct pci_device_id i801_ids[] = 24310@@ -580,7 +580,7 @@ static struct pci_device_id i801_ids[] =
23086 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) }, 24311 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
23087 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, 24312 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
23088 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, 24313 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
@@ -23091,9 +24316,9 @@ diff -urNp linux-2.6.32.10/drivers/i2c/busses/i2c-i801.c linux-2.6.32.10/drivers
23091 }; 24316 };
23092 24317
23093 MODULE_DEVICE_TABLE (pci, i801_ids); 24318 MODULE_DEVICE_TABLE (pci, i801_ids);
23094diff -urNp linux-2.6.32.10/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.10/drivers/i2c/busses/i2c-piix4.c 24319diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c
23095--- linux-2.6.32.10/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400 24320--- linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400
23096+++ linux-2.6.32.10/drivers/i2c/busses/i2c-piix4.c 2010-03-20 15:58:47.062125591 -0400 24321+++ linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c 2010-04-04 20:46:41.585591308 -0400
23097@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat 24322@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
23098 .ident = "IBM", 24323 .ident = "IBM",
23099 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, 24324 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -23112,9 +24337,9 @@ diff -urNp linux-2.6.32.10/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.10/driver
23112 }; 24337 };
23113 24338
23114 MODULE_DEVICE_TABLE (pci, piix4_ids); 24339 MODULE_DEVICE_TABLE (pci, piix4_ids);
23115diff -urNp linux-2.6.32.10/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.10/drivers/i2c/busses/i2c-sis630.c 24340diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c
23116--- linux-2.6.32.10/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400 24341--- linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400
23117+++ linux-2.6.32.10/drivers/i2c/busses/i2c-sis630.c 2010-03-20 15:58:47.062125591 -0400 24342+++ linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c 2010-04-04 20:46:41.585591308 -0400
23118@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter 24343@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
23119 static struct pci_device_id sis630_ids[] __devinitdata = { 24344 static struct pci_device_id sis630_ids[] __devinitdata = {
23120 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, 24345 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
@@ -23124,9 +24349,9 @@ diff -urNp linux-2.6.32.10/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.10/drive
23124 }; 24349 };
23125 24350
23126 MODULE_DEVICE_TABLE (pci, sis630_ids); 24351 MODULE_DEVICE_TABLE (pci, sis630_ids);
23127diff -urNp linux-2.6.32.10/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.10/drivers/i2c/busses/i2c-sis96x.c 24352diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c
23128--- linux-2.6.32.10/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400 24353--- linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400
23129+++ linux-2.6.32.10/drivers/i2c/busses/i2c-sis96x.c 2010-03-20 15:58:47.062125591 -0400 24354+++ linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c 2010-04-04 20:46:41.585591308 -0400
23130@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter 24355@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
23131 24356
23132 static struct pci_device_id sis96x_ids[] = { 24357 static struct pci_device_id sis96x_ids[] = {
@@ -23136,9 +24361,9 @@ diff -urNp linux-2.6.32.10/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.10/drive
23136 }; 24361 };
23137 24362
23138 MODULE_DEVICE_TABLE (pci, sis96x_ids); 24363 MODULE_DEVICE_TABLE (pci, sis96x_ids);
23139diff -urNp linux-2.6.32.10/drivers/ide/ide-cd.c linux-2.6.32.10/drivers/ide/ide-cd.c 24364diff -urNp linux-2.6.32.11/drivers/ide/ide-cd.c linux-2.6.32.11/drivers/ide/ide-cd.c
23140--- linux-2.6.32.10/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400 24365--- linux-2.6.32.11/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400
23141+++ linux-2.6.32.10/drivers/ide/ide-cd.c 2010-03-20 15:58:47.062125591 -0400 24366+++ linux-2.6.32.11/drivers/ide/ide-cd.c 2010-04-04 20:46:41.585591308 -0400
23142@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ 24367@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_
23143 alignment = queue_dma_alignment(q) | q->dma_pad_mask; 24368 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
23144 if ((unsigned long)buf & alignment 24369 if ((unsigned long)buf & alignment
@@ -23148,9 +24373,9 @@ diff -urNp linux-2.6.32.10/drivers/ide/ide-cd.c linux-2.6.32.10/drivers/ide/ide-
23148 drive->dma = 0; 24373 drive->dma = 0;
23149 } 24374 }
23150 } 24375 }
23151diff -urNp linux-2.6.32.10/drivers/ieee1394/dv1394.c linux-2.6.32.10/drivers/ieee1394/dv1394.c 24376diff -urNp linux-2.6.32.11/drivers/ieee1394/dv1394.c linux-2.6.32.11/drivers/ieee1394/dv1394.c
23152--- linux-2.6.32.10/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400 24377--- linux-2.6.32.11/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400
23153+++ linux-2.6.32.10/drivers/ieee1394/dv1394.c 2010-03-20 15:58:47.062125591 -0400 24378+++ linux-2.6.32.11/drivers/ieee1394/dv1394.c 2010-04-04 20:46:41.585591308 -0400
23154@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c 24379@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
23155 based upon DIF section and sequence 24380 based upon DIF section and sequence
23156 */ 24381 */
@@ -23169,9 +24394,9 @@ diff -urNp linux-2.6.32.10/drivers/ieee1394/dv1394.c linux-2.6.32.10/drivers/iee
23169 }; 24394 };
23170 24395
23171 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); 24396 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
23172diff -urNp linux-2.6.32.10/drivers/ieee1394/eth1394.c linux-2.6.32.10/drivers/ieee1394/eth1394.c 24397diff -urNp linux-2.6.32.11/drivers/ieee1394/eth1394.c linux-2.6.32.11/drivers/ieee1394/eth1394.c
23173--- linux-2.6.32.10/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400 24398--- linux-2.6.32.11/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400
23174+++ linux-2.6.32.10/drivers/ieee1394/eth1394.c 2010-03-20 15:58:47.062125591 -0400 24399+++ linux-2.6.32.11/drivers/ieee1394/eth1394.c 2010-04-04 20:46:41.585591308 -0400
23175@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e 24400@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
23176 .specifier_id = ETHER1394_GASP_SPECIFIER_ID, 24401 .specifier_id = ETHER1394_GASP_SPECIFIER_ID,
23177 .version = ETHER1394_GASP_VERSION, 24402 .version = ETHER1394_GASP_VERSION,
@@ -23181,9 +24406,9 @@ diff -urNp linux-2.6.32.10/drivers/ieee1394/eth1394.c linux-2.6.32.10/drivers/ie
23181 }; 24406 };
23182 24407
23183 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); 24408 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
23184diff -urNp linux-2.6.32.10/drivers/ieee1394/hosts.c linux-2.6.32.10/drivers/ieee1394/hosts.c 24409diff -urNp linux-2.6.32.11/drivers/ieee1394/hosts.c linux-2.6.32.11/drivers/ieee1394/hosts.c
23185--- linux-2.6.32.10/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400 24410--- linux-2.6.32.11/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400
23186+++ linux-2.6.32.10/drivers/ieee1394/hosts.c 2010-03-20 15:58:47.062125591 -0400 24411+++ linux-2.6.32.11/drivers/ieee1394/hosts.c 2010-04-04 20:46:41.589782410 -0400
23187@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso 24412@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
23188 } 24413 }
23189 24414
@@ -23192,9 +24417,9 @@ diff -urNp linux-2.6.32.10/drivers/ieee1394/hosts.c linux-2.6.32.10/drivers/ieee
23192 .transmit_packet = dummy_transmit_packet, 24417 .transmit_packet = dummy_transmit_packet,
23193 .devctl = dummy_devctl, 24418 .devctl = dummy_devctl,
23194 .isoctl = dummy_isoctl 24419 .isoctl = dummy_isoctl
23195diff -urNp linux-2.6.32.10/drivers/ieee1394/ohci1394.c linux-2.6.32.10/drivers/ieee1394/ohci1394.c 24420diff -urNp linux-2.6.32.11/drivers/ieee1394/ohci1394.c linux-2.6.32.11/drivers/ieee1394/ohci1394.c
23196--- linux-2.6.32.10/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400 24421--- linux-2.6.32.11/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400
23197+++ linux-2.6.32.10/drivers/ieee1394/ohci1394.c 2010-03-20 15:58:47.062125591 -0400 24422+++ linux-2.6.32.11/drivers/ieee1394/ohci1394.c 2010-04-04 20:46:41.589782410 -0400
23198@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ 24423@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
23199 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) 24424 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
23200 24425
@@ -23216,9 +24441,9 @@ diff -urNp linux-2.6.32.10/drivers/ieee1394/ohci1394.c linux-2.6.32.10/drivers/i
23216 }; 24441 };
23217 24442
23218 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); 24443 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
23219diff -urNp linux-2.6.32.10/drivers/ieee1394/raw1394.c linux-2.6.32.10/drivers/ieee1394/raw1394.c 24444diff -urNp linux-2.6.32.11/drivers/ieee1394/raw1394.c linux-2.6.32.11/drivers/ieee1394/raw1394.c
23220--- linux-2.6.32.10/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400 24445--- linux-2.6.32.11/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400
23221+++ linux-2.6.32.10/drivers/ieee1394/raw1394.c 2010-03-20 15:58:47.066062568 -0400 24446+++ linux-2.6.32.11/drivers/ieee1394/raw1394.c 2010-04-04 20:46:41.589782410 -0400
23222@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r 24447@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
23223 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 24448 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
23224 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 24449 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -23228,9 +24453,9 @@ diff -urNp linux-2.6.32.10/drivers/ieee1394/raw1394.c linux-2.6.32.10/drivers/ie
23228 }; 24453 };
23229 24454
23230 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); 24455 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
23231diff -urNp linux-2.6.32.10/drivers/ieee1394/sbp2.c linux-2.6.32.10/drivers/ieee1394/sbp2.c 24456diff -urNp linux-2.6.32.11/drivers/ieee1394/sbp2.c linux-2.6.32.11/drivers/ieee1394/sbp2.c
23232--- linux-2.6.32.10/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400 24457--- linux-2.6.32.11/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400
23233+++ linux-2.6.32.10/drivers/ieee1394/sbp2.c 2010-03-20 15:58:47.066062568 -0400 24458+++ linux-2.6.32.11/drivers/ieee1394/sbp2.c 2010-04-04 20:46:41.589782410 -0400
23234@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s 24459@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s
23235 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 24460 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
23236 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, 24461 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -23249,9 +24474,9 @@ diff -urNp linux-2.6.32.10/drivers/ieee1394/sbp2.c linux-2.6.32.10/drivers/ieee1
23249 { 24474 {
23250 int ret; 24475 int ret;
23251 24476
23252diff -urNp linux-2.6.32.10/drivers/ieee1394/video1394.c linux-2.6.32.10/drivers/ieee1394/video1394.c 24477diff -urNp linux-2.6.32.11/drivers/ieee1394/video1394.c linux-2.6.32.11/drivers/ieee1394/video1394.c
23253--- linux-2.6.32.10/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400 24478--- linux-2.6.32.11/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400
23254+++ linux-2.6.32.10/drivers/ieee1394/video1394.c 2010-03-20 15:58:47.066062568 -0400 24479+++ linux-2.6.32.11/drivers/ieee1394/video1394.c 2010-04-04 20:46:41.589782410 -0400
23255@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v 24480@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
23256 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 24481 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
23257 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff 24482 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
@@ -23261,9 +24486,9 @@ diff -urNp linux-2.6.32.10/drivers/ieee1394/video1394.c linux-2.6.32.10/drivers/
23261 }; 24486 };
23262 24487
23263 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); 24488 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
23264diff -urNp linux-2.6.32.10/drivers/infiniband/core/cm.c linux-2.6.32.10/drivers/infiniband/core/cm.c 24489diff -urNp linux-2.6.32.11/drivers/infiniband/core/cm.c linux-2.6.32.11/drivers/infiniband/core/cm.c
23265--- linux-2.6.32.10/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400 24490--- linux-2.6.32.11/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400
23266+++ linux-2.6.32.10/drivers/infiniband/core/cm.c 2010-03-20 15:58:47.066062568 -0400 24491+++ linux-2.6.32.11/drivers/infiniband/core/cm.c 2010-04-04 20:46:41.589782410 -0400
23267@@ -112,7 +112,7 @@ static char const counter_group_names[CM 24492@@ -112,7 +112,7 @@ static char const counter_group_names[CM
23268 24493
23269 struct cm_counter_group { 24494 struct cm_counter_group {
@@ -23407,9 +24632,9 @@ diff -urNp linux-2.6.32.10/drivers/infiniband/core/cm.c linux-2.6.32.10/drivers/
23407 .show = cm_show_counter 24632 .show = cm_show_counter
23408 }; 24633 };
23409 24634
23410diff -urNp linux-2.6.32.10/drivers/infiniband/core/sysfs.c linux-2.6.32.10/drivers/infiniband/core/sysfs.c 24635diff -urNp linux-2.6.32.11/drivers/infiniband/core/sysfs.c linux-2.6.32.11/drivers/infiniband/core/sysfs.c
23411--- linux-2.6.32.10/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400 24636--- linux-2.6.32.11/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400
23412+++ linux-2.6.32.10/drivers/infiniband/core/sysfs.c 2010-03-20 15:58:47.066062568 -0400 24637+++ linux-2.6.32.11/drivers/infiniband/core/sysfs.c 2010-04-04 20:46:41.589782410 -0400
23413@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob 24638@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
23414 return port_attr->show(p, port_attr, buf); 24639 return port_attr->show(p, port_attr, buf);
23415 } 24640 }
@@ -23419,9 +24644,9 @@ diff -urNp linux-2.6.32.10/drivers/infiniband/core/sysfs.c linux-2.6.32.10/drive
23419 .show = port_attr_show 24644 .show = port_attr_show
23420 }; 24645 };
23421 24646
23422diff -urNp linux-2.6.32.10/drivers/input/keyboard/atkbd.c linux-2.6.32.10/drivers/input/keyboard/atkbd.c 24647diff -urNp linux-2.6.32.11/drivers/input/keyboard/atkbd.c linux-2.6.32.11/drivers/input/keyboard/atkbd.c
23423--- linux-2.6.32.10/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400 24648--- linux-2.6.32.11/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400
23424+++ linux-2.6.32.10/drivers/input/keyboard/atkbd.c 2010-03-20 15:58:47.066062568 -0400 24649+++ linux-2.6.32.11/drivers/input/keyboard/atkbd.c 2010-04-04 20:46:41.589782410 -0400
23425@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri 24650@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
23426 .id = SERIO_ANY, 24651 .id = SERIO_ANY,
23427 .extra = SERIO_ANY, 24652 .extra = SERIO_ANY,
@@ -23431,9 +24656,9 @@ diff -urNp linux-2.6.32.10/drivers/input/keyboard/atkbd.c linux-2.6.32.10/driver
23431 }; 24656 };
23432 24657
23433 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); 24658 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
23434diff -urNp linux-2.6.32.10/drivers/input/mouse/lifebook.c linux-2.6.32.10/drivers/input/mouse/lifebook.c 24659diff -urNp linux-2.6.32.11/drivers/input/mouse/lifebook.c linux-2.6.32.11/drivers/input/mouse/lifebook.c
23435--- linux-2.6.32.10/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400 24660--- linux-2.6.32.11/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400
23436+++ linux-2.6.32.10/drivers/input/mouse/lifebook.c 2010-03-20 15:58:47.066062568 -0400 24661+++ linux-2.6.32.11/drivers/input/mouse/lifebook.c 2010-04-04 20:46:41.589782410 -0400
23437@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo 24662@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
23438 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), 24663 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
23439 }, 24664 },
@@ -23443,9 +24668,9 @@ diff -urNp linux-2.6.32.10/drivers/input/mouse/lifebook.c linux-2.6.32.10/driver
23443 }; 24668 };
23444 24669
23445 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) 24670 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
23446diff -urNp linux-2.6.32.10/drivers/input/mouse/psmouse-base.c linux-2.6.32.10/drivers/input/mouse/psmouse-base.c 24671diff -urNp linux-2.6.32.11/drivers/input/mouse/psmouse-base.c linux-2.6.32.11/drivers/input/mouse/psmouse-base.c
23447--- linux-2.6.32.10/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400 24672--- linux-2.6.32.11/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400
23448+++ linux-2.6.32.10/drivers/input/mouse/psmouse-base.c 2010-03-20 15:58:47.066062568 -0400 24673+++ linux-2.6.32.11/drivers/input/mouse/psmouse-base.c 2010-04-04 20:46:41.593451026 -0400
23449@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se 24674@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se
23450 .id = SERIO_ANY, 24675 .id = SERIO_ANY,
23451 .extra = SERIO_ANY, 24676 .extra = SERIO_ANY,
@@ -23455,9 +24680,9 @@ diff -urNp linux-2.6.32.10/drivers/input/mouse/psmouse-base.c linux-2.6.32.10/dr
23455 }; 24680 };
23456 24681
23457 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); 24682 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
23458diff -urNp linux-2.6.32.10/drivers/input/mouse/synaptics.c linux-2.6.32.10/drivers/input/mouse/synaptics.c 24683diff -urNp linux-2.6.32.11/drivers/input/mouse/synaptics.c linux-2.6.32.11/drivers/input/mouse/synaptics.c
23459--- linux-2.6.32.10/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400 24684--- linux-2.6.32.11/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400
23460+++ linux-2.6.32.10/drivers/input/mouse/synaptics.c 2010-03-20 15:58:47.066062568 -0400 24685+++ linux-2.6.32.11/drivers/input/mouse/synaptics.c 2010-04-04 20:46:41.593451026 -0400
23461@@ -437,7 +437,7 @@ static void synaptics_process_packet(str 24686@@ -437,7 +437,7 @@ static void synaptics_process_packet(str
23462 break; 24687 break;
23463 case 2: 24688 case 2:
@@ -23486,9 +24711,9 @@ diff -urNp linux-2.6.32.10/drivers/input/mouse/synaptics.c linux-2.6.32.10/drive
23486 }; 24711 };
23487 #endif 24712 #endif
23488 24713
23489diff -urNp linux-2.6.32.10/drivers/input/mousedev.c linux-2.6.32.10/drivers/input/mousedev.c 24714diff -urNp linux-2.6.32.11/drivers/input/mousedev.c linux-2.6.32.11/drivers/input/mousedev.c
23490--- linux-2.6.32.10/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400 24715--- linux-2.6.32.11/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400
23491+++ linux-2.6.32.10/drivers/input/mousedev.c 2010-03-20 15:58:47.066062568 -0400 24716+++ linux-2.6.32.11/drivers/input/mousedev.c 2010-04-04 20:46:41.593451026 -0400
23492@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han 24717@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
23493 24718
23494 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX 24719 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -23498,9 +24723,9 @@ diff -urNp linux-2.6.32.10/drivers/input/mousedev.c linux-2.6.32.10/drivers/inpu
23498 }; 24723 };
23499 static int psaux_registered; 24724 static int psaux_registered;
23500 #endif 24725 #endif
23501diff -urNp linux-2.6.32.10/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.10/drivers/input/serio/i8042-x86ia64io.h 24726diff -urNp linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h
23502--- linux-2.6.32.10/drivers/input/serio/i8042-x86ia64io.h 2010-03-15 11:52:04.000000000 -0400 24727--- linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400
23503+++ linux-2.6.32.10/drivers/input/serio/i8042-x86ia64io.h 2010-03-20 15:58:47.066062568 -0400 24728+++ linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:46:41.593451026 -0400
23504@@ -172,7 +172,7 @@ static const struct dmi_system_id __init 24729@@ -172,7 +172,7 @@ static const struct dmi_system_id __init
23505 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), 24730 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
23506 }, 24731 },
@@ -23519,7 +24744,7 @@ diff -urNp linux-2.6.32.10/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.10
23519 }; 24744 };
23520 24745
23521 static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = { 24746 static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
23522@@ -469,7 +469,7 @@ static const struct dmi_system_id __init 24747@@ -476,7 +476,7 @@ static const struct dmi_system_id __init
23523 DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"), 24748 DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"),
23524 }, 24749 },
23525 }, 24750 },
@@ -23528,7 +24753,7 @@ diff -urNp linux-2.6.32.10/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.10
23528 }; 24753 };
23529 24754
23530 #ifdef CONFIG_PNP 24755 #ifdef CONFIG_PNP
23531@@ -488,7 +488,7 @@ static const struct dmi_system_id __init 24756@@ -495,7 +495,7 @@ static const struct dmi_system_id __init
23532 DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), 24757 DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
23533 }, 24758 },
23534 }, 24759 },
@@ -23537,7 +24762,7 @@ diff -urNp linux-2.6.32.10/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.10
23537 }; 24762 };
23538 24763
23539 static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = { 24764 static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = {
23540@@ -512,7 +512,7 @@ static const struct dmi_system_id __init 24765@@ -519,7 +519,7 @@ static const struct dmi_system_id __init
23541 DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */ 24766 DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */
23542 }, 24767 },
23543 }, 24768 },
@@ -23546,7 +24771,7 @@ diff -urNp linux-2.6.32.10/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.10
23546 }; 24771 };
23547 #endif 24772 #endif
23548 24773
23549@@ -586,7 +586,7 @@ static const struct dmi_system_id __init 24774@@ -593,7 +593,7 @@ static const struct dmi_system_id __init
23550 DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"), 24775 DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"),
23551 }, 24776 },
23552 }, 24777 },
@@ -23555,9 +24780,9 @@ diff -urNp linux-2.6.32.10/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.10
23555 }; 24780 };
23556 24781
23557 #endif /* CONFIG_X86 */ 24782 #endif /* CONFIG_X86 */
23558diff -urNp linux-2.6.32.10/drivers/input/serio/serio_raw.c linux-2.6.32.10/drivers/input/serio/serio_raw.c 24783diff -urNp linux-2.6.32.11/drivers/input/serio/serio_raw.c linux-2.6.32.11/drivers/input/serio/serio_raw.c
23559--- linux-2.6.32.10/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400 24784--- linux-2.6.32.11/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400
23560+++ linux-2.6.32.10/drivers/input/serio/serio_raw.c 2010-03-20 15:58:47.066062568 -0400 24785+++ linux-2.6.32.11/drivers/input/serio/serio_raw.c 2010-04-04 20:46:41.593451026 -0400
23561@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ 24786@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
23562 .id = SERIO_ANY, 24787 .id = SERIO_ANY,
23563 .extra = SERIO_ANY, 24788 .extra = SERIO_ANY,
@@ -23567,9 +24792,9 @@ diff -urNp linux-2.6.32.10/drivers/input/serio/serio_raw.c linux-2.6.32.10/drive
23567 }; 24792 };
23568 24793
23569 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); 24794 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
23570diff -urNp linux-2.6.32.10/drivers/isdn/gigaset/common.c linux-2.6.32.10/drivers/isdn/gigaset/common.c 24795diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/common.c linux-2.6.32.11/drivers/isdn/gigaset/common.c
23571--- linux-2.6.32.10/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400 24796--- linux-2.6.32.11/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400
23572+++ linux-2.6.32.10/drivers/isdn/gigaset/common.c 2010-03-20 15:58:47.070072193 -0400 24797+++ linux-2.6.32.11/drivers/isdn/gigaset/common.c 2010-04-04 20:46:41.593451026 -0400
23573@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct 24798@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
23574 cs->commands_pending = 0; 24799 cs->commands_pending = 0;
23575 cs->cur_at_seq = 0; 24800 cs->cur_at_seq = 0;
@@ -23579,9 +24804,9 @@ diff -urNp linux-2.6.32.10/drivers/isdn/gigaset/common.c linux-2.6.32.10/drivers
23579 cs->dev = NULL; 24804 cs->dev = NULL;
23580 cs->tty = NULL; 24805 cs->tty = NULL;
23581 cs->tty_dev = NULL; 24806 cs->tty_dev = NULL;
23582diff -urNp linux-2.6.32.10/drivers/isdn/gigaset/gigaset.h linux-2.6.32.10/drivers/isdn/gigaset/gigaset.h 24807diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h
23583--- linux-2.6.32.10/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400 24808--- linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400
23584+++ linux-2.6.32.10/drivers/isdn/gigaset/gigaset.h 2010-03-20 15:58:47.070072193 -0400 24809+++ linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h 2010-04-04 20:46:41.593451026 -0400
23585@@ -446,7 +446,7 @@ struct cardstate { 24810@@ -446,7 +446,7 @@ struct cardstate {
23586 spinlock_t cmdlock; 24811 spinlock_t cmdlock;
23587 unsigned curlen, cmdbytes; 24812 unsigned curlen, cmdbytes;
@@ -23591,9 +24816,9 @@ diff -urNp linux-2.6.32.10/drivers/isdn/gigaset/gigaset.h linux-2.6.32.10/driver
23591 struct tty_struct *tty; 24816 struct tty_struct *tty;
23592 struct tasklet_struct if_wake_tasklet; 24817 struct tasklet_struct if_wake_tasklet;
23593 unsigned control_state; 24818 unsigned control_state;
23594diff -urNp linux-2.6.32.10/drivers/isdn/gigaset/interface.c linux-2.6.32.10/drivers/isdn/gigaset/interface.c 24819diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/interface.c linux-2.6.32.11/drivers/isdn/gigaset/interface.c
23595--- linux-2.6.32.10/drivers/isdn/gigaset/interface.c 2010-03-15 11:52:04.000000000 -0400 24820--- linux-2.6.32.11/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400
23596+++ linux-2.6.32.10/drivers/isdn/gigaset/interface.c 2010-03-20 15:58:47.070072193 -0400 24821+++ linux-2.6.32.11/drivers/isdn/gigaset/interface.c 2010-04-04 20:46:41.593451026 -0400
23597@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt 24822@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
23598 return -ERESTARTSYS; // FIXME -EINTR? 24823 return -ERESTARTSYS; // FIXME -EINTR?
23599 tty->driver_data = cs; 24824 tty->driver_data = cs;
@@ -23681,9 +24906,9 @@ diff -urNp linux-2.6.32.10/drivers/isdn/gigaset/interface.c linux-2.6.32.10/driv
23681 dev_warn(cs->dev, "%s: device not opened\n", __func__); 24906 dev_warn(cs->dev, "%s: device not opened\n", __func__);
23682 goto out; 24907 goto out;
23683 } 24908 }
23684diff -urNp linux-2.6.32.10/drivers/isdn/hardware/avm/b1.c linux-2.6.32.10/drivers/isdn/hardware/avm/b1.c 24909diff -urNp linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c
23685--- linux-2.6.32.10/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400 24910--- linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400
23686+++ linux-2.6.32.10/drivers/isdn/hardware/avm/b1.c 2010-03-20 15:58:47.070072193 -0400 24911+++ linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c 2010-04-04 20:46:41.593451026 -0400
23687@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo 24912@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
23688 } 24913 }
23689 if (left) { 24914 if (left) {
@@ -23702,9 +24927,9 @@ diff -urNp linux-2.6.32.10/drivers/isdn/hardware/avm/b1.c linux-2.6.32.10/driver
23702 return -EFAULT; 24927 return -EFAULT;
23703 } else { 24928 } else {
23704 memcpy(buf, dp, left); 24929 memcpy(buf, dp, left);
23705diff -urNp linux-2.6.32.10/drivers/isdn/icn/icn.c linux-2.6.32.10/drivers/isdn/icn/icn.c 24930diff -urNp linux-2.6.32.11/drivers/isdn/icn/icn.c linux-2.6.32.11/drivers/isdn/icn/icn.c
23706--- linux-2.6.32.10/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400 24931--- linux-2.6.32.11/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400
23707+++ linux-2.6.32.10/drivers/isdn/icn/icn.c 2010-03-20 15:58:47.070072193 -0400 24932+++ linux-2.6.32.11/drivers/isdn/icn/icn.c 2010-04-04 20:46:41.593451026 -0400
23708@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len 24933@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
23709 if (count > len) 24934 if (count > len)
23710 count = len; 24935 count = len;
@@ -23714,9 +24939,9 @@ diff -urNp linux-2.6.32.10/drivers/isdn/icn/icn.c linux-2.6.32.10/drivers/isdn/i
23714 return -EFAULT; 24939 return -EFAULT;
23715 } else 24940 } else
23716 memcpy(msg, buf, count); 24941 memcpy(msg, buf, count);
23717diff -urNp linux-2.6.32.10/drivers/lguest/core.c linux-2.6.32.10/drivers/lguest/core.c 24942diff -urNp linux-2.6.32.11/drivers/lguest/core.c linux-2.6.32.11/drivers/lguest/core.c
23718--- linux-2.6.32.10/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400 24943--- linux-2.6.32.11/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400
23719+++ linux-2.6.32.10/drivers/lguest/core.c 2010-03-20 15:58:47.070072193 -0400 24944+++ linux-2.6.32.11/drivers/lguest/core.c 2010-04-04 20:46:41.593451026 -0400
23720@@ -91,9 +91,17 @@ static __init int map_switcher(void) 24945@@ -91,9 +91,17 @@ static __init int map_switcher(void)
23721 * it's worked so far. The end address needs +1 because __get_vm_area 24946 * it's worked so far. The end address needs +1 because __get_vm_area
23722 * allocates an extra guard page, so we need space for that. 24947 * allocates an extra guard page, so we need space for that.
@@ -23735,9 +24960,9 @@ diff -urNp linux-2.6.32.10/drivers/lguest/core.c linux-2.6.32.10/drivers/lguest/
23735 if (!switcher_vma) { 24960 if (!switcher_vma) {
23736 err = -ENOMEM; 24961 err = -ENOMEM;
23737 printk("lguest: could not map switcher pages high\n"); 24962 printk("lguest: could not map switcher pages high\n");
23738diff -urNp linux-2.6.32.10/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.10/drivers/macintosh/via-pmu-backlight.c 24963diff -urNp linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c
23739--- linux-2.6.32.10/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400 24964--- linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400
23740+++ linux-2.6.32.10/drivers/macintosh/via-pmu-backlight.c 2010-03-20 15:58:47.070072193 -0400 24965+++ linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c 2010-04-04 20:46:41.593451026 -0400
23741@@ -15,7 +15,7 @@ 24966@@ -15,7 +15,7 @@
23742 24967
23743 #define MAX_PMU_LEVEL 0xFF 24968 #define MAX_PMU_LEVEL 0xFF
@@ -23756,9 +24981,9 @@ diff -urNp linux-2.6.32.10/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.10
23756 .get_brightness = pmu_backlight_get_brightness, 24981 .get_brightness = pmu_backlight_get_brightness,
23757 .update_status = pmu_backlight_update_status, 24982 .update_status = pmu_backlight_update_status,
23758 24983
23759diff -urNp linux-2.6.32.10/drivers/macintosh/via-pmu.c linux-2.6.32.10/drivers/macintosh/via-pmu.c 24984diff -urNp linux-2.6.32.11/drivers/macintosh/via-pmu.c linux-2.6.32.11/drivers/macintosh/via-pmu.c
23760--- linux-2.6.32.10/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400 24985--- linux-2.6.32.11/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400
23761+++ linux-2.6.32.10/drivers/macintosh/via-pmu.c 2010-03-20 15:58:47.070072193 -0400 24986+++ linux-2.6.32.11/drivers/macintosh/via-pmu.c 2010-04-04 20:46:41.593451026 -0400
23762@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state 24987@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
23763 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); 24988 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
23764 } 24989 }
@@ -23768,9 +24993,9 @@ diff -urNp linux-2.6.32.10/drivers/macintosh/via-pmu.c linux-2.6.32.10/drivers/m
23768 .enter = powerbook_sleep, 24993 .enter = powerbook_sleep,
23769 .valid = pmu_sleep_valid, 24994 .valid = pmu_sleep_valid,
23770 }; 24995 };
23771diff -urNp linux-2.6.32.10/drivers/md/bitmap.c linux-2.6.32.10/drivers/md/bitmap.c 24996diff -urNp linux-2.6.32.11/drivers/md/bitmap.c linux-2.6.32.11/drivers/md/bitmap.c
23772--- linux-2.6.32.10/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400 24997--- linux-2.6.32.11/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400
23773+++ linux-2.6.32.10/drivers/md/bitmap.c 2010-03-20 15:58:47.070072193 -0400 24998+++ linux-2.6.32.11/drivers/md/bitmap.c 2010-04-04 20:46:41.593451026 -0400
23774@@ -58,7 +58,7 @@ 24999@@ -58,7 +58,7 @@
23775 # if DEBUG > 0 25000 # if DEBUG > 0
23776 # define PRINTK(x...) printk(KERN_DEBUG x) 25001 # define PRINTK(x...) printk(KERN_DEBUG x)
@@ -23780,9 +25005,9 @@ diff -urNp linux-2.6.32.10/drivers/md/bitmap.c linux-2.6.32.10/drivers/md/bitmap
23780 # endif 25005 # endif
23781 #endif 25006 #endif
23782 25007
23783diff -urNp linux-2.6.32.10/drivers/md/dm-sysfs.c linux-2.6.32.10/drivers/md/dm-sysfs.c 25008diff -urNp linux-2.6.32.11/drivers/md/dm-sysfs.c linux-2.6.32.11/drivers/md/dm-sysfs.c
23784--- linux-2.6.32.10/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400 25009--- linux-2.6.32.11/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400
23785+++ linux-2.6.32.10/drivers/md/dm-sysfs.c 2010-03-20 15:58:47.070072193 -0400 25010+++ linux-2.6.32.11/drivers/md/dm-sysfs.c 2010-04-04 20:46:41.593451026 -0400
23786@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { 25011@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
23787 NULL, 25012 NULL,
23788 }; 25013 };
@@ -23792,9 +25017,9 @@ diff -urNp linux-2.6.32.10/drivers/md/dm-sysfs.c linux-2.6.32.10/drivers/md/dm-s
23792 .show = dm_attr_show, 25017 .show = dm_attr_show,
23793 }; 25018 };
23794 25019
23795diff -urNp linux-2.6.32.10/drivers/md/dm-table.c linux-2.6.32.10/drivers/md/dm-table.c 25020diff -urNp linux-2.6.32.11/drivers/md/dm-table.c linux-2.6.32.11/drivers/md/dm-table.c
23796--- linux-2.6.32.10/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400 25021--- linux-2.6.32.11/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400
23797+++ linux-2.6.32.10/drivers/md/dm-table.c 2010-03-20 15:58:47.070072193 -0400 25022+++ linux-2.6.32.11/drivers/md/dm-table.c 2010-04-04 20:46:41.593451026 -0400
23798@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct 25023@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
23799 if (!dev_size) 25024 if (!dev_size)
23800 return 0; 25025 return 0;
@@ -23804,9 +25029,9 @@ diff -urNp linux-2.6.32.10/drivers/md/dm-table.c linux-2.6.32.10/drivers/md/dm-t
23804 DMWARN("%s: %s too small for target: " 25029 DMWARN("%s: %s too small for target: "
23805 "start=%llu, len=%llu, dev_size=%llu", 25030 "start=%llu, len=%llu, dev_size=%llu",
23806 dm_device_name(ti->table->md), bdevname(bdev, b), 25031 dm_device_name(ti->table->md), bdevname(bdev, b),
23807diff -urNp linux-2.6.32.10/drivers/md/md.c linux-2.6.32.10/drivers/md/md.c 25032diff -urNp linux-2.6.32.11/drivers/md/md.c linux-2.6.32.11/drivers/md/md.c
23808--- linux-2.6.32.10/drivers/md/md.c 2010-03-15 11:52:04.000000000 -0400 25033--- linux-2.6.32.11/drivers/md/md.c 2010-03-15 11:52:04.000000000 -0400
23809+++ linux-2.6.32.10/drivers/md/md.c 2010-03-20 15:58:47.070072193 -0400 25034+++ linux-2.6.32.11/drivers/md/md.c 2010-04-04 20:46:41.597784214 -0400
23810@@ -2508,7 +2508,7 @@ static void rdev_free(struct kobject *ko 25035@@ -2508,7 +2508,7 @@ static void rdev_free(struct kobject *ko
23811 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); 25036 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
23812 kfree(rdev); 25037 kfree(rdev);
@@ -23843,9 +25068,9 @@ diff -urNp linux-2.6.32.10/drivers/md/md.c linux-2.6.32.10/drivers/md/md.c
23843 /* sync IO will cause sync_io to increase before the disk_stats 25068 /* sync IO will cause sync_io to increase before the disk_stats
23844 * as sync_io is counted when a request starts, and 25069 * as sync_io is counted when a request starts, and
23845 * disk_stats is counted when it completes. 25070 * disk_stats is counted when it completes.
23846diff -urNp linux-2.6.32.10/drivers/md/md.h linux-2.6.32.10/drivers/md/md.h 25071diff -urNp linux-2.6.32.11/drivers/md/md.h linux-2.6.32.11/drivers/md/md.h
23847--- linux-2.6.32.10/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400 25072--- linux-2.6.32.11/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400
23848+++ linux-2.6.32.10/drivers/md/md.h 2010-03-20 15:58:47.074047893 -0400 25073+++ linux-2.6.32.11/drivers/md/md.h 2010-04-04 20:46:41.597784214 -0400
23849@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ 25074@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
23850 25075
23851 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) 25076 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
@@ -23855,9 +25080,9 @@ diff -urNp linux-2.6.32.10/drivers/md/md.h linux-2.6.32.10/drivers/md/md.h
23855 } 25080 }
23856 25081
23857 struct mdk_personality 25082 struct mdk_personality
23858diff -urNp linux-2.6.32.10/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.10/drivers/media/dvb/dvb-core/dvbdev.c 25083diff -urNp linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c
23859--- linux-2.6.32.10/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400 25084--- linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400
23860+++ linux-2.6.32.10/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-20 15:58:47.074047893 -0400 25085+++ linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c 2010-04-04 20:46:41.597784214 -0400
23861@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt 25086@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
23862 const struct dvb_device *template, void *priv, int type) 25087 const struct dvb_device *template, void *priv, int type)
23863 { 25088 {
@@ -23866,9 +25091,9 @@ diff -urNp linux-2.6.32.10/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.10/d
23866 struct file_operations *dvbdevfops; 25091 struct file_operations *dvbdevfops;
23867 struct device *clsdev; 25092 struct device *clsdev;
23868 int minor; 25093 int minor;
23869diff -urNp linux-2.6.32.10/drivers/media/radio/radio-cadet.c linux-2.6.32.10/drivers/media/radio/radio-cadet.c 25094diff -urNp linux-2.6.32.11/drivers/media/radio/radio-cadet.c linux-2.6.32.11/drivers/media/radio/radio-cadet.c
23870--- linux-2.6.32.10/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400 25095--- linux-2.6.32.11/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400
23871+++ linux-2.6.32.10/drivers/media/radio/radio-cadet.c 2010-03-20 15:58:47.074047893 -0400 25096+++ linux-2.6.32.11/drivers/media/radio/radio-cadet.c 2010-04-04 20:46:41.597784214 -0400
23872@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f 25097@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
23873 while (i < count && dev->rdsin != dev->rdsout) 25098 while (i < count && dev->rdsin != dev->rdsout)
23874 readbuf[i++] = dev->rdsbuf[dev->rdsout++]; 25099 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
@@ -23878,9 +25103,9 @@ diff -urNp linux-2.6.32.10/drivers/media/radio/radio-cadet.c linux-2.6.32.10/dri
23878 return -EFAULT; 25103 return -EFAULT;
23879 return i; 25104 return i;
23880 } 25105 }
23881diff -urNp linux-2.6.32.10/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.10/drivers/media/video/usbvideo/konicawc.c 25106diff -urNp linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c
23882--- linux-2.6.32.10/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400 25107--- linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400
23883+++ linux-2.6.32.10/drivers/media/video/usbvideo/konicawc.c 2010-03-20 15:58:47.074047893 -0400 25108+++ linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c 2010-04-04 20:46:41.597784214 -0400
23884@@ -225,7 +225,7 @@ static void konicawc_register_input(stru 25109@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
23885 int error; 25110 int error;
23886 25111
@@ -23890,9 +25115,9 @@ diff -urNp linux-2.6.32.10/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.
23890 25115
23891 cam->input = input_dev = input_allocate_device(); 25116 cam->input = input_dev = input_allocate_device();
23892 if (!input_dev) { 25117 if (!input_dev) {
23893diff -urNp linux-2.6.32.10/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.10/drivers/media/video/usbvideo/quickcam_messenger.c 25118diff -urNp linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c
23894--- linux-2.6.32.10/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400 25119--- linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400
23895+++ linux-2.6.32.10/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-20 15:58:47.074047893 -0400 25120+++ linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c 2010-04-04 20:46:41.597784214 -0400
23896@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc 25121@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
23897 int error; 25122 int error;
23898 25123
@@ -23902,9 +25127,9 @@ diff -urNp linux-2.6.32.10/drivers/media/video/usbvideo/quickcam_messenger.c lin
23902 25127
23903 cam->input = input_dev = input_allocate_device(); 25128 cam->input = input_dev = input_allocate_device();
23904 if (!input_dev) { 25129 if (!input_dev) {
23905diff -urNp linux-2.6.32.10/drivers/message/i2o/i2o_proc.c linux-2.6.32.10/drivers/message/i2o/i2o_proc.c 25130diff -urNp linux-2.6.32.11/drivers/message/i2o/i2o_proc.c linux-2.6.32.11/drivers/message/i2o/i2o_proc.c
23906--- linux-2.6.32.10/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400 25131--- linux-2.6.32.11/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400
23907+++ linux-2.6.32.10/drivers/message/i2o/i2o_proc.c 2010-03-20 15:58:47.074047893 -0400 25132+++ linux-2.6.32.11/drivers/message/i2o/i2o_proc.c 2010-04-04 20:46:41.597784214 -0400
23908@@ -259,13 +259,6 @@ static char *scsi_devices[] = { 25133@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
23909 "Array Controller Device" 25134 "Array Controller Device"
23910 }; 25135 };
@@ -23991,9 +25216,9 @@ diff -urNp linux-2.6.32.10/drivers/message/i2o/i2o_proc.c linux-2.6.32.10/driver
23991 25216
23992 return 0; 25217 return 0;
23993 } 25218 }
23994diff -urNp linux-2.6.32.10/drivers/misc/kgdbts.c linux-2.6.32.10/drivers/misc/kgdbts.c 25219diff -urNp linux-2.6.32.11/drivers/misc/kgdbts.c linux-2.6.32.11/drivers/misc/kgdbts.c
23995--- linux-2.6.32.10/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400 25220--- linux-2.6.32.11/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400
23996+++ linux-2.6.32.10/drivers/misc/kgdbts.c 2010-03-20 15:58:47.074047893 -0400 25221+++ linux-2.6.32.11/drivers/misc/kgdbts.c 2010-04-04 20:46:41.597784214 -0400
23997@@ -118,7 +118,7 @@ 25222@@ -118,7 +118,7 @@
23998 } while (0) 25223 } while (0)
23999 #define MAX_CONFIG_LEN 40 25224 #define MAX_CONFIG_LEN 40
@@ -24012,9 +25237,9 @@ diff -urNp linux-2.6.32.10/drivers/misc/kgdbts.c linux-2.6.32.10/drivers/misc/kg
24012 .name = "kgdbts", 25237 .name = "kgdbts",
24013 .read_char = kgdbts_get_char, 25238 .read_char = kgdbts_get_char,
24014 .write_char = kgdbts_put_char, 25239 .write_char = kgdbts_put_char,
24015diff -urNp linux-2.6.32.10/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.10/drivers/misc/sgi-gru/gruhandles.c 25240diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c
24016--- linux-2.6.32.10/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400 25241--- linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400
24017+++ linux-2.6.32.10/drivers/misc/sgi-gru/gruhandles.c 2010-03-20 15:58:47.074047893 -0400 25242+++ linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c 2010-04-04 20:46:41.597784214 -0400
24018@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic 25243@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
24019 25244
24020 static void update_mcs_stats(enum mcs_op op, unsigned long clks) 25245 static void update_mcs_stats(enum mcs_op op, unsigned long clks)
@@ -24026,9 +25251,9 @@ diff -urNp linux-2.6.32.10/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.10/dri
24026 if (mcs_op_statistics[op].max < clks) 25251 if (mcs_op_statistics[op].max < clks)
24027 mcs_op_statistics[op].max = clks; 25252 mcs_op_statistics[op].max = clks;
24028 } 25253 }
24029diff -urNp linux-2.6.32.10/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.10/drivers/misc/sgi-gru/gruprocfs.c 25254diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c
24030--- linux-2.6.32.10/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400 25255--- linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400
24031+++ linux-2.6.32.10/drivers/misc/sgi-gru/gruprocfs.c 2010-03-20 15:58:47.074047893 -0400 25256+++ linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c 2010-04-04 20:46:41.597784214 -0400
24032@@ -32,9 +32,9 @@ 25257@@ -32,9 +32,9 @@
24033 25258
24034 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) 25259 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -24052,9 +25277,9 @@ diff -urNp linux-2.6.32.10/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.10/driv
24052 max = mcs_op_statistics[op].max; 25277 max = mcs_op_statistics[op].max;
24053 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, 25278 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
24054 count ? total / count : 0, max); 25279 count ? total / count : 0, max);
24055diff -urNp linux-2.6.32.10/drivers/misc/sgi-gru/grutables.h linux-2.6.32.10/drivers/misc/sgi-gru/grutables.h 25280diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h
24056--- linux-2.6.32.10/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400 25281--- linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400
24057+++ linux-2.6.32.10/drivers/misc/sgi-gru/grutables.h 2010-03-20 15:58:47.074047893 -0400 25282+++ linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h 2010-04-04 20:46:41.597784214 -0400
24058@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; 25283@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
24059 * GRU statistics. 25284 * GRU statistics.
24060 */ 25285 */
@@ -24238,9 +25463,9 @@ diff -urNp linux-2.6.32.10/drivers/misc/sgi-gru/grutables.h linux-2.6.32.10/driv
24238 } while (0) 25463 } while (0)
24239 25464
24240 #ifdef CONFIG_SGI_GRU_DEBUG 25465 #ifdef CONFIG_SGI_GRU_DEBUG
24241diff -urNp linux-2.6.32.10/drivers/mtd/devices/doc2000.c linux-2.6.32.10/drivers/mtd/devices/doc2000.c 25466diff -urNp linux-2.6.32.11/drivers/mtd/devices/doc2000.c linux-2.6.32.11/drivers/mtd/devices/doc2000.c
24242--- linux-2.6.32.10/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400 25467--- linux-2.6.32.11/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400
24243+++ linux-2.6.32.10/drivers/mtd/devices/doc2000.c 2010-03-20 15:58:47.074047893 -0400 25468+++ linux-2.6.32.11/drivers/mtd/devices/doc2000.c 2010-04-04 20:46:41.597784214 -0400
24244@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt 25469@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
24245 25470
24246 /* The ECC will not be calculated correctly if less than 512 is written */ 25471 /* The ECC will not be calculated correctly if less than 512 is written */
@@ -24250,9 +25475,9 @@ diff -urNp linux-2.6.32.10/drivers/mtd/devices/doc2000.c linux-2.6.32.10/drivers
24250 printk(KERN_WARNING 25475 printk(KERN_WARNING
24251 "ECC needs a full sector write (adr: %lx size %lx)\n", 25476 "ECC needs a full sector write (adr: %lx size %lx)\n",
24252 (long) to, (long) len); 25477 (long) to, (long) len);
24253diff -urNp linux-2.6.32.10/drivers/mtd/devices/doc2001.c linux-2.6.32.10/drivers/mtd/devices/doc2001.c 25478diff -urNp linux-2.6.32.11/drivers/mtd/devices/doc2001.c linux-2.6.32.11/drivers/mtd/devices/doc2001.c
24254--- linux-2.6.32.10/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400 25479--- linux-2.6.32.11/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400
24255+++ linux-2.6.32.10/drivers/mtd/devices/doc2001.c 2010-03-20 17:04:50.568729833 -0400 25480+++ linux-2.6.32.11/drivers/mtd/devices/doc2001.c 2010-04-04 20:46:41.597784214 -0400
24256@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt 25481@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
24257 struct Nand *mychip = &this->chips[from >> (this->chipshift)]; 25482 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
24258 25483
@@ -24262,9 +25487,9 @@ diff -urNp linux-2.6.32.10/drivers/mtd/devices/doc2001.c linux-2.6.32.10/drivers
24262 return -EINVAL; 25487 return -EINVAL;
24263 25488
24264 /* Don't allow a single read to cross a 512-byte block boundary */ 25489 /* Don't allow a single read to cross a 512-byte block boundary */
24265diff -urNp linux-2.6.32.10/drivers/mtd/ubi/build.c linux-2.6.32.10/drivers/mtd/ubi/build.c 25490diff -urNp linux-2.6.32.11/drivers/mtd/ubi/build.c linux-2.6.32.11/drivers/mtd/ubi/build.c
24266--- linux-2.6.32.10/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400 25491--- linux-2.6.32.11/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400
24267+++ linux-2.6.32.10/drivers/mtd/ubi/build.c 2010-03-20 15:58:47.074047893 -0400 25492+++ linux-2.6.32.11/drivers/mtd/ubi/build.c 2010-04-04 20:46:41.597784214 -0400
24268@@ -1255,7 +1255,7 @@ module_exit(ubi_exit); 25493@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
24269 static int __init bytes_str_to_int(const char *str) 25494 static int __init bytes_str_to_int(const char *str)
24270 { 25495 {
@@ -24304,9 +25529,9 @@ diff -urNp linux-2.6.32.10/drivers/mtd/ubi/build.c linux-2.6.32.10/drivers/mtd/u
24304 } 25529 }
24305 25530
24306 /** 25531 /**
24307diff -urNp linux-2.6.32.10/drivers/net/e1000e/82571.c linux-2.6.32.10/drivers/net/e1000e/82571.c 25532diff -urNp linux-2.6.32.11/drivers/net/e1000e/82571.c linux-2.6.32.11/drivers/net/e1000e/82571.c
24308--- linux-2.6.32.10/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400 25533--- linux-2.6.32.11/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400
24309+++ linux-2.6.32.10/drivers/net/e1000e/82571.c 2010-03-20 15:58:47.074047893 -0400 25534+++ linux-2.6.32.11/drivers/net/e1000e/82571.c 2010-04-04 20:46:41.597784214 -0400
24310@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s 25535@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
24311 { 25536 {
24312 struct e1000_hw *hw = &adapter->hw; 25537 struct e1000_hw *hw = &adapter->hw;
@@ -24360,9 +25585,9 @@ diff -urNp linux-2.6.32.10/drivers/net/e1000e/82571.c linux-2.6.32.10/drivers/ne
24360 .acquire_nvm = e1000_acquire_nvm_82571, 25585 .acquire_nvm = e1000_acquire_nvm_82571,
24361 .read_nvm = e1000e_read_nvm_eerd, 25586 .read_nvm = e1000e_read_nvm_eerd,
24362 .release_nvm = e1000_release_nvm_82571, 25587 .release_nvm = e1000_release_nvm_82571,
24363diff -urNp linux-2.6.32.10/drivers/net/e1000e/e1000.h linux-2.6.32.10/drivers/net/e1000e/e1000.h 25588diff -urNp linux-2.6.32.11/drivers/net/e1000e/e1000.h linux-2.6.32.11/drivers/net/e1000e/e1000.h
24364--- linux-2.6.32.10/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400 25589--- linux-2.6.32.11/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400
24365+++ linux-2.6.32.10/drivers/net/e1000e/e1000.h 2010-03-20 15:58:47.074047893 -0400 25590+++ linux-2.6.32.11/drivers/net/e1000e/e1000.h 2010-04-04 20:46:41.597784214 -0400
24366@@ -375,9 +375,9 @@ struct e1000_info { 25591@@ -375,9 +375,9 @@ struct e1000_info {
24367 u32 pba; 25592 u32 pba;
24368 u32 max_hw_frame_size; 25593 u32 max_hw_frame_size;
@@ -24376,9 +25601,9 @@ diff -urNp linux-2.6.32.10/drivers/net/e1000e/e1000.h linux-2.6.32.10/drivers/ne
24376 }; 25601 };
24377 25602
24378 /* hardware capability, feature, and workaround flags */ 25603 /* hardware capability, feature, and workaround flags */
24379diff -urNp linux-2.6.32.10/drivers/net/e1000e/es2lan.c linux-2.6.32.10/drivers/net/e1000e/es2lan.c 25604diff -urNp linux-2.6.32.11/drivers/net/e1000e/es2lan.c linux-2.6.32.11/drivers/net/e1000e/es2lan.c
24380--- linux-2.6.32.10/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400 25605--- linux-2.6.32.11/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400
24381+++ linux-2.6.32.10/drivers/net/e1000e/es2lan.c 2010-03-20 15:58:47.078052541 -0400 25606+++ linux-2.6.32.11/drivers/net/e1000e/es2lan.c 2010-04-04 20:46:41.597784214 -0400
24382@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es 25607@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
24383 { 25608 {
24384 struct e1000_hw *hw = &adapter->hw; 25609 struct e1000_hw *hw = &adapter->hw;
@@ -24414,10 +25639,10 @@ diff -urNp linux-2.6.32.10/drivers/net/e1000e/es2lan.c linux-2.6.32.10/drivers/n
24414 .acquire_nvm = e1000_acquire_nvm_80003es2lan, 25639 .acquire_nvm = e1000_acquire_nvm_80003es2lan,
24415 .read_nvm = e1000e_read_nvm_eerd, 25640 .read_nvm = e1000e_read_nvm_eerd,
24416 .release_nvm = e1000_release_nvm_80003es2lan, 25641 .release_nvm = e1000_release_nvm_80003es2lan,
24417diff -urNp linux-2.6.32.10/drivers/net/e1000e/hw.h linux-2.6.32.10/drivers/net/e1000e/hw.h 25642diff -urNp linux-2.6.32.11/drivers/net/e1000e/hw.h linux-2.6.32.11/drivers/net/e1000e/hw.h
24418--- linux-2.6.32.10/drivers/net/e1000e/hw.h 2010-03-15 11:52:04.000000000 -0400 25643--- linux-2.6.32.11/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400
24419+++ linux-2.6.32.10/drivers/net/e1000e/hw.h 2010-03-20 15:58:47.078052541 -0400 25644+++ linux-2.6.32.11/drivers/net/e1000e/hw.h 2010-04-04 20:46:41.601781347 -0400
24420@@ -755,34 +755,34 @@ struct e1000_mac_operations { 25645@@ -756,34 +756,34 @@ struct e1000_mac_operations {
24421 25646
24422 /* Function pointers for the PHY. */ 25647 /* Function pointers for the PHY. */
24423 struct e1000_phy_operations { 25648 struct e1000_phy_operations {
@@ -24476,10 +25701,10 @@ diff -urNp linux-2.6.32.10/drivers/net/e1000e/hw.h linux-2.6.32.10/drivers/net/e
24476 }; 25701 };
24477 25702
24478 struct e1000_mac_info { 25703 struct e1000_mac_info {
24479diff -urNp linux-2.6.32.10/drivers/net/e1000e/ich8lan.c linux-2.6.32.10/drivers/net/e1000e/ich8lan.c 25704diff -urNp linux-2.6.32.11/drivers/net/e1000e/ich8lan.c linux-2.6.32.11/drivers/net/e1000e/ich8lan.c
24480--- linux-2.6.32.10/drivers/net/e1000e/ich8lan.c 2010-03-15 11:52:04.000000000 -0400 25705--- linux-2.6.32.11/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400
24481+++ linux-2.6.32.10/drivers/net/e1000e/ich8lan.c 2010-03-20 15:58:47.078052541 -0400 25706+++ linux-2.6.32.11/drivers/net/e1000e/ich8lan.c 2010-04-04 20:46:41.601781347 -0400
24482@@ -3451,7 +3451,7 @@ static void e1000_clear_hw_cntrs_ich8lan 25707@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan
24483 } 25708 }
24484 } 25709 }
24485 25710
@@ -24488,7 +25713,7 @@ diff -urNp linux-2.6.32.10/drivers/net/e1000e/ich8lan.c linux-2.6.32.10/drivers/
24488 .id_led_init = e1000e_id_led_init, 25713 .id_led_init = e1000e_id_led_init,
24489 .check_mng_mode = e1000_check_mng_mode_ich8lan, 25714 .check_mng_mode = e1000_check_mng_mode_ich8lan,
24490 .check_for_link = e1000_check_for_copper_link_ich8lan, 25715 .check_for_link = e1000_check_for_copper_link_ich8lan,
24491@@ -3469,7 +3469,7 @@ static struct e1000_mac_operations ich8_ 25716@@ -3470,7 +3470,7 @@ static struct e1000_mac_operations ich8_
24492 /* id_led_init dependent on mac type */ 25717 /* id_led_init dependent on mac type */
24493 }; 25718 };
24494 25719
@@ -24497,7 +25722,7 @@ diff -urNp linux-2.6.32.10/drivers/net/e1000e/ich8lan.c linux-2.6.32.10/drivers/
24497 .acquire_phy = e1000_acquire_swflag_ich8lan, 25722 .acquire_phy = e1000_acquire_swflag_ich8lan,
24498 .check_reset_block = e1000_check_reset_block_ich8lan, 25723 .check_reset_block = e1000_check_reset_block_ich8lan,
24499 .commit_phy = NULL, 25724 .commit_phy = NULL,
24500@@ -3485,7 +3485,7 @@ static struct e1000_phy_operations ich8_ 25725@@ -3486,7 +3486,7 @@ static struct e1000_phy_operations ich8_
24501 .write_phy_reg = e1000e_write_phy_reg_igp, 25726 .write_phy_reg = e1000e_write_phy_reg_igp,
24502 }; 25727 };
24503 25728
@@ -24506,9 +25731,9 @@ diff -urNp linux-2.6.32.10/drivers/net/e1000e/ich8lan.c linux-2.6.32.10/drivers/
24506 .acquire_nvm = e1000_acquire_nvm_ich8lan, 25731 .acquire_nvm = e1000_acquire_nvm_ich8lan,
24507 .read_nvm = e1000_read_nvm_ich8lan, 25732 .read_nvm = e1000_read_nvm_ich8lan,
24508 .release_nvm = e1000_release_nvm_ich8lan, 25733 .release_nvm = e1000_release_nvm_ich8lan,
24509diff -urNp linux-2.6.32.10/drivers/net/ibmveth.c linux-2.6.32.10/drivers/net/ibmveth.c 25734diff -urNp linux-2.6.32.11/drivers/net/ibmveth.c linux-2.6.32.11/drivers/net/ibmveth.c
24510--- linux-2.6.32.10/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400 25735--- linux-2.6.32.11/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400
24511+++ linux-2.6.32.10/drivers/net/ibmveth.c 2010-03-20 15:58:47.078052541 -0400 25736+++ linux-2.6.32.11/drivers/net/ibmveth.c 2010-04-04 20:46:41.601781347 -0400
24512@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr 25737@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
24513 NULL, 25738 NULL,
24514 }; 25739 };
@@ -24518,9 +25743,9 @@ diff -urNp linux-2.6.32.10/drivers/net/ibmveth.c linux-2.6.32.10/drivers/net/ibm
24518 .show = veth_pool_show, 25743 .show = veth_pool_show,
24519 .store = veth_pool_store, 25744 .store = veth_pool_store,
24520 }; 25745 };
24521diff -urNp linux-2.6.32.10/drivers/net/igb/e1000_82575.c linux-2.6.32.10/drivers/net/igb/e1000_82575.c 25746diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_82575.c linux-2.6.32.11/drivers/net/igb/e1000_82575.c
24522--- linux-2.6.32.10/drivers/net/igb/e1000_82575.c 2010-03-15 11:52:04.000000000 -0400 25747--- linux-2.6.32.11/drivers/net/igb/e1000_82575.c 2010-03-15 11:52:04.000000000 -0400
24523+++ linux-2.6.32.10/drivers/net/igb/e1000_82575.c 2010-03-20 15:58:47.078052541 -0400 25748+++ linux-2.6.32.11/drivers/net/igb/e1000_82575.c 2010-04-04 20:46:41.601781347 -0400
24524@@ -1400,7 +1400,7 @@ void igb_vmdq_set_replication_pf(struct 25749@@ -1400,7 +1400,7 @@ void igb_vmdq_set_replication_pf(struct
24525 wr32(E1000_VT_CTL, vt_ctl); 25750 wr32(E1000_VT_CTL, vt_ctl);
24526 } 25751 }
@@ -24546,9 +25771,9 @@ diff -urNp linux-2.6.32.10/drivers/net/igb/e1000_82575.c linux-2.6.32.10/drivers
24546 .acquire = igb_acquire_nvm_82575, 25771 .acquire = igb_acquire_nvm_82575,
24547 .read = igb_read_nvm_eerd, 25772 .read = igb_read_nvm_eerd,
24548 .release = igb_release_nvm_82575, 25773 .release = igb_release_nvm_82575,
24549diff -urNp linux-2.6.32.10/drivers/net/igb/e1000_hw.h linux-2.6.32.10/drivers/net/igb/e1000_hw.h 25774diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_hw.h linux-2.6.32.11/drivers/net/igb/e1000_hw.h
24550--- linux-2.6.32.10/drivers/net/igb/e1000_hw.h 2010-03-15 11:52:04.000000000 -0400 25775--- linux-2.6.32.11/drivers/net/igb/e1000_hw.h 2010-03-15 11:52:04.000000000 -0400
24551+++ linux-2.6.32.10/drivers/net/igb/e1000_hw.h 2010-03-20 15:58:47.078052541 -0400 25776+++ linux-2.6.32.11/drivers/net/igb/e1000_hw.h 2010-04-04 20:46:41.601781347 -0400
24552@@ -302,17 +302,17 @@ struct e1000_phy_operations { 25777@@ -302,17 +302,17 @@ struct e1000_phy_operations {
24553 }; 25778 };
24554 25779
@@ -24574,9 +25799,9 @@ diff -urNp linux-2.6.32.10/drivers/net/igb/e1000_hw.h linux-2.6.32.10/drivers/ne
24574 }; 25799 };
24575 25800
24576 extern const struct e1000_info e1000_82575_info; 25801 extern const struct e1000_info e1000_82575_info;
24577diff -urNp linux-2.6.32.10/drivers/net/irda/vlsi_ir.c linux-2.6.32.10/drivers/net/irda/vlsi_ir.c 25802diff -urNp linux-2.6.32.11/drivers/net/irda/vlsi_ir.c linux-2.6.32.11/drivers/net/irda/vlsi_ir.c
24578--- linux-2.6.32.10/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400 25803--- linux-2.6.32.11/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400
24579+++ linux-2.6.32.10/drivers/net/irda/vlsi_ir.c 2010-03-20 15:58:47.078052541 -0400 25804+++ linux-2.6.32.11/drivers/net/irda/vlsi_ir.c 2010-04-04 20:46:41.601781347 -0400
24580@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( 25805@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
24581 /* no race - tx-ring already empty */ 25806 /* no race - tx-ring already empty */
24582 vlsi_set_baud(idev, iobase); 25807 vlsi_set_baud(idev, iobase);
@@ -24593,9 +25818,9 @@ diff -urNp linux-2.6.32.10/drivers/net/irda/vlsi_ir.c linux-2.6.32.10/drivers/ne
24593 spin_unlock_irqrestore(&idev->lock, flags); 25818 spin_unlock_irqrestore(&idev->lock, flags);
24594 dev_kfree_skb_any(skb); 25819 dev_kfree_skb_any(skb);
24595 return NETDEV_TX_OK; 25820 return NETDEV_TX_OK;
24596diff -urNp linux-2.6.32.10/drivers/net/iseries_veth.c linux-2.6.32.10/drivers/net/iseries_veth.c 25821diff -urNp linux-2.6.32.11/drivers/net/iseries_veth.c linux-2.6.32.11/drivers/net/iseries_veth.c
24597--- linux-2.6.32.10/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400 25822--- linux-2.6.32.11/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400
24598+++ linux-2.6.32.10/drivers/net/iseries_veth.c 2010-03-20 15:58:47.078052541 -0400 25823+++ linux-2.6.32.11/drivers/net/iseries_veth.c 2010-04-04 20:46:41.601781347 -0400
24599@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul 25824@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
24600 NULL 25825 NULL
24601 }; 25826 };
@@ -24614,9 +25839,9 @@ diff -urNp linux-2.6.32.10/drivers/net/iseries_veth.c linux-2.6.32.10/drivers/ne
24614 .show = veth_port_attribute_show 25839 .show = veth_port_attribute_show
24615 }; 25840 };
24616 25841
24617diff -urNp linux-2.6.32.10/drivers/net/pcnet32.c linux-2.6.32.10/drivers/net/pcnet32.c 25842diff -urNp linux-2.6.32.11/drivers/net/pcnet32.c linux-2.6.32.11/drivers/net/pcnet32.c
24618--- linux-2.6.32.10/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400 25843--- linux-2.6.32.11/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400
24619+++ linux-2.6.32.10/drivers/net/pcnet32.c 2010-03-20 15:58:47.078052541 -0400 25844+++ linux-2.6.32.11/drivers/net/pcnet32.c 2010-04-04 20:46:41.601781347 -0400
24620@@ -79,7 +79,7 @@ static int cards_found; 25845@@ -79,7 +79,7 @@ static int cards_found;
24621 /* 25846 /*
24622 * VLB I/O addresses 25847 * VLB I/O addresses
@@ -24626,9 +25851,9 @@ diff -urNp linux-2.6.32.10/drivers/net/pcnet32.c linux-2.6.32.10/drivers/net/pcn
24626 { 0x300, 0x320, 0x340, 0x360, 0 }; 25851 { 0x300, 0x320, 0x340, 0x360, 0 };
24627 25852
24628 static int pcnet32_debug = 0; 25853 static int pcnet32_debug = 0;
24629diff -urNp linux-2.6.32.10/drivers/net/tg3.h linux-2.6.32.10/drivers/net/tg3.h 25854diff -urNp linux-2.6.32.11/drivers/net/tg3.h linux-2.6.32.11/drivers/net/tg3.h
24630--- linux-2.6.32.10/drivers/net/tg3.h 2010-03-15 11:52:04.000000000 -0400 25855--- linux-2.6.32.11/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400
24631+++ linux-2.6.32.10/drivers/net/tg3.h 2010-03-20 15:58:47.078052541 -0400 25856+++ linux-2.6.32.11/drivers/net/tg3.h 2010-04-04 20:46:41.601781347 -0400
24632@@ -95,6 +95,7 @@ 25857@@ -95,6 +95,7 @@
24633 #define CHIPREV_ID_5750_A0 0x4000 25858 #define CHIPREV_ID_5750_A0 0x4000
24634 #define CHIPREV_ID_5750_A1 0x4001 25859 #define CHIPREV_ID_5750_A1 0x4001
@@ -24637,9 +25862,9 @@ diff -urNp linux-2.6.32.10/drivers/net/tg3.h linux-2.6.32.10/drivers/net/tg3.h
24637 #define CHIPREV_ID_5750_C2 0x4202 25862 #define CHIPREV_ID_5750_C2 0x4202
24638 #define CHIPREV_ID_5752_A0_HW 0x5000 25863 #define CHIPREV_ID_5752_A0_HW 0x5000
24639 #define CHIPREV_ID_5752_A0 0x6000 25864 #define CHIPREV_ID_5752_A0 0x6000
24640diff -urNp linux-2.6.32.10/drivers/net/tulip/de4x5.c linux-2.6.32.10/drivers/net/tulip/de4x5.c 25865diff -urNp linux-2.6.32.11/drivers/net/tulip/de4x5.c linux-2.6.32.11/drivers/net/tulip/de4x5.c
24641--- linux-2.6.32.10/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400 25866--- linux-2.6.32.11/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400
24642+++ linux-2.6.32.10/drivers/net/tulip/de4x5.c 2010-03-20 15:58:47.082043078 -0400 25867+++ linux-2.6.32.11/drivers/net/tulip/de4x5.c 2010-04-04 20:46:41.601781347 -0400
24643@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru 25868@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
24644 for (i=0; i<ETH_ALEN; i++) { 25869 for (i=0; i<ETH_ALEN; i++) {
24645 tmp.addr[i] = dev->dev_addr[i]; 25870 tmp.addr[i] = dev->dev_addr[i];
@@ -24658,9 +25883,9 @@ diff -urNp linux-2.6.32.10/drivers/net/tulip/de4x5.c linux-2.6.32.10/drivers/net
24658 return -EFAULT; 25883 return -EFAULT;
24659 break; 25884 break;
24660 } 25885 }
24661diff -urNp linux-2.6.32.10/drivers/net/usb/hso.c linux-2.6.32.10/drivers/net/usb/hso.c 25886diff -urNp linux-2.6.32.11/drivers/net/usb/hso.c linux-2.6.32.11/drivers/net/usb/hso.c
24662--- linux-2.6.32.10/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400 25887--- linux-2.6.32.11/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400
24663+++ linux-2.6.32.10/drivers/net/usb/hso.c 2010-03-20 15:58:47.082043078 -0400 25888+++ linux-2.6.32.11/drivers/net/usb/hso.c 2010-04-04 20:46:41.605567348 -0400
24664@@ -258,7 +258,7 @@ struct hso_serial { 25889@@ -258,7 +258,7 @@ struct hso_serial {
24665 25890
24666 /* from usb_serial_port */ 25891 /* from usb_serial_port */
@@ -24739,9 +25964,9 @@ diff -urNp linux-2.6.32.10/drivers/net/usb/hso.c linux-2.6.32.10/drivers/net/usb
24739 result = 25964 result =
24740 hso_start_serial_device(serial_table[i], GFP_NOIO); 25965 hso_start_serial_device(serial_table[i], GFP_NOIO);
24741 hso_kick_transmit(dev2ser(serial_table[i])); 25966 hso_kick_transmit(dev2ser(serial_table[i]));
24742diff -urNp linux-2.6.32.10/drivers/net/wireless/b43/debugfs.c linux-2.6.32.10/drivers/net/wireless/b43/debugfs.c 25967diff -urNp linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c
24743--- linux-2.6.32.10/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400 25968--- linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400
24744+++ linux-2.6.32.10/drivers/net/wireless/b43/debugfs.c 2010-03-20 15:58:47.082043078 -0400 25969+++ linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c 2010-04-04 20:46:41.605567348 -0400
24745@@ -43,7 +43,7 @@ static struct dentry *rootdir; 25970@@ -43,7 +43,7 @@ static struct dentry *rootdir;
24746 struct b43_debugfs_fops { 25971 struct b43_debugfs_fops {
24747 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); 25972 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -24751,9 +25976,9 @@ diff -urNp linux-2.6.32.10/drivers/net/wireless/b43/debugfs.c linux-2.6.32.10/dr
24751 /* Offset of struct b43_dfs_file in struct b43_dfsentry */ 25976 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
24752 size_t file_struct_offset; 25977 size_t file_struct_offset;
24753 }; 25978 };
24754diff -urNp linux-2.6.32.10/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.10/drivers/net/wireless/b43legacy/debugfs.c 25979diff -urNp linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c
24755--- linux-2.6.32.10/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400 25980--- linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400
24756+++ linux-2.6.32.10/drivers/net/wireless/b43legacy/debugfs.c 2010-03-20 15:58:47.082043078 -0400 25981+++ linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c 2010-04-04 20:46:41.605567348 -0400
24757@@ -44,7 +44,7 @@ static struct dentry *rootdir; 25982@@ -44,7 +44,7 @@ static struct dentry *rootdir;
24758 struct b43legacy_debugfs_fops { 25983 struct b43legacy_debugfs_fops {
24759 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); 25984 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -24763,9 +25988,9 @@ diff -urNp linux-2.6.32.10/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32
24763 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ 25988 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
24764 size_t file_struct_offset; 25989 size_t file_struct_offset;
24765 /* Take wl->irq_lock before calling read/write? */ 25990 /* Take wl->irq_lock before calling read/write? */
24766diff -urNp linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-1000.c 25991diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-1000.c
24767--- linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400 25992--- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400
24768+++ linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-20 15:58:47.082043078 -0400 25993+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-04-04 20:46:41.605567348 -0400
24769@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = 25994@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
24770 }, 25995 },
24771 }; 25996 };
@@ -24775,10 +26000,10 @@ diff -urNp linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
24775 .ucode = &iwl5000_ucode, 26000 .ucode = &iwl5000_ucode,
24776 .lib = &iwl1000_lib, 26001 .lib = &iwl1000_lib,
24777 .hcmd = &iwl5000_hcmd, 26002 .hcmd = &iwl5000_hcmd,
24778diff -urNp linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-3945.c 26003diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-3945.c
24779--- linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-03-15 11:52:04.000000000 -0400 26004--- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400
24780+++ linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-03-20 15:58:47.082043078 -0400 26005+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:46:41.605567348 -0400
24781@@ -2876,7 +2876,7 @@ static struct iwl_hcmd_utils_ops iwl3945 26006@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
24782 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, 26007 .build_addsta_hcmd = iwl3945_build_addsta_hcmd,
24783 }; 26008 };
24784 26009
@@ -24787,9 +26012,9 @@ diff -urNp linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.
24787 .ucode = &iwl3945_ucode, 26012 .ucode = &iwl3945_ucode,
24788 .lib = &iwl3945_lib, 26013 .lib = &iwl3945_lib,
24789 .hcmd = &iwl3945_hcmd, 26014 .hcmd = &iwl3945_hcmd,
24790diff -urNp linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-4965.c 26015diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-4965.c
24791--- linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-03-15 11:52:04.000000000 -0400 26016--- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-03-15 11:52:04.000000000 -0400
24792+++ linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-03-20 15:58:47.082043078 -0400 26017+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-04-04 20:46:41.605567348 -0400
24793@@ -2335,7 +2335,7 @@ static struct iwl_lib_ops iwl4965_lib = 26018@@ -2335,7 +2335,7 @@ static struct iwl_lib_ops iwl4965_lib =
24794 }, 26019 },
24795 }; 26020 };
@@ -24799,9 +26024,9 @@ diff -urNp linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.
24799 .ucode = &iwl4965_ucode, 26024 .ucode = &iwl4965_ucode,
24800 .lib = &iwl4965_lib, 26025 .lib = &iwl4965_lib,
24801 .hcmd = &iwl4965_hcmd, 26026 .hcmd = &iwl4965_hcmd,
24802diff -urNp linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-5000.c 26027diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-5000.c
24803--- linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-03-15 11:52:04.000000000 -0400 26028--- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-03-15 11:52:04.000000000 -0400
24804+++ linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-03-20 15:58:47.082043078 -0400 26029+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-04-04 20:46:41.605567348 -0400
24805@@ -1626,14 +1626,14 @@ static struct iwl_lib_ops iwl5150_lib = 26030@@ -1626,14 +1626,14 @@ static struct iwl_lib_ops iwl5150_lib =
24806 }, 26031 },
24807 }; 26032 };
@@ -24819,9 +26044,9 @@ diff -urNp linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.
24819 .ucode = &iwl5000_ucode, 26044 .ucode = &iwl5000_ucode,
24820 .lib = &iwl5150_lib, 26045 .lib = &iwl5150_lib,
24821 .hcmd = &iwl5000_hcmd, 26046 .hcmd = &iwl5000_hcmd,
24822diff -urNp linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-6000.c 26047diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-6000.c
24823--- linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400 26048--- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400
24824+++ linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-20 15:58:47.082043078 -0400 26049+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-04-04 20:46:41.605567348 -0400
24825@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 26050@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
24826 .calc_rssi = iwl5000_calc_rssi, 26051 .calc_rssi = iwl5000_calc_rssi,
24827 }; 26052 };
@@ -24831,9 +26056,9 @@ diff -urNp linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
24831 .ucode = &iwl5000_ucode, 26056 .ucode = &iwl5000_ucode,
24832 .lib = &iwl6000_lib, 26057 .lib = &iwl6000_lib,
24833 .hcmd = &iwl5000_hcmd, 26058 .hcmd = &iwl5000_hcmd,
24834diff -urNp linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-dev.h 26059diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-dev.h
24835--- linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400 26060--- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400
24836+++ linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-20 15:58:47.082043078 -0400 26061+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-04-04 20:46:41.605567348 -0400
24837@@ -67,7 +67,7 @@ struct iwl_tx_queue; 26062@@ -67,7 +67,7 @@ struct iwl_tx_queue;
24838 26063
24839 /* shared structures from iwl-5000.c */ 26064 /* shared structures from iwl-5000.c */
@@ -24843,9 +26068,9 @@ diff -urNp linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.1
24843 extern struct iwl_ucode_ops iwl5000_ucode; 26068 extern struct iwl_ucode_ops iwl5000_ucode;
24844 extern struct iwl_lib_ops iwl5000_lib; 26069 extern struct iwl_lib_ops iwl5000_lib;
24845 extern struct iwl_hcmd_ops iwl5000_hcmd; 26070 extern struct iwl_hcmd_ops iwl5000_hcmd;
24846diff -urNp linux-2.6.32.10/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.10/drivers/net/wireless/libertas/debugfs.c 26071diff -urNp linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c
24847--- linux-2.6.32.10/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400 26072--- linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400
24848+++ linux-2.6.32.10/drivers/net/wireless/libertas/debugfs.c 2010-03-20 15:58:47.082043078 -0400 26073+++ linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c 2010-04-04 20:46:41.605567348 -0400
24849@@ -708,7 +708,7 @@ out_unlock: 26074@@ -708,7 +708,7 @@ out_unlock:
24850 struct lbs_debugfs_files { 26075 struct lbs_debugfs_files {
24851 const char *name; 26076 const char *name;
@@ -24855,9 +26080,9 @@ diff -urNp linux-2.6.32.10/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
24855 }; 26080 };
24856 26081
24857 static const struct lbs_debugfs_files debugfs_files[] = { 26082 static const struct lbs_debugfs_files debugfs_files[] = {
24858diff -urNp linux-2.6.32.10/drivers/oprofile/buffer_sync.c linux-2.6.32.10/drivers/oprofile/buffer_sync.c 26083diff -urNp linux-2.6.32.11/drivers/oprofile/buffer_sync.c linux-2.6.32.11/drivers/oprofile/buffer_sync.c
24859--- linux-2.6.32.10/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400 26084--- linux-2.6.32.11/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400
24860+++ linux-2.6.32.10/drivers/oprofile/buffer_sync.c 2010-03-20 15:58:47.086042900 -0400 26085+++ linux-2.6.32.11/drivers/oprofile/buffer_sync.c 2010-04-04 20:46:41.605567348 -0400
24861@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en 26086@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en
24862 if (cookie == NO_COOKIE) 26087 if (cookie == NO_COOKIE)
24863 offset = pc; 26088 offset = pc;
@@ -24893,9 +26118,9 @@ diff -urNp linux-2.6.32.10/drivers/oprofile/buffer_sync.c linux-2.6.32.10/driver
24893 } 26118 }
24894 } 26119 }
24895 release_mm(mm); 26120 release_mm(mm);
24896diff -urNp linux-2.6.32.10/drivers/oprofile/event_buffer.c linux-2.6.32.10/drivers/oprofile/event_buffer.c 26121diff -urNp linux-2.6.32.11/drivers/oprofile/event_buffer.c linux-2.6.32.11/drivers/oprofile/event_buffer.c
24897--- linux-2.6.32.10/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400 26122--- linux-2.6.32.11/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400
24898+++ linux-2.6.32.10/drivers/oprofile/event_buffer.c 2010-03-20 15:58:47.086042900 -0400 26123+++ linux-2.6.32.11/drivers/oprofile/event_buffer.c 2010-04-04 20:46:41.605567348 -0400
24899@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value 26124@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
24900 } 26125 }
24901 26126
@@ -24905,9 +26130,9 @@ diff -urNp linux-2.6.32.10/drivers/oprofile/event_buffer.c linux-2.6.32.10/drive
24905 return; 26130 return;
24906 } 26131 }
24907 26132
24908diff -urNp linux-2.6.32.10/drivers/oprofile/oprof.c linux-2.6.32.10/drivers/oprofile/oprof.c 26133diff -urNp linux-2.6.32.11/drivers/oprofile/oprof.c linux-2.6.32.11/drivers/oprofile/oprof.c
24909--- linux-2.6.32.10/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400 26134--- linux-2.6.32.11/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400
24910+++ linux-2.6.32.10/drivers/oprofile/oprof.c 2010-03-20 15:58:47.086042900 -0400 26135+++ linux-2.6.32.11/drivers/oprofile/oprof.c 2010-04-04 20:46:41.605567348 -0400
24911@@ -110,7 +110,7 @@ static void switch_worker(struct work_st 26136@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
24912 if (oprofile_ops.switch_events()) 26137 if (oprofile_ops.switch_events())
24913 return; 26138 return;
@@ -24917,9 +26142,9 @@ diff -urNp linux-2.6.32.10/drivers/oprofile/oprof.c linux-2.6.32.10/drivers/opro
24917 start_switch_worker(); 26142 start_switch_worker();
24918 } 26143 }
24919 26144
24920diff -urNp linux-2.6.32.10/drivers/oprofile/oprofilefs.c linux-2.6.32.10/drivers/oprofile/oprofilefs.c 26145diff -urNp linux-2.6.32.11/drivers/oprofile/oprofilefs.c linux-2.6.32.11/drivers/oprofile/oprofilefs.c
24921--- linux-2.6.32.10/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400 26146--- linux-2.6.32.11/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400
24922+++ linux-2.6.32.10/drivers/oprofile/oprofilefs.c 2010-03-20 15:58:47.086042900 -0400 26147+++ linux-2.6.32.11/drivers/oprofile/oprofilefs.c 2010-04-04 20:46:41.609229988 -0400
24923@@ -187,7 +187,7 @@ static const struct file_operations atom 26148@@ -187,7 +187,7 @@ static const struct file_operations atom
24924 26149
24925 26150
@@ -24929,9 +26154,9 @@ diff -urNp linux-2.6.32.10/drivers/oprofile/oprofilefs.c linux-2.6.32.10/drivers
24929 { 26154 {
24930 struct dentry *d = __oprofilefs_create_file(sb, root, name, 26155 struct dentry *d = __oprofilefs_create_file(sb, root, name,
24931 &atomic_ro_fops, 0444); 26156 &atomic_ro_fops, 0444);
24932diff -urNp linux-2.6.32.10/drivers/oprofile/oprofile_stats.c linux-2.6.32.10/drivers/oprofile/oprofile_stats.c 26157diff -urNp linux-2.6.32.11/drivers/oprofile/oprofile_stats.c linux-2.6.32.11/drivers/oprofile/oprofile_stats.c
24933--- linux-2.6.32.10/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400 26158--- linux-2.6.32.11/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400
24934+++ linux-2.6.32.10/drivers/oprofile/oprofile_stats.c 2010-03-20 15:58:47.086042900 -0400 26159+++ linux-2.6.32.11/drivers/oprofile/oprofile_stats.c 2010-04-04 20:46:41.609229988 -0400
24935@@ -30,11 +30,11 @@ void oprofile_reset_stats(void) 26160@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
24936 cpu_buf->sample_invalid_eip = 0; 26161 cpu_buf->sample_invalid_eip = 0;
24937 } 26162 }
@@ -24949,9 +26174,9 @@ diff -urNp linux-2.6.32.10/drivers/oprofile/oprofile_stats.c linux-2.6.32.10/dri
24949 } 26174 }
24950 26175
24951 26176
24952diff -urNp linux-2.6.32.10/drivers/oprofile/oprofile_stats.h linux-2.6.32.10/drivers/oprofile/oprofile_stats.h 26177diff -urNp linux-2.6.32.11/drivers/oprofile/oprofile_stats.h linux-2.6.32.11/drivers/oprofile/oprofile_stats.h
24953--- linux-2.6.32.10/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400 26178--- linux-2.6.32.11/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400
24954+++ linux-2.6.32.10/drivers/oprofile/oprofile_stats.h 2010-03-20 15:58:47.086042900 -0400 26179+++ linux-2.6.32.11/drivers/oprofile/oprofile_stats.h 2010-04-04 20:46:41.609229988 -0400
24955@@ -13,11 +13,11 @@ 26180@@ -13,11 +13,11 @@
24956 #include <asm/atomic.h> 26181 #include <asm/atomic.h>
24957 26182
@@ -24969,9 +26194,9 @@ diff -urNp linux-2.6.32.10/drivers/oprofile/oprofile_stats.h linux-2.6.32.10/dri
24969 }; 26194 };
24970 26195
24971 extern struct oprofile_stat_struct oprofile_stats; 26196 extern struct oprofile_stat_struct oprofile_stats;
24972diff -urNp linux-2.6.32.10/drivers/parisc/pdc_stable.c linux-2.6.32.10/drivers/parisc/pdc_stable.c 26197diff -urNp linux-2.6.32.11/drivers/parisc/pdc_stable.c linux-2.6.32.11/drivers/parisc/pdc_stable.c
24973--- linux-2.6.32.10/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400 26198--- linux-2.6.32.11/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400
24974+++ linux-2.6.32.10/drivers/parisc/pdc_stable.c 2010-03-20 15:58:47.086042900 -0400 26199+++ linux-2.6.32.11/drivers/parisc/pdc_stable.c 2010-04-04 20:46:41.609229988 -0400
24975@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj 26200@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
24976 return ret; 26201 return ret;
24977 } 26202 }
@@ -24981,9 +26206,9 @@ diff -urNp linux-2.6.32.10/drivers/parisc/pdc_stable.c linux-2.6.32.10/drivers/p
24981 .show = pdcspath_attr_show, 26206 .show = pdcspath_attr_show,
24982 .store = pdcspath_attr_store, 26207 .store = pdcspath_attr_store,
24983 }; 26208 };
24984diff -urNp linux-2.6.32.10/drivers/parport/procfs.c linux-2.6.32.10/drivers/parport/procfs.c 26209diff -urNp linux-2.6.32.11/drivers/parport/procfs.c linux-2.6.32.11/drivers/parport/procfs.c
24985--- linux-2.6.32.10/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400 26210--- linux-2.6.32.11/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400
24986+++ linux-2.6.32.10/drivers/parport/procfs.c 2010-03-20 15:58:47.086042900 -0400 26211+++ linux-2.6.32.11/drivers/parport/procfs.c 2010-04-04 20:46:41.609229988 -0400
24987@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t 26212@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
24988 26213
24989 *ppos += len; 26214 *ppos += len;
@@ -25002,9 +26227,9 @@ diff -urNp linux-2.6.32.10/drivers/parport/procfs.c linux-2.6.32.10/drivers/parp
25002 } 26227 }
25003 #endif /* IEEE1284.3 support. */ 26228 #endif /* IEEE1284.3 support. */
25004 26229
25005diff -urNp linux-2.6.32.10/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.10/drivers/pci/hotplug/acpiphp_glue.c 26230diff -urNp linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c
25006--- linux-2.6.32.10/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400 26231--- linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400
25007+++ linux-2.6.32.10/drivers/pci/hotplug/acpiphp_glue.c 2010-03-20 15:58:47.086042900 -0400 26232+++ linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c 2010-04-04 20:46:41.609229988 -0400
25008@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif 26233@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
25009 } 26234 }
25010 26235
@@ -25014,9 +26239,9 @@ diff -urNp linux-2.6.32.10/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.10/dr
25014 .handler = handle_hotplug_event_func, 26239 .handler = handle_hotplug_event_func,
25015 }; 26240 };
25016 26241
25017diff -urNp linux-2.6.32.10/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.10/drivers/pci/hotplug/cpqphp_nvram.c 26242diff -urNp linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c
25018--- linux-2.6.32.10/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400 26243--- linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400
25019+++ linux-2.6.32.10/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-20 15:58:47.086042900 -0400 26244+++ linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c 2010-04-04 20:46:41.609229988 -0400
25020@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ 26245@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
25021 26246
25022 void compaq_nvram_init (void __iomem *rom_start) 26247 void compaq_nvram_init (void __iomem *rom_start)
@@ -25031,9 +26256,9 @@ diff -urNp linux-2.6.32.10/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.10/dr
25031 dbg("int15 entry = %p\n", compaq_int15_entry_point); 26256 dbg("int15 entry = %p\n", compaq_int15_entry_point);
25032 26257
25033 /* initialize our int15 lock */ 26258 /* initialize our int15 lock */
25034diff -urNp linux-2.6.32.10/drivers/pci/hotplug/fakephp.c linux-2.6.32.10/drivers/pci/hotplug/fakephp.c 26259diff -urNp linux-2.6.32.11/drivers/pci/hotplug/fakephp.c linux-2.6.32.11/drivers/pci/hotplug/fakephp.c
25035--- linux-2.6.32.10/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400 26260--- linux-2.6.32.11/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400
25036+++ linux-2.6.32.10/drivers/pci/hotplug/fakephp.c 2010-03-20 15:58:47.086042900 -0400 26261+++ linux-2.6.32.11/drivers/pci/hotplug/fakephp.c 2010-04-04 20:46:41.609229988 -0400
25037@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec 26262@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
25038 } 26263 }
25039 26264
@@ -25043,9 +26268,9 @@ diff -urNp linux-2.6.32.10/drivers/pci/hotplug/fakephp.c linux-2.6.32.10/drivers
25043 .store = legacy_store, .show = legacy_show 26268 .store = legacy_store, .show = legacy_show
25044 }, 26269 },
25045 .release = &legacy_release, 26270 .release = &legacy_release,
25046diff -urNp linux-2.6.32.10/drivers/pci/intel-iommu.c linux-2.6.32.10/drivers/pci/intel-iommu.c 26271diff -urNp linux-2.6.32.11/drivers/pci/intel-iommu.c linux-2.6.32.11/drivers/pci/intel-iommu.c
25047--- linux-2.6.32.10/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400 26272--- linux-2.6.32.11/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400
25048+++ linux-2.6.32.10/drivers/pci/intel-iommu.c 2010-03-20 15:58:47.086042900 -0400 26273+++ linux-2.6.32.11/drivers/pci/intel-iommu.c 2010-04-04 20:46:41.609229988 -0400
25049@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de 26274@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de
25050 return !dma_addr; 26275 return !dma_addr;
25051 } 26276 }
@@ -25055,9 +26280,9 @@ diff -urNp linux-2.6.32.10/drivers/pci/intel-iommu.c linux-2.6.32.10/drivers/pci
25055 .alloc_coherent = intel_alloc_coherent, 26280 .alloc_coherent = intel_alloc_coherent,
25056 .free_coherent = intel_free_coherent, 26281 .free_coherent = intel_free_coherent,
25057 .map_sg = intel_map_sg, 26282 .map_sg = intel_map_sg,
25058diff -urNp linux-2.6.32.10/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.10/drivers/pci/pcie/portdrv_pci.c 26283diff -urNp linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c
25059--- linux-2.6.32.10/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400 26284--- linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400
25060+++ linux-2.6.32.10/drivers/pci/pcie/portdrv_pci.c 2010-03-20 15:58:47.086042900 -0400 26285+++ linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c 2010-04-04 20:46:41.609229988 -0400
25061@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru 26286@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru
25062 static const struct pci_device_id port_pci_ids[] = { { 26287 static const struct pci_device_id port_pci_ids[] = { {
25063 /* handle any PCI-Express port */ 26288 /* handle any PCI-Express port */
@@ -25067,9 +26292,9 @@ diff -urNp linux-2.6.32.10/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.10/driver
25067 }; 26292 };
25068 MODULE_DEVICE_TABLE(pci, port_pci_ids); 26293 MODULE_DEVICE_TABLE(pci, port_pci_ids);
25069 26294
25070diff -urNp linux-2.6.32.10/drivers/pci/proc.c linux-2.6.32.10/drivers/pci/proc.c 26295diff -urNp linux-2.6.32.11/drivers/pci/proc.c linux-2.6.32.11/drivers/pci/proc.c
25071--- linux-2.6.32.10/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400 26296--- linux-2.6.32.11/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400
25072+++ linux-2.6.32.10/drivers/pci/proc.c 2010-03-20 15:58:47.086042900 -0400 26297+++ linux-2.6.32.11/drivers/pci/proc.c 2010-04-04 20:46:41.609229988 -0400
25073@@ -480,7 +480,16 @@ static const struct file_operations proc 26298@@ -480,7 +480,16 @@ static const struct file_operations proc
25074 static int __init pci_proc_init(void) 26299 static int __init pci_proc_init(void)
25075 { 26300 {
@@ -25087,9 +26312,9 @@ diff -urNp linux-2.6.32.10/drivers/pci/proc.c linux-2.6.32.10/drivers/pci/proc.c
25087 proc_create("devices", 0, proc_bus_pci_dir, 26312 proc_create("devices", 0, proc_bus_pci_dir,
25088 &proc_bus_pci_dev_operations); 26313 &proc_bus_pci_dev_operations);
25089 proc_initialized = 1; 26314 proc_initialized = 1;
25090diff -urNp linux-2.6.32.10/drivers/pci/slot.c linux-2.6.32.10/drivers/pci/slot.c 26315diff -urNp linux-2.6.32.11/drivers/pci/slot.c linux-2.6.32.11/drivers/pci/slot.c
25091--- linux-2.6.32.10/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400 26316--- linux-2.6.32.11/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400
25092+++ linux-2.6.32.10/drivers/pci/slot.c 2010-03-20 15:58:47.086042900 -0400 26317+++ linux-2.6.32.11/drivers/pci/slot.c 2010-04-04 20:46:41.609229988 -0400
25093@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc 26318@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
25094 return attribute->store ? attribute->store(slot, buf, len) : -EIO; 26319 return attribute->store ? attribute->store(slot, buf, len) : -EIO;
25095 } 26320 }
@@ -25099,9 +26324,9 @@ diff -urNp linux-2.6.32.10/drivers/pci/slot.c linux-2.6.32.10/drivers/pci/slot.c
25099 .show = pci_slot_attr_show, 26324 .show = pci_slot_attr_show,
25100 .store = pci_slot_attr_store, 26325 .store = pci_slot_attr_store,
25101 }; 26326 };
25102diff -urNp linux-2.6.32.10/drivers/pcmcia/ti113x.h linux-2.6.32.10/drivers/pcmcia/ti113x.h 26327diff -urNp linux-2.6.32.11/drivers/pcmcia/ti113x.h linux-2.6.32.11/drivers/pcmcia/ti113x.h
25103--- linux-2.6.32.10/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400 26328--- linux-2.6.32.11/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400
25104+++ linux-2.6.32.10/drivers/pcmcia/ti113x.h 2010-03-20 15:58:47.086042900 -0400 26329+++ linux-2.6.32.11/drivers/pcmcia/ti113x.h 2010-04-04 20:46:41.609229988 -0400
25105@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl 26330@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl
25106 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, 26331 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
25107 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), 26332 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
@@ -25111,9 +26336,9 @@ diff -urNp linux-2.6.32.10/drivers/pcmcia/ti113x.h linux-2.6.32.10/drivers/pcmci
25111 }; 26336 };
25112 26337
25113 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) 26338 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
25114diff -urNp linux-2.6.32.10/drivers/pcmcia/yenta_socket.c linux-2.6.32.10/drivers/pcmcia/yenta_socket.c 26339diff -urNp linux-2.6.32.11/drivers/pcmcia/yenta_socket.c linux-2.6.32.11/drivers/pcmcia/yenta_socket.c
25115--- linux-2.6.32.10/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400 26340--- linux-2.6.32.11/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400
25116+++ linux-2.6.32.10/drivers/pcmcia/yenta_socket.c 2010-03-20 15:58:47.086042900 -0400 26341+++ linux-2.6.32.11/drivers/pcmcia/yenta_socket.c 2010-04-04 20:46:41.609229988 -0400
25117@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table 26342@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
25118 26343
25119 /* match any cardbus bridge */ 26344 /* match any cardbus bridge */
@@ -25123,9 +26348,9 @@ diff -urNp linux-2.6.32.10/drivers/pcmcia/yenta_socket.c linux-2.6.32.10/drivers
25123 }; 26348 };
25124 MODULE_DEVICE_TABLE(pci, yenta_table); 26349 MODULE_DEVICE_TABLE(pci, yenta_table);
25125 26350
25126diff -urNp linux-2.6.32.10/drivers/platform/x86/acer-wmi.c linux-2.6.32.10/drivers/platform/x86/acer-wmi.c 26351diff -urNp linux-2.6.32.11/drivers/platform/x86/acer-wmi.c linux-2.6.32.11/drivers/platform/x86/acer-wmi.c
25127--- linux-2.6.32.10/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400 26352--- linux-2.6.32.11/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400
25128+++ linux-2.6.32.10/drivers/platform/x86/acer-wmi.c 2010-03-20 15:58:47.086042900 -0400 26353+++ linux-2.6.32.11/drivers/platform/x86/acer-wmi.c 2010-04-04 20:46:41.609229988 -0400
25129@@ -918,7 +918,7 @@ static int update_bl_status(struct backl 26354@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
25130 return 0; 26355 return 0;
25131 } 26356 }
@@ -25135,9 +26360,9 @@ diff -urNp linux-2.6.32.10/drivers/platform/x86/acer-wmi.c linux-2.6.32.10/drive
25135 .get_brightness = read_brightness, 26360 .get_brightness = read_brightness,
25136 .update_status = update_bl_status, 26361 .update_status = update_bl_status,
25137 }; 26362 };
25138diff -urNp linux-2.6.32.10/drivers/platform/x86/asus_acpi.c linux-2.6.32.10/drivers/platform/x86/asus_acpi.c 26363diff -urNp linux-2.6.32.11/drivers/platform/x86/asus_acpi.c linux-2.6.32.11/drivers/platform/x86/asus_acpi.c
25139--- linux-2.6.32.10/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400 26364--- linux-2.6.32.11/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400
25140+++ linux-2.6.32.10/drivers/platform/x86/asus_acpi.c 2010-03-20 15:58:47.086042900 -0400 26365+++ linux-2.6.32.11/drivers/platform/x86/asus_acpi.c 2010-04-04 20:46:41.609229988 -0400
25141@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ 26366@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
25142 return 0; 26367 return 0;
25143 } 26368 }
@@ -25147,9 +26372,9 @@ diff -urNp linux-2.6.32.10/drivers/platform/x86/asus_acpi.c linux-2.6.32.10/driv
25147 .get_brightness = read_brightness, 26372 .get_brightness = read_brightness,
25148 .update_status = set_brightness_status, 26373 .update_status = set_brightness_status,
25149 }; 26374 };
25150diff -urNp linux-2.6.32.10/drivers/platform/x86/asus-laptop.c linux-2.6.32.10/drivers/platform/x86/asus-laptop.c 26375diff -urNp linux-2.6.32.11/drivers/platform/x86/asus-laptop.c linux-2.6.32.11/drivers/platform/x86/asus-laptop.c
25151--- linux-2.6.32.10/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400 26376--- linux-2.6.32.11/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400
25152+++ linux-2.6.32.10/drivers/platform/x86/asus-laptop.c 2010-03-20 15:58:47.086042900 -0400 26377+++ linux-2.6.32.11/drivers/platform/x86/asus-laptop.c 2010-04-04 20:46:41.609229988 -0400
25153@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac 26378@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
25154 */ 26379 */
25155 static int read_brightness(struct backlight_device *bd); 26380 static int read_brightness(struct backlight_device *bd);
@@ -25159,9 +26384,9 @@ diff -urNp linux-2.6.32.10/drivers/platform/x86/asus-laptop.c linux-2.6.32.10/dr
25159 .get_brightness = read_brightness, 26384 .get_brightness = read_brightness,
25160 .update_status = update_bl_status, 26385 .update_status = update_bl_status,
25161 }; 26386 };
25162diff -urNp linux-2.6.32.10/drivers/platform/x86/compal-laptop.c linux-2.6.32.10/drivers/platform/x86/compal-laptop.c 26387diff -urNp linux-2.6.32.11/drivers/platform/x86/compal-laptop.c linux-2.6.32.11/drivers/platform/x86/compal-laptop.c
25163--- linux-2.6.32.10/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400 26388--- linux-2.6.32.11/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400
25164+++ linux-2.6.32.10/drivers/platform/x86/compal-laptop.c 2010-03-20 15:58:47.090064442 -0400 26389+++ linux-2.6.32.11/drivers/platform/x86/compal-laptop.c 2010-04-04 20:46:41.612789562 -0400
25165@@ -163,7 +163,7 @@ static int bl_update_status(struct backl 26390@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
25166 return set_lcd_level(b->props.brightness); 26391 return set_lcd_level(b->props.brightness);
25167 } 26392 }
@@ -25171,9 +26396,9 @@ diff -urNp linux-2.6.32.10/drivers/platform/x86/compal-laptop.c linux-2.6.32.10/
25171 .get_brightness = bl_get_brightness, 26396 .get_brightness = bl_get_brightness,
25172 .update_status = bl_update_status, 26397 .update_status = bl_update_status,
25173 }; 26398 };
25174diff -urNp linux-2.6.32.10/drivers/platform/x86/dell-laptop.c linux-2.6.32.10/drivers/platform/x86/dell-laptop.c 26399diff -urNp linux-2.6.32.11/drivers/platform/x86/dell-laptop.c linux-2.6.32.11/drivers/platform/x86/dell-laptop.c
25175--- linux-2.6.32.10/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400 26400--- linux-2.6.32.11/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400
25176+++ linux-2.6.32.10/drivers/platform/x86/dell-laptop.c 2010-03-20 15:58:47.090064442 -0400 26401+++ linux-2.6.32.11/drivers/platform/x86/dell-laptop.c 2010-04-04 20:46:41.612789562 -0400
25177@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac 26402@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
25178 return buffer.output[1]; 26403 return buffer.output[1];
25179 } 26404 }
@@ -25183,9 +26408,9 @@ diff -urNp linux-2.6.32.10/drivers/platform/x86/dell-laptop.c linux-2.6.32.10/dr
25183 .get_brightness = dell_get_intensity, 26408 .get_brightness = dell_get_intensity,
25184 .update_status = dell_send_intensity, 26409 .update_status = dell_send_intensity,
25185 }; 26410 };
25186diff -urNp linux-2.6.32.10/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.10/drivers/platform/x86/eeepc-laptop.c 26411diff -urNp linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c
25187--- linux-2.6.32.10/drivers/platform/x86/eeepc-laptop.c 2010-03-15 11:52:04.000000000 -0400 26412--- linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c 2010-03-15 11:52:04.000000000 -0400
25188+++ linux-2.6.32.10/drivers/platform/x86/eeepc-laptop.c 2010-03-20 15:58:47.090064442 -0400 26413+++ linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c 2010-04-04 20:46:41.612789562 -0400
25189@@ -242,7 +242,7 @@ static struct device *eeepc_hwmon_device 26414@@ -242,7 +242,7 @@ static struct device *eeepc_hwmon_device
25190 */ 26415 */
25191 static int read_brightness(struct backlight_device *bd); 26416 static int read_brightness(struct backlight_device *bd);
@@ -25195,9 +26420,9 @@ diff -urNp linux-2.6.32.10/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.10/d
25195 .get_brightness = read_brightness, 26420 .get_brightness = read_brightness,
25196 .update_status = update_bl_status, 26421 .update_status = update_bl_status,
25197 }; 26422 };
25198diff -urNp linux-2.6.32.10/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.10/drivers/platform/x86/fujitsu-laptop.c 26423diff -urNp linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c
25199--- linux-2.6.32.10/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400 26424--- linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400
25200+++ linux-2.6.32.10/drivers/platform/x86/fujitsu-laptop.c 2010-03-20 15:58:47.090064442 -0400 26425+++ linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c 2010-04-04 20:46:41.612789562 -0400
25201@@ -436,7 +436,7 @@ static int bl_update_status(struct backl 26426@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
25202 return ret; 26427 return ret;
25203 } 26428 }
@@ -25207,9 +26432,9 @@ diff -urNp linux-2.6.32.10/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.10
25207 .get_brightness = bl_get_brightness, 26432 .get_brightness = bl_get_brightness,
25208 .update_status = bl_update_status, 26433 .update_status = bl_update_status,
25209 }; 26434 };
25210diff -urNp linux-2.6.32.10/drivers/platform/x86/msi-laptop.c linux-2.6.32.10/drivers/platform/x86/msi-laptop.c 26435diff -urNp linux-2.6.32.11/drivers/platform/x86/msi-laptop.c linux-2.6.32.11/drivers/platform/x86/msi-laptop.c
25211--- linux-2.6.32.10/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400 26436--- linux-2.6.32.11/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400
25212+++ linux-2.6.32.10/drivers/platform/x86/msi-laptop.c 2010-03-20 15:58:47.090064442 -0400 26437+++ linux-2.6.32.11/drivers/platform/x86/msi-laptop.c 2010-04-04 20:46:41.612789562 -0400
25213@@ -161,7 +161,7 @@ static int bl_update_status(struct backl 26438@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
25214 return set_lcd_level(b->props.brightness); 26439 return set_lcd_level(b->props.brightness);
25215 } 26440 }
@@ -25219,9 +26444,9 @@ diff -urNp linux-2.6.32.10/drivers/platform/x86/msi-laptop.c linux-2.6.32.10/dri
25219 .get_brightness = bl_get_brightness, 26444 .get_brightness = bl_get_brightness,
25220 .update_status = bl_update_status, 26445 .update_status = bl_update_status,
25221 }; 26446 };
25222diff -urNp linux-2.6.32.10/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.10/drivers/platform/x86/panasonic-laptop.c 26447diff -urNp linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c
25223--- linux-2.6.32.10/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400 26448--- linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400
25224+++ linux-2.6.32.10/drivers/platform/x86/panasonic-laptop.c 2010-03-20 15:58:47.090064442 -0400 26449+++ linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c 2010-04-04 20:46:41.612789562 -0400
25225@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh 26450@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
25226 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); 26451 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
25227 } 26452 }
@@ -25231,9 +26456,9 @@ diff -urNp linux-2.6.32.10/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.
25231 .get_brightness = bl_get, 26456 .get_brightness = bl_get,
25232 .update_status = bl_set_status, 26457 .update_status = bl_set_status,
25233 }; 26458 };
25234diff -urNp linux-2.6.32.10/drivers/platform/x86/sony-laptop.c linux-2.6.32.10/drivers/platform/x86/sony-laptop.c 26459diff -urNp linux-2.6.32.11/drivers/platform/x86/sony-laptop.c linux-2.6.32.11/drivers/platform/x86/sony-laptop.c
25235--- linux-2.6.32.10/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400 26460--- linux-2.6.32.11/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400
25236+++ linux-2.6.32.10/drivers/platform/x86/sony-laptop.c 2010-03-20 15:58:47.090064442 -0400 26461+++ linux-2.6.32.11/drivers/platform/x86/sony-laptop.c 2010-04-04 20:46:41.612789562 -0400
25237@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness 26462@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
25238 } 26463 }
25239 26464
@@ -25243,9 +26468,9 @@ diff -urNp linux-2.6.32.10/drivers/platform/x86/sony-laptop.c linux-2.6.32.10/dr
25243 .update_status = sony_backlight_update_status, 26468 .update_status = sony_backlight_update_status,
25244 .get_brightness = sony_backlight_get_brightness, 26469 .get_brightness = sony_backlight_get_brightness,
25245 }; 26470 };
25246diff -urNp linux-2.6.32.10/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.10/drivers/platform/x86/thinkpad_acpi.c 26471diff -urNp linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c
25247--- linux-2.6.32.10/drivers/platform/x86/thinkpad_acpi.c 2010-03-15 11:52:04.000000000 -0400 26472--- linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c 2010-03-15 11:52:04.000000000 -0400
25248+++ linux-2.6.32.10/drivers/platform/x86/thinkpad_acpi.c 2010-03-20 15:58:47.090064442 -0400 26473+++ linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c 2010-04-04 20:46:41.612789562 -0400
25249@@ -6083,7 +6083,7 @@ static int brightness_get(struct backlig 26474@@ -6083,7 +6083,7 @@ static int brightness_get(struct backlig
25250 return status & TP_EC_BACKLIGHT_LVLMSK; 26475 return status & TP_EC_BACKLIGHT_LVLMSK;
25251 } 26476 }
@@ -25255,9 +26480,9 @@ diff -urNp linux-2.6.32.10/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.10/
25255 .get_brightness = brightness_get, 26480 .get_brightness = brightness_get,
25256 .update_status = brightness_update_status, 26481 .update_status = brightness_update_status,
25257 }; 26482 };
25258diff -urNp linux-2.6.32.10/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.10/drivers/platform/x86/toshiba_acpi.c 26483diff -urNp linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c
25259--- linux-2.6.32.10/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400 26484--- linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400
25260+++ linux-2.6.32.10/drivers/platform/x86/toshiba_acpi.c 2010-03-20 15:58:47.090064442 -0400 26485+++ linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c 2010-04-04 20:46:41.612789562 -0400
25261@@ -671,7 +671,7 @@ static acpi_status remove_device(void) 26486@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
25262 return AE_OK; 26487 return AE_OK;
25263 } 26488 }
@@ -25267,9 +26492,9 @@ diff -urNp linux-2.6.32.10/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.10/d
25267 .get_brightness = get_lcd, 26492 .get_brightness = get_lcd,
25268 .update_status = set_lcd_status, 26493 .update_status = set_lcd_status,
25269 }; 26494 };
25270diff -urNp linux-2.6.32.10/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.10/drivers/pnp/pnpbios/bioscalls.c 26495diff -urNp linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c
25271--- linux-2.6.32.10/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400 26496--- linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400
25272+++ linux-2.6.32.10/drivers/pnp/pnpbios/bioscalls.c 2010-03-20 15:58:47.090064442 -0400 26497+++ linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c 2010-04-04 20:46:41.612789562 -0400
25273@@ -60,7 +60,7 @@ do { \ 26498@@ -60,7 +60,7 @@ do { \
25274 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ 26499 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
25275 } while(0) 26500 } while(0)
@@ -25326,9 +26551,9 @@ diff -urNp linux-2.6.32.10/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.10/drive
25326+ 26551+
25327+ pax_close_kernel(); 26552+ pax_close_kernel();
25328 } 26553 }
25329diff -urNp linux-2.6.32.10/drivers/pnp/quirks.c linux-2.6.32.10/drivers/pnp/quirks.c 26554diff -urNp linux-2.6.32.11/drivers/pnp/quirks.c linux-2.6.32.11/drivers/pnp/quirks.c
25330--- linux-2.6.32.10/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400 26555--- linux-2.6.32.11/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400
25331+++ linux-2.6.32.10/drivers/pnp/quirks.c 2010-03-20 15:58:47.090064442 -0400 26556+++ linux-2.6.32.11/drivers/pnp/quirks.c 2010-04-04 20:46:41.612789562 -0400
25332@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { 26557@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
25333 /* PnP resources that might overlap PCI BARs */ 26558 /* PnP resources that might overlap PCI BARs */
25334 {"PNP0c01", quirk_system_pci_resources}, 26559 {"PNP0c01", quirk_system_pci_resources},
@@ -25338,9 +26563,9 @@ diff -urNp linux-2.6.32.10/drivers/pnp/quirks.c linux-2.6.32.10/drivers/pnp/quir
25338 }; 26563 };
25339 26564
25340 void pnp_fixup_device(struct pnp_dev *dev) 26565 void pnp_fixup_device(struct pnp_dev *dev)
25341diff -urNp linux-2.6.32.10/drivers/pnp/resource.c linux-2.6.32.10/drivers/pnp/resource.c 26566diff -urNp linux-2.6.32.11/drivers/pnp/resource.c linux-2.6.32.11/drivers/pnp/resource.c
25342--- linux-2.6.32.10/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400 26567--- linux-2.6.32.11/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400
25343+++ linux-2.6.32.10/drivers/pnp/resource.c 2010-03-20 15:58:47.090064442 -0400 26568+++ linux-2.6.32.11/drivers/pnp/resource.c 2010-04-04 20:46:41.612789562 -0400
25344@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s 26569@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
25345 return 1; 26570 return 1;
25346 26571
@@ -25359,9 +26584,9 @@ diff -urNp linux-2.6.32.10/drivers/pnp/resource.c linux-2.6.32.10/drivers/pnp/re
25359 return 0; 26584 return 0;
25360 26585
25361 /* check if the resource is reserved */ 26586 /* check if the resource is reserved */
25362diff -urNp linux-2.6.32.10/drivers/s390/cio/qdio_perf.c linux-2.6.32.10/drivers/s390/cio/qdio_perf.c 26587diff -urNp linux-2.6.32.11/drivers/s390/cio/qdio_perf.c linux-2.6.32.11/drivers/s390/cio/qdio_perf.c
25363--- linux-2.6.32.10/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400 26588--- linux-2.6.32.11/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400
25364+++ linux-2.6.32.10/drivers/s390/cio/qdio_perf.c 2010-03-20 15:58:47.090064442 -0400 26589+++ linux-2.6.32.11/drivers/s390/cio/qdio_perf.c 2010-04-04 20:46:41.612789562 -0400
25365@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ 26590@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
25366 static int qdio_perf_proc_show(struct seq_file *m, void *v) 26591 static int qdio_perf_proc_show(struct seq_file *m, void *v)
25367 { 26592 {
@@ -25437,9 +26662,9 @@ diff -urNp linux-2.6.32.10/drivers/s390/cio/qdio_perf.c linux-2.6.32.10/drivers/
25437 seq_printf(m, "\n"); 26662 seq_printf(m, "\n");
25438 return 0; 26663 return 0;
25439 } 26664 }
25440diff -urNp linux-2.6.32.10/drivers/s390/cio/qdio_perf.h linux-2.6.32.10/drivers/s390/cio/qdio_perf.h 26665diff -urNp linux-2.6.32.11/drivers/s390/cio/qdio_perf.h linux-2.6.32.11/drivers/s390/cio/qdio_perf.h
25441--- linux-2.6.32.10/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400 26666--- linux-2.6.32.11/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400
25442+++ linux-2.6.32.10/drivers/s390/cio/qdio_perf.h 2010-03-20 15:58:47.090064442 -0400 26667+++ linux-2.6.32.11/drivers/s390/cio/qdio_perf.h 2010-04-04 20:46:41.612789562 -0400
25443@@ -13,46 +13,46 @@ 26668@@ -13,46 +13,46 @@
25444 26669
25445 struct qdio_perf_stats { 26670 struct qdio_perf_stats {
@@ -25512,9 +26737,9 @@ diff -urNp linux-2.6.32.10/drivers/s390/cio/qdio_perf.h linux-2.6.32.10/drivers/
25512 } 26737 }
25513 26738
25514 int qdio_setup_perf_stats(void); 26739 int qdio_setup_perf_stats(void);
25515diff -urNp linux-2.6.32.10/drivers/scsi/ipr.c linux-2.6.32.10/drivers/scsi/ipr.c 26740diff -urNp linux-2.6.32.11/drivers/scsi/ipr.c linux-2.6.32.11/drivers/scsi/ipr.c
25516--- linux-2.6.32.10/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400 26741--- linux-2.6.32.11/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400
25517+++ linux-2.6.32.10/drivers/scsi/ipr.c 2010-03-20 15:58:47.094061510 -0400 26742+++ linux-2.6.32.11/drivers/scsi/ipr.c 2010-04-04 20:46:41.616874360 -0400
25518@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q 26743@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
25519 return true; 26744 return true;
25520 } 26745 }
@@ -25524,9 +26749,9 @@ diff -urNp linux-2.6.32.10/drivers/scsi/ipr.c linux-2.6.32.10/drivers/scsi/ipr.c
25524 .phy_reset = ipr_ata_phy_reset, 26749 .phy_reset = ipr_ata_phy_reset,
25525 .hardreset = ipr_sata_reset, 26750 .hardreset = ipr_sata_reset,
25526 .post_internal_cmd = ipr_ata_post_internal, 26751 .post_internal_cmd = ipr_ata_post_internal,
25527diff -urNp linux-2.6.32.10/drivers/scsi/libfc/fc_exch.c linux-2.6.32.10/drivers/scsi/libfc/fc_exch.c 26752diff -urNp linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c
25528--- linux-2.6.32.10/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400 26753--- linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400
25529+++ linux-2.6.32.10/drivers/scsi/libfc/fc_exch.c 2010-03-20 15:58:47.094061510 -0400 26754+++ linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c 2010-04-04 20:46:41.616874360 -0400
25530@@ -86,12 +86,12 @@ struct fc_exch_mgr { 26755@@ -86,12 +86,12 @@ struct fc_exch_mgr {
25531 * all together if not used XXX 26756 * all together if not used XXX
25532 */ 26757 */
@@ -25648,9 +26873,9 @@ diff -urNp linux-2.6.32.10/drivers/scsi/libfc/fc_exch.c linux-2.6.32.10/drivers/
25648 26873
25649 fc_frame_free(fp); 26874 fc_frame_free(fp);
25650 } 26875 }
25651diff -urNp linux-2.6.32.10/drivers/scsi/libsas/sas_ata.c linux-2.6.32.10/drivers/scsi/libsas/sas_ata.c 26876diff -urNp linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c
25652--- linux-2.6.32.10/drivers/scsi/libsas/sas_ata.c 2010-03-15 11:52:04.000000000 -0400 26877--- linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c 2010-03-15 11:52:04.000000000 -0400
25653+++ linux-2.6.32.10/drivers/scsi/libsas/sas_ata.c 2010-03-20 15:58:47.094061510 -0400 26878+++ linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c 2010-04-04 20:46:41.616874360 -0400
25654@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l 26879@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
25655 } 26880 }
25656 } 26881 }
@@ -25660,9 +26885,9 @@ diff -urNp linux-2.6.32.10/drivers/scsi/libsas/sas_ata.c linux-2.6.32.10/drivers
25660 .phy_reset = sas_ata_phy_reset, 26885 .phy_reset = sas_ata_phy_reset,
25661 .post_internal_cmd = sas_ata_post_internal, 26886 .post_internal_cmd = sas_ata_post_internal,
25662 .qc_prep = ata_noop_qc_prep, 26887 .qc_prep = ata_noop_qc_prep,
25663diff -urNp linux-2.6.32.10/drivers/scsi/scsi_logging.h linux-2.6.32.10/drivers/scsi/scsi_logging.h 26888diff -urNp linux-2.6.32.11/drivers/scsi/scsi_logging.h linux-2.6.32.11/drivers/scsi/scsi_logging.h
25664--- linux-2.6.32.10/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400 26889--- linux-2.6.32.11/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400
25665+++ linux-2.6.32.10/drivers/scsi/scsi_logging.h 2010-03-20 15:58:47.094061510 -0400 26890+++ linux-2.6.32.11/drivers/scsi/scsi_logging.h 2010-04-04 20:46:41.616874360 -0400
25666@@ -51,7 +51,7 @@ do { \ 26891@@ -51,7 +51,7 @@ do { \
25667 } while (0); \ 26892 } while (0); \
25668 } while (0) 26893 } while (0)
@@ -25672,9 +26897,9 @@ diff -urNp linux-2.6.32.10/drivers/scsi/scsi_logging.h linux-2.6.32.10/drivers/s
25672 #endif /* CONFIG_SCSI_LOGGING */ 26897 #endif /* CONFIG_SCSI_LOGGING */
25673 26898
25674 /* 26899 /*
25675diff -urNp linux-2.6.32.10/drivers/scsi/sg.c linux-2.6.32.10/drivers/scsi/sg.c 26900diff -urNp linux-2.6.32.11/drivers/scsi/sg.c linux-2.6.32.11/drivers/scsi/sg.c
25676--- linux-2.6.32.10/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400 26901--- linux-2.6.32.11/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400
25677+++ linux-2.6.32.10/drivers/scsi/sg.c 2010-03-20 15:58:47.094061510 -0400 26902+++ linux-2.6.32.11/drivers/scsi/sg.c 2010-04-04 20:46:41.616874360 -0400
25678@@ -2292,7 +2292,7 @@ struct sg_proc_leaf { 26903@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
25679 const struct file_operations * fops; 26904 const struct file_operations * fops;
25680 }; 26905 };
@@ -25693,9 +26918,9 @@ diff -urNp linux-2.6.32.10/drivers/scsi/sg.c linux-2.6.32.10/drivers/scsi/sg.c
25693 26918
25694 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); 26919 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
25695 if (!sg_proc_sgp) 26920 if (!sg_proc_sgp)
25696diff -urNp linux-2.6.32.10/drivers/serial/8250_pci.c linux-2.6.32.10/drivers/serial/8250_pci.c 26921diff -urNp linux-2.6.32.11/drivers/serial/8250_pci.c linux-2.6.32.11/drivers/serial/8250_pci.c
25697--- linux-2.6.32.10/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400 26922--- linux-2.6.32.11/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400
25698+++ linux-2.6.32.10/drivers/serial/8250_pci.c 2010-03-20 15:58:47.094061510 -0400 26923+++ linux-2.6.32.11/drivers/serial/8250_pci.c 2010-04-04 20:46:41.616874360 -0400
25699@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t 26924@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
25700 PCI_ANY_ID, PCI_ANY_ID, 26925 PCI_ANY_ID, PCI_ANY_ID,
25701 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, 26926 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
@@ -25705,9 +26930,9 @@ diff -urNp linux-2.6.32.10/drivers/serial/8250_pci.c linux-2.6.32.10/drivers/ser
25705 }; 26930 };
25706 26931
25707 static struct pci_driver serial_pci_driver = { 26932 static struct pci_driver serial_pci_driver = {
25708diff -urNp linux-2.6.32.10/drivers/serial/kgdboc.c linux-2.6.32.10/drivers/serial/kgdboc.c 26933diff -urNp linux-2.6.32.11/drivers/serial/kgdboc.c linux-2.6.32.11/drivers/serial/kgdboc.c
25709--- linux-2.6.32.10/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400 26934--- linux-2.6.32.11/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400
25710+++ linux-2.6.32.10/drivers/serial/kgdboc.c 2010-03-20 15:58:47.094061510 -0400 26935+++ linux-2.6.32.11/drivers/serial/kgdboc.c 2010-04-04 20:46:41.616874360 -0400
25711@@ -18,7 +18,7 @@ 26936@@ -18,7 +18,7 @@
25712 26937
25713 #define MAX_CONFIG_LEN 40 26938 #define MAX_CONFIG_LEN 40
@@ -25726,9 +26951,9 @@ diff -urNp linux-2.6.32.10/drivers/serial/kgdboc.c linux-2.6.32.10/drivers/seria
25726 .name = "kgdboc", 26951 .name = "kgdboc",
25727 .read_char = kgdboc_get_char, 26952 .read_char = kgdboc_get_char,
25728 .write_char = kgdboc_put_char, 26953 .write_char = kgdboc_put_char,
25729diff -urNp linux-2.6.32.10/drivers/staging/android/binder.c linux-2.6.32.10/drivers/staging/android/binder.c 26954diff -urNp linux-2.6.32.11/drivers/staging/android/binder.c linux-2.6.32.11/drivers/staging/android/binder.c
25730--- linux-2.6.32.10/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400 26955--- linux-2.6.32.11/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400
25731+++ linux-2.6.32.10/drivers/staging/android/binder.c 2010-03-20 15:58:47.094061510 -0400 26956+++ linux-2.6.32.11/drivers/staging/android/binder.c 2010-04-04 20:46:41.616874360 -0400
25732@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a 26957@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
25733 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); 26958 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
25734 } 26959 }
@@ -25738,9 +26963,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/android/binder.c linux-2.6.32.10/driv
25738 .open = binder_vma_open, 26963 .open = binder_vma_open,
25739 .close = binder_vma_close, 26964 .close = binder_vma_close,
25740 }; 26965 };
25741diff -urNp linux-2.6.32.10/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.10/drivers/staging/b3dfg/b3dfg.c 26966diff -urNp linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c
25742--- linux-2.6.32.10/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400 26967--- linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400
25743+++ linux-2.6.32.10/drivers/staging/b3dfg/b3dfg.c 2010-03-20 15:58:47.094061510 -0400 26968+++ linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c 2010-04-04 20:46:41.616874360 -0400
25744@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are 26969@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
25745 return VM_FAULT_NOPAGE; 26970 return VM_FAULT_NOPAGE;
25746 } 26971 }
@@ -25759,9 +26984,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.10/drivers
25759 .owner = THIS_MODULE, 26984 .owner = THIS_MODULE,
25760 .open = b3dfg_open, 26985 .open = b3dfg_open,
25761 .release = b3dfg_release, 26986 .release = b3dfg_release,
25762diff -urNp linux-2.6.32.10/drivers/staging/comedi/comedi_fops.c linux-2.6.32.10/drivers/staging/comedi/comedi_fops.c 26987diff -urNp linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c
25763--- linux-2.6.32.10/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400 26988--- linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400
25764+++ linux-2.6.32.10/drivers/staging/comedi/comedi_fops.c 2010-03-20 15:58:47.098056258 -0400 26989+++ linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c 2010-04-04 20:46:41.616874360 -0400
25765@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct 26990@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
25766 mutex_unlock(&dev->mutex); 26991 mutex_unlock(&dev->mutex);
25767 } 26992 }
@@ -25771,9 +26996,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/comedi/comedi_fops.c linux-2.6.32.10/
25771 .close = comedi_unmap, 26996 .close = comedi_unmap,
25772 }; 26997 };
25773 26998
25774diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.10/drivers/staging/dream/qdsp5/adsp_driver.c 26999diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.11/drivers/staging/dream/qdsp5/adsp_driver.c
25775--- linux-2.6.32.10/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400 27000--- linux-2.6.32.11/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400
25776+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-20 15:58:47.098056258 -0400 27001+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/adsp_driver.c 2010-04-04 20:46:41.616874360 -0400
25777@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi 27002@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
25778 static dev_t adsp_devno; 27003 static dev_t adsp_devno;
25779 static struct class *adsp_class; 27004 static struct class *adsp_class;
@@ -25783,9 +27008,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3
25783 .owner = THIS_MODULE, 27008 .owner = THIS_MODULE,
25784 .open = adsp_open, 27009 .open = adsp_open,
25785 .unlocked_ioctl = adsp_ioctl, 27010 .unlocked_ioctl = adsp_ioctl,
25786diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_aac.c 27011diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_aac.c
25787--- linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400 27012--- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400
25788+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-20 15:58:47.098056258 -0400 27013+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_aac.c 2010-04-04 20:46:41.621505029 -0400
25789@@ -1022,7 +1022,7 @@ done: 27014@@ -1022,7 +1022,7 @@ done:
25790 return rc; 27015 return rc;
25791 } 27016 }
@@ -25795,9 +27020,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.
25795 .owner = THIS_MODULE, 27020 .owner = THIS_MODULE,
25796 .open = audio_open, 27021 .open = audio_open,
25797 .release = audio_release, 27022 .release = audio_release,
25798diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_amrnb.c 27023diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_amrnb.c
25799--- linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400 27024--- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400
25800+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-20 15:58:47.098056258 -0400 27025+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-04-04 20:46:41.621505029 -0400
25801@@ -833,7 +833,7 @@ done: 27026@@ -833,7 +833,7 @@ done:
25802 return rc; 27027 return rc;
25803 } 27028 }
@@ -25807,9 +27032,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3
25807 .owner = THIS_MODULE, 27032 .owner = THIS_MODULE,
25808 .open = audamrnb_open, 27033 .open = audamrnb_open,
25809 .release = audamrnb_release, 27034 .release = audamrnb_release,
25810diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_evrc.c 27035diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_evrc.c
25811--- linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400 27036--- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400
25812+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-20 15:58:47.098056258 -0400 27037+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_evrc.c 2010-04-04 20:46:41.621505029 -0400
25813@@ -805,7 +805,7 @@ dma_fail: 27038@@ -805,7 +805,7 @@ dma_fail:
25814 return rc; 27039 return rc;
25815 } 27040 }
@@ -25819,9 +27044,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32
25819 .owner = THIS_MODULE, 27044 .owner = THIS_MODULE,
25820 .open = audevrc_open, 27045 .open = audevrc_open,
25821 .release = audevrc_release, 27046 .release = audevrc_release,
25822diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_in.c 27047diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c
25823--- linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400 27048--- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400
25824+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_in.c 2010-03-20 15:58:47.098056258 -0400 27049+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c 2010-04-04 20:46:41.621505029 -0400
25825@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino 27050@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
25826 return 0; 27051 return 0;
25827 } 27052 }
@@ -25840,9 +27065,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.1
25840 .owner = THIS_MODULE, 27065 .owner = THIS_MODULE,
25841 .open = audpre_open, 27066 .open = audpre_open,
25842 .unlocked_ioctl = audpre_ioctl, 27067 .unlocked_ioctl = audpre_ioctl,
25843diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_mp3.c 27068diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c
25844--- linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400 27069--- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400
25845+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-20 15:58:47.098056258 -0400 27070+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c 2010-04-04 20:46:41.621505029 -0400
25846@@ -941,7 +941,7 @@ done: 27071@@ -941,7 +941,7 @@ done:
25847 return rc; 27072 return rc;
25848 } 27073 }
@@ -25852,9 +27077,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.
25852 .owner = THIS_MODULE, 27077 .owner = THIS_MODULE,
25853 .open = audio_open, 27078 .open = audio_open,
25854 .release = audio_release, 27079 .release = audio_release,
25855diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_out.c 27080diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_out.c
25856--- linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400 27081--- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400
25857+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_out.c 2010-03-20 15:58:47.098056258 -0400 27082+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_out.c 2010-04-04 20:46:41.621505029 -0400
25858@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod 27083@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
25859 return 0; 27084 return 0;
25860 } 27085 }
@@ -25873,9 +27098,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
25873 .owner = THIS_MODULE, 27098 .owner = THIS_MODULE,
25874 .open = audpp_open, 27099 .open = audpp_open,
25875 .unlocked_ioctl = audpp_ioctl, 27100 .unlocked_ioctl = audpp_ioctl,
25876diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_qcelp.c 27101diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_qcelp.c
25877--- linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400 27102--- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400
25878+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-20 15:58:47.098056258 -0400 27103+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-04-04 20:46:41.621505029 -0400
25879@@ -816,7 +816,7 @@ err: 27104@@ -816,7 +816,7 @@ err:
25880 return rc; 27105 return rc;
25881 } 27106 }
@@ -25885,9 +27110,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3
25885 .owner = THIS_MODULE, 27110 .owner = THIS_MODULE,
25886 .open = audqcelp_open, 27111 .open = audqcelp_open,
25887 .release = audqcelp_release, 27112 .release = audqcelp_release,
25888diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.10/drivers/staging/dream/qdsp5/snd.c 27113diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c
25889--- linux-2.6.32.10/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400 27114--- linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400
25890+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/snd.c 2010-03-20 15:58:47.098056258 -0400 27115+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c 2010-04-04 20:46:41.621505029 -0400
25891@@ -242,7 +242,7 @@ err: 27116@@ -242,7 +242,7 @@ err:
25892 return rc; 27117 return rc;
25893 } 27118 }
@@ -25897,9 +27122,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.10/dri
25897 .owner = THIS_MODULE, 27122 .owner = THIS_MODULE,
25898 .open = snd_open, 27123 .open = snd_open,
25899 .release = snd_release, 27124 .release = snd_release,
25900diff -urNp linux-2.6.32.10/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.10/drivers/staging/dream/smd/smd_qmi.c 27125diff -urNp linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c
25901--- linux-2.6.32.10/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400 27126--- linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400
25902+++ linux-2.6.32.10/drivers/staging/dream/smd/smd_qmi.c 2010-03-20 15:58:47.098056258 -0400 27127+++ linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c 2010-04-04 20:46:41.621505029 -0400
25903@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, 27128@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
25904 return 0; 27129 return 0;
25905 } 27130 }
@@ -25909,9 +27134,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.10/d
25909 .owner = THIS_MODULE, 27134 .owner = THIS_MODULE,
25910 .read = qmi_read, 27135 .read = qmi_read,
25911 .write = qmi_write, 27136 .write = qmi_write,
25912diff -urNp linux-2.6.32.10/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.10/drivers/staging/dream/smd/smd_rpcrouter_device.c 27137diff -urNp linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c
25913--- linux-2.6.32.10/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400 27138--- linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400
25914+++ linux-2.6.32.10/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-20 15:58:47.098056258 -0400 27139+++ linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-04-04 20:46:41.621505029 -0400
25915@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file 27140@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
25916 return rc; 27141 return rc;
25917 } 27142 }
@@ -25930,9 +27155,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
25930 .owner = THIS_MODULE, 27155 .owner = THIS_MODULE,
25931 .open = rpcrouter_open, 27156 .open = rpcrouter_open,
25932 .release = rpcrouter_release, 27157 .release = rpcrouter_release,
25933diff -urNp linux-2.6.32.10/drivers/staging/dst/dcore.c linux-2.6.32.10/drivers/staging/dst/dcore.c 27158diff -urNp linux-2.6.32.11/drivers/staging/dst/dcore.c linux-2.6.32.11/drivers/staging/dst/dcore.c
25934--- linux-2.6.32.10/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400 27159--- linux-2.6.32.11/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400
25935+++ linux-2.6.32.10/drivers/staging/dst/dcore.c 2010-03-20 15:58:47.098056258 -0400 27160+++ linux-2.6.32.11/drivers/staging/dst/dcore.c 2010-04-04 20:46:41.621505029 -0400
25936@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi 27161@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
25937 return 0; 27162 return 0;
25938 } 27163 }
@@ -25951,9 +27176,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/dst/dcore.c linux-2.6.32.10/drivers/s
25951 snprintf(n->name, sizeof(n->name), "%s", ctl->name); 27176 snprintf(n->name, sizeof(n->name), "%s", ctl->name);
25952 27177
25953 err = dst_node_sysfs_init(n); 27178 err = dst_node_sysfs_init(n);
25954diff -urNp linux-2.6.32.10/drivers/staging/dst/trans.c linux-2.6.32.10/drivers/staging/dst/trans.c 27179diff -urNp linux-2.6.32.11/drivers/staging/dst/trans.c linux-2.6.32.11/drivers/staging/dst/trans.c
25955--- linux-2.6.32.10/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400 27180--- linux-2.6.32.11/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400
25956+++ linux-2.6.32.10/drivers/staging/dst/trans.c 2010-03-20 15:58:47.098056258 -0400 27181+++ linux-2.6.32.11/drivers/staging/dst/trans.c 2010-04-04 20:46:41.621505029 -0400
25957@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, 27182@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
25958 t->error = 0; 27183 t->error = 0;
25959 t->retries = 0; 27184 t->retries = 0;
@@ -25963,9 +27188,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/dst/trans.c linux-2.6.32.10/drivers/s
25963 27188
25964 t->enc = bio_data_dir(bio); 27189 t->enc = bio_data_dir(bio);
25965 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); 27190 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
25966diff -urNp linux-2.6.32.10/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.10/drivers/staging/go7007/go7007-v4l2.c 27191diff -urNp linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c
25967--- linux-2.6.32.10/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400 27192--- linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400
25968+++ linux-2.6.32.10/drivers/staging/go7007/go7007-v4l2.c 2010-03-20 15:58:47.098056258 -0400 27193+++ linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c 2010-04-04 20:46:41.621505029 -0400
25969@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are 27194@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
25970 return 0; 27195 return 0;
25971 } 27196 }
@@ -25975,9 +27200,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.10/
25975 .open = go7007_vm_open, 27200 .open = go7007_vm_open,
25976 .close = go7007_vm_close, 27201 .close = go7007_vm_close,
25977 .fault = go7007_vm_fault, 27202 .fault = go7007_vm_fault,
25978diff -urNp linux-2.6.32.10/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.10/drivers/staging/hv/blkvsc_drv.c 27203diff -urNp linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c
25979--- linux-2.6.32.10/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400 27204--- linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400
25980+++ linux-2.6.32.10/drivers/staging/hv/blkvsc_drv.c 2010-03-20 15:58:47.102057128 -0400 27205+++ linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c 2010-04-04 20:46:41.621505029 -0400
25981@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV 27206@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
25982 /* The one and only one */ 27207 /* The one and only one */
25983 static struct blkvsc_driver_context g_blkvsc_drv; 27208 static struct blkvsc_driver_context g_blkvsc_drv;
@@ -25987,9 +27212,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.10/drive
25987 .owner = THIS_MODULE, 27212 .owner = THIS_MODULE,
25988 .open = blkvsc_open, 27213 .open = blkvsc_open,
25989 .release = blkvsc_release, 27214 .release = blkvsc_release,
25990diff -urNp linux-2.6.32.10/drivers/staging/panel/panel.c linux-2.6.32.10/drivers/staging/panel/panel.c 27215diff -urNp linux-2.6.32.11/drivers/staging/panel/panel.c linux-2.6.32.11/drivers/staging/panel/panel.c
25991--- linux-2.6.32.10/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400 27216--- linux-2.6.32.11/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400
25992+++ linux-2.6.32.10/drivers/staging/panel/panel.c 2010-03-20 15:58:47.102057128 -0400 27217+++ linux-2.6.32.11/drivers/staging/panel/panel.c 2010-04-04 20:46:41.621505029 -0400
25993@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino 27218@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
25994 return 0; 27219 return 0;
25995 } 27220 }
@@ -26008,9 +27233,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/panel/panel.c linux-2.6.32.10/drivers
26008 .read = keypad_read, /* read */ 27233 .read = keypad_read, /* read */
26009 .open = keypad_open, /* open */ 27234 .open = keypad_open, /* open */
26010 .release = keypad_release, /* close */ 27235 .release = keypad_release, /* close */
26011diff -urNp linux-2.6.32.10/drivers/staging/phison/phison.c linux-2.6.32.10/drivers/staging/phison/phison.c 27236diff -urNp linux-2.6.32.11/drivers/staging/phison/phison.c linux-2.6.32.11/drivers/staging/phison/phison.c
26012--- linux-2.6.32.10/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400 27237--- linux-2.6.32.11/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400
26013+++ linux-2.6.32.10/drivers/staging/phison/phison.c 2010-03-20 15:58:47.102057128 -0400 27238+++ linux-2.6.32.11/drivers/staging/phison/phison.c 2010-04-04 20:46:41.621505029 -0400
26014@@ -43,7 +43,7 @@ static struct scsi_host_template phison_ 27239@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
26015 ATA_BMDMA_SHT(DRV_NAME), 27240 ATA_BMDMA_SHT(DRV_NAME),
26016 }; 27241 };
@@ -26020,9 +27245,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/phison/phison.c linux-2.6.32.10/drive
26020 .inherits = &ata_bmdma_port_ops, 27245 .inherits = &ata_bmdma_port_ops,
26021 .prereset = phison_pre_reset, 27246 .prereset = phison_pre_reset,
26022 }; 27247 };
26023diff -urNp linux-2.6.32.10/drivers/staging/poch/poch.c linux-2.6.32.10/drivers/staging/poch/poch.c 27248diff -urNp linux-2.6.32.11/drivers/staging/poch/poch.c linux-2.6.32.11/drivers/staging/poch/poch.c
26024--- linux-2.6.32.10/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400 27249--- linux-2.6.32.11/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400
26025+++ linux-2.6.32.10/drivers/staging/poch/poch.c 2010-03-20 15:58:47.102057128 -0400 27250+++ linux-2.6.32.11/drivers/staging/poch/poch.c 2010-04-04 20:46:41.625742858 -0400
26026@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod 27251@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
26027 return 0; 27252 return 0;
26028 } 27253 }
@@ -26032,9 +27257,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/poch/poch.c linux-2.6.32.10/drivers/s
26032 .owner = THIS_MODULE, 27257 .owner = THIS_MODULE,
26033 .open = poch_open, 27258 .open = poch_open,
26034 .release = poch_release, 27259 .release = poch_release,
26035diff -urNp linux-2.6.32.10/drivers/staging/pohmelfs/inode.c linux-2.6.32.10/drivers/staging/pohmelfs/inode.c 27260diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/inode.c linux-2.6.32.11/drivers/staging/pohmelfs/inode.c
26036--- linux-2.6.32.10/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400 27261--- linux-2.6.32.11/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400
26037+++ linux-2.6.32.10/drivers/staging/pohmelfs/inode.c 2010-03-20 15:58:47.102057128 -0400 27262+++ linux-2.6.32.11/drivers/staging/pohmelfs/inode.c 2010-04-04 20:46:41.625742858 -0400
26038@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su 27263@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
26039 mutex_init(&psb->mcache_lock); 27264 mutex_init(&psb->mcache_lock);
26040 psb->mcache_root = RB_ROOT; 27265 psb->mcache_root = RB_ROOT;
@@ -26044,9 +27269,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/pohmelfs/inode.c linux-2.6.32.10/driv
26044 27269
26045 psb->trans_max_pages = 100; 27270 psb->trans_max_pages = 100;
26046 27271
26047diff -urNp linux-2.6.32.10/drivers/staging/pohmelfs/mcache.c linux-2.6.32.10/drivers/staging/pohmelfs/mcache.c 27272diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c
26048--- linux-2.6.32.10/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400 27273--- linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400
26049+++ linux-2.6.32.10/drivers/staging/pohmelfs/mcache.c 2010-03-20 15:58:47.102057128 -0400 27274+++ linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c 2010-04-04 20:46:41.625742858 -0400
26050@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ 27275@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
26051 m->data = data; 27276 m->data = data;
26052 m->start = start; 27277 m->start = start;
@@ -26056,9 +27281,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/pohmelfs/mcache.c linux-2.6.32.10/dri
26056 27281
26057 mutex_lock(&psb->mcache_lock); 27282 mutex_lock(&psb->mcache_lock);
26058 err = pohmelfs_mcache_insert(psb, m); 27283 err = pohmelfs_mcache_insert(psb, m);
26059diff -urNp linux-2.6.32.10/drivers/staging/pohmelfs/netfs.h linux-2.6.32.10/drivers/staging/pohmelfs/netfs.h 27284diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h
26060--- linux-2.6.32.10/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400 27285--- linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400
26061+++ linux-2.6.32.10/drivers/staging/pohmelfs/netfs.h 2010-03-20 15:58:47.102057128 -0400 27286+++ linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h 2010-04-04 20:46:41.625742858 -0400
26062@@ -570,7 +570,7 @@ struct pohmelfs_config; 27287@@ -570,7 +570,7 @@ struct pohmelfs_config;
26063 struct pohmelfs_sb { 27288 struct pohmelfs_sb {
26064 struct rb_root mcache_root; 27289 struct rb_root mcache_root;
@@ -26068,9 +27293,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/pohmelfs/netfs.h linux-2.6.32.10/driv
26068 unsigned long mcache_timeout; 27293 unsigned long mcache_timeout;
26069 27294
26070 unsigned int idx; 27295 unsigned int idx;
26071diff -urNp linux-2.6.32.10/drivers/staging/sep/sep_driver.c linux-2.6.32.10/drivers/staging/sep/sep_driver.c 27296diff -urNp linux-2.6.32.11/drivers/staging/sep/sep_driver.c linux-2.6.32.11/drivers/staging/sep/sep_driver.c
26072--- linux-2.6.32.10/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400 27297--- linux-2.6.32.11/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400
26073+++ linux-2.6.32.10/drivers/staging/sep/sep_driver.c 2010-03-20 15:58:47.102057128 -0400 27298+++ linux-2.6.32.11/drivers/staging/sep/sep_driver.c 2010-04-04 20:46:41.625742858 -0400
26074@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver 27299@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
26075 static dev_t sep_devno; 27300 static dev_t sep_devno;
26076 27301
@@ -26080,9 +27305,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/sep/sep_driver.c linux-2.6.32.10/driv
26080 .owner = THIS_MODULE, 27305 .owner = THIS_MODULE,
26081 .ioctl = sep_ioctl, 27306 .ioctl = sep_ioctl,
26082 .poll = sep_poll, 27307 .poll = sep_poll,
26083diff -urNp linux-2.6.32.10/drivers/staging/vme/devices/vme_user.c linux-2.6.32.10/drivers/staging/vme/devices/vme_user.c 27308diff -urNp linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c
26084--- linux-2.6.32.10/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400 27309--- linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400
26085+++ linux-2.6.32.10/drivers/staging/vme/devices/vme_user.c 2010-03-20 15:58:47.102057128 -0400 27310+++ linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c 2010-04-04 20:46:41.625742858 -0400
26086@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * 27311@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
26087 static int __init vme_user_probe(struct device *, int, int); 27312 static int __init vme_user_probe(struct device *, int, int);
26088 static int __exit vme_user_remove(struct device *, int, int); 27313 static int __exit vme_user_remove(struct device *, int, int);
@@ -26092,9 +27317,9 @@ diff -urNp linux-2.6.32.10/drivers/staging/vme/devices/vme_user.c linux-2.6.32.1
26092 .open = vme_user_open, 27317 .open = vme_user_open,
26093 .release = vme_user_release, 27318 .release = vme_user_release,
26094 .read = vme_user_read, 27319 .read = vme_user_read,
26095diff -urNp linux-2.6.32.10/drivers/uio/uio.c linux-2.6.32.10/drivers/uio/uio.c 27320diff -urNp linux-2.6.32.11/drivers/uio/uio.c linux-2.6.32.11/drivers/uio/uio.c
26096--- linux-2.6.32.10/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400 27321--- linux-2.6.32.11/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400
26097+++ linux-2.6.32.10/drivers/uio/uio.c 2010-03-20 15:58:47.102057128 -0400 27322+++ linux-2.6.32.11/drivers/uio/uio.c 2010-04-04 20:46:41.625742858 -0400
26098@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj 27323@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj
26099 return entry->show(mem, buf); 27324 return entry->show(mem, buf);
26100 } 27325 }
@@ -26113,9 +27338,9 @@ diff -urNp linux-2.6.32.10/drivers/uio/uio.c linux-2.6.32.10/drivers/uio/uio.c
26113 .show = portio_type_show, 27338 .show = portio_type_show,
26114 }; 27339 };
26115 27340
26116diff -urNp linux-2.6.32.10/drivers/usb/atm/usbatm.c linux-2.6.32.10/drivers/usb/atm/usbatm.c 27341diff -urNp linux-2.6.32.11/drivers/usb/atm/usbatm.c linux-2.6.32.11/drivers/usb/atm/usbatm.c
26117--- linux-2.6.32.10/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400 27342--- linux-2.6.32.11/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400
26118+++ linux-2.6.32.10/drivers/usb/atm/usbatm.c 2010-03-20 15:58:47.102057128 -0400 27343+++ linux-2.6.32.11/drivers/usb/atm/usbatm.c 2010-04-04 20:46:41.625742858 -0400
26119@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru 27344@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
26120 if (printk_ratelimit()) 27345 if (printk_ratelimit())
26121 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", 27346 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -26195,9 +27420,9 @@ diff -urNp linux-2.6.32.10/drivers/usb/atm/usbatm.c linux-2.6.32.10/drivers/usb/
26195 27420
26196 if (!left--) { 27421 if (!left--) {
26197 if (instance->disconnected) 27422 if (instance->disconnected)
26198diff -urNp linux-2.6.32.10/drivers/usb/class/cdc-acm.c linux-2.6.32.10/drivers/usb/class/cdc-acm.c 27423diff -urNp linux-2.6.32.11/drivers/usb/class/cdc-acm.c linux-2.6.32.11/drivers/usb/class/cdc-acm.c
26199--- linux-2.6.32.10/drivers/usb/class/cdc-acm.c 2010-03-15 11:52:04.000000000 -0400 27424--- linux-2.6.32.11/drivers/usb/class/cdc-acm.c 2010-03-15 11:52:04.000000000 -0400
26200+++ linux-2.6.32.10/drivers/usb/class/cdc-acm.c 2010-03-20 15:58:47.102057128 -0400 27425+++ linux-2.6.32.11/drivers/usb/class/cdc-acm.c 2010-04-04 20:46:41.625742858 -0400
26201@@ -1534,7 +1534,7 @@ static struct usb_device_id acm_ids[] = 27426@@ -1534,7 +1534,7 @@ static struct usb_device_id acm_ids[] =
26202 USB_CDC_ACM_PROTO_AT_CDMA) }, 27427 USB_CDC_ACM_PROTO_AT_CDMA) },
26203 27428
@@ -26207,9 +27432,9 @@ diff -urNp linux-2.6.32.10/drivers/usb/class/cdc-acm.c linux-2.6.32.10/drivers/u
26207 }; 27432 };
26208 27433
26209 MODULE_DEVICE_TABLE(usb, acm_ids); 27434 MODULE_DEVICE_TABLE(usb, acm_ids);
26210diff -urNp linux-2.6.32.10/drivers/usb/class/usblp.c linux-2.6.32.10/drivers/usb/class/usblp.c 27435diff -urNp linux-2.6.32.11/drivers/usb/class/usblp.c linux-2.6.32.11/drivers/usb/class/usblp.c
26211--- linux-2.6.32.10/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400 27436--- linux-2.6.32.11/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400
26212+++ linux-2.6.32.10/drivers/usb/class/usblp.c 2010-03-20 15:58:47.102057128 -0400 27437+++ linux-2.6.32.11/drivers/usb/class/usblp.c 2010-04-04 20:46:41.625742858 -0400
26213@@ -228,7 +228,7 @@ static const struct quirk_printer_struct 27438@@ -228,7 +228,7 @@ static const struct quirk_printer_struct
26214 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ 27439 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
26215 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ 27440 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
@@ -26228,9 +27453,9 @@ diff -urNp linux-2.6.32.10/drivers/usb/class/usblp.c linux-2.6.32.10/drivers/usb
26228 }; 27453 };
26229 27454
26230 MODULE_DEVICE_TABLE (usb, usblp_ids); 27455 MODULE_DEVICE_TABLE (usb, usblp_ids);
26231diff -urNp linux-2.6.32.10/drivers/usb/core/hcd.c linux-2.6.32.10/drivers/usb/core/hcd.c 27456diff -urNp linux-2.6.32.11/drivers/usb/core/hcd.c linux-2.6.32.11/drivers/usb/core/hcd.c
26232--- linux-2.6.32.10/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400 27457--- linux-2.6.32.11/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400
26233+++ linux-2.6.32.10/drivers/usb/core/hcd.c 2010-03-20 15:58:47.106071004 -0400 27458+++ linux-2.6.32.11/drivers/usb/core/hcd.c 2010-04-04 20:46:41.625742858 -0400
26234@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd 27459@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
26235 27460
26236 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 27461 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -26249,9 +27474,9 @@ diff -urNp linux-2.6.32.10/drivers/usb/core/hcd.c linux-2.6.32.10/drivers/usb/co
26249 { 27474 {
26250 27475
26251 if (mon_ops) 27476 if (mon_ops)
26252diff -urNp linux-2.6.32.10/drivers/usb/core/hcd.h linux-2.6.32.10/drivers/usb/core/hcd.h 27477diff -urNp linux-2.6.32.11/drivers/usb/core/hcd.h linux-2.6.32.11/drivers/usb/core/hcd.h
26253--- linux-2.6.32.10/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400 27478--- linux-2.6.32.11/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400
26254+++ linux-2.6.32.10/drivers/usb/core/hcd.h 2010-03-20 15:58:47.106071004 -0400 27479+++ linux-2.6.32.11/drivers/usb/core/hcd.h 2010-04-04 20:46:41.625742858 -0400
26255@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { 27480@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
26256 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 27481 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
26257 27482
@@ -26279,9 +27504,9 @@ diff -urNp linux-2.6.32.10/drivers/usb/core/hcd.h linux-2.6.32.10/drivers/usb/co
26279 void usb_mon_deregister(void); 27504 void usb_mon_deregister(void);
26280 27505
26281 #else 27506 #else
26282diff -urNp linux-2.6.32.10/drivers/usb/core/hub.c linux-2.6.32.10/drivers/usb/core/hub.c 27507diff -urNp linux-2.6.32.11/drivers/usb/core/hub.c linux-2.6.32.11/drivers/usb/core/hub.c
26283--- linux-2.6.32.10/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400 27508--- linux-2.6.32.11/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400
26284+++ linux-2.6.32.10/drivers/usb/core/hub.c 2010-03-20 15:58:47.106071004 -0400 27509+++ linux-2.6.32.11/drivers/usb/core/hub.c 2010-04-04 20:46:41.625742858 -0400
26285@@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table 27510@@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table
26286 .bDeviceClass = USB_CLASS_HUB}, 27511 .bDeviceClass = USB_CLASS_HUB},
26287 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, 27512 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
@@ -26291,9 +27516,9 @@ diff -urNp linux-2.6.32.10/drivers/usb/core/hub.c linux-2.6.32.10/drivers/usb/co
26291 }; 27516 };
26292 27517
26293 MODULE_DEVICE_TABLE (usb, hub_id_table); 27518 MODULE_DEVICE_TABLE (usb, hub_id_table);
26294diff -urNp linux-2.6.32.10/drivers/usb/core/message.c linux-2.6.32.10/drivers/usb/core/message.c 27519diff -urNp linux-2.6.32.11/drivers/usb/core/message.c linux-2.6.32.11/drivers/usb/core/message.c
26295--- linux-2.6.32.10/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400 27520--- linux-2.6.32.11/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400
26296+++ linux-2.6.32.10/drivers/usb/core/message.c 2010-03-20 15:58:47.106071004 -0400 27521+++ linux-2.6.32.11/drivers/usb/core/message.c 2010-04-04 20:46:41.629706570 -0400
26297@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device 27522@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
26298 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); 27523 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
26299 if (buf) { 27524 if (buf) {
@@ -26305,9 +27530,9 @@ diff -urNp linux-2.6.32.10/drivers/usb/core/message.c linux-2.6.32.10/drivers/us
26305 if (!smallbuf) 27530 if (!smallbuf)
26306 return buf; 27531 return buf;
26307 memcpy(smallbuf, buf, len); 27532 memcpy(smallbuf, buf, len);
26308diff -urNp linux-2.6.32.10/drivers/usb/host/ehci-pci.c linux-2.6.32.10/drivers/usb/host/ehci-pci.c 27533diff -urNp linux-2.6.32.11/drivers/usb/host/ehci-pci.c linux-2.6.32.11/drivers/usb/host/ehci-pci.c
26309--- linux-2.6.32.10/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400 27534--- linux-2.6.32.11/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400
26310+++ linux-2.6.32.10/drivers/usb/host/ehci-pci.c 2010-03-20 15:58:47.106071004 -0400 27535+++ linux-2.6.32.11/drivers/usb/host/ehci-pci.c 2010-04-04 20:46:41.629706570 -0400
26311@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id 27536@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id
26312 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), 27537 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
26313 .driver_data = (unsigned long) &ehci_pci_hc_driver, 27538 .driver_data = (unsigned long) &ehci_pci_hc_driver,
@@ -26317,9 +27542,9 @@ diff -urNp linux-2.6.32.10/drivers/usb/host/ehci-pci.c linux-2.6.32.10/drivers/u
26317 }; 27542 };
26318 MODULE_DEVICE_TABLE(pci, pci_ids); 27543 MODULE_DEVICE_TABLE(pci, pci_ids);
26319 27544
26320diff -urNp linux-2.6.32.10/drivers/usb/host/uhci-hcd.c linux-2.6.32.10/drivers/usb/host/uhci-hcd.c 27545diff -urNp linux-2.6.32.11/drivers/usb/host/uhci-hcd.c linux-2.6.32.11/drivers/usb/host/uhci-hcd.c
26321--- linux-2.6.32.10/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400 27546--- linux-2.6.32.11/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400
26322+++ linux-2.6.32.10/drivers/usb/host/uhci-hcd.c 2010-03-20 15:58:47.106071004 -0400 27547+++ linux-2.6.32.11/drivers/usb/host/uhci-hcd.c 2010-04-04 20:46:41.629706570 -0400
26323@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p 27548@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
26324 /* handle any USB UHCI controller */ 27549 /* handle any USB UHCI controller */
26325 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), 27550 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
@@ -26329,9 +27554,9 @@ diff -urNp linux-2.6.32.10/drivers/usb/host/uhci-hcd.c linux-2.6.32.10/drivers/u
26329 }; 27554 };
26330 27555
26331 MODULE_DEVICE_TABLE(pci, uhci_pci_ids); 27556 MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
26332diff -urNp linux-2.6.32.10/drivers/usb/misc/appledisplay.c linux-2.6.32.10/drivers/usb/misc/appledisplay.c 27557diff -urNp linux-2.6.32.11/drivers/usb/misc/appledisplay.c linux-2.6.32.11/drivers/usb/misc/appledisplay.c
26333--- linux-2.6.32.10/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400 27558--- linux-2.6.32.11/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400
26334+++ linux-2.6.32.10/drivers/usb/misc/appledisplay.c 2010-03-20 15:58:47.106071004 -0400 27559+++ linux-2.6.32.11/drivers/usb/misc/appledisplay.c 2010-04-04 20:46:41.629706570 -0400
26335@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes 27560@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
26336 return pdata->msgdata[1]; 27561 return pdata->msgdata[1];
26337 } 27562 }
@@ -26341,9 +27566,9 @@ diff -urNp linux-2.6.32.10/drivers/usb/misc/appledisplay.c linux-2.6.32.10/drive
26341 .get_brightness = appledisplay_bl_get_brightness, 27566 .get_brightness = appledisplay_bl_get_brightness,
26342 .update_status = appledisplay_bl_update_status, 27567 .update_status = appledisplay_bl_update_status,
26343 }; 27568 };
26344diff -urNp linux-2.6.32.10/drivers/usb/mon/mon_main.c linux-2.6.32.10/drivers/usb/mon/mon_main.c 27569diff -urNp linux-2.6.32.11/drivers/usb/mon/mon_main.c linux-2.6.32.11/drivers/usb/mon/mon_main.c
26345--- linux-2.6.32.10/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400 27570--- linux-2.6.32.11/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400
26346+++ linux-2.6.32.10/drivers/usb/mon/mon_main.c 2010-03-20 15:58:47.106071004 -0400 27571+++ linux-2.6.32.11/drivers/usb/mon/mon_main.c 2010-04-04 20:46:41.629706570 -0400
26347@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { 27572@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
26348 /* 27573 /*
26349 * Ops 27574 * Ops
@@ -26353,9 +27578,9 @@ diff -urNp linux-2.6.32.10/drivers/usb/mon/mon_main.c linux-2.6.32.10/drivers/us
26353 .urb_submit = mon_submit, 27578 .urb_submit = mon_submit,
26354 .urb_submit_error = mon_submit_error, 27579 .urb_submit_error = mon_submit_error,
26355 .urb_complete = mon_complete, 27580 .urb_complete = mon_complete,
26356diff -urNp linux-2.6.32.10/drivers/usb/storage/debug.h linux-2.6.32.10/drivers/usb/storage/debug.h 27581diff -urNp linux-2.6.32.11/drivers/usb/storage/debug.h linux-2.6.32.11/drivers/usb/storage/debug.h
26357--- linux-2.6.32.10/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400 27582--- linux-2.6.32.11/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400
26358+++ linux-2.6.32.10/drivers/usb/storage/debug.h 2010-03-20 15:58:47.106071004 -0400 27583+++ linux-2.6.32.11/drivers/usb/storage/debug.h 2010-04-04 20:46:41.629706570 -0400
26359@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char 27584@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
26360 #define US_DEBUGPX(x...) printk( x ) 27585 #define US_DEBUGPX(x...) printk( x )
26361 #define US_DEBUG(x) x 27586 #define US_DEBUG(x) x
@@ -26369,9 +27594,9 @@ diff -urNp linux-2.6.32.10/drivers/usb/storage/debug.h linux-2.6.32.10/drivers/u
26369 #endif 27594 #endif
26370 27595
26371 #endif 27596 #endif
26372diff -urNp linux-2.6.32.10/drivers/usb/storage/usb.c linux-2.6.32.10/drivers/usb/storage/usb.c 27597diff -urNp linux-2.6.32.11/drivers/usb/storage/usb.c linux-2.6.32.11/drivers/usb/storage/usb.c
26373--- linux-2.6.32.10/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400 27598--- linux-2.6.32.11/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400
26374+++ linux-2.6.32.10/drivers/usb/storage/usb.c 2010-03-20 15:58:47.106071004 -0400 27599+++ linux-2.6.32.11/drivers/usb/storage/usb.c 2010-04-04 20:46:41.629706570 -0400
26375@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l 27600@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
26376 27601
26377 static struct us_unusual_dev us_unusual_dev_list[] = { 27602 static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -26381,9 +27606,9 @@ diff -urNp linux-2.6.32.10/drivers/usb/storage/usb.c linux-2.6.32.10/drivers/usb
26381 }; 27606 };
26382 27607
26383 #undef UNUSUAL_DEV 27608 #undef UNUSUAL_DEV
26384diff -urNp linux-2.6.32.10/drivers/usb/storage/usual-tables.c linux-2.6.32.10/drivers/usb/storage/usual-tables.c 27609diff -urNp linux-2.6.32.11/drivers/usb/storage/usual-tables.c linux-2.6.32.11/drivers/usb/storage/usual-tables.c
26385--- linux-2.6.32.10/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400 27610--- linux-2.6.32.11/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400
26386+++ linux-2.6.32.10/drivers/usb/storage/usual-tables.c 2010-03-20 15:58:47.106071004 -0400 27611+++ linux-2.6.32.11/drivers/usb/storage/usual-tables.c 2010-04-04 20:46:41.629706570 -0400
26387@@ -48,7 +48,7 @@ 27612@@ -48,7 +48,7 @@
26388 27613
26389 struct usb_device_id usb_storage_usb_ids[] = { 27614 struct usb_device_id usb_storage_usb_ids[] = {
@@ -26393,9 +27618,9 @@ diff -urNp linux-2.6.32.10/drivers/usb/storage/usual-tables.c linux-2.6.32.10/dr
26393 }; 27618 };
26394 EXPORT_SYMBOL_GPL(usb_storage_usb_ids); 27619 EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
26395 27620
26396diff -urNp linux-2.6.32.10/drivers/uwb/wlp/messages.c linux-2.6.32.10/drivers/uwb/wlp/messages.c 27621diff -urNp linux-2.6.32.11/drivers/uwb/wlp/messages.c linux-2.6.32.11/drivers/uwb/wlp/messages.c
26397--- linux-2.6.32.10/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400 27622--- linux-2.6.32.11/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400
26398+++ linux-2.6.32.10/drivers/uwb/wlp/messages.c 2010-03-20 15:58:47.106071004 -0400 27623+++ linux-2.6.32.11/drivers/uwb/wlp/messages.c 2010-04-04 20:46:41.629706570 -0400
26399@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct 27624@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
26400 size_t len = skb->len; 27625 size_t len = skb->len;
26401 size_t used; 27626 size_t used;
@@ -26405,9 +27630,9 @@ diff -urNp linux-2.6.32.10/drivers/uwb/wlp/messages.c linux-2.6.32.10/drivers/uw
26405 enum wlp_assc_error assc_err; 27630 enum wlp_assc_error assc_err;
26406 char enonce_buf[WLP_WSS_NONCE_STRSIZE]; 27631 char enonce_buf[WLP_WSS_NONCE_STRSIZE];
26407 char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; 27632 char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
26408diff -urNp linux-2.6.32.10/drivers/uwb/wlp/sysfs.c linux-2.6.32.10/drivers/uwb/wlp/sysfs.c 27633diff -urNp linux-2.6.32.11/drivers/uwb/wlp/sysfs.c linux-2.6.32.11/drivers/uwb/wlp/sysfs.c
26409--- linux-2.6.32.10/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400 27634--- linux-2.6.32.11/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400
26410+++ linux-2.6.32.10/drivers/uwb/wlp/sysfs.c 2010-03-20 15:58:47.106071004 -0400 27635+++ linux-2.6.32.11/drivers/uwb/wlp/sysfs.c 2010-04-04 20:46:41.629706570 -0400
26411@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec 27636@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
26412 return ret; 27637 return ret;
26413 } 27638 }
@@ -26418,9 +27643,9 @@ diff -urNp linux-2.6.32.10/drivers/uwb/wlp/sysfs.c linux-2.6.32.10/drivers/uwb/w
26418 .show = wlp_wss_attr_show, 27643 .show = wlp_wss_attr_show,
26419 .store = wlp_wss_attr_store, 27644 .store = wlp_wss_attr_store,
26420 }; 27645 };
26421diff -urNp linux-2.6.32.10/drivers/video/atmel_lcdfb.c linux-2.6.32.10/drivers/video/atmel_lcdfb.c 27646diff -urNp linux-2.6.32.11/drivers/video/atmel_lcdfb.c linux-2.6.32.11/drivers/video/atmel_lcdfb.c
26422--- linux-2.6.32.10/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400 27647--- linux-2.6.32.11/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400
26423+++ linux-2.6.32.10/drivers/video/atmel_lcdfb.c 2010-03-20 15:58:47.106071004 -0400 27648+++ linux-2.6.32.11/drivers/video/atmel_lcdfb.c 2010-04-04 20:46:41.629706570 -0400
26424@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc 27649@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
26425 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); 27650 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
26426 } 27651 }
@@ -26430,9 +27655,9 @@ diff -urNp linux-2.6.32.10/drivers/video/atmel_lcdfb.c linux-2.6.32.10/drivers/v
26430 .update_status = atmel_bl_update_status, 27655 .update_status = atmel_bl_update_status,
26431 .get_brightness = atmel_bl_get_brightness, 27656 .get_brightness = atmel_bl_get_brightness,
26432 }; 27657 };
26433diff -urNp linux-2.6.32.10/drivers/video/aty/aty128fb.c linux-2.6.32.10/drivers/video/aty/aty128fb.c 27658diff -urNp linux-2.6.32.11/drivers/video/aty/aty128fb.c linux-2.6.32.11/drivers/video/aty/aty128fb.c
26434--- linux-2.6.32.10/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400 27659--- linux-2.6.32.11/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400
26435+++ linux-2.6.32.10/drivers/video/aty/aty128fb.c 2010-03-20 15:58:47.110069152 -0400 27660+++ linux-2.6.32.11/drivers/video/aty/aty128fb.c 2010-04-04 20:46:41.629706570 -0400
26436@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru 27661@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
26437 return bd->props.brightness; 27662 return bd->props.brightness;
26438 } 27663 }
@@ -26442,9 +27667,9 @@ diff -urNp linux-2.6.32.10/drivers/video/aty/aty128fb.c linux-2.6.32.10/drivers/
26442 .get_brightness = aty128_bl_get_brightness, 27667 .get_brightness = aty128_bl_get_brightness,
26443 .update_status = aty128_bl_update_status, 27668 .update_status = aty128_bl_update_status,
26444 }; 27669 };
26445diff -urNp linux-2.6.32.10/drivers/video/aty/atyfb_base.c linux-2.6.32.10/drivers/video/aty/atyfb_base.c 27670diff -urNp linux-2.6.32.11/drivers/video/aty/atyfb_base.c linux-2.6.32.11/drivers/video/aty/atyfb_base.c
26446--- linux-2.6.32.10/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400 27671--- linux-2.6.32.11/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400
26447+++ linux-2.6.32.10/drivers/video/aty/atyfb_base.c 2010-03-20 15:58:47.110069152 -0400 27672+++ linux-2.6.32.11/drivers/video/aty/atyfb_base.c 2010-04-04 20:46:41.629706570 -0400
26448@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct 27673@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
26449 return bd->props.brightness; 27674 return bd->props.brightness;
26450 } 27675 }
@@ -26454,9 +27679,9 @@ diff -urNp linux-2.6.32.10/drivers/video/aty/atyfb_base.c linux-2.6.32.10/driver
26454 .get_brightness = aty_bl_get_brightness, 27679 .get_brightness = aty_bl_get_brightness,
26455 .update_status = aty_bl_update_status, 27680 .update_status = aty_bl_update_status,
26456 }; 27681 };
26457diff -urNp linux-2.6.32.10/drivers/video/aty/radeon_backlight.c linux-2.6.32.10/drivers/video/aty/radeon_backlight.c 27682diff -urNp linux-2.6.32.11/drivers/video/aty/radeon_backlight.c linux-2.6.32.11/drivers/video/aty/radeon_backlight.c
26458--- linux-2.6.32.10/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400 27683--- linux-2.6.32.11/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400
26459+++ linux-2.6.32.10/drivers/video/aty/radeon_backlight.c 2010-03-20 15:58:47.110069152 -0400 27684+++ linux-2.6.32.11/drivers/video/aty/radeon_backlight.c 2010-04-04 20:46:41.629706570 -0400
26460@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru 27685@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
26461 return bd->props.brightness; 27686 return bd->props.brightness;
26462 } 27687 }
@@ -26466,9 +27691,9 @@ diff -urNp linux-2.6.32.10/drivers/video/aty/radeon_backlight.c linux-2.6.32.10/
26466 .get_brightness = radeon_bl_get_brightness, 27691 .get_brightness = radeon_bl_get_brightness,
26467 .update_status = radeon_bl_update_status, 27692 .update_status = radeon_bl_update_status,
26468 }; 27693 };
26469diff -urNp linux-2.6.32.10/drivers/video/backlight/adp5520_bl.c linux-2.6.32.10/drivers/video/backlight/adp5520_bl.c 27694diff -urNp linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c
26470--- linux-2.6.32.10/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400 27695--- linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400
26471+++ linux-2.6.32.10/drivers/video/backlight/adp5520_bl.c 2010-03-20 15:58:47.110069152 -0400 27696+++ linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c 2010-04-04 20:46:41.629706570 -0400
26472@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str 27697@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
26473 return error ? data->current_brightness : reg_val; 27698 return error ? data->current_brightness : reg_val;
26474 } 27699 }
@@ -26478,9 +27703,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/adp5520_bl.c linux-2.6.32.10/
26478 .update_status = adp5520_bl_update_status, 27703 .update_status = adp5520_bl_update_status,
26479 .get_brightness = adp5520_bl_get_brightness, 27704 .get_brightness = adp5520_bl_get_brightness,
26480 }; 27705 };
26481diff -urNp linux-2.6.32.10/drivers/video/backlight/adx_bl.c linux-2.6.32.10/drivers/video/backlight/adx_bl.c 27706diff -urNp linux-2.6.32.11/drivers/video/backlight/adx_bl.c linux-2.6.32.11/drivers/video/backlight/adx_bl.c
26482--- linux-2.6.32.10/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400 27707--- linux-2.6.32.11/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400
26483+++ linux-2.6.32.10/drivers/video/backlight/adx_bl.c 2010-03-20 15:58:47.110069152 -0400 27708+++ linux-2.6.32.11/drivers/video/backlight/adx_bl.c 2010-04-04 20:46:41.633638271 -0400
26484@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct 27709@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
26485 return 1; 27710 return 1;
26486 } 27711 }
@@ -26490,9 +27715,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/adx_bl.c linux-2.6.32.10/driv
26490 .options = 0, 27715 .options = 0,
26491 .update_status = adx_backlight_update_status, 27716 .update_status = adx_backlight_update_status,
26492 .get_brightness = adx_backlight_get_brightness, 27717 .get_brightness = adx_backlight_get_brightness,
26493diff -urNp linux-2.6.32.10/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.10/drivers/video/backlight/atmel-pwm-bl.c 27718diff -urNp linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c
26494--- linux-2.6.32.10/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400 27719--- linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400
26495+++ linux-2.6.32.10/drivers/video/backlight/atmel-pwm-bl.c 2010-03-20 15:58:47.110069152 -0400 27720+++ linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c 2010-04-04 20:46:41.633638271 -0400
26496@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct 27721@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
26497 return pwm_channel_enable(&pwmbl->pwmc); 27722 return pwm_channel_enable(&pwmbl->pwmc);
26498 } 27723 }
@@ -26502,9 +27727,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.1
26502 .get_brightness = atmel_pwm_bl_get_intensity, 27727 .get_brightness = atmel_pwm_bl_get_intensity,
26503 .update_status = atmel_pwm_bl_set_intensity, 27728 .update_status = atmel_pwm_bl_set_intensity,
26504 }; 27729 };
26505diff -urNp linux-2.6.32.10/drivers/video/backlight/backlight.c linux-2.6.32.10/drivers/video/backlight/backlight.c 27730diff -urNp linux-2.6.32.11/drivers/video/backlight/backlight.c linux-2.6.32.11/drivers/video/backlight/backlight.c
26506--- linux-2.6.32.10/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400 27731--- linux-2.6.32.11/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400
26507+++ linux-2.6.32.10/drivers/video/backlight/backlight.c 2010-03-20 15:58:47.110069152 -0400 27732+++ linux-2.6.32.11/drivers/video/backlight/backlight.c 2010-04-04 20:46:41.633638271 -0400
26508@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); 27733@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
26509 * ERR_PTR() or a pointer to the newly allocated device. 27734 * ERR_PTR() or a pointer to the newly allocated device.
26510 */ 27735 */
@@ -26514,9 +27739,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/backlight.c linux-2.6.32.10/d
26514 { 27739 {
26515 struct backlight_device *new_bd; 27740 struct backlight_device *new_bd;
26516 int rc; 27741 int rc;
26517diff -urNp linux-2.6.32.10/drivers/video/backlight/corgi_lcd.c linux-2.6.32.10/drivers/video/backlight/corgi_lcd.c 27742diff -urNp linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c
26518--- linux-2.6.32.10/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400 27743--- linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400
26519+++ linux-2.6.32.10/drivers/video/backlight/corgi_lcd.c 2010-03-20 15:58:47.110069152 -0400 27744+++ linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c 2010-04-04 20:46:41.633638271 -0400
26520@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit 27745@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
26521 } 27746 }
26522 EXPORT_SYMBOL(corgi_lcd_limit_intensity); 27747 EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -26526,9 +27751,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/corgi_lcd.c linux-2.6.32.10/d
26526 .get_brightness = corgi_bl_get_intensity, 27751 .get_brightness = corgi_bl_get_intensity,
26527 .update_status = corgi_bl_update_status, 27752 .update_status = corgi_bl_update_status,
26528 }; 27753 };
26529diff -urNp linux-2.6.32.10/drivers/video/backlight/cr_bllcd.c linux-2.6.32.10/drivers/video/backlight/cr_bllcd.c 27754diff -urNp linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c
26530--- linux-2.6.32.10/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400 27755--- linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400
26531+++ linux-2.6.32.10/drivers/video/backlight/cr_bllcd.c 2010-03-20 15:58:47.110069152 -0400 27756+++ linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c 2010-04-04 20:46:41.633638271 -0400
26532@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st 27757@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
26533 return intensity; 27758 return intensity;
26534 } 27759 }
@@ -26538,9 +27763,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/cr_bllcd.c linux-2.6.32.10/dr
26538 .get_brightness = cr_backlight_get_intensity, 27763 .get_brightness = cr_backlight_get_intensity,
26539 .update_status = cr_backlight_set_intensity, 27764 .update_status = cr_backlight_set_intensity,
26540 }; 27765 };
26541diff -urNp linux-2.6.32.10/drivers/video/backlight/da903x_bl.c linux-2.6.32.10/drivers/video/backlight/da903x_bl.c 27766diff -urNp linux-2.6.32.11/drivers/video/backlight/da903x_bl.c linux-2.6.32.11/drivers/video/backlight/da903x_bl.c
26542--- linux-2.6.32.10/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400 27767--- linux-2.6.32.11/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400
26543+++ linux-2.6.32.10/drivers/video/backlight/da903x_bl.c 2010-03-20 15:58:47.110069152 -0400 27768+++ linux-2.6.32.11/drivers/video/backlight/da903x_bl.c 2010-04-04 20:46:41.633638271 -0400
26544@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne 27769@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
26545 return data->current_brightness; 27770 return data->current_brightness;
26546 } 27771 }
@@ -26550,9 +27775,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/da903x_bl.c linux-2.6.32.10/d
26550 .update_status = da903x_backlight_update_status, 27775 .update_status = da903x_backlight_update_status,
26551 .get_brightness = da903x_backlight_get_brightness, 27776 .get_brightness = da903x_backlight_get_brightness,
26552 }; 27777 };
26553diff -urNp linux-2.6.32.10/drivers/video/backlight/generic_bl.c linux-2.6.32.10/drivers/video/backlight/generic_bl.c 27778diff -urNp linux-2.6.32.11/drivers/video/backlight/generic_bl.c linux-2.6.32.11/drivers/video/backlight/generic_bl.c
26554--- linux-2.6.32.10/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400 27779--- linux-2.6.32.11/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400
26555+++ linux-2.6.32.10/drivers/video/backlight/generic_bl.c 2010-03-20 15:58:47.110069152 -0400 27780+++ linux-2.6.32.11/drivers/video/backlight/generic_bl.c 2010-04-04 20:46:41.633638271 -0400
26556@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) 27781@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
26557 } 27782 }
26558 EXPORT_SYMBOL(corgibl_limit_intensity); 27783 EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -26562,9 +27787,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/generic_bl.c linux-2.6.32.10/
26562 .options = BL_CORE_SUSPENDRESUME, 27787 .options = BL_CORE_SUSPENDRESUME,
26563 .get_brightness = genericbl_get_intensity, 27788 .get_brightness = genericbl_get_intensity,
26564 .update_status = genericbl_send_intensity, 27789 .update_status = genericbl_send_intensity,
26565diff -urNp linux-2.6.32.10/drivers/video/backlight/hp680_bl.c linux-2.6.32.10/drivers/video/backlight/hp680_bl.c 27790diff -urNp linux-2.6.32.11/drivers/video/backlight/hp680_bl.c linux-2.6.32.11/drivers/video/backlight/hp680_bl.c
26566--- linux-2.6.32.10/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400 27791--- linux-2.6.32.11/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400
26567+++ linux-2.6.32.10/drivers/video/backlight/hp680_bl.c 2010-03-20 15:58:47.110069152 -0400 27792+++ linux-2.6.32.11/drivers/video/backlight/hp680_bl.c 2010-04-04 20:46:41.633638271 -0400
26568@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct 27793@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
26569 return current_intensity; 27794 return current_intensity;
26570 } 27795 }
@@ -26574,9 +27799,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/hp680_bl.c linux-2.6.32.10/dr
26574 .get_brightness = hp680bl_get_intensity, 27799 .get_brightness = hp680bl_get_intensity,
26575 .update_status = hp680bl_set_intensity, 27800 .update_status = hp680bl_set_intensity,
26576 }; 27801 };
26577diff -urNp linux-2.6.32.10/drivers/video/backlight/jornada720_bl.c linux-2.6.32.10/drivers/video/backlight/jornada720_bl.c 27802diff -urNp linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c
26578--- linux-2.6.32.10/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400 27803--- linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400
26579+++ linux-2.6.32.10/drivers/video/backlight/jornada720_bl.c 2010-03-20 15:58:47.110069152 -0400 27804+++ linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c 2010-04-04 20:46:41.633638271 -0400
26580@@ -93,7 +93,7 @@ out: 27805@@ -93,7 +93,7 @@ out:
26581 return ret; 27806 return ret;
26582 } 27807 }
@@ -26586,9 +27811,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/jornada720_bl.c linux-2.6.32.
26586 .get_brightness = jornada_bl_get_brightness, 27811 .get_brightness = jornada_bl_get_brightness,
26587 .update_status = jornada_bl_update_status, 27812 .update_status = jornada_bl_update_status,
26588 .options = BL_CORE_SUSPENDRESUME, 27813 .options = BL_CORE_SUSPENDRESUME,
26589diff -urNp linux-2.6.32.10/drivers/video/backlight/kb3886_bl.c linux-2.6.32.10/drivers/video/backlight/kb3886_bl.c 27814diff -urNp linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c
26590--- linux-2.6.32.10/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400 27815--- linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400
26591+++ linux-2.6.32.10/drivers/video/backlight/kb3886_bl.c 2010-03-20 15:58:47.110069152 -0400 27816+++ linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c 2010-04-04 20:46:41.633638271 -0400
26592@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct 27817@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
26593 return kb3886bl_intensity; 27818 return kb3886bl_intensity;
26594 } 27819 }
@@ -26598,9 +27823,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/kb3886_bl.c linux-2.6.32.10/d
26598 .get_brightness = kb3886bl_get_intensity, 27823 .get_brightness = kb3886bl_get_intensity,
26599 .update_status = kb3886bl_send_intensity, 27824 .update_status = kb3886bl_send_intensity,
26600 }; 27825 };
26601diff -urNp linux-2.6.32.10/drivers/video/backlight/locomolcd.c linux-2.6.32.10/drivers/video/backlight/locomolcd.c 27826diff -urNp linux-2.6.32.11/drivers/video/backlight/locomolcd.c linux-2.6.32.11/drivers/video/backlight/locomolcd.c
26602--- linux-2.6.32.10/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400 27827--- linux-2.6.32.11/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400
26603+++ linux-2.6.32.10/drivers/video/backlight/locomolcd.c 2010-03-20 15:58:47.110069152 -0400 27828+++ linux-2.6.32.11/drivers/video/backlight/locomolcd.c 2010-04-04 20:46:41.633638271 -0400
26604@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc 27829@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
26605 return current_intensity; 27830 return current_intensity;
26606 } 27831 }
@@ -26610,9 +27835,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/locomolcd.c linux-2.6.32.10/d
26610 .get_brightness = locomolcd_get_intensity, 27835 .get_brightness = locomolcd_get_intensity,
26611 .update_status = locomolcd_set_intensity, 27836 .update_status = locomolcd_set_intensity,
26612 }; 27837 };
26613diff -urNp linux-2.6.32.10/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.10/drivers/video/backlight/mbp_nvidia_bl.c 27838diff -urNp linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c
26614--- linux-2.6.32.10/drivers/video/backlight/mbp_nvidia_bl.c 2010-03-15 11:52:04.000000000 -0400 27839--- linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c 2010-03-15 11:52:04.000000000 -0400
26615+++ linux-2.6.32.10/drivers/video/backlight/mbp_nvidia_bl.c 2010-03-20 15:58:47.110069152 -0400 27840+++ linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-04 20:46:41.633638271 -0400
26616@@ -33,7 +33,7 @@ struct dmi_match_data { 27841@@ -33,7 +33,7 @@ struct dmi_match_data {
26617 unsigned long iostart; 27842 unsigned long iostart;
26618 unsigned long iolen; 27843 unsigned long iolen;
@@ -26622,9 +27847,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.
26622 }; 27847 };
26623 27848
26624 /* Module parameters. */ 27849 /* Module parameters. */
26625diff -urNp linux-2.6.32.10/drivers/video/backlight/omap1_bl.c linux-2.6.32.10/drivers/video/backlight/omap1_bl.c 27850diff -urNp linux-2.6.32.11/drivers/video/backlight/omap1_bl.c linux-2.6.32.11/drivers/video/backlight/omap1_bl.c
26626--- linux-2.6.32.10/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400 27851--- linux-2.6.32.11/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400
26627+++ linux-2.6.32.10/drivers/video/backlight/omap1_bl.c 2010-03-20 15:58:47.110069152 -0400 27852+++ linux-2.6.32.11/drivers/video/backlight/omap1_bl.c 2010-04-04 20:46:41.633638271 -0400
26628@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b 27853@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
26629 return bl->current_intensity; 27854 return bl->current_intensity;
26630 } 27855 }
@@ -26634,9 +27859,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/omap1_bl.c linux-2.6.32.10/dr
26634 .get_brightness = omapbl_get_intensity, 27859 .get_brightness = omapbl_get_intensity,
26635 .update_status = omapbl_update_status, 27860 .update_status = omapbl_update_status,
26636 }; 27861 };
26637diff -urNp linux-2.6.32.10/drivers/video/backlight/progear_bl.c linux-2.6.32.10/drivers/video/backlight/progear_bl.c 27862diff -urNp linux-2.6.32.11/drivers/video/backlight/progear_bl.c linux-2.6.32.11/drivers/video/backlight/progear_bl.c
26638--- linux-2.6.32.10/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400 27863--- linux-2.6.32.11/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400
26639+++ linux-2.6.32.10/drivers/video/backlight/progear_bl.c 2010-03-20 15:58:47.110069152 -0400 27864+++ linux-2.6.32.11/drivers/video/backlight/progear_bl.c 2010-04-04 20:46:41.633638271 -0400
26640@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc 27865@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
26641 return intensity - HW_LEVEL_MIN; 27866 return intensity - HW_LEVEL_MIN;
26642 } 27867 }
@@ -26646,9 +27871,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/progear_bl.c linux-2.6.32.10/
26646 .get_brightness = progearbl_get_intensity, 27871 .get_brightness = progearbl_get_intensity,
26647 .update_status = progearbl_set_intensity, 27872 .update_status = progearbl_set_intensity,
26648 }; 27873 };
26649diff -urNp linux-2.6.32.10/drivers/video/backlight/pwm_bl.c linux-2.6.32.10/drivers/video/backlight/pwm_bl.c 27874diff -urNp linux-2.6.32.11/drivers/video/backlight/pwm_bl.c linux-2.6.32.11/drivers/video/backlight/pwm_bl.c
26650--- linux-2.6.32.10/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400 27875--- linux-2.6.32.11/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400
26651+++ linux-2.6.32.10/drivers/video/backlight/pwm_bl.c 2010-03-20 15:58:47.110069152 -0400 27876+++ linux-2.6.32.11/drivers/video/backlight/pwm_bl.c 2010-04-04 20:46:41.633638271 -0400
26652@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( 27877@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
26653 return bl->props.brightness; 27878 return bl->props.brightness;
26654 } 27879 }
@@ -26658,9 +27883,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/pwm_bl.c linux-2.6.32.10/driv
26658 .update_status = pwm_backlight_update_status, 27883 .update_status = pwm_backlight_update_status,
26659 .get_brightness = pwm_backlight_get_brightness, 27884 .get_brightness = pwm_backlight_get_brightness,
26660 }; 27885 };
26661diff -urNp linux-2.6.32.10/drivers/video/backlight/tosa_bl.c linux-2.6.32.10/drivers/video/backlight/tosa_bl.c 27886diff -urNp linux-2.6.32.11/drivers/video/backlight/tosa_bl.c linux-2.6.32.11/drivers/video/backlight/tosa_bl.c
26662--- linux-2.6.32.10/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400 27887--- linux-2.6.32.11/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400
26663+++ linux-2.6.32.10/drivers/video/backlight/tosa_bl.c 2010-03-20 15:58:47.110069152 -0400 27888+++ linux-2.6.32.11/drivers/video/backlight/tosa_bl.c 2010-04-04 20:46:41.633638271 -0400
26664@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct 27889@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
26665 return props->brightness; 27890 return props->brightness;
26666 } 27891 }
@@ -26670,9 +27895,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/tosa_bl.c linux-2.6.32.10/dri
26670 .get_brightness = tosa_bl_get_brightness, 27895 .get_brightness = tosa_bl_get_brightness,
26671 .update_status = tosa_bl_update_status, 27896 .update_status = tosa_bl_update_status,
26672 }; 27897 };
26673diff -urNp linux-2.6.32.10/drivers/video/backlight/wm831x_bl.c linux-2.6.32.10/drivers/video/backlight/wm831x_bl.c 27898diff -urNp linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c
26674--- linux-2.6.32.10/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400 27899--- linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400
26675+++ linux-2.6.32.10/drivers/video/backlight/wm831x_bl.c 2010-03-20 15:58:47.110069152 -0400 27900+++ linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c 2010-04-04 20:46:41.633638271 -0400
26676@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne 27901@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
26677 return data->current_brightness; 27902 return data->current_brightness;
26678 } 27903 }
@@ -26682,9 +27907,9 @@ diff -urNp linux-2.6.32.10/drivers/video/backlight/wm831x_bl.c linux-2.6.32.10/d
26682 .options = BL_CORE_SUSPENDRESUME, 27907 .options = BL_CORE_SUSPENDRESUME,
26683 .update_status = wm831x_backlight_update_status, 27908 .update_status = wm831x_backlight_update_status,
26684 .get_brightness = wm831x_backlight_get_brightness, 27909 .get_brightness = wm831x_backlight_get_brightness,
26685diff -urNp linux-2.6.32.10/drivers/video/bf54x-lq043fb.c linux-2.6.32.10/drivers/video/bf54x-lq043fb.c 27910diff -urNp linux-2.6.32.11/drivers/video/bf54x-lq043fb.c linux-2.6.32.11/drivers/video/bf54x-lq043fb.c
26686--- linux-2.6.32.10/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400 27911--- linux-2.6.32.11/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400
26687+++ linux-2.6.32.10/drivers/video/bf54x-lq043fb.c 2010-03-20 15:58:47.114045863 -0400 27912+++ linux-2.6.32.11/drivers/video/bf54x-lq043fb.c 2010-04-04 20:46:41.633638271 -0400
26688@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back 27913@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
26689 return 0; 27914 return 0;
26690 } 27915 }
@@ -26694,9 +27919,9 @@ diff -urNp linux-2.6.32.10/drivers/video/bf54x-lq043fb.c linux-2.6.32.10/drivers
26694 .get_brightness = bl_get_brightness, 27919 .get_brightness = bl_get_brightness,
26695 }; 27920 };
26696 27921
26697diff -urNp linux-2.6.32.10/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.10/drivers/video/bfin-t350mcqb-fb.c 27922diff -urNp linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c
26698--- linux-2.6.32.10/drivers/video/bfin-t350mcqb-fb.c 2010-03-15 11:52:04.000000000 -0400 27923--- linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c 2010-03-15 11:52:04.000000000 -0400
26699+++ linux-2.6.32.10/drivers/video/bfin-t350mcqb-fb.c 2010-03-20 15:58:47.114045863 -0400 27924+++ linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c 2010-04-04 20:46:41.633638271 -0400
26700@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back 27925@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
26701 return 0; 27926 return 0;
26702 } 27927 }
@@ -26706,9 +27931,9 @@ diff -urNp linux-2.6.32.10/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.10/driv
26706 .get_brightness = bl_get_brightness, 27931 .get_brightness = bl_get_brightness,
26707 }; 27932 };
26708 27933
26709diff -urNp linux-2.6.32.10/drivers/video/fbmem.c linux-2.6.32.10/drivers/video/fbmem.c 27934diff -urNp linux-2.6.32.11/drivers/video/fbmem.c linux-2.6.32.11/drivers/video/fbmem.c
26710--- linux-2.6.32.10/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400 27935--- linux-2.6.32.11/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400
26711+++ linux-2.6.32.10/drivers/video/fbmem.c 2010-03-20 15:58:47.114045863 -0400 27936+++ linux-2.6.32.11/drivers/video/fbmem.c 2010-04-04 20:46:41.633638271 -0400
26712@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in 27937@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
26713 image->dx += image->width + 8; 27938 image->dx += image->width + 8;
26714 } 27939 }
@@ -26736,9 +27961,9 @@ diff -urNp linux-2.6.32.10/drivers/video/fbmem.c linux-2.6.32.10/drivers/video/f
26736 return -EINVAL; 27961 return -EINVAL;
26737 if (!registered_fb[con2fb.framebuffer]) 27962 if (!registered_fb[con2fb.framebuffer])
26738 request_module("fb%d", con2fb.framebuffer); 27963 request_module("fb%d", con2fb.framebuffer);
26739diff -urNp linux-2.6.32.10/drivers/video/fbmon.c linux-2.6.32.10/drivers/video/fbmon.c 27964diff -urNp linux-2.6.32.11/drivers/video/fbmon.c linux-2.6.32.11/drivers/video/fbmon.c
26740--- linux-2.6.32.10/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400 27965--- linux-2.6.32.11/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400
26741+++ linux-2.6.32.10/drivers/video/fbmon.c 2010-03-20 15:58:47.114045863 -0400 27966+++ linux-2.6.32.11/drivers/video/fbmon.c 2010-04-04 20:46:41.633638271 -0400
26742@@ -45,7 +45,7 @@ 27967@@ -45,7 +45,7 @@
26743 #ifdef DEBUG 27968 #ifdef DEBUG
26744 #define DPRINTK(fmt, args...) printk(fmt,## args) 27969 #define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -26748,9 +27973,9 @@ diff -urNp linux-2.6.32.10/drivers/video/fbmon.c linux-2.6.32.10/drivers/video/f
26748 #endif 27973 #endif
26749 27974
26750 #define FBMON_FIX_HEADER 1 27975 #define FBMON_FIX_HEADER 1
26751diff -urNp linux-2.6.32.10/drivers/video/i810/i810_accel.c linux-2.6.32.10/drivers/video/i810/i810_accel.c 27976diff -urNp linux-2.6.32.11/drivers/video/i810/i810_accel.c linux-2.6.32.11/drivers/video/i810/i810_accel.c
26752--- linux-2.6.32.10/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400 27977--- linux-2.6.32.11/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400
26753+++ linux-2.6.32.10/drivers/video/i810/i810_accel.c 2010-03-20 15:58:47.114045863 -0400 27978+++ linux-2.6.32.11/drivers/video/i810/i810_accel.c 2010-04-04 20:46:41.633638271 -0400
26754@@ -73,6 +73,7 @@ static inline int wait_for_space(struct 27979@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
26755 } 27980 }
26756 } 27981 }
@@ -26759,9 +27984,9 @@ diff -urNp linux-2.6.32.10/drivers/video/i810/i810_accel.c linux-2.6.32.10/drive
26759 i810_report_error(mmio); 27984 i810_report_error(mmio);
26760 par->dev_flags |= LOCKUP; 27985 par->dev_flags |= LOCKUP;
26761 info->pixmap.scan_align = 1; 27986 info->pixmap.scan_align = 1;
26762diff -urNp linux-2.6.32.10/drivers/video/i810/i810_main.c linux-2.6.32.10/drivers/video/i810/i810_main.c 27987diff -urNp linux-2.6.32.11/drivers/video/i810/i810_main.c linux-2.6.32.11/drivers/video/i810/i810_main.c
26763--- linux-2.6.32.10/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400 27988--- linux-2.6.32.11/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400
26764+++ linux-2.6.32.10/drivers/video/i810/i810_main.c 2010-03-20 15:58:47.114045863 -0400 27989+++ linux-2.6.32.11/drivers/video/i810/i810_main.c 2010-04-04 20:46:41.633638271 -0400
26765@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t 27990@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
26766 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, 27991 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
26767 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, 27992 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
@@ -26771,9 +27996,9 @@ diff -urNp linux-2.6.32.10/drivers/video/i810/i810_main.c linux-2.6.32.10/driver
26771 }; 27996 };
26772 27997
26773 static struct pci_driver i810fb_driver = { 27998 static struct pci_driver i810fb_driver = {
26774diff -urNp linux-2.6.32.10/drivers/video/modedb.c linux-2.6.32.10/drivers/video/modedb.c 27999diff -urNp linux-2.6.32.11/drivers/video/modedb.c linux-2.6.32.11/drivers/video/modedb.c
26775--- linux-2.6.32.10/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400 28000--- linux-2.6.32.11/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400
26776+++ linux-2.6.32.10/drivers/video/modedb.c 2010-03-20 15:58:47.114045863 -0400 28001+++ linux-2.6.32.11/drivers/video/modedb.c 2010-04-04 20:46:41.637780128 -0400
26777@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ 28002@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
26778 { 28003 {
26779 /* 640x400 @ 70 Hz, 31.5 kHz hsync */ 28004 /* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -27074,9 +28299,9 @@ diff -urNp linux-2.6.32.10/drivers/video/modedb.c linux-2.6.32.10/drivers/video/
27074 }, 28299 },
27075 }; 28300 };
27076 28301
27077diff -urNp linux-2.6.32.10/drivers/video/nvidia/nv_backlight.c linux-2.6.32.10/drivers/video/nvidia/nv_backlight.c 28302diff -urNp linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c
27078--- linux-2.6.32.10/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400 28303--- linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400
27079+++ linux-2.6.32.10/drivers/video/nvidia/nv_backlight.c 2010-03-20 15:58:47.114045863 -0400 28304+++ linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c 2010-04-04 20:46:41.637780128 -0400
27080@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru 28305@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
27081 return bd->props.brightness; 28306 return bd->props.brightness;
27082 } 28307 }
@@ -27086,9 +28311,9 @@ diff -urNp linux-2.6.32.10/drivers/video/nvidia/nv_backlight.c linux-2.6.32.10/d
27086 .get_brightness = nvidia_bl_get_brightness, 28311 .get_brightness = nvidia_bl_get_brightness,
27087 .update_status = nvidia_bl_update_status, 28312 .update_status = nvidia_bl_update_status,
27088 }; 28313 };
27089diff -urNp linux-2.6.32.10/drivers/video/riva/fbdev.c linux-2.6.32.10/drivers/video/riva/fbdev.c 28314diff -urNp linux-2.6.32.11/drivers/video/riva/fbdev.c linux-2.6.32.11/drivers/video/riva/fbdev.c
27090--- linux-2.6.32.10/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400 28315--- linux-2.6.32.11/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400
27091+++ linux-2.6.32.10/drivers/video/riva/fbdev.c 2010-03-20 15:58:47.114045863 -0400 28316+++ linux-2.6.32.11/drivers/video/riva/fbdev.c 2010-04-04 20:46:41.637780128 -0400
27092@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct 28317@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
27093 return bd->props.brightness; 28318 return bd->props.brightness;
27094 } 28319 }
@@ -27098,9 +28323,9 @@ diff -urNp linux-2.6.32.10/drivers/video/riva/fbdev.c linux-2.6.32.10/drivers/vi
27098 .get_brightness = riva_bl_get_brightness, 28323 .get_brightness = riva_bl_get_brightness,
27099 .update_status = riva_bl_update_status, 28324 .update_status = riva_bl_update_status,
27100 }; 28325 };
27101diff -urNp linux-2.6.32.10/drivers/video/uvesafb.c linux-2.6.32.10/drivers/video/uvesafb.c 28326diff -urNp linux-2.6.32.11/drivers/video/uvesafb.c linux-2.6.32.11/drivers/video/uvesafb.c
27102--- linux-2.6.32.10/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400 28327--- linux-2.6.32.11/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400
27103+++ linux-2.6.32.10/drivers/video/uvesafb.c 2010-03-20 15:58:47.114045863 -0400 28328+++ linux-2.6.32.11/drivers/video/uvesafb.c 2010-04-04 20:46:41.637780128 -0400
27104@@ -18,6 +18,7 @@ 28329@@ -18,6 +18,7 @@
27105 #include <linux/fb.h> 28330 #include <linux/fb.h>
27106 #include <linux/io.h> 28331 #include <linux/io.h>
@@ -27176,9 +28401,9 @@ diff -urNp linux-2.6.32.10/drivers/video/uvesafb.c linux-2.6.32.10/drivers/video
27176 } 28401 }
27177 28402
27178 framebuffer_release(info); 28403 framebuffer_release(info);
27179diff -urNp linux-2.6.32.10/drivers/video/vesafb.c linux-2.6.32.10/drivers/video/vesafb.c 28404diff -urNp linux-2.6.32.11/drivers/video/vesafb.c linux-2.6.32.11/drivers/video/vesafb.c
27180--- linux-2.6.32.10/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400 28405--- linux-2.6.32.11/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400
27181+++ linux-2.6.32.10/drivers/video/vesafb.c 2010-03-20 15:58:47.114045863 -0400 28406+++ linux-2.6.32.11/drivers/video/vesafb.c 2010-04-04 20:46:41.637780128 -0400
27182@@ -9,6 +9,7 @@ 28407@@ -9,6 +9,7 @@
27183 */ 28408 */
27184 28409
@@ -27282,9 +28507,9 @@ diff -urNp linux-2.6.32.10/drivers/video/vesafb.c linux-2.6.32.10/drivers/video/
27282 if (info->screen_base) 28507 if (info->screen_base)
27283 iounmap(info->screen_base); 28508 iounmap(info->screen_base);
27284 framebuffer_release(info); 28509 framebuffer_release(info);
27285diff -urNp linux-2.6.32.10/drivers/xen/sys-hypervisor.c linux-2.6.32.10/drivers/xen/sys-hypervisor.c 28510diff -urNp linux-2.6.32.11/drivers/xen/sys-hypervisor.c linux-2.6.32.11/drivers/xen/sys-hypervisor.c
27286--- linux-2.6.32.10/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400 28511--- linux-2.6.32.11/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400
27287+++ linux-2.6.32.10/drivers/xen/sys-hypervisor.c 2010-03-20 15:58:47.114045863 -0400 28512+++ linux-2.6.32.11/drivers/xen/sys-hypervisor.c 2010-04-04 20:46:41.637780128 -0400
27288@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko 28513@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
27289 return 0; 28514 return 0;
27290 } 28515 }
@@ -27294,9 +28519,9 @@ diff -urNp linux-2.6.32.10/drivers/xen/sys-hypervisor.c linux-2.6.32.10/drivers/
27294 .show = hyp_sysfs_show, 28519 .show = hyp_sysfs_show,
27295 .store = hyp_sysfs_store, 28520 .store = hyp_sysfs_store,
27296 }; 28521 };
27297diff -urNp linux-2.6.32.10/fs/9p/vfs_inode.c linux-2.6.32.10/fs/9p/vfs_inode.c 28522diff -urNp linux-2.6.32.11/fs/9p/vfs_inode.c linux-2.6.32.11/fs/9p/vfs_inode.c
27298--- linux-2.6.32.10/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400 28523--- linux-2.6.32.11/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400
27299+++ linux-2.6.32.10/fs/9p/vfs_inode.c 2010-03-20 15:58:47.114045863 -0400 28524+++ linux-2.6.32.11/fs/9p/vfs_inode.c 2010-04-04 20:46:41.637780128 -0400
27300@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct 28525@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
27301 static void 28526 static void
27302 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 28527 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -27306,9 +28531,9 @@ diff -urNp linux-2.6.32.10/fs/9p/vfs_inode.c linux-2.6.32.10/fs/9p/vfs_inode.c
27306 28531
27307 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, 28532 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
27308 IS_ERR(s) ? "<error>" : s); 28533 IS_ERR(s) ? "<error>" : s);
27309diff -urNp linux-2.6.32.10/fs/aio.c linux-2.6.32.10/fs/aio.c 28534diff -urNp linux-2.6.32.11/fs/aio.c linux-2.6.32.11/fs/aio.c
27310--- linux-2.6.32.10/fs/aio.c 2010-03-15 11:52:04.000000000 -0400 28535--- linux-2.6.32.11/fs/aio.c 2010-03-15 11:52:04.000000000 -0400
27311+++ linux-2.6.32.10/fs/aio.c 2010-03-20 15:58:47.114045863 -0400 28536+++ linux-2.6.32.11/fs/aio.c 2010-04-04 20:46:41.637780128 -0400
27312@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx 28537@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx
27313 size += sizeof(struct io_event) * nr_events; 28538 size += sizeof(struct io_event) * nr_events;
27314 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; 28539 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -27318,9 +28543,9 @@ diff -urNp linux-2.6.32.10/fs/aio.c linux-2.6.32.10/fs/aio.c
27318 return -EINVAL; 28543 return -EINVAL;
27319 28544
27320 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); 28545 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
27321diff -urNp linux-2.6.32.10/fs/attr.c linux-2.6.32.10/fs/attr.c 28546diff -urNp linux-2.6.32.11/fs/attr.c linux-2.6.32.11/fs/attr.c
27322--- linux-2.6.32.10/fs/attr.c 2010-03-15 11:52:04.000000000 -0400 28547--- linux-2.6.32.11/fs/attr.c 2010-03-15 11:52:04.000000000 -0400
27323+++ linux-2.6.32.10/fs/attr.c 2010-03-20 15:58:47.118060790 -0400 28548+++ linux-2.6.32.11/fs/attr.c 2010-04-04 20:46:41.637780128 -0400
27324@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode 28549@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
27325 unsigned long limit; 28550 unsigned long limit;
27326 28551
@@ -27329,9 +28554,9 @@ diff -urNp linux-2.6.32.10/fs/attr.c linux-2.6.32.10/fs/attr.c
27329 if (limit != RLIM_INFINITY && offset > limit) 28554 if (limit != RLIM_INFINITY && offset > limit)
27330 goto out_sig; 28555 goto out_sig;
27331 if (offset > inode->i_sb->s_maxbytes) 28556 if (offset > inode->i_sb->s_maxbytes)
27332diff -urNp linux-2.6.32.10/fs/autofs/root.c linux-2.6.32.10/fs/autofs/root.c 28557diff -urNp linux-2.6.32.11/fs/autofs/root.c linux-2.6.32.11/fs/autofs/root.c
27333--- linux-2.6.32.10/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400 28558--- linux-2.6.32.11/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400
27334+++ linux-2.6.32.10/fs/autofs/root.c 2010-03-20 15:58:47.118060790 -0400 28559+++ linux-2.6.32.11/fs/autofs/root.c 2010-04-04 20:46:41.637780128 -0400
27335@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in 28560@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
27336 set_bit(n,sbi->symlink_bitmap); 28561 set_bit(n,sbi->symlink_bitmap);
27337 sl = &sbi->symlink[n]; 28562 sl = &sbi->symlink[n];
@@ -27342,9 +28567,9 @@ diff -urNp linux-2.6.32.10/fs/autofs/root.c linux-2.6.32.10/fs/autofs/root.c
27342 if (!sl->data) { 28567 if (!sl->data) {
27343 clear_bit(n,sbi->symlink_bitmap); 28568 clear_bit(n,sbi->symlink_bitmap);
27344 unlock_kernel(); 28569 unlock_kernel();
27345diff -urNp linux-2.6.32.10/fs/autofs4/symlink.c linux-2.6.32.10/fs/autofs4/symlink.c 28570diff -urNp linux-2.6.32.11/fs/autofs4/symlink.c linux-2.6.32.11/fs/autofs4/symlink.c
27346--- linux-2.6.32.10/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400 28571--- linux-2.6.32.11/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400
27347+++ linux-2.6.32.10/fs/autofs4/symlink.c 2010-03-20 15:58:47.118060790 -0400 28572+++ linux-2.6.32.11/fs/autofs4/symlink.c 2010-04-04 20:46:41.637780128 -0400
27348@@ -15,7 +15,7 @@ 28573@@ -15,7 +15,7 @@
27349 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) 28574 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
27350 { 28575 {
@@ -27354,9 +28579,9 @@ diff -urNp linux-2.6.32.10/fs/autofs4/symlink.c linux-2.6.32.10/fs/autofs4/symli
27354 return NULL; 28579 return NULL;
27355 } 28580 }
27356 28581
27357diff -urNp linux-2.6.32.10/fs/befs/linuxvfs.c linux-2.6.32.10/fs/befs/linuxvfs.c 28582diff -urNp linux-2.6.32.11/fs/befs/linuxvfs.c linux-2.6.32.11/fs/befs/linuxvfs.c
27358--- linux-2.6.32.10/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400 28583--- linux-2.6.32.11/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400
27359+++ linux-2.6.32.10/fs/befs/linuxvfs.c 2010-03-20 15:58:47.118060790 -0400 28584+++ linux-2.6.32.11/fs/befs/linuxvfs.c 2010-04-04 20:46:41.637780128 -0400
27360@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry 28585@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
27361 { 28586 {
27362 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); 28587 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -27366,9 +28591,9 @@ diff -urNp linux-2.6.32.10/fs/befs/linuxvfs.c linux-2.6.32.10/fs/befs/linuxvfs.c
27366 if (!IS_ERR(link)) 28591 if (!IS_ERR(link))
27367 kfree(link); 28592 kfree(link);
27368 } 28593 }
27369diff -urNp linux-2.6.32.10/fs/binfmt_aout.c linux-2.6.32.10/fs/binfmt_aout.c 28594diff -urNp linux-2.6.32.11/fs/binfmt_aout.c linux-2.6.32.11/fs/binfmt_aout.c
27370--- linux-2.6.32.10/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400 28595--- linux-2.6.32.11/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400
27371+++ linux-2.6.32.10/fs/binfmt_aout.c 2010-03-20 15:58:47.118060790 -0400 28596+++ linux-2.6.32.11/fs/binfmt_aout.c 2010-04-04 20:46:41.637780128 -0400
27372@@ -16,6 +16,7 @@ 28597@@ -16,6 +16,7 @@
27373 #include <linux/string.h> 28598 #include <linux/string.h>
27374 #include <linux/fs.h> 28599 #include <linux/fs.h>
@@ -27436,9 +28661,9 @@ diff -urNp linux-2.6.32.10/fs/binfmt_aout.c linux-2.6.32.10/fs/binfmt_aout.c
27436 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, 28661 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
27437 fd_offset + ex.a_text); 28662 fd_offset + ex.a_text);
27438 up_write(&current->mm->mmap_sem); 28663 up_write(&current->mm->mmap_sem);
27439diff -urNp linux-2.6.32.10/fs/binfmt_elf.c linux-2.6.32.10/fs/binfmt_elf.c 28664diff -urNp linux-2.6.32.11/fs/binfmt_elf.c linux-2.6.32.11/fs/binfmt_elf.c
27440--- linux-2.6.32.10/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 28665--- linux-2.6.32.11/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400
27441+++ linux-2.6.32.10/fs/binfmt_elf.c 2010-03-20 15:58:47.118060790 -0400 28666+++ linux-2.6.32.11/fs/binfmt_elf.c 2010-04-04 20:47:28.956670452 -0400
27442@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str 28667@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
27443 #define elf_core_dump NULL 28668 #define elf_core_dump NULL
27444 #endif 28669 #endif
@@ -27489,17 +28714,21 @@ diff -urNp linux-2.6.32.10/fs/binfmt_elf.c linux-2.6.32.10/fs/binfmt_elf.c
27489 int items; 28714 int items;
27490 elf_addr_t *elf_info; 28715 elf_addr_t *elf_info;
27491 int ei_index = 0; 28716 int ei_index = 0;
27492@@ -195,6 +206,10 @@ create_elf_tables(struct linux_binprm *b 28717@@ -195,8 +206,12 @@ create_elf_tables(struct linux_binprm *b
27493 * Generate 16 random bytes for userspace PRNG seeding. 28718 * Generate 16 random bytes for userspace PRNG seeding.
27494 */ 28719 */
27495 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes)); 28720 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
28721- u_rand_bytes = (elf_addr_t __user *)
28722- STACK_ALLOC(p, sizeof(k_rand_bytes));
27496+ srandom32(k_rand_bytes[0] ^ random32()); 28723+ srandom32(k_rand_bytes[0] ^ random32());
27497+ srandom32(k_rand_bytes[1] ^ random32()); 28724+ srandom32(k_rand_bytes[1] ^ random32());
27498+ srandom32(k_rand_bytes[2] ^ random32()); 28725+ srandom32(k_rand_bytes[2] ^ random32());
27499+ srandom32(k_rand_bytes[3] ^ random32()); 28726+ srandom32(k_rand_bytes[3] ^ random32());
27500 u_rand_bytes = (elf_addr_t __user *) 28727+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
27501 STACK_ALLOC(p, sizeof(k_rand_bytes)); 28728+ u_rand_bytes = (elf_addr_t __user *) p;
27502 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes))) 28729 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
28730 return -EFAULT;
28731
27503@@ -385,10 +400,10 @@ static unsigned long load_elf_interp(str 28732@@ -385,10 +400,10 @@ static unsigned long load_elf_interp(str
27504 { 28733 {
27505 struct elf_phdr *elf_phdata; 28734 struct elf_phdr *elf_phdata;
@@ -28070,9 +29299,9 @@ diff -urNp linux-2.6.32.10/fs/binfmt_elf.c linux-2.6.32.10/fs/binfmt_elf.c
28070 static int __init init_elf_binfmt(void) 29299 static int __init init_elf_binfmt(void)
28071 { 29300 {
28072 return register_binfmt(&elf_format); 29301 return register_binfmt(&elf_format);
28073diff -urNp linux-2.6.32.10/fs/binfmt_flat.c linux-2.6.32.10/fs/binfmt_flat.c 29302diff -urNp linux-2.6.32.11/fs/binfmt_flat.c linux-2.6.32.11/fs/binfmt_flat.c
28074--- linux-2.6.32.10/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400 29303--- linux-2.6.32.11/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400
28075+++ linux-2.6.32.10/fs/binfmt_flat.c 2010-03-20 15:58:47.118060790 -0400 29304+++ linux-2.6.32.11/fs/binfmt_flat.c 2010-04-04 20:46:41.641560293 -0400
28076@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b 29305@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
28077 realdatastart = (unsigned long) -ENOMEM; 29306 realdatastart = (unsigned long) -ENOMEM;
28078 printk("Unable to allocate RAM for process data, errno %d\n", 29307 printk("Unable to allocate RAM for process data, errno %d\n",
@@ -28105,9 +29334,9 @@ diff -urNp linux-2.6.32.10/fs/binfmt_flat.c linux-2.6.32.10/fs/binfmt_flat.c
28105 ret = result; 29334 ret = result;
28106 goto err; 29335 goto err;
28107 } 29336 }
28108diff -urNp linux-2.6.32.10/fs/binfmt_misc.c linux-2.6.32.10/fs/binfmt_misc.c 29337diff -urNp linux-2.6.32.11/fs/binfmt_misc.c linux-2.6.32.11/fs/binfmt_misc.c
28109--- linux-2.6.32.10/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400 29338--- linux-2.6.32.11/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400
28110+++ linux-2.6.32.10/fs/binfmt_misc.c 2010-03-20 15:58:47.118060790 -0400 29339+++ linux-2.6.32.11/fs/binfmt_misc.c 2010-04-04 20:46:41.641560293 -0400
28111@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl 29340@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
28112 static struct tree_descr bm_files[] = { 29341 static struct tree_descr bm_files[] = {
28113 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, 29342 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
@@ -28117,9 +29346,9 @@ diff -urNp linux-2.6.32.10/fs/binfmt_misc.c linux-2.6.32.10/fs/binfmt_misc.c
28117 }; 29346 };
28118 int err = simple_fill_super(sb, 0x42494e4d, bm_files); 29347 int err = simple_fill_super(sb, 0x42494e4d, bm_files);
28119 if (!err) 29348 if (!err)
28120diff -urNp linux-2.6.32.10/fs/bio.c linux-2.6.32.10/fs/bio.c 29349diff -urNp linux-2.6.32.11/fs/bio.c linux-2.6.32.11/fs/bio.c
28121--- linux-2.6.32.10/fs/bio.c 2010-03-15 11:52:04.000000000 -0400 29350--- linux-2.6.32.11/fs/bio.c 2010-03-15 11:52:04.000000000 -0400
28122+++ linux-2.6.32.10/fs/bio.c 2010-03-20 15:58:47.118060790 -0400 29351+++ linux-2.6.32.11/fs/bio.c 2010-04-04 20:46:41.641560293 -0400
28123@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr 29352@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
28124 29353
28125 i = 0; 29354 i = 0;
@@ -28138,9 +29367,9 @@ diff -urNp linux-2.6.32.10/fs/bio.c linux-2.6.32.10/fs/bio.c
28138 29367
28139 __bio_for_each_segment(bvec, bio, i, 0) { 29368 __bio_for_each_segment(bvec, bio, i, 0) {
28140 char *addr = page_address(bvec->bv_page); 29369 char *addr = page_address(bvec->bv_page);
28141diff -urNp linux-2.6.32.10/fs/btrfs/ctree.c linux-2.6.32.10/fs/btrfs/ctree.c 29370diff -urNp linux-2.6.32.11/fs/btrfs/ctree.c linux-2.6.32.11/fs/btrfs/ctree.c
28142--- linux-2.6.32.10/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400 29371--- linux-2.6.32.11/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400
28143+++ linux-2.6.32.10/fs/btrfs/ctree.c 2010-03-20 15:58:47.118060790 -0400 29372+++ linux-2.6.32.11/fs/btrfs/ctree.c 2010-04-04 20:46:41.641560293 -0400
28144@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran 29373@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran
28145 29374
28146 ret = 0; 29375 ret = 0;
@@ -28149,9 +29378,9 @@ diff -urNp linux-2.6.32.10/fs/btrfs/ctree.c linux-2.6.32.10/fs/btrfs/ctree.c
28149 btrfs_cpu_key_to_disk(&disk_key, cpu_key); 29378 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
28150 ret = fixup_low_keys(trans, root, path, &disk_key, 1); 29379 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
28151 } 29380 }
28152diff -urNp linux-2.6.32.10/fs/btrfs/disk-io.c linux-2.6.32.10/fs/btrfs/disk-io.c 29381diff -urNp linux-2.6.32.11/fs/btrfs/disk-io.c linux-2.6.32.11/fs/btrfs/disk-io.c
28153--- linux-2.6.32.10/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400 29382--- linux-2.6.32.11/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400
28154+++ linux-2.6.32.10/fs/btrfs/disk-io.c 2010-03-20 15:58:47.118060790 -0400 29383+++ linux-2.6.32.11/fs/btrfs/disk-io.c 2010-04-04 20:46:41.641560293 -0400
28155@@ -39,7 +39,7 @@ 29384@@ -39,7 +39,7 @@
28156 #include "tree-log.h" 29385 #include "tree-log.h"
28157 #include "free-space-cache.h" 29386 #include "free-space-cache.h"
@@ -28170,9 +29399,9 @@ diff -urNp linux-2.6.32.10/fs/btrfs/disk-io.c linux-2.6.32.10/fs/btrfs/disk-io.c
28170 .write_cache_pages_lock_hook = btree_lock_page_hook, 29399 .write_cache_pages_lock_hook = btree_lock_page_hook,
28171 .readpage_end_io_hook = btree_readpage_end_io_hook, 29400 .readpage_end_io_hook = btree_readpage_end_io_hook,
28172 .submit_bio_hook = btree_submit_bio_hook, 29401 .submit_bio_hook = btree_submit_bio_hook,
28173diff -urNp linux-2.6.32.10/fs/btrfs/extent_io.h linux-2.6.32.10/fs/btrfs/extent_io.h 29402diff -urNp linux-2.6.32.11/fs/btrfs/extent_io.h linux-2.6.32.11/fs/btrfs/extent_io.h
28174--- linux-2.6.32.10/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400 29403--- linux-2.6.32.11/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400
28175+++ linux-2.6.32.10/fs/btrfs/extent_io.h 2010-03-20 15:58:47.118060790 -0400 29404+++ linux-2.6.32.11/fs/btrfs/extent_io.h 2010-04-04 20:46:41.641560293 -0400
28176@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s 29405@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
28177 struct bio *bio, int mirror_num, 29406 struct bio *bio, int mirror_num,
28178 unsigned long bio_flags); 29407 unsigned long bio_flags);
@@ -28233,9 +29462,9 @@ diff -urNp linux-2.6.32.10/fs/btrfs/extent_io.h linux-2.6.32.10/fs/btrfs/extent_
28233 }; 29462 };
28234 29463
28235 struct extent_state { 29464 struct extent_state {
28236diff -urNp linux-2.6.32.10/fs/btrfs/free-space-cache.c linux-2.6.32.10/fs/btrfs/free-space-cache.c 29465diff -urNp linux-2.6.32.11/fs/btrfs/free-space-cache.c linux-2.6.32.11/fs/btrfs/free-space-cache.c
28237--- linux-2.6.32.10/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400 29466--- linux-2.6.32.11/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400
28238+++ linux-2.6.32.10/fs/btrfs/free-space-cache.c 2010-03-20 15:58:47.122041773 -0400 29467+++ linux-2.6.32.11/fs/btrfs/free-space-cache.c 2010-04-04 20:46:41.641560293 -0400
28239@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf 29468@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
28240 29469
28241 while(1) { 29470 while(1) {
@@ -28254,9 +29483,9 @@ diff -urNp linux-2.6.32.10/fs/btrfs/free-space-cache.c linux-2.6.32.10/fs/btrfs/
28254 29483
28255 if (entry->bitmap && entry->bytes > bytes + empty_size) { 29484 if (entry->bitmap && entry->bytes > bytes + empty_size) {
28256 ret = btrfs_bitmap_cluster(block_group, entry, cluster, 29485 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
28257diff -urNp linux-2.6.32.10/fs/btrfs/inode.c linux-2.6.32.10/fs/btrfs/inode.c 29486diff -urNp linux-2.6.32.11/fs/btrfs/inode.c linux-2.6.32.11/fs/btrfs/inode.c
28258--- linux-2.6.32.10/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400 29487--- linux-2.6.32.11/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400
28259+++ linux-2.6.32.10/fs/btrfs/inode.c 2010-03-20 15:58:47.122041773 -0400 29488+++ linux-2.6.32.11/fs/btrfs/inode.c 2010-04-04 20:46:41.641560293 -0400
28260@@ -63,7 +63,7 @@ static const struct inode_operations btr 29489@@ -63,7 +63,7 @@ static const struct inode_operations btr
28261 static const struct address_space_operations btrfs_aops; 29490 static const struct address_space_operations btrfs_aops;
28262 static const struct address_space_operations btrfs_symlink_aops; 29491 static const struct address_space_operations btrfs_symlink_aops;
@@ -28275,9 +29504,9 @@ diff -urNp linux-2.6.32.10/fs/btrfs/inode.c linux-2.6.32.10/fs/btrfs/inode.c
28275 .fill_delalloc = run_delalloc_range, 29504 .fill_delalloc = run_delalloc_range,
28276 .submit_bio_hook = btrfs_submit_bio_hook, 29505 .submit_bio_hook = btrfs_submit_bio_hook,
28277 .merge_bio_hook = btrfs_merge_bio_hook, 29506 .merge_bio_hook = btrfs_merge_bio_hook,
28278diff -urNp linux-2.6.32.10/fs/btrfs/sysfs.c linux-2.6.32.10/fs/btrfs/sysfs.c 29507diff -urNp linux-2.6.32.11/fs/btrfs/sysfs.c linux-2.6.32.11/fs/btrfs/sysfs.c
28279--- linux-2.6.32.10/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400 29508--- linux-2.6.32.11/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400
28280+++ linux-2.6.32.10/fs/btrfs/sysfs.c 2010-03-20 15:58:47.122041773 -0400 29509+++ linux-2.6.32.11/fs/btrfs/sysfs.c 2010-04-04 20:46:41.641560293 -0400
28281@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko 29510@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
28282 complete(&root->kobj_unregister); 29511 complete(&root->kobj_unregister);
28283 } 29512 }
@@ -28293,9 +29522,9 @@ diff -urNp linux-2.6.32.10/fs/btrfs/sysfs.c linux-2.6.32.10/fs/btrfs/sysfs.c
28293 .show = btrfs_root_attr_show, 29522 .show = btrfs_root_attr_show,
28294 .store = btrfs_root_attr_store, 29523 .store = btrfs_root_attr_store,
28295 }; 29524 };
28296diff -urNp linux-2.6.32.10/fs/buffer.c linux-2.6.32.10/fs/buffer.c 29525diff -urNp linux-2.6.32.11/fs/buffer.c linux-2.6.32.11/fs/buffer.c
28297--- linux-2.6.32.10/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400 29526--- linux-2.6.32.11/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400
28298+++ linux-2.6.32.10/fs/buffer.c 2010-03-20 15:58:47.122041773 -0400 29527+++ linux-2.6.32.11/fs/buffer.c 2010-04-04 20:46:41.641560293 -0400
28299@@ -25,6 +25,7 @@ 29528@@ -25,6 +25,7 @@
28300 #include <linux/percpu.h> 29529 #include <linux/percpu.h>
28301 #include <linux/slab.h> 29530 #include <linux/slab.h>
@@ -28304,9 +29533,9 @@ diff -urNp linux-2.6.32.10/fs/buffer.c linux-2.6.32.10/fs/buffer.c
28304 #include <linux/blkdev.h> 29533 #include <linux/blkdev.h>
28305 #include <linux/file.h> 29534 #include <linux/file.h>
28306 #include <linux/quotaops.h> 29535 #include <linux/quotaops.h>
28307diff -urNp linux-2.6.32.10/fs/cachefiles/rdwr.c linux-2.6.32.10/fs/cachefiles/rdwr.c 29536diff -urNp linux-2.6.32.11/fs/cachefiles/rdwr.c linux-2.6.32.11/fs/cachefiles/rdwr.c
28308--- linux-2.6.32.10/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400 29537--- linux-2.6.32.11/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400
28309+++ linux-2.6.32.10/fs/cachefiles/rdwr.c 2010-03-20 15:58:47.122041773 -0400 29538+++ linux-2.6.32.11/fs/cachefiles/rdwr.c 2010-04-04 20:46:41.641560293 -0400
28310@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache 29539@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
28311 old_fs = get_fs(); 29540 old_fs = get_fs();
28312 set_fs(KERNEL_DS); 29541 set_fs(KERNEL_DS);
@@ -28316,9 +29545,9 @@ diff -urNp linux-2.6.32.10/fs/cachefiles/rdwr.c linux-2.6.32.10/fs/cachefiles/rd
28316 set_fs(old_fs); 29545 set_fs(old_fs);
28317 kunmap(page); 29546 kunmap(page);
28318 if (ret != len) 29547 if (ret != len)
28319diff -urNp linux-2.6.32.10/fs/cifs/cifs_uniupr.h linux-2.6.32.10/fs/cifs/cifs_uniupr.h 29548diff -urNp linux-2.6.32.11/fs/cifs/cifs_uniupr.h linux-2.6.32.11/fs/cifs/cifs_uniupr.h
28320--- linux-2.6.32.10/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400 29549--- linux-2.6.32.11/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400
28321+++ linux-2.6.32.10/fs/cifs/cifs_uniupr.h 2010-03-20 15:58:47.122041773 -0400 29550+++ linux-2.6.32.11/fs/cifs/cifs_uniupr.h 2010-04-04 20:46:41.645781188 -0400
28322@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa 29551@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
28323 {0x0490, 0x04cc, UniCaseRangeU0490}, 29552 {0x0490, 0x04cc, UniCaseRangeU0490},
28324 {0x1e00, 0x1ffc, UniCaseRangeU1e00}, 29553 {0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -28328,9 +29557,9 @@ diff -urNp linux-2.6.32.10/fs/cifs/cifs_uniupr.h linux-2.6.32.10/fs/cifs/cifs_un
28328 }; 29557 };
28329 #endif 29558 #endif
28330 29559
28331diff -urNp linux-2.6.32.10/fs/cifs/link.c linux-2.6.32.10/fs/cifs/link.c 29560diff -urNp linux-2.6.32.11/fs/cifs/link.c linux-2.6.32.11/fs/cifs/link.c
28332--- linux-2.6.32.10/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400 29561--- linux-2.6.32.11/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400
28333+++ linux-2.6.32.10/fs/cifs/link.c 2010-03-20 15:58:47.122041773 -0400 29562+++ linux-2.6.32.11/fs/cifs/link.c 2010-04-04 20:46:41.645781188 -0400
28334@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct 29563@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
28335 29564
28336 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) 29565 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -28340,9 +29569,9 @@ diff -urNp linux-2.6.32.10/fs/cifs/link.c linux-2.6.32.10/fs/cifs/link.c
28340 if (!IS_ERR(p)) 29569 if (!IS_ERR(p))
28341 kfree(p); 29570 kfree(p);
28342 } 29571 }
28343diff -urNp linux-2.6.32.10/fs/compat_binfmt_elf.c linux-2.6.32.10/fs/compat_binfmt_elf.c 29572diff -urNp linux-2.6.32.11/fs/compat_binfmt_elf.c linux-2.6.32.11/fs/compat_binfmt_elf.c
28344--- linux-2.6.32.10/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 29573--- linux-2.6.32.11/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400
28345+++ linux-2.6.32.10/fs/compat_binfmt_elf.c 2010-03-20 15:58:47.122041773 -0400 29574+++ linux-2.6.32.11/fs/compat_binfmt_elf.c 2010-04-04 20:46:41.645781188 -0400
28346@@ -29,10 +29,12 @@ 29575@@ -29,10 +29,12 @@
28347 #undef elfhdr 29576 #undef elfhdr
28348 #undef elf_phdr 29577 #undef elf_phdr
@@ -28356,9 +29585,9 @@ diff -urNp linux-2.6.32.10/fs/compat_binfmt_elf.c linux-2.6.32.10/fs/compat_binf
28356 #define elf_addr_t Elf32_Addr 29585 #define elf_addr_t Elf32_Addr
28357 29586
28358 /* 29587 /*
28359diff -urNp linux-2.6.32.10/fs/compat.c linux-2.6.32.10/fs/compat.c 29588diff -urNp linux-2.6.32.11/fs/compat.c linux-2.6.32.11/fs/compat.c
28360--- linux-2.6.32.10/fs/compat.c 2010-03-15 11:52:04.000000000 -0400 29589--- linux-2.6.32.11/fs/compat.c 2010-03-15 11:52:04.000000000 -0400
28361+++ linux-2.6.32.10/fs/compat.c 2010-03-20 15:58:47.122041773 -0400 29590+++ linux-2.6.32.11/fs/compat.c 2010-04-04 20:46:41.645781188 -0400
28362@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, 29591@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc,
28363 if (!kmapped_page || kpos != (pos & PAGE_MASK)) { 29592 if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
28364 struct page *page; 29593 struct page *page;
@@ -28458,9 +29687,9 @@ diff -urNp linux-2.6.32.10/fs/compat.c linux-2.6.32.10/fs/compat.c
28458 out: 29687 out:
28459 if (bprm->mm) 29688 if (bprm->mm)
28460 mmput(bprm->mm); 29689 mmput(bprm->mm);
28461diff -urNp linux-2.6.32.10/fs/compat_ioctl.c linux-2.6.32.10/fs/compat_ioctl.c 29690diff -urNp linux-2.6.32.11/fs/compat_ioctl.c linux-2.6.32.11/fs/compat_ioctl.c
28462--- linux-2.6.32.10/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400 29691--- linux-2.6.32.11/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400
28463+++ linux-2.6.32.10/fs/compat_ioctl.c 2010-03-20 15:58:47.122041773 -0400 29692+++ linux-2.6.32.11/fs/compat_ioctl.c 2010-04-04 20:46:41.645781188 -0400
28464@@ -1827,15 +1827,15 @@ struct ioctl_trans { 29693@@ -1827,15 +1827,15 @@ struct ioctl_trans {
28465 }; 29694 };
28466 29695
@@ -28480,9 +29709,9 @@ diff -urNp linux-2.6.32.10/fs/compat_ioctl.c linux-2.6.32.10/fs/compat_ioctl.c
28480 29709
28481 /* ioctl should not be warned about even if it's not implemented. 29710 /* ioctl should not be warned about even if it's not implemented.
28482 Valid reasons to use this: 29711 Valid reasons to use this:
28483diff -urNp linux-2.6.32.10/fs/debugfs/inode.c linux-2.6.32.10/fs/debugfs/inode.c 29712diff -urNp linux-2.6.32.11/fs/debugfs/inode.c linux-2.6.32.11/fs/debugfs/inode.c
28484--- linux-2.6.32.10/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400 29713--- linux-2.6.32.11/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400
28485+++ linux-2.6.32.10/fs/debugfs/inode.c 2010-03-20 15:58:47.122041773 -0400 29714+++ linux-2.6.32.11/fs/debugfs/inode.c 2010-04-04 20:46:41.645781188 -0400
28486@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc 29715@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
28487 29716
28488 static int debug_fill_super(struct super_block *sb, void *data, int silent) 29717 static int debug_fill_super(struct super_block *sb, void *data, int silent)
@@ -28492,9 +29721,9 @@ diff -urNp linux-2.6.32.10/fs/debugfs/inode.c linux-2.6.32.10/fs/debugfs/inode.c
28492 29721
28493 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); 29722 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
28494 } 29723 }
28495diff -urNp linux-2.6.32.10/fs/dlm/lockspace.c linux-2.6.32.10/fs/dlm/lockspace.c 29724diff -urNp linux-2.6.32.11/fs/dlm/lockspace.c linux-2.6.32.11/fs/dlm/lockspace.c
28496--- linux-2.6.32.10/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400 29725--- linux-2.6.32.11/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400
28497+++ linux-2.6.32.10/fs/dlm/lockspace.c 2010-03-20 15:58:47.126047499 -0400 29726+++ linux-2.6.32.11/fs/dlm/lockspace.c 2010-04-04 20:46:41.645781188 -0400
28498@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc 29727@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
28499 kfree(ls); 29728 kfree(ls);
28500 } 29729 }
@@ -28504,9 +29733,9 @@ diff -urNp linux-2.6.32.10/fs/dlm/lockspace.c linux-2.6.32.10/fs/dlm/lockspace.c
28504 .show = dlm_attr_show, 29733 .show = dlm_attr_show,
28505 .store = dlm_attr_store, 29734 .store = dlm_attr_store,
28506 }; 29735 };
28507diff -urNp linux-2.6.32.10/fs/ecryptfs/inode.c linux-2.6.32.10/fs/ecryptfs/inode.c 29736diff -urNp linux-2.6.32.11/fs/ecryptfs/inode.c linux-2.6.32.11/fs/ecryptfs/inode.c
28508--- linux-2.6.32.10/fs/ecryptfs/inode.c 2010-03-15 11:52:04.000000000 -0400 29737--- linux-2.6.32.11/fs/ecryptfs/inode.c 2010-03-15 11:52:04.000000000 -0400
28509+++ linux-2.6.32.10/fs/ecryptfs/inode.c 2010-03-20 15:58:47.126047499 -0400 29738+++ linux-2.6.32.11/fs/ecryptfs/inode.c 2010-04-04 20:46:41.645781188 -0400
28510@@ -676,7 +676,7 @@ ecryptfs_readlink(struct dentry *dentry, 29739@@ -676,7 +676,7 @@ ecryptfs_readlink(struct dentry *dentry,
28511 old_fs = get_fs(); 29740 old_fs = get_fs();
28512 set_fs(get_ds()); 29741 set_fs(get_ds());
@@ -28525,9 +29754,9 @@ diff -urNp linux-2.6.32.10/fs/ecryptfs/inode.c linux-2.6.32.10/fs/ecryptfs/inode
28525 set_fs(old_fs); 29754 set_fs(old_fs);
28526 if (rc < 0) 29755 if (rc < 0)
28527 goto out_free; 29756 goto out_free;
28528diff -urNp linux-2.6.32.10/fs/exec.c linux-2.6.32.10/fs/exec.c 29757diff -urNp linux-2.6.32.11/fs/exec.c linux-2.6.32.11/fs/exec.c
28529--- linux-2.6.32.10/fs/exec.c 2010-03-15 11:52:04.000000000 -0400 29758--- linux-2.6.32.11/fs/exec.c 2010-04-04 20:41:50.037938751 -0400
28530+++ linux-2.6.32.10/fs/exec.c 2010-03-20 15:58:47.126047499 -0400 29759+++ linux-2.6.32.11/fs/exec.c 2010-04-04 20:46:41.645781188 -0400
28531@@ -56,12 +56,24 @@ 29760@@ -56,12 +56,24 @@
28532 #include <linux/fsnotify.h> 29761 #include <linux/fsnotify.h>
28533 #include <linux/fs_struct.h> 29762 #include <linux/fs_struct.h>
@@ -29006,9 +30235,9 @@ diff -urNp linux-2.6.32.10/fs/exec.c linux-2.6.32.10/fs/exec.c
29006 /* 30235 /*
29007 * lock_kernel() because format_corename() is controlled by sysctl, which 30236 * lock_kernel() because format_corename() is controlled by sysctl, which
29008 * uses lock_kernel() 30237 * uses lock_kernel()
29009diff -urNp linux-2.6.32.10/fs/ext2/balloc.c linux-2.6.32.10/fs/ext2/balloc.c 30238diff -urNp linux-2.6.32.11/fs/ext2/balloc.c linux-2.6.32.11/fs/ext2/balloc.c
29010--- linux-2.6.32.10/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400 30239--- linux-2.6.32.11/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400
29011+++ linux-2.6.32.10/fs/ext2/balloc.c 2010-03-20 15:58:47.126047499 -0400 30240+++ linux-2.6.32.11/fs/ext2/balloc.c 2010-04-04 20:46:41.645781188 -0400
29012@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e 30241@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
29013 30242
29014 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 30243 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -29018,9 +30247,9 @@ diff -urNp linux-2.6.32.10/fs/ext2/balloc.c linux-2.6.32.10/fs/ext2/balloc.c
29018 sbi->s_resuid != current_fsuid() && 30247 sbi->s_resuid != current_fsuid() &&
29019 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 30248 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
29020 return 0; 30249 return 0;
29021diff -urNp linux-2.6.32.10/fs/ext3/balloc.c linux-2.6.32.10/fs/ext3/balloc.c 30250diff -urNp linux-2.6.32.11/fs/ext3/balloc.c linux-2.6.32.11/fs/ext3/balloc.c
29022--- linux-2.6.32.10/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400 30251--- linux-2.6.32.11/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400
29023+++ linux-2.6.32.10/fs/ext3/balloc.c 2010-03-20 15:58:47.126047499 -0400 30252+++ linux-2.6.32.11/fs/ext3/balloc.c 2010-04-04 20:46:41.645781188 -0400
29024@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e 30253@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
29025 30254
29026 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 30255 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -29030,9 +30259,9 @@ diff -urNp linux-2.6.32.10/fs/ext3/balloc.c linux-2.6.32.10/fs/ext3/balloc.c
29030 sbi->s_resuid != current_fsuid() && 30259 sbi->s_resuid != current_fsuid() &&
29031 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 30260 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
29032 return 0; 30261 return 0;
29033diff -urNp linux-2.6.32.10/fs/ext3/namei.c linux-2.6.32.10/fs/ext3/namei.c 30262diff -urNp linux-2.6.32.11/fs/ext3/namei.c linux-2.6.32.11/fs/ext3/namei.c
29034--- linux-2.6.32.10/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400 30263--- linux-2.6.32.11/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400
29035+++ linux-2.6.32.10/fs/ext3/namei.c 2010-03-20 15:58:47.126047499 -0400 30264+++ linux-2.6.32.11/fs/ext3/namei.c 2010-04-04 20:46:41.649500937 -0400
29036@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split 30265@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
29037 char *data1 = (*bh)->b_data, *data2; 30266 char *data1 = (*bh)->b_data, *data2;
29038 unsigned split, move, size; 30267 unsigned split, move, size;
@@ -29042,9 +30271,9 @@ diff -urNp linux-2.6.32.10/fs/ext3/namei.c linux-2.6.32.10/fs/ext3/namei.c
29042 30271
29043 bh2 = ext3_append (handle, dir, &newblock, &err); 30272 bh2 = ext3_append (handle, dir, &newblock, &err);
29044 if (!(bh2)) { 30273 if (!(bh2)) {
29045diff -urNp linux-2.6.32.10/fs/ext3/xattr.c linux-2.6.32.10/fs/ext3/xattr.c 30274diff -urNp linux-2.6.32.11/fs/ext3/xattr.c linux-2.6.32.11/fs/ext3/xattr.c
29046--- linux-2.6.32.10/fs/ext3/xattr.c 2010-03-15 11:52:04.000000000 -0400 30275--- linux-2.6.32.11/fs/ext3/xattr.c 2010-03-15 11:52:04.000000000 -0400
29047+++ linux-2.6.32.10/fs/ext3/xattr.c 2010-03-20 15:58:47.126047499 -0400 30276+++ linux-2.6.32.11/fs/ext3/xattr.c 2010-04-04 20:46:41.649500937 -0400
29048@@ -89,8 +89,8 @@ 30277@@ -89,8 +89,8 @@
29049 printk("\n"); \ 30278 printk("\n"); \
29050 } while (0) 30279 } while (0)
@@ -29056,9 +30285,9 @@ diff -urNp linux-2.6.32.10/fs/ext3/xattr.c linux-2.6.32.10/fs/ext3/xattr.c
29056 #endif 30285 #endif
29057 30286
29058 static void ext3_xattr_cache_insert(struct buffer_head *); 30287 static void ext3_xattr_cache_insert(struct buffer_head *);
29059diff -urNp linux-2.6.32.10/fs/ext4/balloc.c linux-2.6.32.10/fs/ext4/balloc.c 30288diff -urNp linux-2.6.32.11/fs/ext4/balloc.c linux-2.6.32.11/fs/ext4/balloc.c
29060--- linux-2.6.32.10/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400 30289--- linux-2.6.32.11/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400
29061+++ linux-2.6.32.10/fs/ext4/balloc.c 2010-03-20 15:58:47.126047499 -0400 30290+++ linux-2.6.32.11/fs/ext4/balloc.c 2010-04-04 20:46:41.649500937 -0400
29062@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ 30291@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_
29063 /* Hm, nope. Are (enough) root reserved blocks available? */ 30292 /* Hm, nope. Are (enough) root reserved blocks available? */
29064 if (sbi->s_resuid == current_fsuid() || 30293 if (sbi->s_resuid == current_fsuid() ||
@@ -29068,9 +30297,9 @@ diff -urNp linux-2.6.32.10/fs/ext4/balloc.c linux-2.6.32.10/fs/ext4/balloc.c
29068 if (free_blocks >= (nblocks + dirty_blocks)) 30297 if (free_blocks >= (nblocks + dirty_blocks))
29069 return 1; 30298 return 1;
29070 } 30299 }
29071diff -urNp linux-2.6.32.10/fs/ext4/ioctl.c linux-2.6.32.10/fs/ext4/ioctl.c 30300diff -urNp linux-2.6.32.11/fs/ext4/ioctl.c linux-2.6.32.11/fs/ext4/ioctl.c
29072--- linux-2.6.32.10/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400 30301--- linux-2.6.32.11/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400
29073+++ linux-2.6.32.10/fs/ext4/ioctl.c 2010-03-20 15:58:47.126047499 -0400 30302+++ linux-2.6.32.11/fs/ext4/ioctl.c 2010-04-04 20:46:41.649500937 -0400
29074@@ -221,6 +221,9 @@ setversion_out: 30303@@ -221,6 +221,9 @@ setversion_out:
29075 struct file *donor_filp; 30304 struct file *donor_filp;
29076 int err; 30305 int err;
@@ -29081,9 +30310,9 @@ diff -urNp linux-2.6.32.10/fs/ext4/ioctl.c linux-2.6.32.10/fs/ext4/ioctl.c
29081 if (!(filp->f_mode & FMODE_READ) || 30310 if (!(filp->f_mode & FMODE_READ) ||
29082 !(filp->f_mode & FMODE_WRITE)) 30311 !(filp->f_mode & FMODE_WRITE))
29083 return -EBADF; 30312 return -EBADF;
29084diff -urNp linux-2.6.32.10/fs/ext4/namei.c linux-2.6.32.10/fs/ext4/namei.c 30313diff -urNp linux-2.6.32.11/fs/ext4/namei.c linux-2.6.32.11/fs/ext4/namei.c
29085--- linux-2.6.32.10/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400 30314--- linux-2.6.32.11/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400
29086+++ linux-2.6.32.10/fs/ext4/namei.c 2010-03-20 15:58:47.126047499 -0400 30315+++ linux-2.6.32.11/fs/ext4/namei.c 2010-04-04 20:46:41.649500937 -0400
29087@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split 30316@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
29088 char *data1 = (*bh)->b_data, *data2; 30317 char *data1 = (*bh)->b_data, *data2;
29089 unsigned split, move, size; 30318 unsigned split, move, size;
@@ -29093,9 +30322,9 @@ diff -urNp linux-2.6.32.10/fs/ext4/namei.c linux-2.6.32.10/fs/ext4/namei.c
29093 30322
29094 bh2 = ext4_append (handle, dir, &newblock, &err); 30323 bh2 = ext4_append (handle, dir, &newblock, &err);
29095 if (!(bh2)) { 30324 if (!(bh2)) {
29096diff -urNp linux-2.6.32.10/fs/ext4/super.c linux-2.6.32.10/fs/ext4/super.c 30325diff -urNp linux-2.6.32.11/fs/ext4/super.c linux-2.6.32.11/fs/ext4/super.c
29097--- linux-2.6.32.10/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400 30326--- linux-2.6.32.11/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400
29098+++ linux-2.6.32.10/fs/ext4/super.c 2010-03-20 15:58:47.126047499 -0400 30327+++ linux-2.6.32.11/fs/ext4/super.c 2010-04-04 20:46:41.649500937 -0400
29099@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje 30328@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje
29100 } 30329 }
29101 30330
@@ -29105,9 +30334,9 @@ diff -urNp linux-2.6.32.10/fs/ext4/super.c linux-2.6.32.10/fs/ext4/super.c
29105 .show = ext4_attr_show, 30334 .show = ext4_attr_show,
29106 .store = ext4_attr_store, 30335 .store = ext4_attr_store,
29107 }; 30336 };
29108diff -urNp linux-2.6.32.10/fs/fcntl.c linux-2.6.32.10/fs/fcntl.c 30337diff -urNp linux-2.6.32.11/fs/fcntl.c linux-2.6.32.11/fs/fcntl.c
29109--- linux-2.6.32.10/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400 30338--- linux-2.6.32.11/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400
29110+++ linux-2.6.32.10/fs/fcntl.c 2010-03-20 15:58:47.126047499 -0400 30339+++ linux-2.6.32.11/fs/fcntl.c 2010-04-04 20:46:41.649500937 -0400
29111@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in 30340@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in
29112 switch (cmd) { 30341 switch (cmd) {
29113 case F_DUPFD: 30342 case F_DUPFD:
@@ -29126,9 +30355,9 @@ diff -urNp linux-2.6.32.10/fs/fcntl.c linux-2.6.32.10/fs/fcntl.c
29126 rcu_read_unlock(); 30355 rcu_read_unlock();
29127 return ret; 30356 return ret;
29128 } 30357 }
29129diff -urNp linux-2.6.32.10/fs/fifo.c linux-2.6.32.10/fs/fifo.c 30358diff -urNp linux-2.6.32.11/fs/fifo.c linux-2.6.32.11/fs/fifo.c
29130--- linux-2.6.32.10/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400 30359--- linux-2.6.32.11/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400
29131+++ linux-2.6.32.10/fs/fifo.c 2010-03-20 15:58:47.130049516 -0400 30360+++ linux-2.6.32.11/fs/fifo.c 2010-04-04 20:46:41.649500937 -0400
29132@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode 30361@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
29133 */ 30362 */
29134 filp->f_op = &read_pipefifo_fops; 30363 filp->f_op = &read_pipefifo_fops;
@@ -29199,9 +30428,9 @@ diff -urNp linux-2.6.32.10/fs/fifo.c linux-2.6.32.10/fs/fifo.c
29199 free_pipe_info(inode); 30428 free_pipe_info(inode);
29200 30429
29201 err_nocleanup: 30430 err_nocleanup:
29202diff -urNp linux-2.6.32.10/fs/file.c linux-2.6.32.10/fs/file.c 30431diff -urNp linux-2.6.32.11/fs/file.c linux-2.6.32.11/fs/file.c
29203--- linux-2.6.32.10/fs/file.c 2010-03-15 11:52:04.000000000 -0400 30432--- linux-2.6.32.11/fs/file.c 2010-03-15 11:52:04.000000000 -0400
29204+++ linux-2.6.32.10/fs/file.c 2010-03-20 15:58:47.130049516 -0400 30433+++ linux-2.6.32.11/fs/file.c 2010-04-04 20:46:41.649500937 -0400
29205@@ -14,6 +14,7 @@ 30434@@ -14,6 +14,7 @@
29206 #include <linux/slab.h> 30435 #include <linux/slab.h>
29207 #include <linux/vmalloc.h> 30436 #include <linux/vmalloc.h>
@@ -29219,9 +30448,9 @@ diff -urNp linux-2.6.32.10/fs/file.c linux-2.6.32.10/fs/file.c
29219 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 30448 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
29220 return -EMFILE; 30449 return -EMFILE;
29221 30450
29222diff -urNp linux-2.6.32.10/fs/fs_struct.c linux-2.6.32.10/fs/fs_struct.c 30451diff -urNp linux-2.6.32.11/fs/fs_struct.c linux-2.6.32.11/fs/fs_struct.c
29223--- linux-2.6.32.10/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400 30452--- linux-2.6.32.11/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400
29224+++ linux-2.6.32.10/fs/fs_struct.c 2010-03-20 15:58:47.130049516 -0400 30453+++ linux-2.6.32.11/fs/fs_struct.c 2010-04-04 20:46:41.649500937 -0400
29225@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo 30454@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo
29226 struct task_struct *g, *p; 30455 struct task_struct *g, *p;
29227 struct fs_struct *fs; 30456 struct fs_struct *fs;
@@ -29326,9 +30555,9 @@ diff -urNp linux-2.6.32.10/fs/fs_struct.c linux-2.6.32.10/fs/fs_struct.c
29326 30555
29327 task_unlock(current); 30556 task_unlock(current);
29328 if (kill) 30557 if (kill)
29329diff -urNp linux-2.6.32.10/fs/fuse/control.c linux-2.6.32.10/fs/fuse/control.c 30558diff -urNp linux-2.6.32.11/fs/fuse/control.c linux-2.6.32.11/fs/fuse/control.c
29330--- linux-2.6.32.10/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400 30559--- linux-2.6.32.11/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400
29331+++ linux-2.6.32.10/fs/fuse/control.c 2010-03-20 15:58:47.130049516 -0400 30560+++ linux-2.6.32.11/fs/fuse/control.c 2010-04-04 20:46:41.649500937 -0400
29332@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co 30561@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
29333 30562
29334 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) 30563 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
@@ -29338,9 +30567,9 @@ diff -urNp linux-2.6.32.10/fs/fuse/control.c linux-2.6.32.10/fs/fuse/control.c
29338 struct fuse_conn *fc; 30567 struct fuse_conn *fc;
29339 int err; 30568 int err;
29340 30569
29341diff -urNp linux-2.6.32.10/fs/fuse/cuse.c linux-2.6.32.10/fs/fuse/cuse.c 30570diff -urNp linux-2.6.32.11/fs/fuse/cuse.c linux-2.6.32.11/fs/fuse/cuse.c
29342--- linux-2.6.32.10/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400 30571--- linux-2.6.32.11/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400
29343+++ linux-2.6.32.10/fs/fuse/cuse.c 2010-03-20 15:58:47.130049516 -0400 30572+++ linux-2.6.32.11/fs/fuse/cuse.c 2010-04-04 20:46:41.649500937 -0400
29344@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i 30573@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
29345 return rc; 30574 return rc;
29346 } 30575 }
@@ -29375,9 +30604,9 @@ diff -urNp linux-2.6.32.10/fs/fuse/cuse.c linux-2.6.32.10/fs/fuse/cuse.c
29375 cuse_class = class_create(THIS_MODULE, "cuse"); 30604 cuse_class = class_create(THIS_MODULE, "cuse");
29376 if (IS_ERR(cuse_class)) 30605 if (IS_ERR(cuse_class))
29377 return PTR_ERR(cuse_class); 30606 return PTR_ERR(cuse_class);
29378diff -urNp linux-2.6.32.10/fs/fuse/dev.c linux-2.6.32.10/fs/fuse/dev.c 30607diff -urNp linux-2.6.32.11/fs/fuse/dev.c linux-2.6.32.11/fs/fuse/dev.c
29379--- linux-2.6.32.10/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400 30608--- linux-2.6.32.11/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400
29380+++ linux-2.6.32.10/fs/fuse/dev.c 2010-03-20 15:58:47.130049516 -0400 30609+++ linux-2.6.32.11/fs/fuse/dev.c 2010-04-04 20:46:41.649500937 -0400
29381@@ -745,7 +745,7 @@ __releases(&fc->lock) 30610@@ -745,7 +745,7 @@ __releases(&fc->lock)
29382 * request_end(). Otherwise add it to the processing list, and set 30611 * request_end(). Otherwise add it to the processing list, and set
29383 * the 'sent' flag. 30612 * the 'sent' flag.
@@ -29483,9 +30712,9 @@ diff -urNp linux-2.6.32.10/fs/fuse/dev.c linux-2.6.32.10/fs/fuse/dev.c
29483 30712
29484 const struct file_operations fuse_dev_operations = { 30713 const struct file_operations fuse_dev_operations = {
29485 .owner = THIS_MODULE, 30714 .owner = THIS_MODULE,
29486diff -urNp linux-2.6.32.10/fs/fuse/dir.c linux-2.6.32.10/fs/fuse/dir.c 30715diff -urNp linux-2.6.32.11/fs/fuse/dir.c linux-2.6.32.11/fs/fuse/dir.c
29487--- linux-2.6.32.10/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400 30716--- linux-2.6.32.11/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400
29488+++ linux-2.6.32.10/fs/fuse/dir.c 2010-03-20 15:58:47.130049516 -0400 30717+++ linux-2.6.32.11/fs/fuse/dir.c 2010-04-04 20:46:41.649500937 -0400
29489@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de 30718@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
29490 return link; 30719 return link;
29491 } 30720 }
@@ -29495,9 +30724,9 @@ diff -urNp linux-2.6.32.10/fs/fuse/dir.c linux-2.6.32.10/fs/fuse/dir.c
29495 { 30724 {
29496 if (!IS_ERR(link)) 30725 if (!IS_ERR(link))
29497 free_page((unsigned long) link); 30726 free_page((unsigned long) link);
29498diff -urNp linux-2.6.32.10/fs/fuse/fuse_i.h linux-2.6.32.10/fs/fuse/fuse_i.h 30727diff -urNp linux-2.6.32.11/fs/fuse/fuse_i.h linux-2.6.32.11/fs/fuse/fuse_i.h
29499--- linux-2.6.32.10/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400 30728--- linux-2.6.32.11/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400
29500+++ linux-2.6.32.10/fs/fuse/fuse_i.h 2010-03-20 15:58:47.130049516 -0400 30729+++ linux-2.6.32.11/fs/fuse/fuse_i.h 2010-04-04 20:46:41.649500937 -0400
29501@@ -521,6 +521,16 @@ extern const struct file_operations fuse 30730@@ -521,6 +521,16 @@ extern const struct file_operations fuse
29502 30731
29503 extern const struct dentry_operations fuse_dentry_operations; 30732 extern const struct dentry_operations fuse_dentry_operations;
@@ -29515,9 +30744,9 @@ diff -urNp linux-2.6.32.10/fs/fuse/fuse_i.h linux-2.6.32.10/fs/fuse/fuse_i.h
29515 /** 30744 /**
29516 * Inode to nodeid comparison. 30745 * Inode to nodeid comparison.
29517 */ 30746 */
29518diff -urNp linux-2.6.32.10/fs/gfs2/sys.c linux-2.6.32.10/fs/gfs2/sys.c 30747diff -urNp linux-2.6.32.11/fs/gfs2/sys.c linux-2.6.32.11/fs/gfs2/sys.c
29519--- linux-2.6.32.10/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400 30748--- linux-2.6.32.11/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400
29520+++ linux-2.6.32.10/fs/gfs2/sys.c 2010-03-20 15:58:47.130049516 -0400 30749+++ linux-2.6.32.11/fs/gfs2/sys.c 2010-04-04 20:46:41.649500937 -0400
29521@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko 30750@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
29522 return a->store ? a->store(sdp, buf, len) : len; 30751 return a->store ? a->store(sdp, buf, len) : len;
29523 } 30752 }
@@ -29536,9 +30765,9 @@ diff -urNp linux-2.6.32.10/fs/gfs2/sys.c linux-2.6.32.10/fs/gfs2/sys.c
29536 .uevent = gfs2_uevent, 30765 .uevent = gfs2_uevent,
29537 }; 30766 };
29538 30767
29539diff -urNp linux-2.6.32.10/fs/hfs/inode.c linux-2.6.32.10/fs/hfs/inode.c 30768diff -urNp linux-2.6.32.11/fs/hfs/inode.c linux-2.6.32.11/fs/hfs/inode.c
29540--- linux-2.6.32.10/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400 30769--- linux-2.6.32.11/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400
29541+++ linux-2.6.32.10/fs/hfs/inode.c 2010-03-20 15:58:47.130049516 -0400 30770+++ linux-2.6.32.11/fs/hfs/inode.c 2010-04-04 20:46:41.653544810 -0400
29542@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, 30771@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
29543 30772
29544 if (S_ISDIR(main_inode->i_mode)) { 30773 if (S_ISDIR(main_inode->i_mode)) {
@@ -29557,9 +30786,9 @@ diff -urNp linux-2.6.32.10/fs/hfs/inode.c linux-2.6.32.10/fs/hfs/inode.c
29557 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, 30786 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
29558 sizeof(struct hfs_cat_file)); 30787 sizeof(struct hfs_cat_file));
29559 if (rec.type != HFS_CDR_FIL || 30788 if (rec.type != HFS_CDR_FIL ||
29560diff -urNp linux-2.6.32.10/fs/hfsplus/inode.c linux-2.6.32.10/fs/hfsplus/inode.c 30789diff -urNp linux-2.6.32.11/fs/hfsplus/inode.c linux-2.6.32.11/fs/hfsplus/inode.c
29561--- linux-2.6.32.10/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400 30790--- linux-2.6.32.11/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400
29562+++ linux-2.6.32.10/fs/hfsplus/inode.c 2010-03-20 15:58:47.130049516 -0400 30791+++ linux-2.6.32.11/fs/hfsplus/inode.c 2010-04-04 20:46:41.653544810 -0400
29563@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode 30792@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
29564 struct hfsplus_cat_folder *folder = &entry.folder; 30793 struct hfsplus_cat_folder *folder = &entry.folder;
29565 30794
@@ -29596,9 +30825,9 @@ diff -urNp linux-2.6.32.10/fs/hfsplus/inode.c linux-2.6.32.10/fs/hfsplus/inode.c
29596 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, 30825 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
29597 sizeof(struct hfsplus_cat_file)); 30826 sizeof(struct hfsplus_cat_file));
29598 hfsplus_inode_write_fork(inode, &file->data_fork); 30827 hfsplus_inode_write_fork(inode, &file->data_fork);
29599diff -urNp linux-2.6.32.10/fs/ioctl.c linux-2.6.32.10/fs/ioctl.c 30828diff -urNp linux-2.6.32.11/fs/ioctl.c linux-2.6.32.11/fs/ioctl.c
29600--- linux-2.6.32.10/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400 30829--- linux-2.6.32.11/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400
29601+++ linux-2.6.32.10/fs/ioctl.c 2010-03-20 15:58:47.130049516 -0400 30830+++ linux-2.6.32.11/fs/ioctl.c 2010-04-04 20:46:41.653544810 -0400
29602@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema 30831@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
29603 u64 phys, u64 len, u32 flags) 30832 u64 phys, u64 len, u32 flags)
29604 { 30833 {
@@ -29626,9 +30855,9 @@ diff -urNp linux-2.6.32.10/fs/ioctl.c linux-2.6.32.10/fs/ioctl.c
29626 error = -EFAULT; 30855 error = -EFAULT;
29627 30856
29628 return error; 30857 return error;
29629diff -urNp linux-2.6.32.10/fs/jffs2/debug.h linux-2.6.32.10/fs/jffs2/debug.h 30858diff -urNp linux-2.6.32.11/fs/jffs2/debug.h linux-2.6.32.11/fs/jffs2/debug.h
29630--- linux-2.6.32.10/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400 30859--- linux-2.6.32.11/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400
29631+++ linux-2.6.32.10/fs/jffs2/debug.h 2010-03-20 15:58:47.130049516 -0400 30860+++ linux-2.6.32.11/fs/jffs2/debug.h 2010-04-04 20:46:41.653544810 -0400
29632@@ -52,13 +52,13 @@ 30861@@ -52,13 +52,13 @@
29633 #if CONFIG_JFFS2_FS_DEBUG > 0 30862 #if CONFIG_JFFS2_FS_DEBUG > 0
29634 #define D1(x) x 30863 #define D1(x) x
@@ -29730,9 +30959,9 @@ diff -urNp linux-2.6.32.10/fs/jffs2/debug.h linux-2.6.32.10/fs/jffs2/debug.h
29730 #endif 30959 #endif
29731 30960
29732 /* "Sanity" checks */ 30961 /* "Sanity" checks */
29733diff -urNp linux-2.6.32.10/fs/jffs2/erase.c linux-2.6.32.10/fs/jffs2/erase.c 30962diff -urNp linux-2.6.32.11/fs/jffs2/erase.c linux-2.6.32.11/fs/jffs2/erase.c
29734--- linux-2.6.32.10/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400 30963--- linux-2.6.32.11/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400
29735+++ linux-2.6.32.10/fs/jffs2/erase.c 2010-03-20 15:58:47.130049516 -0400 30964+++ linux-2.6.32.11/fs/jffs2/erase.c 2010-04-04 20:46:41.653544810 -0400
29736@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru 30965@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
29737 struct jffs2_unknown_node marker = { 30966 struct jffs2_unknown_node marker = {
29738 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), 30967 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -29743,9 +30972,9 @@ diff -urNp linux-2.6.32.10/fs/jffs2/erase.c linux-2.6.32.10/fs/jffs2/erase.c
29743 }; 30972 };
29744 30973
29745 jffs2_prealloc_raw_node_refs(c, jeb, 1); 30974 jffs2_prealloc_raw_node_refs(c, jeb, 1);
29746diff -urNp linux-2.6.32.10/fs/jffs2/summary.h linux-2.6.32.10/fs/jffs2/summary.h 30975diff -urNp linux-2.6.32.11/fs/jffs2/summary.h linux-2.6.32.11/fs/jffs2/summary.h
29747--- linux-2.6.32.10/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400 30976--- linux-2.6.32.11/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400
29748+++ linux-2.6.32.10/fs/jffs2/summary.h 2010-03-20 15:58:47.130049516 -0400 30977+++ linux-2.6.32.11/fs/jffs2/summary.h 2010-04-04 20:46:41.653544810 -0400
29749@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ 30978@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
29750 30979
29751 #define jffs2_sum_active() (0) 30980 #define jffs2_sum_active() (0)
@@ -29774,9 +31003,9 @@ diff -urNp linux-2.6.32.10/fs/jffs2/summary.h linux-2.6.32.10/fs/jffs2/summary.h
29774 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) 31003 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
29775 31004
29776 #endif /* CONFIG_JFFS2_SUMMARY */ 31005 #endif /* CONFIG_JFFS2_SUMMARY */
29777diff -urNp linux-2.6.32.10/fs/jffs2/wbuf.c linux-2.6.32.10/fs/jffs2/wbuf.c 31006diff -urNp linux-2.6.32.11/fs/jffs2/wbuf.c linux-2.6.32.11/fs/jffs2/wbuf.c
29778--- linux-2.6.32.10/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400 31007--- linux-2.6.32.11/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400
29779+++ linux-2.6.32.10/fs/jffs2/wbuf.c 2010-03-20 15:58:47.130049516 -0400 31008+++ linux-2.6.32.11/fs/jffs2/wbuf.c 2010-04-04 20:46:41.653544810 -0400
29780@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o 31009@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
29781 { 31010 {
29782 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), 31011 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -29787,9 +31016,9 @@ diff -urNp linux-2.6.32.10/fs/jffs2/wbuf.c linux-2.6.32.10/fs/jffs2/wbuf.c
29787 }; 31016 };
29788 31017
29789 /* 31018 /*
29790diff -urNp linux-2.6.32.10/fs/lockd/svc.c linux-2.6.32.10/fs/lockd/svc.c 31019diff -urNp linux-2.6.32.11/fs/lockd/svc.c linux-2.6.32.11/fs/lockd/svc.c
29791--- linux-2.6.32.10/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400 31020--- linux-2.6.32.11/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400
29792+++ linux-2.6.32.10/fs/lockd/svc.c 2010-03-20 15:58:47.130049516 -0400 31021+++ linux-2.6.32.11/fs/lockd/svc.c 2010-04-04 20:46:41.653544810 -0400
29793@@ -43,7 +43,7 @@ 31022@@ -43,7 +43,7 @@
29794 31023
29795 static struct svc_program nlmsvc_program; 31024 static struct svc_program nlmsvc_program;
@@ -29799,9 +31028,9 @@ diff -urNp linux-2.6.32.10/fs/lockd/svc.c linux-2.6.32.10/fs/lockd/svc.c
29799 EXPORT_SYMBOL_GPL(nlmsvc_ops); 31028 EXPORT_SYMBOL_GPL(nlmsvc_ops);
29800 31029
29801 static DEFINE_MUTEX(nlmsvc_mutex); 31030 static DEFINE_MUTEX(nlmsvc_mutex);
29802diff -urNp linux-2.6.32.10/fs/locks.c linux-2.6.32.10/fs/locks.c 31031diff -urNp linux-2.6.32.11/fs/locks.c linux-2.6.32.11/fs/locks.c
29803--- linux-2.6.32.10/fs/locks.c 2010-03-15 11:52:04.000000000 -0400 31032--- linux-2.6.32.11/fs/locks.c 2010-03-15 11:52:04.000000000 -0400
29804+++ linux-2.6.32.10/fs/locks.c 2010-03-20 15:58:47.130049516 -0400 31033+++ linux-2.6.32.11/fs/locks.c 2010-04-04 20:46:41.653544810 -0400
29805@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil 31034@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
29806 return; 31035 return;
29807 31036
@@ -29823,9 +31052,9 @@ diff -urNp linux-2.6.32.10/fs/locks.c linux-2.6.32.10/fs/locks.c
29823 } 31052 }
29824 31053
29825 lock_kernel(); 31054 lock_kernel();
29826diff -urNp linux-2.6.32.10/fs/namei.c linux-2.6.32.10/fs/namei.c 31055diff -urNp linux-2.6.32.11/fs/namei.c linux-2.6.32.11/fs/namei.c
29827--- linux-2.6.32.10/fs/namei.c 2010-03-15 11:52:04.000000000 -0400 31056--- linux-2.6.32.11/fs/namei.c 2010-03-15 11:52:04.000000000 -0400
29828+++ linux-2.6.32.10/fs/namei.c 2010-03-20 15:58:47.134048580 -0400 31057+++ linux-2.6.32.11/fs/namei.c 2010-04-04 20:46:41.653544810 -0400
29829@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l 31058@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l
29830 cookie = dentry->d_inode->i_op->follow_link(dentry, nd); 31059 cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
29831 error = PTR_ERR(cookie); 31060 error = PTR_ERR(cookie);
@@ -30152,9 +31381,9 @@ diff -urNp linux-2.6.32.10/fs/namei.c linux-2.6.32.10/fs/namei.c
30152 exit6: 31381 exit6:
30153 mnt_drop_write(oldnd.path.mnt); 31382 mnt_drop_write(oldnd.path.mnt);
30154 exit5: 31383 exit5:
30155diff -urNp linux-2.6.32.10/fs/namespace.c linux-2.6.32.10/fs/namespace.c 31384diff -urNp linux-2.6.32.11/fs/namespace.c linux-2.6.32.11/fs/namespace.c
30156--- linux-2.6.32.10/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400 31385--- linux-2.6.32.11/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400
30157+++ linux-2.6.32.10/fs/namespace.c 2010-03-20 15:58:47.134048580 -0400 31386+++ linux-2.6.32.11/fs/namespace.c 2010-04-04 20:46:41.653544810 -0400
30158@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn 31387@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
30159 if (!(sb->s_flags & MS_RDONLY)) 31388 if (!(sb->s_flags & MS_RDONLY))
30160 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); 31389 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -30215,9 +31444,9 @@ diff -urNp linux-2.6.32.10/fs/namespace.c linux-2.6.32.10/fs/namespace.c
30215 read_lock(&current->fs->lock); 31444 read_lock(&current->fs->lock);
30216 root = current->fs->root; 31445 root = current->fs->root;
30217 path_get(&current->fs->root); 31446 path_get(&current->fs->root);
30218diff -urNp linux-2.6.32.10/fs/nfs/inode.c linux-2.6.32.10/fs/nfs/inode.c 31447diff -urNp linux-2.6.32.11/fs/nfs/inode.c linux-2.6.32.11/fs/nfs/inode.c
30219--- linux-2.6.32.10/fs/nfs/inode.c 2010-03-15 11:52:04.000000000 -0400 31448--- linux-2.6.32.11/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400
30220+++ linux-2.6.32.10/fs/nfs/inode.c 2010-03-20 15:58:47.134048580 -0400 31449+++ linux-2.6.32.11/fs/nfs/inode.c 2010-04-04 20:46:41.653544810 -0400
30221@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st 31450@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
30222 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); 31451 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
30223 } 31452 }
@@ -30238,9 +31467,9 @@ diff -urNp linux-2.6.32.10/fs/nfs/inode.c linux-2.6.32.10/fs/nfs/inode.c
30238 } 31467 }
30239 31468
30240 void nfs_fattr_init(struct nfs_fattr *fattr) 31469 void nfs_fattr_init(struct nfs_fattr *fattr)
30241diff -urNp linux-2.6.32.10/fs/nfs/nfs4proc.c linux-2.6.32.10/fs/nfs/nfs4proc.c 31470diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
30242--- linux-2.6.32.10/fs/nfs/nfs4proc.c 2010-03-15 11:52:04.000000000 -0400 31471--- linux-2.6.32.11/fs/nfs/nfs4proc.c 2010-03-15 11:52:04.000000000 -0400
30243+++ linux-2.6.32.10/fs/nfs/nfs4proc.c 2010-03-20 15:58:47.134048580 -0400 31472+++ linux-2.6.32.11/fs/nfs/nfs4proc.c 2010-04-04 20:46:41.653544810 -0400
30244@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct 31473@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct
30245 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) 31474 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
30246 { 31475 {
@@ -30511,9 +31740,9 @@ diff -urNp linux-2.6.32.10/fs/nfs/nfs4proc.c linux-2.6.32.10/fs/nfs/nfs4proc.c
30511 int err; 31740 int err;
30512 31741
30513 err = nfs4_set_lock_state(state, fl); 31742 err = nfs4_set_lock_state(state, fl);
30514diff -urNp linux-2.6.32.10/fs/nfsd/lockd.c linux-2.6.32.10/fs/nfsd/lockd.c 31743diff -urNp linux-2.6.32.11/fs/nfsd/lockd.c linux-2.6.32.11/fs/nfsd/lockd.c
30515--- linux-2.6.32.10/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400 31744--- linux-2.6.32.11/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400
30516+++ linux-2.6.32.10/fs/nfsd/lockd.c 2010-03-20 15:58:47.134048580 -0400 31745+++ linux-2.6.32.11/fs/nfsd/lockd.c 2010-04-04 20:46:41.653544810 -0400
30517@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) 31746@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
30518 fput(filp); 31747 fput(filp);
30519 } 31748 }
@@ -30523,9 +31752,9 @@ diff -urNp linux-2.6.32.10/fs/nfsd/lockd.c linux-2.6.32.10/fs/nfsd/lockd.c
30523 .fopen = nlm_fopen, /* open file for locking */ 31752 .fopen = nlm_fopen, /* open file for locking */
30524 .fclose = nlm_fclose, /* close file */ 31753 .fclose = nlm_fclose, /* close file */
30525 }; 31754 };
30526diff -urNp linux-2.6.32.10/fs/nfsd/vfs.c linux-2.6.32.10/fs/nfsd/vfs.c 31755diff -urNp linux-2.6.32.11/fs/nfsd/vfs.c linux-2.6.32.11/fs/nfsd/vfs.c
30527--- linux-2.6.32.10/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400 31756--- linux-2.6.32.11/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400
30528+++ linux-2.6.32.10/fs/nfsd/vfs.c 2010-03-20 15:58:47.134048580 -0400 31757+++ linux-2.6.32.11/fs/nfsd/vfs.c 2010-04-04 20:46:41.657782339 -0400
30529@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st 31758@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
30530 } else { 31759 } else {
30531 oldfs = get_fs(); 31760 oldfs = get_fs();
@@ -30553,9 +31782,9 @@ diff -urNp linux-2.6.32.10/fs/nfsd/vfs.c linux-2.6.32.10/fs/nfsd/vfs.c
30553 set_fs(oldfs); 31782 set_fs(oldfs);
30554 31783
30555 if (host_err < 0) 31784 if (host_err < 0)
30556diff -urNp linux-2.6.32.10/fs/nls/nls_base.c linux-2.6.32.10/fs/nls/nls_base.c 31785diff -urNp linux-2.6.32.11/fs/nls/nls_base.c linux-2.6.32.11/fs/nls/nls_base.c
30557--- linux-2.6.32.10/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400 31786--- linux-2.6.32.11/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400
30558+++ linux-2.6.32.10/fs/nls/nls_base.c 2010-03-20 15:58:47.134048580 -0400 31787+++ linux-2.6.32.11/fs/nls/nls_base.c 2010-04-04 20:46:41.657782339 -0400
30559@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl 31788@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
30560 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, 31789 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
30561 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, 31790 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
@@ -30565,9 +31794,9 @@ diff -urNp linux-2.6.32.10/fs/nls/nls_base.c linux-2.6.32.10/fs/nls/nls_base.c
30565 }; 31794 };
30566 31795
30567 #define UNICODE_MAX 0x0010ffff 31796 #define UNICODE_MAX 0x0010ffff
30568diff -urNp linux-2.6.32.10/fs/ntfs/file.c linux-2.6.32.10/fs/ntfs/file.c 31797diff -urNp linux-2.6.32.11/fs/ntfs/file.c linux-2.6.32.11/fs/ntfs/file.c
30569--- linux-2.6.32.10/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400 31798--- linux-2.6.32.11/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400
30570+++ linux-2.6.32.10/fs/ntfs/file.c 2010-03-20 15:58:47.134048580 -0400 31799+++ linux-2.6.32.11/fs/ntfs/file.c 2010-04-04 20:46:41.657782339 -0400
30571@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ 31800@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
30572 #endif /* NTFS_RW */ 31801 #endif /* NTFS_RW */
30573 }; 31802 };
@@ -30577,9 +31806,9 @@ diff -urNp linux-2.6.32.10/fs/ntfs/file.c linux-2.6.32.10/fs/ntfs/file.c
30577 31806
30578-const struct inode_operations ntfs_empty_inode_ops = {}; 31807-const struct inode_operations ntfs_empty_inode_ops = {};
30579+const struct inode_operations ntfs_empty_inode_ops __read_only; 31808+const struct inode_operations ntfs_empty_inode_ops __read_only;
30580diff -urNp linux-2.6.32.10/fs/ocfs2/cluster/masklog.c linux-2.6.32.10/fs/ocfs2/cluster/masklog.c 31809diff -urNp linux-2.6.32.11/fs/ocfs2/cluster/masklog.c linux-2.6.32.11/fs/ocfs2/cluster/masklog.c
30581--- linux-2.6.32.10/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400 31810--- linux-2.6.32.11/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400
30582+++ linux-2.6.32.10/fs/ocfs2/cluster/masklog.c 2010-03-20 15:58:47.134048580 -0400 31811+++ linux-2.6.32.11/fs/ocfs2/cluster/masklog.c 2010-04-04 20:46:41.657782339 -0400
30583@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject 31812@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
30584 return mlog_mask_store(mlog_attr->mask, buf, count); 31813 return mlog_mask_store(mlog_attr->mask, buf, count);
30585 } 31814 }
@@ -30589,9 +31818,9 @@ diff -urNp linux-2.6.32.10/fs/ocfs2/cluster/masklog.c linux-2.6.32.10/fs/ocfs2/c
30589 .show = mlog_show, 31818 .show = mlog_show,
30590 .store = mlog_store, 31819 .store = mlog_store,
30591 }; 31820 };
30592diff -urNp linux-2.6.32.10/fs/ocfs2/localalloc.c linux-2.6.32.10/fs/ocfs2/localalloc.c 31821diff -urNp linux-2.6.32.11/fs/ocfs2/localalloc.c linux-2.6.32.11/fs/ocfs2/localalloc.c
30593--- linux-2.6.32.10/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400 31822--- linux-2.6.32.11/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400
30594+++ linux-2.6.32.10/fs/ocfs2/localalloc.c 2010-03-20 15:58:47.134048580 -0400 31823+++ linux-2.6.32.11/fs/ocfs2/localalloc.c 2010-04-04 20:46:41.657782339 -0400
30595@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo 31824@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
30596 goto bail; 31825 goto bail;
30597 } 31826 }
@@ -30601,9 +31830,9 @@ diff -urNp linux-2.6.32.10/fs/ocfs2/localalloc.c linux-2.6.32.10/fs/ocfs2/locala
30601 31830
30602 status = 0; 31831 status = 0;
30603 bail: 31832 bail:
30604diff -urNp linux-2.6.32.10/fs/ocfs2/ocfs2.h linux-2.6.32.10/fs/ocfs2/ocfs2.h 31833diff -urNp linux-2.6.32.11/fs/ocfs2/ocfs2.h linux-2.6.32.11/fs/ocfs2/ocfs2.h
30605--- linux-2.6.32.10/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400 31834--- linux-2.6.32.11/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400
30606+++ linux-2.6.32.10/fs/ocfs2/ocfs2.h 2010-03-20 15:58:47.134048580 -0400 31835+++ linux-2.6.32.11/fs/ocfs2/ocfs2.h 2010-04-04 20:46:41.657782339 -0400
30607@@ -217,11 +217,11 @@ enum ocfs2_vol_state 31836@@ -217,11 +217,11 @@ enum ocfs2_vol_state
30608 31837
30609 struct ocfs2_alloc_stats 31838 struct ocfs2_alloc_stats
@@ -30621,9 +31850,9 @@ diff -urNp linux-2.6.32.10/fs/ocfs2/ocfs2.h linux-2.6.32.10/fs/ocfs2/ocfs2.h
30621 }; 31850 };
30622 31851
30623 enum ocfs2_local_alloc_state 31852 enum ocfs2_local_alloc_state
30624diff -urNp linux-2.6.32.10/fs/ocfs2/suballoc.c linux-2.6.32.10/fs/ocfs2/suballoc.c 31853diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc.c
30625--- linux-2.6.32.10/fs/ocfs2/suballoc.c 2010-03-15 11:52:04.000000000 -0400 31854--- linux-2.6.32.11/fs/ocfs2/suballoc.c 2010-03-15 11:52:04.000000000 -0400
30626+++ linux-2.6.32.10/fs/ocfs2/suballoc.c 2010-03-20 15:58:47.138051759 -0400 31855+++ linux-2.6.32.11/fs/ocfs2/suballoc.c 2010-04-04 20:46:41.657782339 -0400
30627@@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s 31856@@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s
30628 mlog_errno(status); 31857 mlog_errno(status);
30629 goto bail; 31858 goto bail;
@@ -30669,9 +31898,9 @@ diff -urNp linux-2.6.32.10/fs/ocfs2/suballoc.c linux-2.6.32.10/fs/ocfs2/suballoc
30669 } 31898 }
30670 } 31899 }
30671 if (status < 0) { 31900 if (status < 0) {
30672diff -urNp linux-2.6.32.10/fs/ocfs2/super.c linux-2.6.32.10/fs/ocfs2/super.c 31901diff -urNp linux-2.6.32.11/fs/ocfs2/super.c linux-2.6.32.11/fs/ocfs2/super.c
30673--- linux-2.6.32.10/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400 31902--- linux-2.6.32.11/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400
30674+++ linux-2.6.32.10/fs/ocfs2/super.c 2010-03-20 15:58:47.138051759 -0400 31903+++ linux-2.6.32.11/fs/ocfs2/super.c 2010-04-04 20:46:41.657782339 -0400
30675@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s 31904@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
30676 "%10s => GlobalAllocs: %d LocalAllocs: %d " 31905 "%10s => GlobalAllocs: %d LocalAllocs: %d "
30677 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", 31906 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
@@ -30706,9 +31935,9 @@ diff -urNp linux-2.6.32.10/fs/ocfs2/super.c linux-2.6.32.10/fs/ocfs2/super.c
30706 31935
30707 /* Copy the blockcheck stats from the superblock probe */ 31936 /* Copy the blockcheck stats from the superblock probe */
30708 osb->osb_ecc_stats = *stats; 31937 osb->osb_ecc_stats = *stats;
30709diff -urNp linux-2.6.32.10/fs/open.c linux-2.6.32.10/fs/open.c 31938diff -urNp linux-2.6.32.11/fs/open.c linux-2.6.32.11/fs/open.c
30710--- linux-2.6.32.10/fs/open.c 2010-03-15 11:52:04.000000000 -0400 31939--- linux-2.6.32.11/fs/open.c 2010-03-15 11:52:04.000000000 -0400
30711+++ linux-2.6.32.10/fs/open.c 2010-03-20 15:58:47.138051759 -0400 31940+++ linux-2.6.32.11/fs/open.c 2010-04-04 20:46:41.657782339 -0400
30712@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l 31941@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l
30713 if (length < 0) 31942 if (length < 0)
30714 return -EINVAL; 31943 return -EINVAL;
@@ -30882,9 +32111,9 @@ diff -urNp linux-2.6.32.10/fs/open.c linux-2.6.32.10/fs/open.c
30882 mnt_drop_write(file->f_path.mnt); 32111 mnt_drop_write(file->f_path.mnt);
30883 out_fput: 32112 out_fput:
30884 fput(file); 32113 fput(file);
30885diff -urNp linux-2.6.32.10/fs/pipe.c linux-2.6.32.10/fs/pipe.c 32114diff -urNp linux-2.6.32.11/fs/pipe.c linux-2.6.32.11/fs/pipe.c
30886--- linux-2.6.32.10/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400 32115--- linux-2.6.32.11/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400
30887+++ linux-2.6.32.10/fs/pipe.c 2010-03-20 15:58:47.138051759 -0400 32116+++ linux-2.6.32.11/fs/pipe.c 2010-04-04 20:46:41.657782339 -0400
30888@@ -401,9 +401,9 @@ redo: 32117@@ -401,9 +401,9 @@ redo:
30889 } 32118 }
30890 if (bufs) /* More to do? */ 32119 if (bufs) /* More to do? */
@@ -31008,9 +32237,9 @@ diff -urNp linux-2.6.32.10/fs/pipe.c linux-2.6.32.10/fs/pipe.c
31008 inode->i_fop = &rdwr_pipefifo_fops; 32237 inode->i_fop = &rdwr_pipefifo_fops;
31009 32238
31010 /* 32239 /*
31011diff -urNp linux-2.6.32.10/fs/proc/array.c linux-2.6.32.10/fs/proc/array.c 32240diff -urNp linux-2.6.32.11/fs/proc/array.c linux-2.6.32.11/fs/proc/array.c
31012--- linux-2.6.32.10/fs/proc/array.c 2010-03-15 11:52:04.000000000 -0400 32241--- linux-2.6.32.11/fs/proc/array.c 2010-03-15 11:52:04.000000000 -0400
31013+++ linux-2.6.32.10/fs/proc/array.c 2010-03-20 15:58:47.138051759 -0400 32242+++ linux-2.6.32.11/fs/proc/array.c 2010-04-04 20:46:41.657782339 -0400
31014@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct 32243@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct
31015 } 32244 }
31016 #endif /* CONFIG_MMU */ 32245 #endif /* CONFIG_MMU */
@@ -31101,9 +32330,9 @@ diff -urNp linux-2.6.32.10/fs/proc/array.c linux-2.6.32.10/fs/proc/array.c
31101+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); 32330+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
31102+} 32331+}
31103+#endif 32332+#endif
31104diff -urNp linux-2.6.32.10/fs/proc/base.c linux-2.6.32.10/fs/proc/base.c 32333diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
31105--- linux-2.6.32.10/fs/proc/base.c 2010-03-15 11:52:04.000000000 -0400 32334--- linux-2.6.32.11/fs/proc/base.c 2010-03-15 11:52:04.000000000 -0400
31106+++ linux-2.6.32.10/fs/proc/base.c 2010-03-21 16:37:01.906406623 -0400 32335+++ linux-2.6.32.11/fs/proc/base.c 2010-04-04 20:46:41.661529739 -0400
31107@@ -102,6 +102,22 @@ struct pid_entry { 32336@@ -102,6 +102,22 @@ struct pid_entry {
31108 union proc_op op; 32337 union proc_op op;
31109 }; 32338 };
@@ -31469,9 +32698,9 @@ diff -urNp linux-2.6.32.10/fs/proc/base.c linux-2.6.32.10/fs/proc/base.c
31469 ONE("stack", S_IRUSR, proc_pid_stack), 32698 ONE("stack", S_IRUSR, proc_pid_stack),
31470 #endif 32699 #endif
31471 #ifdef CONFIG_SCHEDSTATS 32700 #ifdef CONFIG_SCHEDSTATS
31472diff -urNp linux-2.6.32.10/fs/proc/cmdline.c linux-2.6.32.10/fs/proc/cmdline.c 32701diff -urNp linux-2.6.32.11/fs/proc/cmdline.c linux-2.6.32.11/fs/proc/cmdline.c
31473--- linux-2.6.32.10/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400 32702--- linux-2.6.32.11/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400
31474+++ linux-2.6.32.10/fs/proc/cmdline.c 2010-03-20 15:58:47.138051759 -0400 32703+++ linux-2.6.32.11/fs/proc/cmdline.c 2010-04-04 20:46:41.661529739 -0400
31475@@ -23,7 +23,11 @@ static const struct file_operations cmdl 32704@@ -23,7 +23,11 @@ static const struct file_operations cmdl
31476 32705
31477 static int __init proc_cmdline_init(void) 32706 static int __init proc_cmdline_init(void)
@@ -31484,9 +32713,9 @@ diff -urNp linux-2.6.32.10/fs/proc/cmdline.c linux-2.6.32.10/fs/proc/cmdline.c
31484 return 0; 32713 return 0;
31485 } 32714 }
31486 module_init(proc_cmdline_init); 32715 module_init(proc_cmdline_init);
31487diff -urNp linux-2.6.32.10/fs/proc/devices.c linux-2.6.32.10/fs/proc/devices.c 32716diff -urNp linux-2.6.32.11/fs/proc/devices.c linux-2.6.32.11/fs/proc/devices.c
31488--- linux-2.6.32.10/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400 32717--- linux-2.6.32.11/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400
31489+++ linux-2.6.32.10/fs/proc/devices.c 2010-03-20 15:58:47.138051759 -0400 32718+++ linux-2.6.32.11/fs/proc/devices.c 2010-04-04 20:46:41.661529739 -0400
31490@@ -64,7 +64,11 @@ static const struct file_operations proc 32719@@ -64,7 +64,11 @@ static const struct file_operations proc
31491 32720
31492 static int __init proc_devices_init(void) 32721 static int __init proc_devices_init(void)
@@ -31499,9 +32728,9 @@ diff -urNp linux-2.6.32.10/fs/proc/devices.c linux-2.6.32.10/fs/proc/devices.c
31499 return 0; 32728 return 0;
31500 } 32729 }
31501 module_init(proc_devices_init); 32730 module_init(proc_devices_init);
31502diff -urNp linux-2.6.32.10/fs/proc/inode.c linux-2.6.32.10/fs/proc/inode.c 32731diff -urNp linux-2.6.32.11/fs/proc/inode.c linux-2.6.32.11/fs/proc/inode.c
31503--- linux-2.6.32.10/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400 32732--- linux-2.6.32.11/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400
31504+++ linux-2.6.32.10/fs/proc/inode.c 2010-03-20 15:58:47.138051759 -0400 32733+++ linux-2.6.32.11/fs/proc/inode.c 2010-04-04 20:46:41.661529739 -0400
31505@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe 32734@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
31506 if (de->mode) { 32735 if (de->mode) {
31507 inode->i_mode = de->mode; 32736 inode->i_mode = de->mode;
@@ -31514,9 +32743,9 @@ diff -urNp linux-2.6.32.10/fs/proc/inode.c linux-2.6.32.10/fs/proc/inode.c
31514 } 32743 }
31515 if (de->size) 32744 if (de->size)
31516 inode->i_size = de->size; 32745 inode->i_size = de->size;
31517diff -urNp linux-2.6.32.10/fs/proc/internal.h linux-2.6.32.10/fs/proc/internal.h 32746diff -urNp linux-2.6.32.11/fs/proc/internal.h linux-2.6.32.11/fs/proc/internal.h
31518--- linux-2.6.32.10/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400 32747--- linux-2.6.32.11/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400
31519+++ linux-2.6.32.10/fs/proc/internal.h 2010-03-20 15:58:47.138051759 -0400 32748+++ linux-2.6.32.11/fs/proc/internal.h 2010-04-04 20:46:41.661529739 -0400
31520@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi 32749@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
31521 struct pid *pid, struct task_struct *task); 32750 struct pid *pid, struct task_struct *task);
31522 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, 32751 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -31527,9 +32756,9 @@ diff -urNp linux-2.6.32.10/fs/proc/internal.h linux-2.6.32.10/fs/proc/internal.h
31527 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); 32756 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
31528 32757
31529 extern const struct file_operations proc_maps_operations; 32758 extern const struct file_operations proc_maps_operations;
31530diff -urNp linux-2.6.32.10/fs/proc/Kconfig linux-2.6.32.10/fs/proc/Kconfig 32759diff -urNp linux-2.6.32.11/fs/proc/Kconfig linux-2.6.32.11/fs/proc/Kconfig
31531--- linux-2.6.32.10/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400 32760--- linux-2.6.32.11/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400
31532+++ linux-2.6.32.10/fs/proc/Kconfig 2010-03-20 15:58:47.138051759 -0400 32761+++ linux-2.6.32.11/fs/proc/Kconfig 2010-04-04 20:46:41.661529739 -0400
31533@@ -30,12 +30,12 @@ config PROC_FS 32762@@ -30,12 +30,12 @@ config PROC_FS
31534 32763
31535 config PROC_KCORE 32764 config PROC_KCORE
@@ -31557,9 +32786,9 @@ diff -urNp linux-2.6.32.10/fs/proc/Kconfig linux-2.6.32.10/fs/proc/Kconfig
31557 bool "Enable /proc page monitoring" if EMBEDDED 32786 bool "Enable /proc page monitoring" if EMBEDDED
31558 help 32787 help
31559 Various /proc files exist to monitor process memory utilization: 32788 Various /proc files exist to monitor process memory utilization:
31560diff -urNp linux-2.6.32.10/fs/proc/kcore.c linux-2.6.32.10/fs/proc/kcore.c 32789diff -urNp linux-2.6.32.11/fs/proc/kcore.c linux-2.6.32.11/fs/proc/kcore.c
31561--- linux-2.6.32.10/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400 32790--- linux-2.6.32.11/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400
31562+++ linux-2.6.32.10/fs/proc/kcore.c 2010-03-20 15:58:47.138051759 -0400 32791+++ linux-2.6.32.11/fs/proc/kcore.c 2010-04-04 20:46:41.661529739 -0400
31563@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use 32792@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use
31564 32793
31565 static int open_kcore(struct inode *inode, struct file *filp) 32794 static int open_kcore(struct inode *inode, struct file *filp)
@@ -31570,9 +32799,9 @@ diff -urNp linux-2.6.32.10/fs/proc/kcore.c linux-2.6.32.10/fs/proc/kcore.c
31570 if (!capable(CAP_SYS_RAWIO)) 32799 if (!capable(CAP_SYS_RAWIO))
31571 return -EPERM; 32800 return -EPERM;
31572 if (kcore_need_update) 32801 if (kcore_need_update)
31573diff -urNp linux-2.6.32.10/fs/proc/meminfo.c linux-2.6.32.10/fs/proc/meminfo.c 32802diff -urNp linux-2.6.32.11/fs/proc/meminfo.c linux-2.6.32.11/fs/proc/meminfo.c
31574--- linux-2.6.32.10/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400 32803--- linux-2.6.32.11/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400
31575+++ linux-2.6.32.10/fs/proc/meminfo.c 2010-03-20 15:58:47.138051759 -0400 32804+++ linux-2.6.32.11/fs/proc/meminfo.c 2010-04-04 20:46:41.661529739 -0400
31576@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ 32805@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
31577 vmi.used >> 10, 32806 vmi.used >> 10,
31578 vmi.largest_chunk >> 10 32807 vmi.largest_chunk >> 10
@@ -31582,9 +32811,9 @@ diff -urNp linux-2.6.32.10/fs/proc/meminfo.c linux-2.6.32.10/fs/proc/meminfo.c
31582 #endif 32811 #endif
31583 ); 32812 );
31584 32813
31585diff -urNp linux-2.6.32.10/fs/proc/nommu.c linux-2.6.32.10/fs/proc/nommu.c 32814diff -urNp linux-2.6.32.11/fs/proc/nommu.c linux-2.6.32.11/fs/proc/nommu.c
31586--- linux-2.6.32.10/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400 32815--- linux-2.6.32.11/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400
31587+++ linux-2.6.32.10/fs/proc/nommu.c 2010-03-20 15:58:47.138051759 -0400 32816+++ linux-2.6.32.11/fs/proc/nommu.c 2010-04-04 20:46:41.661529739 -0400
31588@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ 32817@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
31589 if (len < 1) 32818 if (len < 1)
31590 len = 1; 32819 len = 1;
@@ -31594,9 +32823,9 @@ diff -urNp linux-2.6.32.10/fs/proc/nommu.c linux-2.6.32.10/fs/proc/nommu.c
31594 } 32823 }
31595 32824
31596 seq_putc(m, '\n'); 32825 seq_putc(m, '\n');
31597diff -urNp linux-2.6.32.10/fs/proc/proc_net.c linux-2.6.32.10/fs/proc/proc_net.c 32826diff -urNp linux-2.6.32.11/fs/proc/proc_net.c linux-2.6.32.11/fs/proc/proc_net.c
31598--- linux-2.6.32.10/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400 32827--- linux-2.6.32.11/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400
31599+++ linux-2.6.32.10/fs/proc/proc_net.c 2010-03-20 15:58:47.138051759 -0400 32828+++ linux-2.6.32.11/fs/proc/proc_net.c 2010-04-04 20:46:41.661529739 -0400
31600@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str 32829@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
31601 struct task_struct *task; 32830 struct task_struct *task;
31602 struct nsproxy *ns; 32831 struct nsproxy *ns;
@@ -31615,9 +32844,9 @@ diff -urNp linux-2.6.32.10/fs/proc/proc_net.c linux-2.6.32.10/fs/proc/proc_net.c
31615 32844
31616 rcu_read_lock(); 32845 rcu_read_lock();
31617 task = pid_task(proc_pid(dir), PIDTYPE_PID); 32846 task = pid_task(proc_pid(dir), PIDTYPE_PID);
31618diff -urNp linux-2.6.32.10/fs/proc/proc_sysctl.c linux-2.6.32.10/fs/proc/proc_sysctl.c 32847diff -urNp linux-2.6.32.11/fs/proc/proc_sysctl.c linux-2.6.32.11/fs/proc/proc_sysctl.c
31619--- linux-2.6.32.10/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 32848--- linux-2.6.32.11/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400
31620+++ linux-2.6.32.10/fs/proc/proc_sysctl.c 2010-03-20 15:58:47.138051759 -0400 32849+++ linux-2.6.32.11/fs/proc/proc_sysctl.c 2010-04-04 20:46:41.661529739 -0400
31621@@ -7,6 +7,8 @@ 32850@@ -7,6 +7,8 @@
31622 #include <linux/security.h> 32851 #include <linux/security.h>
31623 #include "internal.h" 32852 #include "internal.h"
@@ -31657,9 +32886,9 @@ diff -urNp linux-2.6.32.10/fs/proc/proc_sysctl.c linux-2.6.32.10/fs/proc/proc_sy
31657 generic_fillattr(inode, stat); 32886 generic_fillattr(inode, stat);
31658 if (table) 32887 if (table)
31659 stat->mode = (stat->mode & S_IFMT) | table->mode; 32888 stat->mode = (stat->mode & S_IFMT) | table->mode;
31660diff -urNp linux-2.6.32.10/fs/proc/root.c linux-2.6.32.10/fs/proc/root.c 32889diff -urNp linux-2.6.32.11/fs/proc/root.c linux-2.6.32.11/fs/proc/root.c
31661--- linux-2.6.32.10/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400 32890--- linux-2.6.32.11/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400
31662+++ linux-2.6.32.10/fs/proc/root.c 2010-03-20 15:58:47.142046768 -0400 32891+++ linux-2.6.32.11/fs/proc/root.c 2010-04-04 20:46:41.661529739 -0400
31663@@ -134,7 +134,15 @@ void __init proc_root_init(void) 32892@@ -134,7 +134,15 @@ void __init proc_root_init(void)
31664 #ifdef CONFIG_PROC_DEVICETREE 32893 #ifdef CONFIG_PROC_DEVICETREE
31665 proc_device_tree_init(); 32894 proc_device_tree_init();
@@ -31676,9 +32905,9 @@ diff -urNp linux-2.6.32.10/fs/proc/root.c linux-2.6.32.10/fs/proc/root.c
31676 proc_sys_init(); 32905 proc_sys_init();
31677 } 32906 }
31678 32907
31679diff -urNp linux-2.6.32.10/fs/proc/task_mmu.c linux-2.6.32.10/fs/proc/task_mmu.c 32908diff -urNp linux-2.6.32.11/fs/proc/task_mmu.c linux-2.6.32.11/fs/proc/task_mmu.c
31680--- linux-2.6.32.10/fs/proc/task_mmu.c 2010-03-15 11:52:04.000000000 -0400 32909--- linux-2.6.32.11/fs/proc/task_mmu.c 2010-03-15 11:52:04.000000000 -0400
31681+++ linux-2.6.32.10/fs/proc/task_mmu.c 2010-03-20 15:58:47.142046768 -0400 32910+++ linux-2.6.32.11/fs/proc/task_mmu.c 2010-04-04 20:46:41.661529739 -0400
31682@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct 32911@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
31683 "VmStk:\t%8lu kB\n" 32912 "VmStk:\t%8lu kB\n"
31684 "VmExe:\t%8lu kB\n" 32913 "VmExe:\t%8lu kB\n"
@@ -31799,9 +33028,9 @@ diff -urNp linux-2.6.32.10/fs/proc/task_mmu.c linux-2.6.32.10/fs/proc/task_mmu.c
31799 mss.resident >> 10, 33028 mss.resident >> 10,
31800 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), 33029 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
31801 mss.shared_clean >> 10, 33030 mss.shared_clean >> 10,
31802diff -urNp linux-2.6.32.10/fs/proc/task_nommu.c linux-2.6.32.10/fs/proc/task_nommu.c 33031diff -urNp linux-2.6.32.11/fs/proc/task_nommu.c linux-2.6.32.11/fs/proc/task_nommu.c
31803--- linux-2.6.32.10/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400 33032--- linux-2.6.32.11/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400
31804+++ linux-2.6.32.10/fs/proc/task_nommu.c 2010-03-20 15:58:47.142046768 -0400 33033+++ linux-2.6.32.11/fs/proc/task_nommu.c 2010-04-04 20:46:41.661529739 -0400
31805@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct 33034@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
31806 else 33035 else
31807 bytes += kobjsize(mm); 33036 bytes += kobjsize(mm);
@@ -31820,9 +33049,9 @@ diff -urNp linux-2.6.32.10/fs/proc/task_nommu.c linux-2.6.32.10/fs/proc/task_nom
31820 } 33049 }
31821 33050
31822 seq_putc(m, '\n'); 33051 seq_putc(m, '\n');
31823diff -urNp linux-2.6.32.10/fs/readdir.c linux-2.6.32.10/fs/readdir.c 33052diff -urNp linux-2.6.32.11/fs/readdir.c linux-2.6.32.11/fs/readdir.c
31824--- linux-2.6.32.10/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400 33053--- linux-2.6.32.11/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400
31825+++ linux-2.6.32.10/fs/readdir.c 2010-03-20 15:58:47.142046768 -0400 33054+++ linux-2.6.32.11/fs/readdir.c 2010-04-04 20:46:41.661529739 -0400
31826@@ -16,6 +16,7 @@ 33055@@ -16,6 +16,7 @@
31827 #include <linux/security.h> 33056 #include <linux/security.h>
31828 #include <linux/syscalls.h> 33057 #include <linux/syscalls.h>
@@ -31912,9 +33141,9 @@ diff -urNp linux-2.6.32.10/fs/readdir.c linux-2.6.32.10/fs/readdir.c
31912 buf.count = count; 33141 buf.count = count;
31913 buf.error = 0; 33142 buf.error = 0;
31914 33143
31915diff -urNp linux-2.6.32.10/fs/reiserfs/do_balan.c linux-2.6.32.10/fs/reiserfs/do_balan.c 33144diff -urNp linux-2.6.32.11/fs/reiserfs/do_balan.c linux-2.6.32.11/fs/reiserfs/do_balan.c
31916--- linux-2.6.32.10/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400 33145--- linux-2.6.32.11/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400
31917+++ linux-2.6.32.10/fs/reiserfs/do_balan.c 2010-03-20 15:58:47.142046768 -0400 33146+++ linux-2.6.32.11/fs/reiserfs/do_balan.c 2010-04-04 20:46:41.661529739 -0400
31918@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, 33147@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
31919 return; 33148 return;
31920 } 33149 }
@@ -31924,9 +33153,9 @@ diff -urNp linux-2.6.32.10/fs/reiserfs/do_balan.c linux-2.6.32.10/fs/reiserfs/do
31924 do_balance_starts(tb); 33153 do_balance_starts(tb);
31925 33154
31926 /* balance leaf returns 0 except if combining L R and S into 33155 /* balance leaf returns 0 except if combining L R and S into
31927diff -urNp linux-2.6.32.10/fs/reiserfs/item_ops.c linux-2.6.32.10/fs/reiserfs/item_ops.c 33156diff -urNp linux-2.6.32.11/fs/reiserfs/item_ops.c linux-2.6.32.11/fs/reiserfs/item_ops.c
31928--- linux-2.6.32.10/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400 33157--- linux-2.6.32.11/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400
31929+++ linux-2.6.32.10/fs/reiserfs/item_ops.c 2010-03-20 15:58:47.142046768 -0400 33158+++ linux-2.6.32.11/fs/reiserfs/item_ops.c 2010-04-04 20:46:41.661529739 -0400
31930@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i 33159@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
31931 vi->vi_index, vi->vi_type, vi->vi_ih); 33160 vi->vi_index, vi->vi_type, vi->vi_ih);
31932 } 33161 }
@@ -31981,9 +33210,9 @@ diff -urNp linux-2.6.32.10/fs/reiserfs/item_ops.c linux-2.6.32.10/fs/reiserfs/it
31981 &stat_data_ops, 33210 &stat_data_ops,
31982 &indirect_ops, 33211 &indirect_ops,
31983 &direct_ops, 33212 &direct_ops,
31984diff -urNp linux-2.6.32.10/fs/reiserfs/procfs.c linux-2.6.32.10/fs/reiserfs/procfs.c 33213diff -urNp linux-2.6.32.11/fs/reiserfs/procfs.c linux-2.6.32.11/fs/reiserfs/procfs.c
31985--- linux-2.6.32.10/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400 33214--- linux-2.6.32.11/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400
31986+++ linux-2.6.32.10/fs/reiserfs/procfs.c 2010-03-20 15:58:47.142046768 -0400 33215+++ linux-2.6.32.11/fs/reiserfs/procfs.c 2010-04-04 20:46:41.661529739 -0400
31987@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m 33216@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
31988 "SMALL_TAILS " : "NO_TAILS ", 33217 "SMALL_TAILS " : "NO_TAILS ",
31989 replay_only(sb) ? "REPLAY_ONLY " : "", 33218 replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -31993,9 +33222,9 @@ diff -urNp linux-2.6.32.10/fs/reiserfs/procfs.c linux-2.6.32.10/fs/reiserfs/proc
31993 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), 33222 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
31994 SF(s_do_balance), SF(s_unneeded_left_neighbor), 33223 SF(s_do_balance), SF(s_unneeded_left_neighbor),
31995 SF(s_good_search_by_key_reada), SF(s_bmaps), 33224 SF(s_good_search_by_key_reada), SF(s_bmaps),
31996diff -urNp linux-2.6.32.10/fs/select.c linux-2.6.32.10/fs/select.c 33225diff -urNp linux-2.6.32.11/fs/select.c linux-2.6.32.11/fs/select.c
31997--- linux-2.6.32.10/fs/select.c 2010-03-15 11:52:04.000000000 -0400 33226--- linux-2.6.32.11/fs/select.c 2010-03-15 11:52:04.000000000 -0400
31998+++ linux-2.6.32.10/fs/select.c 2010-03-20 15:58:47.142046768 -0400 33227+++ linux-2.6.32.11/fs/select.c 2010-04-04 20:46:41.661529739 -0400
31999@@ -20,6 +20,7 @@ 33228@@ -20,6 +20,7 @@
32000 #include <linux/module.h> 33229 #include <linux/module.h>
32001 #include <linux/slab.h> 33230 #include <linux/slab.h>
@@ -32012,9 +33241,9 @@ diff -urNp linux-2.6.32.10/fs/select.c linux-2.6.32.10/fs/select.c
32012 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 33241 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
32013 return -EINVAL; 33242 return -EINVAL;
32014 33243
32015diff -urNp linux-2.6.32.10/fs/seq_file.c linux-2.6.32.10/fs/seq_file.c 33244diff -urNp linux-2.6.32.11/fs/seq_file.c linux-2.6.32.11/fs/seq_file.c
32016--- linux-2.6.32.10/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400 33245--- linux-2.6.32.11/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400
32017+++ linux-2.6.32.10/fs/seq_file.c 2010-03-20 15:58:47.142046768 -0400 33246+++ linux-2.6.32.11/fs/seq_file.c 2010-04-04 20:46:41.661529739 -0400
32018@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 33247@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
32019 return 0; 33248 return 0;
32020 } 33249 }
@@ -32055,9 +33284,9 @@ diff -urNp linux-2.6.32.10/fs/seq_file.c linux-2.6.32.10/fs/seq_file.c
32055 if (!m->buf) 33284 if (!m->buf)
32056 goto Enomem; 33285 goto Enomem;
32057 m->count = 0; 33286 m->count = 0;
32058diff -urNp linux-2.6.32.10/fs/smbfs/symlink.c linux-2.6.32.10/fs/smbfs/symlink.c 33287diff -urNp linux-2.6.32.11/fs/smbfs/symlink.c linux-2.6.32.11/fs/smbfs/symlink.c
32059--- linux-2.6.32.10/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 33288--- linux-2.6.32.11/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400
32060+++ linux-2.6.32.10/fs/smbfs/symlink.c 2010-03-20 15:58:47.142046768 -0400 33289+++ linux-2.6.32.11/fs/smbfs/symlink.c 2010-04-04 20:46:41.661529739 -0400
32061@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent 33290@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
32062 33291
32063 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 33292 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -32067,9 +33296,9 @@ diff -urNp linux-2.6.32.10/fs/smbfs/symlink.c linux-2.6.32.10/fs/smbfs/symlink.c
32067 if (!IS_ERR(s)) 33296 if (!IS_ERR(s))
32068 __putname(s); 33297 __putname(s);
32069 } 33298 }
32070diff -urNp linux-2.6.32.10/fs/splice.c linux-2.6.32.10/fs/splice.c 33299diff -urNp linux-2.6.32.11/fs/splice.c linux-2.6.32.11/fs/splice.c
32071--- linux-2.6.32.10/fs/splice.c 2010-03-15 11:52:04.000000000 -0400 33300--- linux-2.6.32.11/fs/splice.c 2010-03-15 11:52:04.000000000 -0400
32072+++ linux-2.6.32.10/fs/splice.c 2010-03-20 15:58:47.142046768 -0400 33301+++ linux-2.6.32.11/fs/splice.c 2010-04-04 20:46:41.661529739 -0400
32073@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode 33302@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
32074 pipe_lock(pipe); 33303 pipe_lock(pipe);
32075 33304
@@ -32208,9 +33437,9 @@ diff -urNp linux-2.6.32.10/fs/splice.c linux-2.6.32.10/fs/splice.c
32208 ret = -EAGAIN; 33437 ret = -EAGAIN;
32209 33438
32210 pipe_unlock(ipipe); 33439 pipe_unlock(ipipe);
32211diff -urNp linux-2.6.32.10/fs/sysfs/file.c linux-2.6.32.10/fs/sysfs/file.c 33440diff -urNp linux-2.6.32.11/fs/sysfs/file.c linux-2.6.32.11/fs/sysfs/file.c
32212--- linux-2.6.32.10/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400 33441--- linux-2.6.32.11/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400
32213+++ linux-2.6.32.10/fs/sysfs/file.c 2010-03-20 15:58:47.142046768 -0400 33442+++ linux-2.6.32.11/fs/sysfs/file.c 2010-04-04 20:46:41.661529739 -0400
32214@@ -53,7 +53,7 @@ struct sysfs_buffer { 33443@@ -53,7 +53,7 @@ struct sysfs_buffer {
32215 size_t count; 33444 size_t count;
32216 loff_t pos; 33445 loff_t pos;
@@ -32247,9 +33476,9 @@ diff -urNp linux-2.6.32.10/fs/sysfs/file.c linux-2.6.32.10/fs/sysfs/file.c
32247 int error = -EACCES; 33476 int error = -EACCES;
32248 char *p; 33477 char *p;
32249 33478
32250diff -urNp linux-2.6.32.10/fs/sysfs/symlink.c linux-2.6.32.10/fs/sysfs/symlink.c 33479diff -urNp linux-2.6.32.11/fs/sysfs/symlink.c linux-2.6.32.11/fs/sysfs/symlink.c
32251--- linux-2.6.32.10/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 33480--- linux-2.6.32.11/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400
32252+++ linux-2.6.32.10/fs/sysfs/symlink.c 2010-03-20 15:58:47.142046768 -0400 33481+++ linux-2.6.32.11/fs/sysfs/symlink.c 2010-04-04 20:46:41.661529739 -0400
32253@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de 33482@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
32254 33483
32255 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) 33484 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -32259,9 +33488,9 @@ diff -urNp linux-2.6.32.10/fs/sysfs/symlink.c linux-2.6.32.10/fs/sysfs/symlink.c
32259 if (!IS_ERR(page)) 33488 if (!IS_ERR(page))
32260 free_page((unsigned long)page); 33489 free_page((unsigned long)page);
32261 } 33490 }
32262diff -urNp linux-2.6.32.10/fs/udf/balloc.c linux-2.6.32.10/fs/udf/balloc.c 33491diff -urNp linux-2.6.32.11/fs/udf/balloc.c linux-2.6.32.11/fs/udf/balloc.c
32263--- linux-2.6.32.10/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400 33492--- linux-2.6.32.11/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400
32264+++ linux-2.6.32.10/fs/udf/balloc.c 2010-03-20 15:58:47.142046768 -0400 33493+++ linux-2.6.32.11/fs/udf/balloc.c 2010-04-04 20:46:41.665784997 -0400
32265@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc 33494@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
32266 33495
32267 mutex_lock(&sbi->s_alloc_mutex); 33496 mutex_lock(&sbi->s_alloc_mutex);
@@ -32284,9 +33513,9 @@ diff -urNp linux-2.6.32.10/fs/udf/balloc.c linux-2.6.32.10/fs/udf/balloc.c
32284 udf_debug("%d < %d || %d + %d > %d\n", 33513 udf_debug("%d < %d || %d + %d > %d\n",
32285 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, 33514 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
32286 partmap->s_partition_len); 33515 partmap->s_partition_len);
32287diff -urNp linux-2.6.32.10/fs/utimes.c linux-2.6.32.10/fs/utimes.c 33516diff -urNp linux-2.6.32.11/fs/utimes.c linux-2.6.32.11/fs/utimes.c
32288--- linux-2.6.32.10/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400 33517--- linux-2.6.32.11/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400
32289+++ linux-2.6.32.10/fs/utimes.c 2010-03-20 15:58:47.142046768 -0400 33518+++ linux-2.6.32.11/fs/utimes.c 2010-04-04 20:46:41.665784997 -0400
32290@@ -1,6 +1,7 @@ 33519@@ -1,6 +1,7 @@
32291 #include <linux/compiler.h> 33520 #include <linux/compiler.h>
32292 #include <linux/file.h> 33521 #include <linux/file.h>
@@ -32308,9 +33537,9 @@ diff -urNp linux-2.6.32.10/fs/utimes.c linux-2.6.32.10/fs/utimes.c
32308 mutex_lock(&inode->i_mutex); 33537 mutex_lock(&inode->i_mutex);
32309 error = notify_change(path->dentry, &newattrs); 33538 error = notify_change(path->dentry, &newattrs);
32310 mutex_unlock(&inode->i_mutex); 33539 mutex_unlock(&inode->i_mutex);
32311diff -urNp linux-2.6.32.10/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.10/fs/xfs/linux-2.6/xfs_ioctl.c 33540diff -urNp linux-2.6.32.11/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.11/fs/xfs/linux-2.6/xfs_ioctl.c
32312--- linux-2.6.32.10/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400 33541--- linux-2.6.32.11/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400
32313+++ linux-2.6.32.10/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-20 15:58:47.142046768 -0400 33542+++ linux-2.6.32.11/fs/xfs/linux-2.6/xfs_ioctl.c 2010-04-04 20:46:41.665784997 -0400
32314@@ -134,7 +134,7 @@ xfs_find_handle( 33543@@ -134,7 +134,7 @@ xfs_find_handle(
32315 } 33544 }
32316 33545
@@ -32320,9 +33549,9 @@ diff -urNp linux-2.6.32.10/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.10/fs/xfs/l
32320 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) 33549 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
32321 goto out_put; 33550 goto out_put;
32322 33551
32323diff -urNp linux-2.6.32.10/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.10/fs/xfs/linux-2.6/xfs_iops.c 33552diff -urNp linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c
32324--- linux-2.6.32.10/fs/xfs/linux-2.6/xfs_iops.c 2010-03-15 11:52:04.000000000 -0400 33553--- linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c 2010-03-15 11:52:04.000000000 -0400
32325+++ linux-2.6.32.10/fs/xfs/linux-2.6/xfs_iops.c 2010-03-20 15:58:47.142046768 -0400 33554+++ linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c 2010-04-04 20:46:41.665784997 -0400
32326@@ -468,7 +468,7 @@ xfs_vn_put_link( 33555@@ -468,7 +468,7 @@ xfs_vn_put_link(
32327 struct nameidata *nd, 33556 struct nameidata *nd,
32328 void *p) 33557 void *p)
@@ -32332,9 +33561,9 @@ diff -urNp linux-2.6.32.10/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.10/fs/xfs/li
32332 33561
32333 if (!IS_ERR(s)) 33562 if (!IS_ERR(s))
32334 kfree(s); 33563 kfree(s);
32335diff -urNp linux-2.6.32.10/fs/xfs/xfs_bmap.c linux-2.6.32.10/fs/xfs/xfs_bmap.c 33564diff -urNp linux-2.6.32.11/fs/xfs/xfs_bmap.c linux-2.6.32.11/fs/xfs/xfs_bmap.c
32336--- linux-2.6.32.10/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400 33565--- linux-2.6.32.11/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400
32337+++ linux-2.6.32.10/fs/xfs/xfs_bmap.c 2010-03-20 15:58:47.146050321 -0400 33566+++ linux-2.6.32.11/fs/xfs/xfs_bmap.c 2010-04-04 20:46:41.665784997 -0400
32338@@ -360,7 +360,7 @@ xfs_bmap_validate_ret( 33567@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
32339 int nmap, 33568 int nmap,
32340 int ret_nmap); 33569 int ret_nmap);
@@ -32344,9 +33573,9 @@ diff -urNp linux-2.6.32.10/fs/xfs/xfs_bmap.c linux-2.6.32.10/fs/xfs/xfs_bmap.c
32344 #endif /* DEBUG */ 33573 #endif /* DEBUG */
32345 33574
32346 #if defined(XFS_RW_TRACE) 33575 #if defined(XFS_RW_TRACE)
32347diff -urNp linux-2.6.32.10/grsecurity/gracl_alloc.c linux-2.6.32.10/grsecurity/gracl_alloc.c 33576diff -urNp linux-2.6.32.11/grsecurity/gracl_alloc.c linux-2.6.32.11/grsecurity/gracl_alloc.c
32348--- linux-2.6.32.10/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 33577--- linux-2.6.32.11/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
32349+++ linux-2.6.32.10/grsecurity/gracl_alloc.c 2010-03-20 15:58:47.146050321 -0400 33578+++ linux-2.6.32.11/grsecurity/gracl_alloc.c 2010-04-04 20:46:41.665784997 -0400
32350@@ -0,0 +1,105 @@ 33579@@ -0,0 +1,105 @@
32351+#include <linux/kernel.h> 33580+#include <linux/kernel.h>
32352+#include <linux/mm.h> 33581+#include <linux/mm.h>
@@ -32453,9 +33682,9 @@ diff -urNp linux-2.6.32.10/grsecurity/gracl_alloc.c linux-2.6.32.10/grsecurity/g
32453+ else 33682+ else
32454+ return 1; 33683+ return 1;
32455+} 33684+}
32456diff -urNp linux-2.6.32.10/grsecurity/gracl.c linux-2.6.32.10/grsecurity/gracl.c 33685diff -urNp linux-2.6.32.11/grsecurity/gracl.c linux-2.6.32.11/grsecurity/gracl.c
32457--- linux-2.6.32.10/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 33686--- linux-2.6.32.11/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
32458+++ linux-2.6.32.10/grsecurity/gracl.c 2010-03-20 16:56:51.708801961 -0400 33687+++ linux-2.6.32.11/grsecurity/gracl.c 2010-04-04 20:46:41.668784531 -0400
32459@@ -0,0 +1,3917 @@ 33688@@ -0,0 +1,3917 @@
32460+#include <linux/kernel.h> 33689+#include <linux/kernel.h>
32461+#include <linux/module.h> 33690+#include <linux/module.h>
@@ -36374,9 +37603,9 @@ diff -urNp linux-2.6.32.10/grsecurity/gracl.c linux-2.6.32.10/grsecurity/gracl.c
36374+EXPORT_SYMBOL(gr_check_group_change); 37603+EXPORT_SYMBOL(gr_check_group_change);
36375+#endif 37604+#endif
36376+ 37605+
36377diff -urNp linux-2.6.32.10/grsecurity/gracl_cap.c linux-2.6.32.10/grsecurity/gracl_cap.c 37606diff -urNp linux-2.6.32.11/grsecurity/gracl_cap.c linux-2.6.32.11/grsecurity/gracl_cap.c
36378--- linux-2.6.32.10/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 37607--- linux-2.6.32.11/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
36379+++ linux-2.6.32.10/grsecurity/gracl_cap.c 2010-03-20 15:58:47.148627499 -0400 37608+++ linux-2.6.32.11/grsecurity/gracl_cap.c 2010-04-04 20:46:41.668784531 -0400
36380@@ -0,0 +1,131 @@ 37609@@ -0,0 +1,131 @@
36381+#include <linux/kernel.h> 37610+#include <linux/kernel.h>
36382+#include <linux/module.h> 37611+#include <linux/module.h>
@@ -36509,9 +37738,9 @@ diff -urNp linux-2.6.32.10/grsecurity/gracl_cap.c linux-2.6.32.10/grsecurity/gra
36509+ return 0; 37738+ return 0;
36510+} 37739+}
36511+ 37740+
36512diff -urNp linux-2.6.32.10/grsecurity/gracl_fs.c linux-2.6.32.10/grsecurity/gracl_fs.c 37741diff -urNp linux-2.6.32.11/grsecurity/gracl_fs.c linux-2.6.32.11/grsecurity/gracl_fs.c
36513--- linux-2.6.32.10/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 37742--- linux-2.6.32.11/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
36514+++ linux-2.6.32.10/grsecurity/gracl_fs.c 2010-03-20 15:58:47.148627499 -0400 37743+++ linux-2.6.32.11/grsecurity/gracl_fs.c 2010-04-04 20:46:41.668784531 -0400
36515@@ -0,0 +1,424 @@ 37744@@ -0,0 +1,424 @@
36516+#include <linux/kernel.h> 37745+#include <linux/kernel.h>
36517+#include <linux/sched.h> 37746+#include <linux/sched.h>
@@ -36937,9 +38166,9 @@ diff -urNp linux-2.6.32.10/grsecurity/gracl_fs.c linux-2.6.32.10/grsecurity/grac
36937+ 38166+
36938+ return 0; 38167+ return 0;
36939+} 38168+}
36940diff -urNp linux-2.6.32.10/grsecurity/gracl_ip.c linux-2.6.32.10/grsecurity/gracl_ip.c 38169diff -urNp linux-2.6.32.11/grsecurity/gracl_ip.c linux-2.6.32.11/grsecurity/gracl_ip.c
36941--- linux-2.6.32.10/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 38170--- linux-2.6.32.11/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
36942+++ linux-2.6.32.10/grsecurity/gracl_ip.c 2010-03-20 15:58:47.148627499 -0400 38171+++ linux-2.6.32.11/grsecurity/gracl_ip.c 2010-04-04 20:46:41.668784531 -0400
36943@@ -0,0 +1,339 @@ 38172@@ -0,0 +1,339 @@
36944+#include <linux/kernel.h> 38173+#include <linux/kernel.h>
36945+#include <asm/uaccess.h> 38174+#include <asm/uaccess.h>
@@ -37280,9 +38509,9 @@ diff -urNp linux-2.6.32.10/grsecurity/gracl_ip.c linux-2.6.32.10/grsecurity/grac
37280+ 38509+
37281+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); 38510+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
37282+} 38511+}
37283diff -urNp linux-2.6.32.10/grsecurity/gracl_learn.c linux-2.6.32.10/grsecurity/gracl_learn.c 38512diff -urNp linux-2.6.32.11/grsecurity/gracl_learn.c linux-2.6.32.11/grsecurity/gracl_learn.c
37284--- linux-2.6.32.10/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 38513--- linux-2.6.32.11/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
37285+++ linux-2.6.32.10/grsecurity/gracl_learn.c 2010-03-20 15:58:47.148627499 -0400 38514+++ linux-2.6.32.11/grsecurity/gracl_learn.c 2010-04-04 20:46:41.668784531 -0400
37286@@ -0,0 +1,211 @@ 38515@@ -0,0 +1,211 @@
37287+#include <linux/kernel.h> 38516+#include <linux/kernel.h>
37288+#include <linux/mm.h> 38517+#include <linux/mm.h>
@@ -37495,9 +38724,9 @@ diff -urNp linux-2.6.32.10/grsecurity/gracl_learn.c linux-2.6.32.10/grsecurity/g
37495+ .release = close_learn, 38724+ .release = close_learn,
37496+ .poll = poll_learn, 38725+ .poll = poll_learn,
37497+}; 38726+};
37498diff -urNp linux-2.6.32.10/grsecurity/gracl_res.c linux-2.6.32.10/grsecurity/gracl_res.c 38727diff -urNp linux-2.6.32.11/grsecurity/gracl_res.c linux-2.6.32.11/grsecurity/gracl_res.c
37499--- linux-2.6.32.10/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 38728--- linux-2.6.32.11/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
37500+++ linux-2.6.32.10/grsecurity/gracl_res.c 2010-03-20 15:58:47.148627499 -0400 38729+++ linux-2.6.32.11/grsecurity/gracl_res.c 2010-04-04 20:46:41.668784531 -0400
37501@@ -0,0 +1,65 @@ 38730@@ -0,0 +1,65 @@
37502+#include <linux/kernel.h> 38731+#include <linux/kernel.h>
37503+#include <linux/sched.h> 38732+#include <linux/sched.h>
@@ -37564,9 +38793,9 @@ diff -urNp linux-2.6.32.10/grsecurity/gracl_res.c linux-2.6.32.10/grsecurity/gra
37564+ rcu_read_unlock(); 38793+ rcu_read_unlock();
37565+ return; 38794+ return;
37566+} 38795+}
37567diff -urNp linux-2.6.32.10/grsecurity/gracl_segv.c linux-2.6.32.10/grsecurity/gracl_segv.c 38796diff -urNp linux-2.6.32.11/grsecurity/gracl_segv.c linux-2.6.32.11/grsecurity/gracl_segv.c
37568--- linux-2.6.32.10/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 38797--- linux-2.6.32.11/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
37569+++ linux-2.6.32.10/grsecurity/gracl_segv.c 2010-03-20 15:58:47.148627499 -0400 38798+++ linux-2.6.32.11/grsecurity/gracl_segv.c 2010-04-04 20:46:41.668784531 -0400
37570@@ -0,0 +1,310 @@ 38799@@ -0,0 +1,310 @@
37571+#include <linux/kernel.h> 38800+#include <linux/kernel.h>
37572+#include <linux/mm.h> 38801+#include <linux/mm.h>
@@ -37878,9 +39107,9 @@ diff -urNp linux-2.6.32.10/grsecurity/gracl_segv.c linux-2.6.32.10/grsecurity/gr
37878+ 39107+
37879+ return; 39108+ return;
37880+} 39109+}
37881diff -urNp linux-2.6.32.10/grsecurity/gracl_shm.c linux-2.6.32.10/grsecurity/gracl_shm.c 39110diff -urNp linux-2.6.32.11/grsecurity/gracl_shm.c linux-2.6.32.11/grsecurity/gracl_shm.c
37882--- linux-2.6.32.10/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 39111--- linux-2.6.32.11/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
37883+++ linux-2.6.32.10/grsecurity/gracl_shm.c 2010-03-20 15:58:47.148627499 -0400 39112+++ linux-2.6.32.11/grsecurity/gracl_shm.c 2010-04-04 20:46:41.668784531 -0400
37884@@ -0,0 +1,37 @@ 39113@@ -0,0 +1,37 @@
37885+#include <linux/kernel.h> 39114+#include <linux/kernel.h>
37886+#include <linux/mm.h> 39115+#include <linux/mm.h>
@@ -37919,9 +39148,9 @@ diff -urNp linux-2.6.32.10/grsecurity/gracl_shm.c linux-2.6.32.10/grsecurity/gra
37919+ 39148+
37920+ return 1; 39149+ return 1;
37921+} 39150+}
37922diff -urNp linux-2.6.32.10/grsecurity/grsec_chdir.c linux-2.6.32.10/grsecurity/grsec_chdir.c 39151diff -urNp linux-2.6.32.11/grsecurity/grsec_chdir.c linux-2.6.32.11/grsecurity/grsec_chdir.c
37923--- linux-2.6.32.10/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 39152--- linux-2.6.32.11/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
37924+++ linux-2.6.32.10/grsecurity/grsec_chdir.c 2010-03-20 15:58:47.148627499 -0400 39153+++ linux-2.6.32.11/grsecurity/grsec_chdir.c 2010-04-04 20:46:41.668784531 -0400
37925@@ -0,0 +1,19 @@ 39154@@ -0,0 +1,19 @@
37926+#include <linux/kernel.h> 39155+#include <linux/kernel.h>
37927+#include <linux/sched.h> 39156+#include <linux/sched.h>
@@ -37942,9 +39171,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_chdir.c linux-2.6.32.10/grsecurity/g
37942+#endif 39171+#endif
37943+ return; 39172+ return;
37944+} 39173+}
37945diff -urNp linux-2.6.32.10/grsecurity/grsec_chroot.c linux-2.6.32.10/grsecurity/grsec_chroot.c 39174diff -urNp linux-2.6.32.11/grsecurity/grsec_chroot.c linux-2.6.32.11/grsecurity/grsec_chroot.c
37946--- linux-2.6.32.10/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 39175--- linux-2.6.32.11/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
37947+++ linux-2.6.32.10/grsecurity/grsec_chroot.c 2010-03-20 15:58:47.148627499 -0400 39176+++ linux-2.6.32.11/grsecurity/grsec_chroot.c 2010-04-04 20:46:41.668784531 -0400
37948@@ -0,0 +1,348 @@ 39177@@ -0,0 +1,348 @@
37949+#include <linux/kernel.h> 39178+#include <linux/kernel.h>
37950+#include <linux/module.h> 39179+#include <linux/module.h>
@@ -38294,9 +39523,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_chroot.c linux-2.6.32.10/grsecurity/
38294+#ifdef CONFIG_SECURITY 39523+#ifdef CONFIG_SECURITY
38295+EXPORT_SYMBOL(gr_handle_chroot_caps); 39524+EXPORT_SYMBOL(gr_handle_chroot_caps);
38296+#endif 39525+#endif
38297diff -urNp linux-2.6.32.10/grsecurity/grsec_disabled.c linux-2.6.32.10/grsecurity/grsec_disabled.c 39526diff -urNp linux-2.6.32.11/grsecurity/grsec_disabled.c linux-2.6.32.11/grsecurity/grsec_disabled.c
38298--- linux-2.6.32.10/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 39527--- linux-2.6.32.11/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
38299+++ linux-2.6.32.10/grsecurity/grsec_disabled.c 2010-03-20 15:58:47.148627499 -0400 39528+++ linux-2.6.32.11/grsecurity/grsec_disabled.c 2010-04-04 20:46:41.668784531 -0400
38300@@ -0,0 +1,426 @@ 39529@@ -0,0 +1,426 @@
38301+#include <linux/kernel.h> 39530+#include <linux/kernel.h>
38302+#include <linux/module.h> 39531+#include <linux/module.h>
@@ -38724,9 +39953,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_disabled.c linux-2.6.32.10/grsecurit
38724+EXPORT_SYMBOL(gr_check_user_change); 39953+EXPORT_SYMBOL(gr_check_user_change);
38725+EXPORT_SYMBOL(gr_check_group_change); 39954+EXPORT_SYMBOL(gr_check_group_change);
38726+#endif 39955+#endif
38727diff -urNp linux-2.6.32.10/grsecurity/grsec_exec.c linux-2.6.32.10/grsecurity/grsec_exec.c 39956diff -urNp linux-2.6.32.11/grsecurity/grsec_exec.c linux-2.6.32.11/grsecurity/grsec_exec.c
38728--- linux-2.6.32.10/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 39957--- linux-2.6.32.11/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
38729+++ linux-2.6.32.10/grsecurity/grsec_exec.c 2010-03-20 15:58:47.148627499 -0400 39958+++ linux-2.6.32.11/grsecurity/grsec_exec.c 2010-04-04 20:46:41.668784531 -0400
38730@@ -0,0 +1,89 @@ 39959@@ -0,0 +1,89 @@
38731+#include <linux/kernel.h> 39960+#include <linux/kernel.h>
38732+#include <linux/sched.h> 39961+#include <linux/sched.h>
@@ -38817,9 +40046,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_exec.c linux-2.6.32.10/grsecurity/gr
38817+#endif 40046+#endif
38818+ return; 40047+ return;
38819+} 40048+}
38820diff -urNp linux-2.6.32.10/grsecurity/grsec_fifo.c linux-2.6.32.10/grsecurity/grsec_fifo.c 40049diff -urNp linux-2.6.32.11/grsecurity/grsec_fifo.c linux-2.6.32.11/grsecurity/grsec_fifo.c
38821--- linux-2.6.32.10/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 40050--- linux-2.6.32.11/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
38822+++ linux-2.6.32.10/grsecurity/grsec_fifo.c 2010-03-20 15:58:47.148627499 -0400 40051+++ linux-2.6.32.11/grsecurity/grsec_fifo.c 2010-04-04 20:46:41.668784531 -0400
38823@@ -0,0 +1,24 @@ 40052@@ -0,0 +1,24 @@
38824+#include <linux/kernel.h> 40053+#include <linux/kernel.h>
38825+#include <linux/sched.h> 40054+#include <linux/sched.h>
@@ -38845,9 +40074,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_fifo.c linux-2.6.32.10/grsecurity/gr
38845+#endif 40074+#endif
38846+ return 0; 40075+ return 0;
38847+} 40076+}
38848diff -urNp linux-2.6.32.10/grsecurity/grsec_fork.c linux-2.6.32.10/grsecurity/grsec_fork.c 40077diff -urNp linux-2.6.32.11/grsecurity/grsec_fork.c linux-2.6.32.11/grsecurity/grsec_fork.c
38849--- linux-2.6.32.10/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 40078--- linux-2.6.32.11/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
38850+++ linux-2.6.32.10/grsecurity/grsec_fork.c 2010-03-20 15:58:47.148627499 -0400 40079+++ linux-2.6.32.11/grsecurity/grsec_fork.c 2010-04-04 20:46:41.668784531 -0400
38851@@ -0,0 +1,15 @@ 40080@@ -0,0 +1,15 @@
38852+#include <linux/kernel.h> 40081+#include <linux/kernel.h>
38853+#include <linux/sched.h> 40082+#include <linux/sched.h>
@@ -38864,9 +40093,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_fork.c linux-2.6.32.10/grsecurity/gr
38864+#endif 40093+#endif
38865+ return; 40094+ return;
38866+} 40095+}
38867diff -urNp linux-2.6.32.10/grsecurity/grsec_init.c linux-2.6.32.10/grsecurity/grsec_init.c 40096diff -urNp linux-2.6.32.11/grsecurity/grsec_init.c linux-2.6.32.11/grsecurity/grsec_init.c
38868--- linux-2.6.32.10/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 40097--- linux-2.6.32.11/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
38869+++ linux-2.6.32.10/grsecurity/grsec_init.c 2010-03-20 16:14:37.552600443 -0400 40098+++ linux-2.6.32.11/grsecurity/grsec_init.c 2010-04-04 20:46:41.668784531 -0400
38870@@ -0,0 +1,241 @@ 40099@@ -0,0 +1,241 @@
38871+#include <linux/kernel.h> 40100+#include <linux/kernel.h>
38872+#include <linux/sched.h> 40101+#include <linux/sched.h>
@@ -39109,9 +40338,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_init.c linux-2.6.32.10/grsecurity/gr
39109+ 40338+
39110+ return; 40339+ return;
39111+} 40340+}
39112diff -urNp linux-2.6.32.10/grsecurity/grsec_link.c linux-2.6.32.10/grsecurity/grsec_link.c 40341diff -urNp linux-2.6.32.11/grsecurity/grsec_link.c linux-2.6.32.11/grsecurity/grsec_link.c
39113--- linux-2.6.32.10/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 40342--- linux-2.6.32.11/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
39114+++ linux-2.6.32.10/grsecurity/grsec_link.c 2010-03-20 15:58:47.148627499 -0400 40343+++ linux-2.6.32.11/grsecurity/grsec_link.c 2010-04-04 20:46:41.668784531 -0400
39115@@ -0,0 +1,43 @@ 40344@@ -0,0 +1,43 @@
39116+#include <linux/kernel.h> 40345+#include <linux/kernel.h>
39117+#include <linux/sched.h> 40346+#include <linux/sched.h>
@@ -39156,9 +40385,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_link.c linux-2.6.32.10/grsecurity/gr
39156+#endif 40385+#endif
39157+ return 0; 40386+ return 0;
39158+} 40387+}
39159diff -urNp linux-2.6.32.10/grsecurity/grsec_log.c linux-2.6.32.10/grsecurity/grsec_log.c 40388diff -urNp linux-2.6.32.11/grsecurity/grsec_log.c linux-2.6.32.11/grsecurity/grsec_log.c
39160--- linux-2.6.32.10/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 40389--- linux-2.6.32.11/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
39161+++ linux-2.6.32.10/grsecurity/grsec_log.c 2010-03-20 15:58:47.148627499 -0400 40390+++ linux-2.6.32.11/grsecurity/grsec_log.c 2010-04-04 20:46:41.668784531 -0400
39162@@ -0,0 +1,296 @@ 40391@@ -0,0 +1,296 @@
39163+#include <linux/kernel.h> 40392+#include <linux/kernel.h>
39164+#include <linux/sched.h> 40393+#include <linux/sched.h>
@@ -39456,9 +40685,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_log.c linux-2.6.32.10/grsecurity/grs
39456+ gr_log_end(audit); 40685+ gr_log_end(audit);
39457+ END_LOCKS(audit); 40686+ END_LOCKS(audit);
39458+} 40687+}
39459diff -urNp linux-2.6.32.10/grsecurity/grsec_mem.c linux-2.6.32.10/grsecurity/grsec_mem.c 40688diff -urNp linux-2.6.32.11/grsecurity/grsec_mem.c linux-2.6.32.11/grsecurity/grsec_mem.c
39460--- linux-2.6.32.10/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 40689--- linux-2.6.32.11/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
39461+++ linux-2.6.32.10/grsecurity/grsec_mem.c 2010-03-20 15:58:47.148627499 -0400 40690+++ linux-2.6.32.11/grsecurity/grsec_mem.c 2010-04-04 20:46:41.668784531 -0400
39462@@ -0,0 +1,85 @@ 40691@@ -0,0 +1,85 @@
39463+#include <linux/kernel.h> 40692+#include <linux/kernel.h>
39464+#include <linux/sched.h> 40693+#include <linux/sched.h>
@@ -39545,9 +40774,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_mem.c linux-2.6.32.10/grsecurity/grs
39545+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); 40774+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
39546+ return; 40775+ return;
39547+} 40776+}
39548diff -urNp linux-2.6.32.10/grsecurity/grsec_mount.c linux-2.6.32.10/grsecurity/grsec_mount.c 40777diff -urNp linux-2.6.32.11/grsecurity/grsec_mount.c linux-2.6.32.11/grsecurity/grsec_mount.c
39549--- linux-2.6.32.10/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 40778--- linux-2.6.32.11/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
39550+++ linux-2.6.32.10/grsecurity/grsec_mount.c 2010-03-20 15:58:47.148627499 -0400 40779+++ linux-2.6.32.11/grsecurity/grsec_mount.c 2010-04-04 20:46:41.668784531 -0400
39551@@ -0,0 +1,62 @@ 40780@@ -0,0 +1,62 @@
39552+#include <linux/kernel.h> 40781+#include <linux/kernel.h>
39553+#include <linux/sched.h> 40782+#include <linux/sched.h>
@@ -39611,9 +40840,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_mount.c linux-2.6.32.10/grsecurity/g
39611+#endif 40840+#endif
39612+ return 0; 40841+ return 0;
39613+} 40842+}
39614diff -urNp linux-2.6.32.10/grsecurity/grsec_ptrace.c linux-2.6.32.10/grsecurity/grsec_ptrace.c 40843diff -urNp linux-2.6.32.11/grsecurity/grsec_ptrace.c linux-2.6.32.11/grsecurity/grsec_ptrace.c
39615--- linux-2.6.32.10/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 40844--- linux-2.6.32.11/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
39616+++ linux-2.6.32.10/grsecurity/grsec_ptrace.c 2010-03-20 15:58:47.148627499 -0400 40845+++ linux-2.6.32.11/grsecurity/grsec_ptrace.c 2010-04-04 20:46:41.668784531 -0400
39617@@ -0,0 +1,14 @@ 40846@@ -0,0 +1,14 @@
39618+#include <linux/kernel.h> 40847+#include <linux/kernel.h>
39619+#include <linux/sched.h> 40848+#include <linux/sched.h>
@@ -39629,9 +40858,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_ptrace.c linux-2.6.32.10/grsecurity/
39629+#endif 40858+#endif
39630+ return; 40859+ return;
39631+} 40860+}
39632diff -urNp linux-2.6.32.10/grsecurity/grsec_sig.c linux-2.6.32.10/grsecurity/grsec_sig.c 40861diff -urNp linux-2.6.32.11/grsecurity/grsec_sig.c linux-2.6.32.11/grsecurity/grsec_sig.c
39633--- linux-2.6.32.10/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 40862--- linux-2.6.32.11/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
39634+++ linux-2.6.32.10/grsecurity/grsec_sig.c 2010-03-20 15:58:47.148627499 -0400 40863+++ linux-2.6.32.11/grsecurity/grsec_sig.c 2010-04-04 20:46:41.668784531 -0400
39635@@ -0,0 +1,65 @@ 40864@@ -0,0 +1,65 @@
39636+#include <linux/kernel.h> 40865+#include <linux/kernel.h>
39637+#include <linux/sched.h> 40866+#include <linux/sched.h>
@@ -39698,9 +40927,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_sig.c linux-2.6.32.10/grsecurity/grs
39698+ return; 40927+ return;
39699+} 40928+}
39700+ 40929+
39701diff -urNp linux-2.6.32.10/grsecurity/grsec_sock.c linux-2.6.32.10/grsecurity/grsec_sock.c 40930diff -urNp linux-2.6.32.11/grsecurity/grsec_sock.c linux-2.6.32.11/grsecurity/grsec_sock.c
39702--- linux-2.6.32.10/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 40931--- linux-2.6.32.11/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
39703+++ linux-2.6.32.10/grsecurity/grsec_sock.c 2010-03-20 15:58:47.148627499 -0400 40932+++ linux-2.6.32.11/grsecurity/grsec_sock.c 2010-04-04 20:46:41.668784531 -0400
39704@@ -0,0 +1,271 @@ 40933@@ -0,0 +1,271 @@
39705+#include <linux/kernel.h> 40934+#include <linux/kernel.h>
39706+#include <linux/module.h> 40935+#include <linux/module.h>
@@ -39973,9 +41202,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_sock.c linux-2.6.32.10/grsecurity/gr
39973+ return current_cap(); 41202+ return current_cap();
39974+#endif 41203+#endif
39975+} 41204+}
39976diff -urNp linux-2.6.32.10/grsecurity/grsec_sysctl.c linux-2.6.32.10/grsecurity/grsec_sysctl.c 41205diff -urNp linux-2.6.32.11/grsecurity/grsec_sysctl.c linux-2.6.32.11/grsecurity/grsec_sysctl.c
39977--- linux-2.6.32.10/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 41206--- linux-2.6.32.11/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
39978+++ linux-2.6.32.10/grsecurity/grsec_sysctl.c 2010-03-20 16:11:50.117003314 -0400 41207+++ linux-2.6.32.11/grsecurity/grsec_sysctl.c 2010-04-04 20:46:41.668784531 -0400
39979@@ -0,0 +1,447 @@ 41208@@ -0,0 +1,447 @@
39980+#include <linux/kernel.h> 41209+#include <linux/kernel.h>
39981+#include <linux/sched.h> 41210+#include <linux/sched.h>
@@ -40424,9 +41653,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_sysctl.c linux-2.6.32.10/grsecurity/
40424+ { .ctl_name = 0 } 41653+ { .ctl_name = 0 }
40425+}; 41654+};
40426+#endif 41655+#endif
40427diff -urNp linux-2.6.32.10/grsecurity/grsec_textrel.c linux-2.6.32.10/grsecurity/grsec_textrel.c 41656diff -urNp linux-2.6.32.11/grsecurity/grsec_textrel.c linux-2.6.32.11/grsecurity/grsec_textrel.c
40428--- linux-2.6.32.10/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 41657--- linux-2.6.32.11/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
40429+++ linux-2.6.32.10/grsecurity/grsec_textrel.c 2010-03-20 15:58:47.148627499 -0400 41658+++ linux-2.6.32.11/grsecurity/grsec_textrel.c 2010-04-04 20:46:41.668784531 -0400
40430@@ -0,0 +1,16 @@ 41659@@ -0,0 +1,16 @@
40431+#include <linux/kernel.h> 41660+#include <linux/kernel.h>
40432+#include <linux/sched.h> 41661+#include <linux/sched.h>
@@ -40444,9 +41673,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_textrel.c linux-2.6.32.10/grsecurity
40444+#endif 41673+#endif
40445+ return; 41674+ return;
40446+} 41675+}
40447diff -urNp linux-2.6.32.10/grsecurity/grsec_time.c linux-2.6.32.10/grsecurity/grsec_time.c 41676diff -urNp linux-2.6.32.11/grsecurity/grsec_time.c linux-2.6.32.11/grsecurity/grsec_time.c
40448--- linux-2.6.32.10/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 41677--- linux-2.6.32.11/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
40449+++ linux-2.6.32.10/grsecurity/grsec_time.c 2010-03-20 15:58:47.148627499 -0400 41678+++ linux-2.6.32.11/grsecurity/grsec_time.c 2010-04-04 20:46:41.668784531 -0400
40450@@ -0,0 +1,13 @@ 41679@@ -0,0 +1,13 @@
40451+#include <linux/kernel.h> 41680+#include <linux/kernel.h>
40452+#include <linux/sched.h> 41681+#include <linux/sched.h>
@@ -40461,9 +41690,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_time.c linux-2.6.32.10/grsecurity/gr
40461+#endif 41690+#endif
40462+ return; 41691+ return;
40463+} 41692+}
40464diff -urNp linux-2.6.32.10/grsecurity/grsec_tpe.c linux-2.6.32.10/grsecurity/grsec_tpe.c 41693diff -urNp linux-2.6.32.11/grsecurity/grsec_tpe.c linux-2.6.32.11/grsecurity/grsec_tpe.c
40465--- linux-2.6.32.10/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 41694--- linux-2.6.32.11/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
40466+++ linux-2.6.32.10/grsecurity/grsec_tpe.c 2010-03-20 15:58:47.148627499 -0400 41695+++ linux-2.6.32.11/grsecurity/grsec_tpe.c 2010-04-04 20:46:41.668784531 -0400
40467@@ -0,0 +1,38 @@ 41696@@ -0,0 +1,38 @@
40468+#include <linux/kernel.h> 41697+#include <linux/kernel.h>
40469+#include <linux/sched.h> 41698+#include <linux/sched.h>
@@ -40503,9 +41732,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsec_tpe.c linux-2.6.32.10/grsecurity/grs
40503+#endif 41732+#endif
40504+ return 1; 41733+ return 1;
40505+} 41734+}
40506diff -urNp linux-2.6.32.10/grsecurity/grsum.c linux-2.6.32.10/grsecurity/grsum.c 41735diff -urNp linux-2.6.32.11/grsecurity/grsum.c linux-2.6.32.11/grsecurity/grsum.c
40507--- linux-2.6.32.10/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 41736--- linux-2.6.32.11/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
40508+++ linux-2.6.32.10/grsecurity/grsum.c 2010-03-20 15:58:47.148627499 -0400 41737+++ linux-2.6.32.11/grsecurity/grsum.c 2010-04-04 20:46:41.668784531 -0400
40509@@ -0,0 +1,59 @@ 41738@@ -0,0 +1,59 @@
40510+#include <linux/err.h> 41739+#include <linux/err.h>
40511+#include <linux/kernel.h> 41740+#include <linux/kernel.h>
@@ -40566,9 +41795,9 @@ diff -urNp linux-2.6.32.10/grsecurity/grsum.c linux-2.6.32.10/grsecurity/grsum.c
40566+ 41795+
40567+ return retval; 41796+ return retval;
40568+} 41797+}
40569diff -urNp linux-2.6.32.10/grsecurity/Kconfig linux-2.6.32.10/grsecurity/Kconfig 41798diff -urNp linux-2.6.32.11/grsecurity/Kconfig linux-2.6.32.11/grsecurity/Kconfig
40570--- linux-2.6.32.10/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 41799--- linux-2.6.32.11/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
40571+++ linux-2.6.32.10/grsecurity/Kconfig 2010-03-20 16:35:58.913398417 -0400 41800+++ linux-2.6.32.11/grsecurity/Kconfig 2010-04-04 20:46:41.668784531 -0400
40572@@ -0,0 +1,965 @@ 41801@@ -0,0 +1,965 @@
40573+# 41802+#
40574+# grecurity configuration 41803+# grecurity configuration
@@ -41535,9 +42764,9 @@ diff -urNp linux-2.6.32.10/grsecurity/Kconfig linux-2.6.32.10/grsecurity/Kconfig
41535+endmenu 42764+endmenu
41536+ 42765+
41537+endmenu 42766+endmenu
41538diff -urNp linux-2.6.32.10/grsecurity/Makefile linux-2.6.32.10/grsecurity/Makefile 42767diff -urNp linux-2.6.32.11/grsecurity/Makefile linux-2.6.32.11/grsecurity/Makefile
41539--- linux-2.6.32.10/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 42768--- linux-2.6.32.11/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
41540+++ linux-2.6.32.10/grsecurity/Makefile 2010-03-20 15:58:47.148627499 -0400 42769+++ linux-2.6.32.11/grsecurity/Makefile 2010-04-04 20:46:41.668784531 -0400
41541@@ -0,0 +1,29 @@ 42770@@ -0,0 +1,29 @@
41542+# grsecurity's ACL system was originally written in 2001 by Michael Dalton 42771+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
41543+# during 2001-2009 it has been completely redesigned by Brad Spengler 42772+# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -41568,9 +42797,9 @@ diff -urNp linux-2.6.32.10/grsecurity/Makefile linux-2.6.32.10/grsecurity/Makefi
41568+ @-chmod -f 700 . 42797+ @-chmod -f 700 .
41569+ @echo ' grsec: protected kernel image paths' 42798+ @echo ' grsec: protected kernel image paths'
41570+endif 42799+endif
41571diff -urNp linux-2.6.32.10/include/acpi/acpi_drivers.h linux-2.6.32.10/include/acpi/acpi_drivers.h 42800diff -urNp linux-2.6.32.11/include/acpi/acpi_drivers.h linux-2.6.32.11/include/acpi/acpi_drivers.h
41572--- linux-2.6.32.10/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400 42801--- linux-2.6.32.11/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400
41573+++ linux-2.6.32.10/include/acpi/acpi_drivers.h 2010-03-20 15:58:47.152569927 -0400 42802+++ linux-2.6.32.11/include/acpi/acpi_drivers.h 2010-04-04 20:46:41.668784531 -0400
41574@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp 42803@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
41575 Dock Station 42804 Dock Station
41576 -------------------------------------------------------------------------- */ 42805 -------------------------------------------------------------------------- */
@@ -41600,9 +42829,9 @@ diff -urNp linux-2.6.32.10/include/acpi/acpi_drivers.h linux-2.6.32.10/include/a
41600 void *context) 42829 void *context)
41601 { 42830 {
41602 return -ENODEV; 42831 return -ENODEV;
41603diff -urNp linux-2.6.32.10/include/asm-generic/atomic-long.h linux-2.6.32.10/include/asm-generic/atomic-long.h 42832diff -urNp linux-2.6.32.11/include/asm-generic/atomic-long.h linux-2.6.32.11/include/asm-generic/atomic-long.h
41604--- linux-2.6.32.10/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400 42833--- linux-2.6.32.11/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400
41605+++ linux-2.6.32.10/include/asm-generic/atomic-long.h 2010-03-20 15:58:47.152569927 -0400 42834+++ linux-2.6.32.11/include/asm-generic/atomic-long.h 2010-04-04 20:46:41.668784531 -0400
41606@@ -22,6 +22,12 @@ 42835@@ -22,6 +22,12 @@
41607 42836
41608 typedef atomic64_t atomic_long_t; 42837 typedef atomic64_t atomic_long_t;
@@ -41823,9 +43052,9 @@ diff -urNp linux-2.6.32.10/include/asm-generic/atomic-long.h linux-2.6.32.10/inc
41823+#endif 43052+#endif
41824+ 43053+
41825 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ 43054 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
41826diff -urNp linux-2.6.32.10/include/asm-generic/dma-mapping-common.h linux-2.6.32.10/include/asm-generic/dma-mapping-common.h 43055diff -urNp linux-2.6.32.11/include/asm-generic/dma-mapping-common.h linux-2.6.32.11/include/asm-generic/dma-mapping-common.h
41827--- linux-2.6.32.10/include/asm-generic/dma-mapping-common.h 2010-03-15 11:52:04.000000000 -0400 43056--- linux-2.6.32.11/include/asm-generic/dma-mapping-common.h 2010-03-15 11:52:04.000000000 -0400
41828+++ linux-2.6.32.10/include/asm-generic/dma-mapping-common.h 2010-03-20 15:58:47.152569927 -0400 43057+++ linux-2.6.32.11/include/asm-generic/dma-mapping-common.h 2010-04-04 20:46:41.673688119 -0400
41829@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ 43058@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
41830 enum dma_data_direction dir, 43059 enum dma_data_direction dir,
41831 struct dma_attrs *attrs) 43060 struct dma_attrs *attrs)
@@ -41934,9 +43163,9 @@ diff -urNp linux-2.6.32.10/include/asm-generic/dma-mapping-common.h linux-2.6.32
41934 43163
41935 BUG_ON(!valid_dma_direction(dir)); 43164 BUG_ON(!valid_dma_direction(dir));
41936 if (ops->sync_sg_for_device) 43165 if (ops->sync_sg_for_device)
41937diff -urNp linux-2.6.32.10/include/asm-generic/futex.h linux-2.6.32.10/include/asm-generic/futex.h 43166diff -urNp linux-2.6.32.11/include/asm-generic/futex.h linux-2.6.32.11/include/asm-generic/futex.h
41938--- linux-2.6.32.10/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400 43167--- linux-2.6.32.11/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400
41939+++ linux-2.6.32.10/include/asm-generic/futex.h 2010-03-20 15:58:47.152569927 -0400 43168+++ linux-2.6.32.11/include/asm-generic/futex.h 2010-04-04 20:46:41.673688119 -0400
41940@@ -6,7 +6,7 @@ 43169@@ -6,7 +6,7 @@
41941 #include <asm/errno.h> 43170 #include <asm/errno.h>
41942 43171
@@ -41955,9 +43184,9 @@ diff -urNp linux-2.6.32.10/include/asm-generic/futex.h linux-2.6.32.10/include/a
41955 { 43184 {
41956 return -ENOSYS; 43185 return -ENOSYS;
41957 } 43186 }
41958diff -urNp linux-2.6.32.10/include/asm-generic/int-l64.h linux-2.6.32.10/include/asm-generic/int-l64.h 43187diff -urNp linux-2.6.32.11/include/asm-generic/int-l64.h linux-2.6.32.11/include/asm-generic/int-l64.h
41959--- linux-2.6.32.10/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400 43188--- linux-2.6.32.11/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400
41960+++ linux-2.6.32.10/include/asm-generic/int-l64.h 2010-03-20 15:58:47.152569927 -0400 43189+++ linux-2.6.32.11/include/asm-generic/int-l64.h 2010-04-04 20:46:41.673688119 -0400
41961@@ -46,6 +46,8 @@ typedef unsigned int u32; 43190@@ -46,6 +46,8 @@ typedef unsigned int u32;
41962 typedef signed long s64; 43191 typedef signed long s64;
41963 typedef unsigned long u64; 43192 typedef unsigned long u64;
@@ -41967,9 +43196,9 @@ diff -urNp linux-2.6.32.10/include/asm-generic/int-l64.h linux-2.6.32.10/include
41967 #define S8_C(x) x 43196 #define S8_C(x) x
41968 #define U8_C(x) x ## U 43197 #define U8_C(x) x ## U
41969 #define S16_C(x) x 43198 #define S16_C(x) x
41970diff -urNp linux-2.6.32.10/include/asm-generic/int-ll64.h linux-2.6.32.10/include/asm-generic/int-ll64.h 43199diff -urNp linux-2.6.32.11/include/asm-generic/int-ll64.h linux-2.6.32.11/include/asm-generic/int-ll64.h
41971--- linux-2.6.32.10/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400 43200--- linux-2.6.32.11/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400
41972+++ linux-2.6.32.10/include/asm-generic/int-ll64.h 2010-03-20 15:58:47.152569927 -0400 43201+++ linux-2.6.32.11/include/asm-generic/int-ll64.h 2010-04-04 20:46:41.673688119 -0400
41973@@ -51,6 +51,8 @@ typedef unsigned int u32; 43202@@ -51,6 +51,8 @@ typedef unsigned int u32;
41974 typedef signed long long s64; 43203 typedef signed long long s64;
41975 typedef unsigned long long u64; 43204 typedef unsigned long long u64;
@@ -41979,9 +43208,9 @@ diff -urNp linux-2.6.32.10/include/asm-generic/int-ll64.h linux-2.6.32.10/includ
41979 #define S8_C(x) x 43208 #define S8_C(x) x
41980 #define U8_C(x) x ## U 43209 #define U8_C(x) x ## U
41981 #define S16_C(x) x 43210 #define S16_C(x) x
41982diff -urNp linux-2.6.32.10/include/asm-generic/kmap_types.h linux-2.6.32.10/include/asm-generic/kmap_types.h 43211diff -urNp linux-2.6.32.11/include/asm-generic/kmap_types.h linux-2.6.32.11/include/asm-generic/kmap_types.h
41983--- linux-2.6.32.10/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 43212--- linux-2.6.32.11/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
41984+++ linux-2.6.32.10/include/asm-generic/kmap_types.h 2010-03-20 15:58:47.152569927 -0400 43213+++ linux-2.6.32.11/include/asm-generic/kmap_types.h 2010-04-04 20:46:41.673688119 -0400
41985@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, 43214@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
41986 KMAP_D(16) KM_IRQ_PTE, 43215 KMAP_D(16) KM_IRQ_PTE,
41987 KMAP_D(17) KM_NMI, 43216 KMAP_D(17) KM_NMI,
@@ -41992,9 +43221,9 @@ diff -urNp linux-2.6.32.10/include/asm-generic/kmap_types.h linux-2.6.32.10/incl
41992 }; 43221 };
41993 43222
41994 #undef KMAP_D 43223 #undef KMAP_D
41995diff -urNp linux-2.6.32.10/include/asm-generic/pgtable.h linux-2.6.32.10/include/asm-generic/pgtable.h 43224diff -urNp linux-2.6.32.11/include/asm-generic/pgtable.h linux-2.6.32.11/include/asm-generic/pgtable.h
41996--- linux-2.6.32.10/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400 43225--- linux-2.6.32.11/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400
41997+++ linux-2.6.32.10/include/asm-generic/pgtable.h 2010-03-20 15:58:47.152569927 -0400 43226+++ linux-2.6.32.11/include/asm-generic/pgtable.h 2010-04-04 20:46:41.673688119 -0400
41998@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar 43227@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
41999 unsigned long size); 43228 unsigned long size);
42000 #endif 43229 #endif
@@ -42010,9 +43239,9 @@ diff -urNp linux-2.6.32.10/include/asm-generic/pgtable.h linux-2.6.32.10/include
42010 #endif /* !__ASSEMBLY__ */ 43239 #endif /* !__ASSEMBLY__ */
42011 43240
42012 #endif /* _ASM_GENERIC_PGTABLE_H */ 43241 #endif /* _ASM_GENERIC_PGTABLE_H */
42013diff -urNp linux-2.6.32.10/include/asm-generic/vmlinux.lds.h linux-2.6.32.10/include/asm-generic/vmlinux.lds.h 43242diff -urNp linux-2.6.32.11/include/asm-generic/vmlinux.lds.h linux-2.6.32.11/include/asm-generic/vmlinux.lds.h
42014--- linux-2.6.32.10/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400 43243--- linux-2.6.32.11/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400
42015+++ linux-2.6.32.10/include/asm-generic/vmlinux.lds.h 2010-03-20 15:58:47.152569927 -0400 43244+++ linux-2.6.32.11/include/asm-generic/vmlinux.lds.h 2010-04-04 20:46:41.673688119 -0400
42016@@ -199,6 +199,7 @@ 43245@@ -199,6 +199,7 @@
42017 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ 43246 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
42018 VMLINUX_SYMBOL(__start_rodata) = .; \ 43247 VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -42051,9 +43280,9 @@ diff -urNp linux-2.6.32.10/include/asm-generic/vmlinux.lds.h linux-2.6.32.10/inc
42051 43280
42052 /** 43281 /**
42053 * PERCPU - define output section for percpu area, simple version 43282 * PERCPU - define output section for percpu area, simple version
42054diff -urNp linux-2.6.32.10/include/drm/drm_pciids.h linux-2.6.32.10/include/drm/drm_pciids.h 43283diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/drm_pciids.h
42055--- linux-2.6.32.10/include/drm/drm_pciids.h 2010-03-15 11:52:04.000000000 -0400 43284--- linux-2.6.32.11/include/drm/drm_pciids.h 2010-03-15 11:52:04.000000000 -0400
42056+++ linux-2.6.32.10/include/drm/drm_pciids.h 2010-03-20 15:58:47.152569927 -0400 43285+++ linux-2.6.32.11/include/drm/drm_pciids.h 2010-04-04 20:46:41.673688119 -0400
42057@@ -375,7 +375,7 @@ 43286@@ -375,7 +375,7 @@
42058 {0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 43287 {0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
42059 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 43288 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -42157,9 +43386,9 @@ diff -urNp linux-2.6.32.10/include/drm/drm_pciids.h linux-2.6.32.10/include/drm/
42157 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 43386 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
42158- {0, 0, 0} 43387- {0, 0, 0}
42159+ {0, 0, 0, 0, 0, 0} 43388+ {0, 0, 0, 0, 0, 0}
42160diff -urNp linux-2.6.32.10/include/drm/drmP.h linux-2.6.32.10/include/drm/drmP.h 43389diff -urNp linux-2.6.32.11/include/drm/drmP.h linux-2.6.32.11/include/drm/drmP.h
42161--- linux-2.6.32.10/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400 43390--- linux-2.6.32.11/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400
42162+++ linux-2.6.32.10/include/drm/drmP.h 2010-03-20 15:58:47.152569927 -0400 43391+++ linux-2.6.32.11/include/drm/drmP.h 2010-04-04 20:46:41.673688119 -0400
42163@@ -814,7 +814,7 @@ struct drm_driver { 43392@@ -814,7 +814,7 @@ struct drm_driver {
42164 void (*vgaarb_irq)(struct drm_device *dev, bool state); 43393 void (*vgaarb_irq)(struct drm_device *dev, bool state);
42165 43394
@@ -42187,9 +43416,9 @@ diff -urNp linux-2.6.32.10/include/drm/drmP.h linux-2.6.32.10/include/drm/drmP.h
42187 /*@} */ 43416 /*@} */
42188 43417
42189 struct list_head filelist; 43418 struct list_head filelist;
42190diff -urNp linux-2.6.32.10/include/linux/a.out.h linux-2.6.32.10/include/linux/a.out.h 43419diff -urNp linux-2.6.32.11/include/linux/a.out.h linux-2.6.32.11/include/linux/a.out.h
42191--- linux-2.6.32.10/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400 43420--- linux-2.6.32.11/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400
42192+++ linux-2.6.32.10/include/linux/a.out.h 2010-03-20 15:58:47.152569927 -0400 43421+++ linux-2.6.32.11/include/linux/a.out.h 2010-04-04 20:46:41.673688119 -0400
42193@@ -39,6 +39,14 @@ enum machine_type { 43422@@ -39,6 +39,14 @@ enum machine_type {
42194 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ 43423 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
42195 }; 43424 };
@@ -42205,9 +43434,9 @@ diff -urNp linux-2.6.32.10/include/linux/a.out.h linux-2.6.32.10/include/linux/a
42205 #if !defined (N_MAGIC) 43434 #if !defined (N_MAGIC)
42206 #define N_MAGIC(exec) ((exec).a_info & 0xffff) 43435 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
42207 #endif 43436 #endif
42208diff -urNp linux-2.6.32.10/include/linux/atmdev.h linux-2.6.32.10/include/linux/atmdev.h 43437diff -urNp linux-2.6.32.11/include/linux/atmdev.h linux-2.6.32.11/include/linux/atmdev.h
42209--- linux-2.6.32.10/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400 43438--- linux-2.6.32.11/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400
42210+++ linux-2.6.32.10/include/linux/atmdev.h 2010-03-20 15:58:47.152569927 -0400 43439+++ linux-2.6.32.11/include/linux/atmdev.h 2010-04-04 20:46:41.673688119 -0400
42211@@ -237,7 +237,7 @@ struct compat_atm_iobuf { 43440@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
42212 #endif 43441 #endif
42213 43442
@@ -42217,9 +43446,9 @@ diff -urNp linux-2.6.32.10/include/linux/atmdev.h linux-2.6.32.10/include/linux/
42217 __AAL_STAT_ITEMS 43446 __AAL_STAT_ITEMS
42218 #undef __HANDLE_ITEM 43447 #undef __HANDLE_ITEM
42219 }; 43448 };
42220diff -urNp linux-2.6.32.10/include/linux/backlight.h linux-2.6.32.10/include/linux/backlight.h 43449diff -urNp linux-2.6.32.11/include/linux/backlight.h linux-2.6.32.11/include/linux/backlight.h
42221--- linux-2.6.32.10/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400 43450--- linux-2.6.32.11/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400
42222+++ linux-2.6.32.10/include/linux/backlight.h 2010-03-20 15:58:47.152569927 -0400 43451+++ linux-2.6.32.11/include/linux/backlight.h 2010-04-04 20:46:41.673688119 -0400
42223@@ -36,18 +36,18 @@ struct backlight_device; 43452@@ -36,18 +36,18 @@ struct backlight_device;
42224 struct fb_info; 43453 struct fb_info;
42225 43454
@@ -42261,9 +43490,9 @@ diff -urNp linux-2.6.32.10/include/linux/backlight.h linux-2.6.32.10/include/lin
42261 extern void backlight_device_unregister(struct backlight_device *bd); 43490 extern void backlight_device_unregister(struct backlight_device *bd);
42262 extern void backlight_force_update(struct backlight_device *bd, 43491 extern void backlight_force_update(struct backlight_device *bd,
42263 enum backlight_update_reason reason); 43492 enum backlight_update_reason reason);
42264diff -urNp linux-2.6.32.10/include/linux/binfmts.h linux-2.6.32.10/include/linux/binfmts.h 43493diff -urNp linux-2.6.32.11/include/linux/binfmts.h linux-2.6.32.11/include/linux/binfmts.h
42265--- linux-2.6.32.10/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400 43494--- linux-2.6.32.11/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400
42266+++ linux-2.6.32.10/include/linux/binfmts.h 2010-03-20 15:58:47.152569927 -0400 43495+++ linux-2.6.32.11/include/linux/binfmts.h 2010-04-04 20:46:41.673688119 -0400
42267@@ -78,6 +78,7 @@ struct linux_binfmt { 43496@@ -78,6 +78,7 @@ struct linux_binfmt {
42268 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); 43497 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
42269 int (*load_shlib)(struct file *); 43498 int (*load_shlib)(struct file *);
@@ -42272,9 +43501,9 @@ diff -urNp linux-2.6.32.10/include/linux/binfmts.h linux-2.6.32.10/include/linux
42272 unsigned long min_coredump; /* minimal dump size */ 43501 unsigned long min_coredump; /* minimal dump size */
42273 int hasvdso; 43502 int hasvdso;
42274 }; 43503 };
42275diff -urNp linux-2.6.32.10/include/linux/blkdev.h linux-2.6.32.10/include/linux/blkdev.h 43504diff -urNp linux-2.6.32.11/include/linux/blkdev.h linux-2.6.32.11/include/linux/blkdev.h
42276--- linux-2.6.32.10/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400 43505--- linux-2.6.32.11/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400
42277+++ linux-2.6.32.10/include/linux/blkdev.h 2010-03-20 15:58:47.152569927 -0400 43506+++ linux-2.6.32.11/include/linux/blkdev.h 2010-04-04 20:46:41.673688119 -0400
42278@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc 43507@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc
42279 #endif /* CONFIG_BLK_DEV_INTEGRITY */ 43508 #endif /* CONFIG_BLK_DEV_INTEGRITY */
42280 43509
@@ -42306,9 +43535,9 @@ diff -urNp linux-2.6.32.10/include/linux/blkdev.h linux-2.6.32.10/include/linux/
42306 }; 43535 };
42307 43536
42308 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, 43537 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
42309diff -urNp linux-2.6.32.10/include/linux/cache.h linux-2.6.32.10/include/linux/cache.h 43538diff -urNp linux-2.6.32.11/include/linux/cache.h linux-2.6.32.11/include/linux/cache.h
42310--- linux-2.6.32.10/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400 43539--- linux-2.6.32.11/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400
42311+++ linux-2.6.32.10/include/linux/cache.h 2010-03-20 15:58:47.152569927 -0400 43540+++ linux-2.6.32.11/include/linux/cache.h 2010-04-04 20:46:41.673688119 -0400
42312@@ -16,6 +16,10 @@ 43541@@ -16,6 +16,10 @@
42313 #define __read_mostly 43542 #define __read_mostly
42314 #endif 43543 #endif
@@ -42320,9 +43549,9 @@ diff -urNp linux-2.6.32.10/include/linux/cache.h linux-2.6.32.10/include/linux/c
42320 #ifndef ____cacheline_aligned 43549 #ifndef ____cacheline_aligned
42321 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) 43550 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
42322 #endif 43551 #endif
42323diff -urNp linux-2.6.32.10/include/linux/capability.h linux-2.6.32.10/include/linux/capability.h 43552diff -urNp linux-2.6.32.11/include/linux/capability.h linux-2.6.32.11/include/linux/capability.h
42324--- linux-2.6.32.10/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400 43553--- linux-2.6.32.11/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400
42325+++ linux-2.6.32.10/include/linux/capability.h 2010-03-20 15:58:47.152569927 -0400 43554+++ linux-2.6.32.11/include/linux/capability.h 2010-04-04 20:46:41.673688119 -0400
42326@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff 43555@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
42327 (security_real_capable_noaudit((t), (cap)) == 0) 43556 (security_real_capable_noaudit((t), (cap)) == 0)
42328 43557
@@ -42331,9 +43560,9 @@ diff -urNp linux-2.6.32.10/include/linux/capability.h linux-2.6.32.10/include/li
42331 43560
42332 /* audit system wants to get cap info from files as well */ 43561 /* audit system wants to get cap info from files as well */
42333 struct dentry; 43562 struct dentry;
42334diff -urNp linux-2.6.32.10/include/linux/compiler-gcc4.h linux-2.6.32.10/include/linux/compiler-gcc4.h 43563diff -urNp linux-2.6.32.11/include/linux/compiler-gcc4.h linux-2.6.32.11/include/linux/compiler-gcc4.h
42335--- linux-2.6.32.10/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400 43564--- linux-2.6.32.11/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400
42336+++ linux-2.6.32.10/include/linux/compiler-gcc4.h 2010-03-20 15:58:47.152569927 -0400 43565+++ linux-2.6.32.11/include/linux/compiler-gcc4.h 2010-04-04 20:46:41.673688119 -0400
42337@@ -36,4 +36,8 @@ 43566@@ -36,4 +36,8 @@
42338 the kernel context */ 43567 the kernel context */
42339 #define __cold __attribute__((__cold__)) 43568 #define __cold __attribute__((__cold__))
@@ -42343,9 +43572,9 @@ diff -urNp linux-2.6.32.10/include/linux/compiler-gcc4.h linux-2.6.32.10/include
42343+#define __bos0(ptr) __bos((ptr), 0) 43572+#define __bos0(ptr) __bos((ptr), 0)
42344+#define __bos1(ptr) __bos((ptr), 1) 43573+#define __bos1(ptr) __bos((ptr), 1)
42345 #endif 43574 #endif
42346diff -urNp linux-2.6.32.10/include/linux/compiler.h linux-2.6.32.10/include/linux/compiler.h 43575diff -urNp linux-2.6.32.11/include/linux/compiler.h linux-2.6.32.11/include/linux/compiler.h
42347--- linux-2.6.32.10/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400 43576--- linux-2.6.32.11/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400
42348+++ linux-2.6.32.10/include/linux/compiler.h 2010-03-20 15:58:47.152569927 -0400 43577+++ linux-2.6.32.11/include/linux/compiler.h 2010-04-04 20:46:41.673688119 -0400
42349@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ 43578@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
42350 #define __cold 43579 #define __cold
42351 #endif 43580 #endif
@@ -42369,10 +43598,10 @@ diff -urNp linux-2.6.32.10/include/linux/compiler.h linux-2.6.32.10/include/linu
42369 /* Simple shorthand for a section definition */ 43598 /* Simple shorthand for a section definition */
42370 #ifndef __section 43599 #ifndef __section
42371 # define __section(S) __attribute__ ((__section__(#S))) 43600 # define __section(S) __attribute__ ((__section__(#S)))
42372diff -urNp linux-2.6.32.10/include/linux/decompress/mm.h linux-2.6.32.10/include/linux/decompress/mm.h 43601diff -urNp linux-2.6.32.11/include/linux/decompress/mm.h linux-2.6.32.11/include/linux/decompress/mm.h
42373--- linux-2.6.32.10/include/linux/decompress/mm.h 2010-03-15 11:52:04.000000000 -0400 43602--- linux-2.6.32.11/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400
42374+++ linux-2.6.32.10/include/linux/decompress/mm.h 2010-03-20 15:58:47.152569927 -0400 43603+++ linux-2.6.32.11/include/linux/decompress/mm.h 2010-04-04 20:46:41.673688119 -0400
42375@@ -68,7 +68,7 @@ static void free(void *where) 43604@@ -78,7 +78,7 @@ static void free(void *where)
42376 * warnings when not needed (indeed large_malloc / large_free are not 43605 * warnings when not needed (indeed large_malloc / large_free are not
42377 * needed by inflate */ 43606 * needed by inflate */
42378 43607
@@ -42381,9 +43610,9 @@ diff -urNp linux-2.6.32.10/include/linux/decompress/mm.h linux-2.6.32.10/include
42381 #define free(a) kfree(a) 43610 #define free(a) kfree(a)
42382 43611
42383 #define large_malloc(a) vmalloc(a) 43612 #define large_malloc(a) vmalloc(a)
42384diff -urNp linux-2.6.32.10/include/linux/dma-mapping.h linux-2.6.32.10/include/linux/dma-mapping.h 43613diff -urNp linux-2.6.32.11/include/linux/dma-mapping.h linux-2.6.32.11/include/linux/dma-mapping.h
42385--- linux-2.6.32.10/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 43614--- linux-2.6.32.11/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
42386+++ linux-2.6.32.10/include/linux/dma-mapping.h 2010-03-20 15:58:47.152569927 -0400 43615+++ linux-2.6.32.11/include/linux/dma-mapping.h 2010-04-04 20:46:41.673688119 -0400
42387@@ -16,50 +16,50 @@ enum dma_data_direction { 43616@@ -16,50 +16,50 @@ enum dma_data_direction {
42388 }; 43617 };
42389 43618
@@ -42450,9 +43679,9 @@ diff -urNp linux-2.6.32.10/include/linux/dma-mapping.h linux-2.6.32.10/include/l
42450 }; 43679 };
42451 43680
42452 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) 43681 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
42453diff -urNp linux-2.6.32.10/include/linux/dst.h linux-2.6.32.10/include/linux/dst.h 43682diff -urNp linux-2.6.32.11/include/linux/dst.h linux-2.6.32.11/include/linux/dst.h
42454--- linux-2.6.32.10/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400 43683--- linux-2.6.32.11/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400
42455+++ linux-2.6.32.10/include/linux/dst.h 2010-03-20 15:58:47.152569927 -0400 43684+++ linux-2.6.32.11/include/linux/dst.h 2010-04-04 20:46:41.673688119 -0400
42456@@ -380,7 +380,7 @@ struct dst_node 43685@@ -380,7 +380,7 @@ struct dst_node
42457 struct thread_pool *pool; 43686 struct thread_pool *pool;
42458 43687
@@ -42462,9 +43691,9 @@ diff -urNp linux-2.6.32.10/include/linux/dst.h linux-2.6.32.10/include/linux/dst
42462 43691
42463 /* 43692 /*
42464 * How frequently and how many times transaction 43693 * How frequently and how many times transaction
42465diff -urNp linux-2.6.32.10/include/linux/elf.h linux-2.6.32.10/include/linux/elf.h 43694diff -urNp linux-2.6.32.11/include/linux/elf.h linux-2.6.32.11/include/linux/elf.h
42466--- linux-2.6.32.10/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400 43695--- linux-2.6.32.11/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400
42467+++ linux-2.6.32.10/include/linux/elf.h 2010-03-20 15:58:47.152569927 -0400 43696+++ linux-2.6.32.11/include/linux/elf.h 2010-04-04 20:46:41.673688119 -0400
42468@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; 43697@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
42469 #define PT_GNU_EH_FRAME 0x6474e550 43698 #define PT_GNU_EH_FRAME 0x6474e550
42470 43699
@@ -42537,9 +43766,9 @@ diff -urNp linux-2.6.32.10/include/linux/elf.h linux-2.6.32.10/include/linux/elf
42537 43766
42538 #endif 43767 #endif
42539 43768
42540diff -urNp linux-2.6.32.10/include/linux/fs.h linux-2.6.32.10/include/linux/fs.h 43769diff -urNp linux-2.6.32.11/include/linux/fs.h linux-2.6.32.11/include/linux/fs.h
42541--- linux-2.6.32.10/include/linux/fs.h 2010-03-15 11:52:04.000000000 -0400 43770--- linux-2.6.32.11/include/linux/fs.h 2010-03-15 11:52:04.000000000 -0400
42542+++ linux-2.6.32.10/include/linux/fs.h 2010-03-20 16:00:19.024739237 -0400 43771+++ linux-2.6.32.11/include/linux/fs.h 2010-04-04 20:46:41.677383221 -0400
42543@@ -90,6 +90,11 @@ struct inodes_stat_t { 43772@@ -90,6 +90,11 @@ struct inodes_stat_t {
42544 /* Expect random access pattern */ 43773 /* Expect random access pattern */
42545 #define FMODE_RANDOM ((__force fmode_t)4096) 43774 #define FMODE_RANDOM ((__force fmode_t)4096)
@@ -42701,9 +43930,9 @@ diff -urNp linux-2.6.32.10/include/linux/fs.h linux-2.6.32.10/include/linux/fs.h
42701 }; 43930 };
42702 43931
42703 /* 43932 /*
42704diff -urNp linux-2.6.32.10/include/linux/fs_struct.h linux-2.6.32.10/include/linux/fs_struct.h 43933diff -urNp linux-2.6.32.11/include/linux/fs_struct.h linux-2.6.32.11/include/linux/fs_struct.h
42705--- linux-2.6.32.10/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400 43934--- linux-2.6.32.11/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400
42706+++ linux-2.6.32.10/include/linux/fs_struct.h 2010-03-20 15:58:47.158060906 -0400 43935+++ linux-2.6.32.11/include/linux/fs_struct.h 2010-04-04 20:46:41.677383221 -0400
42707@@ -4,7 +4,7 @@ 43936@@ -4,7 +4,7 @@
42708 #include <linux/path.h> 43937 #include <linux/path.h>
42709 43938
@@ -42713,9 +43942,9 @@ diff -urNp linux-2.6.32.10/include/linux/fs_struct.h linux-2.6.32.10/include/lin
42713 rwlock_t lock; 43942 rwlock_t lock;
42714 int umask; 43943 int umask;
42715 int in_exec; 43944 int in_exec;
42716diff -urNp linux-2.6.32.10/include/linux/genhd.h linux-2.6.32.10/include/linux/genhd.h 43945diff -urNp linux-2.6.32.11/include/linux/genhd.h linux-2.6.32.11/include/linux/genhd.h
42717--- linux-2.6.32.10/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400 43946--- linux-2.6.32.11/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400
42718+++ linux-2.6.32.10/include/linux/genhd.h 2010-03-20 15:58:47.158060906 -0400 43947+++ linux-2.6.32.11/include/linux/genhd.h 2010-04-04 20:46:41.677383221 -0400
42719@@ -161,7 +161,7 @@ struct gendisk { 43948@@ -161,7 +161,7 @@ struct gendisk {
42720 43949
42721 struct timer_rand_state *random; 43950 struct timer_rand_state *random;
@@ -42725,9 +43954,9 @@ diff -urNp linux-2.6.32.10/include/linux/genhd.h linux-2.6.32.10/include/linux/g
42725 struct work_struct async_notify; 43954 struct work_struct async_notify;
42726 #ifdef CONFIG_BLK_DEV_INTEGRITY 43955 #ifdef CONFIG_BLK_DEV_INTEGRITY
42727 struct blk_integrity *integrity; 43956 struct blk_integrity *integrity;
42728diff -urNp linux-2.6.32.10/include/linux/gracl.h linux-2.6.32.10/include/linux/gracl.h 43957diff -urNp linux-2.6.32.11/include/linux/gracl.h linux-2.6.32.11/include/linux/gracl.h
42729--- linux-2.6.32.10/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 43958--- linux-2.6.32.11/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
42730+++ linux-2.6.32.10/include/linux/gracl.h 2010-03-20 15:58:47.158060906 -0400 43959+++ linux-2.6.32.11/include/linux/gracl.h 2010-04-04 20:46:41.677383221 -0400
42731@@ -0,0 +1,309 @@ 43960@@ -0,0 +1,309 @@
42732+#ifndef GR_ACL_H 43961+#ifndef GR_ACL_H
42733+#define GR_ACL_H 43962+#define GR_ACL_H
@@ -43038,9 +44267,9 @@ diff -urNp linux-2.6.32.10/include/linux/gracl.h linux-2.6.32.10/include/linux/g
43038+ 44267+
43039+#endif 44268+#endif
43040+ 44269+
43041diff -urNp linux-2.6.32.10/include/linux/gralloc.h linux-2.6.32.10/include/linux/gralloc.h 44270diff -urNp linux-2.6.32.11/include/linux/gralloc.h linux-2.6.32.11/include/linux/gralloc.h
43042--- linux-2.6.32.10/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 44271--- linux-2.6.32.11/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
43043+++ linux-2.6.32.10/include/linux/gralloc.h 2010-03-20 15:58:47.158060906 -0400 44272+++ linux-2.6.32.11/include/linux/gralloc.h 2010-04-04 20:46:41.677383221 -0400
43044@@ -0,0 +1,9 @@ 44273@@ -0,0 +1,9 @@
43045+#ifndef __GRALLOC_H 44274+#ifndef __GRALLOC_H
43046+#define __GRALLOC_H 44275+#define __GRALLOC_H
@@ -43051,9 +44280,9 @@ diff -urNp linux-2.6.32.10/include/linux/gralloc.h linux-2.6.32.10/include/linux
43051+void *acl_alloc_num(unsigned long num, unsigned long len); 44280+void *acl_alloc_num(unsigned long num, unsigned long len);
43052+ 44281+
43053+#endif 44282+#endif
43054diff -urNp linux-2.6.32.10/include/linux/grdefs.h linux-2.6.32.10/include/linux/grdefs.h 44283diff -urNp linux-2.6.32.11/include/linux/grdefs.h linux-2.6.32.11/include/linux/grdefs.h
43055--- linux-2.6.32.10/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 44284--- linux-2.6.32.11/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
43056+++ linux-2.6.32.10/include/linux/grdefs.h 2010-03-20 15:58:47.158060906 -0400 44285+++ linux-2.6.32.11/include/linux/grdefs.h 2010-04-04 20:46:41.677383221 -0400
43057@@ -0,0 +1,136 @@ 44286@@ -0,0 +1,136 @@
43058+#ifndef GRDEFS_H 44287+#ifndef GRDEFS_H
43059+#define GRDEFS_H 44288+#define GRDEFS_H
@@ -43191,9 +44420,9 @@ diff -urNp linux-2.6.32.10/include/linux/grdefs.h linux-2.6.32.10/include/linux/
43191+}; 44420+};
43192+ 44421+
43193+#endif 44422+#endif
43194diff -urNp linux-2.6.32.10/include/linux/grinternal.h linux-2.6.32.10/include/linux/grinternal.h 44423diff -urNp linux-2.6.32.11/include/linux/grinternal.h linux-2.6.32.11/include/linux/grinternal.h
43195--- linux-2.6.32.10/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 44424--- linux-2.6.32.11/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
43196+++ linux-2.6.32.10/include/linux/grinternal.h 2010-03-20 17:35:36.571019099 -0400 44425+++ linux-2.6.32.11/include/linux/grinternal.h 2010-04-04 20:46:41.677383221 -0400
43197@@ -0,0 +1,215 @@ 44426@@ -0,0 +1,215 @@
43198+#ifndef __GRINTERNAL_H 44427+#ifndef __GRINTERNAL_H
43199+#define __GRINTERNAL_H 44428+#define __GRINTERNAL_H
@@ -43410,9 +44639,9 @@ diff -urNp linux-2.6.32.10/include/linux/grinternal.h linux-2.6.32.10/include/li
43410+#endif 44639+#endif
43411+ 44640+
43412+#endif 44641+#endif
43413diff -urNp linux-2.6.32.10/include/linux/grmsg.h linux-2.6.32.10/include/linux/grmsg.h 44642diff -urNp linux-2.6.32.11/include/linux/grmsg.h linux-2.6.32.11/include/linux/grmsg.h
43414--- linux-2.6.32.10/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 44643--- linux-2.6.32.11/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
43415+++ linux-2.6.32.10/include/linux/grmsg.h 2010-03-20 16:57:07.112591863 -0400 44644+++ linux-2.6.32.11/include/linux/grmsg.h 2010-04-04 20:46:41.677383221 -0400
43416@@ -0,0 +1,107 @@ 44645@@ -0,0 +1,107 @@
43417+#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" 44646+#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"
43418+#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" 44647+#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"
@@ -43521,9 +44750,9 @@ diff -urNp linux-2.6.32.10/include/linux/grmsg.h linux-2.6.32.10/include/linux/g
43521+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " 44750+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
43522+#define GR_VM86_MSG "denied use of vm86 by " 44751+#define GR_VM86_MSG "denied use of vm86 by "
43523+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " 44752+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
43524diff -urNp linux-2.6.32.10/include/linux/grsecurity.h linux-2.6.32.10/include/linux/grsecurity.h 44753diff -urNp linux-2.6.32.11/include/linux/grsecurity.h linux-2.6.32.11/include/linux/grsecurity.h
43525--- linux-2.6.32.10/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 44754--- linux-2.6.32.11/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
43526+++ linux-2.6.32.10/include/linux/grsecurity.h 2010-03-20 16:38:55.149896257 -0400 44755+++ linux-2.6.32.11/include/linux/grsecurity.h 2010-04-04 20:46:41.677383221 -0400
43527@@ -0,0 +1,199 @@ 44756@@ -0,0 +1,199 @@
43528+#ifndef GR_SECURITY_H 44757+#ifndef GR_SECURITY_H
43529+#define GR_SECURITY_H 44758+#define GR_SECURITY_H
@@ -43724,9 +44953,9 @@ diff -urNp linux-2.6.32.10/include/linux/grsecurity.h linux-2.6.32.10/include/li
43724+#endif 44953+#endif
43725+ 44954+
43726+#endif 44955+#endif
43727diff -urNp linux-2.6.32.10/include/linux/hdpu_features.h linux-2.6.32.10/include/linux/hdpu_features.h 44956diff -urNp linux-2.6.32.11/include/linux/hdpu_features.h linux-2.6.32.11/include/linux/hdpu_features.h
43728--- linux-2.6.32.10/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400 44957--- linux-2.6.32.11/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400
43729+++ linux-2.6.32.10/include/linux/hdpu_features.h 2010-03-20 15:58:47.158060906 -0400 44958+++ linux-2.6.32.11/include/linux/hdpu_features.h 2010-04-04 20:46:41.677383221 -0400
43730@@ -3,7 +3,7 @@ 44959@@ -3,7 +3,7 @@
43731 struct cpustate_t { 44960 struct cpustate_t {
43732 spinlock_t lock; 44961 spinlock_t lock;
@@ -43736,9 +44965,9 @@ diff -urNp linux-2.6.32.10/include/linux/hdpu_features.h linux-2.6.32.10/include
43736 unsigned char cached_val; 44965 unsigned char cached_val;
43737 int inited; 44966 int inited;
43738 unsigned long *set_addr; 44967 unsigned long *set_addr;
43739diff -urNp linux-2.6.32.10/include/linux/highmem.h linux-2.6.32.10/include/linux/highmem.h 44968diff -urNp linux-2.6.32.11/include/linux/highmem.h linux-2.6.32.11/include/linux/highmem.h
43740--- linux-2.6.32.10/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400 44969--- linux-2.6.32.11/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400
43741+++ linux-2.6.32.10/include/linux/highmem.h 2010-03-20 15:58:47.158060906 -0400 44970+++ linux-2.6.32.11/include/linux/highmem.h 2010-04-04 20:46:41.677383221 -0400
43742@@ -137,6 +137,18 @@ static inline void clear_highpage(struct 44971@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
43743 kunmap_atomic(kaddr, KM_USER0); 44972 kunmap_atomic(kaddr, KM_USER0);
43744 } 44973 }
@@ -43758,9 +44987,9 @@ diff -urNp linux-2.6.32.10/include/linux/highmem.h linux-2.6.32.10/include/linux
43758 static inline void zero_user_segments(struct page *page, 44987 static inline void zero_user_segments(struct page *page,
43759 unsigned start1, unsigned end1, 44988 unsigned start1, unsigned end1,
43760 unsigned start2, unsigned end2) 44989 unsigned start2, unsigned end2)
43761diff -urNp linux-2.6.32.10/include/linux/init_task.h linux-2.6.32.10/include/linux/init_task.h 44990diff -urNp linux-2.6.32.11/include/linux/init_task.h linux-2.6.32.11/include/linux/init_task.h
43762--- linux-2.6.32.10/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400 44991--- linux-2.6.32.11/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400
43763+++ linux-2.6.32.10/include/linux/init_task.h 2010-03-20 15:58:47.158060906 -0400 44992+++ linux-2.6.32.11/include/linux/init_task.h 2010-04-04 20:46:41.677383221 -0400
43764@@ -115,6 +115,13 @@ extern struct cred init_cred; 44993@@ -115,6 +115,13 @@ extern struct cred init_cred;
43765 # define INIT_PERF_EVENTS(tsk) 44994 # define INIT_PERF_EVENTS(tsk)
43766 #endif 44995 #endif
@@ -43783,9 +45012,9 @@ diff -urNp linux-2.6.32.10/include/linux/init_task.h linux-2.6.32.10/include/lin
43783 } 45012 }
43784 45013
43785 45014
43786diff -urNp linux-2.6.32.10/include/linux/interrupt.h linux-2.6.32.10/include/linux/interrupt.h 45015diff -urNp linux-2.6.32.11/include/linux/interrupt.h linux-2.6.32.11/include/linux/interrupt.h
43787--- linux-2.6.32.10/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400 45016--- linux-2.6.32.11/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400
43788+++ linux-2.6.32.10/include/linux/interrupt.h 2010-03-20 15:58:47.158060906 -0400 45017+++ linux-2.6.32.11/include/linux/interrupt.h 2010-04-04 20:46:41.677383221 -0400
43789@@ -357,7 +357,7 @@ enum 45018@@ -357,7 +357,7 @@ enum
43790 /* map softirq index to softirq name. update 'softirq_to_name' in 45019 /* map softirq index to softirq name. update 'softirq_to_name' in
43791 * kernel/softirq.c when adding a new softirq. 45020 * kernel/softirq.c when adding a new softirq.
@@ -43810,9 +45039,9 @@ diff -urNp linux-2.6.32.10/include/linux/interrupt.h linux-2.6.32.10/include/lin
43810 extern void softirq_init(void); 45039 extern void softirq_init(void);
43811 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) 45040 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
43812 extern void raise_softirq_irqoff(unsigned int nr); 45041 extern void raise_softirq_irqoff(unsigned int nr);
43813diff -urNp linux-2.6.32.10/include/linux/jbd2.h linux-2.6.32.10/include/linux/jbd2.h 45042diff -urNp linux-2.6.32.11/include/linux/jbd2.h linux-2.6.32.11/include/linux/jbd2.h
43814--- linux-2.6.32.10/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400 45043--- linux-2.6.32.11/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400
43815+++ linux-2.6.32.10/include/linux/jbd2.h 2010-03-20 15:58:47.160547125 -0400 45044+++ linux-2.6.32.11/include/linux/jbd2.h 2010-04-04 20:46:41.677383221 -0400
43816@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; 45045@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
43817 } \ 45046 } \
43818 } while (0) 45047 } while (0)
@@ -43822,9 +45051,9 @@ diff -urNp linux-2.6.32.10/include/linux/jbd2.h linux-2.6.32.10/include/linux/jb
43822 #endif 45051 #endif
43823 45052
43824 static inline void *jbd2_alloc(size_t size, gfp_t flags) 45053 static inline void *jbd2_alloc(size_t size, gfp_t flags)
43825diff -urNp linux-2.6.32.10/include/linux/jbd.h linux-2.6.32.10/include/linux/jbd.h 45054diff -urNp linux-2.6.32.11/include/linux/jbd.h linux-2.6.32.11/include/linux/jbd.h
43826--- linux-2.6.32.10/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400 45055--- linux-2.6.32.11/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400
43827+++ linux-2.6.32.10/include/linux/jbd.h 2010-03-20 15:58:47.160547125 -0400 45056+++ linux-2.6.32.11/include/linux/jbd.h 2010-04-04 20:46:41.677383221 -0400
43828@@ -66,7 +66,7 @@ extern u8 journal_enable_debug; 45057@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
43829 } \ 45058 } \
43830 } while (0) 45059 } while (0)
@@ -43834,9 +45063,9 @@ diff -urNp linux-2.6.32.10/include/linux/jbd.h linux-2.6.32.10/include/linux/jbd
43834 #endif 45063 #endif
43835 45064
43836 static inline void *jbd_alloc(size_t size, gfp_t flags) 45065 static inline void *jbd_alloc(size_t size, gfp_t flags)
43837diff -urNp linux-2.6.32.10/include/linux/kallsyms.h linux-2.6.32.10/include/linux/kallsyms.h 45066diff -urNp linux-2.6.32.11/include/linux/kallsyms.h linux-2.6.32.11/include/linux/kallsyms.h
43838--- linux-2.6.32.10/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400 45067--- linux-2.6.32.11/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400
43839+++ linux-2.6.32.10/include/linux/kallsyms.h 2010-03-20 15:58:47.160547125 -0400 45068+++ linux-2.6.32.11/include/linux/kallsyms.h 2010-04-04 20:46:41.677383221 -0400
43840@@ -15,7 +15,8 @@ 45069@@ -15,7 +15,8 @@
43841 45070
43842 struct module; 45071 struct module;
@@ -43857,9 +45086,9 @@ diff -urNp linux-2.6.32.10/include/linux/kallsyms.h linux-2.6.32.10/include/linu
43857 45086
43858 /* This macro allows us to keep printk typechecking */ 45087 /* This macro allows us to keep printk typechecking */
43859 static void __check_printsym_format(const char *fmt, ...) 45088 static void __check_printsym_format(const char *fmt, ...)
43860diff -urNp linux-2.6.32.10/include/linux/kgdb.h linux-2.6.32.10/include/linux/kgdb.h 45089diff -urNp linux-2.6.32.11/include/linux/kgdb.h linux-2.6.32.11/include/linux/kgdb.h
43861--- linux-2.6.32.10/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400 45090--- linux-2.6.32.11/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400
43862+++ linux-2.6.32.10/include/linux/kgdb.h 2010-03-20 15:58:47.160547125 -0400 45091+++ linux-2.6.32.11/include/linux/kgdb.h 2010-04-04 20:46:41.677383221 -0400
43863@@ -251,20 +251,20 @@ struct kgdb_arch { 45092@@ -251,20 +251,20 @@ struct kgdb_arch {
43864 */ 45093 */
43865 struct kgdb_io { 45094 struct kgdb_io {
@@ -43890,9 +45119,9 @@ diff -urNp linux-2.6.32.10/include/linux/kgdb.h linux-2.6.32.10/include/linux/kg
43890 45119
43891 extern int kgdb_hex2long(char **ptr, unsigned long *long_val); 45120 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
43892 extern int kgdb_mem2hex(char *mem, char *buf, int count); 45121 extern int kgdb_mem2hex(char *mem, char *buf, int count);
43893diff -urNp linux-2.6.32.10/include/linux/kobject.h linux-2.6.32.10/include/linux/kobject.h 45122diff -urNp linux-2.6.32.11/include/linux/kobject.h linux-2.6.32.11/include/linux/kobject.h
43894--- linux-2.6.32.10/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400 45123--- linux-2.6.32.11/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400
43895+++ linux-2.6.32.10/include/linux/kobject.h 2010-03-20 15:58:47.160547125 -0400 45124+++ linux-2.6.32.11/include/linux/kobject.h 2010-04-04 20:46:41.677383221 -0400
43896@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob 45125@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
43897 45126
43898 struct kobj_type { 45127 struct kobj_type {
@@ -43941,9 +45170,9 @@ diff -urNp linux-2.6.32.10/include/linux/kobject.h linux-2.6.32.10/include/linux
43941 struct kobject *parent_kobj); 45170 struct kobject *parent_kobj);
43942 45171
43943 static inline struct kset *to_kset(struct kobject *kobj) 45172 static inline struct kset *to_kset(struct kobject *kobj)
43944diff -urNp linux-2.6.32.10/include/linux/kvm_host.h linux-2.6.32.10/include/linux/kvm_host.h 45173diff -urNp linux-2.6.32.11/include/linux/kvm_host.h linux-2.6.32.11/include/linux/kvm_host.h
43945--- linux-2.6.32.10/include/linux/kvm_host.h 2010-03-15 11:52:04.000000000 -0400 45174--- linux-2.6.32.11/include/linux/kvm_host.h 2010-03-15 11:52:04.000000000 -0400
43946+++ linux-2.6.32.10/include/linux/kvm_host.h 2010-03-20 15:58:47.160547125 -0400 45175+++ linux-2.6.32.11/include/linux/kvm_host.h 2010-04-04 20:46:41.677383221 -0400
43947@@ -205,7 +205,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc 45176@@ -205,7 +205,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
43948 void vcpu_load(struct kvm_vcpu *vcpu); 45177 void vcpu_load(struct kvm_vcpu *vcpu);
43949 void vcpu_put(struct kvm_vcpu *vcpu); 45178 void vcpu_put(struct kvm_vcpu *vcpu);
@@ -43962,9 +45191,9 @@ diff -urNp linux-2.6.32.10/include/linux/kvm_host.h linux-2.6.32.10/include/linu
43962 void kvm_arch_exit(void); 45191 void kvm_arch_exit(void);
43963 45192
43964 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); 45193 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
43965diff -urNp linux-2.6.32.10/include/linux/libata.h linux-2.6.32.10/include/linux/libata.h 45194diff -urNp linux-2.6.32.11/include/linux/libata.h linux-2.6.32.11/include/linux/libata.h
43966--- linux-2.6.32.10/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400 45195--- linux-2.6.32.11/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400
43967+++ linux-2.6.32.10/include/linux/libata.h 2010-03-20 15:58:47.160547125 -0400 45196+++ linux-2.6.32.11/include/linux/libata.h 2010-04-04 20:46:41.677383221 -0400
43968@@ -64,11 +64,11 @@ 45197@@ -64,11 +64,11 @@
43969 #ifdef ATA_VERBOSE_DEBUG 45198 #ifdef ATA_VERBOSE_DEBUG
43970 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) 45199 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -44030,9 +45259,9 @@ diff -urNp linux-2.6.32.10/include/linux/libata.h linux-2.6.32.10/include/linux/
44030 extern int ata_scsi_detect(struct scsi_host_template *sht); 45259 extern int ata_scsi_detect(struct scsi_host_template *sht);
44031 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); 45260 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
44032 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); 45261 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
44033diff -urNp linux-2.6.32.10/include/linux/lockd/bind.h linux-2.6.32.10/include/linux/lockd/bind.h 45262diff -urNp linux-2.6.32.11/include/linux/lockd/bind.h linux-2.6.32.11/include/linux/lockd/bind.h
44034--- linux-2.6.32.10/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400 45263--- linux-2.6.32.11/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400
44035+++ linux-2.6.32.10/include/linux/lockd/bind.h 2010-03-20 15:58:47.160547125 -0400 45264+++ linux-2.6.32.11/include/linux/lockd/bind.h 2010-04-04 20:46:41.681061354 -0400
44036@@ -23,13 +23,13 @@ struct svc_rqst; 45265@@ -23,13 +23,13 @@ struct svc_rqst;
44037 * This is the set of functions for lockd->nfsd communication 45266 * This is the set of functions for lockd->nfsd communication
44038 */ 45267 */
@@ -44050,9 +45279,9 @@ diff -urNp linux-2.6.32.10/include/linux/lockd/bind.h linux-2.6.32.10/include/li
44050 45279
44051 /* 45280 /*
44052 * Similar to nfs_client_initdata, but without the NFS-specific 45281 * Similar to nfs_client_initdata, but without the NFS-specific
44053diff -urNp linux-2.6.32.10/include/linux/mm.h linux-2.6.32.10/include/linux/mm.h 45282diff -urNp linux-2.6.32.11/include/linux/mm.h linux-2.6.32.11/include/linux/mm.h
44054--- linux-2.6.32.10/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400 45283--- linux-2.6.32.11/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400
44055+++ linux-2.6.32.10/include/linux/mm.h 2010-03-20 15:58:47.160547125 -0400 45284+++ linux-2.6.32.11/include/linux/mm.h 2010-04-04 20:46:41.681061354 -0400
44056@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void 45285@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void
44057 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ 45286 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
44058 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ 45287 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
@@ -44115,9 +45344,9 @@ diff -urNp linux-2.6.32.10/include/linux/mm.h linux-2.6.32.10/include/linux/mm.h
44115 45344
44116 #endif /* __KERNEL__ */ 45345 #endif /* __KERNEL__ */
44117 #endif /* _LINUX_MM_H */ 45346 #endif /* _LINUX_MM_H */
44118diff -urNp linux-2.6.32.10/include/linux/mm_types.h linux-2.6.32.10/include/linux/mm_types.h 45347diff -urNp linux-2.6.32.11/include/linux/mm_types.h linux-2.6.32.11/include/linux/mm_types.h
44119--- linux-2.6.32.10/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400 45348--- linux-2.6.32.11/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400
44120+++ linux-2.6.32.10/include/linux/mm_types.h 2010-03-20 15:58:47.160547125 -0400 45349+++ linux-2.6.32.11/include/linux/mm_types.h 2010-04-04 20:46:41.681061354 -0400
44121@@ -186,6 +186,8 @@ struct vm_area_struct { 45350@@ -186,6 +186,8 @@ struct vm_area_struct {
44122 #ifdef CONFIG_NUMA 45351 #ifdef CONFIG_NUMA
44123 struct mempolicy *vm_policy; /* NUMA policy for the VMA */ 45352 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -44152,9 +45381,9 @@ diff -urNp linux-2.6.32.10/include/linux/mm_types.h linux-2.6.32.10/include/linu
44152 }; 45381 };
44153 45382
44154 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ 45383 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
44155diff -urNp linux-2.6.32.10/include/linux/mmu_notifier.h linux-2.6.32.10/include/linux/mmu_notifier.h 45384diff -urNp linux-2.6.32.11/include/linux/mmu_notifier.h linux-2.6.32.11/include/linux/mmu_notifier.h
44156--- linux-2.6.32.10/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400 45385--- linux-2.6.32.11/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400
44157+++ linux-2.6.32.10/include/linux/mmu_notifier.h 2010-03-20 15:58:47.160547125 -0400 45386+++ linux-2.6.32.11/include/linux/mmu_notifier.h 2010-04-04 20:46:41.681061354 -0400
44158@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr 45387@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
44159 */ 45388 */
44160 #define ptep_clear_flush_notify(__vma, __address, __ptep) \ 45389 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -44171,9 +45400,9 @@ diff -urNp linux-2.6.32.10/include/linux/mmu_notifier.h linux-2.6.32.10/include/
44171 }) 45400 })
44172 45401
44173 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ 45402 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
44174diff -urNp linux-2.6.32.10/include/linux/mod_devicetable.h linux-2.6.32.10/include/linux/mod_devicetable.h 45403diff -urNp linux-2.6.32.11/include/linux/mod_devicetable.h linux-2.6.32.11/include/linux/mod_devicetable.h
44175--- linux-2.6.32.10/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400 45404--- linux-2.6.32.11/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400
44176+++ linux-2.6.32.10/include/linux/mod_devicetable.h 2010-03-20 15:58:47.160547125 -0400 45405+++ linux-2.6.32.11/include/linux/mod_devicetable.h 2010-04-04 20:46:41.681061354 -0400
44177@@ -12,7 +12,7 @@ 45406@@ -12,7 +12,7 @@
44178 typedef unsigned long kernel_ulong_t; 45407 typedef unsigned long kernel_ulong_t;
44179 #endif 45408 #endif
@@ -44192,9 +45421,9 @@ diff -urNp linux-2.6.32.10/include/linux/mod_devicetable.h linux-2.6.32.10/inclu
44192 45421
44193 struct hid_device_id { 45422 struct hid_device_id {
44194 __u16 bus; 45423 __u16 bus;
44195diff -urNp linux-2.6.32.10/include/linux/module.h linux-2.6.32.10/include/linux/module.h 45424diff -urNp linux-2.6.32.11/include/linux/module.h linux-2.6.32.11/include/linux/module.h
44196--- linux-2.6.32.10/include/linux/module.h 2010-03-15 11:52:04.000000000 -0400 45425--- linux-2.6.32.11/include/linux/module.h 2010-03-15 11:52:04.000000000 -0400
44197+++ linux-2.6.32.10/include/linux/module.h 2010-03-20 15:58:47.160547125 -0400 45426+++ linux-2.6.32.11/include/linux/module.h 2010-04-04 20:46:41.681061354 -0400
44198@@ -287,16 +287,16 @@ struct module 45427@@ -287,16 +287,16 @@ struct module
44199 int (*init)(void); 45428 int (*init)(void);
44200 45429
@@ -44267,9 +45496,9 @@ diff -urNp linux-2.6.32.10/include/linux/module.h linux-2.6.32.10/include/linux/
44267 } 45496 }
44268 45497
44269 /* Search for module by name: must hold module_mutex. */ 45498 /* Search for module by name: must hold module_mutex. */
44270diff -urNp linux-2.6.32.10/include/linux/moduleloader.h linux-2.6.32.10/include/linux/moduleloader.h 45499diff -urNp linux-2.6.32.11/include/linux/moduleloader.h linux-2.6.32.11/include/linux/moduleloader.h
44271--- linux-2.6.32.10/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400 45500--- linux-2.6.32.11/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400
44272+++ linux-2.6.32.10/include/linux/moduleloader.h 2010-03-20 15:58:47.160547125 -0400 45501+++ linux-2.6.32.11/include/linux/moduleloader.h 2010-04-04 20:46:41.681061354 -0400
44273@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st 45502@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
44274 sections. Returns NULL on failure. */ 45503 sections. Returns NULL on failure. */
44275 void *module_alloc(unsigned long size); 45504 void *module_alloc(unsigned long size);
@@ -44292,9 +45521,9 @@ diff -urNp linux-2.6.32.10/include/linux/moduleloader.h linux-2.6.32.10/include/
44292 /* Apply the given relocation to the (simplified) ELF. Return -error 45521 /* Apply the given relocation to the (simplified) ELF. Return -error
44293 or 0. */ 45522 or 0. */
44294 int apply_relocate(Elf_Shdr *sechdrs, 45523 int apply_relocate(Elf_Shdr *sechdrs,
44295diff -urNp linux-2.6.32.10/include/linux/namei.h linux-2.6.32.10/include/linux/namei.h 45524diff -urNp linux-2.6.32.11/include/linux/namei.h linux-2.6.32.11/include/linux/namei.h
44296--- linux-2.6.32.10/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400 45525--- linux-2.6.32.11/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400
44297+++ linux-2.6.32.10/include/linux/namei.h 2010-03-20 15:58:47.160547125 -0400 45526+++ linux-2.6.32.11/include/linux/namei.h 2010-04-04 20:46:41.681061354 -0400
44298@@ -22,7 +22,7 @@ struct nameidata { 45527@@ -22,7 +22,7 @@ struct nameidata {
44299 unsigned int flags; 45528 unsigned int flags;
44300 int last_type; 45529 int last_type;
@@ -44319,9 +45548,9 @@ diff -urNp linux-2.6.32.10/include/linux/namei.h linux-2.6.32.10/include/linux/n
44319 { 45548 {
44320 return nd->saved_names[nd->depth]; 45549 return nd->saved_names[nd->depth];
44321 } 45550 }
44322diff -urNp linux-2.6.32.10/include/linux/nodemask.h linux-2.6.32.10/include/linux/nodemask.h 45551diff -urNp linux-2.6.32.11/include/linux/nodemask.h linux-2.6.32.11/include/linux/nodemask.h
44323--- linux-2.6.32.10/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400 45552--- linux-2.6.32.11/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400
44324+++ linux-2.6.32.10/include/linux/nodemask.h 2010-03-20 15:58:47.160547125 -0400 45553+++ linux-2.6.32.11/include/linux/nodemask.h 2010-04-04 20:46:41.681061354 -0400
44325@@ -464,11 +464,11 @@ static inline int num_node_state(enum no 45554@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
44326 45555
44327 #define any_online_node(mask) \ 45556 #define any_online_node(mask) \
@@ -44338,9 +45567,9 @@ diff -urNp linux-2.6.32.10/include/linux/nodemask.h linux-2.6.32.10/include/linu
44338 }) 45567 })
44339 45568
44340 #define num_online_nodes() num_node_state(N_ONLINE) 45569 #define num_online_nodes() num_node_state(N_ONLINE)
44341diff -urNp linux-2.6.32.10/include/linux/oprofile.h linux-2.6.32.10/include/linux/oprofile.h 45570diff -urNp linux-2.6.32.11/include/linux/oprofile.h linux-2.6.32.11/include/linux/oprofile.h
44342--- linux-2.6.32.10/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400 45571--- linux-2.6.32.11/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400
44343+++ linux-2.6.32.10/include/linux/oprofile.h 2010-03-20 15:58:47.160547125 -0400 45572+++ linux-2.6.32.11/include/linux/oprofile.h 2010-04-04 20:46:41.681061354 -0400
44344@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super 45573@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
44345 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, 45574 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
44346 char const * name, ulong * val); 45575 char const * name, ulong * val);
@@ -44353,9 +45582,9 @@ diff -urNp linux-2.6.32.10/include/linux/oprofile.h linux-2.6.32.10/include/linu
44353 45582
44354 /** create a directory */ 45583 /** create a directory */
44355 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, 45584 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
44356diff -urNp linux-2.6.32.10/include/linux/pipe_fs_i.h linux-2.6.32.10/include/linux/pipe_fs_i.h 45585diff -urNp linux-2.6.32.11/include/linux/pipe_fs_i.h linux-2.6.32.11/include/linux/pipe_fs_i.h
44357--- linux-2.6.32.10/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400 45586--- linux-2.6.32.11/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400
44358+++ linux-2.6.32.10/include/linux/pipe_fs_i.h 2010-03-20 15:58:47.160547125 -0400 45587+++ linux-2.6.32.11/include/linux/pipe_fs_i.h 2010-04-04 20:46:41.681061354 -0400
44359@@ -46,9 +46,9 @@ struct pipe_inode_info { 45588@@ -46,9 +46,9 @@ struct pipe_inode_info {
44360 wait_queue_head_t wait; 45589 wait_queue_head_t wait;
44361 unsigned int nrbufs, curbuf; 45590 unsigned int nrbufs, curbuf;
@@ -44369,9 +45598,9 @@ diff -urNp linux-2.6.32.10/include/linux/pipe_fs_i.h linux-2.6.32.10/include/lin
44369 unsigned int r_counter; 45598 unsigned int r_counter;
44370 unsigned int w_counter; 45599 unsigned int w_counter;
44371 struct fasync_struct *fasync_readers; 45600 struct fasync_struct *fasync_readers;
44372diff -urNp linux-2.6.32.10/include/linux/poison.h linux-2.6.32.10/include/linux/poison.h 45601diff -urNp linux-2.6.32.11/include/linux/poison.h linux-2.6.32.11/include/linux/poison.h
44373--- linux-2.6.32.10/include/linux/poison.h 2010-03-15 11:52:04.000000000 -0400 45602--- linux-2.6.32.11/include/linux/poison.h 2010-03-15 11:52:04.000000000 -0400
44374+++ linux-2.6.32.10/include/linux/poison.h 2010-03-20 15:58:47.160547125 -0400 45603+++ linux-2.6.32.11/include/linux/poison.h 2010-04-04 20:46:41.681061354 -0400
44375@@ -7,8 +7,8 @@ 45604@@ -7,8 +7,8 @@
44376 * under normal circumstances, used to verify that nobody uses 45605 * under normal circumstances, used to verify that nobody uses
44377 * non-initialized list entries. 45606 * non-initialized list entries.
@@ -44383,9 +45612,9 @@ diff -urNp linux-2.6.32.10/include/linux/poison.h linux-2.6.32.10/include/linux/
44383 45612
44384 /********** include/linux/timer.h **********/ 45613 /********** include/linux/timer.h **********/
44385 /* 45614 /*
44386diff -urNp linux-2.6.32.10/include/linux/proc_fs.h linux-2.6.32.10/include/linux/proc_fs.h 45615diff -urNp linux-2.6.32.11/include/linux/proc_fs.h linux-2.6.32.11/include/linux/proc_fs.h
44387--- linux-2.6.32.10/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400 45616--- linux-2.6.32.11/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400
44388+++ linux-2.6.32.10/include/linux/proc_fs.h 2010-03-20 15:58:47.160547125 -0400 45617+++ linux-2.6.32.11/include/linux/proc_fs.h 2010-04-04 20:46:41.681061354 -0400
44389@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro 45618@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
44390 return proc_create_data(name, mode, parent, proc_fops, NULL); 45619 return proc_create_data(name, mode, parent, proc_fops, NULL);
44391 } 45620 }
@@ -44406,9 +45635,9 @@ diff -urNp linux-2.6.32.10/include/linux/proc_fs.h linux-2.6.32.10/include/linux
44406 static inline struct proc_dir_entry *create_proc_read_entry(const char *name, 45635 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
44407 mode_t mode, struct proc_dir_entry *base, 45636 mode_t mode, struct proc_dir_entry *base,
44408 read_proc_t *read_proc, void * data) 45637 read_proc_t *read_proc, void * data)
44409diff -urNp linux-2.6.32.10/include/linux/random.h linux-2.6.32.10/include/linux/random.h 45638diff -urNp linux-2.6.32.11/include/linux/random.h linux-2.6.32.11/include/linux/random.h
44410--- linux-2.6.32.10/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400 45639--- linux-2.6.32.11/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400
44411+++ linux-2.6.32.10/include/linux/random.h 2010-03-20 15:58:47.160547125 -0400 45640+++ linux-2.6.32.11/include/linux/random.h 2010-04-04 20:46:41.681061354 -0400
44412@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l 45641@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
44413 u32 random32(void); 45642 u32 random32(void);
44414 void srandom32(u32 seed); 45643 void srandom32(u32 seed);
@@ -44421,9 +45650,9 @@ diff -urNp linux-2.6.32.10/include/linux/random.h linux-2.6.32.10/include/linux/
44421 #endif /* __KERNEL___ */ 45650 #endif /* __KERNEL___ */
44422 45651
44423 #endif /* _LINUX_RANDOM_H */ 45652 #endif /* _LINUX_RANDOM_H */
44424diff -urNp linux-2.6.32.10/include/linux/reiserfs_fs.h linux-2.6.32.10/include/linux/reiserfs_fs.h 45653diff -urNp linux-2.6.32.11/include/linux/reiserfs_fs.h linux-2.6.32.11/include/linux/reiserfs_fs.h
44425--- linux-2.6.32.10/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400 45654--- linux-2.6.32.11/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400
44426+++ linux-2.6.32.10/include/linux/reiserfs_fs.h 2010-03-20 15:58:47.160547125 -0400 45655+++ linux-2.6.32.11/include/linux/reiserfs_fs.h 2010-04-04 20:46:41.681061354 -0400
44427@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset 45656@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
44428 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ 45657 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
44429 45658
@@ -44470,9 +45699,9 @@ diff -urNp linux-2.6.32.10/include/linux/reiserfs_fs.h linux-2.6.32.10/include/l
44470 45699
44471 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) 45700 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
44472 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) 45701 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
44473diff -urNp linux-2.6.32.10/include/linux/reiserfs_fs_sb.h linux-2.6.32.10/include/linux/reiserfs_fs_sb.h 45702diff -urNp linux-2.6.32.11/include/linux/reiserfs_fs_sb.h linux-2.6.32.11/include/linux/reiserfs_fs_sb.h
44474--- linux-2.6.32.10/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400 45703--- linux-2.6.32.11/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400
44475+++ linux-2.6.32.10/include/linux/reiserfs_fs_sb.h 2010-03-20 15:58:47.160547125 -0400 45704+++ linux-2.6.32.11/include/linux/reiserfs_fs_sb.h 2010-04-04 20:46:41.681061354 -0400
44476@@ -377,7 +377,7 @@ struct reiserfs_sb_info { 45705@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
44477 /* Comment? -Hans */ 45706 /* Comment? -Hans */
44478 wait_queue_head_t s_wait; 45707 wait_queue_head_t s_wait;
@@ -44482,9 +45711,9 @@ diff -urNp linux-2.6.32.10/include/linux/reiserfs_fs_sb.h linux-2.6.32.10/includ
44482 // tree gets re-balanced 45711 // tree gets re-balanced
44483 unsigned long s_properties; /* File system properties. Currently holds 45712 unsigned long s_properties; /* File system properties. Currently holds
44484 on-disk FS format */ 45713 on-disk FS format */
44485diff -urNp linux-2.6.32.10/include/linux/sched.h linux-2.6.32.10/include/linux/sched.h 45714diff -urNp linux-2.6.32.11/include/linux/sched.h linux-2.6.32.11/include/linux/sched.h
44486--- linux-2.6.32.10/include/linux/sched.h 2010-03-15 11:52:04.000000000 -0400 45715--- linux-2.6.32.11/include/linux/sched.h 2010-03-15 11:52:04.000000000 -0400
44487+++ linux-2.6.32.10/include/linux/sched.h 2010-03-20 15:58:47.165359004 -0400 45716+++ linux-2.6.32.11/include/linux/sched.h 2010-04-04 20:46:41.681061354 -0400
44488@@ -101,6 +101,7 @@ struct bio; 45717@@ -101,6 +101,7 @@ struct bio;
44489 struct fs_struct; 45718 struct fs_struct;
44490 struct bts_context; 45719 struct bts_context;
@@ -44733,9 +45962,9 @@ diff -urNp linux-2.6.32.10/include/linux/sched.h linux-2.6.32.10/include/linux/s
44733 extern void thread_info_cache_init(void); 45962 extern void thread_info_cache_init(void);
44734 45963
44735 #ifdef CONFIG_DEBUG_STACK_USAGE 45964 #ifdef CONFIG_DEBUG_STACK_USAGE
44736diff -urNp linux-2.6.32.10/include/linux/screen_info.h linux-2.6.32.10/include/linux/screen_info.h 45965diff -urNp linux-2.6.32.11/include/linux/screen_info.h linux-2.6.32.11/include/linux/screen_info.h
44737--- linux-2.6.32.10/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400 45966--- linux-2.6.32.11/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400
44738+++ linux-2.6.32.10/include/linux/screen_info.h 2010-03-20 15:58:47.165359004 -0400 45967+++ linux-2.6.32.11/include/linux/screen_info.h 2010-04-04 20:46:41.681061354 -0400
44739@@ -42,7 +42,8 @@ struct screen_info { 45968@@ -42,7 +42,8 @@ struct screen_info {
44740 __u16 pages; /* 0x32 */ 45969 __u16 pages; /* 0x32 */
44741 __u16 vesa_attributes; /* 0x34 */ 45970 __u16 vesa_attributes; /* 0x34 */
@@ -44746,9 +45975,9 @@ diff -urNp linux-2.6.32.10/include/linux/screen_info.h linux-2.6.32.10/include/l
44746 } __attribute__((packed)); 45975 } __attribute__((packed));
44747 45976
44748 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ 45977 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
44749diff -urNp linux-2.6.32.10/include/linux/security.h linux-2.6.32.10/include/linux/security.h 45978diff -urNp linux-2.6.32.11/include/linux/security.h linux-2.6.32.11/include/linux/security.h
44750--- linux-2.6.32.10/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400 45979--- linux-2.6.32.11/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400
44751+++ linux-2.6.32.10/include/linux/security.h 2010-03-20 15:58:47.165359004 -0400 45980+++ linux-2.6.32.11/include/linux/security.h 2010-04-04 20:46:41.681061354 -0400
44752@@ -34,6 +34,7 @@ 45981@@ -34,6 +34,7 @@
44753 #include <linux/key.h> 45982 #include <linux/key.h>
44754 #include <linux/xfrm.h> 45983 #include <linux/xfrm.h>
@@ -44757,9 +45986,9 @@ diff -urNp linux-2.6.32.10/include/linux/security.h linux-2.6.32.10/include/linu
44757 #include <net/flow.h> 45986 #include <net/flow.h>
44758 45987
44759 /* Maximum number of letters for an LSM name string */ 45988 /* Maximum number of letters for an LSM name string */
44760diff -urNp linux-2.6.32.10/include/linux/shm.h linux-2.6.32.10/include/linux/shm.h 45989diff -urNp linux-2.6.32.11/include/linux/shm.h linux-2.6.32.11/include/linux/shm.h
44761--- linux-2.6.32.10/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400 45990--- linux-2.6.32.11/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400
44762+++ linux-2.6.32.10/include/linux/shm.h 2010-03-20 15:58:47.165359004 -0400 45991+++ linux-2.6.32.11/include/linux/shm.h 2010-04-04 20:46:41.681061354 -0400
44763@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke 45992@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
44764 pid_t shm_cprid; 45993 pid_t shm_cprid;
44765 pid_t shm_lprid; 45994 pid_t shm_lprid;
@@ -44771,9 +46000,9 @@ diff -urNp linux-2.6.32.10/include/linux/shm.h linux-2.6.32.10/include/linux/shm
44771 }; 46000 };
44772 46001
44773 /* shm_mode upper byte flags */ 46002 /* shm_mode upper byte flags */
44774diff -urNp linux-2.6.32.10/include/linux/slab.h linux-2.6.32.10/include/linux/slab.h 46003diff -urNp linux-2.6.32.11/include/linux/slab.h linux-2.6.32.11/include/linux/slab.h
44775--- linux-2.6.32.10/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400 46004--- linux-2.6.32.11/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400
44776+++ linux-2.6.32.10/include/linux/slab.h 2010-03-20 15:58:47.165359004 -0400 46005+++ linux-2.6.32.11/include/linux/slab.h 2010-04-04 20:47:28.956670452 -0400
44777@@ -11,6 +11,7 @@ 46006@@ -11,6 +11,7 @@
44778 46007
44779 #include <linux/gfp.h> 46008 #include <linux/gfp.h>
@@ -44795,7 +46024,7 @@ diff -urNp linux-2.6.32.10/include/linux/slab.h linux-2.6.32.10/include/linux/sl
44795 46024
44796-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \ 46025-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
44797- (unsigned long)ZERO_SIZE_PTR) 46026- (unsigned long)ZERO_SIZE_PTR)
44798+#define ZERO_OR_NULL_PTR(x) (!(x) || (x) == ZERO_SIZE_PTR) 46027+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
44799 46028
44800 /* 46029 /*
44801 * struct kmem_cache related prototypes 46030 * struct kmem_cache related prototypes
@@ -44845,9 +46074,9 @@ diff -urNp linux-2.6.32.10/include/linux/slab.h linux-2.6.32.10/include/linux/sl
44845+}) 46074+})
44846+ 46075+
44847 #endif /* _LINUX_SLAB_H */ 46076 #endif /* _LINUX_SLAB_H */
44848diff -urNp linux-2.6.32.10/include/linux/slub_def.h linux-2.6.32.10/include/linux/slub_def.h 46077diff -urNp linux-2.6.32.11/include/linux/slub_def.h linux-2.6.32.11/include/linux/slub_def.h
44849--- linux-2.6.32.10/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400 46078--- linux-2.6.32.11/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400
44850+++ linux-2.6.32.10/include/linux/slub_def.h 2010-03-20 15:58:47.165359004 -0400 46079+++ linux-2.6.32.11/include/linux/slub_def.h 2010-04-04 20:46:41.685762250 -0400
44851@@ -86,7 +86,7 @@ struct kmem_cache { 46080@@ -86,7 +86,7 @@ struct kmem_cache {
44852 struct kmem_cache_order_objects max; 46081 struct kmem_cache_order_objects max;
44853 struct kmem_cache_order_objects min; 46082 struct kmem_cache_order_objects min;
@@ -44857,9 +46086,9 @@ diff -urNp linux-2.6.32.10/include/linux/slub_def.h linux-2.6.32.10/include/linu
44857 void (*ctor)(void *); 46086 void (*ctor)(void *);
44858 int inuse; /* Offset to metadata */ 46087 int inuse; /* Offset to metadata */
44859 int align; /* Alignment */ 46088 int align; /* Alignment */
44860diff -urNp linux-2.6.32.10/include/linux/sonet.h linux-2.6.32.10/include/linux/sonet.h 46089diff -urNp linux-2.6.32.11/include/linux/sonet.h linux-2.6.32.11/include/linux/sonet.h
44861--- linux-2.6.32.10/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400 46090--- linux-2.6.32.11/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400
44862+++ linux-2.6.32.10/include/linux/sonet.h 2010-03-20 15:58:47.165359004 -0400 46091+++ linux-2.6.32.11/include/linux/sonet.h 2010-04-04 20:46:41.685762250 -0400
44863@@ -61,7 +61,7 @@ struct sonet_stats { 46092@@ -61,7 +61,7 @@ struct sonet_stats {
44864 #include <asm/atomic.h> 46093 #include <asm/atomic.h>
44865 46094
@@ -44869,9 +46098,9 @@ diff -urNp linux-2.6.32.10/include/linux/sonet.h linux-2.6.32.10/include/linux/s
44869 __SONET_ITEMS 46098 __SONET_ITEMS
44870 #undef __HANDLE_ITEM 46099 #undef __HANDLE_ITEM
44871 }; 46100 };
44872diff -urNp linux-2.6.32.10/include/linux/suspend.h linux-2.6.32.10/include/linux/suspend.h 46101diff -urNp linux-2.6.32.11/include/linux/suspend.h linux-2.6.32.11/include/linux/suspend.h
44873--- linux-2.6.32.10/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400 46102--- linux-2.6.32.11/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400
44874+++ linux-2.6.32.10/include/linux/suspend.h 2010-03-20 15:58:47.165359004 -0400 46103+++ linux-2.6.32.11/include/linux/suspend.h 2010-04-04 20:46:41.685762250 -0400
44875@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; 46104@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
44876 * which require special recovery actions in that situation. 46105 * which require special recovery actions in that situation.
44877 */ 46106 */
@@ -44960,9 +46189,9 @@ diff -urNp linux-2.6.32.10/include/linux/suspend.h linux-2.6.32.10/include/linux
44960 static inline int hibernate(void) { return -ENOSYS; } 46189 static inline int hibernate(void) { return -ENOSYS; }
44961 static inline bool system_entering_hibernation(void) { return false; } 46190 static inline bool system_entering_hibernation(void) { return false; }
44962 #endif /* CONFIG_HIBERNATION */ 46191 #endif /* CONFIG_HIBERNATION */
44963diff -urNp linux-2.6.32.10/include/linux/sysctl.h linux-2.6.32.10/include/linux/sysctl.h 46192diff -urNp linux-2.6.32.11/include/linux/sysctl.h linux-2.6.32.11/include/linux/sysctl.h
44964--- linux-2.6.32.10/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400 46193--- linux-2.6.32.11/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400
44965+++ linux-2.6.32.10/include/linux/sysctl.h 2010-03-20 15:58:47.165359004 -0400 46194+++ linux-2.6.32.11/include/linux/sysctl.h 2010-04-04 20:46:41.685762250 -0400
44966@@ -164,7 +164,11 @@ enum 46195@@ -164,7 +164,11 @@ enum
44967 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ 46196 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
44968 }; 46197 };
@@ -44976,9 +46205,9 @@ diff -urNp linux-2.6.32.10/include/linux/sysctl.h linux-2.6.32.10/include/linux/
44976 46205
44977 /* CTL_VM names: */ 46206 /* CTL_VM names: */
44978 enum 46207 enum
44979diff -urNp linux-2.6.32.10/include/linux/sysfs.h linux-2.6.32.10/include/linux/sysfs.h 46208diff -urNp linux-2.6.32.11/include/linux/sysfs.h linux-2.6.32.11/include/linux/sysfs.h
44980--- linux-2.6.32.10/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400 46209--- linux-2.6.32.11/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400
44981+++ linux-2.6.32.10/include/linux/sysfs.h 2010-03-20 15:58:47.165359004 -0400 46210+++ linux-2.6.32.11/include/linux/sysfs.h 2010-04-04 20:46:41.685762250 -0400
44982@@ -75,8 +75,8 @@ struct bin_attribute { 46211@@ -75,8 +75,8 @@ struct bin_attribute {
44983 }; 46212 };
44984 46213
@@ -44990,9 +46219,9 @@ diff -urNp linux-2.6.32.10/include/linux/sysfs.h linux-2.6.32.10/include/linux/s
44990 }; 46219 };
44991 46220
44992 struct sysfs_dirent; 46221 struct sysfs_dirent;
44993diff -urNp linux-2.6.32.10/include/linux/thread_info.h linux-2.6.32.10/include/linux/thread_info.h 46222diff -urNp linux-2.6.32.11/include/linux/thread_info.h linux-2.6.32.11/include/linux/thread_info.h
44994--- linux-2.6.32.10/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400 46223--- linux-2.6.32.11/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400
44995+++ linux-2.6.32.10/include/linux/thread_info.h 2010-03-20 15:58:47.165359004 -0400 46224+++ linux-2.6.32.11/include/linux/thread_info.h 2010-04-04 20:46:41.685762250 -0400
44996@@ -23,7 +23,7 @@ struct restart_block { 46225@@ -23,7 +23,7 @@ struct restart_block {
44997 }; 46226 };
44998 /* For futex_wait and futex_wait_requeue_pi */ 46227 /* For futex_wait and futex_wait_requeue_pi */
@@ -45002,9 +46231,9 @@ diff -urNp linux-2.6.32.10/include/linux/thread_info.h linux-2.6.32.10/include/l
45002 u32 val; 46231 u32 val;
45003 u32 flags; 46232 u32 flags;
45004 u32 bitset; 46233 u32 bitset;
45005diff -urNp linux-2.6.32.10/include/linux/tty.h linux-2.6.32.10/include/linux/tty.h 46234diff -urNp linux-2.6.32.11/include/linux/tty.h linux-2.6.32.11/include/linux/tty.h
45006--- linux-2.6.32.10/include/linux/tty.h 2010-03-15 11:52:04.000000000 -0400 46235--- linux-2.6.32.11/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400
45007+++ linux-2.6.32.10/include/linux/tty.h 2010-03-20 15:58:47.165359004 -0400 46236+++ linux-2.6.32.11/include/linux/tty.h 2010-04-04 20:46:41.685762250 -0400
45008@@ -13,6 +13,7 @@ 46237@@ -13,6 +13,7 @@
45009 #include <linux/tty_driver.h> 46238 #include <linux/tty_driver.h>
45010 #include <linux/tty_ldisc.h> 46239 #include <linux/tty_ldisc.h>
@@ -45013,7 +46242,7 @@ diff -urNp linux-2.6.32.10/include/linux/tty.h linux-2.6.32.10/include/linux/tty
45013 46242
45014 #include <asm/system.h> 46243 #include <asm/system.h>
45015 46244
45016@@ -432,7 +433,6 @@ extern int tty_perform_flush(struct tty_ 46245@@ -443,7 +444,6 @@ extern int tty_perform_flush(struct tty_
45017 extern dev_t tty_devnum(struct tty_struct *tty); 46246 extern dev_t tty_devnum(struct tty_struct *tty);
45018 extern void proc_clear_tty(struct task_struct *p); 46247 extern void proc_clear_tty(struct task_struct *p);
45019 extern struct tty_struct *get_current_tty(void); 46248 extern struct tty_struct *get_current_tty(void);
@@ -45021,7 +46250,7 @@ diff -urNp linux-2.6.32.10/include/linux/tty.h linux-2.6.32.10/include/linux/tty
45021 extern struct tty_struct *alloc_tty_struct(void); 46250 extern struct tty_struct *alloc_tty_struct(void);
45022 extern void free_tty_struct(struct tty_struct *tty); 46251 extern void free_tty_struct(struct tty_struct *tty);
45023 extern void initialize_tty_struct(struct tty_struct *tty, 46252 extern void initialize_tty_struct(struct tty_struct *tty,
45024@@ -482,6 +482,18 @@ extern void tty_ldisc_begin(void); 46253@@ -493,6 +493,18 @@ extern void tty_ldisc_begin(void);
45025 /* This last one is just for the tty layer internals and shouldn't be used elsewhere */ 46254 /* This last one is just for the tty layer internals and shouldn't be used elsewhere */
45026 extern void tty_ldisc_enable(struct tty_struct *tty); 46255 extern void tty_ldisc_enable(struct tty_struct *tty);
45027 46256
@@ -45040,9 +46269,9 @@ diff -urNp linux-2.6.32.10/include/linux/tty.h linux-2.6.32.10/include/linux/tty
45040 46269
45041 /* n_tty.c */ 46270 /* n_tty.c */
45042 extern struct tty_ldisc_ops tty_ldisc_N_TTY; 46271 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
45043diff -urNp linux-2.6.32.10/include/linux/tty_ldisc.h linux-2.6.32.10/include/linux/tty_ldisc.h 46272diff -urNp linux-2.6.32.11/include/linux/tty_ldisc.h linux-2.6.32.11/include/linux/tty_ldisc.h
45044--- linux-2.6.32.10/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400 46273--- linux-2.6.32.11/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400
45045+++ linux-2.6.32.10/include/linux/tty_ldisc.h 2010-03-20 15:58:47.165359004 -0400 46274+++ linux-2.6.32.11/include/linux/tty_ldisc.h 2010-04-04 20:46:41.685762250 -0400
45046@@ -139,7 +139,7 @@ struct tty_ldisc_ops { 46275@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
45047 46276
45048 struct module *owner; 46277 struct module *owner;
@@ -45052,9 +46281,9 @@ diff -urNp linux-2.6.32.10/include/linux/tty_ldisc.h linux-2.6.32.10/include/lin
45052 }; 46281 };
45053 46282
45054 struct tty_ldisc { 46283 struct tty_ldisc {
45055diff -urNp linux-2.6.32.10/include/linux/types.h linux-2.6.32.10/include/linux/types.h 46284diff -urNp linux-2.6.32.11/include/linux/types.h linux-2.6.32.11/include/linux/types.h
45056--- linux-2.6.32.10/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400 46285--- linux-2.6.32.11/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400
45057+++ linux-2.6.32.10/include/linux/types.h 2010-03-20 15:58:47.168865970 -0400 46286+++ linux-2.6.32.11/include/linux/types.h 2010-04-04 20:46:41.685762250 -0400
45058@@ -191,10 +191,26 @@ typedef struct { 46287@@ -191,10 +191,26 @@ typedef struct {
45059 volatile int counter; 46288 volatile int counter;
45060 } atomic_t; 46289 } atomic_t;
@@ -45082,9 +46311,9 @@ diff -urNp linux-2.6.32.10/include/linux/types.h linux-2.6.32.10/include/linux/t
45082 #endif 46311 #endif
45083 46312
45084 struct ustat { 46313 struct ustat {
45085diff -urNp linux-2.6.32.10/include/linux/uaccess.h linux-2.6.32.10/include/linux/uaccess.h 46314diff -urNp linux-2.6.32.11/include/linux/uaccess.h linux-2.6.32.11/include/linux/uaccess.h
45086--- linux-2.6.32.10/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400 46315--- linux-2.6.32.11/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400
45087+++ linux-2.6.32.10/include/linux/uaccess.h 2010-03-20 15:58:47.168865970 -0400 46316+++ linux-2.6.32.11/include/linux/uaccess.h 2010-04-04 20:46:41.685762250 -0400
45088@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ 46317@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
45089 long ret; \ 46318 long ret; \
45090 mm_segment_t old_fs = get_fs(); \ 46319 mm_segment_t old_fs = get_fs(); \
@@ -45116,9 +46345,9 @@ diff -urNp linux-2.6.32.10/include/linux/uaccess.h linux-2.6.32.10/include/linux
45116+extern long probe_kernel_write(void *dst, const void *src, size_t size); 46345+extern long probe_kernel_write(void *dst, const void *src, size_t size);
45117 46346
45118 #endif /* __LINUX_UACCESS_H__ */ 46347 #endif /* __LINUX_UACCESS_H__ */
45119diff -urNp linux-2.6.32.10/include/linux/vmalloc.h linux-2.6.32.10/include/linux/vmalloc.h 46348diff -urNp linux-2.6.32.11/include/linux/vmalloc.h linux-2.6.32.11/include/linux/vmalloc.h
45120--- linux-2.6.32.10/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400 46349--- linux-2.6.32.11/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400
45121+++ linux-2.6.32.10/include/linux/vmalloc.h 2010-03-20 15:58:47.168865970 -0400 46350+++ linux-2.6.32.11/include/linux/vmalloc.h 2010-04-04 20:46:41.685762250 -0400
45122@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining 46351@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
45123 #define VM_MAP 0x00000004 /* vmap()ed pages */ 46352 #define VM_MAP 0x00000004 /* vmap()ed pages */
45124 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ 46353 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
@@ -45213,9 +46442,9 @@ diff -urNp linux-2.6.32.10/include/linux/vmalloc.h linux-2.6.32.10/include/linux
45213+}) 46442+})
45214+ 46443+
45215 #endif /* _LINUX_VMALLOC_H */ 46444 #endif /* _LINUX_VMALLOC_H */
45216diff -urNp linux-2.6.32.10/include/net/irda/ircomm_tty.h linux-2.6.32.10/include/net/irda/ircomm_tty.h 46445diff -urNp linux-2.6.32.11/include/net/irda/ircomm_tty.h linux-2.6.32.11/include/net/irda/ircomm_tty.h
45217--- linux-2.6.32.10/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400 46446--- linux-2.6.32.11/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400
45218+++ linux-2.6.32.10/include/net/irda/ircomm_tty.h 2010-03-20 15:58:47.168865970 -0400 46447+++ linux-2.6.32.11/include/net/irda/ircomm_tty.h 2010-04-04 20:46:41.685762250 -0400
45219@@ -105,8 +105,8 @@ struct ircomm_tty_cb { 46448@@ -105,8 +105,8 @@ struct ircomm_tty_cb {
45220 unsigned short close_delay; 46449 unsigned short close_delay;
45221 unsigned short closing_wait; /* time to wait before closing */ 46450 unsigned short closing_wait; /* time to wait before closing */
@@ -45227,9 +46456,9 @@ diff -urNp linux-2.6.32.10/include/net/irda/ircomm_tty.h linux-2.6.32.10/include
45227 46456
45228 /* Protect concurent access to : 46457 /* Protect concurent access to :
45229 * o self->open_count 46458 * o self->open_count
45230diff -urNp linux-2.6.32.10/include/net/neighbour.h linux-2.6.32.10/include/net/neighbour.h 46459diff -urNp linux-2.6.32.11/include/net/neighbour.h linux-2.6.32.11/include/net/neighbour.h
45231--- linux-2.6.32.10/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400 46460--- linux-2.6.32.11/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400
45232+++ linux-2.6.32.10/include/net/neighbour.h 2010-03-20 15:58:47.168865970 -0400 46461+++ linux-2.6.32.11/include/net/neighbour.h 2010-04-04 20:46:41.685762250 -0400
45233@@ -125,12 +125,12 @@ struct neighbour 46462@@ -125,12 +125,12 @@ struct neighbour
45234 struct neigh_ops 46463 struct neigh_ops
45235 { 46464 {
@@ -45249,9 +46478,9 @@ diff -urNp linux-2.6.32.10/include/net/neighbour.h linux-2.6.32.10/include/net/n
45249 }; 46478 };
45250 46479
45251 struct pneigh_entry 46480 struct pneigh_entry
45252diff -urNp linux-2.6.32.10/include/net/sctp/sctp.h linux-2.6.32.10/include/net/sctp/sctp.h 46481diff -urNp linux-2.6.32.11/include/net/sctp/sctp.h linux-2.6.32.11/include/net/sctp/sctp.h
45253--- linux-2.6.32.10/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400 46482--- linux-2.6.32.11/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400
45254+++ linux-2.6.32.10/include/net/sctp/sctp.h 2010-03-20 15:58:47.168865970 -0400 46483+++ linux-2.6.32.11/include/net/sctp/sctp.h 2010-04-04 20:46:41.685762250 -0400
45255@@ -305,8 +305,8 @@ extern int sctp_debug_flag; 46484@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
45256 46485
45257 #else /* SCTP_DEBUG */ 46486 #else /* SCTP_DEBUG */
@@ -45263,9 +46492,9 @@ diff -urNp linux-2.6.32.10/include/net/sctp/sctp.h linux-2.6.32.10/include/net/s
45263 #define SCTP_ENABLE_DEBUG 46492 #define SCTP_ENABLE_DEBUG
45264 #define SCTP_DISABLE_DEBUG 46493 #define SCTP_DISABLE_DEBUG
45265 #define SCTP_ASSERT(expr, str, func) 46494 #define SCTP_ASSERT(expr, str, func)
45266diff -urNp linux-2.6.32.10/include/net/tcp.h linux-2.6.32.10/include/net/tcp.h 46495diff -urNp linux-2.6.32.11/include/net/tcp.h linux-2.6.32.11/include/net/tcp.h
45267--- linux-2.6.32.10/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400 46496--- linux-2.6.32.11/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400
45268+++ linux-2.6.32.10/include/net/tcp.h 2010-03-20 15:58:47.168865970 -0400 46497+++ linux-2.6.32.11/include/net/tcp.h 2010-04-04 20:46:41.685762250 -0400
45269@@ -1420,6 +1420,7 @@ enum tcp_seq_states { 46498@@ -1420,6 +1420,7 @@ enum tcp_seq_states {
45270 struct tcp_seq_afinfo { 46499 struct tcp_seq_afinfo {
45271 char *name; 46500 char *name;
@@ -45274,9 +46503,9 @@ diff -urNp linux-2.6.32.10/include/net/tcp.h linux-2.6.32.10/include/net/tcp.h
45274 struct file_operations seq_fops; 46503 struct file_operations seq_fops;
45275 struct seq_operations seq_ops; 46504 struct seq_operations seq_ops;
45276 }; 46505 };
45277diff -urNp linux-2.6.32.10/include/net/udp.h linux-2.6.32.10/include/net/udp.h 46506diff -urNp linux-2.6.32.11/include/net/udp.h linux-2.6.32.11/include/net/udp.h
45278--- linux-2.6.32.10/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400 46507--- linux-2.6.32.11/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400
45279+++ linux-2.6.32.10/include/net/udp.h 2010-03-20 15:58:47.168865970 -0400 46508+++ linux-2.6.32.11/include/net/udp.h 2010-04-04 20:46:41.685762250 -0400
45280@@ -187,6 +187,7 @@ struct udp_seq_afinfo { 46509@@ -187,6 +187,7 @@ struct udp_seq_afinfo {
45281 char *name; 46510 char *name;
45282 sa_family_t family; 46511 sa_family_t family;
@@ -45285,9 +46514,9 @@ diff -urNp linux-2.6.32.10/include/net/udp.h linux-2.6.32.10/include/net/udp.h
45285 struct file_operations seq_fops; 46514 struct file_operations seq_fops;
45286 struct seq_operations seq_ops; 46515 struct seq_operations seq_ops;
45287 }; 46516 };
45288diff -urNp linux-2.6.32.10/include/sound/ac97_codec.h linux-2.6.32.10/include/sound/ac97_codec.h 46517diff -urNp linux-2.6.32.11/include/sound/ac97_codec.h linux-2.6.32.11/include/sound/ac97_codec.h
45289--- linux-2.6.32.10/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400 46518--- linux-2.6.32.11/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400
45290+++ linux-2.6.32.10/include/sound/ac97_codec.h 2010-03-20 15:58:47.168865970 -0400 46519+++ linux-2.6.32.11/include/sound/ac97_codec.h 2010-04-04 20:46:41.685762250 -0400
45291@@ -419,15 +419,15 @@ 46520@@ -419,15 +419,15 @@
45292 struct snd_ac97; 46521 struct snd_ac97;
45293 46522
@@ -45320,9 +46549,9 @@ diff -urNp linux-2.6.32.10/include/sound/ac97_codec.h linux-2.6.32.10/include/so
45320 void *private_data; 46549 void *private_data;
45321 void (*private_free) (struct snd_ac97 *ac97); 46550 void (*private_free) (struct snd_ac97 *ac97);
45322 /* --- */ 46551 /* --- */
45323diff -urNp linux-2.6.32.10/include/trace/events/irq.h linux-2.6.32.10/include/trace/events/irq.h 46552diff -urNp linux-2.6.32.11/include/trace/events/irq.h linux-2.6.32.11/include/trace/events/irq.h
45324--- linux-2.6.32.10/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400 46553--- linux-2.6.32.11/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400
45325+++ linux-2.6.32.10/include/trace/events/irq.h 2010-03-20 15:58:47.168865970 -0400 46554+++ linux-2.6.32.11/include/trace/events/irq.h 2010-04-04 20:46:41.685762250 -0400
45326@@ -34,7 +34,7 @@ 46555@@ -34,7 +34,7 @@
45327 */ 46556 */
45328 TRACE_EVENT(irq_handler_entry, 46557 TRACE_EVENT(irq_handler_entry,
@@ -45359,9 +46588,9 @@ diff -urNp linux-2.6.32.10/include/trace/events/irq.h linux-2.6.32.10/include/tr
45359 46588
45360 TP_ARGS(h, vec), 46589 TP_ARGS(h, vec),
45361 46590
45362diff -urNp linux-2.6.32.10/include/video/uvesafb.h linux-2.6.32.10/include/video/uvesafb.h 46591diff -urNp linux-2.6.32.11/include/video/uvesafb.h linux-2.6.32.11/include/video/uvesafb.h
45363--- linux-2.6.32.10/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400 46592--- linux-2.6.32.11/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400
45364+++ linux-2.6.32.10/include/video/uvesafb.h 2010-03-20 15:58:47.168865970 -0400 46593+++ linux-2.6.32.11/include/video/uvesafb.h 2010-04-04 20:46:41.685762250 -0400
45365@@ -177,6 +177,7 @@ struct uvesafb_par { 46594@@ -177,6 +177,7 @@ struct uvesafb_par {
45366 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ 46595 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
45367 u8 pmi_setpal; /* PMI for palette changes */ 46596 u8 pmi_setpal; /* PMI for palette changes */
@@ -45370,9 +46599,9 @@ diff -urNp linux-2.6.32.10/include/video/uvesafb.h linux-2.6.32.10/include/video
45370 void *pmi_start; 46599 void *pmi_start;
45371 void *pmi_pal; 46600 void *pmi_pal;
45372 u8 *vbe_state_orig; /* 46601 u8 *vbe_state_orig; /*
45373diff -urNp linux-2.6.32.10/init/do_mounts.c linux-2.6.32.10/init/do_mounts.c 46602diff -urNp linux-2.6.32.11/init/do_mounts.c linux-2.6.32.11/init/do_mounts.c
45374--- linux-2.6.32.10/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400 46603--- linux-2.6.32.11/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400
45375+++ linux-2.6.32.10/init/do_mounts.c 2010-03-20 15:58:47.168865970 -0400 46604+++ linux-2.6.32.11/init/do_mounts.c 2010-04-04 20:46:41.685762250 -0400
45376@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa 46605@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
45377 46606
45378 static int __init do_mount_root(char *name, char *fs, int flags, void *data) 46607 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -45418,9 +46647,9 @@ diff -urNp linux-2.6.32.10/init/do_mounts.c linux-2.6.32.10/init/do_mounts.c
45418+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); 46647+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
45419+ sys_chroot((__force char __user *)"."); 46648+ sys_chroot((__force char __user *)".");
45420 } 46649 }
45421diff -urNp linux-2.6.32.10/init/do_mounts.h linux-2.6.32.10/init/do_mounts.h 46650diff -urNp linux-2.6.32.11/init/do_mounts.h linux-2.6.32.11/init/do_mounts.h
45422--- linux-2.6.32.10/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400 46651--- linux-2.6.32.11/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400
45423+++ linux-2.6.32.10/init/do_mounts.h 2010-03-20 15:58:47.168865970 -0400 46652+++ linux-2.6.32.11/init/do_mounts.h 2010-04-04 20:46:41.685762250 -0400
45424@@ -15,15 +15,15 @@ extern int root_mountflags; 46653@@ -15,15 +15,15 @@ extern int root_mountflags;
45425 46654
45426 static inline int create_dev(char *name, dev_t dev) 46655 static inline int create_dev(char *name, dev_t dev)
@@ -45440,9 +46669,9 @@ diff -urNp linux-2.6.32.10/init/do_mounts.h linux-2.6.32.10/init/do_mounts.h
45440 return 0; 46669 return 0;
45441 if (!S_ISBLK(stat.st_mode)) 46670 if (!S_ISBLK(stat.st_mode))
45442 return 0; 46671 return 0;
45443diff -urNp linux-2.6.32.10/init/do_mounts_initrd.c linux-2.6.32.10/init/do_mounts_initrd.c 46672diff -urNp linux-2.6.32.11/init/do_mounts_initrd.c linux-2.6.32.11/init/do_mounts_initrd.c
45444--- linux-2.6.32.10/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400 46673--- linux-2.6.32.11/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400
45445+++ linux-2.6.32.10/init/do_mounts_initrd.c 2010-03-20 15:58:47.168865970 -0400 46674+++ linux-2.6.32.11/init/do_mounts_initrd.c 2010-04-04 20:46:41.685762250 -0400
45446@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel 46675@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
45447 sys_close(old_fd);sys_close(root_fd); 46676 sys_close(old_fd);sys_close(root_fd);
45448 sys_close(0);sys_close(1);sys_close(2); 46677 sys_close(0);sys_close(1);sys_close(2);
@@ -45526,9 +46755,9 @@ diff -urNp linux-2.6.32.10/init/do_mounts_initrd.c linux-2.6.32.10/init/do_mount
45526+ sys_unlink((__force const char __user *)"/initrd.image"); 46755+ sys_unlink((__force const char __user *)"/initrd.image");
45527 return 0; 46756 return 0;
45528 } 46757 }
45529diff -urNp linux-2.6.32.10/init/do_mounts_md.c linux-2.6.32.10/init/do_mounts_md.c 46758diff -urNp linux-2.6.32.11/init/do_mounts_md.c linux-2.6.32.11/init/do_mounts_md.c
45530--- linux-2.6.32.10/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400 46759--- linux-2.6.32.11/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400
45531+++ linux-2.6.32.10/init/do_mounts_md.c 2010-03-20 15:58:47.168865970 -0400 46760+++ linux-2.6.32.11/init/do_mounts_md.c 2010-04-04 20:46:41.689696132 -0400
45532@@ -170,7 +170,7 @@ static void __init md_setup_drive(void) 46761@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
45533 partitioned ? "_d" : "", minor, 46762 partitioned ? "_d" : "", minor,
45534 md_setup_args[ent].device_names); 46763 md_setup_args[ent].device_names);
@@ -45556,9 +46785,9 @@ diff -urNp linux-2.6.32.10/init/do_mounts_md.c linux-2.6.32.10/init/do_mounts_md
45556 if (fd >= 0) { 46785 if (fd >= 0) {
45557 sys_ioctl(fd, RAID_AUTORUN, raid_autopart); 46786 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
45558 sys_close(fd); 46787 sys_close(fd);
45559diff -urNp linux-2.6.32.10/init/initramfs.c linux-2.6.32.10/init/initramfs.c 46788diff -urNp linux-2.6.32.11/init/initramfs.c linux-2.6.32.11/init/initramfs.c
45560--- linux-2.6.32.10/init/initramfs.c 2010-03-15 11:52:04.000000000 -0400 46789--- linux-2.6.32.11/init/initramfs.c 2010-03-15 11:52:04.000000000 -0400
45561+++ linux-2.6.32.10/init/initramfs.c 2010-03-20 15:58:47.168865970 -0400 46790+++ linux-2.6.32.11/init/initramfs.c 2010-04-04 20:46:41.689696132 -0400
45562@@ -74,7 +74,7 @@ static void __init free_hash(void) 46791@@ -74,7 +74,7 @@ static void __init free_hash(void)
45563 } 46792 }
45564 } 46793 }
@@ -45667,9 +46896,9 @@ diff -urNp linux-2.6.32.10/init/initramfs.c linux-2.6.32.10/init/initramfs.c
45667 state = SkipIt; 46896 state = SkipIt;
45668 next_state = Reset; 46897 next_state = Reset;
45669 return 0; 46898 return 0;
45670diff -urNp linux-2.6.32.10/init/Kconfig linux-2.6.32.10/init/Kconfig 46899diff -urNp linux-2.6.32.11/init/Kconfig linux-2.6.32.11/init/Kconfig
45671--- linux-2.6.32.10/init/Kconfig 2010-03-15 11:52:04.000000000 -0400 46900--- linux-2.6.32.11/init/Kconfig 2010-03-15 11:52:04.000000000 -0400
45672+++ linux-2.6.32.10/init/Kconfig 2010-03-20 15:58:47.168865970 -0400 46901+++ linux-2.6.32.11/init/Kconfig 2010-04-04 20:46:41.689696132 -0400
45673@@ -1026,7 +1026,7 @@ config SLUB_DEBUG 46902@@ -1026,7 +1026,7 @@ config SLUB_DEBUG
45674 46903
45675 config COMPAT_BRK 46904 config COMPAT_BRK
@@ -45691,9 +46920,9 @@ diff -urNp linux-2.6.32.10/init/Kconfig linux-2.6.32.10/init/Kconfig
45691 46920
45692 config RT_MUTEXES 46921 config RT_MUTEXES
45693 boolean 46922 boolean
45694diff -urNp linux-2.6.32.10/init/main.c linux-2.6.32.10/init/main.c 46923diff -urNp linux-2.6.32.11/init/main.c linux-2.6.32.11/init/main.c
45695--- linux-2.6.32.10/init/main.c 2010-03-15 11:52:04.000000000 -0400 46924--- linux-2.6.32.11/init/main.c 2010-04-04 20:41:50.060586306 -0400
45696+++ linux-2.6.32.10/init/main.c 2010-03-20 15:58:47.168865970 -0400 46925+++ linux-2.6.32.11/init/main.c 2010-04-04 20:58:33.225084964 -0400
45697@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) 46926@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
45698 #ifdef CONFIG_TC 46927 #ifdef CONFIG_TC
45699 extern void tc_init(void); 46928 extern void tc_init(void);
@@ -45702,13 +46931,20 @@ diff -urNp linux-2.6.32.10/init/main.c linux-2.6.32.10/init/main.c
45702 46931
45703 enum system_states system_state __read_mostly; 46932 enum system_states system_state __read_mostly;
45704 EXPORT_SYMBOL(system_state); 46933 EXPORT_SYMBOL(system_state);
45705@@ -183,6 +184,35 @@ static int __init set_reset_devices(char 46934@@ -183,6 +184,50 @@ static int __init set_reset_devices(char
45706 46935
45707 __setup("reset_devices", set_reset_devices); 46936 __setup("reset_devices", set_reset_devices);
45708 46937
45709+#if defined(CONFIG_PAX_MEMORY_UDEREF) && defined(CONFIG_X86_32) 46938+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
46939+extern void pax_enter_kernel_user(void);
46940+extern void pax_exit_kernel_user(void);
46941+extern pteval_t clone_pgd_mask;
46942+#endif
46943+
46944+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
45710+static int __init setup_pax_nouderef(char *str) 46945+static int __init setup_pax_nouderef(char *str)
45711+{ 46946+{
46947+#ifdef CONFIG_X86_32
45712+ unsigned int cpu; 46948+ unsigned int cpu;
45713+ 46949+
45714+ for (cpu = 0; cpu < NR_CPUS; cpu++) { 46950+ for (cpu = 0; cpu < NR_CPUS; cpu++) {
@@ -45718,6 +46954,14 @@ diff -urNp linux-2.6.32.10/init/main.c linux-2.6.32.10/init/main.c
45718+ asm("mov %0, %%ds" : : "r" (__KERNEL_DS) : "memory"); 46954+ asm("mov %0, %%ds" : : "r" (__KERNEL_DS) : "memory");
45719+ asm("mov %0, %%es" : : "r" (__KERNEL_DS) : "memory"); 46955+ asm("mov %0, %%es" : : "r" (__KERNEL_DS) : "memory");
45720+ asm("mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory"); 46956+ asm("mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
46957+#else
46958+ char *p;
46959+ p = (char *)pax_enter_kernel_user;
46960+ *p = 0xc3;
46961+ p = (char *)pax_exit_kernel_user;
46962+ *p = 0xc3;
46963+ clone_pgd_mask = ~(pteval_t)0UL;
46964+#endif
45721+ 46965+
45722+ return 0; 46966+ return 0;
45723+} 46967+}
@@ -45738,7 +46982,7 @@ diff -urNp linux-2.6.32.10/init/main.c linux-2.6.32.10/init/main.c
45738 static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; 46982 static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
45739 char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; 46983 char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
45740 static const char *panic_later, *panic_param; 46984 static const char *panic_later, *panic_param;
45741@@ -702,52 +732,53 @@ int initcall_debug; 46985@@ -697,52 +742,53 @@ int initcall_debug;
45742 core_param(initcall_debug, initcall_debug, bool, 0644); 46986 core_param(initcall_debug, initcall_debug, bool, 0644);
45743 46987
45744 static char msgbuf[64]; 46988 static char msgbuf[64];
@@ -45808,7 +47052,7 @@ diff -urNp linux-2.6.32.10/init/main.c linux-2.6.32.10/init/main.c
45808 } 47052 }
45809 47053
45810 47054
45811@@ -886,11 +917,13 @@ static int __init kernel_init(void * unu 47055@@ -881,11 +927,13 @@ static int __init kernel_init(void * unu
45812 if (!ramdisk_execute_command) 47056 if (!ramdisk_execute_command)
45813 ramdisk_execute_command = "/init"; 47057 ramdisk_execute_command = "/init";
45814 47058
@@ -45823,9 +47067,9 @@ diff -urNp linux-2.6.32.10/init/main.c linux-2.6.32.10/init/main.c
45823 /* 47067 /*
45824 * Ok, we have completed the initial bootup, and 47068 * Ok, we have completed the initial bootup, and
45825 * we're essentially up and running. Get rid of the 47069 * we're essentially up and running. Get rid of the
45826diff -urNp linux-2.6.32.10/init/noinitramfs.c linux-2.6.32.10/init/noinitramfs.c 47070diff -urNp linux-2.6.32.11/init/noinitramfs.c linux-2.6.32.11/init/noinitramfs.c
45827--- linux-2.6.32.10/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400 47071--- linux-2.6.32.11/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400
45828+++ linux-2.6.32.10/init/noinitramfs.c 2010-03-20 15:58:47.168865970 -0400 47072+++ linux-2.6.32.11/init/noinitramfs.c 2010-04-04 20:46:41.689696132 -0400
45829@@ -29,7 +29,7 @@ static int __init default_rootfs(void) 47073@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
45830 { 47074 {
45831 int err; 47075 int err;
@@ -45844,9 +47088,9 @@ diff -urNp linux-2.6.32.10/init/noinitramfs.c linux-2.6.32.10/init/noinitramfs.c
45844 if (err < 0) 47088 if (err < 0)
45845 goto out; 47089 goto out;
45846 47090
45847diff -urNp linux-2.6.32.10/ipc/ipc_sysctl.c linux-2.6.32.10/ipc/ipc_sysctl.c 47091diff -urNp linux-2.6.32.11/ipc/ipc_sysctl.c linux-2.6.32.11/ipc/ipc_sysctl.c
45848--- linux-2.6.32.10/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 47092--- linux-2.6.32.11/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400
45849+++ linux-2.6.32.10/ipc/ipc_sysctl.c 2010-03-20 15:58:47.168865970 -0400 47093+++ linux-2.6.32.11/ipc/ipc_sysctl.c 2010-04-04 20:46:41.689696132 -0400
45850@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] 47094@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
45851 .extra1 = &zero, 47095 .extra1 = &zero,
45852 .extra2 = &one, 47096 .extra2 = &one,
@@ -45865,9 +47109,9 @@ diff -urNp linux-2.6.32.10/ipc/ipc_sysctl.c linux-2.6.32.10/ipc/ipc_sysctl.c
45865 }; 47109 };
45866 47110
45867 static int __init ipc_sysctl_init(void) 47111 static int __init ipc_sysctl_init(void)
45868diff -urNp linux-2.6.32.10/ipc/mqueue.c linux-2.6.32.10/ipc/mqueue.c 47112diff -urNp linux-2.6.32.11/ipc/mqueue.c linux-2.6.32.11/ipc/mqueue.c
45869--- linux-2.6.32.10/ipc/mqueue.c 2010-03-15 11:52:04.000000000 -0400 47113--- linux-2.6.32.11/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400
45870+++ linux-2.6.32.10/ipc/mqueue.c 2010-03-20 15:58:47.168865970 -0400 47114+++ linux-2.6.32.11/ipc/mqueue.c 2010-04-04 20:46:41.689696132 -0400
45871@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st 47115@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
45872 mq_bytes = (mq_msg_tblsz + 47116 mq_bytes = (mq_msg_tblsz +
45873 (info->attr.mq_maxmsg * info->attr.mq_msgsize)); 47117 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -45876,9 +47120,9 @@ diff -urNp linux-2.6.32.10/ipc/mqueue.c linux-2.6.32.10/ipc/mqueue.c
45876 spin_lock(&mq_lock); 47120 spin_lock(&mq_lock);
45877 if (u->mq_bytes + mq_bytes < u->mq_bytes || 47121 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
45878 u->mq_bytes + mq_bytes > 47122 u->mq_bytes + mq_bytes >
45879diff -urNp linux-2.6.32.10/ipc/shm.c linux-2.6.32.10/ipc/shm.c 47123diff -urNp linux-2.6.32.11/ipc/shm.c linux-2.6.32.11/ipc/shm.c
45880--- linux-2.6.32.10/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400 47124--- linux-2.6.32.11/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400
45881+++ linux-2.6.32.10/ipc/shm.c 2010-03-20 15:58:47.168865970 -0400 47125+++ linux-2.6.32.11/ipc/shm.c 2010-04-04 20:46:41.689696132 -0400
45882@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name 47126@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
45883 static int sysvipc_shm_proc_show(struct seq_file *s, void *it); 47127 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
45884 #endif 47128 #endif
@@ -45931,9 +47175,9 @@ diff -urNp linux-2.6.32.10/ipc/shm.c linux-2.6.32.10/ipc/shm.c
45931 size = i_size_read(path.dentry->d_inode); 47175 size = i_size_read(path.dentry->d_inode);
45932 shm_unlock(shp); 47176 shm_unlock(shp);
45933 47177
45934diff -urNp linux-2.6.32.10/kernel/acct.c linux-2.6.32.10/kernel/acct.c 47178diff -urNp linux-2.6.32.11/kernel/acct.c linux-2.6.32.11/kernel/acct.c
45935--- linux-2.6.32.10/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400 47179--- linux-2.6.32.11/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400
45936+++ linux-2.6.32.10/kernel/acct.c 2010-03-20 15:58:47.168865970 -0400 47180+++ linux-2.6.32.11/kernel/acct.c 2010-04-04 20:46:41.689696132 -0400
45937@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a 47181@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
45938 */ 47182 */
45939 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; 47183 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -45943,9 +47187,9 @@ diff -urNp linux-2.6.32.10/kernel/acct.c linux-2.6.32.10/kernel/acct.c
45943 sizeof(acct_t), &file->f_pos); 47187 sizeof(acct_t), &file->f_pos);
45944 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; 47188 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
45945 set_fs(fs); 47189 set_fs(fs);
45946diff -urNp linux-2.6.32.10/kernel/capability.c linux-2.6.32.10/kernel/capability.c 47190diff -urNp linux-2.6.32.11/kernel/capability.c linux-2.6.32.11/kernel/capability.c
45947--- linux-2.6.32.10/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400 47191--- linux-2.6.32.11/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400
45948+++ linux-2.6.32.10/kernel/capability.c 2010-03-20 15:58:47.168865970 -0400 47192+++ linux-2.6.32.11/kernel/capability.c 2010-04-04 20:46:41.689696132 -0400
45949@@ -306,10 +306,21 @@ int capable(int cap) 47193@@ -306,10 +306,21 @@ int capable(int cap)
45950 BUG(); 47194 BUG();
45951 } 47195 }
@@ -45969,9 +47213,9 @@ diff -urNp linux-2.6.32.10/kernel/capability.c linux-2.6.32.10/kernel/capability
45969+ 47213+
45970 EXPORT_SYMBOL(capable); 47214 EXPORT_SYMBOL(capable);
45971+EXPORT_SYMBOL(capable_nolog); 47215+EXPORT_SYMBOL(capable_nolog);
45972diff -urNp linux-2.6.32.10/kernel/configs.c linux-2.6.32.10/kernel/configs.c 47216diff -urNp linux-2.6.32.11/kernel/configs.c linux-2.6.32.11/kernel/configs.c
45973--- linux-2.6.32.10/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400 47217--- linux-2.6.32.11/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400
45974+++ linux-2.6.32.10/kernel/configs.c 2010-03-20 15:58:47.168865970 -0400 47218+++ linux-2.6.32.11/kernel/configs.c 2010-04-04 20:46:41.689696132 -0400
45975@@ -73,8 +73,19 @@ static int __init ikconfig_init(void) 47219@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
45976 struct proc_dir_entry *entry; 47220 struct proc_dir_entry *entry;
45977 47221
@@ -45992,9 +47236,9 @@ diff -urNp linux-2.6.32.10/kernel/configs.c linux-2.6.32.10/kernel/configs.c
45992 if (!entry) 47236 if (!entry)
45993 return -ENOMEM; 47237 return -ENOMEM;
45994 47238
45995diff -urNp linux-2.6.32.10/kernel/cpu.c linux-2.6.32.10/kernel/cpu.c 47239diff -urNp linux-2.6.32.11/kernel/cpu.c linux-2.6.32.11/kernel/cpu.c
45996--- linux-2.6.32.10/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400 47240--- linux-2.6.32.11/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400
45997+++ linux-2.6.32.10/kernel/cpu.c 2010-03-20 15:58:47.168865970 -0400 47241+++ linux-2.6.32.11/kernel/cpu.c 2010-04-04 20:46:41.689696132 -0400
45998@@ -19,7 +19,7 @@ 47242@@ -19,7 +19,7 @@
45999 /* Serializes the updates to cpu_online_mask, cpu_present_mask */ 47243 /* Serializes the updates to cpu_online_mask, cpu_present_mask */
46000 static DEFINE_MUTEX(cpu_add_remove_lock); 47244 static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -46004,9 +47248,9 @@ diff -urNp linux-2.6.32.10/kernel/cpu.c linux-2.6.32.10/kernel/cpu.c
46004 47248
46005 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. 47249 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
46006 * Should always be manipulated under cpu_add_remove_lock 47250 * Should always be manipulated under cpu_add_remove_lock
46007diff -urNp linux-2.6.32.10/kernel/cred.c linux-2.6.32.10/kernel/cred.c 47251diff -urNp linux-2.6.32.11/kernel/cred.c linux-2.6.32.11/kernel/cred.c
46008--- linux-2.6.32.10/kernel/cred.c 2010-03-15 11:52:04.000000000 -0400 47252--- linux-2.6.32.11/kernel/cred.c 2010-03-15 11:52:04.000000000 -0400
46009+++ linux-2.6.32.10/kernel/cred.c 2010-03-20 15:58:47.174047356 -0400 47253+++ linux-2.6.32.11/kernel/cred.c 2010-04-04 20:46:41.689696132 -0400
46010@@ -520,6 +520,8 @@ int commit_creds(struct cred *new) 47254@@ -520,6 +520,8 @@ int commit_creds(struct cred *new)
46011 47255
46012 get_cred(new); /* we will require a ref for the subj creds too */ 47256 get_cred(new); /* we will require a ref for the subj creds too */
@@ -46016,9 +47260,9 @@ diff -urNp linux-2.6.32.10/kernel/cred.c linux-2.6.32.10/kernel/cred.c
46016 /* dumpability changes */ 47260 /* dumpability changes */
46017 if (old->euid != new->euid || 47261 if (old->euid != new->euid ||
46018 old->egid != new->egid || 47262 old->egid != new->egid ||
46019diff -urNp linux-2.6.32.10/kernel/exit.c linux-2.6.32.10/kernel/exit.c 47263diff -urNp linux-2.6.32.11/kernel/exit.c linux-2.6.32.11/kernel/exit.c
46020--- linux-2.6.32.10/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400 47264--- linux-2.6.32.11/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400
46021+++ linux-2.6.32.10/kernel/exit.c 2010-03-20 15:58:47.174047356 -0400 47265+++ linux-2.6.32.11/kernel/exit.c 2010-04-04 20:46:41.689696132 -0400
46022@@ -56,6 +56,10 @@ 47266@@ -56,6 +56,10 @@
46023 #include <asm/mmu_context.h> 47267 #include <asm/mmu_context.h>
46024 #include "cred-internals.h" 47268 #include "cred-internals.h"
@@ -46108,9 +47352,9 @@ diff -urNp linux-2.6.32.10/kernel/exit.c linux-2.6.32.10/kernel/exit.c
46108 47352
46109 get_task_struct(p); 47353 get_task_struct(p);
46110 read_unlock(&tasklist_lock); 47354 read_unlock(&tasklist_lock);
46111diff -urNp linux-2.6.32.10/kernel/fork.c linux-2.6.32.10/kernel/fork.c 47355diff -urNp linux-2.6.32.11/kernel/fork.c linux-2.6.32.11/kernel/fork.c
46112--- linux-2.6.32.10/kernel/fork.c 2010-03-15 11:52:04.000000000 -0400 47356--- linux-2.6.32.11/kernel/fork.c 2010-03-15 11:52:04.000000000 -0400
46113+++ linux-2.6.32.10/kernel/fork.c 2010-03-20 15:58:47.174047356 -0400 47357+++ linux-2.6.32.11/kernel/fork.c 2010-04-04 20:46:41.689696132 -0400
46114@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru 47358@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
46115 *stackend = STACK_END_MAGIC; /* for overflow detection */ 47359 *stackend = STACK_END_MAGIC; /* for overflow detection */
46116 47360
@@ -46263,9 +47507,9 @@ diff -urNp linux-2.6.32.10/kernel/fork.c linux-2.6.32.10/kernel/fork.c
46263 } 47507 }
46264 47508
46265 if (new_mm) { 47509 if (new_mm) {
46266diff -urNp linux-2.6.32.10/kernel/futex.c linux-2.6.32.10/kernel/futex.c 47510diff -urNp linux-2.6.32.11/kernel/futex.c linux-2.6.32.11/kernel/futex.c
46267--- linux-2.6.32.10/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400 47511--- linux-2.6.32.11/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400
46268+++ linux-2.6.32.10/kernel/futex.c 2010-03-20 15:58:47.174047356 -0400 47512+++ linux-2.6.32.11/kernel/futex.c 2010-04-04 20:46:41.689696132 -0400
46269@@ -54,6 +54,7 @@ 47513@@ -54,6 +54,7 @@
46270 #include <linux/mount.h> 47514 #include <linux/mount.h>
46271 #include <linux/pagemap.h> 47515 #include <linux/pagemap.h>
@@ -46333,9 +47577,9 @@ diff -urNp linux-2.6.32.10/kernel/futex.c linux-2.6.32.10/kernel/futex.c
46333 { 47577 {
46334 unsigned long uentry; 47578 unsigned long uentry;
46335 47579
46336diff -urNp linux-2.6.32.10/kernel/futex_compat.c linux-2.6.32.10/kernel/futex_compat.c 47580diff -urNp linux-2.6.32.11/kernel/futex_compat.c linux-2.6.32.11/kernel/futex_compat.c
46337--- linux-2.6.32.10/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400 47581--- linux-2.6.32.11/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400
46338+++ linux-2.6.32.10/kernel/futex_compat.c 2010-03-20 15:58:47.174047356 -0400 47582+++ linux-2.6.32.11/kernel/futex_compat.c 2010-04-04 20:46:41.693491350 -0400
46339@@ -10,6 +10,7 @@ 47583@@ -10,6 +10,7 @@
46340 #include <linux/compat.h> 47584 #include <linux/compat.h>
46341 #include <linux/nsproxy.h> 47585 #include <linux/nsproxy.h>
@@ -46373,9 +47617,9 @@ diff -urNp linux-2.6.32.10/kernel/futex_compat.c linux-2.6.32.10/kernel/futex_co
46373 head = p->compat_robust_list; 47617 head = p->compat_robust_list;
46374 read_unlock(&tasklist_lock); 47618 read_unlock(&tasklist_lock);
46375 } 47619 }
46376diff -urNp linux-2.6.32.10/kernel/gcov/base.c linux-2.6.32.10/kernel/gcov/base.c 47620diff -urNp linux-2.6.32.11/kernel/gcov/base.c linux-2.6.32.11/kernel/gcov/base.c
46377--- linux-2.6.32.10/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400 47621--- linux-2.6.32.11/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400
46378+++ linux-2.6.32.10/kernel/gcov/base.c 2010-03-20 15:58:47.174047356 -0400 47622+++ linux-2.6.32.11/kernel/gcov/base.c 2010-04-04 20:46:41.693491350 -0400
46379@@ -102,11 +102,6 @@ void gcov_enable_events(void) 47623@@ -102,11 +102,6 @@ void gcov_enable_events(void)
46380 } 47624 }
46381 47625
@@ -46397,10 +47641,10 @@ diff -urNp linux-2.6.32.10/kernel/gcov/base.c linux-2.6.32.10/kernel/gcov/base.c
46397 if (prev) 47641 if (prev)
46398 prev->next = info->next; 47642 prev->next = info->next;
46399 else 47643 else
46400diff -urNp linux-2.6.32.10/kernel/hrtimer.c linux-2.6.32.10/kernel/hrtimer.c 47644diff -urNp linux-2.6.32.11/kernel/hrtimer.c linux-2.6.32.11/kernel/hrtimer.c
46401--- linux-2.6.32.10/kernel/hrtimer.c 2010-03-15 11:52:04.000000000 -0400 47645--- linux-2.6.32.11/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400
46402+++ linux-2.6.32.10/kernel/hrtimer.c 2010-03-20 15:58:47.174047356 -0400 47646+++ linux-2.6.32.11/kernel/hrtimer.c 2010-04-04 20:46:41.693491350 -0400
46403@@ -1364,7 +1364,7 @@ void hrtimer_peek_ahead_timers(void) 47647@@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void)
46404 local_irq_restore(flags); 47648 local_irq_restore(flags);
46405 } 47649 }
46406 47650
@@ -46409,9 +47653,9 @@ diff -urNp linux-2.6.32.10/kernel/hrtimer.c linux-2.6.32.10/kernel/hrtimer.c
46409 { 47653 {
46410 hrtimer_peek_ahead_timers(); 47654 hrtimer_peek_ahead_timers();
46411 } 47655 }
46412diff -urNp linux-2.6.32.10/kernel/kallsyms.c linux-2.6.32.10/kernel/kallsyms.c 47656diff -urNp linux-2.6.32.11/kernel/kallsyms.c linux-2.6.32.11/kernel/kallsyms.c
46413--- linux-2.6.32.10/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 47657--- linux-2.6.32.11/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400
46414+++ linux-2.6.32.10/kernel/kallsyms.c 2010-03-20 15:58:47.174047356 -0400 47658+++ linux-2.6.32.11/kernel/kallsyms.c 2010-04-04 20:46:41.693491350 -0400
46415@@ -11,6 +11,9 @@ 47659@@ -11,6 +11,9 @@
46416 * Changed the compression method from stem compression to "table lookup" 47660 * Changed the compression method from stem compression to "table lookup"
46417 * compression (see scripts/kallsyms.c for a more complete description) 47661 * compression (see scripts/kallsyms.c for a more complete description)
@@ -46486,9 +47730,9 @@ diff -urNp linux-2.6.32.10/kernel/kallsyms.c linux-2.6.32.10/kernel/kallsyms.c
46486 if (!iter) 47730 if (!iter)
46487 return -ENOMEM; 47731 return -ENOMEM;
46488 reset_iter(iter, 0); 47732 reset_iter(iter, 0);
46489diff -urNp linux-2.6.32.10/kernel/kgdb.c linux-2.6.32.10/kernel/kgdb.c 47733diff -urNp linux-2.6.32.11/kernel/kgdb.c linux-2.6.32.11/kernel/kgdb.c
46490--- linux-2.6.32.10/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 47734--- linux-2.6.32.11/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
46491+++ linux-2.6.32.10/kernel/kgdb.c 2010-03-20 15:58:47.174047356 -0400 47735+++ linux-2.6.32.11/kernel/kgdb.c 2010-04-04 20:46:41.693491350 -0400
46492@@ -86,7 +86,7 @@ static int kgdb_io_module_registered; 47736@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
46493 /* Guard for recursive entry */ 47737 /* Guard for recursive entry */
46494 static int exception_level; 47738 static int exception_level;
@@ -46516,9 +47760,9 @@ diff -urNp linux-2.6.32.10/kernel/kgdb.c linux-2.6.32.10/kernel/kgdb.c
46516 { 47760 {
46517 BUG_ON(kgdb_connected); 47761 BUG_ON(kgdb_connected);
46518 47762
46519diff -urNp linux-2.6.32.10/kernel/kmod.c linux-2.6.32.10/kernel/kmod.c 47763diff -urNp linux-2.6.32.11/kernel/kmod.c linux-2.6.32.11/kernel/kmod.c
46520--- linux-2.6.32.10/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400 47764--- linux-2.6.32.11/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400
46521+++ linux-2.6.32.10/kernel/kmod.c 2010-03-20 15:58:47.174047356 -0400 47765+++ linux-2.6.32.11/kernel/kmod.c 2010-04-04 20:46:41.693491350 -0400
46522@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch 47766@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
46523 if (ret >= MODULE_NAME_LEN) 47767 if (ret >= MODULE_NAME_LEN)
46524 return -ENAMETOOLONG; 47768 return -ENAMETOOLONG;
@@ -46538,9 +47782,9 @@ diff -urNp linux-2.6.32.10/kernel/kmod.c linux-2.6.32.10/kernel/kmod.c
46538 /* If modprobe needs a service that is in a module, we get a recursive 47782 /* If modprobe needs a service that is in a module, we get a recursive
46539 * loop. Limit the number of running kmod threads to max_threads/2 or 47783 * loop. Limit the number of running kmod threads to max_threads/2 or
46540 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method 47784 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
46541diff -urNp linux-2.6.32.10/kernel/kprobes.c linux-2.6.32.10/kernel/kprobes.c 47785diff -urNp linux-2.6.32.11/kernel/kprobes.c linux-2.6.32.11/kernel/kprobes.c
46542--- linux-2.6.32.10/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 47786--- linux-2.6.32.11/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400
46543+++ linux-2.6.32.10/kernel/kprobes.c 2010-03-20 15:58:47.174047356 -0400 47787+++ linux-2.6.32.11/kernel/kprobes.c 2010-04-04 20:46:41.693491350 -0400
46544@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ 47788@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
46545 * kernel image and loaded module images reside. This is required 47789 * kernel image and loaded module images reside. This is required
46546 * so x86_64 can correctly handle the %rip-relative fixups. 47790 * so x86_64 can correctly handle the %rip-relative fixups.
@@ -46559,9 +47803,9 @@ diff -urNp linux-2.6.32.10/kernel/kprobes.c linux-2.6.32.10/kernel/kprobes.c
46559 kfree(kip); 47803 kfree(kip);
46560 } 47804 }
46561 return 1; 47805 return 1;
46562diff -urNp linux-2.6.32.10/kernel/lockdep.c linux-2.6.32.10/kernel/lockdep.c 47806diff -urNp linux-2.6.32.11/kernel/lockdep.c linux-2.6.32.11/kernel/lockdep.c
46563--- linux-2.6.32.10/kernel/lockdep.c 2010-03-15 11:52:04.000000000 -0400 47807--- linux-2.6.32.11/kernel/lockdep.c 2010-03-15 11:52:04.000000000 -0400
46564+++ linux-2.6.32.10/kernel/lockdep.c 2010-03-20 15:58:47.178057776 -0400 47808+++ linux-2.6.32.11/kernel/lockdep.c 2010-04-04 20:46:41.693491350 -0400
46565@@ -577,6 +577,10 @@ static int static_obj(void *obj) 47809@@ -577,6 +577,10 @@ static int static_obj(void *obj)
46566 int i; 47810 int i;
46567 #endif 47811 #endif
@@ -46591,9 +47835,9 @@ diff -urNp linux-2.6.32.10/kernel/lockdep.c linux-2.6.32.10/kernel/lockdep.c
46591 printk("the code is fine but needs lockdep annotation.\n"); 47835 printk("the code is fine but needs lockdep annotation.\n");
46592 printk("turning off the locking correctness validator.\n"); 47836 printk("turning off the locking correctness validator.\n");
46593 dump_stack(); 47837 dump_stack();
46594diff -urNp linux-2.6.32.10/kernel/module.c linux-2.6.32.10/kernel/module.c 47838diff -urNp linux-2.6.32.11/kernel/module.c linux-2.6.32.11/kernel/module.c
46595--- linux-2.6.32.10/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 47839--- linux-2.6.32.11/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
46596+++ linux-2.6.32.10/kernel/module.c 2010-03-20 15:58:47.178057776 -0400 47840+++ linux-2.6.32.11/kernel/module.c 2010-04-04 20:46:41.693491350 -0400
46597@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq 47841@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
46598 static BLOCKING_NOTIFIER_HEAD(module_notify_list); 47842 static BLOCKING_NOTIFIER_HEAD(module_notify_list);
46599 47843
@@ -47133,9 +48377,9 @@ diff -urNp linux-2.6.32.10/kernel/module.c linux-2.6.32.10/kernel/module.c
47133 mod = NULL; 48377 mod = NULL;
47134 } 48378 }
47135 return mod; 48379 return mod;
47136diff -urNp linux-2.6.32.10/kernel/panic.c linux-2.6.32.10/kernel/panic.c 48380diff -urNp linux-2.6.32.11/kernel/panic.c linux-2.6.32.11/kernel/panic.c
47137--- linux-2.6.32.10/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400 48381--- linux-2.6.32.11/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400
47138+++ linux-2.6.32.10/kernel/panic.c 2010-03-20 15:58:47.178057776 -0400 48382+++ linux-2.6.32.11/kernel/panic.c 2010-04-04 20:46:41.693491350 -0400
47139@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); 48383@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
47140 */ 48384 */
47141 void __stack_chk_fail(void) 48385 void __stack_chk_fail(void)
@@ -47146,9 +48390,9 @@ diff -urNp linux-2.6.32.10/kernel/panic.c linux-2.6.32.10/kernel/panic.c
47146 __builtin_return_address(0)); 48390 __builtin_return_address(0));
47147 } 48391 }
47148 EXPORT_SYMBOL(__stack_chk_fail); 48392 EXPORT_SYMBOL(__stack_chk_fail);
47149diff -urNp linux-2.6.32.10/kernel/params.c linux-2.6.32.10/kernel/params.c 48393diff -urNp linux-2.6.32.11/kernel/params.c linux-2.6.32.11/kernel/params.c
47150--- linux-2.6.32.10/kernel/params.c 2010-03-15 11:52:04.000000000 -0400 48394--- linux-2.6.32.11/kernel/params.c 2010-03-15 11:52:04.000000000 -0400
47151+++ linux-2.6.32.10/kernel/params.c 2010-03-20 15:58:47.178057776 -0400 48395+++ linux-2.6.32.11/kernel/params.c 2010-04-04 20:46:41.693491350 -0400
47152@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct 48396@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
47153 return ret; 48397 return ret;
47154 } 48398 }
@@ -47167,9 +48411,9 @@ diff -urNp linux-2.6.32.10/kernel/params.c linux-2.6.32.10/kernel/params.c
47167 .filter = uevent_filter, 48411 .filter = uevent_filter,
47168 }; 48412 };
47169 48413
47170diff -urNp linux-2.6.32.10/kernel/pid.c linux-2.6.32.10/kernel/pid.c 48414diff -urNp linux-2.6.32.11/kernel/pid.c linux-2.6.32.11/kernel/pid.c
47171--- linux-2.6.32.10/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400 48415--- linux-2.6.32.11/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400
47172+++ linux-2.6.32.10/kernel/pid.c 2010-03-20 15:58:47.178057776 -0400 48416+++ linux-2.6.32.11/kernel/pid.c 2010-04-04 20:46:41.693491350 -0400
47173@@ -33,6 +33,7 @@ 48417@@ -33,6 +33,7 @@
47174 #include <linux/rculist.h> 48418 #include <linux/rculist.h>
47175 #include <linux/bootmem.h> 48419 #include <linux/bootmem.h>
@@ -47203,9 +48447,9 @@ diff -urNp linux-2.6.32.10/kernel/pid.c linux-2.6.32.10/kernel/pid.c
47203 } 48447 }
47204 48448
47205 struct task_struct *find_task_by_vpid(pid_t vnr) 48449 struct task_struct *find_task_by_vpid(pid_t vnr)
47206diff -urNp linux-2.6.32.10/kernel/posix-cpu-timers.c linux-2.6.32.10/kernel/posix-cpu-timers.c 48450diff -urNp linux-2.6.32.11/kernel/posix-cpu-timers.c linux-2.6.32.11/kernel/posix-cpu-timers.c
47207--- linux-2.6.32.10/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400 48451--- linux-2.6.32.11/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400
47208+++ linux-2.6.32.10/kernel/posix-cpu-timers.c 2010-03-20 15:58:47.178057776 -0400 48452+++ linux-2.6.32.11/kernel/posix-cpu-timers.c 2010-04-04 20:46:41.697788265 -0400
47209@@ -6,6 +6,7 @@ 48453@@ -6,6 +6,7 @@
47210 #include <linux/posix-timers.h> 48454 #include <linux/posix-timers.h>
47211 #include <linux/errno.h> 48455 #include <linux/errno.h>
@@ -47230,9 +48474,9 @@ diff -urNp linux-2.6.32.10/kernel/posix-cpu-timers.c linux-2.6.32.10/kernel/posi
47230 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { 48474 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) {
47231 /* 48475 /*
47232 * At the soft limit, send a SIGXCPU every second. 48476 * At the soft limit, send a SIGXCPU every second.
47233diff -urNp linux-2.6.32.10/kernel/power/hibernate.c linux-2.6.32.10/kernel/power/hibernate.c 48477diff -urNp linux-2.6.32.11/kernel/power/hibernate.c linux-2.6.32.11/kernel/power/hibernate.c
47234--- linux-2.6.32.10/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400 48478--- linux-2.6.32.11/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400
47235+++ linux-2.6.32.10/kernel/power/hibernate.c 2010-03-20 15:58:47.178057776 -0400 48479+++ linux-2.6.32.11/kernel/power/hibernate.c 2010-04-04 20:46:41.697788265 -0400
47236@@ -48,14 +48,14 @@ enum { 48480@@ -48,14 +48,14 @@ enum {
47237 48481
47238 static int hibernation_mode = HIBERNATION_SHUTDOWN; 48482 static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -47250,9 +48494,9 @@ diff -urNp linux-2.6.32.10/kernel/power/hibernate.c linux-2.6.32.10/kernel/power
47250 { 48494 {
47251 if (ops && !(ops->begin && ops->end && ops->pre_snapshot 48495 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
47252 && ops->prepare && ops->finish && ops->enter && ops->pre_restore 48496 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
47253diff -urNp linux-2.6.32.10/kernel/power/poweroff.c linux-2.6.32.10/kernel/power/poweroff.c 48497diff -urNp linux-2.6.32.11/kernel/power/poweroff.c linux-2.6.32.11/kernel/power/poweroff.c
47254--- linux-2.6.32.10/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400 48498--- linux-2.6.32.11/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400
47255+++ linux-2.6.32.10/kernel/power/poweroff.c 2010-03-20 15:58:47.178057776 -0400 48499+++ linux-2.6.32.11/kernel/power/poweroff.c 2010-04-04 20:46:41.697788265 -0400
47256@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof 48500@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
47257 .enable_mask = SYSRQ_ENABLE_BOOT, 48501 .enable_mask = SYSRQ_ENABLE_BOOT,
47258 }; 48502 };
@@ -47262,9 +48506,9 @@ diff -urNp linux-2.6.32.10/kernel/power/poweroff.c linux-2.6.32.10/kernel/power/
47262 { 48506 {
47263 register_sysrq_key('o', &sysrq_poweroff_op); 48507 register_sysrq_key('o', &sysrq_poweroff_op);
47264 return 0; 48508 return 0;
47265diff -urNp linux-2.6.32.10/kernel/power/process.c linux-2.6.32.10/kernel/power/process.c 48509diff -urNp linux-2.6.32.11/kernel/power/process.c linux-2.6.32.11/kernel/power/process.c
47266--- linux-2.6.32.10/kernel/power/process.c 2010-03-15 11:52:04.000000000 -0400 48510--- linux-2.6.32.11/kernel/power/process.c 2010-03-15 11:52:04.000000000 -0400
47267+++ linux-2.6.32.10/kernel/power/process.c 2010-03-20 15:58:47.178057776 -0400 48511+++ linux-2.6.32.11/kernel/power/process.c 2010-04-04 20:46:41.697788265 -0400
47268@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ 48512@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
47269 struct timeval start, end; 48513 struct timeval start, end;
47270 u64 elapsed_csecs64; 48514 u64 elapsed_csecs64;
@@ -47304,9 +48548,9 @@ diff -urNp linux-2.6.32.10/kernel/power/process.c linux-2.6.32.10/kernel/power/p
47304 48548
47305 do_gettimeofday(&end); 48549 do_gettimeofday(&end);
47306 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); 48550 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
47307diff -urNp linux-2.6.32.10/kernel/power/suspend.c linux-2.6.32.10/kernel/power/suspend.c 48551diff -urNp linux-2.6.32.11/kernel/power/suspend.c linux-2.6.32.11/kernel/power/suspend.c
47308--- linux-2.6.32.10/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400 48552--- linux-2.6.32.11/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400
47309+++ linux-2.6.32.10/kernel/power/suspend.c 2010-03-20 15:58:47.178057776 -0400 48553+++ linux-2.6.32.11/kernel/power/suspend.c 2010-04-04 20:46:41.697788265 -0400
47310@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M 48554@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
47311 [PM_SUSPEND_MEM] = "mem", 48555 [PM_SUSPEND_MEM] = "mem",
47312 }; 48556 };
@@ -47323,9 +48567,9 @@ diff -urNp linux-2.6.32.10/kernel/power/suspend.c linux-2.6.32.10/kernel/power/s
47323 { 48567 {
47324 mutex_lock(&pm_mutex); 48568 mutex_lock(&pm_mutex);
47325 suspend_ops = ops; 48569 suspend_ops = ops;
47326diff -urNp linux-2.6.32.10/kernel/printk.c linux-2.6.32.10/kernel/printk.c 48570diff -urNp linux-2.6.32.11/kernel/printk.c linux-2.6.32.11/kernel/printk.c
47327--- linux-2.6.32.10/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400 48571--- linux-2.6.32.11/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400
47328+++ linux-2.6.32.10/kernel/printk.c 2010-03-20 15:58:47.180647899 -0400 48572+++ linux-2.6.32.11/kernel/printk.c 2010-04-04 20:46:41.697788265 -0400
47329@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf 48573@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
47330 char c; 48574 char c;
47331 int error = 0; 48575 int error = 0;
@@ -47338,9 +48582,9 @@ diff -urNp linux-2.6.32.10/kernel/printk.c linux-2.6.32.10/kernel/printk.c
47338 error = security_syslog(type); 48582 error = security_syslog(type);
47339 if (error) 48583 if (error)
47340 return error; 48584 return error;
47341diff -urNp linux-2.6.32.10/kernel/ptrace.c linux-2.6.32.10/kernel/ptrace.c 48585diff -urNp linux-2.6.32.11/kernel/ptrace.c linux-2.6.32.11/kernel/ptrace.c
47342--- linux-2.6.32.10/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 48586--- linux-2.6.32.11/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400
47343+++ linux-2.6.32.10/kernel/ptrace.c 2010-03-20 15:58:47.180647899 -0400 48587+++ linux-2.6.32.11/kernel/ptrace.c 2010-04-04 20:46:41.697788265 -0400
47344@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru 48588@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
47345 cred->gid != tcred->egid || 48589 cred->gid != tcred->egid ||
47346 cred->gid != tcred->sgid || 48590 cred->gid != tcred->sgid ||
@@ -47422,9 +48666,9 @@ diff -urNp linux-2.6.32.10/kernel/ptrace.c linux-2.6.32.10/kernel/ptrace.c
47422 } 48666 }
47423 48667
47424 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) 48668 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
47425diff -urNp linux-2.6.32.10/kernel/rcutree.c linux-2.6.32.10/kernel/rcutree.c 48669diff -urNp linux-2.6.32.11/kernel/rcutree.c linux-2.6.32.11/kernel/rcutree.c
47426--- linux-2.6.32.10/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400 48670--- linux-2.6.32.11/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400
47427+++ linux-2.6.32.10/kernel/rcutree.c 2010-03-20 15:58:47.180647899 -0400 48671+++ linux-2.6.32.11/kernel/rcutree.c 2010-04-04 20:46:41.697788265 -0400
47428@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state 48672@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
47429 /* 48673 /*
47430 * Do softirq processing for the current CPU. 48674 * Do softirq processing for the current CPU.
@@ -47434,9 +48678,9 @@ diff -urNp linux-2.6.32.10/kernel/rcutree.c linux-2.6.32.10/kernel/rcutree.c
47434 { 48678 {
47435 /* 48679 /*
47436 * Memory references from any prior RCU read-side critical sections 48680 * Memory references from any prior RCU read-side critical sections
47437diff -urNp linux-2.6.32.10/kernel/relay.c linux-2.6.32.10/kernel/relay.c 48681diff -urNp linux-2.6.32.11/kernel/relay.c linux-2.6.32.11/kernel/relay.c
47438--- linux-2.6.32.10/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400 48682--- linux-2.6.32.11/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400
47439+++ linux-2.6.32.10/kernel/relay.c 2010-03-20 15:58:47.180647899 -0400 48683+++ linux-2.6.32.11/kernel/relay.c 2010-04-04 20:46:41.697788265 -0400
47440@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi 48684@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi
47441 return 0; 48685 return 0;
47442 48686
@@ -47446,9 +48690,9 @@ diff -urNp linux-2.6.32.10/kernel/relay.c linux-2.6.32.10/kernel/relay.c
47446 return ret; 48690 return ret;
47447 48691
47448 if (read_start + ret == nonpad_end) 48692 if (read_start + ret == nonpad_end)
47449diff -urNp linux-2.6.32.10/kernel/resource.c linux-2.6.32.10/kernel/resource.c 48693diff -urNp linux-2.6.32.11/kernel/resource.c linux-2.6.32.11/kernel/resource.c
47450--- linux-2.6.32.10/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400 48694--- linux-2.6.32.11/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400
47451+++ linux-2.6.32.10/kernel/resource.c 2010-03-20 15:58:47.180647899 -0400 48695+++ linux-2.6.32.11/kernel/resource.c 2010-04-04 20:46:41.697788265 -0400
47452@@ -132,8 +132,18 @@ static const struct file_operations proc 48696@@ -132,8 +132,18 @@ static const struct file_operations proc
47453 48697
47454 static int __init ioresources_init(void) 48698 static int __init ioresources_init(void)
@@ -47468,10 +48712,10 @@ diff -urNp linux-2.6.32.10/kernel/resource.c linux-2.6.32.10/kernel/resource.c
47468 return 0; 48712 return 0;
47469 } 48713 }
47470 __initcall(ioresources_init); 48714 __initcall(ioresources_init);
47471diff -urNp linux-2.6.32.10/kernel/sched.c linux-2.6.32.10/kernel/sched.c 48715diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c
47472--- linux-2.6.32.10/kernel/sched.c 2010-03-15 11:52:04.000000000 -0400 48716--- linux-2.6.32.11/kernel/sched.c 2010-04-04 20:41:50.068477203 -0400
47473+++ linux-2.6.32.10/kernel/sched.c 2010-03-20 15:58:47.180647899 -0400 48717+++ linux-2.6.32.11/kernel/sched.c 2010-04-04 20:46:41.697788265 -0400
47474@@ -4833,7 +4833,7 @@ out: 48718@@ -4843,7 +4843,7 @@ out:
47475 * In CONFIG_NO_HZ case, the idle load balance owner will do the 48719 * In CONFIG_NO_HZ case, the idle load balance owner will do the
47476 * rebalancing for all the cpus for whom scheduler ticks are stopped. 48720 * rebalancing for all the cpus for whom scheduler ticks are stopped.
47477 */ 48721 */
@@ -47480,7 +48724,7 @@ diff -urNp linux-2.6.32.10/kernel/sched.c linux-2.6.32.10/kernel/sched.c
47480 { 48724 {
47481 int this_cpu = smp_processor_id(); 48725 int this_cpu = smp_processor_id();
47482 struct rq *this_rq = cpu_rq(this_cpu); 48726 struct rq *this_rq = cpu_rq(this_cpu);
47483@@ -6102,6 +6102,8 @@ int can_nice(const struct task_struct *p 48727@@ -6112,6 +6112,8 @@ int can_nice(const struct task_struct *p
47484 /* convert nice value [19,-20] to rlimit style value [1,40] */ 48728 /* convert nice value [19,-20] to rlimit style value [1,40] */
47485 int nice_rlim = 20 - nice; 48729 int nice_rlim = 20 - nice;
47486 48730
@@ -47489,7 +48733,7 @@ diff -urNp linux-2.6.32.10/kernel/sched.c linux-2.6.32.10/kernel/sched.c
47489 return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || 48733 return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
47490 capable(CAP_SYS_NICE)); 48734 capable(CAP_SYS_NICE));
47491 } 48735 }
47492@@ -6135,7 +6137,8 @@ SYSCALL_DEFINE1(nice, int, increment) 48736@@ -6145,7 +6147,8 @@ SYSCALL_DEFINE1(nice, int, increment)
47493 if (nice > 19) 48737 if (nice > 19)
47494 nice = 19; 48738 nice = 19;
47495 48739
@@ -47499,7 +48743,7 @@ diff -urNp linux-2.6.32.10/kernel/sched.c linux-2.6.32.10/kernel/sched.c
47499 return -EPERM; 48743 return -EPERM;
47500 48744
47501 retval = security_task_setnice(current, nice); 48745 retval = security_task_setnice(current, nice);
47502@@ -6285,6 +6288,8 @@ recheck: 48746@@ -6295,6 +6298,8 @@ recheck:
47503 if (rt_policy(policy)) { 48747 if (rt_policy(policy)) {
47504 unsigned long rlim_rtprio; 48748 unsigned long rlim_rtprio;
47505 48749
@@ -47508,7 +48752,7 @@ diff -urNp linux-2.6.32.10/kernel/sched.c linux-2.6.32.10/kernel/sched.c
47508 if (!lock_task_sighand(p, &flags)) 48752 if (!lock_task_sighand(p, &flags))
47509 return -ESRCH; 48753 return -ESRCH;
47510 rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur; 48754 rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur;
47511@@ -7437,7 +7442,7 @@ static struct ctl_table sd_ctl_dir[] = { 48755@@ -7447,7 +7452,7 @@ static struct ctl_table sd_ctl_dir[] = {
47512 .procname = "sched_domain", 48756 .procname = "sched_domain",
47513 .mode = 0555, 48757 .mode = 0555,
47514 }, 48758 },
@@ -47517,7 +48761,7 @@ diff -urNp linux-2.6.32.10/kernel/sched.c linux-2.6.32.10/kernel/sched.c
47517 }; 48761 };
47518 48762
47519 static struct ctl_table sd_ctl_root[] = { 48763 static struct ctl_table sd_ctl_root[] = {
47520@@ -7447,7 +7452,7 @@ static struct ctl_table sd_ctl_root[] = 48764@@ -7457,7 +7462,7 @@ static struct ctl_table sd_ctl_root[] =
47521 .mode = 0555, 48765 .mode = 0555,
47522 .child = sd_ctl_dir, 48766 .child = sd_ctl_dir,
47523 }, 48767 },
@@ -47526,9 +48770,9 @@ diff -urNp linux-2.6.32.10/kernel/sched.c linux-2.6.32.10/kernel/sched.c
47526 }; 48770 };
47527 48771
47528 static struct ctl_table *sd_alloc_ctl_entry(int n) 48772 static struct ctl_table *sd_alloc_ctl_entry(int n)
47529diff -urNp linux-2.6.32.10/kernel/signal.c linux-2.6.32.10/kernel/signal.c 48773diff -urNp linux-2.6.32.11/kernel/signal.c linux-2.6.32.11/kernel/signal.c
47530--- linux-2.6.32.10/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 48774--- linux-2.6.32.11/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400
47531+++ linux-2.6.32.10/kernel/signal.c 2010-03-20 15:58:47.180647899 -0400 48775+++ linux-2.6.32.11/kernel/signal.c 2010-04-04 20:46:41.701624986 -0400
47532@@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc 48776@@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc
47533 */ 48777 */
47534 user = get_uid(__task_cred(t)->user); 48778 user = get_uid(__task_cred(t)->user);
@@ -47581,9 +48825,9 @@ diff -urNp linux-2.6.32.10/kernel/signal.c linux-2.6.32.10/kernel/signal.c
47581 48825
47582 return ret; 48826 return ret;
47583 } 48827 }
47584diff -urNp linux-2.6.32.10/kernel/smp.c linux-2.6.32.10/kernel/smp.c 48828diff -urNp linux-2.6.32.11/kernel/smp.c linux-2.6.32.11/kernel/smp.c
47585--- linux-2.6.32.10/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400 48829--- linux-2.6.32.11/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400
47586+++ linux-2.6.32.10/kernel/smp.c 2010-03-20 15:58:47.180647899 -0400 48830+++ linux-2.6.32.11/kernel/smp.c 2010-04-04 20:46:41.701624986 -0400
47587@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void 48831@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void
47588 } 48832 }
47589 EXPORT_SYMBOL(smp_call_function); 48833 EXPORT_SYMBOL(smp_call_function);
@@ -47611,9 +48855,9 @@ diff -urNp linux-2.6.32.10/kernel/smp.c linux-2.6.32.10/kernel/smp.c
47611 { 48855 {
47612 spin_unlock_irq(&call_function.lock); 48856 spin_unlock_irq(&call_function.lock);
47613 } 48857 }
47614diff -urNp linux-2.6.32.10/kernel/softirq.c linux-2.6.32.10/kernel/softirq.c 48858diff -urNp linux-2.6.32.11/kernel/softirq.c linux-2.6.32.11/kernel/softirq.c
47615--- linux-2.6.32.10/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400 48859--- linux-2.6.32.11/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400
47616+++ linux-2.6.32.10/kernel/softirq.c 2010-03-20 15:58:47.180647899 -0400 48860+++ linux-2.6.32.11/kernel/softirq.c 2010-04-04 20:46:41.701624986 -0400
47617@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec 48861@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
47618 48862
47619 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); 48863 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -47668,9 +48912,9 @@ diff -urNp linux-2.6.32.10/kernel/softirq.c linux-2.6.32.10/kernel/softirq.c
47668 { 48912 {
47669 struct tasklet_struct *list; 48913 struct tasklet_struct *list;
47670 48914
47671diff -urNp linux-2.6.32.10/kernel/sys.c linux-2.6.32.10/kernel/sys.c 48915diff -urNp linux-2.6.32.11/kernel/sys.c linux-2.6.32.11/kernel/sys.c
47672--- linux-2.6.32.10/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400 48916--- linux-2.6.32.11/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400
47673+++ linux-2.6.32.10/kernel/sys.c 2010-03-20 15:58:47.180647899 -0400 48917+++ linux-2.6.32.11/kernel/sys.c 2010-04-04 20:46:41.701624986 -0400
47674@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru 48918@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
47675 error = -EACCES; 48919 error = -EACCES;
47676 goto out; 48920 goto out;
@@ -47806,9 +49050,9 @@ diff -urNp linux-2.6.32.10/kernel/sys.c linux-2.6.32.10/kernel/sys.c
47806 error = -EINVAL; 49050 error = -EINVAL;
47807 break; 49051 break;
47808 } 49052 }
47809diff -urNp linux-2.6.32.10/kernel/sysctl.c linux-2.6.32.10/kernel/sysctl.c 49053diff -urNp linux-2.6.32.11/kernel/sysctl.c linux-2.6.32.11/kernel/sysctl.c
47810--- linux-2.6.32.10/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400 49054--- linux-2.6.32.11/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400
47811+++ linux-2.6.32.10/kernel/sysctl.c 2010-03-20 15:58:47.180647899 -0400 49055+++ linux-2.6.32.11/kernel/sysctl.c 2010-04-04 20:46:41.701624986 -0400
47812@@ -63,6 +63,13 @@ 49056@@ -63,6 +63,13 @@
47813 static int deprecated_sysctl_warning(struct __sysctl_args *args); 49057 static int deprecated_sysctl_warning(struct __sysctl_args *args);
47814 49058
@@ -47930,9 +49174,9 @@ diff -urNp linux-2.6.32.10/kernel/sysctl.c linux-2.6.32.10/kernel/sysctl.c
47930 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); 49174 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
47931 if (error) 49175 if (error)
47932 return error; 49176 return error;
47933diff -urNp linux-2.6.32.10/kernel/taskstats.c linux-2.6.32.10/kernel/taskstats.c 49177diff -urNp linux-2.6.32.11/kernel/taskstats.c linux-2.6.32.11/kernel/taskstats.c
47934--- linux-2.6.32.10/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400 49178--- linux-2.6.32.11/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400
47935+++ linux-2.6.32.10/kernel/taskstats.c 2010-03-20 15:58:47.180647899 -0400 49179+++ linux-2.6.32.11/kernel/taskstats.c 2010-04-04 20:46:41.701624986 -0400
47936@@ -26,9 +26,12 @@ 49180@@ -26,9 +26,12 @@
47937 #include <linux/cgroup.h> 49181 #include <linux/cgroup.h>
47938 #include <linux/fs.h> 49182 #include <linux/fs.h>
@@ -47956,9 +49200,9 @@ diff -urNp linux-2.6.32.10/kernel/taskstats.c linux-2.6.32.10/kernel/taskstats.c
47956 if (!alloc_cpumask_var(&mask, GFP_KERNEL)) 49200 if (!alloc_cpumask_var(&mask, GFP_KERNEL))
47957 return -ENOMEM; 49201 return -ENOMEM;
47958 49202
47959diff -urNp linux-2.6.32.10/kernel/time/tick-broadcast.c linux-2.6.32.10/kernel/time/tick-broadcast.c 49203diff -urNp linux-2.6.32.11/kernel/time/tick-broadcast.c linux-2.6.32.11/kernel/time/tick-broadcast.c
47960--- linux-2.6.32.10/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400 49204--- linux-2.6.32.11/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400
47961+++ linux-2.6.32.10/kernel/time/tick-broadcast.c 2010-03-20 15:58:47.180647899 -0400 49205+++ linux-2.6.32.11/kernel/time/tick-broadcast.c 2010-04-04 20:46:41.701624986 -0400
47962@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl 49206@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
47963 * then clear the broadcast bit. 49207 * then clear the broadcast bit.
47964 */ 49208 */
@@ -47968,9 +49212,9 @@ diff -urNp linux-2.6.32.10/kernel/time/tick-broadcast.c linux-2.6.32.10/kernel/t
47968 49212
47969 cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); 49213 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
47970 tick_broadcast_clear_oneshot(cpu); 49214 tick_broadcast_clear_oneshot(cpu);
47971diff -urNp linux-2.6.32.10/kernel/time.c linux-2.6.32.10/kernel/time.c 49215diff -urNp linux-2.6.32.11/kernel/time.c linux-2.6.32.11/kernel/time.c
47972--- linux-2.6.32.10/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 49216--- linux-2.6.32.11/kernel/time.c 2010-03-15 11:52:04.000000000 -0400
47973+++ linux-2.6.32.10/kernel/time.c 2010-03-20 15:58:47.186022161 -0400 49217+++ linux-2.6.32.11/kernel/time.c 2010-04-04 20:46:41.701624986 -0400
47974@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, 49218@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *,
47975 return err; 49219 return err;
47976 49220
@@ -48008,9 +49252,9 @@ diff -urNp linux-2.6.32.10/kernel/time.c linux-2.6.32.10/kernel/time.c
48008 { 49252 {
48009 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) 49253 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
48010 return (USEC_PER_SEC / HZ) * j; 49254 return (USEC_PER_SEC / HZ) * j;
48011diff -urNp linux-2.6.32.10/kernel/timer.c linux-2.6.32.10/kernel/timer.c 49255diff -urNp linux-2.6.32.11/kernel/timer.c linux-2.6.32.11/kernel/timer.c
48012--- linux-2.6.32.10/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400 49256--- linux-2.6.32.11/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400
48013+++ linux-2.6.32.10/kernel/timer.c 2010-03-20 15:58:47.186022161 -0400 49257+++ linux-2.6.32.11/kernel/timer.c 2010-04-04 20:46:41.701624986 -0400
48014@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) 49258@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick)
48015 /* 49259 /*
48016 * This function runs timers and the timer-tq in bottom half context. 49260 * This function runs timers and the timer-tq in bottom half context.
@@ -48020,9 +49264,9 @@ diff -urNp linux-2.6.32.10/kernel/timer.c linux-2.6.32.10/kernel/timer.c
48020 { 49264 {
48021 struct tvec_base *base = __get_cpu_var(tvec_bases); 49265 struct tvec_base *base = __get_cpu_var(tvec_bases);
48022 49266
48023diff -urNp linux-2.6.32.10/kernel/trace/ftrace.c linux-2.6.32.10/kernel/trace/ftrace.c 49267diff -urNp linux-2.6.32.11/kernel/trace/ftrace.c linux-2.6.32.11/kernel/trace/ftrace.c
48024--- linux-2.6.32.10/kernel/trace/ftrace.c 2010-03-15 11:52:04.000000000 -0400 49268--- linux-2.6.32.11/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400
48025+++ linux-2.6.32.10/kernel/trace/ftrace.c 2010-03-20 15:58:47.186022161 -0400 49269+++ linux-2.6.32.11/kernel/trace/ftrace.c 2010-04-04 20:46:41.701624986 -0400
48026@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, 49270@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod,
48027 49271
48028 ip = rec->ip; 49272 ip = rec->ip;
@@ -48044,9 +49288,9 @@ diff -urNp linux-2.6.32.10/kernel/trace/ftrace.c linux-2.6.32.10/kernel/trace/ft
48044 } 49288 }
48045 49289
48046 /* 49290 /*
48047diff -urNp linux-2.6.32.10/kernel/trace/Kconfig linux-2.6.32.10/kernel/trace/Kconfig 49291diff -urNp linux-2.6.32.11/kernel/trace/Kconfig linux-2.6.32.11/kernel/trace/Kconfig
48048--- linux-2.6.32.10/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400 49292--- linux-2.6.32.11/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400
48049+++ linux-2.6.32.10/kernel/trace/Kconfig 2010-03-20 15:58:47.186022161 -0400 49293+++ linux-2.6.32.11/kernel/trace/Kconfig 2010-04-04 20:46:41.701624986 -0400
48050@@ -126,6 +126,7 @@ if FTRACE 49294@@ -126,6 +126,7 @@ if FTRACE
48051 config FUNCTION_TRACER 49295 config FUNCTION_TRACER
48052 bool "Kernel Function Tracer" 49296 bool "Kernel Function Tracer"
@@ -48063,10 +49307,10 @@ diff -urNp linux-2.6.32.10/kernel/trace/Kconfig linux-2.6.32.10/kernel/trace/Kco
48063 select FUNCTION_TRACER 49307 select FUNCTION_TRACER
48064 select STACKTRACE 49308 select STACKTRACE
48065 select KALLSYMS 49309 select KALLSYMS
48066diff -urNp linux-2.6.32.10/kernel/trace/trace.c linux-2.6.32.10/kernel/trace/trace.c 49310diff -urNp linux-2.6.32.11/kernel/trace/trace.c linux-2.6.32.11/kernel/trace/trace.c
48067--- linux-2.6.32.10/kernel/trace/trace.c 2010-03-15 11:52:04.000000000 -0400 49311--- linux-2.6.32.11/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400
48068+++ linux-2.6.32.10/kernel/trace/trace.c 2010-03-20 15:58:47.186022161 -0400 49312+++ linux-2.6.32.11/kernel/trace/trace.c 2010-04-04 20:46:41.705142860 -0400
48069@@ -3792,10 +3792,9 @@ static const struct file_operations trac 49313@@ -3808,10 +3808,9 @@ static const struct file_operations trac
48070 }; 49314 };
48071 #endif 49315 #endif
48072 49316
@@ -48078,7 +49322,7 @@ diff -urNp linux-2.6.32.10/kernel/trace/trace.c linux-2.6.32.10/kernel/trace/tra
48078 static int once; 49322 static int once;
48079 49323
48080 if (d_tracer) 49324 if (d_tracer)
48081@@ -3815,10 +3814,9 @@ struct dentry *tracing_init_dentry(void) 49325@@ -3831,10 +3830,9 @@ struct dentry *tracing_init_dentry(void)
48082 return d_tracer; 49326 return d_tracer;
48083 } 49327 }
48084 49328
@@ -48090,9 +49334,9 @@ diff -urNp linux-2.6.32.10/kernel/trace/trace.c linux-2.6.32.10/kernel/trace/tra
48090 static int once; 49334 static int once;
48091 struct dentry *d_tracer; 49335 struct dentry *d_tracer;
48092 49336
48093diff -urNp linux-2.6.32.10/kernel/trace/trace_events.c linux-2.6.32.10/kernel/trace/trace_events.c 49337diff -urNp linux-2.6.32.11/kernel/trace/trace_events.c linux-2.6.32.11/kernel/trace/trace_events.c
48094--- linux-2.6.32.10/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400 49338--- linux-2.6.32.11/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400
48095+++ linux-2.6.32.10/kernel/trace/trace_events.c 2010-03-20 15:58:47.186022161 -0400 49339+++ linux-2.6.32.11/kernel/trace/trace_events.c 2010-04-04 20:46:41.705142860 -0400
48096@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list 49340@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
48097 * Modules must own their file_operations to keep up with 49341 * Modules must own their file_operations to keep up with
48098 * reference counting. 49342 * reference counting.
@@ -48102,9 +49346,9 @@ diff -urNp linux-2.6.32.10/kernel/trace/trace_events.c linux-2.6.32.10/kernel/tr
48102 struct ftrace_module_file_ops { 49346 struct ftrace_module_file_ops {
48103 struct list_head list; 49347 struct list_head list;
48104 struct module *mod; 49348 struct module *mod;
48105diff -urNp linux-2.6.32.10/kernel/trace/trace_output.c linux-2.6.32.10/kernel/trace/trace_output.c 49349diff -urNp linux-2.6.32.11/kernel/trace/trace_output.c linux-2.6.32.11/kernel/trace/trace_output.c
48106--- linux-2.6.32.10/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400 49350--- linux-2.6.32.11/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400
48107+++ linux-2.6.32.10/kernel/trace/trace_output.c 2010-03-20 15:58:47.186022161 -0400 49351+++ linux-2.6.32.11/kernel/trace/trace_output.c 2010-04-04 20:46:41.705142860 -0400
48108@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, 49352@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,
48109 return 0; 49353 return 0;
48110 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); 49354 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -48114,9 +49358,9 @@ diff -urNp linux-2.6.32.10/kernel/trace/trace_output.c linux-2.6.32.10/kernel/tr
48114 if (p) { 49358 if (p) {
48115 s->len = p - s->buffer; 49359 s->len = p - s->buffer;
48116 return 1; 49360 return 1;
48117diff -urNp linux-2.6.32.10/kernel/trace/trace_stack.c linux-2.6.32.10/kernel/trace/trace_stack.c 49361diff -urNp linux-2.6.32.11/kernel/trace/trace_stack.c linux-2.6.32.11/kernel/trace/trace_stack.c
48118--- linux-2.6.32.10/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400 49362--- linux-2.6.32.11/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400
48119+++ linux-2.6.32.10/kernel/trace/trace_stack.c 2010-03-20 15:58:47.186022161 -0400 49363+++ linux-2.6.32.11/kernel/trace/trace_stack.c 2010-04-04 20:46:41.705142860 -0400
48120@@ -50,7 +50,7 @@ static inline void check_stack(void) 49364@@ -50,7 +50,7 @@ static inline void check_stack(void)
48121 return; 49365 return;
48122 49366
@@ -48126,9 +49370,9 @@ diff -urNp linux-2.6.32.10/kernel/trace/trace_stack.c linux-2.6.32.10/kernel/tra
48126 return; 49370 return;
48127 49371
48128 local_irq_save(flags); 49372 local_irq_save(flags);
48129diff -urNp linux-2.6.32.10/kernel/utsname_sysctl.c linux-2.6.32.10/kernel/utsname_sysctl.c 49373diff -urNp linux-2.6.32.11/kernel/utsname_sysctl.c linux-2.6.32.11/kernel/utsname_sysctl.c
48130--- linux-2.6.32.10/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400 49374--- linux-2.6.32.11/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400
48131+++ linux-2.6.32.10/kernel/utsname_sysctl.c 2010-03-20 15:58:47.186022161 -0400 49375+++ linux-2.6.32.11/kernel/utsname_sysctl.c 2010-04-04 20:46:41.705142860 -0400
48132@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] 49376@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
48133 .proc_handler = proc_do_uts_string, 49377 .proc_handler = proc_do_uts_string,
48134 .strategy = sysctl_uts_string, 49378 .strategy = sysctl_uts_string,
@@ -48147,9 +49391,9 @@ diff -urNp linux-2.6.32.10/kernel/utsname_sysctl.c linux-2.6.32.10/kernel/utsnam
48147 }; 49391 };
48148 49392
48149 static int __init utsname_sysctl_init(void) 49393 static int __init utsname_sysctl_init(void)
48150diff -urNp linux-2.6.32.10/lib/bug.c linux-2.6.32.10/lib/bug.c 49394diff -urNp linux-2.6.32.11/lib/bug.c linux-2.6.32.11/lib/bug.c
48151--- linux-2.6.32.10/lib/bug.c 2010-03-15 11:52:04.000000000 -0400 49395--- linux-2.6.32.11/lib/bug.c 2010-03-15 11:52:04.000000000 -0400
48152+++ linux-2.6.32.10/lib/bug.c 2010-03-20 15:58:47.186022161 -0400 49396+++ linux-2.6.32.11/lib/bug.c 2010-04-04 20:46:41.705142860 -0400
48153@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l 49397@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
48154 return BUG_TRAP_TYPE_NONE; 49398 return BUG_TRAP_TYPE_NONE;
48155 49399
@@ -48159,9 +49403,9 @@ diff -urNp linux-2.6.32.10/lib/bug.c linux-2.6.32.10/lib/bug.c
48159 49403
48160 printk(KERN_EMERG "------------[ cut here ]------------\n"); 49404 printk(KERN_EMERG "------------[ cut here ]------------\n");
48161 49405
48162diff -urNp linux-2.6.32.10/lib/debugobjects.c linux-2.6.32.10/lib/debugobjects.c 49406diff -urNp linux-2.6.32.11/lib/debugobjects.c linux-2.6.32.11/lib/debugobjects.c
48163--- linux-2.6.32.10/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400 49407--- linux-2.6.32.11/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400
48164+++ linux-2.6.32.10/lib/debugobjects.c 2010-03-20 15:58:47.186022161 -0400 49408+++ linux-2.6.32.11/lib/debugobjects.c 2010-04-04 20:46:41.705142860 -0400
48165@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi 49409@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
48166 if (limit > 4) 49410 if (limit > 4)
48167 return; 49411 return;
@@ -48171,9 +49415,9 @@ diff -urNp linux-2.6.32.10/lib/debugobjects.c linux-2.6.32.10/lib/debugobjects.c
48171 if (is_on_stack == onstack) 49415 if (is_on_stack == onstack)
48172 return; 49416 return;
48173 49417
48174diff -urNp linux-2.6.32.10/lib/dma-debug.c linux-2.6.32.10/lib/dma-debug.c 49418diff -urNp linux-2.6.32.11/lib/dma-debug.c linux-2.6.32.11/lib/dma-debug.c
48175--- linux-2.6.32.10/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400 49419--- linux-2.6.32.11/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400
48176+++ linux-2.6.32.10/lib/dma-debug.c 2010-03-20 15:58:47.186022161 -0400 49420+++ linux-2.6.32.11/lib/dma-debug.c 2010-04-04 20:46:41.705142860 -0400
48177@@ -861,7 +861,7 @@ out: 49421@@ -861,7 +861,7 @@ out:
48178 49422
48179 static void check_for_stack(struct device *dev, void *addr) 49423 static void check_for_stack(struct device *dev, void *addr)
@@ -48183,9 +49427,9 @@ diff -urNp linux-2.6.32.10/lib/dma-debug.c linux-2.6.32.10/lib/dma-debug.c
48183 err_printk(dev, NULL, "DMA-API: device driver maps memory from" 49427 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
48184 "stack [addr=%p]\n", addr); 49428 "stack [addr=%p]\n", addr);
48185 } 49429 }
48186diff -urNp linux-2.6.32.10/lib/idr.c linux-2.6.32.10/lib/idr.c 49430diff -urNp linux-2.6.32.11/lib/idr.c linux-2.6.32.11/lib/idr.c
48187--- linux-2.6.32.10/lib/idr.c 2010-03-15 11:52:04.000000000 -0400 49431--- linux-2.6.32.11/lib/idr.c 2010-03-15 11:52:04.000000000 -0400
48188+++ linux-2.6.32.10/lib/idr.c 2010-03-20 16:03:53.500671149 -0400 49432+++ linux-2.6.32.11/lib/idr.c 2010-04-04 20:46:41.705142860 -0400
48189@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in 49433@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
48190 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; 49434 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
48191 49435
@@ -48195,9 +49439,9 @@ diff -urNp linux-2.6.32.10/lib/idr.c linux-2.6.32.10/lib/idr.c
48195 *starting_id = id; 49439 *starting_id = id;
48196 return IDR_NEED_TO_GROW; 49440 return IDR_NEED_TO_GROW;
48197 } 49441 }
48198diff -urNp linux-2.6.32.10/lib/inflate.c linux-2.6.32.10/lib/inflate.c 49442diff -urNp linux-2.6.32.11/lib/inflate.c linux-2.6.32.11/lib/inflate.c
48199--- linux-2.6.32.10/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400 49443--- linux-2.6.32.11/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400
48200+++ linux-2.6.32.10/lib/inflate.c 2010-03-20 15:58:47.186022161 -0400 49444+++ linux-2.6.32.11/lib/inflate.c 2010-04-04 20:46:41.705142860 -0400
48201@@ -266,7 +266,7 @@ static void free(void *where) 49445@@ -266,7 +266,7 @@ static void free(void *where)
48202 malloc_ptr = free_mem_ptr; 49446 malloc_ptr = free_mem_ptr;
48203 } 49447 }
@@ -48207,9 +49451,9 @@ diff -urNp linux-2.6.32.10/lib/inflate.c linux-2.6.32.10/lib/inflate.c
48207 #define free(a) kfree(a) 49451 #define free(a) kfree(a)
48208 #endif 49452 #endif
48209 49453
48210diff -urNp linux-2.6.32.10/lib/Kconfig.debug linux-2.6.32.10/lib/Kconfig.debug 49454diff -urNp linux-2.6.32.11/lib/Kconfig.debug linux-2.6.32.11/lib/Kconfig.debug
48211--- linux-2.6.32.10/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 49455--- linux-2.6.32.11/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400
48212+++ linux-2.6.32.10/lib/Kconfig.debug 2010-03-20 15:58:47.186022161 -0400 49456+++ linux-2.6.32.11/lib/Kconfig.debug 2010-04-04 20:46:41.705142860 -0400
48213@@ -905,7 +905,7 @@ config LATENCYTOP 49457@@ -905,7 +905,7 @@ config LATENCYTOP
48214 select STACKTRACE 49458 select STACKTRACE
48215 select SCHEDSTATS 49459 select SCHEDSTATS
@@ -48219,9 +49463,9 @@ diff -urNp linux-2.6.32.10/lib/Kconfig.debug linux-2.6.32.10/lib/Kconfig.debug
48219 help 49463 help
48220 Enable this option if you want to use the LatencyTOP tool 49464 Enable this option if you want to use the LatencyTOP tool
48221 to find out which userspace is blocking on what kernel operations. 49465 to find out which userspace is blocking on what kernel operations.
48222diff -urNp linux-2.6.32.10/lib/kobject.c linux-2.6.32.10/lib/kobject.c 49466diff -urNp linux-2.6.32.11/lib/kobject.c linux-2.6.32.11/lib/kobject.c
48223--- linux-2.6.32.10/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400 49467--- linux-2.6.32.11/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400
48224+++ linux-2.6.32.10/lib/kobject.c 2010-03-20 15:58:47.190048482 -0400 49468+++ linux-2.6.32.11/lib/kobject.c 2010-04-04 20:46:41.705142860 -0400
48225@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko 49469@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
48226 return ret; 49470 return ret;
48227 } 49471 }
@@ -48249,9 +49493,9 @@ diff -urNp linux-2.6.32.10/lib/kobject.c linux-2.6.32.10/lib/kobject.c
48249 struct kobject *parent_kobj) 49493 struct kobject *parent_kobj)
48250 { 49494 {
48251 struct kset *kset; 49495 struct kset *kset;
48252diff -urNp linux-2.6.32.10/lib/kobject_uevent.c linux-2.6.32.10/lib/kobject_uevent.c 49496diff -urNp linux-2.6.32.11/lib/kobject_uevent.c linux-2.6.32.11/lib/kobject_uevent.c
48253--- linux-2.6.32.10/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400 49497--- linux-2.6.32.11/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400
48254+++ linux-2.6.32.10/lib/kobject_uevent.c 2010-03-20 15:58:47.190048482 -0400 49498+++ linux-2.6.32.11/lib/kobject_uevent.c 2010-04-04 20:46:41.705142860 -0400
48255@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k 49499@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
48256 const char *subsystem; 49500 const char *subsystem;
48257 struct kobject *top_kobj; 49501 struct kobject *top_kobj;
@@ -48261,9 +49505,9 @@ diff -urNp linux-2.6.32.10/lib/kobject_uevent.c linux-2.6.32.10/lib/kobject_ueve
48261 u64 seq; 49505 u64 seq;
48262 int i = 0; 49506 int i = 0;
48263 int retval = 0; 49507 int retval = 0;
48264diff -urNp linux-2.6.32.10/lib/parser.c linux-2.6.32.10/lib/parser.c 49508diff -urNp linux-2.6.32.11/lib/parser.c linux-2.6.32.11/lib/parser.c
48265--- linux-2.6.32.10/lib/parser.c 2010-03-15 11:52:04.000000000 -0400 49509--- linux-2.6.32.11/lib/parser.c 2010-03-15 11:52:04.000000000 -0400
48266+++ linux-2.6.32.10/lib/parser.c 2010-03-20 15:58:47.190048482 -0400 49510+++ linux-2.6.32.11/lib/parser.c 2010-04-04 20:46:41.705142860 -0400
48267@@ -126,7 +126,7 @@ static int match_number(substring_t *s, 49511@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
48268 char *buf; 49512 char *buf;
48269 int ret; 49513 int ret;
@@ -48273,9 +49517,9 @@ diff -urNp linux-2.6.32.10/lib/parser.c linux-2.6.32.10/lib/parser.c
48273 if (!buf) 49517 if (!buf)
48274 return -ENOMEM; 49518 return -ENOMEM;
48275 memcpy(buf, s->from, s->to - s->from); 49519 memcpy(buf, s->from, s->to - s->from);
48276diff -urNp linux-2.6.32.10/lib/radix-tree.c linux-2.6.32.10/lib/radix-tree.c 49520diff -urNp linux-2.6.32.11/lib/radix-tree.c linux-2.6.32.11/lib/radix-tree.c
48277--- linux-2.6.32.10/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400 49521--- linux-2.6.32.11/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400
48278+++ linux-2.6.32.10/lib/radix-tree.c 2010-03-20 15:58:47.190048482 -0400 49522+++ linux-2.6.32.11/lib/radix-tree.c 2010-04-04 20:46:41.705142860 -0400
48279@@ -81,7 +81,7 @@ struct radix_tree_preload { 49523@@ -81,7 +81,7 @@ struct radix_tree_preload {
48280 int nr; 49524 int nr;
48281 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; 49525 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -48285,9 +49529,9 @@ diff -urNp linux-2.6.32.10/lib/radix-tree.c linux-2.6.32.10/lib/radix-tree.c
48285 49529
48286 static inline gfp_t root_gfp_mask(struct radix_tree_root *root) 49530 static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
48287 { 49531 {
48288diff -urNp linux-2.6.32.10/lib/random32.c linux-2.6.32.10/lib/random32.c 49532diff -urNp linux-2.6.32.11/lib/random32.c linux-2.6.32.11/lib/random32.c
48289--- linux-2.6.32.10/lib/random32.c 2010-03-15 11:52:04.000000000 -0400 49533--- linux-2.6.32.11/lib/random32.c 2010-03-15 11:52:04.000000000 -0400
48290+++ linux-2.6.32.10/lib/random32.c 2010-03-20 15:58:47.190048482 -0400 49534+++ linux-2.6.32.11/lib/random32.c 2010-04-04 20:46:41.705142860 -0400
48291@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * 49535@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
48292 */ 49536 */
48293 static inline u32 __seed(u32 x, u32 m) 49537 static inline u32 __seed(u32 x, u32 m)
@@ -48297,14 +49541,14 @@ diff -urNp linux-2.6.32.10/lib/random32.c linux-2.6.32.10/lib/random32.c
48297 } 49541 }
48298 49542
48299 /** 49543 /**
48300diff -urNp linux-2.6.32.10/localversion-grsec linux-2.6.32.10/localversion-grsec 49544diff -urNp linux-2.6.32.11/localversion-grsec linux-2.6.32.11/localversion-grsec
48301--- linux-2.6.32.10/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 49545--- linux-2.6.32.11/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
48302+++ linux-2.6.32.10/localversion-grsec 2010-03-20 15:58:47.190048482 -0400 49546+++ linux-2.6.32.11/localversion-grsec 2010-04-04 20:46:41.705142860 -0400
48303@@ -0,0 +1 @@ 49547@@ -0,0 +1 @@
48304+-grsec 49548+-grsec
48305diff -urNp linux-2.6.32.10/Makefile linux-2.6.32.10/Makefile 49549diff -urNp linux-2.6.32.11/Makefile linux-2.6.32.11/Makefile
48306--- linux-2.6.32.10/Makefile 2010-03-15 11:52:04.000000000 -0400 49550--- linux-2.6.32.11/Makefile 2010-04-04 20:41:49.914404054 -0400
48307+++ linux-2.6.32.10/Makefile 2010-03-20 15:58:47.190048482 -0400 49551+++ linux-2.6.32.11/Makefile 2010-04-04 20:46:41.705142860 -0400
48308@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" 49552@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
48309 49553
48310 HOSTCC = gcc 49554 HOSTCC = gcc
@@ -48325,9 +49569,9 @@ diff -urNp linux-2.6.32.10/Makefile linux-2.6.32.10/Makefile
48325 49569
48326 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ 49570 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
48327 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ 49571 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
48328diff -urNp linux-2.6.32.10/mm/filemap.c linux-2.6.32.10/mm/filemap.c 49572diff -urNp linux-2.6.32.11/mm/filemap.c linux-2.6.32.11/mm/filemap.c
48329--- linux-2.6.32.10/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400 49573--- linux-2.6.32.11/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400
48330+++ linux-2.6.32.10/mm/filemap.c 2010-03-20 15:58:47.190048482 -0400 49574+++ linux-2.6.32.11/mm/filemap.c 2010-04-04 20:46:41.708732353 -0400
48331@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file 49575@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file
48332 struct address_space *mapping = file->f_mapping; 49576 struct address_space *mapping = file->f_mapping;
48333 49577
@@ -48345,9 +49589,9 @@ diff -urNp linux-2.6.32.10/mm/filemap.c linux-2.6.32.10/mm/filemap.c
48345 if (*pos >= limit) { 49589 if (*pos >= limit) {
48346 send_sig(SIGXFSZ, current, 0); 49590 send_sig(SIGXFSZ, current, 0);
48347 return -EFBIG; 49591 return -EFBIG;
48348diff -urNp linux-2.6.32.10/mm/fremap.c linux-2.6.32.10/mm/fremap.c 49592diff -urNp linux-2.6.32.11/mm/fremap.c linux-2.6.32.11/mm/fremap.c
48349--- linux-2.6.32.10/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400 49593--- linux-2.6.32.11/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400
48350+++ linux-2.6.32.10/mm/fremap.c 2010-03-20 15:58:47.190048482 -0400 49594+++ linux-2.6.32.11/mm/fremap.c 2010-04-04 20:46:41.708732353 -0400
48351@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign 49595@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
48352 retry: 49596 retry:
48353 vma = find_vma(mm, start); 49597 vma = find_vma(mm, start);
@@ -48360,9 +49604,9 @@ diff -urNp linux-2.6.32.10/mm/fremap.c linux-2.6.32.10/mm/fremap.c
48360 /* 49604 /*
48361 * Make sure the vma is shared, that it supports prefaulting, 49605 * Make sure the vma is shared, that it supports prefaulting,
48362 * and that the remapped range is valid and fully within 49606 * and that the remapped range is valid and fully within
48363diff -urNp linux-2.6.32.10/mm/highmem.c linux-2.6.32.10/mm/highmem.c 49607diff -urNp linux-2.6.32.11/mm/highmem.c linux-2.6.32.11/mm/highmem.c
48364--- linux-2.6.32.10/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400 49608--- linux-2.6.32.11/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400
48365+++ linux-2.6.32.10/mm/highmem.c 2010-03-20 15:58:47.190048482 -0400 49609+++ linux-2.6.32.11/mm/highmem.c 2010-04-04 20:46:41.708732353 -0400
48366@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) 49610@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
48367 * So no dangers, even with speculative execution. 49611 * So no dangers, even with speculative execution.
48368 */ 49612 */
@@ -48388,9 +49632,9 @@ diff -urNp linux-2.6.32.10/mm/highmem.c linux-2.6.32.10/mm/highmem.c
48388 pkmap_count[last_pkmap_nr] = 1; 49632 pkmap_count[last_pkmap_nr] = 1;
48389 set_page_address(page, (void *)vaddr); 49633 set_page_address(page, (void *)vaddr);
48390 49634
48391diff -urNp linux-2.6.32.10/mm/hugetlb.c linux-2.6.32.10/mm/hugetlb.c 49635diff -urNp linux-2.6.32.11/mm/hugetlb.c linux-2.6.32.11/mm/hugetlb.c
48392--- linux-2.6.32.10/mm/hugetlb.c 2010-03-15 11:52:04.000000000 -0400 49636--- linux-2.6.32.11/mm/hugetlb.c 2010-03-15 11:52:04.000000000 -0400
48393+++ linux-2.6.32.10/mm/hugetlb.c 2010-03-20 15:58:47.190048482 -0400 49637+++ linux-2.6.32.11/mm/hugetlb.c 2010-04-04 20:46:41.708732353 -0400
48394@@ -1924,6 +1924,26 @@ static int unmap_ref_private(struct mm_s 49638@@ -1924,6 +1924,26 @@ static int unmap_ref_private(struct mm_s
48395 return 1; 49639 return 1;
48396 } 49640 }
@@ -48470,9 +49714,9 @@ diff -urNp linux-2.6.32.10/mm/hugetlb.c linux-2.6.32.10/mm/hugetlb.c
48470 ptep = huge_pte_alloc(mm, address, huge_page_size(h)); 49714 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
48471 if (!ptep) 49715 if (!ptep)
48472 return VM_FAULT_OOM; 49716 return VM_FAULT_OOM;
48473diff -urNp linux-2.6.32.10/mm/Kconfig linux-2.6.32.10/mm/Kconfig 49717diff -urNp linux-2.6.32.11/mm/Kconfig linux-2.6.32.11/mm/Kconfig
48474--- linux-2.6.32.10/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400 49718--- linux-2.6.32.11/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400
48475+++ linux-2.6.32.10/mm/Kconfig 2010-03-20 15:58:47.190048482 -0400 49719+++ linux-2.6.32.11/mm/Kconfig 2010-04-04 20:46:41.708732353 -0400
48476@@ -228,7 +228,7 @@ config KSM 49720@@ -228,7 +228,7 @@ config KSM
48477 config DEFAULT_MMAP_MIN_ADDR 49721 config DEFAULT_MMAP_MIN_ADDR
48478 int "Low address space to protect from user allocation" 49722 int "Low address space to protect from user allocation"
@@ -48482,9 +49726,9 @@ diff -urNp linux-2.6.32.10/mm/Kconfig linux-2.6.32.10/mm/Kconfig
48482 help 49726 help
48483 This is the portion of low virtual memory which should be protected 49727 This is the portion of low virtual memory which should be protected
48484 from userspace allocation. Keeping a user from writing to low pages 49728 from userspace allocation. Keeping a user from writing to low pages
48485diff -urNp linux-2.6.32.10/mm/maccess.c linux-2.6.32.10/mm/maccess.c 49729diff -urNp linux-2.6.32.11/mm/maccess.c linux-2.6.32.11/mm/maccess.c
48486--- linux-2.6.32.10/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400 49730--- linux-2.6.32.11/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400
48487+++ linux-2.6.32.10/mm/maccess.c 2010-03-20 15:58:47.190048482 -0400 49731+++ linux-2.6.32.11/mm/maccess.c 2010-04-04 20:46:41.708732353 -0400
48488@@ -14,7 +14,7 @@ 49732@@ -14,7 +14,7 @@
48489 * Safely read from address @src to the buffer at @dst. If a kernel fault 49733 * Safely read from address @src to the buffer at @dst. If a kernel fault
48490 * happens, handle that and return -EFAULT. 49734 * happens, handle that and return -EFAULT.
@@ -48503,9 +49747,9 @@ diff -urNp linux-2.6.32.10/mm/maccess.c linux-2.6.32.10/mm/maccess.c
48503 { 49747 {
48504 long ret; 49748 long ret;
48505 mm_segment_t old_fs = get_fs(); 49749 mm_segment_t old_fs = get_fs();
48506diff -urNp linux-2.6.32.10/mm/madvise.c linux-2.6.32.10/mm/madvise.c 49750diff -urNp linux-2.6.32.11/mm/madvise.c linux-2.6.32.11/mm/madvise.c
48507--- linux-2.6.32.10/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400 49751--- linux-2.6.32.11/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400
48508+++ linux-2.6.32.10/mm/madvise.c 2010-03-20 15:58:47.190048482 -0400 49752+++ linux-2.6.32.11/mm/madvise.c 2010-04-04 20:46:41.708732353 -0400
48509@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a 49753@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
48510 pgoff_t pgoff; 49754 pgoff_t pgoff;
48511 unsigned long new_flags = vma->vm_flags; 49755 unsigned long new_flags = vma->vm_flags;
@@ -48582,9 +49826,9 @@ diff -urNp linux-2.6.32.10/mm/madvise.c linux-2.6.32.10/mm/madvise.c
48582 error = 0; 49826 error = 0;
48583 if (end == start) 49827 if (end == start)
48584 goto out; 49828 goto out;
48585diff -urNp linux-2.6.32.10/mm/memory.c linux-2.6.32.10/mm/memory.c 49829diff -urNp linux-2.6.32.11/mm/memory.c linux-2.6.32.11/mm/memory.c
48586--- linux-2.6.32.10/mm/memory.c 2010-03-15 11:52:04.000000000 -0400 49830--- linux-2.6.32.11/mm/memory.c 2010-03-15 11:52:04.000000000 -0400
48587+++ linux-2.6.32.10/mm/memory.c 2010-03-20 15:58:47.190048482 -0400 49831+++ linux-2.6.32.11/mm/memory.c 2010-04-04 20:46:41.708732353 -0400
48588@@ -48,6 +48,7 @@ 49832@@ -48,6 +48,7 @@
48589 #include <linux/ksm.h> 49833 #include <linux/ksm.h>
48590 #include <linux/rmap.h> 49834 #include <linux/rmap.h>
@@ -48989,9 +50233,9 @@ diff -urNp linux-2.6.32.10/mm/memory.c linux-2.6.32.10/mm/memory.c
48989 /* 50233 /*
48990 * Make sure the vDSO gets into every core dump. 50234 * Make sure the vDSO gets into every core dump.
48991 * Dumping its contents makes post-mortem fully interpretable later 50235 * Dumping its contents makes post-mortem fully interpretable later
48992diff -urNp linux-2.6.32.10/mm/memory-failure.c linux-2.6.32.10/mm/memory-failure.c 50236diff -urNp linux-2.6.32.11/mm/memory-failure.c linux-2.6.32.11/mm/memory-failure.c
48993--- linux-2.6.32.10/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400 50237--- linux-2.6.32.11/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400
48994+++ linux-2.6.32.10/mm/memory-failure.c 2010-03-20 15:58:47.190048482 -0400 50238+++ linux-2.6.32.11/mm/memory-failure.c 2010-04-04 20:46:41.708732353 -0400
48995@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r 50239@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
48996 50240
48997 int sysctl_memory_failure_recovery __read_mostly = 1; 50241 int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -49010,9 +50254,9 @@ diff -urNp linux-2.6.32.10/mm/memory-failure.c linux-2.6.32.10/mm/memory-failure
49010 50254
49011 /* 50255 /*
49012 * We need/can do nothing about count=0 pages. 50256 * We need/can do nothing about count=0 pages.
49013diff -urNp linux-2.6.32.10/mm/mempolicy.c linux-2.6.32.10/mm/mempolicy.c 50257diff -urNp linux-2.6.32.11/mm/mempolicy.c linux-2.6.32.11/mm/mempolicy.c
49014--- linux-2.6.32.10/mm/mempolicy.c 2010-03-15 11:52:04.000000000 -0400 50258--- linux-2.6.32.11/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400
49015+++ linux-2.6.32.10/mm/mempolicy.c 2010-03-20 15:58:47.194047891 -0400 50259+++ linux-2.6.32.11/mm/mempolicy.c 2010-04-04 20:46:41.708732353 -0400
49016@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st 50260@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
49017 struct vm_area_struct *next; 50261 struct vm_area_struct *next;
49018 int err; 50262 int err;
@@ -49084,7 +50328,7 @@ diff -urNp linux-2.6.32.10/mm/mempolicy.c linux-2.6.32.10/mm/mempolicy.c
49084 rcu_read_unlock(); 50328 rcu_read_unlock();
49085 err = -EPERM; 50329 err = -EPERM;
49086 goto out; 50330 goto out;
49087@@ -2386,7 +2418,7 @@ int show_numa_map(struct seq_file *m, vo 50331@@ -2396,7 +2428,7 @@ int show_numa_map(struct seq_file *m, vo
49088 50332
49089 if (file) { 50333 if (file) {
49090 seq_printf(m, " file="); 50334 seq_printf(m, " file=");
@@ -49093,9 +50337,9 @@ diff -urNp linux-2.6.32.10/mm/mempolicy.c linux-2.6.32.10/mm/mempolicy.c
49093 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { 50337 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
49094 seq_printf(m, " heap"); 50338 seq_printf(m, " heap");
49095 } else if (vma->vm_start <= mm->start_stack && 50339 } else if (vma->vm_start <= mm->start_stack &&
49096diff -urNp linux-2.6.32.10/mm/migrate.c linux-2.6.32.10/mm/migrate.c 50340diff -urNp linux-2.6.32.11/mm/migrate.c linux-2.6.32.11/mm/migrate.c
49097--- linux-2.6.32.10/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400 50341--- linux-2.6.32.11/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400
49098+++ linux-2.6.32.10/mm/migrate.c 2010-03-20 15:58:47.194047891 -0400 50342+++ linux-2.6.32.11/mm/migrate.c 2010-04-04 20:46:41.708732353 -0400
49099@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 50343@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
49100 if (!mm) 50344 if (!mm)
49101 return -EINVAL; 50345 return -EINVAL;
@@ -49121,9 +50365,9 @@ diff -urNp linux-2.6.32.10/mm/migrate.c linux-2.6.32.10/mm/migrate.c
49121 rcu_read_unlock(); 50365 rcu_read_unlock();
49122 err = -EPERM; 50366 err = -EPERM;
49123 goto out; 50367 goto out;
49124diff -urNp linux-2.6.32.10/mm/mlock.c linux-2.6.32.10/mm/mlock.c 50368diff -urNp linux-2.6.32.11/mm/mlock.c linux-2.6.32.11/mm/mlock.c
49125--- linux-2.6.32.10/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400 50369--- linux-2.6.32.11/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400
49126+++ linux-2.6.32.10/mm/mlock.c 2010-03-20 15:58:47.194047891 -0400 50370+++ linux-2.6.32.11/mm/mlock.c 2010-04-04 20:46:41.708732353 -0400
49127@@ -13,6 +13,7 @@ 50371@@ -13,6 +13,7 @@
49128 #include <linux/pagemap.h> 50372 #include <linux/pagemap.h>
49129 #include <linux/mempolicy.h> 50373 #include <linux/mempolicy.h>
@@ -49192,9 +50436,9 @@ diff -urNp linux-2.6.32.10/mm/mlock.c linux-2.6.32.10/mm/mlock.c
49192 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || 50436 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
49193 capable(CAP_IPC_LOCK)) 50437 capable(CAP_IPC_LOCK))
49194 ret = do_mlockall(flags); 50438 ret = do_mlockall(flags);
49195diff -urNp linux-2.6.32.10/mm/mmap.c linux-2.6.32.10/mm/mmap.c 50439diff -urNp linux-2.6.32.11/mm/mmap.c linux-2.6.32.11/mm/mmap.c
49196--- linux-2.6.32.10/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 50440--- linux-2.6.32.11/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
49197+++ linux-2.6.32.10/mm/mmap.c 2010-03-20 15:58:47.194047891 -0400 50441+++ linux-2.6.32.11/mm/mmap.c 2010-04-04 20:46:41.713805609 -0400
49198@@ -45,6 +45,16 @@ 50442@@ -45,6 +45,16 @@
49199 #define arch_rebalance_pgtables(addr, len) (addr) 50443 #define arch_rebalance_pgtables(addr, len) (addr)
49200 #endif 50444 #endif
@@ -50283,9 +51527,9 @@ diff -urNp linux-2.6.32.10/mm/mmap.c linux-2.6.32.10/mm/mmap.c
50283 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; 51527 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
50284 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 51528 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
50285 51529
50286diff -urNp linux-2.6.32.10/mm/mprotect.c linux-2.6.32.10/mm/mprotect.c 51530diff -urNp linux-2.6.32.11/mm/mprotect.c linux-2.6.32.11/mm/mprotect.c
50287--- linux-2.6.32.10/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400 51531--- linux-2.6.32.11/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400
50288+++ linux-2.6.32.10/mm/mprotect.c 2010-03-20 15:58:47.194047891 -0400 51532+++ linux-2.6.32.11/mm/mprotect.c 2010-04-04 20:46:41.713805609 -0400
50289@@ -24,10 +24,16 @@ 51533@@ -24,10 +24,16 @@
50290 #include <linux/mmu_notifier.h> 51534 #include <linux/mmu_notifier.h>
50291 #include <linux/migrate.h> 51535 #include <linux/migrate.h>
@@ -50476,9 +51720,9 @@ diff -urNp linux-2.6.32.10/mm/mprotect.c linux-2.6.32.10/mm/mprotect.c
50476 nstart = tmp; 51720 nstart = tmp;
50477 51721
50478 if (nstart < prev->vm_end) 51722 if (nstart < prev->vm_end)
50479diff -urNp linux-2.6.32.10/mm/mremap.c linux-2.6.32.10/mm/mremap.c 51723diff -urNp linux-2.6.32.11/mm/mremap.c linux-2.6.32.11/mm/mremap.c
50480--- linux-2.6.32.10/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400 51724--- linux-2.6.32.11/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400
50481+++ linux-2.6.32.10/mm/mremap.c 2010-03-20 15:58:47.194047891 -0400 51725+++ linux-2.6.32.11/mm/mremap.c 2010-04-04 20:46:41.713805609 -0400
50482@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str 51726@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
50483 continue; 51727 continue;
50484 pte = ptep_clear_flush(vma, old_addr, old_pte); 51728 pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -50579,9 +51823,9 @@ diff -urNp linux-2.6.32.10/mm/mremap.c linux-2.6.32.10/mm/mremap.c
50579 } 51823 }
50580 out: 51824 out:
50581 if (ret & ~PAGE_MASK) 51825 if (ret & ~PAGE_MASK)
50582diff -urNp linux-2.6.32.10/mm/nommu.c linux-2.6.32.10/mm/nommu.c 51826diff -urNp linux-2.6.32.11/mm/nommu.c linux-2.6.32.11/mm/nommu.c
50583--- linux-2.6.32.10/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400 51827--- linux-2.6.32.11/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400
50584+++ linux-2.6.32.10/mm/nommu.c 2010-03-20 15:58:47.194047891 -0400 51828+++ linux-2.6.32.11/mm/nommu.c 2010-04-04 20:46:41.713805609 -0400
50585@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m 51829@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m
50586 EXPORT_SYMBOL(find_vma); 51830 EXPORT_SYMBOL(find_vma);
50587 51831
@@ -50598,9 +51842,9 @@ diff -urNp linux-2.6.32.10/mm/nommu.c linux-2.6.32.10/mm/nommu.c
50598 * expand a stack to a given address 51842 * expand a stack to a given address
50599 * - not supported under NOMMU conditions 51843 * - not supported under NOMMU conditions
50600 */ 51844 */
50601diff -urNp linux-2.6.32.10/mm/page_alloc.c linux-2.6.32.10/mm/page_alloc.c 51845diff -urNp linux-2.6.32.11/mm/page_alloc.c linux-2.6.32.11/mm/page_alloc.c
50602--- linux-2.6.32.10/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400 51846--- linux-2.6.32.11/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400
50603+++ linux-2.6.32.10/mm/page_alloc.c 2010-03-20 15:58:47.194047891 -0400 51847+++ linux-2.6.32.11/mm/page_alloc.c 2010-04-04 20:46:41.713805609 -0400
50604@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page 51848@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page
50605 int bad = 0; 51849 int bad = 0;
50606 int wasMlocked = __TestClearPageMlocked(page); 51850 int wasMlocked = __TestClearPageMlocked(page);
@@ -50648,9 +51892,9 @@ diff -urNp linux-2.6.32.10/mm/page_alloc.c linux-2.6.32.10/mm/page_alloc.c
50648 arch_free_page(page, 0); 51892 arch_free_page(page, 0);
50649 kernel_map_pages(page, 1, 0); 51893 kernel_map_pages(page, 1, 0);
50650 51894
50651diff -urNp linux-2.6.32.10/mm/percpu.c linux-2.6.32.10/mm/percpu.c 51895diff -urNp linux-2.6.32.11/mm/percpu.c linux-2.6.32.11/mm/percpu.c
50652--- linux-2.6.32.10/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400 51896--- linux-2.6.32.11/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400
50653+++ linux-2.6.32.10/mm/percpu.c 2010-03-20 15:58:47.194047891 -0400 51897+++ linux-2.6.32.11/mm/percpu.c 2010-04-04 20:46:41.713805609 -0400
50654@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu 51898@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
50655 static unsigned int pcpu_last_unit_cpu __read_mostly; 51899 static unsigned int pcpu_last_unit_cpu __read_mostly;
50656 51900
@@ -50660,9 +51904,9 @@ diff -urNp linux-2.6.32.10/mm/percpu.c linux-2.6.32.10/mm/percpu.c
50660 EXPORT_SYMBOL_GPL(pcpu_base_addr); 51904 EXPORT_SYMBOL_GPL(pcpu_base_addr);
50661 51905
50662 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ 51906 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
50663diff -urNp linux-2.6.32.10/mm/rmap.c linux-2.6.32.10/mm/rmap.c 51907diff -urNp linux-2.6.32.11/mm/rmap.c linux-2.6.32.11/mm/rmap.c
50664--- linux-2.6.32.10/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400 51908--- linux-2.6.32.11/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400
50665+++ linux-2.6.32.10/mm/rmap.c 2010-03-20 15:58:47.194047891 -0400 51909+++ linux-2.6.32.11/mm/rmap.c 2010-04-04 20:46:41.713805609 -0400
50666@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru 51910@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru
50667 struct mm_struct *mm = vma->vm_mm; 51911 struct mm_struct *mm = vma->vm_mm;
50668 struct anon_vma *allocated; 51912 struct anon_vma *allocated;
@@ -50690,9 +51934,9 @@ diff -urNp linux-2.6.32.10/mm/rmap.c linux-2.6.32.10/mm/rmap.c
50690 vma->anon_vma = anon_vma; 51934 vma->anon_vma = anon_vma;
50691 list_add_tail(&vma->anon_vma_node, &anon_vma->head); 51935 list_add_tail(&vma->anon_vma_node, &anon_vma->head);
50692 allocated = NULL; 51936 allocated = NULL;
50693diff -urNp linux-2.6.32.10/mm/shmem.c linux-2.6.32.10/mm/shmem.c 51937diff -urNp linux-2.6.32.11/mm/shmem.c linux-2.6.32.11/mm/shmem.c
50694--- linux-2.6.32.10/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400 51938--- linux-2.6.32.11/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400
50695+++ linux-2.6.32.10/mm/shmem.c 2010-03-20 15:58:47.198057227 -0400 51939+++ linux-2.6.32.11/mm/shmem.c 2010-04-04 20:46:41.716811517 -0400
50696@@ -31,7 +31,7 @@ 51940@@ -31,7 +31,7 @@
50697 #include <linux/swap.h> 51941 #include <linux/swap.h>
50698 #include <linux/ima.h> 51942 #include <linux/ima.h>
@@ -50702,9 +51946,9 @@ diff -urNp linux-2.6.32.10/mm/shmem.c linux-2.6.32.10/mm/shmem.c
50702 51946
50703 #ifdef CONFIG_SHMEM 51947 #ifdef CONFIG_SHMEM
50704 /* 51948 /*
50705diff -urNp linux-2.6.32.10/mm/slab.c linux-2.6.32.10/mm/slab.c 51949diff -urNp linux-2.6.32.11/mm/slab.c linux-2.6.32.11/mm/slab.c
50706--- linux-2.6.32.10/mm/slab.c 2010-03-15 11:52:04.000000000 -0400 51950--- linux-2.6.32.11/mm/slab.c 2010-03-15 11:52:04.000000000 -0400
50707+++ linux-2.6.32.10/mm/slab.c 2010-03-20 15:58:47.198057227 -0400 51951+++ linux-2.6.32.11/mm/slab.c 2010-04-04 20:46:41.716811517 -0400
50708@@ -308,7 +308,7 @@ struct kmem_list3 { 51952@@ -308,7 +308,7 @@ struct kmem_list3 {
50709 * Need this for bootstrapping a per node allocator. 51953 * Need this for bootstrapping a per node allocator.
50710 */ 51954 */
@@ -50802,9 +52046,9 @@ diff -urNp linux-2.6.32.10/mm/slab.c linux-2.6.32.10/mm/slab.c
50802 /** 52046 /**
50803 * ksize - get the actual amount of memory allocated for a given object 52047 * ksize - get the actual amount of memory allocated for a given object
50804 * @objp: Pointer to the object 52048 * @objp: Pointer to the object
50805diff -urNp linux-2.6.32.10/mm/slob.c linux-2.6.32.10/mm/slob.c 52049diff -urNp linux-2.6.32.11/mm/slob.c linux-2.6.32.11/mm/slob.c
50806--- linux-2.6.32.10/mm/slob.c 2010-03-15 11:52:04.000000000 -0400 52050--- linux-2.6.32.11/mm/slob.c 2010-03-15 11:52:04.000000000 -0400
50807+++ linux-2.6.32.10/mm/slob.c 2010-03-20 15:58:47.198057227 -0400 52051+++ linux-2.6.32.11/mm/slob.c 2010-04-04 20:46:41.716811517 -0400
50808@@ -29,7 +29,7 @@ 52052@@ -29,7 +29,7 @@
50809 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls 52053 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
50810 * alloc_pages() directly, allocating compound pages so the page order 52054 * alloc_pages() directly, allocating compound pages so the page order
@@ -51125,9 +52369,9 @@ diff -urNp linux-2.6.32.10/mm/slob.c linux-2.6.32.10/mm/slob.c
51125 } 52369 }
51126 52370
51127 trace_kmem_cache_free(_RET_IP_, b); 52371 trace_kmem_cache_free(_RET_IP_, b);
51128diff -urNp linux-2.6.32.10/mm/slub.c linux-2.6.32.10/mm/slub.c 52372diff -urNp linux-2.6.32.11/mm/slub.c linux-2.6.32.11/mm/slub.c
51129--- linux-2.6.32.10/mm/slub.c 2010-03-15 11:52:04.000000000 -0400 52373--- linux-2.6.32.11/mm/slub.c 2010-03-15 11:52:04.000000000 -0400
51130+++ linux-2.6.32.10/mm/slub.c 2010-03-20 15:58:47.198057227 -0400 52374+++ linux-2.6.32.11/mm/slub.c 2010-04-04 20:46:41.716811517 -0400
51131@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * 52375@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache *
51132 52376
51133 page = virt_to_head_page(x); 52377 page = virt_to_head_page(x);
@@ -51284,9 +52528,9 @@ diff -urNp linux-2.6.32.10/mm/slub.c linux-2.6.32.10/mm/slub.c
51284 static void print_slabinfo_header(struct seq_file *m) 52528 static void print_slabinfo_header(struct seq_file *m)
51285 { 52529 {
51286 seq_puts(m, "slabinfo - version: 2.1\n"); 52530 seq_puts(m, "slabinfo - version: 2.1\n");
51287diff -urNp linux-2.6.32.10/mm/util.c linux-2.6.32.10/mm/util.c 52531diff -urNp linux-2.6.32.11/mm/util.c linux-2.6.32.11/mm/util.c
51288--- linux-2.6.32.10/mm/util.c 2010-03-15 11:52:04.000000000 -0400 52532--- linux-2.6.32.11/mm/util.c 2010-03-15 11:52:04.000000000 -0400
51289+++ linux-2.6.32.10/mm/util.c 2010-03-20 15:58:47.198057227 -0400 52533+++ linux-2.6.32.11/mm/util.c 2010-04-04 20:46:41.716811517 -0400
51290@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); 52534@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
51291 void arch_pick_mmap_layout(struct mm_struct *mm) 52535 void arch_pick_mmap_layout(struct mm_struct *mm)
51292 { 52536 {
@@ -51300,9 +52544,9 @@ diff -urNp linux-2.6.32.10/mm/util.c linux-2.6.32.10/mm/util.c
51300 mm->get_unmapped_area = arch_get_unmapped_area; 52544 mm->get_unmapped_area = arch_get_unmapped_area;
51301 mm->unmap_area = arch_unmap_area; 52545 mm->unmap_area = arch_unmap_area;
51302 } 52546 }
51303diff -urNp linux-2.6.32.10/mm/vmalloc.c linux-2.6.32.10/mm/vmalloc.c 52547diff -urNp linux-2.6.32.11/mm/vmalloc.c linux-2.6.32.11/mm/vmalloc.c
51304--- linux-2.6.32.10/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400 52548--- linux-2.6.32.11/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400
51305+++ linux-2.6.32.10/mm/vmalloc.c 2010-03-20 15:58:47.198057227 -0400 52549+++ linux-2.6.32.11/mm/vmalloc.c 2010-04-04 20:46:41.716811517 -0400
51306@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, 52550@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
51307 52551
51308 pte = pte_offset_kernel(pmd, addr); 52552 pte = pte_offset_kernel(pmd, addr);
@@ -51513,9 +52757,9 @@ diff -urNp linux-2.6.32.10/mm/vmalloc.c linux-2.6.32.10/mm/vmalloc.c
51513 void *vmalloc_32_user(unsigned long size) 52757 void *vmalloc_32_user(unsigned long size)
51514 { 52758 {
51515 struct vm_struct *area; 52759 struct vm_struct *area;
51516diff -urNp linux-2.6.32.10/net/atm/atm_misc.c linux-2.6.32.10/net/atm/atm_misc.c 52760diff -urNp linux-2.6.32.11/net/atm/atm_misc.c linux-2.6.32.11/net/atm/atm_misc.c
51517--- linux-2.6.32.10/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400 52761--- linux-2.6.32.11/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400
51518+++ linux-2.6.32.10/net/atm/atm_misc.c 2010-03-20 15:58:47.198057227 -0400 52762+++ linux-2.6.32.11/net/atm/atm_misc.c 2010-04-04 20:46:41.716811517 -0400
51519@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t 52763@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
51520 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) 52764 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
51521 return 1; 52765 return 1;
@@ -51552,9 +52796,9 @@ diff -urNp linux-2.6.32.10/net/atm/atm_misc.c linux-2.6.32.10/net/atm/atm_misc.c
51552 __SONET_ITEMS 52796 __SONET_ITEMS
51553 #undef __HANDLE_ITEM 52797 #undef __HANDLE_ITEM
51554 } 52798 }
51555diff -urNp linux-2.6.32.10/net/atm/proc.c linux-2.6.32.10/net/atm/proc.c 52799diff -urNp linux-2.6.32.11/net/atm/proc.c linux-2.6.32.11/net/atm/proc.c
51556--- linux-2.6.32.10/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400 52800--- linux-2.6.32.11/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400
51557+++ linux-2.6.32.10/net/atm/proc.c 2010-03-20 15:58:47.198057227 -0400 52801+++ linux-2.6.32.11/net/atm/proc.c 2010-04-04 20:46:41.716811517 -0400
51558@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s 52802@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
51559 const struct k_atm_aal_stats *stats) 52803 const struct k_atm_aal_stats *stats)
51560 { 52804 {
@@ -51568,9 +52812,9 @@ diff -urNp linux-2.6.32.10/net/atm/proc.c linux-2.6.32.10/net/atm/proc.c
51568 } 52812 }
51569 52813
51570 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) 52814 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
51571diff -urNp linux-2.6.32.10/net/atm/resources.c linux-2.6.32.10/net/atm/resources.c 52815diff -urNp linux-2.6.32.11/net/atm/resources.c linux-2.6.32.11/net/atm/resources.c
51572--- linux-2.6.32.10/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400 52816--- linux-2.6.32.11/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400
51573+++ linux-2.6.32.10/net/atm/resources.c 2010-03-20 15:58:47.198057227 -0400 52817+++ linux-2.6.32.11/net/atm/resources.c 2010-04-04 20:46:41.716811517 -0400
51574@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * 52818@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
51575 static void copy_aal_stats(struct k_atm_aal_stats *from, 52819 static void copy_aal_stats(struct k_atm_aal_stats *from,
51576 struct atm_aal_stats *to) 52820 struct atm_aal_stats *to)
@@ -51589,9 +52833,9 @@ diff -urNp linux-2.6.32.10/net/atm/resources.c linux-2.6.32.10/net/atm/resources
51589 __AAL_STAT_ITEMS 52833 __AAL_STAT_ITEMS
51590 #undef __HANDLE_ITEM 52834 #undef __HANDLE_ITEM
51591 } 52835 }
51592diff -urNp linux-2.6.32.10/net/bridge/br_private.h linux-2.6.32.10/net/bridge/br_private.h 52836diff -urNp linux-2.6.32.11/net/bridge/br_private.h linux-2.6.32.11/net/bridge/br_private.h
51593--- linux-2.6.32.10/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400 52837--- linux-2.6.32.11/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400
51594+++ linux-2.6.32.10/net/bridge/br_private.h 2010-03-20 15:58:47.198057227 -0400 52838+++ linux-2.6.32.11/net/bridge/br_private.h 2010-04-04 20:46:41.716811517 -0400
51595@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, 52839@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,
51596 52840
51597 #ifdef CONFIG_SYSFS 52841 #ifdef CONFIG_SYSFS
@@ -51601,9 +52845,9 @@ diff -urNp linux-2.6.32.10/net/bridge/br_private.h linux-2.6.32.10/net/bridge/br
51601 extern int br_sysfs_addif(struct net_bridge_port *p); 52845 extern int br_sysfs_addif(struct net_bridge_port *p);
51602 52846
51603 /* br_sysfs_br.c */ 52847 /* br_sysfs_br.c */
51604diff -urNp linux-2.6.32.10/net/bridge/br_stp_if.c linux-2.6.32.10/net/bridge/br_stp_if.c 52848diff -urNp linux-2.6.32.11/net/bridge/br_stp_if.c linux-2.6.32.11/net/bridge/br_stp_if.c
51605--- linux-2.6.32.10/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400 52849--- linux-2.6.32.11/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400
51606+++ linux-2.6.32.10/net/bridge/br_stp_if.c 2010-03-20 15:58:47.198057227 -0400 52850+++ linux-2.6.32.11/net/bridge/br_stp_if.c 2010-04-04 20:46:41.716811517 -0400
51607@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg 52851@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
51608 char *envp[] = { NULL }; 52852 char *envp[] = { NULL };
51609 52853
@@ -51613,9 +52857,9 @@ diff -urNp linux-2.6.32.10/net/bridge/br_stp_if.c linux-2.6.32.10/net/bridge/br_
51613 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", 52857 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
51614 br->dev->name, r); 52858 br->dev->name, r);
51615 52859
51616diff -urNp linux-2.6.32.10/net/bridge/br_sysfs_if.c linux-2.6.32.10/net/bridge/br_sysfs_if.c 52860diff -urNp linux-2.6.32.11/net/bridge/br_sysfs_if.c linux-2.6.32.11/net/bridge/br_sysfs_if.c
51617--- linux-2.6.32.10/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400 52861--- linux-2.6.32.11/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400
51618+++ linux-2.6.32.10/net/bridge/br_sysfs_if.c 2010-03-20 15:58:47.198057227 -0400 52862+++ linux-2.6.32.11/net/bridge/br_sysfs_if.c 2010-04-04 20:46:41.716811517 -0400
51619@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje 52863@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
51620 return ret; 52864 return ret;
51621 } 52865 }
@@ -51625,9 +52869,9 @@ diff -urNp linux-2.6.32.10/net/bridge/br_sysfs_if.c linux-2.6.32.10/net/bridge/b
51625 .show = brport_show, 52869 .show = brport_show,
51626 .store = brport_store, 52870 .store = brport_store,
51627 }; 52871 };
51628diff -urNp linux-2.6.32.10/net/core/dev.c linux-2.6.32.10/net/core/dev.c 52872diff -urNp linux-2.6.32.11/net/core/dev.c linux-2.6.32.11/net/core/dev.c
51629--- linux-2.6.32.10/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400 52873--- linux-2.6.32.11/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400
51630+++ linux-2.6.32.10/net/core/dev.c 2010-03-20 15:58:47.202049690 -0400 52874+++ linux-2.6.32.11/net/core/dev.c 2010-04-04 20:46:41.721901011 -0400
51631@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) 52875@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb)
51632 } 52876 }
51633 EXPORT_SYMBOL(netif_rx_ni); 52877 EXPORT_SYMBOL(netif_rx_ni);
@@ -51646,9 +52890,9 @@ diff -urNp linux-2.6.32.10/net/core/dev.c linux-2.6.32.10/net/core/dev.c
51646 { 52890 {
51647 struct list_head *list = &__get_cpu_var(softnet_data).poll_list; 52891 struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
51648 unsigned long time_limit = jiffies + 2; 52892 unsigned long time_limit = jiffies + 2;
51649diff -urNp linux-2.6.32.10/net/core/flow.c linux-2.6.32.10/net/core/flow.c 52893diff -urNp linux-2.6.32.11/net/core/flow.c linux-2.6.32.11/net/core/flow.c
51650--- linux-2.6.32.10/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400 52894--- linux-2.6.32.11/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400
51651+++ linux-2.6.32.10/net/core/flow.c 2010-03-20 15:58:47.202049690 -0400 52895+++ linux-2.6.32.11/net/core/flow.c 2010-04-04 20:46:41.721901011 -0400
51652@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( 52896@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
51653 52897
51654 static u32 flow_hash_shift; 52898 static u32 flow_hash_shift;
@@ -51676,9 +52920,9 @@ diff -urNp linux-2.6.32.10/net/core/flow.c linux-2.6.32.10/net/core/flow.c
51676 52920
51677 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) 52921 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
51678 52922
51679diff -urNp linux-2.6.32.10/net/dccp/ccids/ccid3.c linux-2.6.32.10/net/dccp/ccids/ccid3.c 52923diff -urNp linux-2.6.32.11/net/dccp/ccids/ccid3.c linux-2.6.32.11/net/dccp/ccids/ccid3.c
51680--- linux-2.6.32.10/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400 52924--- linux-2.6.32.11/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400
51681+++ linux-2.6.32.10/net/dccp/ccids/ccid3.c 2010-03-20 15:58:47.202049690 -0400 52925+++ linux-2.6.32.11/net/dccp/ccids/ccid3.c 2010-04-04 20:46:41.721901011 -0400
51682@@ -41,7 +41,7 @@ 52926@@ -41,7 +41,7 @@
51683 static int ccid3_debug; 52927 static int ccid3_debug;
51684 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) 52928 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -51688,9 +52932,9 @@ diff -urNp linux-2.6.32.10/net/dccp/ccids/ccid3.c linux-2.6.32.10/net/dccp/ccids
51688 #endif 52932 #endif
51689 52933
51690 /* 52934 /*
51691diff -urNp linux-2.6.32.10/net/dccp/dccp.h linux-2.6.32.10/net/dccp/dccp.h 52935diff -urNp linux-2.6.32.11/net/dccp/dccp.h linux-2.6.32.11/net/dccp/dccp.h
51692--- linux-2.6.32.10/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400 52936--- linux-2.6.32.11/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400
51693+++ linux-2.6.32.10/net/dccp/dccp.h 2010-03-20 15:58:47.202049690 -0400 52937+++ linux-2.6.32.11/net/dccp/dccp.h 2010-04-04 20:46:41.721901011 -0400
51694@@ -44,9 +44,9 @@ extern int dccp_debug; 52938@@ -44,9 +44,9 @@ extern int dccp_debug;
51695 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) 52939 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
51696 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) 52940 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
@@ -51704,9 +52948,9 @@ diff -urNp linux-2.6.32.10/net/dccp/dccp.h linux-2.6.32.10/net/dccp/dccp.h
51704 #endif 52948 #endif
51705 52949
51706 extern struct inet_hashinfo dccp_hashinfo; 52950 extern struct inet_hashinfo dccp_hashinfo;
51707diff -urNp linux-2.6.32.10/net/decnet/sysctl_net_decnet.c linux-2.6.32.10/net/decnet/sysctl_net_decnet.c 52951diff -urNp linux-2.6.32.11/net/decnet/sysctl_net_decnet.c linux-2.6.32.11/net/decnet/sysctl_net_decnet.c
51708--- linux-2.6.32.10/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400 52952--- linux-2.6.32.11/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400
51709+++ linux-2.6.32.10/net/decnet/sysctl_net_decnet.c 2010-03-20 15:58:47.202049690 -0400 52953+++ linux-2.6.32.11/net/decnet/sysctl_net_decnet.c 2010-04-04 20:46:41.721901011 -0400
51710@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t 52954@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
51711 52955
51712 if (len > *lenp) len = *lenp; 52956 if (len > *lenp) len = *lenp;
@@ -51725,9 +52969,9 @@ diff -urNp linux-2.6.32.10/net/decnet/sysctl_net_decnet.c linux-2.6.32.10/net/de
51725 return -EFAULT; 52969 return -EFAULT;
51726 52970
51727 *lenp = len; 52971 *lenp = len;
51728diff -urNp linux-2.6.32.10/net/ipv4/inet_hashtables.c linux-2.6.32.10/net/ipv4/inet_hashtables.c 52972diff -urNp linux-2.6.32.11/net/ipv4/inet_hashtables.c linux-2.6.32.11/net/ipv4/inet_hashtables.c
51729--- linux-2.6.32.10/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400 52973--- linux-2.6.32.11/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400
51730+++ linux-2.6.32.10/net/ipv4/inet_hashtables.c 2010-03-20 15:58:47.202049690 -0400 52974+++ linux-2.6.32.11/net/ipv4/inet_hashtables.c 2010-04-04 20:46:41.721901011 -0400
51731@@ -18,11 +18,14 @@ 52975@@ -18,11 +18,14 @@
51732 #include <linux/sched.h> 52976 #include <linux/sched.h>
51733 #include <linux/slab.h> 52977 #include <linux/slab.h>
@@ -51752,9 +52996,9 @@ diff -urNp linux-2.6.32.10/net/ipv4/inet_hashtables.c linux-2.6.32.10/net/ipv4/i
51752 if (tw) { 52996 if (tw) {
51753 inet_twsk_deschedule(tw, death_row); 52997 inet_twsk_deschedule(tw, death_row);
51754 inet_twsk_put(tw); 52998 inet_twsk_put(tw);
51755diff -urNp linux-2.6.32.10/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.10/net/ipv4/netfilter/nf_nat_snmp_basic.c 52999diff -urNp linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c
51756--- linux-2.6.32.10/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400 53000--- linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400
51757+++ linux-2.6.32.10/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-20 15:58:47.202049690 -0400 53001+++ linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-04-04 20:46:41.721901011 -0400
51758@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( 53002@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
51759 53003
51760 *len = 0; 53004 *len = 0;
@@ -51764,9 +53008,9 @@ diff -urNp linux-2.6.32.10/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.1
51764 if (*octets == NULL) { 53008 if (*octets == NULL) {
51765 if (net_ratelimit()) 53009 if (net_ratelimit())
51766 printk("OOM in bsalg (%d)\n", __LINE__); 53010 printk("OOM in bsalg (%d)\n", __LINE__);
51767diff -urNp linux-2.6.32.10/net/ipv4/tcp_ipv4.c linux-2.6.32.10/net/ipv4/tcp_ipv4.c 53011diff -urNp linux-2.6.32.11/net/ipv4/tcp_ipv4.c linux-2.6.32.11/net/ipv4/tcp_ipv4.c
51768--- linux-2.6.32.10/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400 53012--- linux-2.6.32.11/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400
51769+++ linux-2.6.32.10/net/ipv4/tcp_ipv4.c 2010-03-20 16:43:40.608963983 -0400 53013+++ linux-2.6.32.11/net/ipv4/tcp_ipv4.c 2010-04-04 20:46:41.721901011 -0400
51770@@ -84,6 +84,9 @@ 53014@@ -84,6 +84,9 @@
51771 int sysctl_tcp_tw_reuse __read_mostly; 53015 int sysctl_tcp_tw_reuse __read_mostly;
51772 int sysctl_tcp_low_latency __read_mostly; 53016 int sysctl_tcp_low_latency __read_mostly;
@@ -51811,9 +53055,9 @@ diff -urNp linux-2.6.32.10/net/ipv4/tcp_ipv4.c linux-2.6.32.10/net/ipv4/tcp_ipv4
51811 tcp_v4_send_reset(NULL, skb); 53055 tcp_v4_send_reset(NULL, skb);
51812 } 53056 }
51813 53057
51814diff -urNp linux-2.6.32.10/net/ipv4/tcp_minisocks.c linux-2.6.32.10/net/ipv4/tcp_minisocks.c 53058diff -urNp linux-2.6.32.11/net/ipv4/tcp_minisocks.c linux-2.6.32.11/net/ipv4/tcp_minisocks.c
51815--- linux-2.6.32.10/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400 53059--- linux-2.6.32.11/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400
51816+++ linux-2.6.32.10/net/ipv4/tcp_minisocks.c 2010-03-21 15:08:35.843551109 -0400 53060+++ linux-2.6.32.11/net/ipv4/tcp_minisocks.c 2010-04-04 20:46:41.721901011 -0400
51817@@ -26,6 +26,10 @@ 53061@@ -26,6 +26,10 @@
51818 #include <net/inet_common.h> 53062 #include <net/inet_common.h>
51819 #include <net/xfrm.h> 53063 #include <net/xfrm.h>
@@ -51836,9 +53080,9 @@ diff -urNp linux-2.6.32.10/net/ipv4/tcp_minisocks.c linux-2.6.32.10/net/ipv4/tcp
51836 if (!(flg & TCP_FLAG_RST)) 53080 if (!(flg & TCP_FLAG_RST))
51837 req->rsk_ops->send_reset(sk, skb); 53081 req->rsk_ops->send_reset(sk, skb);
51838 53082
51839diff -urNp linux-2.6.32.10/net/ipv4/tcp_probe.c linux-2.6.32.10/net/ipv4/tcp_probe.c 53083diff -urNp linux-2.6.32.11/net/ipv4/tcp_probe.c linux-2.6.32.11/net/ipv4/tcp_probe.c
51840--- linux-2.6.32.10/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400 53084--- linux-2.6.32.11/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400
51841+++ linux-2.6.32.10/net/ipv4/tcp_probe.c 2010-03-20 15:58:47.202049690 -0400 53085+++ linux-2.6.32.11/net/ipv4/tcp_probe.c 2010-04-04 20:46:41.721901011 -0400
51842@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file 53086@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
51843 if (cnt + width >= len) 53087 if (cnt + width >= len)
51844 break; 53088 break;
@@ -51848,9 +53092,9 @@ diff -urNp linux-2.6.32.10/net/ipv4/tcp_probe.c linux-2.6.32.10/net/ipv4/tcp_pro
51848 return -EFAULT; 53092 return -EFAULT;
51849 cnt += width; 53093 cnt += width;
51850 } 53094 }
51851diff -urNp linux-2.6.32.10/net/ipv4/tcp_timer.c linux-2.6.32.10/net/ipv4/tcp_timer.c 53095diff -urNp linux-2.6.32.11/net/ipv4/tcp_timer.c linux-2.6.32.11/net/ipv4/tcp_timer.c
51852--- linux-2.6.32.10/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400 53096--- linux-2.6.32.11/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400
51853+++ linux-2.6.32.10/net/ipv4/tcp_timer.c 2010-03-20 16:54:07.060562571 -0400 53097+++ linux-2.6.32.11/net/ipv4/tcp_timer.c 2010-04-04 20:46:41.721901011 -0400
51854@@ -21,6 +21,10 @@ 53098@@ -21,6 +21,10 @@
51855 #include <linux/module.h> 53099 #include <linux/module.h>
51856 #include <net/tcp.h> 53100 #include <net/tcp.h>
@@ -51876,9 +53120,9 @@ diff -urNp linux-2.6.32.10/net/ipv4/tcp_timer.c linux-2.6.32.10/net/ipv4/tcp_tim
51876 if (retransmits_timed_out(sk, retry_until)) { 53120 if (retransmits_timed_out(sk, retry_until)) {
51877 /* Has it gone just too far? */ 53121 /* Has it gone just too far? */
51878 tcp_write_err(sk); 53122 tcp_write_err(sk);
51879diff -urNp linux-2.6.32.10/net/ipv4/udp.c linux-2.6.32.10/net/ipv4/udp.c 53123diff -urNp linux-2.6.32.11/net/ipv4/udp.c linux-2.6.32.11/net/ipv4/udp.c
51880--- linux-2.6.32.10/net/ipv4/udp.c 2010-03-15 11:52:04.000000000 -0400 53124--- linux-2.6.32.11/net/ipv4/udp.c 2010-03-15 11:52:04.000000000 -0400
51881+++ linux-2.6.32.10/net/ipv4/udp.c 2010-03-20 16:44:04.336670861 -0400 53125+++ linux-2.6.32.11/net/ipv4/udp.c 2010-04-04 20:46:41.724917264 -0400
51882@@ -86,6 +86,7 @@ 53126@@ -86,6 +86,7 @@
51883 #include <linux/types.h> 53127 #include <linux/types.h>
51884 #include <linux/fcntl.h> 53128 #include <linux/fcntl.h>
@@ -51948,9 +53192,9 @@ diff -urNp linux-2.6.32.10/net/ipv4/udp.c linux-2.6.32.10/net/ipv4/udp.c
51948 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); 53192 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
51949 53193
51950 /* 53194 /*
51951diff -urNp linux-2.6.32.10/net/ipv6/exthdrs.c linux-2.6.32.10/net/ipv6/exthdrs.c 53195diff -urNp linux-2.6.32.11/net/ipv6/exthdrs.c linux-2.6.32.11/net/ipv6/exthdrs.c
51952--- linux-2.6.32.10/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400 53196--- linux-2.6.32.11/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400
51953+++ linux-2.6.32.10/net/ipv6/exthdrs.c 2010-03-20 15:58:47.202049690 -0400 53197+++ linux-2.6.32.11/net/ipv6/exthdrs.c 2010-04-04 20:46:41.724917264 -0400
51954@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt 53198@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
51955 .type = IPV6_TLV_JUMBO, 53199 .type = IPV6_TLV_JUMBO,
51956 .func = ipv6_hop_jumbo, 53200 .func = ipv6_hop_jumbo,
@@ -51960,9 +53204,9 @@ diff -urNp linux-2.6.32.10/net/ipv6/exthdrs.c linux-2.6.32.10/net/ipv6/exthdrs.c
51960 }; 53204 };
51961 53205
51962 int ipv6_parse_hopopts(struct sk_buff *skb) 53206 int ipv6_parse_hopopts(struct sk_buff *skb)
51963diff -urNp linux-2.6.32.10/net/ipv6/raw.c linux-2.6.32.10/net/ipv6/raw.c 53207diff -urNp linux-2.6.32.11/net/ipv6/raw.c linux-2.6.32.11/net/ipv6/raw.c
51964--- linux-2.6.32.10/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400 53208--- linux-2.6.32.11/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400
51965+++ linux-2.6.32.10/net/ipv6/raw.c 2010-03-20 15:58:47.202049690 -0400 53209+++ linux-2.6.32.11/net/ipv6/raw.c 2010-04-04 20:46:41.724917264 -0400
51966@@ -600,7 +600,7 @@ out: 53210@@ -600,7 +600,7 @@ out:
51967 return err; 53211 return err;
51968 } 53212 }
@@ -51972,9 +53216,9 @@ diff -urNp linux-2.6.32.10/net/ipv6/raw.c linux-2.6.32.10/net/ipv6/raw.c
51972 struct flowi *fl, struct rt6_info *rt, 53216 struct flowi *fl, struct rt6_info *rt,
51973 unsigned int flags) 53217 unsigned int flags)
51974 { 53218 {
51975diff -urNp linux-2.6.32.10/net/ipv6/tcp_ipv6.c linux-2.6.32.10/net/ipv6/tcp_ipv6.c 53219diff -urNp linux-2.6.32.11/net/ipv6/tcp_ipv6.c linux-2.6.32.11/net/ipv6/tcp_ipv6.c
51976--- linux-2.6.32.10/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400 53220--- linux-2.6.32.11/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400
51977+++ linux-2.6.32.10/net/ipv6/tcp_ipv6.c 2010-03-20 15:58:47.205034038 -0400 53221+++ linux-2.6.32.11/net/ipv6/tcp_ipv6.c 2010-04-04 20:46:41.724917264 -0400
51978@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk 53222@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk
51979 return 0; 53223 return 0;
51980 53224
@@ -51995,9 +53239,9 @@ diff -urNp linux-2.6.32.10/net/ipv6/tcp_ipv6.c linux-2.6.32.10/net/ipv6/tcp_ipv6
51995 tcp_v6_send_reset(NULL, skb); 53239 tcp_v6_send_reset(NULL, skb);
51996 } 53240 }
51997 53241
51998diff -urNp linux-2.6.32.10/net/ipv6/udp.c linux-2.6.32.10/net/ipv6/udp.c 53242diff -urNp linux-2.6.32.11/net/ipv6/udp.c linux-2.6.32.11/net/ipv6/udp.c
51999--- linux-2.6.32.10/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400 53243--- linux-2.6.32.11/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400
52000+++ linux-2.6.32.10/net/ipv6/udp.c 2010-03-20 15:58:47.205034038 -0400 53244+++ linux-2.6.32.11/net/ipv6/udp.c 2010-04-04 20:46:41.724917264 -0400
52001@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, 53245@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb,
52002 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, 53246 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
52003 proto == IPPROTO_UDPLITE); 53247 proto == IPPROTO_UDPLITE);
@@ -52008,9 +53252,9 @@ diff -urNp linux-2.6.32.10/net/ipv6/udp.c linux-2.6.32.10/net/ipv6/udp.c
52008 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); 53252 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
52009 53253
52010 kfree_skb(skb); 53254 kfree_skb(skb);
52011diff -urNp linux-2.6.32.10/net/irda/ircomm/ircomm_tty.c linux-2.6.32.10/net/irda/ircomm/ircomm_tty.c 53255diff -urNp linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c
52012--- linux-2.6.32.10/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400 53256--- linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400
52013+++ linux-2.6.32.10/net/irda/ircomm/ircomm_tty.c 2010-03-20 15:58:47.205034038 -0400 53257+++ linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c 2010-04-04 20:46:41.724917264 -0400
52014@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st 53258@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
52015 add_wait_queue(&self->open_wait, &wait); 53259 add_wait_queue(&self->open_wait, &wait);
52016 53260
@@ -52133,10 +53377,10 @@ diff -urNp linux-2.6.32.10/net/irda/ircomm/ircomm_tty.c linux-2.6.32.10/net/irda
52133 seq_printf(m, "Max data size: %d\n", self->max_data_size); 53377 seq_printf(m, "Max data size: %d\n", self->max_data_size);
52134 seq_printf(m, "Max header size: %d\n", self->max_header_size); 53378 seq_printf(m, "Max header size: %d\n", self->max_header_size);
52135 53379
52136diff -urNp linux-2.6.32.10/net/mac80211/ieee80211_i.h linux-2.6.32.10/net/mac80211/ieee80211_i.h 53380diff -urNp linux-2.6.32.11/net/mac80211/ieee80211_i.h linux-2.6.32.11/net/mac80211/ieee80211_i.h
52137--- linux-2.6.32.10/net/mac80211/ieee80211_i.h 2010-03-15 11:52:04.000000000 -0400 53381--- linux-2.6.32.11/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400
52138+++ linux-2.6.32.10/net/mac80211/ieee80211_i.h 2010-03-20 15:58:47.205034038 -0400 53382+++ linux-2.6.32.11/net/mac80211/ieee80211_i.h 2010-04-04 20:46:41.724917264 -0400
52139@@ -634,7 +634,7 @@ struct ieee80211_local { 53383@@ -635,7 +635,7 @@ struct ieee80211_local {
52140 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ 53384 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
52141 spinlock_t queue_stop_reason_lock; 53385 spinlock_t queue_stop_reason_lock;
52142 53386
@@ -52145,9 +53389,9 @@ diff -urNp linux-2.6.32.10/net/mac80211/ieee80211_i.h linux-2.6.32.10/net/mac802
52145 int monitors, cooked_mntrs; 53389 int monitors, cooked_mntrs;
52146 /* number of interfaces with corresponding FIF_ flags */ 53390 /* number of interfaces with corresponding FIF_ flags */
52147 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; 53391 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
52148diff -urNp linux-2.6.32.10/net/mac80211/iface.c linux-2.6.32.10/net/mac80211/iface.c 53392diff -urNp linux-2.6.32.11/net/mac80211/iface.c linux-2.6.32.11/net/mac80211/iface.c
52149--- linux-2.6.32.10/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400 53393--- linux-2.6.32.11/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400
52150+++ linux-2.6.32.10/net/mac80211/iface.c 2010-03-20 15:58:47.205034038 -0400 53394+++ linux-2.6.32.11/net/mac80211/iface.c 2010-04-04 20:46:41.724917264 -0400
52151@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev 53395@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
52152 break; 53396 break;
52153 } 53397 }
@@ -52202,9 +53446,9 @@ diff -urNp linux-2.6.32.10/net/mac80211/iface.c linux-2.6.32.10/net/mac80211/ifa
52202 ieee80211_clear_tx_pending(local); 53446 ieee80211_clear_tx_pending(local);
52203 ieee80211_stop_device(local); 53447 ieee80211_stop_device(local);
52204 53448
52205diff -urNp linux-2.6.32.10/net/mac80211/main.c linux-2.6.32.10/net/mac80211/main.c 53449diff -urNp linux-2.6.32.11/net/mac80211/main.c linux-2.6.32.11/net/mac80211/main.c
52206--- linux-2.6.32.10/net/mac80211/main.c 2010-03-15 11:52:04.000000000 -0400 53450--- linux-2.6.32.11/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400
52207+++ linux-2.6.32.10/net/mac80211/main.c 2010-03-20 15:58:47.205034038 -0400 53451+++ linux-2.6.32.11/net/mac80211/main.c 2010-04-04 20:46:41.724917264 -0400
52208@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 53452@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
52209 local->hw.conf.power_level = power; 53453 local->hw.conf.power_level = power;
52210 } 53454 }
@@ -52214,9 +53458,9 @@ diff -urNp linux-2.6.32.10/net/mac80211/main.c linux-2.6.32.10/net/mac80211/main
52214 ret = drv_config(local, changed); 53458 ret = drv_config(local, changed);
52215 /* 53459 /*
52216 * Goal: 53460 * Goal:
52217diff -urNp linux-2.6.32.10/net/mac80211/pm.c linux-2.6.32.10/net/mac80211/pm.c 53461diff -urNp linux-2.6.32.11/net/mac80211/pm.c linux-2.6.32.11/net/mac80211/pm.c
52218--- linux-2.6.32.10/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400 53462--- linux-2.6.32.11/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400
52219+++ linux-2.6.32.10/net/mac80211/pm.c 2010-03-20 15:58:47.205034038 -0400 53463+++ linux-2.6.32.11/net/mac80211/pm.c 2010-04-04 20:46:41.724917264 -0400
52220@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 53464@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
52221 } 53465 }
52222 53466
@@ -52226,9 +53470,9 @@ diff -urNp linux-2.6.32.10/net/mac80211/pm.c linux-2.6.32.10/net/mac80211/pm.c
52226 ieee80211_stop_device(local); 53470 ieee80211_stop_device(local);
52227 53471
52228 local->suspended = true; 53472 local->suspended = true;
52229diff -urNp linux-2.6.32.10/net/mac80211/rate.c linux-2.6.32.10/net/mac80211/rate.c 53473diff -urNp linux-2.6.32.11/net/mac80211/rate.c linux-2.6.32.11/net/mac80211/rate.c
52230--- linux-2.6.32.10/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400 53474--- linux-2.6.32.11/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400
52231+++ linux-2.6.32.10/net/mac80211/rate.c 2010-03-20 15:58:47.205034038 -0400 53475+++ linux-2.6.32.11/net/mac80211/rate.c 2010-04-04 20:46:41.724917264 -0400
52232@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct 53476@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
52233 struct rate_control_ref *ref, *old; 53477 struct rate_control_ref *ref, *old;
52234 53478
@@ -52238,9 +53482,9 @@ diff -urNp linux-2.6.32.10/net/mac80211/rate.c linux-2.6.32.10/net/mac80211/rate
52238 return -EBUSY; 53482 return -EBUSY;
52239 53483
52240 ref = rate_control_alloc(name, local); 53484 ref = rate_control_alloc(name, local);
52241diff -urNp linux-2.6.32.10/net/mac80211/util.c linux-2.6.32.10/net/mac80211/util.c 53485diff -urNp linux-2.6.32.11/net/mac80211/util.c linux-2.6.32.11/net/mac80211/util.c
52242--- linux-2.6.32.10/net/mac80211/util.c 2010-03-15 11:52:04.000000000 -0400 53486--- linux-2.6.32.11/net/mac80211/util.c 2010-03-15 11:52:04.000000000 -0400
52243+++ linux-2.6.32.10/net/mac80211/util.c 2010-03-20 15:58:47.205034038 -0400 53487+++ linux-2.6.32.11/net/mac80211/util.c 2010-04-04 20:46:41.724917264 -0400
52244@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ 53488@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_
52245 local->resuming = true; 53489 local->resuming = true;
52246 53490
@@ -52258,9 +53502,9 @@ diff -urNp linux-2.6.32.10/net/mac80211/util.c linux-2.6.32.10/net/mac80211/util
52258 if (res) { 53502 if (res) {
52259 WARN(local->suspended, "Harware became unavailable " 53503 WARN(local->suspended, "Harware became unavailable "
52260 "upon resume. This is could be a software issue" 53504 "upon resume. This is could be a software issue"
52261diff -urNp linux-2.6.32.10/net/sctp/socket.c linux-2.6.32.10/net/sctp/socket.c 53505diff -urNp linux-2.6.32.11/net/sctp/socket.c linux-2.6.32.11/net/sctp/socket.c
52262--- linux-2.6.32.10/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400 53506--- linux-2.6.32.11/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400
52263+++ linux-2.6.32.10/net/sctp/socket.c 2010-03-20 15:58:47.205034038 -0400 53507+++ linux-2.6.32.11/net/sctp/socket.c 2010-04-04 20:46:41.728797784 -0400
52264@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc 53508@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
52265 struct sctp_sndrcvinfo *sinfo; 53509 struct sctp_sndrcvinfo *sinfo;
52266 struct sctp_initmsg *sinit; 53510 struct sctp_initmsg *sinit;
@@ -52278,9 +53522,9 @@ diff -urNp linux-2.6.32.10/net/sctp/socket.c linux-2.6.32.10/net/sctp/socket.c
52278 53522
52279 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); 53523 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
52280 if (pp->fastreuse && sk->sk_reuse && 53524 if (pp->fastreuse && sk->sk_reuse &&
52281diff -urNp linux-2.6.32.10/net/socket.c linux-2.6.32.10/net/socket.c 53525diff -urNp linux-2.6.32.11/net/socket.c linux-2.6.32.11/net/socket.c
52282--- linux-2.6.32.10/net/socket.c 2010-03-15 11:52:04.000000000 -0400 53526--- linux-2.6.32.11/net/socket.c 2010-03-15 11:52:04.000000000 -0400
52283+++ linux-2.6.32.10/net/socket.c 2010-03-20 15:58:47.208549091 -0400 53527+++ linux-2.6.32.11/net/socket.c 2010-04-04 20:46:41.728797784 -0400
52284@@ -87,6 +87,7 @@ 53528@@ -87,6 +87,7 @@
52285 #include <linux/wireless.h> 53529 #include <linux/wireless.h>
52286 #include <linux/nsproxy.h> 53530 #include <linux/nsproxy.h>
@@ -52435,9 +53679,9 @@ diff -urNp linux-2.6.32.10/net/socket.c linux-2.6.32.10/net/socket.c
52435 err = 53679 err =
52436 security_socket_connect(sock, (struct sockaddr *)&address, addrlen); 53680 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
52437 if (err) 53681 if (err)
52438diff -urNp linux-2.6.32.10/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.10/net/sunrpc/xprtrdma/svc_rdma.c 53682diff -urNp linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c
52439--- linux-2.6.32.10/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400 53683--- linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400
52440+++ linux-2.6.32.10/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-20 15:58:47.208549091 -0400 53684+++ linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c 2010-04-04 20:46:41.728797784 -0400
52441@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta 53685@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
52442 len -= *ppos; 53686 len -= *ppos;
52443 if (len > *lenp) 53687 if (len > *lenp)
@@ -52447,9 +53691,9 @@ diff -urNp linux-2.6.32.10/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.10/net/su
52447 return -EFAULT; 53691 return -EFAULT;
52448 *lenp = len; 53692 *lenp = len;
52449 *ppos += len; 53693 *ppos += len;
52450diff -urNp linux-2.6.32.10/net/sysctl_net.c linux-2.6.32.10/net/sysctl_net.c 53694diff -urNp linux-2.6.32.11/net/sysctl_net.c linux-2.6.32.11/net/sysctl_net.c
52451--- linux-2.6.32.10/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400 53695--- linux-2.6.32.11/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400
52452+++ linux-2.6.32.10/net/sysctl_net.c 2010-03-20 15:58:47.208549091 -0400 53696+++ linux-2.6.32.11/net/sysctl_net.c 2010-04-04 20:46:41.728797784 -0400
52453@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct 53697@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
52454 struct ctl_table *table) 53698 struct ctl_table *table)
52455 { 53699 {
@@ -52459,9 +53703,9 @@ diff -urNp linux-2.6.32.10/net/sysctl_net.c linux-2.6.32.10/net/sysctl_net.c
52459 int mode = (table->mode >> 6) & 7; 53703 int mode = (table->mode >> 6) & 7;
52460 return (mode << 6) | (mode << 3) | mode; 53704 return (mode << 6) | (mode << 3) | mode;
52461 } 53705 }
52462diff -urNp linux-2.6.32.10/net/unix/af_unix.c linux-2.6.32.10/net/unix/af_unix.c 53706diff -urNp linux-2.6.32.11/net/unix/af_unix.c linux-2.6.32.11/net/unix/af_unix.c
52463--- linux-2.6.32.10/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400 53707--- linux-2.6.32.11/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400
52464+++ linux-2.6.32.10/net/unix/af_unix.c 2010-03-20 15:58:47.208549091 -0400 53708+++ linux-2.6.32.11/net/unix/af_unix.c 2010-04-04 20:46:41.728797784 -0400
52465@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru 53709@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru
52466 err = -ECONNREFUSED; 53710 err = -ECONNREFUSED;
52467 if (!S_ISSOCK(inode->i_mode)) 53711 if (!S_ISSOCK(inode->i_mode))
@@ -52519,9 +53763,9 @@ diff -urNp linux-2.6.32.10/net/unix/af_unix.c linux-2.6.32.10/net/unix/af_unix.c
52519 list = &unix_socket_table[addr->hash]; 53763 list = &unix_socket_table[addr->hash];
52520 } else { 53764 } else {
52521 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; 53765 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
52522diff -urNp linux-2.6.32.10/samples/kobject/kset-example.c linux-2.6.32.10/samples/kobject/kset-example.c 53766diff -urNp linux-2.6.32.11/samples/kobject/kset-example.c linux-2.6.32.11/samples/kobject/kset-example.c
52523--- linux-2.6.32.10/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400 53767--- linux-2.6.32.11/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400
52524+++ linux-2.6.32.10/samples/kobject/kset-example.c 2010-03-20 15:58:47.208549091 -0400 53768+++ linux-2.6.32.11/samples/kobject/kset-example.c 2010-04-04 20:46:41.728797784 -0400
52525@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob 53769@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
52526 } 53770 }
52527 53771
@@ -52531,9 +53775,9 @@ diff -urNp linux-2.6.32.10/samples/kobject/kset-example.c linux-2.6.32.10/sample
52531 .show = foo_attr_show, 53775 .show = foo_attr_show,
52532 .store = foo_attr_store, 53776 .store = foo_attr_store,
52533 }; 53777 };
52534diff -urNp linux-2.6.32.10/scripts/basic/fixdep.c linux-2.6.32.10/scripts/basic/fixdep.c 53778diff -urNp linux-2.6.32.11/scripts/basic/fixdep.c linux-2.6.32.11/scripts/basic/fixdep.c
52535--- linux-2.6.32.10/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400 53779--- linux-2.6.32.11/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400
52536+++ linux-2.6.32.10/scripts/basic/fixdep.c 2010-03-20 15:58:47.208549091 -0400 53780+++ linux-2.6.32.11/scripts/basic/fixdep.c 2010-04-04 20:46:41.728797784 -0400
52537@@ -222,9 +222,9 @@ static void use_config(char *m, int slen 53781@@ -222,9 +222,9 @@ static void use_config(char *m, int slen
52538 53782
52539 static void parse_config_file(char *map, size_t len) 53783 static void parse_config_file(char *map, size_t len)
@@ -52555,9 +53799,9 @@ diff -urNp linux-2.6.32.10/scripts/basic/fixdep.c linux-2.6.32.10/scripts/basic/
52555 53799
52556 if (*p != INT_CONF) { 53800 if (*p != INT_CONF) {
52557 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", 53801 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
52558diff -urNp linux-2.6.32.10/scripts/kallsyms.c linux-2.6.32.10/scripts/kallsyms.c 53802diff -urNp linux-2.6.32.11/scripts/kallsyms.c linux-2.6.32.11/scripts/kallsyms.c
52559--- linux-2.6.32.10/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 53803--- linux-2.6.32.11/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400
52560+++ linux-2.6.32.10/scripts/kallsyms.c 2010-03-20 15:58:47.208549091 -0400 53804+++ linux-2.6.32.11/scripts/kallsyms.c 2010-04-04 20:46:41.728797784 -0400
52561@@ -43,10 +43,10 @@ struct text_range { 53805@@ -43,10 +43,10 @@ struct text_range {
52562 53806
52563 static unsigned long long _text; 53807 static unsigned long long _text;
@@ -52573,9 +53817,9 @@ diff -urNp linux-2.6.32.10/scripts/kallsyms.c linux-2.6.32.10/scripts/kallsyms.c
52573 }; 53817 };
52574 #define text_range_text (&text_ranges[0]) 53818 #define text_range_text (&text_ranges[0])
52575 #define text_range_inittext (&text_ranges[1]) 53819 #define text_range_inittext (&text_ranges[1])
52576diff -urNp linux-2.6.32.10/scripts/mod/file2alias.c linux-2.6.32.10/scripts/mod/file2alias.c 53820diff -urNp linux-2.6.32.11/scripts/mod/file2alias.c linux-2.6.32.11/scripts/mod/file2alias.c
52577--- linux-2.6.32.10/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400 53821--- linux-2.6.32.11/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400
52578+++ linux-2.6.32.10/scripts/mod/file2alias.c 2010-03-20 15:58:47.208549091 -0400 53822+++ linux-2.6.32.11/scripts/mod/file2alias.c 2010-04-04 20:46:41.728797784 -0400
52579@@ -72,7 +72,7 @@ static void device_id_check(const char * 53823@@ -72,7 +72,7 @@ static void device_id_check(const char *
52580 unsigned long size, unsigned long id_size, 53824 unsigned long size, unsigned long id_size,
52581 void *symval) 53825 void *symval)
@@ -52630,9 +53874,9 @@ diff -urNp linux-2.6.32.10/scripts/mod/file2alias.c linux-2.6.32.10/scripts/mod/
52630 53874
52631 sprintf(alias, "dmi*"); 53875 sprintf(alias, "dmi*");
52632 53876
52633diff -urNp linux-2.6.32.10/scripts/mod/modpost.c linux-2.6.32.10/scripts/mod/modpost.c 53877diff -urNp linux-2.6.32.11/scripts/mod/modpost.c linux-2.6.32.11/scripts/mod/modpost.c
52634--- linux-2.6.32.10/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400 53878--- linux-2.6.32.11/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400
52635+++ linux-2.6.32.10/scripts/mod/modpost.c 2010-03-20 15:58:47.208549091 -0400 53879+++ linux-2.6.32.11/scripts/mod/modpost.c 2010-04-04 20:46:41.728797784 -0400
52636@@ -835,6 +835,7 @@ enum mismatch { 53880@@ -835,6 +835,7 @@ enum mismatch {
52637 INIT_TO_EXIT, 53881 INIT_TO_EXIT,
52638 EXIT_TO_INIT, 53882 EXIT_TO_INIT,
@@ -52700,9 +53944,9 @@ diff -urNp linux-2.6.32.10/scripts/mod/modpost.c linux-2.6.32.10/scripts/mod/mod
52700 goto close_write; 53944 goto close_write;
52701 53945
52702 tmp = NOFAIL(malloc(b->pos)); 53946 tmp = NOFAIL(malloc(b->pos));
52703diff -urNp linux-2.6.32.10/scripts/mod/modpost.h linux-2.6.32.10/scripts/mod/modpost.h 53947diff -urNp linux-2.6.32.11/scripts/mod/modpost.h linux-2.6.32.11/scripts/mod/modpost.h
52704--- linux-2.6.32.10/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400 53948--- linux-2.6.32.11/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400
52705+++ linux-2.6.32.10/scripts/mod/modpost.h 2010-03-20 15:58:47.208549091 -0400 53949+++ linux-2.6.32.11/scripts/mod/modpost.h 2010-04-04 20:46:41.728797784 -0400
52706@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e 53950@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
52707 53951
52708 struct buffer { 53952 struct buffer {
@@ -52722,9 +53966,9 @@ diff -urNp linux-2.6.32.10/scripts/mod/modpost.h linux-2.6.32.10/scripts/mod/mod
52722 53966
52723 struct module { 53967 struct module {
52724 struct module *next; 53968 struct module *next;
52725diff -urNp linux-2.6.32.10/scripts/mod/sumversion.c linux-2.6.32.10/scripts/mod/sumversion.c 53969diff -urNp linux-2.6.32.11/scripts/mod/sumversion.c linux-2.6.32.11/scripts/mod/sumversion.c
52726--- linux-2.6.32.10/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400 53970--- linux-2.6.32.11/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400
52727+++ linux-2.6.32.10/scripts/mod/sumversion.c 2010-03-20 15:58:47.208549091 -0400 53971+++ linux-2.6.32.11/scripts/mod/sumversion.c 2010-04-04 20:46:41.728797784 -0400
52728@@ -455,7 +455,7 @@ static void write_version(const char *fi 53972@@ -455,7 +455,7 @@ static void write_version(const char *fi
52729 goto out; 53973 goto out;
52730 } 53974 }
@@ -52734,9 +53978,9 @@ diff -urNp linux-2.6.32.10/scripts/mod/sumversion.c linux-2.6.32.10/scripts/mod/
52734 warn("writing sum in %s failed: %s\n", 53978 warn("writing sum in %s failed: %s\n",
52735 filename, strerror(errno)); 53979 filename, strerror(errno));
52736 goto out; 53980 goto out;
52737diff -urNp linux-2.6.32.10/scripts/pnmtologo.c linux-2.6.32.10/scripts/pnmtologo.c 53981diff -urNp linux-2.6.32.11/scripts/pnmtologo.c linux-2.6.32.11/scripts/pnmtologo.c
52738--- linux-2.6.32.10/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400 53982--- linux-2.6.32.11/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400
52739+++ linux-2.6.32.10/scripts/pnmtologo.c 2010-03-20 15:58:47.208549091 -0400 53983+++ linux-2.6.32.11/scripts/pnmtologo.c 2010-04-04 20:46:41.728797784 -0400
52740@@ -237,14 +237,14 @@ static void write_header(void) 53984@@ -237,14 +237,14 @@ static void write_header(void)
52741 fprintf(out, " * Linux logo %s\n", logoname); 53985 fprintf(out, " * Linux logo %s\n", logoname);
52742 fputs(" */\n\n", out); 53986 fputs(" */\n\n", out);
@@ -52763,9 +54007,9 @@ diff -urNp linux-2.6.32.10/scripts/pnmtologo.c linux-2.6.32.10/scripts/pnmtologo
52763 logoname); 54007 logoname);
52764 write_hex_cnt = 0; 54008 write_hex_cnt = 0;
52765 for (i = 0; i < logo_clutsize; i++) { 54009 for (i = 0; i < logo_clutsize; i++) {
52766diff -urNp linux-2.6.32.10/security/commoncap.c linux-2.6.32.10/security/commoncap.c 54010diff -urNp linux-2.6.32.11/security/commoncap.c linux-2.6.32.11/security/commoncap.c
52767--- linux-2.6.32.10/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400 54011--- linux-2.6.32.11/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400
52768+++ linux-2.6.32.10/security/commoncap.c 2010-03-20 15:58:47.208549091 -0400 54012+++ linux-2.6.32.11/security/commoncap.c 2010-04-04 20:46:41.728797784 -0400
52769@@ -27,7 +27,7 @@ 54013@@ -27,7 +27,7 @@
52770 #include <linux/sched.h> 54014 #include <linux/sched.h>
52771 #include <linux/prctl.h> 54015 #include <linux/prctl.h>
@@ -52788,9 +54032,9 @@ diff -urNp linux-2.6.32.10/security/commoncap.c linux-2.6.32.10/security/commonc
52788 return 0; 54032 return 0;
52789 } 54033 }
52790 54034
52791diff -urNp linux-2.6.32.10/security/integrity/ima/ima_api.c linux-2.6.32.10/security/integrity/ima/ima_api.c 54035diff -urNp linux-2.6.32.11/security/integrity/ima/ima_api.c linux-2.6.32.11/security/integrity/ima/ima_api.c
52792--- linux-2.6.32.10/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400 54036--- linux-2.6.32.11/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400
52793+++ linux-2.6.32.10/security/integrity/ima/ima_api.c 2010-03-20 15:58:47.208549091 -0400 54037+++ linux-2.6.32.11/security/integrity/ima/ima_api.c 2010-04-04 20:46:41.728797784 -0400
52794@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino 54038@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
52795 int result; 54039 int result;
52796 54040
@@ -52800,9 +54044,9 @@ diff -urNp linux-2.6.32.10/security/integrity/ima/ima_api.c linux-2.6.32.10/secu
52800 54044
52801 entry = kmalloc(sizeof(*entry), GFP_KERNEL); 54045 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
52802 if (!entry) { 54046 if (!entry) {
52803diff -urNp linux-2.6.32.10/security/integrity/ima/ima_fs.c linux-2.6.32.10/security/integrity/ima/ima_fs.c 54047diff -urNp linux-2.6.32.11/security/integrity/ima/ima_fs.c linux-2.6.32.11/security/integrity/ima/ima_fs.c
52804--- linux-2.6.32.10/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400 54048--- linux-2.6.32.11/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400
52805+++ linux-2.6.32.10/security/integrity/ima/ima_fs.c 2010-03-20 15:58:47.208549091 -0400 54049+++ linux-2.6.32.11/security/integrity/ima/ima_fs.c 2010-04-04 20:46:41.728797784 -0400
52806@@ -27,12 +27,12 @@ 54050@@ -27,12 +27,12 @@
52807 static int valid_policy = 1; 54051 static int valid_policy = 1;
52808 #define TMPBUFLEN 12 54052 #define TMPBUFLEN 12
@@ -52818,9 +54062,9 @@ diff -urNp linux-2.6.32.10/security/integrity/ima/ima_fs.c linux-2.6.32.10/secur
52818 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); 54062 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
52819 } 54063 }
52820 54064
52821diff -urNp linux-2.6.32.10/security/integrity/ima/ima.h linux-2.6.32.10/security/integrity/ima/ima.h 54065diff -urNp linux-2.6.32.11/security/integrity/ima/ima.h linux-2.6.32.11/security/integrity/ima/ima.h
52822--- linux-2.6.32.10/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400 54066--- linux-2.6.32.11/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400
52823+++ linux-2.6.32.10/security/integrity/ima/ima.h 2010-03-20 15:58:47.208549091 -0400 54067+++ linux-2.6.32.11/security/integrity/ima/ima.h 2010-04-04 20:46:41.728797784 -0400
52824@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino 54068@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
52825 extern spinlock_t ima_queue_lock; 54069 extern spinlock_t ima_queue_lock;
52826 54070
@@ -52832,9 +54076,9 @@ diff -urNp linux-2.6.32.10/security/integrity/ima/ima.h linux-2.6.32.10/security
52832 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; 54076 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
52833 }; 54077 };
52834 extern struct ima_h_table ima_htable; 54078 extern struct ima_h_table ima_htable;
52835diff -urNp linux-2.6.32.10/security/integrity/ima/ima_queue.c linux-2.6.32.10/security/integrity/ima/ima_queue.c 54079diff -urNp linux-2.6.32.11/security/integrity/ima/ima_queue.c linux-2.6.32.11/security/integrity/ima/ima_queue.c
52836--- linux-2.6.32.10/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400 54080--- linux-2.6.32.11/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400
52837+++ linux-2.6.32.10/security/integrity/ima/ima_queue.c 2010-03-20 15:58:47.208549091 -0400 54081+++ linux-2.6.32.11/security/integrity/ima/ima_queue.c 2010-04-04 20:46:41.728797784 -0400
52838@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i 54082@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
52839 INIT_LIST_HEAD(&qe->later); 54083 INIT_LIST_HEAD(&qe->later);
52840 list_add_tail_rcu(&qe->later, &ima_measurements); 54084 list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -52844,10 +54088,10 @@ diff -urNp linux-2.6.32.10/security/integrity/ima/ima_queue.c linux-2.6.32.10/se
52844 key = ima_hash_key(entry->digest); 54088 key = ima_hash_key(entry->digest);
52845 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); 54089 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
52846 return 0; 54090 return 0;
52847diff -urNp linux-2.6.32.10/security/Kconfig linux-2.6.32.10/security/Kconfig 54091diff -urNp linux-2.6.32.11/security/Kconfig linux-2.6.32.11/security/Kconfig
52848--- linux-2.6.32.10/security/Kconfig 2010-03-15 11:52:04.000000000 -0400 54092--- linux-2.6.32.11/security/Kconfig 2010-03-15 11:52:04.000000000 -0400
52849+++ linux-2.6.32.10/security/Kconfig 2010-03-20 17:03:48.864664841 -0400 54093+++ linux-2.6.32.11/security/Kconfig 2010-04-04 21:03:05.108480196 -0400
52850@@ -4,6 +4,488 @@ 54094@@ -4,6 +4,499 @@
52851 54095
52852 menu "Security options" 54096 menu "Security options"
52853 54097
@@ -52939,6 +54183,15 @@ diff -urNp linux-2.6.32.10/security/Kconfig linux-2.6.32.10/security/Kconfig
52939+ bool 'hook' 54183+ bool 'hook'
52940+endchoice 54184+endchoice
52941+ 54185+
54186+ config PAX_PER_CPU_PGD
54187+ bool
54188+
54189+ config TASK_SIZE_MAX_SHIFT
54190+ int
54191+ depends on X86_64
54192+ default 47 if !PAX_PER_CPU_PGD
54193+ default 42 if PAX_PER_CPU_PGD
54194+
52942+endmenu 54195+endmenu
52943+ 54196+
52944+menu "Non-executable pages" 54197+menu "Non-executable pages"
@@ -53140,6 +54393,7 @@ diff -urNp linux-2.6.32.10/security/Kconfig linux-2.6.32.10/security/Kconfig
53140+config PAX_KERNEXEC 54393+config PAX_KERNEXEC
53141+ bool "Enforce non-executable kernel pages" 54394+ bool "Enforce non-executable kernel pages"
53142+ depends on PAX_NOEXEC && (PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN 54395+ depends on PAX_NOEXEC && (PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN
54396+ select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE)
53143+ help 54397+ help
53144+ This is the kernel land equivalent of PAGEEXEC and MPROTECT, 54398+ This is the kernel land equivalent of PAGEEXEC and MPROTECT,
53145+ that is, enabling this option will make it harder to inject 54399+ that is, enabling this option will make it harder to inject
@@ -53275,7 +54529,8 @@ diff -urNp linux-2.6.32.10/security/Kconfig linux-2.6.32.10/security/Kconfig
53275+ 54529+
53276+config PAX_MEMORY_UDEREF 54530+config PAX_MEMORY_UDEREF
53277+ bool "Prevent invalid userland pointer dereference" 54531+ bool "Prevent invalid userland pointer dereference"
53278+ depends on X86_32 && !UML_X86 && !XEN 54532+ depends on X86 && !UML_X86 && !XEN
54533+ select PAX_PER_CPU_PGD if X86_64
53279+ help 54534+ help
53280+ By saying Y here the kernel will be prevented from dereferencing 54535+ By saying Y here the kernel will be prevented from dereferencing
53281+ userland pointers in contexts where the kernel expects only kernel 54536+ userland pointers in contexts where the kernel expects only kernel
@@ -53336,7 +54591,7 @@ diff -urNp linux-2.6.32.10/security/Kconfig linux-2.6.32.10/security/Kconfig
53336 config KEYS 54591 config KEYS
53337 bool "Enable access key retention support" 54592 bool "Enable access key retention support"
53338 help 54593 help
53339@@ -146,7 +628,7 @@ config INTEL_TXT 54594@@ -146,7 +639,7 @@ config INTEL_TXT
53340 config LSM_MMAP_MIN_ADDR 54595 config LSM_MMAP_MIN_ADDR
53341 int "Low address space for LSM to protect from user allocation" 54596 int "Low address space for LSM to protect from user allocation"
53342 depends on SECURITY && SECURITY_SELINUX 54597 depends on SECURITY && SECURITY_SELINUX
@@ -53345,9 +54600,9 @@ diff -urNp linux-2.6.32.10/security/Kconfig linux-2.6.32.10/security/Kconfig
53345 help 54600 help
53346 This is the portion of low virtual memory which should be protected 54601 This is the portion of low virtual memory which should be protected
53347 from userspace allocation. Keeping a user from writing to low pages 54602 from userspace allocation. Keeping a user from writing to low pages
53348diff -urNp linux-2.6.32.10/security/min_addr.c linux-2.6.32.10/security/min_addr.c 54603diff -urNp linux-2.6.32.11/security/min_addr.c linux-2.6.32.11/security/min_addr.c
53349--- linux-2.6.32.10/security/min_addr.c 2010-03-15 11:52:04.000000000 -0400 54604--- linux-2.6.32.11/security/min_addr.c 2010-04-04 20:41:50.084493253 -0400
53350+++ linux-2.6.32.10/security/min_addr.c 2010-03-20 15:58:47.208549091 -0400 54605+++ linux-2.6.32.11/security/min_addr.c 2010-04-04 20:46:41.732880788 -0400
53351@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG 54606@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
53352 */ 54607 */
53353 static void update_mmap_min_addr(void) 54608 static void update_mmap_min_addr(void)
@@ -53364,19 +54619,9 @@ diff -urNp linux-2.6.32.10/security/min_addr.c linux-2.6.32.10/security/min_addr
53364 } 54619 }
53365 54620
53366 /* 54621 /*
53367@@ -33,6 +35,9 @@ int mmap_min_addr_handler(struct ctl_tab 54622diff -urNp linux-2.6.32.11/sound/aoa/codecs/onyx.c linux-2.6.32.11/sound/aoa/codecs/onyx.c
53368 { 54623--- linux-2.6.32.11/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400
53369 int ret; 54624+++ linux-2.6.32.11/sound/aoa/codecs/onyx.c 2010-04-04 20:46:41.732880788 -0400
53370
53371+ if (!capable(CAP_SYS_RAWIO))
53372+ return -EPERM;
53373+
53374 ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
53375
53376 update_mmap_min_addr();
53377diff -urNp linux-2.6.32.10/sound/aoa/codecs/onyx.c linux-2.6.32.10/sound/aoa/codecs/onyx.c
53378--- linux-2.6.32.10/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400
53379+++ linux-2.6.32.10/sound/aoa/codecs/onyx.c 2010-03-20 15:58:47.208549091 -0400
53380@@ -53,7 +53,7 @@ struct onyx { 54625@@ -53,7 +53,7 @@ struct onyx {
53381 spdif_locked:1, 54626 spdif_locked:1,
53382 analog_locked:1, 54627 analog_locked:1,
@@ -53405,9 +54650,9 @@ diff -urNp linux-2.6.32.10/sound/aoa/codecs/onyx.c linux-2.6.32.10/sound/aoa/cod
53405 onyx->spdif_locked = onyx->analog_locked = 0; 54650 onyx->spdif_locked = onyx->analog_locked = 0;
53406 mutex_unlock(&onyx->mutex); 54651 mutex_unlock(&onyx->mutex);
53407 54652
53408diff -urNp linux-2.6.32.10/sound/core/oss/pcm_oss.c linux-2.6.32.10/sound/core/oss/pcm_oss.c 54653diff -urNp linux-2.6.32.11/sound/core/oss/pcm_oss.c linux-2.6.32.11/sound/core/oss/pcm_oss.c
53409--- linux-2.6.32.10/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400 54654--- linux-2.6.32.11/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400
53410+++ linux-2.6.32.10/sound/core/oss/pcm_oss.c 2010-03-20 15:58:47.212551922 -0400 54655+++ linux-2.6.32.11/sound/core/oss/pcm_oss.c 2010-04-04 20:46:41.732880788 -0400
53411@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct 54656@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
53412 } 54657 }
53413 } 54658 }
@@ -53419,9 +54664,9 @@ diff -urNp linux-2.6.32.10/sound/core/oss/pcm_oss.c linux-2.6.32.10/sound/core/o
53419 #endif /* CONFIG_SND_VERBOSE_PROCFS */ 54664 #endif /* CONFIG_SND_VERBOSE_PROCFS */
53420 54665
53421 /* 54666 /*
53422diff -urNp linux-2.6.32.10/sound/core/seq/seq_lock.h linux-2.6.32.10/sound/core/seq/seq_lock.h 54667diff -urNp linux-2.6.32.11/sound/core/seq/seq_lock.h linux-2.6.32.11/sound/core/seq/seq_lock.h
53423--- linux-2.6.32.10/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400 54668--- linux-2.6.32.11/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400
53424+++ linux-2.6.32.10/sound/core/seq/seq_lock.h 2010-03-20 15:58:47.212551922 -0400 54669+++ linux-2.6.32.11/sound/core/seq/seq_lock.h 2010-04-04 20:46:41.732880788 -0400
53425@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo 54670@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
53426 #else /* SMP || CONFIG_SND_DEBUG */ 54671 #else /* SMP || CONFIG_SND_DEBUG */
53427 54672
@@ -53437,9 +54682,9 @@ diff -urNp linux-2.6.32.10/sound/core/seq/seq_lock.h linux-2.6.32.10/sound/core/
53437 54682
53438 #endif /* SMP || CONFIG_SND_DEBUG */ 54683 #endif /* SMP || CONFIG_SND_DEBUG */
53439 54684
53440diff -urNp linux-2.6.32.10/sound/drivers/mts64.c linux-2.6.32.10/sound/drivers/mts64.c 54685diff -urNp linux-2.6.32.11/sound/drivers/mts64.c linux-2.6.32.11/sound/drivers/mts64.c
53441--- linux-2.6.32.10/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400 54686--- linux-2.6.32.11/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400
53442+++ linux-2.6.32.10/sound/drivers/mts64.c 2010-03-20 15:58:47.212551922 -0400 54687+++ linux-2.6.32.11/sound/drivers/mts64.c 2010-04-04 20:46:41.732880788 -0400
53443@@ -65,7 +65,7 @@ struct mts64 { 54688@@ -65,7 +65,7 @@ struct mts64 {
53444 struct pardevice *pardev; 54689 struct pardevice *pardev;
53445 int pardev_claimed; 54690 int pardev_claimed;
@@ -53488,9 +54733,9 @@ diff -urNp linux-2.6.32.10/sound/drivers/mts64.c linux-2.6.32.10/sound/drivers/m
53488 54733
53489 return 0; 54734 return 0;
53490 } 54735 }
53491diff -urNp linux-2.6.32.10/sound/drivers/portman2x4.c linux-2.6.32.10/sound/drivers/portman2x4.c 54736diff -urNp linux-2.6.32.11/sound/drivers/portman2x4.c linux-2.6.32.11/sound/drivers/portman2x4.c
53492--- linux-2.6.32.10/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400 54737--- linux-2.6.32.11/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400
53493+++ linux-2.6.32.10/sound/drivers/portman2x4.c 2010-03-20 15:58:47.212551922 -0400 54738+++ linux-2.6.32.11/sound/drivers/portman2x4.c 2010-04-04 20:46:41.732880788 -0400
53494@@ -83,7 +83,7 @@ struct portman { 54739@@ -83,7 +83,7 @@ struct portman {
53495 struct pardevice *pardev; 54740 struct pardevice *pardev;
53496 int pardev_claimed; 54741 int pardev_claimed;
@@ -53500,9 +54745,9 @@ diff -urNp linux-2.6.32.10/sound/drivers/portman2x4.c linux-2.6.32.10/sound/driv
53500 int mode[PORTMAN_NUM_INPUT_PORTS]; 54745 int mode[PORTMAN_NUM_INPUT_PORTS];
53501 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; 54746 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
53502 }; 54747 };
53503diff -urNp linux-2.6.32.10/sound/oss/sb_audio.c linux-2.6.32.10/sound/oss/sb_audio.c 54748diff -urNp linux-2.6.32.11/sound/oss/sb_audio.c linux-2.6.32.11/sound/oss/sb_audio.c
53504--- linux-2.6.32.10/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400 54749--- linux-2.6.32.11/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400
53505+++ linux-2.6.32.10/sound/oss/sb_audio.c 2010-03-20 15:58:47.212551922 -0400 54750+++ linux-2.6.32.11/sound/oss/sb_audio.c 2010-04-04 20:46:41.732880788 -0400
53506@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, 54751@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
53507 buf16 = (signed short *)(localbuf + localoffs); 54752 buf16 = (signed short *)(localbuf + localoffs);
53508 while (c) 54753 while (c)
@@ -53512,9 +54757,9 @@ diff -urNp linux-2.6.32.10/sound/oss/sb_audio.c linux-2.6.32.10/sound/oss/sb_aud
53512 if (copy_from_user(lbuf8, 54757 if (copy_from_user(lbuf8,
53513 userbuf+useroffs + p, 54758 userbuf+useroffs + p,
53514 locallen)) 54759 locallen))
53515diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_codec.c linux-2.6.32.10/sound/pci/ac97/ac97_codec.c 54760diff -urNp linux-2.6.32.11/sound/pci/ac97/ac97_codec.c linux-2.6.32.11/sound/pci/ac97/ac97_codec.c
53516--- linux-2.6.32.10/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400 54761--- linux-2.6.32.11/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400
53517+++ linux-2.6.32.10/sound/pci/ac97/ac97_codec.c 2010-03-20 15:58:47.212551922 -0400 54762+++ linux-2.6.32.11/sound/pci/ac97/ac97_codec.c 2010-04-04 20:46:41.732880788 -0400
53518@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc 54763@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
53519 } 54764 }
53520 54765
@@ -53524,9 +54769,9 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_codec.c linux-2.6.32.10/sound/pci
53524 54769
53525 #ifdef CONFIG_SND_AC97_POWER_SAVE 54770 #ifdef CONFIG_SND_AC97_POWER_SAVE
53526 static void do_update_power(struct work_struct *work) 54771 static void do_update_power(struct work_struct *work)
53527diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci/ac97/ac97_patch.c 54772diff -urNp linux-2.6.32.11/sound/pci/ac97/ac97_patch.c linux-2.6.32.11/sound/pci/ac97/ac97_patch.c
53528--- linux-2.6.32.10/sound/pci/ac97/ac97_patch.c 2010-03-15 11:52:04.000000000 -0400 54773--- linux-2.6.32.11/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400
53529+++ linux-2.6.32.10/sound/pci/ac97/ac97_patch.c 2010-03-20 15:58:47.212551922 -0400 54774+++ linux-2.6.32.11/sound/pci/ac97/ac97_patch.c 2010-04-04 20:46:41.732880788 -0400
53530@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd 54775@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
53531 return 0; 54776 return 0;
53532 } 54777 }
@@ -53671,7 +54916,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53671 .build_specific = &patch_ad1886_specific, 54916 .build_specific = &patch_ad1886_specific,
53672 #ifdef CONFIG_PM 54917 #ifdef CONFIG_PM
53673 .resume = ad18xx_resume 54918 .resume = ad18xx_resume
53674@@ -1894,7 +1894,7 @@ static int patch_ad1981a_specific(struct 54919@@ -1896,7 +1896,7 @@ static int patch_ad1981a_specific(struct
53675 ARRAY_SIZE(snd_ac97_ad1981x_jack_sense)); 54920 ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
53676 } 54921 }
53677 54922
@@ -53680,7 +54925,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53680 .build_post_spdif = patch_ad198x_post_spdif, 54925 .build_post_spdif = patch_ad198x_post_spdif,
53681 .build_specific = patch_ad1981a_specific, 54926 .build_specific = patch_ad1981a_specific,
53682 #ifdef CONFIG_PM 54927 #ifdef CONFIG_PM
53683@@ -1949,7 +1949,7 @@ static int patch_ad1981b_specific(struct 54928@@ -1951,7 +1951,7 @@ static int patch_ad1981b_specific(struct
53684 ARRAY_SIZE(snd_ac97_ad1981x_jack_sense)); 54929 ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
53685 } 54930 }
53686 54931
@@ -53689,7 +54934,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53689 .build_post_spdif = patch_ad198x_post_spdif, 54934 .build_post_spdif = patch_ad198x_post_spdif,
53690 .build_specific = patch_ad1981b_specific, 54935 .build_specific = patch_ad1981b_specific,
53691 #ifdef CONFIG_PM 54936 #ifdef CONFIG_PM
53692@@ -2088,7 +2088,7 @@ static int patch_ad1888_specific(struct 54937@@ -2090,7 +2090,7 @@ static int patch_ad1888_specific(struct
53693 return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls)); 54938 return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls));
53694 } 54939 }
53695 54940
@@ -53698,7 +54943,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53698 .build_post_spdif = patch_ad198x_post_spdif, 54943 .build_post_spdif = patch_ad198x_post_spdif,
53699 .build_specific = patch_ad1888_specific, 54944 .build_specific = patch_ad1888_specific,
53700 #ifdef CONFIG_PM 54945 #ifdef CONFIG_PM
53701@@ -2137,7 +2137,7 @@ static int patch_ad1980_specific(struct 54946@@ -2139,7 +2139,7 @@ static int patch_ad1980_specific(struct
53702 return patch_build_controls(ac97, &snd_ac97_ad198x_2cmic, 1); 54947 return patch_build_controls(ac97, &snd_ac97_ad198x_2cmic, 1);
53703 } 54948 }
53704 54949
@@ -53707,7 +54952,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53707 .build_post_spdif = patch_ad198x_post_spdif, 54952 .build_post_spdif = patch_ad198x_post_spdif,
53708 .build_specific = patch_ad1980_specific, 54953 .build_specific = patch_ad1980_specific,
53709 #ifdef CONFIG_PM 54954 #ifdef CONFIG_PM
53710@@ -2252,7 +2252,7 @@ static int patch_ad1985_specific(struct 54955@@ -2254,7 +2254,7 @@ static int patch_ad1985_specific(struct
53711 ARRAY_SIZE(snd_ac97_ad1985_controls)); 54956 ARRAY_SIZE(snd_ac97_ad1985_controls));
53712 } 54957 }
53713 54958
@@ -53716,7 +54961,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53716 .build_post_spdif = patch_ad198x_post_spdif, 54961 .build_post_spdif = patch_ad198x_post_spdif,
53717 .build_specific = patch_ad1985_specific, 54962 .build_specific = patch_ad1985_specific,
53718 #ifdef CONFIG_PM 54963 #ifdef CONFIG_PM
53719@@ -2544,7 +2544,7 @@ static int patch_ad1986_specific(struct 54964@@ -2546,7 +2546,7 @@ static int patch_ad1986_specific(struct
53720 ARRAY_SIZE(snd_ac97_ad1985_controls)); 54965 ARRAY_SIZE(snd_ac97_ad1985_controls));
53721 } 54966 }
53722 54967
@@ -53725,7 +54970,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53725 .build_post_spdif = patch_ad198x_post_spdif, 54970 .build_post_spdif = patch_ad198x_post_spdif,
53726 .build_specific = patch_ad1986_specific, 54971 .build_specific = patch_ad1986_specific,
53727 #ifdef CONFIG_PM 54972 #ifdef CONFIG_PM
53728@@ -2649,7 +2649,7 @@ static int patch_alc650_specific(struct 54973@@ -2651,7 +2651,7 @@ static int patch_alc650_specific(struct
53729 return 0; 54974 return 0;
53730 } 54975 }
53731 54976
@@ -53734,7 +54979,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53734 .build_specific = patch_alc650_specific, 54979 .build_specific = patch_alc650_specific,
53735 .update_jacks = alc650_update_jacks 54980 .update_jacks = alc650_update_jacks
53736 }; 54981 };
53737@@ -2801,7 +2801,7 @@ static int patch_alc655_specific(struct 54982@@ -2803,7 +2803,7 @@ static int patch_alc655_specific(struct
53738 return 0; 54983 return 0;
53739 } 54984 }
53740 54985
@@ -53743,7 +54988,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53743 .build_specific = patch_alc655_specific, 54988 .build_specific = patch_alc655_specific,
53744 .update_jacks = alc655_update_jacks 54989 .update_jacks = alc655_update_jacks
53745 }; 54990 };
53746@@ -2913,7 +2913,7 @@ static int patch_alc850_specific(struct 54991@@ -2915,7 +2915,7 @@ static int patch_alc850_specific(struct
53747 return 0; 54992 return 0;
53748 } 54993 }
53749 54994
@@ -53752,7 +54997,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53752 .build_specific = patch_alc850_specific, 54997 .build_specific = patch_alc850_specific,
53753 .update_jacks = alc850_update_jacks 54998 .update_jacks = alc850_update_jacks
53754 }; 54999 };
53755@@ -2975,7 +2975,7 @@ static int patch_cm9738_specific(struct 55000@@ -2977,7 +2977,7 @@ static int patch_cm9738_specific(struct
53756 return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls)); 55001 return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls));
53757 } 55002 }
53758 55003
@@ -53761,7 +55006,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53761 .build_specific = patch_cm9738_specific, 55006 .build_specific = patch_cm9738_specific,
53762 .update_jacks = cm9738_update_jacks 55007 .update_jacks = cm9738_update_jacks
53763 }; 55008 };
53764@@ -3066,7 +3066,7 @@ static int patch_cm9739_post_spdif(struc 55009@@ -3068,7 +3068,7 @@ static int patch_cm9739_post_spdif(struc
53765 return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif)); 55010 return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif));
53766 } 55011 }
53767 55012
@@ -53770,7 +55015,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53770 .build_specific = patch_cm9739_specific, 55015 .build_specific = patch_cm9739_specific,
53771 .build_post_spdif = patch_cm9739_post_spdif, 55016 .build_post_spdif = patch_cm9739_post_spdif,
53772 .update_jacks = cm9739_update_jacks 55017 .update_jacks = cm9739_update_jacks
53773@@ -3240,7 +3240,7 @@ static int patch_cm9761_specific(struct 55018@@ -3242,7 +3242,7 @@ static int patch_cm9761_specific(struct
53774 return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls)); 55019 return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls));
53775 } 55020 }
53776 55021
@@ -53779,7 +55024,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53779 .build_specific = patch_cm9761_specific, 55024 .build_specific = patch_cm9761_specific,
53780 .build_post_spdif = patch_cm9761_post_spdif, 55025 .build_post_spdif = patch_cm9761_post_spdif,
53781 .update_jacks = cm9761_update_jacks 55026 .update_jacks = cm9761_update_jacks
53782@@ -3336,7 +3336,7 @@ static int patch_cm9780_specific(struct 55027@@ -3338,7 +3338,7 @@ static int patch_cm9780_specific(struct
53783 return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls)); 55028 return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls));
53784 } 55029 }
53785 55030
@@ -53788,7 +55033,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53788 .build_specific = patch_cm9780_specific, 55033 .build_specific = patch_cm9780_specific,
53789 .build_post_spdif = patch_cm9761_post_spdif /* identical with CM9761 */ 55034 .build_post_spdif = patch_cm9761_post_spdif /* identical with CM9761 */
53790 }; 55035 };
53791@@ -3456,7 +3456,7 @@ static int patch_vt1616_specific(struct 55036@@ -3458,7 +3458,7 @@ static int patch_vt1616_specific(struct
53792 return 0; 55037 return 0;
53793 } 55038 }
53794 55039
@@ -53797,7 +55042,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53797 .build_specific = patch_vt1616_specific 55042 .build_specific = patch_vt1616_specific
53798 }; 55043 };
53799 55044
53800@@ -3810,7 +3810,7 @@ static int patch_it2646_specific(struct 55045@@ -3812,7 +3812,7 @@ static int patch_it2646_specific(struct
53801 return 0; 55046 return 0;
53802 } 55047 }
53803 55048
@@ -53806,7 +55051,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53806 .build_specific = patch_it2646_specific, 55051 .build_specific = patch_it2646_specific,
53807 .update_jacks = it2646_update_jacks 55052 .update_jacks = it2646_update_jacks
53808 }; 55053 };
53809@@ -3844,7 +3844,7 @@ static int patch_si3036_specific(struct 55054@@ -3846,7 +3846,7 @@ static int patch_si3036_specific(struct
53810 return 0; 55055 return 0;
53811 } 55056 }
53812 55057
@@ -53815,7 +55060,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53815 .build_specific = patch_si3036_specific, 55060 .build_specific = patch_si3036_specific,
53816 }; 55061 };
53817 55062
53818@@ -3877,7 +3877,7 @@ static struct snd_ac97_res_table lm4550_ 55063@@ -3879,7 +3879,7 @@ static struct snd_ac97_res_table lm4550_
53819 { AC97_AUX, 0x1f1f }, 55064 { AC97_AUX, 0x1f1f },
53820 { AC97_PCM, 0x1f1f }, 55065 { AC97_PCM, 0x1f1f },
53821 { AC97_REC_GAIN, 0x0f0f }, 55066 { AC97_REC_GAIN, 0x0f0f },
@@ -53824,7 +55069,7 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53824 }; 55069 };
53825 55070
53826 static int patch_lm4550(struct snd_ac97 *ac97) 55071 static int patch_lm4550(struct snd_ac97 *ac97)
53827@@ -3911,7 +3911,7 @@ static int patch_ucb1400_specific(struct 55072@@ -3913,7 +3913,7 @@ static int patch_ucb1400_specific(struct
53828 return 0; 55073 return 0;
53829 } 55074 }
53830 55075
@@ -53833,9 +55078,9 @@ diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci
53833 .build_specific = patch_ucb1400_specific, 55078 .build_specific = patch_ucb1400_specific,
53834 }; 55079 };
53835 55080
53836diff -urNp linux-2.6.32.10/sound/pci/ens1370.c linux-2.6.32.10/sound/pci/ens1370.c 55081diff -urNp linux-2.6.32.11/sound/pci/ens1370.c linux-2.6.32.11/sound/pci/ens1370.c
53837--- linux-2.6.32.10/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400 55082--- linux-2.6.32.11/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400
53838+++ linux-2.6.32.10/sound/pci/ens1370.c 2010-03-20 15:58:47.212551922 -0400 55083+++ linux-2.6.32.11/sound/pci/ens1370.c 2010-04-04 20:46:41.732880788 -0400
53839@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci 55084@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
53840 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ 55085 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
53841 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ 55086 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
@@ -53845,9 +55090,9 @@ diff -urNp linux-2.6.32.10/sound/pci/ens1370.c linux-2.6.32.10/sound/pci/ens1370
53845 }; 55090 };
53846 55091
53847 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); 55092 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
53848diff -urNp linux-2.6.32.10/sound/pci/intel8x0.c linux-2.6.32.10/sound/pci/intel8x0.c 55093diff -urNp linux-2.6.32.11/sound/pci/intel8x0.c linux-2.6.32.11/sound/pci/intel8x0.c
53849--- linux-2.6.32.10/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400 55094--- linux-2.6.32.11/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400
53850+++ linux-2.6.32.10/sound/pci/intel8x0.c 2010-03-20 15:58:47.212551922 -0400 55095+++ linux-2.6.32.11/sound/pci/intel8x0.c 2010-04-04 20:46:41.732880788 -0400
53851@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 55096@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
53852 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 55097 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
53853 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ 55098 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
@@ -53866,9 +55111,9 @@ diff -urNp linux-2.6.32.10/sound/pci/intel8x0.c linux-2.6.32.10/sound/pci/intel8
53866 }; 55111 };
53867 55112
53868 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, 55113 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
53869diff -urNp linux-2.6.32.10/sound/pci/intel8x0m.c linux-2.6.32.10/sound/pci/intel8x0m.c 55114diff -urNp linux-2.6.32.11/sound/pci/intel8x0m.c linux-2.6.32.11/sound/pci/intel8x0m.c
53870--- linux-2.6.32.10/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400 55115--- linux-2.6.32.11/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400
53871+++ linux-2.6.32.10/sound/pci/intel8x0m.c 2010-03-20 15:58:47.212551922 -0400 55116+++ linux-2.6.32.11/sound/pci/intel8x0m.c 2010-04-04 20:46:41.737788480 -0400
53872@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 55117@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
53873 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 55118 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
53874 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ 55119 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
@@ -53887,9 +55132,9 @@ diff -urNp linux-2.6.32.10/sound/pci/intel8x0m.c linux-2.6.32.10/sound/pci/intel
53887 }; 55132 };
53888 55133
53889 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, 55134 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
53890diff -urNp linux-2.6.32.10/usr/gen_init_cpio.c linux-2.6.32.10/usr/gen_init_cpio.c 55135diff -urNp linux-2.6.32.11/usr/gen_init_cpio.c linux-2.6.32.11/usr/gen_init_cpio.c
53891--- linux-2.6.32.10/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400 55136--- linux-2.6.32.11/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400
53892+++ linux-2.6.32.10/usr/gen_init_cpio.c 2010-03-20 15:58:47.212551922 -0400 55137+++ linux-2.6.32.11/usr/gen_init_cpio.c 2010-04-04 20:46:41.737788480 -0400
53893@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, 55138@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
53894 int retval; 55139 int retval;
53895 int rc = -1; 55140 int rc = -1;
@@ -53912,9 +55157,9 @@ diff -urNp linux-2.6.32.10/usr/gen_init_cpio.c linux-2.6.32.10/usr/gen_init_cpio
53912 } else 55157 } else
53913 break; 55158 break;
53914 } 55159 }
53915diff -urNp linux-2.6.32.10/virt/kvm/kvm_main.c linux-2.6.32.10/virt/kvm/kvm_main.c 55160diff -urNp linux-2.6.32.11/virt/kvm/kvm_main.c linux-2.6.32.11/virt/kvm/kvm_main.c
53916--- linux-2.6.32.10/virt/kvm/kvm_main.c 2010-03-15 11:52:04.000000000 -0400 55161--- linux-2.6.32.11/virt/kvm/kvm_main.c 2010-03-15 11:52:04.000000000 -0400
53917+++ linux-2.6.32.10/virt/kvm/kvm_main.c 2010-03-20 15:58:47.212551922 -0400 55162+++ linux-2.6.32.11/virt/kvm/kvm_main.c 2010-04-04 20:46:41.737788480 -0400
53918@@ -1745,6 +1745,7 @@ static int kvm_vcpu_release(struct inode 55163@@ -1745,6 +1745,7 @@ static int kvm_vcpu_release(struct inode
53919 return 0; 55164 return 0;
53920 } 55165 }
© 2015 Mike Crute