aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-03-23 10:44:45 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-03-31 07:58:38 +0000
commit6ace2d1d9b9d16c6deda1187a9379381cbb45129 (patch)
treed42208210312aa771a5631ceaaef9f6b200cdeda
parent9ecc46adcb899a119c17101dd3c2aa029445a2ac (diff)
downloadalpine_aports-6ace2d1d9b9d16c6deda1187a9379381cbb45129.tar.bz2
alpine_aports-6ace2d1d9b9d16c6deda1187a9379381cbb45129.tar.xz
alpine_aports-6ace2d1d9b9d16c6deda1187a9379381cbb45129.zip
main/linux-grsec: upgrade to 2.1.14-2.6.32.10-201003211638
(cherry picked from commit d38920953b33a352804c304db35b61816ae92126)
Diffstat
-rw-r--r--main/linux-grsec/APKBUILD10
-rw-r--r--main/linux-grsec/grsecurity-2.1.14-2.6.32.10-201003211638.patch (renamed from main/linux-grsec/grsecurity-2.1.14-2.6.32.9-201003112025.patch)6968
2 files changed, 3538 insertions, 3440 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index e29efde20a..f54026e0b3 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.9 5pkgver=2.6.32.10
6_kernver=2.6.32 6_kernver=2.6.32
7pkgrel=3 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.9-201003112025.patch 17 grsecurity-2.1.14-2.6.32.10-201003211638.patch
18 ip_gre.patch 18 ip_gre.patch
19 ip_gre2.patch 19 ip_gre2.patch
20 arp.patch 20 arp.patch
@@ -123,8 +123,8 @@ firmware() {
123} 123}
124 124
125md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 125md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
1267f615dd3b4a3b19fb86e479996a2deb5 patch-2.6.32.9.bz2 1260f1863836bf96fd0aab128d61eaa5693 patch-2.6.32.10.bz2
12798721ae28fe928f970ce92d8fc99d3a0 grsecurity-2.1.14-2.6.32.9-201003112025.patch 127a1959ececf64be61488ed84d0252c053 grsecurity-2.1.14-2.6.32.10-201003211638.patch
1283ef822f3a2723b9a80c3f12954457225 ip_gre.patch 1283ef822f3a2723b9a80c3f12954457225 ip_gre.patch
12913ca9e91700e459da269c957062bbea7 ip_gre2.patch 12913ca9e91700e459da269c957062bbea7 ip_gre2.patch
1304c39a161d918e7f274292ecfd168b891 arp.patch 1304c39a161d918e7f274292ecfd168b891 arp.patch
diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.32.9-201003112025.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.32.10-201003211638.patch
index 44301c7228..f2a180b8f1 100644
--- a/main/linux-grsec/grsecurity-2.1.14-2.6.32.9-201003112025.patch
+++ b/main/linux-grsec/grsecurity-2.1.14-2.6.32.10-201003211638.patch
@@ -1,6 +1,6 @@
1diff -urNp linux-2.6.32.9/arch/alpha/include/asm/elf.h linux-2.6.32.9/arch/alpha/include/asm/elf.h 1diff -urNp linux-2.6.32.10/arch/alpha/include/asm/elf.h linux-2.6.32.10/arch/alpha/include/asm/elf.h
2--- linux-2.6.32.9/arch/alpha/include/asm/elf.h 2010-02-23 10:38:51.000000000 -0500 2--- linux-2.6.32.10/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
3+++ linux-2.6.32.9/arch/alpha/include/asm/elf.h 2010-03-11 20:24:59.793355116 -0500 3+++ linux-2.6.32.10/arch/alpha/include/asm/elf.h 2010-03-20 15:58:45.636971023 -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.9/arch/alpha/include/asm/elf.h linux-2.6.32.9/arch/alpha
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.9/arch/alpha/include/asm/pgtable.h linux-2.6.32.9/arch/alpha/include/asm/pgtable.h 18diff -urNp linux-2.6.32.10/arch/alpha/include/asm/pgtable.h linux-2.6.32.10/arch/alpha/include/asm/pgtable.h
19--- linux-2.6.32.9/arch/alpha/include/asm/pgtable.h 2010-02-23 10:38:51.000000000 -0500 19--- linux-2.6.32.10/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
20+++ linux-2.6.32.9/arch/alpha/include/asm/pgtable.h 2010-03-11 20:24:59.793355116 -0500 20+++ linux-2.6.32.10/arch/alpha/include/asm/pgtable.h 2010-03-20 15:58:45.636971023 -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.9/arch/alpha/include/asm/pgtable.h linux-2.6.32.9/arch/a
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.9/arch/alpha/kernel/module.c linux-2.6.32.9/arch/alpha/kernel/module.c 39diff -urNp linux-2.6.32.10/arch/alpha/kernel/module.c linux-2.6.32.10/arch/alpha/kernel/module.c
40--- linux-2.6.32.9/arch/alpha/kernel/module.c 2010-02-23 10:38:51.000000000 -0500 40--- linux-2.6.32.10/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
41+++ linux-2.6.32.9/arch/alpha/kernel/module.c 2010-03-11 20:24:59.793355116 -0500 41+++ linux-2.6.32.10/arch/alpha/kernel/module.c 2010-03-20 15:58:45.636971023 -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.9/arch/alpha/kernel/module.c linux-2.6.32.9/arch/alpha/k
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.9/arch/alpha/kernel/osf_sys.c linux-2.6.32.9/arch/alpha/kernel/osf_sys.c 51diff -urNp linux-2.6.32.10/arch/alpha/kernel/osf_sys.c linux-2.6.32.10/arch/alpha/kernel/osf_sys.c
52--- linux-2.6.32.9/arch/alpha/kernel/osf_sys.c 2010-02-23 10:38:51.000000000 -0500 52--- linux-2.6.32.10/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400
53+++ linux-2.6.32.9/arch/alpha/kernel/osf_sys.c 2010-03-11 20:24:59.793355116 -0500 53+++ linux-2.6.32.10/arch/alpha/kernel/osf_sys.c 2010-03-20 15:58:45.636971023 -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.9/arch/alpha/kernel/osf_sys.c linux-2.6.32.9/arch/alpha/
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.9/arch/alpha/mm/fault.c linux-2.6.32.9/arch/alpha/mm/fault.c 76diff -urNp linux-2.6.32.10/arch/alpha/mm/fault.c linux-2.6.32.10/arch/alpha/mm/fault.c
77--- linux-2.6.32.9/arch/alpha/mm/fault.c 2010-02-23 10:38:51.000000000 -0500 77--- linux-2.6.32.10/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
78+++ linux-2.6.32.9/arch/alpha/mm/fault.c 2010-03-11 20:24:59.793355116 -0500 78+++ linux-2.6.32.10/arch/alpha/mm/fault.c 2010-03-20 15:58:45.636971023 -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.9/arch/alpha/mm/fault.c linux-2.6.32.9/arch/alpha/mm/fau
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.9/arch/arm/include/asm/elf.h linux-2.6.32.9/arch/arm/include/asm/elf.h 235diff -urNp linux-2.6.32.10/arch/arm/include/asm/elf.h linux-2.6.32.10/arch/arm/include/asm/elf.h
236--- linux-2.6.32.9/arch/arm/include/asm/elf.h 2010-02-23 10:38:51.000000000 -0500 236--- linux-2.6.32.10/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
237+++ linux-2.6.32.9/arch/arm/include/asm/elf.h 2010-03-11 20:24:59.793355116 -0500 237+++ linux-2.6.32.10/arch/arm/include/asm/elf.h 2010-03-20 15:58:45.636971023 -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.9/arch/arm/include/asm/elf.h linux-2.6.32.9/arch/arm/inc
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.9/arch/arm/include/asm/kmap_types.h linux-2.6.32.9/arch/arm/include/asm/kmap_types.h 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
255--- linux-2.6.32.9/arch/arm/include/asm/kmap_types.h 2010-02-23 10:38:51.000000000 -0500 255--- linux-2.6.32.10/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
256+++ linux-2.6.32.9/arch/arm/include/asm/kmap_types.h 2010-03-11 20:24:59.793355116 -0500 256+++ linux-2.6.32.10/arch/arm/include/asm/kmap_types.h 2010-03-20 15:58:45.636971023 -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.9/arch/arm/include/asm/kmap_types.h linux-2.6.32.9/arch/
262 KM_TYPE_NR 262 KM_TYPE_NR
263 }; 263 };
264 264
265diff -urNp linux-2.6.32.9/arch/arm/include/asm/uaccess.h linux-2.6.32.9/arch/arm/include/asm/uaccess.h 265diff -urNp linux-2.6.32.10/arch/arm/include/asm/uaccess.h linux-2.6.32.10/arch/arm/include/asm/uaccess.h
266--- linux-2.6.32.9/arch/arm/include/asm/uaccess.h 2010-02-23 10:38:51.000000000 -0500 266--- linux-2.6.32.10/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
267+++ linux-2.6.32.9/arch/arm/include/asm/uaccess.h 2010-03-11 20:24:59.793355116 -0500 267+++ linux-2.6.32.10/arch/arm/include/asm/uaccess.h 2010-03-20 15:58:45.636971023 -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.9/arch/arm/include/asm/uaccess.h linux-2.6.32.9/arch/arm
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.9/arch/arm/kernel/kgdb.c linux-2.6.32.9/arch/arm/kernel/kgdb.c 288diff -urNp linux-2.6.32.10/arch/arm/kernel/kgdb.c linux-2.6.32.10/arch/arm/kernel/kgdb.c
289--- linux-2.6.32.9/arch/arm/kernel/kgdb.c 2010-02-23 10:38:51.000000000 -0500 289--- linux-2.6.32.10/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
290+++ linux-2.6.32.9/arch/arm/kernel/kgdb.c 2010-03-11 20:24:59.793355116 -0500 290+++ linux-2.6.32.10/arch/arm/kernel/kgdb.c 2010-03-20 15:58:45.636971023 -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.9/arch/arm/kernel/kgdb.c linux-2.6.32.9/arch/arm/kernel/
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.9/arch/arm/mach-at91/pm.c linux-2.6.32.9/arch/arm/mach-at91/pm.c 300diff -urNp linux-2.6.32.10/arch/arm/mach-at91/pm.c linux-2.6.32.10/arch/arm/mach-at91/pm.c
301--- linux-2.6.32.9/arch/arm/mach-at91/pm.c 2010-02-23 10:38:51.000000000 -0500 301--- linux-2.6.32.10/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400
302+++ linux-2.6.32.9/arch/arm/mach-at91/pm.c 2010-03-11 20:24:59.793355116 -0500 302+++ linux-2.6.32.10/arch/arm/mach-at91/pm.c 2010-03-20 15:58:45.636971023 -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.9/arch/arm/mach-at91/pm.c linux-2.6.32.9/arch/arm/mach-a
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.9/arch/arm/mach-omap1/pm.c linux-2.6.32.9/arch/arm/mach-omap1/pm.c 312diff -urNp linux-2.6.32.10/arch/arm/mach-omap1/pm.c linux-2.6.32.10/arch/arm/mach-omap1/pm.c
313--- linux-2.6.32.9/arch/arm/mach-omap1/pm.c 2010-02-23 10:38:51.000000000 -0500 313--- linux-2.6.32.10/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400
314+++ linux-2.6.32.9/arch/arm/mach-omap1/pm.c 2010-03-11 20:24:59.793355116 -0500 314+++ linux-2.6.32.10/arch/arm/mach-omap1/pm.c 2010-03-20 15:58:45.636971023 -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.9/arch/arm/mach-omap1/pm.c linux-2.6.32.9/arch/arm/mach-
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.9/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.9/arch/arm/mach-omap2/pm24xx.c 324diff -urNp linux-2.6.32.10/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.10/arch/arm/mach-omap2/pm24xx.c
325--- linux-2.6.32.9/arch/arm/mach-omap2/pm24xx.c 2010-02-23 10:38:51.000000000 -0500 325--- linux-2.6.32.10/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400
326+++ linux-2.6.32.9/arch/arm/mach-omap2/pm24xx.c 2010-03-11 20:24:59.793355116 -0500 326+++ linux-2.6.32.10/arch/arm/mach-omap2/pm24xx.c 2010-03-20 15:58:45.636971023 -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.9/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.9/arch/arm/m
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.9/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.9/arch/arm/mach-omap2/pm34xx.c 336diff -urNp linux-2.6.32.10/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.10/arch/arm/mach-omap2/pm34xx.c
337--- linux-2.6.32.9/arch/arm/mach-omap2/pm34xx.c 2010-02-23 10:38:51.000000000 -0500 337--- linux-2.6.32.10/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400
338+++ linux-2.6.32.9/arch/arm/mach-omap2/pm34xx.c 2010-03-11 20:24:59.793355116 -0500 338+++ linux-2.6.32.10/arch/arm/mach-omap2/pm34xx.c 2010-03-20 15:58:45.640844875 -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.9/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.9/arch/arm/m
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.9/arch/arm/mach-pnx4008/pm.c linux-2.6.32.9/arch/arm/mach-pnx4008/pm.c 348diff -urNp linux-2.6.32.10/arch/arm/mach-pnx4008/pm.c linux-2.6.32.10/arch/arm/mach-pnx4008/pm.c
349--- linux-2.6.32.9/arch/arm/mach-pnx4008/pm.c 2010-02-23 10:38:51.000000000 -0500 349--- linux-2.6.32.10/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400
350+++ linux-2.6.32.9/arch/arm/mach-pnx4008/pm.c 2010-03-11 20:24:59.793355116 -0500 350+++ linux-2.6.32.10/arch/arm/mach-pnx4008/pm.c 2010-03-20 15:58:45.640844875 -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.9/arch/arm/mach-pnx4008/pm.c linux-2.6.32.9/arch/arm/mac
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.9/arch/arm/mach-pxa/pm.c linux-2.6.32.9/arch/arm/mach-pxa/pm.c 360diff -urNp linux-2.6.32.10/arch/arm/mach-pxa/pm.c linux-2.6.32.10/arch/arm/mach-pxa/pm.c
361--- linux-2.6.32.9/arch/arm/mach-pxa/pm.c 2010-02-23 10:38:51.000000000 -0500 361--- linux-2.6.32.10/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400
362+++ linux-2.6.32.9/arch/arm/mach-pxa/pm.c 2010-03-11 20:24:59.793355116 -0500 362+++ linux-2.6.32.10/arch/arm/mach-pxa/pm.c 2010-03-20 15:58:45.640844875 -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.9/arch/arm/mach-pxa/pm.c linux-2.6.32.9/arch/arm/mach-px
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.9/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.9/arch/arm/mach-pxa/sharpsl_pm.c 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
373--- linux-2.6.32.9/arch/arm/mach-pxa/sharpsl_pm.c 2010-02-23 10:38:51.000000000 -0500 373--- linux-2.6.32.10/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400
374+++ linux-2.6.32.9/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-11 20:24:59.793355116 -0500 374+++ linux-2.6.32.10/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-20 15:58:45.640844875 -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.9/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.9/arch/arm
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.9/arch/arm/mach-sa1100/pm.c linux-2.6.32.9/arch/arm/mach-sa1100/pm.c 384diff -urNp linux-2.6.32.10/arch/arm/mach-sa1100/pm.c linux-2.6.32.10/arch/arm/mach-sa1100/pm.c
385--- linux-2.6.32.9/arch/arm/mach-sa1100/pm.c 2010-02-23 10:38:51.000000000 -0500 385--- linux-2.6.32.10/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400
386+++ linux-2.6.32.9/arch/arm/mach-sa1100/pm.c 2010-03-11 20:24:59.793355116 -0500 386+++ linux-2.6.32.10/arch/arm/mach-sa1100/pm.c 2010-03-20 15:58:45.640844875 -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.9/arch/arm/mach-sa1100/pm.c linux-2.6.32.9/arch/arm/mach
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.9/arch/arm/mm/fault.c linux-2.6.32.9/arch/arm/mm/fault.c 396diff -urNp linux-2.6.32.10/arch/arm/mm/fault.c linux-2.6.32.10/arch/arm/mm/fault.c
397--- linux-2.6.32.9/arch/arm/mm/fault.c 2010-02-23 10:38:51.000000000 -0500 397--- linux-2.6.32.10/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
398+++ linux-2.6.32.9/arch/arm/mm/fault.c 2010-03-11 20:24:59.793355116 -0500 398+++ linux-2.6.32.10/arch/arm/mm/fault.c 2010-03-20 15:58:45.640844875 -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.9/arch/arm/mm/fault.c linux-2.6.32.9/arch/arm/mm/fault.c
444 /* 444 /*
445 * First Level Translation Fault Handler 445 * First Level Translation Fault Handler
446 * 446 *
447diff -urNp linux-2.6.32.9/arch/arm/mm/mmap.c linux-2.6.32.9/arch/arm/mm/mmap.c 447diff -urNp linux-2.6.32.10/arch/arm/mm/mmap.c linux-2.6.32.10/arch/arm/mm/mmap.c
448--- linux-2.6.32.9/arch/arm/mm/mmap.c 2010-02-23 10:38:51.000000000 -0500 448--- linux-2.6.32.10/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
449+++ linux-2.6.32.9/arch/arm/mm/mmap.c 2010-03-11 20:24:59.805548113 -0500 449+++ linux-2.6.32.10/arch/arm/mm/mmap.c 2010-03-20 15:58:45.640844875 -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.9/arch/arm/mm/mmap.c linux-2.6.32.9/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.9/arch/arm/plat-s3c/pm.c linux-2.6.32.9/arch/arm/plat-s3c/pm.c 486diff -urNp linux-2.6.32.10/arch/arm/plat-s3c/pm.c linux-2.6.32.10/arch/arm/plat-s3c/pm.c
487--- linux-2.6.32.9/arch/arm/plat-s3c/pm.c 2010-02-23 10:38:51.000000000 -0500 487--- linux-2.6.32.10/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400
488+++ linux-2.6.32.9/arch/arm/plat-s3c/pm.c 2010-03-11 20:24:59.805548113 -0500 488+++ linux-2.6.32.10/arch/arm/plat-s3c/pm.c 2010-03-20 15:58:45.640844875 -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.9/arch/arm/plat-s3c/pm.c linux-2.6.32.9/arch/arm/plat-s3
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.9/arch/avr32/include/asm/elf.h linux-2.6.32.9/arch/avr32/include/asm/elf.h 498diff -urNp linux-2.6.32.10/arch/avr32/include/asm/elf.h linux-2.6.32.10/arch/avr32/include/asm/elf.h
499--- linux-2.6.32.9/arch/avr32/include/asm/elf.h 2010-02-23 10:38:51.000000000 -0500 499--- linux-2.6.32.10/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
500+++ linux-2.6.32.9/arch/avr32/include/asm/elf.h 2010-03-11 20:24:59.805548113 -0500 500+++ linux-2.6.32.10/arch/avr32/include/asm/elf.h 2010-03-20 15:58:45.640844875 -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.9/arch/avr32/include/asm/elf.h linux-2.6.32.9/arch/avr32
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.9/arch/avr32/include/asm/kmap_types.h linux-2.6.32.9/arch/avr32/include/asm/kmap_types.h 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
518--- linux-2.6.32.9/arch/avr32/include/asm/kmap_types.h 2010-02-23 10:38:51.000000000 -0500 518--- linux-2.6.32.10/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
519+++ linux-2.6.32.9/arch/avr32/include/asm/kmap_types.h 2010-03-11 20:24:59.805548113 -0500 519+++ linux-2.6.32.10/arch/avr32/include/asm/kmap_types.h 2010-03-20 15:58:45.640844875 -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.9/arch/avr32/include/asm/kmap_types.h linux-2.6.32.9/arc
527 }; 527 };
528 528
529 #undef D 529 #undef D
530diff -urNp linux-2.6.32.9/arch/avr32/mach-at32ap/pm.c linux-2.6.32.9/arch/avr32/mach-at32ap/pm.c 530diff -urNp linux-2.6.32.10/arch/avr32/mach-at32ap/pm.c linux-2.6.32.10/arch/avr32/mach-at32ap/pm.c
531--- linux-2.6.32.9/arch/avr32/mach-at32ap/pm.c 2010-02-23 10:38:51.000000000 -0500 531--- linux-2.6.32.10/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400
532+++ linux-2.6.32.9/arch/avr32/mach-at32ap/pm.c 2010-03-11 20:24:59.805548113 -0500 532+++ linux-2.6.32.10/arch/avr32/mach-at32ap/pm.c 2010-03-20 15:58:45.640844875 -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.9/arch/avr32/mach-at32ap/pm.c linux-2.6.32.9/arch/avr32/
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.9/arch/avr32/mm/fault.c linux-2.6.32.9/arch/avr32/mm/fault.c 542diff -urNp linux-2.6.32.10/arch/avr32/mm/fault.c linux-2.6.32.10/arch/avr32/mm/fault.c
543--- linux-2.6.32.9/arch/avr32/mm/fault.c 2010-02-23 10:38:51.000000000 -0500 543--- linux-2.6.32.10/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
544+++ linux-2.6.32.9/arch/avr32/mm/fault.c 2010-03-11 20:24:59.805548113 -0500 544+++ linux-2.6.32.10/arch/avr32/mm/fault.c 2010-03-20 15:58:45.640844875 -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.9/arch/avr32/mm/fault.c linux-2.6.32.9/arch/avr32/mm/fau
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.9/arch/blackfin/kernel/kgdb.c linux-2.6.32.9/arch/blackfin/kernel/kgdb.c 586diff -urNp linux-2.6.32.10/arch/blackfin/kernel/kgdb.c linux-2.6.32.10/arch/blackfin/kernel/kgdb.c
587--- linux-2.6.32.9/arch/blackfin/kernel/kgdb.c 2010-02-23 10:38:51.000000000 -0500 587--- linux-2.6.32.10/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
588+++ linux-2.6.32.9/arch/blackfin/kernel/kgdb.c 2010-03-11 20:24:59.805548113 -0500 588+++ linux-2.6.32.10/arch/blackfin/kernel/kgdb.c 2010-03-20 15:58:45.640844875 -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.9/arch/blackfin/kernel/kgdb.c linux-2.6.32.9/arch/blackf
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.9/arch/blackfin/mach-common/pm.c linux-2.6.32.9/arch/blackfin/mach-common/pm.c 598diff -urNp linux-2.6.32.10/arch/blackfin/mach-common/pm.c linux-2.6.32.10/arch/blackfin/mach-common/pm.c
599--- linux-2.6.32.9/arch/blackfin/mach-common/pm.c 2010-02-23 10:38:51.000000000 -0500 599--- linux-2.6.32.10/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400
600+++ linux-2.6.32.9/arch/blackfin/mach-common/pm.c 2010-03-11 20:24:59.805548113 -0500 600+++ linux-2.6.32.10/arch/blackfin/mach-common/pm.c 2010-03-20 15:58:45.640844875 -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.9/arch/blackfin/mach-common/pm.c linux-2.6.32.9/arch/bla
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.9/arch/frv/include/asm/kmap_types.h linux-2.6.32.9/arch/frv/include/asm/kmap_types.h 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
611--- linux-2.6.32.9/arch/frv/include/asm/kmap_types.h 2010-02-23 10:38:51.000000000 -0500 611--- linux-2.6.32.10/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
612+++ linux-2.6.32.9/arch/frv/include/asm/kmap_types.h 2010-03-11 20:24:59.805548113 -0500 612+++ linux-2.6.32.10/arch/frv/include/asm/kmap_types.h 2010-03-20 15:58:45.640844875 -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.9/arch/frv/include/asm/kmap_types.h linux-2.6.32.9/arch/
618 KM_TYPE_NR 618 KM_TYPE_NR
619 }; 619 };
620 620
621diff -urNp linux-2.6.32.9/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.9/arch/ia64/hp/common/hwsw_iommu.c 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
622--- linux-2.6.32.9/arch/ia64/hp/common/hwsw_iommu.c 2010-02-23 10:38:51.000000000 -0500 622--- linux-2.6.32.10/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400
623+++ linux-2.6.32.9/arch/ia64/hp/common/hwsw_iommu.c 2010-03-11 20:24:59.805548113 -0500 623+++ linux-2.6.32.10/arch/ia64/hp/common/hwsw_iommu.c 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.9/arch/i
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.9/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.9/arch/ia64/hp/common/sba_iommu.c 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
643--- linux-2.6.32.9/arch/ia64/hp/common/sba_iommu.c 2010-02-23 10:38:51.000000000 -0500 643--- linux-2.6.32.10/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400
644+++ linux-2.6.32.9/arch/ia64/hp/common/sba_iommu.c 2010-03-11 20:24:59.805548113 -0500 644+++ linux-2.6.32.10/arch/ia64/hp/common/sba_iommu.c 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.9/arch/ia
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.9/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.9/arch/ia64/ia32/binfmt_elf32.c 663diff -urNp linux-2.6.32.10/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.10/arch/ia64/ia32/binfmt_elf32.c
664--- linux-2.6.32.9/arch/ia64/ia32/binfmt_elf32.c 2010-02-23 10:38:51.000000000 -0500 664--- linux-2.6.32.10/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400
665+++ linux-2.6.32.9/arch/ia64/ia32/binfmt_elf32.c 2010-03-11 20:24:59.805548113 -0500 665+++ linux-2.6.32.10/arch/ia64/ia32/binfmt_elf32.c 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.9/arch/ia64
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.9/arch/ia64/ia32/ia32priv.h linux-2.6.32.9/arch/ia64/ia32/ia32priv.h 680diff -urNp linux-2.6.32.10/arch/ia64/ia32/ia32priv.h linux-2.6.32.10/arch/ia64/ia32/ia32priv.h
681--- linux-2.6.32.9/arch/ia64/ia32/ia32priv.h 2010-02-23 10:38:51.000000000 -0500 681--- linux-2.6.32.10/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400
682+++ linux-2.6.32.9/arch/ia64/ia32/ia32priv.h 2010-03-11 20:24:59.805548113 -0500 682+++ linux-2.6.32.10/arch/ia64/ia32/ia32priv.h 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/ia32/ia32priv.h linux-2.6.32.9/arch/ia64/ia3
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.9/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.9/arch/ia64/include/asm/dma-mapping.h 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
700--- linux-2.6.32.9/arch/ia64/include/asm/dma-mapping.h 2010-02-23 10:38:51.000000000 -0500 700--- linux-2.6.32.10/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
701+++ linux-2.6.32.9/arch/ia64/include/asm/dma-mapping.h 2010-03-11 20:24:59.805548113 -0500 701+++ linux-2.6.32.10/arch/ia64/include/asm/dma-mapping.h 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.9/arc
742 return ops->dma_supported(dev, mask); 742 return ops->dma_supported(dev, mask);
743 } 743 }
744 744
745diff -urNp linux-2.6.32.9/arch/ia64/include/asm/elf.h linux-2.6.32.9/arch/ia64/include/asm/elf.h 745diff -urNp linux-2.6.32.10/arch/ia64/include/asm/elf.h linux-2.6.32.10/arch/ia64/include/asm/elf.h
746--- linux-2.6.32.9/arch/ia64/include/asm/elf.h 2010-02-23 10:38:51.000000000 -0500 746--- linux-2.6.32.10/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
747+++ linux-2.6.32.9/arch/ia64/include/asm/elf.h 2010-03-11 20:24:59.805548113 -0500 747+++ linux-2.6.32.10/arch/ia64/include/asm/elf.h 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/include/asm/elf.h linux-2.6.32.9/arch/ia64/i
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.9/arch/ia64/include/asm/machvec.h linux-2.6.32.9/arch/ia64/include/asm/machvec.h 762diff -urNp linux-2.6.32.10/arch/ia64/include/asm/machvec.h linux-2.6.32.10/arch/ia64/include/asm/machvec.h
763--- linux-2.6.32.9/arch/ia64/include/asm/machvec.h 2010-02-23 10:38:51.000000000 -0500 763--- linux-2.6.32.10/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400
764+++ linux-2.6.32.9/arch/ia64/include/asm/machvec.h 2010-03-11 20:24:59.805548113 -0500 764+++ linux-2.6.32.10/arch/ia64/include/asm/machvec.h 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/include/asm/machvec.h linux-2.6.32.9/arch/ia
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.9/arch/ia64/include/asm/pgtable.h linux-2.6.32.9/arch/ia64/include/asm/pgtable.h 783diff -urNp linux-2.6.32.10/arch/ia64/include/asm/pgtable.h linux-2.6.32.10/arch/ia64/include/asm/pgtable.h
784--- linux-2.6.32.9/arch/ia64/include/asm/pgtable.h 2010-02-23 10:38:51.000000000 -0500 784--- linux-2.6.32.10/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
785+++ linux-2.6.32.9/arch/ia64/include/asm/pgtable.h 2010-03-11 20:24:59.805548113 -0500 785+++ linux-2.6.32.10/arch/ia64/include/asm/pgtable.h 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/include/asm/pgtable.h linux-2.6.32.9/arch/ia
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.9/arch/ia64/include/asm/uaccess.h linux-2.6.32.9/arch/ia64/include/asm/uaccess.h 804diff -urNp linux-2.6.32.10/arch/ia64/include/asm/uaccess.h linux-2.6.32.10/arch/ia64/include/asm/uaccess.h
805--- linux-2.6.32.9/arch/ia64/include/asm/uaccess.h 2010-02-23 10:38:51.000000000 -0500 805--- linux-2.6.32.10/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
806+++ linux-2.6.32.9/arch/ia64/include/asm/uaccess.h 2010-03-11 20:24:59.805548113 -0500 806+++ linux-2.6.32.10/arch/ia64/include/asm/uaccess.h 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/include/asm/uaccess.h linux-2.6.32.9/arch/ia
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.9/arch/ia64/kernel/dma-mapping.c linux-2.6.32.9/arch/ia64/kernel/dma-mapping.c 825diff -urNp linux-2.6.32.10/arch/ia64/kernel/dma-mapping.c linux-2.6.32.10/arch/ia64/kernel/dma-mapping.c
826--- linux-2.6.32.9/arch/ia64/kernel/dma-mapping.c 2010-02-23 10:38:51.000000000 -0500 826--- linux-2.6.32.10/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400
827+++ linux-2.6.32.9/arch/ia64/kernel/dma-mapping.c 2010-03-11 20:24:59.805548113 -0500 827+++ linux-2.6.32.10/arch/ia64/kernel/dma-mapping.c 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/kernel/dma-mapping.c linux-2.6.32.9/arch/ia6
843 { 843 {
844 return dma_ops; 844 return dma_ops;
845 } 845 }
846diff -urNp linux-2.6.32.9/arch/ia64/kernel/module.c linux-2.6.32.9/arch/ia64/kernel/module.c 846diff -urNp linux-2.6.32.10/arch/ia64/kernel/module.c linux-2.6.32.10/arch/ia64/kernel/module.c
847--- linux-2.6.32.9/arch/ia64/kernel/module.c 2010-02-23 10:38:51.000000000 -0500 847--- linux-2.6.32.10/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
848+++ linux-2.6.32.9/arch/ia64/kernel/module.c 2010-03-11 20:24:59.809615556 -0500 848+++ linux-2.6.32.10/arch/ia64/kernel/module.c 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/kernel/module.c linux-2.6.32.9/arch/ia64/ker
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.9/arch/ia64/kernel/pci-dma.c linux-2.6.32.9/arch/ia64/kernel/pci-dma.c 937diff -urNp linux-2.6.32.10/arch/ia64/kernel/pci-dma.c linux-2.6.32.10/arch/ia64/kernel/pci-dma.c
938--- linux-2.6.32.9/arch/ia64/kernel/pci-dma.c 2010-02-23 10:38:51.000000000 -0500 938--- linux-2.6.32.10/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
939+++ linux-2.6.32.9/arch/ia64/kernel/pci-dma.c 2010-03-11 20:24:59.809615556 -0500 939+++ linux-2.6.32.10/arch/ia64/kernel/pci-dma.c 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/kernel/pci-dma.c linux-2.6.32.9/arch/ia64/ke
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.9/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.9/arch/ia64/kernel/pci-swiotlb.c 949diff -urNp linux-2.6.32.10/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.10/arch/ia64/kernel/pci-swiotlb.c
950--- linux-2.6.32.9/arch/ia64/kernel/pci-swiotlb.c 2010-02-23 10:38:51.000000000 -0500 950--- linux-2.6.32.10/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
951+++ linux-2.6.32.9/arch/ia64/kernel/pci-swiotlb.c 2010-03-11 20:24:59.809615556 -0500 951+++ linux-2.6.32.10/arch/ia64/kernel/pci-swiotlb.c 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.9/arch/ia6
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.9/arch/ia64/kernel/sys_ia64.c linux-2.6.32.9/arch/ia64/kernel/sys_ia64.c 961diff -urNp linux-2.6.32.10/arch/ia64/kernel/sys_ia64.c linux-2.6.32.10/arch/ia64/kernel/sys_ia64.c
962--- linux-2.6.32.9/arch/ia64/kernel/sys_ia64.c 2010-02-23 10:38:51.000000000 -0500 962--- linux-2.6.32.10/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400
963+++ linux-2.6.32.9/arch/ia64/kernel/sys_ia64.c 2010-03-11 20:24:59.809615556 -0500 963+++ linux-2.6.32.10/arch/ia64/kernel/sys_ia64.c 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/kernel/sys_ia64.c linux-2.6.32.9/arch/ia64/k
987 goto full_search; 987 goto full_search;
988 } 988 }
989 return -ENOMEM; 989 return -ENOMEM;
990diff -urNp linux-2.6.32.9/arch/ia64/kernel/topology.c linux-2.6.32.9/arch/ia64/kernel/topology.c 990diff -urNp linux-2.6.32.10/arch/ia64/kernel/topology.c linux-2.6.32.10/arch/ia64/kernel/topology.c
991--- linux-2.6.32.9/arch/ia64/kernel/topology.c 2010-02-23 10:38:51.000000000 -0500 991--- linux-2.6.32.10/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400
992+++ linux-2.6.32.9/arch/ia64/kernel/topology.c 2010-03-11 20:24:59.809615556 -0500 992+++ linux-2.6.32.10/arch/ia64/kernel/topology.c 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/kernel/topology.c linux-2.6.32.9/arch/ia64/k
999 .show = cache_show 999 .show = cache_show
1000 }; 1000 };
1001 1001
1002diff -urNp linux-2.6.32.9/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.9/arch/ia64/kernel/vmlinux.lds.S 1002diff -urNp linux-2.6.32.10/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.10/arch/ia64/kernel/vmlinux.lds.S
1003--- linux-2.6.32.9/arch/ia64/kernel/vmlinux.lds.S 2010-02-23 10:38:51.000000000 -0500 1003--- linux-2.6.32.10/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
1004+++ linux-2.6.32.9/arch/ia64/kernel/vmlinux.lds.S 2010-03-11 20:24:59.809615556 -0500 1004+++ linux-2.6.32.10/arch/ia64/kernel/vmlinux.lds.S 2010-03-20 15:58:45.640844875 -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.9/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.9/arch/ia6
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.9/arch/ia64/mm/fault.c linux-2.6.32.9/arch/ia64/mm/fault.c 1014diff -urNp linux-2.6.32.10/arch/ia64/mm/fault.c linux-2.6.32.10/arch/ia64/mm/fault.c
1015--- linux-2.6.32.9/arch/ia64/mm/fault.c 2010-02-23 10:38:51.000000000 -0500 1015--- linux-2.6.32.10/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
1016+++ linux-2.6.32.9/arch/ia64/mm/fault.c 2010-03-11 20:24:59.809615556 -0500 1016+++ linux-2.6.32.10/arch/ia64/mm/fault.c 2010-03-20 15:58:45.645469621 -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.9/arch/ia64/mm/fault.c linux-2.6.32.9/arch/ia64/mm/fault
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.9/arch/ia64/mm/init.c linux-2.6.32.9/arch/ia64/mm/init.c 1066diff -urNp linux-2.6.32.10/arch/ia64/mm/init.c linux-2.6.32.10/arch/ia64/mm/init.c
1067--- linux-2.6.32.9/arch/ia64/mm/init.c 2010-02-23 10:38:51.000000000 -0500 1067--- linux-2.6.32.10/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400
1068+++ linux-2.6.32.9/arch/ia64/mm/init.c 2010-03-11 20:24:59.809615556 -0500 1068+++ linux-2.6.32.10/arch/ia64/mm/init.c 2010-03-20 15:58:45.645469621 -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.9/arch/ia64/mm/init.c linux-2.6.32.9/arch/ia64/mm/init.c
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.9/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.9/arch/ia64/sn/pci/pci_dma.c 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
1090--- linux-2.6.32.9/arch/ia64/sn/pci/pci_dma.c 2010-02-23 10:38:51.000000000 -0500 1090--- linux-2.6.32.10/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400
1091+++ linux-2.6.32.9/arch/ia64/sn/pci/pci_dma.c 2010-03-11 20:24:59.809615556 -0500 1091+++ linux-2.6.32.10/arch/ia64/sn/pci/pci_dma.c 2010-03-20 15:58:45.645469621 -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.9/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.9/arch/ia64/sn
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.9/arch/m32r/lib/usercopy.c linux-2.6.32.9/arch/m32r/lib/usercopy.c 1101diff -urNp linux-2.6.32.10/arch/m32r/lib/usercopy.c linux-2.6.32.10/arch/m32r/lib/usercopy.c
1102--- linux-2.6.32.9/arch/m32r/lib/usercopy.c 2010-02-23 10:38:51.000000000 -0500 1102--- linux-2.6.32.10/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400
1103+++ linux-2.6.32.9/arch/m32r/lib/usercopy.c 2010-03-11 20:24:59.809615556 -0500 1103+++ linux-2.6.32.10/arch/m32r/lib/usercopy.c 2010-03-20 15:58:45.645469621 -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.9/arch/m32r/lib/usercopy.c linux-2.6.32.9/arch/m32r/lib/
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.9/arch/mips/alchemy/devboards/pm.c linux-2.6.32.9/arch/mips/alchemy/devboards/pm.c 1124diff -urNp linux-2.6.32.10/arch/mips/alchemy/devboards/pm.c linux-2.6.32.10/arch/mips/alchemy/devboards/pm.c
1125--- linux-2.6.32.9/arch/mips/alchemy/devboards/pm.c 2010-02-23 10:38:51.000000000 -0500 1125--- linux-2.6.32.10/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400
1126+++ linux-2.6.32.9/arch/mips/alchemy/devboards/pm.c 2010-03-11 20:24:59.809615556 -0500 1126+++ linux-2.6.32.10/arch/mips/alchemy/devboards/pm.c 2010-03-20 15:58:45.645469621 -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.9/arch/mips/alchemy/devboards/pm.c linux-2.6.32.9/arch/m
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.9/arch/mips/include/asm/elf.h linux-2.6.32.9/arch/mips/include/asm/elf.h 1136diff -urNp linux-2.6.32.10/arch/mips/include/asm/elf.h linux-2.6.32.10/arch/mips/include/asm/elf.h
1137--- linux-2.6.32.9/arch/mips/include/asm/elf.h 2010-02-23 10:38:51.000000000 -0500 1137--- linux-2.6.32.10/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
1138+++ linux-2.6.32.9/arch/mips/include/asm/elf.h 2010-03-11 20:24:59.809615556 -0500 1138+++ linux-2.6.32.10/arch/mips/include/asm/elf.h 2010-03-20 15:58:45.645469621 -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.9/arch/mips/include/asm/elf.h linux-2.6.32.9/arch/mips/i
1148+#endif 1148+#endif
1149+ 1149+
1150 #endif /* _ASM_ELF_H */ 1150 #endif /* _ASM_ELF_H */
1151diff -urNp linux-2.6.32.9/arch/mips/include/asm/page.h linux-2.6.32.9/arch/mips/include/asm/page.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
1152--- linux-2.6.32.9/arch/mips/include/asm/page.h 2010-02-23 10:38:51.000000000 -0500 1152--- linux-2.6.32.10/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
1153+++ linux-2.6.32.9/arch/mips/include/asm/page.h 2010-03-11 20:24:59.809615556 -0500 1153+++ linux-2.6.32.10/arch/mips/include/asm/page.h 2010-03-20 15:58:45.645469621 -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.9/arch/mips/include/asm/page.h linux-2.6.32.9/arch/mips/
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.9/arch/mips/include/asm/system.h linux-2.6.32.9/arch/mips/include/asm/system.h 1163diff -urNp linux-2.6.32.10/arch/mips/include/asm/system.h linux-2.6.32.10/arch/mips/include/asm/system.h
1164--- linux-2.6.32.9/arch/mips/include/asm/system.h 2010-02-23 10:38:51.000000000 -0500 1164--- linux-2.6.32.10/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
1165+++ linux-2.6.32.9/arch/mips/include/asm/system.h 2010-03-11 20:24:59.809615556 -0500 1165+++ linux-2.6.32.10/arch/mips/include/asm/system.h 2010-03-20 15:58:45.645469621 -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.9/arch/mips/include/asm/system.h linux-2.6.32.9/arch/mip
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.9/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.9/arch/mips/kernel/binfmt_elfn32.c 1174diff -urNp linux-2.6.32.10/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.10/arch/mips/kernel/binfmt_elfn32.c
1175--- linux-2.6.32.9/arch/mips/kernel/binfmt_elfn32.c 2010-02-23 10:38:51.000000000 -0500 1175--- linux-2.6.32.10/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400
1176+++ linux-2.6.32.9/arch/mips/kernel/binfmt_elfn32.c 2010-03-11 20:24:59.809615556 -0500 1176+++ linux-2.6.32.10/arch/mips/kernel/binfmt_elfn32.c 2010-03-20 15:58:45.645469621 -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.9/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.9/arch/m
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.9/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.9/arch/mips/kernel/binfmt_elfo32.c 1191diff -urNp linux-2.6.32.10/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.10/arch/mips/kernel/binfmt_elfo32.c
1192--- linux-2.6.32.9/arch/mips/kernel/binfmt_elfo32.c 2010-02-23 10:38:51.000000000 -0500 1192--- linux-2.6.32.10/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400
1193+++ linux-2.6.32.9/arch/mips/kernel/binfmt_elfo32.c 2010-03-11 20:24:59.809615556 -0500 1193+++ linux-2.6.32.10/arch/mips/kernel/binfmt_elfo32.c 2010-03-20 15:58:45.645469621 -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.9/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.9/arch/m
1205 #include <asm/processor.h> 1205 #include <asm/processor.h>
1206 1206
1207 /* 1207 /*
1208diff -urNp linux-2.6.32.9/arch/mips/kernel/kgdb.c linux-2.6.32.9/arch/mips/kernel/kgdb.c 1208diff -urNp linux-2.6.32.10/arch/mips/kernel/kgdb.c linux-2.6.32.10/arch/mips/kernel/kgdb.c
1209--- linux-2.6.32.9/arch/mips/kernel/kgdb.c 2010-02-23 10:38:51.000000000 -0500 1209--- linux-2.6.32.10/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
1210+++ linux-2.6.32.9/arch/mips/kernel/kgdb.c 2010-03-11 20:24:59.809615556 -0500 1210+++ linux-2.6.32.10/arch/mips/kernel/kgdb.c 2010-03-20 15:58:45.645469621 -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.9/arch/mips/kernel/kgdb.c linux-2.6.32.9/arch/mips/kerne
1216 struct kgdb_arch arch_kgdb_ops; 1216 struct kgdb_arch arch_kgdb_ops;
1217 1217
1218 /* 1218 /*
1219diff -urNp linux-2.6.32.9/arch/mips/kernel/process.c linux-2.6.32.9/arch/mips/kernel/process.c 1219diff -urNp linux-2.6.32.10/arch/mips/kernel/process.c linux-2.6.32.10/arch/mips/kernel/process.c
1220--- linux-2.6.32.9/arch/mips/kernel/process.c 2010-02-23 10:38:51.000000000 -0500 1220--- linux-2.6.32.10/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
1221+++ linux-2.6.32.9/arch/mips/kernel/process.c 2010-03-11 20:24:59.809615556 -0500 1221+++ linux-2.6.32.10/arch/mips/kernel/process.c 2010-03-20 15:58:45.645469621 -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.9/arch/mips/kernel/process.c linux-2.6.32.9/arch/mips/ke
1235- 1235-
1236- return sp & ALMASK; 1236- return sp & ALMASK;
1237-} 1237-}
1238diff -urNp linux-2.6.32.9/arch/mips/kernel/syscall.c linux-2.6.32.9/arch/mips/kernel/syscall.c 1238diff -urNp linux-2.6.32.10/arch/mips/kernel/syscall.c linux-2.6.32.10/arch/mips/kernel/syscall.c
1239--- linux-2.6.32.9/arch/mips/kernel/syscall.c 2010-02-23 10:38:51.000000000 -0500 1239--- linux-2.6.32.10/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400
1240+++ linux-2.6.32.9/arch/mips/kernel/syscall.c 2010-03-11 20:24:59.809615556 -0500 1240+++ linux-2.6.32.10/arch/mips/kernel/syscall.c 2010-03-20 15:58:45.645469621 -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.9/arch/mips/kernel/syscall.c linux-2.6.32.9/arch/mips/ke
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.9/arch/mips/mm/fault.c linux-2.6.32.9/arch/mips/mm/fault.c 1262diff -urNp linux-2.6.32.10/arch/mips/mm/fault.c linux-2.6.32.10/arch/mips/mm/fault.c
1263--- linux-2.6.32.9/arch/mips/mm/fault.c 2010-02-23 10:38:51.000000000 -0500 1263--- linux-2.6.32.10/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
1264+++ linux-2.6.32.9/arch/mips/mm/fault.c 2010-03-11 20:24:59.809615556 -0500 1264+++ linux-2.6.32.10/arch/mips/mm/fault.c 2010-03-20 15:58:45.645469621 -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.9/arch/mips/mm/fault.c linux-2.6.32.9/arch/mips/mm/fault
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.9/arch/parisc/include/asm/elf.h linux-2.6.32.9/arch/parisc/include/asm/elf.h 1289diff -urNp linux-2.6.32.10/arch/parisc/include/asm/elf.h linux-2.6.32.10/arch/parisc/include/asm/elf.h
1290--- linux-2.6.32.9/arch/parisc/include/asm/elf.h 2010-02-23 10:38:51.000000000 -0500 1290--- linux-2.6.32.10/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
1291+++ linux-2.6.32.9/arch/parisc/include/asm/elf.h 2010-03-11 20:24:59.809615556 -0500 1291+++ linux-2.6.32.10/arch/parisc/include/asm/elf.h 2010-03-20 15:58:45.645469621 -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.9/arch/parisc/include/asm/elf.h linux-2.6.32.9/arch/pari
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.9/arch/parisc/include/asm/pgtable.h linux-2.6.32.9/arch/parisc/include/asm/pgtable.h 1306diff -urNp linux-2.6.32.10/arch/parisc/include/asm/pgtable.h linux-2.6.32.10/arch/parisc/include/asm/pgtable.h
1307--- linux-2.6.32.9/arch/parisc/include/asm/pgtable.h 2010-02-23 10:38:51.000000000 -0500 1307--- linux-2.6.32.10/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
1308+++ linux-2.6.32.9/arch/parisc/include/asm/pgtable.h 2010-03-11 20:24:59.809615556 -0500 1308+++ linux-2.6.32.10/arch/parisc/include/asm/pgtable.h 2010-03-20 15:58:45.649479097 -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.9/arch/parisc/include/asm/pgtable.h linux-2.6.32.9/arch/
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.9/arch/parisc/kernel/module.c linux-2.6.32.9/arch/parisc/kernel/module.c 1327diff -urNp linux-2.6.32.10/arch/parisc/kernel/module.c linux-2.6.32.10/arch/parisc/kernel/module.c
1328--- linux-2.6.32.9/arch/parisc/kernel/module.c 2010-02-23 10:38:51.000000000 -0500 1328--- linux-2.6.32.10/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
1329+++ linux-2.6.32.9/arch/parisc/kernel/module.c 2010-03-11 20:24:59.809615556 -0500 1329+++ linux-2.6.32.10/arch/parisc/kernel/module.c 2010-03-20 15:58:45.649479097 -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.9/arch/parisc/kernel/module.c linux-2.6.32.9/arch/parisc
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.9/arch/parisc/kernel/sys_parisc.c linux-2.6.32.9/arch/parisc/kernel/sys_parisc.c 1430diff -urNp linux-2.6.32.10/arch/parisc/kernel/sys_parisc.c linux-2.6.32.10/arch/parisc/kernel/sys_parisc.c
1431--- linux-2.6.32.9/arch/parisc/kernel/sys_parisc.c 2010-02-23 10:38:51.000000000 -0500 1431--- linux-2.6.32.10/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400
1432+++ linux-2.6.32.9/arch/parisc/kernel/sys_parisc.c 2010-03-11 20:24:59.809615556 -0500 1432+++ linux-2.6.32.10/arch/parisc/kernel/sys_parisc.c 2010-03-20 15:58:45.649479097 -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.9/arch/parisc/kernel/sys_parisc.c linux-2.6.32.9/arch/pa
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.9/arch/parisc/kernel/traps.c linux-2.6.32.9/arch/parisc/kernel/traps.c 1442diff -urNp linux-2.6.32.10/arch/parisc/kernel/traps.c linux-2.6.32.10/arch/parisc/kernel/traps.c
1443--- linux-2.6.32.9/arch/parisc/kernel/traps.c 2010-02-23 10:38:51.000000000 -0500 1443--- linux-2.6.32.10/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
1444+++ linux-2.6.32.9/arch/parisc/kernel/traps.c 2010-03-11 20:24:59.809615556 -0500 1444+++ linux-2.6.32.10/arch/parisc/kernel/traps.c 2010-03-20 15:58:45.649479097 -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.9/arch/parisc/kernel/traps.c linux-2.6.32.9/arch/parisc/
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.9/arch/parisc/mm/fault.c linux-2.6.32.9/arch/parisc/mm/fault.c 1456diff -urNp linux-2.6.32.10/arch/parisc/mm/fault.c linux-2.6.32.10/arch/parisc/mm/fault.c
1457--- linux-2.6.32.9/arch/parisc/mm/fault.c 2010-02-23 10:38:51.000000000 -0500 1457--- linux-2.6.32.10/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
1458+++ linux-2.6.32.9/arch/parisc/mm/fault.c 2010-03-11 20:24:59.809615556 -0500 1458+++ linux-2.6.32.10/arch/parisc/mm/fault.c 2010-03-20 15:58:45.649479097 -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.9/arch/parisc/mm/fault.c linux-2.6.32.9/arch/parisc/mm/f
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.9/arch/powerpc/include/asm/device.h linux-2.6.32.9/arch/powerpc/include/asm/device.h 1628diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/device.h linux-2.6.32.10/arch/powerpc/include/asm/device.h
1629--- linux-2.6.32.9/arch/powerpc/include/asm/device.h 2010-02-23 10:38:51.000000000 -0500 1629--- linux-2.6.32.10/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
1630+++ linux-2.6.32.9/arch/powerpc/include/asm/device.h 2010-03-11 20:24:59.809615556 -0500 1630+++ linux-2.6.32.10/arch/powerpc/include/asm/device.h 2010-03-20 15:58:45.649479097 -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.9/arch/powerpc/include/asm/device.h linux-2.6.32.9/arch/
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.9/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.9/arch/powerpc/include/asm/dma-mapping.h 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
1641--- linux-2.6.32.9/arch/powerpc/include/asm/dma-mapping.h 2010-02-23 10:38:51.000000000 -0500 1641--- linux-2.6.32.10/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
1642+++ linux-2.6.32.9/arch/powerpc/include/asm/dma-mapping.h 2010-03-11 20:24:59.813619305 -0500 1642+++ linux-2.6.32.10/arch/powerpc/include/asm/dma-mapping.h 2010-03-20 15:58:45.649479097 -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.9/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.9/
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.9/arch/powerpc/include/asm/elf.h linux-2.6.32.9/arch/powerpc/include/asm/elf.h 1709diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/elf.h linux-2.6.32.10/arch/powerpc/include/asm/elf.h
1710--- linux-2.6.32.9/arch/powerpc/include/asm/elf.h 2010-02-23 10:38:51.000000000 -0500 1710--- linux-2.6.32.10/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
1711+++ linux-2.6.32.9/arch/powerpc/include/asm/elf.h 2010-03-11 20:24:59.813619305 -0500 1711+++ linux-2.6.32.10/arch/powerpc/include/asm/elf.h 2010-03-20 15:58:45.649479097 -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.9/arch/powerpc/include/asm/elf.h linux-2.6.32.9/arch/pow
1741 #endif /* __KERNEL__ */ 1741 #endif /* __KERNEL__ */
1742 1742
1743 /* 1743 /*
1744diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/iommu.h linux-2.6.32.9/arch/powerpc/include/asm/iommu.h 1744diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/iommu.h linux-2.6.32.10/arch/powerpc/include/asm/iommu.h
1745--- linux-2.6.32.9/arch/powerpc/include/asm/iommu.h 2010-02-23 10:38:51.000000000 -0500 1745--- linux-2.6.32.10/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
1746+++ linux-2.6.32.9/arch/powerpc/include/asm/iommu.h 2010-03-11 20:24:59.813619305 -0500 1746+++ linux-2.6.32.10/arch/powerpc/include/asm/iommu.h 2010-03-20 15:58:45.649479097 -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.9/arch/powerpc/include/asm/iommu.h linux-2.6.32.9/arch/p
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.9/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.9/arch/powerpc/include/asm/kmap_types.h 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
1758--- linux-2.6.32.9/arch/powerpc/include/asm/kmap_types.h 2010-02-23 10:38:51.000000000 -0500 1758--- linux-2.6.32.10/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
1759+++ linux-2.6.32.9/arch/powerpc/include/asm/kmap_types.h 2010-03-11 20:24:59.813619305 -0500 1759+++ linux-2.6.32.10/arch/powerpc/include/asm/kmap_types.h 2010-03-20 15:58:45.649479097 -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.9/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.9/a
1765 KM_TYPE_NR 1765 KM_TYPE_NR
1766 }; 1766 };
1767 1767
1768diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/page_64.h linux-2.6.32.9/arch/powerpc/include/asm/page_64.h 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
1769--- linux-2.6.32.9/arch/powerpc/include/asm/page_64.h 2010-02-23 10:38:51.000000000 -0500 1769--- linux-2.6.32.10/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400
1770+++ linux-2.6.32.9/arch/powerpc/include/asm/page_64.h 2010-03-11 20:24:59.813619305 -0500 1770+++ linux-2.6.32.10/arch/powerpc/include/asm/page_64.h 2010-03-20 15:58:45.649479097 -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.9/arch/powerpc/include/asm/page_64.h linux-2.6.32.9/arch
1789 1789
1790 #include <asm-generic/getorder.h> 1790 #include <asm-generic/getorder.h>
1791 1791
1792diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/page.h linux-2.6.32.9/arch/powerpc/include/asm/page.h 1792diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/page.h linux-2.6.32.10/arch/powerpc/include/asm/page.h
1793--- linux-2.6.32.9/arch/powerpc/include/asm/page.h 2010-02-23 10:38:51.000000000 -0500 1793--- linux-2.6.32.10/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
1794+++ linux-2.6.32.9/arch/powerpc/include/asm/page.h 2010-03-11 20:24:59.813619305 -0500 1794+++ linux-2.6.32.10/arch/powerpc/include/asm/page.h 2010-03-20 15:58:45.649479097 -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.9/arch/powerpc/include/asm/page.h linux-2.6.32.9/arch/po
1814 #ifndef __ASSEMBLY__ 1814 #ifndef __ASSEMBLY__
1815 1815
1816 #undef STRICT_MM_TYPECHECKS 1816 #undef STRICT_MM_TYPECHECKS
1817diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/pci.h linux-2.6.32.9/arch/powerpc/include/asm/pci.h 1817diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/pci.h linux-2.6.32.10/arch/powerpc/include/asm/pci.h
1818--- linux-2.6.32.9/arch/powerpc/include/asm/pci.h 2010-02-23 10:38:51.000000000 -0500 1818--- linux-2.6.32.10/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400
1819+++ linux-2.6.32.9/arch/powerpc/include/asm/pci.h 2010-03-11 20:24:59.813619305 -0500 1819+++ linux-2.6.32.10/arch/powerpc/include/asm/pci.h 2010-03-20 15:58:45.649479097 -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.9/arch/powerpc/include/asm/pci.h linux-2.6.32.9/arch/pow
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.9/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.9/arch/powerpc/include/asm/pte-hash32.h 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
1832--- linux-2.6.32.9/arch/powerpc/include/asm/pte-hash32.h 2010-02-23 10:38:51.000000000 -0500 1832--- linux-2.6.32.10/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400
1833+++ linux-2.6.32.9/arch/powerpc/include/asm/pte-hash32.h 2010-03-11 20:24:59.813619305 -0500 1833+++ linux-2.6.32.10/arch/powerpc/include/asm/pte-hash32.h 2010-03-20 15:58:45.649479097 -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.9/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.9/a
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.9/arch/powerpc/include/asm/reg.h linux-2.6.32.9/arch/powerpc/include/asm/reg.h 1842diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/reg.h linux-2.6.32.10/arch/powerpc/include/asm/reg.h
1843--- linux-2.6.32.9/arch/powerpc/include/asm/reg.h 2010-02-23 10:38:51.000000000 -0500 1843--- linux-2.6.32.10/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400
1844+++ linux-2.6.32.9/arch/powerpc/include/asm/reg.h 2010-03-11 20:24:59.813619305 -0500 1844+++ linux-2.6.32.10/arch/powerpc/include/asm/reg.h 2010-03-20 15:58:45.649479097 -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.9/arch/powerpc/include/asm/reg.h linux-2.6.32.9/arch/pow
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.9/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.9/arch/powerpc/include/asm/swiotlb.h 1853diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.10/arch/powerpc/include/asm/swiotlb.h
1854--- linux-2.6.32.9/arch/powerpc/include/asm/swiotlb.h 2010-02-23 10:38:51.000000000 -0500 1854--- linux-2.6.32.10/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400
1855+++ linux-2.6.32.9/arch/powerpc/include/asm/swiotlb.h 2010-03-11 20:24:59.813619305 -0500 1855+++ linux-2.6.32.10/arch/powerpc/include/asm/swiotlb.h 2010-03-20 15:58:45.649479097 -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.9/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.9/arch
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.9/arch/powerpc/include/asm/uaccess.h linux-2.6.32.9/arch/powerpc/include/asm/uaccess.h 1865diff -urNp linux-2.6.32.10/arch/powerpc/include/asm/uaccess.h linux-2.6.32.10/arch/powerpc/include/asm/uaccess.h
1866--- linux-2.6.32.9/arch/powerpc/include/asm/uaccess.h 2010-02-23 10:38:51.000000000 -0500 1866--- linux-2.6.32.10/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
1867+++ linux-2.6.32.9/arch/powerpc/include/asm/uaccess.h 2010-03-11 20:24:59.813619305 -0500 1867+++ linux-2.6.32.10/arch/powerpc/include/asm/uaccess.h 2010-03-20 15:58:45.649479097 -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.9/arch/powerpc/include/asm/uaccess.h linux-2.6.32.9/arch
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.9/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.9/arch/powerpc/kernel/cacheinfo.c 2036diff -urNp linux-2.6.32.10/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.10/arch/powerpc/kernel/cacheinfo.c
2037--- linux-2.6.32.9/arch/powerpc/kernel/cacheinfo.c 2010-02-23 10:38:51.000000000 -0500 2037--- linux-2.6.32.10/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400
2038+++ linux-2.6.32.9/arch/powerpc/kernel/cacheinfo.c 2010-03-11 20:24:59.813619305 -0500 2038+++ linux-2.6.32.10/arch/powerpc/kernel/cacheinfo.c 2010-03-20 15:58:45.649479097 -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.9/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.9/arch/po
2045 .show = cache_index_show, 2045 .show = cache_index_show,
2046 }; 2046 };
2047 2047
2048diff -urNp linux-2.6.32.9/arch/powerpc/kernel/dma.c linux-2.6.32.9/arch/powerpc/kernel/dma.c 2048diff -urNp linux-2.6.32.10/arch/powerpc/kernel/dma.c linux-2.6.32.10/arch/powerpc/kernel/dma.c
2049--- linux-2.6.32.9/arch/powerpc/kernel/dma.c 2010-02-23 10:38:51.000000000 -0500 2049--- linux-2.6.32.10/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400
2050+++ linux-2.6.32.9/arch/powerpc/kernel/dma.c 2010-03-11 20:24:59.813619305 -0500 2050+++ linux-2.6.32.10/arch/powerpc/kernel/dma.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/dma.c linux-2.6.32.9/arch/powerpc/
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.9/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.9/arch/powerpc/kernel/dma-iommu.c 2060diff -urNp linux-2.6.32.10/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.10/arch/powerpc/kernel/dma-iommu.c
2061--- linux-2.6.32.9/arch/powerpc/kernel/dma-iommu.c 2010-02-23 10:38:51.000000000 -0500 2061--- linux-2.6.32.10/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400
2062+++ linux-2.6.32.9/arch/powerpc/kernel/dma-iommu.c 2010-03-11 20:24:59.813619305 -0500 2062+++ linux-2.6.32.10/arch/powerpc/kernel/dma-iommu.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.9/arch/po
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.9/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.9/arch/powerpc/kernel/dma-swiotlb.c 2072diff -urNp linux-2.6.32.10/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.10/arch/powerpc/kernel/dma-swiotlb.c
2073--- linux-2.6.32.9/arch/powerpc/kernel/dma-swiotlb.c 2010-02-23 10:38:51.000000000 -0500 2073--- linux-2.6.32.10/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
2074+++ linux-2.6.32.9/arch/powerpc/kernel/dma-swiotlb.c 2010-03-11 20:24:59.813619305 -0500 2074+++ linux-2.6.32.10/arch/powerpc/kernel/dma-swiotlb.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.9/arch/
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.9/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.9/arch/powerpc/kernel/exceptions-64e.S 2084diff -urNp linux-2.6.32.10/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.10/arch/powerpc/kernel/exceptions-64e.S
2085--- linux-2.6.32.9/arch/powerpc/kernel/exceptions-64e.S 2010-02-23 10:38:51.000000000 -0500 2085--- linux-2.6.32.10/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400
2086+++ linux-2.6.32.9/arch/powerpc/kernel/exceptions-64e.S 2010-03-11 20:24:59.813619305 -0500 2086+++ linux-2.6.32.10/arch/powerpc/kernel/exceptions-64e.S 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.9/ar
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.9/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.9/arch/powerpc/kernel/exceptions-64s.S 2105diff -urNp linux-2.6.32.10/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.10/arch/powerpc/kernel/exceptions-64s.S
2106--- linux-2.6.32.9/arch/powerpc/kernel/exceptions-64s.S 2010-02-23 10:38:51.000000000 -0500 2106--- linux-2.6.32.10/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400
2107+++ linux-2.6.32.9/arch/powerpc/kernel/exceptions-64s.S 2010-03-11 20:24:59.813619305 -0500 2107+++ linux-2.6.32.10/arch/powerpc/kernel/exceptions-64s.S 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.9/ar
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.9/arch/powerpc/kernel/ibmebus.c linux-2.6.32.9/arch/powerpc/kernel/ibmebus.c 2120diff -urNp linux-2.6.32.10/arch/powerpc/kernel/ibmebus.c linux-2.6.32.10/arch/powerpc/kernel/ibmebus.c
2121--- linux-2.6.32.9/arch/powerpc/kernel/ibmebus.c 2010-02-23 10:38:51.000000000 -0500 2121--- linux-2.6.32.10/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400
2122+++ linux-2.6.32.9/arch/powerpc/kernel/ibmebus.c 2010-03-11 20:24:59.813619305 -0500 2122+++ linux-2.6.32.10/arch/powerpc/kernel/ibmebus.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/ibmebus.c linux-2.6.32.9/arch/powe
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.9/arch/powerpc/kernel/kgdb.c linux-2.6.32.9/arch/powerpc/kernel/kgdb.c 2132diff -urNp linux-2.6.32.10/arch/powerpc/kernel/kgdb.c linux-2.6.32.10/arch/powerpc/kernel/kgdb.c
2133--- linux-2.6.32.9/arch/powerpc/kernel/kgdb.c 2010-02-23 10:38:51.000000000 -0500 2133--- linux-2.6.32.10/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
2134+++ linux-2.6.32.9/arch/powerpc/kernel/kgdb.c 2010-03-11 20:24:59.813619305 -0500 2134+++ linux-2.6.32.10/arch/powerpc/kernel/kgdb.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/kgdb.c linux-2.6.32.9/arch/powerpc
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.9/arch/powerpc/kernel/module_32.c linux-2.6.32.9/arch/powerpc/kernel/module_32.c 2153diff -urNp linux-2.6.32.10/arch/powerpc/kernel/module_32.c linux-2.6.32.10/arch/powerpc/kernel/module_32.c
2154--- linux-2.6.32.9/arch/powerpc/kernel/module_32.c 2010-02-23 10:38:51.000000000 -0500 2154--- linux-2.6.32.10/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400
2155+++ linux-2.6.32.9/arch/powerpc/kernel/module_32.c 2010-03-11 20:24:59.813619305 -0500 2155+++ linux-2.6.32.10/arch/powerpc/kernel/module_32.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/module_32.c linux-2.6.32.9/arch/po
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.9/arch/powerpc/kernel/module.c linux-2.6.32.9/arch/powerpc/kernel/module.c 2185diff -urNp linux-2.6.32.10/arch/powerpc/kernel/module.c linux-2.6.32.10/arch/powerpc/kernel/module.c
2186--- linux-2.6.32.9/arch/powerpc/kernel/module.c 2010-02-23 10:38:51.000000000 -0500 2186--- linux-2.6.32.10/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
2187+++ linux-2.6.32.9/arch/powerpc/kernel/module.c 2010-03-11 20:24:59.813619305 -0500 2187+++ linux-2.6.32.10/arch/powerpc/kernel/module.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/module.c linux-2.6.32.9/arch/power
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.9/arch/powerpc/kernel/pci-common.c linux-2.6.32.9/arch/powerpc/kernel/pci-common.c 2227diff -urNp linux-2.6.32.10/arch/powerpc/kernel/pci-common.c linux-2.6.32.10/arch/powerpc/kernel/pci-common.c
2228--- linux-2.6.32.9/arch/powerpc/kernel/pci-common.c 2010-02-23 10:38:51.000000000 -0500 2228--- linux-2.6.32.10/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400
2229+++ linux-2.6.32.9/arch/powerpc/kernel/pci-common.c 2010-03-11 20:24:59.813619305 -0500 2229+++ linux-2.6.32.10/arch/powerpc/kernel/pci-common.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/pci-common.c linux-2.6.32.9/arch/p
2245 { 2245 {
2246 return pci_dma_ops; 2246 return pci_dma_ops;
2247 } 2247 }
2248diff -urNp linux-2.6.32.9/arch/powerpc/kernel/process.c linux-2.6.32.9/arch/powerpc/kernel/process.c 2248diff -urNp linux-2.6.32.10/arch/powerpc/kernel/process.c linux-2.6.32.10/arch/powerpc/kernel/process.c
2249--- linux-2.6.32.9/arch/powerpc/kernel/process.c 2010-02-23 10:38:51.000000000 -0500 2249--- linux-2.6.32.10/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
2250+++ linux-2.6.32.9/arch/powerpc/kernel/process.c 2010-03-11 20:24:59.813619305 -0500 2250+++ linux-2.6.32.10/arch/powerpc/kernel/process.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/process.c linux-2.6.32.9/arch/powe
2300- 2300-
2301- return ret; 2301- return ret;
2302-} 2302-}
2303diff -urNp linux-2.6.32.9/arch/powerpc/kernel/signal_32.c linux-2.6.32.9/arch/powerpc/kernel/signal_32.c 2303diff -urNp linux-2.6.32.10/arch/powerpc/kernel/signal_32.c linux-2.6.32.10/arch/powerpc/kernel/signal_32.c
2304--- linux-2.6.32.9/arch/powerpc/kernel/signal_32.c 2010-02-23 10:38:51.000000000 -0500 2304--- linux-2.6.32.10/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400
2305+++ linux-2.6.32.9/arch/powerpc/kernel/signal_32.c 2010-03-11 20:24:59.813619305 -0500 2305+++ linux-2.6.32.10/arch/powerpc/kernel/signal_32.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/signal_32.c linux-2.6.32.9/arch/po
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.9/arch/powerpc/kernel/signal_64.c linux-2.6.32.9/arch/powerpc/kernel/signal_64.c 2315diff -urNp linux-2.6.32.10/arch/powerpc/kernel/signal_64.c linux-2.6.32.10/arch/powerpc/kernel/signal_64.c
2316--- linux-2.6.32.9/arch/powerpc/kernel/signal_64.c 2010-02-23 10:38:51.000000000 -0500 2316--- linux-2.6.32.10/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400
2317+++ linux-2.6.32.9/arch/powerpc/kernel/signal_64.c 2010-03-11 20:24:59.813619305 -0500 2317+++ linux-2.6.32.10/arch/powerpc/kernel/signal_64.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/signal_64.c linux-2.6.32.9/arch/po
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.9/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.9/arch/powerpc/kernel/sys_ppc32.c 2327diff -urNp linux-2.6.32.10/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.10/arch/powerpc/kernel/sys_ppc32.c
2328--- linux-2.6.32.9/arch/powerpc/kernel/sys_ppc32.c 2010-02-23 10:38:51.000000000 -0500 2328--- linux-2.6.32.10/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400
2329+++ linux-2.6.32.9/arch/powerpc/kernel/sys_ppc32.c 2010-03-11 20:24:59.817594589 -0500 2329+++ linux-2.6.32.10/arch/powerpc/kernel/sys_ppc32.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.9/arch/po
2340 } 2340 }
2341 return error; 2341 return error;
2342 } 2342 }
2343diff -urNp linux-2.6.32.9/arch/powerpc/kernel/vdso.c linux-2.6.32.9/arch/powerpc/kernel/vdso.c 2343diff -urNp linux-2.6.32.10/arch/powerpc/kernel/vdso.c linux-2.6.32.10/arch/powerpc/kernel/vdso.c
2344--- linux-2.6.32.9/arch/powerpc/kernel/vdso.c 2010-02-23 10:38:51.000000000 -0500 2344--- linux-2.6.32.10/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400
2345+++ linux-2.6.32.9/arch/powerpc/kernel/vdso.c 2010-03-11 20:24:59.817594589 -0500 2345+++ linux-2.6.32.10/arch/powerpc/kernel/vdso.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/vdso.c linux-2.6.32.9/arch/powerpc
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.9/arch/powerpc/kernel/vio.c linux-2.6.32.9/arch/powerpc/kernel/vio.c 2372diff -urNp linux-2.6.32.10/arch/powerpc/kernel/vio.c linux-2.6.32.10/arch/powerpc/kernel/vio.c
2373--- linux-2.6.32.9/arch/powerpc/kernel/vio.c 2010-02-23 10:38:51.000000000 -0500 2373--- linux-2.6.32.10/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400
2374+++ linux-2.6.32.9/arch/powerpc/kernel/vio.c 2010-03-11 20:24:59.817594589 -0500 2374+++ linux-2.6.32.10/arch/powerpc/kernel/vio.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/kernel/vio.c linux-2.6.32.9/arch/powerpc/
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.9/arch/powerpc/lib/usercopy_64.c linux-2.6.32.9/arch/powerpc/lib/usercopy_64.c 2397diff -urNp linux-2.6.32.10/arch/powerpc/lib/usercopy_64.c linux-2.6.32.10/arch/powerpc/lib/usercopy_64.c
2398--- linux-2.6.32.9/arch/powerpc/lib/usercopy_64.c 2010-02-23 10:38:51.000000000 -0500 2398--- linux-2.6.32.10/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400
2399+++ linux-2.6.32.9/arch/powerpc/lib/usercopy_64.c 2010-03-11 20:24:59.817594589 -0500 2399+++ linux-2.6.32.10/arch/powerpc/lib/usercopy_64.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/lib/usercopy_64.c linux-2.6.32.9/arch/pow
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.9/arch/powerpc/mm/fault.c linux-2.6.32.9/arch/powerpc/mm/fault.c 2431diff -urNp linux-2.6.32.10/arch/powerpc/mm/fault.c linux-2.6.32.10/arch/powerpc/mm/fault.c
2432--- linux-2.6.32.9/arch/powerpc/mm/fault.c 2010-02-23 10:38:51.000000000 -0500 2432--- linux-2.6.32.10/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
2433+++ linux-2.6.32.9/arch/powerpc/mm/fault.c 2010-03-11 20:24:59.817594589 -0500 2433+++ linux-2.6.32.10/arch/powerpc/mm/fault.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/mm/fault.c linux-2.6.32.9/arch/powerpc/mm
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.9/arch/powerpc/mm/mmap_64.c linux-2.6.32.9/arch/powerpc/mm/mmap_64.c 2538diff -urNp linux-2.6.32.10/arch/powerpc/mm/mmap_64.c linux-2.6.32.10/arch/powerpc/mm/mmap_64.c
2539--- linux-2.6.32.9/arch/powerpc/mm/mmap_64.c 2010-02-23 10:38:51.000000000 -0500 2539--- linux-2.6.32.10/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400
2540+++ linux-2.6.32.9/arch/powerpc/mm/mmap_64.c 2010-03-11 20:24:59.817594589 -0500 2540+++ linux-2.6.32.10/arch/powerpc/mm/mmap_64.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/mm/mmap_64.c linux-2.6.32.9/arch/powerpc/
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.9/arch/powerpc/mm/slice.c linux-2.6.32.9/arch/powerpc/mm/slice.c 2564diff -urNp linux-2.6.32.10/arch/powerpc/mm/slice.c linux-2.6.32.10/arch/powerpc/mm/slice.c
2565--- linux-2.6.32.9/arch/powerpc/mm/slice.c 2010-02-23 10:38:51.000000000 -0500 2565--- linux-2.6.32.10/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400
2566+++ linux-2.6.32.9/arch/powerpc/mm/slice.c 2010-03-11 20:24:59.817594589 -0500 2566+++ linux-2.6.32.10/arch/powerpc/mm/slice.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/mm/slice.c linux-2.6.32.9/arch/powerpc/mm
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.9/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.9/arch/powerpc/platforms/52xx/lite5200_pm.c 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
2580--- linux-2.6.32.9/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-02-23 10:38:51.000000000 -0500 2580--- linux-2.6.32.10/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400
2581+++ linux-2.6.32.9/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-11 20:24:59.817594589 -0500 2581+++ linux-2.6.32.10/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32
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.9/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.9/arch/powerpc/platforms/52xx/mpc52xx_pm.c 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
2592--- linux-2.6.32.9/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-02-23 10:38:51.000000000 -0500 2592--- linux-2.6.32.10/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400
2593+++ linux-2.6.32.9/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-11 20:24:59.824754350 -0500 2593+++ linux-2.6.32.10/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-20 15:58:45.653481097 -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.9/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.9/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.9/arch/powerpc/platforms/83xx/suspend.c 2603diff -urNp linux-2.6.32.10/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.10/arch/powerpc/platforms/83xx/suspend.c
2604--- linux-2.6.32.9/arch/powerpc/platforms/83xx/suspend.c 2010-02-23 10:38:51.000000000 -0500 2604--- linux-2.6.32.10/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400
2605+++ linux-2.6.32.9/arch/powerpc/platforms/83xx/suspend.c 2010-03-11 20:24:59.824754350 -0500 2605+++ linux-2.6.32.10/arch/powerpc/platforms/83xx/suspend.c 2010-03-20 15:58:45.653481097 -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.9/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.9/a
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.9/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.9/arch/powerpc/platforms/cell/iommu.c 2615diff -urNp linux-2.6.32.10/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.10/arch/powerpc/platforms/cell/iommu.c
2616--- linux-2.6.32.9/arch/powerpc/platforms/cell/iommu.c 2010-02-23 10:38:51.000000000 -0500 2616--- linux-2.6.32.10/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400
2617+++ linux-2.6.32.9/arch/powerpc/platforms/cell/iommu.c 2010-03-11 20:24:59.824754350 -0500 2617+++ linux-2.6.32.10/arch/powerpc/platforms/cell/iommu.c 2010-03-20 15:58:45.657383148 -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.9/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.9/arc
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.9/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.9/arch/powerpc/platforms/ps3/system-bus.c 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
2628--- linux-2.6.32.9/arch/powerpc/platforms/ps3/system-bus.c 2010-02-23 10:38:51.000000000 -0500 2628--- linux-2.6.32.10/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400
2629+++ linux-2.6.32.9/arch/powerpc/platforms/ps3/system-bus.c 2010-03-11 20:24:59.824754350 -0500 2629+++ linux-2.6.32.10/arch/powerpc/platforms/ps3/system-bus.c 2010-03-20 15:58:45.657383148 -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.9/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.9
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.9/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.9/arch/powerpc/platforms/pseries/Kconfig 2648diff -urNp linux-2.6.32.10/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.10/arch/powerpc/platforms/pseries/Kconfig
2649--- linux-2.6.32.9/arch/powerpc/platforms/pseries/Kconfig 2010-02-23 10:38:51.000000000 -0500 2649--- linux-2.6.32.10/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400
2650+++ linux-2.6.32.9/arch/powerpc/platforms/pseries/Kconfig 2010-03-11 20:24:59.824754350 -0500 2650+++ linux-2.6.32.10/arch/powerpc/platforms/pseries/Kconfig 2010-03-20 15:58:45.657383148 -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.9/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.9/
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.9/arch/s390/include/asm/elf.h linux-2.6.32.9/arch/s390/include/asm/elf.h 2660diff -urNp linux-2.6.32.10/arch/s390/include/asm/elf.h linux-2.6.32.10/arch/s390/include/asm/elf.h
2661--- linux-2.6.32.9/arch/s390/include/asm/elf.h 2010-02-23 10:38:51.000000000 -0500 2661--- linux-2.6.32.10/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
2662+++ linux-2.6.32.9/arch/s390/include/asm/elf.h 2010-03-11 20:24:59.824754350 -0500 2662+++ linux-2.6.32.10/arch/s390/include/asm/elf.h 2010-03-20 15:58:45.657383148 -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.9/arch/s390/include/asm/elf.h linux-2.6.32.9/arch/s390/i
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.9/arch/s390/include/asm/setup.h linux-2.6.32.9/arch/s390/include/asm/setup.h 2677diff -urNp linux-2.6.32.10/arch/s390/include/asm/setup.h linux-2.6.32.10/arch/s390/include/asm/setup.h
2678--- linux-2.6.32.9/arch/s390/include/asm/setup.h 2010-02-23 10:38:51.000000000 -0500 2678--- linux-2.6.32.10/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400
2679+++ linux-2.6.32.9/arch/s390/include/asm/setup.h 2010-03-11 20:24:59.825622071 -0500 2679+++ linux-2.6.32.10/arch/s390/include/asm/setup.h 2010-03-20 15:58:45.657383148 -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.9/arch/s390/include/asm/setup.h linux-2.6.32.9/arch/s390
2693 #else 2693 #else
2694 #define s390_noexec (0) 2694 #define s390_noexec (0)
2695 #endif 2695 #endif
2696diff -urNp linux-2.6.32.9/arch/s390/include/asm/uaccess.h linux-2.6.32.9/arch/s390/include/asm/uaccess.h 2696diff -urNp linux-2.6.32.10/arch/s390/include/asm/uaccess.h linux-2.6.32.10/arch/s390/include/asm/uaccess.h
2697--- linux-2.6.32.9/arch/s390/include/asm/uaccess.h 2010-02-23 10:38:51.000000000 -0500 2697--- linux-2.6.32.10/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
2698+++ linux-2.6.32.9/arch/s390/include/asm/uaccess.h 2010-03-11 20:24:59.825622071 -0500 2698+++ linux-2.6.32.10/arch/s390/include/asm/uaccess.h 2010-03-20 15:58:45.657383148 -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.9/arch/s390/include/asm/uaccess.h linux-2.6.32.9/arch/s3
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.9/arch/s390/Kconfig linux-2.6.32.9/arch/s390/Kconfig 2731diff -urNp linux-2.6.32.10/arch/s390/Kconfig linux-2.6.32.10/arch/s390/Kconfig
2732--- linux-2.6.32.9/arch/s390/Kconfig 2010-02-23 10:38:51.000000000 -0500 2732--- linux-2.6.32.10/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400
2733+++ linux-2.6.32.9/arch/s390/Kconfig 2010-03-11 20:24:59.825622071 -0500 2733+++ linux-2.6.32.10/arch/s390/Kconfig 2010-03-20 15:58:45.657383148 -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.9/arch/s390/Kconfig linux-2.6.32.9/arch/s390/Kconfig
2768 2768
2769 comment "Code generation options" 2769 comment "Code generation options"
2770 2770
2771diff -urNp linux-2.6.32.9/arch/s390/kernel/module.c linux-2.6.32.9/arch/s390/kernel/module.c 2771diff -urNp linux-2.6.32.10/arch/s390/kernel/module.c linux-2.6.32.10/arch/s390/kernel/module.c
2772--- linux-2.6.32.9/arch/s390/kernel/module.c 2010-02-23 10:38:51.000000000 -0500 2772--- linux-2.6.32.10/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
2773+++ linux-2.6.32.9/arch/s390/kernel/module.c 2010-03-11 20:24:59.825622071 -0500 2773+++ linux-2.6.32.10/arch/s390/kernel/module.c 2010-03-20 15:58:45.657383148 -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.9/arch/s390/kernel/module.c linux-2.6.32.9/arch/s390/ker
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.9/arch/s390/kernel/setup.c linux-2.6.32.9/arch/s390/kernel/setup.c 2845diff -urNp linux-2.6.32.10/arch/s390/kernel/setup.c linux-2.6.32.10/arch/s390/kernel/setup.c
2846--- linux-2.6.32.9/arch/s390/kernel/setup.c 2010-02-23 10:38:51.000000000 -0500 2846--- linux-2.6.32.10/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
2847+++ linux-2.6.32.9/arch/s390/kernel/setup.c 2010-03-11 20:24:59.825622071 -0500 2847+++ linux-2.6.32.10/arch/s390/kernel/setup.c 2010-03-20 15:58:45.657383148 -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.9/arch/s390/kernel/setup.c linux-2.6.32.9/arch/s390/kern
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.9/arch/s390/mm/mmap.c linux-2.6.32.9/arch/s390/mm/mmap.c 2901diff -urNp linux-2.6.32.10/arch/s390/mm/mmap.c linux-2.6.32.10/arch/s390/mm/mmap.c
2902--- linux-2.6.32.9/arch/s390/mm/mmap.c 2010-02-23 10:38:51.000000000 -0500 2902--- linux-2.6.32.10/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
2903+++ linux-2.6.32.9/arch/s390/mm/mmap.c 2010-03-11 20:24:59.825622071 -0500 2903+++ linux-2.6.32.10/arch/s390/mm/mmap.c 2010-03-20 15:58:45.657383148 -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.9/arch/s390/mm/mmap.c linux-2.6.32.9/arch/s390/mm/mmap.c
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.9/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.9/arch/sh/boards/mach-hp6xx/pm.c 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
2951--- linux-2.6.32.9/arch/sh/boards/mach-hp6xx/pm.c 2010-02-23 10:38:51.000000000 -0500 2951--- linux-2.6.32.10/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400
2952+++ linux-2.6.32.9/arch/sh/boards/mach-hp6xx/pm.c 2010-03-11 20:24:59.825622071 -0500 2952+++ linux-2.6.32.10/arch/sh/boards/mach-hp6xx/pm.c 2010-03-20 15:58:45.666359473 -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.9/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.9/arch/sh/
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.9/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.9/arch/sh/kernel/cpu/sh4/sq.c 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
2963--- linux-2.6.32.9/arch/sh/kernel/cpu/sh4/sq.c 2010-02-23 10:38:51.000000000 -0500 2963--- linux-2.6.32.10/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400
2964+++ linux-2.6.32.9/arch/sh/kernel/cpu/sh4/sq.c 2010-03-11 20:24:59.825622071 -0500 2964+++ linux-2.6.32.10/arch/sh/kernel/cpu/sh4/sq.c 2010-03-20 15:58:45.666359473 -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.9/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.9/arch/sh/ker
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.9/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.9/arch/sh/kernel/cpu/shmobile/pm.c 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
2975--- linux-2.6.32.9/arch/sh/kernel/cpu/shmobile/pm.c 2010-02-23 10:38:51.000000000 -0500 2975--- linux-2.6.32.10/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400
2976+++ linux-2.6.32.9/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-11 20:24:59.825622071 -0500 2976+++ linux-2.6.32.10/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-20 15:58:45.666359473 -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.9/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.9/arch/s
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.9/arch/sh/kernel/kgdb.c linux-2.6.32.9/arch/sh/kernel/kgdb.c 2986diff -urNp linux-2.6.32.10/arch/sh/kernel/kgdb.c linux-2.6.32.10/arch/sh/kernel/kgdb.c
2987--- linux-2.6.32.9/arch/sh/kernel/kgdb.c 2010-02-23 10:38:51.000000000 -0500 2987--- linux-2.6.32.10/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
2988+++ linux-2.6.32.9/arch/sh/kernel/kgdb.c 2010-03-11 20:24:59.825622071 -0500 2988+++ linux-2.6.32.10/arch/sh/kernel/kgdb.c 2010-03-20 15:58:45.666359473 -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.9/arch/sh/kernel/kgdb.c linux-2.6.32.9/arch/sh/kernel/kg
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.9/arch/sparc/include/asm/atomic_64.h linux-2.6.32.9/arch/sparc/include/asm/atomic_64.h 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
2999--- linux-2.6.32.9/arch/sparc/include/asm/atomic_64.h 2010-02-23 10:38:51.000000000 -0500 2999--- linux-2.6.32.10/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
3000+++ linux-2.6.32.9/arch/sparc/include/asm/atomic_64.h 2010-03-11 20:24:59.825622071 -0500 3000+++ linux-2.6.32.10/arch/sparc/include/asm/atomic_64.h 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/include/asm/atomic_64.h linux-2.6.32.9/arch
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.9/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.9/arch/sparc/include/asm/dma-mapping.h 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
3131--- linux-2.6.32.9/arch/sparc/include/asm/dma-mapping.h 2010-02-23 10:38:51.000000000 -0500 3131--- linux-2.6.32.10/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
3132+++ linux-2.6.32.9/arch/sparc/include/asm/dma-mapping.h 2010-03-11 20:24:59.825622071 -0500 3132+++ linux-2.6.32.10/arch/sparc/include/asm/dma-mapping.h 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.9/ar
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.9/arch/sparc/include/asm/elf_32.h linux-2.6.32.9/arch/sparc/include/asm/elf_32.h 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
3165--- linux-2.6.32.9/arch/sparc/include/asm/elf_32.h 2010-02-23 10:38:51.000000000 -0500 3165--- linux-2.6.32.10/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400
3166+++ linux-2.6.32.9/arch/sparc/include/asm/elf_32.h 2010-03-11 20:24:59.825622071 -0500 3166+++ linux-2.6.32.10/arch/sparc/include/asm/elf_32.h 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/include/asm/elf_32.h linux-2.6.32.9/arch/sp
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.9/arch/sparc/include/asm/elf_64.h linux-2.6.32.9/arch/sparc/include/asm/elf_64.h 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
3182--- linux-2.6.32.9/arch/sparc/include/asm/elf_64.h 2010-02-23 10:38:51.000000000 -0500 3182--- linux-2.6.32.10/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400
3183+++ linux-2.6.32.9/arch/sparc/include/asm/elf_64.h 2010-03-11 20:24:59.825622071 -0500 3183+++ linux-2.6.32.10/arch/sparc/include/asm/elf_64.h 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/include/asm/elf_64.h linux-2.6.32.9/arch/sp
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.9/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.9/arch/sparc/include/asm/pgtable_32.h 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
3198--- linux-2.6.32.9/arch/sparc/include/asm/pgtable_32.h 2010-02-23 10:38:51.000000000 -0500 3198--- linux-2.6.32.10/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
3199+++ linux-2.6.32.9/arch/sparc/include/asm/pgtable_32.h 2010-03-11 20:24:59.825622071 -0500 3199+++ linux-2.6.32.10/arch/sparc/include/asm/pgtable_32.h 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.9/arc
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.9/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.9/arch/sparc/include/asm/pgtsrmmu.h 3231diff -urNp linux-2.6.32.10/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.10/arch/sparc/include/asm/pgtsrmmu.h
3232--- linux-2.6.32.9/arch/sparc/include/asm/pgtsrmmu.h 2010-02-23 10:38:51.000000000 -0500 3232--- linux-2.6.32.10/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400
3233+++ linux-2.6.32.9/arch/sparc/include/asm/pgtsrmmu.h 2010-03-11 20:24:59.825622071 -0500 3233+++ linux-2.6.32.10/arch/sparc/include/asm/pgtsrmmu.h 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.9/arch/
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.9/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.9/arch/sparc/include/asm/spinlock_64.h 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
3249--- linux-2.6.32.9/arch/sparc/include/asm/spinlock_64.h 2010-02-23 10:38:51.000000000 -0500 3249--- linux-2.6.32.10/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400
3250+++ linux-2.6.32.9/arch/sparc/include/asm/spinlock_64.h 2010-03-11 20:24:59.829342654 -0500 3250+++ linux-2.6.32.10/arch/sparc/include/asm/spinlock_64.h 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.9/ar
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.9/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.9/arch/sparc/include/asm/uaccess_32.h 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
3303--- linux-2.6.32.9/arch/sparc/include/asm/uaccess_32.h 2010-02-23 10:38:51.000000000 -0500 3303--- linux-2.6.32.10/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
3304+++ linux-2.6.32.9/arch/sparc/include/asm/uaccess_32.h 2010-03-11 20:24:59.829342654 -0500 3304+++ linux-2.6.32.10/arch/sparc/include/asm/uaccess_32.h 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.9/arc
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.9/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.9/arch/sparc/include/asm/uaccess_64.h 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
3357--- linux-2.6.32.9/arch/sparc/include/asm/uaccess_64.h 2010-02-23 10:38:51.000000000 -0500 3357--- linux-2.6.32.10/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
3358+++ linux-2.6.32.9/arch/sparc/include/asm/uaccess_64.h 2010-03-11 20:24:59.829342654 -0500 3358+++ linux-2.6.32.10/arch/sparc/include/asm/uaccess_64.h 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.9/arc
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.9/arch/sparc/kernel/iommu.c linux-2.6.32.9/arch/sparc/kernel/iommu.c 3409diff -urNp linux-2.6.32.10/arch/sparc/kernel/iommu.c linux-2.6.32.10/arch/sparc/kernel/iommu.c
3410--- linux-2.6.32.9/arch/sparc/kernel/iommu.c 2010-02-23 10:38:51.000000000 -0500 3410--- linux-2.6.32.10/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400
3411+++ linux-2.6.32.9/arch/sparc/kernel/iommu.c 2010-03-11 20:24:59.829342654 -0500 3411+++ linux-2.6.32.10/arch/sparc/kernel/iommu.c 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/kernel/iommu.c linux-2.6.32.9/arch/sparc/ke
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.9/arch/sparc/kernel/ioport.c linux-2.6.32.9/arch/sparc/kernel/ioport.c 3430diff -urNp linux-2.6.32.10/arch/sparc/kernel/ioport.c linux-2.6.32.10/arch/sparc/kernel/ioport.c
3431--- linux-2.6.32.9/arch/sparc/kernel/ioport.c 2010-02-23 10:38:51.000000000 -0500 3431--- linux-2.6.32.10/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
3432+++ linux-2.6.32.9/arch/sparc/kernel/ioport.c 2010-03-11 20:24:59.829342654 -0500 3432+++ linux-2.6.32.10/arch/sparc/kernel/ioport.c 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/kernel/ioport.c linux-2.6.32.9/arch/sparc/k
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.9/arch/sparc/kernel/kgdb_32.c linux-2.6.32.9/arch/sparc/kernel/kgdb_32.c 3460diff -urNp linux-2.6.32.10/arch/sparc/kernel/kgdb_32.c linux-2.6.32.10/arch/sparc/kernel/kgdb_32.c
3461--- linux-2.6.32.9/arch/sparc/kernel/kgdb_32.c 2010-02-23 10:38:51.000000000 -0500 3461--- linux-2.6.32.10/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400
3462+++ linux-2.6.32.9/arch/sparc/kernel/kgdb_32.c 2010-03-11 20:24:59.829342654 -0500 3462+++ linux-2.6.32.10/arch/sparc/kernel/kgdb_32.c 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/kernel/kgdb_32.c linux-2.6.32.9/arch/sparc/
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.9/arch/sparc/kernel/kgdb_64.c linux-2.6.32.9/arch/sparc/kernel/kgdb_64.c 3472diff -urNp linux-2.6.32.10/arch/sparc/kernel/kgdb_64.c linux-2.6.32.10/arch/sparc/kernel/kgdb_64.c
3473--- linux-2.6.32.9/arch/sparc/kernel/kgdb_64.c 2010-02-23 10:38:51.000000000 -0500 3473--- linux-2.6.32.10/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400
3474+++ linux-2.6.32.9/arch/sparc/kernel/kgdb_64.c 2010-03-11 20:24:59.829342654 -0500 3474+++ linux-2.6.32.10/arch/sparc/kernel/kgdb_64.c 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/kernel/kgdb_64.c linux-2.6.32.9/arch/sparc/
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.9/arch/sparc/kernel/Makefile linux-2.6.32.9/arch/sparc/kernel/Makefile 3484diff -urNp linux-2.6.32.10/arch/sparc/kernel/Makefile linux-2.6.32.10/arch/sparc/kernel/Makefile
3485--- linux-2.6.32.9/arch/sparc/kernel/Makefile 2010-02-23 10:38:51.000000000 -0500 3485--- linux-2.6.32.10/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400
3486+++ linux-2.6.32.9/arch/sparc/kernel/Makefile 2010-03-11 20:24:59.829342654 -0500 3486+++ linux-2.6.32.10/arch/sparc/kernel/Makefile 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/kernel/Makefile linux-2.6.32.9/arch/sparc/k
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.9/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.9/arch/sparc/kernel/pci_sun4v.c 3496diff -urNp linux-2.6.32.10/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.10/arch/sparc/kernel/pci_sun4v.c
3497--- linux-2.6.32.9/arch/sparc/kernel/pci_sun4v.c 2010-02-23 10:38:51.000000000 -0500 3497--- linux-2.6.32.10/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400
3498+++ linux-2.6.32.9/arch/sparc/kernel/pci_sun4v.c 2010-03-11 20:24:59.829342654 -0500 3498+++ linux-2.6.32.10/arch/sparc/kernel/pci_sun4v.c 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.9/arch/spar
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.9/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.9/arch/sparc/kernel/sys_sparc_32.c 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
3509--- linux-2.6.32.9/arch/sparc/kernel/sys_sparc_32.c 2010-02-23 10:38:51.000000000 -0500 3509--- linux-2.6.32.10/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400
3510+++ linux-2.6.32.9/arch/sparc/kernel/sys_sparc_32.c 2010-03-11 20:24:59.829342654 -0500 3510+++ linux-2.6.32.10/arch/sparc/kernel/sys_sparc_32.c 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.9/arch/s
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.9/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.9/arch/sparc/kernel/sys_sparc_64.c 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
3521--- linux-2.6.32.9/arch/sparc/kernel/sys_sparc_64.c 2010-02-23 10:38:51.000000000 -0500 3521--- linux-2.6.32.10/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400
3522+++ linux-2.6.32.9/arch/sparc/kernel/sys_sparc_64.c 2010-03-11 20:24:59.829342654 -0500 3522+++ linux-2.6.32.10/arch/sparc/kernel/sys_sparc_64.c 2010-03-20 15:58:45.666359473 -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.9/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.9/arch/s
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.9/arch/sparc/kernel/traps_64.c linux-2.6.32.9/arch/sparc/kernel/traps_64.c 3601diff -urNp linux-2.6.32.10/arch/sparc/kernel/traps_64.c linux-2.6.32.10/arch/sparc/kernel/traps_64.c
3602--- linux-2.6.32.9/arch/sparc/kernel/traps_64.c 2010-02-23 10:38:51.000000000 -0500 3602--- linux-2.6.32.10/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400
3603+++ linux-2.6.32.9/arch/sparc/kernel/traps_64.c 2010-03-11 20:24:59.829342654 -0500 3603+++ linux-2.6.32.10/arch/sparc/kernel/traps_64.c 2010-03-20 15:58:45.669974524 -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,27 +3632,9 @@ diff -urNp linux-2.6.32.9/arch/sparc/kernel/traps_64.c linux-2.6.32.9/arch/sparc
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.9/arch/sparc/kernel/tsb.S linux-2.6.32.9/arch/sparc/kernel/tsb.S 3635diff -urNp linux-2.6.32.10/arch/sparc/lib/atomic_64.S linux-2.6.32.10/arch/sparc/lib/atomic_64.S
3636--- linux-2.6.32.9/arch/sparc/kernel/tsb.S 2010-02-23 10:38:51.000000000 -0500 3636--- linux-2.6.32.10/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400
3637+++ linux-2.6.32.9/arch/sparc/kernel/tsb.S 2010-03-11 20:24:59.829342654 -0500 3637+++ linux-2.6.32.10/arch/sparc/lib/atomic_64.S 2010-03-20 15:58:46.916553763 -0400
3638@@ -191,10 +191,12 @@ tsb_dtlb_load:
3639
3640 tsb_itlb_load:
3641 /* Executable bit must be set. */
3642-661: andcc %g5, _PAGE_EXEC_4U, %g0
3643- .section .sun4v_1insn_patch, "ax"
3644+661: sethi %hi(_PAGE_EXEC_4U), %g4
3645+ andcc %g5, %g4, %g0
3646+ .section .sun4v_2insn_patch, "ax"
3647 .word 661b
3648 andcc %g5, _PAGE_EXEC_4V, %g0
3649+ nop
3650 .previous
3651
3652 be,pn %xcc, tsb_do_fault
3653diff -urNp linux-2.6.32.9/arch/sparc/lib/atomic_64.S linux-2.6.32.9/arch/sparc/lib/atomic_64.S
3654--- linux-2.6.32.9/arch/sparc/lib/atomic_64.S 2010-02-23 10:38:51.000000000 -0500
3655+++ linux-2.6.32.9/arch/sparc/lib/atomic_64.S 2010-03-11 20:24:59.829342654 -0500
3656@@ -18,7 +18,12 @@ 3638@@ -18,7 +18,12 @@
3657 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ 3639 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
3658 BACKOFF_SETUP(%o2) 3640 BACKOFF_SETUP(%o2)
@@ -3846,9 +3828,9 @@ diff -urNp linux-2.6.32.9/arch/sparc/lib/atomic_64.S linux-2.6.32.9/arch/sparc/l
3846 casx [%o1], %g1, %g7 3828 casx [%o1], %g1, %g7
3847 cmp %g1, %g7 3829 cmp %g1, %g7
3848 bne,pn %xcc, 2f 3830 bne,pn %xcc, 2f
3849diff -urNp linux-2.6.32.9/arch/sparc/lib/ksyms.c linux-2.6.32.9/arch/sparc/lib/ksyms.c 3831diff -urNp linux-2.6.32.10/arch/sparc/lib/ksyms.c linux-2.6.32.10/arch/sparc/lib/ksyms.c
3850--- linux-2.6.32.9/arch/sparc/lib/ksyms.c 2010-02-23 10:38:51.000000000 -0500 3832--- linux-2.6.32.10/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400
3851+++ linux-2.6.32.9/arch/sparc/lib/ksyms.c 2010-03-11 20:24:59.829342654 -0500 3833+++ linux-2.6.32.10/arch/sparc/lib/ksyms.c 2010-03-20 15:58:46.916553763 -0400
3852@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write); 3834@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write);
3853 3835
3854 /* Atomic counter implementation. */ 3836 /* Atomic counter implementation. */
@@ -3860,9 +3842,9 @@ diff -urNp linux-2.6.32.9/arch/sparc/lib/ksyms.c linux-2.6.32.9/arch/sparc/lib/k
3860 EXPORT_SYMBOL(atomic_sub_ret); 3842 EXPORT_SYMBOL(atomic_sub_ret);
3861 EXPORT_SYMBOL(atomic64_add); 3843 EXPORT_SYMBOL(atomic64_add);
3862 EXPORT_SYMBOL(atomic64_add_ret); 3844 EXPORT_SYMBOL(atomic64_add_ret);
3863diff -urNp linux-2.6.32.9/arch/sparc/lib/rwsem_64.S linux-2.6.32.9/arch/sparc/lib/rwsem_64.S 3845diff -urNp linux-2.6.32.10/arch/sparc/lib/rwsem_64.S linux-2.6.32.10/arch/sparc/lib/rwsem_64.S
3864--- linux-2.6.32.9/arch/sparc/lib/rwsem_64.S 2010-02-23 10:38:51.000000000 -0500 3846--- linux-2.6.32.10/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400
3865+++ linux-2.6.32.9/arch/sparc/lib/rwsem_64.S 2010-03-11 20:24:59.829342654 -0500 3847+++ linux-2.6.32.10/arch/sparc/lib/rwsem_64.S 2010-03-20 15:58:46.916553763 -0400
3866@@ -11,7 +11,12 @@ 3848@@ -11,7 +11,12 @@
3867 .globl __down_read 3849 .globl __down_read
3868 __down_read: 3850 __down_read:
@@ -3961,9 +3943,9 @@ diff -urNp linux-2.6.32.9/arch/sparc/lib/rwsem_64.S linux-2.6.32.9/arch/sparc/li
3961 cas [%o0], %g3, %g7 3943 cas [%o0], %g3, %g7
3962 cmp %g3, %g7 3944 cmp %g3, %g7
3963 bne,pn %icc, 1b 3945 bne,pn %icc, 1b
3964diff -urNp linux-2.6.32.9/arch/sparc/Makefile linux-2.6.32.9/arch/sparc/Makefile 3946diff -urNp linux-2.6.32.10/arch/sparc/Makefile linux-2.6.32.10/arch/sparc/Makefile
3965--- linux-2.6.32.9/arch/sparc/Makefile 2010-02-23 10:38:51.000000000 -0500 3947--- linux-2.6.32.10/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400
3966+++ linux-2.6.32.9/arch/sparc/Makefile 2010-03-11 20:24:59.829342654 -0500 3948+++ linux-2.6.32.10/arch/sparc/Makefile 2010-03-20 15:58:46.916553763 -0400
3967@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc 3949@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
3968 # Export what is needed by arch/sparc/boot/Makefile 3950 # Export what is needed by arch/sparc/boot/Makefile
3969 export VMLINUX_INIT VMLINUX_MAIN 3951 export VMLINUX_INIT VMLINUX_MAIN
@@ -3973,9 +3955,9 @@ diff -urNp linux-2.6.32.9/arch/sparc/Makefile linux-2.6.32.9/arch/sparc/Makefile
3973 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) 3955 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
3974 VMLINUX_MAIN += $(drivers-y) $(net-y) 3956 VMLINUX_MAIN += $(drivers-y) $(net-y)
3975 3957
3976diff -urNp linux-2.6.32.9/arch/sparc/mm/fault_32.c linux-2.6.32.9/arch/sparc/mm/fault_32.c 3958diff -urNp linux-2.6.32.10/arch/sparc/mm/fault_32.c linux-2.6.32.10/arch/sparc/mm/fault_32.c
3977--- linux-2.6.32.9/arch/sparc/mm/fault_32.c 2010-02-23 10:38:51.000000000 -0500 3959--- linux-2.6.32.10/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400
3978+++ linux-2.6.32.9/arch/sparc/mm/fault_32.c 2010-03-11 20:24:59.829342654 -0500 3960+++ linux-2.6.32.10/arch/sparc/mm/fault_32.c 2010-03-20 15:58:46.916553763 -0400
3979@@ -21,6 +21,9 @@ 3961@@ -21,6 +21,9 @@
3980 #include <linux/interrupt.h> 3962 #include <linux/interrupt.h>
3981 #include <linux/module.h> 3963 #include <linux/module.h>
@@ -4279,9 +4261,9 @@ diff -urNp linux-2.6.32.9/arch/sparc/mm/fault_32.c linux-2.6.32.9/arch/sparc/mm/
4279 /* Allow reads even for write-only mappings */ 4261 /* Allow reads even for write-only mappings */
4280 if(!(vma->vm_flags & (VM_READ | VM_EXEC))) 4262 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
4281 goto bad_area; 4263 goto bad_area;
4282diff -urNp linux-2.6.32.9/arch/sparc/mm/fault_64.c linux-2.6.32.9/arch/sparc/mm/fault_64.c 4264diff -urNp linux-2.6.32.10/arch/sparc/mm/fault_64.c linux-2.6.32.10/arch/sparc/mm/fault_64.c
4283--- linux-2.6.32.9/arch/sparc/mm/fault_64.c 2010-02-23 10:38:51.000000000 -0500 4265--- linux-2.6.32.10/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400
4284+++ linux-2.6.32.9/arch/sparc/mm/fault_64.c 2010-03-11 20:24:59.829342654 -0500 4266+++ linux-2.6.32.10/arch/sparc/mm/fault_64.c 2010-03-20 15:58:46.916553763 -0400
4285@@ -20,6 +20,9 @@ 4267@@ -20,6 +20,9 @@
4286 #include <linux/kprobes.h> 4268 #include <linux/kprobes.h>
4287 #include <linux/kdebug.h> 4269 #include <linux/kdebug.h>
@@ -4779,9 +4761,9 @@ diff -urNp linux-2.6.32.9/arch/sparc/mm/fault_64.c linux-2.6.32.9/arch/sparc/mm/
4779 /* Pure DTLB misses do not tell us whether the fault causing 4761 /* Pure DTLB misses do not tell us whether the fault causing
4780 * 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
4781 * 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
4782diff -urNp linux-2.6.32.9/arch/sparc/mm/init_32.c linux-2.6.32.9/arch/sparc/mm/init_32.c 4764diff -urNp linux-2.6.32.10/arch/sparc/mm/init_32.c linux-2.6.32.10/arch/sparc/mm/init_32.c
4783--- linux-2.6.32.9/arch/sparc/mm/init_32.c 2010-02-23 10:38:51.000000000 -0500 4765--- linux-2.6.32.10/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
4784+++ linux-2.6.32.9/arch/sparc/mm/init_32.c 2010-03-11 20:24:59.829342654 -0500 4766+++ linux-2.6.32.10/arch/sparc/mm/init_32.c 2010-03-20 15:58:46.916553763 -0400
4785@@ -317,6 +317,9 @@ extern void device_scan(void); 4767@@ -317,6 +317,9 @@ extern void device_scan(void);
4786 pgprot_t PAGE_SHARED __read_mostly; 4768 pgprot_t PAGE_SHARED __read_mostly;
4787 EXPORT_SYMBOL(PAGE_SHARED); 4769 EXPORT_SYMBOL(PAGE_SHARED);
@@ -4816,9 +4798,9 @@ diff -urNp linux-2.6.32.9/arch/sparc/mm/init_32.c linux-2.6.32.9/arch/sparc/mm/i
4816 protection_map[12] = PAGE_READONLY; 4798 protection_map[12] = PAGE_READONLY;
4817 protection_map[13] = PAGE_READONLY; 4799 protection_map[13] = PAGE_READONLY;
4818 protection_map[14] = PAGE_SHARED; 4800 protection_map[14] = PAGE_SHARED;
4819diff -urNp linux-2.6.32.9/arch/sparc/mm/Makefile linux-2.6.32.9/arch/sparc/mm/Makefile 4801diff -urNp linux-2.6.32.10/arch/sparc/mm/Makefile linux-2.6.32.10/arch/sparc/mm/Makefile
4820--- linux-2.6.32.9/arch/sparc/mm/Makefile 2010-02-23 10:38:51.000000000 -0500 4802--- linux-2.6.32.10/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400
4821+++ linux-2.6.32.9/arch/sparc/mm/Makefile 2010-03-11 20:24:59.829342654 -0500 4803+++ linux-2.6.32.10/arch/sparc/mm/Makefile 2010-03-20 15:58:46.916553763 -0400
4822@@ -2,7 +2,7 @@ 4804@@ -2,7 +2,7 @@
4823 # 4805 #
4824 4806
@@ -4828,9 +4810,9 @@ diff -urNp linux-2.6.32.9/arch/sparc/mm/Makefile linux-2.6.32.9/arch/sparc/mm/Ma
4828 4810
4829 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o 4811 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
4830 obj-y += fault_$(BITS).o 4812 obj-y += fault_$(BITS).o
4831diff -urNp linux-2.6.32.9/arch/sparc/mm/srmmu.c linux-2.6.32.9/arch/sparc/mm/srmmu.c 4813diff -urNp linux-2.6.32.10/arch/sparc/mm/srmmu.c linux-2.6.32.10/arch/sparc/mm/srmmu.c
4832--- linux-2.6.32.9/arch/sparc/mm/srmmu.c 2010-02-23 10:38:51.000000000 -0500 4814--- linux-2.6.32.10/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400
4833+++ linux-2.6.32.9/arch/sparc/mm/srmmu.c 2010-03-11 20:24:59.833630821 -0500 4815+++ linux-2.6.32.10/arch/sparc/mm/srmmu.c 2010-03-20 15:58:46.916553763 -0400
4834@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) 4816@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
4835 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); 4817 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
4836 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); 4818 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -4845,9 +4827,9 @@ diff -urNp linux-2.6.32.9/arch/sparc/mm/srmmu.c linux-2.6.32.9/arch/sparc/mm/srm
4845 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); 4827 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
4846 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); 4828 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
4847 4829
4848diff -urNp linux-2.6.32.9/arch/um/include/asm/kmap_types.h linux-2.6.32.9/arch/um/include/asm/kmap_types.h 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
4849--- linux-2.6.32.9/arch/um/include/asm/kmap_types.h 2010-02-23 10:38:51.000000000 -0500 4831--- linux-2.6.32.10/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
4850+++ linux-2.6.32.9/arch/um/include/asm/kmap_types.h 2010-03-11 20:24:59.833630821 -0500 4832+++ linux-2.6.32.10/arch/um/include/asm/kmap_types.h 2010-03-20 15:58:46.916553763 -0400
4851@@ -23,6 +23,7 @@ enum km_type { 4833@@ -23,6 +23,7 @@ enum km_type {
4852 KM_IRQ1, 4834 KM_IRQ1,
4853 KM_SOFTIRQ0, 4835 KM_SOFTIRQ0,
@@ -4856,9 +4838,9 @@ diff -urNp linux-2.6.32.9/arch/um/include/asm/kmap_types.h linux-2.6.32.9/arch/u
4856 KM_TYPE_NR 4838 KM_TYPE_NR
4857 }; 4839 };
4858 4840
4859diff -urNp linux-2.6.32.9/arch/um/include/asm/page.h linux-2.6.32.9/arch/um/include/asm/page.h 4841diff -urNp linux-2.6.32.10/arch/um/include/asm/page.h linux-2.6.32.10/arch/um/include/asm/page.h
4860--- linux-2.6.32.9/arch/um/include/asm/page.h 2010-02-23 10:38:51.000000000 -0500 4842--- linux-2.6.32.10/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
4861+++ linux-2.6.32.9/arch/um/include/asm/page.h 2010-03-11 20:24:59.833630821 -0500 4843+++ linux-2.6.32.10/arch/um/include/asm/page.h 2010-03-20 15:58:46.916553763 -0400
4862@@ -14,6 +14,9 @@ 4844@@ -14,6 +14,9 @@
4863 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) 4845 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
4864 #define PAGE_MASK (~(PAGE_SIZE-1)) 4846 #define PAGE_MASK (~(PAGE_SIZE-1))
@@ -4869,9 +4851,9 @@ diff -urNp linux-2.6.32.9/arch/um/include/asm/page.h linux-2.6.32.9/arch/um/incl
4869 #ifndef __ASSEMBLY__ 4851 #ifndef __ASSEMBLY__
4870 4852
4871 struct page; 4853 struct page;
4872diff -urNp linux-2.6.32.9/arch/um/sys-i386/syscalls.c linux-2.6.32.9/arch/um/sys-i386/syscalls.c 4854diff -urNp linux-2.6.32.10/arch/um/sys-i386/syscalls.c linux-2.6.32.10/arch/um/sys-i386/syscalls.c
4873--- linux-2.6.32.9/arch/um/sys-i386/syscalls.c 2010-02-23 10:38:51.000000000 -0500 4855--- linux-2.6.32.10/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400
4874+++ linux-2.6.32.9/arch/um/sys-i386/syscalls.c 2010-03-11 20:24:59.833630821 -0500 4856+++ linux-2.6.32.10/arch/um/sys-i386/syscalls.c 2010-03-20 15:58:46.916553763 -0400
4875@@ -11,6 +11,21 @@ 4857@@ -11,6 +11,21 @@
4876 #include "asm/uaccess.h" 4858 #include "asm/uaccess.h"
4877 #include "asm/unistd.h" 4859 #include "asm/unistd.h"
@@ -4894,9 +4876,9 @@ diff -urNp linux-2.6.32.9/arch/um/sys-i386/syscalls.c linux-2.6.32.9/arch/um/sys
4894 /* 4876 /*
4895 * Perform the select(nd, in, out, ex, tv) and mmap() system 4877 * Perform the select(nd, in, out, ex, tv) and mmap() system
4896 * 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
4897diff -urNp linux-2.6.32.9/arch/x86/boot/bitops.h linux-2.6.32.9/arch/x86/boot/bitops.h 4879diff -urNp linux-2.6.32.10/arch/x86/boot/bitops.h linux-2.6.32.10/arch/x86/boot/bitops.h
4898--- linux-2.6.32.9/arch/x86/boot/bitops.h 2010-02-23 10:38:51.000000000 -0500 4880--- linux-2.6.32.10/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400
4899+++ linux-2.6.32.9/arch/x86/boot/bitops.h 2010-03-11 20:24:59.833630821 -0500 4881+++ linux-2.6.32.10/arch/x86/boot/bitops.h 2010-03-20 15:58:46.916553763 -0400
4900@@ -26,7 +26,7 @@ static inline int variable_test_bit(int 4882@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
4901 u8 v; 4883 u8 v;
4902 const u32 *p = (const u32 *)addr; 4884 const u32 *p = (const u32 *)addr;
@@ -4915,9 +4897,9 @@ diff -urNp linux-2.6.32.9/arch/x86/boot/bitops.h linux-2.6.32.9/arch/x86/boot/bi
4915 } 4897 }
4916 4898
4917 #endif /* BOOT_BITOPS_H */ 4899 #endif /* BOOT_BITOPS_H */
4918diff -urNp linux-2.6.32.9/arch/x86/boot/boot.h linux-2.6.32.9/arch/x86/boot/boot.h 4900diff -urNp linux-2.6.32.10/arch/x86/boot/boot.h linux-2.6.32.10/arch/x86/boot/boot.h
4919--- linux-2.6.32.9/arch/x86/boot/boot.h 2010-02-23 10:38:51.000000000 -0500 4901--- linux-2.6.32.10/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400
4920+++ linux-2.6.32.9/arch/x86/boot/boot.h 2010-03-11 20:24:59.966150316 -0500 4902+++ linux-2.6.32.10/arch/x86/boot/boot.h 2010-03-20 15:58:46.916553763 -0400
4921@@ -82,7 +82,7 @@ static inline void io_delay(void) 4903@@ -82,7 +82,7 @@ static inline void io_delay(void)
4922 static inline u16 ds(void) 4904 static inline u16 ds(void)
4923 { 4905 {
@@ -4936,9 +4918,9 @@ diff -urNp linux-2.6.32.9/arch/x86/boot/boot.h linux-2.6.32.9/arch/x86/boot/boot
4936 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); 4918 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
4937 return diff; 4919 return diff;
4938 } 4920 }
4939diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/head_32.S linux-2.6.32.9/arch/x86/boot/compressed/head_32.S 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
4940--- linux-2.6.32.9/arch/x86/boot/compressed/head_32.S 2010-02-23 10:38:51.000000000 -0500 4922--- linux-2.6.32.10/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400
4941+++ linux-2.6.32.9/arch/x86/boot/compressed/head_32.S 2010-03-11 20:24:59.966150316 -0500 4923+++ linux-2.6.32.10/arch/x86/boot/compressed/head_32.S 2010-03-20 15:58:46.916553763 -0400
4942@@ -76,7 +76,7 @@ ENTRY(startup_32) 4924@@ -76,7 +76,7 @@ ENTRY(startup_32)
4943 notl %eax 4925 notl %eax
4944 andl %eax, %ebx 4926 andl %eax, %ebx
@@ -4967,9 +4949,9 @@ diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/head_32.S linux-2.6.32.9/arch
4967 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) 4949 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
4968 jmp 1b 4950 jmp 1b
4969 2: 4951 2:
4970diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/head_64.S linux-2.6.32.9/arch/x86/boot/compressed/head_64.S 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
4971--- linux-2.6.32.9/arch/x86/boot/compressed/head_64.S 2010-02-23 10:38:51.000000000 -0500 4953--- linux-2.6.32.10/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400
4972+++ linux-2.6.32.9/arch/x86/boot/compressed/head_64.S 2010-03-11 20:24:59.966150316 -0500 4954+++ linux-2.6.32.10/arch/x86/boot/compressed/head_64.S 2010-03-20 15:58:46.916553763 -0400
4973@@ -91,7 +91,7 @@ ENTRY(startup_32) 4955@@ -91,7 +91,7 @@ ENTRY(startup_32)
4974 notl %eax 4956 notl %eax
4975 andl %eax, %ebx 4957 andl %eax, %ebx
@@ -4988,9 +4970,9 @@ diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/head_64.S linux-2.6.32.9/arch
4988 #endif 4970 #endif
4989 4971
4990 /* Target address to relocate to for decompression */ 4972 /* Target address to relocate to for decompression */
4991diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/misc.c linux-2.6.32.9/arch/x86/boot/compressed/misc.c 4973diff -urNp linux-2.6.32.10/arch/x86/boot/compressed/misc.c linux-2.6.32.10/arch/x86/boot/compressed/misc.c
4992--- linux-2.6.32.9/arch/x86/boot/compressed/misc.c 2010-02-23 10:38:51.000000000 -0500 4974--- linux-2.6.32.10/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400
4993+++ linux-2.6.32.9/arch/x86/boot/compressed/misc.c 2010-03-11 20:24:59.966150316 -0500 4975+++ linux-2.6.32.10/arch/x86/boot/compressed/misc.c 2010-03-20 15:58:46.916553763 -0400
4994@@ -288,7 +288,7 @@ static void parse_elf(void *output) 4976@@ -288,7 +288,7 @@ static void parse_elf(void *output)
4995 case PT_LOAD: 4977 case PT_LOAD:
4996 #ifdef CONFIG_RELOCATABLE 4978 #ifdef CONFIG_RELOCATABLE
@@ -5009,9 +4991,9 @@ diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/misc.c linux-2.6.32.9/arch/x8
5009 error("Wrong destination address"); 4991 error("Wrong destination address");
5010 #endif 4992 #endif
5011 4993
5012diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.9/arch/x86/boot/compressed/mkpiggy.c 4994diff -urNp linux-2.6.32.10/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.10/arch/x86/boot/compressed/mkpiggy.c
5013--- linux-2.6.32.9/arch/x86/boot/compressed/mkpiggy.c 2010-02-23 10:38:51.000000000 -0500 4995--- linux-2.6.32.10/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400
5014+++ linux-2.6.32.9/arch/x86/boot/compressed/mkpiggy.c 2010-03-11 20:24:59.966150316 -0500 4996+++ linux-2.6.32.10/arch/x86/boot/compressed/mkpiggy.c 2010-03-20 15:58:46.916553763 -0400
5015@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) 4997@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
5016 4998
5017 offs = (olen > ilen) ? olen - ilen : 0; 4999 offs = (olen > ilen) ? olen - ilen : 0;
@@ -5021,9 +5003,9 @@ diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.9/arch
5021 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ 5003 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
5022 5004
5023 printf(".section \".rodata.compressed\",\"a\",@progbits\n"); 5005 printf(".section \".rodata.compressed\",\"a\",@progbits\n");
5024diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/relocs.c linux-2.6.32.9/arch/x86/boot/compressed/relocs.c 5006diff -urNp linux-2.6.32.10/arch/x86/boot/compressed/relocs.c linux-2.6.32.10/arch/x86/boot/compressed/relocs.c
5025--- linux-2.6.32.9/arch/x86/boot/compressed/relocs.c 2010-02-23 10:38:51.000000000 -0500 5007--- linux-2.6.32.10/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400
5026+++ linux-2.6.32.9/arch/x86/boot/compressed/relocs.c 2010-03-11 20:24:59.966150316 -0500 5008+++ linux-2.6.32.10/arch/x86/boot/compressed/relocs.c 2010-03-20 15:58:46.916553763 -0400
5027@@ -10,8 +10,11 @@ 5009@@ -10,8 +10,11 @@
5028 #define USE_BSD 5010 #define USE_BSD
5029 #include <endian.h> 5011 #include <endian.h>
@@ -5224,9 +5206,9 @@ diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/relocs.c linux-2.6.32.9/arch/
5224 read_shdrs(fp); 5206 read_shdrs(fp);
5225 read_strtabs(fp); 5207 read_strtabs(fp);
5226 read_symtabs(fp); 5208 read_symtabs(fp);
5227diff -urNp linux-2.6.32.9/arch/x86/boot/cpucheck.c linux-2.6.32.9/arch/x86/boot/cpucheck.c 5209diff -urNp linux-2.6.32.10/arch/x86/boot/cpucheck.c linux-2.6.32.10/arch/x86/boot/cpucheck.c
5228--- linux-2.6.32.9/arch/x86/boot/cpucheck.c 2010-02-23 10:38:51.000000000 -0500 5210--- linux-2.6.32.10/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400
5229+++ linux-2.6.32.9/arch/x86/boot/cpucheck.c 2010-03-11 20:24:59.966150316 -0500 5211+++ linux-2.6.32.10/arch/x86/boot/cpucheck.c 2010-03-20 15:58:46.921536877 -0400
5230@@ -74,7 +74,7 @@ static int has_fpu(void) 5212@@ -74,7 +74,7 @@ static int has_fpu(void)
5231 u16 fcw = -1, fsw = -1; 5213 u16 fcw = -1, fsw = -1;
5232 u32 cr0; 5214 u32 cr0;
@@ -5322,9 +5304,9 @@ diff -urNp linux-2.6.32.9/arch/x86/boot/cpucheck.c linux-2.6.32.9/arch/x86/boot/
5322 5304
5323 err = check_flags(); 5305 err = check_flags();
5324 } 5306 }
5325diff -urNp linux-2.6.32.9/arch/x86/boot/header.S linux-2.6.32.9/arch/x86/boot/header.S 5307diff -urNp linux-2.6.32.10/arch/x86/boot/header.S linux-2.6.32.10/arch/x86/boot/header.S
5326--- linux-2.6.32.9/arch/x86/boot/header.S 2010-02-23 10:38:51.000000000 -0500 5308--- linux-2.6.32.10/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400
5327+++ linux-2.6.32.9/arch/x86/boot/header.S 2010-03-11 20:24:59.966150316 -0500 5309+++ linux-2.6.32.10/arch/x86/boot/header.S 2010-03-20 15:58:46.921536877 -0400
5328@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical 5310@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
5329 # single linked list of 5311 # single linked list of
5330 # struct setup_data 5312 # struct setup_data
@@ -5334,9 +5316,9 @@ diff -urNp linux-2.6.32.9/arch/x86/boot/header.S linux-2.6.32.9/arch/x86/boot/he
5334 5316
5335 #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)
5336 #define VO_INIT_SIZE (VO__end - VO__text) 5318 #define VO_INIT_SIZE (VO__end - VO__text)
5337diff -urNp linux-2.6.32.9/arch/x86/boot/video-vesa.c linux-2.6.32.9/arch/x86/boot/video-vesa.c 5319diff -urNp linux-2.6.32.10/arch/x86/boot/video-vesa.c linux-2.6.32.10/arch/x86/boot/video-vesa.c
5338--- linux-2.6.32.9/arch/x86/boot/video-vesa.c 2010-02-23 10:38:51.000000000 -0500 5320--- linux-2.6.32.10/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400
5339+++ linux-2.6.32.9/arch/x86/boot/video-vesa.c 2010-03-11 20:24:59.966150316 -0500 5321+++ linux-2.6.32.10/arch/x86/boot/video-vesa.c 2010-03-20 15:58:46.921536877 -0400
5340@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) 5322@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
5341 5323
5342 boot_params.screen_info.vesapm_seg = oreg.es; 5324 boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5345,9 +5327,9 @@ diff -urNp linux-2.6.32.9/arch/x86/boot/video-vesa.c linux-2.6.32.9/arch/x86/boo
5345 } 5327 }
5346 5328
5347 /* 5329 /*
5348diff -urNp linux-2.6.32.9/arch/x86/ia32/ia32_signal.c linux-2.6.32.9/arch/x86/ia32/ia32_signal.c 5330diff -urNp linux-2.6.32.10/arch/x86/ia32/ia32_signal.c linux-2.6.32.10/arch/x86/ia32/ia32_signal.c
5349--- linux-2.6.32.9/arch/x86/ia32/ia32_signal.c 2010-02-23 10:38:51.000000000 -0500 5331--- linux-2.6.32.10/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400
5350+++ linux-2.6.32.9/arch/x86/ia32/ia32_signal.c 2010-03-11 20:24:59.966150316 -0500 5332+++ linux-2.6.32.10/arch/x86/ia32/ia32_signal.c 2010-03-20 15:58:46.921536877 -0400
5351@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 5333@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
5352 sp -= frame_size; 5334 sp -= frame_size;
5353 /* Align the stack pointer according to the i386 ABI, 5335 /* Align the stack pointer according to the i386 ABI,
@@ -5366,9 +5348,9 @@ diff -urNp linux-2.6.32.9/arch/x86/ia32/ia32_signal.c linux-2.6.32.9/arch/x86/ia
5366 }; 5348 };
5367 5349
5368 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); 5350 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
5369diff -urNp linux-2.6.32.9/arch/x86/include/asm/alternative.h linux-2.6.32.9/arch/x86/include/asm/alternative.h 5351diff -urNp linux-2.6.32.10/arch/x86/include/asm/alternative.h linux-2.6.32.10/arch/x86/include/asm/alternative.h
5370--- linux-2.6.32.9/arch/x86/include/asm/alternative.h 2010-02-23 10:38:51.000000000 -0500 5352--- linux-2.6.32.10/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400
5371+++ linux-2.6.32.9/arch/x86/include/asm/alternative.h 2010-03-11 20:24:59.966150316 -0500 5353+++ linux-2.6.32.10/arch/x86/include/asm/alternative.h 2010-03-20 15:58:46.921536877 -0400
5372@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit 5354@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
5373 " .byte 662b-661b\n" /* sourcelen */ \ 5355 " .byte 662b-661b\n" /* sourcelen */ \
5374 " .byte 664f-663f\n" /* replacementlen */ \ 5356 " .byte 664f-663f\n" /* replacementlen */ \
@@ -5378,9 +5360,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/alternative.h linux-2.6.32.9/arch
5378 "663:\n\t" newinstr "\n664:\n" /* replacement */ \ 5360 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
5379 ".previous" 5361 ".previous"
5380 5362
5381diff -urNp linux-2.6.32.9/arch/x86/include/asm/apm.h linux-2.6.32.9/arch/x86/include/asm/apm.h 5363diff -urNp linux-2.6.32.10/arch/x86/include/asm/apm.h linux-2.6.32.10/arch/x86/include/asm/apm.h
5382--- linux-2.6.32.9/arch/x86/include/asm/apm.h 2010-02-23 10:38:51.000000000 -0500 5364--- linux-2.6.32.10/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400
5383+++ linux-2.6.32.9/arch/x86/include/asm/apm.h 2010-03-11 20:24:59.977323108 -0500 5365+++ linux-2.6.32.10/arch/x86/include/asm/apm.h 2010-03-20 15:58:46.921536877 -0400
5384@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 5366@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
5385 __asm__ __volatile__(APM_DO_ZERO_SEGS 5367 __asm__ __volatile__(APM_DO_ZERO_SEGS
5386 "pushl %%edi\n\t" 5368 "pushl %%edi\n\t"
@@ -5399,9 +5381,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/apm.h linux-2.6.32.9/arch/x86/inc
5399 "setc %%bl\n\t" 5381 "setc %%bl\n\t"
5400 "popl %%ebp\n\t" 5382 "popl %%ebp\n\t"
5401 "popl %%edi\n\t" 5383 "popl %%edi\n\t"
5402diff -urNp linux-2.6.32.9/arch/x86/include/asm/atomic_32.h linux-2.6.32.9/arch/x86/include/asm/atomic_32.h 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
5403--- linux-2.6.32.9/arch/x86/include/asm/atomic_32.h 2010-02-23 10:38:51.000000000 -0500 5385--- linux-2.6.32.10/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400
5404+++ linux-2.6.32.9/arch/x86/include/asm/atomic_32.h 2010-03-11 20:24:59.977323108 -0500 5386+++ linux-2.6.32.10/arch/x86/include/asm/atomic_32.h 2010-03-20 15:58:46.921536877 -0400
5405@@ -25,6 +25,17 @@ static inline int atomic_read(const atom 5387@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
5406 } 5388 }
5407 5389
@@ -5732,9 +5714,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/atomic_32.h linux-2.6.32.9/arch/x
5732 #define ATOMIC64_INIT(val) { (val) } 5714 #define ATOMIC64_INIT(val) { (val) }
5733 5715
5734 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); 5716 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
5735diff -urNp linux-2.6.32.9/arch/x86/include/asm/atomic_64.h linux-2.6.32.9/arch/x86/include/asm/atomic_64.h 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
5736--- linux-2.6.32.9/arch/x86/include/asm/atomic_64.h 2010-02-23 10:38:51.000000000 -0500 5718--- linux-2.6.32.10/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
5737+++ linux-2.6.32.9/arch/x86/include/asm/atomic_64.h 2010-03-11 20:24:59.977323108 -0500 5719+++ linux-2.6.32.10/arch/x86/include/asm/atomic_64.h 2010-03-20 15:58:46.921536877 -0400
5738@@ -24,6 +24,17 @@ static inline int atomic_read(const atom 5720@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
5739 } 5721 }
5740 5722
@@ -6312,9 +6294,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/atomic_64.h linux-2.6.32.9/arch/x
6312 } 6294 }
6313 6295
6314 /** 6296 /**
6315diff -urNp linux-2.6.32.9/arch/x86/include/asm/boot.h linux-2.6.32.9/arch/x86/include/asm/boot.h 6297diff -urNp linux-2.6.32.10/arch/x86/include/asm/boot.h linux-2.6.32.10/arch/x86/include/asm/boot.h
6316--- linux-2.6.32.9/arch/x86/include/asm/boot.h 2010-02-23 10:38:51.000000000 -0500 6298--- linux-2.6.32.10/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400
6317+++ linux-2.6.32.9/arch/x86/include/asm/boot.h 2010-03-11 20:24:59.981624197 -0500 6299+++ linux-2.6.32.10/arch/x86/include/asm/boot.h 2010-03-20 15:58:46.921536877 -0400
6318@@ -11,10 +11,15 @@ 6300@@ -11,10 +11,15 @@
6319 #include <asm/pgtable_types.h> 6301 #include <asm/pgtable_types.h>
6320 6302
@@ -6332,9 +6314,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/boot.h linux-2.6.32.9/arch/x86/in
6332 /* Minimum kernel alignment, as a power of two */ 6314 /* Minimum kernel alignment, as a power of two */
6333 #ifdef CONFIG_X86_64 6315 #ifdef CONFIG_X86_64
6334 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT 6316 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
6335diff -urNp linux-2.6.32.9/arch/x86/include/asm/cache.h linux-2.6.32.9/arch/x86/include/asm/cache.h 6317diff -urNp linux-2.6.32.10/arch/x86/include/asm/cache.h linux-2.6.32.10/arch/x86/include/asm/cache.h
6336--- linux-2.6.32.9/arch/x86/include/asm/cache.h 2010-02-23 10:38:51.000000000 -0500 6318--- linux-2.6.32.10/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400
6337+++ linux-2.6.32.9/arch/x86/include/asm/cache.h 2010-03-11 20:24:59.981624197 -0500 6319+++ linux-2.6.32.10/arch/x86/include/asm/cache.h 2010-03-20 15:58:46.921536877 -0400
6338@@ -8,6 +8,7 @@ 6320@@ -8,6 +8,7 @@
6339 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) 6321 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6340 6322
@@ -6343,9 +6325,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/cache.h linux-2.6.32.9/arch/x86/i
6343 6325
6344 #ifdef CONFIG_X86_VSMP 6326 #ifdef CONFIG_X86_VSMP
6345 /* vSMP Internode cacheline shift */ 6327 /* vSMP Internode cacheline shift */
6346diff -urNp linux-2.6.32.9/arch/x86/include/asm/checksum_32.h linux-2.6.32.9/arch/x86/include/asm/checksum_32.h 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
6347--- linux-2.6.32.9/arch/x86/include/asm/checksum_32.h 2010-02-23 10:38:51.000000000 -0500 6329--- linux-2.6.32.10/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400
6348+++ linux-2.6.32.9/arch/x86/include/asm/checksum_32.h 2010-03-11 20:24:59.981624197 -0500 6330+++ linux-2.6.32.10/arch/x86/include/asm/checksum_32.h 2010-03-20 15:58:46.921536877 -0400
6349@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene 6331@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
6350 int len, __wsum sum, 6332 int len, __wsum sum,
6351 int *src_err_ptr, int *dst_err_ptr); 6333 int *src_err_ptr, int *dst_err_ptr);
@@ -6379,9 +6361,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/checksum_32.h linux-2.6.32.9/arch
6379 len, sum, NULL, err_ptr); 6361 len, sum, NULL, err_ptr);
6380 6362
6381 if (len) 6363 if (len)
6382diff -urNp linux-2.6.32.9/arch/x86/include/asm/desc.h linux-2.6.32.9/arch/x86/include/asm/desc.h 6364diff -urNp linux-2.6.32.10/arch/x86/include/asm/desc.h linux-2.6.32.10/arch/x86/include/asm/desc.h
6383--- linux-2.6.32.9/arch/x86/include/asm/desc.h 2010-02-23 10:38:51.000000000 -0500 6365--- linux-2.6.32.10/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400
6384+++ linux-2.6.32.9/arch/x86/include/asm/desc.h 2010-03-11 20:24:59.981624197 -0500 6366+++ linux-2.6.32.10/arch/x86/include/asm/desc.h 2010-03-20 15:58:46.921536877 -0400
6385@@ -4,6 +4,7 @@ 6367@@ -4,6 +4,7 @@
6386 #include <asm/desc_defs.h> 6368 #include <asm/desc_defs.h>
6387 #include <asm/ldt.h> 6369 #include <asm/ldt.h>
@@ -6492,9 +6474,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/desc.h linux-2.6.32.9/arch/x86/in
6492+#endif 6474+#endif
6493+ 6475+
6494 #endif /* _ASM_X86_DESC_H */ 6476 #endif /* _ASM_X86_DESC_H */
6495diff -urNp linux-2.6.32.9/arch/x86/include/asm/device.h linux-2.6.32.9/arch/x86/include/asm/device.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
6496--- linux-2.6.32.9/arch/x86/include/asm/device.h 2010-02-23 10:38:51.000000000 -0500 6478--- linux-2.6.32.10/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
6497+++ linux-2.6.32.9/arch/x86/include/asm/device.h 2010-03-11 20:24:59.981624197 -0500 6479+++ linux-2.6.32.10/arch/x86/include/asm/device.h 2010-03-20 15:58:46.921536877 -0400
6498@@ -6,7 +6,7 @@ struct dev_archdata { 6480@@ -6,7 +6,7 @@ struct dev_archdata {
6499 void *acpi_handle; 6481 void *acpi_handle;
6500 #endif 6482 #endif
@@ -6504,9 +6486,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/device.h linux-2.6.32.9/arch/x86/
6504 #endif 6486 #endif
6505 #ifdef CONFIG_DMAR 6487 #ifdef CONFIG_DMAR
6506 void *iommu; /* hook for IOMMU specific extension */ 6488 void *iommu; /* hook for IOMMU specific extension */
6507diff -urNp linux-2.6.32.9/arch/x86/include/asm/dma-mapping.h linux-2.6.32.9/arch/x86/include/asm/dma-mapping.h 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
6508--- linux-2.6.32.9/arch/x86/include/asm/dma-mapping.h 2010-02-23 10:38:51.000000000 -0500 6490--- linux-2.6.32.10/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
6509+++ linux-2.6.32.9/arch/x86/include/asm/dma-mapping.h 2010-03-11 20:24:59.981624197 -0500 6491+++ linux-2.6.32.10/arch/x86/include/asm/dma-mapping.h 2010-03-20 15:58:46.921536877 -0400
6510@@ -25,9 +25,9 @@ extern int iommu_merge; 6492@@ -25,9 +25,9 @@ extern int iommu_merge;
6511 extern struct device x86_dma_fallback_dev; 6493 extern struct device x86_dma_fallback_dev;
6512 extern int panic_on_overflow; 6494 extern int panic_on_overflow;
@@ -6546,9 +6528,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/dma-mapping.h linux-2.6.32.9/arch
6546 6528
6547 WARN_ON(irqs_disabled()); /* for portability */ 6529 WARN_ON(irqs_disabled()); /* for portability */
6548 6530
6549diff -urNp linux-2.6.32.9/arch/x86/include/asm/e820.h linux-2.6.32.9/arch/x86/include/asm/e820.h 6531diff -urNp linux-2.6.32.10/arch/x86/include/asm/e820.h linux-2.6.32.10/arch/x86/include/asm/e820.h
6550--- linux-2.6.32.9/arch/x86/include/asm/e820.h 2010-02-23 10:38:51.000000000 -0500 6532--- linux-2.6.32.10/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400
6551+++ linux-2.6.32.9/arch/x86/include/asm/e820.h 2010-03-11 20:24:59.981624197 -0500 6533+++ linux-2.6.32.10/arch/x86/include/asm/e820.h 2010-03-20 15:58:46.921536877 -0400
6552@@ -133,7 +133,7 @@ extern char *default_machine_specific_me 6534@@ -133,7 +133,7 @@ extern char *default_machine_specific_me
6553 #define ISA_END_ADDRESS 0x100000 6535 #define ISA_END_ADDRESS 0x100000
6554 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) 6536 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
@@ -6558,9 +6540,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/e820.h linux-2.6.32.9/arch/x86/in
6558 #define BIOS_END 0x00100000 6540 #define BIOS_END 0x00100000
6559 6541
6560 #ifdef __KERNEL__ 6542 #ifdef __KERNEL__
6561diff -urNp linux-2.6.32.9/arch/x86/include/asm/elf.h linux-2.6.32.9/arch/x86/include/asm/elf.h 6543diff -urNp linux-2.6.32.10/arch/x86/include/asm/elf.h linux-2.6.32.10/arch/x86/include/asm/elf.h
6562--- linux-2.6.32.9/arch/x86/include/asm/elf.h 2010-02-23 10:38:51.000000000 -0500 6544--- linux-2.6.32.10/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
6563+++ linux-2.6.32.9/arch/x86/include/asm/elf.h 2010-03-11 20:24:59.981624197 -0500 6545+++ linux-2.6.32.10/arch/x86/include/asm/elf.h 2010-03-20 15:58:46.921536877 -0400
6564@@ -257,7 +257,25 @@ extern int force_personality32; 6546@@ -257,7 +257,25 @@ extern int force_personality32;
6565 the loader. We need to make sure that it is out of the way of the program 6547 the loader. We need to make sure that it is out of the way of the program
6566 that it will "exec", and that there is sufficient room for the brk. */ 6548 that it will "exec", and that there is sufficient room for the brk. */
@@ -6614,9 +6596,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/elf.h linux-2.6.32.9/arch/x86/inc
6614-#define arch_randomize_brk arch_randomize_brk 6596-#define arch_randomize_brk arch_randomize_brk
6615- 6597-
6616 #endif /* _ASM_X86_ELF_H */ 6598 #endif /* _ASM_X86_ELF_H */
6617diff -urNp linux-2.6.32.9/arch/x86/include/asm/futex.h linux-2.6.32.9/arch/x86/include/asm/futex.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
6618--- linux-2.6.32.9/arch/x86/include/asm/futex.h 2010-02-23 10:38:51.000000000 -0500 6600--- linux-2.6.32.10/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400
6619+++ linux-2.6.32.9/arch/x86/include/asm/futex.h 2010-03-11 20:24:59.981624197 -0500 6601+++ linux-2.6.32.10/arch/x86/include/asm/futex.h 2010-03-20 15:58:46.921536877 -0400
6620@@ -11,6 +11,40 @@ 6602@@ -11,6 +11,40 @@
6621 #include <asm/processor.h> 6603 #include <asm/processor.h>
6622 #include <asm/system.h> 6604 #include <asm/system.h>
@@ -6728,9 +6710,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/futex.h linux-2.6.32.9/arch/x86/i
6728 : "memory" 6710 : "memory"
6729 ); 6711 );
6730 6712
6731diff -urNp linux-2.6.32.9/arch/x86/include/asm/i387.h linux-2.6.32.9/arch/x86/include/asm/i387.h 6713diff -urNp linux-2.6.32.10/arch/x86/include/asm/i387.h linux-2.6.32.10/arch/x86/include/asm/i387.h
6732--- linux-2.6.32.9/arch/x86/include/asm/i387.h 2010-02-23 10:38:51.000000000 -0500 6714--- linux-2.6.32.10/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400
6733+++ linux-2.6.32.9/arch/x86/include/asm/i387.h 2010-03-11 20:24:59.981624197 -0500 6715+++ linux-2.6.32.10/arch/x86/include/asm/i387.h 2010-03-20 15:58:46.921536877 -0400
6734@@ -195,13 +195,8 @@ static inline int fxrstor_checking(struc 6716@@ -195,13 +195,8 @@ static inline int fxrstor_checking(struc
6735 } 6717 }
6736 6718
@@ -6747,9 +6729,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/i387.h linux-2.6.32.9/arch/x86/in
6747 6729
6748 /* 6730 /*
6749 * These must be called with preempt disabled 6731 * These must be called with preempt disabled
6750diff -urNp linux-2.6.32.9/arch/x86/include/asm/io_64.h linux-2.6.32.9/arch/x86/include/asm/io_64.h 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
6751--- linux-2.6.32.9/arch/x86/include/asm/io_64.h 2010-02-23 10:38:51.000000000 -0500 6733--- linux-2.6.32.10/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400
6752+++ linux-2.6.32.9/arch/x86/include/asm/io_64.h 2010-03-11 20:24:59.981624197 -0500 6734+++ linux-2.6.32.10/arch/x86/include/asm/io_64.h 2010-03-20 15:58:46.921536877 -0400
6753@@ -140,6 +140,17 @@ __OUTS(l) 6735@@ -140,6 +140,17 @@ __OUTS(l)
6754 6736
6755 #include <linux/vmalloc.h> 6737 #include <linux/vmalloc.h>
@@ -6768,9 +6750,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/io_64.h linux-2.6.32.9/arch/x86/i
6768 #include <asm-generic/iomap.h> 6750 #include <asm-generic/iomap.h>
6769 6751
6770 void __memcpy_fromio(void *, unsigned long, unsigned); 6752 void __memcpy_fromio(void *, unsigned long, unsigned);
6771diff -urNp linux-2.6.32.9/arch/x86/include/asm/iommu.h linux-2.6.32.9/arch/x86/include/asm/iommu.h 6753diff -urNp linux-2.6.32.10/arch/x86/include/asm/iommu.h linux-2.6.32.10/arch/x86/include/asm/iommu.h
6772--- linux-2.6.32.9/arch/x86/include/asm/iommu.h 2010-02-23 10:38:51.000000000 -0500 6754--- linux-2.6.32.10/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
6773+++ linux-2.6.32.9/arch/x86/include/asm/iommu.h 2010-03-11 20:24:59.981624197 -0500 6755+++ linux-2.6.32.10/arch/x86/include/asm/iommu.h 2010-03-20 15:58:46.921536877 -0400
6774@@ -3,7 +3,7 @@ 6756@@ -3,7 +3,7 @@
6775 6757
6776 extern void pci_iommu_shutdown(void); 6758 extern void pci_iommu_shutdown(void);
@@ -6780,21 +6762,27 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/iommu.h linux-2.6.32.9/arch/x86/i
6780 extern int force_iommu, no_iommu; 6762 extern int force_iommu, no_iommu;
6781 extern int iommu_detected; 6763 extern int iommu_detected;
6782 extern int iommu_pass_through; 6764 extern int iommu_pass_through;
6783diff -urNp linux-2.6.32.9/arch/x86/include/asm/irqflags.h linux-2.6.32.9/arch/x86/include/asm/irqflags.h 6765diff -urNp linux-2.6.32.10/arch/x86/include/asm/irqflags.h linux-2.6.32.10/arch/x86/include/asm/irqflags.h
6784--- linux-2.6.32.9/arch/x86/include/asm/irqflags.h 2010-02-23 10:38:51.000000000 -0500 6766--- linux-2.6.32.10/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400
6785+++ linux-2.6.32.9/arch/x86/include/asm/irqflags.h 2010-03-11 20:24:59.981624197 -0500 6767+++ linux-2.6.32.10/arch/x86/include/asm/irqflags.h 2010-03-21 16:37:01.886719099 -0400
6786@@ -142,10 +142,75 @@ static inline unsigned long __raw_local_ 6768@@ -142,10 +142,81 @@ static inline unsigned long __raw_local_
6787 sti; \ 6769 sti; \
6788 sysexit 6770 sysexit
6789 6771
6790+/* PaX: special register usage in entry_64.S, beware */ 6772+/* PaX: special register usage in entry_64.S, beware */
6791+#ifdef CONFIG_PAX_KERNEXEC 6773+#ifdef CONFIG_PAX_KERNEXEC
6792+ .macro ljmpq sel, off 6774+ .macro ljmpq sel, off
6775+#if defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
6793+ .byte 0x48; ljmp *1234f(%rip) 6776+ .byte 0x48; ljmp *1234f(%rip)
6794+ .pushsection .rodata 6777+ .pushsection .rodata
6795+ .align 16 6778+ .align 16
6796+ 1234: .quad \off; .word \sel 6779+ 1234: .quad \off; .word \sel
6797+ .popsection 6780+ .popsection
6781+#else
6782+ push $\sel
6783+ push $\off
6784+ lretq
6785+#endif
6798+ .endm 6786+ .endm
6799+ 6787+
6800+#define PAX_EXIT_KERNEL \ 6788+#define PAX_EXIT_KERNEL \
@@ -6859,9 +6847,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/irqflags.h linux-2.6.32.9/arch/x8
6859 #endif 6847 #endif
6860 6848
6861 6849
6862diff -urNp linux-2.6.32.9/arch/x86/include/asm/kvm_host.h linux-2.6.32.9/arch/x86/include/asm/kvm_host.h 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
6863--- linux-2.6.32.9/arch/x86/include/asm/kvm_host.h 2010-02-23 10:38:51.000000000 -0500 6851--- linux-2.6.32.10/arch/x86/include/asm/kvm_host.h 2010-03-15 11:52:04.000000000 -0400
6864+++ linux-2.6.32.9/arch/x86/include/asm/kvm_host.h 2010-03-11 20:24:59.981624197 -0500 6852+++ linux-2.6.32.10/arch/x86/include/asm/kvm_host.h 2010-03-20 15:58:46.921536877 -0400
6865@@ -531,7 +531,7 @@ struct kvm_x86_ops { 6853@@ -531,7 +531,7 @@ struct kvm_x86_ops {
6866 const struct trace_print_flags *exit_reasons_str; 6854 const struct trace_print_flags *exit_reasons_str;
6867 }; 6855 };
@@ -6871,9 +6859,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/kvm_host.h linux-2.6.32.9/arch/x8
6871 6859
6872 int kvm_mmu_module_init(void); 6860 int kvm_mmu_module_init(void);
6873 void kvm_mmu_module_exit(void); 6861 void kvm_mmu_module_exit(void);
6874diff -urNp linux-2.6.32.9/arch/x86/include/asm/local.h linux-2.6.32.9/arch/x86/include/asm/local.h 6862diff -urNp linux-2.6.32.10/arch/x86/include/asm/local.h linux-2.6.32.10/arch/x86/include/asm/local.h
6875--- linux-2.6.32.9/arch/x86/include/asm/local.h 2010-02-23 10:38:51.000000000 -0500 6863--- linux-2.6.32.10/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400
6876+++ linux-2.6.32.9/arch/x86/include/asm/local.h 2010-03-11 20:24:59.981624197 -0500 6864+++ linux-2.6.32.10/arch/x86/include/asm/local.h 2010-03-20 15:58:46.921536877 -0400
6877@@ -18,26 +18,90 @@ typedef struct { 6865@@ -18,26 +18,90 @@ typedef struct {
6878 6866
6879 static inline void local_inc(local_t *l) 6867 static inline void local_inc(local_t *l)
@@ -7098,9 +7086,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/local.h linux-2.6.32.9/arch/x86/i
7098 : "+r" (i), "+m" (l->a.counter) 7086 : "+r" (i), "+m" (l->a.counter)
7099 : : "memory"); 7087 : : "memory");
7100 return i + __i; 7088 return i + __i;
7101diff -urNp linux-2.6.32.9/arch/x86/include/asm/microcode.h linux-2.6.32.9/arch/x86/include/asm/microcode.h 7089diff -urNp linux-2.6.32.10/arch/x86/include/asm/microcode.h linux-2.6.32.10/arch/x86/include/asm/microcode.h
7102--- linux-2.6.32.9/arch/x86/include/asm/microcode.h 2010-02-23 10:38:51.000000000 -0500 7090--- linux-2.6.32.10/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400
7103+++ linux-2.6.32.9/arch/x86/include/asm/microcode.h 2010-03-11 20:24:59.981624197 -0500 7091+++ linux-2.6.32.10/arch/x86/include/asm/microcode.h 2010-03-20 15:58:46.921536877 -0400
7104@@ -12,13 +12,13 @@ struct device; 7092@@ -12,13 +12,13 @@ struct device;
7105 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; 7093 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
7106 7094
@@ -7141,9 +7129,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/microcode.h linux-2.6.32.9/arch/x
7141 { 7129 {
7142 return NULL; 7130 return NULL;
7143 } 7131 }
7144diff -urNp linux-2.6.32.9/arch/x86/include/asm/mman.h linux-2.6.32.9/arch/x86/include/asm/mman.h 7132diff -urNp linux-2.6.32.10/arch/x86/include/asm/mman.h linux-2.6.32.10/arch/x86/include/asm/mman.h
7145--- linux-2.6.32.9/arch/x86/include/asm/mman.h 2010-02-23 10:38:51.000000000 -0500 7133--- linux-2.6.32.10/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400
7146+++ linux-2.6.32.9/arch/x86/include/asm/mman.h 2010-03-11 20:24:59.981624197 -0500 7134+++ linux-2.6.32.10/arch/x86/include/asm/mman.h 2010-03-20 15:58:46.921536877 -0400
7147@@ -5,4 +5,14 @@ 7135@@ -5,4 +5,14 @@
7148 7136
7149 #include <asm-generic/mman.h> 7137 #include <asm-generic/mman.h>
@@ -7159,9 +7147,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/mman.h linux-2.6.32.9/arch/x86/in
7159+#endif 7147+#endif
7160+ 7148+
7161 #endif /* _ASM_X86_MMAN_H */ 7149 #endif /* _ASM_X86_MMAN_H */
7162diff -urNp linux-2.6.32.9/arch/x86/include/asm/mmu_context.h linux-2.6.32.9/arch/x86/include/asm/mmu_context.h 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
7163--- linux-2.6.32.9/arch/x86/include/asm/mmu_context.h 2010-02-23 10:38:51.000000000 -0500 7151--- linux-2.6.32.10/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400
7164+++ linux-2.6.32.9/arch/x86/include/asm/mmu_context.h 2010-03-11 20:24:59.981624197 -0500 7152+++ linux-2.6.32.10/arch/x86/include/asm/mmu_context.h 2010-03-20 15:58:46.921536877 -0400
7165@@ -34,11 +34,17 @@ static inline void switch_mm(struct mm_s 7153@@ -34,11 +34,17 @@ static inline void switch_mm(struct mm_s
7166 struct task_struct *tsk) 7154 struct task_struct *tsk)
7167 { 7155 {
@@ -7227,9 +7215,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/mmu_context.h linux-2.6.32.9/arch
7227 } 7215 }
7228 } 7216 }
7229 #endif 7217 #endif
7230diff -urNp linux-2.6.32.9/arch/x86/include/asm/mmu.h linux-2.6.32.9/arch/x86/include/asm/mmu.h 7218diff -urNp linux-2.6.32.10/arch/x86/include/asm/mmu.h linux-2.6.32.10/arch/x86/include/asm/mmu.h
7231--- linux-2.6.32.9/arch/x86/include/asm/mmu.h 2010-02-23 10:38:51.000000000 -0500 7219--- linux-2.6.32.10/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400
7232+++ linux-2.6.32.9/arch/x86/include/asm/mmu.h 2010-03-11 20:24:59.981624197 -0500 7220+++ linux-2.6.32.10/arch/x86/include/asm/mmu.h 2010-03-20 15:58:46.921536877 -0400
7233@@ -9,10 +9,23 @@ 7221@@ -9,10 +9,23 @@
7234 * we put the segment information here. 7222 * we put the segment information here.
7235 */ 7223 */
@@ -7256,9 +7244,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/mmu.h linux-2.6.32.9/arch/x86/inc
7256 } mm_context_t; 7244 } mm_context_t;
7257 7245
7258 #ifdef CONFIG_SMP 7246 #ifdef CONFIG_SMP
7259diff -urNp linux-2.6.32.9/arch/x86/include/asm/module.h linux-2.6.32.9/arch/x86/include/asm/module.h 7247diff -urNp linux-2.6.32.10/arch/x86/include/asm/module.h linux-2.6.32.10/arch/x86/include/asm/module.h
7260--- linux-2.6.32.9/arch/x86/include/asm/module.h 2010-02-23 10:38:51.000000000 -0500 7248--- linux-2.6.32.10/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400
7261+++ linux-2.6.32.9/arch/x86/include/asm/module.h 2010-03-11 20:24:59.981624197 -0500 7249+++ linux-2.6.32.10/arch/x86/include/asm/module.h 2010-03-20 15:58:46.925538200 -0400
7262@@ -65,7 +65,12 @@ 7250@@ -65,7 +65,12 @@
7263 # else 7251 # else
7264 # define MODULE_STACKSIZE "" 7252 # define MODULE_STACKSIZE ""
@@ -7273,9 +7261,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/module.h linux-2.6.32.9/arch/x86/
7273 #endif 7261 #endif
7274 7262
7275 #endif /* _ASM_X86_MODULE_H */ 7263 #endif /* _ASM_X86_MODULE_H */
7276diff -urNp linux-2.6.32.9/arch/x86/include/asm/page_32_types.h linux-2.6.32.9/arch/x86/include/asm/page_32_types.h 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
7277--- linux-2.6.32.9/arch/x86/include/asm/page_32_types.h 2010-02-23 10:38:51.000000000 -0500 7265--- linux-2.6.32.10/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400
7278+++ linux-2.6.32.9/arch/x86/include/asm/page_32_types.h 2010-03-11 20:24:59.981624197 -0500 7266+++ linux-2.6.32.10/arch/x86/include/asm/page_32_types.h 2010-03-20 15:58:46.925538200 -0400
7279@@ -15,6 +15,10 @@ 7267@@ -15,6 +15,10 @@
7280 */ 7268 */
7281 #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) 7269 #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
@@ -7287,9 +7275,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/page_32_types.h linux-2.6.32.9/ar
7287 #ifdef CONFIG_4KSTACKS 7275 #ifdef CONFIG_4KSTACKS
7288 #define THREAD_ORDER 0 7276 #define THREAD_ORDER 0
7289 #else 7277 #else
7290diff -urNp linux-2.6.32.9/arch/x86/include/asm/page_64_types.h linux-2.6.32.9/arch/x86/include/asm/page_64_types.h 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
7291--- linux-2.6.32.9/arch/x86/include/asm/page_64_types.h 2010-02-23 10:38:51.000000000 -0500 7279--- linux-2.6.32.10/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400
7292+++ linux-2.6.32.9/arch/x86/include/asm/page_64_types.h 2010-03-11 20:24:59.981624197 -0500 7280+++ linux-2.6.32.10/arch/x86/include/asm/page_64_types.h 2010-03-20 15:58:46.925538200 -0400
7293@@ -39,6 +39,9 @@ 7281@@ -39,6 +39,9 @@
7294 #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) 7282 #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START)
7295 #define __START_KERNEL_map _AC(0xffffffff80000000, UL) 7283 #define __START_KERNEL_map _AC(0xffffffff80000000, UL)
@@ -7300,9 +7288,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/page_64_types.h linux-2.6.32.9/ar
7300 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ 7288 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
7301 #define __PHYSICAL_MASK_SHIFT 46 7289 #define __PHYSICAL_MASK_SHIFT 46
7302 #define __VIRTUAL_MASK_SHIFT 47 7290 #define __VIRTUAL_MASK_SHIFT 47
7303diff -urNp linux-2.6.32.9/arch/x86/include/asm/paravirt.h linux-2.6.32.9/arch/x86/include/asm/paravirt.h 7291diff -urNp linux-2.6.32.10/arch/x86/include/asm/paravirt.h linux-2.6.32.10/arch/x86/include/asm/paravirt.h
7304--- linux-2.6.32.9/arch/x86/include/asm/paravirt.h 2010-02-23 10:38:51.000000000 -0500 7292--- linux-2.6.32.10/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400
7305+++ linux-2.6.32.9/arch/x86/include/asm/paravirt.h 2010-03-11 20:25:04.609377560 -0500 7293+++ linux-2.6.32.10/arch/x86/include/asm/paravirt.h 2010-03-21 16:37:01.902719167 -0400
7306@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned 7294@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
7307 pv_mmu_ops.set_fixmap(idx, phys, flags); 7295 pv_mmu_ops.set_fixmap(idx, phys, flags);
7308 } 7296 }
@@ -7369,18 +7357,24 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/paravirt.h linux-2.6.32.9/arch/x8
7369 7357
7370 #else /* !CONFIG_X86_32 */ 7358 #else /* !CONFIG_X86_32 */
7371 7359
7372@@ -1022,6 +1065,46 @@ extern void default_banner(void); 7360@@ -1022,6 +1065,52 @@ extern void default_banner(void);
7373 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \ 7361 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
7374 CLBR_NONE, \ 7362 CLBR_NONE, \
7375 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit)) 7363 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
7376+ 7364+
7377+#ifdef CONFIG_PAX_KERNEXEC 7365+#ifdef CONFIG_PAX_KERNEXEC
7378+ .macro ljmpq sel, off 7366+ .macro ljmpq sel, off
7367+#if defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
7379+ .byte 0x48; ljmp *1234f(%rip) 7368+ .byte 0x48; ljmp *1234f(%rip)
7380+ .pushsection .rodata 7369+ .pushsection .rodata
7381+ .align 16 7370+ .align 16
7382+ 1234: .quad \off; .word \sel 7371+ 1234: .quad \off; .word \sel
7383+ .popsection 7372+ .popsection
7373+#else
7374+ push $\sel
7375+ push $\off
7376+ lretq
7377+#endif
7384+ .endm 7378+ .endm
7385+ 7379+
7386+#define PAX_EXIT_KERNEL \ 7380+#define PAX_EXIT_KERNEL \
@@ -7416,9 +7410,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/paravirt.h linux-2.6.32.9/arch/x8
7416 #endif /* CONFIG_X86_32 */ 7410 #endif /* CONFIG_X86_32 */
7417 7411
7418 #endif /* __ASSEMBLY__ */ 7412 #endif /* __ASSEMBLY__ */
7419diff -urNp linux-2.6.32.9/arch/x86/include/asm/paravirt_types.h linux-2.6.32.9/arch/x86/include/asm/paravirt_types.h 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
7420--- linux-2.6.32.9/arch/x86/include/asm/paravirt_types.h 2010-02-23 10:38:51.000000000 -0500 7414--- linux-2.6.32.10/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400
7421+++ linux-2.6.32.9/arch/x86/include/asm/paravirt_types.h 2010-03-11 20:24:59.985340824 -0500 7415+++ linux-2.6.32.10/arch/x86/include/asm/paravirt_types.h 2010-03-20 15:58:46.925538200 -0400
7422@@ -316,6 +316,12 @@ struct pv_mmu_ops { 7416@@ -316,6 +316,12 @@ struct pv_mmu_ops {
7423 an mfn. We can tell which is which from the index. */ 7417 an mfn. We can tell which is which from the index. */
7424 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, 7418 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
@@ -7432,9 +7426,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/paravirt_types.h linux-2.6.32.9/a
7432 }; 7426 };
7433 7427
7434 struct raw_spinlock; 7428 struct raw_spinlock;
7435diff -urNp linux-2.6.32.9/arch/x86/include/asm/pci_x86.h linux-2.6.32.9/arch/x86/include/asm/pci_x86.h 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
7436--- linux-2.6.32.9/arch/x86/include/asm/pci_x86.h 2010-02-23 10:38:51.000000000 -0500 7430--- linux-2.6.32.10/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400
7437+++ linux-2.6.32.9/arch/x86/include/asm/pci_x86.h 2010-03-11 20:24:59.985340824 -0500 7431+++ linux-2.6.32.10/arch/x86/include/asm/pci_x86.h 2010-03-20 15:58:46.925538200 -0400
7438@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct 7432@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
7439 extern void (*pcibios_disable_irq)(struct pci_dev *dev); 7433 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
7440 7434
@@ -7457,10 +7451,10 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/pci_x86.h linux-2.6.32.9/arch/x86
7457 extern bool port_cf9_safe; 7451 extern bool port_cf9_safe;
7458 7452
7459 /* arch_initcall level */ 7453 /* arch_initcall level */
7460diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgalloc.h linux-2.6.32.9/arch/x86/include/asm/pgalloc.h 7454diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgalloc.h linux-2.6.32.10/arch/x86/include/asm/pgalloc.h
7461--- linux-2.6.32.9/arch/x86/include/asm/pgalloc.h 2010-02-23 10:38:51.000000000 -0500 7455--- linux-2.6.32.10/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400
7462+++ linux-2.6.32.9/arch/x86/include/asm/pgalloc.h 2010-03-11 20:24:59.985340824 -0500 7456+++ linux-2.6.32.10/arch/x86/include/asm/pgalloc.h 2010-03-20 15:58:46.925538200 -0400
7463@@ -58,6 +58,13 @@ static inline void pmd_populate_kernel(s 7457@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
7464 pmd_t *pmd, pte_t *pte) 7458 pmd_t *pmd, pte_t *pte)
7465 { 7459 {
7466 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT); 7460 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
@@ -7474,9 +7468,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgalloc.h linux-2.6.32.9/arch/x86
7474 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); 7468 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
7475 } 7469 }
7476 7470
7477diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.9/arch/x86/include/asm/pgtable-2level.h 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
7478--- linux-2.6.32.9/arch/x86/include/asm/pgtable-2level.h 2010-02-23 10:38:51.000000000 -0500 7472--- linux-2.6.32.10/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400
7479+++ linux-2.6.32.9/arch/x86/include/asm/pgtable-2level.h 2010-03-11 20:24:59.985340824 -0500 7473+++ linux-2.6.32.10/arch/x86/include/asm/pgtable-2level.h 2010-03-20 15:58:46.925538200 -0400
7480@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 7474@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
7481 7475
7482 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 7476 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7487,9 +7481,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.9/a
7487 } 7481 }
7488 7482
7489 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) 7483 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
7490diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable_32.h linux-2.6.32.9/arch/x86/include/asm/pgtable_32.h 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
7491--- linux-2.6.32.9/arch/x86/include/asm/pgtable_32.h 2010-02-23 10:38:51.000000000 -0500 7485--- linux-2.6.32.10/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
7492+++ linux-2.6.32.9/arch/x86/include/asm/pgtable_32.h 2010-03-11 20:24:59.985340824 -0500 7486+++ linux-2.6.32.10/arch/x86/include/asm/pgtable_32.h 2010-03-20 15:58:46.925538200 -0400
7493@@ -26,8 +26,6 @@ 7487@@ -26,8 +26,6 @@
7494 struct mm_struct; 7488 struct mm_struct;
7495 struct vm_area_struct; 7489 struct vm_area_struct;
@@ -7531,9 +7525,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable_32.h linux-2.6.32.9/arch/
7531 /* 7525 /*
7532 * kern_addr_valid() is (1) for FLATMEM and (0) for 7526 * kern_addr_valid() is (1) for FLATMEM and (0) for
7533 * SPARSEMEM and DISCONTIGMEM 7527 * SPARSEMEM and DISCONTIGMEM
7534diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.9/arch/x86/include/asm/pgtable_32_types.h 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
7535--- linux-2.6.32.9/arch/x86/include/asm/pgtable_32_types.h 2010-02-23 10:38:51.000000000 -0500 7529--- linux-2.6.32.10/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400
7536+++ linux-2.6.32.9/arch/x86/include/asm/pgtable_32_types.h 2010-03-11 20:24:59.985340824 -0500 7530+++ linux-2.6.32.10/arch/x86/include/asm/pgtable_32_types.h 2010-03-20 15:58:46.925538200 -0400
7537@@ -8,7 +8,7 @@ 7531@@ -8,7 +8,7 @@
7538 */ 7532 */
7539 #ifdef CONFIG_X86_PAE 7533 #ifdef CONFIG_X86_PAE
@@ -7563,9 +7557,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.9
7563 #define MODULES_VADDR VMALLOC_START 7557 #define MODULES_VADDR VMALLOC_START
7564 #define MODULES_END VMALLOC_END 7558 #define MODULES_END VMALLOC_END
7565 #define MODULES_LEN (MODULES_VADDR - MODULES_END) 7559 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
7566diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.9/arch/x86/include/asm/pgtable-3level.h 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
7567--- linux-2.6.32.9/arch/x86/include/asm/pgtable-3level.h 2010-02-23 10:38:51.000000000 -0500 7561--- linux-2.6.32.10/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400
7568+++ linux-2.6.32.9/arch/x86/include/asm/pgtable-3level.h 2010-03-11 20:24:59.985340824 -0500 7562+++ linux-2.6.32.10/arch/x86/include/asm/pgtable-3level.h 2010-03-20 15:58:46.925538200 -0400
7569@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic 7563@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
7570 7564
7571 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 7565 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7583,9 +7577,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.9/a
7583 } 7577 }
7584 7578
7585 /* 7579 /*
7586diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable_64.h linux-2.6.32.9/arch/x86/include/asm/pgtable_64.h 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
7587--- linux-2.6.32.9/arch/x86/include/asm/pgtable_64.h 2010-02-23 10:38:51.000000000 -0500 7581--- linux-2.6.32.10/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400
7588+++ linux-2.6.32.9/arch/x86/include/asm/pgtable_64.h 2010-03-11 20:24:59.985340824 -0500 7582+++ linux-2.6.32.10/arch/x86/include/asm/pgtable_64.h 2010-03-20 15:58:46.925538200 -0400
7589@@ -16,9 +16,12 @@ 7583@@ -16,9 +16,12 @@
7590 7584
7591 extern pud_t level3_kernel_pgt[512]; 7585 extern pud_t level3_kernel_pgt[512];
@@ -7620,9 +7614,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable_64.h linux-2.6.32.9/arch/
7620 } 7614 }
7621 7615
7622 static inline void native_pgd_clear(pgd_t *pgd) 7616 static inline void native_pgd_clear(pgd_t *pgd)
7623diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable.h linux-2.6.32.9/arch/x86/include/asm/pgtable.h 7617diff -urNp linux-2.6.32.10/arch/x86/include/asm/pgtable.h linux-2.6.32.10/arch/x86/include/asm/pgtable.h
7624--- linux-2.6.32.9/arch/x86/include/asm/pgtable.h 2010-02-23 10:38:51.000000000 -0500 7618--- linux-2.6.32.10/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
7625+++ linux-2.6.32.9/arch/x86/include/asm/pgtable.h 2010-03-11 20:24:59.985340824 -0500 7619+++ linux-2.6.32.10/arch/x86/include/asm/pgtable.h 2010-03-20 15:58:46.925538200 -0400
7626@@ -74,12 +74,51 @@ extern struct list_head pgd_list; 7620@@ -74,12 +74,51 @@ extern struct list_head pgd_list;
7627 7621
7628 #define arch_end_context_switch(prev) do {} while(0) 7622 #define arch_end_context_switch(prev) do {} while(0)
@@ -7730,9 +7724,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable.h linux-2.6.32.9/arch/x86
7730 } 7724 }
7731 7725
7732 7726
7733diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable_types.h linux-2.6.32.9/arch/x86/include/asm/pgtable_types.h 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
7734--- linux-2.6.32.9/arch/x86/include/asm/pgtable_types.h 2010-02-23 10:38:51.000000000 -0500 7728--- linux-2.6.32.10/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400
7735+++ linux-2.6.32.9/arch/x86/include/asm/pgtable_types.h 2010-03-11 20:24:59.985340824 -0500 7729+++ linux-2.6.32.10/arch/x86/include/asm/pgtable_types.h 2010-03-20 15:58:46.925538200 -0400
7736@@ -16,12 +16,11 @@ 7730@@ -16,12 +16,11 @@
7737 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ 7731 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
7738 #define _PAGE_BIT_PAT 7 /* on 4KB pages */ 7732 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -7817,9 +7811,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable_types.h linux-2.6.32.9/ar
7817 7811
7818 #define pgprot_writecombine pgprot_writecombine 7812 #define pgprot_writecombine pgprot_writecombine
7819 extern pgprot_t pgprot_writecombine(pgprot_t prot); 7813 extern pgprot_t pgprot_writecombine(pgprot_t prot);
7820diff -urNp linux-2.6.32.9/arch/x86/include/asm/processor.h linux-2.6.32.9/arch/x86/include/asm/processor.h 7814diff -urNp linux-2.6.32.10/arch/x86/include/asm/processor.h linux-2.6.32.10/arch/x86/include/asm/processor.h
7821--- linux-2.6.32.9/arch/x86/include/asm/processor.h 2010-02-23 10:38:51.000000000 -0500 7815--- linux-2.6.32.10/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400
7822+++ linux-2.6.32.9/arch/x86/include/asm/processor.h 2010-03-11 20:24:59.985340824 -0500 7816+++ linux-2.6.32.10/arch/x86/include/asm/processor.h 2010-03-20 15:58:46.925538200 -0400
7823@@ -272,7 +272,7 @@ struct tss_struct { 7817@@ -272,7 +272,7 @@ struct tss_struct {
7824 7818
7825 } ____cacheline_aligned; 7819 } ____cacheline_aligned;
@@ -7897,9 +7891,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/processor.h linux-2.6.32.9/arch/x
7897 #define KSTK_EIP(task) (task_pt_regs(task)->ip) 7891 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
7898 7892
7899 /* Get/set a process' ability to use the timestamp counter instruction */ 7893 /* Get/set a process' ability to use the timestamp counter instruction */
7900diff -urNp linux-2.6.32.9/arch/x86/include/asm/ptrace.h linux-2.6.32.9/arch/x86/include/asm/ptrace.h 7894diff -urNp linux-2.6.32.10/arch/x86/include/asm/ptrace.h linux-2.6.32.10/arch/x86/include/asm/ptrace.h
7901--- linux-2.6.32.9/arch/x86/include/asm/ptrace.h 2010-02-23 10:38:51.000000000 -0500 7895--- linux-2.6.32.10/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400
7902+++ linux-2.6.32.9/arch/x86/include/asm/ptrace.h 2010-03-11 20:24:59.985340824 -0500 7896+++ linux-2.6.32.10/arch/x86/include/asm/ptrace.h 2010-03-20 15:58:46.925538200 -0400
7903@@ -151,28 +151,29 @@ static inline unsigned long regs_return_ 7897@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
7904 } 7898 }
7905 7899
@@ -7936,9 +7930,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/ptrace.h linux-2.6.32.9/arch/x86/
7936 #endif 7930 #endif
7937 } 7931 }
7938 7932
7939diff -urNp linux-2.6.32.9/arch/x86/include/asm/reboot.h linux-2.6.32.9/arch/x86/include/asm/reboot.h 7933diff -urNp linux-2.6.32.10/arch/x86/include/asm/reboot.h linux-2.6.32.10/arch/x86/include/asm/reboot.h
7940--- linux-2.6.32.9/arch/x86/include/asm/reboot.h 2010-02-23 10:38:51.000000000 -0500 7934--- linux-2.6.32.10/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400
7941+++ linux-2.6.32.9/arch/x86/include/asm/reboot.h 2010-03-11 20:24:59.985340824 -0500 7935+++ linux-2.6.32.10/arch/x86/include/asm/reboot.h 2010-03-20 15:58:46.925538200 -0400
7942@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; 7936@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
7943 7937
7944 void native_machine_crash_shutdown(struct pt_regs *regs); 7938 void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -7948,9 +7942,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/reboot.h linux-2.6.32.9/arch/x86/
7948 7942
7949 typedef void (*nmi_shootdown_cb)(int, struct die_args*); 7943 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
7950 void nmi_shootdown_cpus(nmi_shootdown_cb callback); 7944 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
7951diff -urNp linux-2.6.32.9/arch/x86/include/asm/rwsem.h linux-2.6.32.9/arch/x86/include/asm/rwsem.h 7945diff -urNp linux-2.6.32.10/arch/x86/include/asm/rwsem.h linux-2.6.32.10/arch/x86/include/asm/rwsem.h
7952--- linux-2.6.32.9/arch/x86/include/asm/rwsem.h 2010-02-23 10:38:51.000000000 -0500 7946--- linux-2.6.32.10/arch/x86/include/asm/rwsem.h 2010-03-15 11:52:04.000000000 -0400
7953+++ linux-2.6.32.9/arch/x86/include/asm/rwsem.h 2010-03-11 20:24:59.985340824 -0500 7947+++ linux-2.6.32.10/arch/x86/include/asm/rwsem.h 2010-03-20 15:58:46.925538200 -0400
7954@@ -106,10 +106,26 @@ static inline void __down_read(struct rw 7948@@ -106,10 +106,26 @@ static inline void __down_read(struct rw
7955 { 7949 {
7956 asm volatile("# beginning down_read\n\t" 7950 asm volatile("# beginning down_read\n\t"
@@ -8183,9 +8177,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/rwsem.h linux-2.6.32.9/arch/x86/i
8183 : "+r" (tmp), "+m" (sem->count) 8177 : "+r" (tmp), "+m" (sem->count)
8184 : : "memory"); 8178 : : "memory");
8185 8179
8186diff -urNp linux-2.6.32.9/arch/x86/include/asm/segment.h linux-2.6.32.9/arch/x86/include/asm/segment.h 8180diff -urNp linux-2.6.32.10/arch/x86/include/asm/segment.h linux-2.6.32.10/arch/x86/include/asm/segment.h
8187--- linux-2.6.32.9/arch/x86/include/asm/segment.h 2010-02-23 10:38:51.000000000 -0500 8181--- linux-2.6.32.10/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400
8188+++ linux-2.6.32.9/arch/x86/include/asm/segment.h 2010-03-11 20:24:59.985340824 -0500 8182+++ linux-2.6.32.10/arch/x86/include/asm/segment.h 2010-03-20 15:58:46.925538200 -0400
8189@@ -62,8 +62,8 @@ 8183@@ -62,8 +62,8 @@
8190 * 26 - ESPFIX small SS 8184 * 26 - ESPFIX small SS
8191 * 27 - per-cpu [ offset to per-cpu data area ] 8185 * 27 - per-cpu [ offset to per-cpu data area ]
@@ -8254,9 +8248,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/segment.h linux-2.6.32.9/arch/x86
8254 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) 8248 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
8255 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) 8249 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
8256 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) 8250 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
8257diff -urNp linux-2.6.32.9/arch/x86/include/asm/spinlock.h linux-2.6.32.9/arch/x86/include/asm/spinlock.h 8251diff -urNp linux-2.6.32.10/arch/x86/include/asm/spinlock.h linux-2.6.32.10/arch/x86/include/asm/spinlock.h
8258--- linux-2.6.32.9/arch/x86/include/asm/spinlock.h 2010-02-23 10:38:51.000000000 -0500 8252--- linux-2.6.32.10/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400
8259+++ linux-2.6.32.9/arch/x86/include/asm/spinlock.h 2010-03-11 20:24:59.985340824 -0500 8253+++ linux-2.6.32.10/arch/x86/include/asm/spinlock.h 2010-03-20 15:58:46.930703824 -0400
8260@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r 8254@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r
8261 static inline void __raw_read_lock(raw_rwlock_t *rw) 8255 static inline void __raw_read_lock(raw_rwlock_t *rw)
8262 { 8256 {
@@ -8360,9 +8354,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/spinlock.h linux-2.6.32.9/arch/x8
8360 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); 8354 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
8361 } 8355 }
8362 8356
8363diff -urNp linux-2.6.32.9/arch/x86/include/asm/system.h linux-2.6.32.9/arch/x86/include/asm/system.h 8357diff -urNp linux-2.6.32.10/arch/x86/include/asm/system.h linux-2.6.32.10/arch/x86/include/asm/system.h
8364--- linux-2.6.32.9/arch/x86/include/asm/system.h 2010-02-23 10:38:51.000000000 -0500 8358--- linux-2.6.32.10/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
8365+++ linux-2.6.32.9/arch/x86/include/asm/system.h 2010-03-11 20:24:59.985340824 -0500 8359+++ linux-2.6.32.10/arch/x86/include/asm/system.h 2010-03-20 15:58:46.930703824 -0400
8366@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un 8360@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
8367 { 8361 {
8368 unsigned long __limit; 8362 unsigned long __limit;
@@ -8381,9 +8375,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/system.h linux-2.6.32.9/arch/x86/
8381 extern void free_init_pages(char *what, unsigned long begin, unsigned long end); 8375 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
8382 8376
8383 void default_idle(void); 8377 void default_idle(void);
8384diff -urNp linux-2.6.32.9/arch/x86/include/asm/uaccess_32.h linux-2.6.32.9/arch/x86/include/asm/uaccess_32.h 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
8385--- linux-2.6.32.9/arch/x86/include/asm/uaccess_32.h 2010-02-23 10:38:51.000000000 -0500 8379--- linux-2.6.32.10/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
8386+++ linux-2.6.32.9/arch/x86/include/asm/uaccess_32.h 2010-03-11 20:24:59.985340824 -0500 8380+++ linux-2.6.32.10/arch/x86/include/asm/uaccess_32.h 2010-03-20 15:58:46.930703824 -0400
8387@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u 8381@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
8388 static __always_inline unsigned long __must_check 8382 static __always_inline unsigned long __must_check
8389 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) 8383 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -8513,9 +8507,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/uaccess_32.h linux-2.6.32.9/arch/
8513 long __must_check strncpy_from_user(char *dst, const char __user *src, 8507 long __must_check strncpy_from_user(char *dst, const char __user *src,
8514 long count); 8508 long count);
8515 long __must_check __strncpy_from_user(char *dst, 8509 long __must_check __strncpy_from_user(char *dst,
8516diff -urNp linux-2.6.32.9/arch/x86/include/asm/uaccess_64.h linux-2.6.32.9/arch/x86/include/asm/uaccess_64.h 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
8517--- linux-2.6.32.9/arch/x86/include/asm/uaccess_64.h 2010-02-23 10:38:51.000000000 -0500 8511--- linux-2.6.32.10/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
8518+++ linux-2.6.32.9/arch/x86/include/asm/uaccess_64.h 2010-03-11 20:24:59.985340824 -0500 8512+++ linux-2.6.32.10/arch/x86/include/asm/uaccess_64.h 2010-03-20 15:58:46.930703824 -0400
8519@@ -10,6 +10,8 @@ 8513@@ -10,6 +10,8 @@
8520 #include <linux/lockdep.h> 8514 #include <linux/lockdep.h>
8521 #include <asm/page.h> 8515 #include <asm/page.h>
@@ -8666,9 +8660,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/uaccess_64.h linux-2.6.32.9/arch/
8666 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); 8660 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
8667 8661
8668 #endif /* _ASM_X86_UACCESS_64_H */ 8662 #endif /* _ASM_X86_UACCESS_64_H */
8669diff -urNp linux-2.6.32.9/arch/x86/include/asm/uaccess.h linux-2.6.32.9/arch/x86/include/asm/uaccess.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
8670--- linux-2.6.32.9/arch/x86/include/asm/uaccess.h 2010-02-23 10:38:51.000000000 -0500 8664--- linux-2.6.32.10/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
8671+++ linux-2.6.32.9/arch/x86/include/asm/uaccess.h 2010-03-11 20:25:04.609377560 -0500 8665+++ linux-2.6.32.10/arch/x86/include/asm/uaccess.h 2010-03-20 15:58:46.930703824 -0400
8672@@ -8,8 +8,11 @@ 8666@@ -8,8 +8,11 @@
8673 #include <linux/thread_info.h> 8667 #include <linux/thread_info.h>
8674 #include <linux/prefetch.h> 8668 #include <linux/prefetch.h>
@@ -8871,9 +8865,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/uaccess.h linux-2.6.32.9/arch/x86
8871 #ifdef CONFIG_X86_32 8865 #ifdef CONFIG_X86_32
8872 # include "uaccess_32.h" 8866 # include "uaccess_32.h"
8873 #else 8867 #else
8874diff -urNp linux-2.6.32.9/arch/x86/include/asm/vgtod.h linux-2.6.32.9/arch/x86/include/asm/vgtod.h 8868diff -urNp linux-2.6.32.10/arch/x86/include/asm/vgtod.h linux-2.6.32.10/arch/x86/include/asm/vgtod.h
8875--- linux-2.6.32.9/arch/x86/include/asm/vgtod.h 2010-02-23 10:38:51.000000000 -0500 8869--- linux-2.6.32.10/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400
8876+++ linux-2.6.32.9/arch/x86/include/asm/vgtod.h 2010-03-11 20:24:59.985340824 -0500 8870+++ linux-2.6.32.10/arch/x86/include/asm/vgtod.h 2010-03-20 15:58:46.930703824 -0400
8877@@ -14,6 +14,7 @@ struct vsyscall_gtod_data { 8871@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
8878 int sysctl_enabled; 8872 int sysctl_enabled;
8879 struct timezone sys_tz; 8873 struct timezone sys_tz;
@@ -8882,9 +8876,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/vgtod.h linux-2.6.32.9/arch/x86/i
8882 cycle_t (*vread)(void); 8876 cycle_t (*vread)(void);
8883 cycle_t cycle_last; 8877 cycle_t cycle_last;
8884 cycle_t mask; 8878 cycle_t mask;
8885diff -urNp linux-2.6.32.9/arch/x86/include/asm/vmi.h linux-2.6.32.9/arch/x86/include/asm/vmi.h 8879diff -urNp linux-2.6.32.10/arch/x86/include/asm/vmi.h linux-2.6.32.10/arch/x86/include/asm/vmi.h
8886--- linux-2.6.32.9/arch/x86/include/asm/vmi.h 2010-02-23 10:38:51.000000000 -0500 8880--- linux-2.6.32.10/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400
8887+++ linux-2.6.32.9/arch/x86/include/asm/vmi.h 2010-03-11 20:24:59.985340824 -0500 8881+++ linux-2.6.32.10/arch/x86/include/asm/vmi.h 2010-03-20 15:58:46.930703824 -0400
8888@@ -191,6 +191,7 @@ struct vrom_header { 8882@@ -191,6 +191,7 @@ struct vrom_header {
8889 u8 reserved[96]; /* Reserved for headers */ 8883 u8 reserved[96]; /* Reserved for headers */
8890 char vmi_init[8]; /* VMI_Init jump point */ 8884 char vmi_init[8]; /* VMI_Init jump point */
@@ -8893,9 +8887,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/vmi.h linux-2.6.32.9/arch/x86/inc
8893 } __attribute__((packed)); 8887 } __attribute__((packed));
8894 8888
8895 struct pnp_header { 8889 struct pnp_header {
8896diff -urNp linux-2.6.32.9/arch/x86/include/asm/vsyscall.h linux-2.6.32.9/arch/x86/include/asm/vsyscall.h 8890diff -urNp linux-2.6.32.10/arch/x86/include/asm/vsyscall.h linux-2.6.32.10/arch/x86/include/asm/vsyscall.h
8897--- linux-2.6.32.9/arch/x86/include/asm/vsyscall.h 2010-02-23 10:38:51.000000000 -0500 8891--- linux-2.6.32.10/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400
8898+++ linux-2.6.32.9/arch/x86/include/asm/vsyscall.h 2010-03-11 20:24:59.985340824 -0500 8892+++ linux-2.6.32.10/arch/x86/include/asm/vsyscall.h 2010-03-20 15:58:46.930703824 -0400
8899@@ -15,9 +15,10 @@ enum vsyscall_num { 8893@@ -15,9 +15,10 @@ enum vsyscall_num {
8900 8894
8901 #ifdef __KERNEL__ 8895 #ifdef __KERNEL__
@@ -8926,9 +8920,9 @@ diff -urNp linux-2.6.32.9/arch/x86/include/asm/vsyscall.h linux-2.6.32.9/arch/x8
8926 #endif /* __KERNEL__ */ 8920 #endif /* __KERNEL__ */
8927 8921
8928 #endif /* _ASM_X86_VSYSCALL_H */ 8922 #endif /* _ASM_X86_VSYSCALL_H */
8929diff -urNp linux-2.6.32.9/arch/x86/Kconfig linux-2.6.32.9/arch/x86/Kconfig 8923diff -urNp linux-2.6.32.10/arch/x86/Kconfig linux-2.6.32.10/arch/x86/Kconfig
8930--- linux-2.6.32.9/arch/x86/Kconfig 2010-02-23 10:38:51.000000000 -0500 8924--- linux-2.6.32.10/arch/x86/Kconfig 2010-03-15 11:52:04.000000000 -0400
8931+++ linux-2.6.32.9/arch/x86/Kconfig 2010-03-11 20:24:59.989436952 -0500 8925+++ linux-2.6.32.10/arch/x86/Kconfig 2010-03-20 15:58:46.930703824 -0400
8932@@ -1083,7 +1083,7 @@ config PAGE_OFFSET 8926@@ -1083,7 +1083,7 @@ config PAGE_OFFSET
8933 hex 8927 hex
8934 default 0xB0000000 if VMSPLIT_3G_OPT 8928 default 0xB0000000 if VMSPLIT_3G_OPT
@@ -8975,9 +8969,9 @@ diff -urNp linux-2.6.32.9/arch/x86/Kconfig linux-2.6.32.9/arch/x86/Kconfig
8975 ---help--- 8969 ---help---
8976 Map the 32-bit VDSO to the predictable old-style address too. 8970 Map the 32-bit VDSO to the predictable old-style address too.
8977 ---help--- 8971 ---help---
8978diff -urNp linux-2.6.32.9/arch/x86/Kconfig.cpu linux-2.6.32.9/arch/x86/Kconfig.cpu 8972diff -urNp linux-2.6.32.10/arch/x86/Kconfig.cpu linux-2.6.32.10/arch/x86/Kconfig.cpu
8979--- linux-2.6.32.9/arch/x86/Kconfig.cpu 2010-02-23 10:38:51.000000000 -0500 8973--- linux-2.6.32.10/arch/x86/Kconfig.cpu 2010-03-15 11:52:04.000000000 -0400
8980+++ linux-2.6.32.9/arch/x86/Kconfig.cpu 2010-03-11 20:24:59.989436952 -0500 8974+++ linux-2.6.32.10/arch/x86/Kconfig.cpu 2010-03-20 15:58:46.930703824 -0400
8981@@ -340,7 +340,7 @@ config X86_PPRO_FENCE 8975@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
8982 8976
8983 config X86_F00F_BUG 8977 config X86_F00F_BUG
@@ -9005,9 +8999,9 @@ diff -urNp linux-2.6.32.9/arch/x86/Kconfig.cpu linux-2.6.32.9/arch/x86/Kconfig.c
9005 8999
9006 config X86_MINIMUM_CPU_FAMILY 9000 config X86_MINIMUM_CPU_FAMILY
9007 int 9001 int
9008diff -urNp linux-2.6.32.9/arch/x86/Kconfig.debug linux-2.6.32.9/arch/x86/Kconfig.debug 9002diff -urNp linux-2.6.32.10/arch/x86/Kconfig.debug linux-2.6.32.10/arch/x86/Kconfig.debug
9009--- linux-2.6.32.9/arch/x86/Kconfig.debug 2010-02-23 10:38:51.000000000 -0500 9003--- linux-2.6.32.10/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400
9010+++ linux-2.6.32.9/arch/x86/Kconfig.debug 2010-03-11 20:24:59.989436952 -0500 9004+++ linux-2.6.32.10/arch/x86/Kconfig.debug 2010-03-20 15:58:46.930703824 -0400
9011@@ -99,7 +99,7 @@ config X86_PTDUMP 9005@@ -99,7 +99,7 @@ config X86_PTDUMP
9012 config DEBUG_RODATA 9006 config DEBUG_RODATA
9013 bool "Write protect kernel read-only data structures" 9007 bool "Write protect kernel read-only data structures"
@@ -9017,10 +9011,10 @@ diff -urNp linux-2.6.32.9/arch/x86/Kconfig.debug linux-2.6.32.9/arch/x86/Kconfig
9017 ---help--- 9011 ---help---
9018 Mark the kernel read-only data as write-protected in the pagetables, 9012 Mark the kernel read-only data as write-protected in the pagetables,
9019 in order to catch accidental (and incorrect) writes to such const 9013 in order to catch accidental (and incorrect) writes to such const
9020diff -urNp linux-2.6.32.9/arch/x86/kernel/acpi/boot.c linux-2.6.32.9/arch/x86/kernel/acpi/boot.c 9014diff -urNp linux-2.6.32.10/arch/x86/kernel/acpi/boot.c linux-2.6.32.10/arch/x86/kernel/acpi/boot.c
9021--- linux-2.6.32.9/arch/x86/kernel/acpi/boot.c 2010-02-23 10:38:51.000000000 -0500 9015--- linux-2.6.32.10/arch/x86/kernel/acpi/boot.c 2010-03-15 11:52:04.000000000 -0400
9022+++ linux-2.6.32.9/arch/x86/kernel/acpi/boot.c 2010-03-11 20:24:59.989436952 -0500 9016+++ linux-2.6.32.10/arch/x86/kernel/acpi/boot.c 2010-03-20 15:58:46.930703824 -0400
9023@@ -1508,7 +1508,7 @@ static struct dmi_system_id __initdata a 9017@@ -1507,7 +1507,7 @@ static struct dmi_system_id __initdata a
9024 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), 9018 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
9025 }, 9019 },
9026 }, 9020 },
@@ -9029,9 +9023,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/acpi/boot.c linux-2.6.32.9/arch/x86/ke
9029 }; 9023 };
9030 9024
9031 /* 9025 /*
9032diff -urNp linux-2.6.32.9/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.9/arch/x86/kernel/acpi/realmode/wakeup.S 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
9033--- linux-2.6.32.9/arch/x86/kernel/acpi/realmode/wakeup.S 2010-02-23 10:38:51.000000000 -0500 9027--- linux-2.6.32.10/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400
9034+++ linux-2.6.32.9/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-11 20:24:59.989436952 -0500 9028+++ linux-2.6.32.10/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-20 15:58:46.930703824 -0400
9035@@ -104,7 +104,7 @@ _start: 9029@@ -104,7 +104,7 @@ _start:
9036 movl %eax, %ecx 9030 movl %eax, %ecx
9037 orl %edx, %ecx 9031 orl %edx, %ecx
@@ -9041,9 +9035,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.9/
9041 wrmsr 9035 wrmsr
9042 1: 9036 1:
9043 9037
9044diff -urNp linux-2.6.32.9/arch/x86/kernel/acpi/sleep.c linux-2.6.32.9/arch/x86/kernel/acpi/sleep.c 9038diff -urNp linux-2.6.32.10/arch/x86/kernel/acpi/sleep.c linux-2.6.32.10/arch/x86/kernel/acpi/sleep.c
9045--- linux-2.6.32.9/arch/x86/kernel/acpi/sleep.c 2010-02-23 10:38:51.000000000 -0500 9039--- linux-2.6.32.10/arch/x86/kernel/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400
9046+++ linux-2.6.32.9/arch/x86/kernel/acpi/sleep.c 2010-03-11 20:24:59.989436952 -0500 9040+++ linux-2.6.32.10/arch/x86/kernel/acpi/sleep.c 2010-03-20 15:58:46.930703824 -0400
9047@@ -11,11 +11,12 @@ 9041@@ -11,11 +11,12 @@
9048 #include <linux/cpumask.h> 9042 #include <linux/cpumask.h>
9049 #include <asm/segment.h> 9043 #include <asm/segment.h>
@@ -9088,9 +9082,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/acpi/sleep.c linux-2.6.32.9/arch/x86/k
9088 } 9082 }
9089 9083
9090 9084
9091diff -urNp linux-2.6.32.9/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.9/arch/x86/kernel/acpi/wakeup_32.S 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
9092--- linux-2.6.32.9/arch/x86/kernel/acpi/wakeup_32.S 2010-02-23 10:38:51.000000000 -0500 9086--- linux-2.6.32.10/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400
9093+++ linux-2.6.32.9/arch/x86/kernel/acpi/wakeup_32.S 2010-03-11 20:24:59.989436952 -0500 9087+++ linux-2.6.32.10/arch/x86/kernel/acpi/wakeup_32.S 2010-03-20 15:58:46.930703824 -0400
9094@@ -30,13 +30,11 @@ wakeup_pmode_return: 9088@@ -30,13 +30,11 @@ wakeup_pmode_return:
9095 # and restore the stack ... but you need gdt for this to work 9089 # and restore the stack ... but you need gdt for this to work
9096 movl saved_context_esp, %esp 9090 movl saved_context_esp, %esp
@@ -9107,9 +9101,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.9/arch/x
9107 9101
9108 bogus_magic: 9102 bogus_magic:
9109 jmp bogus_magic 9103 jmp bogus_magic
9110diff -urNp linux-2.6.32.9/arch/x86/kernel/alternative.c linux-2.6.32.9/arch/x86/kernel/alternative.c 9104diff -urNp linux-2.6.32.10/arch/x86/kernel/alternative.c linux-2.6.32.10/arch/x86/kernel/alternative.c
9111--- linux-2.6.32.9/arch/x86/kernel/alternative.c 2010-02-23 10:38:51.000000000 -0500 9105--- linux-2.6.32.10/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400
9112+++ linux-2.6.32.9/arch/x86/kernel/alternative.c 2010-03-11 20:24:59.989436952 -0500 9106+++ linux-2.6.32.10/arch/x86/kernel/alternative.c 2010-03-20 15:58:46.933535080 -0400
9113@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str 9107@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
9114 9108
9115 BUG_ON(p->len > MAX_PATCH_LEN); 9109 BUG_ON(p->len > MAX_PATCH_LEN);
@@ -9182,9 +9176,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/alternative.c linux-2.6.32.9/arch/x86/
9182+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); 9176+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]);
9183 return addr; 9177 return addr;
9184 } 9178 }
9185diff -urNp linux-2.6.32.9/arch/x86/kernel/amd_iommu.c linux-2.6.32.9/arch/x86/kernel/amd_iommu.c 9179diff -urNp linux-2.6.32.10/arch/x86/kernel/amd_iommu.c linux-2.6.32.10/arch/x86/kernel/amd_iommu.c
9186--- linux-2.6.32.9/arch/x86/kernel/amd_iommu.c 2010-02-23 10:38:51.000000000 -0500 9180--- linux-2.6.32.10/arch/x86/kernel/amd_iommu.c 2010-03-15 11:52:04.000000000 -0400
9187+++ linux-2.6.32.9/arch/x86/kernel/amd_iommu.c 2010-03-11 20:24:59.989436952 -0500 9181+++ linux-2.6.32.10/arch/x86/kernel/amd_iommu.c 2010-03-20 15:58:46.933535080 -0400
9188@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( 9182@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains(
9189 } 9183 }
9190 } 9184 }
@@ -9194,9 +9188,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/amd_iommu.c linux-2.6.32.9/arch/x86/ke
9194 .alloc_coherent = alloc_coherent, 9188 .alloc_coherent = alloc_coherent,
9195 .free_coherent = free_coherent, 9189 .free_coherent = free_coherent,
9196 .map_page = map_page, 9190 .map_page = map_page,
9197diff -urNp linux-2.6.32.9/arch/x86/kernel/apic/io_apic.c linux-2.6.32.9/arch/x86/kernel/apic/io_apic.c 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
9198--- linux-2.6.32.9/arch/x86/kernel/apic/io_apic.c 2010-02-23 10:38:51.000000000 -0500 9192--- linux-2.6.32.10/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400
9199+++ linux-2.6.32.9/arch/x86/kernel/apic/io_apic.c 2010-03-11 20:24:59.989436952 -0500 9193+++ linux-2.6.32.10/arch/x86/kernel/apic/io_apic.c 2010-03-20 15:58:46.933535080 -0400
9200@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi 9194@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi
9201 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, 9195 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
9202 GFP_ATOMIC); 9196 GFP_ATOMIC);
@@ -9233,9 +9227,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/apic/io_apic.c linux-2.6.32.9/arch/x86
9233 { 9227 {
9234 spin_unlock(&vector_lock); 9228 spin_unlock(&vector_lock);
9235 } 9229 }
9236diff -urNp linux-2.6.32.9/arch/x86/kernel/apm_32.c linux-2.6.32.9/arch/x86/kernel/apm_32.c 9230diff -urNp linux-2.6.32.10/arch/x86/kernel/apm_32.c linux-2.6.32.10/arch/x86/kernel/apm_32.c
9237--- linux-2.6.32.9/arch/x86/kernel/apm_32.c 2010-02-23 10:38:51.000000000 -0500 9231--- linux-2.6.32.10/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400
9238+++ linux-2.6.32.9/arch/x86/kernel/apm_32.c 2010-03-11 20:24:59.989436952 -0500 9232+++ linux-2.6.32.10/arch/x86/kernel/apm_32.c 2010-03-20 15:58:46.933535080 -0400
9239@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); 9233@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
9240 * This is for buggy BIOS's that refer to (real mode) segment 0x40 9234 * This is for buggy BIOS's that refer to (real mode) segment 0x40
9241 * even though they are called in protected mode. 9235 * even though they are called in protected mode.
@@ -9337,9 +9331,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/apm_32.c linux-2.6.32.9/arch/x86/kerne
9337 9331
9338 proc_create("apm", 0, NULL, &apm_file_ops); 9332 proc_create("apm", 0, NULL, &apm_file_ops);
9339 9333
9340diff -urNp linux-2.6.32.9/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.9/arch/x86/kernel/asm-offsets_32.c 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
9341--- linux-2.6.32.9/arch/x86/kernel/asm-offsets_32.c 2010-02-23 10:38:51.000000000 -0500 9335--- linux-2.6.32.10/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400
9342+++ linux-2.6.32.9/arch/x86/kernel/asm-offsets_32.c 2010-03-11 20:24:59.989436952 -0500 9336+++ linux-2.6.32.10/arch/x86/kernel/asm-offsets_32.c 2010-03-20 15:58:46.933535080 -0400
9343@@ -115,6 +115,11 @@ void foo(void) 9337@@ -115,6 +115,11 @@ void foo(void)
9344 OFFSET(PV_CPU_iret, pv_cpu_ops, iret); 9338 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
9345 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 9339 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
@@ -9352,9 +9346,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.9/arch/x
9352 #endif 9346 #endif
9353 9347
9354 #ifdef CONFIG_XEN 9348 #ifdef CONFIG_XEN
9355diff -urNp linux-2.6.32.9/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.9/arch/x86/kernel/asm-offsets_64.c 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
9356--- linux-2.6.32.9/arch/x86/kernel/asm-offsets_64.c 2010-02-23 10:38:51.000000000 -0500 9350--- linux-2.6.32.10/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400
9357+++ linux-2.6.32.9/arch/x86/kernel/asm-offsets_64.c 2010-03-11 20:24:59.989436952 -0500 9351+++ linux-2.6.32.10/arch/x86/kernel/asm-offsets_64.c 2010-03-20 15:58:46.933535080 -0400
9358@@ -63,6 +63,12 @@ int main(void) 9352@@ -63,6 +63,12 @@ int main(void)
9359 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 9353 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
9360 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); 9354 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
@@ -9376,9 +9370,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.9/arch/x
9376 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); 9370 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
9377 BLANK(); 9371 BLANK();
9378 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); 9372 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
9379diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/common.c linux-2.6.32.9/arch/x86/kernel/cpu/common.c 9373diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/common.c linux-2.6.32.10/arch/x86/kernel/cpu/common.c
9380--- linux-2.6.32.9/arch/x86/kernel/cpu/common.c 2010-02-23 10:38:51.000000000 -0500 9374--- linux-2.6.32.10/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400
9381+++ linux-2.6.32.9/arch/x86/kernel/cpu/common.c 2010-03-11 20:24:59.989436952 -0500 9375+++ linux-2.6.32.10/arch/x86/kernel/cpu/common.c 2010-03-20 15:58:46.933535080 -0400
9382@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon 9376@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
9383 9377
9384 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; 9378 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -9478,9 +9472,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/common.c linux-2.6.32.9/arch/x86/k
9478 struct thread_struct *thread = &curr->thread; 9472 struct thread_struct *thread = &curr->thread;
9479 9473
9480 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { 9474 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
9481diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 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
9482--- linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-02-23 10:38:51.000000000 -0500 9476--- linux-2.6.32.10/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400
9483+++ linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-11 20:24:59.989436952 -0500 9477+++ linux-2.6.32.10/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-20 15:58:46.933535080 -0400
9484@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any 9478@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
9485 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), 9479 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
9486 }, 9480 },
@@ -9490,9 +9484,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.3
9490 }; 9484 };
9491 9485
9492 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) 9486 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
9493diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 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
9494--- linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-02-23 10:38:51.000000000 -0500 9488--- linux-2.6.32.10/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400
9495+++ linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-11 20:24:59.993366078 -0500 9489+++ linux-2.6.32.10/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-20 15:58:46.933535080 -0400
9496@@ -225,7 +225,7 @@ static struct cpu_model models[] = 9490@@ -225,7 +225,7 @@ static struct cpu_model models[] =
9497 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, 9491 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
9498 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, 9492 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
@@ -9502,9 +9496,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux
9502 }; 9496 };
9503 #undef _BANIAS 9497 #undef _BANIAS
9504 #undef BANIAS 9498 #undef BANIAS
9505diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/intel.c linux-2.6.32.9/arch/x86/kernel/cpu/intel.c 9499diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/intel.c linux-2.6.32.10/arch/x86/kernel/cpu/intel.c
9506--- linux-2.6.32.9/arch/x86/kernel/cpu/intel.c 2010-02-23 10:38:51.000000000 -0500 9500--- linux-2.6.32.10/arch/x86/kernel/cpu/intel.c 2010-03-15 11:52:04.000000000 -0400
9507+++ linux-2.6.32.9/arch/x86/kernel/cpu/intel.c 2010-03-11 20:24:59.993366078 -0500 9501+++ linux-2.6.32.10/arch/x86/kernel/cpu/intel.c 2010-03-20 15:58:46.933535080 -0400
9508@@ -139,7 +139,7 @@ static void __cpuinit trap_init_f00f_bug 9502@@ -139,7 +139,7 @@ static void __cpuinit trap_init_f00f_bug
9509 * Update the IDT descriptor and reload the IDT so that 9503 * Update the IDT descriptor and reload the IDT so that
9510 * it uses the read-only mapped virtual address. 9504 * it uses the read-only mapped virtual address.
@@ -9514,9 +9508,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/intel.c linux-2.6.32.9/arch/x86/ke
9514 load_idt(&idt_descr); 9508 load_idt(&idt_descr);
9515 } 9509 }
9516 #endif 9510 #endif
9517diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.9/arch/x86/kernel/cpu/intel_cacheinfo.c 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
9518--- linux-2.6.32.9/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-02-23 10:38:51.000000000 -0500 9512--- linux-2.6.32.10/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-03-15 11:52:04.000000000 -0400
9519+++ linux-2.6.32.9/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-03-11 20:24:59.993366078 -0500 9513+++ linux-2.6.32.10/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-03-20 15:58:46.933535080 -0400
9520@@ -863,7 +863,7 @@ static ssize_t store(struct kobject *kob 9514@@ -863,7 +863,7 @@ static ssize_t store(struct kobject *kob
9521 return ret; 9515 return ret;
9522 } 9516 }
@@ -9526,9 +9520,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.9/a
9526 .show = show, 9520 .show = show,
9527 .store = store, 9521 .store = store,
9528 }; 9522 };
9529diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/Makefile linux-2.6.32.9/arch/x86/kernel/cpu/Makefile 9523diff -urNp linux-2.6.32.10/arch/x86/kernel/cpu/Makefile linux-2.6.32.10/arch/x86/kernel/cpu/Makefile
9530--- linux-2.6.32.9/arch/x86/kernel/cpu/Makefile 2010-02-23 10:38:51.000000000 -0500 9524--- linux-2.6.32.10/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400
9531+++ linux-2.6.32.9/arch/x86/kernel/cpu/Makefile 2010-03-11 20:24:59.993366078 -0500 9525+++ linux-2.6.32.10/arch/x86/kernel/cpu/Makefile 2010-03-20 15:58:46.933535080 -0400
9532@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER 9526@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
9533 CFLAGS_REMOVE_common.o = -pg 9527 CFLAGS_REMOVE_common.o = -pg
9534 endif 9528 endif
@@ -9540,9 +9534,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/Makefile linux-2.6.32.9/arch/x86/k
9540 obj-y := intel_cacheinfo.o addon_cpuid_features.o 9534 obj-y := intel_cacheinfo.o addon_cpuid_features.o
9541 obj-y += proc.o capflags.o powerflags.o common.o 9535 obj-y += proc.o capflags.o powerflags.o common.o
9542 obj-y += vmware.o hypervisor.o sched.o 9536 obj-y += vmware.o hypervisor.o sched.o
9543diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce_amd.c 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
9544--- linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-02-23 10:38:51.000000000 -0500 9538--- linux-2.6.32.10/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400
9545+++ linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-11 20:24:59.993366078 -0500 9539+++ linux-2.6.32.10/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-20 15:58:46.933535080 -0400
9546@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob 9540@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob
9547 return ret; 9541 return ret;
9548 } 9542 }
@@ -9552,9 +9546,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.9/ar
9552 .show = show, 9546 .show = show,
9553 .store = store, 9547 .store = store,
9554 }; 9548 };
9555diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce.c 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
9556--- linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce.c 2010-02-23 10:38:51.000000000 -0500 9550--- linux-2.6.32.10/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400
9557+++ linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-11 20:24:59.993366078 -0500 9551+++ linux-2.6.32.10/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-20 15:58:46.933535080 -0400
9558@@ -187,7 +187,7 @@ static void print_mce(struct mce *m) 9552@@ -187,7 +187,7 @@ static void print_mce(struct mce *m)
9559 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", 9553 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
9560 m->cs, m->ip); 9554 m->cs, m->ip);
@@ -9607,9 +9601,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.9/arch/x
9607 }; 9601 };
9608 9602
9609 /* 9603 /*
9610diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/amd.c 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
9611--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/amd.c 2010-02-23 10:38:51.000000000 -0500 9605--- linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400
9612+++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-11 20:24:59.993366078 -0500 9606+++ linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-20 15:58:46.933535080 -0400
9613@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base 9607@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
9614 return 0; 9608 return 0;
9615 } 9609 }
@@ -9619,9 +9613,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.9/arch/x86
9619 .vendor = X86_VENDOR_AMD, 9613 .vendor = X86_VENDOR_AMD,
9620 .set = amd_set_mtrr, 9614 .set = amd_set_mtrr,
9621 .get = amd_get_mtrr, 9615 .get = amd_get_mtrr,
9622diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/centaur.c 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
9623--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/centaur.c 2010-02-23 10:38:51.000000000 -0500 9617--- linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400
9624+++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-11 20:24:59.993366078 -0500 9618+++ linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-20 15:58:46.933535080 -0400
9625@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long 9619@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
9626 return 0; 9620 return 0;
9627 } 9621 }
@@ -9631,9 +9625,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.9/arch
9631 .vendor = X86_VENDOR_CENTAUR, 9625 .vendor = X86_VENDOR_CENTAUR,
9632 .set = centaur_set_mcr, 9626 .set = centaur_set_mcr,
9633 .get = centaur_get_mcr, 9627 .get = centaur_get_mcr,
9634diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/cyrix.c 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
9635--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-02-23 10:38:51.000000000 -0500 9629--- linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400
9636+++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-11 20:24:59.993366078 -0500 9630+++ linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-20 15:58:46.937540924 -0400
9637@@ -265,7 +265,7 @@ static void cyrix_set_all(void) 9631@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
9638 post_set(); 9632 post_set();
9639 } 9633 }
@@ -9643,9 +9637,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.9/arch/x
9643 .vendor = X86_VENDOR_CYRIX, 9637 .vendor = X86_VENDOR_CYRIX,
9644 .set_all = cyrix_set_all, 9638 .set_all = cyrix_set_all,
9645 .set = cyrix_set_arr, 9639 .set = cyrix_set_arr,
9646diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/generic.c 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
9647--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/generic.c 2010-02-23 10:38:51.000000000 -0500 9641--- linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400
9648+++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-11 20:24:59.993366078 -0500 9642+++ linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-20 15:58:46.937540924 -0400
9649@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra 9643@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
9650 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ 9644 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
9651 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ 9645 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
@@ -9664,9 +9658,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.9/arch
9664 .use_intel_if = 1, 9658 .use_intel_if = 1,
9665 .set_all = generic_set_all, 9659 .set_all = generic_set_all,
9666 .get = generic_get_mtrr, 9660 .get = generic_get_mtrr,
9667diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/main.c 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
9668--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/main.c 2010-02-23 10:38:51.000000000 -0500 9662--- linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400
9669+++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/main.c 2010-03-11 20:24:59.993366078 -0500 9663+++ linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/main.c 2010-03-20 15:58:46.937540924 -0400
9670@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); 9664@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
9671 u64 size_or_mask, size_and_mask; 9665 u64 size_or_mask, size_and_mask;
9672 static bool mtrr_aps_delayed_init; 9666 static bool mtrr_aps_delayed_init;
@@ -9685,9 +9679,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.9/arch/x8
9685 { 9679 {
9686 if (ops->vendor && ops->vendor < X86_VENDOR_NUM) 9680 if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
9687 mtrr_ops[ops->vendor] = ops; 9681 mtrr_ops[ops->vendor] = ops;
9688diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/mtrr.h 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
9689--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-02-23 10:38:51.000000000 -0500 9683--- linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400
9690+++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-11 20:24:59.993366078 -0500 9684+++ linux-2.6.32.10/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-20 15:58:46.937540924 -0400
9691@@ -12,19 +12,19 @@ 9685@@ -12,19 +12,19 @@
9692 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; 9686 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
9693 9687
@@ -9738,9 +9732,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.9/arch/x8
9738 9732
9739 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) 9733 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
9740 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) 9734 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
9741diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.9/arch/x86/kernel/cpu/perfctr-watchdog.c 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
9742--- linux-2.6.32.9/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-02-23 10:38:51.000000000 -0500 9736--- linux-2.6.32.10/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400
9743+++ linux-2.6.32.9/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-11 20:24:59.993366078 -0500 9737+++ linux-2.6.32.10/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-20 15:58:46.937540924 -0400
9744@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { 9738@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
9745 9739
9746 /* Interface defining a CPU specific perfctr watchdog */ 9740 /* Interface defining a CPU specific perfctr watchdog */
@@ -9774,9 +9768,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.9/
9774 static struct wd_ops intel_arch_wd_ops __read_mostly = { 9768 static struct wd_ops intel_arch_wd_ops __read_mostly = {
9775 .reserve = single_msr_reserve, 9769 .reserve = single_msr_reserve,
9776 .unreserve = single_msr_unreserve, 9770 .unreserve = single_msr_unreserve,
9777diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.9/arch/x86/kernel/cpu/perf_event.c 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
9778--- linux-2.6.32.9/arch/x86/kernel/cpu/perf_event.c 2010-02-23 10:38:51.000000000 -0500 9772--- linux-2.6.32.10/arch/x86/kernel/cpu/perf_event.c 2010-03-15 11:52:04.000000000 -0400
9779+++ linux-2.6.32.9/arch/x86/kernel/cpu/perf_event.c 2010-03-11 20:24:59.993366078 -0500 9773+++ linux-2.6.32.10/arch/x86/kernel/cpu/perf_event.c 2010-03-20 15:58:46.945539132 -0400
9780@@ -2252,7 +2252,7 @@ perf_callchain_user(struct pt_regs *regs 9774@@ -2252,7 +2252,7 @@ perf_callchain_user(struct pt_regs *regs
9781 break; 9775 break;
9782 9776
@@ -9786,9 +9780,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.9/arch/x
9786 } 9780 }
9787 } 9781 }
9788 9782
9789diff -urNp linux-2.6.32.9/arch/x86/kernel/crash.c linux-2.6.32.9/arch/x86/kernel/crash.c 9783diff -urNp linux-2.6.32.10/arch/x86/kernel/crash.c linux-2.6.32.10/arch/x86/kernel/crash.c
9790--- linux-2.6.32.9/arch/x86/kernel/crash.c 2010-02-23 10:38:51.000000000 -0500 9784--- linux-2.6.32.10/arch/x86/kernel/crash.c 2010-03-15 11:52:04.000000000 -0400
9791+++ linux-2.6.32.9/arch/x86/kernel/crash.c 2010-03-11 20:24:59.993366078 -0500 9785+++ linux-2.6.32.10/arch/x86/kernel/crash.c 2010-03-20 15:58:46.945539132 -0400
9792@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, 9786@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu,
9793 regs = args->regs; 9787 regs = args->regs;
9794 9788
@@ -9798,9 +9792,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/crash.c linux-2.6.32.9/arch/x86/kernel
9798 crash_fixup_ss_esp(&fixed_regs, regs); 9792 crash_fixup_ss_esp(&fixed_regs, regs);
9799 regs = &fixed_regs; 9793 regs = &fixed_regs;
9800 } 9794 }
9801diff -urNp linux-2.6.32.9/arch/x86/kernel/doublefault_32.c linux-2.6.32.9/arch/x86/kernel/doublefault_32.c 9795diff -urNp linux-2.6.32.10/arch/x86/kernel/doublefault_32.c linux-2.6.32.10/arch/x86/kernel/doublefault_32.c
9802--- linux-2.6.32.9/arch/x86/kernel/doublefault_32.c 2010-02-23 10:38:51.000000000 -0500 9796--- linux-2.6.32.10/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400
9803+++ linux-2.6.32.9/arch/x86/kernel/doublefault_32.c 2010-03-11 20:24:59.993366078 -0500 9797+++ linux-2.6.32.10/arch/x86/kernel/doublefault_32.c 2010-03-20 15:58:46.945539132 -0400
9804@@ -11,7 +11,7 @@ 9798@@ -11,7 +11,7 @@
9805 9799
9806 #define DOUBLEFAULT_STACKSIZE (1024) 9800 #define DOUBLEFAULT_STACKSIZE (1024)
@@ -9832,9 +9826,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/doublefault_32.c linux-2.6.32.9/arch/x
9832 .fs = __KERNEL_PERCPU, 9826 .fs = __KERNEL_PERCPU,
9833 9827
9834 .__cr3 = __pa_nodebug(swapper_pg_dir), 9828 .__cr3 = __pa_nodebug(swapper_pg_dir),
9835diff -urNp linux-2.6.32.9/arch/x86/kernel/dumpstack_32.c linux-2.6.32.9/arch/x86/kernel/dumpstack_32.c 9829diff -urNp linux-2.6.32.10/arch/x86/kernel/dumpstack_32.c linux-2.6.32.10/arch/x86/kernel/dumpstack_32.c
9836--- linux-2.6.32.9/arch/x86/kernel/dumpstack_32.c 2010-02-23 10:38:51.000000000 -0500 9830--- linux-2.6.32.10/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400
9837+++ linux-2.6.32.9/arch/x86/kernel/dumpstack_32.c 2010-03-11 20:24:59.993366078 -0500 9831+++ linux-2.6.32.10/arch/x86/kernel/dumpstack_32.c 2010-03-20 15:58:46.945539132 -0400
9838@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs 9832@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs
9839 * When in-kernel, we also print out the stack and code at the 9833 * When in-kernel, we also print out the stack and code at the
9840 * time of the fault.. 9834 * time of the fault..
@@ -9879,9 +9873,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/dumpstack_32.c linux-2.6.32.9/arch/x86
9879 if (ip < PAGE_OFFSET) 9873 if (ip < PAGE_OFFSET)
9880 return 0; 9874 return 0;
9881 if (probe_kernel_address((unsigned short *)ip, ud2)) 9875 if (probe_kernel_address((unsigned short *)ip, ud2))
9882diff -urNp linux-2.6.32.9/arch/x86/kernel/dumpstack.c linux-2.6.32.9/arch/x86/kernel/dumpstack.c 9876diff -urNp linux-2.6.32.10/arch/x86/kernel/dumpstack.c linux-2.6.32.10/arch/x86/kernel/dumpstack.c
9883--- linux-2.6.32.9/arch/x86/kernel/dumpstack.c 2010-02-23 10:38:51.000000000 -0500 9877--- linux-2.6.32.10/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400
9884+++ linux-2.6.32.9/arch/x86/kernel/dumpstack.c 2010-03-11 20:24:59.993366078 -0500 9878+++ linux-2.6.32.10/arch/x86/kernel/dumpstack.c 2010-03-20 15:58:46.945539132 -0400
9885@@ -180,7 +180,7 @@ void dump_stack(void) 9879@@ -180,7 +180,7 @@ void dump_stack(void)
9886 #endif 9880 #endif
9887 9881
@@ -9909,9 +9903,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/dumpstack.c linux-2.6.32.9/arch/x86/ke
9909 report_bug(regs->ip, regs); 9903 report_bug(regs->ip, regs);
9910 9904
9911 if (__die(str, regs, err)) 9905 if (__die(str, regs, err))
9912diff -urNp linux-2.6.32.9/arch/x86/kernel/e820.c linux-2.6.32.9/arch/x86/kernel/e820.c 9906diff -urNp linux-2.6.32.10/arch/x86/kernel/e820.c linux-2.6.32.10/arch/x86/kernel/e820.c
9913--- linux-2.6.32.9/arch/x86/kernel/e820.c 2010-02-23 10:38:51.000000000 -0500 9907--- linux-2.6.32.10/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400
9914+++ linux-2.6.32.9/arch/x86/kernel/e820.c 2010-03-11 20:25:04.609377560 -0500 9908+++ linux-2.6.32.10/arch/x86/kernel/e820.c 2010-03-20 15:58:46.945539132 -0400
9915@@ -733,7 +733,7 @@ struct early_res { 9909@@ -733,7 +733,7 @@ struct early_res {
9916 }; 9910 };
9917 static struct early_res early_res[MAX_EARLY_RES] __initdata = { 9911 static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -9921,9 +9915,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/e820.c linux-2.6.32.9/arch/x86/kernel/
9921 }; 9915 };
9922 9916
9923 static int __init find_overlapped_early(u64 start, u64 end) 9917 static int __init find_overlapped_early(u64 start, u64 end)
9924diff -urNp linux-2.6.32.9/arch/x86/kernel/efi_32.c linux-2.6.32.9/arch/x86/kernel/efi_32.c 9918diff -urNp linux-2.6.32.10/arch/x86/kernel/efi_32.c linux-2.6.32.10/arch/x86/kernel/efi_32.c
9925--- linux-2.6.32.9/arch/x86/kernel/efi_32.c 2010-02-23 10:38:51.000000000 -0500 9919--- linux-2.6.32.10/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400
9926+++ linux-2.6.32.9/arch/x86/kernel/efi_32.c 2010-03-11 20:24:59.993366078 -0500 9920+++ linux-2.6.32.10/arch/x86/kernel/efi_32.c 2010-03-20 15:58:46.945539132 -0400
9927@@ -38,70 +38,38 @@ 9921@@ -38,70 +38,38 @@
9928 */ 9922 */
9929 9923
@@ -10004,9 +9998,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/efi_32.c linux-2.6.32.9/arch/x86/kerne
10004 9998
10005 /* 9999 /*
10006 * After the lock is released, the original page table is restored. 10000 * After the lock is released, the original page table is restored.
10007diff -urNp linux-2.6.32.9/arch/x86/kernel/efi_stub_32.S linux-2.6.32.9/arch/x86/kernel/efi_stub_32.S 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
10008--- linux-2.6.32.9/arch/x86/kernel/efi_stub_32.S 2010-02-23 10:38:51.000000000 -0500 10002--- linux-2.6.32.10/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400
10009+++ linux-2.6.32.9/arch/x86/kernel/efi_stub_32.S 2010-03-11 20:24:59.993366078 -0500 10003+++ linux-2.6.32.10/arch/x86/kernel/efi_stub_32.S 2010-03-20 15:58:46.945539132 -0400
10010@@ -6,6 +6,7 @@ 10004@@ -6,6 +6,7 @@
10011 */ 10005 */
10012 10006
@@ -10105,9 +10099,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/efi_stub_32.S linux-2.6.32.9/arch/x86/
10105 saved_return_addr: 10099 saved_return_addr:
10106 .long 0 10100 .long 0
10107 efi_rt_function_ptr: 10101 efi_rt_function_ptr:
10108diff -urNp linux-2.6.32.9/arch/x86/kernel/entry_32.S linux-2.6.32.9/arch/x86/kernel/entry_32.S 10102diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_32.S linux-2.6.32.10/arch/x86/kernel/entry_32.S
10109--- linux-2.6.32.9/arch/x86/kernel/entry_32.S 2010-02-23 10:38:51.000000000 -0500 10103--- linux-2.6.32.10/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400
10110+++ linux-2.6.32.9/arch/x86/kernel/entry_32.S 2010-03-11 20:24:59.997628451 -0500 10104+++ linux-2.6.32.10/arch/x86/kernel/entry_32.S 2010-03-20 15:58:46.945539132 -0400
10111@@ -191,7 +191,7 @@ 10105@@ -191,7 +191,7 @@
10112 10106
10113 #endif /* CONFIG_X86_32_LAZY_GS */ 10107 #endif /* CONFIG_X86_32_LAZY_GS */
@@ -10361,9 +10355,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/entry_32.S linux-2.6.32.9/arch/x86/ker
10361 RESTORE_REGS 10355 RESTORE_REGS
10362 lss 12+4(%esp), %esp # back to espfix stack 10356 lss 12+4(%esp), %esp # back to espfix stack
10363 CFI_ADJUST_CFA_OFFSET -24 10357 CFI_ADJUST_CFA_OFFSET -24
10364diff -urNp linux-2.6.32.9/arch/x86/kernel/entry_64.S linux-2.6.32.9/arch/x86/kernel/entry_64.S 10358diff -urNp linux-2.6.32.10/arch/x86/kernel/entry_64.S linux-2.6.32.10/arch/x86/kernel/entry_64.S
10365--- linux-2.6.32.9/arch/x86/kernel/entry_64.S 2010-02-23 10:38:51.000000000 -0500 10359--- linux-2.6.32.10/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400
10366+++ linux-2.6.32.9/arch/x86/kernel/entry_64.S 2010-03-11 20:24:59.997628451 -0500 10360+++ linux-2.6.32.10/arch/x86/kernel/entry_64.S 2010-03-20 15:58:46.945539132 -0400
10367@@ -53,6 +53,7 @@ 10361@@ -53,6 +53,7 @@
10368 #include <asm/paravirt.h> 10362 #include <asm/paravirt.h>
10369 #include <asm/ftrace.h> 10363 #include <asm/ftrace.h>
@@ -10467,9 +10461,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/entry_64.S linux-2.6.32.9/arch/x86/ker
10467 RESTORE_ALL 8 10461 RESTORE_ALL 8
10468 jmp irq_return 10462 jmp irq_return
10469 nmi_userspace: 10463 nmi_userspace:
10470diff -urNp linux-2.6.32.9/arch/x86/kernel/ftrace.c linux-2.6.32.9/arch/x86/kernel/ftrace.c 10464diff -urNp linux-2.6.32.10/arch/x86/kernel/ftrace.c linux-2.6.32.10/arch/x86/kernel/ftrace.c
10471--- linux-2.6.32.9/arch/x86/kernel/ftrace.c 2010-02-23 10:38:51.000000000 -0500 10465--- linux-2.6.32.10/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400
10472+++ linux-2.6.32.9/arch/x86/kernel/ftrace.c 2010-03-11 20:24:59.997628451 -0500 10466+++ linux-2.6.32.10/arch/x86/kernel/ftrace.c 2010-03-20 15:58:46.945539132 -0400
10473@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) 10467@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
10474 { 10468 {
10475 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { 10469 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -10535,9 +10529,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/ftrace.c linux-2.6.32.9/arch/x86/kerne
10535 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) 10529 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
10536 return -EFAULT; 10530 return -EFAULT;
10537 10531
10538diff -urNp linux-2.6.32.9/arch/x86/kernel/head32.c linux-2.6.32.9/arch/x86/kernel/head32.c 10532diff -urNp linux-2.6.32.10/arch/x86/kernel/head32.c linux-2.6.32.10/arch/x86/kernel/head32.c
10539--- linux-2.6.32.9/arch/x86/kernel/head32.c 2010-02-23 10:38:51.000000000 -0500 10533--- linux-2.6.32.10/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400
10540+++ linux-2.6.32.9/arch/x86/kernel/head32.c 2010-03-11 20:24:59.997628451 -0500 10534+++ linux-2.6.32.10/arch/x86/kernel/head32.c 2010-03-20 15:58:46.945539132 -0400
10541@@ -16,6 +16,7 @@ 10535@@ -16,6 +16,7 @@
10542 #include <asm/apic.h> 10536 #include <asm/apic.h>
10543 #include <asm/io_apic.h> 10537 #include <asm/io_apic.h>
@@ -10555,9 +10549,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/head32.c linux-2.6.32.9/arch/x86/kerne
10555 10549
10556 #ifdef CONFIG_BLK_DEV_INITRD 10550 #ifdef CONFIG_BLK_DEV_INITRD
10557 /* Reserve INITRD */ 10551 /* Reserve INITRD */
10558diff -urNp linux-2.6.32.9/arch/x86/kernel/head_32.S linux-2.6.32.9/arch/x86/kernel/head_32.S 10552diff -urNp linux-2.6.32.10/arch/x86/kernel/head_32.S linux-2.6.32.10/arch/x86/kernel/head_32.S
10559--- linux-2.6.32.9/arch/x86/kernel/head_32.S 2010-02-23 10:38:51.000000000 -0500 10553--- linux-2.6.32.10/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400
10560+++ linux-2.6.32.9/arch/x86/kernel/head_32.S 2010-03-11 20:25:04.609377560 -0500 10554+++ linux-2.6.32.10/arch/x86/kernel/head_32.S 2010-03-20 15:58:46.945539132 -0400
10561@@ -19,10 +19,17 @@ 10555@@ -19,10 +19,17 @@
10562 #include <asm/setup.h> 10556 #include <asm/setup.h>
10563 #include <asm/processor-flags.h> 10557 #include <asm/processor-flags.h>
@@ -10991,9 +10985,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/head_32.S linux-2.6.32.9/arch/x86/kern
10991+ /* Be sure this is zeroed to avoid false validations in Xen */ 10985+ /* Be sure this is zeroed to avoid false validations in Xen */
10992+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0 10986+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
10993+ .endr 10987+ .endr
10994diff -urNp linux-2.6.32.9/arch/x86/kernel/head_64.S linux-2.6.32.9/arch/x86/kernel/head_64.S 10988diff -urNp linux-2.6.32.10/arch/x86/kernel/head_64.S linux-2.6.32.10/arch/x86/kernel/head_64.S
10995--- linux-2.6.32.9/arch/x86/kernel/head_64.S 2010-02-23 10:38:51.000000000 -0500 10989--- linux-2.6.32.10/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400
10996+++ linux-2.6.32.9/arch/x86/kernel/head_64.S 2010-03-11 20:25:04.609377560 -0500 10990+++ linux-2.6.32.10/arch/x86/kernel/head_64.S 2010-03-20 15:58:46.945539132 -0400
10997@@ -19,6 +19,7 @@ 10991@@ -19,6 +19,7 @@
10998 #include <asm/cache.h> 10992 #include <asm/cache.h>
10999 #include <asm/processor-flags.h> 10993 #include <asm/processor-flags.h>
@@ -11246,9 +11240,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/head_64.S linux-2.6.32.9/arch/x86/kern
11246 11240
11247 __PAGE_ALIGNED_BSS 11241 __PAGE_ALIGNED_BSS
11248 .align PAGE_SIZE 11242 .align PAGE_SIZE
11249diff -urNp linux-2.6.32.9/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.9/arch/x86/kernel/i386_ksyms_32.c 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
11250--- linux-2.6.32.9/arch/x86/kernel/i386_ksyms_32.c 2010-02-23 10:38:51.000000000 -0500 11244--- linux-2.6.32.10/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400
11251+++ linux-2.6.32.9/arch/x86/kernel/i386_ksyms_32.c 2010-03-11 20:24:59.997628451 -0500 11245+++ linux-2.6.32.10/arch/x86/kernel/i386_ksyms_32.c 2010-03-20 15:58:46.945539132 -0400
11252@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); 11246@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
11253 EXPORT_SYMBOL(cmpxchg8b_emu); 11247 EXPORT_SYMBOL(cmpxchg8b_emu);
11254 #endif 11248 #endif
@@ -11270,9 +11264,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.9/arch/x8
11270+#ifdef CONFIG_PAX_KERNEXEC 11264+#ifdef CONFIG_PAX_KERNEXEC
11271+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); 11265+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
11272+#endif 11266+#endif
11273diff -urNp linux-2.6.32.9/arch/x86/kernel/init_task.c linux-2.6.32.9/arch/x86/kernel/init_task.c 11267diff -urNp linux-2.6.32.10/arch/x86/kernel/init_task.c linux-2.6.32.10/arch/x86/kernel/init_task.c
11274--- linux-2.6.32.9/arch/x86/kernel/init_task.c 2010-02-23 10:38:51.000000000 -0500 11268--- linux-2.6.32.10/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400
11275+++ linux-2.6.32.9/arch/x86/kernel/init_task.c 2010-03-11 20:24:59.997628451 -0500 11269+++ linux-2.6.32.10/arch/x86/kernel/init_task.c 2010-03-20 15:58:46.945539132 -0400
11276@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); 11270@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
11277 * section. Since TSS's are completely CPU-local, we want them 11271 * section. Since TSS's are completely CPU-local, we want them
11278 * on exact cacheline boundaries, to eliminate cacheline ping-pong. 11272 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -11281,9 +11275,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/init_task.c linux-2.6.32.9/arch/x86/ke
11281- 11275-
11282+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; 11276+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
11283+EXPORT_SYMBOL(init_tss); 11277+EXPORT_SYMBOL(init_tss);
11284diff -urNp linux-2.6.32.9/arch/x86/kernel/ioport.c linux-2.6.32.9/arch/x86/kernel/ioport.c 11278diff -urNp linux-2.6.32.10/arch/x86/kernel/ioport.c linux-2.6.32.10/arch/x86/kernel/ioport.c
11285--- linux-2.6.32.9/arch/x86/kernel/ioport.c 2010-02-23 10:38:51.000000000 -0500 11279--- linux-2.6.32.10/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
11286+++ linux-2.6.32.9/arch/x86/kernel/ioport.c 2010-03-11 20:24:59.997628451 -0500 11280+++ linux-2.6.32.10/arch/x86/kernel/ioport.c 2010-03-20 15:58:46.945539132 -0400
11287@@ -6,6 +6,7 @@ 11281@@ -6,6 +6,7 @@
11288 #include <linux/sched.h> 11282 #include <linux/sched.h>
11289 #include <linux/kernel.h> 11283 #include <linux/kernel.h>
@@ -11328,9 +11322,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/ioport.c linux-2.6.32.9/arch/x86/kerne
11328 } 11322 }
11329 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); 11323 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
11330 11324
11331diff -urNp linux-2.6.32.9/arch/x86/kernel/irq_32.c linux-2.6.32.9/arch/x86/kernel/irq_32.c 11325diff -urNp linux-2.6.32.10/arch/x86/kernel/irq_32.c linux-2.6.32.10/arch/x86/kernel/irq_32.c
11332--- linux-2.6.32.9/arch/x86/kernel/irq_32.c 2010-02-23 10:38:51.000000000 -0500 11326--- linux-2.6.32.10/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400
11333+++ linux-2.6.32.9/arch/x86/kernel/irq_32.c 2010-03-11 20:24:59.997628451 -0500 11327+++ linux-2.6.32.10/arch/x86/kernel/irq_32.c 2010-03-20 15:58:46.945539132 -0400
11334@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc 11328@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
11335 return 0; 11329 return 0;
11336 11330
@@ -11349,9 +11343,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/irq_32.c linux-2.6.32.9/arch/x86/kerne
11349 11343
11350 call_on_stack(__do_softirq, isp); 11344 call_on_stack(__do_softirq, isp);
11351 /* 11345 /*
11352diff -urNp linux-2.6.32.9/arch/x86/kernel/kgdb.c linux-2.6.32.9/arch/x86/kernel/kgdb.c 11346diff -urNp linux-2.6.32.10/arch/x86/kernel/kgdb.c linux-2.6.32.10/arch/x86/kernel/kgdb.c
11353--- linux-2.6.32.9/arch/x86/kernel/kgdb.c 2010-02-23 10:38:51.000000000 -0500 11347--- linux-2.6.32.10/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
11354+++ linux-2.6.32.9/arch/x86/kernel/kgdb.c 2010-03-11 20:24:59.997628451 -0500 11348+++ linux-2.6.32.10/arch/x86/kernel/kgdb.c 2010-03-20 15:58:46.945539132 -0400
11355@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception 11349@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
11356 return instruction_pointer(regs); 11350 return instruction_pointer(regs);
11357 } 11351 }
@@ -11361,9 +11355,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/kgdb.c linux-2.6.32.9/arch/x86/kernel/
11361 /* Breakpoint instruction: */ 11355 /* Breakpoint instruction: */
11362 .gdb_bpt_instr = { 0xcc }, 11356 .gdb_bpt_instr = { 0xcc },
11363 .flags = KGDB_HW_BREAKPOINT, 11357 .flags = KGDB_HW_BREAKPOINT,
11364diff -urNp linux-2.6.32.9/arch/x86/kernel/kprobes.c linux-2.6.32.9/arch/x86/kernel/kprobes.c 11358diff -urNp linux-2.6.32.10/arch/x86/kernel/kprobes.c linux-2.6.32.10/arch/x86/kernel/kprobes.c
11365--- linux-2.6.32.9/arch/x86/kernel/kprobes.c 2010-02-23 10:38:51.000000000 -0500 11359--- linux-2.6.32.10/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400
11366+++ linux-2.6.32.9/arch/x86/kernel/kprobes.c 2010-03-11 20:24:59.997628451 -0500 11360+++ linux-2.6.32.10/arch/x86/kernel/kprobes.c 2010-03-20 15:58:46.949540167 -0400
11367@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f 11361@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
11368 char op; 11362 char op;
11369 s32 raddr; 11363 s32 raddr;
@@ -11446,9 +11440,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/kprobes.c linux-2.6.32.9/arch/x86/kern
11446 return ret; 11440 return ret;
11447 11441
11448 switch (val) { 11442 switch (val) {
11449diff -urNp linux-2.6.32.9/arch/x86/kernel/ldt.c linux-2.6.32.9/arch/x86/kernel/ldt.c 11443diff -urNp linux-2.6.32.10/arch/x86/kernel/ldt.c linux-2.6.32.10/arch/x86/kernel/ldt.c
11450--- linux-2.6.32.9/arch/x86/kernel/ldt.c 2010-02-23 10:38:51.000000000 -0500 11444--- linux-2.6.32.10/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400
11451+++ linux-2.6.32.9/arch/x86/kernel/ldt.c 2010-03-11 20:24:59.997628451 -0500 11445+++ linux-2.6.32.10/arch/x86/kernel/ldt.c 2010-03-20 15:58:46.949540167 -0400
11452@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i 11446@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
11453 if (reload) { 11447 if (reload) {
11454 #ifdef CONFIG_SMP 11448 #ifdef CONFIG_SMP
@@ -11513,9 +11507,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/ldt.c linux-2.6.32.9/arch/x86/kernel/l
11513 fill_ldt(&ldt, &ldt_info); 11507 fill_ldt(&ldt, &ldt_info);
11514 if (oldmode) 11508 if (oldmode)
11515 ldt.avl = 0; 11509 ldt.avl = 0;
11516diff -urNp linux-2.6.32.9/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.9/arch/x86/kernel/machine_kexec_32.c 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
11517--- linux-2.6.32.9/arch/x86/kernel/machine_kexec_32.c 2010-02-23 10:38:51.000000000 -0500 11511--- linux-2.6.32.10/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400
11518+++ linux-2.6.32.9/arch/x86/kernel/machine_kexec_32.c 2010-03-11 20:24:59.997628451 -0500 11512+++ linux-2.6.32.10/arch/x86/kernel/machine_kexec_32.c 2010-03-20 15:58:46.949540167 -0400
11519@@ -26,7 +26,7 @@ 11513@@ -26,7 +26,7 @@
11520 #include <asm/system.h> 11514 #include <asm/system.h>
11521 #include <asm/cacheflush.h> 11515 #include <asm/cacheflush.h>
@@ -11543,9 +11537,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.9/arch
11543 11537
11544 relocate_kernel_ptr = control_page; 11538 relocate_kernel_ptr = control_page;
11545 page_list[PA_CONTROL_PAGE] = __pa(control_page); 11539 page_list[PA_CONTROL_PAGE] = __pa(control_page);
11546diff -urNp linux-2.6.32.9/arch/x86/kernel/microcode_amd.c linux-2.6.32.9/arch/x86/kernel/microcode_amd.c 11540diff -urNp linux-2.6.32.10/arch/x86/kernel/microcode_amd.c linux-2.6.32.10/arch/x86/kernel/microcode_amd.c
11547--- linux-2.6.32.9/arch/x86/kernel/microcode_amd.c 2010-02-23 10:38:51.000000000 -0500 11541--- linux-2.6.32.10/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400
11548+++ linux-2.6.32.9/arch/x86/kernel/microcode_amd.c 2010-03-11 20:24:59.997628451 -0500 11542+++ linux-2.6.32.10/arch/x86/kernel/microcode_amd.c 2010-03-20 15:58:46.949540167 -0400
11549@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c 11543@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
11550 uci->mc = NULL; 11544 uci->mc = NULL;
11551 } 11545 }
@@ -11564,9 +11558,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/microcode_amd.c linux-2.6.32.9/arch/x8
11564 { 11558 {
11565 return &microcode_amd_ops; 11559 return &microcode_amd_ops;
11566 } 11560 }
11567diff -urNp linux-2.6.32.9/arch/x86/kernel/microcode_core.c linux-2.6.32.9/arch/x86/kernel/microcode_core.c 11561diff -urNp linux-2.6.32.10/arch/x86/kernel/microcode_core.c linux-2.6.32.10/arch/x86/kernel/microcode_core.c
11568--- linux-2.6.32.9/arch/x86/kernel/microcode_core.c 2010-02-23 10:38:51.000000000 -0500 11562--- linux-2.6.32.10/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400
11569+++ linux-2.6.32.9/arch/x86/kernel/microcode_core.c 2010-03-11 20:24:59.997628451 -0500 11563+++ linux-2.6.32.10/arch/x86/kernel/microcode_core.c 2010-03-20 15:58:46.949540167 -0400
11570@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); 11564@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
11571 11565
11572 #define MICROCODE_VERSION "2.00" 11566 #define MICROCODE_VERSION "2.00"
@@ -11576,9 +11570,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/microcode_core.c linux-2.6.32.9/arch/x
11576 11570
11577 /* 11571 /*
11578 * Synchronization. 11572 * Synchronization.
11579diff -urNp linux-2.6.32.9/arch/x86/kernel/microcode_intel.c linux-2.6.32.9/arch/x86/kernel/microcode_intel.c 11573diff -urNp linux-2.6.32.10/arch/x86/kernel/microcode_intel.c linux-2.6.32.10/arch/x86/kernel/microcode_intel.c
11580--- linux-2.6.32.9/arch/x86/kernel/microcode_intel.c 2010-02-23 10:38:51.000000000 -0500 11574--- linux-2.6.32.10/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400
11581+++ linux-2.6.32.9/arch/x86/kernel/microcode_intel.c 2010-03-11 20:24:59.997628451 -0500 11575+++ linux-2.6.32.10/arch/x86/kernel/microcode_intel.c 2010-03-20 15:58:46.949540167 -0400
11582@@ -443,13 +443,13 @@ static enum ucode_state request_microcod 11576@@ -443,13 +443,13 @@ static enum ucode_state request_microcod
11583 11577
11584 static int get_ucode_user(void *to, const void *from, size_t n) 11578 static int get_ucode_user(void *to, const void *from, size_t n)
@@ -11613,9 +11607,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/microcode_intel.c linux-2.6.32.9/arch/
11613 { 11607 {
11614 return &microcode_intel_ops; 11608 return &microcode_intel_ops;
11615 } 11609 }
11616diff -urNp linux-2.6.32.9/arch/x86/kernel/module.c linux-2.6.32.9/arch/x86/kernel/module.c 11610diff -urNp linux-2.6.32.10/arch/x86/kernel/module.c linux-2.6.32.10/arch/x86/kernel/module.c
11617--- linux-2.6.32.9/arch/x86/kernel/module.c 2010-02-23 10:38:51.000000000 -0500 11611--- linux-2.6.32.10/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
11618+++ linux-2.6.32.9/arch/x86/kernel/module.c 2010-03-11 20:24:59.997628451 -0500 11612+++ linux-2.6.32.10/arch/x86/kernel/module.c 2010-03-20 15:58:46.949540167 -0400
11619@@ -34,7 +34,7 @@ 11613@@ -34,7 +34,7 @@
11620 #define DEBUGP(fmt...) 11614 #define DEBUGP(fmt...)
11621 #endif 11615 #endif
@@ -11756,9 +11750,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/module.c linux-2.6.32.9/arch/x86/kerne
11756 #if 0 11750 #if 0
11757 if ((s64)val != *(s32 *)loc) 11751 if ((s64)val != *(s32 *)loc)
11758 goto overflow; 11752 goto overflow;
11759diff -urNp linux-2.6.32.9/arch/x86/kernel/paravirt.c linux-2.6.32.9/arch/x86/kernel/paravirt.c 11753diff -urNp linux-2.6.32.10/arch/x86/kernel/paravirt.c linux-2.6.32.10/arch/x86/kernel/paravirt.c
11760--- linux-2.6.32.9/arch/x86/kernel/paravirt.c 2010-02-23 10:38:51.000000000 -0500 11754--- linux-2.6.32.10/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400
11761+++ linux-2.6.32.9/arch/x86/kernel/paravirt.c 2010-03-11 20:25:00.001389982 -0500 11755+++ linux-2.6.32.10/arch/x86/kernel/paravirt.c 2010-03-20 15:58:46.949540167 -0400
11762@@ -120,9 +120,9 @@ unsigned paravirt_patch_jmp(void *insnbu 11756@@ -120,9 +120,9 @@ unsigned paravirt_patch_jmp(void *insnbu
11763 11757
11764 /* Neat trick to map patch type back to the call within the 11758 /* Neat trick to map patch type back to the call within the
@@ -11863,9 +11857,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/paravirt.c linux-2.6.32.9/arch/x86/ker
11863 }; 11857 };
11864 11858
11865 EXPORT_SYMBOL_GPL(pv_time_ops); 11859 EXPORT_SYMBOL_GPL(pv_time_ops);
11866diff -urNp linux-2.6.32.9/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.9/arch/x86/kernel/paravirt-spinlocks.c 11860diff -urNp linux-2.6.32.10/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.10/arch/x86/kernel/paravirt-spinlocks.c
11867--- linux-2.6.32.9/arch/x86/kernel/paravirt-spinlocks.c 2010-02-23 10:38:51.000000000 -0500 11861--- linux-2.6.32.10/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400
11868+++ linux-2.6.32.9/arch/x86/kernel/paravirt-spinlocks.c 2010-03-11 20:25:00.001389982 -0500 11862+++ linux-2.6.32.10/arch/x86/kernel/paravirt-spinlocks.c 2010-03-20 15:58:46.949540167 -0400
11869@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * 11863@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
11870 __raw_spin_lock(lock); 11864 __raw_spin_lock(lock);
11871 } 11865 }
@@ -11875,9 +11869,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.9/ar
11875 #ifdef CONFIG_SMP 11869 #ifdef CONFIG_SMP
11876 .spin_is_locked = __ticket_spin_is_locked, 11870 .spin_is_locked = __ticket_spin_is_locked,
11877 .spin_is_contended = __ticket_spin_is_contended, 11871 .spin_is_contended = __ticket_spin_is_contended,
11878diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.9/arch/x86/kernel/pci-calgary_64.c 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
11879--- linux-2.6.32.9/arch/x86/kernel/pci-calgary_64.c 2010-02-23 10:38:51.000000000 -0500 11873--- linux-2.6.32.10/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400
11880+++ linux-2.6.32.9/arch/x86/kernel/pci-calgary_64.c 2010-03-11 20:25:00.001389982 -0500 11874+++ linux-2.6.32.10/arch/x86/kernel/pci-calgary_64.c 2010-03-20 15:58:46.949540167 -0400
11881@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct 11875@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct
11882 free_pages((unsigned long)vaddr, get_order(size)); 11876 free_pages((unsigned long)vaddr, get_order(size));
11883 } 11877 }
@@ -11887,9 +11881,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.9/arch/x
11887 .alloc_coherent = calgary_alloc_coherent, 11881 .alloc_coherent = calgary_alloc_coherent,
11888 .free_coherent = calgary_free_coherent, 11882 .free_coherent = calgary_free_coherent,
11889 .map_sg = calgary_map_sg, 11883 .map_sg = calgary_map_sg,
11890diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-dma.c linux-2.6.32.9/arch/x86/kernel/pci-dma.c 11884diff -urNp linux-2.6.32.10/arch/x86/kernel/pci-dma.c linux-2.6.32.10/arch/x86/kernel/pci-dma.c
11891--- linux-2.6.32.9/arch/x86/kernel/pci-dma.c 2010-02-23 10:38:51.000000000 -0500 11885--- linux-2.6.32.10/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
11892+++ linux-2.6.32.9/arch/x86/kernel/pci-dma.c 2010-03-11 20:25:00.001389982 -0500 11886+++ linux-2.6.32.10/arch/x86/kernel/pci-dma.c 2010-03-20 15:58:46.949540167 -0400
11893@@ -14,7 +14,7 @@ 11887@@ -14,7 +14,7 @@
11894 11888
11895 static int forbid_dac __read_mostly; 11889 static int forbid_dac __read_mostly;
@@ -11908,9 +11902,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-dma.c linux-2.6.32.9/arch/x86/kern
11908 11902
11909 #ifdef CONFIG_PCI 11903 #ifdef CONFIG_PCI
11910 if (mask > 0xffffffff && forbid_dac > 0) { 11904 if (mask > 0xffffffff && forbid_dac > 0) {
11911diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-gart_64.c linux-2.6.32.9/arch/x86/kernel/pci-gart_64.c 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
11912--- linux-2.6.32.9/arch/x86/kernel/pci-gart_64.c 2010-02-23 10:38:51.000000000 -0500 11906--- linux-2.6.32.10/arch/x86/kernel/pci-gart_64.c 2010-03-15 11:52:04.000000000 -0400
11913+++ linux-2.6.32.9/arch/x86/kernel/pci-gart_64.c 2010-03-11 20:25:00.001389982 -0500 11907+++ linux-2.6.32.10/arch/x86/kernel/pci-gart_64.c 2010-03-20 15:58:46.949540167 -0400
11914@@ -679,7 +679,7 @@ static __init int init_k8_gatt(struct ag 11908@@ -679,7 +679,7 @@ static __init int init_k8_gatt(struct ag
11915 return -1; 11909 return -1;
11916 } 11910 }
@@ -11920,9 +11914,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-gart_64.c linux-2.6.32.9/arch/x86/
11920 .map_sg = gart_map_sg, 11914 .map_sg = gart_map_sg,
11921 .unmap_sg = gart_unmap_sg, 11915 .unmap_sg = gart_unmap_sg,
11922 .map_page = gart_map_page, 11916 .map_page = gart_map_page,
11923diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-nommu.c linux-2.6.32.9/arch/x86/kernel/pci-nommu.c 11917diff -urNp linux-2.6.32.10/arch/x86/kernel/pci-nommu.c linux-2.6.32.10/arch/x86/kernel/pci-nommu.c
11924--- linux-2.6.32.9/arch/x86/kernel/pci-nommu.c 2010-02-23 10:38:51.000000000 -0500 11918--- linux-2.6.32.10/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400
11925+++ linux-2.6.32.9/arch/x86/kernel/pci-nommu.c 2010-03-11 20:25:00.001389982 -0500 11919+++ linux-2.6.32.10/arch/x86/kernel/pci-nommu.c 2010-03-20 15:58:46.949540167 -0400
11926@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str 11920@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
11927 flush_write_buffers(); 11921 flush_write_buffers();
11928 } 11922 }
@@ -11932,9 +11926,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-nommu.c linux-2.6.32.9/arch/x86/ke
11932 .alloc_coherent = dma_generic_alloc_coherent, 11926 .alloc_coherent = dma_generic_alloc_coherent,
11933 .free_coherent = nommu_free_coherent, 11927 .free_coherent = nommu_free_coherent,
11934 .map_sg = nommu_map_sg, 11928 .map_sg = nommu_map_sg,
11935diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.9/arch/x86/kernel/pci-swiotlb.c 11929diff -urNp linux-2.6.32.10/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.10/arch/x86/kernel/pci-swiotlb.c
11936--- linux-2.6.32.9/arch/x86/kernel/pci-swiotlb.c 2010-02-23 10:38:51.000000000 -0500 11930--- linux-2.6.32.10/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
11937+++ linux-2.6.32.9/arch/x86/kernel/pci-swiotlb.c 2010-03-11 20:25:00.001389982 -0500 11931+++ linux-2.6.32.10/arch/x86/kernel/pci-swiotlb.c 2010-03-20 15:58:46.949540167 -0400
11938@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( 11932@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
11939 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); 11933 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
11940 } 11934 }
@@ -11944,9 +11938,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.9/arch/x86/
11944 .mapping_error = swiotlb_dma_mapping_error, 11938 .mapping_error = swiotlb_dma_mapping_error,
11945 .alloc_coherent = x86_swiotlb_alloc_coherent, 11939 .alloc_coherent = x86_swiotlb_alloc_coherent,
11946 .free_coherent = swiotlb_free_coherent, 11940 .free_coherent = swiotlb_free_coherent,
11947diff -urNp linux-2.6.32.9/arch/x86/kernel/process_32.c linux-2.6.32.9/arch/x86/kernel/process_32.c 11941diff -urNp linux-2.6.32.10/arch/x86/kernel/process_32.c linux-2.6.32.10/arch/x86/kernel/process_32.c
11948--- linux-2.6.32.9/arch/x86/kernel/process_32.c 2010-02-23 10:38:51.000000000 -0500 11942--- linux-2.6.32.10/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400
11949+++ linux-2.6.32.9/arch/x86/kernel/process_32.c 2010-03-11 20:25:00.001389982 -0500 11943+++ linux-2.6.32.10/arch/x86/kernel/process_32.c 2010-03-20 15:58:46.949540167 -0400
11950@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as 11944@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
11951 unsigned long thread_saved_pc(struct task_struct *tsk) 11945 unsigned long thread_saved_pc(struct task_struct *tsk)
11952 { 11946 {
@@ -12041,9 +12035,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/process_32.c linux-2.6.32.9/arch/x86/k
12041+ load_sp0(init_tss + smp_processor_id(), thread); 12035+ load_sp0(init_tss + smp_processor_id(), thread);
12042+} 12036+}
12043+#endif 12037+#endif
12044diff -urNp linux-2.6.32.9/arch/x86/kernel/process_64.c linux-2.6.32.9/arch/x86/kernel/process_64.c 12038diff -urNp linux-2.6.32.10/arch/x86/kernel/process_64.c linux-2.6.32.10/arch/x86/kernel/process_64.c
12045--- linux-2.6.32.9/arch/x86/kernel/process_64.c 2010-02-23 10:38:51.000000000 -0500 12039--- linux-2.6.32.10/arch/x86/kernel/process_64.c 2010-03-15 11:52:04.000000000 -0400
12046+++ linux-2.6.32.9/arch/x86/kernel/process_64.c 2010-03-11 20:25:00.001389982 -0500 12040+++ linux-2.6.32.10/arch/x86/kernel/process_64.c 2010-03-20 15:58:46.949540167 -0400
12047@@ -91,7 +91,7 @@ static void __exit_idle(void) 12041@@ -91,7 +91,7 @@ static void __exit_idle(void)
12048 void exit_idle(void) 12042 void exit_idle(void)
12049 { 12043 {
@@ -12086,9 +12080,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/process_64.c linux-2.6.32.9/arch/x86/k
12086 return 0; 12080 return 0;
12087 ip = *(u64 *)(fp+8); 12081 ip = *(u64 *)(fp+8);
12088 if (!in_sched_functions(ip)) 12082 if (!in_sched_functions(ip))
12089diff -urNp linux-2.6.32.9/arch/x86/kernel/process.c linux-2.6.32.9/arch/x86/kernel/process.c 12083diff -urNp linux-2.6.32.10/arch/x86/kernel/process.c linux-2.6.32.10/arch/x86/kernel/process.c
12090--- linux-2.6.32.9/arch/x86/kernel/process.c 2010-02-23 10:38:51.000000000 -0500 12084--- linux-2.6.32.10/arch/x86/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
12091+++ linux-2.6.32.9/arch/x86/kernel/process.c 2010-03-11 20:25:00.001389982 -0500 12085+++ linux-2.6.32.10/arch/x86/kernel/process.c 2010-03-20 15:58:46.949540167 -0400
12092@@ -73,7 +73,7 @@ void exit_thread(void) 12086@@ -73,7 +73,7 @@ void exit_thread(void)
12093 unsigned long *bp = t->io_bitmap_ptr; 12087 unsigned long *bp = t->io_bitmap_ptr;
12094 12088
@@ -12126,9 +12120,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/process.c linux-2.6.32.9/arch/x86/kern
12126- return randomize_range(mm->brk, range_end, 0) ? : mm->brk; 12120- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
12127-} 12121-}
12128- 12122-
12129diff -urNp linux-2.6.32.9/arch/x86/kernel/ptrace.c linux-2.6.32.9/arch/x86/kernel/ptrace.c 12123diff -urNp linux-2.6.32.10/arch/x86/kernel/ptrace.c linux-2.6.32.10/arch/x86/kernel/ptrace.c
12130--- linux-2.6.32.9/arch/x86/kernel/ptrace.c 2010-02-23 10:38:51.000000000 -0500 12124--- linux-2.6.32.10/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400
12131+++ linux-2.6.32.9/arch/x86/kernel/ptrace.c 2010-03-11 20:25:00.001389982 -0500 12125+++ linux-2.6.32.10/arch/x86/kernel/ptrace.c 2010-03-20 15:58:46.949540167 -0400
12132@@ -925,7 +925,7 @@ static const struct user_regset_view use 12126@@ -925,7 +925,7 @@ static const struct user_regset_view use
12133 long arch_ptrace(struct task_struct *child, long request, long addr, long data) 12127 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
12134 { 12128 {
@@ -12197,9 +12191,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/ptrace.c linux-2.6.32.9/arch/x86/kerne
12197 12191
12198 /* Send us the fake SIGTRAP */ 12192 /* Send us the fake SIGTRAP */
12199 force_sig_info(SIGTRAP, &info, tsk); 12193 force_sig_info(SIGTRAP, &info, tsk);
12200diff -urNp linux-2.6.32.9/arch/x86/kernel/reboot.c linux-2.6.32.9/arch/x86/kernel/reboot.c 12194diff -urNp linux-2.6.32.10/arch/x86/kernel/reboot.c linux-2.6.32.10/arch/x86/kernel/reboot.c
12201--- linux-2.6.32.9/arch/x86/kernel/reboot.c 2010-02-23 10:38:51.000000000 -0500 12195--- linux-2.6.32.10/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400
12202+++ linux-2.6.32.9/arch/x86/kernel/reboot.c 2010-03-11 20:25:00.001389982 -0500 12196+++ linux-2.6.32.10/arch/x86/kernel/reboot.c 2010-03-20 15:58:46.949540167 -0400
12203@@ -33,7 +33,7 @@ void (*pm_power_off)(void); 12197@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
12204 EXPORT_SYMBOL(pm_power_off); 12198 EXPORT_SYMBOL(pm_power_off);
12205 12199
@@ -12276,9 +12270,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/reboot.c linux-2.6.32.9/arch/x86/kerne
12276 12270
12277 /* Set up the IDT for real mode. */ 12271 /* Set up the IDT for real mode. */
12278 load_idt(&real_mode_idt); 12272 load_idt(&real_mode_idt);
12279diff -urNp linux-2.6.32.9/arch/x86/kernel/setup.c linux-2.6.32.9/arch/x86/kernel/setup.c 12273diff -urNp linux-2.6.32.10/arch/x86/kernel/setup.c linux-2.6.32.10/arch/x86/kernel/setup.c
12280--- linux-2.6.32.9/arch/x86/kernel/setup.c 2010-02-23 10:38:51.000000000 -0500 12274--- linux-2.6.32.10/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
12281+++ linux-2.6.32.9/arch/x86/kernel/setup.c 2010-03-11 20:25:00.001389982 -0500 12275+++ linux-2.6.32.10/arch/x86/kernel/setup.c 2010-03-20 15:58:46.949540167 -0400
12282@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p) 12276@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p)
12283 12277
12284 if (!boot_params.hdr.root_flags) 12278 if (!boot_params.hdr.root_flags)
@@ -12299,9 +12293,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/setup.c linux-2.6.32.9/arch/x86/kernel
12299 data_resource.end = virt_to_phys(_edata)-1; 12293 data_resource.end = virt_to_phys(_edata)-1;
12300 bss_resource.start = virt_to_phys(&__bss_start); 12294 bss_resource.start = virt_to_phys(&__bss_start);
12301 bss_resource.end = virt_to_phys(&__bss_stop)-1; 12295 bss_resource.end = virt_to_phys(&__bss_stop)-1;
12302diff -urNp linux-2.6.32.9/arch/x86/kernel/setup_percpu.c linux-2.6.32.9/arch/x86/kernel/setup_percpu.c 12296diff -urNp linux-2.6.32.10/arch/x86/kernel/setup_percpu.c linux-2.6.32.10/arch/x86/kernel/setup_percpu.c
12303--- linux-2.6.32.9/arch/x86/kernel/setup_percpu.c 2010-02-23 10:38:51.000000000 -0500 12297--- linux-2.6.32.10/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400
12304+++ linux-2.6.32.9/arch/x86/kernel/setup_percpu.c 2010-03-11 20:25:04.609377560 -0500 12298+++ linux-2.6.32.10/arch/x86/kernel/setup_percpu.c 2010-03-20 15:58:46.949540167 -0400
12305@@ -25,19 +25,17 @@ 12299@@ -25,19 +25,17 @@
12306 # define DBG(x...) 12300 # define DBG(x...)
12307 #endif 12301 #endif
@@ -12364,9 +12358,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/setup_percpu.c linux-2.6.32.9/arch/x86
12364 /* 12358 /*
12365 * Up to this point, the boot CPU has been using .data.init 12359 * Up to this point, the boot CPU has been using .data.init
12366 * area. Reload any changed state for the boot CPU. 12360 * area. Reload any changed state for the boot CPU.
12367diff -urNp linux-2.6.32.9/arch/x86/kernel/signal.c linux-2.6.32.9/arch/x86/kernel/signal.c 12361diff -urNp linux-2.6.32.10/arch/x86/kernel/signal.c linux-2.6.32.10/arch/x86/kernel/signal.c
12368--- linux-2.6.32.9/arch/x86/kernel/signal.c 2010-02-23 10:38:51.000000000 -0500 12362--- linux-2.6.32.10/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400
12369+++ linux-2.6.32.9/arch/x86/kernel/signal.c 2010-03-11 20:25:00.005341198 -0500 12363+++ linux-2.6.32.10/arch/x86/kernel/signal.c 2010-03-20 15:58:46.949540167 -0400
12370@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi 12364@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
12371 * Align the stack pointer according to the i386 ABI, 12365 * Align the stack pointer according to the i386 ABI,
12372 * i.e. so that on function entry ((sp + 4) & 15) == 0. 12366 * i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -12438,9 +12432,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/signal.c linux-2.6.32.9/arch/x86/kerne
12438 return; 12432 return;
12439 12433
12440 if (current_thread_info()->status & TS_RESTORE_SIGMASK) 12434 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
12441diff -urNp linux-2.6.32.9/arch/x86/kernel/smpboot.c linux-2.6.32.9/arch/x86/kernel/smpboot.c 12435diff -urNp linux-2.6.32.10/arch/x86/kernel/smpboot.c linux-2.6.32.10/arch/x86/kernel/smpboot.c
12442--- linux-2.6.32.9/arch/x86/kernel/smpboot.c 2010-02-23 10:38:51.000000000 -0500 12436--- linux-2.6.32.10/arch/x86/kernel/smpboot.c 2010-03-15 11:52:04.000000000 -0400
12443+++ linux-2.6.32.9/arch/x86/kernel/smpboot.c 2010-03-11 20:25:00.005341198 -0500 12437+++ linux-2.6.32.10/arch/x86/kernel/smpboot.c 2010-03-20 15:58:46.949540167 -0400
12444@@ -729,7 +729,11 @@ do_rest: 12438@@ -729,7 +729,11 @@ do_rest:
12445 (unsigned long)task_stack_page(c_idle.idle) - 12439 (unsigned long)task_stack_page(c_idle.idle) -
12446 KERNEL_STACK_OFFSET + THREAD_SIZE; 12440 KERNEL_STACK_OFFSET + THREAD_SIZE;
@@ -12453,9 +12447,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/smpboot.c linux-2.6.32.9/arch/x86/kern
12453 initial_code = (unsigned long)start_secondary; 12447 initial_code = (unsigned long)start_secondary;
12454 stack_start.sp = (void *) c_idle.idle->thread.sp; 12448 stack_start.sp = (void *) c_idle.idle->thread.sp;
12455 12449
12456diff -urNp linux-2.6.32.9/arch/x86/kernel/step.c linux-2.6.32.9/arch/x86/kernel/step.c 12450diff -urNp linux-2.6.32.10/arch/x86/kernel/step.c linux-2.6.32.10/arch/x86/kernel/step.c
12457--- linux-2.6.32.9/arch/x86/kernel/step.c 2010-02-23 10:38:51.000000000 -0500 12451--- linux-2.6.32.10/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400
12458+++ linux-2.6.32.9/arch/x86/kernel/step.c 2010-03-11 20:25:00.005341198 -0500 12452+++ linux-2.6.32.10/arch/x86/kernel/step.c 2010-03-20 15:58:46.953540376 -0400
12459@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc 12453@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
12460 struct desc_struct *desc; 12454 struct desc_struct *desc;
12461 unsigned long base; 12455 unsigned long base;
@@ -12488,17 +12482,17 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/step.c linux-2.6.32.9/arch/x86/kernel/
12488 /* 32-bit mode: register increment */ 12482 /* 32-bit mode: register increment */
12489 return 0; 12483 return 0;
12490 /* 64-bit mode: REX prefix */ 12484 /* 64-bit mode: REX prefix */
12491diff -urNp linux-2.6.32.9/arch/x86/kernel/syscall_table_32.S linux-2.6.32.9/arch/x86/kernel/syscall_table_32.S 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
12492--- linux-2.6.32.9/arch/x86/kernel/syscall_table_32.S 2010-02-23 10:38:51.000000000 -0500 12486--- linux-2.6.32.10/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400
12493+++ linux-2.6.32.9/arch/x86/kernel/syscall_table_32.S 2010-03-11 20:25:00.005341198 -0500 12487+++ linux-2.6.32.10/arch/x86/kernel/syscall_table_32.S 2010-03-20 15:58:46.953540376 -0400
12494@@ -1,3 +1,4 @@ 12488@@ -1,3 +1,4 @@
12495+.section .rodata,"a",@progbits 12489+.section .rodata,"a",@progbits
12496 ENTRY(sys_call_table) 12490 ENTRY(sys_call_table)
12497 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ 12491 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
12498 .long sys_exit 12492 .long sys_exit
12499diff -urNp linux-2.6.32.9/arch/x86/kernel/sys_i386_32.c linux-2.6.32.9/arch/x86/kernel/sys_i386_32.c 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
12500--- linux-2.6.32.9/arch/x86/kernel/sys_i386_32.c 2010-02-23 10:38:51.000000000 -0500 12494--- linux-2.6.32.10/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400
12501+++ linux-2.6.32.9/arch/x86/kernel/sys_i386_32.c 2010-03-11 20:25:00.005341198 -0500 12495+++ linux-2.6.32.10/arch/x86/kernel/sys_i386_32.c 2010-03-20 15:58:46.953540376 -0400
12502@@ -24,6 +24,21 @@ 12496@@ -24,6 +24,21 @@
12503 12497
12504 #include <asm/syscalls.h> 12498 #include <asm/syscalls.h>
@@ -12745,9 +12739,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/sys_i386_32.c linux-2.6.32.9/arch/x86/
12745 } 12739 }
12746 case 1: /* iBCS2 emulator entry point */ 12740 case 1: /* iBCS2 emulator entry point */
12747 if (!segment_eq(get_fs(), get_ds())) 12741 if (!segment_eq(get_fs(), get_ds()))
12748diff -urNp linux-2.6.32.9/arch/x86/kernel/sys_x86_64.c linux-2.6.32.9/arch/x86/kernel/sys_x86_64.c 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
12749--- linux-2.6.32.9/arch/x86/kernel/sys_x86_64.c 2010-02-23 10:38:51.000000000 -0500 12743--- linux-2.6.32.10/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400
12750+++ linux-2.6.32.9/arch/x86/kernel/sys_x86_64.c 2010-03-11 20:25:00.005341198 -0500 12744+++ linux-2.6.32.10/arch/x86/kernel/sys_x86_64.c 2010-03-20 15:58:46.953540376 -0400
12751@@ -32,8 +32,8 @@ out: 12745@@ -32,8 +32,8 @@ out:
12752 return error; 12746 return error;
12753 } 12747 }
@@ -12829,9 +12823,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/sys_x86_64.c linux-2.6.32.9/arch/x86/k
12829 mm->cached_hole_size = ~0UL; 12823 mm->cached_hole_size = ~0UL;
12830 12824
12831 return addr; 12825 return addr;
12832diff -urNp linux-2.6.32.9/arch/x86/kernel/time.c linux-2.6.32.9/arch/x86/kernel/time.c 12826diff -urNp linux-2.6.32.10/arch/x86/kernel/time.c linux-2.6.32.10/arch/x86/kernel/time.c
12833--- linux-2.6.32.9/arch/x86/kernel/time.c 2010-02-23 10:38:51.000000000 -0500 12827--- linux-2.6.32.10/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400
12834+++ linux-2.6.32.9/arch/x86/kernel/time.c 2010-03-11 20:25:00.005341198 -0500 12828+++ linux-2.6.32.10/arch/x86/kernel/time.c 2010-03-20 15:58:46.953540376 -0400
12835@@ -26,17 +26,13 @@ 12829@@ -26,17 +26,13 @@
12836 int timer_ack; 12830 int timer_ack;
12837 #endif 12831 #endif
@@ -12870,9 +12864,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/time.c linux-2.6.32.9/arch/x86/kernel/
12870 } 12864 }
12871 return pc; 12865 return pc;
12872 } 12866 }
12873diff -urNp linux-2.6.32.9/arch/x86/kernel/tls.c linux-2.6.32.9/arch/x86/kernel/tls.c 12867diff -urNp linux-2.6.32.10/arch/x86/kernel/tls.c linux-2.6.32.10/arch/x86/kernel/tls.c
12874--- linux-2.6.32.9/arch/x86/kernel/tls.c 2010-02-23 10:38:51.000000000 -0500 12868--- linux-2.6.32.10/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400
12875+++ linux-2.6.32.9/arch/x86/kernel/tls.c 2010-03-11 20:25:00.005341198 -0500 12869+++ linux-2.6.32.10/arch/x86/kernel/tls.c 2010-03-20 15:58:46.953540376 -0400
12876@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc 12870@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
12877 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) 12871 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
12878 return -EINVAL; 12872 return -EINVAL;
@@ -12885,9 +12879,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/tls.c linux-2.6.32.9/arch/x86/kernel/t
12885 set_tls_desc(p, idx, &info, 1); 12879 set_tls_desc(p, idx, &info, 1);
12886 12880
12887 return 0; 12881 return 0;
12888diff -urNp linux-2.6.32.9/arch/x86/kernel/trampoline_32.S linux-2.6.32.9/arch/x86/kernel/trampoline_32.S 12882diff -urNp linux-2.6.32.10/arch/x86/kernel/trampoline_32.S linux-2.6.32.10/arch/x86/kernel/trampoline_32.S
12889--- linux-2.6.32.9/arch/x86/kernel/trampoline_32.S 2010-02-23 10:38:51.000000000 -0500 12883--- linux-2.6.32.10/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400
12890+++ linux-2.6.32.9/arch/x86/kernel/trampoline_32.S 2010-03-11 20:25:00.005341198 -0500 12884+++ linux-2.6.32.10/arch/x86/kernel/trampoline_32.S 2010-03-20 15:58:46.953540376 -0400
12891@@ -32,6 +32,12 @@ 12885@@ -32,6 +32,12 @@
12892 #include <asm/segment.h> 12886 #include <asm/segment.h>
12893 #include <asm/page_types.h> 12887 #include <asm/page_types.h>
@@ -12910,9 +12904,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/trampoline_32.S linux-2.6.32.9/arch/x8
12910 12904
12911 # These need to be in the same 64K segment as the above; 12905 # These need to be in the same 64K segment as the above;
12912 # hence we don't use the boot_gdt_descr defined in head.S 12906 # hence we don't use the boot_gdt_descr defined in head.S
12913diff -urNp linux-2.6.32.9/arch/x86/kernel/traps.c linux-2.6.32.9/arch/x86/kernel/traps.c 12907diff -urNp linux-2.6.32.10/arch/x86/kernel/traps.c linux-2.6.32.10/arch/x86/kernel/traps.c
12914--- linux-2.6.32.9/arch/x86/kernel/traps.c 2010-02-23 10:38:51.000000000 -0500 12908--- linux-2.6.32.10/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
12915+++ linux-2.6.32.9/arch/x86/kernel/traps.c 2010-03-11 20:25:00.005341198 -0500 12909+++ linux-2.6.32.10/arch/x86/kernel/traps.c 2010-03-20 15:58:46.953540376 -0400
12916@@ -69,12 +69,6 @@ asmlinkage int system_call(void); 12910@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
12917 12911
12918 /* Do we ignore FPU interrupts ? */ 12912 /* Do we ignore FPU interrupts ? */
@@ -13062,9 +13056,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/traps.c linux-2.6.32.9/arch/x86/kernel
13062 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); 13056 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
13063 return; 13057 return;
13064 } 13058 }
13065diff -urNp linux-2.6.32.9/arch/x86/kernel/tsc.c linux-2.6.32.9/arch/x86/kernel/tsc.c 13059diff -urNp linux-2.6.32.10/arch/x86/kernel/tsc.c linux-2.6.32.10/arch/x86/kernel/tsc.c
13066--- linux-2.6.32.9/arch/x86/kernel/tsc.c 2010-02-23 10:38:51.000000000 -0500 13060--- linux-2.6.32.10/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400
13067+++ linux-2.6.32.9/arch/x86/kernel/tsc.c 2010-03-11 20:25:00.005341198 -0500 13061+++ linux-2.6.32.10/arch/x86/kernel/tsc.c 2010-03-20 15:58:46.953540376 -0400
13068@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b 13062@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b
13069 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), 13063 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
13070 }, 13064 },
@@ -13074,9 +13068,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/tsc.c linux-2.6.32.9/arch/x86/kernel/t
13074 }; 13068 };
13075 13069
13076 static void __init check_system_tsc_reliable(void) 13070 static void __init check_system_tsc_reliable(void)
13077diff -urNp linux-2.6.32.9/arch/x86/kernel/vm86_32.c linux-2.6.32.9/arch/x86/kernel/vm86_32.c 13071diff -urNp linux-2.6.32.10/arch/x86/kernel/vm86_32.c linux-2.6.32.10/arch/x86/kernel/vm86_32.c
13078--- linux-2.6.32.9/arch/x86/kernel/vm86_32.c 2010-02-23 10:38:51.000000000 -0500 13072--- linux-2.6.32.10/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400
13079+++ linux-2.6.32.9/arch/x86/kernel/vm86_32.c 2010-03-11 20:25:00.005341198 -0500 13073+++ linux-2.6.32.10/arch/x86/kernel/vm86_32.c 2010-03-20 15:58:46.953540376 -0400
13080@@ -41,6 +41,7 @@ 13074@@ -41,6 +41,7 @@
13081 #include <linux/ptrace.h> 13075 #include <linux/ptrace.h>
13082 #include <linux/audit.h> 13076 #include <linux/audit.h>
@@ -13141,9 +13135,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/vm86_32.c linux-2.6.32.9/arch/x86/kern
13141 if (get_user(segoffs, intr_ptr)) 13135 if (get_user(segoffs, intr_ptr))
13142 goto cannot_handle; 13136 goto cannot_handle;
13143 if ((segoffs >> 16) == BIOSSEG) 13137 if ((segoffs >> 16) == BIOSSEG)
13144diff -urNp linux-2.6.32.9/arch/x86/kernel/vmi_32.c linux-2.6.32.9/arch/x86/kernel/vmi_32.c 13138diff -urNp linux-2.6.32.10/arch/x86/kernel/vmi_32.c linux-2.6.32.10/arch/x86/kernel/vmi_32.c
13145--- linux-2.6.32.9/arch/x86/kernel/vmi_32.c 2010-02-23 10:38:51.000000000 -0500 13139--- linux-2.6.32.10/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400
13146+++ linux-2.6.32.9/arch/x86/kernel/vmi_32.c 2010-03-11 20:25:00.005341198 -0500 13140+++ linux-2.6.32.10/arch/x86/kernel/vmi_32.c 2010-03-20 15:58:46.953540376 -0400
13147@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) 13141@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
13148 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); 13142 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
13149 13143
@@ -13303,9 +13297,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/vmi_32.c linux-2.6.32.9/arch/x86/kerne
13303 return; 13297 return;
13304 13298
13305 local_irq_save(flags); 13299 local_irq_save(flags);
13306diff -urNp linux-2.6.32.9/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.9/arch/x86/kernel/vmlinux.lds.S 13300diff -urNp linux-2.6.32.10/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.10/arch/x86/kernel/vmlinux.lds.S
13307--- linux-2.6.32.9/arch/x86/kernel/vmlinux.lds.S 2010-02-23 10:38:51.000000000 -0500 13301--- linux-2.6.32.10/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
13308+++ linux-2.6.32.9/arch/x86/kernel/vmlinux.lds.S 2010-03-11 20:25:00.005341198 -0500 13302+++ linux-2.6.32.10/arch/x86/kernel/vmlinux.lds.S 2010-03-20 15:58:46.953540376 -0400
13309@@ -26,6 +26,22 @@ 13303@@ -26,6 +26,22 @@
13310 #include <asm/page_types.h> 13304 #include <asm/page_types.h>
13311 #include <asm/cache.h> 13305 #include <asm/cache.h>
@@ -13593,9 +13587,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.9/arch/x86/
13593 "kernel image bigger than KERNEL_IMAGE_SIZE"); 13587 "kernel image bigger than KERNEL_IMAGE_SIZE");
13594 13588
13595 #ifdef CONFIG_SMP 13589 #ifdef CONFIG_SMP
13596diff -urNp linux-2.6.32.9/arch/x86/kernel/vsyscall_64.c linux-2.6.32.9/arch/x86/kernel/vsyscall_64.c 13590diff -urNp linux-2.6.32.10/arch/x86/kernel/vsyscall_64.c linux-2.6.32.10/arch/x86/kernel/vsyscall_64.c
13597--- linux-2.6.32.9/arch/x86/kernel/vsyscall_64.c 2010-02-23 10:38:51.000000000 -0500 13591--- linux-2.6.32.10/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400
13598+++ linux-2.6.32.9/arch/x86/kernel/vsyscall_64.c 2010-03-11 20:25:00.005341198 -0500 13592+++ linux-2.6.32.10/arch/x86/kernel/vsyscall_64.c 2010-03-20 15:58:46.953540376 -0400
13599@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa 13593@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa
13600 13594
13601 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); 13595 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -13629,9 +13623,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/vsyscall_64.c linux-2.6.32.9/arch/x86/
13629 }; 13623 };
13630 #endif 13624 #endif
13631 13625
13632diff -urNp linux-2.6.32.9/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.9/arch/x86/kernel/x8664_ksyms_64.c 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
13633--- linux-2.6.32.9/arch/x86/kernel/x8664_ksyms_64.c 2010-02-23 10:38:51.000000000 -0500 13627--- linux-2.6.32.10/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400
13634+++ linux-2.6.32.9/arch/x86/kernel/x8664_ksyms_64.c 2010-03-11 20:25:00.005341198 -0500 13628+++ linux-2.6.32.10/arch/x86/kernel/x8664_ksyms_64.c 2010-03-20 15:58:46.953540376 -0400
13635@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); 13629@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
13636 13630
13637 EXPORT_SYMBOL(copy_user_generic); 13631 EXPORT_SYMBOL(copy_user_generic);
@@ -13641,9 +13635,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.9/arch/x
13641 EXPORT_SYMBOL(__copy_from_user_inatomic); 13635 EXPORT_SYMBOL(__copy_from_user_inatomic);
13642 13636
13643 EXPORT_SYMBOL(copy_page); 13637 EXPORT_SYMBOL(copy_page);
13644diff -urNp linux-2.6.32.9/arch/x86/kernel/xsave.c linux-2.6.32.9/arch/x86/kernel/xsave.c 13638diff -urNp linux-2.6.32.10/arch/x86/kernel/xsave.c linux-2.6.32.10/arch/x86/kernel/xsave.c
13645--- linux-2.6.32.9/arch/x86/kernel/xsave.c 2010-02-23 10:38:51.000000000 -0500 13639--- linux-2.6.32.10/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400
13646+++ linux-2.6.32.9/arch/x86/kernel/xsave.c 2010-03-11 20:25:00.005341198 -0500 13640+++ linux-2.6.32.10/arch/x86/kernel/xsave.c 2010-03-20 15:58:46.953540376 -0400
13647@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ 13641@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
13648 fx_sw_user->xstate_size > fx_sw_user->extended_size) 13642 fx_sw_user->xstate_size > fx_sw_user->extended_size)
13649 return -1; 13643 return -1;
@@ -13671,10 +13665,10 @@ diff -urNp linux-2.6.32.9/arch/x86/kernel/xsave.c linux-2.6.32.9/arch/x86/kernel
13671 buf); 13665 buf);
13672 if (unlikely(err)) { 13666 if (unlikely(err)) {
13673 /* 13667 /*
13674diff -urNp linux-2.6.32.9/arch/x86/kvm/emulate.c linux-2.6.32.9/arch/x86/kvm/emulate.c 13668diff -urNp linux-2.6.32.10/arch/x86/kvm/emulate.c linux-2.6.32.10/arch/x86/kvm/emulate.c
13675--- linux-2.6.32.9/arch/x86/kvm/emulate.c 2010-02-23 10:38:51.000000000 -0500 13669--- linux-2.6.32.10/arch/x86/kvm/emulate.c 2010-03-15 11:52:04.000000000 -0400
13676+++ linux-2.6.32.9/arch/x86/kvm/emulate.c 2010-03-11 20:25:00.009433385 -0500 13670+++ linux-2.6.32.10/arch/x86/kvm/emulate.c 2010-03-20 15:58:46.953540376 -0400
13677@@ -389,6 +389,7 @@ static u32 group2_table[] = { 13671@@ -404,6 +404,7 @@ static u32 group2_table[] = {
13678 13672
13679 #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \ 13673 #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \
13680 do { \ 13674 do { \
@@ -13682,7 +13676,7 @@ diff -urNp linux-2.6.32.9/arch/x86/kvm/emulate.c linux-2.6.32.9/arch/x86/kvm/emu
13682 __asm__ __volatile__ ( \ 13676 __asm__ __volatile__ ( \
13683 _PRE_EFLAGS("0", "4", "2") \ 13677 _PRE_EFLAGS("0", "4", "2") \
13684 _op _suffix " %"_x"3,%1; " \ 13678 _op _suffix " %"_x"3,%1; " \
13685@@ -402,8 +403,6 @@ static u32 group2_table[] = { 13679@@ -417,8 +418,6 @@ static u32 group2_table[] = {
13686 /* Raw emulation: instruction has two explicit operands. */ 13680 /* Raw emulation: instruction has two explicit operands. */
13687 #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \ 13681 #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \
13688 do { \ 13682 do { \
@@ -13691,7 +13685,7 @@ diff -urNp linux-2.6.32.9/arch/x86/kvm/emulate.c linux-2.6.32.9/arch/x86/kvm/emu
13691 switch ((_dst).bytes) { \ 13685 switch ((_dst).bytes) { \
13692 case 2: \ 13686 case 2: \
13693 ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \ 13687 ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \
13694@@ -419,7 +418,6 @@ static u32 group2_table[] = { 13688@@ -434,7 +433,6 @@ static u32 group2_table[] = {
13695 13689
13696 #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \ 13690 #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
13697 do { \ 13691 do { \
@@ -13699,9 +13693,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kvm/emulate.c linux-2.6.32.9/arch/x86/kvm/emu
13699 switch ((_dst).bytes) { \ 13693 switch ((_dst).bytes) { \
13700 case 1: \ 13694 case 1: \
13701 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ 13695 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
13702diff -urNp linux-2.6.32.9/arch/x86/kvm/svm.c linux-2.6.32.9/arch/x86/kvm/svm.c 13696diff -urNp linux-2.6.32.10/arch/x86/kvm/svm.c linux-2.6.32.10/arch/x86/kvm/svm.c
13703--- linux-2.6.32.9/arch/x86/kvm/svm.c 2010-02-23 10:38:51.000000000 -0500 13697--- linux-2.6.32.10/arch/x86/kvm/svm.c 2010-03-15 11:52:04.000000000 -0400
13704+++ linux-2.6.32.9/arch/x86/kvm/svm.c 2010-03-11 20:25:00.065754306 -0500 13698+++ linux-2.6.32.10/arch/x86/kvm/svm.c 2010-03-20 15:58:46.953540376 -0400
13705@@ -2389,9 +2389,12 @@ static int handle_exit(struct kvm_run *k 13699@@ -2389,9 +2389,12 @@ static int handle_exit(struct kvm_run *k
13706 static void reload_tss(struct kvm_vcpu *vcpu) 13700 static void reload_tss(struct kvm_vcpu *vcpu)
13707 { 13701 {
@@ -13725,9 +13719,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kvm/svm.c linux-2.6.32.9/arch/x86/kvm/svm.c
13725 .cpu_has_kvm_support = has_svm, 13719 .cpu_has_kvm_support = has_svm,
13726 .disabled_by_bios = is_disabled, 13720 .disabled_by_bios = is_disabled,
13727 .hardware_setup = svm_hardware_setup, 13721 .hardware_setup = svm_hardware_setup,
13728diff -urNp linux-2.6.32.9/arch/x86/kvm/vmx.c linux-2.6.32.9/arch/x86/kvm/vmx.c 13722diff -urNp linux-2.6.32.10/arch/x86/kvm/vmx.c linux-2.6.32.10/arch/x86/kvm/vmx.c
13729--- linux-2.6.32.9/arch/x86/kvm/vmx.c 2010-02-23 10:38:51.000000000 -0500 13723--- linux-2.6.32.10/arch/x86/kvm/vmx.c 2010-03-15 11:52:04.000000000 -0400
13730+++ linux-2.6.32.9/arch/x86/kvm/vmx.c 2010-03-11 20:25:00.065754306 -0500 13724+++ linux-2.6.32.10/arch/x86/kvm/vmx.c 2010-03-20 15:58:46.953540376 -0400
13731@@ -566,7 +566,11 @@ static void reload_tss(void) 13725@@ -566,7 +566,11 @@ static void reload_tss(void)
13732 13726
13733 kvm_get_gdt(&gdt); 13727 kvm_get_gdt(&gdt);
@@ -13806,9 +13800,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kvm/vmx.c linux-2.6.32.9/arch/x86/kvm/vmx.c
13806 .cpu_has_kvm_support = cpu_has_kvm_support, 13800 .cpu_has_kvm_support = cpu_has_kvm_support,
13807 .disabled_by_bios = vmx_disabled_by_bios, 13801 .disabled_by_bios = vmx_disabled_by_bios,
13808 .hardware_setup = hardware_setup, 13802 .hardware_setup = hardware_setup,
13809diff -urNp linux-2.6.32.9/arch/x86/kvm/x86.c linux-2.6.32.9/arch/x86/kvm/x86.c 13803diff -urNp linux-2.6.32.10/arch/x86/kvm/x86.c linux-2.6.32.10/arch/x86/kvm/x86.c
13810--- linux-2.6.32.9/arch/x86/kvm/x86.c 2010-02-23 10:38:51.000000000 -0500 13804--- linux-2.6.32.10/arch/x86/kvm/x86.c 2010-03-15 11:52:04.000000000 -0400
13811+++ linux-2.6.32.9/arch/x86/kvm/x86.c 2010-03-11 20:25:00.065754306 -0500 13805+++ linux-2.6.32.10/arch/x86/kvm/x86.c 2010-03-20 15:58:46.973540531 -0400
13812@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct 13806@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct
13813 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, 13807 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
13814 struct kvm_cpuid_entry2 __user *entries); 13808 struct kvm_cpuid_entry2 __user *entries);
@@ -13910,9 +13904,9 @@ diff -urNp linux-2.6.32.9/arch/x86/kvm/x86.c linux-2.6.32.9/arch/x86/kvm/x86.c
13910 13904
13911 if (kvm_x86_ops) { 13905 if (kvm_x86_ops) {
13912 printk(KERN_ERR "kvm: already loaded the other module\n"); 13906 printk(KERN_ERR "kvm: already loaded the other module\n");
13913diff -urNp linux-2.6.32.9/arch/x86/lib/checksum_32.S linux-2.6.32.9/arch/x86/lib/checksum_32.S 13907diff -urNp linux-2.6.32.10/arch/x86/lib/checksum_32.S linux-2.6.32.10/arch/x86/lib/checksum_32.S
13914--- linux-2.6.32.9/arch/x86/lib/checksum_32.S 2010-02-23 10:38:51.000000000 -0500 13908--- linux-2.6.32.10/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400
13915+++ linux-2.6.32.9/arch/x86/lib/checksum_32.S 2010-03-11 20:25:00.065754306 -0500 13909+++ linux-2.6.32.10/arch/x86/lib/checksum_32.S 2010-03-20 15:58:46.973540531 -0400
13916@@ -28,7 +28,8 @@ 13910@@ -28,7 +28,8 @@
13917 #include <linux/linkage.h> 13911 #include <linux/linkage.h>
13918 #include <asm/dwarf2.h> 13912 #include <asm/dwarf2.h>
@@ -14158,9 +14152,9 @@ diff -urNp linux-2.6.32.9/arch/x86/lib/checksum_32.S linux-2.6.32.9/arch/x86/lib
14158 14152
14159 #undef ROUND 14153 #undef ROUND
14160 #undef ROUND1 14154 #undef ROUND1
14161diff -urNp linux-2.6.32.9/arch/x86/lib/clear_page_64.S linux-2.6.32.9/arch/x86/lib/clear_page_64.S 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
14162--- linux-2.6.32.9/arch/x86/lib/clear_page_64.S 2010-02-23 10:38:51.000000000 -0500 14156--- linux-2.6.32.10/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400
14163+++ linux-2.6.32.9/arch/x86/lib/clear_page_64.S 2010-03-11 20:25:00.065754306 -0500 14157+++ linux-2.6.32.10/arch/x86/lib/clear_page_64.S 2010-03-20 15:58:46.973540531 -0400
14164@@ -43,7 +43,7 @@ ENDPROC(clear_page) 14158@@ -43,7 +43,7 @@ ENDPROC(clear_page)
14165 14159
14166 #include <asm/cpufeature.h> 14160 #include <asm/cpufeature.h>
@@ -14170,9 +14164,9 @@ diff -urNp linux-2.6.32.9/arch/x86/lib/clear_page_64.S linux-2.6.32.9/arch/x86/l
14170 1: .byte 0xeb /* jmp <disp8> */ 14164 1: .byte 0xeb /* jmp <disp8> */
14171 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 14165 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
14172 2: 14166 2:
14173diff -urNp linux-2.6.32.9/arch/x86/lib/copy_page_64.S linux-2.6.32.9/arch/x86/lib/copy_page_64.S 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
14174--- linux-2.6.32.9/arch/x86/lib/copy_page_64.S 2010-02-23 10:38:51.000000000 -0500 14168--- linux-2.6.32.10/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400
14175+++ linux-2.6.32.9/arch/x86/lib/copy_page_64.S 2010-03-11 20:25:00.065754306 -0500 14169+++ linux-2.6.32.10/arch/x86/lib/copy_page_64.S 2010-03-20 15:58:46.973540531 -0400
14176@@ -104,7 +104,7 @@ ENDPROC(copy_page) 14170@@ -104,7 +104,7 @@ ENDPROC(copy_page)
14177 14171
14178 #include <asm/cpufeature.h> 14172 #include <asm/cpufeature.h>
@@ -14182,9 +14176,9 @@ diff -urNp linux-2.6.32.9/arch/x86/lib/copy_page_64.S linux-2.6.32.9/arch/x86/li
14182 1: .byte 0xeb /* jmp <disp8> */ 14176 1: .byte 0xeb /* jmp <disp8> */
14183 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 14177 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
14184 2: 14178 2:
14185diff -urNp linux-2.6.32.9/arch/x86/lib/copy_user_64.S linux-2.6.32.9/arch/x86/lib/copy_user_64.S 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
14186--- linux-2.6.32.9/arch/x86/lib/copy_user_64.S 2010-02-23 10:38:51.000000000 -0500 14180--- linux-2.6.32.10/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400
14187+++ linux-2.6.32.9/arch/x86/lib/copy_user_64.S 2010-03-11 20:25:00.065754306 -0500 14181+++ linux-2.6.32.10/arch/x86/lib/copy_user_64.S 2010-03-20 15:58:46.973540531 -0400
14188@@ -21,7 +21,7 @@ 14182@@ -21,7 +21,7 @@
14189 .byte 0xe9 /* 32bit jump */ 14183 .byte 0xe9 /* 32bit jump */
14190 .long \orig-1f /* by default jump to orig */ 14184 .long \orig-1f /* by default jump to orig */
@@ -14236,9 +14230,9 @@ diff -urNp linux-2.6.32.9/arch/x86/lib/copy_user_64.S linux-2.6.32.9/arch/x86/li
14236 movl %edx,%ecx 14230 movl %edx,%ecx
14237 xorl %eax,%eax 14231 xorl %eax,%eax
14238 rep 14232 rep
14239diff -urNp linux-2.6.32.9/arch/x86/lib/getuser.S linux-2.6.32.9/arch/x86/lib/getuser.S 14233diff -urNp linux-2.6.32.10/arch/x86/lib/getuser.S linux-2.6.32.10/arch/x86/lib/getuser.S
14240--- linux-2.6.32.9/arch/x86/lib/getuser.S 2010-02-23 10:38:51.000000000 -0500 14234--- linux-2.6.32.10/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400
14241+++ linux-2.6.32.9/arch/x86/lib/getuser.S 2010-03-11 20:25:00.065754306 -0500 14235+++ linux-2.6.32.10/arch/x86/lib/getuser.S 2010-03-20 15:58:46.973540531 -0400
14242@@ -33,14 +33,28 @@ 14236@@ -33,14 +33,28 @@
14243 #include <asm/asm-offsets.h> 14237 #include <asm/asm-offsets.h>
14244 #include <asm/thread_info.h> 14238 #include <asm/thread_info.h>
@@ -14331,9 +14325,9 @@ diff -urNp linux-2.6.32.9/arch/x86/lib/getuser.S linux-2.6.32.9/arch/x86/lib/get
14331 xor %edx,%edx 14325 xor %edx,%edx
14332 mov $(-EFAULT),%_ASM_AX 14326 mov $(-EFAULT),%_ASM_AX
14333 ret 14327 ret
14334diff -urNp linux-2.6.32.9/arch/x86/lib/memcpy_64.S linux-2.6.32.9/arch/x86/lib/memcpy_64.S 14328diff -urNp linux-2.6.32.10/arch/x86/lib/memcpy_64.S linux-2.6.32.10/arch/x86/lib/memcpy_64.S
14335--- linux-2.6.32.9/arch/x86/lib/memcpy_64.S 2010-02-23 10:38:51.000000000 -0500 14329--- linux-2.6.32.10/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400
14336+++ linux-2.6.32.9/arch/x86/lib/memcpy_64.S 2010-03-11 20:25:00.065754306 -0500 14330+++ linux-2.6.32.10/arch/x86/lib/memcpy_64.S 2010-03-20 15:58:46.973540531 -0400
14337@@ -128,7 +128,7 @@ ENDPROC(__memcpy) 14331@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
14338 * It is also a lot simpler. Use this when possible: 14332 * It is also a lot simpler. Use this when possible:
14339 */ 14333 */
@@ -14343,9 +14337,9 @@ diff -urNp linux-2.6.32.9/arch/x86/lib/memcpy_64.S linux-2.6.32.9/arch/x86/lib/m
14343 1: .byte 0xeb /* jmp <disp8> */ 14337 1: .byte 0xeb /* jmp <disp8> */
14344 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 14338 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
14345 2: 14339 2:
14346diff -urNp linux-2.6.32.9/arch/x86/lib/memset_64.S linux-2.6.32.9/arch/x86/lib/memset_64.S 14340diff -urNp linux-2.6.32.10/arch/x86/lib/memset_64.S linux-2.6.32.10/arch/x86/lib/memset_64.S
14347--- linux-2.6.32.9/arch/x86/lib/memset_64.S 2010-02-23 10:38:51.000000000 -0500 14341--- linux-2.6.32.10/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400
14348+++ linux-2.6.32.9/arch/x86/lib/memset_64.S 2010-03-11 20:25:00.065754306 -0500 14342+++ linux-2.6.32.10/arch/x86/lib/memset_64.S 2010-03-20 15:58:46.973540531 -0400
14349@@ -118,7 +118,7 @@ ENDPROC(__memset) 14343@@ -118,7 +118,7 @@ ENDPROC(__memset)
14350 14344
14351 #include <asm/cpufeature.h> 14345 #include <asm/cpufeature.h>
@@ -14355,9 +14349,9 @@ diff -urNp linux-2.6.32.9/arch/x86/lib/memset_64.S linux-2.6.32.9/arch/x86/lib/m
14355 1: .byte 0xeb /* jmp <disp8> */ 14349 1: .byte 0xeb /* jmp <disp8> */
14356 .byte (memset_c - memset) - (2f - 1b) /* offset */ 14350 .byte (memset_c - memset) - (2f - 1b) /* offset */
14357 2: 14351 2:
14358diff -urNp linux-2.6.32.9/arch/x86/lib/mmx_32.c linux-2.6.32.9/arch/x86/lib/mmx_32.c 14352diff -urNp linux-2.6.32.10/arch/x86/lib/mmx_32.c linux-2.6.32.10/arch/x86/lib/mmx_32.c
14359--- linux-2.6.32.9/arch/x86/lib/mmx_32.c 2010-02-23 10:38:51.000000000 -0500 14353--- linux-2.6.32.10/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400
14360+++ linux-2.6.32.9/arch/x86/lib/mmx_32.c 2010-03-11 20:25:00.070628324 -0500 14354+++ linux-2.6.32.10/arch/x86/lib/mmx_32.c 2010-03-20 15:58:46.973540531 -0400
14361@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * 14355@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
14362 { 14356 {
14363 void *p; 14357 void *p;
@@ -14673,9 +14667,9 @@ diff -urNp linux-2.6.32.9/arch/x86/lib/mmx_32.c linux-2.6.32.9/arch/x86/lib/mmx_
14673 14667
14674 from += 64; 14668 from += 64;
14675 to += 64; 14669 to += 64;
14676diff -urNp linux-2.6.32.9/arch/x86/lib/putuser.S linux-2.6.32.9/arch/x86/lib/putuser.S 14670diff -urNp linux-2.6.32.10/arch/x86/lib/putuser.S linux-2.6.32.10/arch/x86/lib/putuser.S
14677--- linux-2.6.32.9/arch/x86/lib/putuser.S 2010-02-23 10:38:51.000000000 -0500 14671--- linux-2.6.32.10/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400
14678+++ linux-2.6.32.9/arch/x86/lib/putuser.S 2010-03-11 20:25:04.609377560 -0500 14672+++ linux-2.6.32.10/arch/x86/lib/putuser.S 2010-03-20 15:58:46.973540531 -0400
14679@@ -15,6 +15,7 @@ 14673@@ -15,6 +15,7 @@
14680 #include <asm/thread_info.h> 14674 #include <asm/thread_info.h>
14681 #include <asm/errno.h> 14675 #include <asm/errno.h>
@@ -14807,9 +14801,9 @@ diff -urNp linux-2.6.32.9/arch/x86/lib/putuser.S linux-2.6.32.9/arch/x86/lib/put
14807 movl $-EFAULT,%eax 14801 movl $-EFAULT,%eax
14808 EXIT 14802 EXIT
14809 END(bad_put_user) 14803 END(bad_put_user)
14810diff -urNp linux-2.6.32.9/arch/x86/lib/usercopy_32.c linux-2.6.32.9/arch/x86/lib/usercopy_32.c 14804diff -urNp linux-2.6.32.10/arch/x86/lib/usercopy_32.c linux-2.6.32.10/arch/x86/lib/usercopy_32.c
14811--- linux-2.6.32.9/arch/x86/lib/usercopy_32.c 2010-02-23 10:38:51.000000000 -0500 14805--- linux-2.6.32.10/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400
14812+++ linux-2.6.32.9/arch/x86/lib/usercopy_32.c 2010-03-11 20:25:00.070628324 -0500 14806+++ linux-2.6.32.10/arch/x86/lib/usercopy_32.c 2010-03-20 15:58:46.973540531 -0400
14813@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned 14807@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
14814 * Copy a null terminated string from userspace. 14808 * Copy a null terminated string from userspace.
14815 */ 14809 */
@@ -15778,9 +15772,9 @@ diff -urNp linux-2.6.32.9/arch/x86/lib/usercopy_32.c linux-2.6.32.9/arch/x86/lib
15778+#endif 15772+#endif
15779+ 15773+
15780+EXPORT_SYMBOL(set_fs); 15774+EXPORT_SYMBOL(set_fs);
15781diff -urNp linux-2.6.32.9/arch/x86/Makefile linux-2.6.32.9/arch/x86/Makefile 15775diff -urNp linux-2.6.32.10/arch/x86/Makefile linux-2.6.32.10/arch/x86/Makefile
15782--- linux-2.6.32.9/arch/x86/Makefile 2010-02-23 10:38:51.000000000 -0500 15776--- linux-2.6.32.10/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400
15783+++ linux-2.6.32.9/arch/x86/Makefile 2010-03-11 20:25:00.070628324 -0500 15777+++ linux-2.6.32.10/arch/x86/Makefile 2010-03-20 15:58:46.973540531 -0400
15784@@ -189,3 +189,12 @@ define archhelp 15778@@ -189,3 +189,12 @@ define archhelp
15785 echo ' FDARGS="..." arguments for the booted kernel' 15779 echo ' FDARGS="..." arguments for the booted kernel'
15786 echo ' FDINITRD=file initrd for the booted kernel' 15780 echo ' FDINITRD=file initrd for the booted kernel'
@@ -15794,9 +15788,9 @@ diff -urNp linux-2.6.32.9/arch/x86/Makefile linux-2.6.32.9/arch/x86/Makefile
15794+ 15788+
15795+archprepare: 15789+archprepare:
15796+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) 15790+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
15797diff -urNp linux-2.6.32.9/arch/x86/mm/extable.c linux-2.6.32.9/arch/x86/mm/extable.c 15791diff -urNp linux-2.6.32.10/arch/x86/mm/extable.c linux-2.6.32.10/arch/x86/mm/extable.c
15798--- linux-2.6.32.9/arch/x86/mm/extable.c 2010-02-23 10:38:51.000000000 -0500 15792--- linux-2.6.32.10/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400
15799+++ linux-2.6.32.9/arch/x86/mm/extable.c 2010-03-11 20:25:00.070628324 -0500 15793+++ linux-2.6.32.10/arch/x86/mm/extable.c 2010-03-20 15:58:46.973540531 -0400
15800@@ -1,14 +1,71 @@ 15794@@ -1,14 +1,71 @@
15801 #include <linux/module.h> 15795 #include <linux/module.h>
15802 #include <linux/spinlock.h> 15796 #include <linux/spinlock.h>
@@ -15870,9 +15864,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/extable.c linux-2.6.32.9/arch/x86/mm/extab
15870 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; 15864 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
15871 extern u32 pnp_bios_is_utter_crap; 15865 extern u32 pnp_bios_is_utter_crap;
15872 pnp_bios_is_utter_crap = 1; 15866 pnp_bios_is_utter_crap = 1;
15873diff -urNp linux-2.6.32.9/arch/x86/mm/fault.c linux-2.6.32.9/arch/x86/mm/fault.c 15867diff -urNp linux-2.6.32.10/arch/x86/mm/fault.c linux-2.6.32.10/arch/x86/mm/fault.c
15874--- linux-2.6.32.9/arch/x86/mm/fault.c 2010-02-23 10:38:51.000000000 -0500 15868--- linux-2.6.32.10/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
15875+++ linux-2.6.32.9/arch/x86/mm/fault.c 2010-03-11 20:25:00.070628324 -0500 15869+++ linux-2.6.32.10/arch/x86/mm/fault.c 2010-03-20 15:58:46.977545072 -0400
15876@@ -11,10 +11,14 @@ 15870@@ -11,10 +11,14 @@
15877 #include <linux/kprobes.h> /* __kprobes, ... */ 15871 #include <linux/kprobes.h> /* __kprobes, ... */
15878 #include <linux/mmiotrace.h> /* kmmio_handler, ... */ 15872 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
@@ -16439,9 +16433,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/fault.c linux-2.6.32.9/arch/x86/mm/fault.c
16439+ 16433+
16440+ return ret ? -EFAULT : 0; 16434+ return ret ? -EFAULT : 0;
16441+} 16435+}
16442diff -urNp linux-2.6.32.9/arch/x86/mm/gup.c linux-2.6.32.9/arch/x86/mm/gup.c 16436diff -urNp linux-2.6.32.10/arch/x86/mm/gup.c linux-2.6.32.10/arch/x86/mm/gup.c
16443--- linux-2.6.32.9/arch/x86/mm/gup.c 2010-02-23 10:38:51.000000000 -0500 16437--- linux-2.6.32.10/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400
16444+++ linux-2.6.32.9/arch/x86/mm/gup.c 2010-03-11 20:25:00.070628324 -0500 16438+++ linux-2.6.32.10/arch/x86/mm/gup.c 2010-03-20 15:58:46.977545072 -0400
16445@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long 16439@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
16446 addr = start; 16440 addr = start;
16447 len = (unsigned long) nr_pages << PAGE_SHIFT; 16441 len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -16451,9 +16445,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/gup.c linux-2.6.32.9/arch/x86/mm/gup.c
16451 (void __user *)start, len))) 16445 (void __user *)start, len)))
16452 return 0; 16446 return 0;
16453 16447
16454diff -urNp linux-2.6.32.9/arch/x86/mm/highmem_32.c linux-2.6.32.9/arch/x86/mm/highmem_32.c 16448diff -urNp linux-2.6.32.10/arch/x86/mm/highmem_32.c linux-2.6.32.10/arch/x86/mm/highmem_32.c
16455--- linux-2.6.32.9/arch/x86/mm/highmem_32.c 2010-02-23 10:38:51.000000000 -0500 16449--- linux-2.6.32.10/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400
16456+++ linux-2.6.32.9/arch/x86/mm/highmem_32.c 2010-03-11 20:25:00.070628324 -0500 16450+++ linux-2.6.32.10/arch/x86/mm/highmem_32.c 2010-03-20 15:58:46.977545072 -0400
16457@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page 16451@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
16458 idx = type + KM_TYPE_NR*smp_processor_id(); 16452 idx = type + KM_TYPE_NR*smp_processor_id();
16459 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); 16453 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -16465,9 +16459,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/highmem_32.c linux-2.6.32.9/arch/x86/mm/hi
16465 16459
16466 return (void *)vaddr; 16460 return (void *)vaddr;
16467 } 16461 }
16468diff -urNp linux-2.6.32.9/arch/x86/mm/hugetlbpage.c linux-2.6.32.9/arch/x86/mm/hugetlbpage.c 16462diff -urNp linux-2.6.32.10/arch/x86/mm/hugetlbpage.c linux-2.6.32.10/arch/x86/mm/hugetlbpage.c
16469--- linux-2.6.32.9/arch/x86/mm/hugetlbpage.c 2010-02-23 10:38:51.000000000 -0500 16463--- linux-2.6.32.10/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400
16470+++ linux-2.6.32.9/arch/x86/mm/hugetlbpage.c 2010-03-11 20:25:00.070628324 -0500 16464+++ linux-2.6.32.10/arch/x86/mm/hugetlbpage.c 2010-03-20 15:58:46.977545072 -0400
16471@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe 16465@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe
16472 struct hstate *h = hstate_file(file); 16466 struct hstate *h = hstate_file(file);
16473 struct mm_struct *mm = current->mm; 16467 struct mm_struct *mm = current->mm;
@@ -16602,9 +16596,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/hugetlbpage.c linux-2.6.32.9/arch/x86/mm/h
16602 (!vma || addr + len <= vma->vm_start)) 16596 (!vma || addr + len <= vma->vm_start))
16603 return addr; 16597 return addr;
16604 } 16598 }
16605diff -urNp linux-2.6.32.9/arch/x86/mm/init_32.c linux-2.6.32.9/arch/x86/mm/init_32.c 16599diff -urNp linux-2.6.32.10/arch/x86/mm/init_32.c linux-2.6.32.10/arch/x86/mm/init_32.c
16606--- linux-2.6.32.9/arch/x86/mm/init_32.c 2010-02-23 10:38:51.000000000 -0500 16600--- linux-2.6.32.10/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
16607+++ linux-2.6.32.9/arch/x86/mm/init_32.c 2010-03-11 20:25:04.609377560 -0500 16601+++ linux-2.6.32.10/arch/x86/mm/init_32.c 2010-03-20 15:58:46.977545072 -0400
16608@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) 16602@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
16609 } 16603 }
16610 16604
@@ -16895,9 +16889,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/init_32.c linux-2.6.32.9/arch/x86/mm/init_
16895 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); 16889 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
16896 printk(KERN_INFO "Write protecting the kernel text: %luk\n", 16890 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
16897 size >> 10); 16891 size >> 10);
16898diff -urNp linux-2.6.32.9/arch/x86/mm/init_64.c linux-2.6.32.9/arch/x86/mm/init_64.c 16892diff -urNp linux-2.6.32.10/arch/x86/mm/init_64.c linux-2.6.32.10/arch/x86/mm/init_64.c
16899--- linux-2.6.32.9/arch/x86/mm/init_64.c 2010-02-23 10:38:51.000000000 -0500 16893--- linux-2.6.32.10/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400
16900+++ linux-2.6.32.9/arch/x86/mm/init_64.c 2010-03-11 20:25:00.070628324 -0500 16894+++ linux-2.6.32.10/arch/x86/mm/init_64.c 2010-03-20 15:58:46.977545072 -0400
16901@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 16895@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
16902 pmd = fill_pmd(pud, vaddr); 16896 pmd = fill_pmd(pud, vaddr);
16903 pte = fill_pte(pmd, vaddr); 16897 pte = fill_pte(pmd, vaddr);
@@ -16945,9 +16939,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/init_64.c linux-2.6.32.9/arch/x86/mm/init_
16945 return "[vdso]"; 16939 return "[vdso]";
16946 if (vma == &gate_vma) 16940 if (vma == &gate_vma)
16947 return "[vsyscall]"; 16941 return "[vsyscall]";
16948diff -urNp linux-2.6.32.9/arch/x86/mm/init.c linux-2.6.32.9/arch/x86/mm/init.c 16942diff -urNp linux-2.6.32.10/arch/x86/mm/init.c linux-2.6.32.10/arch/x86/mm/init.c
16949--- linux-2.6.32.9/arch/x86/mm/init.c 2010-02-23 10:38:51.000000000 -0500 16943--- linux-2.6.32.10/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400
16950+++ linux-2.6.32.9/arch/x86/mm/init.c 2010-03-11 20:25:04.609377560 -0500 16944+++ linux-2.6.32.10/arch/x86/mm/init.c 2010-03-20 15:58:46.977545072 -0400
16951@@ -69,11 +69,7 @@ static void __init find_early_table_spac 16945@@ -69,11 +69,7 @@ static void __init find_early_table_spac
16952 * cause a hotspot and fill up ZONE_DMA. The page tables 16946 * cause a hotspot and fill up ZONE_DMA. The page tables
16953 * need roughly 0.5KB per GB. 16947 * need roughly 0.5KB per GB.
@@ -17064,9 +17058,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/init.c linux-2.6.32.9/arch/x86/mm/init.c
17064 free_init_pages("unused kernel memory", 17058 free_init_pages("unused kernel memory",
17065 (unsigned long)(&__init_begin), 17059 (unsigned long)(&__init_begin),
17066 (unsigned long)(&__init_end)); 17060 (unsigned long)(&__init_end));
17067diff -urNp linux-2.6.32.9/arch/x86/mm/iomap_32.c linux-2.6.32.9/arch/x86/mm/iomap_32.c 17061diff -urNp linux-2.6.32.10/arch/x86/mm/iomap_32.c linux-2.6.32.10/arch/x86/mm/iomap_32.c
17068--- linux-2.6.32.9/arch/x86/mm/iomap_32.c 2010-02-23 10:38:51.000000000 -0500 17062--- linux-2.6.32.10/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400
17069+++ linux-2.6.32.9/arch/x86/mm/iomap_32.c 2010-03-11 20:25:00.073656172 -0500 17063+++ linux-2.6.32.10/arch/x86/mm/iomap_32.c 2010-03-20 15:58:46.977545072 -0400
17070@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long 17064@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
17071 debug_kmap_atomic(type); 17065 debug_kmap_atomic(type);
17072 idx = type + KM_TYPE_NR * smp_processor_id(); 17066 idx = type + KM_TYPE_NR * smp_processor_id();
@@ -17079,9 +17073,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/iomap_32.c linux-2.6.32.9/arch/x86/mm/ioma
17079 arch_flush_lazy_mmu_mode(); 17073 arch_flush_lazy_mmu_mode();
17080 17074
17081 return (void *)vaddr; 17075 return (void *)vaddr;
17082diff -urNp linux-2.6.32.9/arch/x86/mm/ioremap.c linux-2.6.32.9/arch/x86/mm/ioremap.c 17076diff -urNp linux-2.6.32.10/arch/x86/mm/ioremap.c linux-2.6.32.10/arch/x86/mm/ioremap.c
17083--- linux-2.6.32.9/arch/x86/mm/ioremap.c 2010-02-23 10:38:51.000000000 -0500 17077--- linux-2.6.32.10/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400
17084+++ linux-2.6.32.9/arch/x86/mm/ioremap.c 2010-03-11 20:25:00.073656172 -0500 17078+++ linux-2.6.32.10/arch/x86/mm/ioremap.c 2010-03-20 15:58:46.977545072 -0400
17085@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) 17079@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
17086 * Second special case: Some BIOSen report the PC BIOS 17080 * Second special case: Some BIOSen report the PC BIOS
17087 * area (640->1Mb) as ram even though it is not. 17081 * area (640->1Mb) as ram even though it is not.
@@ -17128,9 +17122,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/ioremap.c linux-2.6.32.9/arch/x86/mm/iorem
17128 17122
17129 /* 17123 /*
17130 * The boot-ioremap range spans multiple pmds, for which 17124 * The boot-ioremap range spans multiple pmds, for which
17131diff -urNp linux-2.6.32.9/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.9/arch/x86/mm/kmemcheck/kmemcheck.c 17125diff -urNp linux-2.6.32.10/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.10/arch/x86/mm/kmemcheck/kmemcheck.c
17132--- linux-2.6.32.9/arch/x86/mm/kmemcheck/kmemcheck.c 2010-02-23 10:38:51.000000000 -0500 17126--- linux-2.6.32.10/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400
17133+++ linux-2.6.32.9/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-11 20:25:00.073656172 -0500 17127+++ linux-2.6.32.10/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-20 15:58:46.977545072 -0400
17134@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg 17128@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
17135 * memory (e.g. tracked pages)? For now, we need this to avoid 17129 * memory (e.g. tracked pages)? For now, we need this to avoid
17136 * invoking kmemcheck for PnP BIOS calls. 17130 * invoking kmemcheck for PnP BIOS calls.
@@ -17143,9 +17137,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.9/arch/
17143 return false; 17137 return false;
17144 17138
17145 pte = kmemcheck_pte_lookup(address); 17139 pte = kmemcheck_pte_lookup(address);
17146diff -urNp linux-2.6.32.9/arch/x86/mm/mmap.c linux-2.6.32.9/arch/x86/mm/mmap.c 17140diff -urNp linux-2.6.32.10/arch/x86/mm/mmap.c linux-2.6.32.10/arch/x86/mm/mmap.c
17147--- linux-2.6.32.9/arch/x86/mm/mmap.c 2010-02-23 10:38:51.000000000 -0500 17141--- linux-2.6.32.10/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
17148+++ linux-2.6.32.9/arch/x86/mm/mmap.c 2010-03-11 20:25:00.073656172 -0500 17142+++ linux-2.6.32.10/arch/x86/mm/mmap.c 2010-03-20 15:58:46.977545072 -0400
17149@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size 17143@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
17150 * Leave an at least ~128 MB hole with possible stack randomization. 17144 * Leave an at least ~128 MB hole with possible stack randomization.
17151 */ 17145 */
@@ -17227,9 +17221,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/mmap.c linux-2.6.32.9/arch/x86/mm/mmap.c
17227 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 17221 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
17228 mm->unmap_area = arch_unmap_area_topdown; 17222 mm->unmap_area = arch_unmap_area_topdown;
17229 } 17223 }
17230diff -urNp linux-2.6.32.9/arch/x86/mm/numa_32.c linux-2.6.32.9/arch/x86/mm/numa_32.c 17224diff -urNp linux-2.6.32.10/arch/x86/mm/numa_32.c linux-2.6.32.10/arch/x86/mm/numa_32.c
17231--- linux-2.6.32.9/arch/x86/mm/numa_32.c 2010-02-23 10:38:51.000000000 -0500 17225--- linux-2.6.32.10/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400
17232+++ linux-2.6.32.9/arch/x86/mm/numa_32.c 2010-03-11 20:25:00.073656172 -0500 17226+++ linux-2.6.32.10/arch/x86/mm/numa_32.c 2010-03-20 15:58:46.977545072 -0400
17233@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int 17227@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
17234 } 17228 }
17235 #endif 17229 #endif
@@ -17238,9 +17232,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/numa_32.c linux-2.6.32.9/arch/x86/mm/numa_
17238 extern unsigned long highend_pfn, highstart_pfn; 17232 extern unsigned long highend_pfn, highstart_pfn;
17239 17233
17240 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) 17234 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
17241diff -urNp linux-2.6.32.9/arch/x86/mm/pageattr.c linux-2.6.32.9/arch/x86/mm/pageattr.c 17235diff -urNp linux-2.6.32.10/arch/x86/mm/pageattr.c linux-2.6.32.10/arch/x86/mm/pageattr.c
17242--- linux-2.6.32.9/arch/x86/mm/pageattr.c 2010-02-23 10:38:51.000000000 -0500 17236--- linux-2.6.32.10/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400
17243+++ linux-2.6.32.9/arch/x86/mm/pageattr.c 2010-03-11 20:25:00.073656172 -0500 17237+++ linux-2.6.32.10/arch/x86/mm/pageattr.c 2010-03-20 15:58:46.977545072 -0400
17244@@ -268,9 +268,10 @@ static inline pgprot_t static_protection 17238@@ -268,9 +268,10 @@ static inline pgprot_t static_protection
17245 * Does not cover __inittext since that is gone later on. On 17239 * Does not cover __inittext since that is gone later on. On
17246 * 64bit we do not enforce !NX on the low mapping 17240 * 64bit we do not enforce !NX on the low mapping
@@ -17272,9 +17266,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/pageattr.c linux-2.6.32.9/arch/x86/mm/page
17272 #ifdef CONFIG_X86_32 17266 #ifdef CONFIG_X86_32
17273 if (!SHARED_KERNEL_PMD) { 17267 if (!SHARED_KERNEL_PMD) {
17274 struct page *page; 17268 struct page *page;
17275diff -urNp linux-2.6.32.9/arch/x86/mm/pageattr-test.c linux-2.6.32.9/arch/x86/mm/pageattr-test.c 17269diff -urNp linux-2.6.32.10/arch/x86/mm/pageattr-test.c linux-2.6.32.10/arch/x86/mm/pageattr-test.c
17276--- linux-2.6.32.9/arch/x86/mm/pageattr-test.c 2010-02-23 10:38:51.000000000 -0500 17270--- linux-2.6.32.10/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400
17277+++ linux-2.6.32.9/arch/x86/mm/pageattr-test.c 2010-03-11 20:25:00.073656172 -0500 17271+++ linux-2.6.32.10/arch/x86/mm/pageattr-test.c 2010-03-20 15:58:46.977545072 -0400
17278@@ -36,7 +36,7 @@ enum { 17272@@ -36,7 +36,7 @@ enum {
17279 17273
17280 static int pte_testbit(pte_t pte) 17274 static int pte_testbit(pte_t pte)
@@ -17284,9 +17278,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/pageattr-test.c linux-2.6.32.9/arch/x86/mm
17284 } 17278 }
17285 17279
17286 struct split_state { 17280 struct split_state {
17287diff -urNp linux-2.6.32.9/arch/x86/mm/pat.c linux-2.6.32.9/arch/x86/mm/pat.c 17281diff -urNp linux-2.6.32.10/arch/x86/mm/pat.c linux-2.6.32.10/arch/x86/mm/pat.c
17288--- linux-2.6.32.9/arch/x86/mm/pat.c 2010-02-23 10:38:51.000000000 -0500 17282--- linux-2.6.32.10/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400
17289+++ linux-2.6.32.9/arch/x86/mm/pat.c 2010-03-11 20:25:00.073656172 -0500 17283+++ linux-2.6.32.10/arch/x86/mm/pat.c 2010-03-20 15:58:46.977545072 -0400
17290@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct 17284@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
17291 17285
17292 conflict: 17286 conflict:
@@ -17323,9 +17317,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/pat.c linux-2.6.32.9/arch/x86/mm/pat.c
17323 cattr_name(want_flags), 17317 cattr_name(want_flags),
17324 (unsigned long long)paddr, 17318 (unsigned long long)paddr,
17325 (unsigned long long)(paddr + size), 17319 (unsigned long long)(paddr + size),
17326diff -urNp linux-2.6.32.9/arch/x86/mm/pgtable_32.c linux-2.6.32.9/arch/x86/mm/pgtable_32.c 17320diff -urNp linux-2.6.32.10/arch/x86/mm/pgtable_32.c linux-2.6.32.10/arch/x86/mm/pgtable_32.c
17327--- linux-2.6.32.9/arch/x86/mm/pgtable_32.c 2010-02-23 10:38:51.000000000 -0500 17321--- linux-2.6.32.10/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400
17328+++ linux-2.6.32.9/arch/x86/mm/pgtable_32.c 2010-03-11 20:25:00.073656172 -0500 17322+++ linux-2.6.32.10/arch/x86/mm/pgtable_32.c 2010-03-20 15:58:46.977545072 -0400
17329@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, 17323@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
17330 return; 17324 return;
17331 } 17325 }
@@ -17340,9 +17334,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/pgtable_32.c linux-2.6.32.9/arch/x86/mm/pg
17340 17334
17341 /* 17335 /*
17342 * It's enough to flush this one mapping. 17336 * It's enough to flush this one mapping.
17343diff -urNp linux-2.6.32.9/arch/x86/mm/setup_nx.c linux-2.6.32.9/arch/x86/mm/setup_nx.c 17337diff -urNp linux-2.6.32.10/arch/x86/mm/setup_nx.c linux-2.6.32.10/arch/x86/mm/setup_nx.c
17344--- linux-2.6.32.9/arch/x86/mm/setup_nx.c 2010-02-23 10:38:51.000000000 -0500 17338--- linux-2.6.32.10/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400
17345+++ linux-2.6.32.9/arch/x86/mm/setup_nx.c 2010-03-11 20:25:00.073656172 -0500 17339+++ linux-2.6.32.10/arch/x86/mm/setup_nx.c 2010-03-20 15:58:46.977545072 -0400
17346@@ -4,11 +4,10 @@ 17340@@ -4,11 +4,10 @@
17347 17341
17348 #include <asm/pgtable.h> 17342 #include <asm/pgtable.h>
@@ -17408,9 +17402,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/setup_nx.c linux-2.6.32.9/arch/x86/mm/setu
17408 __supported_pte_mask &= ~_PAGE_NX; 17402 __supported_pte_mask &= ~_PAGE_NX;
17409 } 17403 }
17410 #endif 17404 #endif
17411diff -urNp linux-2.6.32.9/arch/x86/mm/tlb.c linux-2.6.32.9/arch/x86/mm/tlb.c 17405diff -urNp linux-2.6.32.10/arch/x86/mm/tlb.c linux-2.6.32.10/arch/x86/mm/tlb.c
17412--- linux-2.6.32.9/arch/x86/mm/tlb.c 2010-02-23 10:38:51.000000000 -0500 17406--- linux-2.6.32.10/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400
17413+++ linux-2.6.32.9/arch/x86/mm/tlb.c 2010-03-11 20:25:00.073656172 -0500 17407+++ linux-2.6.32.10/arch/x86/mm/tlb.c 2010-03-20 15:58:46.977545072 -0400
17414@@ -12,7 +12,7 @@ 17408@@ -12,7 +12,7 @@
17415 #include <asm/uv/uv.h> 17409 #include <asm/uv/uv.h>
17416 17410
@@ -17420,18 +17414,9 @@ diff -urNp linux-2.6.32.9/arch/x86/mm/tlb.c linux-2.6.32.9/arch/x86/mm/tlb.c
17420 17414
17421 /* 17415 /*
17422 * Smarter SMP flushing macros. 17416 * Smarter SMP flushing macros.
17423diff -urNp linux-2.6.32.9/arch/x86/oprofile/backtrace.c linux-2.6.32.9/arch/x86/oprofile/backtrace.c 17417diff -urNp linux-2.6.32.10/arch/x86/oprofile/backtrace.c linux-2.6.32.10/arch/x86/oprofile/backtrace.c
17424--- linux-2.6.32.9/arch/x86/oprofile/backtrace.c 2010-02-23 10:38:51.000000000 -0500 17418--- linux-2.6.32.10/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400
17425+++ linux-2.6.32.9/arch/x86/oprofile/backtrace.c 2010-03-11 20:25:00.073656172 -0500 17419+++ linux-2.6.32.10/arch/x86/oprofile/backtrace.c 2010-03-20 17:00:22.628580380 -0400
17426@@ -37,7 +37,7 @@ static void backtrace_address(void *data
17427 unsigned int *depth = data;
17428
17429 if ((*depth)--)
17430- oprofile_add_trace(addr);
17431+ oprofile_add_trace(ktla_ktva(addr));
17432 }
17433
17434 static struct stacktrace_ops backtrace_ops = {
17435@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back 17420@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
17436 struct frame_head bufhead[2]; 17421 struct frame_head bufhead[2];
17437 17422
@@ -17450,9 +17435,9 @@ diff -urNp linux-2.6.32.9/arch/x86/oprofile/backtrace.c linux-2.6.32.9/arch/x86/
17450 unsigned long stack = kernel_stack_pointer(regs); 17435 unsigned long stack = kernel_stack_pointer(regs);
17451 if (depth) 17436 if (depth)
17452 dump_trace(NULL, regs, (unsigned long *)stack, 0, 17437 dump_trace(NULL, regs, (unsigned long *)stack, 0,
17453diff -urNp linux-2.6.32.9/arch/x86/oprofile/op_model_p4.c linux-2.6.32.9/arch/x86/oprofile/op_model_p4.c 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
17454--- linux-2.6.32.9/arch/x86/oprofile/op_model_p4.c 2010-02-23 10:38:51.000000000 -0500 17439--- linux-2.6.32.10/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400
17455+++ linux-2.6.32.9/arch/x86/oprofile/op_model_p4.c 2010-03-11 20:25:00.073656172 -0500 17440+++ linux-2.6.32.10/arch/x86/oprofile/op_model_p4.c 2010-03-20 15:58:46.977545072 -0400
17456@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo 17441@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
17457 #endif 17442 #endif
17458 } 17443 }
@@ -17462,9 +17447,9 @@ diff -urNp linux-2.6.32.9/arch/x86/oprofile/op_model_p4.c linux-2.6.32.9/arch/x8
17462 { 17447 {
17463 #ifdef CONFIG_SMP 17448 #ifdef CONFIG_SMP
17464 return smp_num_siblings == 2 ? 2 : 1; 17449 return smp_num_siblings == 2 ? 2 : 1;
17465diff -urNp linux-2.6.32.9/arch/x86/pci/common.c linux-2.6.32.9/arch/x86/pci/common.c 17450diff -urNp linux-2.6.32.10/arch/x86/pci/common.c linux-2.6.32.10/arch/x86/pci/common.c
17466--- linux-2.6.32.9/arch/x86/pci/common.c 2010-02-23 10:38:51.000000000 -0500 17451--- linux-2.6.32.10/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400
17467+++ linux-2.6.32.9/arch/x86/pci/common.c 2010-03-11 20:25:00.073656172 -0500 17452+++ linux-2.6.32.10/arch/x86/pci/common.c 2010-03-20 15:58:46.977545072 -0400
17468@@ -31,8 +31,8 @@ int noioapicreroute = 1; 17453@@ -31,8 +31,8 @@ int noioapicreroute = 1;
17469 int pcibios_last_bus = -1; 17454 int pcibios_last_bus = -1;
17470 unsigned long pirq_table_addr; 17455 unsigned long pirq_table_addr;
@@ -17485,9 +17470,9 @@ diff -urNp linux-2.6.32.9/arch/x86/pci/common.c linux-2.6.32.9/arch/x86/pci/comm
17485 }; 17470 };
17486 17471
17487 void __init dmi_check_pciprobe(void) 17472 void __init dmi_check_pciprobe(void)
17488diff -urNp linux-2.6.32.9/arch/x86/pci/direct.c linux-2.6.32.9/arch/x86/pci/direct.c 17473diff -urNp linux-2.6.32.10/arch/x86/pci/direct.c linux-2.6.32.10/arch/x86/pci/direct.c
17489--- linux-2.6.32.9/arch/x86/pci/direct.c 2010-02-23 10:38:51.000000000 -0500 17474--- linux-2.6.32.10/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400
17490+++ linux-2.6.32.9/arch/x86/pci/direct.c 2010-03-11 20:25:00.073656172 -0500 17475+++ linux-2.6.32.10/arch/x86/pci/direct.c 2010-03-20 15:58:46.977545072 -0400
17491@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 17476@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
17492 17477
17493 #undef PCI_CONF1_ADDRESS 17478 #undef PCI_CONF1_ADDRESS
@@ -17515,9 +17500,9 @@ diff -urNp linux-2.6.32.9/arch/x86/pci/direct.c linux-2.6.32.9/arch/x86/pci/dire
17515 { 17500 {
17516 u32 x = 0; 17501 u32 x = 0;
17517 int year, devfn; 17502 int year, devfn;
17518diff -urNp linux-2.6.32.9/arch/x86/pci/fixup.c linux-2.6.32.9/arch/x86/pci/fixup.c 17503diff -urNp linux-2.6.32.10/arch/x86/pci/fixup.c linux-2.6.32.10/arch/x86/pci/fixup.c
17519--- linux-2.6.32.9/arch/x86/pci/fixup.c 2010-02-23 10:38:51.000000000 -0500 17504--- linux-2.6.32.10/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400
17520+++ linux-2.6.32.9/arch/x86/pci/fixup.c 2010-03-11 20:25:00.073656172 -0500 17505+++ linux-2.6.32.10/arch/x86/pci/fixup.c 2010-03-20 15:58:46.977545072 -0400
17521@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi 17506@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
17522 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), 17507 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
17523 }, 17508 },
@@ -17536,9 +17521,9 @@ diff -urNp linux-2.6.32.9/arch/x86/pci/fixup.c linux-2.6.32.9/arch/x86/pci/fixup
17536 }; 17521 };
17537 17522
17538 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) 17523 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
17539diff -urNp linux-2.6.32.9/arch/x86/pci/irq.c linux-2.6.32.9/arch/x86/pci/irq.c 17524diff -urNp linux-2.6.32.10/arch/x86/pci/irq.c linux-2.6.32.10/arch/x86/pci/irq.c
17540--- linux-2.6.32.9/arch/x86/pci/irq.c 2010-02-23 10:38:51.000000000 -0500 17525--- linux-2.6.32.10/arch/x86/pci/irq.c 2010-03-15 11:52:04.000000000 -0400
17541+++ linux-2.6.32.9/arch/x86/pci/irq.c 2010-03-11 20:25:00.073656172 -0500 17526+++ linux-2.6.32.10/arch/x86/pci/irq.c 2010-03-20 15:58:46.981539860 -0400
17542@@ -543,7 +543,7 @@ static __init int intel_router_probe(str 17527@@ -543,7 +543,7 @@ static __init int intel_router_probe(str
17543 static struct pci_device_id __initdata pirq_440gx[] = { 17528 static struct pci_device_id __initdata pirq_440gx[] = {
17544 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, 17529 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
@@ -17557,9 +17542,9 @@ diff -urNp linux-2.6.32.9/arch/x86/pci/irq.c linux-2.6.32.9/arch/x86/pci/irq.c
17557 }; 17542 };
17558 17543
17559 int __init pcibios_irq_init(void) 17544 int __init pcibios_irq_init(void)
17560diff -urNp linux-2.6.32.9/arch/x86/pci/mmconfig_32.c linux-2.6.32.9/arch/x86/pci/mmconfig_32.c 17545diff -urNp linux-2.6.32.10/arch/x86/pci/mmconfig_32.c linux-2.6.32.10/arch/x86/pci/mmconfig_32.c
17561--- linux-2.6.32.9/arch/x86/pci/mmconfig_32.c 2010-02-23 10:38:51.000000000 -0500 17546--- linux-2.6.32.10/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400
17562+++ linux-2.6.32.9/arch/x86/pci/mmconfig_32.c 2010-03-11 20:25:00.073656172 -0500 17547+++ linux-2.6.32.10/arch/x86/pci/mmconfig_32.c 2010-03-20 15:58:46.981539860 -0400
17563@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int 17548@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
17564 return 0; 17549 return 0;
17565 } 17550 }
@@ -17569,9 +17554,9 @@ diff -urNp linux-2.6.32.9/arch/x86/pci/mmconfig_32.c linux-2.6.32.9/arch/x86/pci
17569 .read = pci_mmcfg_read, 17554 .read = pci_mmcfg_read,
17570 .write = pci_mmcfg_write, 17555 .write = pci_mmcfg_write,
17571 }; 17556 };
17572diff -urNp linux-2.6.32.9/arch/x86/pci/mmconfig_64.c linux-2.6.32.9/arch/x86/pci/mmconfig_64.c 17557diff -urNp linux-2.6.32.10/arch/x86/pci/mmconfig_64.c linux-2.6.32.10/arch/x86/pci/mmconfig_64.c
17573--- linux-2.6.32.9/arch/x86/pci/mmconfig_64.c 2010-02-23 10:38:51.000000000 -0500 17558--- linux-2.6.32.10/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400
17574+++ linux-2.6.32.9/arch/x86/pci/mmconfig_64.c 2010-03-11 20:25:00.073656172 -0500 17559+++ linux-2.6.32.10/arch/x86/pci/mmconfig_64.c 2010-03-20 15:58:46.981539860 -0400
17575@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int 17560@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
17576 return 0; 17561 return 0;
17577 } 17562 }
@@ -17581,9 +17566,9 @@ diff -urNp linux-2.6.32.9/arch/x86/pci/mmconfig_64.c linux-2.6.32.9/arch/x86/pci
17581 .read = pci_mmcfg_read, 17566 .read = pci_mmcfg_read,
17582 .write = pci_mmcfg_write, 17567 .write = pci_mmcfg_write,
17583 }; 17568 };
17584diff -urNp linux-2.6.32.9/arch/x86/pci/numaq_32.c linux-2.6.32.9/arch/x86/pci/numaq_32.c 17569diff -urNp linux-2.6.32.10/arch/x86/pci/numaq_32.c linux-2.6.32.10/arch/x86/pci/numaq_32.c
17585--- linux-2.6.32.9/arch/x86/pci/numaq_32.c 2010-02-23 10:38:51.000000000 -0500 17570--- linux-2.6.32.10/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400
17586+++ linux-2.6.32.9/arch/x86/pci/numaq_32.c 2010-03-11 20:25:00.073656172 -0500 17571+++ linux-2.6.32.10/arch/x86/pci/numaq_32.c 2010-03-20 15:58:46.981539860 -0400
17587@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i 17572@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
17588 17573
17589 #undef PCI_CONF1_MQ_ADDRESS 17574 #undef PCI_CONF1_MQ_ADDRESS
@@ -17593,9 +17578,9 @@ diff -urNp linux-2.6.32.9/arch/x86/pci/numaq_32.c linux-2.6.32.9/arch/x86/pci/nu
17593 .read = pci_conf1_mq_read, 17578 .read = pci_conf1_mq_read,
17594 .write = pci_conf1_mq_write 17579 .write = pci_conf1_mq_write
17595 }; 17580 };
17596diff -urNp linux-2.6.32.9/arch/x86/pci/olpc.c linux-2.6.32.9/arch/x86/pci/olpc.c 17581diff -urNp linux-2.6.32.10/arch/x86/pci/olpc.c linux-2.6.32.10/arch/x86/pci/olpc.c
17597--- linux-2.6.32.9/arch/x86/pci/olpc.c 2010-02-23 10:38:51.000000000 -0500 17582--- linux-2.6.32.10/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400
17598+++ linux-2.6.32.9/arch/x86/pci/olpc.c 2010-03-11 20:25:00.073656172 -0500 17583+++ linux-2.6.32.10/arch/x86/pci/olpc.c 2010-03-20 15:58:46.981539860 -0400
17599@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s 17584@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
17600 return 0; 17585 return 0;
17601 } 17586 }
@@ -17605,9 +17590,9 @@ diff -urNp linux-2.6.32.9/arch/x86/pci/olpc.c linux-2.6.32.9/arch/x86/pci/olpc.c
17605 .read = pci_olpc_read, 17590 .read = pci_olpc_read,
17606 .write = pci_olpc_write, 17591 .write = pci_olpc_write,
17607 }; 17592 };
17608diff -urNp linux-2.6.32.9/arch/x86/pci/pcbios.c linux-2.6.32.9/arch/x86/pci/pcbios.c 17593diff -urNp linux-2.6.32.10/arch/x86/pci/pcbios.c linux-2.6.32.10/arch/x86/pci/pcbios.c
17609--- linux-2.6.32.9/arch/x86/pci/pcbios.c 2010-02-23 10:38:51.000000000 -0500 17594--- linux-2.6.32.10/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400
17610+++ linux-2.6.32.9/arch/x86/pci/pcbios.c 2010-03-11 20:25:00.073656172 -0500 17595+++ linux-2.6.32.10/arch/x86/pci/pcbios.c 2010-03-20 15:58:46.981539860 -0400
17611@@ -56,50 +56,93 @@ union bios32 { 17596@@ -56,50 +56,93 @@ union bios32 {
17612 static struct { 17597 static struct {
17613 unsigned long address; 17598 unsigned long address;
@@ -17930,9 +17915,9 @@ diff -urNp linux-2.6.32.9/arch/x86/pci/pcbios.c linux-2.6.32.9/arch/x86/pci/pcbi
17930 return !(ret & 0xff00); 17915 return !(ret & 0xff00);
17931 } 17916 }
17932 EXPORT_SYMBOL(pcibios_set_irq_routing); 17917 EXPORT_SYMBOL(pcibios_set_irq_routing);
17933diff -urNp linux-2.6.32.9/arch/x86/power/cpu.c linux-2.6.32.9/arch/x86/power/cpu.c 17918diff -urNp linux-2.6.32.10/arch/x86/power/cpu.c linux-2.6.32.10/arch/x86/power/cpu.c
17934--- linux-2.6.32.9/arch/x86/power/cpu.c 2010-02-23 10:38:51.000000000 -0500 17919--- linux-2.6.32.10/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400
17935+++ linux-2.6.32.9/arch/x86/power/cpu.c 2010-03-11 20:25:00.073656172 -0500 17920+++ linux-2.6.32.10/arch/x86/power/cpu.c 2010-03-20 15:58:46.981539860 -0400
17936@@ -126,7 +126,7 @@ static void do_fpu_end(void) 17921@@ -126,7 +126,7 @@ static void do_fpu_end(void)
17937 static void fix_processor_context(void) 17922 static void fix_processor_context(void)
17938 { 17923 {
@@ -17952,9 +17937,9 @@ diff -urNp linux-2.6.32.9/arch/x86/power/cpu.c linux-2.6.32.9/arch/x86/power/cpu
17952 17937
17953 syscall_init(); /* This sets MSR_*STAR and related */ 17938 syscall_init(); /* This sets MSR_*STAR and related */
17954 #endif 17939 #endif
17955diff -urNp linux-2.6.32.9/arch/x86/vdso/Makefile linux-2.6.32.9/arch/x86/vdso/Makefile 17940diff -urNp linux-2.6.32.10/arch/x86/vdso/Makefile linux-2.6.32.10/arch/x86/vdso/Makefile
17956--- linux-2.6.32.9/arch/x86/vdso/Makefile 2010-02-23 10:38:51.000000000 -0500 17941--- linux-2.6.32.10/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400
17957+++ linux-2.6.32.9/arch/x86/vdso/Makefile 2010-03-11 20:25:00.073656172 -0500 17942+++ linux-2.6.32.10/arch/x86/vdso/Makefile 2010-03-20 15:58:46.981539860 -0400
17958@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ 17943@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
17959 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ 17944 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
17960 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) 17945 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -17964,9 +17949,9 @@ diff -urNp linux-2.6.32.9/arch/x86/vdso/Makefile linux-2.6.32.9/arch/x86/vdso/Ma
17964 GCOV_PROFILE := n 17949 GCOV_PROFILE := n
17965 17950
17966 # 17951 #
17967diff -urNp linux-2.6.32.9/arch/x86/vdso/vclock_gettime.c linux-2.6.32.9/arch/x86/vdso/vclock_gettime.c 17952diff -urNp linux-2.6.32.10/arch/x86/vdso/vclock_gettime.c linux-2.6.32.10/arch/x86/vdso/vclock_gettime.c
17968--- linux-2.6.32.9/arch/x86/vdso/vclock_gettime.c 2010-02-23 10:38:51.000000000 -0500 17953--- linux-2.6.32.10/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400
17969+++ linux-2.6.32.9/arch/x86/vdso/vclock_gettime.c 2010-03-11 20:25:00.073656172 -0500 17954+++ linux-2.6.32.10/arch/x86/vdso/vclock_gettime.c 2010-03-20 15:58:46.981539860 -0400
17970@@ -22,24 +22,48 @@ 17955@@ -22,24 +22,48 @@
17971 #include <asm/hpet.h> 17956 #include <asm/hpet.h>
17972 #include <asm/unistd.h> 17957 #include <asm/unistd.h>
@@ -18065,9 +18050,9 @@ diff -urNp linux-2.6.32.9/arch/x86/vdso/vclock_gettime.c linux-2.6.32.9/arch/x86
18065 } 18050 }
18066 int gettimeofday(struct timeval *, struct timezone *) 18051 int gettimeofday(struct timeval *, struct timezone *)
18067 __attribute__((weak, alias("__vdso_gettimeofday"))); 18052 __attribute__((weak, alias("__vdso_gettimeofday")));
18068diff -urNp linux-2.6.32.9/arch/x86/vdso/vdso32-setup.c linux-2.6.32.9/arch/x86/vdso/vdso32-setup.c 18053diff -urNp linux-2.6.32.10/arch/x86/vdso/vdso32-setup.c linux-2.6.32.10/arch/x86/vdso/vdso32-setup.c
18069--- linux-2.6.32.9/arch/x86/vdso/vdso32-setup.c 2010-02-23 10:38:51.000000000 -0500 18054--- linux-2.6.32.10/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400
18070+++ linux-2.6.32.9/arch/x86/vdso/vdso32-setup.c 2010-03-11 20:25:00.073656172 -0500 18055+++ linux-2.6.32.10/arch/x86/vdso/vdso32-setup.c 2010-03-20 15:58:46.981539860 -0400
18071@@ -25,6 +25,7 @@ 18056@@ -25,6 +25,7 @@
18072 #include <asm/tlbflush.h> 18057 #include <asm/tlbflush.h>
18073 #include <asm/vdso.h> 18058 #include <asm/vdso.h>
@@ -18168,9 +18153,9 @@ diff -urNp linux-2.6.32.9/arch/x86/vdso/vdso32-setup.c linux-2.6.32.9/arch/x86/v
18168 return &gate_vma; 18153 return &gate_vma;
18169 return NULL; 18154 return NULL;
18170 } 18155 }
18171diff -urNp linux-2.6.32.9/arch/x86/vdso/vdso.lds.S linux-2.6.32.9/arch/x86/vdso/vdso.lds.S 18156diff -urNp linux-2.6.32.10/arch/x86/vdso/vdso.lds.S linux-2.6.32.10/arch/x86/vdso/vdso.lds.S
18172--- linux-2.6.32.9/arch/x86/vdso/vdso.lds.S 2010-02-23 10:38:51.000000000 -0500 18157--- linux-2.6.32.10/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400
18173+++ linux-2.6.32.9/arch/x86/vdso/vdso.lds.S 2010-03-11 20:25:00.073656172 -0500 18158+++ linux-2.6.32.10/arch/x86/vdso/vdso.lds.S 2010-03-20 15:58:46.981539860 -0400
18174@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; 18159@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
18175 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; 18160 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
18176 #include "vextern.h" 18161 #include "vextern.h"
@@ -18181,9 +18166,9 @@ diff -urNp linux-2.6.32.9/arch/x86/vdso/vdso.lds.S linux-2.6.32.9/arch/x86/vdso/
18181+VEXTERN(fallback_time) 18166+VEXTERN(fallback_time)
18182+VEXTERN(getcpu) 18167+VEXTERN(getcpu)
18183+#undef VEXTERN 18168+#undef VEXTERN
18184diff -urNp linux-2.6.32.9/arch/x86/vdso/vextern.h linux-2.6.32.9/arch/x86/vdso/vextern.h 18169diff -urNp linux-2.6.32.10/arch/x86/vdso/vextern.h linux-2.6.32.10/arch/x86/vdso/vextern.h
18185--- linux-2.6.32.9/arch/x86/vdso/vextern.h 2010-02-23 10:38:51.000000000 -0500 18170--- linux-2.6.32.10/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400
18186+++ linux-2.6.32.9/arch/x86/vdso/vextern.h 2010-03-11 20:25:00.073656172 -0500 18171+++ linux-2.6.32.10/arch/x86/vdso/vextern.h 2010-03-20 15:58:46.981539860 -0400
18187@@ -11,6 +11,5 @@ 18172@@ -11,6 +11,5 @@
18188 put into vextern.h and be referenced as a pointer with vdso prefix. 18173 put into vextern.h and be referenced as a pointer with vdso prefix.
18189 The main kernel later fills in the values. */ 18174 The main kernel later fills in the values. */
@@ -18191,9 +18176,9 @@ diff -urNp linux-2.6.32.9/arch/x86/vdso/vextern.h linux-2.6.32.9/arch/x86/vdso/v
18191-VEXTERN(jiffies) 18176-VEXTERN(jiffies)
18192 VEXTERN(vgetcpu_mode) 18177 VEXTERN(vgetcpu_mode)
18193 VEXTERN(vsyscall_gtod_data) 18178 VEXTERN(vsyscall_gtod_data)
18194diff -urNp linux-2.6.32.9/arch/x86/vdso/vma.c linux-2.6.32.9/arch/x86/vdso/vma.c 18179diff -urNp linux-2.6.32.10/arch/x86/vdso/vma.c linux-2.6.32.10/arch/x86/vdso/vma.c
18195--- linux-2.6.32.9/arch/x86/vdso/vma.c 2010-02-23 10:38:51.000000000 -0500 18180--- linux-2.6.32.10/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400
18196+++ linux-2.6.32.9/arch/x86/vdso/vma.c 2010-03-11 20:25:00.073656172 -0500 18181+++ linux-2.6.32.10/arch/x86/vdso/vma.c 2010-03-20 15:58:46.981539860 -0400
18197@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) 18182@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
18198 if (!vbase) 18183 if (!vbase)
18199 goto oom; 18184 goto oom;
@@ -18240,10 +18225,10 @@ diff -urNp linux-2.6.32.9/arch/x86/vdso/vma.c linux-2.6.32.9/arch/x86/vdso/vma.c
18240- return 0; 18225- return 0;
18241-} 18226-}
18242-__setup("vdso=", vdso_setup); 18227-__setup("vdso=", vdso_setup);
18243diff -urNp linux-2.6.32.9/arch/x86/xen/enlighten.c linux-2.6.32.9/arch/x86/xen/enlighten.c 18228diff -urNp linux-2.6.32.10/arch/x86/xen/enlighten.c linux-2.6.32.10/arch/x86/xen/enlighten.c
18244--- linux-2.6.32.9/arch/x86/xen/enlighten.c 2010-02-23 10:38:51.000000000 -0500 18229--- linux-2.6.32.10/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400
18245+++ linux-2.6.32.9/arch/x86/xen/enlighten.c 2010-03-11 20:25:00.073656172 -0500 18230+++ linux-2.6.32.10/arch/x86/xen/enlighten.c 2010-03-20 15:58:46.981539860 -0400
18246@@ -70,8 +70,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); 18231@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
18247 18232
18248 struct shared_info xen_dummy_shared_info; 18233 struct shared_info xen_dummy_shared_info;
18249 18234
@@ -18252,7 +18237,7 @@ diff -urNp linux-2.6.32.9/arch/x86/xen/enlighten.c linux-2.6.32.9/arch/x86/xen/e
18252 /* 18237 /*
18253 * Point at some empty memory to start with. We map the real shared_info 18238 * Point at some empty memory to start with. We map the real shared_info
18254 * page as soon as fixmap is up and running. 18239 * page as soon as fixmap is up and running.
18255@@ -547,7 +545,7 @@ static void xen_write_idt_entry(gate_des 18240@@ -548,7 +546,7 @@ static void xen_write_idt_entry(gate_des
18256 18241
18257 preempt_disable(); 18242 preempt_disable();
18258 18243
@@ -18261,7 +18246,7 @@ diff -urNp linux-2.6.32.9/arch/x86/xen/enlighten.c linux-2.6.32.9/arch/x86/xen/e
18261 end = start + __get_cpu_var(idt_desc).size + 1; 18246 end = start + __get_cpu_var(idt_desc).size + 1;
18262 18247
18263 xen_mc_flush(); 18248 xen_mc_flush();
18264@@ -1126,13 +1124,6 @@ asmlinkage void __init xen_start_kernel( 18249@@ -1133,13 +1131,6 @@ asmlinkage void __init xen_start_kernel(
18265 18250
18266 machine_ops = xen_machine_ops; 18251 machine_ops = xen_machine_ops;
18267 18252
@@ -18275,10 +18260,10 @@ diff -urNp linux-2.6.32.9/arch/x86/xen/enlighten.c linux-2.6.32.9/arch/x86/xen/e
18275 xen_smp_init(); 18260 xen_smp_init();
18276 18261
18277 pgd = (pgd_t *)xen_start_info->pt_base; 18262 pgd = (pgd_t *)xen_start_info->pt_base;
18278diff -urNp linux-2.6.32.9/arch/x86/xen/mmu.c linux-2.6.32.9/arch/x86/xen/mmu.c 18263diff -urNp linux-2.6.32.10/arch/x86/xen/mmu.c linux-2.6.32.10/arch/x86/xen/mmu.c
18279--- linux-2.6.32.9/arch/x86/xen/mmu.c 2010-02-23 10:38:51.000000000 -0500 18264--- linux-2.6.32.10/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400
18280+++ linux-2.6.32.9/arch/x86/xen/mmu.c 2010-03-11 20:25:00.073656172 -0500 18265+++ linux-2.6.32.10/arch/x86/xen/mmu.c 2010-03-20 15:58:46.981539860 -0400
18281@@ -1710,6 +1710,8 @@ __init pgd_t *xen_setup_kernel_pagetable 18266@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable
18282 convert_pfn_mfn(init_level4_pgt); 18267 convert_pfn_mfn(init_level4_pgt);
18283 convert_pfn_mfn(level3_ident_pgt); 18268 convert_pfn_mfn(level3_ident_pgt);
18284 convert_pfn_mfn(level3_kernel_pgt); 18269 convert_pfn_mfn(level3_kernel_pgt);
@@ -18287,7 +18272,7 @@ diff -urNp linux-2.6.32.9/arch/x86/xen/mmu.c linux-2.6.32.9/arch/x86/xen/mmu.c
18287 18272
18288 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd); 18273 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
18289 l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud); 18274 l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
18290@@ -1728,7 +1730,10 @@ __init pgd_t *xen_setup_kernel_pagetable 18275@@ -1729,7 +1731,10 @@ __init pgd_t *xen_setup_kernel_pagetable
18291 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO); 18276 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
18292 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO); 18277 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
18293 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO); 18278 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
@@ -18298,9 +18283,9 @@ diff -urNp linux-2.6.32.9/arch/x86/xen/mmu.c linux-2.6.32.9/arch/x86/xen/mmu.c
18298 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); 18283 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
18299 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); 18284 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
18300 18285
18301diff -urNp linux-2.6.32.9/arch/x86/xen/smp.c linux-2.6.32.9/arch/x86/xen/smp.c 18286diff -urNp linux-2.6.32.10/arch/x86/xen/smp.c linux-2.6.32.10/arch/x86/xen/smp.c
18302--- linux-2.6.32.9/arch/x86/xen/smp.c 2010-02-23 10:38:51.000000000 -0500 18287--- linux-2.6.32.10/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400
18303+++ linux-2.6.32.9/arch/x86/xen/smp.c 2010-03-11 20:25:00.073656172 -0500 18288+++ linux-2.6.32.10/arch/x86/xen/smp.c 2010-03-20 15:58:46.981539860 -0400
18304@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ 18289@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
18305 { 18290 {
18306 BUG_ON(smp_processor_id() != 0); 18291 BUG_ON(smp_processor_id() != 0);
@@ -18324,9 +18309,9 @@ diff -urNp linux-2.6.32.9/arch/x86/xen/smp.c linux-2.6.32.9/arch/x86/xen/smp.c
18324 ctxt->user_regs.ss = __KERNEL_DS; 18309 ctxt->user_regs.ss = __KERNEL_DS;
18325 #ifdef CONFIG_X86_32 18310 #ifdef CONFIG_X86_32
18326 ctxt->user_regs.fs = __KERNEL_PERCPU; 18311 ctxt->user_regs.fs = __KERNEL_PERCPU;
18327diff -urNp linux-2.6.32.9/arch/x86/xen/xen-ops.h linux-2.6.32.9/arch/x86/xen/xen-ops.h 18312diff -urNp linux-2.6.32.10/arch/x86/xen/xen-ops.h linux-2.6.32.10/arch/x86/xen/xen-ops.h
18328--- linux-2.6.32.9/arch/x86/xen/xen-ops.h 2010-02-23 10:38:51.000000000 -0500 18313--- linux-2.6.32.10/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400
18329+++ linux-2.6.32.9/arch/x86/xen/xen-ops.h 2010-03-11 20:25:00.073656172 -0500 18314+++ linux-2.6.32.10/arch/x86/xen/xen-ops.h 2010-03-20 15:58:46.981539860 -0400
18330@@ -10,8 +10,6 @@ 18315@@ -10,8 +10,6 @@
18331 extern const char xen_hypervisor_callback[]; 18316 extern const char xen_hypervisor_callback[];
18332 extern const char xen_failsafe_callback[]; 18317 extern const char xen_failsafe_callback[];
@@ -18336,9 +18321,9 @@ diff -urNp linux-2.6.32.9/arch/x86/xen/xen-ops.h linux-2.6.32.9/arch/x86/xen/xen
18336 struct trap_info; 18321 struct trap_info;
18337 void xen_copy_trap_info(struct trap_info *traps); 18322 void xen_copy_trap_info(struct trap_info *traps);
18338 18323
18339diff -urNp linux-2.6.32.9/block/blk-integrity.c linux-2.6.32.9/block/blk-integrity.c 18324diff -urNp linux-2.6.32.10/block/blk-integrity.c linux-2.6.32.10/block/blk-integrity.c
18340--- linux-2.6.32.9/block/blk-integrity.c 2010-02-23 10:38:51.000000000 -0500 18325--- linux-2.6.32.10/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400
18341+++ linux-2.6.32.9/block/blk-integrity.c 2010-03-11 20:25:00.073656172 -0500 18326+++ linux-2.6.32.10/block/blk-integrity.c 2010-03-20 15:58:46.981539860 -0400
18342@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs 18327@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
18343 NULL, 18328 NULL,
18344 }; 18329 };
@@ -18348,9 +18333,9 @@ diff -urNp linux-2.6.32.9/block/blk-integrity.c linux-2.6.32.9/block/blk-integri
18348 .show = &integrity_attr_show, 18333 .show = &integrity_attr_show,
18349 .store = &integrity_attr_store, 18334 .store = &integrity_attr_store,
18350 }; 18335 };
18351diff -urNp linux-2.6.32.9/block/blk-iopoll.c linux-2.6.32.9/block/blk-iopoll.c 18336diff -urNp linux-2.6.32.10/block/blk-iopoll.c linux-2.6.32.10/block/blk-iopoll.c
18352--- linux-2.6.32.9/block/blk-iopoll.c 2010-02-23 10:38:51.000000000 -0500 18337--- linux-2.6.32.10/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400
18353+++ linux-2.6.32.9/block/blk-iopoll.c 2010-03-11 20:25:00.079125355 -0500 18338+++ linux-2.6.32.10/block/blk-iopoll.c 2010-03-20 15:58:46.981539860 -0400
18354@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo 18339@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
18355 } 18340 }
18356 EXPORT_SYMBOL(blk_iopoll_complete); 18341 EXPORT_SYMBOL(blk_iopoll_complete);
@@ -18360,9 +18345,9 @@ diff -urNp linux-2.6.32.9/block/blk-iopoll.c linux-2.6.32.9/block/blk-iopoll.c
18360 { 18345 {
18361 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); 18346 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
18362 int rearm = 0, budget = blk_iopoll_budget; 18347 int rearm = 0, budget = blk_iopoll_budget;
18363diff -urNp linux-2.6.32.9/block/blk-map.c linux-2.6.32.9/block/blk-map.c 18348diff -urNp linux-2.6.32.10/block/blk-map.c linux-2.6.32.10/block/blk-map.c
18364--- linux-2.6.32.9/block/blk-map.c 2010-02-23 10:38:51.000000000 -0500 18349--- linux-2.6.32.10/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400
18365+++ linux-2.6.32.9/block/blk-map.c 2010-03-11 20:25:00.079125355 -0500 18350+++ linux-2.6.32.10/block/blk-map.c 2010-03-20 15:58:46.981539860 -0400
18366@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ 18351@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
18367 * direct dma. else, set up kernel bounce buffers 18352 * direct dma. else, set up kernel bounce buffers
18368 */ 18353 */
@@ -18381,9 +18366,9 @@ diff -urNp linux-2.6.32.9/block/blk-map.c linux-2.6.32.9/block/blk-map.c
18381 if (do_copy) 18366 if (do_copy)
18382 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); 18367 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
18383 else 18368 else
18384diff -urNp linux-2.6.32.9/block/blk-softirq.c linux-2.6.32.9/block/blk-softirq.c 18369diff -urNp linux-2.6.32.10/block/blk-softirq.c linux-2.6.32.10/block/blk-softirq.c
18385--- linux-2.6.32.9/block/blk-softirq.c 2010-02-23 10:38:51.000000000 -0500 18370--- linux-2.6.32.10/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400
18386+++ linux-2.6.32.9/block/blk-softirq.c 2010-03-11 20:25:00.079125355 -0500 18371+++ linux-2.6.32.10/block/blk-softirq.c 2010-03-20 15:58:46.985539063 -0400
18387@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 18372@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
18388 * Softirq action handler - move entries to local list and loop over them 18373 * Softirq action handler - move entries to local list and loop over them
18389 * while passing them to the queue registered handler. 18374 * while passing them to the queue registered handler.
@@ -18393,9 +18378,9 @@ diff -urNp linux-2.6.32.9/block/blk-softirq.c linux-2.6.32.9/block/blk-softirq.c
18393 { 18378 {
18394 struct list_head *cpu_list, local_list; 18379 struct list_head *cpu_list, local_list;
18395 18380
18396diff -urNp linux-2.6.32.9/block/blk-sysfs.c linux-2.6.32.9/block/blk-sysfs.c 18381diff -urNp linux-2.6.32.10/block/blk-sysfs.c linux-2.6.32.10/block/blk-sysfs.c
18397--- linux-2.6.32.9/block/blk-sysfs.c 2010-02-23 10:38:51.000000000 -0500 18382--- linux-2.6.32.10/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400
18398+++ linux-2.6.32.9/block/blk-sysfs.c 2010-03-11 20:25:00.079125355 -0500 18383+++ linux-2.6.32.10/block/blk-sysfs.c 2010-03-20 15:58:46.985539063 -0400
18399@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob 18384@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
18400 kmem_cache_free(blk_requestq_cachep, q); 18385 kmem_cache_free(blk_requestq_cachep, q);
18401 } 18386 }
@@ -18405,9 +18390,9 @@ diff -urNp linux-2.6.32.9/block/blk-sysfs.c linux-2.6.32.9/block/blk-sysfs.c
18405 .show = queue_attr_show, 18390 .show = queue_attr_show,
18406 .store = queue_attr_store, 18391 .store = queue_attr_store,
18407 }; 18392 };
18408diff -urNp linux-2.6.32.9/block/elevator.c linux-2.6.32.9/block/elevator.c 18393diff -urNp linux-2.6.32.10/block/elevator.c linux-2.6.32.10/block/elevator.c
18409--- linux-2.6.32.9/block/elevator.c 2010-02-23 10:38:51.000000000 -0500 18394--- linux-2.6.32.10/block/elevator.c 2010-03-15 11:52:04.000000000 -0400
18410+++ linux-2.6.32.9/block/elevator.c 2010-03-11 20:25:00.079125355 -0500 18395+++ linux-2.6.32.10/block/elevator.c 2010-03-20 15:58:46.985539063 -0400
18411@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str 18396@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
18412 return error; 18397 return error;
18413 } 18398 }
@@ -18417,9 +18402,9 @@ diff -urNp linux-2.6.32.9/block/elevator.c linux-2.6.32.9/block/elevator.c
18417 .show = elv_attr_show, 18402 .show = elv_attr_show,
18418 .store = elv_attr_store, 18403 .store = elv_attr_store,
18419 }; 18404 };
18420diff -urNp linux-2.6.32.9/crypto/lrw.c linux-2.6.32.9/crypto/lrw.c 18405diff -urNp linux-2.6.32.10/crypto/lrw.c linux-2.6.32.10/crypto/lrw.c
18421--- linux-2.6.32.9/crypto/lrw.c 2010-02-23 10:38:51.000000000 -0500 18406--- linux-2.6.32.10/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400
18422+++ linux-2.6.32.9/crypto/lrw.c 2010-03-11 20:25:00.079125355 -0500 18407+++ linux-2.6.32.10/crypto/lrw.c 2010-03-20 15:58:46.985539063 -0400
18423@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par 18408@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
18424 struct priv *ctx = crypto_tfm_ctx(parent); 18409 struct priv *ctx = crypto_tfm_ctx(parent);
18425 struct crypto_cipher *child = ctx->child; 18410 struct crypto_cipher *child = ctx->child;
@@ -18429,9 +18414,9 @@ diff -urNp linux-2.6.32.9/crypto/lrw.c linux-2.6.32.9/crypto/lrw.c
18429 int bsize = crypto_cipher_blocksize(child); 18414 int bsize = crypto_cipher_blocksize(child);
18430 18415
18431 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); 18416 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
18432diff -urNp linux-2.6.32.9/Documentation/dontdiff linux-2.6.32.9/Documentation/dontdiff 18417diff -urNp linux-2.6.32.10/Documentation/dontdiff linux-2.6.32.10/Documentation/dontdiff
18433--- linux-2.6.32.9/Documentation/dontdiff 2010-02-23 10:38:51.000000000 -0500 18418--- linux-2.6.32.10/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400
18434+++ linux-2.6.32.9/Documentation/dontdiff 2010-03-11 20:25:00.079125355 -0500 18419+++ linux-2.6.32.10/Documentation/dontdiff 2010-03-20 15:58:46.985539063 -0400
18435@@ -3,6 +3,7 @@ 18420@@ -3,6 +3,7 @@
18436 *.bin 18421 *.bin
18437 *.cpio 18422 *.cpio
@@ -18538,9 +18523,9 @@ diff -urNp linux-2.6.32.9/Documentation/dontdiff linux-2.6.32.9/Documentation/do
18538 zImage* 18523 zImage*
18539 zconf.hash.c 18524 zconf.hash.c
18540+zoffset.h 18525+zoffset.h
18541diff -urNp linux-2.6.32.9/Documentation/kernel-parameters.txt linux-2.6.32.9/Documentation/kernel-parameters.txt 18526diff -urNp linux-2.6.32.10/Documentation/kernel-parameters.txt linux-2.6.32.10/Documentation/kernel-parameters.txt
18542--- linux-2.6.32.9/Documentation/kernel-parameters.txt 2010-02-23 10:38:51.000000000 -0500 18527--- linux-2.6.32.10/Documentation/kernel-parameters.txt 2010-03-15 11:52:04.000000000 -0400
18543+++ linux-2.6.32.9/Documentation/kernel-parameters.txt 2010-03-11 20:25:00.079125355 -0500 18528+++ linux-2.6.32.10/Documentation/kernel-parameters.txt 2010-03-20 15:58:46.985539063 -0400
18544@@ -1833,6 +1833,12 @@ and is between 256 and 4096 characters. 18529@@ -1833,6 +1833,12 @@ and is between 256 and 4096 characters.
18545 the specified number of seconds. This is to be used if 18530 the specified number of seconds. This is to be used if
18546 your oopses keep scrolling off the screen. 18531 your oopses keep scrolling off the screen.
@@ -18554,9 +18539,9 @@ diff -urNp linux-2.6.32.9/Documentation/kernel-parameters.txt linux-2.6.32.9/Doc
18554 pcbit= [HW,ISDN] 18539 pcbit= [HW,ISDN]
18555 18540
18556 pcd. [PARIDE] 18541 pcd. [PARIDE]
18557diff -urNp linux-2.6.32.9/drivers/acpi/battery.c linux-2.6.32.9/drivers/acpi/battery.c 18542diff -urNp linux-2.6.32.10/drivers/acpi/battery.c linux-2.6.32.10/drivers/acpi/battery.c
18558--- linux-2.6.32.9/drivers/acpi/battery.c 2010-02-23 10:38:51.000000000 -0500 18543--- linux-2.6.32.10/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400
18559+++ linux-2.6.32.9/drivers/acpi/battery.c 2010-03-11 20:25:00.079125355 -0500 18544+++ linux-2.6.32.10/drivers/acpi/battery.c 2010-03-20 15:58:46.985539063 -0400
18560@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); 18545@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
18561 } 18546 }
18562 18547
@@ -18566,9 +18551,9 @@ diff -urNp linux-2.6.32.9/drivers/acpi/battery.c linux-2.6.32.9/drivers/acpi/bat
18566 mode_t mode; 18551 mode_t mode;
18567 const char *name; 18552 const char *name;
18568 } acpi_battery_file[] = { 18553 } acpi_battery_file[] = {
18569diff -urNp linux-2.6.32.9/drivers/acpi/blacklist.c linux-2.6.32.9/drivers/acpi/blacklist.c 18554diff -urNp linux-2.6.32.10/drivers/acpi/blacklist.c linux-2.6.32.10/drivers/acpi/blacklist.c
18570--- linux-2.6.32.9/drivers/acpi/blacklist.c 2010-02-23 10:38:51.000000000 -0500 18555--- linux-2.6.32.10/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400
18571+++ linux-2.6.32.9/drivers/acpi/blacklist.c 2010-03-11 20:25:00.079125355 -0500 18556+++ linux-2.6.32.10/drivers/acpi/blacklist.c 2010-03-20 15:58:46.985539063 -0400
18572@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b 18557@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
18573 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, 18558 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
18574 "Incorrect _ADR", 1}, 18559 "Incorrect _ADR", 1},
@@ -18578,9 +18563,9 @@ diff -urNp linux-2.6.32.9/drivers/acpi/blacklist.c linux-2.6.32.9/drivers/acpi/b
18578 }; 18563 };
18579 18564
18580 #if CONFIG_ACPI_BLACKLIST_YEAR 18565 #if CONFIG_ACPI_BLACKLIST_YEAR
18581diff -urNp linux-2.6.32.9/drivers/acpi/dock.c linux-2.6.32.9/drivers/acpi/dock.c 18566diff -urNp linux-2.6.32.10/drivers/acpi/dock.c linux-2.6.32.10/drivers/acpi/dock.c
18582--- linux-2.6.32.9/drivers/acpi/dock.c 2010-02-23 10:38:51.000000000 -0500 18567--- linux-2.6.32.10/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400
18583+++ linux-2.6.32.9/drivers/acpi/dock.c 2010-03-11 20:25:00.079125355 -0500 18568+++ linux-2.6.32.10/drivers/acpi/dock.c 2010-03-20 15:58:46.985539063 -0400
18584@@ -77,7 +77,7 @@ struct dock_dependent_device { 18569@@ -77,7 +77,7 @@ struct dock_dependent_device {
18585 struct list_head list; 18570 struct list_head list;
18586 struct list_head hotplug_list; 18571 struct list_head hotplug_list;
@@ -18599,9 +18584,9 @@ diff -urNp linux-2.6.32.9/drivers/acpi/dock.c linux-2.6.32.9/drivers/acpi/dock.c
18599 void *context) 18584 void *context)
18600 { 18585 {
18601 struct dock_dependent_device *dd; 18586 struct dock_dependent_device *dd;
18602diff -urNp linux-2.6.32.9/drivers/acpi/osl.c linux-2.6.32.9/drivers/acpi/osl.c 18587diff -urNp linux-2.6.32.10/drivers/acpi/osl.c linux-2.6.32.10/drivers/acpi/osl.c
18603--- linux-2.6.32.9/drivers/acpi/osl.c 2010-02-23 10:38:51.000000000 -0500 18588--- linux-2.6.32.10/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400
18604+++ linux-2.6.32.9/drivers/acpi/osl.c 2010-03-11 20:25:00.082625224 -0500 18589+++ linux-2.6.32.10/drivers/acpi/osl.c 2010-03-20 15:58:46.985539063 -0400
18605@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres 18590@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
18606 void __iomem *virt_addr; 18591 void __iomem *virt_addr;
18607 18592
@@ -18620,9 +18605,9 @@ diff -urNp linux-2.6.32.9/drivers/acpi/osl.c linux-2.6.32.9/drivers/acpi/osl.c
18620 18605
18621 switch (width) { 18606 switch (width) {
18622 case 8: 18607 case 8:
18623diff -urNp linux-2.6.32.9/drivers/acpi/processor_core.c linux-2.6.32.9/drivers/acpi/processor_core.c 18608diff -urNp linux-2.6.32.10/drivers/acpi/processor_core.c linux-2.6.32.10/drivers/acpi/processor_core.c
18624--- linux-2.6.32.9/drivers/acpi/processor_core.c 2010-02-23 10:38:51.000000000 -0500 18609--- linux-2.6.32.10/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400
18625+++ linux-2.6.32.9/drivers/acpi/processor_core.c 2010-03-11 20:25:00.082625224 -0500 18610+++ linux-2.6.32.10/drivers/acpi/processor_core.c 2010-03-20 15:58:46.985539063 -0400
18626@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( 18611@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add(
18627 return 0; 18612 return 0;
18628 } 18613 }
@@ -18632,9 +18617,9 @@ diff -urNp linux-2.6.32.9/drivers/acpi/processor_core.c linux-2.6.32.9/drivers/a
18632 18617
18633 /* 18618 /*
18634 * Buggy BIOS check 18619 * Buggy BIOS check
18635diff -urNp linux-2.6.32.9/drivers/acpi/processor_idle.c linux-2.6.32.9/drivers/acpi/processor_idle.c 18620diff -urNp linux-2.6.32.10/drivers/acpi/processor_idle.c linux-2.6.32.10/drivers/acpi/processor_idle.c
18636--- linux-2.6.32.9/drivers/acpi/processor_idle.c 2010-02-23 10:38:51.000000000 -0500 18621--- linux-2.6.32.10/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400
18637+++ linux-2.6.32.9/drivers/acpi/processor_idle.c 2010-03-11 20:25:00.082625224 -0500 18622+++ linux-2.6.32.10/drivers/acpi/processor_idle.c 2010-03-20 15:58:46.985539063 -0400
18638@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat 18623@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat
18639 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), 18624 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
18640 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, 18625 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
@@ -18644,9 +18629,9 @@ diff -urNp linux-2.6.32.9/drivers/acpi/processor_idle.c linux-2.6.32.9/drivers/a
18644 }; 18629 };
18645 18630
18646 18631
18647diff -urNp linux-2.6.32.9/drivers/acpi/sleep.c linux-2.6.32.9/drivers/acpi/sleep.c 18632diff -urNp linux-2.6.32.10/drivers/acpi/sleep.c linux-2.6.32.10/drivers/acpi/sleep.c
18648--- linux-2.6.32.9/drivers/acpi/sleep.c 2010-02-23 10:38:51.000000000 -0500 18633--- linux-2.6.32.10/drivers/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400
18649+++ linux-2.6.32.9/drivers/acpi/sleep.c 2010-03-11 20:25:00.082625224 -0500 18634+++ linux-2.6.32.10/drivers/acpi/sleep.c 2010-03-20 15:58:46.985539063 -0400
18650@@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp 18635@@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp
18651 } 18636 }
18652 } 18637 }
@@ -18683,9 +18668,9 @@ diff -urNp linux-2.6.32.9/drivers/acpi/sleep.c linux-2.6.32.9/drivers/acpi/sleep
18683 .begin = acpi_hibernation_begin_old, 18668 .begin = acpi_hibernation_begin_old,
18684 .end = acpi_pm_end, 18669 .end = acpi_pm_end,
18685 .pre_snapshot = acpi_hibernation_pre_snapshot_old, 18670 .pre_snapshot = acpi_hibernation_pre_snapshot_old,
18686diff -urNp linux-2.6.32.9/drivers/acpi/video.c linux-2.6.32.9/drivers/acpi/video.c 18671diff -urNp linux-2.6.32.10/drivers/acpi/video.c linux-2.6.32.10/drivers/acpi/video.c
18687--- linux-2.6.32.9/drivers/acpi/video.c 2010-02-23 10:38:51.000000000 -0500 18672--- linux-2.6.32.10/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400
18688+++ linux-2.6.32.9/drivers/acpi/video.c 2010-03-11 20:25:00.082625224 -0500 18673+++ linux-2.6.32.10/drivers/acpi/video.c 2010-03-20 15:58:46.985539063 -0400
18689@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str 18674@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
18690 vd->brightness->levels[request_level]); 18675 vd->brightness->levels[request_level]);
18691 } 18676 }
@@ -18695,9 +18680,9 @@ diff -urNp linux-2.6.32.9/drivers/acpi/video.c linux-2.6.32.9/drivers/acpi/video
18695 .get_brightness = acpi_video_get_brightness, 18680 .get_brightness = acpi_video_get_brightness,
18696 .update_status = acpi_video_set_brightness, 18681 .update_status = acpi_video_set_brightness,
18697 }; 18682 };
18698diff -urNp linux-2.6.32.9/drivers/ata/ahci.c linux-2.6.32.9/drivers/ata/ahci.c 18683diff -urNp linux-2.6.32.10/drivers/ata/ahci.c linux-2.6.32.10/drivers/ata/ahci.c
18699--- linux-2.6.32.9/drivers/ata/ahci.c 2010-02-23 10:38:51.000000000 -0500 18684--- linux-2.6.32.10/drivers/ata/ahci.c 2010-03-15 11:52:04.000000000 -0400
18700+++ linux-2.6.32.9/drivers/ata/ahci.c 2010-03-11 20:25:00.082625224 -0500 18685+++ linux-2.6.32.10/drivers/ata/ahci.c 2010-03-20 15:58:47.005788900 -0400
18701@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh 18686@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
18702 .sdev_attrs = ahci_sdev_attrs, 18687 .sdev_attrs = ahci_sdev_attrs,
18703 }; 18688 };
@@ -18737,9 +18722,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/ahci.c linux-2.6.32.9/drivers/ata/ahci.c
18737 }; 18722 };
18738 18723
18739 18724
18740diff -urNp linux-2.6.32.9/drivers/ata/ata_generic.c linux-2.6.32.9/drivers/ata/ata_generic.c 18725diff -urNp linux-2.6.32.10/drivers/ata/ata_generic.c linux-2.6.32.10/drivers/ata/ata_generic.c
18741--- linux-2.6.32.9/drivers/ata/ata_generic.c 2010-02-23 10:38:51.000000000 -0500 18726--- linux-2.6.32.10/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400
18742+++ linux-2.6.32.9/drivers/ata/ata_generic.c 2010-03-11 20:25:00.082625224 -0500 18727+++ linux-2.6.32.10/drivers/ata/ata_generic.c 2010-03-20 15:58:47.005788900 -0400
18743@@ -95,7 +95,7 @@ static struct scsi_host_template generic 18728@@ -95,7 +95,7 @@ static struct scsi_host_template generic
18744 ATA_BMDMA_SHT(DRV_NAME), 18729 ATA_BMDMA_SHT(DRV_NAME),
18745 }; 18730 };
@@ -18749,9 +18734,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/ata_generic.c linux-2.6.32.9/drivers/ata/a
18749 .inherits = &ata_bmdma_port_ops, 18734 .inherits = &ata_bmdma_port_ops,
18750 .cable_detect = ata_cable_unknown, 18735 .cable_detect = ata_cable_unknown,
18751 .set_mode = generic_set_mode, 18736 .set_mode = generic_set_mode,
18752diff -urNp linux-2.6.32.9/drivers/ata/ata_piix.c linux-2.6.32.9/drivers/ata/ata_piix.c 18737diff -urNp linux-2.6.32.10/drivers/ata/ata_piix.c linux-2.6.32.10/drivers/ata/ata_piix.c
18753--- linux-2.6.32.9/drivers/ata/ata_piix.c 2010-02-23 10:38:51.000000000 -0500 18738--- linux-2.6.32.10/drivers/ata/ata_piix.c 2010-03-15 11:52:04.000000000 -0400
18754+++ linux-2.6.32.9/drivers/ata/ata_piix.c 2010-03-11 20:25:00.085322493 -0500 18739+++ linux-2.6.32.10/drivers/ata/ata_piix.c 2010-03-20 15:58:47.005788900 -0400
18755@@ -291,7 +291,7 @@ static const struct pci_device_id piix_p 18740@@ -291,7 +291,7 @@ static const struct pci_device_id piix_p
18756 { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, 18741 { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
18757 /* SATA Controller IDE (PCH) */ 18742 /* SATA Controller IDE (PCH) */
@@ -18815,9 +18800,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/ata_piix.c linux-2.6.32.9/drivers/ata/ata_
18815 }; 18800 };
18816 static const char *oemstrs[] = { 18801 static const char *oemstrs[] = {
18817 "Tecra M3,", 18802 "Tecra M3,",
18818diff -urNp linux-2.6.32.9/drivers/ata/libata-acpi.c linux-2.6.32.9/drivers/ata/libata-acpi.c 18803diff -urNp linux-2.6.32.10/drivers/ata/libata-acpi.c linux-2.6.32.10/drivers/ata/libata-acpi.c
18819--- linux-2.6.32.9/drivers/ata/libata-acpi.c 2010-02-23 10:38:51.000000000 -0500 18804--- linux-2.6.32.10/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400
18820+++ linux-2.6.32.9/drivers/ata/libata-acpi.c 2010-03-11 20:25:00.085322493 -0500 18805+++ linux-2.6.32.10/drivers/ata/libata-acpi.c 2010-03-20 15:58:47.005788900 -0400
18821@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han 18806@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
18822 ata_acpi_uevent(dev->link->ap, dev, event); 18807 ata_acpi_uevent(dev->link->ap, dev, event);
18823 } 18808 }
@@ -18833,9 +18818,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/libata-acpi.c linux-2.6.32.9/drivers/ata/l
18833 .handler = ata_acpi_ap_notify_dock, 18818 .handler = ata_acpi_ap_notify_dock,
18834 .uevent = ata_acpi_ap_uevent, 18819 .uevent = ata_acpi_ap_uevent,
18835 }; 18820 };
18836diff -urNp linux-2.6.32.9/drivers/ata/libata-core.c linux-2.6.32.9/drivers/ata/libata-core.c 18821diff -urNp linux-2.6.32.10/drivers/ata/libata-core.c linux-2.6.32.10/drivers/ata/libata-core.c
18837--- linux-2.6.32.9/drivers/ata/libata-core.c 2010-02-23 10:38:51.000000000 -0500 18822--- linux-2.6.32.10/drivers/ata/libata-core.c 2010-03-15 11:52:04.000000000 -0400
18838+++ linux-2.6.32.9/drivers/ata/libata-core.c 2010-03-11 20:25:00.085322493 -0500 18823+++ linux-2.6.32.10/drivers/ata/libata-core.c 2010-03-20 15:58:47.005788900 -0400
18839@@ -896,7 +896,7 @@ static const struct ata_xfer_ent { 18824@@ -896,7 +896,7 @@ static const struct ata_xfer_ent {
18840 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, 18825 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
18841 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, 18826 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
@@ -18909,9 +18894,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/libata-core.c linux-2.6.32.9/drivers/ata/l
18909 .qc_prep = ata_noop_qc_prep, 18894 .qc_prep = ata_noop_qc_prep,
18910 .qc_issue = ata_dummy_qc_issue, 18895 .qc_issue = ata_dummy_qc_issue,
18911 .error_handler = ata_dummy_error_handler, 18896 .error_handler = ata_dummy_error_handler,
18912diff -urNp linux-2.6.32.9/drivers/ata/libata-eh.c linux-2.6.32.9/drivers/ata/libata-eh.c 18897diff -urNp linux-2.6.32.10/drivers/ata/libata-eh.c linux-2.6.32.10/drivers/ata/libata-eh.c
18913--- linux-2.6.32.9/drivers/ata/libata-eh.c 2010-02-23 10:38:51.000000000 -0500 18898--- linux-2.6.32.10/drivers/ata/libata-eh.c 2010-03-15 11:52:04.000000000 -0400
18914+++ linux-2.6.32.9/drivers/ata/libata-eh.c 2010-03-11 20:25:00.085322493 -0500 18899+++ linux-2.6.32.10/drivers/ata/libata-eh.c 2010-03-20 15:58:47.005788900 -0400
18915@@ -3581,7 +3581,7 @@ void ata_do_eh(struct ata_port *ap, ata_ 18900@@ -3581,7 +3581,7 @@ void ata_do_eh(struct ata_port *ap, ata_
18916 */ 18901 */
18917 void ata_std_error_handler(struct ata_port *ap) 18902 void ata_std_error_handler(struct ata_port *ap)
@@ -18921,9 +18906,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/libata-eh.c linux-2.6.32.9/drivers/ata/lib
18921 ata_reset_fn_t hardreset = ops->hardreset; 18906 ata_reset_fn_t hardreset = ops->hardreset;
18922 18907
18923 /* ignore built-in hardreset if SCR access is not available */ 18908 /* ignore built-in hardreset if SCR access is not available */
18924diff -urNp linux-2.6.32.9/drivers/ata/libata-pmp.c linux-2.6.32.9/drivers/ata/libata-pmp.c 18909diff -urNp linux-2.6.32.10/drivers/ata/libata-pmp.c linux-2.6.32.10/drivers/ata/libata-pmp.c
18925--- linux-2.6.32.9/drivers/ata/libata-pmp.c 2010-02-23 10:38:51.000000000 -0500 18910--- linux-2.6.32.10/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400
18926+++ linux-2.6.32.9/drivers/ata/libata-pmp.c 2010-03-11 20:25:00.085322493 -0500 18911+++ linux-2.6.32.10/drivers/ata/libata-pmp.c 2010-03-20 15:58:47.005788900 -0400
18927@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str 18912@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
18928 */ 18913 */
18929 static int sata_pmp_eh_recover(struct ata_port *ap) 18914 static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -18933,9 +18918,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/libata-pmp.c linux-2.6.32.9/drivers/ata/li
18933 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; 18918 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
18934 struct ata_link *pmp_link = &ap->link; 18919 struct ata_link *pmp_link = &ap->link;
18935 struct ata_device *pmp_dev = pmp_link->device; 18920 struct ata_device *pmp_dev = pmp_link->device;
18936diff -urNp linux-2.6.32.9/drivers/ata/pata_acpi.c linux-2.6.32.9/drivers/ata/pata_acpi.c 18921diff -urNp linux-2.6.32.10/drivers/ata/pata_acpi.c linux-2.6.32.10/drivers/ata/pata_acpi.c
18937--- linux-2.6.32.9/drivers/ata/pata_acpi.c 2010-02-23 10:38:51.000000000 -0500 18922--- linux-2.6.32.10/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400
18938+++ linux-2.6.32.9/drivers/ata/pata_acpi.c 2010-03-11 20:25:00.085322493 -0500 18923+++ linux-2.6.32.10/drivers/ata/pata_acpi.c 2010-03-20 15:58:47.005788900 -0400
18939@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s 18924@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
18940 ATA_BMDMA_SHT(DRV_NAME), 18925 ATA_BMDMA_SHT(DRV_NAME),
18941 }; 18926 };
@@ -18945,9 +18930,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_acpi.c linux-2.6.32.9/drivers/ata/pat
18945 .inherits = &ata_bmdma_port_ops, 18930 .inherits = &ata_bmdma_port_ops,
18946 .qc_issue = pacpi_qc_issue, 18931 .qc_issue = pacpi_qc_issue,
18947 .cable_detect = pacpi_cable_detect, 18932 .cable_detect = pacpi_cable_detect,
18948diff -urNp linux-2.6.32.9/drivers/ata/pata_ali.c linux-2.6.32.9/drivers/ata/pata_ali.c 18933diff -urNp linux-2.6.32.10/drivers/ata/pata_ali.c linux-2.6.32.10/drivers/ata/pata_ali.c
18949--- linux-2.6.32.9/drivers/ata/pata_ali.c 2010-02-23 10:38:51.000000000 -0500 18934--- linux-2.6.32.10/drivers/ata/pata_ali.c 2010-03-15 11:52:04.000000000 -0400
18950+++ linux-2.6.32.9/drivers/ata/pata_ali.c 2010-03-11 20:25:00.089632772 -0500 18935+++ linux-2.6.32.10/drivers/ata/pata_ali.c 2010-03-20 15:58:47.009545415 -0400
18951@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht 18936@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
18952 * Port operations for PIO only ALi 18937 * Port operations for PIO only ALi
18953 */ 18938 */
@@ -18993,9 +18978,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_ali.c linux-2.6.32.9/drivers/ata/pata
18993 .inherits = &ali_dma_base_ops, 18978 .inherits = &ali_dma_base_ops,
18994 .check_atapi_dma = ali_check_atapi_dma, 18979 .check_atapi_dma = ali_check_atapi_dma,
18995 .dev_config = ali_warn_atapi_dma, 18980 .dev_config = ali_warn_atapi_dma,
18996diff -urNp linux-2.6.32.9/drivers/ata/pata_amd.c linux-2.6.32.9/drivers/ata/pata_amd.c 18981diff -urNp linux-2.6.32.10/drivers/ata/pata_amd.c linux-2.6.32.10/drivers/ata/pata_amd.c
18997--- linux-2.6.32.9/drivers/ata/pata_amd.c 2010-02-23 10:38:51.000000000 -0500 18982--- linux-2.6.32.10/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400
18998+++ linux-2.6.32.9/drivers/ata/pata_amd.c 2010-03-11 20:25:00.089632772 -0500 18983+++ linux-2.6.32.10/drivers/ata/pata_amd.c 2010-03-20 15:58:47.009545415 -0400
18999@@ -397,28 +397,28 @@ static const struct ata_port_operations 18984@@ -397,28 +397,28 @@ static const struct ata_port_operations
19000 .prereset = amd_pre_reset, 18985 .prereset = amd_pre_reset,
19001 }; 18986 };
@@ -19045,9 +19030,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_amd.c linux-2.6.32.9/drivers/ata/pata
19045 .inherits = &nv_base_port_ops, 19030 .inherits = &nv_base_port_ops,
19046 .set_piomode = nv133_set_piomode, 19031 .set_piomode = nv133_set_piomode,
19047 .set_dmamode = nv133_set_dmamode, 19032 .set_dmamode = nv133_set_dmamode,
19048diff -urNp linux-2.6.32.9/drivers/ata/pata_artop.c linux-2.6.32.9/drivers/ata/pata_artop.c 19033diff -urNp linux-2.6.32.10/drivers/ata/pata_artop.c linux-2.6.32.10/drivers/ata/pata_artop.c
19049--- linux-2.6.32.9/drivers/ata/pata_artop.c 2010-02-23 10:38:51.000000000 -0500 19034--- linux-2.6.32.10/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400
19050+++ linux-2.6.32.9/drivers/ata/pata_artop.c 2010-03-11 20:25:00.089632772 -0500 19035+++ linux-2.6.32.10/drivers/ata/pata_artop.c 2010-03-20 15:58:47.009545415 -0400
19051@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s 19036@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
19052 ATA_BMDMA_SHT(DRV_NAME), 19037 ATA_BMDMA_SHT(DRV_NAME),
19053 }; 19038 };
@@ -19066,9 +19051,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_artop.c linux-2.6.32.9/drivers/ata/pa
19066 .inherits = &ata_bmdma_port_ops, 19051 .inherits = &ata_bmdma_port_ops,
19067 .cable_detect = artop6260_cable_detect, 19052 .cable_detect = artop6260_cable_detect,
19068 .set_piomode = artop6260_set_piomode, 19053 .set_piomode = artop6260_set_piomode,
19069diff -urNp linux-2.6.32.9/drivers/ata/pata_at32.c linux-2.6.32.9/drivers/ata/pata_at32.c 19054diff -urNp linux-2.6.32.10/drivers/ata/pata_at32.c linux-2.6.32.10/drivers/ata/pata_at32.c
19070--- linux-2.6.32.9/drivers/ata/pata_at32.c 2010-02-23 10:38:51.000000000 -0500 19055--- linux-2.6.32.10/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400
19071+++ linux-2.6.32.9/drivers/ata/pata_at32.c 2010-03-11 20:25:00.089632772 -0500 19056+++ linux-2.6.32.10/drivers/ata/pata_at32.c 2010-03-20 15:58:47.009545415 -0400
19072@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh 19057@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
19073 ATA_PIO_SHT(DRV_NAME), 19058 ATA_PIO_SHT(DRV_NAME),
19074 }; 19059 };
@@ -19078,9 +19063,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_at32.c linux-2.6.32.9/drivers/ata/pat
19078 .inherits = &ata_sff_port_ops, 19063 .inherits = &ata_sff_port_ops,
19079 .cable_detect = ata_cable_40wire, 19064 .cable_detect = ata_cable_40wire,
19080 .set_piomode = pata_at32_set_piomode, 19065 .set_piomode = pata_at32_set_piomode,
19081diff -urNp linux-2.6.32.9/drivers/ata/pata_at91.c linux-2.6.32.9/drivers/ata/pata_at91.c 19066diff -urNp linux-2.6.32.10/drivers/ata/pata_at91.c linux-2.6.32.10/drivers/ata/pata_at91.c
19082--- linux-2.6.32.9/drivers/ata/pata_at91.c 2010-02-23 10:38:51.000000000 -0500 19067--- linux-2.6.32.10/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400
19083+++ linux-2.6.32.9/drivers/ata/pata_at91.c 2010-03-11 20:25:00.089632772 -0500 19068+++ linux-2.6.32.10/drivers/ata/pata_at91.c 2010-03-20 15:58:47.009545415 -0400
19084@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at 19069@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
19085 ATA_PIO_SHT(DRV_NAME), 19070 ATA_PIO_SHT(DRV_NAME),
19086 }; 19071 };
@@ -19090,9 +19075,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_at91.c linux-2.6.32.9/drivers/ata/pat
19090 .inherits = &ata_sff_port_ops, 19075 .inherits = &ata_sff_port_ops,
19091 19076
19092 .sff_data_xfer = pata_at91_data_xfer_noirq, 19077 .sff_data_xfer = pata_at91_data_xfer_noirq,
19093diff -urNp linux-2.6.32.9/drivers/ata/pata_atiixp.c linux-2.6.32.9/drivers/ata/pata_atiixp.c 19078diff -urNp linux-2.6.32.10/drivers/ata/pata_atiixp.c linux-2.6.32.10/drivers/ata/pata_atiixp.c
19094--- linux-2.6.32.9/drivers/ata/pata_atiixp.c 2010-02-23 10:38:51.000000000 -0500 19079--- linux-2.6.32.10/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400
19095+++ linux-2.6.32.9/drivers/ata/pata_atiixp.c 2010-03-11 20:25:00.089632772 -0500 19080+++ linux-2.6.32.10/drivers/ata/pata_atiixp.c 2010-03-20 15:58:47.009545415 -0400
19096@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ 19081@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
19097 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 19082 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
19098 }; 19083 };
@@ -19102,9 +19087,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_atiixp.c linux-2.6.32.9/drivers/ata/p
19102 .inherits = &ata_bmdma_port_ops, 19087 .inherits = &ata_bmdma_port_ops,
19103 19088
19104 .qc_prep = ata_sff_dumb_qc_prep, 19089 .qc_prep = ata_sff_dumb_qc_prep,
19105diff -urNp linux-2.6.32.9/drivers/ata/pata_atp867x.c linux-2.6.32.9/drivers/ata/pata_atp867x.c 19090diff -urNp linux-2.6.32.10/drivers/ata/pata_atp867x.c linux-2.6.32.10/drivers/ata/pata_atp867x.c
19106--- linux-2.6.32.9/drivers/ata/pata_atp867x.c 2010-02-23 10:38:51.000000000 -0500 19091--- linux-2.6.32.10/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400
19107+++ linux-2.6.32.9/drivers/ata/pata_atp867x.c 2010-03-11 20:25:00.089632772 -0500 19092+++ linux-2.6.32.10/drivers/ata/pata_atp867x.c 2010-03-20 15:58:47.009545415 -0400
19108@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x 19093@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
19109 ATA_BMDMA_SHT(DRV_NAME), 19094 ATA_BMDMA_SHT(DRV_NAME),
19110 }; 19095 };
@@ -19114,9 +19099,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_atp867x.c linux-2.6.32.9/drivers/ata/
19114 .inherits = &ata_bmdma_port_ops, 19099 .inherits = &ata_bmdma_port_ops,
19115 .cable_detect = atp867x_cable_detect, 19100 .cable_detect = atp867x_cable_detect,
19116 .set_piomode = atp867x_set_piomode, 19101 .set_piomode = atp867x_set_piomode,
19117diff -urNp linux-2.6.32.9/drivers/ata/pata_bf54x.c linux-2.6.32.9/drivers/ata/pata_bf54x.c 19102diff -urNp linux-2.6.32.10/drivers/ata/pata_bf54x.c linux-2.6.32.10/drivers/ata/pata_bf54x.c
19118--- linux-2.6.32.9/drivers/ata/pata_bf54x.c 2010-02-23 10:38:51.000000000 -0500 19103--- linux-2.6.32.10/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400
19119+++ linux-2.6.32.9/drivers/ata/pata_bf54x.c 2010-03-11 20:25:00.089632772 -0500 19104+++ linux-2.6.32.10/drivers/ata/pata_bf54x.c 2010-03-20 15:58:47.009545415 -0400
19120@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh 19105@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
19121 .dma_boundary = ATA_DMA_BOUNDARY, 19106 .dma_boundary = ATA_DMA_BOUNDARY,
19122 }; 19107 };
@@ -19126,9 +19111,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_bf54x.c linux-2.6.32.9/drivers/ata/pa
19126 .inherits = &ata_sff_port_ops, 19111 .inherits = &ata_sff_port_ops,
19127 19112
19128 .set_piomode = bfin_set_piomode, 19113 .set_piomode = bfin_set_piomode,
19129diff -urNp linux-2.6.32.9/drivers/ata/pata_cmd640.c linux-2.6.32.9/drivers/ata/pata_cmd640.c 19114diff -urNp linux-2.6.32.10/drivers/ata/pata_cmd640.c linux-2.6.32.10/drivers/ata/pata_cmd640.c
19130--- linux-2.6.32.9/drivers/ata/pata_cmd640.c 2010-02-23 10:38:51.000000000 -0500 19115--- linux-2.6.32.10/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400
19131+++ linux-2.6.32.9/drivers/ata/pata_cmd640.c 2010-03-11 20:25:00.089632772 -0500 19116+++ linux-2.6.32.10/drivers/ata/pata_cmd640.c 2010-03-20 15:58:47.009545415 -0400
19132@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ 19117@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
19133 ATA_BMDMA_SHT(DRV_NAME), 19118 ATA_BMDMA_SHT(DRV_NAME),
19134 }; 19119 };
@@ -19138,9 +19123,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_cmd640.c linux-2.6.32.9/drivers/ata/p
19138 .inherits = &ata_bmdma_port_ops, 19123 .inherits = &ata_bmdma_port_ops,
19139 /* In theory xfer_noirq is not needed once we kill the prefetcher */ 19124 /* In theory xfer_noirq is not needed once we kill the prefetcher */
19140 .sff_data_xfer = ata_sff_data_xfer_noirq, 19125 .sff_data_xfer = ata_sff_data_xfer_noirq,
19141diff -urNp linux-2.6.32.9/drivers/ata/pata_cmd64x.c linux-2.6.32.9/drivers/ata/pata_cmd64x.c 19126diff -urNp linux-2.6.32.10/drivers/ata/pata_cmd64x.c linux-2.6.32.10/drivers/ata/pata_cmd64x.c
19142--- linux-2.6.32.9/drivers/ata/pata_cmd64x.c 2010-02-23 10:38:51.000000000 -0500 19127--- linux-2.6.32.10/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400
19143+++ linux-2.6.32.9/drivers/ata/pata_cmd64x.c 2010-03-11 20:25:00.089632772 -0500 19128+++ linux-2.6.32.10/drivers/ata/pata_cmd64x.c 2010-03-20 15:58:47.009545415 -0400
19144@@ -275,18 +275,18 @@ static const struct ata_port_operations 19129@@ -275,18 +275,18 @@ static const struct ata_port_operations
19145 .set_dmamode = cmd64x_set_dmamode, 19130 .set_dmamode = cmd64x_set_dmamode,
19146 }; 19131 };
@@ -19163,9 +19148,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_cmd64x.c linux-2.6.32.9/drivers/ata/p
19163 .inherits = &cmd64x_base_ops, 19148 .inherits = &cmd64x_base_ops,
19164 .bmdma_stop = cmd648_bmdma_stop, 19149 .bmdma_stop = cmd648_bmdma_stop,
19165 .cable_detect = cmd648_cable_detect, 19150 .cable_detect = cmd648_cable_detect,
19166diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5520.c linux-2.6.32.9/drivers/ata/pata_cs5520.c 19151diff -urNp linux-2.6.32.10/drivers/ata/pata_cs5520.c linux-2.6.32.10/drivers/ata/pata_cs5520.c
19167--- linux-2.6.32.9/drivers/ata/pata_cs5520.c 2010-02-23 10:38:51.000000000 -0500 19152--- linux-2.6.32.10/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400
19168+++ linux-2.6.32.9/drivers/ata/pata_cs5520.c 2010-03-11 20:25:00.089632772 -0500 19153+++ linux-2.6.32.10/drivers/ata/pata_cs5520.c 2010-03-20 15:58:47.009545415 -0400
19169@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ 19154@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
19170 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 19155 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
19171 }; 19156 };
@@ -19175,9 +19160,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5520.c linux-2.6.32.9/drivers/ata/p
19175 .inherits = &ata_bmdma_port_ops, 19160 .inherits = &ata_bmdma_port_ops,
19176 .qc_prep = ata_sff_dumb_qc_prep, 19161 .qc_prep = ata_sff_dumb_qc_prep,
19177 .cable_detect = ata_cable_40wire, 19162 .cable_detect = ata_cable_40wire,
19178diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5530.c linux-2.6.32.9/drivers/ata/pata_cs5530.c 19163diff -urNp linux-2.6.32.10/drivers/ata/pata_cs5530.c linux-2.6.32.10/drivers/ata/pata_cs5530.c
19179--- linux-2.6.32.9/drivers/ata/pata_cs5530.c 2010-02-23 10:38:51.000000000 -0500 19164--- linux-2.6.32.10/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400
19180+++ linux-2.6.32.9/drivers/ata/pata_cs5530.c 2010-03-11 20:25:00.089632772 -0500 19165+++ linux-2.6.32.10/drivers/ata/pata_cs5530.c 2010-03-20 15:58:47.009545415 -0400
19181@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ 19166@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
19182 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 19167 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
19183 }; 19168 };
@@ -19187,9 +19172,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5530.c linux-2.6.32.9/drivers/ata/p
19187 .inherits = &ata_bmdma_port_ops, 19172 .inherits = &ata_bmdma_port_ops,
19188 19173
19189 .qc_prep = ata_sff_dumb_qc_prep, 19174 .qc_prep = ata_sff_dumb_qc_prep,
19190diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5535.c linux-2.6.32.9/drivers/ata/pata_cs5535.c 19175diff -urNp linux-2.6.32.10/drivers/ata/pata_cs5535.c linux-2.6.32.10/drivers/ata/pata_cs5535.c
19191--- linux-2.6.32.9/drivers/ata/pata_cs5535.c 2010-02-23 10:38:51.000000000 -0500 19176--- linux-2.6.32.10/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400
19192+++ linux-2.6.32.9/drivers/ata/pata_cs5535.c 2010-03-11 20:25:00.089632772 -0500 19177+++ linux-2.6.32.10/drivers/ata/pata_cs5535.c 2010-03-20 15:58:47.009545415 -0400
19193@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ 19178@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
19194 ATA_BMDMA_SHT(DRV_NAME), 19179 ATA_BMDMA_SHT(DRV_NAME),
19195 }; 19180 };
@@ -19199,9 +19184,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5535.c linux-2.6.32.9/drivers/ata/p
19199 .inherits = &ata_bmdma_port_ops, 19184 .inherits = &ata_bmdma_port_ops,
19200 .cable_detect = cs5535_cable_detect, 19185 .cable_detect = cs5535_cable_detect,
19201 .set_piomode = cs5535_set_piomode, 19186 .set_piomode = cs5535_set_piomode,
19202diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5536.c linux-2.6.32.9/drivers/ata/pata_cs5536.c 19187diff -urNp linux-2.6.32.10/drivers/ata/pata_cs5536.c linux-2.6.32.10/drivers/ata/pata_cs5536.c
19203--- linux-2.6.32.9/drivers/ata/pata_cs5536.c 2010-02-23 10:38:51.000000000 -0500 19188--- linux-2.6.32.10/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400
19204+++ linux-2.6.32.9/drivers/ata/pata_cs5536.c 2010-03-11 20:25:00.089632772 -0500 19189+++ linux-2.6.32.10/drivers/ata/pata_cs5536.c 2010-03-20 15:58:47.009545415 -0400
19205@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ 19190@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
19206 ATA_BMDMA_SHT(DRV_NAME), 19191 ATA_BMDMA_SHT(DRV_NAME),
19207 }; 19192 };
@@ -19211,9 +19196,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5536.c linux-2.6.32.9/drivers/ata/p
19211 .inherits = &ata_bmdma_port_ops, 19196 .inherits = &ata_bmdma_port_ops,
19212 .cable_detect = cs5536_cable_detect, 19197 .cable_detect = cs5536_cable_detect,
19213 .set_piomode = cs5536_set_piomode, 19198 .set_piomode = cs5536_set_piomode,
19214diff -urNp linux-2.6.32.9/drivers/ata/pata_cypress.c linux-2.6.32.9/drivers/ata/pata_cypress.c 19199diff -urNp linux-2.6.32.10/drivers/ata/pata_cypress.c linux-2.6.32.10/drivers/ata/pata_cypress.c
19215--- linux-2.6.32.9/drivers/ata/pata_cypress.c 2010-02-23 10:38:51.000000000 -0500 19200--- linux-2.6.32.10/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400
19216+++ linux-2.6.32.9/drivers/ata/pata_cypress.c 2010-03-11 20:25:00.089632772 -0500 19201+++ linux-2.6.32.10/drivers/ata/pata_cypress.c 2010-03-20 15:58:47.009545415 -0400
19217@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 19202@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
19218 ATA_BMDMA_SHT(DRV_NAME), 19203 ATA_BMDMA_SHT(DRV_NAME),
19219 }; 19204 };
@@ -19223,9 +19208,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_cypress.c linux-2.6.32.9/drivers/ata/
19223 .inherits = &ata_bmdma_port_ops, 19208 .inherits = &ata_bmdma_port_ops,
19224 .cable_detect = ata_cable_40wire, 19209 .cable_detect = ata_cable_40wire,
19225 .set_piomode = cy82c693_set_piomode, 19210 .set_piomode = cy82c693_set_piomode,
19226diff -urNp linux-2.6.32.9/drivers/ata/pata_efar.c linux-2.6.32.9/drivers/ata/pata_efar.c 19211diff -urNp linux-2.6.32.10/drivers/ata/pata_efar.c linux-2.6.32.10/drivers/ata/pata_efar.c
19227--- linux-2.6.32.9/drivers/ata/pata_efar.c 2010-02-23 10:38:51.000000000 -0500 19212--- linux-2.6.32.10/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400
19228+++ linux-2.6.32.9/drivers/ata/pata_efar.c 2010-03-11 20:25:00.089632772 -0500 19213+++ linux-2.6.32.10/drivers/ata/pata_efar.c 2010-03-20 15:58:47.009545415 -0400
19229@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh 19214@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
19230 ATA_BMDMA_SHT(DRV_NAME), 19215 ATA_BMDMA_SHT(DRV_NAME),
19231 }; 19216 };
@@ -19235,9 +19220,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_efar.c linux-2.6.32.9/drivers/ata/pat
19235 .inherits = &ata_bmdma_port_ops, 19220 .inherits = &ata_bmdma_port_ops,
19236 .cable_detect = efar_cable_detect, 19221 .cable_detect = efar_cable_detect,
19237 .set_piomode = efar_set_piomode, 19222 .set_piomode = efar_set_piomode,
19238diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt366.c linux-2.6.32.9/drivers/ata/pata_hpt366.c 19223diff -urNp linux-2.6.32.10/drivers/ata/pata_hpt366.c linux-2.6.32.10/drivers/ata/pata_hpt366.c
19239--- linux-2.6.32.9/drivers/ata/pata_hpt366.c 2010-02-23 10:38:51.000000000 -0500 19224--- linux-2.6.32.10/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400
19240+++ linux-2.6.32.9/drivers/ata/pata_hpt366.c 2010-03-11 20:25:00.089632772 -0500 19225+++ linux-2.6.32.10/drivers/ata/pata_hpt366.c 2010-03-20 15:58:47.009545415 -0400
19241@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ 19226@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
19242 * Configuration for HPT366/68 19227 * Configuration for HPT366/68
19243 */ 19228 */
@@ -19247,9 +19232,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt366.c linux-2.6.32.9/drivers/ata/p
19247 .inherits = &ata_bmdma_port_ops, 19232 .inherits = &ata_bmdma_port_ops,
19248 .cable_detect = hpt36x_cable_detect, 19233 .cable_detect = hpt36x_cable_detect,
19249 .mode_filter = hpt366_filter, 19234 .mode_filter = hpt366_filter,
19250diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt37x.c linux-2.6.32.9/drivers/ata/pata_hpt37x.c 19235diff -urNp linux-2.6.32.10/drivers/ata/pata_hpt37x.c linux-2.6.32.10/drivers/ata/pata_hpt37x.c
19251--- linux-2.6.32.9/drivers/ata/pata_hpt37x.c 2010-02-23 10:38:51.000000000 -0500 19236--- linux-2.6.32.10/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400
19252+++ linux-2.6.32.9/drivers/ata/pata_hpt37x.c 2010-03-11 20:25:00.089632772 -0500 19237+++ linux-2.6.32.10/drivers/ata/pata_hpt37x.c 2010-03-20 15:58:47.009545415 -0400
19253@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ 19238@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
19254 * Configuration for HPT370 19239 * Configuration for HPT370
19255 */ 19240 */
@@ -19286,9 +19271,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt37x.c linux-2.6.32.9/drivers/ata/p
19286 .inherits = &hpt372_port_ops, 19271 .inherits = &hpt372_port_ops,
19287 .prereset = hpt374_fn1_pre_reset, 19272 .prereset = hpt374_fn1_pre_reset,
19288 }; 19273 };
19289diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt3x2n.c linux-2.6.32.9/drivers/ata/pata_hpt3x2n.c 19274diff -urNp linux-2.6.32.10/drivers/ata/pata_hpt3x2n.c linux-2.6.32.10/drivers/ata/pata_hpt3x2n.c
19290--- linux-2.6.32.9/drivers/ata/pata_hpt3x2n.c 2010-02-23 10:38:51.000000000 -0500 19275--- linux-2.6.32.10/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400
19291+++ linux-2.6.32.9/drivers/ata/pata_hpt3x2n.c 2010-03-11 20:25:00.089632772 -0500 19276+++ linux-2.6.32.10/drivers/ata/pata_hpt3x2n.c 2010-03-20 15:58:47.009545415 -0400
19292@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n 19277@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
19293 * Configuration for HPT3x2n. 19278 * Configuration for HPT3x2n.
19294 */ 19279 */
@@ -19298,9 +19283,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt3x2n.c linux-2.6.32.9/drivers/ata/
19298 .inherits = &ata_bmdma_port_ops, 19283 .inherits = &ata_bmdma_port_ops,
19299 19284
19300 .bmdma_stop = hpt3x2n_bmdma_stop, 19285 .bmdma_stop = hpt3x2n_bmdma_stop,
19301diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt3x3.c linux-2.6.32.9/drivers/ata/pata_hpt3x3.c 19286diff -urNp linux-2.6.32.10/drivers/ata/pata_hpt3x3.c linux-2.6.32.10/drivers/ata/pata_hpt3x3.c
19302--- linux-2.6.32.9/drivers/ata/pata_hpt3x3.c 2010-02-23 10:38:51.000000000 -0500 19287--- linux-2.6.32.10/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400
19303+++ linux-2.6.32.9/drivers/ata/pata_hpt3x3.c 2010-03-11 20:25:00.089632772 -0500 19288+++ linux-2.6.32.10/drivers/ata/pata_hpt3x3.c 2010-03-20 15:58:47.009545415 -0400
19304@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ 19289@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
19305 ATA_BMDMA_SHT(DRV_NAME), 19290 ATA_BMDMA_SHT(DRV_NAME),
19306 }; 19291 };
@@ -19310,9 +19295,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt3x3.c linux-2.6.32.9/drivers/ata/p
19310 .inherits = &ata_bmdma_port_ops, 19295 .inherits = &ata_bmdma_port_ops,
19311 .cable_detect = ata_cable_40wire, 19296 .cable_detect = ata_cable_40wire,
19312 .set_piomode = hpt3x3_set_piomode, 19297 .set_piomode = hpt3x3_set_piomode,
19313diff -urNp linux-2.6.32.9/drivers/ata/pata_icside.c linux-2.6.32.9/drivers/ata/pata_icside.c 19298diff -urNp linux-2.6.32.10/drivers/ata/pata_icside.c linux-2.6.32.10/drivers/ata/pata_icside.c
19314--- linux-2.6.32.9/drivers/ata/pata_icside.c 2010-02-23 10:38:51.000000000 -0500 19299--- linux-2.6.32.10/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400
19315+++ linux-2.6.32.9/drivers/ata/pata_icside.c 2010-03-11 20:25:00.089632772 -0500 19300+++ linux-2.6.32.10/drivers/ata/pata_icside.c 2010-03-20 15:58:47.009545415 -0400
19316@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct 19301@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
19317 } 19302 }
19318 } 19303 }
@@ -19322,9 +19307,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_icside.c linux-2.6.32.9/drivers/ata/p
19322 .inherits = &ata_sff_port_ops, 19307 .inherits = &ata_sff_port_ops,
19323 /* no need to build any PRD tables for DMA */ 19308 /* no need to build any PRD tables for DMA */
19324 .qc_prep = ata_noop_qc_prep, 19309 .qc_prep = ata_noop_qc_prep,
19325diff -urNp linux-2.6.32.9/drivers/ata/pata_isapnp.c linux-2.6.32.9/drivers/ata/pata_isapnp.c 19310diff -urNp linux-2.6.32.10/drivers/ata/pata_isapnp.c linux-2.6.32.10/drivers/ata/pata_isapnp.c
19326--- linux-2.6.32.9/drivers/ata/pata_isapnp.c 2010-02-23 10:38:51.000000000 -0500 19311--- linux-2.6.32.10/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400
19327+++ linux-2.6.32.9/drivers/ata/pata_isapnp.c 2010-03-11 20:25:00.093350281 -0500 19312+++ linux-2.6.32.10/drivers/ata/pata_isapnp.c 2010-03-20 15:58:47.009545415 -0400
19328@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ 19313@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
19329 ATA_PIO_SHT(DRV_NAME), 19314 ATA_PIO_SHT(DRV_NAME),
19330 }; 19315 };
@@ -19340,9 +19325,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_isapnp.c linux-2.6.32.9/drivers/ata/p
19340 .inherits = &ata_sff_port_ops, 19325 .inherits = &ata_sff_port_ops,
19341 .cable_detect = ata_cable_40wire, 19326 .cable_detect = ata_cable_40wire,
19342 /* No altstatus so we don't want to use the lost interrupt poll */ 19327 /* No altstatus so we don't want to use the lost interrupt poll */
19343diff -urNp linux-2.6.32.9/drivers/ata/pata_it8213.c linux-2.6.32.9/drivers/ata/pata_it8213.c 19328diff -urNp linux-2.6.32.10/drivers/ata/pata_it8213.c linux-2.6.32.10/drivers/ata/pata_it8213.c
19344--- linux-2.6.32.9/drivers/ata/pata_it8213.c 2010-02-23 10:38:51.000000000 -0500 19329--- linux-2.6.32.10/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400
19345+++ linux-2.6.32.9/drivers/ata/pata_it8213.c 2010-03-11 20:25:00.093350281 -0500 19330+++ linux-2.6.32.10/drivers/ata/pata_it8213.c 2010-03-20 15:58:47.009545415 -0400
19346@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ 19331@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
19347 }; 19332 };
19348 19333
@@ -19352,9 +19337,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_it8213.c linux-2.6.32.9/drivers/ata/p
19352 .inherits = &ata_bmdma_port_ops, 19337 .inherits = &ata_bmdma_port_ops,
19353 .cable_detect = it8213_cable_detect, 19338 .cable_detect = it8213_cable_detect,
19354 .set_piomode = it8213_set_piomode, 19339 .set_piomode = it8213_set_piomode,
19355diff -urNp linux-2.6.32.9/drivers/ata/pata_it821x.c linux-2.6.32.9/drivers/ata/pata_it821x.c 19340diff -urNp linux-2.6.32.10/drivers/ata/pata_it821x.c linux-2.6.32.10/drivers/ata/pata_it821x.c
19356--- linux-2.6.32.9/drivers/ata/pata_it821x.c 2010-02-23 10:38:51.000000000 -0500 19341--- linux-2.6.32.10/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400
19357+++ linux-2.6.32.9/drivers/ata/pata_it821x.c 2010-03-11 20:25:00.093350281 -0500 19342+++ linux-2.6.32.10/drivers/ata/pata_it821x.c 2010-03-20 15:58:47.009545415 -0400
19358@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ 19343@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
19359 ATA_BMDMA_SHT(DRV_NAME), 19344 ATA_BMDMA_SHT(DRV_NAME),
19360 }; 19345 };
@@ -19382,9 +19367,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_it821x.c linux-2.6.32.9/drivers/ata/p
19382 .inherits = &ata_bmdma_port_ops, 19367 .inherits = &ata_bmdma_port_ops,
19383 19368
19384 .check_atapi_dma= it821x_check_atapi_dma, 19369 .check_atapi_dma= it821x_check_atapi_dma,
19385diff -urNp linux-2.6.32.9/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.9/drivers/ata/pata_ixp4xx_cf.c 19370diff -urNp linux-2.6.32.10/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.10/drivers/ata/pata_ixp4xx_cf.c
19386--- linux-2.6.32.9/drivers/ata/pata_ixp4xx_cf.c 2010-02-23 10:38:51.000000000 -0500 19371--- linux-2.6.32.10/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400
19387+++ linux-2.6.32.9/drivers/ata/pata_ixp4xx_cf.c 2010-03-11 20:25:00.093350281 -0500 19372+++ linux-2.6.32.10/drivers/ata/pata_ixp4xx_cf.c 2010-03-20 15:58:47.009545415 -0400
19388@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ 19373@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
19389 ATA_PIO_SHT(DRV_NAME), 19374 ATA_PIO_SHT(DRV_NAME),
19390 }; 19375 };
@@ -19394,9 +19379,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.9/drivers/at
19394 .inherits = &ata_sff_port_ops, 19379 .inherits = &ata_sff_port_ops,
19395 .sff_data_xfer = ixp4xx_mmio_data_xfer, 19380 .sff_data_xfer = ixp4xx_mmio_data_xfer,
19396 .cable_detect = ata_cable_40wire, 19381 .cable_detect = ata_cable_40wire,
19397diff -urNp linux-2.6.32.9/drivers/ata/pata_jmicron.c linux-2.6.32.9/drivers/ata/pata_jmicron.c 19382diff -urNp linux-2.6.32.10/drivers/ata/pata_jmicron.c linux-2.6.32.10/drivers/ata/pata_jmicron.c
19398--- linux-2.6.32.9/drivers/ata/pata_jmicron.c 2010-02-23 10:38:51.000000000 -0500 19383--- linux-2.6.32.10/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400
19399+++ linux-2.6.32.9/drivers/ata/pata_jmicron.c 2010-03-11 20:25:00.093350281 -0500 19384+++ linux-2.6.32.10/drivers/ata/pata_jmicron.c 2010-03-20 15:58:47.009545415 -0400
19400@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron 19385@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
19401 ATA_BMDMA_SHT(DRV_NAME), 19386 ATA_BMDMA_SHT(DRV_NAME),
19402 }; 19387 };
@@ -19406,9 +19391,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_jmicron.c linux-2.6.32.9/drivers/ata/
19406 .inherits = &ata_bmdma_port_ops, 19391 .inherits = &ata_bmdma_port_ops,
19407 .prereset = jmicron_pre_reset, 19392 .prereset = jmicron_pre_reset,
19408 }; 19393 };
19409diff -urNp linux-2.6.32.9/drivers/ata/pata_legacy.c linux-2.6.32.9/drivers/ata/pata_legacy.c 19394diff -urNp linux-2.6.32.10/drivers/ata/pata_legacy.c linux-2.6.32.10/drivers/ata/pata_legacy.c
19410--- linux-2.6.32.9/drivers/ata/pata_legacy.c 2010-02-23 10:38:51.000000000 -0500 19395--- linux-2.6.32.10/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400
19411+++ linux-2.6.32.9/drivers/ata/pata_legacy.c 2010-03-11 20:25:00.093350281 -0500 19396+++ linux-2.6.32.10/drivers/ata/pata_legacy.c 2010-03-20 15:58:47.009545415 -0400
19412@@ -106,7 +106,7 @@ struct legacy_probe { 19397@@ -106,7 +106,7 @@ struct legacy_probe {
19413 19398
19414 struct legacy_controller { 19399 struct legacy_controller {
@@ -19520,9 +19505,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_legacy.c linux-2.6.32.9/drivers/ata/p
19520 struct legacy_data *ld = &legacy_data[probe->slot]; 19505 struct legacy_data *ld = &legacy_data[probe->slot];
19521 struct ata_host *host = NULL; 19506 struct ata_host *host = NULL;
19522 struct ata_port *ap; 19507 struct ata_port *ap;
19523diff -urNp linux-2.6.32.9/drivers/ata/pata_marvell.c linux-2.6.32.9/drivers/ata/pata_marvell.c 19508diff -urNp linux-2.6.32.10/drivers/ata/pata_marvell.c linux-2.6.32.10/drivers/ata/pata_marvell.c
19524--- linux-2.6.32.9/drivers/ata/pata_marvell.c 2010-02-23 10:38:51.000000000 -0500 19509--- linux-2.6.32.10/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400
19525+++ linux-2.6.32.9/drivers/ata/pata_marvell.c 2010-03-11 20:25:00.093350281 -0500 19510+++ linux-2.6.32.10/drivers/ata/pata_marvell.c 2010-03-20 15:58:47.014066622 -0400
19526@@ -100,7 +100,7 @@ static struct scsi_host_template marvell 19511@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
19527 ATA_BMDMA_SHT(DRV_NAME), 19512 ATA_BMDMA_SHT(DRV_NAME),
19528 }; 19513 };
@@ -19532,9 +19517,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_marvell.c linux-2.6.32.9/drivers/ata/
19532 .inherits = &ata_bmdma_port_ops, 19517 .inherits = &ata_bmdma_port_ops,
19533 .cable_detect = marvell_cable_detect, 19518 .cable_detect = marvell_cable_detect,
19534 .prereset = marvell_pre_reset, 19519 .prereset = marvell_pre_reset,
19535diff -urNp linux-2.6.32.9/drivers/ata/pata_mpc52xx.c linux-2.6.32.9/drivers/ata/pata_mpc52xx.c 19520diff -urNp linux-2.6.32.10/drivers/ata/pata_mpc52xx.c linux-2.6.32.10/drivers/ata/pata_mpc52xx.c
19536--- linux-2.6.32.9/drivers/ata/pata_mpc52xx.c 2010-02-23 10:38:51.000000000 -0500 19521--- linux-2.6.32.10/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400
19537+++ linux-2.6.32.9/drivers/ata/pata_mpc52xx.c 2010-03-11 20:25:00.093350281 -0500 19522+++ linux-2.6.32.10/drivers/ata/pata_mpc52xx.c 2010-03-20 15:58:47.014066622 -0400
19538@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx 19523@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
19539 ATA_PIO_SHT(DRV_NAME), 19524 ATA_PIO_SHT(DRV_NAME),
19540 }; 19525 };
@@ -19544,9 +19529,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_mpc52xx.c linux-2.6.32.9/drivers/ata/
19544 .inherits = &ata_sff_port_ops, 19529 .inherits = &ata_sff_port_ops,
19545 .sff_dev_select = mpc52xx_ata_dev_select, 19530 .sff_dev_select = mpc52xx_ata_dev_select,
19546 .set_piomode = mpc52xx_ata_set_piomode, 19531 .set_piomode = mpc52xx_ata_set_piomode,
19547diff -urNp linux-2.6.32.9/drivers/ata/pata_mpiix.c linux-2.6.32.9/drivers/ata/pata_mpiix.c 19532diff -urNp linux-2.6.32.10/drivers/ata/pata_mpiix.c linux-2.6.32.10/drivers/ata/pata_mpiix.c
19548--- linux-2.6.32.9/drivers/ata/pata_mpiix.c 2010-02-23 10:38:51.000000000 -0500 19533--- linux-2.6.32.10/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400
19549+++ linux-2.6.32.9/drivers/ata/pata_mpiix.c 2010-03-11 20:25:00.093350281 -0500 19534+++ linux-2.6.32.10/drivers/ata/pata_mpiix.c 2010-03-20 15:58:47.014066622 -0400
19550@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s 19535@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
19551 ATA_PIO_SHT(DRV_NAME), 19536 ATA_PIO_SHT(DRV_NAME),
19552 }; 19537 };
@@ -19556,9 +19541,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_mpiix.c linux-2.6.32.9/drivers/ata/pa
19556 .inherits = &ata_sff_port_ops, 19541 .inherits = &ata_sff_port_ops,
19557 .qc_issue = mpiix_qc_issue, 19542 .qc_issue = mpiix_qc_issue,
19558 .cable_detect = ata_cable_40wire, 19543 .cable_detect = ata_cable_40wire,
19559diff -urNp linux-2.6.32.9/drivers/ata/pata_netcell.c linux-2.6.32.9/drivers/ata/pata_netcell.c 19544diff -urNp linux-2.6.32.10/drivers/ata/pata_netcell.c linux-2.6.32.10/drivers/ata/pata_netcell.c
19560--- linux-2.6.32.9/drivers/ata/pata_netcell.c 2010-02-23 10:38:51.000000000 -0500 19545--- linux-2.6.32.10/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400
19561+++ linux-2.6.32.9/drivers/ata/pata_netcell.c 2010-03-11 20:25:00.093350281 -0500 19546+++ linux-2.6.32.10/drivers/ata/pata_netcell.c 2010-03-20 15:58:47.014066622 -0400
19562@@ -34,7 +34,7 @@ static struct scsi_host_template netcell 19547@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
19563 ATA_BMDMA_SHT(DRV_NAME), 19548 ATA_BMDMA_SHT(DRV_NAME),
19564 }; 19549 };
@@ -19568,9 +19553,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_netcell.c linux-2.6.32.9/drivers/ata/
19568 .inherits = &ata_bmdma_port_ops, 19553 .inherits = &ata_bmdma_port_ops,
19569 .cable_detect = ata_cable_80wire, 19554 .cable_detect = ata_cable_80wire,
19570 .read_id = netcell_read_id, 19555 .read_id = netcell_read_id,
19571diff -urNp linux-2.6.32.9/drivers/ata/pata_ninja32.c linux-2.6.32.9/drivers/ata/pata_ninja32.c 19556diff -urNp linux-2.6.32.10/drivers/ata/pata_ninja32.c linux-2.6.32.10/drivers/ata/pata_ninja32.c
19572--- linux-2.6.32.9/drivers/ata/pata_ninja32.c 2010-02-23 10:38:51.000000000 -0500 19557--- linux-2.6.32.10/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400
19573+++ linux-2.6.32.9/drivers/ata/pata_ninja32.c 2010-03-11 20:25:00.093350281 -0500 19558+++ linux-2.6.32.10/drivers/ata/pata_ninja32.c 2010-03-20 15:58:47.014066622 -0400
19574@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 19559@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
19575 ATA_BMDMA_SHT(DRV_NAME), 19560 ATA_BMDMA_SHT(DRV_NAME),
19576 }; 19561 };
@@ -19580,9 +19565,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_ninja32.c linux-2.6.32.9/drivers/ata/
19580 .inherits = &ata_bmdma_port_ops, 19565 .inherits = &ata_bmdma_port_ops,
19581 .sff_dev_select = ninja32_dev_select, 19566 .sff_dev_select = ninja32_dev_select,
19582 .cable_detect = ata_cable_40wire, 19567 .cable_detect = ata_cable_40wire,
19583diff -urNp linux-2.6.32.9/drivers/ata/pata_ns87410.c linux-2.6.32.9/drivers/ata/pata_ns87410.c 19568diff -urNp linux-2.6.32.10/drivers/ata/pata_ns87410.c linux-2.6.32.10/drivers/ata/pata_ns87410.c
19584--- linux-2.6.32.9/drivers/ata/pata_ns87410.c 2010-02-23 10:38:51.000000000 -0500 19569--- linux-2.6.32.10/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400
19585+++ linux-2.6.32.9/drivers/ata/pata_ns87410.c 2010-03-11 20:25:00.093350281 -0500 19570+++ linux-2.6.32.10/drivers/ata/pata_ns87410.c 2010-03-20 15:58:47.014066622 -0400
19586@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 19571@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
19587 ATA_PIO_SHT(DRV_NAME), 19572 ATA_PIO_SHT(DRV_NAME),
19588 }; 19573 };
@@ -19592,9 +19577,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_ns87410.c linux-2.6.32.9/drivers/ata/
19592 .inherits = &ata_sff_port_ops, 19577 .inherits = &ata_sff_port_ops,
19593 .qc_issue = ns87410_qc_issue, 19578 .qc_issue = ns87410_qc_issue,
19594 .cable_detect = ata_cable_40wire, 19579 .cable_detect = ata_cable_40wire,
19595diff -urNp linux-2.6.32.9/drivers/ata/pata_ns87415.c linux-2.6.32.9/drivers/ata/pata_ns87415.c 19580diff -urNp linux-2.6.32.10/drivers/ata/pata_ns87415.c linux-2.6.32.10/drivers/ata/pata_ns87415.c
19596--- linux-2.6.32.9/drivers/ata/pata_ns87415.c 2010-02-23 10:38:51.000000000 -0500 19581--- linux-2.6.32.10/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400
19597+++ linux-2.6.32.9/drivers/ata/pata_ns87415.c 2010-03-11 20:25:00.093350281 -0500 19582+++ linux-2.6.32.10/drivers/ata/pata_ns87415.c 2010-03-20 15:58:47.014066622 -0400
19598@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at 19583@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
19599 } 19584 }
19600 #endif /* 87560 SuperIO Support */ 19585 #endif /* 87560 SuperIO Support */
@@ -19613,9 +19598,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_ns87415.c linux-2.6.32.9/drivers/ata/
19613 .inherits = &ns87415_pata_ops, 19598 .inherits = &ns87415_pata_ops,
19614 .sff_tf_read = ns87560_tf_read, 19599 .sff_tf_read = ns87560_tf_read,
19615 .sff_check_status = ns87560_check_status, 19600 .sff_check_status = ns87560_check_status,
19616diff -urNp linux-2.6.32.9/drivers/ata/pata_octeon_cf.c linux-2.6.32.9/drivers/ata/pata_octeon_cf.c 19601diff -urNp linux-2.6.32.10/drivers/ata/pata_octeon_cf.c linux-2.6.32.10/drivers/ata/pata_octeon_cf.c
19617--- linux-2.6.32.9/drivers/ata/pata_octeon_cf.c 2010-02-23 10:38:51.000000000 -0500 19602--- linux-2.6.32.10/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400
19618+++ linux-2.6.32.9/drivers/ata/pata_octeon_cf.c 2010-03-11 20:25:00.093350281 -0500 19603+++ linux-2.6.32.10/drivers/ata/pata_octeon_cf.c 2010-03-20 15:58:47.014066622 -0400
19619@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s 19604@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
19620 return 0; 19605 return 0;
19621 } 19606 }
@@ -19624,9 +19609,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_octeon_cf.c linux-2.6.32.9/drivers/at
19624 static struct ata_port_operations octeon_cf_ops = { 19609 static struct ata_port_operations octeon_cf_ops = {
19625 .inherits = &ata_sff_port_ops, 19610 .inherits = &ata_sff_port_ops,
19626 .check_atapi_dma = octeon_cf_check_atapi_dma, 19611 .check_atapi_dma = octeon_cf_check_atapi_dma,
19627diff -urNp linux-2.6.32.9/drivers/ata/pata_oldpiix.c linux-2.6.32.9/drivers/ata/pata_oldpiix.c 19612diff -urNp linux-2.6.32.10/drivers/ata/pata_oldpiix.c linux-2.6.32.10/drivers/ata/pata_oldpiix.c
19628--- linux-2.6.32.9/drivers/ata/pata_oldpiix.c 2010-02-23 10:38:51.000000000 -0500 19613--- linux-2.6.32.10/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400
19629+++ linux-2.6.32.9/drivers/ata/pata_oldpiix.c 2010-03-11 20:25:00.093350281 -0500 19614+++ linux-2.6.32.10/drivers/ata/pata_oldpiix.c 2010-03-20 15:58:47.014066622 -0400
19630@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix 19615@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
19631 ATA_BMDMA_SHT(DRV_NAME), 19616 ATA_BMDMA_SHT(DRV_NAME),
19632 }; 19617 };
@@ -19636,9 +19621,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_oldpiix.c linux-2.6.32.9/drivers/ata/
19636 .inherits = &ata_bmdma_port_ops, 19621 .inherits = &ata_bmdma_port_ops,
19637 .qc_issue = oldpiix_qc_issue, 19622 .qc_issue = oldpiix_qc_issue,
19638 .cable_detect = ata_cable_40wire, 19623 .cable_detect = ata_cable_40wire,
19639diff -urNp linux-2.6.32.9/drivers/ata/pata_opti.c linux-2.6.32.9/drivers/ata/pata_opti.c 19624diff -urNp linux-2.6.32.10/drivers/ata/pata_opti.c linux-2.6.32.10/drivers/ata/pata_opti.c
19640--- linux-2.6.32.9/drivers/ata/pata_opti.c 2010-02-23 10:38:51.000000000 -0500 19625--- linux-2.6.32.10/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400
19641+++ linux-2.6.32.9/drivers/ata/pata_opti.c 2010-03-11 20:25:00.093350281 -0500 19626+++ linux-2.6.32.10/drivers/ata/pata_opti.c 2010-03-20 15:58:47.014066622 -0400
19642@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh 19627@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
19643 ATA_PIO_SHT(DRV_NAME), 19628 ATA_PIO_SHT(DRV_NAME),
19644 }; 19629 };
@@ -19648,9 +19633,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_opti.c linux-2.6.32.9/drivers/ata/pat
19648 .inherits = &ata_sff_port_ops, 19633 .inherits = &ata_sff_port_ops,
19649 .cable_detect = ata_cable_40wire, 19634 .cable_detect = ata_cable_40wire,
19650 .set_piomode = opti_set_piomode, 19635 .set_piomode = opti_set_piomode,
19651diff -urNp linux-2.6.32.9/drivers/ata/pata_optidma.c linux-2.6.32.9/drivers/ata/pata_optidma.c 19636diff -urNp linux-2.6.32.10/drivers/ata/pata_optidma.c linux-2.6.32.10/drivers/ata/pata_optidma.c
19652--- linux-2.6.32.9/drivers/ata/pata_optidma.c 2010-02-23 10:38:51.000000000 -0500 19637--- linux-2.6.32.10/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400
19653+++ linux-2.6.32.9/drivers/ata/pata_optidma.c 2010-03-11 20:25:00.093350281 -0500 19638+++ linux-2.6.32.10/drivers/ata/pata_optidma.c 2010-03-20 15:58:47.014066622 -0400
19654@@ -337,7 +337,7 @@ static struct scsi_host_template optidma 19639@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
19655 ATA_BMDMA_SHT(DRV_NAME), 19640 ATA_BMDMA_SHT(DRV_NAME),
19656 }; 19641 };
@@ -19669,9 +19654,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_optidma.c linux-2.6.32.9/drivers/ata/
19669 .inherits = &optidma_port_ops, 19654 .inherits = &optidma_port_ops,
19670 .set_piomode = optiplus_set_pio_mode, 19655 .set_piomode = optiplus_set_pio_mode,
19671 .set_dmamode = optiplus_set_dma_mode, 19656 .set_dmamode = optiplus_set_dma_mode,
19672diff -urNp linux-2.6.32.9/drivers/ata/pata_palmld.c linux-2.6.32.9/drivers/ata/pata_palmld.c 19657diff -urNp linux-2.6.32.10/drivers/ata/pata_palmld.c linux-2.6.32.10/drivers/ata/pata_palmld.c
19673--- linux-2.6.32.9/drivers/ata/pata_palmld.c 2010-02-23 10:38:51.000000000 -0500 19658--- linux-2.6.32.10/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400
19674+++ linux-2.6.32.9/drivers/ata/pata_palmld.c 2010-03-11 20:25:00.093350281 -0500 19659+++ linux-2.6.32.10/drivers/ata/pata_palmld.c 2010-03-20 15:58:47.014066622 -0400
19675@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ 19660@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
19676 ATA_PIO_SHT(DRV_NAME), 19661 ATA_PIO_SHT(DRV_NAME),
19677 }; 19662 };
@@ -19681,9 +19666,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_palmld.c linux-2.6.32.9/drivers/ata/p
19681 .inherits = &ata_sff_port_ops, 19666 .inherits = &ata_sff_port_ops,
19682 .sff_data_xfer = ata_sff_data_xfer_noirq, 19667 .sff_data_xfer = ata_sff_data_xfer_noirq,
19683 .cable_detect = ata_cable_40wire, 19668 .cable_detect = ata_cable_40wire,
19684diff -urNp linux-2.6.32.9/drivers/ata/pata_pcmcia.c linux-2.6.32.9/drivers/ata/pata_pcmcia.c 19669diff -urNp linux-2.6.32.10/drivers/ata/pata_pcmcia.c linux-2.6.32.10/drivers/ata/pata_pcmcia.c
19685--- linux-2.6.32.9/drivers/ata/pata_pcmcia.c 2010-02-23 10:38:51.000000000 -0500 19670--- linux-2.6.32.10/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400
19686+++ linux-2.6.32.9/drivers/ata/pata_pcmcia.c 2010-03-11 20:25:00.093350281 -0500 19671+++ linux-2.6.32.10/drivers/ata/pata_pcmcia.c 2010-03-20 15:58:47.014066622 -0400
19687@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ 19672@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
19688 ATA_PIO_SHT(DRV_NAME), 19673 ATA_PIO_SHT(DRV_NAME),
19689 }; 19674 };
@@ -19710,9 +19695,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_pcmcia.c linux-2.6.32.9/drivers/ata/p
19710 19695
19711 info = kzalloc(sizeof(*info), GFP_KERNEL); 19696 info = kzalloc(sizeof(*info), GFP_KERNEL);
19712 if (info == NULL) 19697 if (info == NULL)
19713diff -urNp linux-2.6.32.9/drivers/ata/pata_pdc2027x.c linux-2.6.32.9/drivers/ata/pata_pdc2027x.c 19698diff -urNp linux-2.6.32.10/drivers/ata/pata_pdc2027x.c linux-2.6.32.10/drivers/ata/pata_pdc2027x.c
19714--- linux-2.6.32.9/drivers/ata/pata_pdc2027x.c 2010-02-23 10:38:51.000000000 -0500 19699--- linux-2.6.32.10/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400
19715+++ linux-2.6.32.9/drivers/ata/pata_pdc2027x.c 2010-03-11 20:25:00.097395072 -0500 19700+++ linux-2.6.32.10/drivers/ata/pata_pdc2027x.c 2010-03-20 15:58:47.014066622 -0400
19716@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 19701@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
19717 ATA_BMDMA_SHT(DRV_NAME), 19702 ATA_BMDMA_SHT(DRV_NAME),
19718 }; 19703 };
@@ -19730,9 +19715,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_pdc2027x.c linux-2.6.32.9/drivers/ata
19730 .inherits = &pdc2027x_pata100_ops, 19715 .inherits = &pdc2027x_pata100_ops,
19731 .mode_filter = pdc2027x_mode_filter, 19716 .mode_filter = pdc2027x_mode_filter,
19732 .set_piomode = pdc2027x_set_piomode, 19717 .set_piomode = pdc2027x_set_piomode,
19733diff -urNp linux-2.6.32.9/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.9/drivers/ata/pata_pdc202xx_old.c 19718diff -urNp linux-2.6.32.10/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.10/drivers/ata/pata_pdc202xx_old.c
19734--- linux-2.6.32.9/drivers/ata/pata_pdc202xx_old.c 2010-02-23 10:38:51.000000000 -0500 19719--- linux-2.6.32.10/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400
19735+++ linux-2.6.32.9/drivers/ata/pata_pdc202xx_old.c 2010-03-11 20:25:00.097395072 -0500 19720+++ linux-2.6.32.10/drivers/ata/pata_pdc202xx_old.c 2010-03-20 15:58:47.014066622 -0400
19736@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x 19721@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x
19737 ATA_BMDMA_SHT(DRV_NAME), 19722 ATA_BMDMA_SHT(DRV_NAME),
19738 }; 19723 };
@@ -19751,9 +19736,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.9/drivers
19751 .inherits = &pdc2024x_port_ops, 19736 .inherits = &pdc2024x_port_ops,
19752 19737
19753 .check_atapi_dma = pdc2026x_check_atapi_dma, 19738 .check_atapi_dma = pdc2026x_check_atapi_dma,
19754diff -urNp linux-2.6.32.9/drivers/ata/pata_platform.c linux-2.6.32.9/drivers/ata/pata_platform.c 19739diff -urNp linux-2.6.32.10/drivers/ata/pata_platform.c linux-2.6.32.10/drivers/ata/pata_platform.c
19755--- linux-2.6.32.9/drivers/ata/pata_platform.c 2010-02-23 10:38:51.000000000 -0500 19740--- linux-2.6.32.10/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400
19756+++ linux-2.6.32.9/drivers/ata/pata_platform.c 2010-03-11 20:25:00.097395072 -0500 19741+++ linux-2.6.32.10/drivers/ata/pata_platform.c 2010-03-20 15:58:47.014066622 -0400
19757@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl 19742@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
19758 ATA_PIO_SHT(DRV_NAME), 19743 ATA_PIO_SHT(DRV_NAME),
19759 }; 19744 };
@@ -19763,9 +19748,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_platform.c linux-2.6.32.9/drivers/ata
19763 .inherits = &ata_sff_port_ops, 19748 .inherits = &ata_sff_port_ops,
19764 .sff_data_xfer = ata_sff_data_xfer_noirq, 19749 .sff_data_xfer = ata_sff_data_xfer_noirq,
19765 .cable_detect = ata_cable_unknown, 19750 .cable_detect = ata_cable_unknown,
19766diff -urNp linux-2.6.32.9/drivers/ata/pata_qdi.c linux-2.6.32.9/drivers/ata/pata_qdi.c 19751diff -urNp linux-2.6.32.10/drivers/ata/pata_qdi.c linux-2.6.32.10/drivers/ata/pata_qdi.c
19767--- linux-2.6.32.9/drivers/ata/pata_qdi.c 2010-02-23 10:38:51.000000000 -0500 19752--- linux-2.6.32.10/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400
19768+++ linux-2.6.32.9/drivers/ata/pata_qdi.c 2010-03-11 20:25:00.097395072 -0500 19753+++ linux-2.6.32.10/drivers/ata/pata_qdi.c 2010-03-20 15:58:47.014066622 -0400
19769@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht 19754@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
19770 ATA_PIO_SHT(DRV_NAME), 19755 ATA_PIO_SHT(DRV_NAME),
19771 }; 19756 };
@@ -19784,9 +19769,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_qdi.c linux-2.6.32.9/drivers/ata/pata
19784 .inherits = &qdi6500_port_ops, 19769 .inherits = &qdi6500_port_ops,
19785 .set_piomode = qdi6580_set_piomode, 19770 .set_piomode = qdi6580_set_piomode,
19786 }; 19771 };
19787diff -urNp linux-2.6.32.9/drivers/ata/pata_radisys.c linux-2.6.32.9/drivers/ata/pata_radisys.c 19772diff -urNp linux-2.6.32.10/drivers/ata/pata_radisys.c linux-2.6.32.10/drivers/ata/pata_radisys.c
19788--- linux-2.6.32.9/drivers/ata/pata_radisys.c 2010-02-23 10:38:51.000000000 -0500 19773--- linux-2.6.32.10/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400
19789+++ linux-2.6.32.9/drivers/ata/pata_radisys.c 2010-03-11 20:25:00.097395072 -0500 19774+++ linux-2.6.32.10/drivers/ata/pata_radisys.c 2010-03-20 15:58:47.014066622 -0400
19790@@ -187,7 +187,7 @@ static struct scsi_host_template radisys 19775@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
19791 ATA_BMDMA_SHT(DRV_NAME), 19776 ATA_BMDMA_SHT(DRV_NAME),
19792 }; 19777 };
@@ -19796,9 +19781,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_radisys.c linux-2.6.32.9/drivers/ata/
19796 .inherits = &ata_bmdma_port_ops, 19781 .inherits = &ata_bmdma_port_ops,
19797 .qc_issue = radisys_qc_issue, 19782 .qc_issue = radisys_qc_issue,
19798 .cable_detect = ata_cable_unknown, 19783 .cable_detect = ata_cable_unknown,
19799diff -urNp linux-2.6.32.9/drivers/ata/pata_rb532_cf.c linux-2.6.32.9/drivers/ata/pata_rb532_cf.c 19784diff -urNp linux-2.6.32.10/drivers/ata/pata_rb532_cf.c linux-2.6.32.10/drivers/ata/pata_rb532_cf.c
19800--- linux-2.6.32.9/drivers/ata/pata_rb532_cf.c 2010-02-23 10:38:51.000000000 -0500 19785--- linux-2.6.32.10/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400
19801+++ linux-2.6.32.9/drivers/ata/pata_rb532_cf.c 2010-03-11 20:25:00.097395072 -0500 19786+++ linux-2.6.32.10/drivers/ata/pata_rb532_cf.c 2010-03-20 15:58:47.014066622 -0400
19802@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle 19787@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
19803 return IRQ_HANDLED; 19788 return IRQ_HANDLED;
19804 } 19789 }
@@ -19808,9 +19793,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_rb532_cf.c linux-2.6.32.9/drivers/ata
19808 .inherits = &ata_sff_port_ops, 19793 .inherits = &ata_sff_port_ops,
19809 .sff_data_xfer = ata_sff_data_xfer32, 19794 .sff_data_xfer = ata_sff_data_xfer32,
19810 }; 19795 };
19811diff -urNp linux-2.6.32.9/drivers/ata/pata_rdc.c linux-2.6.32.9/drivers/ata/pata_rdc.c 19796diff -urNp linux-2.6.32.10/drivers/ata/pata_rdc.c linux-2.6.32.10/drivers/ata/pata_rdc.c
19812--- linux-2.6.32.9/drivers/ata/pata_rdc.c 2010-02-23 10:38:51.000000000 -0500 19797--- linux-2.6.32.10/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400
19813+++ linux-2.6.32.9/drivers/ata/pata_rdc.c 2010-03-11 20:25:00.097395072 -0500 19798+++ linux-2.6.32.10/drivers/ata/pata_rdc.c 2010-03-20 15:58:47.014066622 -0400
19814@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p 19799@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
19815 pci_write_config_byte(dev, 0x48, udma_enable); 19800 pci_write_config_byte(dev, 0x48, udma_enable);
19816 } 19801 }
@@ -19820,9 +19805,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_rdc.c linux-2.6.32.9/drivers/ata/pata
19820 .inherits = &ata_bmdma32_port_ops, 19805 .inherits = &ata_bmdma32_port_ops,
19821 .cable_detect = rdc_pata_cable_detect, 19806 .cable_detect = rdc_pata_cable_detect,
19822 .set_piomode = rdc_set_piomode, 19807 .set_piomode = rdc_set_piomode,
19823diff -urNp linux-2.6.32.9/drivers/ata/pata_rz1000.c linux-2.6.32.9/drivers/ata/pata_rz1000.c 19808diff -urNp linux-2.6.32.10/drivers/ata/pata_rz1000.c linux-2.6.32.10/drivers/ata/pata_rz1000.c
19824--- linux-2.6.32.9/drivers/ata/pata_rz1000.c 2010-02-23 10:38:51.000000000 -0500 19809--- linux-2.6.32.10/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400
19825+++ linux-2.6.32.9/drivers/ata/pata_rz1000.c 2010-03-11 20:25:00.097395072 -0500 19810+++ linux-2.6.32.10/drivers/ata/pata_rz1000.c 2010-03-20 15:58:47.014066622 -0400
19826@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ 19811@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
19827 ATA_PIO_SHT(DRV_NAME), 19812 ATA_PIO_SHT(DRV_NAME),
19828 }; 19813 };
@@ -19832,9 +19817,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_rz1000.c linux-2.6.32.9/drivers/ata/p
19832 .inherits = &ata_sff_port_ops, 19817 .inherits = &ata_sff_port_ops,
19833 .cable_detect = ata_cable_40wire, 19818 .cable_detect = ata_cable_40wire,
19834 .set_mode = rz1000_set_mode, 19819 .set_mode = rz1000_set_mode,
19835diff -urNp linux-2.6.32.9/drivers/ata/pata_sc1200.c linux-2.6.32.9/drivers/ata/pata_sc1200.c 19820diff -urNp linux-2.6.32.10/drivers/ata/pata_sc1200.c linux-2.6.32.10/drivers/ata/pata_sc1200.c
19836--- linux-2.6.32.9/drivers/ata/pata_sc1200.c 2010-02-23 10:38:51.000000000 -0500 19821--- linux-2.6.32.10/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400
19837+++ linux-2.6.32.9/drivers/ata/pata_sc1200.c 2010-03-11 20:25:00.097395072 -0500 19822+++ linux-2.6.32.10/drivers/ata/pata_sc1200.c 2010-03-20 15:58:47.014066622 -0400
19838@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ 19823@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
19839 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 19824 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
19840 }; 19825 };
@@ -19844,9 +19829,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_sc1200.c linux-2.6.32.9/drivers/ata/p
19844 .inherits = &ata_bmdma_port_ops, 19829 .inherits = &ata_bmdma_port_ops,
19845 .qc_prep = ata_sff_dumb_qc_prep, 19830 .qc_prep = ata_sff_dumb_qc_prep,
19846 .qc_issue = sc1200_qc_issue, 19831 .qc_issue = sc1200_qc_issue,
19847diff -urNp linux-2.6.32.9/drivers/ata/pata_scc.c linux-2.6.32.9/drivers/ata/pata_scc.c 19832diff -urNp linux-2.6.32.10/drivers/ata/pata_scc.c linux-2.6.32.10/drivers/ata/pata_scc.c
19848--- linux-2.6.32.9/drivers/ata/pata_scc.c 2010-02-23 10:38:51.000000000 -0500 19833--- linux-2.6.32.10/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400
19849+++ linux-2.6.32.9/drivers/ata/pata_scc.c 2010-03-11 20:25:00.097395072 -0500 19834+++ linux-2.6.32.10/drivers/ata/pata_scc.c 2010-03-20 15:58:47.014066622 -0400
19850@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht 19835@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
19851 ATA_BMDMA_SHT(DRV_NAME), 19836 ATA_BMDMA_SHT(DRV_NAME),
19852 }; 19837 };
@@ -19856,9 +19841,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_scc.c linux-2.6.32.9/drivers/ata/pata
19856 .inherits = &ata_bmdma_port_ops, 19841 .inherits = &ata_bmdma_port_ops,
19857 19842
19858 .set_piomode = scc_set_piomode, 19843 .set_piomode = scc_set_piomode,
19859diff -urNp linux-2.6.32.9/drivers/ata/pata_sch.c linux-2.6.32.9/drivers/ata/pata_sch.c 19844diff -urNp linux-2.6.32.10/drivers/ata/pata_sch.c linux-2.6.32.10/drivers/ata/pata_sch.c
19860--- linux-2.6.32.9/drivers/ata/pata_sch.c 2010-02-23 10:38:51.000000000 -0500 19845--- linux-2.6.32.10/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400
19861+++ linux-2.6.32.9/drivers/ata/pata_sch.c 2010-03-11 20:25:00.097395072 -0500 19846+++ linux-2.6.32.10/drivers/ata/pata_sch.c 2010-03-20 15:58:47.014066622 -0400
19862@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht 19847@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
19863 ATA_BMDMA_SHT(DRV_NAME), 19848 ATA_BMDMA_SHT(DRV_NAME),
19864 }; 19849 };
@@ -19868,9 +19853,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_sch.c linux-2.6.32.9/drivers/ata/pata
19868 .inherits = &ata_bmdma_port_ops, 19853 .inherits = &ata_bmdma_port_ops,
19869 .cable_detect = ata_cable_unknown, 19854 .cable_detect = ata_cable_unknown,
19870 .set_piomode = sch_set_piomode, 19855 .set_piomode = sch_set_piomode,
19871diff -urNp linux-2.6.32.9/drivers/ata/pata_serverworks.c linux-2.6.32.9/drivers/ata/pata_serverworks.c 19856diff -urNp linux-2.6.32.10/drivers/ata/pata_serverworks.c linux-2.6.32.10/drivers/ata/pata_serverworks.c
19872--- linux-2.6.32.9/drivers/ata/pata_serverworks.c 2010-02-23 10:38:51.000000000 -0500 19857--- linux-2.6.32.10/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400
19873+++ linux-2.6.32.9/drivers/ata/pata_serverworks.c 2010-03-11 20:25:00.097395072 -0500 19858+++ linux-2.6.32.10/drivers/ata/pata_serverworks.c 2010-03-20 15:58:47.018046884 -0400
19874@@ -299,7 +299,7 @@ static struct scsi_host_template serverw 19859@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
19875 ATA_BMDMA_SHT(DRV_NAME), 19860 ATA_BMDMA_SHT(DRV_NAME),
19876 }; 19861 };
@@ -19889,9 +19874,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_serverworks.c linux-2.6.32.9/drivers/
19889 .inherits = &serverworks_osb4_port_ops, 19874 .inherits = &serverworks_osb4_port_ops,
19890 .mode_filter = serverworks_csb_filter, 19875 .mode_filter = serverworks_csb_filter,
19891 }; 19876 };
19892diff -urNp linux-2.6.32.9/drivers/ata/pata_sil680.c linux-2.6.32.9/drivers/ata/pata_sil680.c 19877diff -urNp linux-2.6.32.10/drivers/ata/pata_sil680.c linux-2.6.32.10/drivers/ata/pata_sil680.c
19893--- linux-2.6.32.9/drivers/ata/pata_sil680.c 2010-02-23 10:38:51.000000000 -0500 19878--- linux-2.6.32.10/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400
19894+++ linux-2.6.32.9/drivers/ata/pata_sil680.c 2010-03-11 20:25:00.097395072 -0500 19879+++ linux-2.6.32.10/drivers/ata/pata_sil680.c 2010-03-20 15:58:47.018046884 -0400
19895@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ 19880@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
19896 ATA_BMDMA_SHT(DRV_NAME), 19881 ATA_BMDMA_SHT(DRV_NAME),
19897 }; 19882 };
@@ -19901,9 +19886,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_sil680.c linux-2.6.32.9/drivers/ata/p
19901 .inherits = &ata_bmdma32_port_ops, 19886 .inherits = &ata_bmdma32_port_ops,
19902 .cable_detect = sil680_cable_detect, 19887 .cable_detect = sil680_cable_detect,
19903 .set_piomode = sil680_set_piomode, 19888 .set_piomode = sil680_set_piomode,
19904diff -urNp linux-2.6.32.9/drivers/ata/pata_sis.c linux-2.6.32.9/drivers/ata/pata_sis.c 19889diff -urNp linux-2.6.32.10/drivers/ata/pata_sis.c linux-2.6.32.10/drivers/ata/pata_sis.c
19905--- linux-2.6.32.9/drivers/ata/pata_sis.c 2010-02-23 10:38:51.000000000 -0500 19890--- linux-2.6.32.10/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400
19906+++ linux-2.6.32.9/drivers/ata/pata_sis.c 2010-03-11 20:25:00.097395072 -0500 19891+++ linux-2.6.32.10/drivers/ata/pata_sis.c 2010-03-20 15:58:47.018046884 -0400
19907@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht 19892@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
19908 ATA_BMDMA_SHT(DRV_NAME), 19893 ATA_BMDMA_SHT(DRV_NAME),
19909 }; 19894 };
@@ -19959,9 +19944,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_sis.c linux-2.6.32.9/drivers/ata/pata
19959 .inherits = &sis_base_ops, 19944 .inherits = &sis_base_ops,
19960 .set_piomode = sis_old_set_piomode, 19945 .set_piomode = sis_old_set_piomode,
19961 .set_dmamode = sis_old_set_dmamode, 19946 .set_dmamode = sis_old_set_dmamode,
19962diff -urNp linux-2.6.32.9/drivers/ata/pata_sl82c105.c linux-2.6.32.9/drivers/ata/pata_sl82c105.c 19947diff -urNp linux-2.6.32.10/drivers/ata/pata_sl82c105.c linux-2.6.32.10/drivers/ata/pata_sl82c105.c
19963--- linux-2.6.32.9/drivers/ata/pata_sl82c105.c 2010-02-23 10:38:51.000000000 -0500 19948--- linux-2.6.32.10/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400
19964+++ linux-2.6.32.9/drivers/ata/pata_sl82c105.c 2010-03-11 20:25:00.097395072 -0500 19949+++ linux-2.6.32.10/drivers/ata/pata_sl82c105.c 2010-03-20 15:58:47.018046884 -0400
19965@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 19950@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
19966 ATA_BMDMA_SHT(DRV_NAME), 19951 ATA_BMDMA_SHT(DRV_NAME),
19967 }; 19952 };
@@ -19971,9 +19956,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_sl82c105.c linux-2.6.32.9/drivers/ata
19971 .inherits = &ata_bmdma_port_ops, 19956 .inherits = &ata_bmdma_port_ops,
19972 .qc_defer = sl82c105_qc_defer, 19957 .qc_defer = sl82c105_qc_defer,
19973 .bmdma_start = sl82c105_bmdma_start, 19958 .bmdma_start = sl82c105_bmdma_start,
19974diff -urNp linux-2.6.32.9/drivers/ata/pata_triflex.c linux-2.6.32.9/drivers/ata/pata_triflex.c 19959diff -urNp linux-2.6.32.10/drivers/ata/pata_triflex.c linux-2.6.32.10/drivers/ata/pata_triflex.c
19975--- linux-2.6.32.9/drivers/ata/pata_triflex.c 2010-02-23 10:38:51.000000000 -0500 19960--- linux-2.6.32.10/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400
19976+++ linux-2.6.32.9/drivers/ata/pata_triflex.c 2010-03-11 20:25:00.097395072 -0500 19961+++ linux-2.6.32.10/drivers/ata/pata_triflex.c 2010-03-20 15:58:47.018046884 -0400
19977@@ -178,7 +178,7 @@ static struct scsi_host_template triflex 19962@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
19978 ATA_BMDMA_SHT(DRV_NAME), 19963 ATA_BMDMA_SHT(DRV_NAME),
19979 }; 19964 };
@@ -19983,9 +19968,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_triflex.c linux-2.6.32.9/drivers/ata/
19983 .inherits = &ata_bmdma_port_ops, 19968 .inherits = &ata_bmdma_port_ops,
19984 .bmdma_start = triflex_bmdma_start, 19969 .bmdma_start = triflex_bmdma_start,
19985 .bmdma_stop = triflex_bmdma_stop, 19970 .bmdma_stop = triflex_bmdma_stop,
19986diff -urNp linux-2.6.32.9/drivers/ata/pata_via.c linux-2.6.32.9/drivers/ata/pata_via.c 19971diff -urNp linux-2.6.32.10/drivers/ata/pata_via.c linux-2.6.32.10/drivers/ata/pata_via.c
19987--- linux-2.6.32.9/drivers/ata/pata_via.c 2010-02-23 10:38:51.000000000 -0500 19972--- linux-2.6.32.10/drivers/ata/pata_via.c 2010-03-15 11:52:04.000000000 -0400
19988+++ linux-2.6.32.9/drivers/ata/pata_via.c 2010-03-11 20:25:00.097395072 -0500 19973+++ linux-2.6.32.10/drivers/ata/pata_via.c 2010-03-20 15:58:47.018046884 -0400
19989@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht 19974@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
19990 ATA_BMDMA_SHT(DRV_NAME), 19975 ATA_BMDMA_SHT(DRV_NAME),
19991 }; 19976 };
@@ -20004,9 +19989,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_via.c linux-2.6.32.9/drivers/ata/pata
20004 .inherits = &via_port_ops, 19989 .inherits = &via_port_ops,
20005 .sff_data_xfer = ata_sff_data_xfer_noirq, 19990 .sff_data_xfer = ata_sff_data_xfer_noirq,
20006 }; 19991 };
20007diff -urNp linux-2.6.32.9/drivers/ata/pata_winbond.c linux-2.6.32.9/drivers/ata/pata_winbond.c 19992diff -urNp linux-2.6.32.10/drivers/ata/pata_winbond.c linux-2.6.32.10/drivers/ata/pata_winbond.c
20008--- linux-2.6.32.9/drivers/ata/pata_winbond.c 2010-02-23 10:38:51.000000000 -0500 19993--- linux-2.6.32.10/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400
20009+++ linux-2.6.32.9/drivers/ata/pata_winbond.c 2010-03-11 20:25:00.097395072 -0500 19994+++ linux-2.6.32.10/drivers/ata/pata_winbond.c 2010-03-20 15:58:47.018046884 -0400
20010@@ -125,7 +125,7 @@ static struct scsi_host_template winbond 19995@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
20011 ATA_PIO_SHT(DRV_NAME), 19996 ATA_PIO_SHT(DRV_NAME),
20012 }; 19997 };
@@ -20016,9 +20001,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pata_winbond.c linux-2.6.32.9/drivers/ata/
20016 .inherits = &ata_sff_port_ops, 20001 .inherits = &ata_sff_port_ops,
20017 .sff_data_xfer = winbond_data_xfer, 20002 .sff_data_xfer = winbond_data_xfer,
20018 .cable_detect = ata_cable_40wire, 20003 .cable_detect = ata_cable_40wire,
20019diff -urNp linux-2.6.32.9/drivers/ata/pdc_adma.c linux-2.6.32.9/drivers/ata/pdc_adma.c 20004diff -urNp linux-2.6.32.10/drivers/ata/pdc_adma.c linux-2.6.32.10/drivers/ata/pdc_adma.c
20020--- linux-2.6.32.9/drivers/ata/pdc_adma.c 2010-02-23 10:38:51.000000000 -0500 20005--- linux-2.6.32.10/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400
20021+++ linux-2.6.32.9/drivers/ata/pdc_adma.c 2010-03-11 20:25:00.097395072 -0500 20006+++ linux-2.6.32.10/drivers/ata/pdc_adma.c 2010-03-20 15:58:47.018046884 -0400
20022@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at 20007@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
20023 .dma_boundary = ADMA_DMA_BOUNDARY, 20008 .dma_boundary = ADMA_DMA_BOUNDARY,
20024 }; 20009 };
@@ -20028,9 +20013,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/pdc_adma.c linux-2.6.32.9/drivers/ata/pdc_
20028 .inherits = &ata_sff_port_ops, 20013 .inherits = &ata_sff_port_ops,
20029 20014
20030 .lost_interrupt = ATA_OP_NULL, 20015 .lost_interrupt = ATA_OP_NULL,
20031diff -urNp linux-2.6.32.9/drivers/ata/sata_fsl.c linux-2.6.32.9/drivers/ata/sata_fsl.c 20016diff -urNp linux-2.6.32.10/drivers/ata/sata_fsl.c linux-2.6.32.10/drivers/ata/sata_fsl.c
20032--- linux-2.6.32.9/drivers/ata/sata_fsl.c 2010-02-23 10:38:51.000000000 -0500 20017--- linux-2.6.32.10/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400
20033+++ linux-2.6.32.9/drivers/ata/sata_fsl.c 2010-03-11 20:25:00.097395072 -0500 20018+++ linux-2.6.32.10/drivers/ata/sata_fsl.c 2010-03-20 15:58:47.018046884 -0400
20034@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs 20019@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
20035 .dma_boundary = ATA_DMA_BOUNDARY, 20020 .dma_boundary = ATA_DMA_BOUNDARY,
20036 }; 20021 };
@@ -20040,9 +20025,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/sata_fsl.c linux-2.6.32.9/drivers/ata/sata
20040 .inherits = &sata_pmp_port_ops, 20025 .inherits = &sata_pmp_port_ops,
20041 20026
20042 .qc_defer = ata_std_qc_defer, 20027 .qc_defer = ata_std_qc_defer,
20043diff -urNp linux-2.6.32.9/drivers/ata/sata_inic162x.c linux-2.6.32.9/drivers/ata/sata_inic162x.c 20028diff -urNp linux-2.6.32.10/drivers/ata/sata_inic162x.c linux-2.6.32.10/drivers/ata/sata_inic162x.c
20044--- linux-2.6.32.9/drivers/ata/sata_inic162x.c 2010-02-23 10:38:51.000000000 -0500 20029--- linux-2.6.32.10/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400
20045+++ linux-2.6.32.9/drivers/ata/sata_inic162x.c 2010-03-11 20:25:00.101561257 -0500 20030+++ linux-2.6.32.10/drivers/ata/sata_inic162x.c 2010-03-20 15:58:47.018046884 -0400
20046@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po 20031@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
20047 return 0; 20032 return 0;
20048 } 20033 }
@@ -20052,9 +20037,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/sata_inic162x.c linux-2.6.32.9/drivers/ata
20052 .inherits = &sata_port_ops, 20037 .inherits = &sata_port_ops,
20053 20038
20054 .check_atapi_dma = inic_check_atapi_dma, 20039 .check_atapi_dma = inic_check_atapi_dma,
20055diff -urNp linux-2.6.32.9/drivers/ata/sata_mv.c linux-2.6.32.9/drivers/ata/sata_mv.c 20040diff -urNp linux-2.6.32.10/drivers/ata/sata_mv.c linux-2.6.32.10/drivers/ata/sata_mv.c
20056--- linux-2.6.32.9/drivers/ata/sata_mv.c 2010-02-23 10:38:51.000000000 -0500 20041--- linux-2.6.32.10/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400
20057+++ linux-2.6.32.9/drivers/ata/sata_mv.c 2010-03-11 20:25:00.101561257 -0500 20042+++ linux-2.6.32.10/drivers/ata/sata_mv.c 2010-03-20 15:58:47.018046884 -0400
20058@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht 20043@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
20059 .dma_boundary = MV_DMA_BOUNDARY, 20044 .dma_boundary = MV_DMA_BOUNDARY,
20060 }; 20045 };
@@ -20082,9 +20067,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/sata_mv.c linux-2.6.32.9/drivers/ata/sata_
20082 .inherits = &mv6_ops, 20067 .inherits = &mv6_ops,
20083 .dev_config = ATA_OP_NULL, 20068 .dev_config = ATA_OP_NULL,
20084 .qc_prep = mv_qc_prep_iie, 20069 .qc_prep = mv_qc_prep_iie,
20085diff -urNp linux-2.6.32.9/drivers/ata/sata_nv.c linux-2.6.32.9/drivers/ata/sata_nv.c 20070diff -urNp linux-2.6.32.10/drivers/ata/sata_nv.c linux-2.6.32.10/drivers/ata/sata_nv.c
20086--- linux-2.6.32.9/drivers/ata/sata_nv.c 2010-02-23 10:38:51.000000000 -0500 20071--- linux-2.6.32.10/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400
20087+++ linux-2.6.32.9/drivers/ata/sata_nv.c 2010-03-11 20:25:00.101561257 -0500 20072+++ linux-2.6.32.10/drivers/ata/sata_nv.c 2010-03-20 15:58:47.018046884 -0400
20088@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc 20073@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
20089 * cases. Define nv_hardreset() which only kicks in for post-boot 20074 * cases. Define nv_hardreset() which only kicks in for post-boot
20090 * probing and use it for all variants. 20075 * probing and use it for all variants.
@@ -20127,9 +20112,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/sata_nv.c linux-2.6.32.9/drivers/ata/sata_
20127 .inherits = &nv_generic_ops, 20112 .inherits = &nv_generic_ops,
20128 20113
20129 .qc_defer = ata_std_qc_defer, 20114 .qc_defer = ata_std_qc_defer,
20130diff -urNp linux-2.6.32.9/drivers/ata/sata_promise.c linux-2.6.32.9/drivers/ata/sata_promise.c 20115diff -urNp linux-2.6.32.10/drivers/ata/sata_promise.c linux-2.6.32.10/drivers/ata/sata_promise.c
20131--- linux-2.6.32.9/drivers/ata/sata_promise.c 2010-02-23 10:38:51.000000000 -0500 20116--- linux-2.6.32.10/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400
20132+++ linux-2.6.32.9/drivers/ata/sata_promise.c 2010-03-11 20:25:00.101561257 -0500 20117+++ linux-2.6.32.10/drivers/ata/sata_promise.c 2010-03-20 15:58:47.018046884 -0400
20133@@ -195,7 +195,7 @@ static const struct ata_port_operations 20118@@ -195,7 +195,7 @@ static const struct ata_port_operations
20134 .error_handler = pdc_error_handler, 20119 .error_handler = pdc_error_handler,
20135 }; 20120 };
@@ -20156,9 +20141,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/sata_promise.c linux-2.6.32.9/drivers/ata/
20156 .inherits = &pdc_common_ops, 20141 .inherits = &pdc_common_ops,
20157 .cable_detect = pdc_pata_cable_detect, 20142 .cable_detect = pdc_pata_cable_detect,
20158 .freeze = pdc_freeze, 20143 .freeze = pdc_freeze,
20159diff -urNp linux-2.6.32.9/drivers/ata/sata_qstor.c linux-2.6.32.9/drivers/ata/sata_qstor.c 20144diff -urNp linux-2.6.32.10/drivers/ata/sata_qstor.c linux-2.6.32.10/drivers/ata/sata_qstor.c
20160--- linux-2.6.32.9/drivers/ata/sata_qstor.c 2010-02-23 10:38:51.000000000 -0500 20145--- linux-2.6.32.10/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400
20161+++ linux-2.6.32.9/drivers/ata/sata_qstor.c 2010-03-11 20:25:00.101561257 -0500 20146+++ linux-2.6.32.10/drivers/ata/sata_qstor.c 2010-03-20 15:58:47.018046884 -0400
20162@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ 20147@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
20163 .dma_boundary = QS_DMA_BOUNDARY, 20148 .dma_boundary = QS_DMA_BOUNDARY,
20164 }; 20149 };
@@ -20168,9 +20153,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/sata_qstor.c linux-2.6.32.9/drivers/ata/sa
20168 .inherits = &ata_sff_port_ops, 20153 .inherits = &ata_sff_port_ops,
20169 20154
20170 .check_atapi_dma = qs_check_atapi_dma, 20155 .check_atapi_dma = qs_check_atapi_dma,
20171diff -urNp linux-2.6.32.9/drivers/ata/sata_sil24.c linux-2.6.32.9/drivers/ata/sata_sil24.c 20156diff -urNp linux-2.6.32.10/drivers/ata/sata_sil24.c linux-2.6.32.10/drivers/ata/sata_sil24.c
20172--- linux-2.6.32.9/drivers/ata/sata_sil24.c 2010-02-23 10:38:51.000000000 -0500 20157--- linux-2.6.32.10/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400
20173+++ linux-2.6.32.9/drivers/ata/sata_sil24.c 2010-03-11 20:25:00.101561257 -0500 20158+++ linux-2.6.32.10/drivers/ata/sata_sil24.c 2010-03-20 15:58:47.018046884 -0400
20174@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s 20159@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
20175 .dma_boundary = ATA_DMA_BOUNDARY, 20160 .dma_boundary = ATA_DMA_BOUNDARY,
20176 }; 20161 };
@@ -20180,9 +20165,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/sata_sil24.c linux-2.6.32.9/drivers/ata/sa
20180 .inherits = &sata_pmp_port_ops, 20165 .inherits = &sata_pmp_port_ops,
20181 20166
20182 .qc_defer = sil24_qc_defer, 20167 .qc_defer = sil24_qc_defer,
20183diff -urNp linux-2.6.32.9/drivers/ata/sata_sil.c linux-2.6.32.9/drivers/ata/sata_sil.c 20168diff -urNp linux-2.6.32.10/drivers/ata/sata_sil.c linux-2.6.32.10/drivers/ata/sata_sil.c
20184--- linux-2.6.32.9/drivers/ata/sata_sil.c 2010-02-23 10:38:51.000000000 -0500 20169--- linux-2.6.32.10/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400
20185+++ linux-2.6.32.9/drivers/ata/sata_sil.c 2010-03-11 20:25:00.101561257 -0500 20170+++ linux-2.6.32.10/drivers/ata/sata_sil.c 2010-03-20 15:58:47.018046884 -0400
20186@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht 20171@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
20187 .sg_tablesize = ATA_MAX_PRD 20172 .sg_tablesize = ATA_MAX_PRD
20188 }; 20173 };
@@ -20192,9 +20177,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/sata_sil.c linux-2.6.32.9/drivers/ata/sata
20192 .inherits = &ata_bmdma32_port_ops, 20177 .inherits = &ata_bmdma32_port_ops,
20193 .dev_config = sil_dev_config, 20178 .dev_config = sil_dev_config,
20194 .set_mode = sil_set_mode, 20179 .set_mode = sil_set_mode,
20195diff -urNp linux-2.6.32.9/drivers/ata/sata_sis.c linux-2.6.32.9/drivers/ata/sata_sis.c 20180diff -urNp linux-2.6.32.10/drivers/ata/sata_sis.c linux-2.6.32.10/drivers/ata/sata_sis.c
20196--- linux-2.6.32.9/drivers/ata/sata_sis.c 2010-02-23 10:38:51.000000000 -0500 20181--- linux-2.6.32.10/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400
20197+++ linux-2.6.32.9/drivers/ata/sata_sis.c 2010-03-11 20:25:00.101561257 -0500 20182+++ linux-2.6.32.10/drivers/ata/sata_sis.c 2010-03-20 15:58:47.018046884 -0400
20198@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht 20183@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
20199 ATA_BMDMA_SHT(DRV_NAME), 20184 ATA_BMDMA_SHT(DRV_NAME),
20200 }; 20185 };
@@ -20204,9 +20189,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/sata_sis.c linux-2.6.32.9/drivers/ata/sata
20204 .inherits = &ata_bmdma_port_ops, 20189 .inherits = &ata_bmdma_port_ops,
20205 .scr_read = sis_scr_read, 20190 .scr_read = sis_scr_read,
20206 .scr_write = sis_scr_write, 20191 .scr_write = sis_scr_write,
20207diff -urNp linux-2.6.32.9/drivers/ata/sata_svw.c linux-2.6.32.9/drivers/ata/sata_svw.c 20192diff -urNp linux-2.6.32.10/drivers/ata/sata_svw.c linux-2.6.32.10/drivers/ata/sata_svw.c
20208--- linux-2.6.32.9/drivers/ata/sata_svw.c 2010-02-23 10:38:51.000000000 -0500 20193--- linux-2.6.32.10/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400
20209+++ linux-2.6.32.9/drivers/ata/sata_svw.c 2010-03-11 20:25:00.101561257 -0500 20194+++ linux-2.6.32.10/drivers/ata/sata_svw.c 2010-03-20 15:58:47.022039994 -0400
20210@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata 20195@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
20211 }; 20196 };
20212 20197
@@ -20216,9 +20201,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/sata_svw.c linux-2.6.32.9/drivers/ata/sata
20216 .inherits = &ata_bmdma_port_ops, 20201 .inherits = &ata_bmdma_port_ops,
20217 .sff_tf_load = k2_sata_tf_load, 20202 .sff_tf_load = k2_sata_tf_load,
20218 .sff_tf_read = k2_sata_tf_read, 20203 .sff_tf_read = k2_sata_tf_read,
20219diff -urNp linux-2.6.32.9/drivers/ata/sata_sx4.c linux-2.6.32.9/drivers/ata/sata_sx4.c 20204diff -urNp linux-2.6.32.10/drivers/ata/sata_sx4.c linux-2.6.32.10/drivers/ata/sata_sx4.c
20220--- linux-2.6.32.9/drivers/ata/sata_sx4.c 2010-02-23 10:38:51.000000000 -0500 20205--- linux-2.6.32.10/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400
20221+++ linux-2.6.32.9/drivers/ata/sata_sx4.c 2010-03-11 20:25:00.101561257 -0500 20206+++ linux-2.6.32.10/drivers/ata/sata_sx4.c 2010-03-20 15:58:47.022039994 -0400
20222@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat 20207@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
20223 }; 20208 };
20224 20209
@@ -20228,9 +20213,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/sata_sx4.c linux-2.6.32.9/drivers/ata/sata
20228 .inherits = &ata_sff_port_ops, 20213 .inherits = &ata_sff_port_ops,
20229 20214
20230 .check_atapi_dma = pdc_check_atapi_dma, 20215 .check_atapi_dma = pdc_check_atapi_dma,
20231diff -urNp linux-2.6.32.9/drivers/ata/sata_uli.c linux-2.6.32.9/drivers/ata/sata_uli.c 20216diff -urNp linux-2.6.32.10/drivers/ata/sata_uli.c linux-2.6.32.10/drivers/ata/sata_uli.c
20232--- linux-2.6.32.9/drivers/ata/sata_uli.c 2010-02-23 10:38:51.000000000 -0500 20217--- linux-2.6.32.10/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400
20233+++ linux-2.6.32.9/drivers/ata/sata_uli.c 2010-03-11 20:25:00.101561257 -0500 20218+++ linux-2.6.32.10/drivers/ata/sata_uli.c 2010-03-20 15:58:47.022039994 -0400
20234@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht 20219@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
20235 ATA_BMDMA_SHT(DRV_NAME), 20220 ATA_BMDMA_SHT(DRV_NAME),
20236 }; 20221 };
@@ -20240,9 +20225,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/sata_uli.c linux-2.6.32.9/drivers/ata/sata
20240 .inherits = &ata_bmdma_port_ops, 20225 .inherits = &ata_bmdma_port_ops,
20241 .scr_read = uli_scr_read, 20226 .scr_read = uli_scr_read,
20242 .scr_write = uli_scr_write, 20227 .scr_write = uli_scr_write,
20243diff -urNp linux-2.6.32.9/drivers/ata/sata_via.c linux-2.6.32.9/drivers/ata/sata_via.c 20228diff -urNp linux-2.6.32.10/drivers/ata/sata_via.c linux-2.6.32.10/drivers/ata/sata_via.c
20244--- linux-2.6.32.9/drivers/ata/sata_via.c 2010-02-23 10:38:51.000000000 -0500 20229--- linux-2.6.32.10/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400
20245+++ linux-2.6.32.9/drivers/ata/sata_via.c 2010-03-11 20:25:00.101561257 -0500 20230+++ linux-2.6.32.10/drivers/ata/sata_via.c 2010-03-20 15:58:47.022039994 -0400
20246@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh 20231@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
20247 ATA_BMDMA_SHT(DRV_NAME), 20232 ATA_BMDMA_SHT(DRV_NAME),
20248 }; 20233 };
@@ -20280,9 +20265,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/sata_via.c linux-2.6.32.9/drivers/ata/sata
20280 .inherits = &svia_base_ops, 20265 .inherits = &svia_base_ops,
20281 .hardreset = sata_std_hardreset, 20266 .hardreset = sata_std_hardreset,
20282 .scr_read = vt8251_scr_read, 20267 .scr_read = vt8251_scr_read,
20283diff -urNp linux-2.6.32.9/drivers/ata/sata_vsc.c linux-2.6.32.9/drivers/ata/sata_vsc.c 20268diff -urNp linux-2.6.32.10/drivers/ata/sata_vsc.c linux-2.6.32.10/drivers/ata/sata_vsc.c
20284--- linux-2.6.32.9/drivers/ata/sata_vsc.c 2010-02-23 10:38:51.000000000 -0500 20269--- linux-2.6.32.10/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400
20285+++ linux-2.6.32.9/drivers/ata/sata_vsc.c 2010-03-11 20:25:00.101561257 -0500 20270+++ linux-2.6.32.10/drivers/ata/sata_vsc.c 2010-03-20 15:58:47.022039994 -0400
20286@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat 20271@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
20287 }; 20272 };
20288 20273
@@ -20292,9 +20277,9 @@ diff -urNp linux-2.6.32.9/drivers/ata/sata_vsc.c linux-2.6.32.9/drivers/ata/sata
20292 .inherits = &ata_bmdma_port_ops, 20277 .inherits = &ata_bmdma_port_ops,
20293 /* The IRQ handling is not quite standard SFF behaviour so we 20278 /* The IRQ handling is not quite standard SFF behaviour so we
20294 cannot use the default lost interrupt handler */ 20279 cannot use the default lost interrupt handler */
20295diff -urNp linux-2.6.32.9/drivers/atm/adummy.c linux-2.6.32.9/drivers/atm/adummy.c 20280diff -urNp linux-2.6.32.10/drivers/atm/adummy.c linux-2.6.32.10/drivers/atm/adummy.c
20296--- linux-2.6.32.9/drivers/atm/adummy.c 2010-02-23 10:38:51.000000000 -0500 20281--- linux-2.6.32.10/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400
20297+++ linux-2.6.32.9/drivers/atm/adummy.c 2010-03-11 20:25:00.101561257 -0500 20282+++ linux-2.6.32.10/drivers/atm/adummy.c 2010-03-20 15:58:47.022039994 -0400
20298@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct 20283@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
20299 vcc->pop(vcc, skb); 20284 vcc->pop(vcc, skb);
20300 else 20285 else
@@ -20304,9 +20289,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/adummy.c linux-2.6.32.9/drivers/atm/adummy
20304 20289
20305 return 0; 20290 return 0;
20306 } 20291 }
20307diff -urNp linux-2.6.32.9/drivers/atm/ambassador.c linux-2.6.32.9/drivers/atm/ambassador.c 20292diff -urNp linux-2.6.32.10/drivers/atm/ambassador.c linux-2.6.32.10/drivers/atm/ambassador.c
20308--- linux-2.6.32.9/drivers/atm/ambassador.c 2010-02-23 10:38:51.000000000 -0500 20293--- linux-2.6.32.10/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400
20309+++ linux-2.6.32.9/drivers/atm/ambassador.c 2010-03-11 20:25:00.105493868 -0500 20294+++ linux-2.6.32.10/drivers/atm/ambassador.c 2010-03-20 15:58:47.022039994 -0400
20310@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, 20295@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
20311 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); 20296 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
20312 20297
@@ -20343,9 +20328,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/ambassador.c linux-2.6.32.9/drivers/atm/am
20343 return -ENOMEM; // ? 20328 return -ENOMEM; // ?
20344 } 20329 }
20345 20330
20346diff -urNp linux-2.6.32.9/drivers/atm/atmtcp.c linux-2.6.32.9/drivers/atm/atmtcp.c 20331diff -urNp linux-2.6.32.10/drivers/atm/atmtcp.c linux-2.6.32.10/drivers/atm/atmtcp.c
20347--- linux-2.6.32.9/drivers/atm/atmtcp.c 2010-02-23 10:38:51.000000000 -0500 20332--- linux-2.6.32.10/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400
20348+++ linux-2.6.32.9/drivers/atm/atmtcp.c 2010-03-11 20:25:00.105493868 -0500 20333+++ linux-2.6.32.10/drivers/atm/atmtcp.c 2010-03-20 15:58:47.022039994 -0400
20349@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc 20334@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc
20350 if (vcc->pop) vcc->pop(vcc,skb); 20335 if (vcc->pop) vcc->pop(vcc,skb);
20351 else dev_kfree_skb(skb); 20336 else dev_kfree_skb(skb);
@@ -20395,9 +20380,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/atmtcp.c linux-2.6.32.9/drivers/atm/atmtcp
20395 done: 20380 done:
20396 if (vcc->pop) vcc->pop(vcc,skb); 20381 if (vcc->pop) vcc->pop(vcc,skb);
20397 else dev_kfree_skb(skb); 20382 else dev_kfree_skb(skb);
20398diff -urNp linux-2.6.32.9/drivers/atm/eni.c linux-2.6.32.9/drivers/atm/eni.c 20383diff -urNp linux-2.6.32.10/drivers/atm/eni.c linux-2.6.32.10/drivers/atm/eni.c
20399--- linux-2.6.32.9/drivers/atm/eni.c 2010-02-23 10:38:51.000000000 -0500 20384--- linux-2.6.32.10/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400
20400+++ linux-2.6.32.9/drivers/atm/eni.c 2010-03-11 20:25:00.105493868 -0500 20385+++ linux-2.6.32.10/drivers/atm/eni.c 2010-03-20 15:58:47.022039994 -0400
20401@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) 20386@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
20402 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", 20387 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
20403 vcc->dev->number); 20388 vcc->dev->number);
@@ -20443,9 +20428,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/eni.c linux-2.6.32.9/drivers/atm/eni.c
20443 wake_up(&eni_dev->tx_wait); 20428 wake_up(&eni_dev->tx_wait);
20444 dma_complete++; 20429 dma_complete++;
20445 } 20430 }
20446diff -urNp linux-2.6.32.9/drivers/atm/firestream.c linux-2.6.32.9/drivers/atm/firestream.c 20431diff -urNp linux-2.6.32.10/drivers/atm/firestream.c linux-2.6.32.10/drivers/atm/firestream.c
20447--- linux-2.6.32.9/drivers/atm/firestream.c 2010-02-23 10:38:51.000000000 -0500 20432--- linux-2.6.32.10/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400
20448+++ linux-2.6.32.9/drivers/atm/firestream.c 2010-03-11 20:25:00.105493868 -0500 20433+++ linux-2.6.32.10/drivers/atm/firestream.c 2010-03-20 15:58:47.022039994 -0400
20449@@ -748,7 +748,7 @@ static void process_txdone_queue (struct 20434@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
20450 } 20435 }
20451 } 20436 }
@@ -20479,9 +20464,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/firestream.c linux-2.6.32.9/drivers/atm/fi
20479 break; 20464 break;
20480 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ 20465 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
20481 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 20466 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
20482diff -urNp linux-2.6.32.9/drivers/atm/fore200e.c linux-2.6.32.9/drivers/atm/fore200e.c 20467diff -urNp linux-2.6.32.10/drivers/atm/fore200e.c linux-2.6.32.10/drivers/atm/fore200e.c
20483--- linux-2.6.32.9/drivers/atm/fore200e.c 2010-02-23 10:38:51.000000000 -0500 20468--- linux-2.6.32.10/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400
20484+++ linux-2.6.32.9/drivers/atm/fore200e.c 2010-03-11 20:25:00.105493868 -0500 20469+++ linux-2.6.32.10/drivers/atm/fore200e.c 2010-03-20 15:58:47.022039994 -0400
20485@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 20470@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
20486 #endif 20471 #endif
20487 /* check error condition */ 20472 /* check error condition */
@@ -20538,9 +20523,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/fore200e.c linux-2.6.32.9/drivers/atm/fore
20538 20523
20539 fore200e->tx_sat++; 20524 fore200e->tx_sat++;
20540 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", 20525 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
20541diff -urNp linux-2.6.32.9/drivers/atm/he.c linux-2.6.32.9/drivers/atm/he.c 20526diff -urNp linux-2.6.32.10/drivers/atm/he.c linux-2.6.32.10/drivers/atm/he.c
20542--- linux-2.6.32.9/drivers/atm/he.c 2010-02-23 10:38:51.000000000 -0500 20527--- linux-2.6.32.10/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400
20543+++ linux-2.6.32.9/drivers/atm/he.c 2010-03-11 20:25:00.105493868 -0500 20528+++ linux-2.6.32.10/drivers/atm/he.c 2010-03-20 15:58:47.022039994 -0400
20544@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i 20529@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
20545 20530
20546 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { 20531 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -20622,9 +20607,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/he.c linux-2.6.32.9/drivers/atm/he.c
20622 20607
20623 return 0; 20608 return 0;
20624 } 20609 }
20625diff -urNp linux-2.6.32.9/drivers/atm/horizon.c linux-2.6.32.9/drivers/atm/horizon.c 20610diff -urNp linux-2.6.32.10/drivers/atm/horizon.c linux-2.6.32.10/drivers/atm/horizon.c
20626--- linux-2.6.32.9/drivers/atm/horizon.c 2010-02-23 10:38:51.000000000 -0500 20611--- linux-2.6.32.10/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400
20627+++ linux-2.6.32.9/drivers/atm/horizon.c 2010-03-11 20:25:00.105493868 -0500 20612+++ linux-2.6.32.10/drivers/atm/horizon.c 2010-03-20 15:58:47.026036446 -0400
20628@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, 20613@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
20629 { 20614 {
20630 struct atm_vcc * vcc = ATM_SKB(skb)->vcc; 20615 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -20643,9 +20628,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/horizon.c linux-2.6.32.9/drivers/atm/horiz
20643 20628
20644 // free the skb 20629 // free the skb
20645 hrz_kfree_skb (skb); 20630 hrz_kfree_skb (skb);
20646diff -urNp linux-2.6.32.9/drivers/atm/idt77252.c linux-2.6.32.9/drivers/atm/idt77252.c 20631diff -urNp linux-2.6.32.10/drivers/atm/idt77252.c linux-2.6.32.10/drivers/atm/idt77252.c
20647--- linux-2.6.32.9/drivers/atm/idt77252.c 2010-02-23 10:38:51.000000000 -0500 20632--- linux-2.6.32.10/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400
20648+++ linux-2.6.32.9/drivers/atm/idt77252.c 2010-03-11 20:25:00.105493868 -0500 20633+++ linux-2.6.32.10/drivers/atm/idt77252.c 2010-03-20 15:58:47.026036446 -0400
20649@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str 20634@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
20650 else 20635 else
20651 dev_kfree_skb(skb); 20636 dev_kfree_skb(skb);
@@ -20800,9 +20785,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/idt77252.c linux-2.6.32.9/drivers/atm/idt7
20800 return -ENOMEM; 20785 return -ENOMEM;
20801 } 20786 }
20802 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); 20787 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
20803diff -urNp linux-2.6.32.9/drivers/atm/iphase.c linux-2.6.32.9/drivers/atm/iphase.c 20788diff -urNp linux-2.6.32.10/drivers/atm/iphase.c linux-2.6.32.10/drivers/atm/iphase.c
20804--- linux-2.6.32.9/drivers/atm/iphase.c 2010-02-23 10:38:51.000000000 -0500 20789--- linux-2.6.32.10/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400
20805+++ linux-2.6.32.9/drivers/atm/iphase.c 2010-03-11 20:25:00.109629334 -0500 20790+++ linux-2.6.32.10/drivers/atm/iphase.c 2010-03-20 15:58:47.026036446 -0400
20806@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) 20791@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)
20807 status = (u_short) (buf_desc_ptr->desc_mode); 20792 status = (u_short) (buf_desc_ptr->desc_mode);
20808 if (status & (RX_CER | RX_PTE | RX_OFL)) 20793 if (status & (RX_CER | RX_PTE | RX_OFL))
@@ -20899,9 +20884,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/iphase.c linux-2.6.32.9/drivers/atm/iphase
20899 if (iavcc->vc_desc_cnt > 10) { 20884 if (iavcc->vc_desc_cnt > 10) {
20900 vcc->tx_quota = vcc->tx_quota * 3 / 4; 20885 vcc->tx_quota = vcc->tx_quota * 3 / 4;
20901 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); 20886 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
20902diff -urNp linux-2.6.32.9/drivers/atm/lanai.c linux-2.6.32.9/drivers/atm/lanai.c 20887diff -urNp linux-2.6.32.10/drivers/atm/lanai.c linux-2.6.32.10/drivers/atm/lanai.c
20903--- linux-2.6.32.9/drivers/atm/lanai.c 2010-02-23 10:38:51.000000000 -0500 20888--- linux-2.6.32.10/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400
20904+++ linux-2.6.32.9/drivers/atm/lanai.c 2010-03-11 20:25:00.109629334 -0500 20889+++ linux-2.6.32.10/drivers/atm/lanai.c 2010-03-20 15:58:47.026036446 -0400
20905@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l 20890@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
20906 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); 20891 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
20907 lanai_endtx(lanai, lvcc); 20892 lanai_endtx(lanai, lvcc);
@@ -20956,9 +20941,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/lanai.c linux-2.6.32.9/drivers/atm/lanai.c
20956 lvcc->stats.x.aal5.service_rxcrc++; 20941 lvcc->stats.x.aal5.service_rxcrc++;
20957 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; 20942 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
20958 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); 20943 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
20959diff -urNp linux-2.6.32.9/drivers/atm/nicstar.c linux-2.6.32.9/drivers/atm/nicstar.c 20944diff -urNp linux-2.6.32.10/drivers/atm/nicstar.c linux-2.6.32.10/drivers/atm/nicstar.c
20960--- linux-2.6.32.9/drivers/atm/nicstar.c 2010-02-23 10:38:51.000000000 -0500 20945--- linux-2.6.32.10/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400
20961+++ linux-2.6.32.9/drivers/atm/nicstar.c 2010-03-11 20:25:00.109629334 -0500 20946+++ linux-2.6.32.10/drivers/atm/nicstar.c 2010-03-20 15:58:47.026036446 -0400
20962@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, 20947@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
20963 if ((vc = (vc_map *) vcc->dev_data) == NULL) 20948 if ((vc = (vc_map *) vcc->dev_data) == NULL)
20964 { 20949 {
@@ -21161,9 +21146,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/nicstar.c linux-2.6.32.9/drivers/atm/nicst
21161 } 21146 }
21162 } 21147 }
21163 21148
21164diff -urNp linux-2.6.32.9/drivers/atm/solos-pci.c linux-2.6.32.9/drivers/atm/solos-pci.c 21149diff -urNp linux-2.6.32.10/drivers/atm/solos-pci.c linux-2.6.32.10/drivers/atm/solos-pci.c
21165--- linux-2.6.32.9/drivers/atm/solos-pci.c 2010-02-23 10:38:51.000000000 -0500 21150--- linux-2.6.32.10/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400
21166+++ linux-2.6.32.9/drivers/atm/solos-pci.c 2010-03-11 20:25:00.109629334 -0500 21151+++ linux-2.6.32.10/drivers/atm/solos-pci.c 2010-03-20 15:58:47.026036446 -0400
21167@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) 21152@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
21168 } 21153 }
21169 atm_charge(vcc, skb->truesize); 21154 atm_charge(vcc, skb->truesize);
@@ -21182,9 +21167,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/solos-pci.c linux-2.6.32.9/drivers/atm/sol
21182 solos_pop(vcc, oldskb); 21167 solos_pop(vcc, oldskb);
21183 } else 21168 } else
21184 dev_kfree_skb_irq(oldskb); 21169 dev_kfree_skb_irq(oldskb);
21185diff -urNp linux-2.6.32.9/drivers/atm/suni.c linux-2.6.32.9/drivers/atm/suni.c 21170diff -urNp linux-2.6.32.10/drivers/atm/suni.c linux-2.6.32.10/drivers/atm/suni.c
21186--- linux-2.6.32.9/drivers/atm/suni.c 2010-02-23 10:38:51.000000000 -0500 21171--- linux-2.6.32.10/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400
21187+++ linux-2.6.32.9/drivers/atm/suni.c 2010-03-11 20:25:00.109629334 -0500 21172+++ linux-2.6.32.10/drivers/atm/suni.c 2010-03-20 15:58:47.026036446 -0400
21188@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); 21173@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
21189 21174
21190 21175
@@ -21196,9 +21181,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/suni.c linux-2.6.32.9/drivers/atm/suni.c
21196 21181
21197 21182
21198 static void suni_hz(unsigned long from_timer) 21183 static void suni_hz(unsigned long from_timer)
21199diff -urNp linux-2.6.32.9/drivers/atm/uPD98402.c linux-2.6.32.9/drivers/atm/uPD98402.c 21184diff -urNp linux-2.6.32.10/drivers/atm/uPD98402.c linux-2.6.32.10/drivers/atm/uPD98402.c
21200--- linux-2.6.32.9/drivers/atm/uPD98402.c 2010-02-23 10:38:51.000000000 -0500 21185--- linux-2.6.32.10/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400
21201+++ linux-2.6.32.9/drivers/atm/uPD98402.c 2010-03-11 20:25:00.109629334 -0500 21186+++ linux-2.6.32.10/drivers/atm/uPD98402.c 2010-03-20 15:58:47.026036446 -0400
21202@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d 21187@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
21203 struct sonet_stats tmp; 21188 struct sonet_stats tmp;
21204 int error = 0; 21189 int error = 0;
@@ -21243,9 +21228,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/uPD98402.c linux-2.6.32.9/drivers/atm/uPD9
21243 return 0; 21228 return 0;
21244 } 21229 }
21245 21230
21246diff -urNp linux-2.6.32.9/drivers/atm/zatm.c linux-2.6.32.9/drivers/atm/zatm.c 21231diff -urNp linux-2.6.32.10/drivers/atm/zatm.c linux-2.6.32.10/drivers/atm/zatm.c
21247--- linux-2.6.32.9/drivers/atm/zatm.c 2010-02-23 10:38:51.000000000 -0500 21232--- linux-2.6.32.10/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400
21248+++ linux-2.6.32.9/drivers/atm/zatm.c 2010-03-11 20:25:00.109629334 -0500 21233+++ linux-2.6.32.10/drivers/atm/zatm.c 2010-03-20 15:58:47.030038477 -0400
21249@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy 21234@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
21250 } 21235 }
21251 if (!size) { 21236 if (!size) {
@@ -21273,9 +21258,9 @@ diff -urNp linux-2.6.32.9/drivers/atm/zatm.c linux-2.6.32.9/drivers/atm/zatm.c
21273 wake_up(&zatm_vcc->tx_wait); 21258 wake_up(&zatm_vcc->tx_wait);
21274 } 21259 }
21275 21260
21276diff -urNp linux-2.6.32.9/drivers/base/bus.c linux-2.6.32.9/drivers/base/bus.c 21261diff -urNp linux-2.6.32.10/drivers/base/bus.c linux-2.6.32.10/drivers/base/bus.c
21277--- linux-2.6.32.9/drivers/base/bus.c 2010-02-23 10:38:51.000000000 -0500 21262--- linux-2.6.32.10/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400
21278+++ linux-2.6.32.9/drivers/base/bus.c 2010-03-11 20:25:00.109629334 -0500 21263+++ linux-2.6.32.10/drivers/base/bus.c 2010-03-20 15:58:47.030038477 -0400
21279@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob 21264@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
21280 return ret; 21265 return ret;
21281 } 21266 }
@@ -21303,9 +21288,9 @@ diff -urNp linux-2.6.32.9/drivers/base/bus.c linux-2.6.32.9/drivers/base/bus.c
21303 .filter = bus_uevent_filter, 21288 .filter = bus_uevent_filter,
21304 }; 21289 };
21305 21290
21306diff -urNp linux-2.6.32.9/drivers/base/class.c linux-2.6.32.9/drivers/base/class.c 21291diff -urNp linux-2.6.32.10/drivers/base/class.c linux-2.6.32.10/drivers/base/class.c
21307--- linux-2.6.32.9/drivers/base/class.c 2010-02-23 10:38:51.000000000 -0500 21292--- linux-2.6.32.10/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400
21308+++ linux-2.6.32.9/drivers/base/class.c 2010-03-11 20:25:00.109629334 -0500 21293+++ linux-2.6.32.10/drivers/base/class.c 2010-03-20 15:58:47.030038477 -0400
21309@@ -63,7 +63,7 @@ static void class_release(struct kobject 21294@@ -63,7 +63,7 @@ static void class_release(struct kobject
21310 kfree(cp); 21295 kfree(cp);
21311 } 21296 }
@@ -21315,9 +21300,9 @@ diff -urNp linux-2.6.32.9/drivers/base/class.c linux-2.6.32.9/drivers/base/class
21315 .show = class_attr_show, 21300 .show = class_attr_show,
21316 .store = class_attr_store, 21301 .store = class_attr_store,
21317 }; 21302 };
21318diff -urNp linux-2.6.32.9/drivers/base/core.c linux-2.6.32.9/drivers/base/core.c 21303diff -urNp linux-2.6.32.10/drivers/base/core.c linux-2.6.32.10/drivers/base/core.c
21319--- linux-2.6.32.9/drivers/base/core.c 2010-02-23 10:38:51.000000000 -0500 21304--- linux-2.6.32.10/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400
21320+++ linux-2.6.32.9/drivers/base/core.c 2010-03-11 20:25:00.109629334 -0500 21305+++ linux-2.6.32.10/drivers/base/core.c 2010-03-20 15:58:47.030038477 -0400
21321@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob 21306@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
21322 return ret; 21307 return ret;
21323 } 21308 }
@@ -21336,9 +21321,9 @@ diff -urNp linux-2.6.32.9/drivers/base/core.c linux-2.6.32.9/drivers/base/core.c
21336 .filter = dev_uevent_filter, 21321 .filter = dev_uevent_filter,
21337 .name = dev_uevent_name, 21322 .name = dev_uevent_name,
21338 .uevent = dev_uevent, 21323 .uevent = dev_uevent,
21339diff -urNp linux-2.6.32.9/drivers/base/memory.c linux-2.6.32.9/drivers/base/memory.c 21324diff -urNp linux-2.6.32.10/drivers/base/memory.c linux-2.6.32.10/drivers/base/memory.c
21340--- linux-2.6.32.9/drivers/base/memory.c 2010-02-23 10:38:51.000000000 -0500 21325--- linux-2.6.32.10/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400
21341+++ linux-2.6.32.9/drivers/base/memory.c 2010-03-11 20:25:00.109629334 -0500 21326+++ linux-2.6.32.10/drivers/base/memory.c 2010-03-20 15:58:47.030038477 -0400
21342@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks 21327@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
21343 return retval; 21328 return retval;
21344 } 21329 }
@@ -21348,9 +21333,9 @@ diff -urNp linux-2.6.32.9/drivers/base/memory.c linux-2.6.32.9/drivers/base/memo
21348 .name = memory_uevent_name, 21333 .name = memory_uevent_name,
21349 .uevent = memory_uevent, 21334 .uevent = memory_uevent,
21350 }; 21335 };
21351diff -urNp linux-2.6.32.9/drivers/base/sys.c linux-2.6.32.9/drivers/base/sys.c 21336diff -urNp linux-2.6.32.10/drivers/base/sys.c linux-2.6.32.10/drivers/base/sys.c
21352--- linux-2.6.32.9/drivers/base/sys.c 2010-02-23 10:38:51.000000000 -0500 21337--- linux-2.6.32.10/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400
21353+++ linux-2.6.32.9/drivers/base/sys.c 2010-03-11 20:25:00.109629334 -0500 21338+++ linux-2.6.32.10/drivers/base/sys.c 2010-03-20 15:58:47.030038477 -0400
21354@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc 21339@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
21355 return -EIO; 21340 return -EIO;
21356 } 21341 }
@@ -21369,9 +21354,9 @@ diff -urNp linux-2.6.32.9/drivers/base/sys.c linux-2.6.32.9/drivers/base/sys.c
21369 .show = sysdev_class_show, 21354 .show = sysdev_class_show,
21370 .store = sysdev_class_store, 21355 .store = sysdev_class_store,
21371 }; 21356 };
21372diff -urNp linux-2.6.32.9/drivers/block/pktcdvd.c linux-2.6.32.9/drivers/block/pktcdvd.c 21357diff -urNp linux-2.6.32.10/drivers/block/pktcdvd.c linux-2.6.32.10/drivers/block/pktcdvd.c
21373--- linux-2.6.32.9/drivers/block/pktcdvd.c 2010-02-23 10:38:51.000000000 -0500 21358--- linux-2.6.32.10/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400
21374+++ linux-2.6.32.9/drivers/block/pktcdvd.c 2010-03-11 20:25:00.113318832 -0500 21359+++ linux-2.6.32.10/drivers/block/pktcdvd.c 2010-03-20 15:58:47.030038477 -0400
21375@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob 21360@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
21376 return len; 21361 return len;
21377 } 21362 }
@@ -21381,9 +21366,9 @@ diff -urNp linux-2.6.32.9/drivers/block/pktcdvd.c linux-2.6.32.9/drivers/block/p
21381 .show = kobj_pkt_show, 21366 .show = kobj_pkt_show,
21382 .store = kobj_pkt_store 21367 .store = kobj_pkt_store
21383 }; 21368 };
21384diff -urNp linux-2.6.32.9/drivers/char/agp/frontend.c linux-2.6.32.9/drivers/char/agp/frontend.c 21369diff -urNp linux-2.6.32.10/drivers/char/agp/frontend.c linux-2.6.32.10/drivers/char/agp/frontend.c
21385--- linux-2.6.32.9/drivers/char/agp/frontend.c 2010-02-23 10:38:51.000000000 -0500 21370--- linux-2.6.32.10/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400
21386+++ linux-2.6.32.9/drivers/char/agp/frontend.c 2010-03-11 20:25:00.113318832 -0500 21371+++ linux-2.6.32.10/drivers/char/agp/frontend.c 2010-03-20 15:58:47.030038477 -0400
21387@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag 21372@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
21388 if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) 21373 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
21389 return -EFAULT; 21374 return -EFAULT;
@@ -21393,9 +21378,9 @@ diff -urNp linux-2.6.32.9/drivers/char/agp/frontend.c linux-2.6.32.9/drivers/cha
21393 return -EFAULT; 21378 return -EFAULT;
21394 21379
21395 client = agp_find_client_by_pid(reserve.pid); 21380 client = agp_find_client_by_pid(reserve.pid);
21396diff -urNp linux-2.6.32.9/drivers/char/agp/intel-agp.c linux-2.6.32.9/drivers/char/agp/intel-agp.c 21381diff -urNp linux-2.6.32.10/drivers/char/agp/intel-agp.c linux-2.6.32.10/drivers/char/agp/intel-agp.c
21397--- linux-2.6.32.9/drivers/char/agp/intel-agp.c 2010-02-23 10:38:51.000000000 -0500 21382--- linux-2.6.32.10/drivers/char/agp/intel-agp.c 2010-03-15 11:52:04.000000000 -0400
21398+++ linux-2.6.32.9/drivers/char/agp/intel-agp.c 2010-03-11 20:25:00.113318832 -0500 21383+++ linux-2.6.32.10/drivers/char/agp/intel-agp.c 2010-03-20 15:58:47.045148884 -0400
21399@@ -2571,7 +2571,7 @@ static struct pci_device_id agp_intel_pc 21384@@ -2571,7 +2571,7 @@ static struct pci_device_id agp_intel_pc
21400 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), 21385 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
21401 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), 21386 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
@@ -21405,9 +21390,9 @@ diff -urNp linux-2.6.32.9/drivers/char/agp/intel-agp.c linux-2.6.32.9/drivers/ch
21405 }; 21390 };
21406 21391
21407 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); 21392 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
21408diff -urNp linux-2.6.32.9/drivers/char/hpet.c linux-2.6.32.9/drivers/char/hpet.c 21393diff -urNp linux-2.6.32.10/drivers/char/hpet.c linux-2.6.32.10/drivers/char/hpet.c
21409--- linux-2.6.32.9/drivers/char/hpet.c 2010-02-23 10:38:51.000000000 -0500 21394--- linux-2.6.32.10/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400
21410+++ linux-2.6.32.9/drivers/char/hpet.c 2010-03-11 20:25:00.113318832 -0500 21395+++ linux-2.6.32.10/drivers/char/hpet.c 2010-03-20 15:58:47.045148884 -0400
21411@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv 21396@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv
21412 }, 21397 },
21413 }; 21398 };
@@ -21417,9 +21402,9 @@ diff -urNp linux-2.6.32.9/drivers/char/hpet.c linux-2.6.32.9/drivers/char/hpet.c
21417 21402
21418 static int __init hpet_init(void) 21403 static int __init hpet_init(void)
21419 { 21404 {
21420diff -urNp linux-2.6.32.9/drivers/char/hvc_beat.c linux-2.6.32.9/drivers/char/hvc_beat.c 21405diff -urNp linux-2.6.32.10/drivers/char/hvc_beat.c linux-2.6.32.10/drivers/char/hvc_beat.c
21421--- linux-2.6.32.9/drivers/char/hvc_beat.c 2010-02-23 10:38:51.000000000 -0500 21406--- linux-2.6.32.10/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400
21422+++ linux-2.6.32.9/drivers/char/hvc_beat.c 2010-03-11 20:25:00.113318832 -0500 21407+++ linux-2.6.32.10/drivers/char/hvc_beat.c 2010-03-20 15:58:47.045148884 -0400
21423@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v 21408@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
21424 return cnt; 21409 return cnt;
21425 } 21410 }
@@ -21429,9 +21414,9 @@ diff -urNp linux-2.6.32.9/drivers/char/hvc_beat.c linux-2.6.32.9/drivers/char/hv
21429 .get_chars = hvc_beat_get_chars, 21414 .get_chars = hvc_beat_get_chars,
21430 .put_chars = hvc_beat_put_chars, 21415 .put_chars = hvc_beat_put_chars,
21431 }; 21416 };
21432diff -urNp linux-2.6.32.9/drivers/char/hvc_console.c linux-2.6.32.9/drivers/char/hvc_console.c 21417diff -urNp linux-2.6.32.10/drivers/char/hvc_console.c linux-2.6.32.10/drivers/char/hvc_console.c
21433--- linux-2.6.32.9/drivers/char/hvc_console.c 2010-02-23 10:38:51.000000000 -0500 21418--- linux-2.6.32.10/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400
21434+++ linux-2.6.32.9/drivers/char/hvc_console.c 2010-03-11 20:25:00.113318832 -0500 21419+++ linux-2.6.32.10/drivers/char/hvc_console.c 2010-03-20 15:58:47.045148884 -0400
21435@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind 21420@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
21436 * console interfaces but can still be used as a tty device. This has to be 21421 * console interfaces but can still be used as a tty device. This has to be
21437 * static because kmalloc will not work during early console init. 21422 * static because kmalloc will not work during early console init.
@@ -21459,9 +21444,9 @@ diff -urNp linux-2.6.32.9/drivers/char/hvc_console.c linux-2.6.32.9/drivers/char
21459 { 21444 {
21460 struct hvc_struct *hp; 21445 struct hvc_struct *hp;
21461 int i; 21446 int i;
21462diff -urNp linux-2.6.32.9/drivers/char/hvc_console.h linux-2.6.32.9/drivers/char/hvc_console.h 21447diff -urNp linux-2.6.32.10/drivers/char/hvc_console.h linux-2.6.32.10/drivers/char/hvc_console.h
21463--- linux-2.6.32.9/drivers/char/hvc_console.h 2010-02-23 10:38:51.000000000 -0500 21448--- linux-2.6.32.10/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400
21464+++ linux-2.6.32.9/drivers/char/hvc_console.h 2010-03-11 20:25:00.113318832 -0500 21449+++ linux-2.6.32.10/drivers/char/hvc_console.h 2010-03-20 15:58:47.045148884 -0400
21465@@ -55,7 +55,7 @@ struct hvc_struct { 21450@@ -55,7 +55,7 @@ struct hvc_struct {
21466 int outbuf_size; 21451 int outbuf_size;
21467 int n_outbuf; 21452 int n_outbuf;
@@ -21485,9 +21470,9 @@ diff -urNp linux-2.6.32.9/drivers/char/hvc_console.h linux-2.6.32.9/drivers/char
21485 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ 21470 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
21486 extern int hvc_remove(struct hvc_struct *hp); 21471 extern int hvc_remove(struct hvc_struct *hp);
21487 21472
21488diff -urNp linux-2.6.32.9/drivers/char/hvc_iseries.c linux-2.6.32.9/drivers/char/hvc_iseries.c 21473diff -urNp linux-2.6.32.10/drivers/char/hvc_iseries.c linux-2.6.32.10/drivers/char/hvc_iseries.c
21489--- linux-2.6.32.9/drivers/char/hvc_iseries.c 2010-02-23 10:38:51.000000000 -0500 21474--- linux-2.6.32.10/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400
21490+++ linux-2.6.32.9/drivers/char/hvc_iseries.c 2010-03-11 20:25:00.113318832 -0500 21475+++ linux-2.6.32.10/drivers/char/hvc_iseries.c 2010-03-20 15:58:47.045148884 -0400
21491@@ -197,7 +197,7 @@ done: 21476@@ -197,7 +197,7 @@ done:
21492 return sent; 21477 return sent;
21493 } 21478 }
@@ -21497,9 +21482,9 @@ diff -urNp linux-2.6.32.9/drivers/char/hvc_iseries.c linux-2.6.32.9/drivers/char
21497 .get_chars = get_chars, 21482 .get_chars = get_chars,
21498 .put_chars = put_chars, 21483 .put_chars = put_chars,
21499 .notifier_add = notifier_add_irq, 21484 .notifier_add = notifier_add_irq,
21500diff -urNp linux-2.6.32.9/drivers/char/hvc_iucv.c linux-2.6.32.9/drivers/char/hvc_iucv.c 21485diff -urNp linux-2.6.32.10/drivers/char/hvc_iucv.c linux-2.6.32.10/drivers/char/hvc_iucv.c
21501--- linux-2.6.32.9/drivers/char/hvc_iucv.c 2010-02-23 10:38:51.000000000 -0500 21486--- linux-2.6.32.10/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400
21502+++ linux-2.6.32.9/drivers/char/hvc_iucv.c 2010-03-11 20:25:00.113318832 -0500 21487+++ linux-2.6.32.10/drivers/char/hvc_iucv.c 2010-03-20 15:58:47.045148884 -0400
21503@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru 21488@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
21504 21489
21505 21490
@@ -21509,9 +21494,9 @@ diff -urNp linux-2.6.32.9/drivers/char/hvc_iucv.c linux-2.6.32.9/drivers/char/hv
21509 .get_chars = hvc_iucv_get_chars, 21494 .get_chars = hvc_iucv_get_chars,
21510 .put_chars = hvc_iucv_put_chars, 21495 .put_chars = hvc_iucv_put_chars,
21511 .notifier_add = hvc_iucv_notifier_add, 21496 .notifier_add = hvc_iucv_notifier_add,
21512diff -urNp linux-2.6.32.9/drivers/char/hvc_rtas.c linux-2.6.32.9/drivers/char/hvc_rtas.c 21497diff -urNp linux-2.6.32.10/drivers/char/hvc_rtas.c linux-2.6.32.10/drivers/char/hvc_rtas.c
21513--- linux-2.6.32.9/drivers/char/hvc_rtas.c 2010-02-23 10:38:51.000000000 -0500 21498--- linux-2.6.32.10/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400
21514+++ linux-2.6.32.9/drivers/char/hvc_rtas.c 2010-03-11 20:25:00.113318832 -0500 21499+++ linux-2.6.32.10/drivers/char/hvc_rtas.c 2010-03-20 15:58:47.045148884 -0400
21515@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ 21500@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
21516 return i; 21501 return i;
21517 } 21502 }
@@ -21521,9 +21506,9 @@ diff -urNp linux-2.6.32.9/drivers/char/hvc_rtas.c linux-2.6.32.9/drivers/char/hv
21521 .get_chars = hvc_rtas_read_console, 21506 .get_chars = hvc_rtas_read_console,
21522 .put_chars = hvc_rtas_write_console, 21507 .put_chars = hvc_rtas_write_console,
21523 }; 21508 };
21524diff -urNp linux-2.6.32.9/drivers/char/hvcs.c linux-2.6.32.9/drivers/char/hvcs.c 21509diff -urNp linux-2.6.32.10/drivers/char/hvcs.c linux-2.6.32.10/drivers/char/hvcs.c
21525--- linux-2.6.32.9/drivers/char/hvcs.c 2010-02-23 10:38:51.000000000 -0500 21510--- linux-2.6.32.10/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400
21526+++ linux-2.6.32.9/drivers/char/hvcs.c 2010-03-11 20:25:00.113318832 -0500 21511+++ linux-2.6.32.10/drivers/char/hvcs.c 2010-03-20 15:58:47.045148884 -0400
21527@@ -269,7 +269,7 @@ struct hvcs_struct { 21512@@ -269,7 +269,7 @@ struct hvcs_struct {
21528 unsigned int index; 21513 unsigned int index;
21529 21514
@@ -21618,9 +21603,9 @@ diff -urNp linux-2.6.32.9/drivers/char/hvcs.c linux-2.6.32.9/drivers/char/hvcs.c
21618 return 0; 21603 return 0;
21619 21604
21620 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; 21605 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
21621diff -urNp linux-2.6.32.9/drivers/char/hvc_udbg.c linux-2.6.32.9/drivers/char/hvc_udbg.c 21606diff -urNp linux-2.6.32.10/drivers/char/hvc_udbg.c linux-2.6.32.10/drivers/char/hvc_udbg.c
21622--- linux-2.6.32.9/drivers/char/hvc_udbg.c 2010-02-23 10:38:51.000000000 -0500 21607--- linux-2.6.32.10/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400
21623+++ linux-2.6.32.9/drivers/char/hvc_udbg.c 2010-03-11 20:25:00.113318832 -0500 21608+++ linux-2.6.32.10/drivers/char/hvc_udbg.c 2010-03-20 15:58:47.045148884 -0400
21624@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno 21609@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
21625 return i; 21610 return i;
21626 } 21611 }
@@ -21630,9 +21615,9 @@ diff -urNp linux-2.6.32.9/drivers/char/hvc_udbg.c linux-2.6.32.9/drivers/char/hv
21630 .get_chars = hvc_udbg_get, 21615 .get_chars = hvc_udbg_get,
21631 .put_chars = hvc_udbg_put, 21616 .put_chars = hvc_udbg_put,
21632 }; 21617 };
21633diff -urNp linux-2.6.32.9/drivers/char/hvc_vio.c linux-2.6.32.9/drivers/char/hvc_vio.c 21618diff -urNp linux-2.6.32.10/drivers/char/hvc_vio.c linux-2.6.32.10/drivers/char/hvc_vio.c
21634--- linux-2.6.32.9/drivers/char/hvc_vio.c 2010-02-23 10:38:51.000000000 -0500 21619--- linux-2.6.32.10/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400
21635+++ linux-2.6.32.9/drivers/char/hvc_vio.c 2010-03-11 20:25:00.113318832 -0500 21620+++ linux-2.6.32.10/drivers/char/hvc_vio.c 2010-03-20 15:58:47.045148884 -0400
21636@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v 21621@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
21637 return got; 21622 return got;
21638 } 21623 }
@@ -21642,9 +21627,9 @@ diff -urNp linux-2.6.32.9/drivers/char/hvc_vio.c linux-2.6.32.9/drivers/char/hvc
21642 .get_chars = filtered_get_chars, 21627 .get_chars = filtered_get_chars,
21643 .put_chars = hvc_put_chars, 21628 .put_chars = hvc_put_chars,
21644 .notifier_add = notifier_add_irq, 21629 .notifier_add = notifier_add_irq,
21645diff -urNp linux-2.6.32.9/drivers/char/hvc_xen.c linux-2.6.32.9/drivers/char/hvc_xen.c 21630diff -urNp linux-2.6.32.10/drivers/char/hvc_xen.c linux-2.6.32.10/drivers/char/hvc_xen.c
21646--- linux-2.6.32.9/drivers/char/hvc_xen.c 2010-02-23 10:38:51.000000000 -0500 21631--- linux-2.6.32.10/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400
21647+++ linux-2.6.32.9/drivers/char/hvc_xen.c 2010-03-11 20:25:00.113318832 -0500 21632+++ linux-2.6.32.10/drivers/char/hvc_xen.c 2010-03-20 15:58:47.045148884 -0400
21648@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno 21633@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
21649 return recv; 21634 return recv;
21650 } 21635 }
@@ -21654,9 +21639,9 @@ diff -urNp linux-2.6.32.9/drivers/char/hvc_xen.c linux-2.6.32.9/drivers/char/hvc
21654 .get_chars = read_console, 21639 .get_chars = read_console,
21655 .put_chars = write_console, 21640 .put_chars = write_console,
21656 .notifier_add = notifier_add_irq, 21641 .notifier_add = notifier_add_irq,
21657diff -urNp linux-2.6.32.9/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.9/drivers/char/ipmi/ipmi_msghandler.c 21642diff -urNp linux-2.6.32.10/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.10/drivers/char/ipmi/ipmi_msghandler.c
21658--- linux-2.6.32.9/drivers/char/ipmi/ipmi_msghandler.c 2010-02-23 10:38:51.000000000 -0500 21643--- linux-2.6.32.10/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400
21659+++ linux-2.6.32.9/drivers/char/ipmi/ipmi_msghandler.c 2010-03-11 20:25:00.113318832 -0500 21644+++ linux-2.6.32.10/drivers/char/ipmi/ipmi_msghandler.c 2010-03-20 15:58:47.050048266 -0400
21660@@ -414,7 +414,7 @@ struct ipmi_smi { 21645@@ -414,7 +414,7 @@ struct ipmi_smi {
21661 struct proc_dir_entry *proc_dir; 21646 struct proc_dir_entry *proc_dir;
21662 char proc_dir_name[10]; 21647 char proc_dir_name[10];
@@ -21687,9 +21672,9 @@ diff -urNp linux-2.6.32.9/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.9/dri
21687 21672
21688 intf->proc_dir = NULL; 21673 intf->proc_dir = NULL;
21689 21674
21690diff -urNp linux-2.6.32.9/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.9/drivers/char/ipmi/ipmi_si_intf.c 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
21691--- linux-2.6.32.9/drivers/char/ipmi/ipmi_si_intf.c 2010-02-23 10:38:51.000000000 -0500 21676--- linux-2.6.32.10/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400
21692+++ linux-2.6.32.9/drivers/char/ipmi/ipmi_si_intf.c 2010-03-11 20:25:00.117548876 -0500 21677+++ linux-2.6.32.10/drivers/char/ipmi/ipmi_si_intf.c 2010-03-20 15:58:47.050048266 -0400
21693@@ -277,7 +277,7 @@ struct smi_info { 21678@@ -277,7 +277,7 @@ struct smi_info {
21694 unsigned char slave_addr; 21679 unsigned char slave_addr;
21695 21680
@@ -21720,9 +21705,9 @@ diff -urNp linux-2.6.32.9/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.9/driver
21720 21705
21721 new_smi->interrupt_disabled = 0; 21706 new_smi->interrupt_disabled = 0;
21722 atomic_set(&new_smi->stop_operation, 0); 21707 atomic_set(&new_smi->stop_operation, 0);
21723diff -urNp linux-2.6.32.9/drivers/char/keyboard.c linux-2.6.32.9/drivers/char/keyboard.c 21708diff -urNp linux-2.6.32.10/drivers/char/keyboard.c linux-2.6.32.10/drivers/char/keyboard.c
21724--- linux-2.6.32.9/drivers/char/keyboard.c 2010-02-23 10:38:51.000000000 -0500 21709--- linux-2.6.32.10/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400
21725+++ linux-2.6.32.9/drivers/char/keyboard.c 2010-03-11 20:25:00.117548876 -0500 21710+++ linux-2.6.32.10/drivers/char/keyboard.c 2010-03-20 15:58:47.050048266 -0400
21726@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u 21711@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
21727 kbd->kbdmode == VC_MEDIUMRAW) && 21712 kbd->kbdmode == VC_MEDIUMRAW) &&
21728 value != KVAL(K_SAK)) 21713 value != KVAL(K_SAK))
@@ -21749,9 +21734,9 @@ diff -urNp linux-2.6.32.9/drivers/char/keyboard.c linux-2.6.32.9/drivers/char/ke
21749 }; 21734 };
21750 21735
21751 MODULE_DEVICE_TABLE(input, kbd_ids); 21736 MODULE_DEVICE_TABLE(input, kbd_ids);
21752diff -urNp linux-2.6.32.9/drivers/char/mem.c linux-2.6.32.9/drivers/char/mem.c 21737diff -urNp linux-2.6.32.10/drivers/char/mem.c linux-2.6.32.10/drivers/char/mem.c
21753--- linux-2.6.32.9/drivers/char/mem.c 2010-02-23 10:38:51.000000000 -0500 21738--- linux-2.6.32.10/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400
21754+++ linux-2.6.32.9/drivers/char/mem.c 2010-03-11 20:25:00.117548876 -0500 21739+++ linux-2.6.32.10/drivers/char/mem.c 2010-03-20 15:58:47.050048266 -0400
21755@@ -18,6 +18,7 @@ 21740@@ -18,6 +18,7 @@
21756 #include <linux/raw.h> 21741 #include <linux/raw.h>
21757 #include <linux/tty.h> 21742 #include <linux/tty.h>
@@ -21842,9 +21827,9 @@ diff -urNp linux-2.6.32.9/drivers/char/mem.c linux-2.6.32.9/drivers/char/mem.c
21842 }; 21827 };
21843 21828
21844 static int memory_open(struct inode *inode, struct file *filp) 21829 static int memory_open(struct inode *inode, struct file *filp)
21845diff -urNp linux-2.6.32.9/drivers/char/nvram.c linux-2.6.32.9/drivers/char/nvram.c 21830diff -urNp linux-2.6.32.10/drivers/char/nvram.c linux-2.6.32.10/drivers/char/nvram.c
21846--- linux-2.6.32.9/drivers/char/nvram.c 2010-02-23 10:38:51.000000000 -0500 21831--- linux-2.6.32.10/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400
21847+++ linux-2.6.32.9/drivers/char/nvram.c 2010-03-11 20:25:00.117548876 -0500 21832+++ linux-2.6.32.10/drivers/char/nvram.c 2010-03-20 15:58:47.050048266 -0400
21848@@ -429,7 +429,10 @@ static const struct file_operations nvra 21833@@ -429,7 +429,10 @@ static const struct file_operations nvra
21849 static struct miscdevice nvram_dev = { 21834 static struct miscdevice nvram_dev = {
21850 NVRAM_MINOR, 21835 NVRAM_MINOR,
@@ -21857,9 +21842,9 @@ diff -urNp linux-2.6.32.9/drivers/char/nvram.c linux-2.6.32.9/drivers/char/nvram
21857 }; 21842 };
21858 21843
21859 static int __init nvram_init(void) 21844 static int __init nvram_init(void)
21860diff -urNp linux-2.6.32.9/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.9/drivers/char/pcmcia/ipwireless/tty.c 21845diff -urNp linux-2.6.32.10/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.10/drivers/char/pcmcia/ipwireless/tty.c
21861--- linux-2.6.32.9/drivers/char/pcmcia/ipwireless/tty.c 2010-02-23 10:38:51.000000000 -0500 21846--- linux-2.6.32.10/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400
21862+++ linux-2.6.32.9/drivers/char/pcmcia/ipwireless/tty.c 2010-03-11 20:25:00.117548876 -0500 21847+++ linux-2.6.32.10/drivers/char/pcmcia/ipwireless/tty.c 2010-03-20 15:58:47.050048266 -0400
21863@@ -51,7 +51,7 @@ struct ipw_tty { 21848@@ -51,7 +51,7 @@ struct ipw_tty {
21864 int tty_type; 21849 int tty_type;
21865 struct ipw_network *network; 21850 struct ipw_network *network;
@@ -21974,9 +21959,9 @@ diff -urNp linux-2.6.32.9/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.9/dr
21974 do_ipw_close(ttyj); 21959 do_ipw_close(ttyj);
21975 ipwireless_disassociate_network_ttys(network, 21960 ipwireless_disassociate_network_ttys(network,
21976 ttyj->channel_idx); 21961 ttyj->channel_idx);
21977diff -urNp linux-2.6.32.9/drivers/char/pty.c linux-2.6.32.9/drivers/char/pty.c 21962diff -urNp linux-2.6.32.10/drivers/char/pty.c linux-2.6.32.10/drivers/char/pty.c
21978--- linux-2.6.32.9/drivers/char/pty.c 2010-02-23 10:38:51.000000000 -0500 21963--- linux-2.6.32.10/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400
21979+++ linux-2.6.32.9/drivers/char/pty.c 2010-03-11 20:25:00.117548876 -0500 21964+++ linux-2.6.32.10/drivers/char/pty.c 2010-03-20 15:58:47.050048266 -0400
21980@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode 21965@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
21981 return ret; 21966 return ret;
21982 } 21967 }
@@ -22007,9 +21992,9 @@ diff -urNp linux-2.6.32.9/drivers/char/pty.c linux-2.6.32.9/drivers/char/pty.c
22007 cdev_init(&ptmx_cdev, &ptmx_fops); 21992 cdev_init(&ptmx_cdev, &ptmx_fops);
22008 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || 21993 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
22009 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) 21994 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
22010diff -urNp linux-2.6.32.9/drivers/char/random.c linux-2.6.32.9/drivers/char/random.c 21995diff -urNp linux-2.6.32.10/drivers/char/random.c linux-2.6.32.10/drivers/char/random.c
22011--- linux-2.6.32.9/drivers/char/random.c 2010-02-23 10:38:51.000000000 -0500 21996--- linux-2.6.32.10/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400
22012+++ linux-2.6.32.9/drivers/char/random.c 2010-03-11 20:25:00.117548876 -0500 21997+++ linux-2.6.32.10/drivers/char/random.c 2010-03-20 15:58:47.050048266 -0400
22013@@ -254,8 +254,13 @@ 21998@@ -254,8 +254,13 @@
22014 /* 21999 /*
22015 * Configuration information 22000 * Configuration information
@@ -22051,9 +22036,9 @@ diff -urNp linux-2.6.32.9/drivers/char/random.c linux-2.6.32.9/drivers/char/rand
22051 static int max_write_thresh = INPUT_POOL_WORDS * 32; 22036 static int max_write_thresh = INPUT_POOL_WORDS * 32;
22052 static char sysctl_bootid[16]; 22037 static char sysctl_bootid[16];
22053 22038
22054diff -urNp linux-2.6.32.9/drivers/char/sonypi.c linux-2.6.32.9/drivers/char/sonypi.c 22039diff -urNp linux-2.6.32.10/drivers/char/sonypi.c linux-2.6.32.10/drivers/char/sonypi.c
22055--- linux-2.6.32.9/drivers/char/sonypi.c 2010-02-23 10:38:51.000000000 -0500 22040--- linux-2.6.32.10/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400
22056+++ linux-2.6.32.9/drivers/char/sonypi.c 2010-03-11 20:25:00.117548876 -0500 22041+++ linux-2.6.32.10/drivers/char/sonypi.c 2010-03-20 15:58:47.050048266 -0400
22057@@ -491,7 +491,7 @@ static struct sonypi_device { 22042@@ -491,7 +491,7 @@ static struct sonypi_device {
22058 spinlock_t fifo_lock; 22043 spinlock_t fifo_lock;
22059 wait_queue_head_t fifo_proc_list; 22044 wait_queue_head_t fifo_proc_list;
@@ -22084,9 +22069,9 @@ diff -urNp linux-2.6.32.9/drivers/char/sonypi.c linux-2.6.32.9/drivers/char/sony
22084 mutex_unlock(&sonypi_device.lock); 22069 mutex_unlock(&sonypi_device.lock);
22085 unlock_kernel(); 22070 unlock_kernel();
22086 return 0; 22071 return 0;
22087diff -urNp linux-2.6.32.9/drivers/char/tpm/tpm_bios.c linux-2.6.32.9/drivers/char/tpm/tpm_bios.c 22072diff -urNp linux-2.6.32.10/drivers/char/tpm/tpm_bios.c linux-2.6.32.10/drivers/char/tpm/tpm_bios.c
22088--- linux-2.6.32.9/drivers/char/tpm/tpm_bios.c 2010-02-23 10:38:51.000000000 -0500 22073--- linux-2.6.32.10/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400
22089+++ linux-2.6.32.9/drivers/char/tpm/tpm_bios.c 2010-03-11 20:25:00.117548876 -0500 22074+++ linux-2.6.32.10/drivers/char/tpm/tpm_bios.c 2010-03-20 15:58:47.050048266 -0400
22090@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start 22075@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
22091 event = addr; 22076 event = addr;
22092 22077
@@ -22127,9 +22112,9 @@ diff -urNp linux-2.6.32.9/drivers/char/tpm/tpm_bios.c linux-2.6.32.9/drivers/cha
22127 22112
22128 memcpy(log->bios_event_log, virt, len); 22113 memcpy(log->bios_event_log, virt, len);
22129 22114
22130diff -urNp linux-2.6.32.9/drivers/char/tty_io.c linux-2.6.32.9/drivers/char/tty_io.c 22115diff -urNp linux-2.6.32.10/drivers/char/tty_io.c linux-2.6.32.10/drivers/char/tty_io.c
22131--- linux-2.6.32.9/drivers/char/tty_io.c 2010-02-23 10:38:51.000000000 -0500 22116--- linux-2.6.32.10/drivers/char/tty_io.c 2010-03-15 11:52:04.000000000 -0400
22132+++ linux-2.6.32.9/drivers/char/tty_io.c 2010-03-11 20:25:00.117548876 -0500 22117+++ linux-2.6.32.10/drivers/char/tty_io.c 2010-03-20 15:58:47.050048266 -0400
22133@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list 22118@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
22134 DEFINE_MUTEX(tty_mutex); 22119 DEFINE_MUTEX(tty_mutex);
22135 EXPORT_SYMBOL(tty_mutex); 22120 EXPORT_SYMBOL(tty_mutex);
@@ -22268,9 +22253,9 @@ diff -urNp linux-2.6.32.9/drivers/char/tty_io.c linux-2.6.32.9/drivers/char/tty_
22268 /* 22253 /*
22269 * Initialize the console device. This is called *early*, so 22254 * Initialize the console device. This is called *early*, so
22270 * we can't necessarily depend on lots of kernel help here. 22255 * we can't necessarily depend on lots of kernel help here.
22271diff -urNp linux-2.6.32.9/drivers/char/tty_ldisc.c linux-2.6.32.9/drivers/char/tty_ldisc.c 22256diff -urNp linux-2.6.32.10/drivers/char/tty_ldisc.c linux-2.6.32.10/drivers/char/tty_ldisc.c
22272--- linux-2.6.32.9/drivers/char/tty_ldisc.c 2010-02-23 10:38:51.000000000 -0500 22257--- linux-2.6.32.10/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400
22273+++ linux-2.6.32.9/drivers/char/tty_ldisc.c 2010-03-11 20:25:00.117548876 -0500 22258+++ linux-2.6.32.10/drivers/char/tty_ldisc.c 2010-03-20 15:58:47.050048266 -0400
22274@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * 22259@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc *
22275 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { 22260 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
22276 struct tty_ldisc_ops *ldo = ld->ops; 22261 struct tty_ldisc_ops *ldo = ld->ops;
@@ -22316,9 +22301,9 @@ diff -urNp linux-2.6.32.9/drivers/char/tty_ldisc.c linux-2.6.32.9/drivers/char/t
22316 module_put(ldops->owner); 22301 module_put(ldops->owner);
22317 spin_unlock_irqrestore(&tty_ldisc_lock, flags); 22302 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
22318 } 22303 }
22319diff -urNp linux-2.6.32.9/drivers/char/virtio_console.c linux-2.6.32.9/drivers/char/virtio_console.c 22304diff -urNp linux-2.6.32.10/drivers/char/virtio_console.c linux-2.6.32.10/drivers/char/virtio_console.c
22320--- linux-2.6.32.9/drivers/char/virtio_console.c 2010-02-23 10:38:51.000000000 -0500 22305--- linux-2.6.32.10/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400
22321+++ linux-2.6.32.9/drivers/char/virtio_console.c 2010-03-11 20:25:00.117548876 -0500 22306+++ linux-2.6.32.10/drivers/char/virtio_console.c 2010-03-20 15:58:47.054065670 -0400
22322@@ -44,6 +44,7 @@ static unsigned int in_len; 22307@@ -44,6 +44,7 @@ static unsigned int in_len;
22323 static char *in, *inbuf; 22308 static char *in, *inbuf;
22324 22309
@@ -22327,9 +22312,9 @@ diff -urNp linux-2.6.32.9/drivers/char/virtio_console.c linux-2.6.32.9/drivers/c
22327 static struct hv_ops virtio_cons; 22312 static struct hv_ops virtio_cons;
22328 22313
22329 /* The hvc device */ 22314 /* The hvc device */
22330diff -urNp linux-2.6.32.9/drivers/char/vt_ioctl.c linux-2.6.32.9/drivers/char/vt_ioctl.c 22315diff -urNp linux-2.6.32.10/drivers/char/vt_ioctl.c linux-2.6.32.10/drivers/char/vt_ioctl.c
22331--- linux-2.6.32.9/drivers/char/vt_ioctl.c 2010-02-23 10:38:51.000000000 -0500 22316--- linux-2.6.32.10/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400
22332+++ linux-2.6.32.9/drivers/char/vt_ioctl.c 2010-03-11 20:25:00.117548876 -0500 22317+++ linux-2.6.32.10/drivers/char/vt_ioctl.c 2010-03-20 15:58:47.054065670 -0400
22333@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ 22318@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __
22334 case KDSKBENT: 22319 case KDSKBENT:
22335 if (!perm) 22320 if (!perm)
@@ -22357,9 +22342,9 @@ diff -urNp linux-2.6.32.9/drivers/char/vt_ioctl.c linux-2.6.32.9/drivers/char/vt
22357 q = func_table[i]; 22342 q = func_table[i];
22358 first_free = funcbufptr + (funcbufsize - funcbufleft); 22343 first_free = funcbufptr + (funcbufsize - funcbufleft);
22359 for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 22344 for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++)
22360diff -urNp linux-2.6.32.9/drivers/cpufreq/cpufreq.c linux-2.6.32.9/drivers/cpufreq/cpufreq.c 22345diff -urNp linux-2.6.32.10/drivers/cpufreq/cpufreq.c linux-2.6.32.10/drivers/cpufreq/cpufreq.c
22361--- linux-2.6.32.9/drivers/cpufreq/cpufreq.c 2010-02-23 10:38:51.000000000 -0500 22346--- linux-2.6.32.10/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400
22362+++ linux-2.6.32.9/drivers/cpufreq/cpufreq.c 2010-03-11 20:25:00.121507428 -0500 22347+++ linux-2.6.32.10/drivers/cpufreq/cpufreq.c 2010-03-20 15:58:47.054065670 -0400
22363@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct 22348@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
22364 complete(&policy->kobj_unregister); 22349 complete(&policy->kobj_unregister);
22365 } 22350 }
@@ -22369,9 +22354,9 @@ diff -urNp linux-2.6.32.9/drivers/cpufreq/cpufreq.c linux-2.6.32.9/drivers/cpufr
22369 .show = show, 22354 .show = show,
22370 .store = store, 22355 .store = store,
22371 }; 22356 };
22372diff -urNp linux-2.6.32.9/drivers/cpuidle/sysfs.c linux-2.6.32.9/drivers/cpuidle/sysfs.c 22357diff -urNp linux-2.6.32.10/drivers/cpuidle/sysfs.c linux-2.6.32.10/drivers/cpuidle/sysfs.c
22373--- linux-2.6.32.9/drivers/cpuidle/sysfs.c 2010-02-23 10:38:51.000000000 -0500 22358--- linux-2.6.32.10/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400
22374+++ linux-2.6.32.9/drivers/cpuidle/sysfs.c 2010-03-11 20:25:00.121507428 -0500 22359+++ linux-2.6.32.10/drivers/cpuidle/sysfs.c 2010-03-20 15:58:47.054065670 -0400
22375@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj 22360@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
22376 return ret; 22361 return ret;
22377 } 22362 }
@@ -22390,9 +22375,9 @@ diff -urNp linux-2.6.32.9/drivers/cpuidle/sysfs.c linux-2.6.32.9/drivers/cpuidle
22390 .show = cpuidle_state_show, 22375 .show = cpuidle_state_show,
22391 }; 22376 };
22392 22377
22393diff -urNp linux-2.6.32.9/drivers/dma/ioat/dma.c linux-2.6.32.9/drivers/dma/ioat/dma.c 22378diff -urNp linux-2.6.32.10/drivers/dma/ioat/dma.c linux-2.6.32.10/drivers/dma/ioat/dma.c
22394--- linux-2.6.32.9/drivers/dma/ioat/dma.c 2010-02-23 10:38:51.000000000 -0500 22379--- linux-2.6.32.10/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400
22395+++ linux-2.6.32.9/drivers/dma/ioat/dma.c 2010-03-11 20:25:00.121507428 -0500 22380+++ linux-2.6.32.10/drivers/dma/ioat/dma.c 2010-03-20 15:58:47.054065670 -0400
22396@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str 22381@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
22397 return entry->show(&chan->common, page); 22382 return entry->show(&chan->common, page);
22398 } 22383 }
@@ -22402,9 +22387,9 @@ diff -urNp linux-2.6.32.9/drivers/dma/ioat/dma.c linux-2.6.32.9/drivers/dma/ioat
22402 .show = ioat_attr_show, 22387 .show = ioat_attr_show,
22403 }; 22388 };
22404 22389
22405diff -urNp linux-2.6.32.9/drivers/dma/ioat/dma.h linux-2.6.32.9/drivers/dma/ioat/dma.h 22390diff -urNp linux-2.6.32.10/drivers/dma/ioat/dma.h linux-2.6.32.10/drivers/dma/ioat/dma.h
22406--- linux-2.6.32.9/drivers/dma/ioat/dma.h 2010-02-23 10:38:51.000000000 -0500 22391--- linux-2.6.32.10/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400
22407+++ linux-2.6.32.9/drivers/dma/ioat/dma.h 2010-03-11 20:25:00.121507428 -0500 22392+++ linux-2.6.32.10/drivers/dma/ioat/dma.h 2010-03-20 15:58:47.054065670 -0400
22408@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c 22393@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
22409 unsigned long *phys_complete); 22394 unsigned long *phys_complete);
22410 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); 22395 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
@@ -22414,9 +22399,9 @@ diff -urNp linux-2.6.32.9/drivers/dma/ioat/dma.h linux-2.6.32.9/drivers/dma/ioat
22414 extern struct ioat_sysfs_entry ioat_version_attr; 22399 extern struct ioat_sysfs_entry ioat_version_attr;
22415 extern struct ioat_sysfs_entry ioat_cap_attr; 22400 extern struct ioat_sysfs_entry ioat_cap_attr;
22416 #endif /* IOATDMA_H */ 22401 #endif /* IOATDMA_H */
22417diff -urNp linux-2.6.32.9/drivers/edac/edac_core.h linux-2.6.32.9/drivers/edac/edac_core.h 22402diff -urNp linux-2.6.32.10/drivers/edac/edac_core.h linux-2.6.32.10/drivers/edac/edac_core.h
22418--- linux-2.6.32.9/drivers/edac/edac_core.h 2010-02-23 10:38:51.000000000 -0500 22403--- linux-2.6.32.10/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400
22419+++ linux-2.6.32.9/drivers/edac/edac_core.h 2010-03-11 20:25:00.121507428 -0500 22404+++ linux-2.6.32.10/drivers/edac/edac_core.h 2010-03-20 15:58:47.054065670 -0400
22420@@ -99,11 +99,11 @@ extern int edac_debug_level; 22405@@ -99,11 +99,11 @@ extern int edac_debug_level;
22421 22406
22422 #else /* !CONFIG_EDAC_DEBUG */ 22407 #else /* !CONFIG_EDAC_DEBUG */
@@ -22434,9 +22419,9 @@ diff -urNp linux-2.6.32.9/drivers/edac/edac_core.h linux-2.6.32.9/drivers/edac/e
22434 22419
22435 #endif /* !CONFIG_EDAC_DEBUG */ 22420 #endif /* !CONFIG_EDAC_DEBUG */
22436 22421
22437diff -urNp linux-2.6.32.9/drivers/edac/edac_device_sysfs.c linux-2.6.32.9/drivers/edac/edac_device_sysfs.c 22422diff -urNp linux-2.6.32.10/drivers/edac/edac_device_sysfs.c linux-2.6.32.10/drivers/edac/edac_device_sysfs.c
22438--- linux-2.6.32.9/drivers/edac/edac_device_sysfs.c 2010-02-23 10:38:51.000000000 -0500 22423--- linux-2.6.32.10/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400
22439+++ linux-2.6.32.9/drivers/edac/edac_device_sysfs.c 2010-03-11 20:25:00.121507428 -0500 22424+++ linux-2.6.32.10/drivers/edac/edac_device_sysfs.c 2010-03-20 15:58:47.054065670 -0400
22440@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s 22425@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
22441 } 22426 }
22442 22427
@@ -22464,9 +22449,9 @@ diff -urNp linux-2.6.32.9/drivers/edac/edac_device_sysfs.c linux-2.6.32.9/driver
22464 .show = edac_dev_block_show, 22449 .show = edac_dev_block_show,
22465 .store = edac_dev_block_store 22450 .store = edac_dev_block_store
22466 }; 22451 };
22467diff -urNp linux-2.6.32.9/drivers/edac/edac_mc_sysfs.c linux-2.6.32.9/drivers/edac/edac_mc_sysfs.c 22452diff -urNp linux-2.6.32.10/drivers/edac/edac_mc_sysfs.c linux-2.6.32.10/drivers/edac/edac_mc_sysfs.c
22468--- linux-2.6.32.9/drivers/edac/edac_mc_sysfs.c 2010-02-23 10:38:51.000000000 -0500 22453--- linux-2.6.32.10/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400
22469+++ linux-2.6.32.9/drivers/edac/edac_mc_sysfs.c 2010-03-11 20:25:00.121507428 -0500 22454+++ linux-2.6.32.10/drivers/edac/edac_mc_sysfs.c 2010-03-20 15:58:47.054065670 -0400
22470@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob 22455@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
22471 return -EIO; 22456 return -EIO;
22472 } 22457 }
@@ -22485,9 +22470,9 @@ diff -urNp linux-2.6.32.9/drivers/edac/edac_mc_sysfs.c linux-2.6.32.9/drivers/ed
22485 .show = mcidev_show, 22470 .show = mcidev_show,
22486 .store = mcidev_store 22471 .store = mcidev_store
22487 }; 22472 };
22488diff -urNp linux-2.6.32.9/drivers/edac/edac_pci_sysfs.c linux-2.6.32.9/drivers/edac/edac_pci_sysfs.c 22473diff -urNp linux-2.6.32.10/drivers/edac/edac_pci_sysfs.c linux-2.6.32.10/drivers/edac/edac_pci_sysfs.c
22489--- linux-2.6.32.9/drivers/edac/edac_pci_sysfs.c 2010-02-23 10:38:51.000000000 -0500 22474--- linux-2.6.32.10/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400
22490+++ linux-2.6.32.9/drivers/edac/edac_pci_sysfs.c 2010-03-11 20:25:00.121507428 -0500 22475+++ linux-2.6.32.10/drivers/edac/edac_pci_sysfs.c 2010-03-20 15:58:47.054065670 -0400
22491@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s 22476@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
22492 } 22477 }
22493 22478
@@ -22506,9 +22491,9 @@ diff -urNp linux-2.6.32.9/drivers/edac/edac_pci_sysfs.c linux-2.6.32.9/drivers/e
22506 .show = edac_pci_dev_show, 22491 .show = edac_pci_dev_show,
22507 .store = edac_pci_dev_store 22492 .store = edac_pci_dev_store
22508 }; 22493 };
22509diff -urNp linux-2.6.32.9/drivers/firmware/dmi_scan.c linux-2.6.32.9/drivers/firmware/dmi_scan.c 22494diff -urNp linux-2.6.32.10/drivers/firmware/dmi_scan.c linux-2.6.32.10/drivers/firmware/dmi_scan.c
22510--- linux-2.6.32.9/drivers/firmware/dmi_scan.c 2010-02-23 10:38:51.000000000 -0500 22495--- linux-2.6.32.10/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400
22511+++ linux-2.6.32.9/drivers/firmware/dmi_scan.c 2010-03-11 20:25:00.121507428 -0500 22496+++ linux-2.6.32.10/drivers/firmware/dmi_scan.c 2010-03-20 15:58:47.054065670 -0400
22512@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) 22497@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
22513 } 22498 }
22514 } 22499 }
@@ -22521,9 +22506,9 @@ diff -urNp linux-2.6.32.9/drivers/firmware/dmi_scan.c linux-2.6.32.9/drivers/fir
22521 p = dmi_ioremap(0xF0000, 0x10000); 22506 p = dmi_ioremap(0xF0000, 0x10000);
22522 if (p == NULL) 22507 if (p == NULL)
22523 goto error; 22508 goto error;
22524diff -urNp linux-2.6.32.9/drivers/firmware/edd.c linux-2.6.32.9/drivers/firmware/edd.c 22509diff -urNp linux-2.6.32.10/drivers/firmware/edd.c linux-2.6.32.10/drivers/firmware/edd.c
22525--- linux-2.6.32.9/drivers/firmware/edd.c 2010-02-23 10:38:51.000000000 -0500 22510--- linux-2.6.32.10/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400
22526+++ linux-2.6.32.9/drivers/firmware/edd.c 2010-03-11 20:25:00.121507428 -0500 22511+++ linux-2.6.32.10/drivers/firmware/edd.c 2010-03-20 15:58:47.054065670 -0400
22527@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str 22512@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
22528 return ret; 22513 return ret;
22529 } 22514 }
@@ -22533,9 +22518,9 @@ diff -urNp linux-2.6.32.9/drivers/firmware/edd.c linux-2.6.32.9/drivers/firmware
22533 .show = edd_attr_show, 22518 .show = edd_attr_show,
22534 }; 22519 };
22535 22520
22536diff -urNp linux-2.6.32.9/drivers/firmware/efivars.c linux-2.6.32.9/drivers/firmware/efivars.c 22521diff -urNp linux-2.6.32.10/drivers/firmware/efivars.c linux-2.6.32.10/drivers/firmware/efivars.c
22537--- linux-2.6.32.9/drivers/firmware/efivars.c 2010-02-23 10:38:51.000000000 -0500 22522--- linux-2.6.32.10/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400
22538+++ linux-2.6.32.9/drivers/firmware/efivars.c 2010-03-11 20:25:00.121507428 -0500 22523+++ linux-2.6.32.10/drivers/firmware/efivars.c 2010-03-20 15:58:47.054065670 -0400
22539@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct 22524@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
22540 return ret; 22525 return ret;
22541 } 22526 }
@@ -22545,9 +22530,9 @@ diff -urNp linux-2.6.32.9/drivers/firmware/efivars.c linux-2.6.32.9/drivers/firm
22545 .show = efivar_attr_show, 22530 .show = efivar_attr_show,
22546 .store = efivar_attr_store, 22531 .store = efivar_attr_store,
22547 }; 22532 };
22548diff -urNp linux-2.6.32.9/drivers/firmware/iscsi_ibft.c linux-2.6.32.9/drivers/firmware/iscsi_ibft.c 22533diff -urNp linux-2.6.32.10/drivers/firmware/iscsi_ibft.c linux-2.6.32.10/drivers/firmware/iscsi_ibft.c
22549--- linux-2.6.32.9/drivers/firmware/iscsi_ibft.c 2010-02-23 10:38:51.000000000 -0500 22534--- linux-2.6.32.10/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400
22550+++ linux-2.6.32.9/drivers/firmware/iscsi_ibft.c 2010-03-11 20:25:00.121507428 -0500 22535+++ linux-2.6.32.10/drivers/firmware/iscsi_ibft.c 2010-03-20 15:58:47.054065670 -0400
22551@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc 22536@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
22552 return ret; 22537 return ret;
22553 } 22538 }
@@ -22557,9 +22542,9 @@ diff -urNp linux-2.6.32.9/drivers/firmware/iscsi_ibft.c linux-2.6.32.9/drivers/f
22557 .show = ibft_show_attribute, 22542 .show = ibft_show_attribute,
22558 }; 22543 };
22559 22544
22560diff -urNp linux-2.6.32.9/drivers/firmware/memmap.c linux-2.6.32.9/drivers/firmware/memmap.c 22545diff -urNp linux-2.6.32.10/drivers/firmware/memmap.c linux-2.6.32.10/drivers/firmware/memmap.c
22561--- linux-2.6.32.9/drivers/firmware/memmap.c 2010-02-23 10:38:51.000000000 -0500 22546--- linux-2.6.32.10/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400
22562+++ linux-2.6.32.9/drivers/firmware/memmap.c 2010-03-11 20:25:00.121507428 -0500 22547+++ linux-2.6.32.10/drivers/firmware/memmap.c 2010-03-20 15:58:47.054065670 -0400
22563@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { 22548@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
22564 NULL 22549 NULL
22565 }; 22550 };
@@ -22569,9 +22554,9 @@ diff -urNp linux-2.6.32.9/drivers/firmware/memmap.c linux-2.6.32.9/drivers/firmw
22569 .show = memmap_attr_show, 22554 .show = memmap_attr_show,
22570 }; 22555 };
22571 22556
22572diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_drv.c linux-2.6.32.9/drivers/gpu/drm/drm_drv.c 22557diff -urNp linux-2.6.32.10/drivers/gpu/drm/drm_drv.c linux-2.6.32.10/drivers/gpu/drm/drm_drv.c
22573--- linux-2.6.32.9/drivers/gpu/drm/drm_drv.c 2010-02-23 10:38:51.000000000 -0500 22558--- linux-2.6.32.10/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400
22574+++ linux-2.6.32.9/drivers/gpu/drm/drm_drv.c 2010-03-11 20:25:00.121507428 -0500 22559+++ linux-2.6.32.10/drivers/gpu/drm/drm_drv.c 2010-03-20 15:58:47.054065670 -0400
22575@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc 22560@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
22576 char *kdata = NULL; 22561 char *kdata = NULL;
22577 22562
@@ -22581,9 +22566,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_drv.c linux-2.6.32.9/drivers/gpu/d
22581 ++file_priv->ioctl_count; 22566 ++file_priv->ioctl_count;
22582 22567
22583 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", 22568 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
22584diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_fops.c linux-2.6.32.9/drivers/gpu/drm/drm_fops.c 22569diff -urNp linux-2.6.32.10/drivers/gpu/drm/drm_fops.c linux-2.6.32.10/drivers/gpu/drm/drm_fops.c
22585--- linux-2.6.32.9/drivers/gpu/drm/drm_fops.c 2010-02-23 10:38:51.000000000 -0500 22570--- linux-2.6.32.10/drivers/gpu/drm/drm_fops.c 2010-03-15 11:52:04.000000000 -0400
22586+++ linux-2.6.32.9/drivers/gpu/drm/drm_fops.c 2010-03-11 20:25:00.121507428 -0500 22571+++ linux-2.6.32.10/drivers/gpu/drm/drm_fops.c 2010-03-20 15:58:47.054065670 -0400
22587@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * 22572@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
22588 } 22573 }
22589 22574
@@ -22635,9 +22620,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_fops.c linux-2.6.32.9/drivers/gpu/
22635 if (atomic_read(&dev->ioctl_count)) { 22620 if (atomic_read(&dev->ioctl_count)) {
22636 DRM_ERROR("Device busy: %d\n", 22621 DRM_ERROR("Device busy: %d\n",
22637 atomic_read(&dev->ioctl_count)); 22622 atomic_read(&dev->ioctl_count));
22638diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.9/drivers/gpu/drm/drm_ioctl.c 22623diff -urNp linux-2.6.32.10/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.10/drivers/gpu/drm/drm_ioctl.c
22639--- linux-2.6.32.9/drivers/gpu/drm/drm_ioctl.c 2010-02-23 10:38:51.000000000 -0500 22624--- linux-2.6.32.10/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400
22640+++ linux-2.6.32.9/drivers/gpu/drm/drm_ioctl.c 2010-03-11 20:25:00.121507428 -0500 22625+++ linux-2.6.32.10/drivers/gpu/drm/drm_ioctl.c 2010-03-20 15:58:47.054065670 -0400
22641@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, 22626@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
22642 stats->data[i].value = 22627 stats->data[i].value =
22643 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); 22628 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -22647,9 +22632,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.9/drivers/gpu
22647 stats->data[i].type = dev->types[i]; 22632 stats->data[i].type = dev->types[i];
22648 } 22633 }
22649 22634
22650diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_lock.c linux-2.6.32.9/drivers/gpu/drm/drm_lock.c 22635diff -urNp linux-2.6.32.10/drivers/gpu/drm/drm_lock.c linux-2.6.32.10/drivers/gpu/drm/drm_lock.c
22651--- linux-2.6.32.9/drivers/gpu/drm/drm_lock.c 2010-02-23 10:38:51.000000000 -0500 22636--- linux-2.6.32.10/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400
22652+++ linux-2.6.32.9/drivers/gpu/drm/drm_lock.c 2010-03-11 20:25:00.121507428 -0500 22637+++ linux-2.6.32.10/drivers/gpu/drm/drm_lock.c 2010-03-20 15:58:47.054065670 -0400
22653@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi 22638@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
22654 if (drm_lock_take(&master->lock, lock->context)) { 22639 if (drm_lock_take(&master->lock, lock->context)) {
22655 master->lock.file_priv = file_priv; 22640 master->lock.file_priv = file_priv;
@@ -22668,9 +22653,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_lock.c linux-2.6.32.9/drivers/gpu/
22668 22653
22669 /* kernel_context_switch isn't used by any of the x86 drm 22654 /* kernel_context_switch isn't used by any of the x86 drm
22670 * modules but is required by the Sparc driver. 22655 * modules but is required by the Sparc driver.
22671diff -urNp linux-2.6.32.9/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.9/drivers/gpu/drm/i810/i810_dma.c 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
22672--- linux-2.6.32.9/drivers/gpu/drm/i810/i810_dma.c 2010-02-23 10:38:51.000000000 -0500 22657--- linux-2.6.32.10/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400
22673+++ linux-2.6.32.9/drivers/gpu/drm/i810/i810_dma.c 2010-03-11 20:25:00.121507428 -0500 22658+++ linux-2.6.32.10/drivers/gpu/drm/i810/i810_dma.c 2010-03-20 15:58:47.058045612 -0400
22674@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de 22659@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
22675 dma->buflist[vertex->idx], 22660 dma->buflist[vertex->idx],
22676 vertex->discard, vertex->used); 22661 vertex->discard, vertex->used);
@@ -22693,9 +22678,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.9/drivers
22693 sarea_priv->last_enqueue = dev_priv->counter - 1; 22678 sarea_priv->last_enqueue = dev_priv->counter - 1;
22694 sarea_priv->last_dispatch = (int)hw_status[5]; 22679 sarea_priv->last_dispatch = (int)hw_status[5];
22695 22680
22696diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7017.c 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
22697--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7017.c 2010-02-23 10:38:51.000000000 -0500 22682--- linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400
22698+++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-11 20:25:00.121507428 -0500 22683+++ linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-20 15:58:47.058045612 -0400
22699@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ 22684@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
22700 } 22685 }
22701 } 22686 }
@@ -22705,9 +22690,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.9/drive
22705 .init = ch7017_init, 22690 .init = ch7017_init,
22706 .detect = ch7017_detect, 22691 .detect = ch7017_detect,
22707 .mode_valid = ch7017_mode_valid, 22692 .mode_valid = ch7017_mode_valid,
22708diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7xxx.c 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
22709--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-02-23 10:38:51.000000000 -0500 22694--- linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400
22710+++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-11 20:25:00.121507428 -0500 22695+++ linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-20 15:58:47.058045612 -0400
22711@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ 22696@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
22712 } 22697 }
22713 } 22698 }
@@ -22717,9 +22702,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.9/drive
22717 .init = ch7xxx_init, 22702 .init = ch7xxx_init,
22718 .detect = ch7xxx_detect, 22703 .detect = ch7xxx_detect,
22719 .mode_valid = ch7xxx_mode_valid, 22704 .mode_valid = ch7xxx_mode_valid,
22720diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo.h linux-2.6.32.9/drivers/gpu/drm/i915/dvo.h 22705diff -urNp linux-2.6.32.10/drivers/gpu/drm/i915/dvo.h linux-2.6.32.10/drivers/gpu/drm/i915/dvo.h
22721--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo.h 2010-02-23 10:38:51.000000000 -0500 22706--- linux-2.6.32.10/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400
22722+++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo.h 2010-03-11 20:25:00.121507428 -0500 22707+++ linux-2.6.32.10/drivers/gpu/drm/i915/dvo.h 2010-03-20 15:58:47.058045612 -0400
22723@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { 22708@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
22724 * 22709 *
22725 * \return singly-linked list of modes or NULL if no modes found. 22710 * \return singly-linked list of modes or NULL if no modes found.
@@ -22752,9 +22737,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo.h linux-2.6.32.9/drivers/gpu/
22752+extern const struct intel_dvo_dev_ops ch7017_ops; 22737+extern const struct intel_dvo_dev_ops ch7017_ops;
22753 22738
22754 #endif /* _INTEL_DVO_H */ 22739 #endif /* _INTEL_DVO_H */
22755diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ivch.c 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
22756--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ivch.c 2010-02-23 10:38:51.000000000 -0500 22741--- linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400
22757+++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-11 20:25:00.125635179 -0500 22742+++ linux-2.6.32.10/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-20 15:58:47.058045612 -0400
22758@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv 22743@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
22759 } 22744 }
22760 } 22745 }
@@ -22764,9 +22749,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.9/drivers
22764 .init = ivch_init, 22749 .init = ivch_init,
22765 .dpms = ivch_dpms, 22750 .dpms = ivch_dpms,
22766 .save = ivch_save, 22751 .save = ivch_save,
22767diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.9/drivers/gpu/drm/i915/dvo_sil164.c 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
22768--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo_sil164.c 2010-02-23 10:38:51.000000000 -0500 22753--- linux-2.6.32.10/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400
22769+++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-11 20:25:00.125635179 -0500 22754+++ linux-2.6.32.10/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-20 15:58:47.058045612 -0400
22770@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ 22755@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
22771 } 22756 }
22772 } 22757 }
@@ -22776,9 +22761,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.9/drive
22776 .init = sil164_init, 22761 .init = sil164_init,
22777 .detect = sil164_detect, 22762 .detect = sil164_detect,
22778 .mode_valid = sil164_mode_valid, 22763 .mode_valid = sil164_mode_valid,
22779diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.9/drivers/gpu/drm/i915/dvo_tfp410.c 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
22780--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo_tfp410.c 2010-02-23 10:38:51.000000000 -0500 22765--- linux-2.6.32.10/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400
22781+++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-11 20:25:00.125635179 -0500 22766+++ linux-2.6.32.10/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-20 15:58:47.058045612 -0400
22782@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ 22767@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
22783 } 22768 }
22784 } 22769 }
@@ -22788,9 +22773,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.9/drive
22788 .init = tfp410_init, 22773 .init = tfp410_init,
22789 .detect = tfp410_detect, 22774 .detect = tfp410_detect,
22790 .mode_valid = tfp410_mode_valid, 22775 .mode_valid = tfp410_mode_valid,
22791diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.9/drivers/gpu/drm/i915/i915_drv.c 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
22792--- linux-2.6.32.9/drivers/gpu/drm/i915/i915_drv.c 2010-02-23 10:38:51.000000000 -0500 22777--- linux-2.6.32.10/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400
22793+++ linux-2.6.32.9/drivers/gpu/drm/i915/i915_drv.c 2010-03-11 20:25:00.125635179 -0500 22778+++ linux-2.6.32.10/drivers/gpu/drm/i915/i915_drv.c 2010-03-20 15:58:47.058045612 -0400
22794@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) 22779@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev)
22795 return i915_resume(dev); 22780 return i915_resume(dev);
22796 } 22781 }
@@ -22800,9 +22785,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.9/drivers
22800 .fault = i915_gem_fault, 22785 .fault = i915_gem_fault,
22801 .open = drm_gem_vm_open, 22786 .open = drm_gem_vm_open,
22802 .close = drm_gem_vm_close, 22787 .close = drm_gem_vm_close,
22803diff -urNp linux-2.6.32.9/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.9/drivers/gpu/drm/radeon/mkregtable.c 22788diff -urNp linux-2.6.32.10/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.10/drivers/gpu/drm/radeon/mkregtable.c
22804--- linux-2.6.32.9/drivers/gpu/drm/radeon/mkregtable.c 2010-02-23 10:38:51.000000000 -0500 22789--- linux-2.6.32.10/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400
22805+++ linux-2.6.32.9/drivers/gpu/drm/radeon/mkregtable.c 2010-03-11 20:25:00.125635179 -0500 22790+++ linux-2.6.32.10/drivers/gpu/drm/radeon/mkregtable.c 2010-03-20 15:58:47.058045612 -0400
22806@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 22791@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
22807 regex_t mask_rex; 22792 regex_t mask_rex;
22808 regmatch_t match[4]; 22793 regmatch_t match[4];
@@ -22820,9 +22805,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.9/dri
22820 22805
22821 if (regcomp 22806 if (regcomp
22822 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { 22807 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
22823diff -urNp linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_atombios.c 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
22824--- linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_atombios.c 2010-02-23 10:38:51.000000000 -0500 22809--- linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400
22825+++ linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-11 20:25:00.125635179 -0500 22810+++ linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-20 15:58:47.058045612 -0400
22826@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o 22811@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o
22827 } 22812 }
22828 } 22813 }
@@ -22847,9 +22832,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.
22847 22832
22848 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); 22833 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
22849 22834
22850diff -urNp linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_state.c 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
22851--- linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_state.c 2010-02-23 10:38:51.000000000 -0500 22836--- linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400
22852+++ linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_state.c 2010-03-11 20:25:00.125635179 -0500 22837+++ linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_state.c 2010-03-20 15:58:47.058045612 -0400
22853@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm 22838@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm
22854 { 22839 {
22855 drm_radeon_private_t *dev_priv = dev->dev_private; 22840 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -22859,9 +22844,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.9/d
22859 22844
22860 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); 22845 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
22861 22846
22862diff -urNp linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_ttm.c 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
22863--- linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_ttm.c 2010-02-23 10:38:51.000000000 -0500 22848--- linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400
22864+++ linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-11 20:25:00.125635179 -0500 22849+++ linux-2.6.32.10/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-20 15:58:47.058045612 -0400
22865@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic 22850@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
22866 DRM_INFO("radeon: ttm finalized\n"); 22851 DRM_INFO("radeon: ttm finalized\n");
22867 } 22852 }
@@ -22913,9 +22898,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.9/dri
22913 } 22898 }
22914 22899
22915 22900
22916diff -urNp linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo.c 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
22917--- linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo.c 2010-02-23 10:38:51.000000000 -0500 22902--- linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400
22918+++ linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-11 20:25:00.125635179 -0500 22903+++ linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-20 15:58:47.058045612 -0400
22919@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a 22904@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a
22920 NULL 22905 NULL
22921 }; 22906 };
@@ -22925,9 +22910,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.9/drivers/gp
22925 .show = &ttm_bo_global_show 22910 .show = &ttm_bo_global_show
22926 }; 22911 };
22927 22912
22928diff -urNp linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo_vm.c 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
22929--- linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-02-23 10:38:51.000000000 -0500 22914--- linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400
22930+++ linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-11 20:25:00.125635179 -0500 22915+++ linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-20 15:58:47.058045612 -0400
22931@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are 22916@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
22932 { 22917 {
22933 struct ttm_buffer_object *bo = (struct ttm_buffer_object *) 22918 struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -22948,9 +22933,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.9/drivers
22948 /* 22933 /*
22949 * Work around locking order reversal in fault / nopfn 22934 * Work around locking order reversal in fault / nopfn
22950 * between mmap_sem and bo_reserve: Perform a trylock operation 22935 * between mmap_sem and bo_reserve: Perform a trylock operation
22951diff -urNp linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_global.c 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
22952--- linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_global.c 2010-02-23 10:38:51.000000000 -0500 22937--- linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400
22953+++ linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_global.c 2010-03-11 20:25:00.125635179 -0500 22938+++ linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_global.c 2010-03-20 15:58:47.058045612 -0400
22954@@ -36,7 +36,7 @@ 22939@@ -36,7 +36,7 @@
22955 struct ttm_global_item { 22940 struct ttm_global_item {
22956 struct mutex mutex; 22941 struct mutex mutex;
@@ -23008,9 +22993,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.9/driver
23008 ref->release(ref); 22993 ref->release(ref);
23009 item->object = NULL; 22994 item->object = NULL;
23010 } 22995 }
23011diff -urNp linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_memory.c 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
23012--- linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_memory.c 2010-02-23 10:38:51.000000000 -0500 22997--- linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400
23013+++ linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-11 20:25:00.125635179 -0500 22998+++ linux-2.6.32.10/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-20 15:58:47.062125591 -0400
23014@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at 22999@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
23015 NULL 23000 NULL
23016 }; 23001 };
@@ -23020,9 +23005,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.9/driver
23020 .show = &ttm_mem_zone_show, 23005 .show = &ttm_mem_zone_show,
23021 .store = &ttm_mem_zone_store 23006 .store = &ttm_mem_zone_store
23022 }; 23007 };
23023diff -urNp linux-2.6.32.9/drivers/gpu/vga/vgaarb.c linux-2.6.32.9/drivers/gpu/vga/vgaarb.c 23008diff -urNp linux-2.6.32.10/drivers/gpu/vga/vgaarb.c linux-2.6.32.10/drivers/gpu/vga/vgaarb.c
23024--- linux-2.6.32.9/drivers/gpu/vga/vgaarb.c 2010-02-23 10:38:51.000000000 -0500 23009--- linux-2.6.32.10/drivers/gpu/vga/vgaarb.c 2010-03-15 11:52:04.000000000 -0400
23025+++ linux-2.6.32.9/drivers/gpu/vga/vgaarb.c 2010-03-11 20:25:00.125635179 -0500 23010+++ linux-2.6.32.10/drivers/gpu/vga/vgaarb.c 2010-03-20 15:58:47.062125591 -0400
23026@@ -961,7 +961,7 @@ static ssize_t vga_arb_write(struct file 23011@@ -961,7 +961,7 @@ static ssize_t vga_arb_write(struct file
23027 remaining -= 7; 23012 remaining -= 7;
23028 pr_devel("client 0x%p called 'target'\n", priv); 23013 pr_devel("client 0x%p called 'target'\n", priv);
@@ -23032,9 +23017,9 @@ diff -urNp linux-2.6.32.9/drivers/gpu/vga/vgaarb.c linux-2.6.32.9/drivers/gpu/vg
23032 pdev = pci_dev_get(vga_default_device()); 23017 pdev = pci_dev_get(vga_default_device());
23033 else { 23018 else {
23034 if (!vga_pci_str_to_vars(curr_pos, remaining, 23019 if (!vga_pci_str_to_vars(curr_pos, remaining,
23035diff -urNp linux-2.6.32.9/drivers/hwmon/k8temp.c linux-2.6.32.9/drivers/hwmon/k8temp.c 23020diff -urNp linux-2.6.32.10/drivers/hwmon/k8temp.c linux-2.6.32.10/drivers/hwmon/k8temp.c
23036--- linux-2.6.32.9/drivers/hwmon/k8temp.c 2010-02-23 10:38:51.000000000 -0500 23021--- linux-2.6.32.10/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400
23037+++ linux-2.6.32.9/drivers/hwmon/k8temp.c 2010-03-11 20:25:00.125635179 -0500 23022+++ linux-2.6.32.10/drivers/hwmon/k8temp.c 2010-03-20 15:58:47.062125591 -0400
23038@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n 23023@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
23039 23024
23040 static struct pci_device_id k8temp_ids[] = { 23025 static struct pci_device_id k8temp_ids[] = {
@@ -23044,9 +23029,9 @@ diff -urNp linux-2.6.32.9/drivers/hwmon/k8temp.c linux-2.6.32.9/drivers/hwmon/k8
23044 }; 23029 };
23045 23030
23046 MODULE_DEVICE_TABLE(pci, k8temp_ids); 23031 MODULE_DEVICE_TABLE(pci, k8temp_ids);
23047diff -urNp linux-2.6.32.9/drivers/hwmon/sis5595.c linux-2.6.32.9/drivers/hwmon/sis5595.c 23032diff -urNp linux-2.6.32.10/drivers/hwmon/sis5595.c linux-2.6.32.10/drivers/hwmon/sis5595.c
23048--- linux-2.6.32.9/drivers/hwmon/sis5595.c 2010-02-23 10:38:51.000000000 -0500 23033--- linux-2.6.32.10/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400
23049+++ linux-2.6.32.9/drivers/hwmon/sis5595.c 2010-03-11 20:25:00.125635179 -0500 23034+++ linux-2.6.32.10/drivers/hwmon/sis5595.c 2010-03-20 15:58:47.062125591 -0400
23050@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda 23035@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
23051 23036
23052 static struct pci_device_id sis5595_pci_ids[] = { 23037 static struct pci_device_id sis5595_pci_ids[] = {
@@ -23056,9 +23041,9 @@ diff -urNp linux-2.6.32.9/drivers/hwmon/sis5595.c linux-2.6.32.9/drivers/hwmon/s
23056 }; 23041 };
23057 23042
23058 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); 23043 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
23059diff -urNp linux-2.6.32.9/drivers/hwmon/via686a.c linux-2.6.32.9/drivers/hwmon/via686a.c 23044diff -urNp linux-2.6.32.10/drivers/hwmon/via686a.c linux-2.6.32.10/drivers/hwmon/via686a.c
23060--- linux-2.6.32.9/drivers/hwmon/via686a.c 2010-02-23 10:38:51.000000000 -0500 23045--- linux-2.6.32.10/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400
23061+++ linux-2.6.32.9/drivers/hwmon/via686a.c 2010-03-11 20:25:00.125635179 -0500 23046+++ linux-2.6.32.10/drivers/hwmon/via686a.c 2010-03-20 15:58:47.062125591 -0400
23062@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda 23047@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
23063 23048
23064 static struct pci_device_id via686a_pci_ids[] = { 23049 static struct pci_device_id via686a_pci_ids[] = {
@@ -23068,9 +23053,9 @@ diff -urNp linux-2.6.32.9/drivers/hwmon/via686a.c linux-2.6.32.9/drivers/hwmon/v
23068 }; 23053 };
23069 23054
23070 MODULE_DEVICE_TABLE(pci, via686a_pci_ids); 23055 MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
23071diff -urNp linux-2.6.32.9/drivers/hwmon/vt8231.c linux-2.6.32.9/drivers/hwmon/vt8231.c 23056diff -urNp linux-2.6.32.10/drivers/hwmon/vt8231.c linux-2.6.32.10/drivers/hwmon/vt8231.c
23072--- linux-2.6.32.9/drivers/hwmon/vt8231.c 2010-02-23 10:38:51.000000000 -0500 23057--- linux-2.6.32.10/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400
23073+++ linux-2.6.32.9/drivers/hwmon/vt8231.c 2010-03-11 20:25:00.129411700 -0500 23058+++ linux-2.6.32.10/drivers/hwmon/vt8231.c 2010-03-20 15:58:47.062125591 -0400
23074@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri 23059@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
23075 23060
23076 static struct pci_device_id vt8231_pci_ids[] = { 23061 static struct pci_device_id vt8231_pci_ids[] = {
@@ -23080,9 +23065,9 @@ diff -urNp linux-2.6.32.9/drivers/hwmon/vt8231.c linux-2.6.32.9/drivers/hwmon/vt
23080 }; 23065 };
23081 23066
23082 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); 23067 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
23083diff -urNp linux-2.6.32.9/drivers/hwmon/w83791d.c linux-2.6.32.9/drivers/hwmon/w83791d.c 23068diff -urNp linux-2.6.32.10/drivers/hwmon/w83791d.c linux-2.6.32.10/drivers/hwmon/w83791d.c
23084--- linux-2.6.32.9/drivers/hwmon/w83791d.c 2010-02-23 10:38:51.000000000 -0500 23069--- linux-2.6.32.10/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400
23085+++ linux-2.6.32.9/drivers/hwmon/w83791d.c 2010-03-11 20:25:00.129411700 -0500 23070+++ linux-2.6.32.10/drivers/hwmon/w83791d.c 2010-03-20 15:58:47.062125591 -0400
23086@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli 23071@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
23087 struct i2c_board_info *info); 23072 struct i2c_board_info *info);
23088 static int w83791d_remove(struct i2c_client *client); 23073 static int w83791d_remove(struct i2c_client *client);
@@ -23094,9 +23079,9 @@ diff -urNp linux-2.6.32.9/drivers/hwmon/w83791d.c linux-2.6.32.9/drivers/hwmon/w
23094 static struct w83791d_data *w83791d_update_device(struct device *dev); 23079 static struct w83791d_data *w83791d_update_device(struct device *dev);
23095 23080
23096 #ifdef DEBUG 23081 #ifdef DEBUG
23097diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-i801.c linux-2.6.32.9/drivers/i2c/busses/i2c-i801.c 23082diff -urNp linux-2.6.32.10/drivers/i2c/busses/i2c-i801.c linux-2.6.32.10/drivers/i2c/busses/i2c-i801.c
23098--- linux-2.6.32.9/drivers/i2c/busses/i2c-i801.c 2010-02-23 10:38:51.000000000 -0500 23083--- linux-2.6.32.10/drivers/i2c/busses/i2c-i801.c 2010-03-15 11:52:04.000000000 -0400
23099+++ linux-2.6.32.9/drivers/i2c/busses/i2c-i801.c 2010-03-11 20:25:00.129411700 -0500 23084+++ linux-2.6.32.10/drivers/i2c/busses/i2c-i801.c 2010-03-20 15:58:47.062125591 -0400
23100@@ -578,7 +578,7 @@ static struct pci_device_id i801_ids[] = 23085@@ -578,7 +578,7 @@ static struct pci_device_id i801_ids[] =
23101 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) }, 23086 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
23102 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, 23087 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
@@ -23106,9 +23091,9 @@ diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-i801.c linux-2.6.32.9/drivers/i
23106 }; 23091 };
23107 23092
23108 MODULE_DEVICE_TABLE (pci, i801_ids); 23093 MODULE_DEVICE_TABLE (pci, i801_ids);
23109diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.9/drivers/i2c/busses/i2c-piix4.c 23094diff -urNp linux-2.6.32.10/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.10/drivers/i2c/busses/i2c-piix4.c
23110--- linux-2.6.32.9/drivers/i2c/busses/i2c-piix4.c 2010-02-23 10:38:51.000000000 -0500 23095--- linux-2.6.32.10/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400
23111+++ linux-2.6.32.9/drivers/i2c/busses/i2c-piix4.c 2010-03-11 20:25:00.129411700 -0500 23096+++ linux-2.6.32.10/drivers/i2c/busses/i2c-piix4.c 2010-03-20 15:58:47.062125591 -0400
23112@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat 23097@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
23113 .ident = "IBM", 23098 .ident = "IBM",
23114 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, 23099 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -23127,9 +23112,9 @@ diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.9/drivers/
23127 }; 23112 };
23128 23113
23129 MODULE_DEVICE_TABLE (pci, piix4_ids); 23114 MODULE_DEVICE_TABLE (pci, piix4_ids);
23130diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.9/drivers/i2c/busses/i2c-sis630.c 23115diff -urNp linux-2.6.32.10/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.10/drivers/i2c/busses/i2c-sis630.c
23131--- linux-2.6.32.9/drivers/i2c/busses/i2c-sis630.c 2010-02-23 10:38:51.000000000 -0500 23116--- linux-2.6.32.10/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400
23132+++ linux-2.6.32.9/drivers/i2c/busses/i2c-sis630.c 2010-03-11 20:25:00.129411700 -0500 23117+++ linux-2.6.32.10/drivers/i2c/busses/i2c-sis630.c 2010-03-20 15:58:47.062125591 -0400
23133@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter 23118@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
23134 static struct pci_device_id sis630_ids[] __devinitdata = { 23119 static struct pci_device_id sis630_ids[] __devinitdata = {
23135 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, 23120 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
@@ -23139,9 +23124,9 @@ diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.9/drivers
23139 }; 23124 };
23140 23125
23141 MODULE_DEVICE_TABLE (pci, sis630_ids); 23126 MODULE_DEVICE_TABLE (pci, sis630_ids);
23142diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.9/drivers/i2c/busses/i2c-sis96x.c 23127diff -urNp linux-2.6.32.10/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.10/drivers/i2c/busses/i2c-sis96x.c
23143--- linux-2.6.32.9/drivers/i2c/busses/i2c-sis96x.c 2010-02-23 10:38:51.000000000 -0500 23128--- linux-2.6.32.10/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400
23144+++ linux-2.6.32.9/drivers/i2c/busses/i2c-sis96x.c 2010-03-11 20:25:00.129411700 -0500 23129+++ linux-2.6.32.10/drivers/i2c/busses/i2c-sis96x.c 2010-03-20 15:58:47.062125591 -0400
23145@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter 23130@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
23146 23131
23147 static struct pci_device_id sis96x_ids[] = { 23132 static struct pci_device_id sis96x_ids[] = {
@@ -23151,9 +23136,9 @@ diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.9/drivers
23151 }; 23136 };
23152 23137
23153 MODULE_DEVICE_TABLE (pci, sis96x_ids); 23138 MODULE_DEVICE_TABLE (pci, sis96x_ids);
23154diff -urNp linux-2.6.32.9/drivers/ide/ide-cd.c linux-2.6.32.9/drivers/ide/ide-cd.c 23139diff -urNp linux-2.6.32.10/drivers/ide/ide-cd.c linux-2.6.32.10/drivers/ide/ide-cd.c
23155--- linux-2.6.32.9/drivers/ide/ide-cd.c 2010-02-23 10:38:51.000000000 -0500 23140--- linux-2.6.32.10/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400
23156+++ linux-2.6.32.9/drivers/ide/ide-cd.c 2010-03-11 20:25:00.129411700 -0500 23141+++ linux-2.6.32.10/drivers/ide/ide-cd.c 2010-03-20 15:58:47.062125591 -0400
23157@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ 23142@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_
23158 alignment = queue_dma_alignment(q) | q->dma_pad_mask; 23143 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
23159 if ((unsigned long)buf & alignment 23144 if ((unsigned long)buf & alignment
@@ -23163,9 +23148,9 @@ diff -urNp linux-2.6.32.9/drivers/ide/ide-cd.c linux-2.6.32.9/drivers/ide/ide-cd
23163 drive->dma = 0; 23148 drive->dma = 0;
23164 } 23149 }
23165 } 23150 }
23166diff -urNp linux-2.6.32.9/drivers/ieee1394/dv1394.c linux-2.6.32.9/drivers/ieee1394/dv1394.c 23151diff -urNp linux-2.6.32.10/drivers/ieee1394/dv1394.c linux-2.6.32.10/drivers/ieee1394/dv1394.c
23167--- linux-2.6.32.9/drivers/ieee1394/dv1394.c 2010-02-23 10:38:51.000000000 -0500 23152--- linux-2.6.32.10/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400
23168+++ linux-2.6.32.9/drivers/ieee1394/dv1394.c 2010-03-11 20:25:00.129411700 -0500 23153+++ linux-2.6.32.10/drivers/ieee1394/dv1394.c 2010-03-20 15:58:47.062125591 -0400
23169@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c 23154@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
23170 based upon DIF section and sequence 23155 based upon DIF section and sequence
23171 */ 23156 */
@@ -23184,9 +23169,9 @@ diff -urNp linux-2.6.32.9/drivers/ieee1394/dv1394.c linux-2.6.32.9/drivers/ieee1
23184 }; 23169 };
23185 23170
23186 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); 23171 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
23187diff -urNp linux-2.6.32.9/drivers/ieee1394/eth1394.c linux-2.6.32.9/drivers/ieee1394/eth1394.c 23172diff -urNp linux-2.6.32.10/drivers/ieee1394/eth1394.c linux-2.6.32.10/drivers/ieee1394/eth1394.c
23188--- linux-2.6.32.9/drivers/ieee1394/eth1394.c 2010-02-23 10:38:51.000000000 -0500 23173--- linux-2.6.32.10/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400
23189+++ linux-2.6.32.9/drivers/ieee1394/eth1394.c 2010-03-11 20:25:00.129411700 -0500 23174+++ linux-2.6.32.10/drivers/ieee1394/eth1394.c 2010-03-20 15:58:47.062125591 -0400
23190@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e 23175@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
23191 .specifier_id = ETHER1394_GASP_SPECIFIER_ID, 23176 .specifier_id = ETHER1394_GASP_SPECIFIER_ID,
23192 .version = ETHER1394_GASP_VERSION, 23177 .version = ETHER1394_GASP_VERSION,
@@ -23196,9 +23181,9 @@ diff -urNp linux-2.6.32.9/drivers/ieee1394/eth1394.c linux-2.6.32.9/drivers/ieee
23196 }; 23181 };
23197 23182
23198 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); 23183 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
23199diff -urNp linux-2.6.32.9/drivers/ieee1394/hosts.c linux-2.6.32.9/drivers/ieee1394/hosts.c 23184diff -urNp linux-2.6.32.10/drivers/ieee1394/hosts.c linux-2.6.32.10/drivers/ieee1394/hosts.c
23200--- linux-2.6.32.9/drivers/ieee1394/hosts.c 2010-02-23 10:38:51.000000000 -0500 23185--- linux-2.6.32.10/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400
23201+++ linux-2.6.32.9/drivers/ieee1394/hosts.c 2010-03-11 20:25:00.129411700 -0500 23186+++ linux-2.6.32.10/drivers/ieee1394/hosts.c 2010-03-20 15:58:47.062125591 -0400
23202@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso 23187@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
23203 } 23188 }
23204 23189
@@ -23207,9 +23192,9 @@ diff -urNp linux-2.6.32.9/drivers/ieee1394/hosts.c linux-2.6.32.9/drivers/ieee13
23207 .transmit_packet = dummy_transmit_packet, 23192 .transmit_packet = dummy_transmit_packet,
23208 .devctl = dummy_devctl, 23193 .devctl = dummy_devctl,
23209 .isoctl = dummy_isoctl 23194 .isoctl = dummy_isoctl
23210diff -urNp linux-2.6.32.9/drivers/ieee1394/ohci1394.c linux-2.6.32.9/drivers/ieee1394/ohci1394.c 23195diff -urNp linux-2.6.32.10/drivers/ieee1394/ohci1394.c linux-2.6.32.10/drivers/ieee1394/ohci1394.c
23211--- linux-2.6.32.9/drivers/ieee1394/ohci1394.c 2010-02-23 10:38:51.000000000 -0500 23196--- linux-2.6.32.10/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400
23212+++ linux-2.6.32.9/drivers/ieee1394/ohci1394.c 2010-03-11 20:25:00.129411700 -0500 23197+++ linux-2.6.32.10/drivers/ieee1394/ohci1394.c 2010-03-20 15:58:47.062125591 -0400
23213@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ 23198@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
23214 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) 23199 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
23215 23200
@@ -23231,9 +23216,9 @@ diff -urNp linux-2.6.32.9/drivers/ieee1394/ohci1394.c linux-2.6.32.9/drivers/iee
23231 }; 23216 };
23232 23217
23233 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); 23218 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
23234diff -urNp linux-2.6.32.9/drivers/ieee1394/raw1394.c linux-2.6.32.9/drivers/ieee1394/raw1394.c 23219diff -urNp linux-2.6.32.10/drivers/ieee1394/raw1394.c linux-2.6.32.10/drivers/ieee1394/raw1394.c
23235--- linux-2.6.32.9/drivers/ieee1394/raw1394.c 2010-02-23 10:38:51.000000000 -0500 23220--- linux-2.6.32.10/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400
23236+++ linux-2.6.32.9/drivers/ieee1394/raw1394.c 2010-03-11 20:25:00.129411700 -0500 23221+++ linux-2.6.32.10/drivers/ieee1394/raw1394.c 2010-03-20 15:58:47.066062568 -0400
23237@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r 23222@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
23238 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 23223 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
23239 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 23224 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -23243,9 +23228,9 @@ diff -urNp linux-2.6.32.9/drivers/ieee1394/raw1394.c linux-2.6.32.9/drivers/ieee
23243 }; 23228 };
23244 23229
23245 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); 23230 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
23246diff -urNp linux-2.6.32.9/drivers/ieee1394/sbp2.c linux-2.6.32.9/drivers/ieee1394/sbp2.c 23231diff -urNp linux-2.6.32.10/drivers/ieee1394/sbp2.c linux-2.6.32.10/drivers/ieee1394/sbp2.c
23247--- linux-2.6.32.9/drivers/ieee1394/sbp2.c 2010-02-23 10:38:51.000000000 -0500 23232--- linux-2.6.32.10/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400
23248+++ linux-2.6.32.9/drivers/ieee1394/sbp2.c 2010-03-11 20:25:00.133674261 -0500 23233+++ linux-2.6.32.10/drivers/ieee1394/sbp2.c 2010-03-20 15:58:47.066062568 -0400
23249@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s 23234@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s
23250 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 23235 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
23251 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, 23236 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -23264,9 +23249,9 @@ diff -urNp linux-2.6.32.9/drivers/ieee1394/sbp2.c linux-2.6.32.9/drivers/ieee139
23264 { 23249 {
23265 int ret; 23250 int ret;
23266 23251
23267diff -urNp linux-2.6.32.9/drivers/ieee1394/video1394.c linux-2.6.32.9/drivers/ieee1394/video1394.c 23252diff -urNp linux-2.6.32.10/drivers/ieee1394/video1394.c linux-2.6.32.10/drivers/ieee1394/video1394.c
23268--- linux-2.6.32.9/drivers/ieee1394/video1394.c 2010-02-23 10:38:51.000000000 -0500 23253--- linux-2.6.32.10/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400
23269+++ linux-2.6.32.9/drivers/ieee1394/video1394.c 2010-03-11 20:25:00.133674261 -0500 23254+++ linux-2.6.32.10/drivers/ieee1394/video1394.c 2010-03-20 15:58:47.066062568 -0400
23270@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v 23255@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
23271 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 23256 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
23272 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff 23257 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
@@ -23276,9 +23261,9 @@ diff -urNp linux-2.6.32.9/drivers/ieee1394/video1394.c linux-2.6.32.9/drivers/ie
23276 }; 23261 };
23277 23262
23278 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); 23263 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
23279diff -urNp linux-2.6.32.9/drivers/infiniband/core/cm.c linux-2.6.32.9/drivers/infiniband/core/cm.c 23264diff -urNp linux-2.6.32.10/drivers/infiniband/core/cm.c linux-2.6.32.10/drivers/infiniband/core/cm.c
23280--- linux-2.6.32.9/drivers/infiniband/core/cm.c 2010-02-23 10:38:51.000000000 -0500 23265--- linux-2.6.32.10/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400
23281+++ linux-2.6.32.9/drivers/infiniband/core/cm.c 2010-03-11 20:25:00.133674261 -0500 23266+++ linux-2.6.32.10/drivers/infiniband/core/cm.c 2010-03-20 15:58:47.066062568 -0400
23282@@ -112,7 +112,7 @@ static char const counter_group_names[CM 23267@@ -112,7 +112,7 @@ static char const counter_group_names[CM
23283 23268
23284 struct cm_counter_group { 23269 struct cm_counter_group {
@@ -23422,9 +23407,9 @@ diff -urNp linux-2.6.32.9/drivers/infiniband/core/cm.c linux-2.6.32.9/drivers/in
23422 .show = cm_show_counter 23407 .show = cm_show_counter
23423 }; 23408 };
23424 23409
23425diff -urNp linux-2.6.32.9/drivers/infiniband/core/sysfs.c linux-2.6.32.9/drivers/infiniband/core/sysfs.c 23410diff -urNp linux-2.6.32.10/drivers/infiniband/core/sysfs.c linux-2.6.32.10/drivers/infiniband/core/sysfs.c
23426--- linux-2.6.32.9/drivers/infiniband/core/sysfs.c 2010-02-23 10:38:51.000000000 -0500 23411--- linux-2.6.32.10/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400
23427+++ linux-2.6.32.9/drivers/infiniband/core/sysfs.c 2010-03-11 20:25:00.133674261 -0500 23412+++ linux-2.6.32.10/drivers/infiniband/core/sysfs.c 2010-03-20 15:58:47.066062568 -0400
23428@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob 23413@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
23429 return port_attr->show(p, port_attr, buf); 23414 return port_attr->show(p, port_attr, buf);
23430 } 23415 }
@@ -23434,9 +23419,9 @@ diff -urNp linux-2.6.32.9/drivers/infiniband/core/sysfs.c linux-2.6.32.9/drivers
23434 .show = port_attr_show 23419 .show = port_attr_show
23435 }; 23420 };
23436 23421
23437diff -urNp linux-2.6.32.9/drivers/input/keyboard/atkbd.c linux-2.6.32.9/drivers/input/keyboard/atkbd.c 23422diff -urNp linux-2.6.32.10/drivers/input/keyboard/atkbd.c linux-2.6.32.10/drivers/input/keyboard/atkbd.c
23438--- linux-2.6.32.9/drivers/input/keyboard/atkbd.c 2010-02-23 10:38:51.000000000 -0500 23423--- linux-2.6.32.10/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400
23439+++ linux-2.6.32.9/drivers/input/keyboard/atkbd.c 2010-03-11 20:25:00.133674261 -0500 23424+++ linux-2.6.32.10/drivers/input/keyboard/atkbd.c 2010-03-20 15:58:47.066062568 -0400
23440@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri 23425@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
23441 .id = SERIO_ANY, 23426 .id = SERIO_ANY,
23442 .extra = SERIO_ANY, 23427 .extra = SERIO_ANY,
@@ -23446,9 +23431,9 @@ diff -urNp linux-2.6.32.9/drivers/input/keyboard/atkbd.c linux-2.6.32.9/drivers/
23446 }; 23431 };
23447 23432
23448 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); 23433 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
23449diff -urNp linux-2.6.32.9/drivers/input/mouse/lifebook.c linux-2.6.32.9/drivers/input/mouse/lifebook.c 23434diff -urNp linux-2.6.32.10/drivers/input/mouse/lifebook.c linux-2.6.32.10/drivers/input/mouse/lifebook.c
23450--- linux-2.6.32.9/drivers/input/mouse/lifebook.c 2010-02-23 10:38:51.000000000 -0500 23435--- linux-2.6.32.10/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400
23451+++ linux-2.6.32.9/drivers/input/mouse/lifebook.c 2010-03-11 20:25:00.133674261 -0500 23436+++ linux-2.6.32.10/drivers/input/mouse/lifebook.c 2010-03-20 15:58:47.066062568 -0400
23452@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo 23437@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
23453 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), 23438 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
23454 }, 23439 },
@@ -23458,9 +23443,9 @@ diff -urNp linux-2.6.32.9/drivers/input/mouse/lifebook.c linux-2.6.32.9/drivers/
23458 }; 23443 };
23459 23444
23460 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) 23445 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
23461diff -urNp linux-2.6.32.9/drivers/input/mouse/psmouse-base.c linux-2.6.32.9/drivers/input/mouse/psmouse-base.c 23446diff -urNp linux-2.6.32.10/drivers/input/mouse/psmouse-base.c linux-2.6.32.10/drivers/input/mouse/psmouse-base.c
23462--- linux-2.6.32.9/drivers/input/mouse/psmouse-base.c 2010-02-23 10:38:51.000000000 -0500 23447--- linux-2.6.32.10/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400
23463+++ linux-2.6.32.9/drivers/input/mouse/psmouse-base.c 2010-03-11 20:25:00.133674261 -0500 23448+++ linux-2.6.32.10/drivers/input/mouse/psmouse-base.c 2010-03-20 15:58:47.066062568 -0400
23464@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se 23449@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se
23465 .id = SERIO_ANY, 23450 .id = SERIO_ANY,
23466 .extra = SERIO_ANY, 23451 .extra = SERIO_ANY,
@@ -23470,9 +23455,9 @@ diff -urNp linux-2.6.32.9/drivers/input/mouse/psmouse-base.c linux-2.6.32.9/driv
23470 }; 23455 };
23471 23456
23472 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); 23457 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
23473diff -urNp linux-2.6.32.9/drivers/input/mouse/synaptics.c linux-2.6.32.9/drivers/input/mouse/synaptics.c 23458diff -urNp linux-2.6.32.10/drivers/input/mouse/synaptics.c linux-2.6.32.10/drivers/input/mouse/synaptics.c
23474--- linux-2.6.32.9/drivers/input/mouse/synaptics.c 2010-02-23 10:38:51.000000000 -0500 23459--- linux-2.6.32.10/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400
23475+++ linux-2.6.32.9/drivers/input/mouse/synaptics.c 2010-03-11 20:25:00.133674261 -0500 23460+++ linux-2.6.32.10/drivers/input/mouse/synaptics.c 2010-03-20 15:58:47.066062568 -0400
23476@@ -437,7 +437,7 @@ static void synaptics_process_packet(str 23461@@ -437,7 +437,7 @@ static void synaptics_process_packet(str
23477 break; 23462 break;
23478 case 2: 23463 case 2:
@@ -23501,9 +23486,9 @@ diff -urNp linux-2.6.32.9/drivers/input/mouse/synaptics.c linux-2.6.32.9/drivers
23501 }; 23486 };
23502 #endif 23487 #endif
23503 23488
23504diff -urNp linux-2.6.32.9/drivers/input/mousedev.c linux-2.6.32.9/drivers/input/mousedev.c 23489diff -urNp linux-2.6.32.10/drivers/input/mousedev.c linux-2.6.32.10/drivers/input/mousedev.c
23505--- linux-2.6.32.9/drivers/input/mousedev.c 2010-02-23 10:38:51.000000000 -0500 23490--- linux-2.6.32.10/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400
23506+++ linux-2.6.32.9/drivers/input/mousedev.c 2010-03-11 20:25:00.133674261 -0500 23491+++ linux-2.6.32.10/drivers/input/mousedev.c 2010-03-20 15:58:47.066062568 -0400
23507@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han 23492@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
23508 23493
23509 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX 23494 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -23513,9 +23498,9 @@ diff -urNp linux-2.6.32.9/drivers/input/mousedev.c linux-2.6.32.9/drivers/input/
23513 }; 23498 };
23514 static int psaux_registered; 23499 static int psaux_registered;
23515 #endif 23500 #endif
23516diff -urNp linux-2.6.32.9/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.9/drivers/input/serio/i8042-x86ia64io.h 23501diff -urNp linux-2.6.32.10/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.10/drivers/input/serio/i8042-x86ia64io.h
23517--- linux-2.6.32.9/drivers/input/serio/i8042-x86ia64io.h 2010-02-23 10:38:51.000000000 -0500 23502--- linux-2.6.32.10/drivers/input/serio/i8042-x86ia64io.h 2010-03-15 11:52:04.000000000 -0400
23518+++ linux-2.6.32.9/drivers/input/serio/i8042-x86ia64io.h 2010-03-11 20:25:00.133674261 -0500 23503+++ linux-2.6.32.10/drivers/input/serio/i8042-x86ia64io.h 2010-03-20 15:58:47.066062568 -0400
23519@@ -172,7 +172,7 @@ static const struct dmi_system_id __init 23504@@ -172,7 +172,7 @@ static const struct dmi_system_id __init
23520 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), 23505 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
23521 }, 23506 },
@@ -23570,9 +23555,9 @@ diff -urNp linux-2.6.32.9/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.9/d
23570 }; 23555 };
23571 23556
23572 #endif /* CONFIG_X86 */ 23557 #endif /* CONFIG_X86 */
23573diff -urNp linux-2.6.32.9/drivers/input/serio/serio_raw.c linux-2.6.32.9/drivers/input/serio/serio_raw.c 23558diff -urNp linux-2.6.32.10/drivers/input/serio/serio_raw.c linux-2.6.32.10/drivers/input/serio/serio_raw.c
23574--- linux-2.6.32.9/drivers/input/serio/serio_raw.c 2010-02-23 10:38:51.000000000 -0500 23559--- linux-2.6.32.10/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400
23575+++ linux-2.6.32.9/drivers/input/serio/serio_raw.c 2010-03-11 20:25:00.133674261 -0500 23560+++ linux-2.6.32.10/drivers/input/serio/serio_raw.c 2010-03-20 15:58:47.066062568 -0400
23576@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ 23561@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
23577 .id = SERIO_ANY, 23562 .id = SERIO_ANY,
23578 .extra = SERIO_ANY, 23563 .extra = SERIO_ANY,
@@ -23582,9 +23567,9 @@ diff -urNp linux-2.6.32.9/drivers/input/serio/serio_raw.c linux-2.6.32.9/drivers
23582 }; 23567 };
23583 23568
23584 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); 23569 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
23585diff -urNp linux-2.6.32.9/drivers/isdn/gigaset/common.c linux-2.6.32.9/drivers/isdn/gigaset/common.c 23570diff -urNp linux-2.6.32.10/drivers/isdn/gigaset/common.c linux-2.6.32.10/drivers/isdn/gigaset/common.c
23586--- linux-2.6.32.9/drivers/isdn/gigaset/common.c 2010-02-23 10:38:51.000000000 -0500 23571--- linux-2.6.32.10/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400
23587+++ linux-2.6.32.9/drivers/isdn/gigaset/common.c 2010-03-11 20:25:00.133674261 -0500 23572+++ linux-2.6.32.10/drivers/isdn/gigaset/common.c 2010-03-20 15:58:47.070072193 -0400
23588@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct 23573@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
23589 cs->commands_pending = 0; 23574 cs->commands_pending = 0;
23590 cs->cur_at_seq = 0; 23575 cs->cur_at_seq = 0;
@@ -23594,9 +23579,9 @@ diff -urNp linux-2.6.32.9/drivers/isdn/gigaset/common.c linux-2.6.32.9/drivers/i
23594 cs->dev = NULL; 23579 cs->dev = NULL;
23595 cs->tty = NULL; 23580 cs->tty = NULL;
23596 cs->tty_dev = NULL; 23581 cs->tty_dev = NULL;
23597diff -urNp linux-2.6.32.9/drivers/isdn/gigaset/gigaset.h linux-2.6.32.9/drivers/isdn/gigaset/gigaset.h 23582diff -urNp linux-2.6.32.10/drivers/isdn/gigaset/gigaset.h linux-2.6.32.10/drivers/isdn/gigaset/gigaset.h
23598--- linux-2.6.32.9/drivers/isdn/gigaset/gigaset.h 2010-02-23 10:38:51.000000000 -0500 23583--- linux-2.6.32.10/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400
23599+++ linux-2.6.32.9/drivers/isdn/gigaset/gigaset.h 2010-03-11 20:25:00.133674261 -0500 23584+++ linux-2.6.32.10/drivers/isdn/gigaset/gigaset.h 2010-03-20 15:58:47.070072193 -0400
23600@@ -446,7 +446,7 @@ struct cardstate { 23585@@ -446,7 +446,7 @@ struct cardstate {
23601 spinlock_t cmdlock; 23586 spinlock_t cmdlock;
23602 unsigned curlen, cmdbytes; 23587 unsigned curlen, cmdbytes;
@@ -23606,9 +23591,9 @@ diff -urNp linux-2.6.32.9/drivers/isdn/gigaset/gigaset.h linux-2.6.32.9/drivers/
23606 struct tty_struct *tty; 23591 struct tty_struct *tty;
23607 struct tasklet_struct if_wake_tasklet; 23592 struct tasklet_struct if_wake_tasklet;
23608 unsigned control_state; 23593 unsigned control_state;
23609diff -urNp linux-2.6.32.9/drivers/isdn/gigaset/interface.c linux-2.6.32.9/drivers/isdn/gigaset/interface.c 23594diff -urNp linux-2.6.32.10/drivers/isdn/gigaset/interface.c linux-2.6.32.10/drivers/isdn/gigaset/interface.c
23610--- linux-2.6.32.9/drivers/isdn/gigaset/interface.c 2010-02-23 10:38:51.000000000 -0500 23595--- linux-2.6.32.10/drivers/isdn/gigaset/interface.c 2010-03-15 11:52:04.000000000 -0400
23611+++ linux-2.6.32.9/drivers/isdn/gigaset/interface.c 2010-03-11 20:25:00.133674261 -0500 23596+++ linux-2.6.32.10/drivers/isdn/gigaset/interface.c 2010-03-20 15:58:47.070072193 -0400
23612@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt 23597@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
23613 return -ERESTARTSYS; // FIXME -EINTR? 23598 return -ERESTARTSYS; // FIXME -EINTR?
23614 tty->driver_data = cs; 23599 tty->driver_data = cs;
@@ -23696,9 +23681,9 @@ diff -urNp linux-2.6.32.9/drivers/isdn/gigaset/interface.c linux-2.6.32.9/driver
23696 dev_warn(cs->dev, "%s: device not opened\n", __func__); 23681 dev_warn(cs->dev, "%s: device not opened\n", __func__);
23697 goto out; 23682 goto out;
23698 } 23683 }
23699diff -urNp linux-2.6.32.9/drivers/isdn/hardware/avm/b1.c linux-2.6.32.9/drivers/isdn/hardware/avm/b1.c 23684diff -urNp linux-2.6.32.10/drivers/isdn/hardware/avm/b1.c linux-2.6.32.10/drivers/isdn/hardware/avm/b1.c
23700--- linux-2.6.32.9/drivers/isdn/hardware/avm/b1.c 2010-02-23 10:38:51.000000000 -0500 23685--- linux-2.6.32.10/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400
23701+++ linux-2.6.32.9/drivers/isdn/hardware/avm/b1.c 2010-03-11 20:25:00.133674261 -0500 23686+++ linux-2.6.32.10/drivers/isdn/hardware/avm/b1.c 2010-03-20 15:58:47.070072193 -0400
23702@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo 23687@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
23703 } 23688 }
23704 if (left) { 23689 if (left) {
@@ -23717,9 +23702,9 @@ diff -urNp linux-2.6.32.9/drivers/isdn/hardware/avm/b1.c linux-2.6.32.9/drivers/
23717 return -EFAULT; 23702 return -EFAULT;
23718 } else { 23703 } else {
23719 memcpy(buf, dp, left); 23704 memcpy(buf, dp, left);
23720diff -urNp linux-2.6.32.9/drivers/isdn/icn/icn.c linux-2.6.32.9/drivers/isdn/icn/icn.c 23705diff -urNp linux-2.6.32.10/drivers/isdn/icn/icn.c linux-2.6.32.10/drivers/isdn/icn/icn.c
23721--- linux-2.6.32.9/drivers/isdn/icn/icn.c 2010-02-23 10:38:51.000000000 -0500 23706--- linux-2.6.32.10/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400
23722+++ linux-2.6.32.9/drivers/isdn/icn/icn.c 2010-03-11 20:25:00.137474668 -0500 23707+++ linux-2.6.32.10/drivers/isdn/icn/icn.c 2010-03-20 15:58:47.070072193 -0400
23723@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len 23708@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
23724 if (count > len) 23709 if (count > len)
23725 count = len; 23710 count = len;
@@ -23729,9 +23714,9 @@ diff -urNp linux-2.6.32.9/drivers/isdn/icn/icn.c linux-2.6.32.9/drivers/isdn/icn
23729 return -EFAULT; 23714 return -EFAULT;
23730 } else 23715 } else
23731 memcpy(msg, buf, count); 23716 memcpy(msg, buf, count);
23732diff -urNp linux-2.6.32.9/drivers/lguest/core.c linux-2.6.32.9/drivers/lguest/core.c 23717diff -urNp linux-2.6.32.10/drivers/lguest/core.c linux-2.6.32.10/drivers/lguest/core.c
23733--- linux-2.6.32.9/drivers/lguest/core.c 2010-02-23 10:38:51.000000000 -0500 23718--- linux-2.6.32.10/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400
23734+++ linux-2.6.32.9/drivers/lguest/core.c 2010-03-11 20:25:00.137474668 -0500 23719+++ linux-2.6.32.10/drivers/lguest/core.c 2010-03-20 15:58:47.070072193 -0400
23735@@ -91,9 +91,17 @@ static __init int map_switcher(void) 23720@@ -91,9 +91,17 @@ static __init int map_switcher(void)
23736 * it's worked so far. The end address needs +1 because __get_vm_area 23721 * it's worked so far. The end address needs +1 because __get_vm_area
23737 * allocates an extra guard page, so we need space for that. 23722 * allocates an extra guard page, so we need space for that.
@@ -23750,9 +23735,9 @@ diff -urNp linux-2.6.32.9/drivers/lguest/core.c linux-2.6.32.9/drivers/lguest/co
23750 if (!switcher_vma) { 23735 if (!switcher_vma) {
23751 err = -ENOMEM; 23736 err = -ENOMEM;
23752 printk("lguest: could not map switcher pages high\n"); 23737 printk("lguest: could not map switcher pages high\n");
23753diff -urNp linux-2.6.32.9/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.9/drivers/macintosh/via-pmu-backlight.c 23738diff -urNp linux-2.6.32.10/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.10/drivers/macintosh/via-pmu-backlight.c
23754--- linux-2.6.32.9/drivers/macintosh/via-pmu-backlight.c 2010-02-23 10:38:51.000000000 -0500 23739--- linux-2.6.32.10/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400
23755+++ linux-2.6.32.9/drivers/macintosh/via-pmu-backlight.c 2010-03-11 20:25:00.137474668 -0500 23740+++ linux-2.6.32.10/drivers/macintosh/via-pmu-backlight.c 2010-03-20 15:58:47.070072193 -0400
23756@@ -15,7 +15,7 @@ 23741@@ -15,7 +15,7 @@
23757 23742
23758 #define MAX_PMU_LEVEL 0xFF 23743 #define MAX_PMU_LEVEL 0xFF
@@ -23771,9 +23756,9 @@ diff -urNp linux-2.6.32.9/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.9/d
23771 .get_brightness = pmu_backlight_get_brightness, 23756 .get_brightness = pmu_backlight_get_brightness,
23772 .update_status = pmu_backlight_update_status, 23757 .update_status = pmu_backlight_update_status,
23773 23758
23774diff -urNp linux-2.6.32.9/drivers/macintosh/via-pmu.c linux-2.6.32.9/drivers/macintosh/via-pmu.c 23759diff -urNp linux-2.6.32.10/drivers/macintosh/via-pmu.c linux-2.6.32.10/drivers/macintosh/via-pmu.c
23775--- linux-2.6.32.9/drivers/macintosh/via-pmu.c 2010-02-23 10:38:51.000000000 -0500 23760--- linux-2.6.32.10/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400
23776+++ linux-2.6.32.9/drivers/macintosh/via-pmu.c 2010-03-11 20:25:00.137474668 -0500 23761+++ linux-2.6.32.10/drivers/macintosh/via-pmu.c 2010-03-20 15:58:47.070072193 -0400
23777@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state 23762@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
23778 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); 23763 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
23779 } 23764 }
@@ -23783,9 +23768,9 @@ diff -urNp linux-2.6.32.9/drivers/macintosh/via-pmu.c linux-2.6.32.9/drivers/mac
23783 .enter = powerbook_sleep, 23768 .enter = powerbook_sleep,
23784 .valid = pmu_sleep_valid, 23769 .valid = pmu_sleep_valid,
23785 }; 23770 };
23786diff -urNp linux-2.6.32.9/drivers/md/bitmap.c linux-2.6.32.9/drivers/md/bitmap.c 23771diff -urNp linux-2.6.32.10/drivers/md/bitmap.c linux-2.6.32.10/drivers/md/bitmap.c
23787--- linux-2.6.32.9/drivers/md/bitmap.c 2010-02-23 10:38:51.000000000 -0500 23772--- linux-2.6.32.10/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400
23788+++ linux-2.6.32.9/drivers/md/bitmap.c 2010-03-11 20:25:00.137474668 -0500 23773+++ linux-2.6.32.10/drivers/md/bitmap.c 2010-03-20 15:58:47.070072193 -0400
23789@@ -58,7 +58,7 @@ 23774@@ -58,7 +58,7 @@
23790 # if DEBUG > 0 23775 # if DEBUG > 0
23791 # define PRINTK(x...) printk(KERN_DEBUG x) 23776 # define PRINTK(x...) printk(KERN_DEBUG x)
@@ -23795,9 +23780,9 @@ diff -urNp linux-2.6.32.9/drivers/md/bitmap.c linux-2.6.32.9/drivers/md/bitmap.c
23795 # endif 23780 # endif
23796 #endif 23781 #endif
23797 23782
23798diff -urNp linux-2.6.32.9/drivers/md/dm-sysfs.c linux-2.6.32.9/drivers/md/dm-sysfs.c 23783diff -urNp linux-2.6.32.10/drivers/md/dm-sysfs.c linux-2.6.32.10/drivers/md/dm-sysfs.c
23799--- linux-2.6.32.9/drivers/md/dm-sysfs.c 2010-02-23 10:38:51.000000000 -0500 23784--- linux-2.6.32.10/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400
23800+++ linux-2.6.32.9/drivers/md/dm-sysfs.c 2010-03-11 20:25:00.137474668 -0500 23785+++ linux-2.6.32.10/drivers/md/dm-sysfs.c 2010-03-20 15:58:47.070072193 -0400
23801@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { 23786@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
23802 NULL, 23787 NULL,
23803 }; 23788 };
@@ -23807,9 +23792,9 @@ diff -urNp linux-2.6.32.9/drivers/md/dm-sysfs.c linux-2.6.32.9/drivers/md/dm-sys
23807 .show = dm_attr_show, 23792 .show = dm_attr_show,
23808 }; 23793 };
23809 23794
23810diff -urNp linux-2.6.32.9/drivers/md/dm-table.c linux-2.6.32.9/drivers/md/dm-table.c 23795diff -urNp linux-2.6.32.10/drivers/md/dm-table.c linux-2.6.32.10/drivers/md/dm-table.c
23811--- linux-2.6.32.9/drivers/md/dm-table.c 2010-02-23 10:38:51.000000000 -0500 23796--- linux-2.6.32.10/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400
23812+++ linux-2.6.32.9/drivers/md/dm-table.c 2010-03-11 20:25:00.137474668 -0500 23797+++ linux-2.6.32.10/drivers/md/dm-table.c 2010-03-20 15:58:47.070072193 -0400
23813@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct 23798@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
23814 if (!dev_size) 23799 if (!dev_size)
23815 return 0; 23800 return 0;
@@ -23819,9 +23804,9 @@ diff -urNp linux-2.6.32.9/drivers/md/dm-table.c linux-2.6.32.9/drivers/md/dm-tab
23819 DMWARN("%s: %s too small for target: " 23804 DMWARN("%s: %s too small for target: "
23820 "start=%llu, len=%llu, dev_size=%llu", 23805 "start=%llu, len=%llu, dev_size=%llu",
23821 dm_device_name(ti->table->md), bdevname(bdev, b), 23806 dm_device_name(ti->table->md), bdevname(bdev, b),
23822diff -urNp linux-2.6.32.9/drivers/md/md.c linux-2.6.32.9/drivers/md/md.c 23807diff -urNp linux-2.6.32.10/drivers/md/md.c linux-2.6.32.10/drivers/md/md.c
23823--- linux-2.6.32.9/drivers/md/md.c 2010-02-23 10:38:51.000000000 -0500 23808--- linux-2.6.32.10/drivers/md/md.c 2010-03-15 11:52:04.000000000 -0400
23824+++ linux-2.6.32.9/drivers/md/md.c 2010-03-11 20:25:00.137474668 -0500 23809+++ linux-2.6.32.10/drivers/md/md.c 2010-03-20 15:58:47.070072193 -0400
23825@@ -2508,7 +2508,7 @@ static void rdev_free(struct kobject *ko 23810@@ -2508,7 +2508,7 @@ static void rdev_free(struct kobject *ko
23826 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); 23811 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
23827 kfree(rdev); 23812 kfree(rdev);
@@ -23858,9 +23843,9 @@ diff -urNp linux-2.6.32.9/drivers/md/md.c linux-2.6.32.9/drivers/md/md.c
23858 /* sync IO will cause sync_io to increase before the disk_stats 23843 /* sync IO will cause sync_io to increase before the disk_stats
23859 * as sync_io is counted when a request starts, and 23844 * as sync_io is counted when a request starts, and
23860 * disk_stats is counted when it completes. 23845 * disk_stats is counted when it completes.
23861diff -urNp linux-2.6.32.9/drivers/md/md.h linux-2.6.32.9/drivers/md/md.h 23846diff -urNp linux-2.6.32.10/drivers/md/md.h linux-2.6.32.10/drivers/md/md.h
23862--- linux-2.6.32.9/drivers/md/md.h 2010-02-23 10:38:51.000000000 -0500 23847--- linux-2.6.32.10/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400
23863+++ linux-2.6.32.9/drivers/md/md.h 2010-03-11 20:25:00.137474668 -0500 23848+++ linux-2.6.32.10/drivers/md/md.h 2010-03-20 15:58:47.074047893 -0400
23864@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ 23849@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
23865 23850
23866 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) 23851 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
@@ -23870,9 +23855,9 @@ diff -urNp linux-2.6.32.9/drivers/md/md.h linux-2.6.32.9/drivers/md/md.h
23870 } 23855 }
23871 23856
23872 struct mdk_personality 23857 struct mdk_personality
23873diff -urNp linux-2.6.32.9/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.9/drivers/media/dvb/dvb-core/dvbdev.c 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
23874--- linux-2.6.32.9/drivers/media/dvb/dvb-core/dvbdev.c 2010-02-23 10:38:51.000000000 -0500 23859--- linux-2.6.32.10/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400
23875+++ linux-2.6.32.9/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-11 20:25:00.137474668 -0500 23860+++ linux-2.6.32.10/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-20 15:58:47.074047893 -0400
23876@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt 23861@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
23877 const struct dvb_device *template, void *priv, int type) 23862 const struct dvb_device *template, void *priv, int type)
23878 { 23863 {
@@ -23881,9 +23866,9 @@ diff -urNp linux-2.6.32.9/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.9/dri
23881 struct file_operations *dvbdevfops; 23866 struct file_operations *dvbdevfops;
23882 struct device *clsdev; 23867 struct device *clsdev;
23883 int minor; 23868 int minor;
23884diff -urNp linux-2.6.32.9/drivers/media/radio/radio-cadet.c linux-2.6.32.9/drivers/media/radio/radio-cadet.c 23869diff -urNp linux-2.6.32.10/drivers/media/radio/radio-cadet.c linux-2.6.32.10/drivers/media/radio/radio-cadet.c
23885--- linux-2.6.32.9/drivers/media/radio/radio-cadet.c 2010-02-23 10:38:51.000000000 -0500 23870--- linux-2.6.32.10/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400
23886+++ linux-2.6.32.9/drivers/media/radio/radio-cadet.c 2010-03-11 20:25:00.137474668 -0500 23871+++ linux-2.6.32.10/drivers/media/radio/radio-cadet.c 2010-03-20 15:58:47.074047893 -0400
23887@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f 23872@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
23888 while (i < count && dev->rdsin != dev->rdsout) 23873 while (i < count && dev->rdsin != dev->rdsout)
23889 readbuf[i++] = dev->rdsbuf[dev->rdsout++]; 23874 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
@@ -23893,9 +23878,9 @@ diff -urNp linux-2.6.32.9/drivers/media/radio/radio-cadet.c linux-2.6.32.9/drive
23893 return -EFAULT; 23878 return -EFAULT;
23894 return i; 23879 return i;
23895 } 23880 }
23896diff -urNp linux-2.6.32.9/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.9/drivers/media/video/usbvideo/konicawc.c 23881diff -urNp linux-2.6.32.10/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.10/drivers/media/video/usbvideo/konicawc.c
23897--- linux-2.6.32.9/drivers/media/video/usbvideo/konicawc.c 2010-02-23 10:38:51.000000000 -0500 23882--- linux-2.6.32.10/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400
23898+++ linux-2.6.32.9/drivers/media/video/usbvideo/konicawc.c 2010-03-11 20:25:00.137474668 -0500 23883+++ linux-2.6.32.10/drivers/media/video/usbvideo/konicawc.c 2010-03-20 15:58:47.074047893 -0400
23899@@ -225,7 +225,7 @@ static void konicawc_register_input(stru 23884@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
23900 int error; 23885 int error;
23901 23886
@@ -23905,9 +23890,9 @@ diff -urNp linux-2.6.32.9/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.9
23905 23890
23906 cam->input = input_dev = input_allocate_device(); 23891 cam->input = input_dev = input_allocate_device();
23907 if (!input_dev) { 23892 if (!input_dev) {
23908diff -urNp linux-2.6.32.9/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.9/drivers/media/video/usbvideo/quickcam_messenger.c 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
23909--- linux-2.6.32.9/drivers/media/video/usbvideo/quickcam_messenger.c 2010-02-23 10:38:51.000000000 -0500 23894--- linux-2.6.32.10/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400
23910+++ linux-2.6.32.9/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-11 20:25:00.137474668 -0500 23895+++ linux-2.6.32.10/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-20 15:58:47.074047893 -0400
23911@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc 23896@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
23912 int error; 23897 int error;
23913 23898
@@ -23917,9 +23902,9 @@ diff -urNp linux-2.6.32.9/drivers/media/video/usbvideo/quickcam_messenger.c linu
23917 23902
23918 cam->input = input_dev = input_allocate_device(); 23903 cam->input = input_dev = input_allocate_device();
23919 if (!input_dev) { 23904 if (!input_dev) {
23920diff -urNp linux-2.6.32.9/drivers/message/i2o/i2o_proc.c linux-2.6.32.9/drivers/message/i2o/i2o_proc.c 23905diff -urNp linux-2.6.32.10/drivers/message/i2o/i2o_proc.c linux-2.6.32.10/drivers/message/i2o/i2o_proc.c
23921--- linux-2.6.32.9/drivers/message/i2o/i2o_proc.c 2010-02-23 10:38:51.000000000 -0500 23906--- linux-2.6.32.10/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400
23922+++ linux-2.6.32.9/drivers/message/i2o/i2o_proc.c 2010-03-11 20:25:00.137474668 -0500 23907+++ linux-2.6.32.10/drivers/message/i2o/i2o_proc.c 2010-03-20 15:58:47.074047893 -0400
23923@@ -259,13 +259,6 @@ static char *scsi_devices[] = { 23908@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
23924 "Array Controller Device" 23909 "Array Controller Device"
23925 }; 23910 };
@@ -24006,9 +23991,9 @@ diff -urNp linux-2.6.32.9/drivers/message/i2o/i2o_proc.c linux-2.6.32.9/drivers/
24006 23991
24007 return 0; 23992 return 0;
24008 } 23993 }
24009diff -urNp linux-2.6.32.9/drivers/misc/kgdbts.c linux-2.6.32.9/drivers/misc/kgdbts.c 23994diff -urNp linux-2.6.32.10/drivers/misc/kgdbts.c linux-2.6.32.10/drivers/misc/kgdbts.c
24010--- linux-2.6.32.9/drivers/misc/kgdbts.c 2010-02-23 10:38:51.000000000 -0500 23995--- linux-2.6.32.10/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400
24011+++ linux-2.6.32.9/drivers/misc/kgdbts.c 2010-03-11 20:25:00.137474668 -0500 23996+++ linux-2.6.32.10/drivers/misc/kgdbts.c 2010-03-20 15:58:47.074047893 -0400
24012@@ -118,7 +118,7 @@ 23997@@ -118,7 +118,7 @@
24013 } while (0) 23998 } while (0)
24014 #define MAX_CONFIG_LEN 40 23999 #define MAX_CONFIG_LEN 40
@@ -24027,9 +24012,9 @@ diff -urNp linux-2.6.32.9/drivers/misc/kgdbts.c linux-2.6.32.9/drivers/misc/kgdb
24027 .name = "kgdbts", 24012 .name = "kgdbts",
24028 .read_char = kgdbts_get_char, 24013 .read_char = kgdbts_get_char,
24029 .write_char = kgdbts_put_char, 24014 .write_char = kgdbts_put_char,
24030diff -urNp linux-2.6.32.9/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.9/drivers/misc/sgi-gru/gruhandles.c 24015diff -urNp linux-2.6.32.10/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.10/drivers/misc/sgi-gru/gruhandles.c
24031--- linux-2.6.32.9/drivers/misc/sgi-gru/gruhandles.c 2010-02-23 10:38:51.000000000 -0500 24016--- linux-2.6.32.10/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400
24032+++ linux-2.6.32.9/drivers/misc/sgi-gru/gruhandles.c 2010-03-11 20:25:00.137474668 -0500 24017+++ linux-2.6.32.10/drivers/misc/sgi-gru/gruhandles.c 2010-03-20 15:58:47.074047893 -0400
24033@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic 24018@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
24034 24019
24035 static void update_mcs_stats(enum mcs_op op, unsigned long clks) 24020 static void update_mcs_stats(enum mcs_op op, unsigned long clks)
@@ -24041,9 +24026,9 @@ diff -urNp linux-2.6.32.9/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.9/drive
24041 if (mcs_op_statistics[op].max < clks) 24026 if (mcs_op_statistics[op].max < clks)
24042 mcs_op_statistics[op].max = clks; 24027 mcs_op_statistics[op].max = clks;
24043 } 24028 }
24044diff -urNp linux-2.6.32.9/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.9/drivers/misc/sgi-gru/gruprocfs.c 24029diff -urNp linux-2.6.32.10/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.10/drivers/misc/sgi-gru/gruprocfs.c
24045--- linux-2.6.32.9/drivers/misc/sgi-gru/gruprocfs.c 2010-02-23 10:38:51.000000000 -0500 24030--- linux-2.6.32.10/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400
24046+++ linux-2.6.32.9/drivers/misc/sgi-gru/gruprocfs.c 2010-03-11 20:25:00.137474668 -0500 24031+++ linux-2.6.32.10/drivers/misc/sgi-gru/gruprocfs.c 2010-03-20 15:58:47.074047893 -0400
24047@@ -32,9 +32,9 @@ 24032@@ -32,9 +32,9 @@
24048 24033
24049 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) 24034 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -24067,9 +24052,9 @@ diff -urNp linux-2.6.32.9/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.9/driver
24067 max = mcs_op_statistics[op].max; 24052 max = mcs_op_statistics[op].max;
24068 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, 24053 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
24069 count ? total / count : 0, max); 24054 count ? total / count : 0, max);
24070diff -urNp linux-2.6.32.9/drivers/misc/sgi-gru/grutables.h linux-2.6.32.9/drivers/misc/sgi-gru/grutables.h 24055diff -urNp linux-2.6.32.10/drivers/misc/sgi-gru/grutables.h linux-2.6.32.10/drivers/misc/sgi-gru/grutables.h
24071--- linux-2.6.32.9/drivers/misc/sgi-gru/grutables.h 2010-02-23 10:38:51.000000000 -0500 24056--- linux-2.6.32.10/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400
24072+++ linux-2.6.32.9/drivers/misc/sgi-gru/grutables.h 2010-03-11 20:25:00.141634154 -0500 24057+++ linux-2.6.32.10/drivers/misc/sgi-gru/grutables.h 2010-03-20 15:58:47.074047893 -0400
24073@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; 24058@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
24074 * GRU statistics. 24059 * GRU statistics.
24075 */ 24060 */
@@ -24253,9 +24238,9 @@ diff -urNp linux-2.6.32.9/drivers/misc/sgi-gru/grutables.h linux-2.6.32.9/driver
24253 } while (0) 24238 } while (0)
24254 24239
24255 #ifdef CONFIG_SGI_GRU_DEBUG 24240 #ifdef CONFIG_SGI_GRU_DEBUG
24256diff -urNp linux-2.6.32.9/drivers/mtd/devices/doc2000.c linux-2.6.32.9/drivers/mtd/devices/doc2000.c 24241diff -urNp linux-2.6.32.10/drivers/mtd/devices/doc2000.c linux-2.6.32.10/drivers/mtd/devices/doc2000.c
24257--- linux-2.6.32.9/drivers/mtd/devices/doc2000.c 2010-02-23 10:38:51.000000000 -0500 24242--- linux-2.6.32.10/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400
24258+++ linux-2.6.32.9/drivers/mtd/devices/doc2000.c 2010-03-11 20:25:00.141634154 -0500 24243+++ linux-2.6.32.10/drivers/mtd/devices/doc2000.c 2010-03-20 15:58:47.074047893 -0400
24259@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt 24244@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
24260 24245
24261 /* The ECC will not be calculated correctly if less than 512 is written */ 24246 /* The ECC will not be calculated correctly if less than 512 is written */
@@ -24265,21 +24250,21 @@ diff -urNp linux-2.6.32.9/drivers/mtd/devices/doc2000.c linux-2.6.32.9/drivers/m
24265 printk(KERN_WARNING 24250 printk(KERN_WARNING
24266 "ECC needs a full sector write (adr: %lx size %lx)\n", 24251 "ECC needs a full sector write (adr: %lx size %lx)\n",
24267 (long) to, (long) len); 24252 (long) to, (long) len);
24268diff -urNp linux-2.6.32.9/drivers/mtd/devices/doc2001.c linux-2.6.32.9/drivers/mtd/devices/doc2001.c 24253diff -urNp linux-2.6.32.10/drivers/mtd/devices/doc2001.c linux-2.6.32.10/drivers/mtd/devices/doc2001.c
24269--- linux-2.6.32.9/drivers/mtd/devices/doc2001.c 2010-02-23 10:38:51.000000000 -0500 24254--- linux-2.6.32.10/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400
24270+++ linux-2.6.32.9/drivers/mtd/devices/doc2001.c 2010-03-11 20:25:00.141634154 -0500 24255+++ linux-2.6.32.10/drivers/mtd/devices/doc2001.c 2010-03-20 17:04:50.568729833 -0400
24271@@ -395,6 +395,8 @@ static int doc_read (struct mtd_info *mt 24256@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
24257 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
24258
24272 /* Don't allow read past end of device */ 24259 /* Don't allow read past end of device */
24273 if (from >= this->totlen) 24260- if (from >= this->totlen)
24261+ if (from >= this->totlen || !len)
24274 return -EINVAL; 24262 return -EINVAL;
24275+ if (!len)
24276+ return -EINVAL;
24277 24263
24278 /* Don't allow a single read to cross a 512-byte block boundary */ 24264 /* Don't allow a single read to cross a 512-byte block boundary */
24279 if (from + len > ((from | 0x1ff) + 1)) 24265diff -urNp linux-2.6.32.10/drivers/mtd/ubi/build.c linux-2.6.32.10/drivers/mtd/ubi/build.c
24280diff -urNp linux-2.6.32.9/drivers/mtd/ubi/build.c linux-2.6.32.9/drivers/mtd/ubi/build.c 24266--- linux-2.6.32.10/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400
24281--- linux-2.6.32.9/drivers/mtd/ubi/build.c 2010-02-23 10:38:51.000000000 -0500 24267+++ linux-2.6.32.10/drivers/mtd/ubi/build.c 2010-03-20 15:58:47.074047893 -0400
24282+++ linux-2.6.32.9/drivers/mtd/ubi/build.c 2010-03-11 20:25:00.141634154 -0500
24283@@ -1255,7 +1255,7 @@ module_exit(ubi_exit); 24268@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
24284 static int __init bytes_str_to_int(const char *str) 24269 static int __init bytes_str_to_int(const char *str)
24285 { 24270 {
@@ -24319,9 +24304,9 @@ diff -urNp linux-2.6.32.9/drivers/mtd/ubi/build.c linux-2.6.32.9/drivers/mtd/ubi
24319 } 24304 }
24320 24305
24321 /** 24306 /**
24322diff -urNp linux-2.6.32.9/drivers/net/e1000e/82571.c linux-2.6.32.9/drivers/net/e1000e/82571.c 24307diff -urNp linux-2.6.32.10/drivers/net/e1000e/82571.c linux-2.6.32.10/drivers/net/e1000e/82571.c
24323--- linux-2.6.32.9/drivers/net/e1000e/82571.c 2010-02-23 10:38:51.000000000 -0500 24308--- linux-2.6.32.10/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400
24324+++ linux-2.6.32.9/drivers/net/e1000e/82571.c 2010-03-11 20:25:00.141634154 -0500 24309+++ linux-2.6.32.10/drivers/net/e1000e/82571.c 2010-03-20 15:58:47.074047893 -0400
24325@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s 24310@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
24326 { 24311 {
24327 struct e1000_hw *hw = &adapter->hw; 24312 struct e1000_hw *hw = &adapter->hw;
@@ -24375,9 +24360,9 @@ diff -urNp linux-2.6.32.9/drivers/net/e1000e/82571.c linux-2.6.32.9/drivers/net/
24375 .acquire_nvm = e1000_acquire_nvm_82571, 24360 .acquire_nvm = e1000_acquire_nvm_82571,
24376 .read_nvm = e1000e_read_nvm_eerd, 24361 .read_nvm = e1000e_read_nvm_eerd,
24377 .release_nvm = e1000_release_nvm_82571, 24362 .release_nvm = e1000_release_nvm_82571,
24378diff -urNp linux-2.6.32.9/drivers/net/e1000e/e1000.h linux-2.6.32.9/drivers/net/e1000e/e1000.h 24363diff -urNp linux-2.6.32.10/drivers/net/e1000e/e1000.h linux-2.6.32.10/drivers/net/e1000e/e1000.h
24379--- linux-2.6.32.9/drivers/net/e1000e/e1000.h 2010-02-23 10:38:51.000000000 -0500 24364--- linux-2.6.32.10/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400
24380+++ linux-2.6.32.9/drivers/net/e1000e/e1000.h 2010-03-11 20:25:00.141634154 -0500 24365+++ linux-2.6.32.10/drivers/net/e1000e/e1000.h 2010-03-20 15:58:47.074047893 -0400
24381@@ -375,9 +375,9 @@ struct e1000_info { 24366@@ -375,9 +375,9 @@ struct e1000_info {
24382 u32 pba; 24367 u32 pba;
24383 u32 max_hw_frame_size; 24368 u32 max_hw_frame_size;
@@ -24391,9 +24376,9 @@ diff -urNp linux-2.6.32.9/drivers/net/e1000e/e1000.h linux-2.6.32.9/drivers/net/
24391 }; 24376 };
24392 24377
24393 /* hardware capability, feature, and workaround flags */ 24378 /* hardware capability, feature, and workaround flags */
24394diff -urNp linux-2.6.32.9/drivers/net/e1000e/es2lan.c linux-2.6.32.9/drivers/net/e1000e/es2lan.c 24379diff -urNp linux-2.6.32.10/drivers/net/e1000e/es2lan.c linux-2.6.32.10/drivers/net/e1000e/es2lan.c
24395--- linux-2.6.32.9/drivers/net/e1000e/es2lan.c 2010-02-23 10:38:51.000000000 -0500 24380--- linux-2.6.32.10/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400
24396+++ linux-2.6.32.9/drivers/net/e1000e/es2lan.c 2010-03-11 20:25:00.141634154 -0500 24381+++ linux-2.6.32.10/drivers/net/e1000e/es2lan.c 2010-03-20 15:58:47.078052541 -0400
24397@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es 24382@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
24398 { 24383 {
24399 struct e1000_hw *hw = &adapter->hw; 24384 struct e1000_hw *hw = &adapter->hw;
@@ -24429,9 +24414,9 @@ diff -urNp linux-2.6.32.9/drivers/net/e1000e/es2lan.c linux-2.6.32.9/drivers/net
24429 .acquire_nvm = e1000_acquire_nvm_80003es2lan, 24414 .acquire_nvm = e1000_acquire_nvm_80003es2lan,
24430 .read_nvm = e1000e_read_nvm_eerd, 24415 .read_nvm = e1000e_read_nvm_eerd,
24431 .release_nvm = e1000_release_nvm_80003es2lan, 24416 .release_nvm = e1000_release_nvm_80003es2lan,
24432diff -urNp linux-2.6.32.9/drivers/net/e1000e/hw.h linux-2.6.32.9/drivers/net/e1000e/hw.h 24417diff -urNp linux-2.6.32.10/drivers/net/e1000e/hw.h linux-2.6.32.10/drivers/net/e1000e/hw.h
24433--- linux-2.6.32.9/drivers/net/e1000e/hw.h 2010-02-23 10:38:51.000000000 -0500 24418--- linux-2.6.32.10/drivers/net/e1000e/hw.h 2010-03-15 11:52:04.000000000 -0400
24434+++ linux-2.6.32.9/drivers/net/e1000e/hw.h 2010-03-11 20:25:00.141634154 -0500 24419+++ linux-2.6.32.10/drivers/net/e1000e/hw.h 2010-03-20 15:58:47.078052541 -0400
24435@@ -755,34 +755,34 @@ struct e1000_mac_operations { 24420@@ -755,34 +755,34 @@ struct e1000_mac_operations {
24436 24421
24437 /* Function pointers for the PHY. */ 24422 /* Function pointers for the PHY. */
@@ -24491,9 +24476,9 @@ diff -urNp linux-2.6.32.9/drivers/net/e1000e/hw.h linux-2.6.32.9/drivers/net/e10
24491 }; 24476 };
24492 24477
24493 struct e1000_mac_info { 24478 struct e1000_mac_info {
24494diff -urNp linux-2.6.32.9/drivers/net/e1000e/ich8lan.c linux-2.6.32.9/drivers/net/e1000e/ich8lan.c 24479diff -urNp linux-2.6.32.10/drivers/net/e1000e/ich8lan.c linux-2.6.32.10/drivers/net/e1000e/ich8lan.c
24495--- linux-2.6.32.9/drivers/net/e1000e/ich8lan.c 2010-02-23 10:38:51.000000000 -0500 24480--- linux-2.6.32.10/drivers/net/e1000e/ich8lan.c 2010-03-15 11:52:04.000000000 -0400
24496+++ linux-2.6.32.9/drivers/net/e1000e/ich8lan.c 2010-03-11 20:25:00.141634154 -0500 24481+++ linux-2.6.32.10/drivers/net/e1000e/ich8lan.c 2010-03-20 15:58:47.078052541 -0400
24497@@ -3451,7 +3451,7 @@ static void e1000_clear_hw_cntrs_ich8lan 24482@@ -3451,7 +3451,7 @@ static void e1000_clear_hw_cntrs_ich8lan
24498 } 24483 }
24499 } 24484 }
@@ -24521,9 +24506,9 @@ diff -urNp linux-2.6.32.9/drivers/net/e1000e/ich8lan.c linux-2.6.32.9/drivers/ne
24521 .acquire_nvm = e1000_acquire_nvm_ich8lan, 24506 .acquire_nvm = e1000_acquire_nvm_ich8lan,
24522 .read_nvm = e1000_read_nvm_ich8lan, 24507 .read_nvm = e1000_read_nvm_ich8lan,
24523 .release_nvm = e1000_release_nvm_ich8lan, 24508 .release_nvm = e1000_release_nvm_ich8lan,
24524diff -urNp linux-2.6.32.9/drivers/net/ibmveth.c linux-2.6.32.9/drivers/net/ibmveth.c 24509diff -urNp linux-2.6.32.10/drivers/net/ibmveth.c linux-2.6.32.10/drivers/net/ibmveth.c
24525--- linux-2.6.32.9/drivers/net/ibmveth.c 2010-02-23 10:38:51.000000000 -0500 24510--- linux-2.6.32.10/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400
24526+++ linux-2.6.32.9/drivers/net/ibmveth.c 2010-03-11 20:25:00.141634154 -0500 24511+++ linux-2.6.32.10/drivers/net/ibmveth.c 2010-03-20 15:58:47.078052541 -0400
24527@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr 24512@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
24528 NULL, 24513 NULL,
24529 }; 24514 };
@@ -24533,9 +24518,9 @@ diff -urNp linux-2.6.32.9/drivers/net/ibmveth.c linux-2.6.32.9/drivers/net/ibmve
24533 .show = veth_pool_show, 24518 .show = veth_pool_show,
24534 .store = veth_pool_store, 24519 .store = veth_pool_store,
24535 }; 24520 };
24536diff -urNp linux-2.6.32.9/drivers/net/igb/e1000_82575.c linux-2.6.32.9/drivers/net/igb/e1000_82575.c 24521diff -urNp linux-2.6.32.10/drivers/net/igb/e1000_82575.c linux-2.6.32.10/drivers/net/igb/e1000_82575.c
24537--- linux-2.6.32.9/drivers/net/igb/e1000_82575.c 2010-02-23 10:38:51.000000000 -0500 24522--- linux-2.6.32.10/drivers/net/igb/e1000_82575.c 2010-03-15 11:52:04.000000000 -0400
24538+++ linux-2.6.32.9/drivers/net/igb/e1000_82575.c 2010-03-11 20:25:00.141634154 -0500 24523+++ linux-2.6.32.10/drivers/net/igb/e1000_82575.c 2010-03-20 15:58:47.078052541 -0400
24539@@ -1400,7 +1400,7 @@ void igb_vmdq_set_replication_pf(struct 24524@@ -1400,7 +1400,7 @@ void igb_vmdq_set_replication_pf(struct
24540 wr32(E1000_VT_CTL, vt_ctl); 24525 wr32(E1000_VT_CTL, vt_ctl);
24541 } 24526 }
@@ -24561,9 +24546,9 @@ diff -urNp linux-2.6.32.9/drivers/net/igb/e1000_82575.c linux-2.6.32.9/drivers/n
24561 .acquire = igb_acquire_nvm_82575, 24546 .acquire = igb_acquire_nvm_82575,
24562 .read = igb_read_nvm_eerd, 24547 .read = igb_read_nvm_eerd,
24563 .release = igb_release_nvm_82575, 24548 .release = igb_release_nvm_82575,
24564diff -urNp linux-2.6.32.9/drivers/net/igb/e1000_hw.h linux-2.6.32.9/drivers/net/igb/e1000_hw.h 24549diff -urNp linux-2.6.32.10/drivers/net/igb/e1000_hw.h linux-2.6.32.10/drivers/net/igb/e1000_hw.h
24565--- linux-2.6.32.9/drivers/net/igb/e1000_hw.h 2010-02-23 10:38:51.000000000 -0500 24550--- linux-2.6.32.10/drivers/net/igb/e1000_hw.h 2010-03-15 11:52:04.000000000 -0400
24566+++ linux-2.6.32.9/drivers/net/igb/e1000_hw.h 2010-03-11 20:25:00.141634154 -0500 24551+++ linux-2.6.32.10/drivers/net/igb/e1000_hw.h 2010-03-20 15:58:47.078052541 -0400
24567@@ -302,17 +302,17 @@ struct e1000_phy_operations { 24552@@ -302,17 +302,17 @@ struct e1000_phy_operations {
24568 }; 24553 };
24569 24554
@@ -24589,9 +24574,9 @@ diff -urNp linux-2.6.32.9/drivers/net/igb/e1000_hw.h linux-2.6.32.9/drivers/net/
24589 }; 24574 };
24590 24575
24591 extern const struct e1000_info e1000_82575_info; 24576 extern const struct e1000_info e1000_82575_info;
24592diff -urNp linux-2.6.32.9/drivers/net/irda/vlsi_ir.c linux-2.6.32.9/drivers/net/irda/vlsi_ir.c 24577diff -urNp linux-2.6.32.10/drivers/net/irda/vlsi_ir.c linux-2.6.32.10/drivers/net/irda/vlsi_ir.c
24593--- linux-2.6.32.9/drivers/net/irda/vlsi_ir.c 2010-02-23 10:38:51.000000000 -0500 24578--- linux-2.6.32.10/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400
24594+++ linux-2.6.32.9/drivers/net/irda/vlsi_ir.c 2010-03-11 20:25:00.141634154 -0500 24579+++ linux-2.6.32.10/drivers/net/irda/vlsi_ir.c 2010-03-20 15:58:47.078052541 -0400
24595@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( 24580@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
24596 /* no race - tx-ring already empty */ 24581 /* no race - tx-ring already empty */
24597 vlsi_set_baud(idev, iobase); 24582 vlsi_set_baud(idev, iobase);
@@ -24608,9 +24593,9 @@ diff -urNp linux-2.6.32.9/drivers/net/irda/vlsi_ir.c linux-2.6.32.9/drivers/net/
24608 spin_unlock_irqrestore(&idev->lock, flags); 24593 spin_unlock_irqrestore(&idev->lock, flags);
24609 dev_kfree_skb_any(skb); 24594 dev_kfree_skb_any(skb);
24610 return NETDEV_TX_OK; 24595 return NETDEV_TX_OK;
24611diff -urNp linux-2.6.32.9/drivers/net/iseries_veth.c linux-2.6.32.9/drivers/net/iseries_veth.c 24596diff -urNp linux-2.6.32.10/drivers/net/iseries_veth.c linux-2.6.32.10/drivers/net/iseries_veth.c
24612--- linux-2.6.32.9/drivers/net/iseries_veth.c 2010-02-23 10:38:51.000000000 -0500 24597--- linux-2.6.32.10/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400
24613+++ linux-2.6.32.9/drivers/net/iseries_veth.c 2010-03-11 20:25:00.141634154 -0500 24598+++ linux-2.6.32.10/drivers/net/iseries_veth.c 2010-03-20 15:58:47.078052541 -0400
24614@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul 24599@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
24615 NULL 24600 NULL
24616 }; 24601 };
@@ -24629,9 +24614,9 @@ diff -urNp linux-2.6.32.9/drivers/net/iseries_veth.c linux-2.6.32.9/drivers/net/
24629 .show = veth_port_attribute_show 24614 .show = veth_port_attribute_show
24630 }; 24615 };
24631 24616
24632diff -urNp linux-2.6.32.9/drivers/net/pcnet32.c linux-2.6.32.9/drivers/net/pcnet32.c 24617diff -urNp linux-2.6.32.10/drivers/net/pcnet32.c linux-2.6.32.10/drivers/net/pcnet32.c
24633--- linux-2.6.32.9/drivers/net/pcnet32.c 2010-02-23 10:38:51.000000000 -0500 24618--- linux-2.6.32.10/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400
24634+++ linux-2.6.32.9/drivers/net/pcnet32.c 2010-03-11 20:25:00.145637916 -0500 24619+++ linux-2.6.32.10/drivers/net/pcnet32.c 2010-03-20 15:58:47.078052541 -0400
24635@@ -79,7 +79,7 @@ static int cards_found; 24620@@ -79,7 +79,7 @@ static int cards_found;
24636 /* 24621 /*
24637 * VLB I/O addresses 24622 * VLB I/O addresses
@@ -24641,9 +24626,9 @@ diff -urNp linux-2.6.32.9/drivers/net/pcnet32.c linux-2.6.32.9/drivers/net/pcnet
24641 { 0x300, 0x320, 0x340, 0x360, 0 }; 24626 { 0x300, 0x320, 0x340, 0x360, 0 };
24642 24627
24643 static int pcnet32_debug = 0; 24628 static int pcnet32_debug = 0;
24644diff -urNp linux-2.6.32.9/drivers/net/tg3.h linux-2.6.32.9/drivers/net/tg3.h 24629diff -urNp linux-2.6.32.10/drivers/net/tg3.h linux-2.6.32.10/drivers/net/tg3.h
24645--- linux-2.6.32.9/drivers/net/tg3.h 2010-02-23 10:38:51.000000000 -0500 24630--- linux-2.6.32.10/drivers/net/tg3.h 2010-03-15 11:52:04.000000000 -0400
24646+++ linux-2.6.32.9/drivers/net/tg3.h 2010-03-11 20:25:00.145637916 -0500 24631+++ linux-2.6.32.10/drivers/net/tg3.h 2010-03-20 15:58:47.078052541 -0400
24647@@ -95,6 +95,7 @@ 24632@@ -95,6 +95,7 @@
24648 #define CHIPREV_ID_5750_A0 0x4000 24633 #define CHIPREV_ID_5750_A0 0x4000
24649 #define CHIPREV_ID_5750_A1 0x4001 24634 #define CHIPREV_ID_5750_A1 0x4001
@@ -24652,9 +24637,9 @@ diff -urNp linux-2.6.32.9/drivers/net/tg3.h linux-2.6.32.9/drivers/net/tg3.h
24652 #define CHIPREV_ID_5750_C2 0x4202 24637 #define CHIPREV_ID_5750_C2 0x4202
24653 #define CHIPREV_ID_5752_A0_HW 0x5000 24638 #define CHIPREV_ID_5752_A0_HW 0x5000
24654 #define CHIPREV_ID_5752_A0 0x6000 24639 #define CHIPREV_ID_5752_A0 0x6000
24655diff -urNp linux-2.6.32.9/drivers/net/tulip/de4x5.c linux-2.6.32.9/drivers/net/tulip/de4x5.c 24640diff -urNp linux-2.6.32.10/drivers/net/tulip/de4x5.c linux-2.6.32.10/drivers/net/tulip/de4x5.c
24656--- linux-2.6.32.9/drivers/net/tulip/de4x5.c 2010-02-23 10:38:51.000000000 -0500 24641--- linux-2.6.32.10/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400
24657+++ linux-2.6.32.9/drivers/net/tulip/de4x5.c 2010-03-11 20:25:00.145637916 -0500 24642+++ linux-2.6.32.10/drivers/net/tulip/de4x5.c 2010-03-20 15:58:47.082043078 -0400
24658@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru 24643@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
24659 for (i=0; i<ETH_ALEN; i++) { 24644 for (i=0; i<ETH_ALEN; i++) {
24660 tmp.addr[i] = dev->dev_addr[i]; 24645 tmp.addr[i] = dev->dev_addr[i];
@@ -24673,9 +24658,9 @@ diff -urNp linux-2.6.32.9/drivers/net/tulip/de4x5.c linux-2.6.32.9/drivers/net/t
24673 return -EFAULT; 24658 return -EFAULT;
24674 break; 24659 break;
24675 } 24660 }
24676diff -urNp linux-2.6.32.9/drivers/net/usb/hso.c linux-2.6.32.9/drivers/net/usb/hso.c 24661diff -urNp linux-2.6.32.10/drivers/net/usb/hso.c linux-2.6.32.10/drivers/net/usb/hso.c
24677--- linux-2.6.32.9/drivers/net/usb/hso.c 2010-02-23 10:38:51.000000000 -0500 24662--- linux-2.6.32.10/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400
24678+++ linux-2.6.32.9/drivers/net/usb/hso.c 2010-03-11 20:25:00.145637916 -0500 24663+++ linux-2.6.32.10/drivers/net/usb/hso.c 2010-03-20 15:58:47.082043078 -0400
24679@@ -258,7 +258,7 @@ struct hso_serial { 24664@@ -258,7 +258,7 @@ struct hso_serial {
24680 24665
24681 /* from usb_serial_port */ 24666 /* from usb_serial_port */
@@ -24754,9 +24739,9 @@ diff -urNp linux-2.6.32.9/drivers/net/usb/hso.c linux-2.6.32.9/drivers/net/usb/h
24754 result = 24739 result =
24755 hso_start_serial_device(serial_table[i], GFP_NOIO); 24740 hso_start_serial_device(serial_table[i], GFP_NOIO);
24756 hso_kick_transmit(dev2ser(serial_table[i])); 24741 hso_kick_transmit(dev2ser(serial_table[i]));
24757diff -urNp linux-2.6.32.9/drivers/net/wireless/b43/debugfs.c linux-2.6.32.9/drivers/net/wireless/b43/debugfs.c 24742diff -urNp linux-2.6.32.10/drivers/net/wireless/b43/debugfs.c linux-2.6.32.10/drivers/net/wireless/b43/debugfs.c
24758--- linux-2.6.32.9/drivers/net/wireless/b43/debugfs.c 2010-02-23 10:38:51.000000000 -0500 24743--- linux-2.6.32.10/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400
24759+++ linux-2.6.32.9/drivers/net/wireless/b43/debugfs.c 2010-03-11 20:25:00.145637916 -0500 24744+++ linux-2.6.32.10/drivers/net/wireless/b43/debugfs.c 2010-03-20 15:58:47.082043078 -0400
24760@@ -43,7 +43,7 @@ static struct dentry *rootdir; 24745@@ -43,7 +43,7 @@ static struct dentry *rootdir;
24761 struct b43_debugfs_fops { 24746 struct b43_debugfs_fops {
24762 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); 24747 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -24766,9 +24751,9 @@ diff -urNp linux-2.6.32.9/drivers/net/wireless/b43/debugfs.c linux-2.6.32.9/driv
24766 /* Offset of struct b43_dfs_file in struct b43_dfsentry */ 24751 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
24767 size_t file_struct_offset; 24752 size_t file_struct_offset;
24768 }; 24753 };
24769diff -urNp linux-2.6.32.9/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.9/drivers/net/wireless/b43legacy/debugfs.c 24754diff -urNp linux-2.6.32.10/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.10/drivers/net/wireless/b43legacy/debugfs.c
24770--- linux-2.6.32.9/drivers/net/wireless/b43legacy/debugfs.c 2010-02-23 10:38:51.000000000 -0500 24755--- linux-2.6.32.10/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400
24771+++ linux-2.6.32.9/drivers/net/wireless/b43legacy/debugfs.c 2010-03-11 20:25:00.145637916 -0500 24756+++ linux-2.6.32.10/drivers/net/wireless/b43legacy/debugfs.c 2010-03-20 15:58:47.082043078 -0400
24772@@ -44,7 +44,7 @@ static struct dentry *rootdir; 24757@@ -44,7 +44,7 @@ static struct dentry *rootdir;
24773 struct b43legacy_debugfs_fops { 24758 struct b43legacy_debugfs_fops {
24774 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); 24759 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -24778,9 +24763,9 @@ diff -urNp linux-2.6.32.9/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.
24778 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ 24763 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
24779 size_t file_struct_offset; 24764 size_t file_struct_offset;
24780 /* Take wl->irq_lock before calling read/write? */ 24765 /* Take wl->irq_lock before calling read/write? */
24781diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-1000.c 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
24782--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-02-23 10:38:51.000000000 -0500 24767--- linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400
24783+++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-11 20:25:00.145637916 -0500 24768+++ linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-20 15:58:47.082043078 -0400
24784@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = 24769@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
24785 }, 24770 },
24786 }; 24771 };
@@ -24790,9 +24775,9 @@ diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.9
24790 .ucode = &iwl5000_ucode, 24775 .ucode = &iwl5000_ucode,
24791 .lib = &iwl1000_lib, 24776 .lib = &iwl1000_lib,
24792 .hcmd = &iwl5000_hcmd, 24777 .hcmd = &iwl5000_hcmd,
24793diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-3945.c 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
24794--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-02-23 10:38:51.000000000 -0500 24779--- linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-03-15 11:52:04.000000000 -0400
24795+++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-03-11 20:25:00.145637916 -0500 24780+++ linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-03-20 15:58:47.082043078 -0400
24796@@ -2876,7 +2876,7 @@ static struct iwl_hcmd_utils_ops iwl3945 24781@@ -2876,7 +2876,7 @@ static struct iwl_hcmd_utils_ops iwl3945
24797 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, 24782 .build_addsta_hcmd = iwl3945_build_addsta_hcmd,
24798 }; 24783 };
@@ -24802,9 +24787,9 @@ diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.9
24802 .ucode = &iwl3945_ucode, 24787 .ucode = &iwl3945_ucode,
24803 .lib = &iwl3945_lib, 24788 .lib = &iwl3945_lib,
24804 .hcmd = &iwl3945_hcmd, 24789 .hcmd = &iwl3945_hcmd,
24805diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-4965.c 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
24806--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-02-23 10:38:51.000000000 -0500 24791--- linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-03-15 11:52:04.000000000 -0400
24807+++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-03-11 20:25:00.145637916 -0500 24792+++ linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-03-20 15:58:47.082043078 -0400
24808@@ -2335,7 +2335,7 @@ static struct iwl_lib_ops iwl4965_lib = 24793@@ -2335,7 +2335,7 @@ static struct iwl_lib_ops iwl4965_lib =
24809 }, 24794 },
24810 }; 24795 };
@@ -24814,10 +24799,10 @@ diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.9
24814 .ucode = &iwl4965_ucode, 24799 .ucode = &iwl4965_ucode,
24815 .lib = &iwl4965_lib, 24800 .lib = &iwl4965_lib,
24816 .hcmd = &iwl4965_hcmd, 24801 .hcmd = &iwl4965_hcmd,
24817diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-5000.c 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
24818--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-02-23 10:38:51.000000000 -0500 24803--- linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-03-15 11:52:04.000000000 -0400
24819+++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-03-11 20:25:00.145637916 -0500 24804+++ linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-03-20 15:58:47.082043078 -0400
24820@@ -1628,14 +1628,14 @@ static struct iwl_lib_ops iwl5150_lib = 24805@@ -1626,14 +1626,14 @@ static struct iwl_lib_ops iwl5150_lib =
24821 }, 24806 },
24822 }; 24807 };
24823 24808
@@ -24834,9 +24819,9 @@ diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.9
24834 .ucode = &iwl5000_ucode, 24819 .ucode = &iwl5000_ucode,
24835 .lib = &iwl5150_lib, 24820 .lib = &iwl5150_lib,
24836 .hcmd = &iwl5000_hcmd, 24821 .hcmd = &iwl5000_hcmd,
24837diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-6000.c 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
24838--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-02-23 10:38:51.000000000 -0500 24823--- linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400
24839+++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-11 20:25:00.145637916 -0500 24824+++ linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-20 15:58:47.082043078 -0400
24840@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 24825@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
24841 .calc_rssi = iwl5000_calc_rssi, 24826 .calc_rssi = iwl5000_calc_rssi,
24842 }; 24827 };
@@ -24846,9 +24831,9 @@ diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.9
24846 .ucode = &iwl5000_ucode, 24831 .ucode = &iwl5000_ucode,
24847 .lib = &iwl6000_lib, 24832 .lib = &iwl6000_lib,
24848 .hcmd = &iwl5000_hcmd, 24833 .hcmd = &iwl5000_hcmd,
24849diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-dev.h 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
24850--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-02-23 10:38:51.000000000 -0500 24835--- linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400
24851+++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-11 20:25:00.145637916 -0500 24836+++ linux-2.6.32.10/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-20 15:58:47.082043078 -0400
24852@@ -67,7 +67,7 @@ struct iwl_tx_queue; 24837@@ -67,7 +67,7 @@ struct iwl_tx_queue;
24853 24838
24854 /* shared structures from iwl-5000.c */ 24839 /* shared structures from iwl-5000.c */
@@ -24858,9 +24843,9 @@ diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.9/
24858 extern struct iwl_ucode_ops iwl5000_ucode; 24843 extern struct iwl_ucode_ops iwl5000_ucode;
24859 extern struct iwl_lib_ops iwl5000_lib; 24844 extern struct iwl_lib_ops iwl5000_lib;
24860 extern struct iwl_hcmd_ops iwl5000_hcmd; 24845 extern struct iwl_hcmd_ops iwl5000_hcmd;
24861diff -urNp linux-2.6.32.9/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.9/drivers/net/wireless/libertas/debugfs.c 24846diff -urNp linux-2.6.32.10/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.10/drivers/net/wireless/libertas/debugfs.c
24862--- linux-2.6.32.9/drivers/net/wireless/libertas/debugfs.c 2010-02-23 10:38:51.000000000 -0500 24847--- linux-2.6.32.10/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400
24863+++ linux-2.6.32.9/drivers/net/wireless/libertas/debugfs.c 2010-03-11 20:25:00.145637916 -0500 24848+++ linux-2.6.32.10/drivers/net/wireless/libertas/debugfs.c 2010-03-20 15:58:47.082043078 -0400
24864@@ -708,7 +708,7 @@ out_unlock: 24849@@ -708,7 +708,7 @@ out_unlock:
24865 struct lbs_debugfs_files { 24850 struct lbs_debugfs_files {
24866 const char *name; 24851 const char *name;
@@ -24870,9 +24855,9 @@ diff -urNp linux-2.6.32.9/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.9
24870 }; 24855 };
24871 24856
24872 static const struct lbs_debugfs_files debugfs_files[] = { 24857 static const struct lbs_debugfs_files debugfs_files[] = {
24873diff -urNp linux-2.6.32.9/drivers/oprofile/buffer_sync.c linux-2.6.32.9/drivers/oprofile/buffer_sync.c 24858diff -urNp linux-2.6.32.10/drivers/oprofile/buffer_sync.c linux-2.6.32.10/drivers/oprofile/buffer_sync.c
24874--- linux-2.6.32.9/drivers/oprofile/buffer_sync.c 2010-02-23 10:38:51.000000000 -0500 24859--- linux-2.6.32.10/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400
24875+++ linux-2.6.32.9/drivers/oprofile/buffer_sync.c 2010-03-11 20:25:00.149633601 -0500 24860+++ linux-2.6.32.10/drivers/oprofile/buffer_sync.c 2010-03-20 15:58:47.086042900 -0400
24876@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en 24861@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en
24877 if (cookie == NO_COOKIE) 24862 if (cookie == NO_COOKIE)
24878 offset = pc; 24863 offset = pc;
@@ -24908,9 +24893,9 @@ diff -urNp linux-2.6.32.9/drivers/oprofile/buffer_sync.c linux-2.6.32.9/drivers/
24908 } 24893 }
24909 } 24894 }
24910 release_mm(mm); 24895 release_mm(mm);
24911diff -urNp linux-2.6.32.9/drivers/oprofile/event_buffer.c linux-2.6.32.9/drivers/oprofile/event_buffer.c 24896diff -urNp linux-2.6.32.10/drivers/oprofile/event_buffer.c linux-2.6.32.10/drivers/oprofile/event_buffer.c
24912--- linux-2.6.32.9/drivers/oprofile/event_buffer.c 2010-02-23 10:38:51.000000000 -0500 24897--- linux-2.6.32.10/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400
24913+++ linux-2.6.32.9/drivers/oprofile/event_buffer.c 2010-03-11 20:25:00.149633601 -0500 24898+++ linux-2.6.32.10/drivers/oprofile/event_buffer.c 2010-03-20 15:58:47.086042900 -0400
24914@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value 24899@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
24915 } 24900 }
24916 24901
@@ -24920,9 +24905,9 @@ diff -urNp linux-2.6.32.9/drivers/oprofile/event_buffer.c linux-2.6.32.9/drivers
24920 return; 24905 return;
24921 } 24906 }
24922 24907
24923diff -urNp linux-2.6.32.9/drivers/oprofile/oprof.c linux-2.6.32.9/drivers/oprofile/oprof.c 24908diff -urNp linux-2.6.32.10/drivers/oprofile/oprof.c linux-2.6.32.10/drivers/oprofile/oprof.c
24924--- linux-2.6.32.9/drivers/oprofile/oprof.c 2010-02-23 10:38:51.000000000 -0500 24909--- linux-2.6.32.10/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400
24925+++ linux-2.6.32.9/drivers/oprofile/oprof.c 2010-03-11 20:25:00.149633601 -0500 24910+++ linux-2.6.32.10/drivers/oprofile/oprof.c 2010-03-20 15:58:47.086042900 -0400
24926@@ -110,7 +110,7 @@ static void switch_worker(struct work_st 24911@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
24927 if (oprofile_ops.switch_events()) 24912 if (oprofile_ops.switch_events())
24928 return; 24913 return;
@@ -24932,9 +24917,9 @@ diff -urNp linux-2.6.32.9/drivers/oprofile/oprof.c linux-2.6.32.9/drivers/oprofi
24932 start_switch_worker(); 24917 start_switch_worker();
24933 } 24918 }
24934 24919
24935diff -urNp linux-2.6.32.9/drivers/oprofile/oprofilefs.c linux-2.6.32.9/drivers/oprofile/oprofilefs.c 24920diff -urNp linux-2.6.32.10/drivers/oprofile/oprofilefs.c linux-2.6.32.10/drivers/oprofile/oprofilefs.c
24936--- linux-2.6.32.9/drivers/oprofile/oprofilefs.c 2010-02-23 10:38:51.000000000 -0500 24921--- linux-2.6.32.10/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400
24937+++ linux-2.6.32.9/drivers/oprofile/oprofilefs.c 2010-03-11 20:25:00.149633601 -0500 24922+++ linux-2.6.32.10/drivers/oprofile/oprofilefs.c 2010-03-20 15:58:47.086042900 -0400
24938@@ -187,7 +187,7 @@ static const struct file_operations atom 24923@@ -187,7 +187,7 @@ static const struct file_operations atom
24939 24924
24940 24925
@@ -24944,9 +24929,9 @@ diff -urNp linux-2.6.32.9/drivers/oprofile/oprofilefs.c linux-2.6.32.9/drivers/o
24944 { 24929 {
24945 struct dentry *d = __oprofilefs_create_file(sb, root, name, 24930 struct dentry *d = __oprofilefs_create_file(sb, root, name,
24946 &atomic_ro_fops, 0444); 24931 &atomic_ro_fops, 0444);
24947diff -urNp linux-2.6.32.9/drivers/oprofile/oprofile_stats.c linux-2.6.32.9/drivers/oprofile/oprofile_stats.c 24932diff -urNp linux-2.6.32.10/drivers/oprofile/oprofile_stats.c linux-2.6.32.10/drivers/oprofile/oprofile_stats.c
24948--- linux-2.6.32.9/drivers/oprofile/oprofile_stats.c 2010-02-23 10:38:51.000000000 -0500 24933--- linux-2.6.32.10/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400
24949+++ linux-2.6.32.9/drivers/oprofile/oprofile_stats.c 2010-03-11 20:25:00.149633601 -0500 24934+++ linux-2.6.32.10/drivers/oprofile/oprofile_stats.c 2010-03-20 15:58:47.086042900 -0400
24950@@ -30,11 +30,11 @@ void oprofile_reset_stats(void) 24935@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
24951 cpu_buf->sample_invalid_eip = 0; 24936 cpu_buf->sample_invalid_eip = 0;
24952 } 24937 }
@@ -24964,9 +24949,9 @@ diff -urNp linux-2.6.32.9/drivers/oprofile/oprofile_stats.c linux-2.6.32.9/drive
24964 } 24949 }
24965 24950
24966 24951
24967diff -urNp linux-2.6.32.9/drivers/oprofile/oprofile_stats.h linux-2.6.32.9/drivers/oprofile/oprofile_stats.h 24952diff -urNp linux-2.6.32.10/drivers/oprofile/oprofile_stats.h linux-2.6.32.10/drivers/oprofile/oprofile_stats.h
24968--- linux-2.6.32.9/drivers/oprofile/oprofile_stats.h 2010-02-23 10:38:51.000000000 -0500 24953--- linux-2.6.32.10/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400
24969+++ linux-2.6.32.9/drivers/oprofile/oprofile_stats.h 2010-03-11 20:25:00.149633601 -0500 24954+++ linux-2.6.32.10/drivers/oprofile/oprofile_stats.h 2010-03-20 15:58:47.086042900 -0400
24970@@ -13,11 +13,11 @@ 24955@@ -13,11 +13,11 @@
24971 #include <asm/atomic.h> 24956 #include <asm/atomic.h>
24972 24957
@@ -24984,9 +24969,9 @@ diff -urNp linux-2.6.32.9/drivers/oprofile/oprofile_stats.h linux-2.6.32.9/drive
24984 }; 24969 };
24985 24970
24986 extern struct oprofile_stat_struct oprofile_stats; 24971 extern struct oprofile_stat_struct oprofile_stats;
24987diff -urNp linux-2.6.32.9/drivers/parisc/pdc_stable.c linux-2.6.32.9/drivers/parisc/pdc_stable.c 24972diff -urNp linux-2.6.32.10/drivers/parisc/pdc_stable.c linux-2.6.32.10/drivers/parisc/pdc_stable.c
24988--- linux-2.6.32.9/drivers/parisc/pdc_stable.c 2010-02-23 10:38:51.000000000 -0500 24973--- linux-2.6.32.10/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400
24989+++ linux-2.6.32.9/drivers/parisc/pdc_stable.c 2010-03-11 20:25:00.149633601 -0500 24974+++ linux-2.6.32.10/drivers/parisc/pdc_stable.c 2010-03-20 15:58:47.086042900 -0400
24990@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj 24975@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
24991 return ret; 24976 return ret;
24992 } 24977 }
@@ -24996,9 +24981,9 @@ diff -urNp linux-2.6.32.9/drivers/parisc/pdc_stable.c linux-2.6.32.9/drivers/par
24996 .show = pdcspath_attr_show, 24981 .show = pdcspath_attr_show,
24997 .store = pdcspath_attr_store, 24982 .store = pdcspath_attr_store,
24998 }; 24983 };
24999diff -urNp linux-2.6.32.9/drivers/parport/procfs.c linux-2.6.32.9/drivers/parport/procfs.c 24984diff -urNp linux-2.6.32.10/drivers/parport/procfs.c linux-2.6.32.10/drivers/parport/procfs.c
25000--- linux-2.6.32.9/drivers/parport/procfs.c 2010-02-23 10:38:51.000000000 -0500 24985--- linux-2.6.32.10/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400
25001+++ linux-2.6.32.9/drivers/parport/procfs.c 2010-03-11 20:25:00.149633601 -0500 24986+++ linux-2.6.32.10/drivers/parport/procfs.c 2010-03-20 15:58:47.086042900 -0400
25002@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t 24987@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
25003 24988
25004 *ppos += len; 24989 *ppos += len;
@@ -25017,9 +25002,9 @@ diff -urNp linux-2.6.32.9/drivers/parport/procfs.c linux-2.6.32.9/drivers/parpor
25017 } 25002 }
25018 #endif /* IEEE1284.3 support. */ 25003 #endif /* IEEE1284.3 support. */
25019 25004
25020diff -urNp linux-2.6.32.9/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.9/drivers/pci/hotplug/acpiphp_glue.c 25005diff -urNp linux-2.6.32.10/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.10/drivers/pci/hotplug/acpiphp_glue.c
25021--- linux-2.6.32.9/drivers/pci/hotplug/acpiphp_glue.c 2010-02-23 10:38:51.000000000 -0500 25006--- linux-2.6.32.10/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400
25022+++ linux-2.6.32.9/drivers/pci/hotplug/acpiphp_glue.c 2010-03-11 20:25:00.149633601 -0500 25007+++ linux-2.6.32.10/drivers/pci/hotplug/acpiphp_glue.c 2010-03-20 15:58:47.086042900 -0400
25023@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif 25008@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
25024 } 25009 }
25025 25010
@@ -25029,9 +25014,9 @@ diff -urNp linux-2.6.32.9/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.9/driv
25029 .handler = handle_hotplug_event_func, 25014 .handler = handle_hotplug_event_func,
25030 }; 25015 };
25031 25016
25032diff -urNp linux-2.6.32.9/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.9/drivers/pci/hotplug/cpqphp_nvram.c 25017diff -urNp linux-2.6.32.10/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.10/drivers/pci/hotplug/cpqphp_nvram.c
25033--- linux-2.6.32.9/drivers/pci/hotplug/cpqphp_nvram.c 2010-02-23 10:38:51.000000000 -0500 25018--- linux-2.6.32.10/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400
25034+++ linux-2.6.32.9/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-11 20:25:00.149633601 -0500 25019+++ linux-2.6.32.10/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-20 15:58:47.086042900 -0400
25035@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ 25020@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
25036 25021
25037 void compaq_nvram_init (void __iomem *rom_start) 25022 void compaq_nvram_init (void __iomem *rom_start)
@@ -25046,9 +25031,9 @@ diff -urNp linux-2.6.32.9/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.9/driv
25046 dbg("int15 entry = %p\n", compaq_int15_entry_point); 25031 dbg("int15 entry = %p\n", compaq_int15_entry_point);
25047 25032
25048 /* initialize our int15 lock */ 25033 /* initialize our int15 lock */
25049diff -urNp linux-2.6.32.9/drivers/pci/hotplug/fakephp.c linux-2.6.32.9/drivers/pci/hotplug/fakephp.c 25034diff -urNp linux-2.6.32.10/drivers/pci/hotplug/fakephp.c linux-2.6.32.10/drivers/pci/hotplug/fakephp.c
25050--- linux-2.6.32.9/drivers/pci/hotplug/fakephp.c 2010-02-23 10:38:51.000000000 -0500 25035--- linux-2.6.32.10/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400
25051+++ linux-2.6.32.9/drivers/pci/hotplug/fakephp.c 2010-03-11 20:25:00.149633601 -0500 25036+++ linux-2.6.32.10/drivers/pci/hotplug/fakephp.c 2010-03-20 15:58:47.086042900 -0400
25052@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec 25037@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
25053 } 25038 }
25054 25039
@@ -25058,9 +25043,9 @@ diff -urNp linux-2.6.32.9/drivers/pci/hotplug/fakephp.c linux-2.6.32.9/drivers/p
25058 .store = legacy_store, .show = legacy_show 25043 .store = legacy_store, .show = legacy_show
25059 }, 25044 },
25060 .release = &legacy_release, 25045 .release = &legacy_release,
25061diff -urNp linux-2.6.32.9/drivers/pci/intel-iommu.c linux-2.6.32.9/drivers/pci/intel-iommu.c 25046diff -urNp linux-2.6.32.10/drivers/pci/intel-iommu.c linux-2.6.32.10/drivers/pci/intel-iommu.c
25062--- linux-2.6.32.9/drivers/pci/intel-iommu.c 2010-02-23 10:38:51.000000000 -0500 25047--- linux-2.6.32.10/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400
25063+++ linux-2.6.32.9/drivers/pci/intel-iommu.c 2010-03-11 20:25:00.149633601 -0500 25048+++ linux-2.6.32.10/drivers/pci/intel-iommu.c 2010-03-20 15:58:47.086042900 -0400
25064@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de 25049@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de
25065 return !dma_addr; 25050 return !dma_addr;
25066 } 25051 }
@@ -25070,9 +25055,9 @@ diff -urNp linux-2.6.32.9/drivers/pci/intel-iommu.c linux-2.6.32.9/drivers/pci/i
25070 .alloc_coherent = intel_alloc_coherent, 25055 .alloc_coherent = intel_alloc_coherent,
25071 .free_coherent = intel_free_coherent, 25056 .free_coherent = intel_free_coherent,
25072 .map_sg = intel_map_sg, 25057 .map_sg = intel_map_sg,
25073diff -urNp linux-2.6.32.9/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.9/drivers/pci/pcie/portdrv_pci.c 25058diff -urNp linux-2.6.32.10/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.10/drivers/pci/pcie/portdrv_pci.c
25074--- linux-2.6.32.9/drivers/pci/pcie/portdrv_pci.c 2010-02-23 10:38:51.000000000 -0500 25059--- linux-2.6.32.10/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400
25075+++ linux-2.6.32.9/drivers/pci/pcie/portdrv_pci.c 2010-03-11 20:25:00.149633601 -0500 25060+++ linux-2.6.32.10/drivers/pci/pcie/portdrv_pci.c 2010-03-20 15:58:47.086042900 -0400
25076@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru 25061@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru
25077 static const struct pci_device_id port_pci_ids[] = { { 25062 static const struct pci_device_id port_pci_ids[] = { {
25078 /* handle any PCI-Express port */ 25063 /* handle any PCI-Express port */
@@ -25082,9 +25067,9 @@ diff -urNp linux-2.6.32.9/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.9/drivers/
25082 }; 25067 };
25083 MODULE_DEVICE_TABLE(pci, port_pci_ids); 25068 MODULE_DEVICE_TABLE(pci, port_pci_ids);
25084 25069
25085diff -urNp linux-2.6.32.9/drivers/pci/proc.c linux-2.6.32.9/drivers/pci/proc.c 25070diff -urNp linux-2.6.32.10/drivers/pci/proc.c linux-2.6.32.10/drivers/pci/proc.c
25086--- linux-2.6.32.9/drivers/pci/proc.c 2010-02-23 10:38:51.000000000 -0500 25071--- linux-2.6.32.10/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400
25087+++ linux-2.6.32.9/drivers/pci/proc.c 2010-03-11 20:25:00.149633601 -0500 25072+++ linux-2.6.32.10/drivers/pci/proc.c 2010-03-20 15:58:47.086042900 -0400
25088@@ -480,7 +480,16 @@ static const struct file_operations proc 25073@@ -480,7 +480,16 @@ static const struct file_operations proc
25089 static int __init pci_proc_init(void) 25074 static int __init pci_proc_init(void)
25090 { 25075 {
@@ -25102,9 +25087,9 @@ diff -urNp linux-2.6.32.9/drivers/pci/proc.c linux-2.6.32.9/drivers/pci/proc.c
25102 proc_create("devices", 0, proc_bus_pci_dir, 25087 proc_create("devices", 0, proc_bus_pci_dir,
25103 &proc_bus_pci_dev_operations); 25088 &proc_bus_pci_dev_operations);
25104 proc_initialized = 1; 25089 proc_initialized = 1;
25105diff -urNp linux-2.6.32.9/drivers/pci/slot.c linux-2.6.32.9/drivers/pci/slot.c 25090diff -urNp linux-2.6.32.10/drivers/pci/slot.c linux-2.6.32.10/drivers/pci/slot.c
25106--- linux-2.6.32.9/drivers/pci/slot.c 2010-02-23 10:38:51.000000000 -0500 25091--- linux-2.6.32.10/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400
25107+++ linux-2.6.32.9/drivers/pci/slot.c 2010-03-11 20:25:00.149633601 -0500 25092+++ linux-2.6.32.10/drivers/pci/slot.c 2010-03-20 15:58:47.086042900 -0400
25108@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc 25093@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
25109 return attribute->store ? attribute->store(slot, buf, len) : -EIO; 25094 return attribute->store ? attribute->store(slot, buf, len) : -EIO;
25110 } 25095 }
@@ -25114,9 +25099,9 @@ diff -urNp linux-2.6.32.9/drivers/pci/slot.c linux-2.6.32.9/drivers/pci/slot.c
25114 .show = pci_slot_attr_show, 25099 .show = pci_slot_attr_show,
25115 .store = pci_slot_attr_store, 25100 .store = pci_slot_attr_store,
25116 }; 25101 };
25117diff -urNp linux-2.6.32.9/drivers/pcmcia/ti113x.h linux-2.6.32.9/drivers/pcmcia/ti113x.h 25102diff -urNp linux-2.6.32.10/drivers/pcmcia/ti113x.h linux-2.6.32.10/drivers/pcmcia/ti113x.h
25118--- linux-2.6.32.9/drivers/pcmcia/ti113x.h 2010-02-23 10:38:51.000000000 -0500 25103--- linux-2.6.32.10/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400
25119+++ linux-2.6.32.9/drivers/pcmcia/ti113x.h 2010-03-11 20:25:00.149633601 -0500 25104+++ linux-2.6.32.10/drivers/pcmcia/ti113x.h 2010-03-20 15:58:47.086042900 -0400
25120@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl 25105@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl
25121 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, 25106 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
25122 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), 25107 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
@@ -25126,9 +25111,9 @@ diff -urNp linux-2.6.32.9/drivers/pcmcia/ti113x.h linux-2.6.32.9/drivers/pcmcia/
25126 }; 25111 };
25127 25112
25128 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) 25113 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
25129diff -urNp linux-2.6.32.9/drivers/pcmcia/yenta_socket.c linux-2.6.32.9/drivers/pcmcia/yenta_socket.c 25114diff -urNp linux-2.6.32.10/drivers/pcmcia/yenta_socket.c linux-2.6.32.10/drivers/pcmcia/yenta_socket.c
25130--- linux-2.6.32.9/drivers/pcmcia/yenta_socket.c 2010-02-23 10:38:51.000000000 -0500 25115--- linux-2.6.32.10/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400
25131+++ linux-2.6.32.9/drivers/pcmcia/yenta_socket.c 2010-03-11 20:25:00.149633601 -0500 25116+++ linux-2.6.32.10/drivers/pcmcia/yenta_socket.c 2010-03-20 15:58:47.086042900 -0400
25132@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table 25117@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
25133 25118
25134 /* match any cardbus bridge */ 25119 /* match any cardbus bridge */
@@ -25138,9 +25123,9 @@ diff -urNp linux-2.6.32.9/drivers/pcmcia/yenta_socket.c linux-2.6.32.9/drivers/p
25138 }; 25123 };
25139 MODULE_DEVICE_TABLE(pci, yenta_table); 25124 MODULE_DEVICE_TABLE(pci, yenta_table);
25140 25125
25141diff -urNp linux-2.6.32.9/drivers/platform/x86/acer-wmi.c linux-2.6.32.9/drivers/platform/x86/acer-wmi.c 25126diff -urNp linux-2.6.32.10/drivers/platform/x86/acer-wmi.c linux-2.6.32.10/drivers/platform/x86/acer-wmi.c
25142--- linux-2.6.32.9/drivers/platform/x86/acer-wmi.c 2010-02-23 10:38:51.000000000 -0500 25127--- linux-2.6.32.10/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400
25143+++ linux-2.6.32.9/drivers/platform/x86/acer-wmi.c 2010-03-11 20:25:00.149633601 -0500 25128+++ linux-2.6.32.10/drivers/platform/x86/acer-wmi.c 2010-03-20 15:58:47.086042900 -0400
25144@@ -918,7 +918,7 @@ static int update_bl_status(struct backl 25129@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
25145 return 0; 25130 return 0;
25146 } 25131 }
@@ -25150,9 +25135,9 @@ diff -urNp linux-2.6.32.9/drivers/platform/x86/acer-wmi.c linux-2.6.32.9/drivers
25150 .get_brightness = read_brightness, 25135 .get_brightness = read_brightness,
25151 .update_status = update_bl_status, 25136 .update_status = update_bl_status,
25152 }; 25137 };
25153diff -urNp linux-2.6.32.9/drivers/platform/x86/asus_acpi.c linux-2.6.32.9/drivers/platform/x86/asus_acpi.c 25138diff -urNp linux-2.6.32.10/drivers/platform/x86/asus_acpi.c linux-2.6.32.10/drivers/platform/x86/asus_acpi.c
25154--- linux-2.6.32.9/drivers/platform/x86/asus_acpi.c 2010-02-23 10:38:51.000000000 -0500 25139--- linux-2.6.32.10/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400
25155+++ linux-2.6.32.9/drivers/platform/x86/asus_acpi.c 2010-03-11 20:25:00.149633601 -0500 25140+++ linux-2.6.32.10/drivers/platform/x86/asus_acpi.c 2010-03-20 15:58:47.086042900 -0400
25156@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ 25141@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
25157 return 0; 25142 return 0;
25158 } 25143 }
@@ -25162,9 +25147,9 @@ diff -urNp linux-2.6.32.9/drivers/platform/x86/asus_acpi.c linux-2.6.32.9/driver
25162 .get_brightness = read_brightness, 25147 .get_brightness = read_brightness,
25163 .update_status = set_brightness_status, 25148 .update_status = set_brightness_status,
25164 }; 25149 };
25165diff -urNp linux-2.6.32.9/drivers/platform/x86/asus-laptop.c linux-2.6.32.9/drivers/platform/x86/asus-laptop.c 25150diff -urNp linux-2.6.32.10/drivers/platform/x86/asus-laptop.c linux-2.6.32.10/drivers/platform/x86/asus-laptop.c
25166--- linux-2.6.32.9/drivers/platform/x86/asus-laptop.c 2010-02-23 10:38:51.000000000 -0500 25151--- linux-2.6.32.10/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400
25167+++ linux-2.6.32.9/drivers/platform/x86/asus-laptop.c 2010-03-11 20:25:00.149633601 -0500 25152+++ linux-2.6.32.10/drivers/platform/x86/asus-laptop.c 2010-03-20 15:58:47.086042900 -0400
25168@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac 25153@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
25169 */ 25154 */
25170 static int read_brightness(struct backlight_device *bd); 25155 static int read_brightness(struct backlight_device *bd);
@@ -25174,9 +25159,9 @@ diff -urNp linux-2.6.32.9/drivers/platform/x86/asus-laptop.c linux-2.6.32.9/driv
25174 .get_brightness = read_brightness, 25159 .get_brightness = read_brightness,
25175 .update_status = update_bl_status, 25160 .update_status = update_bl_status,
25176 }; 25161 };
25177diff -urNp linux-2.6.32.9/drivers/platform/x86/compal-laptop.c linux-2.6.32.9/drivers/platform/x86/compal-laptop.c 25162diff -urNp linux-2.6.32.10/drivers/platform/x86/compal-laptop.c linux-2.6.32.10/drivers/platform/x86/compal-laptop.c
25178--- linux-2.6.32.9/drivers/platform/x86/compal-laptop.c 2010-02-23 10:38:51.000000000 -0500 25163--- linux-2.6.32.10/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400
25179+++ linux-2.6.32.9/drivers/platform/x86/compal-laptop.c 2010-03-11 20:25:00.153566598 -0500 25164+++ linux-2.6.32.10/drivers/platform/x86/compal-laptop.c 2010-03-20 15:58:47.090064442 -0400
25180@@ -163,7 +163,7 @@ static int bl_update_status(struct backl 25165@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
25181 return set_lcd_level(b->props.brightness); 25166 return set_lcd_level(b->props.brightness);
25182 } 25167 }
@@ -25186,9 +25171,9 @@ diff -urNp linux-2.6.32.9/drivers/platform/x86/compal-laptop.c linux-2.6.32.9/dr
25186 .get_brightness = bl_get_brightness, 25171 .get_brightness = bl_get_brightness,
25187 .update_status = bl_update_status, 25172 .update_status = bl_update_status,
25188 }; 25173 };
25189diff -urNp linux-2.6.32.9/drivers/platform/x86/dell-laptop.c linux-2.6.32.9/drivers/platform/x86/dell-laptop.c 25174diff -urNp linux-2.6.32.10/drivers/platform/x86/dell-laptop.c linux-2.6.32.10/drivers/platform/x86/dell-laptop.c
25190--- linux-2.6.32.9/drivers/platform/x86/dell-laptop.c 2010-02-23 10:38:51.000000000 -0500 25175--- linux-2.6.32.10/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400
25191+++ linux-2.6.32.9/drivers/platform/x86/dell-laptop.c 2010-03-11 20:25:00.153566598 -0500 25176+++ linux-2.6.32.10/drivers/platform/x86/dell-laptop.c 2010-03-20 15:58:47.090064442 -0400
25192@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac 25177@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
25193 return buffer.output[1]; 25178 return buffer.output[1];
25194 } 25179 }
@@ -25198,9 +25183,9 @@ diff -urNp linux-2.6.32.9/drivers/platform/x86/dell-laptop.c linux-2.6.32.9/driv
25198 .get_brightness = dell_get_intensity, 25183 .get_brightness = dell_get_intensity,
25199 .update_status = dell_send_intensity, 25184 .update_status = dell_send_intensity,
25200 }; 25185 };
25201diff -urNp linux-2.6.32.9/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.9/drivers/platform/x86/eeepc-laptop.c 25186diff -urNp linux-2.6.32.10/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.10/drivers/platform/x86/eeepc-laptop.c
25202--- linux-2.6.32.9/drivers/platform/x86/eeepc-laptop.c 2010-02-23 10:38:51.000000000 -0500 25187--- linux-2.6.32.10/drivers/platform/x86/eeepc-laptop.c 2010-03-15 11:52:04.000000000 -0400
25203+++ linux-2.6.32.9/drivers/platform/x86/eeepc-laptop.c 2010-03-11 20:25:00.153566598 -0500 25188+++ linux-2.6.32.10/drivers/platform/x86/eeepc-laptop.c 2010-03-20 15:58:47.090064442 -0400
25204@@ -242,7 +242,7 @@ static struct device *eeepc_hwmon_device 25189@@ -242,7 +242,7 @@ static struct device *eeepc_hwmon_device
25205 */ 25190 */
25206 static int read_brightness(struct backlight_device *bd); 25191 static int read_brightness(struct backlight_device *bd);
@@ -25210,9 +25195,9 @@ diff -urNp linux-2.6.32.9/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.9/dri
25210 .get_brightness = read_brightness, 25195 .get_brightness = read_brightness,
25211 .update_status = update_bl_status, 25196 .update_status = update_bl_status,
25212 }; 25197 };
25213diff -urNp linux-2.6.32.9/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.9/drivers/platform/x86/fujitsu-laptop.c 25198diff -urNp linux-2.6.32.10/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.10/drivers/platform/x86/fujitsu-laptop.c
25214--- linux-2.6.32.9/drivers/platform/x86/fujitsu-laptop.c 2010-02-23 10:38:51.000000000 -0500 25199--- linux-2.6.32.10/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400
25215+++ linux-2.6.32.9/drivers/platform/x86/fujitsu-laptop.c 2010-03-11 20:25:00.153566598 -0500 25200+++ linux-2.6.32.10/drivers/platform/x86/fujitsu-laptop.c 2010-03-20 15:58:47.090064442 -0400
25216@@ -436,7 +436,7 @@ static int bl_update_status(struct backl 25201@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
25217 return ret; 25202 return ret;
25218 } 25203 }
@@ -25222,9 +25207,9 @@ diff -urNp linux-2.6.32.9/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.9/d
25222 .get_brightness = bl_get_brightness, 25207 .get_brightness = bl_get_brightness,
25223 .update_status = bl_update_status, 25208 .update_status = bl_update_status,
25224 }; 25209 };
25225diff -urNp linux-2.6.32.9/drivers/platform/x86/msi-laptop.c linux-2.6.32.9/drivers/platform/x86/msi-laptop.c 25210diff -urNp linux-2.6.32.10/drivers/platform/x86/msi-laptop.c linux-2.6.32.10/drivers/platform/x86/msi-laptop.c
25226--- linux-2.6.32.9/drivers/platform/x86/msi-laptop.c 2010-02-23 10:38:51.000000000 -0500 25211--- linux-2.6.32.10/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400
25227+++ linux-2.6.32.9/drivers/platform/x86/msi-laptop.c 2010-03-11 20:25:00.153566598 -0500 25212+++ linux-2.6.32.10/drivers/platform/x86/msi-laptop.c 2010-03-20 15:58:47.090064442 -0400
25228@@ -161,7 +161,7 @@ static int bl_update_status(struct backl 25213@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
25229 return set_lcd_level(b->props.brightness); 25214 return set_lcd_level(b->props.brightness);
25230 } 25215 }
@@ -25234,9 +25219,9 @@ diff -urNp linux-2.6.32.9/drivers/platform/x86/msi-laptop.c linux-2.6.32.9/drive
25234 .get_brightness = bl_get_brightness, 25219 .get_brightness = bl_get_brightness,
25235 .update_status = bl_update_status, 25220 .update_status = bl_update_status,
25236 }; 25221 };
25237diff -urNp linux-2.6.32.9/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.9/drivers/platform/x86/panasonic-laptop.c 25222diff -urNp linux-2.6.32.10/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.10/drivers/platform/x86/panasonic-laptop.c
25238--- linux-2.6.32.9/drivers/platform/x86/panasonic-laptop.c 2010-02-23 10:38:51.000000000 -0500 25223--- linux-2.6.32.10/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400
25239+++ linux-2.6.32.9/drivers/platform/x86/panasonic-laptop.c 2010-03-11 20:25:00.153566598 -0500 25224+++ linux-2.6.32.10/drivers/platform/x86/panasonic-laptop.c 2010-03-20 15:58:47.090064442 -0400
25240@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh 25225@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
25241 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); 25226 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
25242 } 25227 }
@@ -25246,9 +25231,9 @@ diff -urNp linux-2.6.32.9/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.9
25246 .get_brightness = bl_get, 25231 .get_brightness = bl_get,
25247 .update_status = bl_set_status, 25232 .update_status = bl_set_status,
25248 }; 25233 };
25249diff -urNp linux-2.6.32.9/drivers/platform/x86/sony-laptop.c linux-2.6.32.9/drivers/platform/x86/sony-laptop.c 25234diff -urNp linux-2.6.32.10/drivers/platform/x86/sony-laptop.c linux-2.6.32.10/drivers/platform/x86/sony-laptop.c
25250--- linux-2.6.32.9/drivers/platform/x86/sony-laptop.c 2010-02-23 10:38:51.000000000 -0500 25235--- linux-2.6.32.10/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400
25251+++ linux-2.6.32.9/drivers/platform/x86/sony-laptop.c 2010-03-11 20:25:00.153566598 -0500 25236+++ linux-2.6.32.10/drivers/platform/x86/sony-laptop.c 2010-03-20 15:58:47.090064442 -0400
25252@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness 25237@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
25253 } 25238 }
25254 25239
@@ -25258,10 +25243,10 @@ diff -urNp linux-2.6.32.9/drivers/platform/x86/sony-laptop.c linux-2.6.32.9/driv
25258 .update_status = sony_backlight_update_status, 25243 .update_status = sony_backlight_update_status,
25259 .get_brightness = sony_backlight_get_brightness, 25244 .get_brightness = sony_backlight_get_brightness,
25260 }; 25245 };
25261diff -urNp linux-2.6.32.9/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.9/drivers/platform/x86/thinkpad_acpi.c 25246diff -urNp linux-2.6.32.10/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.10/drivers/platform/x86/thinkpad_acpi.c
25262--- linux-2.6.32.9/drivers/platform/x86/thinkpad_acpi.c 2010-02-23 10:38:51.000000000 -0500 25247--- linux-2.6.32.10/drivers/platform/x86/thinkpad_acpi.c 2010-03-15 11:52:04.000000000 -0400
25263+++ linux-2.6.32.9/drivers/platform/x86/thinkpad_acpi.c 2010-03-11 20:25:00.153566598 -0500 25248+++ linux-2.6.32.10/drivers/platform/x86/thinkpad_acpi.c 2010-03-20 15:58:47.090064442 -0400
25264@@ -6073,7 +6073,7 @@ static int brightness_get(struct backlig 25249@@ -6083,7 +6083,7 @@ static int brightness_get(struct backlig
25265 return status & TP_EC_BACKLIGHT_LVLMSK; 25250 return status & TP_EC_BACKLIGHT_LVLMSK;
25266 } 25251 }
25267 25252
@@ -25270,9 +25255,9 @@ diff -urNp linux-2.6.32.9/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.9/dr
25270 .get_brightness = brightness_get, 25255 .get_brightness = brightness_get,
25271 .update_status = brightness_update_status, 25256 .update_status = brightness_update_status,
25272 }; 25257 };
25273diff -urNp linux-2.6.32.9/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.9/drivers/platform/x86/toshiba_acpi.c 25258diff -urNp linux-2.6.32.10/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.10/drivers/platform/x86/toshiba_acpi.c
25274--- linux-2.6.32.9/drivers/platform/x86/toshiba_acpi.c 2010-02-23 10:38:51.000000000 -0500 25259--- linux-2.6.32.10/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400
25275+++ linux-2.6.32.9/drivers/platform/x86/toshiba_acpi.c 2010-03-11 20:25:00.153566598 -0500 25260+++ linux-2.6.32.10/drivers/platform/x86/toshiba_acpi.c 2010-03-20 15:58:47.090064442 -0400
25276@@ -671,7 +671,7 @@ static acpi_status remove_device(void) 25261@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
25277 return AE_OK; 25262 return AE_OK;
25278 } 25263 }
@@ -25282,9 +25267,9 @@ diff -urNp linux-2.6.32.9/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.9/dri
25282 .get_brightness = get_lcd, 25267 .get_brightness = get_lcd,
25283 .update_status = set_lcd_status, 25268 .update_status = set_lcd_status,
25284 }; 25269 };
25285diff -urNp linux-2.6.32.9/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.9/drivers/pnp/pnpbios/bioscalls.c 25270diff -urNp linux-2.6.32.10/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.10/drivers/pnp/pnpbios/bioscalls.c
25286--- linux-2.6.32.9/drivers/pnp/pnpbios/bioscalls.c 2010-02-23 10:38:51.000000000 -0500 25271--- linux-2.6.32.10/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400
25287+++ linux-2.6.32.9/drivers/pnp/pnpbios/bioscalls.c 2010-03-11 20:25:00.153566598 -0500 25272+++ linux-2.6.32.10/drivers/pnp/pnpbios/bioscalls.c 2010-03-20 15:58:47.090064442 -0400
25288@@ -60,7 +60,7 @@ do { \ 25273@@ -60,7 +60,7 @@ do { \
25289 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ 25274 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
25290 } while(0) 25275 } while(0)
@@ -25341,9 +25326,9 @@ diff -urNp linux-2.6.32.9/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.9/drivers
25341+ 25326+
25342+ pax_close_kernel(); 25327+ pax_close_kernel();
25343 } 25328 }
25344diff -urNp linux-2.6.32.9/drivers/pnp/quirks.c linux-2.6.32.9/drivers/pnp/quirks.c 25329diff -urNp linux-2.6.32.10/drivers/pnp/quirks.c linux-2.6.32.10/drivers/pnp/quirks.c
25345--- linux-2.6.32.9/drivers/pnp/quirks.c 2010-02-23 10:38:51.000000000 -0500 25330--- linux-2.6.32.10/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400
25346+++ linux-2.6.32.9/drivers/pnp/quirks.c 2010-03-11 20:25:00.153566598 -0500 25331+++ linux-2.6.32.10/drivers/pnp/quirks.c 2010-03-20 15:58:47.090064442 -0400
25347@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { 25332@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
25348 /* PnP resources that might overlap PCI BARs */ 25333 /* PnP resources that might overlap PCI BARs */
25349 {"PNP0c01", quirk_system_pci_resources}, 25334 {"PNP0c01", quirk_system_pci_resources},
@@ -25353,9 +25338,9 @@ diff -urNp linux-2.6.32.9/drivers/pnp/quirks.c linux-2.6.32.9/drivers/pnp/quirks
25353 }; 25338 };
25354 25339
25355 void pnp_fixup_device(struct pnp_dev *dev) 25340 void pnp_fixup_device(struct pnp_dev *dev)
25356diff -urNp linux-2.6.32.9/drivers/pnp/resource.c linux-2.6.32.9/drivers/pnp/resource.c 25341diff -urNp linux-2.6.32.10/drivers/pnp/resource.c linux-2.6.32.10/drivers/pnp/resource.c
25357--- linux-2.6.32.9/drivers/pnp/resource.c 2010-02-23 10:38:51.000000000 -0500 25342--- linux-2.6.32.10/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400
25358+++ linux-2.6.32.9/drivers/pnp/resource.c 2010-03-11 20:25:00.153566598 -0500 25343+++ linux-2.6.32.10/drivers/pnp/resource.c 2010-03-20 15:58:47.090064442 -0400
25359@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s 25344@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
25360 return 1; 25345 return 1;
25361 25346
@@ -25374,9 +25359,9 @@ diff -urNp linux-2.6.32.9/drivers/pnp/resource.c linux-2.6.32.9/drivers/pnp/reso
25374 return 0; 25359 return 0;
25375 25360
25376 /* check if the resource is reserved */ 25361 /* check if the resource is reserved */
25377diff -urNp linux-2.6.32.9/drivers/s390/cio/qdio_perf.c linux-2.6.32.9/drivers/s390/cio/qdio_perf.c 25362diff -urNp linux-2.6.32.10/drivers/s390/cio/qdio_perf.c linux-2.6.32.10/drivers/s390/cio/qdio_perf.c
25378--- linux-2.6.32.9/drivers/s390/cio/qdio_perf.c 2010-02-23 10:38:51.000000000 -0500 25363--- linux-2.6.32.10/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400
25379+++ linux-2.6.32.9/drivers/s390/cio/qdio_perf.c 2010-03-11 20:25:00.153566598 -0500 25364+++ linux-2.6.32.10/drivers/s390/cio/qdio_perf.c 2010-03-20 15:58:47.090064442 -0400
25380@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ 25365@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
25381 static int qdio_perf_proc_show(struct seq_file *m, void *v) 25366 static int qdio_perf_proc_show(struct seq_file *m, void *v)
25382 { 25367 {
@@ -25452,9 +25437,9 @@ diff -urNp linux-2.6.32.9/drivers/s390/cio/qdio_perf.c linux-2.6.32.9/drivers/s3
25452 seq_printf(m, "\n"); 25437 seq_printf(m, "\n");
25453 return 0; 25438 return 0;
25454 } 25439 }
25455diff -urNp linux-2.6.32.9/drivers/s390/cio/qdio_perf.h linux-2.6.32.9/drivers/s390/cio/qdio_perf.h 25440diff -urNp linux-2.6.32.10/drivers/s390/cio/qdio_perf.h linux-2.6.32.10/drivers/s390/cio/qdio_perf.h
25456--- linux-2.6.32.9/drivers/s390/cio/qdio_perf.h 2010-02-23 10:38:51.000000000 -0500 25441--- linux-2.6.32.10/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400
25457+++ linux-2.6.32.9/drivers/s390/cio/qdio_perf.h 2010-03-11 20:25:00.153566598 -0500 25442+++ linux-2.6.32.10/drivers/s390/cio/qdio_perf.h 2010-03-20 15:58:47.090064442 -0400
25458@@ -13,46 +13,46 @@ 25443@@ -13,46 +13,46 @@
25459 25444
25460 struct qdio_perf_stats { 25445 struct qdio_perf_stats {
@@ -25527,9 +25512,9 @@ diff -urNp linux-2.6.32.9/drivers/s390/cio/qdio_perf.h linux-2.6.32.9/drivers/s3
25527 } 25512 }
25528 25513
25529 int qdio_setup_perf_stats(void); 25514 int qdio_setup_perf_stats(void);
25530diff -urNp linux-2.6.32.9/drivers/scsi/ipr.c linux-2.6.32.9/drivers/scsi/ipr.c 25515diff -urNp linux-2.6.32.10/drivers/scsi/ipr.c linux-2.6.32.10/drivers/scsi/ipr.c
25531--- linux-2.6.32.9/drivers/scsi/ipr.c 2010-02-23 10:38:51.000000000 -0500 25516--- linux-2.6.32.10/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400
25532+++ linux-2.6.32.9/drivers/scsi/ipr.c 2010-03-11 20:25:00.157636742 -0500 25517+++ linux-2.6.32.10/drivers/scsi/ipr.c 2010-03-20 15:58:47.094061510 -0400
25533@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q 25518@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
25534 return true; 25519 return true;
25535 } 25520 }
@@ -25539,9 +25524,9 @@ diff -urNp linux-2.6.32.9/drivers/scsi/ipr.c linux-2.6.32.9/drivers/scsi/ipr.c
25539 .phy_reset = ipr_ata_phy_reset, 25524 .phy_reset = ipr_ata_phy_reset,
25540 .hardreset = ipr_sata_reset, 25525 .hardreset = ipr_sata_reset,
25541 .post_internal_cmd = ipr_ata_post_internal, 25526 .post_internal_cmd = ipr_ata_post_internal,
25542diff -urNp linux-2.6.32.9/drivers/scsi/libfc/fc_exch.c linux-2.6.32.9/drivers/scsi/libfc/fc_exch.c 25527diff -urNp linux-2.6.32.10/drivers/scsi/libfc/fc_exch.c linux-2.6.32.10/drivers/scsi/libfc/fc_exch.c
25543--- linux-2.6.32.9/drivers/scsi/libfc/fc_exch.c 2010-02-23 10:38:51.000000000 -0500 25528--- linux-2.6.32.10/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400
25544+++ linux-2.6.32.9/drivers/scsi/libfc/fc_exch.c 2010-03-11 20:25:00.157636742 -0500 25529+++ linux-2.6.32.10/drivers/scsi/libfc/fc_exch.c 2010-03-20 15:58:47.094061510 -0400
25545@@ -86,12 +86,12 @@ struct fc_exch_mgr { 25530@@ -86,12 +86,12 @@ struct fc_exch_mgr {
25546 * all together if not used XXX 25531 * all together if not used XXX
25547 */ 25532 */
@@ -25663,9 +25648,9 @@ diff -urNp linux-2.6.32.9/drivers/scsi/libfc/fc_exch.c linux-2.6.32.9/drivers/sc
25663 25648
25664 fc_frame_free(fp); 25649 fc_frame_free(fp);
25665 } 25650 }
25666diff -urNp linux-2.6.32.9/drivers/scsi/libsas/sas_ata.c linux-2.6.32.9/drivers/scsi/libsas/sas_ata.c 25651diff -urNp linux-2.6.32.10/drivers/scsi/libsas/sas_ata.c linux-2.6.32.10/drivers/scsi/libsas/sas_ata.c
25667--- linux-2.6.32.9/drivers/scsi/libsas/sas_ata.c 2010-02-23 10:38:51.000000000 -0500 25652--- linux-2.6.32.10/drivers/scsi/libsas/sas_ata.c 2010-03-15 11:52:04.000000000 -0400
25668+++ linux-2.6.32.9/drivers/scsi/libsas/sas_ata.c 2010-03-11 20:25:00.157636742 -0500 25653+++ linux-2.6.32.10/drivers/scsi/libsas/sas_ata.c 2010-03-20 15:58:47.094061510 -0400
25669@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l 25654@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
25670 } 25655 }
25671 } 25656 }
@@ -25675,9 +25660,9 @@ diff -urNp linux-2.6.32.9/drivers/scsi/libsas/sas_ata.c linux-2.6.32.9/drivers/s
25675 .phy_reset = sas_ata_phy_reset, 25660 .phy_reset = sas_ata_phy_reset,
25676 .post_internal_cmd = sas_ata_post_internal, 25661 .post_internal_cmd = sas_ata_post_internal,
25677 .qc_prep = ata_noop_qc_prep, 25662 .qc_prep = ata_noop_qc_prep,
25678diff -urNp linux-2.6.32.9/drivers/scsi/scsi_logging.h linux-2.6.32.9/drivers/scsi/scsi_logging.h 25663diff -urNp linux-2.6.32.10/drivers/scsi/scsi_logging.h linux-2.6.32.10/drivers/scsi/scsi_logging.h
25679--- linux-2.6.32.9/drivers/scsi/scsi_logging.h 2010-02-23 10:38:51.000000000 -0500 25664--- linux-2.6.32.10/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400
25680+++ linux-2.6.32.9/drivers/scsi/scsi_logging.h 2010-03-11 20:25:00.157636742 -0500 25665+++ linux-2.6.32.10/drivers/scsi/scsi_logging.h 2010-03-20 15:58:47.094061510 -0400
25681@@ -51,7 +51,7 @@ do { \ 25666@@ -51,7 +51,7 @@ do { \
25682 } while (0); \ 25667 } while (0); \
25683 } while (0) 25668 } while (0)
@@ -25687,9 +25672,9 @@ diff -urNp linux-2.6.32.9/drivers/scsi/scsi_logging.h linux-2.6.32.9/drivers/scs
25687 #endif /* CONFIG_SCSI_LOGGING */ 25672 #endif /* CONFIG_SCSI_LOGGING */
25688 25673
25689 /* 25674 /*
25690diff -urNp linux-2.6.32.9/drivers/scsi/sg.c linux-2.6.32.9/drivers/scsi/sg.c 25675diff -urNp linux-2.6.32.10/drivers/scsi/sg.c linux-2.6.32.10/drivers/scsi/sg.c
25691--- linux-2.6.32.9/drivers/scsi/sg.c 2010-02-23 10:38:51.000000000 -0500 25676--- linux-2.6.32.10/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400
25692+++ linux-2.6.32.9/drivers/scsi/sg.c 2010-03-11 20:25:00.157636742 -0500 25677+++ linux-2.6.32.10/drivers/scsi/sg.c 2010-03-20 15:58:47.094061510 -0400
25693@@ -2292,7 +2292,7 @@ struct sg_proc_leaf { 25678@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
25694 const struct file_operations * fops; 25679 const struct file_operations * fops;
25695 }; 25680 };
@@ -25708,9 +25693,9 @@ diff -urNp linux-2.6.32.9/drivers/scsi/sg.c linux-2.6.32.9/drivers/scsi/sg.c
25708 25693
25709 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); 25694 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
25710 if (!sg_proc_sgp) 25695 if (!sg_proc_sgp)
25711diff -urNp linux-2.6.32.9/drivers/serial/8250_pci.c linux-2.6.32.9/drivers/serial/8250_pci.c 25696diff -urNp linux-2.6.32.10/drivers/serial/8250_pci.c linux-2.6.32.10/drivers/serial/8250_pci.c
25712--- linux-2.6.32.9/drivers/serial/8250_pci.c 2010-02-23 10:38:51.000000000 -0500 25697--- linux-2.6.32.10/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400
25713+++ linux-2.6.32.9/drivers/serial/8250_pci.c 2010-03-11 20:25:00.157636742 -0500 25698+++ linux-2.6.32.10/drivers/serial/8250_pci.c 2010-03-20 15:58:47.094061510 -0400
25714@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t 25699@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
25715 PCI_ANY_ID, PCI_ANY_ID, 25700 PCI_ANY_ID, PCI_ANY_ID,
25716 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, 25701 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
@@ -25720,9 +25705,9 @@ diff -urNp linux-2.6.32.9/drivers/serial/8250_pci.c linux-2.6.32.9/drivers/seria
25720 }; 25705 };
25721 25706
25722 static struct pci_driver serial_pci_driver = { 25707 static struct pci_driver serial_pci_driver = {
25723diff -urNp linux-2.6.32.9/drivers/serial/kgdboc.c linux-2.6.32.9/drivers/serial/kgdboc.c 25708diff -urNp linux-2.6.32.10/drivers/serial/kgdboc.c linux-2.6.32.10/drivers/serial/kgdboc.c
25724--- linux-2.6.32.9/drivers/serial/kgdboc.c 2010-02-23 10:38:51.000000000 -0500 25709--- linux-2.6.32.10/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400
25725+++ linux-2.6.32.9/drivers/serial/kgdboc.c 2010-03-11 20:25:00.157636742 -0500 25710+++ linux-2.6.32.10/drivers/serial/kgdboc.c 2010-03-20 15:58:47.094061510 -0400
25726@@ -18,7 +18,7 @@ 25711@@ -18,7 +18,7 @@
25727 25712
25728 #define MAX_CONFIG_LEN 40 25713 #define MAX_CONFIG_LEN 40
@@ -25741,9 +25726,9 @@ diff -urNp linux-2.6.32.9/drivers/serial/kgdboc.c linux-2.6.32.9/drivers/serial/
25741 .name = "kgdboc", 25726 .name = "kgdboc",
25742 .read_char = kgdboc_get_char, 25727 .read_char = kgdboc_get_char,
25743 .write_char = kgdboc_put_char, 25728 .write_char = kgdboc_put_char,
25744diff -urNp linux-2.6.32.9/drivers/staging/android/binder.c linux-2.6.32.9/drivers/staging/android/binder.c 25729diff -urNp linux-2.6.32.10/drivers/staging/android/binder.c linux-2.6.32.10/drivers/staging/android/binder.c
25745--- linux-2.6.32.9/drivers/staging/android/binder.c 2010-02-23 10:38:51.000000000 -0500 25730--- linux-2.6.32.10/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400
25746+++ linux-2.6.32.9/drivers/staging/android/binder.c 2010-03-11 20:25:00.157636742 -0500 25731+++ linux-2.6.32.10/drivers/staging/android/binder.c 2010-03-20 15:58:47.094061510 -0400
25747@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a 25732@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
25748 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); 25733 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
25749 } 25734 }
@@ -25753,9 +25738,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/android/binder.c linux-2.6.32.9/driver
25753 .open = binder_vma_open, 25738 .open = binder_vma_open,
25754 .close = binder_vma_close, 25739 .close = binder_vma_close,
25755 }; 25740 };
25756diff -urNp linux-2.6.32.9/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.9/drivers/staging/b3dfg/b3dfg.c 25741diff -urNp linux-2.6.32.10/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.10/drivers/staging/b3dfg/b3dfg.c
25757--- linux-2.6.32.9/drivers/staging/b3dfg/b3dfg.c 2010-02-23 10:38:51.000000000 -0500 25742--- linux-2.6.32.10/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400
25758+++ linux-2.6.32.9/drivers/staging/b3dfg/b3dfg.c 2010-03-11 20:25:00.157636742 -0500 25743+++ linux-2.6.32.10/drivers/staging/b3dfg/b3dfg.c 2010-03-20 15:58:47.094061510 -0400
25759@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are 25744@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
25760 return VM_FAULT_NOPAGE; 25745 return VM_FAULT_NOPAGE;
25761 } 25746 }
@@ -25774,9 +25759,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.9/drivers/s
25774 .owner = THIS_MODULE, 25759 .owner = THIS_MODULE,
25775 .open = b3dfg_open, 25760 .open = b3dfg_open,
25776 .release = b3dfg_release, 25761 .release = b3dfg_release,
25777diff -urNp linux-2.6.32.9/drivers/staging/comedi/comedi_fops.c linux-2.6.32.9/drivers/staging/comedi/comedi_fops.c 25762diff -urNp linux-2.6.32.10/drivers/staging/comedi/comedi_fops.c linux-2.6.32.10/drivers/staging/comedi/comedi_fops.c
25778--- linux-2.6.32.9/drivers/staging/comedi/comedi_fops.c 2010-02-23 10:38:51.000000000 -0500 25763--- linux-2.6.32.10/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400
25779+++ linux-2.6.32.9/drivers/staging/comedi/comedi_fops.c 2010-03-11 20:25:00.161352016 -0500 25764+++ linux-2.6.32.10/drivers/staging/comedi/comedi_fops.c 2010-03-20 15:58:47.098056258 -0400
25780@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct 25765@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
25781 mutex_unlock(&dev->mutex); 25766 mutex_unlock(&dev->mutex);
25782 } 25767 }
@@ -25786,9 +25771,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/comedi/comedi_fops.c linux-2.6.32.9/dr
25786 .close = comedi_unmap, 25771 .close = comedi_unmap,
25787 }; 25772 };
25788 25773
25789diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.9/drivers/staging/dream/qdsp5/adsp_driver.c 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
25790--- linux-2.6.32.9/drivers/staging/dream/qdsp5/adsp_driver.c 2010-02-23 10:38:51.000000000 -0500 25775--- linux-2.6.32.10/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400
25791+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-11 20:25:00.161352016 -0500 25776+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-20 15:58:47.098056258 -0400
25792@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi 25777@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
25793 static dev_t adsp_devno; 25778 static dev_t adsp_devno;
25794 static struct class *adsp_class; 25779 static struct class *adsp_class;
@@ -25798,9 +25783,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32
25798 .owner = THIS_MODULE, 25783 .owner = THIS_MODULE,
25799 .open = adsp_open, 25784 .open = adsp_open,
25800 .unlocked_ioctl = adsp_ioctl, 25785 .unlocked_ioctl = adsp_ioctl,
25801diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_aac.c 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
25802--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_aac.c 2010-02-23 10:38:51.000000000 -0500 25787--- linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400
25803+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-11 20:25:00.161352016 -0500 25788+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-20 15:58:47.098056258 -0400
25804@@ -1022,7 +1022,7 @@ done: 25789@@ -1022,7 +1022,7 @@ done:
25805 return rc; 25790 return rc;
25806 } 25791 }
@@ -25810,9 +25795,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.9
25810 .owner = THIS_MODULE, 25795 .owner = THIS_MODULE,
25811 .open = audio_open, 25796 .open = audio_open,
25812 .release = audio_release, 25797 .release = audio_release,
25813diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_amrnb.c 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
25814--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-02-23 10:38:51.000000000 -0500 25799--- linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400
25815+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-11 20:25:00.161352016 -0500 25800+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-20 15:58:47.098056258 -0400
25816@@ -833,7 +833,7 @@ done: 25801@@ -833,7 +833,7 @@ done:
25817 return rc; 25802 return rc;
25818 } 25803 }
@@ -25822,9 +25807,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32
25822 .owner = THIS_MODULE, 25807 .owner = THIS_MODULE,
25823 .open = audamrnb_open, 25808 .open = audamrnb_open,
25824 .release = audamrnb_release, 25809 .release = audamrnb_release,
25825diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_evrc.c 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
25826--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_evrc.c 2010-02-23 10:38:51.000000000 -0500 25811--- linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400
25827+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-11 20:25:00.161352016 -0500 25812+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-20 15:58:47.098056258 -0400
25828@@ -805,7 +805,7 @@ dma_fail: 25813@@ -805,7 +805,7 @@ dma_fail:
25829 return rc; 25814 return rc;
25830 } 25815 }
@@ -25834,9 +25819,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.
25834 .owner = THIS_MODULE, 25819 .owner = THIS_MODULE,
25835 .open = audevrc_open, 25820 .open = audevrc_open,
25836 .release = audevrc_release, 25821 .release = audevrc_release,
25837diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_in.c 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
25838--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_in.c 2010-02-23 10:38:51.000000000 -0500 25823--- linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400
25839+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_in.c 2010-03-11 20:25:00.161352016 -0500 25824+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_in.c 2010-03-20 15:58:47.098056258 -0400
25840@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino 25825@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
25841 return 0; 25826 return 0;
25842 } 25827 }
@@ -25855,9 +25840,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.9/
25855 .owner = THIS_MODULE, 25840 .owner = THIS_MODULE,
25856 .open = audpre_open, 25841 .open = audpre_open,
25857 .unlocked_ioctl = audpre_ioctl, 25842 .unlocked_ioctl = audpre_ioctl,
25858diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_mp3.c 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
25859--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_mp3.c 2010-02-23 10:38:51.000000000 -0500 25844--- linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400
25860+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-11 20:25:00.161352016 -0500 25845+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-20 15:58:47.098056258 -0400
25861@@ -941,7 +941,7 @@ done: 25846@@ -941,7 +941,7 @@ done:
25862 return rc; 25847 return rc;
25863 } 25848 }
@@ -25867,9 +25852,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.9
25867 .owner = THIS_MODULE, 25852 .owner = THIS_MODULE,
25868 .open = audio_open, 25853 .open = audio_open,
25869 .release = audio_release, 25854 .release = audio_release,
25870diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_out.c 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
25871--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_out.c 2010-02-23 10:38:51.000000000 -0500 25856--- linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400
25872+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_out.c 2010-03-11 20:25:00.161352016 -0500 25857+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_out.c 2010-03-20 15:58:47.098056258 -0400
25873@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod 25858@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
25874 return 0; 25859 return 0;
25875 } 25860 }
@@ -25888,9 +25873,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.9
25888 .owner = THIS_MODULE, 25873 .owner = THIS_MODULE,
25889 .open = audpp_open, 25874 .open = audpp_open,
25890 .unlocked_ioctl = audpp_ioctl, 25875 .unlocked_ioctl = audpp_ioctl,
25891diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_qcelp.c 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
25892--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-02-23 10:38:51.000000000 -0500 25877--- linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400
25893+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-11 20:25:00.161352016 -0500 25878+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-20 15:58:47.098056258 -0400
25894@@ -816,7 +816,7 @@ err: 25879@@ -816,7 +816,7 @@ err:
25895 return rc; 25880 return rc;
25896 } 25881 }
@@ -25900,9 +25885,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32
25900 .owner = THIS_MODULE, 25885 .owner = THIS_MODULE,
25901 .open = audqcelp_open, 25886 .open = audqcelp_open,
25902 .release = audqcelp_release, 25887 .release = audqcelp_release,
25903diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.9/drivers/staging/dream/qdsp5/snd.c 25888diff -urNp linux-2.6.32.10/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.10/drivers/staging/dream/qdsp5/snd.c
25904--- linux-2.6.32.9/drivers/staging/dream/qdsp5/snd.c 2010-02-23 10:38:51.000000000 -0500 25889--- linux-2.6.32.10/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400
25905+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/snd.c 2010-03-11 20:25:00.161352016 -0500 25890+++ linux-2.6.32.10/drivers/staging/dream/qdsp5/snd.c 2010-03-20 15:58:47.098056258 -0400
25906@@ -242,7 +242,7 @@ err: 25891@@ -242,7 +242,7 @@ err:
25907 return rc; 25892 return rc;
25908 } 25893 }
@@ -25912,9 +25897,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.9/drive
25912 .owner = THIS_MODULE, 25897 .owner = THIS_MODULE,
25913 .open = snd_open, 25898 .open = snd_open,
25914 .release = snd_release, 25899 .release = snd_release,
25915diff -urNp linux-2.6.32.9/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.9/drivers/staging/dream/smd/smd_qmi.c 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
25916--- linux-2.6.32.9/drivers/staging/dream/smd/smd_qmi.c 2010-02-23 10:38:51.000000000 -0500 25901--- linux-2.6.32.10/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400
25917+++ linux-2.6.32.9/drivers/staging/dream/smd/smd_qmi.c 2010-03-11 20:25:00.161352016 -0500 25902+++ linux-2.6.32.10/drivers/staging/dream/smd/smd_qmi.c 2010-03-20 15:58:47.098056258 -0400
25918@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, 25903@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
25919 return 0; 25904 return 0;
25920 } 25905 }
@@ -25924,9 +25909,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.9/dri
25924 .owner = THIS_MODULE, 25909 .owner = THIS_MODULE,
25925 .read = qmi_read, 25910 .read = qmi_read,
25926 .write = qmi_write, 25911 .write = qmi_write,
25927diff -urNp linux-2.6.32.9/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.9/drivers/staging/dream/smd/smd_rpcrouter_device.c 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
25928--- linux-2.6.32.9/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-02-23 10:38:51.000000000 -0500 25913--- linux-2.6.32.10/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400
25929+++ linux-2.6.32.9/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-11 20:25:00.161352016 -0500 25914+++ linux-2.6.32.10/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-20 15:58:47.098056258 -0400
25930@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file 25915@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
25931 return rc; 25916 return rc;
25932 } 25917 }
@@ -25945,9 +25930,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/dream/smd/smd_rpcrouter_device.c linux
25945 .owner = THIS_MODULE, 25930 .owner = THIS_MODULE,
25946 .open = rpcrouter_open, 25931 .open = rpcrouter_open,
25947 .release = rpcrouter_release, 25932 .release = rpcrouter_release,
25948diff -urNp linux-2.6.32.9/drivers/staging/dst/dcore.c linux-2.6.32.9/drivers/staging/dst/dcore.c 25933diff -urNp linux-2.6.32.10/drivers/staging/dst/dcore.c linux-2.6.32.10/drivers/staging/dst/dcore.c
25949--- linux-2.6.32.9/drivers/staging/dst/dcore.c 2010-02-23 10:38:51.000000000 -0500 25934--- linux-2.6.32.10/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400
25950+++ linux-2.6.32.9/drivers/staging/dst/dcore.c 2010-03-11 20:25:00.161352016 -0500 25935+++ linux-2.6.32.10/drivers/staging/dst/dcore.c 2010-03-20 15:58:47.098056258 -0400
25951@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi 25936@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
25952 return 0; 25937 return 0;
25953 } 25938 }
@@ -25966,9 +25951,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/dst/dcore.c linux-2.6.32.9/drivers/sta
25966 snprintf(n->name, sizeof(n->name), "%s", ctl->name); 25951 snprintf(n->name, sizeof(n->name), "%s", ctl->name);
25967 25952
25968 err = dst_node_sysfs_init(n); 25953 err = dst_node_sysfs_init(n);
25969diff -urNp linux-2.6.32.9/drivers/staging/dst/trans.c linux-2.6.32.9/drivers/staging/dst/trans.c 25954diff -urNp linux-2.6.32.10/drivers/staging/dst/trans.c linux-2.6.32.10/drivers/staging/dst/trans.c
25970--- linux-2.6.32.9/drivers/staging/dst/trans.c 2010-02-23 10:38:51.000000000 -0500 25955--- linux-2.6.32.10/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400
25971+++ linux-2.6.32.9/drivers/staging/dst/trans.c 2010-03-11 20:25:00.161352016 -0500 25956+++ linux-2.6.32.10/drivers/staging/dst/trans.c 2010-03-20 15:58:47.098056258 -0400
25972@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, 25957@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
25973 t->error = 0; 25958 t->error = 0;
25974 t->retries = 0; 25959 t->retries = 0;
@@ -25978,9 +25963,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/dst/trans.c linux-2.6.32.9/drivers/sta
25978 25963
25979 t->enc = bio_data_dir(bio); 25964 t->enc = bio_data_dir(bio);
25980 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); 25965 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
25981diff -urNp linux-2.6.32.9/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.9/drivers/staging/go7007/go7007-v4l2.c 25966diff -urNp linux-2.6.32.10/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.10/drivers/staging/go7007/go7007-v4l2.c
25982--- linux-2.6.32.9/drivers/staging/go7007/go7007-v4l2.c 2010-02-23 10:38:51.000000000 -0500 25967--- linux-2.6.32.10/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400
25983+++ linux-2.6.32.9/drivers/staging/go7007/go7007-v4l2.c 2010-03-11 20:25:00.161352016 -0500 25968+++ linux-2.6.32.10/drivers/staging/go7007/go7007-v4l2.c 2010-03-20 15:58:47.098056258 -0400
25984@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are 25969@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
25985 return 0; 25970 return 0;
25986 } 25971 }
@@ -25990,9 +25975,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.9/dr
25990 .open = go7007_vm_open, 25975 .open = go7007_vm_open,
25991 .close = go7007_vm_close, 25976 .close = go7007_vm_close,
25992 .fault = go7007_vm_fault, 25977 .fault = go7007_vm_fault,
25993diff -urNp linux-2.6.32.9/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.9/drivers/staging/hv/blkvsc_drv.c 25978diff -urNp linux-2.6.32.10/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.10/drivers/staging/hv/blkvsc_drv.c
25994--- linux-2.6.32.9/drivers/staging/hv/blkvsc_drv.c 2010-02-23 10:38:51.000000000 -0500 25979--- linux-2.6.32.10/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400
25995+++ linux-2.6.32.9/drivers/staging/hv/blkvsc_drv.c 2010-03-11 20:25:00.161352016 -0500 25980+++ linux-2.6.32.10/drivers/staging/hv/blkvsc_drv.c 2010-03-20 15:58:47.102057128 -0400
25996@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV 25981@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
25997 /* The one and only one */ 25982 /* The one and only one */
25998 static struct blkvsc_driver_context g_blkvsc_drv; 25983 static struct blkvsc_driver_context g_blkvsc_drv;
@@ -26002,9 +25987,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.9/drivers
26002 .owner = THIS_MODULE, 25987 .owner = THIS_MODULE,
26003 .open = blkvsc_open, 25988 .open = blkvsc_open,
26004 .release = blkvsc_release, 25989 .release = blkvsc_release,
26005diff -urNp linux-2.6.32.9/drivers/staging/panel/panel.c linux-2.6.32.9/drivers/staging/panel/panel.c 25990diff -urNp linux-2.6.32.10/drivers/staging/panel/panel.c linux-2.6.32.10/drivers/staging/panel/panel.c
26006--- linux-2.6.32.9/drivers/staging/panel/panel.c 2010-02-23 10:38:51.000000000 -0500 25991--- linux-2.6.32.10/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400
26007+++ linux-2.6.32.9/drivers/staging/panel/panel.c 2010-03-11 20:25:00.161352016 -0500 25992+++ linux-2.6.32.10/drivers/staging/panel/panel.c 2010-03-20 15:58:47.102057128 -0400
26008@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino 25993@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
26009 return 0; 25994 return 0;
26010 } 25995 }
@@ -26023,9 +26008,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/panel/panel.c linux-2.6.32.9/drivers/s
26023 .read = keypad_read, /* read */ 26008 .read = keypad_read, /* read */
26024 .open = keypad_open, /* open */ 26009 .open = keypad_open, /* open */
26025 .release = keypad_release, /* close */ 26010 .release = keypad_release, /* close */
26026diff -urNp linux-2.6.32.9/drivers/staging/phison/phison.c linux-2.6.32.9/drivers/staging/phison/phison.c 26011diff -urNp linux-2.6.32.10/drivers/staging/phison/phison.c linux-2.6.32.10/drivers/staging/phison/phison.c
26027--- linux-2.6.32.9/drivers/staging/phison/phison.c 2010-02-23 10:38:51.000000000 -0500 26012--- linux-2.6.32.10/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400
26028+++ linux-2.6.32.9/drivers/staging/phison/phison.c 2010-03-11 20:25:00.165424323 -0500 26013+++ linux-2.6.32.10/drivers/staging/phison/phison.c 2010-03-20 15:58:47.102057128 -0400
26029@@ -43,7 +43,7 @@ static struct scsi_host_template phison_ 26014@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
26030 ATA_BMDMA_SHT(DRV_NAME), 26015 ATA_BMDMA_SHT(DRV_NAME),
26031 }; 26016 };
@@ -26035,9 +26020,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/phison/phison.c linux-2.6.32.9/drivers
26035 .inherits = &ata_bmdma_port_ops, 26020 .inherits = &ata_bmdma_port_ops,
26036 .prereset = phison_pre_reset, 26021 .prereset = phison_pre_reset,
26037 }; 26022 };
26038diff -urNp linux-2.6.32.9/drivers/staging/poch/poch.c linux-2.6.32.9/drivers/staging/poch/poch.c 26023diff -urNp linux-2.6.32.10/drivers/staging/poch/poch.c linux-2.6.32.10/drivers/staging/poch/poch.c
26039--- linux-2.6.32.9/drivers/staging/poch/poch.c 2010-02-23 10:38:51.000000000 -0500 26024--- linux-2.6.32.10/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400
26040+++ linux-2.6.32.9/drivers/staging/poch/poch.c 2010-03-11 20:25:00.165424323 -0500 26025+++ linux-2.6.32.10/drivers/staging/poch/poch.c 2010-03-20 15:58:47.102057128 -0400
26041@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod 26026@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
26042 return 0; 26027 return 0;
26043 } 26028 }
@@ -26047,9 +26032,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/poch/poch.c linux-2.6.32.9/drivers/sta
26047 .owner = THIS_MODULE, 26032 .owner = THIS_MODULE,
26048 .open = poch_open, 26033 .open = poch_open,
26049 .release = poch_release, 26034 .release = poch_release,
26050diff -urNp linux-2.6.32.9/drivers/staging/pohmelfs/inode.c linux-2.6.32.9/drivers/staging/pohmelfs/inode.c 26035diff -urNp linux-2.6.32.10/drivers/staging/pohmelfs/inode.c linux-2.6.32.10/drivers/staging/pohmelfs/inode.c
26051--- linux-2.6.32.9/drivers/staging/pohmelfs/inode.c 2010-02-23 10:38:51.000000000 -0500 26036--- linux-2.6.32.10/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400
26052+++ linux-2.6.32.9/drivers/staging/pohmelfs/inode.c 2010-03-11 20:25:00.165424323 -0500 26037+++ linux-2.6.32.10/drivers/staging/pohmelfs/inode.c 2010-03-20 15:58:47.102057128 -0400
26053@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su 26038@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
26054 mutex_init(&psb->mcache_lock); 26039 mutex_init(&psb->mcache_lock);
26055 psb->mcache_root = RB_ROOT; 26040 psb->mcache_root = RB_ROOT;
@@ -26059,9 +26044,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/pohmelfs/inode.c linux-2.6.32.9/driver
26059 26044
26060 psb->trans_max_pages = 100; 26045 psb->trans_max_pages = 100;
26061 26046
26062diff -urNp linux-2.6.32.9/drivers/staging/pohmelfs/mcache.c linux-2.6.32.9/drivers/staging/pohmelfs/mcache.c 26047diff -urNp linux-2.6.32.10/drivers/staging/pohmelfs/mcache.c linux-2.6.32.10/drivers/staging/pohmelfs/mcache.c
26063--- linux-2.6.32.9/drivers/staging/pohmelfs/mcache.c 2010-02-23 10:38:51.000000000 -0500 26048--- linux-2.6.32.10/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400
26064+++ linux-2.6.32.9/drivers/staging/pohmelfs/mcache.c 2010-03-11 20:25:00.165424323 -0500 26049+++ linux-2.6.32.10/drivers/staging/pohmelfs/mcache.c 2010-03-20 15:58:47.102057128 -0400
26065@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ 26050@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
26066 m->data = data; 26051 m->data = data;
26067 m->start = start; 26052 m->start = start;
@@ -26071,9 +26056,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/pohmelfs/mcache.c linux-2.6.32.9/drive
26071 26056
26072 mutex_lock(&psb->mcache_lock); 26057 mutex_lock(&psb->mcache_lock);
26073 err = pohmelfs_mcache_insert(psb, m); 26058 err = pohmelfs_mcache_insert(psb, m);
26074diff -urNp linux-2.6.32.9/drivers/staging/pohmelfs/netfs.h linux-2.6.32.9/drivers/staging/pohmelfs/netfs.h 26059diff -urNp linux-2.6.32.10/drivers/staging/pohmelfs/netfs.h linux-2.6.32.10/drivers/staging/pohmelfs/netfs.h
26075--- linux-2.6.32.9/drivers/staging/pohmelfs/netfs.h 2010-02-23 10:38:51.000000000 -0500 26060--- linux-2.6.32.10/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400
26076+++ linux-2.6.32.9/drivers/staging/pohmelfs/netfs.h 2010-03-11 20:25:00.165424323 -0500 26061+++ linux-2.6.32.10/drivers/staging/pohmelfs/netfs.h 2010-03-20 15:58:47.102057128 -0400
26077@@ -570,7 +570,7 @@ struct pohmelfs_config; 26062@@ -570,7 +570,7 @@ struct pohmelfs_config;
26078 struct pohmelfs_sb { 26063 struct pohmelfs_sb {
26079 struct rb_root mcache_root; 26064 struct rb_root mcache_root;
@@ -26083,9 +26068,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/pohmelfs/netfs.h linux-2.6.32.9/driver
26083 unsigned long mcache_timeout; 26068 unsigned long mcache_timeout;
26084 26069
26085 unsigned int idx; 26070 unsigned int idx;
26086diff -urNp linux-2.6.32.9/drivers/staging/sep/sep_driver.c linux-2.6.32.9/drivers/staging/sep/sep_driver.c 26071diff -urNp linux-2.6.32.10/drivers/staging/sep/sep_driver.c linux-2.6.32.10/drivers/staging/sep/sep_driver.c
26087--- linux-2.6.32.9/drivers/staging/sep/sep_driver.c 2010-02-23 10:38:51.000000000 -0500 26072--- linux-2.6.32.10/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400
26088+++ linux-2.6.32.9/drivers/staging/sep/sep_driver.c 2010-03-11 20:25:00.165424323 -0500 26073+++ linux-2.6.32.10/drivers/staging/sep/sep_driver.c 2010-03-20 15:58:47.102057128 -0400
26089@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver 26074@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
26090 static dev_t sep_devno; 26075 static dev_t sep_devno;
26091 26076
@@ -26095,9 +26080,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/sep/sep_driver.c linux-2.6.32.9/driver
26095 .owner = THIS_MODULE, 26080 .owner = THIS_MODULE,
26096 .ioctl = sep_ioctl, 26081 .ioctl = sep_ioctl,
26097 .poll = sep_poll, 26082 .poll = sep_poll,
26098diff -urNp linux-2.6.32.9/drivers/staging/vme/devices/vme_user.c linux-2.6.32.9/drivers/staging/vme/devices/vme_user.c 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
26099--- linux-2.6.32.9/drivers/staging/vme/devices/vme_user.c 2010-02-23 10:38:51.000000000 -0500 26084--- linux-2.6.32.10/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400
26100+++ linux-2.6.32.9/drivers/staging/vme/devices/vme_user.c 2010-03-11 20:25:00.165424323 -0500 26085+++ linux-2.6.32.10/drivers/staging/vme/devices/vme_user.c 2010-03-20 15:58:47.102057128 -0400
26101@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * 26086@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
26102 static int __init vme_user_probe(struct device *, int, int); 26087 static int __init vme_user_probe(struct device *, int, int);
26103 static int __exit vme_user_remove(struct device *, int, int); 26088 static int __exit vme_user_remove(struct device *, int, int);
@@ -26107,9 +26092,9 @@ diff -urNp linux-2.6.32.9/drivers/staging/vme/devices/vme_user.c linux-2.6.32.9/
26107 .open = vme_user_open, 26092 .open = vme_user_open,
26108 .release = vme_user_release, 26093 .release = vme_user_release,
26109 .read = vme_user_read, 26094 .read = vme_user_read,
26110diff -urNp linux-2.6.32.9/drivers/uio/uio.c linux-2.6.32.9/drivers/uio/uio.c 26095diff -urNp linux-2.6.32.10/drivers/uio/uio.c linux-2.6.32.10/drivers/uio/uio.c
26111--- linux-2.6.32.9/drivers/uio/uio.c 2010-02-23 10:38:51.000000000 -0500 26096--- linux-2.6.32.10/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400
26112+++ linux-2.6.32.9/drivers/uio/uio.c 2010-03-11 20:25:00.165424323 -0500 26097+++ linux-2.6.32.10/drivers/uio/uio.c 2010-03-20 15:58:47.102057128 -0400
26113@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj 26098@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj
26114 return entry->show(mem, buf); 26099 return entry->show(mem, buf);
26115 } 26100 }
@@ -26128,9 +26113,9 @@ diff -urNp linux-2.6.32.9/drivers/uio/uio.c linux-2.6.32.9/drivers/uio/uio.c
26128 .show = portio_type_show, 26113 .show = portio_type_show,
26129 }; 26114 };
26130 26115
26131diff -urNp linux-2.6.32.9/drivers/usb/atm/usbatm.c linux-2.6.32.9/drivers/usb/atm/usbatm.c 26116diff -urNp linux-2.6.32.10/drivers/usb/atm/usbatm.c linux-2.6.32.10/drivers/usb/atm/usbatm.c
26132--- linux-2.6.32.9/drivers/usb/atm/usbatm.c 2010-02-23 10:38:51.000000000 -0500 26117--- linux-2.6.32.10/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400
26133+++ linux-2.6.32.9/drivers/usb/atm/usbatm.c 2010-03-11 20:25:00.165424323 -0500 26118+++ linux-2.6.32.10/drivers/usb/atm/usbatm.c 2010-03-20 15:58:47.102057128 -0400
26134@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru 26119@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
26135 if (printk_ratelimit()) 26120 if (printk_ratelimit())
26136 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", 26121 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -26210,9 +26195,9 @@ diff -urNp linux-2.6.32.9/drivers/usb/atm/usbatm.c linux-2.6.32.9/drivers/usb/at
26210 26195
26211 if (!left--) { 26196 if (!left--) {
26212 if (instance->disconnected) 26197 if (instance->disconnected)
26213diff -urNp linux-2.6.32.9/drivers/usb/class/cdc-acm.c linux-2.6.32.9/drivers/usb/class/cdc-acm.c 26198diff -urNp linux-2.6.32.10/drivers/usb/class/cdc-acm.c linux-2.6.32.10/drivers/usb/class/cdc-acm.c
26214--- linux-2.6.32.9/drivers/usb/class/cdc-acm.c 2010-02-23 10:38:51.000000000 -0500 26199--- linux-2.6.32.10/drivers/usb/class/cdc-acm.c 2010-03-15 11:52:04.000000000 -0400
26215+++ linux-2.6.32.9/drivers/usb/class/cdc-acm.c 2010-03-11 20:25:00.165424323 -0500 26200+++ linux-2.6.32.10/drivers/usb/class/cdc-acm.c 2010-03-20 15:58:47.102057128 -0400
26216@@ -1534,7 +1534,7 @@ static struct usb_device_id acm_ids[] = 26201@@ -1534,7 +1534,7 @@ static struct usb_device_id acm_ids[] =
26217 USB_CDC_ACM_PROTO_AT_CDMA) }, 26202 USB_CDC_ACM_PROTO_AT_CDMA) },
26218 26203
@@ -26222,9 +26207,9 @@ diff -urNp linux-2.6.32.9/drivers/usb/class/cdc-acm.c linux-2.6.32.9/drivers/usb
26222 }; 26207 };
26223 26208
26224 MODULE_DEVICE_TABLE(usb, acm_ids); 26209 MODULE_DEVICE_TABLE(usb, acm_ids);
26225diff -urNp linux-2.6.32.9/drivers/usb/class/usblp.c linux-2.6.32.9/drivers/usb/class/usblp.c 26210diff -urNp linux-2.6.32.10/drivers/usb/class/usblp.c linux-2.6.32.10/drivers/usb/class/usblp.c
26226--- linux-2.6.32.9/drivers/usb/class/usblp.c 2010-02-23 10:38:51.000000000 -0500 26211--- linux-2.6.32.10/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400
26227+++ linux-2.6.32.9/drivers/usb/class/usblp.c 2010-03-11 20:25:00.165424323 -0500 26212+++ linux-2.6.32.10/drivers/usb/class/usblp.c 2010-03-20 15:58:47.102057128 -0400
26228@@ -228,7 +228,7 @@ static const struct quirk_printer_struct 26213@@ -228,7 +228,7 @@ static const struct quirk_printer_struct
26229 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ 26214 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
26230 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ 26215 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
@@ -26243,9 +26228,9 @@ diff -urNp linux-2.6.32.9/drivers/usb/class/usblp.c linux-2.6.32.9/drivers/usb/c
26243 }; 26228 };
26244 26229
26245 MODULE_DEVICE_TABLE (usb, usblp_ids); 26230 MODULE_DEVICE_TABLE (usb, usblp_ids);
26246diff -urNp linux-2.6.32.9/drivers/usb/core/hcd.c linux-2.6.32.9/drivers/usb/core/hcd.c 26231diff -urNp linux-2.6.32.10/drivers/usb/core/hcd.c linux-2.6.32.10/drivers/usb/core/hcd.c
26247--- linux-2.6.32.9/drivers/usb/core/hcd.c 2010-02-23 10:38:51.000000000 -0500 26232--- linux-2.6.32.10/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400
26248+++ linux-2.6.32.9/drivers/usb/core/hcd.c 2010-03-11 20:25:00.165424323 -0500 26233+++ linux-2.6.32.10/drivers/usb/core/hcd.c 2010-03-20 15:58:47.106071004 -0400
26249@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd 26234@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
26250 26235
26251 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 26236 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -26264,9 +26249,9 @@ diff -urNp linux-2.6.32.9/drivers/usb/core/hcd.c linux-2.6.32.9/drivers/usb/core
26264 { 26249 {
26265 26250
26266 if (mon_ops) 26251 if (mon_ops)
26267diff -urNp linux-2.6.32.9/drivers/usb/core/hcd.h linux-2.6.32.9/drivers/usb/core/hcd.h 26252diff -urNp linux-2.6.32.10/drivers/usb/core/hcd.h linux-2.6.32.10/drivers/usb/core/hcd.h
26268--- linux-2.6.32.9/drivers/usb/core/hcd.h 2010-02-23 10:38:51.000000000 -0500 26253--- linux-2.6.32.10/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400
26269+++ linux-2.6.32.9/drivers/usb/core/hcd.h 2010-03-11 20:25:00.165424323 -0500 26254+++ linux-2.6.32.10/drivers/usb/core/hcd.h 2010-03-20 15:58:47.106071004 -0400
26270@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { 26255@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
26271 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 26256 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
26272 26257
@@ -26294,10 +26279,10 @@ diff -urNp linux-2.6.32.9/drivers/usb/core/hcd.h linux-2.6.32.9/drivers/usb/core
26294 void usb_mon_deregister(void); 26279 void usb_mon_deregister(void);
26295 26280
26296 #else 26281 #else
26297diff -urNp linux-2.6.32.9/drivers/usb/core/hub.c linux-2.6.32.9/drivers/usb/core/hub.c 26282diff -urNp linux-2.6.32.10/drivers/usb/core/hub.c linux-2.6.32.10/drivers/usb/core/hub.c
26298--- linux-2.6.32.9/drivers/usb/core/hub.c 2010-02-23 10:38:51.000000000 -0500 26283--- linux-2.6.32.10/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400
26299+++ linux-2.6.32.9/drivers/usb/core/hub.c 2010-03-11 20:25:00.165424323 -0500 26284+++ linux-2.6.32.10/drivers/usb/core/hub.c 2010-03-20 15:58:47.106071004 -0400
26300@@ -3385,7 +3385,7 @@ static struct usb_device_id hub_id_table 26285@@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table
26301 .bDeviceClass = USB_CLASS_HUB}, 26286 .bDeviceClass = USB_CLASS_HUB},
26302 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, 26287 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
26303 .bInterfaceClass = USB_CLASS_HUB}, 26288 .bInterfaceClass = USB_CLASS_HUB},
@@ -26306,9 +26291,9 @@ diff -urNp linux-2.6.32.9/drivers/usb/core/hub.c linux-2.6.32.9/drivers/usb/core
26306 }; 26291 };
26307 26292
26308 MODULE_DEVICE_TABLE (usb, hub_id_table); 26293 MODULE_DEVICE_TABLE (usb, hub_id_table);
26309diff -urNp linux-2.6.32.9/drivers/usb/core/message.c linux-2.6.32.9/drivers/usb/core/message.c 26294diff -urNp linux-2.6.32.10/drivers/usb/core/message.c linux-2.6.32.10/drivers/usb/core/message.c
26310--- linux-2.6.32.9/drivers/usb/core/message.c 2010-02-23 10:38:51.000000000 -0500 26295--- linux-2.6.32.10/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400
26311+++ linux-2.6.32.9/drivers/usb/core/message.c 2010-03-11 20:25:00.169632778 -0500 26296+++ linux-2.6.32.10/drivers/usb/core/message.c 2010-03-20 15:58:47.106071004 -0400
26312@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device 26297@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
26313 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); 26298 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
26314 if (buf) { 26299 if (buf) {
@@ -26320,9 +26305,9 @@ diff -urNp linux-2.6.32.9/drivers/usb/core/message.c linux-2.6.32.9/drivers/usb/
26320 if (!smallbuf) 26305 if (!smallbuf)
26321 return buf; 26306 return buf;
26322 memcpy(smallbuf, buf, len); 26307 memcpy(smallbuf, buf, len);
26323diff -urNp linux-2.6.32.9/drivers/usb/host/ehci-pci.c linux-2.6.32.9/drivers/usb/host/ehci-pci.c 26308diff -urNp linux-2.6.32.10/drivers/usb/host/ehci-pci.c linux-2.6.32.10/drivers/usb/host/ehci-pci.c
26324--- linux-2.6.32.9/drivers/usb/host/ehci-pci.c 2010-02-23 10:38:51.000000000 -0500 26309--- linux-2.6.32.10/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400
26325+++ linux-2.6.32.9/drivers/usb/host/ehci-pci.c 2010-03-11 20:25:00.169632778 -0500 26310+++ linux-2.6.32.10/drivers/usb/host/ehci-pci.c 2010-03-20 15:58:47.106071004 -0400
26326@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id 26311@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id
26327 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), 26312 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
26328 .driver_data = (unsigned long) &ehci_pci_hc_driver, 26313 .driver_data = (unsigned long) &ehci_pci_hc_driver,
@@ -26332,10 +26317,10 @@ diff -urNp linux-2.6.32.9/drivers/usb/host/ehci-pci.c linux-2.6.32.9/drivers/usb
26332 }; 26317 };
26333 MODULE_DEVICE_TABLE(pci, pci_ids); 26318 MODULE_DEVICE_TABLE(pci, pci_ids);
26334 26319
26335diff -urNp linux-2.6.32.9/drivers/usb/host/uhci-hcd.c linux-2.6.32.9/drivers/usb/host/uhci-hcd.c 26320diff -urNp linux-2.6.32.10/drivers/usb/host/uhci-hcd.c linux-2.6.32.10/drivers/usb/host/uhci-hcd.c
26336--- linux-2.6.32.9/drivers/usb/host/uhci-hcd.c 2010-02-23 10:38:51.000000000 -0500 26321--- linux-2.6.32.10/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400
26337+++ linux-2.6.32.9/drivers/usb/host/uhci-hcd.c 2010-03-11 20:25:00.169632778 -0500 26322+++ linux-2.6.32.10/drivers/usb/host/uhci-hcd.c 2010-03-20 15:58:47.106071004 -0400
26338@@ -940,7 +940,7 @@ static const struct pci_device_id uhci_p 26323@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
26339 /* handle any USB UHCI controller */ 26324 /* handle any USB UHCI controller */
26340 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), 26325 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
26341 .driver_data = (unsigned long) &uhci_driver, 26326 .driver_data = (unsigned long) &uhci_driver,
@@ -26344,9 +26329,9 @@ diff -urNp linux-2.6.32.9/drivers/usb/host/uhci-hcd.c linux-2.6.32.9/drivers/usb
26344 }; 26329 };
26345 26330
26346 MODULE_DEVICE_TABLE(pci, uhci_pci_ids); 26331 MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
26347diff -urNp linux-2.6.32.9/drivers/usb/misc/appledisplay.c linux-2.6.32.9/drivers/usb/misc/appledisplay.c 26332diff -urNp linux-2.6.32.10/drivers/usb/misc/appledisplay.c linux-2.6.32.10/drivers/usb/misc/appledisplay.c
26348--- linux-2.6.32.9/drivers/usb/misc/appledisplay.c 2010-02-23 10:38:51.000000000 -0500 26333--- linux-2.6.32.10/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400
26349+++ linux-2.6.32.9/drivers/usb/misc/appledisplay.c 2010-03-11 20:25:00.169632778 -0500 26334+++ linux-2.6.32.10/drivers/usb/misc/appledisplay.c 2010-03-20 15:58:47.106071004 -0400
26350@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes 26335@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
26351 return pdata->msgdata[1]; 26336 return pdata->msgdata[1];
26352 } 26337 }
@@ -26356,9 +26341,9 @@ diff -urNp linux-2.6.32.9/drivers/usb/misc/appledisplay.c linux-2.6.32.9/drivers
26356 .get_brightness = appledisplay_bl_get_brightness, 26341 .get_brightness = appledisplay_bl_get_brightness,
26357 .update_status = appledisplay_bl_update_status, 26342 .update_status = appledisplay_bl_update_status,
26358 }; 26343 };
26359diff -urNp linux-2.6.32.9/drivers/usb/mon/mon_main.c linux-2.6.32.9/drivers/usb/mon/mon_main.c 26344diff -urNp linux-2.6.32.10/drivers/usb/mon/mon_main.c linux-2.6.32.10/drivers/usb/mon/mon_main.c
26360--- linux-2.6.32.9/drivers/usb/mon/mon_main.c 2010-02-23 10:38:51.000000000 -0500 26345--- linux-2.6.32.10/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400
26361+++ linux-2.6.32.9/drivers/usb/mon/mon_main.c 2010-03-11 20:25:00.169632778 -0500 26346+++ linux-2.6.32.10/drivers/usb/mon/mon_main.c 2010-03-20 15:58:47.106071004 -0400
26362@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { 26347@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
26363 /* 26348 /*
26364 * Ops 26349 * Ops
@@ -26368,9 +26353,9 @@ diff -urNp linux-2.6.32.9/drivers/usb/mon/mon_main.c linux-2.6.32.9/drivers/usb/
26368 .urb_submit = mon_submit, 26353 .urb_submit = mon_submit,
26369 .urb_submit_error = mon_submit_error, 26354 .urb_submit_error = mon_submit_error,
26370 .urb_complete = mon_complete, 26355 .urb_complete = mon_complete,
26371diff -urNp linux-2.6.32.9/drivers/usb/storage/debug.h linux-2.6.32.9/drivers/usb/storage/debug.h 26356diff -urNp linux-2.6.32.10/drivers/usb/storage/debug.h linux-2.6.32.10/drivers/usb/storage/debug.h
26372--- linux-2.6.32.9/drivers/usb/storage/debug.h 2010-02-23 10:38:51.000000000 -0500 26357--- linux-2.6.32.10/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400
26373+++ linux-2.6.32.9/drivers/usb/storage/debug.h 2010-03-11 20:25:00.169632778 -0500 26358+++ linux-2.6.32.10/drivers/usb/storage/debug.h 2010-03-20 15:58:47.106071004 -0400
26374@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char 26359@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
26375 #define US_DEBUGPX(x...) printk( x ) 26360 #define US_DEBUGPX(x...) printk( x )
26376 #define US_DEBUG(x) x 26361 #define US_DEBUG(x) x
@@ -26384,9 +26369,9 @@ diff -urNp linux-2.6.32.9/drivers/usb/storage/debug.h linux-2.6.32.9/drivers/usb
26384 #endif 26369 #endif
26385 26370
26386 #endif 26371 #endif
26387diff -urNp linux-2.6.32.9/drivers/usb/storage/usb.c linux-2.6.32.9/drivers/usb/storage/usb.c 26372diff -urNp linux-2.6.32.10/drivers/usb/storage/usb.c linux-2.6.32.10/drivers/usb/storage/usb.c
26388--- linux-2.6.32.9/drivers/usb/storage/usb.c 2010-02-23 10:38:51.000000000 -0500 26373--- linux-2.6.32.10/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400
26389+++ linux-2.6.32.9/drivers/usb/storage/usb.c 2010-03-11 20:25:00.169632778 -0500 26374+++ linux-2.6.32.10/drivers/usb/storage/usb.c 2010-03-20 15:58:47.106071004 -0400
26390@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l 26375@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
26391 26376
26392 static struct us_unusual_dev us_unusual_dev_list[] = { 26377 static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -26396,9 +26381,9 @@ diff -urNp linux-2.6.32.9/drivers/usb/storage/usb.c linux-2.6.32.9/drivers/usb/s
26396 }; 26381 };
26397 26382
26398 #undef UNUSUAL_DEV 26383 #undef UNUSUAL_DEV
26399diff -urNp linux-2.6.32.9/drivers/usb/storage/usual-tables.c linux-2.6.32.9/drivers/usb/storage/usual-tables.c 26384diff -urNp linux-2.6.32.10/drivers/usb/storage/usual-tables.c linux-2.6.32.10/drivers/usb/storage/usual-tables.c
26400--- linux-2.6.32.9/drivers/usb/storage/usual-tables.c 2010-02-23 10:38:51.000000000 -0500 26385--- linux-2.6.32.10/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400
26401+++ linux-2.6.32.9/drivers/usb/storage/usual-tables.c 2010-03-11 20:25:00.169632778 -0500 26386+++ linux-2.6.32.10/drivers/usb/storage/usual-tables.c 2010-03-20 15:58:47.106071004 -0400
26402@@ -48,7 +48,7 @@ 26387@@ -48,7 +48,7 @@
26403 26388
26404 struct usb_device_id usb_storage_usb_ids[] = { 26389 struct usb_device_id usb_storage_usb_ids[] = {
@@ -26408,9 +26393,9 @@ diff -urNp linux-2.6.32.9/drivers/usb/storage/usual-tables.c linux-2.6.32.9/driv
26408 }; 26393 };
26409 EXPORT_SYMBOL_GPL(usb_storage_usb_ids); 26394 EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
26410 26395
26411diff -urNp linux-2.6.32.9/drivers/uwb/wlp/messages.c linux-2.6.32.9/drivers/uwb/wlp/messages.c 26396diff -urNp linux-2.6.32.10/drivers/uwb/wlp/messages.c linux-2.6.32.10/drivers/uwb/wlp/messages.c
26412--- linux-2.6.32.9/drivers/uwb/wlp/messages.c 2010-02-23 10:38:51.000000000 -0500 26397--- linux-2.6.32.10/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400
26413+++ linux-2.6.32.9/drivers/uwb/wlp/messages.c 2010-03-11 20:25:00.169632778 -0500 26398+++ linux-2.6.32.10/drivers/uwb/wlp/messages.c 2010-03-20 15:58:47.106071004 -0400
26414@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct 26399@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
26415 size_t len = skb->len; 26400 size_t len = skb->len;
26416 size_t used; 26401 size_t used;
@@ -26420,9 +26405,9 @@ diff -urNp linux-2.6.32.9/drivers/uwb/wlp/messages.c linux-2.6.32.9/drivers/uwb/
26420 enum wlp_assc_error assc_err; 26405 enum wlp_assc_error assc_err;
26421 char enonce_buf[WLP_WSS_NONCE_STRSIZE]; 26406 char enonce_buf[WLP_WSS_NONCE_STRSIZE];
26422 char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; 26407 char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
26423diff -urNp linux-2.6.32.9/drivers/uwb/wlp/sysfs.c linux-2.6.32.9/drivers/uwb/wlp/sysfs.c 26408diff -urNp linux-2.6.32.10/drivers/uwb/wlp/sysfs.c linux-2.6.32.10/drivers/uwb/wlp/sysfs.c
26424--- linux-2.6.32.9/drivers/uwb/wlp/sysfs.c 2010-02-23 10:38:51.000000000 -0500 26409--- linux-2.6.32.10/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400
26425+++ linux-2.6.32.9/drivers/uwb/wlp/sysfs.c 2010-03-11 20:25:00.169632778 -0500 26410+++ linux-2.6.32.10/drivers/uwb/wlp/sysfs.c 2010-03-20 15:58:47.106071004 -0400
26426@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec 26411@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
26427 return ret; 26412 return ret;
26428 } 26413 }
@@ -26433,9 +26418,9 @@ diff -urNp linux-2.6.32.9/drivers/uwb/wlp/sysfs.c linux-2.6.32.9/drivers/uwb/wlp
26433 .show = wlp_wss_attr_show, 26418 .show = wlp_wss_attr_show,
26434 .store = wlp_wss_attr_store, 26419 .store = wlp_wss_attr_store,
26435 }; 26420 };
26436diff -urNp linux-2.6.32.9/drivers/video/atmel_lcdfb.c linux-2.6.32.9/drivers/video/atmel_lcdfb.c 26421diff -urNp linux-2.6.32.10/drivers/video/atmel_lcdfb.c linux-2.6.32.10/drivers/video/atmel_lcdfb.c
26437--- linux-2.6.32.9/drivers/video/atmel_lcdfb.c 2010-02-23 10:38:51.000000000 -0500 26422--- linux-2.6.32.10/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400
26438+++ linux-2.6.32.9/drivers/video/atmel_lcdfb.c 2010-03-11 20:25:00.169632778 -0500 26423+++ linux-2.6.32.10/drivers/video/atmel_lcdfb.c 2010-03-20 15:58:47.106071004 -0400
26439@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc 26424@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
26440 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); 26425 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
26441 } 26426 }
@@ -26445,9 +26430,9 @@ diff -urNp linux-2.6.32.9/drivers/video/atmel_lcdfb.c linux-2.6.32.9/drivers/vid
26445 .update_status = atmel_bl_update_status, 26430 .update_status = atmel_bl_update_status,
26446 .get_brightness = atmel_bl_get_brightness, 26431 .get_brightness = atmel_bl_get_brightness,
26447 }; 26432 };
26448diff -urNp linux-2.6.32.9/drivers/video/aty/aty128fb.c linux-2.6.32.9/drivers/video/aty/aty128fb.c 26433diff -urNp linux-2.6.32.10/drivers/video/aty/aty128fb.c linux-2.6.32.10/drivers/video/aty/aty128fb.c
26449--- linux-2.6.32.9/drivers/video/aty/aty128fb.c 2010-02-23 10:38:51.000000000 -0500 26434--- linux-2.6.32.10/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400
26450+++ linux-2.6.32.9/drivers/video/aty/aty128fb.c 2010-03-11 20:25:00.169632778 -0500 26435+++ linux-2.6.32.10/drivers/video/aty/aty128fb.c 2010-03-20 15:58:47.110069152 -0400
26451@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru 26436@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
26452 return bd->props.brightness; 26437 return bd->props.brightness;
26453 } 26438 }
@@ -26457,9 +26442,9 @@ diff -urNp linux-2.6.32.9/drivers/video/aty/aty128fb.c linux-2.6.32.9/drivers/vi
26457 .get_brightness = aty128_bl_get_brightness, 26442 .get_brightness = aty128_bl_get_brightness,
26458 .update_status = aty128_bl_update_status, 26443 .update_status = aty128_bl_update_status,
26459 }; 26444 };
26460diff -urNp linux-2.6.32.9/drivers/video/aty/atyfb_base.c linux-2.6.32.9/drivers/video/aty/atyfb_base.c 26445diff -urNp linux-2.6.32.10/drivers/video/aty/atyfb_base.c linux-2.6.32.10/drivers/video/aty/atyfb_base.c
26461--- linux-2.6.32.9/drivers/video/aty/atyfb_base.c 2010-02-23 10:38:51.000000000 -0500 26446--- linux-2.6.32.10/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400
26462+++ linux-2.6.32.9/drivers/video/aty/atyfb_base.c 2010-03-11 20:25:00.169632778 -0500 26447+++ linux-2.6.32.10/drivers/video/aty/atyfb_base.c 2010-03-20 15:58:47.110069152 -0400
26463@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct 26448@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
26464 return bd->props.brightness; 26449 return bd->props.brightness;
26465 } 26450 }
@@ -26469,9 +26454,9 @@ diff -urNp linux-2.6.32.9/drivers/video/aty/atyfb_base.c linux-2.6.32.9/drivers/
26469 .get_brightness = aty_bl_get_brightness, 26454 .get_brightness = aty_bl_get_brightness,
26470 .update_status = aty_bl_update_status, 26455 .update_status = aty_bl_update_status,
26471 }; 26456 };
26472diff -urNp linux-2.6.32.9/drivers/video/aty/radeon_backlight.c linux-2.6.32.9/drivers/video/aty/radeon_backlight.c 26457diff -urNp linux-2.6.32.10/drivers/video/aty/radeon_backlight.c linux-2.6.32.10/drivers/video/aty/radeon_backlight.c
26473--- linux-2.6.32.9/drivers/video/aty/radeon_backlight.c 2010-02-23 10:38:51.000000000 -0500 26458--- linux-2.6.32.10/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400
26474+++ linux-2.6.32.9/drivers/video/aty/radeon_backlight.c 2010-03-11 20:25:00.169632778 -0500 26459+++ linux-2.6.32.10/drivers/video/aty/radeon_backlight.c 2010-03-20 15:58:47.110069152 -0400
26475@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru 26460@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
26476 return bd->props.brightness; 26461 return bd->props.brightness;
26477 } 26462 }
@@ -26481,9 +26466,9 @@ diff -urNp linux-2.6.32.9/drivers/video/aty/radeon_backlight.c linux-2.6.32.9/dr
26481 .get_brightness = radeon_bl_get_brightness, 26466 .get_brightness = radeon_bl_get_brightness,
26482 .update_status = radeon_bl_update_status, 26467 .update_status = radeon_bl_update_status,
26483 }; 26468 };
26484diff -urNp linux-2.6.32.9/drivers/video/backlight/adp5520_bl.c linux-2.6.32.9/drivers/video/backlight/adp5520_bl.c 26469diff -urNp linux-2.6.32.10/drivers/video/backlight/adp5520_bl.c linux-2.6.32.10/drivers/video/backlight/adp5520_bl.c
26485--- linux-2.6.32.9/drivers/video/backlight/adp5520_bl.c 2010-02-23 10:38:51.000000000 -0500 26470--- linux-2.6.32.10/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400
26486+++ linux-2.6.32.9/drivers/video/backlight/adp5520_bl.c 2010-03-11 20:25:00.169632778 -0500 26471+++ linux-2.6.32.10/drivers/video/backlight/adp5520_bl.c 2010-03-20 15:58:47.110069152 -0400
26487@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str 26472@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
26488 return error ? data->current_brightness : reg_val; 26473 return error ? data->current_brightness : reg_val;
26489 } 26474 }
@@ -26493,9 +26478,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/adp5520_bl.c linux-2.6.32.9/dr
26493 .update_status = adp5520_bl_update_status, 26478 .update_status = adp5520_bl_update_status,
26494 .get_brightness = adp5520_bl_get_brightness, 26479 .get_brightness = adp5520_bl_get_brightness,
26495 }; 26480 };
26496diff -urNp linux-2.6.32.9/drivers/video/backlight/adx_bl.c linux-2.6.32.9/drivers/video/backlight/adx_bl.c 26481diff -urNp linux-2.6.32.10/drivers/video/backlight/adx_bl.c linux-2.6.32.10/drivers/video/backlight/adx_bl.c
26497--- linux-2.6.32.9/drivers/video/backlight/adx_bl.c 2010-02-23 10:38:51.000000000 -0500 26482--- linux-2.6.32.10/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400
26498+++ linux-2.6.32.9/drivers/video/backlight/adx_bl.c 2010-03-11 20:25:00.169632778 -0500 26483+++ linux-2.6.32.10/drivers/video/backlight/adx_bl.c 2010-03-20 15:58:47.110069152 -0400
26499@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct 26484@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
26500 return 1; 26485 return 1;
26501 } 26486 }
@@ -26505,9 +26490,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/adx_bl.c linux-2.6.32.9/driver
26505 .options = 0, 26490 .options = 0,
26506 .update_status = adx_backlight_update_status, 26491 .update_status = adx_backlight_update_status,
26507 .get_brightness = adx_backlight_get_brightness, 26492 .get_brightness = adx_backlight_get_brightness,
26508diff -urNp linux-2.6.32.9/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.9/drivers/video/backlight/atmel-pwm-bl.c 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
26509--- linux-2.6.32.9/drivers/video/backlight/atmel-pwm-bl.c 2010-02-23 10:38:51.000000000 -0500 26494--- linux-2.6.32.10/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400
26510+++ linux-2.6.32.9/drivers/video/backlight/atmel-pwm-bl.c 2010-03-11 20:25:00.173379565 -0500 26495+++ linux-2.6.32.10/drivers/video/backlight/atmel-pwm-bl.c 2010-03-20 15:58:47.110069152 -0400
26511@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct 26496@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
26512 return pwm_channel_enable(&pwmbl->pwmc); 26497 return pwm_channel_enable(&pwmbl->pwmc);
26513 } 26498 }
@@ -26517,9 +26502,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.9/
26517 .get_brightness = atmel_pwm_bl_get_intensity, 26502 .get_brightness = atmel_pwm_bl_get_intensity,
26518 .update_status = atmel_pwm_bl_set_intensity, 26503 .update_status = atmel_pwm_bl_set_intensity,
26519 }; 26504 };
26520diff -urNp linux-2.6.32.9/drivers/video/backlight/backlight.c linux-2.6.32.9/drivers/video/backlight/backlight.c 26505diff -urNp linux-2.6.32.10/drivers/video/backlight/backlight.c linux-2.6.32.10/drivers/video/backlight/backlight.c
26521--- linux-2.6.32.9/drivers/video/backlight/backlight.c 2010-02-23 10:38:51.000000000 -0500 26506--- linux-2.6.32.10/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400
26522+++ linux-2.6.32.9/drivers/video/backlight/backlight.c 2010-03-11 20:25:00.173379565 -0500 26507+++ linux-2.6.32.10/drivers/video/backlight/backlight.c 2010-03-20 15:58:47.110069152 -0400
26523@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); 26508@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
26524 * ERR_PTR() or a pointer to the newly allocated device. 26509 * ERR_PTR() or a pointer to the newly allocated device.
26525 */ 26510 */
@@ -26529,9 +26514,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/backlight.c linux-2.6.32.9/dri
26529 { 26514 {
26530 struct backlight_device *new_bd; 26515 struct backlight_device *new_bd;
26531 int rc; 26516 int rc;
26532diff -urNp linux-2.6.32.9/drivers/video/backlight/corgi_lcd.c linux-2.6.32.9/drivers/video/backlight/corgi_lcd.c 26517diff -urNp linux-2.6.32.10/drivers/video/backlight/corgi_lcd.c linux-2.6.32.10/drivers/video/backlight/corgi_lcd.c
26533--- linux-2.6.32.9/drivers/video/backlight/corgi_lcd.c 2010-02-23 10:38:51.000000000 -0500 26518--- linux-2.6.32.10/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400
26534+++ linux-2.6.32.9/drivers/video/backlight/corgi_lcd.c 2010-03-11 20:25:00.173379565 -0500 26519+++ linux-2.6.32.10/drivers/video/backlight/corgi_lcd.c 2010-03-20 15:58:47.110069152 -0400
26535@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit 26520@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
26536 } 26521 }
26537 EXPORT_SYMBOL(corgi_lcd_limit_intensity); 26522 EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -26541,9 +26526,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/corgi_lcd.c linux-2.6.32.9/dri
26541 .get_brightness = corgi_bl_get_intensity, 26526 .get_brightness = corgi_bl_get_intensity,
26542 .update_status = corgi_bl_update_status, 26527 .update_status = corgi_bl_update_status,
26543 }; 26528 };
26544diff -urNp linux-2.6.32.9/drivers/video/backlight/cr_bllcd.c linux-2.6.32.9/drivers/video/backlight/cr_bllcd.c 26529diff -urNp linux-2.6.32.10/drivers/video/backlight/cr_bllcd.c linux-2.6.32.10/drivers/video/backlight/cr_bllcd.c
26545--- linux-2.6.32.9/drivers/video/backlight/cr_bllcd.c 2010-02-23 10:38:51.000000000 -0500 26530--- linux-2.6.32.10/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400
26546+++ linux-2.6.32.9/drivers/video/backlight/cr_bllcd.c 2010-03-11 20:25:00.173379565 -0500 26531+++ linux-2.6.32.10/drivers/video/backlight/cr_bllcd.c 2010-03-20 15:58:47.110069152 -0400
26547@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st 26532@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
26548 return intensity; 26533 return intensity;
26549 } 26534 }
@@ -26553,9 +26538,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/cr_bllcd.c linux-2.6.32.9/driv
26553 .get_brightness = cr_backlight_get_intensity, 26538 .get_brightness = cr_backlight_get_intensity,
26554 .update_status = cr_backlight_set_intensity, 26539 .update_status = cr_backlight_set_intensity,
26555 }; 26540 };
26556diff -urNp linux-2.6.32.9/drivers/video/backlight/da903x_bl.c linux-2.6.32.9/drivers/video/backlight/da903x_bl.c 26541diff -urNp linux-2.6.32.10/drivers/video/backlight/da903x_bl.c linux-2.6.32.10/drivers/video/backlight/da903x_bl.c
26557--- linux-2.6.32.9/drivers/video/backlight/da903x_bl.c 2010-02-23 10:38:51.000000000 -0500 26542--- linux-2.6.32.10/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400
26558+++ linux-2.6.32.9/drivers/video/backlight/da903x_bl.c 2010-03-11 20:25:00.173379565 -0500 26543+++ linux-2.6.32.10/drivers/video/backlight/da903x_bl.c 2010-03-20 15:58:47.110069152 -0400
26559@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne 26544@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
26560 return data->current_brightness; 26545 return data->current_brightness;
26561 } 26546 }
@@ -26565,9 +26550,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/da903x_bl.c linux-2.6.32.9/dri
26565 .update_status = da903x_backlight_update_status, 26550 .update_status = da903x_backlight_update_status,
26566 .get_brightness = da903x_backlight_get_brightness, 26551 .get_brightness = da903x_backlight_get_brightness,
26567 }; 26552 };
26568diff -urNp linux-2.6.32.9/drivers/video/backlight/generic_bl.c linux-2.6.32.9/drivers/video/backlight/generic_bl.c 26553diff -urNp linux-2.6.32.10/drivers/video/backlight/generic_bl.c linux-2.6.32.10/drivers/video/backlight/generic_bl.c
26569--- linux-2.6.32.9/drivers/video/backlight/generic_bl.c 2010-02-23 10:38:51.000000000 -0500 26554--- linux-2.6.32.10/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400
26570+++ linux-2.6.32.9/drivers/video/backlight/generic_bl.c 2010-03-11 20:25:00.173379565 -0500 26555+++ linux-2.6.32.10/drivers/video/backlight/generic_bl.c 2010-03-20 15:58:47.110069152 -0400
26571@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) 26556@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
26572 } 26557 }
26573 EXPORT_SYMBOL(corgibl_limit_intensity); 26558 EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -26577,9 +26562,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/generic_bl.c linux-2.6.32.9/dr
26577 .options = BL_CORE_SUSPENDRESUME, 26562 .options = BL_CORE_SUSPENDRESUME,
26578 .get_brightness = genericbl_get_intensity, 26563 .get_brightness = genericbl_get_intensity,
26579 .update_status = genericbl_send_intensity, 26564 .update_status = genericbl_send_intensity,
26580diff -urNp linux-2.6.32.9/drivers/video/backlight/hp680_bl.c linux-2.6.32.9/drivers/video/backlight/hp680_bl.c 26565diff -urNp linux-2.6.32.10/drivers/video/backlight/hp680_bl.c linux-2.6.32.10/drivers/video/backlight/hp680_bl.c
26581--- linux-2.6.32.9/drivers/video/backlight/hp680_bl.c 2010-02-23 10:38:51.000000000 -0500 26566--- linux-2.6.32.10/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400
26582+++ linux-2.6.32.9/drivers/video/backlight/hp680_bl.c 2010-03-11 20:25:00.173379565 -0500 26567+++ linux-2.6.32.10/drivers/video/backlight/hp680_bl.c 2010-03-20 15:58:47.110069152 -0400
26583@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct 26568@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
26584 return current_intensity; 26569 return current_intensity;
26585 } 26570 }
@@ -26589,9 +26574,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/hp680_bl.c linux-2.6.32.9/driv
26589 .get_brightness = hp680bl_get_intensity, 26574 .get_brightness = hp680bl_get_intensity,
26590 .update_status = hp680bl_set_intensity, 26575 .update_status = hp680bl_set_intensity,
26591 }; 26576 };
26592diff -urNp linux-2.6.32.9/drivers/video/backlight/jornada720_bl.c linux-2.6.32.9/drivers/video/backlight/jornada720_bl.c 26577diff -urNp linux-2.6.32.10/drivers/video/backlight/jornada720_bl.c linux-2.6.32.10/drivers/video/backlight/jornada720_bl.c
26593--- linux-2.6.32.9/drivers/video/backlight/jornada720_bl.c 2010-02-23 10:38:51.000000000 -0500 26578--- linux-2.6.32.10/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400
26594+++ linux-2.6.32.9/drivers/video/backlight/jornada720_bl.c 2010-03-11 20:25:00.173379565 -0500 26579+++ linux-2.6.32.10/drivers/video/backlight/jornada720_bl.c 2010-03-20 15:58:47.110069152 -0400
26595@@ -93,7 +93,7 @@ out: 26580@@ -93,7 +93,7 @@ out:
26596 return ret; 26581 return ret;
26597 } 26582 }
@@ -26601,9 +26586,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/jornada720_bl.c linux-2.6.32.9
26601 .get_brightness = jornada_bl_get_brightness, 26586 .get_brightness = jornada_bl_get_brightness,
26602 .update_status = jornada_bl_update_status, 26587 .update_status = jornada_bl_update_status,
26603 .options = BL_CORE_SUSPENDRESUME, 26588 .options = BL_CORE_SUSPENDRESUME,
26604diff -urNp linux-2.6.32.9/drivers/video/backlight/kb3886_bl.c linux-2.6.32.9/drivers/video/backlight/kb3886_bl.c 26589diff -urNp linux-2.6.32.10/drivers/video/backlight/kb3886_bl.c linux-2.6.32.10/drivers/video/backlight/kb3886_bl.c
26605--- linux-2.6.32.9/drivers/video/backlight/kb3886_bl.c 2010-02-23 10:38:51.000000000 -0500 26590--- linux-2.6.32.10/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400
26606+++ linux-2.6.32.9/drivers/video/backlight/kb3886_bl.c 2010-03-11 20:25:00.173379565 -0500 26591+++ linux-2.6.32.10/drivers/video/backlight/kb3886_bl.c 2010-03-20 15:58:47.110069152 -0400
26607@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct 26592@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
26608 return kb3886bl_intensity; 26593 return kb3886bl_intensity;
26609 } 26594 }
@@ -26613,9 +26598,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/kb3886_bl.c linux-2.6.32.9/dri
26613 .get_brightness = kb3886bl_get_intensity, 26598 .get_brightness = kb3886bl_get_intensity,
26614 .update_status = kb3886bl_send_intensity, 26599 .update_status = kb3886bl_send_intensity,
26615 }; 26600 };
26616diff -urNp linux-2.6.32.9/drivers/video/backlight/locomolcd.c linux-2.6.32.9/drivers/video/backlight/locomolcd.c 26601diff -urNp linux-2.6.32.10/drivers/video/backlight/locomolcd.c linux-2.6.32.10/drivers/video/backlight/locomolcd.c
26617--- linux-2.6.32.9/drivers/video/backlight/locomolcd.c 2010-02-23 10:38:51.000000000 -0500 26602--- linux-2.6.32.10/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400
26618+++ linux-2.6.32.9/drivers/video/backlight/locomolcd.c 2010-03-11 20:25:00.173379565 -0500 26603+++ linux-2.6.32.10/drivers/video/backlight/locomolcd.c 2010-03-20 15:58:47.110069152 -0400
26619@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc 26604@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
26620 return current_intensity; 26605 return current_intensity;
26621 } 26606 }
@@ -26625,9 +26610,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/locomolcd.c linux-2.6.32.9/dri
26625 .get_brightness = locomolcd_get_intensity, 26610 .get_brightness = locomolcd_get_intensity,
26626 .update_status = locomolcd_set_intensity, 26611 .update_status = locomolcd_set_intensity,
26627 }; 26612 };
26628diff -urNp linux-2.6.32.9/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.9/drivers/video/backlight/mbp_nvidia_bl.c 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
26629--- linux-2.6.32.9/drivers/video/backlight/mbp_nvidia_bl.c 2010-02-23 10:38:51.000000000 -0500 26614--- linux-2.6.32.10/drivers/video/backlight/mbp_nvidia_bl.c 2010-03-15 11:52:04.000000000 -0400
26630+++ linux-2.6.32.9/drivers/video/backlight/mbp_nvidia_bl.c 2010-03-11 20:25:00.173379565 -0500 26615+++ linux-2.6.32.10/drivers/video/backlight/mbp_nvidia_bl.c 2010-03-20 15:58:47.110069152 -0400
26631@@ -33,7 +33,7 @@ struct dmi_match_data { 26616@@ -33,7 +33,7 @@ struct dmi_match_data {
26632 unsigned long iostart; 26617 unsigned long iostart;
26633 unsigned long iolen; 26618 unsigned long iolen;
@@ -26637,9 +26622,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.9
26637 }; 26622 };
26638 26623
26639 /* Module parameters. */ 26624 /* Module parameters. */
26640diff -urNp linux-2.6.32.9/drivers/video/backlight/omap1_bl.c linux-2.6.32.9/drivers/video/backlight/omap1_bl.c 26625diff -urNp linux-2.6.32.10/drivers/video/backlight/omap1_bl.c linux-2.6.32.10/drivers/video/backlight/omap1_bl.c
26641--- linux-2.6.32.9/drivers/video/backlight/omap1_bl.c 2010-02-23 10:38:51.000000000 -0500 26626--- linux-2.6.32.10/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400
26642+++ linux-2.6.32.9/drivers/video/backlight/omap1_bl.c 2010-03-11 20:25:00.173379565 -0500 26627+++ linux-2.6.32.10/drivers/video/backlight/omap1_bl.c 2010-03-20 15:58:47.110069152 -0400
26643@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b 26628@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
26644 return bl->current_intensity; 26629 return bl->current_intensity;
26645 } 26630 }
@@ -26649,9 +26634,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/omap1_bl.c linux-2.6.32.9/driv
26649 .get_brightness = omapbl_get_intensity, 26634 .get_brightness = omapbl_get_intensity,
26650 .update_status = omapbl_update_status, 26635 .update_status = omapbl_update_status,
26651 }; 26636 };
26652diff -urNp linux-2.6.32.9/drivers/video/backlight/progear_bl.c linux-2.6.32.9/drivers/video/backlight/progear_bl.c 26637diff -urNp linux-2.6.32.10/drivers/video/backlight/progear_bl.c linux-2.6.32.10/drivers/video/backlight/progear_bl.c
26653--- linux-2.6.32.9/drivers/video/backlight/progear_bl.c 2010-02-23 10:38:51.000000000 -0500 26638--- linux-2.6.32.10/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400
26654+++ linux-2.6.32.9/drivers/video/backlight/progear_bl.c 2010-03-11 20:25:00.173379565 -0500 26639+++ linux-2.6.32.10/drivers/video/backlight/progear_bl.c 2010-03-20 15:58:47.110069152 -0400
26655@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc 26640@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
26656 return intensity - HW_LEVEL_MIN; 26641 return intensity - HW_LEVEL_MIN;
26657 } 26642 }
@@ -26661,9 +26646,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/progear_bl.c linux-2.6.32.9/dr
26661 .get_brightness = progearbl_get_intensity, 26646 .get_brightness = progearbl_get_intensity,
26662 .update_status = progearbl_set_intensity, 26647 .update_status = progearbl_set_intensity,
26663 }; 26648 };
26664diff -urNp linux-2.6.32.9/drivers/video/backlight/pwm_bl.c linux-2.6.32.9/drivers/video/backlight/pwm_bl.c 26649diff -urNp linux-2.6.32.10/drivers/video/backlight/pwm_bl.c linux-2.6.32.10/drivers/video/backlight/pwm_bl.c
26665--- linux-2.6.32.9/drivers/video/backlight/pwm_bl.c 2010-02-23 10:38:51.000000000 -0500 26650--- linux-2.6.32.10/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400
26666+++ linux-2.6.32.9/drivers/video/backlight/pwm_bl.c 2010-03-11 20:25:00.173379565 -0500 26651+++ linux-2.6.32.10/drivers/video/backlight/pwm_bl.c 2010-03-20 15:58:47.110069152 -0400
26667@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( 26652@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
26668 return bl->props.brightness; 26653 return bl->props.brightness;
26669 } 26654 }
@@ -26673,9 +26658,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/pwm_bl.c linux-2.6.32.9/driver
26673 .update_status = pwm_backlight_update_status, 26658 .update_status = pwm_backlight_update_status,
26674 .get_brightness = pwm_backlight_get_brightness, 26659 .get_brightness = pwm_backlight_get_brightness,
26675 }; 26660 };
26676diff -urNp linux-2.6.32.9/drivers/video/backlight/tosa_bl.c linux-2.6.32.9/drivers/video/backlight/tosa_bl.c 26661diff -urNp linux-2.6.32.10/drivers/video/backlight/tosa_bl.c linux-2.6.32.10/drivers/video/backlight/tosa_bl.c
26677--- linux-2.6.32.9/drivers/video/backlight/tosa_bl.c 2010-02-23 10:38:51.000000000 -0500 26662--- linux-2.6.32.10/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400
26678+++ linux-2.6.32.9/drivers/video/backlight/tosa_bl.c 2010-03-11 20:25:00.173379565 -0500 26663+++ linux-2.6.32.10/drivers/video/backlight/tosa_bl.c 2010-03-20 15:58:47.110069152 -0400
26679@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct 26664@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
26680 return props->brightness; 26665 return props->brightness;
26681 } 26666 }
@@ -26685,9 +26670,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/tosa_bl.c linux-2.6.32.9/drive
26685 .get_brightness = tosa_bl_get_brightness, 26670 .get_brightness = tosa_bl_get_brightness,
26686 .update_status = tosa_bl_update_status, 26671 .update_status = tosa_bl_update_status,
26687 }; 26672 };
26688diff -urNp linux-2.6.32.9/drivers/video/backlight/wm831x_bl.c linux-2.6.32.9/drivers/video/backlight/wm831x_bl.c 26673diff -urNp linux-2.6.32.10/drivers/video/backlight/wm831x_bl.c linux-2.6.32.10/drivers/video/backlight/wm831x_bl.c
26689--- linux-2.6.32.9/drivers/video/backlight/wm831x_bl.c 2010-02-23 10:38:51.000000000 -0500 26674--- linux-2.6.32.10/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400
26690+++ linux-2.6.32.9/drivers/video/backlight/wm831x_bl.c 2010-03-11 20:25:00.173379565 -0500 26675+++ linux-2.6.32.10/drivers/video/backlight/wm831x_bl.c 2010-03-20 15:58:47.110069152 -0400
26691@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne 26676@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
26692 return data->current_brightness; 26677 return data->current_brightness;
26693 } 26678 }
@@ -26697,9 +26682,9 @@ diff -urNp linux-2.6.32.9/drivers/video/backlight/wm831x_bl.c linux-2.6.32.9/dri
26697 .options = BL_CORE_SUSPENDRESUME, 26682 .options = BL_CORE_SUSPENDRESUME,
26698 .update_status = wm831x_backlight_update_status, 26683 .update_status = wm831x_backlight_update_status,
26699 .get_brightness = wm831x_backlight_get_brightness, 26684 .get_brightness = wm831x_backlight_get_brightness,
26700diff -urNp linux-2.6.32.9/drivers/video/bf54x-lq043fb.c linux-2.6.32.9/drivers/video/bf54x-lq043fb.c 26685diff -urNp linux-2.6.32.10/drivers/video/bf54x-lq043fb.c linux-2.6.32.10/drivers/video/bf54x-lq043fb.c
26701--- linux-2.6.32.9/drivers/video/bf54x-lq043fb.c 2010-02-23 10:38:51.000000000 -0500 26686--- linux-2.6.32.10/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400
26702+++ linux-2.6.32.9/drivers/video/bf54x-lq043fb.c 2010-03-11 20:25:00.173379565 -0500 26687+++ linux-2.6.32.10/drivers/video/bf54x-lq043fb.c 2010-03-20 15:58:47.114045863 -0400
26703@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back 26688@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
26704 return 0; 26689 return 0;
26705 } 26690 }
@@ -26709,9 +26694,9 @@ diff -urNp linux-2.6.32.9/drivers/video/bf54x-lq043fb.c linux-2.6.32.9/drivers/v
26709 .get_brightness = bl_get_brightness, 26694 .get_brightness = bl_get_brightness,
26710 }; 26695 };
26711 26696
26712diff -urNp linux-2.6.32.9/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.9/drivers/video/bfin-t350mcqb-fb.c 26697diff -urNp linux-2.6.32.10/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.10/drivers/video/bfin-t350mcqb-fb.c
26713--- linux-2.6.32.9/drivers/video/bfin-t350mcqb-fb.c 2010-02-23 10:38:51.000000000 -0500 26698--- linux-2.6.32.10/drivers/video/bfin-t350mcqb-fb.c 2010-03-15 11:52:04.000000000 -0400
26714+++ linux-2.6.32.9/drivers/video/bfin-t350mcqb-fb.c 2010-03-11 20:25:00.173379565 -0500 26699+++ linux-2.6.32.10/drivers/video/bfin-t350mcqb-fb.c 2010-03-20 15:58:47.114045863 -0400
26715@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back 26700@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
26716 return 0; 26701 return 0;
26717 } 26702 }
@@ -26721,9 +26706,9 @@ diff -urNp linux-2.6.32.9/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.9/driver
26721 .get_brightness = bl_get_brightness, 26706 .get_brightness = bl_get_brightness,
26722 }; 26707 };
26723 26708
26724diff -urNp linux-2.6.32.9/drivers/video/fbmem.c linux-2.6.32.9/drivers/video/fbmem.c 26709diff -urNp linux-2.6.32.10/drivers/video/fbmem.c linux-2.6.32.10/drivers/video/fbmem.c
26725--- linux-2.6.32.9/drivers/video/fbmem.c 2010-02-23 10:38:51.000000000 -0500 26710--- linux-2.6.32.10/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400
26726+++ linux-2.6.32.9/drivers/video/fbmem.c 2010-03-11 20:25:00.173379565 -0500 26711+++ linux-2.6.32.10/drivers/video/fbmem.c 2010-03-20 15:58:47.114045863 -0400
26727@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in 26712@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
26728 image->dx += image->width + 8; 26713 image->dx += image->width + 8;
26729 } 26714 }
@@ -26751,9 +26736,9 @@ diff -urNp linux-2.6.32.9/drivers/video/fbmem.c linux-2.6.32.9/drivers/video/fbm
26751 return -EINVAL; 26736 return -EINVAL;
26752 if (!registered_fb[con2fb.framebuffer]) 26737 if (!registered_fb[con2fb.framebuffer])
26753 request_module("fb%d", con2fb.framebuffer); 26738 request_module("fb%d", con2fb.framebuffer);
26754diff -urNp linux-2.6.32.9/drivers/video/fbmon.c linux-2.6.32.9/drivers/video/fbmon.c 26739diff -urNp linux-2.6.32.10/drivers/video/fbmon.c linux-2.6.32.10/drivers/video/fbmon.c
26755--- linux-2.6.32.9/drivers/video/fbmon.c 2010-02-23 10:38:51.000000000 -0500 26740--- linux-2.6.32.10/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400
26756+++ linux-2.6.32.9/drivers/video/fbmon.c 2010-03-11 20:25:00.173379565 -0500 26741+++ linux-2.6.32.10/drivers/video/fbmon.c 2010-03-20 15:58:47.114045863 -0400
26757@@ -45,7 +45,7 @@ 26742@@ -45,7 +45,7 @@
26758 #ifdef DEBUG 26743 #ifdef DEBUG
26759 #define DPRINTK(fmt, args...) printk(fmt,## args) 26744 #define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -26763,9 +26748,9 @@ diff -urNp linux-2.6.32.9/drivers/video/fbmon.c linux-2.6.32.9/drivers/video/fbm
26763 #endif 26748 #endif
26764 26749
26765 #define FBMON_FIX_HEADER 1 26750 #define FBMON_FIX_HEADER 1
26766diff -urNp linux-2.6.32.9/drivers/video/i810/i810_accel.c linux-2.6.32.9/drivers/video/i810/i810_accel.c 26751diff -urNp linux-2.6.32.10/drivers/video/i810/i810_accel.c linux-2.6.32.10/drivers/video/i810/i810_accel.c
26767--- linux-2.6.32.9/drivers/video/i810/i810_accel.c 2010-02-23 10:38:51.000000000 -0500 26752--- linux-2.6.32.10/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400
26768+++ linux-2.6.32.9/drivers/video/i810/i810_accel.c 2010-03-11 20:25:00.173379565 -0500 26753+++ linux-2.6.32.10/drivers/video/i810/i810_accel.c 2010-03-20 15:58:47.114045863 -0400
26769@@ -73,6 +73,7 @@ static inline int wait_for_space(struct 26754@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
26770 } 26755 }
26771 } 26756 }
@@ -26774,9 +26759,9 @@ diff -urNp linux-2.6.32.9/drivers/video/i810/i810_accel.c linux-2.6.32.9/drivers
26774 i810_report_error(mmio); 26759 i810_report_error(mmio);
26775 par->dev_flags |= LOCKUP; 26760 par->dev_flags |= LOCKUP;
26776 info->pixmap.scan_align = 1; 26761 info->pixmap.scan_align = 1;
26777diff -urNp linux-2.6.32.9/drivers/video/i810/i810_main.c linux-2.6.32.9/drivers/video/i810/i810_main.c 26762diff -urNp linux-2.6.32.10/drivers/video/i810/i810_main.c linux-2.6.32.10/drivers/video/i810/i810_main.c
26778--- linux-2.6.32.9/drivers/video/i810/i810_main.c 2010-02-23 10:38:51.000000000 -0500 26763--- linux-2.6.32.10/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400
26779+++ linux-2.6.32.9/drivers/video/i810/i810_main.c 2010-03-11 20:25:00.173379565 -0500 26764+++ linux-2.6.32.10/drivers/video/i810/i810_main.c 2010-03-20 15:58:47.114045863 -0400
26780@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t 26765@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
26781 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, 26766 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
26782 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, 26767 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
@@ -26786,9 +26771,9 @@ diff -urNp linux-2.6.32.9/drivers/video/i810/i810_main.c linux-2.6.32.9/drivers/
26786 }; 26771 };
26787 26772
26788 static struct pci_driver i810fb_driver = { 26773 static struct pci_driver i810fb_driver = {
26789diff -urNp linux-2.6.32.9/drivers/video/modedb.c linux-2.6.32.9/drivers/video/modedb.c 26774diff -urNp linux-2.6.32.10/drivers/video/modedb.c linux-2.6.32.10/drivers/video/modedb.c
26790--- linux-2.6.32.9/drivers/video/modedb.c 2010-02-23 10:38:51.000000000 -0500 26775--- linux-2.6.32.10/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400
26791+++ linux-2.6.32.9/drivers/video/modedb.c 2010-03-11 20:25:00.173379565 -0500 26776+++ linux-2.6.32.10/drivers/video/modedb.c 2010-03-20 15:58:47.114045863 -0400
26792@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ 26777@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
26793 { 26778 {
26794 /* 640x400 @ 70 Hz, 31.5 kHz hsync */ 26779 /* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -27089,9 +27074,9 @@ diff -urNp linux-2.6.32.9/drivers/video/modedb.c linux-2.6.32.9/drivers/video/mo
27089 }, 27074 },
27090 }; 27075 };
27091 27076
27092diff -urNp linux-2.6.32.9/drivers/video/nvidia/nv_backlight.c linux-2.6.32.9/drivers/video/nvidia/nv_backlight.c 27077diff -urNp linux-2.6.32.10/drivers/video/nvidia/nv_backlight.c linux-2.6.32.10/drivers/video/nvidia/nv_backlight.c
27093--- linux-2.6.32.9/drivers/video/nvidia/nv_backlight.c 2010-02-23 10:38:51.000000000 -0500 27078--- linux-2.6.32.10/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400
27094+++ linux-2.6.32.9/drivers/video/nvidia/nv_backlight.c 2010-03-11 20:25:00.177378995 -0500 27079+++ linux-2.6.32.10/drivers/video/nvidia/nv_backlight.c 2010-03-20 15:58:47.114045863 -0400
27095@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru 27080@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
27096 return bd->props.brightness; 27081 return bd->props.brightness;
27097 } 27082 }
@@ -27101,9 +27086,9 @@ diff -urNp linux-2.6.32.9/drivers/video/nvidia/nv_backlight.c linux-2.6.32.9/dri
27101 .get_brightness = nvidia_bl_get_brightness, 27086 .get_brightness = nvidia_bl_get_brightness,
27102 .update_status = nvidia_bl_update_status, 27087 .update_status = nvidia_bl_update_status,
27103 }; 27088 };
27104diff -urNp linux-2.6.32.9/drivers/video/riva/fbdev.c linux-2.6.32.9/drivers/video/riva/fbdev.c 27089diff -urNp linux-2.6.32.10/drivers/video/riva/fbdev.c linux-2.6.32.10/drivers/video/riva/fbdev.c
27105--- linux-2.6.32.9/drivers/video/riva/fbdev.c 2010-02-23 10:38:51.000000000 -0500 27090--- linux-2.6.32.10/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400
27106+++ linux-2.6.32.9/drivers/video/riva/fbdev.c 2010-03-11 20:25:00.177378995 -0500 27091+++ linux-2.6.32.10/drivers/video/riva/fbdev.c 2010-03-20 15:58:47.114045863 -0400
27107@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct 27092@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
27108 return bd->props.brightness; 27093 return bd->props.brightness;
27109 } 27094 }
@@ -27113,9 +27098,9 @@ diff -urNp linux-2.6.32.9/drivers/video/riva/fbdev.c linux-2.6.32.9/drivers/vide
27113 .get_brightness = riva_bl_get_brightness, 27098 .get_brightness = riva_bl_get_brightness,
27114 .update_status = riva_bl_update_status, 27099 .update_status = riva_bl_update_status,
27115 }; 27100 };
27116diff -urNp linux-2.6.32.9/drivers/video/uvesafb.c linux-2.6.32.9/drivers/video/uvesafb.c 27101diff -urNp linux-2.6.32.10/drivers/video/uvesafb.c linux-2.6.32.10/drivers/video/uvesafb.c
27117--- linux-2.6.32.9/drivers/video/uvesafb.c 2010-02-23 10:38:51.000000000 -0500 27102--- linux-2.6.32.10/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400
27118+++ linux-2.6.32.9/drivers/video/uvesafb.c 2010-03-11 20:25:00.177378995 -0500 27103+++ linux-2.6.32.10/drivers/video/uvesafb.c 2010-03-20 15:58:47.114045863 -0400
27119@@ -18,6 +18,7 @@ 27104@@ -18,6 +18,7 @@
27120 #include <linux/fb.h> 27105 #include <linux/fb.h>
27121 #include <linux/io.h> 27106 #include <linux/io.h>
@@ -27191,9 +27176,9 @@ diff -urNp linux-2.6.32.9/drivers/video/uvesafb.c linux-2.6.32.9/drivers/video/u
27191 } 27176 }
27192 27177
27193 framebuffer_release(info); 27178 framebuffer_release(info);
27194diff -urNp linux-2.6.32.9/drivers/video/vesafb.c linux-2.6.32.9/drivers/video/vesafb.c 27179diff -urNp linux-2.6.32.10/drivers/video/vesafb.c linux-2.6.32.10/drivers/video/vesafb.c
27195--- linux-2.6.32.9/drivers/video/vesafb.c 2010-02-23 10:38:51.000000000 -0500 27180--- linux-2.6.32.10/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400
27196+++ linux-2.6.32.9/drivers/video/vesafb.c 2010-03-11 20:25:00.177378995 -0500 27181+++ linux-2.6.32.10/drivers/video/vesafb.c 2010-03-20 15:58:47.114045863 -0400
27197@@ -9,6 +9,7 @@ 27182@@ -9,6 +9,7 @@
27198 */ 27183 */
27199 27184
@@ -27297,9 +27282,9 @@ diff -urNp linux-2.6.32.9/drivers/video/vesafb.c linux-2.6.32.9/drivers/video/ve
27297 if (info->screen_base) 27282 if (info->screen_base)
27298 iounmap(info->screen_base); 27283 iounmap(info->screen_base);
27299 framebuffer_release(info); 27284 framebuffer_release(info);
27300diff -urNp linux-2.6.32.9/drivers/xen/sys-hypervisor.c linux-2.6.32.9/drivers/xen/sys-hypervisor.c 27285diff -urNp linux-2.6.32.10/drivers/xen/sys-hypervisor.c linux-2.6.32.10/drivers/xen/sys-hypervisor.c
27301--- linux-2.6.32.9/drivers/xen/sys-hypervisor.c 2010-02-23 10:38:51.000000000 -0500 27286--- linux-2.6.32.10/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400
27302+++ linux-2.6.32.9/drivers/xen/sys-hypervisor.c 2010-03-11 20:25:00.177378995 -0500 27287+++ linux-2.6.32.10/drivers/xen/sys-hypervisor.c 2010-03-20 15:58:47.114045863 -0400
27303@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko 27288@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
27304 return 0; 27289 return 0;
27305 } 27290 }
@@ -27309,9 +27294,9 @@ diff -urNp linux-2.6.32.9/drivers/xen/sys-hypervisor.c linux-2.6.32.9/drivers/xe
27309 .show = hyp_sysfs_show, 27294 .show = hyp_sysfs_show,
27310 .store = hyp_sysfs_store, 27295 .store = hyp_sysfs_store,
27311 }; 27296 };
27312diff -urNp linux-2.6.32.9/fs/9p/vfs_inode.c linux-2.6.32.9/fs/9p/vfs_inode.c 27297diff -urNp linux-2.6.32.10/fs/9p/vfs_inode.c linux-2.6.32.10/fs/9p/vfs_inode.c
27313--- linux-2.6.32.9/fs/9p/vfs_inode.c 2010-02-23 10:38:51.000000000 -0500 27298--- linux-2.6.32.10/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400
27314+++ linux-2.6.32.9/fs/9p/vfs_inode.c 2010-03-11 20:25:00.177378995 -0500 27299+++ linux-2.6.32.10/fs/9p/vfs_inode.c 2010-03-20 15:58:47.114045863 -0400
27315@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct 27300@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
27316 static void 27301 static void
27317 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 27302 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -27321,9 +27306,9 @@ diff -urNp linux-2.6.32.9/fs/9p/vfs_inode.c linux-2.6.32.9/fs/9p/vfs_inode.c
27321 27306
27322 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, 27307 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
27323 IS_ERR(s) ? "<error>" : s); 27308 IS_ERR(s) ? "<error>" : s);
27324diff -urNp linux-2.6.32.9/fs/aio.c linux-2.6.32.9/fs/aio.c 27309diff -urNp linux-2.6.32.10/fs/aio.c linux-2.6.32.10/fs/aio.c
27325--- linux-2.6.32.9/fs/aio.c 2010-02-23 10:38:51.000000000 -0500 27310--- linux-2.6.32.10/fs/aio.c 2010-03-15 11:52:04.000000000 -0400
27326+++ linux-2.6.32.9/fs/aio.c 2010-03-11 20:25:00.177378995 -0500 27311+++ linux-2.6.32.10/fs/aio.c 2010-03-20 15:58:47.114045863 -0400
27327@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx 27312@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx
27328 size += sizeof(struct io_event) * nr_events; 27313 size += sizeof(struct io_event) * nr_events;
27329 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; 27314 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -27333,9 +27318,9 @@ diff -urNp linux-2.6.32.9/fs/aio.c linux-2.6.32.9/fs/aio.c
27333 return -EINVAL; 27318 return -EINVAL;
27334 27319
27335 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); 27320 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
27336diff -urNp linux-2.6.32.9/fs/attr.c linux-2.6.32.9/fs/attr.c 27321diff -urNp linux-2.6.32.10/fs/attr.c linux-2.6.32.10/fs/attr.c
27337--- linux-2.6.32.9/fs/attr.c 2010-02-23 10:38:51.000000000 -0500 27322--- linux-2.6.32.10/fs/attr.c 2010-03-15 11:52:04.000000000 -0400
27338+++ linux-2.6.32.9/fs/attr.c 2010-03-11 20:25:00.177378995 -0500 27323+++ linux-2.6.32.10/fs/attr.c 2010-03-20 15:58:47.118060790 -0400
27339@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode 27324@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
27340 unsigned long limit; 27325 unsigned long limit;
27341 27326
@@ -27344,9 +27329,9 @@ diff -urNp linux-2.6.32.9/fs/attr.c linux-2.6.32.9/fs/attr.c
27344 if (limit != RLIM_INFINITY && offset > limit) 27329 if (limit != RLIM_INFINITY && offset > limit)
27345 goto out_sig; 27330 goto out_sig;
27346 if (offset > inode->i_sb->s_maxbytes) 27331 if (offset > inode->i_sb->s_maxbytes)
27347diff -urNp linux-2.6.32.9/fs/autofs/root.c linux-2.6.32.9/fs/autofs/root.c 27332diff -urNp linux-2.6.32.10/fs/autofs/root.c linux-2.6.32.10/fs/autofs/root.c
27348--- linux-2.6.32.9/fs/autofs/root.c 2010-02-23 10:38:51.000000000 -0500 27333--- linux-2.6.32.10/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400
27349+++ linux-2.6.32.9/fs/autofs/root.c 2010-03-11 20:25:00.177378995 -0500 27334+++ linux-2.6.32.10/fs/autofs/root.c 2010-03-20 15:58:47.118060790 -0400
27350@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in 27335@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
27351 set_bit(n,sbi->symlink_bitmap); 27336 set_bit(n,sbi->symlink_bitmap);
27352 sl = &sbi->symlink[n]; 27337 sl = &sbi->symlink[n];
@@ -27357,9 +27342,9 @@ diff -urNp linux-2.6.32.9/fs/autofs/root.c linux-2.6.32.9/fs/autofs/root.c
27357 if (!sl->data) { 27342 if (!sl->data) {
27358 clear_bit(n,sbi->symlink_bitmap); 27343 clear_bit(n,sbi->symlink_bitmap);
27359 unlock_kernel(); 27344 unlock_kernel();
27360diff -urNp linux-2.6.32.9/fs/autofs4/symlink.c linux-2.6.32.9/fs/autofs4/symlink.c 27345diff -urNp linux-2.6.32.10/fs/autofs4/symlink.c linux-2.6.32.10/fs/autofs4/symlink.c
27361--- linux-2.6.32.9/fs/autofs4/symlink.c 2010-02-23 10:38:51.000000000 -0500 27346--- linux-2.6.32.10/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400
27362+++ linux-2.6.32.9/fs/autofs4/symlink.c 2010-03-11 20:25:00.177378995 -0500 27347+++ linux-2.6.32.10/fs/autofs4/symlink.c 2010-03-20 15:58:47.118060790 -0400
27363@@ -15,7 +15,7 @@ 27348@@ -15,7 +15,7 @@
27364 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) 27349 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
27365 { 27350 {
@@ -27369,9 +27354,9 @@ diff -urNp linux-2.6.32.9/fs/autofs4/symlink.c linux-2.6.32.9/fs/autofs4/symlink
27369 return NULL; 27354 return NULL;
27370 } 27355 }
27371 27356
27372diff -urNp linux-2.6.32.9/fs/befs/linuxvfs.c linux-2.6.32.9/fs/befs/linuxvfs.c 27357diff -urNp linux-2.6.32.10/fs/befs/linuxvfs.c linux-2.6.32.10/fs/befs/linuxvfs.c
27373--- linux-2.6.32.9/fs/befs/linuxvfs.c 2010-02-23 10:38:51.000000000 -0500 27358--- linux-2.6.32.10/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400
27374+++ linux-2.6.32.9/fs/befs/linuxvfs.c 2010-03-11 20:25:00.177378995 -0500 27359+++ linux-2.6.32.10/fs/befs/linuxvfs.c 2010-03-20 15:58:47.118060790 -0400
27375@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry 27360@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
27376 { 27361 {
27377 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); 27362 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -27381,9 +27366,9 @@ diff -urNp linux-2.6.32.9/fs/befs/linuxvfs.c linux-2.6.32.9/fs/befs/linuxvfs.c
27381 if (!IS_ERR(link)) 27366 if (!IS_ERR(link))
27382 kfree(link); 27367 kfree(link);
27383 } 27368 }
27384diff -urNp linux-2.6.32.9/fs/binfmt_aout.c linux-2.6.32.9/fs/binfmt_aout.c 27369diff -urNp linux-2.6.32.10/fs/binfmt_aout.c linux-2.6.32.10/fs/binfmt_aout.c
27385--- linux-2.6.32.9/fs/binfmt_aout.c 2010-02-23 10:38:51.000000000 -0500 27370--- linux-2.6.32.10/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400
27386+++ linux-2.6.32.9/fs/binfmt_aout.c 2010-03-11 20:25:00.177378995 -0500 27371+++ linux-2.6.32.10/fs/binfmt_aout.c 2010-03-20 15:58:47.118060790 -0400
27387@@ -16,6 +16,7 @@ 27372@@ -16,6 +16,7 @@
27388 #include <linux/string.h> 27373 #include <linux/string.h>
27389 #include <linux/fs.h> 27374 #include <linux/fs.h>
@@ -27451,9 +27436,9 @@ diff -urNp linux-2.6.32.9/fs/binfmt_aout.c linux-2.6.32.9/fs/binfmt_aout.c
27451 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, 27436 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
27452 fd_offset + ex.a_text); 27437 fd_offset + ex.a_text);
27453 up_write(&current->mm->mmap_sem); 27438 up_write(&current->mm->mmap_sem);
27454diff -urNp linux-2.6.32.9/fs/binfmt_elf.c linux-2.6.32.9/fs/binfmt_elf.c 27439diff -urNp linux-2.6.32.10/fs/binfmt_elf.c linux-2.6.32.10/fs/binfmt_elf.c
27455--- linux-2.6.32.9/fs/binfmt_elf.c 2010-02-23 10:38:51.000000000 -0500 27440--- linux-2.6.32.10/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400
27456+++ linux-2.6.32.9/fs/binfmt_elf.c 2010-03-11 20:25:00.177378995 -0500 27441+++ linux-2.6.32.10/fs/binfmt_elf.c 2010-03-20 15:58:47.118060790 -0400
27457@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str 27442@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
27458 #define elf_core_dump NULL 27443 #define elf_core_dump NULL
27459 #endif 27444 #endif
@@ -28085,9 +28070,9 @@ diff -urNp linux-2.6.32.9/fs/binfmt_elf.c linux-2.6.32.9/fs/binfmt_elf.c
28085 static int __init init_elf_binfmt(void) 28070 static int __init init_elf_binfmt(void)
28086 { 28071 {
28087 return register_binfmt(&elf_format); 28072 return register_binfmt(&elf_format);
28088diff -urNp linux-2.6.32.9/fs/binfmt_flat.c linux-2.6.32.9/fs/binfmt_flat.c 28073diff -urNp linux-2.6.32.10/fs/binfmt_flat.c linux-2.6.32.10/fs/binfmt_flat.c
28089--- linux-2.6.32.9/fs/binfmt_flat.c 2010-02-23 10:38:51.000000000 -0500 28074--- linux-2.6.32.10/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400
28090+++ linux-2.6.32.9/fs/binfmt_flat.c 2010-03-11 20:25:00.177378995 -0500 28075+++ linux-2.6.32.10/fs/binfmt_flat.c 2010-03-20 15:58:47.118060790 -0400
28091@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b 28076@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
28092 realdatastart = (unsigned long) -ENOMEM; 28077 realdatastart = (unsigned long) -ENOMEM;
28093 printk("Unable to allocate RAM for process data, errno %d\n", 28078 printk("Unable to allocate RAM for process data, errno %d\n",
@@ -28120,9 +28105,9 @@ diff -urNp linux-2.6.32.9/fs/binfmt_flat.c linux-2.6.32.9/fs/binfmt_flat.c
28120 ret = result; 28105 ret = result;
28121 goto err; 28106 goto err;
28122 } 28107 }
28123diff -urNp linux-2.6.32.9/fs/binfmt_misc.c linux-2.6.32.9/fs/binfmt_misc.c 28108diff -urNp linux-2.6.32.10/fs/binfmt_misc.c linux-2.6.32.10/fs/binfmt_misc.c
28124--- linux-2.6.32.9/fs/binfmt_misc.c 2010-02-23 10:38:51.000000000 -0500 28109--- linux-2.6.32.10/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400
28125+++ linux-2.6.32.9/fs/binfmt_misc.c 2010-03-11 20:25:00.177378995 -0500 28110+++ linux-2.6.32.10/fs/binfmt_misc.c 2010-03-20 15:58:47.118060790 -0400
28126@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl 28111@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
28127 static struct tree_descr bm_files[] = { 28112 static struct tree_descr bm_files[] = {
28128 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, 28113 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
@@ -28132,9 +28117,9 @@ diff -urNp linux-2.6.32.9/fs/binfmt_misc.c linux-2.6.32.9/fs/binfmt_misc.c
28132 }; 28117 };
28133 int err = simple_fill_super(sb, 0x42494e4d, bm_files); 28118 int err = simple_fill_super(sb, 0x42494e4d, bm_files);
28134 if (!err) 28119 if (!err)
28135diff -urNp linux-2.6.32.9/fs/bio.c linux-2.6.32.9/fs/bio.c 28120diff -urNp linux-2.6.32.10/fs/bio.c linux-2.6.32.10/fs/bio.c
28136--- linux-2.6.32.9/fs/bio.c 2010-02-23 10:38:51.000000000 -0500 28121--- linux-2.6.32.10/fs/bio.c 2010-03-15 11:52:04.000000000 -0400
28137+++ linux-2.6.32.9/fs/bio.c 2010-03-11 20:25:00.177378995 -0500 28122+++ linux-2.6.32.10/fs/bio.c 2010-03-20 15:58:47.118060790 -0400
28138@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr 28123@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
28139 28124
28140 i = 0; 28125 i = 0;
@@ -28153,9 +28138,9 @@ diff -urNp linux-2.6.32.9/fs/bio.c linux-2.6.32.9/fs/bio.c
28153 28138
28154 __bio_for_each_segment(bvec, bio, i, 0) { 28139 __bio_for_each_segment(bvec, bio, i, 0) {
28155 char *addr = page_address(bvec->bv_page); 28140 char *addr = page_address(bvec->bv_page);
28156diff -urNp linux-2.6.32.9/fs/btrfs/ctree.c linux-2.6.32.9/fs/btrfs/ctree.c 28141diff -urNp linux-2.6.32.10/fs/btrfs/ctree.c linux-2.6.32.10/fs/btrfs/ctree.c
28157--- linux-2.6.32.9/fs/btrfs/ctree.c 2010-02-23 10:38:51.000000000 -0500 28142--- linux-2.6.32.10/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400
28158+++ linux-2.6.32.9/fs/btrfs/ctree.c 2010-03-11 20:25:00.181402476 -0500 28143+++ linux-2.6.32.10/fs/btrfs/ctree.c 2010-03-20 15:58:47.118060790 -0400
28159@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran 28144@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran
28160 28145
28161 ret = 0; 28146 ret = 0;
@@ -28164,9 +28149,9 @@ diff -urNp linux-2.6.32.9/fs/btrfs/ctree.c linux-2.6.32.9/fs/btrfs/ctree.c
28164 btrfs_cpu_key_to_disk(&disk_key, cpu_key); 28149 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
28165 ret = fixup_low_keys(trans, root, path, &disk_key, 1); 28150 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
28166 } 28151 }
28167diff -urNp linux-2.6.32.9/fs/btrfs/disk-io.c linux-2.6.32.9/fs/btrfs/disk-io.c 28152diff -urNp linux-2.6.32.10/fs/btrfs/disk-io.c linux-2.6.32.10/fs/btrfs/disk-io.c
28168--- linux-2.6.32.9/fs/btrfs/disk-io.c 2010-02-23 10:38:51.000000000 -0500 28153--- linux-2.6.32.10/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400
28169+++ linux-2.6.32.9/fs/btrfs/disk-io.c 2010-03-11 20:25:00.181402476 -0500 28154+++ linux-2.6.32.10/fs/btrfs/disk-io.c 2010-03-20 15:58:47.118060790 -0400
28170@@ -39,7 +39,7 @@ 28155@@ -39,7 +39,7 @@
28171 #include "tree-log.h" 28156 #include "tree-log.h"
28172 #include "free-space-cache.h" 28157 #include "free-space-cache.h"
@@ -28185,9 +28170,9 @@ diff -urNp linux-2.6.32.9/fs/btrfs/disk-io.c linux-2.6.32.9/fs/btrfs/disk-io.c
28185 .write_cache_pages_lock_hook = btree_lock_page_hook, 28170 .write_cache_pages_lock_hook = btree_lock_page_hook,
28186 .readpage_end_io_hook = btree_readpage_end_io_hook, 28171 .readpage_end_io_hook = btree_readpage_end_io_hook,
28187 .submit_bio_hook = btree_submit_bio_hook, 28172 .submit_bio_hook = btree_submit_bio_hook,
28188diff -urNp linux-2.6.32.9/fs/btrfs/extent_io.h linux-2.6.32.9/fs/btrfs/extent_io.h 28173diff -urNp linux-2.6.32.10/fs/btrfs/extent_io.h linux-2.6.32.10/fs/btrfs/extent_io.h
28189--- linux-2.6.32.9/fs/btrfs/extent_io.h 2010-02-23 10:38:51.000000000 -0500 28174--- linux-2.6.32.10/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400
28190+++ linux-2.6.32.9/fs/btrfs/extent_io.h 2010-03-11 20:25:00.181402476 -0500 28175+++ linux-2.6.32.10/fs/btrfs/extent_io.h 2010-03-20 15:58:47.118060790 -0400
28191@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s 28176@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
28192 struct bio *bio, int mirror_num, 28177 struct bio *bio, int mirror_num,
28193 unsigned long bio_flags); 28178 unsigned long bio_flags);
@@ -28248,9 +28233,9 @@ diff -urNp linux-2.6.32.9/fs/btrfs/extent_io.h linux-2.6.32.9/fs/btrfs/extent_io
28248 }; 28233 };
28249 28234
28250 struct extent_state { 28235 struct extent_state {
28251diff -urNp linux-2.6.32.9/fs/btrfs/free-space-cache.c linux-2.6.32.9/fs/btrfs/free-space-cache.c 28236diff -urNp linux-2.6.32.10/fs/btrfs/free-space-cache.c linux-2.6.32.10/fs/btrfs/free-space-cache.c
28252--- linux-2.6.32.9/fs/btrfs/free-space-cache.c 2010-02-23 10:38:51.000000000 -0500 28237--- linux-2.6.32.10/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400
28253+++ linux-2.6.32.9/fs/btrfs/free-space-cache.c 2010-03-11 20:25:00.181402476 -0500 28238+++ linux-2.6.32.10/fs/btrfs/free-space-cache.c 2010-03-20 15:58:47.122041773 -0400
28254@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf 28239@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
28255 28240
28256 while(1) { 28241 while(1) {
@@ -28269,9 +28254,9 @@ diff -urNp linux-2.6.32.9/fs/btrfs/free-space-cache.c linux-2.6.32.9/fs/btrfs/fr
28269 28254
28270 if (entry->bitmap && entry->bytes > bytes + empty_size) { 28255 if (entry->bitmap && entry->bytes > bytes + empty_size) {
28271 ret = btrfs_bitmap_cluster(block_group, entry, cluster, 28256 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
28272diff -urNp linux-2.6.32.9/fs/btrfs/inode.c linux-2.6.32.9/fs/btrfs/inode.c 28257diff -urNp linux-2.6.32.10/fs/btrfs/inode.c linux-2.6.32.10/fs/btrfs/inode.c
28273--- linux-2.6.32.9/fs/btrfs/inode.c 2010-02-23 10:38:51.000000000 -0500 28258--- linux-2.6.32.10/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400
28274+++ linux-2.6.32.9/fs/btrfs/inode.c 2010-03-11 20:25:00.181402476 -0500 28259+++ linux-2.6.32.10/fs/btrfs/inode.c 2010-03-20 15:58:47.122041773 -0400
28275@@ -63,7 +63,7 @@ static const struct inode_operations btr 28260@@ -63,7 +63,7 @@ static const struct inode_operations btr
28276 static const struct address_space_operations btrfs_aops; 28261 static const struct address_space_operations btrfs_aops;
28277 static const struct address_space_operations btrfs_symlink_aops; 28262 static const struct address_space_operations btrfs_symlink_aops;
@@ -28290,9 +28275,9 @@ diff -urNp linux-2.6.32.9/fs/btrfs/inode.c linux-2.6.32.9/fs/btrfs/inode.c
28290 .fill_delalloc = run_delalloc_range, 28275 .fill_delalloc = run_delalloc_range,
28291 .submit_bio_hook = btrfs_submit_bio_hook, 28276 .submit_bio_hook = btrfs_submit_bio_hook,
28292 .merge_bio_hook = btrfs_merge_bio_hook, 28277 .merge_bio_hook = btrfs_merge_bio_hook,
28293diff -urNp linux-2.6.32.9/fs/btrfs/sysfs.c linux-2.6.32.9/fs/btrfs/sysfs.c 28278diff -urNp linux-2.6.32.10/fs/btrfs/sysfs.c linux-2.6.32.10/fs/btrfs/sysfs.c
28294--- linux-2.6.32.9/fs/btrfs/sysfs.c 2010-02-23 10:38:51.000000000 -0500 28279--- linux-2.6.32.10/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400
28295+++ linux-2.6.32.9/fs/btrfs/sysfs.c 2010-03-11 20:25:00.181402476 -0500 28280+++ linux-2.6.32.10/fs/btrfs/sysfs.c 2010-03-20 15:58:47.122041773 -0400
28296@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko 28281@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
28297 complete(&root->kobj_unregister); 28282 complete(&root->kobj_unregister);
28298 } 28283 }
@@ -28308,9 +28293,9 @@ diff -urNp linux-2.6.32.9/fs/btrfs/sysfs.c linux-2.6.32.9/fs/btrfs/sysfs.c
28308 .show = btrfs_root_attr_show, 28293 .show = btrfs_root_attr_show,
28309 .store = btrfs_root_attr_store, 28294 .store = btrfs_root_attr_store,
28310 }; 28295 };
28311diff -urNp linux-2.6.32.9/fs/buffer.c linux-2.6.32.9/fs/buffer.c 28296diff -urNp linux-2.6.32.10/fs/buffer.c linux-2.6.32.10/fs/buffer.c
28312--- linux-2.6.32.9/fs/buffer.c 2010-02-23 10:38:51.000000000 -0500 28297--- linux-2.6.32.10/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400
28313+++ linux-2.6.32.9/fs/buffer.c 2010-03-11 20:25:00.181402476 -0500 28298+++ linux-2.6.32.10/fs/buffer.c 2010-03-20 15:58:47.122041773 -0400
28314@@ -25,6 +25,7 @@ 28299@@ -25,6 +25,7 @@
28315 #include <linux/percpu.h> 28300 #include <linux/percpu.h>
28316 #include <linux/slab.h> 28301 #include <linux/slab.h>
@@ -28319,9 +28304,9 @@ diff -urNp linux-2.6.32.9/fs/buffer.c linux-2.6.32.9/fs/buffer.c
28319 #include <linux/blkdev.h> 28304 #include <linux/blkdev.h>
28320 #include <linux/file.h> 28305 #include <linux/file.h>
28321 #include <linux/quotaops.h> 28306 #include <linux/quotaops.h>
28322diff -urNp linux-2.6.32.9/fs/cachefiles/rdwr.c linux-2.6.32.9/fs/cachefiles/rdwr.c 28307diff -urNp linux-2.6.32.10/fs/cachefiles/rdwr.c linux-2.6.32.10/fs/cachefiles/rdwr.c
28323--- linux-2.6.32.9/fs/cachefiles/rdwr.c 2010-02-23 10:38:51.000000000 -0500 28308--- linux-2.6.32.10/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400
28324+++ linux-2.6.32.9/fs/cachefiles/rdwr.c 2010-03-11 20:25:00.181402476 -0500 28309+++ linux-2.6.32.10/fs/cachefiles/rdwr.c 2010-03-20 15:58:47.122041773 -0400
28325@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache 28310@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
28326 old_fs = get_fs(); 28311 old_fs = get_fs();
28327 set_fs(KERNEL_DS); 28312 set_fs(KERNEL_DS);
@@ -28331,9 +28316,9 @@ diff -urNp linux-2.6.32.9/fs/cachefiles/rdwr.c linux-2.6.32.9/fs/cachefiles/rdwr
28331 set_fs(old_fs); 28316 set_fs(old_fs);
28332 kunmap(page); 28317 kunmap(page);
28333 if (ret != len) 28318 if (ret != len)
28334diff -urNp linux-2.6.32.9/fs/cifs/cifs_uniupr.h linux-2.6.32.9/fs/cifs/cifs_uniupr.h 28319diff -urNp linux-2.6.32.10/fs/cifs/cifs_uniupr.h linux-2.6.32.10/fs/cifs/cifs_uniupr.h
28335--- linux-2.6.32.9/fs/cifs/cifs_uniupr.h 2010-02-23 10:38:51.000000000 -0500 28320--- linux-2.6.32.10/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400
28336+++ linux-2.6.32.9/fs/cifs/cifs_uniupr.h 2010-03-11 20:25:00.181402476 -0500 28321+++ linux-2.6.32.10/fs/cifs/cifs_uniupr.h 2010-03-20 15:58:47.122041773 -0400
28337@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa 28322@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
28338 {0x0490, 0x04cc, UniCaseRangeU0490}, 28323 {0x0490, 0x04cc, UniCaseRangeU0490},
28339 {0x1e00, 0x1ffc, UniCaseRangeU1e00}, 28324 {0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -28343,9 +28328,9 @@ diff -urNp linux-2.6.32.9/fs/cifs/cifs_uniupr.h linux-2.6.32.9/fs/cifs/cifs_uniu
28343 }; 28328 };
28344 #endif 28329 #endif
28345 28330
28346diff -urNp linux-2.6.32.9/fs/cifs/link.c linux-2.6.32.9/fs/cifs/link.c 28331diff -urNp linux-2.6.32.10/fs/cifs/link.c linux-2.6.32.10/fs/cifs/link.c
28347--- linux-2.6.32.9/fs/cifs/link.c 2010-02-23 10:38:51.000000000 -0500 28332--- linux-2.6.32.10/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400
28348+++ linux-2.6.32.9/fs/cifs/link.c 2010-03-11 20:25:00.181402476 -0500 28333+++ linux-2.6.32.10/fs/cifs/link.c 2010-03-20 15:58:47.122041773 -0400
28349@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct 28334@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
28350 28335
28351 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) 28336 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -28355,9 +28340,9 @@ diff -urNp linux-2.6.32.9/fs/cifs/link.c linux-2.6.32.9/fs/cifs/link.c
28355 if (!IS_ERR(p)) 28340 if (!IS_ERR(p))
28356 kfree(p); 28341 kfree(p);
28357 } 28342 }
28358diff -urNp linux-2.6.32.9/fs/compat_binfmt_elf.c linux-2.6.32.9/fs/compat_binfmt_elf.c 28343diff -urNp linux-2.6.32.10/fs/compat_binfmt_elf.c linux-2.6.32.10/fs/compat_binfmt_elf.c
28359--- linux-2.6.32.9/fs/compat_binfmt_elf.c 2010-02-23 10:38:51.000000000 -0500 28344--- linux-2.6.32.10/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400
28360+++ linux-2.6.32.9/fs/compat_binfmt_elf.c 2010-03-11 20:25:00.181402476 -0500 28345+++ linux-2.6.32.10/fs/compat_binfmt_elf.c 2010-03-20 15:58:47.122041773 -0400
28361@@ -29,10 +29,12 @@ 28346@@ -29,10 +29,12 @@
28362 #undef elfhdr 28347 #undef elfhdr
28363 #undef elf_phdr 28348 #undef elf_phdr
@@ -28371,9 +28356,9 @@ diff -urNp linux-2.6.32.9/fs/compat_binfmt_elf.c linux-2.6.32.9/fs/compat_binfmt
28371 #define elf_addr_t Elf32_Addr 28356 #define elf_addr_t Elf32_Addr
28372 28357
28373 /* 28358 /*
28374diff -urNp linux-2.6.32.9/fs/compat.c linux-2.6.32.9/fs/compat.c 28359diff -urNp linux-2.6.32.10/fs/compat.c linux-2.6.32.10/fs/compat.c
28375--- linux-2.6.32.9/fs/compat.c 2010-02-23 10:38:51.000000000 -0500 28360--- linux-2.6.32.10/fs/compat.c 2010-03-15 11:52:04.000000000 -0400
28376+++ linux-2.6.32.9/fs/compat.c 2010-03-11 20:25:00.181402476 -0500 28361+++ linux-2.6.32.10/fs/compat.c 2010-03-20 15:58:47.122041773 -0400
28377@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, 28362@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc,
28378 if (!kmapped_page || kpos != (pos & PAGE_MASK)) { 28363 if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
28379 struct page *page; 28364 struct page *page;
@@ -28473,9 +28458,9 @@ diff -urNp linux-2.6.32.9/fs/compat.c linux-2.6.32.9/fs/compat.c
28473 out: 28458 out:
28474 if (bprm->mm) 28459 if (bprm->mm)
28475 mmput(bprm->mm); 28460 mmput(bprm->mm);
28476diff -urNp linux-2.6.32.9/fs/compat_ioctl.c linux-2.6.32.9/fs/compat_ioctl.c 28461diff -urNp linux-2.6.32.10/fs/compat_ioctl.c linux-2.6.32.10/fs/compat_ioctl.c
28477--- linux-2.6.32.9/fs/compat_ioctl.c 2010-02-23 10:38:51.000000000 -0500 28462--- linux-2.6.32.10/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400
28478+++ linux-2.6.32.9/fs/compat_ioctl.c 2010-03-11 20:25:00.185386567 -0500 28463+++ linux-2.6.32.10/fs/compat_ioctl.c 2010-03-20 15:58:47.122041773 -0400
28479@@ -1827,15 +1827,15 @@ struct ioctl_trans { 28464@@ -1827,15 +1827,15 @@ struct ioctl_trans {
28480 }; 28465 };
28481 28466
@@ -28495,9 +28480,9 @@ diff -urNp linux-2.6.32.9/fs/compat_ioctl.c linux-2.6.32.9/fs/compat_ioctl.c
28495 28480
28496 /* ioctl should not be warned about even if it's not implemented. 28481 /* ioctl should not be warned about even if it's not implemented.
28497 Valid reasons to use this: 28482 Valid reasons to use this:
28498diff -urNp linux-2.6.32.9/fs/debugfs/inode.c linux-2.6.32.9/fs/debugfs/inode.c 28483diff -urNp linux-2.6.32.10/fs/debugfs/inode.c linux-2.6.32.10/fs/debugfs/inode.c
28499--- linux-2.6.32.9/fs/debugfs/inode.c 2010-02-23 10:38:51.000000000 -0500 28484--- linux-2.6.32.10/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400
28500+++ linux-2.6.32.9/fs/debugfs/inode.c 2010-03-11 20:25:00.185386567 -0500 28485+++ linux-2.6.32.10/fs/debugfs/inode.c 2010-03-20 15:58:47.122041773 -0400
28501@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc 28486@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
28502 28487
28503 static int debug_fill_super(struct super_block *sb, void *data, int silent) 28488 static int debug_fill_super(struct super_block *sb, void *data, int silent)
@@ -28507,9 +28492,9 @@ diff -urNp linux-2.6.32.9/fs/debugfs/inode.c linux-2.6.32.9/fs/debugfs/inode.c
28507 28492
28508 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); 28493 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
28509 } 28494 }
28510diff -urNp linux-2.6.32.9/fs/dlm/lockspace.c linux-2.6.32.9/fs/dlm/lockspace.c 28495diff -urNp linux-2.6.32.10/fs/dlm/lockspace.c linux-2.6.32.10/fs/dlm/lockspace.c
28511--- linux-2.6.32.9/fs/dlm/lockspace.c 2010-02-23 10:38:51.000000000 -0500 28496--- linux-2.6.32.10/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400
28512+++ linux-2.6.32.9/fs/dlm/lockspace.c 2010-03-11 20:25:00.185386567 -0500 28497+++ linux-2.6.32.10/fs/dlm/lockspace.c 2010-03-20 15:58:47.126047499 -0400
28513@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc 28498@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
28514 kfree(ls); 28499 kfree(ls);
28515 } 28500 }
@@ -28519,9 +28504,9 @@ diff -urNp linux-2.6.32.9/fs/dlm/lockspace.c linux-2.6.32.9/fs/dlm/lockspace.c
28519 .show = dlm_attr_show, 28504 .show = dlm_attr_show,
28520 .store = dlm_attr_store, 28505 .store = dlm_attr_store,
28521 }; 28506 };
28522diff -urNp linux-2.6.32.9/fs/ecryptfs/inode.c linux-2.6.32.9/fs/ecryptfs/inode.c 28507diff -urNp linux-2.6.32.10/fs/ecryptfs/inode.c linux-2.6.32.10/fs/ecryptfs/inode.c
28523--- linux-2.6.32.9/fs/ecryptfs/inode.c 2010-02-23 10:38:51.000000000 -0500 28508--- linux-2.6.32.10/fs/ecryptfs/inode.c 2010-03-15 11:52:04.000000000 -0400
28524+++ linux-2.6.32.9/fs/ecryptfs/inode.c 2010-03-11 20:25:00.185386567 -0500 28509+++ linux-2.6.32.10/fs/ecryptfs/inode.c 2010-03-20 15:58:47.126047499 -0400
28525@@ -676,7 +676,7 @@ ecryptfs_readlink(struct dentry *dentry, 28510@@ -676,7 +676,7 @@ ecryptfs_readlink(struct dentry *dentry,
28526 old_fs = get_fs(); 28511 old_fs = get_fs();
28527 set_fs(get_ds()); 28512 set_fs(get_ds());
@@ -28540,9 +28525,9 @@ diff -urNp linux-2.6.32.9/fs/ecryptfs/inode.c linux-2.6.32.9/fs/ecryptfs/inode.c
28540 set_fs(old_fs); 28525 set_fs(old_fs);
28541 if (rc < 0) 28526 if (rc < 0)
28542 goto out_free; 28527 goto out_free;
28543diff -urNp linux-2.6.32.9/fs/exec.c linux-2.6.32.9/fs/exec.c 28528diff -urNp linux-2.6.32.10/fs/exec.c linux-2.6.32.10/fs/exec.c
28544--- linux-2.6.32.9/fs/exec.c 2010-02-23 10:38:51.000000000 -0500 28529--- linux-2.6.32.10/fs/exec.c 2010-03-15 11:52:04.000000000 -0400
28545+++ linux-2.6.32.9/fs/exec.c 2010-03-11 20:25:00.185386567 -0500 28530+++ linux-2.6.32.10/fs/exec.c 2010-03-20 15:58:47.126047499 -0400
28546@@ -56,12 +56,24 @@ 28531@@ -56,12 +56,24 @@
28547 #include <linux/fsnotify.h> 28532 #include <linux/fsnotify.h>
28548 #include <linux/fs_struct.h> 28533 #include <linux/fs_struct.h>
@@ -28701,15 +28686,7 @@ diff -urNp linux-2.6.32.9/fs/exec.c linux-2.6.32.9/fs/exec.c
28701 stack_expand = EXTRA_STACK_VM_PAGES * PAGE_SIZE; 28686 stack_expand = EXTRA_STACK_VM_PAGES * PAGE_SIZE;
28702 stack_size = vma->vm_end - vma->vm_start; 28687 stack_size = vma->vm_end - vma->vm_start;
28703 /* 28688 /*
28704@@ -638,7 +671,6 @@ int setup_arg_pages(struct linux_binprm 28689@@ -667,7 +700,7 @@ struct file *open_exec(const char *name)
28705 * will align it up.
28706 */
28707 rlim_stack = rlimit(RLIMIT_STACK) & PAGE_MASK;
28708- rlim_stack = min(rlim_stack, stack_size);
28709 #ifdef CONFIG_STACK_GROWSUP
28710 if (stack_size + stack_expand > rlim_stack)
28711 stack_base = vma->vm_start + rlim_stack;
28712@@ -668,7 +700,7 @@ struct file *open_exec(const char *name)
28713 int err; 28690 int err;
28714 28691
28715 file = do_filp_open(AT_FDCWD, name, 28692 file = do_filp_open(AT_FDCWD, name,
@@ -28718,7 +28695,7 @@ diff -urNp linux-2.6.32.9/fs/exec.c linux-2.6.32.9/fs/exec.c
28718 MAY_EXEC | MAY_OPEN); 28695 MAY_EXEC | MAY_OPEN);
28719 if (IS_ERR(file)) 28696 if (IS_ERR(file))
28720 goto out; 28697 goto out;
28721@@ -705,7 +737,7 @@ int kernel_read(struct file *file, loff_ 28698@@ -704,7 +737,7 @@ int kernel_read(struct file *file, loff_
28722 old_fs = get_fs(); 28699 old_fs = get_fs();
28723 set_fs(get_ds()); 28700 set_fs(get_ds());
28724 /* The cast to a user pointer is valid due to the set_fs() */ 28701 /* The cast to a user pointer is valid due to the set_fs() */
@@ -28727,7 +28704,7 @@ diff -urNp linux-2.6.32.9/fs/exec.c linux-2.6.32.9/fs/exec.c
28727 set_fs(old_fs); 28704 set_fs(old_fs);
28728 return result; 28705 return result;
28729 } 28706 }
28730@@ -1111,7 +1143,7 @@ int check_unsafe_exec(struct linux_binpr 28707@@ -1110,7 +1143,7 @@ int check_unsafe_exec(struct linux_binpr
28731 } 28708 }
28732 rcu_read_unlock(); 28709 rcu_read_unlock();
28733 28710
@@ -28736,7 +28713,7 @@ diff -urNp linux-2.6.32.9/fs/exec.c linux-2.6.32.9/fs/exec.c
28736 bprm->unsafe |= LSM_UNSAFE_SHARE; 28713 bprm->unsafe |= LSM_UNSAFE_SHARE;
28737 } else { 28714 } else {
28738 res = -EAGAIN; 28715 res = -EAGAIN;
28739@@ -1310,6 +1342,11 @@ int do_execve(char * filename, 28716@@ -1309,6 +1342,11 @@ int do_execve(char * filename,
28740 char __user *__user *envp, 28717 char __user *__user *envp,
28741 struct pt_regs * regs) 28718 struct pt_regs * regs)
28742 { 28719 {
@@ -28748,7 +28725,7 @@ diff -urNp linux-2.6.32.9/fs/exec.c linux-2.6.32.9/fs/exec.c
28748 struct linux_binprm *bprm; 28725 struct linux_binprm *bprm;
28749 struct file *file; 28726 struct file *file;
28750 struct files_struct *displaced; 28727 struct files_struct *displaced;
28751@@ -1346,6 +1383,18 @@ int do_execve(char * filename, 28728@@ -1345,6 +1383,18 @@ int do_execve(char * filename,
28752 bprm->filename = filename; 28729 bprm->filename = filename;
28753 bprm->interp = filename; 28730 bprm->interp = filename;
28754 28731
@@ -28767,7 +28744,7 @@ diff -urNp linux-2.6.32.9/fs/exec.c linux-2.6.32.9/fs/exec.c
28767 retval = bprm_mm_init(bprm); 28744 retval = bprm_mm_init(bprm);
28768 if (retval) 28745 if (retval)
28769 goto out_file; 28746 goto out_file;
28770@@ -1375,10 +1424,41 @@ int do_execve(char * filename, 28747@@ -1374,10 +1424,41 @@ int do_execve(char * filename,
28771 if (retval < 0) 28748 if (retval < 0)
28772 goto out; 28749 goto out;
28773 28750
@@ -28810,7 +28787,7 @@ diff -urNp linux-2.6.32.9/fs/exec.c linux-2.6.32.9/fs/exec.c
28810 28787
28811 current->stack_start = current->mm->start_stack; 28788 current->stack_start = current->mm->start_stack;
28812 28789
28813@@ -1391,6 +1471,14 @@ int do_execve(char * filename, 28790@@ -1390,6 +1471,14 @@ int do_execve(char * filename,
28814 put_files_struct(displaced); 28791 put_files_struct(displaced);
28815 return retval; 28792 return retval;
28816 28793
@@ -28825,7 +28802,7 @@ diff -urNp linux-2.6.32.9/fs/exec.c linux-2.6.32.9/fs/exec.c
28825 out: 28802 out:
28826 if (bprm->mm) 28803 if (bprm->mm)
28827 mmput (bprm->mm); 28804 mmput (bprm->mm);
28828@@ -1554,6 +1642,169 @@ out: 28805@@ -1553,6 +1642,169 @@ out:
28829 return ispipe; 28806 return ispipe;
28830 } 28807 }
28831 28808
@@ -28995,7 +28972,7 @@ diff -urNp linux-2.6.32.9/fs/exec.c linux-2.6.32.9/fs/exec.c
28995 static int zap_process(struct task_struct *start) 28972 static int zap_process(struct task_struct *start)
28996 { 28973 {
28997 struct task_struct *t; 28974 struct task_struct *t;
28998@@ -1756,17 +2007,17 @@ static void wait_for_dump_helpers(struct 28975@@ -1755,17 +2007,17 @@ static void wait_for_dump_helpers(struct
28999 pipe = file->f_path.dentry->d_inode->i_pipe; 28976 pipe = file->f_path.dentry->d_inode->i_pipe;
29000 28977
29001 pipe_lock(pipe); 28978 pipe_lock(pipe);
@@ -29018,7 +28995,7 @@ diff -urNp linux-2.6.32.9/fs/exec.c linux-2.6.32.9/fs/exec.c
29018 pipe_unlock(pipe); 28995 pipe_unlock(pipe);
29019 28996
29020 } 28997 }
29021@@ -1837,6 +2088,10 @@ void do_coredump(long signr, int exit_co 28998@@ -1836,6 +2088,10 @@ void do_coredump(long signr, int exit_co
29022 */ 28999 */
29023 clear_thread_flag(TIF_SIGPENDING); 29000 clear_thread_flag(TIF_SIGPENDING);
29024 29001
@@ -29029,9 +29006,9 @@ diff -urNp linux-2.6.32.9/fs/exec.c linux-2.6.32.9/fs/exec.c
29029 /* 29006 /*
29030 * lock_kernel() because format_corename() is controlled by sysctl, which 29007 * lock_kernel() because format_corename() is controlled by sysctl, which
29031 * uses lock_kernel() 29008 * uses lock_kernel()
29032diff -urNp linux-2.6.32.9/fs/ext2/balloc.c linux-2.6.32.9/fs/ext2/balloc.c 29009diff -urNp linux-2.6.32.10/fs/ext2/balloc.c linux-2.6.32.10/fs/ext2/balloc.c
29033--- linux-2.6.32.9/fs/ext2/balloc.c 2010-02-23 10:38:51.000000000 -0500 29010--- linux-2.6.32.10/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400
29034+++ linux-2.6.32.9/fs/ext2/balloc.c 2010-03-11 20:25:00.185386567 -0500 29011+++ linux-2.6.32.10/fs/ext2/balloc.c 2010-03-20 15:58:47.126047499 -0400
29035@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e 29012@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
29036 29013
29037 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 29014 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -29041,9 +29018,9 @@ diff -urNp linux-2.6.32.9/fs/ext2/balloc.c linux-2.6.32.9/fs/ext2/balloc.c
29041 sbi->s_resuid != current_fsuid() && 29018 sbi->s_resuid != current_fsuid() &&
29042 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 29019 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
29043 return 0; 29020 return 0;
29044diff -urNp linux-2.6.32.9/fs/ext3/balloc.c linux-2.6.32.9/fs/ext3/balloc.c 29021diff -urNp linux-2.6.32.10/fs/ext3/balloc.c linux-2.6.32.10/fs/ext3/balloc.c
29045--- linux-2.6.32.9/fs/ext3/balloc.c 2010-02-23 10:38:51.000000000 -0500 29022--- linux-2.6.32.10/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400
29046+++ linux-2.6.32.9/fs/ext3/balloc.c 2010-03-11 20:25:00.185386567 -0500 29023+++ linux-2.6.32.10/fs/ext3/balloc.c 2010-03-20 15:58:47.126047499 -0400
29047@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e 29024@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
29048 29025
29049 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 29026 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -29053,9 +29030,9 @@ diff -urNp linux-2.6.32.9/fs/ext3/balloc.c linux-2.6.32.9/fs/ext3/balloc.c
29053 sbi->s_resuid != current_fsuid() && 29030 sbi->s_resuid != current_fsuid() &&
29054 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 29031 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
29055 return 0; 29032 return 0;
29056diff -urNp linux-2.6.32.9/fs/ext3/namei.c linux-2.6.32.9/fs/ext3/namei.c 29033diff -urNp linux-2.6.32.10/fs/ext3/namei.c linux-2.6.32.10/fs/ext3/namei.c
29057--- linux-2.6.32.9/fs/ext3/namei.c 2010-02-23 10:38:51.000000000 -0500 29034--- linux-2.6.32.10/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400
29058+++ linux-2.6.32.9/fs/ext3/namei.c 2010-03-11 20:25:00.185386567 -0500 29035+++ linux-2.6.32.10/fs/ext3/namei.c 2010-03-20 15:58:47.126047499 -0400
29059@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split 29036@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
29060 char *data1 = (*bh)->b_data, *data2; 29037 char *data1 = (*bh)->b_data, *data2;
29061 unsigned split, move, size; 29038 unsigned split, move, size;
@@ -29065,9 +29042,9 @@ diff -urNp linux-2.6.32.9/fs/ext3/namei.c linux-2.6.32.9/fs/ext3/namei.c
29065 29042
29066 bh2 = ext3_append (handle, dir, &newblock, &err); 29043 bh2 = ext3_append (handle, dir, &newblock, &err);
29067 if (!(bh2)) { 29044 if (!(bh2)) {
29068diff -urNp linux-2.6.32.9/fs/ext3/xattr.c linux-2.6.32.9/fs/ext3/xattr.c 29045diff -urNp linux-2.6.32.10/fs/ext3/xattr.c linux-2.6.32.10/fs/ext3/xattr.c
29069--- linux-2.6.32.9/fs/ext3/xattr.c 2010-02-23 10:38:51.000000000 -0500 29046--- linux-2.6.32.10/fs/ext3/xattr.c 2010-03-15 11:52:04.000000000 -0400
29070+++ linux-2.6.32.9/fs/ext3/xattr.c 2010-03-11 20:25:00.185386567 -0500 29047+++ linux-2.6.32.10/fs/ext3/xattr.c 2010-03-20 15:58:47.126047499 -0400
29071@@ -89,8 +89,8 @@ 29048@@ -89,8 +89,8 @@
29072 printk("\n"); \ 29049 printk("\n"); \
29073 } while (0) 29050 } while (0)
@@ -29079,9 +29056,9 @@ diff -urNp linux-2.6.32.9/fs/ext3/xattr.c linux-2.6.32.9/fs/ext3/xattr.c
29079 #endif 29056 #endif
29080 29057
29081 static void ext3_xattr_cache_insert(struct buffer_head *); 29058 static void ext3_xattr_cache_insert(struct buffer_head *);
29082diff -urNp linux-2.6.32.9/fs/ext4/balloc.c linux-2.6.32.9/fs/ext4/balloc.c 29059diff -urNp linux-2.6.32.10/fs/ext4/balloc.c linux-2.6.32.10/fs/ext4/balloc.c
29083--- linux-2.6.32.9/fs/ext4/balloc.c 2010-02-23 10:38:51.000000000 -0500 29060--- linux-2.6.32.10/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400
29084+++ linux-2.6.32.9/fs/ext4/balloc.c 2010-03-11 20:25:00.185386567 -0500 29061+++ linux-2.6.32.10/fs/ext4/balloc.c 2010-03-20 15:58:47.126047499 -0400
29085@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ 29062@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_
29086 /* Hm, nope. Are (enough) root reserved blocks available? */ 29063 /* Hm, nope. Are (enough) root reserved blocks available? */
29087 if (sbi->s_resuid == current_fsuid() || 29064 if (sbi->s_resuid == current_fsuid() ||
@@ -29091,9 +29068,9 @@ diff -urNp linux-2.6.32.9/fs/ext4/balloc.c linux-2.6.32.9/fs/ext4/balloc.c
29091 if (free_blocks >= (nblocks + dirty_blocks)) 29068 if (free_blocks >= (nblocks + dirty_blocks))
29092 return 1; 29069 return 1;
29093 } 29070 }
29094diff -urNp linux-2.6.32.9/fs/ext4/ioctl.c linux-2.6.32.9/fs/ext4/ioctl.c 29071diff -urNp linux-2.6.32.10/fs/ext4/ioctl.c linux-2.6.32.10/fs/ext4/ioctl.c
29095--- linux-2.6.32.9/fs/ext4/ioctl.c 2010-02-23 10:38:51.000000000 -0500 29072--- linux-2.6.32.10/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400
29096+++ linux-2.6.32.9/fs/ext4/ioctl.c 2010-03-11 20:25:00.185386567 -0500 29073+++ linux-2.6.32.10/fs/ext4/ioctl.c 2010-03-20 15:58:47.126047499 -0400
29097@@ -221,6 +221,9 @@ setversion_out: 29074@@ -221,6 +221,9 @@ setversion_out:
29098 struct file *donor_filp; 29075 struct file *donor_filp;
29099 int err; 29076 int err;
@@ -29104,9 +29081,9 @@ diff -urNp linux-2.6.32.9/fs/ext4/ioctl.c linux-2.6.32.9/fs/ext4/ioctl.c
29104 if (!(filp->f_mode & FMODE_READ) || 29081 if (!(filp->f_mode & FMODE_READ) ||
29105 !(filp->f_mode & FMODE_WRITE)) 29082 !(filp->f_mode & FMODE_WRITE))
29106 return -EBADF; 29083 return -EBADF;
29107diff -urNp linux-2.6.32.9/fs/ext4/namei.c linux-2.6.32.9/fs/ext4/namei.c 29084diff -urNp linux-2.6.32.10/fs/ext4/namei.c linux-2.6.32.10/fs/ext4/namei.c
29108--- linux-2.6.32.9/fs/ext4/namei.c 2010-02-23 10:38:51.000000000 -0500 29085--- linux-2.6.32.10/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400
29109+++ linux-2.6.32.9/fs/ext4/namei.c 2010-03-11 20:25:00.185386567 -0500 29086+++ linux-2.6.32.10/fs/ext4/namei.c 2010-03-20 15:58:47.126047499 -0400
29110@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split 29087@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
29111 char *data1 = (*bh)->b_data, *data2; 29088 char *data1 = (*bh)->b_data, *data2;
29112 unsigned split, move, size; 29089 unsigned split, move, size;
@@ -29116,9 +29093,9 @@ diff -urNp linux-2.6.32.9/fs/ext4/namei.c linux-2.6.32.9/fs/ext4/namei.c
29116 29093
29117 bh2 = ext4_append (handle, dir, &newblock, &err); 29094 bh2 = ext4_append (handle, dir, &newblock, &err);
29118 if (!(bh2)) { 29095 if (!(bh2)) {
29119diff -urNp linux-2.6.32.9/fs/ext4/super.c linux-2.6.32.9/fs/ext4/super.c 29096diff -urNp linux-2.6.32.10/fs/ext4/super.c linux-2.6.32.10/fs/ext4/super.c
29120--- linux-2.6.32.9/fs/ext4/super.c 2010-02-23 10:38:51.000000000 -0500 29097--- linux-2.6.32.10/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400
29121+++ linux-2.6.32.9/fs/ext4/super.c 2010-03-11 20:25:00.189637482 -0500 29098+++ linux-2.6.32.10/fs/ext4/super.c 2010-03-20 15:58:47.126047499 -0400
29122@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje 29099@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje
29123 } 29100 }
29124 29101
@@ -29128,9 +29105,9 @@ diff -urNp linux-2.6.32.9/fs/ext4/super.c linux-2.6.32.9/fs/ext4/super.c
29128 .show = ext4_attr_show, 29105 .show = ext4_attr_show,
29129 .store = ext4_attr_store, 29106 .store = ext4_attr_store,
29130 }; 29107 };
29131diff -urNp linux-2.6.32.9/fs/fcntl.c linux-2.6.32.9/fs/fcntl.c 29108diff -urNp linux-2.6.32.10/fs/fcntl.c linux-2.6.32.10/fs/fcntl.c
29132--- linux-2.6.32.9/fs/fcntl.c 2010-02-23 10:38:51.000000000 -0500 29109--- linux-2.6.32.10/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400
29133+++ linux-2.6.32.9/fs/fcntl.c 2010-03-11 20:25:00.189637482 -0500 29110+++ linux-2.6.32.10/fs/fcntl.c 2010-03-20 15:58:47.126047499 -0400
29134@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in 29111@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in
29135 switch (cmd) { 29112 switch (cmd) {
29136 case F_DUPFD: 29113 case F_DUPFD:
@@ -29149,9 +29126,9 @@ diff -urNp linux-2.6.32.9/fs/fcntl.c linux-2.6.32.9/fs/fcntl.c
29149 rcu_read_unlock(); 29126 rcu_read_unlock();
29150 return ret; 29127 return ret;
29151 } 29128 }
29152diff -urNp linux-2.6.32.9/fs/fifo.c linux-2.6.32.9/fs/fifo.c 29129diff -urNp linux-2.6.32.10/fs/fifo.c linux-2.6.32.10/fs/fifo.c
29153--- linux-2.6.32.9/fs/fifo.c 2010-02-23 10:38:51.000000000 -0500 29130--- linux-2.6.32.10/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400
29154+++ linux-2.6.32.9/fs/fifo.c 2010-03-11 20:25:00.189637482 -0500 29131+++ linux-2.6.32.10/fs/fifo.c 2010-03-20 15:58:47.130049516 -0400
29155@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode 29132@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
29156 */ 29133 */
29157 filp->f_op = &read_pipefifo_fops; 29134 filp->f_op = &read_pipefifo_fops;
@@ -29222,9 +29199,9 @@ diff -urNp linux-2.6.32.9/fs/fifo.c linux-2.6.32.9/fs/fifo.c
29222 free_pipe_info(inode); 29199 free_pipe_info(inode);
29223 29200
29224 err_nocleanup: 29201 err_nocleanup:
29225diff -urNp linux-2.6.32.9/fs/file.c linux-2.6.32.9/fs/file.c 29202diff -urNp linux-2.6.32.10/fs/file.c linux-2.6.32.10/fs/file.c
29226--- linux-2.6.32.9/fs/file.c 2010-02-23 10:38:51.000000000 -0500 29203--- linux-2.6.32.10/fs/file.c 2010-03-15 11:52:04.000000000 -0400
29227+++ linux-2.6.32.9/fs/file.c 2010-03-11 20:25:00.189637482 -0500 29204+++ linux-2.6.32.10/fs/file.c 2010-03-20 15:58:47.130049516 -0400
29228@@ -14,6 +14,7 @@ 29205@@ -14,6 +14,7 @@
29229 #include <linux/slab.h> 29206 #include <linux/slab.h>
29230 #include <linux/vmalloc.h> 29207 #include <linux/vmalloc.h>
@@ -29242,9 +29219,9 @@ diff -urNp linux-2.6.32.9/fs/file.c linux-2.6.32.9/fs/file.c
29242 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 29219 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
29243 return -EMFILE; 29220 return -EMFILE;
29244 29221
29245diff -urNp linux-2.6.32.9/fs/fs_struct.c linux-2.6.32.9/fs/fs_struct.c 29222diff -urNp linux-2.6.32.10/fs/fs_struct.c linux-2.6.32.10/fs/fs_struct.c
29246--- linux-2.6.32.9/fs/fs_struct.c 2010-02-23 10:38:51.000000000 -0500 29223--- linux-2.6.32.10/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400
29247+++ linux-2.6.32.9/fs/fs_struct.c 2010-03-11 20:25:00.189637482 -0500 29224+++ linux-2.6.32.10/fs/fs_struct.c 2010-03-20 15:58:47.130049516 -0400
29248@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo 29225@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo
29249 struct task_struct *g, *p; 29226 struct task_struct *g, *p;
29250 struct fs_struct *fs; 29227 struct fs_struct *fs;
@@ -29349,9 +29326,9 @@ diff -urNp linux-2.6.32.9/fs/fs_struct.c linux-2.6.32.9/fs/fs_struct.c
29349 29326
29350 task_unlock(current); 29327 task_unlock(current);
29351 if (kill) 29328 if (kill)
29352diff -urNp linux-2.6.32.9/fs/fuse/control.c linux-2.6.32.9/fs/fuse/control.c 29329diff -urNp linux-2.6.32.10/fs/fuse/control.c linux-2.6.32.10/fs/fuse/control.c
29353--- linux-2.6.32.9/fs/fuse/control.c 2010-02-23 10:38:51.000000000 -0500 29330--- linux-2.6.32.10/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400
29354+++ linux-2.6.32.9/fs/fuse/control.c 2010-03-11 20:25:00.189637482 -0500 29331+++ linux-2.6.32.10/fs/fuse/control.c 2010-03-20 15:58:47.130049516 -0400
29355@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co 29332@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
29356 29333
29357 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) 29334 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
@@ -29361,9 +29338,9 @@ diff -urNp linux-2.6.32.9/fs/fuse/control.c linux-2.6.32.9/fs/fuse/control.c
29361 struct fuse_conn *fc; 29338 struct fuse_conn *fc;
29362 int err; 29339 int err;
29363 29340
29364diff -urNp linux-2.6.32.9/fs/fuse/cuse.c linux-2.6.32.9/fs/fuse/cuse.c 29341diff -urNp linux-2.6.32.10/fs/fuse/cuse.c linux-2.6.32.10/fs/fuse/cuse.c
29365--- linux-2.6.32.9/fs/fuse/cuse.c 2010-02-23 10:38:51.000000000 -0500 29342--- linux-2.6.32.10/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400
29366+++ linux-2.6.32.9/fs/fuse/cuse.c 2010-03-11 20:25:00.189637482 -0500 29343+++ linux-2.6.32.10/fs/fuse/cuse.c 2010-03-20 15:58:47.130049516 -0400
29367@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i 29344@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
29368 return rc; 29345 return rc;
29369 } 29346 }
@@ -29398,9 +29375,9 @@ diff -urNp linux-2.6.32.9/fs/fuse/cuse.c linux-2.6.32.9/fs/fuse/cuse.c
29398 cuse_class = class_create(THIS_MODULE, "cuse"); 29375 cuse_class = class_create(THIS_MODULE, "cuse");
29399 if (IS_ERR(cuse_class)) 29376 if (IS_ERR(cuse_class))
29400 return PTR_ERR(cuse_class); 29377 return PTR_ERR(cuse_class);
29401diff -urNp linux-2.6.32.9/fs/fuse/dev.c linux-2.6.32.9/fs/fuse/dev.c 29378diff -urNp linux-2.6.32.10/fs/fuse/dev.c linux-2.6.32.10/fs/fuse/dev.c
29402--- linux-2.6.32.9/fs/fuse/dev.c 2010-02-23 10:38:51.000000000 -0500 29379--- linux-2.6.32.10/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400
29403+++ linux-2.6.32.9/fs/fuse/dev.c 2010-03-11 20:25:00.189637482 -0500 29380+++ linux-2.6.32.10/fs/fuse/dev.c 2010-03-20 15:58:47.130049516 -0400
29404@@ -745,7 +745,7 @@ __releases(&fc->lock) 29381@@ -745,7 +745,7 @@ __releases(&fc->lock)
29405 * request_end(). Otherwise add it to the processing list, and set 29382 * request_end(). Otherwise add it to the processing list, and set
29406 * the 'sent' flag. 29383 * the 'sent' flag.
@@ -29506,9 +29483,9 @@ diff -urNp linux-2.6.32.9/fs/fuse/dev.c linux-2.6.32.9/fs/fuse/dev.c
29506 29483
29507 const struct file_operations fuse_dev_operations = { 29484 const struct file_operations fuse_dev_operations = {
29508 .owner = THIS_MODULE, 29485 .owner = THIS_MODULE,
29509diff -urNp linux-2.6.32.9/fs/fuse/dir.c linux-2.6.32.9/fs/fuse/dir.c 29486diff -urNp linux-2.6.32.10/fs/fuse/dir.c linux-2.6.32.10/fs/fuse/dir.c
29510--- linux-2.6.32.9/fs/fuse/dir.c 2010-02-23 10:38:51.000000000 -0500 29487--- linux-2.6.32.10/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400
29511+++ linux-2.6.32.9/fs/fuse/dir.c 2010-03-11 20:25:00.189637482 -0500 29488+++ linux-2.6.32.10/fs/fuse/dir.c 2010-03-20 15:58:47.130049516 -0400
29512@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de 29489@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
29513 return link; 29490 return link;
29514 } 29491 }
@@ -29518,9 +29495,9 @@ diff -urNp linux-2.6.32.9/fs/fuse/dir.c linux-2.6.32.9/fs/fuse/dir.c
29518 { 29495 {
29519 if (!IS_ERR(link)) 29496 if (!IS_ERR(link))
29520 free_page((unsigned long) link); 29497 free_page((unsigned long) link);
29521diff -urNp linux-2.6.32.9/fs/fuse/fuse_i.h linux-2.6.32.9/fs/fuse/fuse_i.h 29498diff -urNp linux-2.6.32.10/fs/fuse/fuse_i.h linux-2.6.32.10/fs/fuse/fuse_i.h
29522--- linux-2.6.32.9/fs/fuse/fuse_i.h 2010-02-23 10:38:51.000000000 -0500 29499--- linux-2.6.32.10/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400
29523+++ linux-2.6.32.9/fs/fuse/fuse_i.h 2010-03-11 20:25:00.189637482 -0500 29500+++ linux-2.6.32.10/fs/fuse/fuse_i.h 2010-03-20 15:58:47.130049516 -0400
29524@@ -521,6 +521,16 @@ extern const struct file_operations fuse 29501@@ -521,6 +521,16 @@ extern const struct file_operations fuse
29525 29502
29526 extern const struct dentry_operations fuse_dentry_operations; 29503 extern const struct dentry_operations fuse_dentry_operations;
@@ -29538,9 +29515,9 @@ diff -urNp linux-2.6.32.9/fs/fuse/fuse_i.h linux-2.6.32.9/fs/fuse/fuse_i.h
29538 /** 29515 /**
29539 * Inode to nodeid comparison. 29516 * Inode to nodeid comparison.
29540 */ 29517 */
29541diff -urNp linux-2.6.32.9/fs/gfs2/sys.c linux-2.6.32.9/fs/gfs2/sys.c 29518diff -urNp linux-2.6.32.10/fs/gfs2/sys.c linux-2.6.32.10/fs/gfs2/sys.c
29542--- linux-2.6.32.9/fs/gfs2/sys.c 2010-02-23 10:38:51.000000000 -0500 29519--- linux-2.6.32.10/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400
29543+++ linux-2.6.32.9/fs/gfs2/sys.c 2010-03-11 20:25:00.189637482 -0500 29520+++ linux-2.6.32.10/fs/gfs2/sys.c 2010-03-20 15:58:47.130049516 -0400
29544@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko 29521@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
29545 return a->store ? a->store(sdp, buf, len) : len; 29522 return a->store ? a->store(sdp, buf, len) : len;
29546 } 29523 }
@@ -29559,9 +29536,9 @@ diff -urNp linux-2.6.32.9/fs/gfs2/sys.c linux-2.6.32.9/fs/gfs2/sys.c
29559 .uevent = gfs2_uevent, 29536 .uevent = gfs2_uevent,
29560 }; 29537 };
29561 29538
29562diff -urNp linux-2.6.32.9/fs/hfs/inode.c linux-2.6.32.9/fs/hfs/inode.c 29539diff -urNp linux-2.6.32.10/fs/hfs/inode.c linux-2.6.32.10/fs/hfs/inode.c
29563--- linux-2.6.32.9/fs/hfs/inode.c 2010-02-23 10:38:51.000000000 -0500 29540--- linux-2.6.32.10/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400
29564+++ linux-2.6.32.9/fs/hfs/inode.c 2010-03-11 20:25:00.189637482 -0500 29541+++ linux-2.6.32.10/fs/hfs/inode.c 2010-03-20 15:58:47.130049516 -0400
29565@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, 29542@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
29566 29543
29567 if (S_ISDIR(main_inode->i_mode)) { 29544 if (S_ISDIR(main_inode->i_mode)) {
@@ -29580,9 +29557,9 @@ diff -urNp linux-2.6.32.9/fs/hfs/inode.c linux-2.6.32.9/fs/hfs/inode.c
29580 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, 29557 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
29581 sizeof(struct hfs_cat_file)); 29558 sizeof(struct hfs_cat_file));
29582 if (rec.type != HFS_CDR_FIL || 29559 if (rec.type != HFS_CDR_FIL ||
29583diff -urNp linux-2.6.32.9/fs/hfsplus/inode.c linux-2.6.32.9/fs/hfsplus/inode.c 29560diff -urNp linux-2.6.32.10/fs/hfsplus/inode.c linux-2.6.32.10/fs/hfsplus/inode.c
29584--- linux-2.6.32.9/fs/hfsplus/inode.c 2010-02-23 10:38:51.000000000 -0500 29561--- linux-2.6.32.10/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400
29585+++ linux-2.6.32.9/fs/hfsplus/inode.c 2010-03-11 20:25:00.189637482 -0500 29562+++ linux-2.6.32.10/fs/hfsplus/inode.c 2010-03-20 15:58:47.130049516 -0400
29586@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode 29563@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
29587 struct hfsplus_cat_folder *folder = &entry.folder; 29564 struct hfsplus_cat_folder *folder = &entry.folder;
29588 29565
@@ -29619,9 +29596,9 @@ diff -urNp linux-2.6.32.9/fs/hfsplus/inode.c linux-2.6.32.9/fs/hfsplus/inode.c
29619 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, 29596 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
29620 sizeof(struct hfsplus_cat_file)); 29597 sizeof(struct hfsplus_cat_file));
29621 hfsplus_inode_write_fork(inode, &file->data_fork); 29598 hfsplus_inode_write_fork(inode, &file->data_fork);
29622diff -urNp linux-2.6.32.9/fs/ioctl.c linux-2.6.32.9/fs/ioctl.c 29599diff -urNp linux-2.6.32.10/fs/ioctl.c linux-2.6.32.10/fs/ioctl.c
29623--- linux-2.6.32.9/fs/ioctl.c 2010-02-23 10:38:51.000000000 -0500 29600--- linux-2.6.32.10/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400
29624+++ linux-2.6.32.9/fs/ioctl.c 2010-03-11 20:25:00.189637482 -0500 29601+++ linux-2.6.32.10/fs/ioctl.c 2010-03-20 15:58:47.130049516 -0400
29625@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema 29602@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
29626 u64 phys, u64 len, u32 flags) 29603 u64 phys, u64 len, u32 flags)
29627 { 29604 {
@@ -29649,9 +29626,9 @@ diff -urNp linux-2.6.32.9/fs/ioctl.c linux-2.6.32.9/fs/ioctl.c
29649 error = -EFAULT; 29626 error = -EFAULT;
29650 29627
29651 return error; 29628 return error;
29652diff -urNp linux-2.6.32.9/fs/jffs2/debug.h linux-2.6.32.9/fs/jffs2/debug.h 29629diff -urNp linux-2.6.32.10/fs/jffs2/debug.h linux-2.6.32.10/fs/jffs2/debug.h
29653--- linux-2.6.32.9/fs/jffs2/debug.h 2010-02-23 10:38:51.000000000 -0500 29630--- linux-2.6.32.10/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400
29654+++ linux-2.6.32.9/fs/jffs2/debug.h 2010-03-11 20:25:00.189637482 -0500 29631+++ linux-2.6.32.10/fs/jffs2/debug.h 2010-03-20 15:58:47.130049516 -0400
29655@@ -52,13 +52,13 @@ 29632@@ -52,13 +52,13 @@
29656 #if CONFIG_JFFS2_FS_DEBUG > 0 29633 #if CONFIG_JFFS2_FS_DEBUG > 0
29657 #define D1(x) x 29634 #define D1(x) x
@@ -29753,9 +29730,9 @@ diff -urNp linux-2.6.32.9/fs/jffs2/debug.h linux-2.6.32.9/fs/jffs2/debug.h
29753 #endif 29730 #endif
29754 29731
29755 /* "Sanity" checks */ 29732 /* "Sanity" checks */
29756diff -urNp linux-2.6.32.9/fs/jffs2/erase.c linux-2.6.32.9/fs/jffs2/erase.c 29733diff -urNp linux-2.6.32.10/fs/jffs2/erase.c linux-2.6.32.10/fs/jffs2/erase.c
29757--- linux-2.6.32.9/fs/jffs2/erase.c 2010-02-23 10:38:51.000000000 -0500 29734--- linux-2.6.32.10/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400
29758+++ linux-2.6.32.9/fs/jffs2/erase.c 2010-03-11 20:25:00.189637482 -0500 29735+++ linux-2.6.32.10/fs/jffs2/erase.c 2010-03-20 15:58:47.130049516 -0400
29759@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru 29736@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
29760 struct jffs2_unknown_node marker = { 29737 struct jffs2_unknown_node marker = {
29761 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), 29738 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -29766,9 +29743,9 @@ diff -urNp linux-2.6.32.9/fs/jffs2/erase.c linux-2.6.32.9/fs/jffs2/erase.c
29766 }; 29743 };
29767 29744
29768 jffs2_prealloc_raw_node_refs(c, jeb, 1); 29745 jffs2_prealloc_raw_node_refs(c, jeb, 1);
29769diff -urNp linux-2.6.32.9/fs/jffs2/summary.h linux-2.6.32.9/fs/jffs2/summary.h 29746diff -urNp linux-2.6.32.10/fs/jffs2/summary.h linux-2.6.32.10/fs/jffs2/summary.h
29770--- linux-2.6.32.9/fs/jffs2/summary.h 2010-02-23 10:38:51.000000000 -0500 29747--- linux-2.6.32.10/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400
29771+++ linux-2.6.32.9/fs/jffs2/summary.h 2010-03-11 20:25:00.189637482 -0500 29748+++ linux-2.6.32.10/fs/jffs2/summary.h 2010-03-20 15:58:47.130049516 -0400
29772@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ 29749@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
29773 29750
29774 #define jffs2_sum_active() (0) 29751 #define jffs2_sum_active() (0)
@@ -29797,9 +29774,9 @@ diff -urNp linux-2.6.32.9/fs/jffs2/summary.h linux-2.6.32.9/fs/jffs2/summary.h
29797 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) 29774 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
29798 29775
29799 #endif /* CONFIG_JFFS2_SUMMARY */ 29776 #endif /* CONFIG_JFFS2_SUMMARY */
29800diff -urNp linux-2.6.32.9/fs/jffs2/wbuf.c linux-2.6.32.9/fs/jffs2/wbuf.c 29777diff -urNp linux-2.6.32.10/fs/jffs2/wbuf.c linux-2.6.32.10/fs/jffs2/wbuf.c
29801--- linux-2.6.32.9/fs/jffs2/wbuf.c 2010-02-23 10:38:51.000000000 -0500 29778--- linux-2.6.32.10/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400
29802+++ linux-2.6.32.9/fs/jffs2/wbuf.c 2010-03-11 20:25:00.189637482 -0500 29779+++ linux-2.6.32.10/fs/jffs2/wbuf.c 2010-03-20 15:58:47.130049516 -0400
29803@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o 29780@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
29804 { 29781 {
29805 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), 29782 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -29810,9 +29787,9 @@ diff -urNp linux-2.6.32.9/fs/jffs2/wbuf.c linux-2.6.32.9/fs/jffs2/wbuf.c
29810 }; 29787 };
29811 29788
29812 /* 29789 /*
29813diff -urNp linux-2.6.32.9/fs/lockd/svc.c linux-2.6.32.9/fs/lockd/svc.c 29790diff -urNp linux-2.6.32.10/fs/lockd/svc.c linux-2.6.32.10/fs/lockd/svc.c
29814--- linux-2.6.32.9/fs/lockd/svc.c 2010-02-23 10:38:51.000000000 -0500 29791--- linux-2.6.32.10/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400
29815+++ linux-2.6.32.9/fs/lockd/svc.c 2010-03-11 20:25:00.189637482 -0500 29792+++ linux-2.6.32.10/fs/lockd/svc.c 2010-03-20 15:58:47.130049516 -0400
29816@@ -43,7 +43,7 @@ 29793@@ -43,7 +43,7 @@
29817 29794
29818 static struct svc_program nlmsvc_program; 29795 static struct svc_program nlmsvc_program;
@@ -29822,9 +29799,9 @@ diff -urNp linux-2.6.32.9/fs/lockd/svc.c linux-2.6.32.9/fs/lockd/svc.c
29822 EXPORT_SYMBOL_GPL(nlmsvc_ops); 29799 EXPORT_SYMBOL_GPL(nlmsvc_ops);
29823 29800
29824 static DEFINE_MUTEX(nlmsvc_mutex); 29801 static DEFINE_MUTEX(nlmsvc_mutex);
29825diff -urNp linux-2.6.32.9/fs/locks.c linux-2.6.32.9/fs/locks.c 29802diff -urNp linux-2.6.32.10/fs/locks.c linux-2.6.32.10/fs/locks.c
29826--- linux-2.6.32.9/fs/locks.c 2010-02-23 10:38:51.000000000 -0500 29803--- linux-2.6.32.10/fs/locks.c 2010-03-15 11:52:04.000000000 -0400
29827+++ linux-2.6.32.9/fs/locks.c 2010-03-11 20:25:00.189637482 -0500 29804+++ linux-2.6.32.10/fs/locks.c 2010-03-20 15:58:47.130049516 -0400
29828@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil 29805@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
29829 return; 29806 return;
29830 29807
@@ -29846,9 +29823,9 @@ diff -urNp linux-2.6.32.9/fs/locks.c linux-2.6.32.9/fs/locks.c
29846 } 29823 }
29847 29824
29848 lock_kernel(); 29825 lock_kernel();
29849diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c 29826diff -urNp linux-2.6.32.10/fs/namei.c linux-2.6.32.10/fs/namei.c
29850--- linux-2.6.32.9/fs/namei.c 2010-02-23 10:38:51.000000000 -0500 29827--- linux-2.6.32.10/fs/namei.c 2010-03-15 11:52:04.000000000 -0400
29851+++ linux-2.6.32.9/fs/namei.c 2010-03-11 20:25:00.193640519 -0500 29828+++ linux-2.6.32.10/fs/namei.c 2010-03-20 15:58:47.134048580 -0400
29852@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l 29829@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l
29853 cookie = dentry->d_inode->i_op->follow_link(dentry, nd); 29830 cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
29854 error = PTR_ERR(cookie); 29831 error = PTR_ERR(cookie);
@@ -29872,7 +29849,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
29872 current->link_count++; 29849 current->link_count++;
29873 current->total_link_count++; 29850 current->total_link_count++;
29874 nd->depth++; 29851 nd->depth++;
29875@@ -1006,11 +1013,18 @@ return_reval: 29852@@ -1016,11 +1023,18 @@ return_reval:
29876 break; 29853 break;
29877 } 29854 }
29878 return_base: 29855 return_base:
@@ -29891,7 +29868,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
29891 path_put(&nd->path); 29868 path_put(&nd->path);
29892 return_err: 29869 return_err:
29893 return err; 29870 return err;
29894@@ -1611,12 +1625,19 @@ static int __open_namei_create(struct na 29871@@ -1621,12 +1635,19 @@ static int __open_namei_create(struct na
29895 int error; 29872 int error;
29896 struct dentry *dir = nd->path.dentry; 29873 struct dentry *dir = nd->path.dentry;
29897 29874
@@ -29911,7 +29888,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
29911 out_unlock: 29888 out_unlock:
29912 mutex_unlock(&dir->d_inode->i_mutex); 29889 mutex_unlock(&dir->d_inode->i_mutex);
29913 dput(nd->path.dentry); 29890 dput(nd->path.dentry);
29914@@ -1699,6 +1720,22 @@ struct file *do_filp_open(int dfd, const 29891@@ -1709,6 +1730,22 @@ struct file *do_filp_open(int dfd, const
29915 &nd, flag); 29892 &nd, flag);
29916 if (error) 29893 if (error)
29917 return ERR_PTR(error); 29894 return ERR_PTR(error);
@@ -29934,7 +29911,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
29934 goto ok; 29911 goto ok;
29935 } 29912 }
29936 29913
29937@@ -1785,6 +1822,24 @@ do_last: 29914@@ -1795,6 +1832,24 @@ do_last:
29938 /* 29915 /*
29939 * It already exists. 29916 * It already exists.
29940 */ 29917 */
@@ -29959,7 +29936,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
29959 mutex_unlock(&dir->d_inode->i_mutex); 29936 mutex_unlock(&dir->d_inode->i_mutex);
29960 audit_inode(pathname, path.dentry); 29937 audit_inode(pathname, path.dentry);
29961 29938
29962@@ -1877,6 +1932,13 @@ do_link: 29939@@ -1887,6 +1942,13 @@ do_link:
29963 error = security_inode_follow_link(path.dentry, &nd); 29940 error = security_inode_follow_link(path.dentry, &nd);
29964 if (error) 29941 if (error)
29965 goto exit_dput; 29942 goto exit_dput;
@@ -29973,7 +29950,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
29973 error = __do_follow_link(&path, &nd); 29950 error = __do_follow_link(&path, &nd);
29974 if (error) { 29951 if (error) {
29975 /* Does someone understand code flow here? Or it is only 29952 /* Does someone understand code flow here? Or it is only
29976@@ -2051,6 +2113,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const 29953@@ -2061,6 +2123,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
29977 error = may_mknod(mode); 29954 error = may_mknod(mode);
29978 if (error) 29955 if (error)
29979 goto out_dput; 29956 goto out_dput;
@@ -29991,7 +29968,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
29991 error = mnt_want_write(nd.path.mnt); 29968 error = mnt_want_write(nd.path.mnt);
29992 if (error) 29969 if (error)
29993 goto out_dput; 29970 goto out_dput;
29994@@ -2071,6 +2144,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const 29971@@ -2081,6 +2154,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
29995 } 29972 }
29996 out_drop_write: 29973 out_drop_write:
29997 mnt_drop_write(nd.path.mnt); 29974 mnt_drop_write(nd.path.mnt);
@@ -30001,7 +29978,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
30001 out_dput: 29978 out_dput:
30002 dput(dentry); 29979 dput(dentry);
30003 out_unlock: 29980 out_unlock:
30004@@ -2124,6 +2200,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const 29981@@ -2134,6 +2210,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
30005 if (IS_ERR(dentry)) 29982 if (IS_ERR(dentry))
30006 goto out_unlock; 29983 goto out_unlock;
30007 29984
@@ -30013,7 +29990,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
30013 if (!IS_POSIXACL(nd.path.dentry->d_inode)) 29990 if (!IS_POSIXACL(nd.path.dentry->d_inode))
30014 mode &= ~current_umask(); 29991 mode &= ~current_umask();
30015 error = mnt_want_write(nd.path.mnt); 29992 error = mnt_want_write(nd.path.mnt);
30016@@ -2135,6 +2216,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const 29993@@ -2145,6 +2226,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
30017 error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode); 29994 error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode);
30018 out_drop_write: 29995 out_drop_write:
30019 mnt_drop_write(nd.path.mnt); 29996 mnt_drop_write(nd.path.mnt);
@@ -30024,7 +30001,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
30024 out_dput: 30001 out_dput:
30025 dput(dentry); 30002 dput(dentry);
30026 out_unlock: 30003 out_unlock:
30027@@ -2216,6 +2301,8 @@ static long do_rmdir(int dfd, const char 30004@@ -2226,6 +2311,8 @@ static long do_rmdir(int dfd, const char
30028 char * name; 30005 char * name;
30029 struct dentry *dentry; 30006 struct dentry *dentry;
30030 struct nameidata nd; 30007 struct nameidata nd;
@@ -30033,7 +30010,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
30033 30010
30034 error = user_path_parent(dfd, pathname, &nd, &name); 30011 error = user_path_parent(dfd, pathname, &nd, &name);
30035 if (error) 30012 if (error)
30036@@ -2240,6 +2327,19 @@ static long do_rmdir(int dfd, const char 30013@@ -2250,6 +2337,19 @@ static long do_rmdir(int dfd, const char
30037 error = PTR_ERR(dentry); 30014 error = PTR_ERR(dentry);
30038 if (IS_ERR(dentry)) 30015 if (IS_ERR(dentry))
30039 goto exit2; 30016 goto exit2;
@@ -30053,7 +30030,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
30053 error = mnt_want_write(nd.path.mnt); 30030 error = mnt_want_write(nd.path.mnt);
30054 if (error) 30031 if (error)
30055 goto exit3; 30032 goto exit3;
30056@@ -2247,6 +2347,8 @@ static long do_rmdir(int dfd, const char 30033@@ -2257,6 +2357,8 @@ static long do_rmdir(int dfd, const char
30057 if (error) 30034 if (error)
30058 goto exit4; 30035 goto exit4;
30059 error = vfs_rmdir(nd.path.dentry->d_inode, dentry); 30036 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
@@ -30062,7 +30039,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
30062 exit4: 30039 exit4:
30063 mnt_drop_write(nd.path.mnt); 30040 mnt_drop_write(nd.path.mnt);
30064 exit3: 30041 exit3:
30065@@ -2308,6 +2410,8 @@ static long do_unlinkat(int dfd, const c 30042@@ -2318,6 +2420,8 @@ static long do_unlinkat(int dfd, const c
30066 struct dentry *dentry; 30043 struct dentry *dentry;
30067 struct nameidata nd; 30044 struct nameidata nd;
30068 struct inode *inode = NULL; 30045 struct inode *inode = NULL;
@@ -30071,7 +30048,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
30071 30048
30072 error = user_path_parent(dfd, pathname, &nd, &name); 30049 error = user_path_parent(dfd, pathname, &nd, &name);
30073 if (error) 30050 if (error)
30074@@ -2327,8 +2431,19 @@ static long do_unlinkat(int dfd, const c 30051@@ -2337,8 +2441,19 @@ static long do_unlinkat(int dfd, const c
30075 if (nd.last.name[nd.last.len]) 30052 if (nd.last.name[nd.last.len])
30076 goto slashes; 30053 goto slashes;
30077 inode = dentry->d_inode; 30054 inode = dentry->d_inode;
@@ -30092,7 +30069,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
30092 error = mnt_want_write(nd.path.mnt); 30069 error = mnt_want_write(nd.path.mnt);
30093 if (error) 30070 if (error)
30094 goto exit2; 30071 goto exit2;
30095@@ -2336,6 +2451,8 @@ static long do_unlinkat(int dfd, const c 30072@@ -2346,6 +2461,8 @@ static long do_unlinkat(int dfd, const c
30096 if (error) 30073 if (error)
30097 goto exit3; 30074 goto exit3;
30098 error = vfs_unlink(nd.path.dentry->d_inode, dentry); 30075 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
@@ -30101,7 +30078,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
30101 exit3: 30078 exit3:
30102 mnt_drop_write(nd.path.mnt); 30079 mnt_drop_write(nd.path.mnt);
30103 exit2: 30080 exit2:
30104@@ -2414,6 +2531,11 @@ SYSCALL_DEFINE3(symlinkat, const char __ 30081@@ -2424,6 +2541,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
30105 if (IS_ERR(dentry)) 30082 if (IS_ERR(dentry))
30106 goto out_unlock; 30083 goto out_unlock;
30107 30084
@@ -30113,7 +30090,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
30113 error = mnt_want_write(nd.path.mnt); 30090 error = mnt_want_write(nd.path.mnt);
30114 if (error) 30091 if (error)
30115 goto out_dput; 30092 goto out_dput;
30116@@ -2421,6 +2543,8 @@ SYSCALL_DEFINE3(symlinkat, const char __ 30093@@ -2431,6 +2553,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
30117 if (error) 30094 if (error)
30118 goto out_drop_write; 30095 goto out_drop_write;
30119 error = vfs_symlink(nd.path.dentry->d_inode, dentry, from); 30096 error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
@@ -30122,7 +30099,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
30122 out_drop_write: 30099 out_drop_write:
30123 mnt_drop_write(nd.path.mnt); 30100 mnt_drop_write(nd.path.mnt);
30124 out_dput: 30101 out_dput:
30125@@ -2514,6 +2638,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con 30102@@ -2524,6 +2648,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
30126 error = PTR_ERR(new_dentry); 30103 error = PTR_ERR(new_dentry);
30127 if (IS_ERR(new_dentry)) 30104 if (IS_ERR(new_dentry))
30128 goto out_unlock; 30105 goto out_unlock;
@@ -30143,7 +30120,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
30143 error = mnt_want_write(nd.path.mnt); 30120 error = mnt_want_write(nd.path.mnt);
30144 if (error) 30121 if (error)
30145 goto out_dput; 30122 goto out_dput;
30146@@ -2521,6 +2659,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con 30123@@ -2531,6 +2669,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
30147 if (error) 30124 if (error)
30148 goto out_drop_write; 30125 goto out_drop_write;
30149 error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry); 30126 error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry);
@@ -30152,7 +30129,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
30152 out_drop_write: 30129 out_drop_write:
30153 mnt_drop_write(nd.path.mnt); 30130 mnt_drop_write(nd.path.mnt);
30154 out_dput: 30131 out_dput:
30155@@ -2754,6 +2894,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c 30132@@ -2764,6 +2904,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
30156 if (new_dentry == trap) 30133 if (new_dentry == trap)
30157 goto exit5; 30134 goto exit5;
30158 30135
@@ -30165,7 +30142,7 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
30165 error = mnt_want_write(oldnd.path.mnt); 30142 error = mnt_want_write(oldnd.path.mnt);
30166 if (error) 30143 if (error)
30167 goto exit5; 30144 goto exit5;
30168@@ -2763,6 +2909,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c 30145@@ -2773,6 +2919,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
30169 goto exit6; 30146 goto exit6;
30170 error = vfs_rename(old_dir->d_inode, old_dentry, 30147 error = vfs_rename(old_dir->d_inode, old_dentry,
30171 new_dir->d_inode, new_dentry); 30148 new_dir->d_inode, new_dentry);
@@ -30175,9 +30152,9 @@ diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
30175 exit6: 30152 exit6:
30176 mnt_drop_write(oldnd.path.mnt); 30153 mnt_drop_write(oldnd.path.mnt);
30177 exit5: 30154 exit5:
30178diff -urNp linux-2.6.32.9/fs/namespace.c linux-2.6.32.9/fs/namespace.c 30155diff -urNp linux-2.6.32.10/fs/namespace.c linux-2.6.32.10/fs/namespace.c
30179--- linux-2.6.32.9/fs/namespace.c 2010-02-23 10:38:51.000000000 -0500 30156--- linux-2.6.32.10/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400
30180+++ linux-2.6.32.9/fs/namespace.c 2010-03-11 20:25:00.193640519 -0500 30157+++ linux-2.6.32.10/fs/namespace.c 2010-03-20 15:58:47.134048580 -0400
30181@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn 30158@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
30182 if (!(sb->s_flags & MS_RDONLY)) 30159 if (!(sb->s_flags & MS_RDONLY))
30183 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); 30160 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -30238,9 +30215,9 @@ diff -urNp linux-2.6.32.9/fs/namespace.c linux-2.6.32.9/fs/namespace.c
30238 read_lock(&current->fs->lock); 30215 read_lock(&current->fs->lock);
30239 root = current->fs->root; 30216 root = current->fs->root;
30240 path_get(&current->fs->root); 30217 path_get(&current->fs->root);
30241diff -urNp linux-2.6.32.9/fs/nfs/inode.c linux-2.6.32.9/fs/nfs/inode.c 30218diff -urNp linux-2.6.32.10/fs/nfs/inode.c linux-2.6.32.10/fs/nfs/inode.c
30242--- linux-2.6.32.9/fs/nfs/inode.c 2010-02-23 10:38:51.000000000 -0500 30219--- linux-2.6.32.10/fs/nfs/inode.c 2010-03-15 11:52:04.000000000 -0400
30243+++ linux-2.6.32.9/fs/nfs/inode.c 2010-03-11 20:25:00.193640519 -0500 30220+++ linux-2.6.32.10/fs/nfs/inode.c 2010-03-20 15:58:47.134048580 -0400
30244@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st 30221@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
30245 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); 30222 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
30246 } 30223 }
@@ -30261,9 +30238,9 @@ diff -urNp linux-2.6.32.9/fs/nfs/inode.c linux-2.6.32.9/fs/nfs/inode.c
30261 } 30238 }
30262 30239
30263 void nfs_fattr_init(struct nfs_fattr *fattr) 30240 void nfs_fattr_init(struct nfs_fattr *fattr)
30264diff -urNp linux-2.6.32.9/fs/nfs/nfs4proc.c linux-2.6.32.9/fs/nfs/nfs4proc.c 30241diff -urNp linux-2.6.32.10/fs/nfs/nfs4proc.c linux-2.6.32.10/fs/nfs/nfs4proc.c
30265--- linux-2.6.32.9/fs/nfs/nfs4proc.c 2010-02-23 10:38:51.000000000 -0500 30242--- linux-2.6.32.10/fs/nfs/nfs4proc.c 2010-03-15 11:52:04.000000000 -0400
30266+++ linux-2.6.32.9/fs/nfs/nfs4proc.c 2010-03-11 20:25:00.193640519 -0500 30243+++ linux-2.6.32.10/fs/nfs/nfs4proc.c 2010-03-20 15:58:47.134048580 -0400
30267@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct 30244@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct
30268 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) 30245 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
30269 { 30246 {
@@ -30534,9 +30511,9 @@ diff -urNp linux-2.6.32.9/fs/nfs/nfs4proc.c linux-2.6.32.9/fs/nfs/nfs4proc.c
30534 int err; 30511 int err;
30535 30512
30536 err = nfs4_set_lock_state(state, fl); 30513 err = nfs4_set_lock_state(state, fl);
30537diff -urNp linux-2.6.32.9/fs/nfsd/lockd.c linux-2.6.32.9/fs/nfsd/lockd.c 30514diff -urNp linux-2.6.32.10/fs/nfsd/lockd.c linux-2.6.32.10/fs/nfsd/lockd.c
30538--- linux-2.6.32.9/fs/nfsd/lockd.c 2010-02-23 10:38:51.000000000 -0500 30515--- linux-2.6.32.10/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400
30539+++ linux-2.6.32.9/fs/nfsd/lockd.c 2010-03-11 20:25:00.193640519 -0500 30516+++ linux-2.6.32.10/fs/nfsd/lockd.c 2010-03-20 15:58:47.134048580 -0400
30540@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) 30517@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
30541 fput(filp); 30518 fput(filp);
30542 } 30519 }
@@ -30546,9 +30523,9 @@ diff -urNp linux-2.6.32.9/fs/nfsd/lockd.c linux-2.6.32.9/fs/nfsd/lockd.c
30546 .fopen = nlm_fopen, /* open file for locking */ 30523 .fopen = nlm_fopen, /* open file for locking */
30547 .fclose = nlm_fclose, /* close file */ 30524 .fclose = nlm_fclose, /* close file */
30548 }; 30525 };
30549diff -urNp linux-2.6.32.9/fs/nfsd/vfs.c linux-2.6.32.9/fs/nfsd/vfs.c 30526diff -urNp linux-2.6.32.10/fs/nfsd/vfs.c linux-2.6.32.10/fs/nfsd/vfs.c
30550--- linux-2.6.32.9/fs/nfsd/vfs.c 2010-02-23 10:38:51.000000000 -0500 30527--- linux-2.6.32.10/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400
30551+++ linux-2.6.32.9/fs/nfsd/vfs.c 2010-03-11 20:25:00.193640519 -0500 30528+++ linux-2.6.32.10/fs/nfsd/vfs.c 2010-03-20 15:58:47.134048580 -0400
30552@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st 30529@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
30553 } else { 30530 } else {
30554 oldfs = get_fs(); 30531 oldfs = get_fs();
@@ -30576,9 +30553,9 @@ diff -urNp linux-2.6.32.9/fs/nfsd/vfs.c linux-2.6.32.9/fs/nfsd/vfs.c
30576 set_fs(oldfs); 30553 set_fs(oldfs);
30577 30554
30578 if (host_err < 0) 30555 if (host_err < 0)
30579diff -urNp linux-2.6.32.9/fs/nls/nls_base.c linux-2.6.32.9/fs/nls/nls_base.c 30556diff -urNp linux-2.6.32.10/fs/nls/nls_base.c linux-2.6.32.10/fs/nls/nls_base.c
30580--- linux-2.6.32.9/fs/nls/nls_base.c 2010-02-23 10:38:51.000000000 -0500 30557--- linux-2.6.32.10/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400
30581+++ linux-2.6.32.9/fs/nls/nls_base.c 2010-03-11 20:25:00.193640519 -0500 30558+++ linux-2.6.32.10/fs/nls/nls_base.c 2010-03-20 15:58:47.134048580 -0400
30582@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl 30559@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
30583 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, 30560 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
30584 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, 30561 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
@@ -30588,9 +30565,9 @@ diff -urNp linux-2.6.32.9/fs/nls/nls_base.c linux-2.6.32.9/fs/nls/nls_base.c
30588 }; 30565 };
30589 30566
30590 #define UNICODE_MAX 0x0010ffff 30567 #define UNICODE_MAX 0x0010ffff
30591diff -urNp linux-2.6.32.9/fs/ntfs/file.c linux-2.6.32.9/fs/ntfs/file.c 30568diff -urNp linux-2.6.32.10/fs/ntfs/file.c linux-2.6.32.10/fs/ntfs/file.c
30592--- linux-2.6.32.9/fs/ntfs/file.c 2010-02-23 10:38:51.000000000 -0500 30569--- linux-2.6.32.10/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400
30593+++ linux-2.6.32.9/fs/ntfs/file.c 2010-03-11 20:25:00.193640519 -0500 30570+++ linux-2.6.32.10/fs/ntfs/file.c 2010-03-20 15:58:47.134048580 -0400
30594@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ 30571@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
30595 #endif /* NTFS_RW */ 30572 #endif /* NTFS_RW */
30596 }; 30573 };
@@ -30600,9 +30577,9 @@ diff -urNp linux-2.6.32.9/fs/ntfs/file.c linux-2.6.32.9/fs/ntfs/file.c
30600 30577
30601-const struct inode_operations ntfs_empty_inode_ops = {}; 30578-const struct inode_operations ntfs_empty_inode_ops = {};
30602+const struct inode_operations ntfs_empty_inode_ops __read_only; 30579+const struct inode_operations ntfs_empty_inode_ops __read_only;
30603diff -urNp linux-2.6.32.9/fs/ocfs2/cluster/masklog.c linux-2.6.32.9/fs/ocfs2/cluster/masklog.c 30580diff -urNp linux-2.6.32.10/fs/ocfs2/cluster/masklog.c linux-2.6.32.10/fs/ocfs2/cluster/masklog.c
30604--- linux-2.6.32.9/fs/ocfs2/cluster/masklog.c 2010-02-23 10:38:51.000000000 -0500 30581--- linux-2.6.32.10/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400
30605+++ linux-2.6.32.9/fs/ocfs2/cluster/masklog.c 2010-03-11 20:25:00.193640519 -0500 30582+++ linux-2.6.32.10/fs/ocfs2/cluster/masklog.c 2010-03-20 15:58:47.134048580 -0400
30606@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject 30583@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
30607 return mlog_mask_store(mlog_attr->mask, buf, count); 30584 return mlog_mask_store(mlog_attr->mask, buf, count);
30608 } 30585 }
@@ -30612,9 +30589,9 @@ diff -urNp linux-2.6.32.9/fs/ocfs2/cluster/masklog.c linux-2.6.32.9/fs/ocfs2/clu
30612 .show = mlog_show, 30589 .show = mlog_show,
30613 .store = mlog_store, 30590 .store = mlog_store,
30614 }; 30591 };
30615diff -urNp linux-2.6.32.9/fs/ocfs2/localalloc.c linux-2.6.32.9/fs/ocfs2/localalloc.c 30592diff -urNp linux-2.6.32.10/fs/ocfs2/localalloc.c linux-2.6.32.10/fs/ocfs2/localalloc.c
30616--- linux-2.6.32.9/fs/ocfs2/localalloc.c 2010-02-23 10:38:51.000000000 -0500 30593--- linux-2.6.32.10/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400
30617+++ linux-2.6.32.9/fs/ocfs2/localalloc.c 2010-03-11 20:25:00.193640519 -0500 30594+++ linux-2.6.32.10/fs/ocfs2/localalloc.c 2010-03-20 15:58:47.134048580 -0400
30618@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo 30595@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
30619 goto bail; 30596 goto bail;
30620 } 30597 }
@@ -30624,9 +30601,9 @@ diff -urNp linux-2.6.32.9/fs/ocfs2/localalloc.c linux-2.6.32.9/fs/ocfs2/localall
30624 30601
30625 status = 0; 30602 status = 0;
30626 bail: 30603 bail:
30627diff -urNp linux-2.6.32.9/fs/ocfs2/ocfs2.h linux-2.6.32.9/fs/ocfs2/ocfs2.h 30604diff -urNp linux-2.6.32.10/fs/ocfs2/ocfs2.h linux-2.6.32.10/fs/ocfs2/ocfs2.h
30628--- linux-2.6.32.9/fs/ocfs2/ocfs2.h 2010-02-23 10:38:51.000000000 -0500 30605--- linux-2.6.32.10/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400
30629+++ linux-2.6.32.9/fs/ocfs2/ocfs2.h 2010-03-11 20:25:00.197533934 -0500 30606+++ linux-2.6.32.10/fs/ocfs2/ocfs2.h 2010-03-20 15:58:47.134048580 -0400
30630@@ -217,11 +217,11 @@ enum ocfs2_vol_state 30607@@ -217,11 +217,11 @@ enum ocfs2_vol_state
30631 30608
30632 struct ocfs2_alloc_stats 30609 struct ocfs2_alloc_stats
@@ -30644,9 +30621,9 @@ diff -urNp linux-2.6.32.9/fs/ocfs2/ocfs2.h linux-2.6.32.9/fs/ocfs2/ocfs2.h
30644 }; 30621 };
30645 30622
30646 enum ocfs2_local_alloc_state 30623 enum ocfs2_local_alloc_state
30647diff -urNp linux-2.6.32.9/fs/ocfs2/suballoc.c linux-2.6.32.9/fs/ocfs2/suballoc.c 30624diff -urNp linux-2.6.32.10/fs/ocfs2/suballoc.c linux-2.6.32.10/fs/ocfs2/suballoc.c
30648--- linux-2.6.32.9/fs/ocfs2/suballoc.c 2010-02-23 10:38:51.000000000 -0500 30625--- linux-2.6.32.10/fs/ocfs2/suballoc.c 2010-03-15 11:52:04.000000000 -0400
30649+++ linux-2.6.32.9/fs/ocfs2/suballoc.c 2010-03-11 20:25:00.197533934 -0500 30626+++ linux-2.6.32.10/fs/ocfs2/suballoc.c 2010-03-20 15:58:47.138051759 -0400
30650@@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s 30627@@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s
30651 mlog_errno(status); 30628 mlog_errno(status);
30652 goto bail; 30629 goto bail;
@@ -30692,9 +30669,9 @@ diff -urNp linux-2.6.32.9/fs/ocfs2/suballoc.c linux-2.6.32.9/fs/ocfs2/suballoc.c
30692 } 30669 }
30693 } 30670 }
30694 if (status < 0) { 30671 if (status < 0) {
30695diff -urNp linux-2.6.32.9/fs/ocfs2/super.c linux-2.6.32.9/fs/ocfs2/super.c 30672diff -urNp linux-2.6.32.10/fs/ocfs2/super.c linux-2.6.32.10/fs/ocfs2/super.c
30696--- linux-2.6.32.9/fs/ocfs2/super.c 2010-02-23 10:38:51.000000000 -0500 30673--- linux-2.6.32.10/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400
30697+++ linux-2.6.32.9/fs/ocfs2/super.c 2010-03-11 20:25:00.197533934 -0500 30674+++ linux-2.6.32.10/fs/ocfs2/super.c 2010-03-20 15:58:47.138051759 -0400
30698@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s 30675@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
30699 "%10s => GlobalAllocs: %d LocalAllocs: %d " 30676 "%10s => GlobalAllocs: %d LocalAllocs: %d "
30700 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", 30677 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
@@ -30729,9 +30706,9 @@ diff -urNp linux-2.6.32.9/fs/ocfs2/super.c linux-2.6.32.9/fs/ocfs2/super.c
30729 30706
30730 /* Copy the blockcheck stats from the superblock probe */ 30707 /* Copy the blockcheck stats from the superblock probe */
30731 osb->osb_ecc_stats = *stats; 30708 osb->osb_ecc_stats = *stats;
30732diff -urNp linux-2.6.32.9/fs/open.c linux-2.6.32.9/fs/open.c 30709diff -urNp linux-2.6.32.10/fs/open.c linux-2.6.32.10/fs/open.c
30733--- linux-2.6.32.9/fs/open.c 2010-02-23 10:38:51.000000000 -0500 30710--- linux-2.6.32.10/fs/open.c 2010-03-15 11:52:04.000000000 -0400
30734+++ linux-2.6.32.9/fs/open.c 2010-03-11 20:25:00.197533934 -0500 30711+++ linux-2.6.32.10/fs/open.c 2010-03-20 15:58:47.138051759 -0400
30735@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l 30712@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l
30736 if (length < 0) 30713 if (length < 0)
30737 return -EINVAL; 30714 return -EINVAL;
@@ -30905,9 +30882,9 @@ diff -urNp linux-2.6.32.9/fs/open.c linux-2.6.32.9/fs/open.c
30905 mnt_drop_write(file->f_path.mnt); 30882 mnt_drop_write(file->f_path.mnt);
30906 out_fput: 30883 out_fput:
30907 fput(file); 30884 fput(file);
30908diff -urNp linux-2.6.32.9/fs/pipe.c linux-2.6.32.9/fs/pipe.c 30885diff -urNp linux-2.6.32.10/fs/pipe.c linux-2.6.32.10/fs/pipe.c
30909--- linux-2.6.32.9/fs/pipe.c 2010-02-23 10:38:51.000000000 -0500 30886--- linux-2.6.32.10/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400
30910+++ linux-2.6.32.9/fs/pipe.c 2010-03-11 20:25:00.197533934 -0500 30887+++ linux-2.6.32.10/fs/pipe.c 2010-03-20 15:58:47.138051759 -0400
30911@@ -401,9 +401,9 @@ redo: 30888@@ -401,9 +401,9 @@ redo:
30912 } 30889 }
30913 if (bufs) /* More to do? */ 30890 if (bufs) /* More to do? */
@@ -31031,9 +31008,9 @@ diff -urNp linux-2.6.32.9/fs/pipe.c linux-2.6.32.9/fs/pipe.c
31031 inode->i_fop = &rdwr_pipefifo_fops; 31008 inode->i_fop = &rdwr_pipefifo_fops;
31032 31009
31033 /* 31010 /*
31034diff -urNp linux-2.6.32.9/fs/proc/array.c linux-2.6.32.9/fs/proc/array.c 31011diff -urNp linux-2.6.32.10/fs/proc/array.c linux-2.6.32.10/fs/proc/array.c
31035--- linux-2.6.32.9/fs/proc/array.c 2010-02-23 10:38:51.000000000 -0500 31012--- linux-2.6.32.10/fs/proc/array.c 2010-03-15 11:52:04.000000000 -0400
31036+++ linux-2.6.32.9/fs/proc/array.c 2010-03-11 20:25:00.197533934 -0500 31013+++ linux-2.6.32.10/fs/proc/array.c 2010-03-20 15:58:47.138051759 -0400
31037@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct 31014@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct
31038 } 31015 }
31039 #endif /* CONFIG_MMU */ 31016 #endif /* CONFIG_MMU */
@@ -31124,9 +31101,9 @@ diff -urNp linux-2.6.32.9/fs/proc/array.c linux-2.6.32.9/fs/proc/array.c
31124+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); 31101+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
31125+} 31102+}
31126+#endif 31103+#endif
31127diff -urNp linux-2.6.32.9/fs/proc/base.c linux-2.6.32.9/fs/proc/base.c 31104diff -urNp linux-2.6.32.10/fs/proc/base.c linux-2.6.32.10/fs/proc/base.c
31128--- linux-2.6.32.9/fs/proc/base.c 2010-02-23 10:38:51.000000000 -0500 31105--- linux-2.6.32.10/fs/proc/base.c 2010-03-15 11:52:04.000000000 -0400
31129+++ linux-2.6.32.9/fs/proc/base.c 2010-03-11 20:25:00.197533934 -0500 31106+++ linux-2.6.32.10/fs/proc/base.c 2010-03-21 16:37:01.906406623 -0400
31130@@ -102,6 +102,22 @@ struct pid_entry { 31107@@ -102,6 +102,22 @@ struct pid_entry {
31131 union proc_op op; 31108 union proc_op op;
31132 }; 31109 };
@@ -31359,7 +31336,16 @@ diff -urNp linux-2.6.32.9/fs/proc/base.c linux-2.6.32.9/fs/proc/base.c
31359 ret = 0; 31336 ret = 0;
31360 i = filp->f_pos; 31337 i = filp->f_pos;
31361 switch (i) { 31338 switch (i) {
31362@@ -2418,6 +2512,9 @@ static struct dentry *proc_base_lookup(s 31339@@ -2319,7 +2413,7 @@ static void *proc_self_follow_link(struc
31340 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
31341 void *cookie)
31342 {
31343- char *s = nd_get_link(nd);
31344+ const char *s = nd_get_link(nd);
31345 if (!IS_ERR(s))
31346 __putname(s);
31347 }
31348@@ -2432,6 +2526,9 @@ static struct dentry *proc_base_lookup(s
31363 if (p > last) 31349 if (p > last)
31364 goto out; 31350 goto out;
31365 31351
@@ -31369,7 +31355,7 @@ diff -urNp linux-2.6.32.9/fs/proc/base.c linux-2.6.32.9/fs/proc/base.c
31369 error = proc_base_instantiate(dir, dentry, task, p); 31355 error = proc_base_instantiate(dir, dentry, task, p);
31370 31356
31371 out: 31357 out:
31372@@ -2504,7 +2601,7 @@ static const struct pid_entry tgid_base_ 31358@@ -2518,7 +2615,7 @@ static const struct pid_entry tgid_base_
31373 #ifdef CONFIG_SCHED_DEBUG 31359 #ifdef CONFIG_SCHED_DEBUG
31374 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), 31360 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
31375 #endif 31361 #endif
@@ -31378,7 +31364,7 @@ diff -urNp linux-2.6.32.9/fs/proc/base.c linux-2.6.32.9/fs/proc/base.c
31378 INF("syscall", S_IRUSR, proc_pid_syscall), 31364 INF("syscall", S_IRUSR, proc_pid_syscall),
31379 #endif 31365 #endif
31380 INF("cmdline", S_IRUGO, proc_pid_cmdline), 31366 INF("cmdline", S_IRUGO, proc_pid_cmdline),
31381@@ -2532,7 +2629,7 @@ static const struct pid_entry tgid_base_ 31367@@ -2546,7 +2643,7 @@ static const struct pid_entry tgid_base_
31382 #ifdef CONFIG_KALLSYMS 31368 #ifdef CONFIG_KALLSYMS
31383 INF("wchan", S_IRUGO, proc_pid_wchan), 31369 INF("wchan", S_IRUGO, proc_pid_wchan),
31384 #endif 31370 #endif
@@ -31387,7 +31373,7 @@ diff -urNp linux-2.6.32.9/fs/proc/base.c linux-2.6.32.9/fs/proc/base.c
31387 ONE("stack", S_IRUSR, proc_pid_stack), 31373 ONE("stack", S_IRUSR, proc_pid_stack),
31388 #endif 31374 #endif
31389 #ifdef CONFIG_SCHEDSTATS 31375 #ifdef CONFIG_SCHEDSTATS
31390@@ -2562,6 +2659,9 @@ static const struct pid_entry tgid_base_ 31376@@ -2576,6 +2673,9 @@ static const struct pid_entry tgid_base_
31391 #ifdef CONFIG_TASK_IO_ACCOUNTING 31377 #ifdef CONFIG_TASK_IO_ACCOUNTING
31392 INF("io", S_IRUGO, proc_tgid_io_accounting), 31378 INF("io", S_IRUGO, proc_tgid_io_accounting),
31393 #endif 31379 #endif
@@ -31397,7 +31383,7 @@ diff -urNp linux-2.6.32.9/fs/proc/base.c linux-2.6.32.9/fs/proc/base.c
31397 }; 31383 };
31398 31384
31399 static int proc_tgid_base_readdir(struct file * filp, 31385 static int proc_tgid_base_readdir(struct file * filp,
31400@@ -2686,7 +2786,14 @@ static struct dentry *proc_pid_instantia 31386@@ -2700,7 +2800,14 @@ static struct dentry *proc_pid_instantia
31401 if (!inode) 31387 if (!inode)
31402 goto out; 31388 goto out;
31403 31389
@@ -31412,7 +31398,7 @@ diff -urNp linux-2.6.32.9/fs/proc/base.c linux-2.6.32.9/fs/proc/base.c
31412 inode->i_op = &proc_tgid_base_inode_operations; 31398 inode->i_op = &proc_tgid_base_inode_operations;
31413 inode->i_fop = &proc_tgid_base_operations; 31399 inode->i_fop = &proc_tgid_base_operations;
31414 inode->i_flags|=S_IMMUTABLE; 31400 inode->i_flags|=S_IMMUTABLE;
31415@@ -2728,7 +2835,11 @@ struct dentry *proc_pid_lookup(struct in 31401@@ -2742,7 +2849,11 @@ struct dentry *proc_pid_lookup(struct in
31416 if (!task) 31402 if (!task)
31417 goto out; 31403 goto out;
31418 31404
@@ -31424,7 +31410,7 @@ diff -urNp linux-2.6.32.9/fs/proc/base.c linux-2.6.32.9/fs/proc/base.c
31424 put_task_struct(task); 31410 put_task_struct(task);
31425 out: 31411 out:
31426 return result; 31412 return result;
31427@@ -2793,6 +2904,11 @@ int proc_pid_readdir(struct file * filp, 31413@@ -2807,6 +2918,11 @@ int proc_pid_readdir(struct file * filp,
31428 { 31414 {
31429 unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY; 31415 unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
31430 struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode); 31416 struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode);
@@ -31436,7 +31422,7 @@ diff -urNp linux-2.6.32.9/fs/proc/base.c linux-2.6.32.9/fs/proc/base.c
31436 struct tgid_iter iter; 31422 struct tgid_iter iter;
31437 struct pid_namespace *ns; 31423 struct pid_namespace *ns;
31438 31424
31439@@ -2811,8 +2927,27 @@ int proc_pid_readdir(struct file * filp, 31425@@ -2825,8 +2941,27 @@ int proc_pid_readdir(struct file * filp,
31440 for (iter = next_tgid(ns, iter); 31426 for (iter = next_tgid(ns, iter);
31441 iter.task; 31427 iter.task;
31442 iter.tgid += 1, iter = next_tgid(ns, iter)) { 31428 iter.tgid += 1, iter = next_tgid(ns, iter)) {
@@ -31465,7 +31451,7 @@ diff -urNp linux-2.6.32.9/fs/proc/base.c linux-2.6.32.9/fs/proc/base.c
31465 put_task_struct(iter.task); 31451 put_task_struct(iter.task);
31466 goto out; 31452 goto out;
31467 } 31453 }
31468@@ -2838,7 +2973,7 @@ static const struct pid_entry tid_base_s 31454@@ -2852,7 +2987,7 @@ static const struct pid_entry tid_base_s
31469 #ifdef CONFIG_SCHED_DEBUG 31455 #ifdef CONFIG_SCHED_DEBUG
31470 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), 31456 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
31471 #endif 31457 #endif
@@ -31474,7 +31460,7 @@ diff -urNp linux-2.6.32.9/fs/proc/base.c linux-2.6.32.9/fs/proc/base.c
31474 INF("syscall", S_IRUSR, proc_pid_syscall), 31460 INF("syscall", S_IRUSR, proc_pid_syscall),
31475 #endif 31461 #endif
31476 INF("cmdline", S_IRUGO, proc_pid_cmdline), 31462 INF("cmdline", S_IRUGO, proc_pid_cmdline),
31477@@ -2865,7 +3000,7 @@ static const struct pid_entry tid_base_s 31463@@ -2879,7 +3014,7 @@ static const struct pid_entry tid_base_s
31478 #ifdef CONFIG_KALLSYMS 31464 #ifdef CONFIG_KALLSYMS
31479 INF("wchan", S_IRUGO, proc_pid_wchan), 31465 INF("wchan", S_IRUGO, proc_pid_wchan),
31480 #endif 31466 #endif
@@ -31483,9 +31469,9 @@ diff -urNp linux-2.6.32.9/fs/proc/base.c linux-2.6.32.9/fs/proc/base.c
31483 ONE("stack", S_IRUSR, proc_pid_stack), 31469 ONE("stack", S_IRUSR, proc_pid_stack),
31484 #endif 31470 #endif
31485 #ifdef CONFIG_SCHEDSTATS 31471 #ifdef CONFIG_SCHEDSTATS
31486diff -urNp linux-2.6.32.9/fs/proc/cmdline.c linux-2.6.32.9/fs/proc/cmdline.c 31472diff -urNp linux-2.6.32.10/fs/proc/cmdline.c linux-2.6.32.10/fs/proc/cmdline.c
31487--- linux-2.6.32.9/fs/proc/cmdline.c 2010-02-23 10:38:51.000000000 -0500 31473--- linux-2.6.32.10/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400
31488+++ linux-2.6.32.9/fs/proc/cmdline.c 2010-03-11 20:25:00.197533934 -0500 31474+++ linux-2.6.32.10/fs/proc/cmdline.c 2010-03-20 15:58:47.138051759 -0400
31489@@ -23,7 +23,11 @@ static const struct file_operations cmdl 31475@@ -23,7 +23,11 @@ static const struct file_operations cmdl
31490 31476
31491 static int __init proc_cmdline_init(void) 31477 static int __init proc_cmdline_init(void)
@@ -31498,9 +31484,9 @@ diff -urNp linux-2.6.32.9/fs/proc/cmdline.c linux-2.6.32.9/fs/proc/cmdline.c
31498 return 0; 31484 return 0;
31499 } 31485 }
31500 module_init(proc_cmdline_init); 31486 module_init(proc_cmdline_init);
31501diff -urNp linux-2.6.32.9/fs/proc/devices.c linux-2.6.32.9/fs/proc/devices.c 31487diff -urNp linux-2.6.32.10/fs/proc/devices.c linux-2.6.32.10/fs/proc/devices.c
31502--- linux-2.6.32.9/fs/proc/devices.c 2010-02-23 10:38:51.000000000 -0500 31488--- linux-2.6.32.10/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400
31503+++ linux-2.6.32.9/fs/proc/devices.c 2010-03-11 20:25:00.197533934 -0500 31489+++ linux-2.6.32.10/fs/proc/devices.c 2010-03-20 15:58:47.138051759 -0400
31504@@ -64,7 +64,11 @@ static const struct file_operations proc 31490@@ -64,7 +64,11 @@ static const struct file_operations proc
31505 31491
31506 static int __init proc_devices_init(void) 31492 static int __init proc_devices_init(void)
@@ -31513,9 +31499,9 @@ diff -urNp linux-2.6.32.9/fs/proc/devices.c linux-2.6.32.9/fs/proc/devices.c
31513 return 0; 31499 return 0;
31514 } 31500 }
31515 module_init(proc_devices_init); 31501 module_init(proc_devices_init);
31516diff -urNp linux-2.6.32.9/fs/proc/inode.c linux-2.6.32.9/fs/proc/inode.c 31502diff -urNp linux-2.6.32.10/fs/proc/inode.c linux-2.6.32.10/fs/proc/inode.c
31517--- linux-2.6.32.9/fs/proc/inode.c 2010-02-23 10:38:51.000000000 -0500 31503--- linux-2.6.32.10/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400
31518+++ linux-2.6.32.9/fs/proc/inode.c 2010-03-11 20:25:00.197533934 -0500 31504+++ linux-2.6.32.10/fs/proc/inode.c 2010-03-20 15:58:47.138051759 -0400
31519@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe 31505@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
31520 if (de->mode) { 31506 if (de->mode) {
31521 inode->i_mode = de->mode; 31507 inode->i_mode = de->mode;
@@ -31528,9 +31514,9 @@ diff -urNp linux-2.6.32.9/fs/proc/inode.c linux-2.6.32.9/fs/proc/inode.c
31528 } 31514 }
31529 if (de->size) 31515 if (de->size)
31530 inode->i_size = de->size; 31516 inode->i_size = de->size;
31531diff -urNp linux-2.6.32.9/fs/proc/internal.h linux-2.6.32.9/fs/proc/internal.h 31517diff -urNp linux-2.6.32.10/fs/proc/internal.h linux-2.6.32.10/fs/proc/internal.h
31532--- linux-2.6.32.9/fs/proc/internal.h 2010-02-23 10:38:51.000000000 -0500 31518--- linux-2.6.32.10/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400
31533+++ linux-2.6.32.9/fs/proc/internal.h 2010-03-11 20:25:00.197533934 -0500 31519+++ linux-2.6.32.10/fs/proc/internal.h 2010-03-20 15:58:47.138051759 -0400
31534@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi 31520@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
31535 struct pid *pid, struct task_struct *task); 31521 struct pid *pid, struct task_struct *task);
31536 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, 31522 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -31541,9 +31527,9 @@ diff -urNp linux-2.6.32.9/fs/proc/internal.h linux-2.6.32.9/fs/proc/internal.h
31541 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); 31527 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
31542 31528
31543 extern const struct file_operations proc_maps_operations; 31529 extern const struct file_operations proc_maps_operations;
31544diff -urNp linux-2.6.32.9/fs/proc/Kconfig linux-2.6.32.9/fs/proc/Kconfig 31530diff -urNp linux-2.6.32.10/fs/proc/Kconfig linux-2.6.32.10/fs/proc/Kconfig
31545--- linux-2.6.32.9/fs/proc/Kconfig 2010-02-23 10:38:51.000000000 -0500 31531--- linux-2.6.32.10/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400
31546+++ linux-2.6.32.9/fs/proc/Kconfig 2010-03-11 20:25:00.197533934 -0500 31532+++ linux-2.6.32.10/fs/proc/Kconfig 2010-03-20 15:58:47.138051759 -0400
31547@@ -30,12 +30,12 @@ config PROC_FS 31533@@ -30,12 +30,12 @@ config PROC_FS
31548 31534
31549 config PROC_KCORE 31535 config PROC_KCORE
@@ -31571,9 +31557,9 @@ diff -urNp linux-2.6.32.9/fs/proc/Kconfig linux-2.6.32.9/fs/proc/Kconfig
31571 bool "Enable /proc page monitoring" if EMBEDDED 31557 bool "Enable /proc page monitoring" if EMBEDDED
31572 help 31558 help
31573 Various /proc files exist to monitor process memory utilization: 31559 Various /proc files exist to monitor process memory utilization:
31574diff -urNp linux-2.6.32.9/fs/proc/kcore.c linux-2.6.32.9/fs/proc/kcore.c 31560diff -urNp linux-2.6.32.10/fs/proc/kcore.c linux-2.6.32.10/fs/proc/kcore.c
31575--- linux-2.6.32.9/fs/proc/kcore.c 2010-02-23 10:38:51.000000000 -0500 31561--- linux-2.6.32.10/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400
31576+++ linux-2.6.32.9/fs/proc/kcore.c 2010-03-11 20:25:00.197533934 -0500 31562+++ linux-2.6.32.10/fs/proc/kcore.c 2010-03-20 15:58:47.138051759 -0400
31577@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use 31563@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use
31578 31564
31579 static int open_kcore(struct inode *inode, struct file *filp) 31565 static int open_kcore(struct inode *inode, struct file *filp)
@@ -31584,9 +31570,9 @@ diff -urNp linux-2.6.32.9/fs/proc/kcore.c linux-2.6.32.9/fs/proc/kcore.c
31584 if (!capable(CAP_SYS_RAWIO)) 31570 if (!capable(CAP_SYS_RAWIO))
31585 return -EPERM; 31571 return -EPERM;
31586 if (kcore_need_update) 31572 if (kcore_need_update)
31587diff -urNp linux-2.6.32.9/fs/proc/meminfo.c linux-2.6.32.9/fs/proc/meminfo.c 31573diff -urNp linux-2.6.32.10/fs/proc/meminfo.c linux-2.6.32.10/fs/proc/meminfo.c
31588--- linux-2.6.32.9/fs/proc/meminfo.c 2010-02-23 10:38:51.000000000 -0500 31574--- linux-2.6.32.10/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400
31589+++ linux-2.6.32.9/fs/proc/meminfo.c 2010-03-11 20:25:00.197533934 -0500 31575+++ linux-2.6.32.10/fs/proc/meminfo.c 2010-03-20 15:58:47.138051759 -0400
31590@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ 31576@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
31591 vmi.used >> 10, 31577 vmi.used >> 10,
31592 vmi.largest_chunk >> 10 31578 vmi.largest_chunk >> 10
@@ -31596,9 +31582,9 @@ diff -urNp linux-2.6.32.9/fs/proc/meminfo.c linux-2.6.32.9/fs/proc/meminfo.c
31596 #endif 31582 #endif
31597 ); 31583 );
31598 31584
31599diff -urNp linux-2.6.32.9/fs/proc/nommu.c linux-2.6.32.9/fs/proc/nommu.c 31585diff -urNp linux-2.6.32.10/fs/proc/nommu.c linux-2.6.32.10/fs/proc/nommu.c
31600--- linux-2.6.32.9/fs/proc/nommu.c 2010-02-23 10:38:51.000000000 -0500 31586--- linux-2.6.32.10/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400
31601+++ linux-2.6.32.9/fs/proc/nommu.c 2010-03-11 20:25:00.197533934 -0500 31587+++ linux-2.6.32.10/fs/proc/nommu.c 2010-03-20 15:58:47.138051759 -0400
31602@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ 31588@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
31603 if (len < 1) 31589 if (len < 1)
31604 len = 1; 31590 len = 1;
@@ -31608,9 +31594,9 @@ diff -urNp linux-2.6.32.9/fs/proc/nommu.c linux-2.6.32.9/fs/proc/nommu.c
31608 } 31594 }
31609 31595
31610 seq_putc(m, '\n'); 31596 seq_putc(m, '\n');
31611diff -urNp linux-2.6.32.9/fs/proc/proc_net.c linux-2.6.32.9/fs/proc/proc_net.c 31597diff -urNp linux-2.6.32.10/fs/proc/proc_net.c linux-2.6.32.10/fs/proc/proc_net.c
31612--- linux-2.6.32.9/fs/proc/proc_net.c 2010-02-23 10:38:51.000000000 -0500 31598--- linux-2.6.32.10/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400
31613+++ linux-2.6.32.9/fs/proc/proc_net.c 2010-03-11 20:25:00.197533934 -0500 31599+++ linux-2.6.32.10/fs/proc/proc_net.c 2010-03-20 15:58:47.138051759 -0400
31614@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str 31600@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
31615 struct task_struct *task; 31601 struct task_struct *task;
31616 struct nsproxy *ns; 31602 struct nsproxy *ns;
@@ -31629,9 +31615,9 @@ diff -urNp linux-2.6.32.9/fs/proc/proc_net.c linux-2.6.32.9/fs/proc/proc_net.c
31629 31615
31630 rcu_read_lock(); 31616 rcu_read_lock();
31631 task = pid_task(proc_pid(dir), PIDTYPE_PID); 31617 task = pid_task(proc_pid(dir), PIDTYPE_PID);
31632diff -urNp linux-2.6.32.9/fs/proc/proc_sysctl.c linux-2.6.32.9/fs/proc/proc_sysctl.c 31618diff -urNp linux-2.6.32.10/fs/proc/proc_sysctl.c linux-2.6.32.10/fs/proc/proc_sysctl.c
31633--- linux-2.6.32.9/fs/proc/proc_sysctl.c 2010-02-23 10:38:51.000000000 -0500 31619--- linux-2.6.32.10/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400
31634+++ linux-2.6.32.9/fs/proc/proc_sysctl.c 2010-03-11 20:25:00.197533934 -0500 31620+++ linux-2.6.32.10/fs/proc/proc_sysctl.c 2010-03-20 15:58:47.138051759 -0400
31635@@ -7,6 +7,8 @@ 31621@@ -7,6 +7,8 @@
31636 #include <linux/security.h> 31622 #include <linux/security.h>
31637 #include "internal.h" 31623 #include "internal.h"
@@ -31671,9 +31657,9 @@ diff -urNp linux-2.6.32.9/fs/proc/proc_sysctl.c linux-2.6.32.9/fs/proc/proc_sysc
31671 generic_fillattr(inode, stat); 31657 generic_fillattr(inode, stat);
31672 if (table) 31658 if (table)
31673 stat->mode = (stat->mode & S_IFMT) | table->mode; 31659 stat->mode = (stat->mode & S_IFMT) | table->mode;
31674diff -urNp linux-2.6.32.9/fs/proc/root.c linux-2.6.32.9/fs/proc/root.c 31660diff -urNp linux-2.6.32.10/fs/proc/root.c linux-2.6.32.10/fs/proc/root.c
31675--- linux-2.6.32.9/fs/proc/root.c 2010-02-23 10:38:51.000000000 -0500 31661--- linux-2.6.32.10/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400
31676+++ linux-2.6.32.9/fs/proc/root.c 2010-03-11 20:25:00.197533934 -0500 31662+++ linux-2.6.32.10/fs/proc/root.c 2010-03-20 15:58:47.142046768 -0400
31677@@ -134,7 +134,15 @@ void __init proc_root_init(void) 31663@@ -134,7 +134,15 @@ void __init proc_root_init(void)
31678 #ifdef CONFIG_PROC_DEVICETREE 31664 #ifdef CONFIG_PROC_DEVICETREE
31679 proc_device_tree_init(); 31665 proc_device_tree_init();
@@ -31690,9 +31676,9 @@ diff -urNp linux-2.6.32.9/fs/proc/root.c linux-2.6.32.9/fs/proc/root.c
31690 proc_sys_init(); 31676 proc_sys_init();
31691 } 31677 }
31692 31678
31693diff -urNp linux-2.6.32.9/fs/proc/task_mmu.c linux-2.6.32.9/fs/proc/task_mmu.c 31679diff -urNp linux-2.6.32.10/fs/proc/task_mmu.c linux-2.6.32.10/fs/proc/task_mmu.c
31694--- linux-2.6.32.9/fs/proc/task_mmu.c 2010-02-23 10:38:51.000000000 -0500 31680--- linux-2.6.32.10/fs/proc/task_mmu.c 2010-03-15 11:52:04.000000000 -0400
31695+++ linux-2.6.32.9/fs/proc/task_mmu.c 2010-03-11 20:25:00.201372364 -0500 31681+++ linux-2.6.32.10/fs/proc/task_mmu.c 2010-03-20 15:58:47.142046768 -0400
31696@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct 31682@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
31697 "VmStk:\t%8lu kB\n" 31683 "VmStk:\t%8lu kB\n"
31698 "VmExe:\t%8lu kB\n" 31684 "VmExe:\t%8lu kB\n"
@@ -31813,9 +31799,9 @@ diff -urNp linux-2.6.32.9/fs/proc/task_mmu.c linux-2.6.32.9/fs/proc/task_mmu.c
31813 mss.resident >> 10, 31799 mss.resident >> 10,
31814 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), 31800 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
31815 mss.shared_clean >> 10, 31801 mss.shared_clean >> 10,
31816diff -urNp linux-2.6.32.9/fs/proc/task_nommu.c linux-2.6.32.9/fs/proc/task_nommu.c 31802diff -urNp linux-2.6.32.10/fs/proc/task_nommu.c linux-2.6.32.10/fs/proc/task_nommu.c
31817--- linux-2.6.32.9/fs/proc/task_nommu.c 2010-02-23 10:38:51.000000000 -0500 31803--- linux-2.6.32.10/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400
31818+++ linux-2.6.32.9/fs/proc/task_nommu.c 2010-03-11 20:25:00.201372364 -0500 31804+++ linux-2.6.32.10/fs/proc/task_nommu.c 2010-03-20 15:58:47.142046768 -0400
31819@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct 31805@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
31820 else 31806 else
31821 bytes += kobjsize(mm); 31807 bytes += kobjsize(mm);
@@ -31834,9 +31820,9 @@ diff -urNp linux-2.6.32.9/fs/proc/task_nommu.c linux-2.6.32.9/fs/proc/task_nommu
31834 } 31820 }
31835 31821
31836 seq_putc(m, '\n'); 31822 seq_putc(m, '\n');
31837diff -urNp linux-2.6.32.9/fs/readdir.c linux-2.6.32.9/fs/readdir.c 31823diff -urNp linux-2.6.32.10/fs/readdir.c linux-2.6.32.10/fs/readdir.c
31838--- linux-2.6.32.9/fs/readdir.c 2010-02-23 10:38:51.000000000 -0500 31824--- linux-2.6.32.10/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400
31839+++ linux-2.6.32.9/fs/readdir.c 2010-03-11 20:25:00.201372364 -0500 31825+++ linux-2.6.32.10/fs/readdir.c 2010-03-20 15:58:47.142046768 -0400
31840@@ -16,6 +16,7 @@ 31826@@ -16,6 +16,7 @@
31841 #include <linux/security.h> 31827 #include <linux/security.h>
31842 #include <linux/syscalls.h> 31828 #include <linux/syscalls.h>
@@ -31926,9 +31912,9 @@ diff -urNp linux-2.6.32.9/fs/readdir.c linux-2.6.32.9/fs/readdir.c
31926 buf.count = count; 31912 buf.count = count;
31927 buf.error = 0; 31913 buf.error = 0;
31928 31914
31929diff -urNp linux-2.6.32.9/fs/reiserfs/do_balan.c linux-2.6.32.9/fs/reiserfs/do_balan.c 31915diff -urNp linux-2.6.32.10/fs/reiserfs/do_balan.c linux-2.6.32.10/fs/reiserfs/do_balan.c
31930--- linux-2.6.32.9/fs/reiserfs/do_balan.c 2010-02-23 10:38:51.000000000 -0500 31916--- linux-2.6.32.10/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400
31931+++ linux-2.6.32.9/fs/reiserfs/do_balan.c 2010-03-11 20:25:00.201372364 -0500 31917+++ linux-2.6.32.10/fs/reiserfs/do_balan.c 2010-03-20 15:58:47.142046768 -0400
31932@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, 31918@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
31933 return; 31919 return;
31934 } 31920 }
@@ -31938,9 +31924,9 @@ diff -urNp linux-2.6.32.9/fs/reiserfs/do_balan.c linux-2.6.32.9/fs/reiserfs/do_b
31938 do_balance_starts(tb); 31924 do_balance_starts(tb);
31939 31925
31940 /* balance leaf returns 0 except if combining L R and S into 31926 /* balance leaf returns 0 except if combining L R and S into
31941diff -urNp linux-2.6.32.9/fs/reiserfs/item_ops.c linux-2.6.32.9/fs/reiserfs/item_ops.c 31927diff -urNp linux-2.6.32.10/fs/reiserfs/item_ops.c linux-2.6.32.10/fs/reiserfs/item_ops.c
31942--- linux-2.6.32.9/fs/reiserfs/item_ops.c 2010-02-23 10:38:51.000000000 -0500 31928--- linux-2.6.32.10/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400
31943+++ linux-2.6.32.9/fs/reiserfs/item_ops.c 2010-03-11 20:25:00.201372364 -0500 31929+++ linux-2.6.32.10/fs/reiserfs/item_ops.c 2010-03-20 15:58:47.142046768 -0400
31944@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i 31930@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
31945 vi->vi_index, vi->vi_type, vi->vi_ih); 31931 vi->vi_index, vi->vi_type, vi->vi_ih);
31946 } 31932 }
@@ -31995,9 +31981,9 @@ diff -urNp linux-2.6.32.9/fs/reiserfs/item_ops.c linux-2.6.32.9/fs/reiserfs/item
31995 &stat_data_ops, 31981 &stat_data_ops,
31996 &indirect_ops, 31982 &indirect_ops,
31997 &direct_ops, 31983 &direct_ops,
31998diff -urNp linux-2.6.32.9/fs/reiserfs/procfs.c linux-2.6.32.9/fs/reiserfs/procfs.c 31984diff -urNp linux-2.6.32.10/fs/reiserfs/procfs.c linux-2.6.32.10/fs/reiserfs/procfs.c
31999--- linux-2.6.32.9/fs/reiserfs/procfs.c 2010-02-23 10:38:51.000000000 -0500 31985--- linux-2.6.32.10/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400
32000+++ linux-2.6.32.9/fs/reiserfs/procfs.c 2010-03-11 20:25:00.201372364 -0500 31986+++ linux-2.6.32.10/fs/reiserfs/procfs.c 2010-03-20 15:58:47.142046768 -0400
32001@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m 31987@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
32002 "SMALL_TAILS " : "NO_TAILS ", 31988 "SMALL_TAILS " : "NO_TAILS ",
32003 replay_only(sb) ? "REPLAY_ONLY " : "", 31989 replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -32007,9 +31993,9 @@ diff -urNp linux-2.6.32.9/fs/reiserfs/procfs.c linux-2.6.32.9/fs/reiserfs/procfs
32007 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), 31993 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
32008 SF(s_do_balance), SF(s_unneeded_left_neighbor), 31994 SF(s_do_balance), SF(s_unneeded_left_neighbor),
32009 SF(s_good_search_by_key_reada), SF(s_bmaps), 31995 SF(s_good_search_by_key_reada), SF(s_bmaps),
32010diff -urNp linux-2.6.32.9/fs/select.c linux-2.6.32.9/fs/select.c 31996diff -urNp linux-2.6.32.10/fs/select.c linux-2.6.32.10/fs/select.c
32011--- linux-2.6.32.9/fs/select.c 2010-02-23 10:38:51.000000000 -0500 31997--- linux-2.6.32.10/fs/select.c 2010-03-15 11:52:04.000000000 -0400
32012+++ linux-2.6.32.9/fs/select.c 2010-03-11 20:25:00.201372364 -0500 31998+++ linux-2.6.32.10/fs/select.c 2010-03-20 15:58:47.142046768 -0400
32013@@ -20,6 +20,7 @@ 31999@@ -20,6 +20,7 @@
32014 #include <linux/module.h> 32000 #include <linux/module.h>
32015 #include <linux/slab.h> 32001 #include <linux/slab.h>
@@ -32026,9 +32012,9 @@ diff -urNp linux-2.6.32.9/fs/select.c linux-2.6.32.9/fs/select.c
32026 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 32012 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
32027 return -EINVAL; 32013 return -EINVAL;
32028 32014
32029diff -urNp linux-2.6.32.9/fs/seq_file.c linux-2.6.32.9/fs/seq_file.c 32015diff -urNp linux-2.6.32.10/fs/seq_file.c linux-2.6.32.10/fs/seq_file.c
32030--- linux-2.6.32.9/fs/seq_file.c 2010-02-23 10:38:51.000000000 -0500 32016--- linux-2.6.32.10/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400
32031+++ linux-2.6.32.9/fs/seq_file.c 2010-03-11 20:25:00.201372364 -0500 32017+++ linux-2.6.32.10/fs/seq_file.c 2010-03-20 15:58:47.142046768 -0400
32032@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 32018@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
32033 return 0; 32019 return 0;
32034 } 32020 }
@@ -32069,9 +32055,9 @@ diff -urNp linux-2.6.32.9/fs/seq_file.c linux-2.6.32.9/fs/seq_file.c
32069 if (!m->buf) 32055 if (!m->buf)
32070 goto Enomem; 32056 goto Enomem;
32071 m->count = 0; 32057 m->count = 0;
32072diff -urNp linux-2.6.32.9/fs/smbfs/symlink.c linux-2.6.32.9/fs/smbfs/symlink.c 32058diff -urNp linux-2.6.32.10/fs/smbfs/symlink.c linux-2.6.32.10/fs/smbfs/symlink.c
32073--- linux-2.6.32.9/fs/smbfs/symlink.c 2010-02-23 10:38:51.000000000 -0500 32059--- linux-2.6.32.10/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400
32074+++ linux-2.6.32.9/fs/smbfs/symlink.c 2010-03-11 20:25:00.201372364 -0500 32060+++ linux-2.6.32.10/fs/smbfs/symlink.c 2010-03-20 15:58:47.142046768 -0400
32075@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent 32061@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
32076 32062
32077 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 32063 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -32081,9 +32067,9 @@ diff -urNp linux-2.6.32.9/fs/smbfs/symlink.c linux-2.6.32.9/fs/smbfs/symlink.c
32081 if (!IS_ERR(s)) 32067 if (!IS_ERR(s))
32082 __putname(s); 32068 __putname(s);
32083 } 32069 }
32084diff -urNp linux-2.6.32.9/fs/splice.c linux-2.6.32.9/fs/splice.c 32070diff -urNp linux-2.6.32.10/fs/splice.c linux-2.6.32.10/fs/splice.c
32085--- linux-2.6.32.9/fs/splice.c 2010-02-23 10:38:51.000000000 -0500 32071--- linux-2.6.32.10/fs/splice.c 2010-03-15 11:52:04.000000000 -0400
32086+++ linux-2.6.32.9/fs/splice.c 2010-03-11 20:25:00.201372364 -0500 32072+++ linux-2.6.32.10/fs/splice.c 2010-03-20 15:58:47.142046768 -0400
32087@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode 32073@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
32088 pipe_lock(pipe); 32074 pipe_lock(pipe);
32089 32075
@@ -32222,9 +32208,9 @@ diff -urNp linux-2.6.32.9/fs/splice.c linux-2.6.32.9/fs/splice.c
32222 ret = -EAGAIN; 32208 ret = -EAGAIN;
32223 32209
32224 pipe_unlock(ipipe); 32210 pipe_unlock(ipipe);
32225diff -urNp linux-2.6.32.9/fs/sysfs/file.c linux-2.6.32.9/fs/sysfs/file.c 32211diff -urNp linux-2.6.32.10/fs/sysfs/file.c linux-2.6.32.10/fs/sysfs/file.c
32226--- linux-2.6.32.9/fs/sysfs/file.c 2010-02-23 10:38:51.000000000 -0500 32212--- linux-2.6.32.10/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400
32227+++ linux-2.6.32.9/fs/sysfs/file.c 2010-03-11 20:25:00.201372364 -0500 32213+++ linux-2.6.32.10/fs/sysfs/file.c 2010-03-20 15:58:47.142046768 -0400
32228@@ -53,7 +53,7 @@ struct sysfs_buffer { 32214@@ -53,7 +53,7 @@ struct sysfs_buffer {
32229 size_t count; 32215 size_t count;
32230 loff_t pos; 32216 loff_t pos;
@@ -32261,9 +32247,9 @@ diff -urNp linux-2.6.32.9/fs/sysfs/file.c linux-2.6.32.9/fs/sysfs/file.c
32261 int error = -EACCES; 32247 int error = -EACCES;
32262 char *p; 32248 char *p;
32263 32249
32264diff -urNp linux-2.6.32.9/fs/sysfs/symlink.c linux-2.6.32.9/fs/sysfs/symlink.c 32250diff -urNp linux-2.6.32.10/fs/sysfs/symlink.c linux-2.6.32.10/fs/sysfs/symlink.c
32265--- linux-2.6.32.9/fs/sysfs/symlink.c 2010-02-23 10:38:51.000000000 -0500 32251--- linux-2.6.32.10/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400
32266+++ linux-2.6.32.9/fs/sysfs/symlink.c 2010-03-11 20:25:00.201372364 -0500 32252+++ linux-2.6.32.10/fs/sysfs/symlink.c 2010-03-20 15:58:47.142046768 -0400
32267@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de 32253@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
32268 32254
32269 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) 32255 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -32273,9 +32259,9 @@ diff -urNp linux-2.6.32.9/fs/sysfs/symlink.c linux-2.6.32.9/fs/sysfs/symlink.c
32273 if (!IS_ERR(page)) 32259 if (!IS_ERR(page))
32274 free_page((unsigned long)page); 32260 free_page((unsigned long)page);
32275 } 32261 }
32276diff -urNp linux-2.6.32.9/fs/udf/balloc.c linux-2.6.32.9/fs/udf/balloc.c 32262diff -urNp linux-2.6.32.10/fs/udf/balloc.c linux-2.6.32.10/fs/udf/balloc.c
32277--- linux-2.6.32.9/fs/udf/balloc.c 2010-02-23 10:38:51.000000000 -0500 32263--- linux-2.6.32.10/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400
32278+++ linux-2.6.32.9/fs/udf/balloc.c 2010-03-11 20:25:00.201372364 -0500 32264+++ linux-2.6.32.10/fs/udf/balloc.c 2010-03-20 15:58:47.142046768 -0400
32279@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc 32265@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
32280 32266
32281 mutex_lock(&sbi->s_alloc_mutex); 32267 mutex_lock(&sbi->s_alloc_mutex);
@@ -32298,9 +32284,9 @@ diff -urNp linux-2.6.32.9/fs/udf/balloc.c linux-2.6.32.9/fs/udf/balloc.c
32298 udf_debug("%d < %d || %d + %d > %d\n", 32284 udf_debug("%d < %d || %d + %d > %d\n",
32299 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, 32285 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
32300 partmap->s_partition_len); 32286 partmap->s_partition_len);
32301diff -urNp linux-2.6.32.9/fs/utimes.c linux-2.6.32.9/fs/utimes.c 32287diff -urNp linux-2.6.32.10/fs/utimes.c linux-2.6.32.10/fs/utimes.c
32302--- linux-2.6.32.9/fs/utimes.c 2010-02-23 10:38:51.000000000 -0500 32288--- linux-2.6.32.10/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400
32303+++ linux-2.6.32.9/fs/utimes.c 2010-03-11 20:25:00.201372364 -0500 32289+++ linux-2.6.32.10/fs/utimes.c 2010-03-20 15:58:47.142046768 -0400
32304@@ -1,6 +1,7 @@ 32290@@ -1,6 +1,7 @@
32305 #include <linux/compiler.h> 32291 #include <linux/compiler.h>
32306 #include <linux/file.h> 32292 #include <linux/file.h>
@@ -32322,9 +32308,9 @@ diff -urNp linux-2.6.32.9/fs/utimes.c linux-2.6.32.9/fs/utimes.c
32322 mutex_lock(&inode->i_mutex); 32308 mutex_lock(&inode->i_mutex);
32323 error = notify_change(path->dentry, &newattrs); 32309 error = notify_change(path->dentry, &newattrs);
32324 mutex_unlock(&inode->i_mutex); 32310 mutex_unlock(&inode->i_mutex);
32325diff -urNp linux-2.6.32.9/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.9/fs/xfs/linux-2.6/xfs_ioctl.c 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
32326--- linux-2.6.32.9/fs/xfs/linux-2.6/xfs_ioctl.c 2010-02-23 10:38:51.000000000 -0500 32312--- linux-2.6.32.10/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400
32327+++ linux-2.6.32.9/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-11 20:25:00.201372364 -0500 32313+++ linux-2.6.32.10/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-20 15:58:47.142046768 -0400
32328@@ -134,7 +134,7 @@ xfs_find_handle( 32314@@ -134,7 +134,7 @@ xfs_find_handle(
32329 } 32315 }
32330 32316
@@ -32334,9 +32320,9 @@ diff -urNp linux-2.6.32.9/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.9/fs/xfs/lin
32334 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) 32320 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
32335 goto out_put; 32321 goto out_put;
32336 32322
32337diff -urNp linux-2.6.32.9/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.9/fs/xfs/linux-2.6/xfs_iops.c 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
32338--- linux-2.6.32.9/fs/xfs/linux-2.6/xfs_iops.c 2010-02-23 10:38:51.000000000 -0500 32324--- linux-2.6.32.10/fs/xfs/linux-2.6/xfs_iops.c 2010-03-15 11:52:04.000000000 -0400
32339+++ linux-2.6.32.9/fs/xfs/linux-2.6/xfs_iops.c 2010-03-11 20:25:00.201372364 -0500 32325+++ linux-2.6.32.10/fs/xfs/linux-2.6/xfs_iops.c 2010-03-20 15:58:47.142046768 -0400
32340@@ -468,7 +468,7 @@ xfs_vn_put_link( 32326@@ -468,7 +468,7 @@ xfs_vn_put_link(
32341 struct nameidata *nd, 32327 struct nameidata *nd,
32342 void *p) 32328 void *p)
@@ -32346,9 +32332,9 @@ diff -urNp linux-2.6.32.9/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.9/fs/xfs/linu
32346 32332
32347 if (!IS_ERR(s)) 32333 if (!IS_ERR(s))
32348 kfree(s); 32334 kfree(s);
32349diff -urNp linux-2.6.32.9/fs/xfs/xfs_bmap.c linux-2.6.32.9/fs/xfs/xfs_bmap.c 32335diff -urNp linux-2.6.32.10/fs/xfs/xfs_bmap.c linux-2.6.32.10/fs/xfs/xfs_bmap.c
32350--- linux-2.6.32.9/fs/xfs/xfs_bmap.c 2010-02-23 10:38:51.000000000 -0500 32336--- linux-2.6.32.10/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400
32351+++ linux-2.6.32.9/fs/xfs/xfs_bmap.c 2010-03-11 20:25:00.205311490 -0500 32337+++ linux-2.6.32.10/fs/xfs/xfs_bmap.c 2010-03-20 15:58:47.146050321 -0400
32352@@ -360,7 +360,7 @@ xfs_bmap_validate_ret( 32338@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
32353 int nmap, 32339 int nmap,
32354 int ret_nmap); 32340 int ret_nmap);
@@ -32358,9 +32344,9 @@ diff -urNp linux-2.6.32.9/fs/xfs/xfs_bmap.c linux-2.6.32.9/fs/xfs/xfs_bmap.c
32358 #endif /* DEBUG */ 32344 #endif /* DEBUG */
32359 32345
32360 #if defined(XFS_RW_TRACE) 32346 #if defined(XFS_RW_TRACE)
32361diff -urNp linux-2.6.32.9/grsecurity/gracl_alloc.c linux-2.6.32.9/grsecurity/gracl_alloc.c 32347diff -urNp linux-2.6.32.10/grsecurity/gracl_alloc.c linux-2.6.32.10/grsecurity/gracl_alloc.c
32362--- linux-2.6.32.9/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 32348--- linux-2.6.32.10/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
32363+++ linux-2.6.32.9/grsecurity/gracl_alloc.c 2010-03-11 20:25:00.205311490 -0500 32349+++ linux-2.6.32.10/grsecurity/gracl_alloc.c 2010-03-20 15:58:47.146050321 -0400
32364@@ -0,0 +1,105 @@ 32350@@ -0,0 +1,105 @@
32365+#include <linux/kernel.h> 32351+#include <linux/kernel.h>
32366+#include <linux/mm.h> 32352+#include <linux/mm.h>
@@ -32467,10 +32453,10 @@ diff -urNp linux-2.6.32.9/grsecurity/gracl_alloc.c linux-2.6.32.9/grsecurity/gra
32467+ else 32453+ else
32468+ return 1; 32454+ return 1;
32469+} 32455+}
32470diff -urNp linux-2.6.32.9/grsecurity/gracl.c linux-2.6.32.9/grsecurity/gracl.c 32456diff -urNp linux-2.6.32.10/grsecurity/gracl.c linux-2.6.32.10/grsecurity/gracl.c
32471--- linux-2.6.32.9/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 32457--- linux-2.6.32.10/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
32472+++ linux-2.6.32.9/grsecurity/gracl.c 2010-03-11 20:25:00.205311490 -0500 32458+++ linux-2.6.32.10/grsecurity/gracl.c 2010-03-20 16:56:51.708801961 -0400
32473@@ -0,0 +1,3918 @@ 32459@@ -0,0 +1,3917 @@
32474+#include <linux/kernel.h> 32460+#include <linux/kernel.h>
32475+#include <linux/module.h> 32461+#include <linux/module.h>
32476+#include <linux/sched.h> 32462+#include <linux/sched.h>
@@ -35575,7 +35561,6 @@ diff -urNp linux-2.6.32.9/grsecurity/gracl.c linux-2.6.32.9/grsecurity/gracl.c
35575+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i); 35561+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
35576+ gr_set_acls(1); 35562+ gr_set_acls(1);
35577+ } else { 35563+ } else {
35578+ gr_log_str(GR_DONT_AUDIT, GR_UNSPROLEF_ACL_MSG, current->role->rolename);
35579+ error = -EPERM; 35564+ error = -EPERM;
35580+ goto out; 35565+ goto out;
35581+ } 35566+ }
@@ -36389,9 +36374,9 @@ diff -urNp linux-2.6.32.9/grsecurity/gracl.c linux-2.6.32.9/grsecurity/gracl.c
36389+EXPORT_SYMBOL(gr_check_group_change); 36374+EXPORT_SYMBOL(gr_check_group_change);
36390+#endif 36375+#endif
36391+ 36376+
36392diff -urNp linux-2.6.32.9/grsecurity/gracl_cap.c linux-2.6.32.9/grsecurity/gracl_cap.c 36377diff -urNp linux-2.6.32.10/grsecurity/gracl_cap.c linux-2.6.32.10/grsecurity/gracl_cap.c
36393--- linux-2.6.32.9/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 36378--- linux-2.6.32.10/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
36394+++ linux-2.6.32.9/grsecurity/gracl_cap.c 2010-03-11 20:25:00.205311490 -0500 36379+++ linux-2.6.32.10/grsecurity/gracl_cap.c 2010-03-20 15:58:47.148627499 -0400
36395@@ -0,0 +1,131 @@ 36380@@ -0,0 +1,131 @@
36396+#include <linux/kernel.h> 36381+#include <linux/kernel.h>
36397+#include <linux/module.h> 36382+#include <linux/module.h>
@@ -36524,9 +36509,9 @@ diff -urNp linux-2.6.32.9/grsecurity/gracl_cap.c linux-2.6.32.9/grsecurity/gracl
36524+ return 0; 36509+ return 0;
36525+} 36510+}
36526+ 36511+
36527diff -urNp linux-2.6.32.9/grsecurity/gracl_fs.c linux-2.6.32.9/grsecurity/gracl_fs.c 36512diff -urNp linux-2.6.32.10/grsecurity/gracl_fs.c linux-2.6.32.10/grsecurity/gracl_fs.c
36528--- linux-2.6.32.9/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 36513--- linux-2.6.32.10/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
36529+++ linux-2.6.32.9/grsecurity/gracl_fs.c 2010-03-11 20:25:00.205311490 -0500 36514+++ linux-2.6.32.10/grsecurity/gracl_fs.c 2010-03-20 15:58:47.148627499 -0400
36530@@ -0,0 +1,424 @@ 36515@@ -0,0 +1,424 @@
36531+#include <linux/kernel.h> 36516+#include <linux/kernel.h>
36532+#include <linux/sched.h> 36517+#include <linux/sched.h>
@@ -36952,9 +36937,9 @@ diff -urNp linux-2.6.32.9/grsecurity/gracl_fs.c linux-2.6.32.9/grsecurity/gracl_
36952+ 36937+
36953+ return 0; 36938+ return 0;
36954+} 36939+}
36955diff -urNp linux-2.6.32.9/grsecurity/gracl_ip.c linux-2.6.32.9/grsecurity/gracl_ip.c 36940diff -urNp linux-2.6.32.10/grsecurity/gracl_ip.c linux-2.6.32.10/grsecurity/gracl_ip.c
36956--- linux-2.6.32.9/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 36941--- linux-2.6.32.10/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
36957+++ linux-2.6.32.9/grsecurity/gracl_ip.c 2010-03-11 20:25:00.205311490 -0500 36942+++ linux-2.6.32.10/grsecurity/gracl_ip.c 2010-03-20 15:58:47.148627499 -0400
36958@@ -0,0 +1,339 @@ 36943@@ -0,0 +1,339 @@
36959+#include <linux/kernel.h> 36944+#include <linux/kernel.h>
36960+#include <asm/uaccess.h> 36945+#include <asm/uaccess.h>
@@ -37295,9 +37280,9 @@ diff -urNp linux-2.6.32.9/grsecurity/gracl_ip.c linux-2.6.32.9/grsecurity/gracl_
37295+ 37280+
37296+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); 37281+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
37297+} 37282+}
37298diff -urNp linux-2.6.32.9/grsecurity/gracl_learn.c linux-2.6.32.9/grsecurity/gracl_learn.c 37283diff -urNp linux-2.6.32.10/grsecurity/gracl_learn.c linux-2.6.32.10/grsecurity/gracl_learn.c
37299--- linux-2.6.32.9/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 37284--- linux-2.6.32.10/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
37300+++ linux-2.6.32.9/grsecurity/gracl_learn.c 2010-03-11 20:25:00.205311490 -0500 37285+++ linux-2.6.32.10/grsecurity/gracl_learn.c 2010-03-20 15:58:47.148627499 -0400
37301@@ -0,0 +1,211 @@ 37286@@ -0,0 +1,211 @@
37302+#include <linux/kernel.h> 37287+#include <linux/kernel.h>
37303+#include <linux/mm.h> 37288+#include <linux/mm.h>
@@ -37510,9 +37495,9 @@ diff -urNp linux-2.6.32.9/grsecurity/gracl_learn.c linux-2.6.32.9/grsecurity/gra
37510+ .release = close_learn, 37495+ .release = close_learn,
37511+ .poll = poll_learn, 37496+ .poll = poll_learn,
37512+}; 37497+};
37513diff -urNp linux-2.6.32.9/grsecurity/gracl_res.c linux-2.6.32.9/grsecurity/gracl_res.c 37498diff -urNp linux-2.6.32.10/grsecurity/gracl_res.c linux-2.6.32.10/grsecurity/gracl_res.c
37514--- linux-2.6.32.9/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 37499--- linux-2.6.32.10/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
37515+++ linux-2.6.32.9/grsecurity/gracl_res.c 2010-03-11 20:25:00.205311490 -0500 37500+++ linux-2.6.32.10/grsecurity/gracl_res.c 2010-03-20 15:58:47.148627499 -0400
37516@@ -0,0 +1,65 @@ 37501@@ -0,0 +1,65 @@
37517+#include <linux/kernel.h> 37502+#include <linux/kernel.h>
37518+#include <linux/sched.h> 37503+#include <linux/sched.h>
@@ -37579,9 +37564,9 @@ diff -urNp linux-2.6.32.9/grsecurity/gracl_res.c linux-2.6.32.9/grsecurity/gracl
37579+ rcu_read_unlock(); 37564+ rcu_read_unlock();
37580+ return; 37565+ return;
37581+} 37566+}
37582diff -urNp linux-2.6.32.9/grsecurity/gracl_segv.c linux-2.6.32.9/grsecurity/gracl_segv.c 37567diff -urNp linux-2.6.32.10/grsecurity/gracl_segv.c linux-2.6.32.10/grsecurity/gracl_segv.c
37583--- linux-2.6.32.9/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 37568--- linux-2.6.32.10/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
37584+++ linux-2.6.32.9/grsecurity/gracl_segv.c 2010-03-11 20:25:00.205311490 -0500 37569+++ linux-2.6.32.10/grsecurity/gracl_segv.c 2010-03-20 15:58:47.148627499 -0400
37585@@ -0,0 +1,310 @@ 37570@@ -0,0 +1,310 @@
37586+#include <linux/kernel.h> 37571+#include <linux/kernel.h>
37587+#include <linux/mm.h> 37572+#include <linux/mm.h>
@@ -37893,9 +37878,9 @@ diff -urNp linux-2.6.32.9/grsecurity/gracl_segv.c linux-2.6.32.9/grsecurity/grac
37893+ 37878+
37894+ return; 37879+ return;
37895+} 37880+}
37896diff -urNp linux-2.6.32.9/grsecurity/gracl_shm.c linux-2.6.32.9/grsecurity/gracl_shm.c 37881diff -urNp linux-2.6.32.10/grsecurity/gracl_shm.c linux-2.6.32.10/grsecurity/gracl_shm.c
37897--- linux-2.6.32.9/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 37882--- linux-2.6.32.10/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
37898+++ linux-2.6.32.9/grsecurity/gracl_shm.c 2010-03-11 20:25:00.205311490 -0500 37883+++ linux-2.6.32.10/grsecurity/gracl_shm.c 2010-03-20 15:58:47.148627499 -0400
37899@@ -0,0 +1,37 @@ 37884@@ -0,0 +1,37 @@
37900+#include <linux/kernel.h> 37885+#include <linux/kernel.h>
37901+#include <linux/mm.h> 37886+#include <linux/mm.h>
@@ -37934,9 +37919,9 @@ diff -urNp linux-2.6.32.9/grsecurity/gracl_shm.c linux-2.6.32.9/grsecurity/gracl
37934+ 37919+
37935+ return 1; 37920+ return 1;
37936+} 37921+}
37937diff -urNp linux-2.6.32.9/grsecurity/grsec_chdir.c linux-2.6.32.9/grsecurity/grsec_chdir.c 37922diff -urNp linux-2.6.32.10/grsecurity/grsec_chdir.c linux-2.6.32.10/grsecurity/grsec_chdir.c
37938--- linux-2.6.32.9/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 37923--- linux-2.6.32.10/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
37939+++ linux-2.6.32.9/grsecurity/grsec_chdir.c 2010-03-11 20:25:00.205311490 -0500 37924+++ linux-2.6.32.10/grsecurity/grsec_chdir.c 2010-03-20 15:58:47.148627499 -0400
37940@@ -0,0 +1,19 @@ 37925@@ -0,0 +1,19 @@
37941+#include <linux/kernel.h> 37926+#include <linux/kernel.h>
37942+#include <linux/sched.h> 37927+#include <linux/sched.h>
@@ -37957,9 +37942,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_chdir.c linux-2.6.32.9/grsecurity/grs
37957+#endif 37942+#endif
37958+ return; 37943+ return;
37959+} 37944+}
37960diff -urNp linux-2.6.32.9/grsecurity/grsec_chroot.c linux-2.6.32.9/grsecurity/grsec_chroot.c 37945diff -urNp linux-2.6.32.10/grsecurity/grsec_chroot.c linux-2.6.32.10/grsecurity/grsec_chroot.c
37961--- linux-2.6.32.9/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 37946--- linux-2.6.32.10/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
37962+++ linux-2.6.32.9/grsecurity/grsec_chroot.c 2010-03-11 20:25:00.205311490 -0500 37947+++ linux-2.6.32.10/grsecurity/grsec_chroot.c 2010-03-20 15:58:47.148627499 -0400
37963@@ -0,0 +1,348 @@ 37948@@ -0,0 +1,348 @@
37964+#include <linux/kernel.h> 37949+#include <linux/kernel.h>
37965+#include <linux/module.h> 37950+#include <linux/module.h>
@@ -38309,9 +38294,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_chroot.c linux-2.6.32.9/grsecurity/gr
38309+#ifdef CONFIG_SECURITY 38294+#ifdef CONFIG_SECURITY
38310+EXPORT_SYMBOL(gr_handle_chroot_caps); 38295+EXPORT_SYMBOL(gr_handle_chroot_caps);
38311+#endif 38296+#endif
38312diff -urNp linux-2.6.32.9/grsecurity/grsec_disabled.c linux-2.6.32.9/grsecurity/grsec_disabled.c 38297diff -urNp linux-2.6.32.10/grsecurity/grsec_disabled.c linux-2.6.32.10/grsecurity/grsec_disabled.c
38313--- linux-2.6.32.9/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 38298--- linux-2.6.32.10/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
38314+++ linux-2.6.32.9/grsecurity/grsec_disabled.c 2010-03-11 20:25:00.205311490 -0500 38299+++ linux-2.6.32.10/grsecurity/grsec_disabled.c 2010-03-20 15:58:47.148627499 -0400
38315@@ -0,0 +1,426 @@ 38300@@ -0,0 +1,426 @@
38316+#include <linux/kernel.h> 38301+#include <linux/kernel.h>
38317+#include <linux/module.h> 38302+#include <linux/module.h>
@@ -38739,9 +38724,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_disabled.c linux-2.6.32.9/grsecurity/
38739+EXPORT_SYMBOL(gr_check_user_change); 38724+EXPORT_SYMBOL(gr_check_user_change);
38740+EXPORT_SYMBOL(gr_check_group_change); 38725+EXPORT_SYMBOL(gr_check_group_change);
38741+#endif 38726+#endif
38742diff -urNp linux-2.6.32.9/grsecurity/grsec_exec.c linux-2.6.32.9/grsecurity/grsec_exec.c 38727diff -urNp linux-2.6.32.10/grsecurity/grsec_exec.c linux-2.6.32.10/grsecurity/grsec_exec.c
38743--- linux-2.6.32.9/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 38728--- linux-2.6.32.10/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
38744+++ linux-2.6.32.9/grsecurity/grsec_exec.c 2010-03-11 20:25:00.205311490 -0500 38729+++ linux-2.6.32.10/grsecurity/grsec_exec.c 2010-03-20 15:58:47.148627499 -0400
38745@@ -0,0 +1,89 @@ 38730@@ -0,0 +1,89 @@
38746+#include <linux/kernel.h> 38731+#include <linux/kernel.h>
38747+#include <linux/sched.h> 38732+#include <linux/sched.h>
@@ -38832,9 +38817,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_exec.c linux-2.6.32.9/grsecurity/grse
38832+#endif 38817+#endif
38833+ return; 38818+ return;
38834+} 38819+}
38835diff -urNp linux-2.6.32.9/grsecurity/grsec_fifo.c linux-2.6.32.9/grsecurity/grsec_fifo.c 38820diff -urNp linux-2.6.32.10/grsecurity/grsec_fifo.c linux-2.6.32.10/grsecurity/grsec_fifo.c
38836--- linux-2.6.32.9/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 38821--- linux-2.6.32.10/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
38837+++ linux-2.6.32.9/grsecurity/grsec_fifo.c 2010-03-11 20:25:00.205311490 -0500 38822+++ linux-2.6.32.10/grsecurity/grsec_fifo.c 2010-03-20 15:58:47.148627499 -0400
38838@@ -0,0 +1,24 @@ 38823@@ -0,0 +1,24 @@
38839+#include <linux/kernel.h> 38824+#include <linux/kernel.h>
38840+#include <linux/sched.h> 38825+#include <linux/sched.h>
@@ -38860,9 +38845,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_fifo.c linux-2.6.32.9/grsecurity/grse
38860+#endif 38845+#endif
38861+ return 0; 38846+ return 0;
38862+} 38847+}
38863diff -urNp linux-2.6.32.9/grsecurity/grsec_fork.c linux-2.6.32.9/grsecurity/grsec_fork.c 38848diff -urNp linux-2.6.32.10/grsecurity/grsec_fork.c linux-2.6.32.10/grsecurity/grsec_fork.c
38864--- linux-2.6.32.9/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 38849--- linux-2.6.32.10/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
38865+++ linux-2.6.32.9/grsecurity/grsec_fork.c 2010-03-11 20:25:00.205311490 -0500 38850+++ linux-2.6.32.10/grsecurity/grsec_fork.c 2010-03-20 15:58:47.148627499 -0400
38866@@ -0,0 +1,15 @@ 38851@@ -0,0 +1,15 @@
38867+#include <linux/kernel.h> 38852+#include <linux/kernel.h>
38868+#include <linux/sched.h> 38853+#include <linux/sched.h>
@@ -38879,10 +38864,10 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_fork.c linux-2.6.32.9/grsecurity/grse
38879+#endif 38864+#endif
38880+ return; 38865+ return;
38881+} 38866+}
38882diff -urNp linux-2.6.32.9/grsecurity/grsec_init.c linux-2.6.32.9/grsecurity/grsec_init.c 38867diff -urNp linux-2.6.32.10/grsecurity/grsec_init.c linux-2.6.32.10/grsecurity/grsec_init.c
38883--- linux-2.6.32.9/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 38868--- linux-2.6.32.10/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
38884+++ linux-2.6.32.9/grsecurity/grsec_init.c 2010-03-11 20:25:00.209634770 -0500 38869+++ linux-2.6.32.10/grsecurity/grsec_init.c 2010-03-20 16:14:37.552600443 -0400
38885@@ -0,0 +1,235 @@ 38870@@ -0,0 +1,241 @@
38886+#include <linux/kernel.h> 38871+#include <linux/kernel.h>
38887+#include <linux/sched.h> 38872+#include <linux/sched.h>
38888+#include <linux/mm.h> 38873+#include <linux/mm.h>
@@ -38924,6 +38909,8 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_init.c linux-2.6.32.9/grsecurity/grse
38924+int grsec_enable_chroot_unix; 38909+int grsec_enable_chroot_unix;
38925+int grsec_enable_tpe; 38910+int grsec_enable_tpe;
38926+int grsec_tpe_gid; 38911+int grsec_tpe_gid;
38912+int grsec_enable_blackhole;
38913+int grsec_lastack_retries;
38927+int grsec_enable_tpe_all; 38914+int grsec_enable_tpe_all;
38928+int grsec_enable_socket_all; 38915+int grsec_enable_socket_all;
38929+int grsec_socket_all_gid; 38916+int grsec_socket_all_gid;
@@ -39029,6 +39016,10 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_init.c linux-2.6.32.9/grsecurity/grse
39029+#ifdef CONFIG_GRKERNSEC_DMESG 39016+#ifdef CONFIG_GRKERNSEC_DMESG
39030+ grsec_enable_dmesg = 1; 39017+ grsec_enable_dmesg = 1;
39031+#endif 39018+#endif
39019+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
39020+ grsec_enable_blackhole = 1;
39021+ grsec_lastack_retries = 4;
39022+#endif
39032+#ifdef CONFIG_GRKERNSEC_FIFO 39023+#ifdef CONFIG_GRKERNSEC_FIFO
39033+ grsec_enable_fifo = 1; 39024+ grsec_enable_fifo = 1;
39034+#endif 39025+#endif
@@ -39118,9 +39109,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_init.c linux-2.6.32.9/grsecurity/grse
39118+ 39109+
39119+ return; 39110+ return;
39120+} 39111+}
39121diff -urNp linux-2.6.32.9/grsecurity/grsec_link.c linux-2.6.32.9/grsecurity/grsec_link.c 39112diff -urNp linux-2.6.32.10/grsecurity/grsec_link.c linux-2.6.32.10/grsecurity/grsec_link.c
39122--- linux-2.6.32.9/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 39113--- linux-2.6.32.10/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
39123+++ linux-2.6.32.9/grsecurity/grsec_link.c 2010-03-11 20:25:00.209634770 -0500 39114+++ linux-2.6.32.10/grsecurity/grsec_link.c 2010-03-20 15:58:47.148627499 -0400
39124@@ -0,0 +1,43 @@ 39115@@ -0,0 +1,43 @@
39125+#include <linux/kernel.h> 39116+#include <linux/kernel.h>
39126+#include <linux/sched.h> 39117+#include <linux/sched.h>
@@ -39165,9 +39156,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_link.c linux-2.6.32.9/grsecurity/grse
39165+#endif 39156+#endif
39166+ return 0; 39157+ return 0;
39167+} 39158+}
39168diff -urNp linux-2.6.32.9/grsecurity/grsec_log.c linux-2.6.32.9/grsecurity/grsec_log.c 39159diff -urNp linux-2.6.32.10/grsecurity/grsec_log.c linux-2.6.32.10/grsecurity/grsec_log.c
39169--- linux-2.6.32.9/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 39160--- linux-2.6.32.10/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
39170+++ linux-2.6.32.9/grsecurity/grsec_log.c 2010-03-11 20:25:00.209634770 -0500 39161+++ linux-2.6.32.10/grsecurity/grsec_log.c 2010-03-20 15:58:47.148627499 -0400
39171@@ -0,0 +1,296 @@ 39162@@ -0,0 +1,296 @@
39172+#include <linux/kernel.h> 39163+#include <linux/kernel.h>
39173+#include <linux/sched.h> 39164+#include <linux/sched.h>
@@ -39465,9 +39456,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_log.c linux-2.6.32.9/grsecurity/grsec
39465+ gr_log_end(audit); 39456+ gr_log_end(audit);
39466+ END_LOCKS(audit); 39457+ END_LOCKS(audit);
39467+} 39458+}
39468diff -urNp linux-2.6.32.9/grsecurity/grsec_mem.c linux-2.6.32.9/grsecurity/grsec_mem.c 39459diff -urNp linux-2.6.32.10/grsecurity/grsec_mem.c linux-2.6.32.10/grsecurity/grsec_mem.c
39469--- linux-2.6.32.9/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 39460--- linux-2.6.32.10/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
39470+++ linux-2.6.32.9/grsecurity/grsec_mem.c 2010-03-11 20:25:00.209634770 -0500 39461+++ linux-2.6.32.10/grsecurity/grsec_mem.c 2010-03-20 15:58:47.148627499 -0400
39471@@ -0,0 +1,85 @@ 39462@@ -0,0 +1,85 @@
39472+#include <linux/kernel.h> 39463+#include <linux/kernel.h>
39473+#include <linux/sched.h> 39464+#include <linux/sched.h>
@@ -39554,9 +39545,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_mem.c linux-2.6.32.9/grsecurity/grsec
39554+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); 39545+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
39555+ return; 39546+ return;
39556+} 39547+}
39557diff -urNp linux-2.6.32.9/grsecurity/grsec_mount.c linux-2.6.32.9/grsecurity/grsec_mount.c 39548diff -urNp linux-2.6.32.10/grsecurity/grsec_mount.c linux-2.6.32.10/grsecurity/grsec_mount.c
39558--- linux-2.6.32.9/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 39549--- linux-2.6.32.10/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
39559+++ linux-2.6.32.9/grsecurity/grsec_mount.c 2010-03-11 20:25:00.221631311 -0500 39550+++ linux-2.6.32.10/grsecurity/grsec_mount.c 2010-03-20 15:58:47.148627499 -0400
39560@@ -0,0 +1,62 @@ 39551@@ -0,0 +1,62 @@
39561+#include <linux/kernel.h> 39552+#include <linux/kernel.h>
39562+#include <linux/sched.h> 39553+#include <linux/sched.h>
@@ -39620,9 +39611,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_mount.c linux-2.6.32.9/grsecurity/grs
39620+#endif 39611+#endif
39621+ return 0; 39612+ return 0;
39622+} 39613+}
39623diff -urNp linux-2.6.32.9/grsecurity/grsec_ptrace.c linux-2.6.32.9/grsecurity/grsec_ptrace.c 39614diff -urNp linux-2.6.32.10/grsecurity/grsec_ptrace.c linux-2.6.32.10/grsecurity/grsec_ptrace.c
39624--- linux-2.6.32.9/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 39615--- linux-2.6.32.10/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
39625+++ linux-2.6.32.9/grsecurity/grsec_ptrace.c 2010-03-11 20:25:00.221631311 -0500 39616+++ linux-2.6.32.10/grsecurity/grsec_ptrace.c 2010-03-20 15:58:47.148627499 -0400
39626@@ -0,0 +1,14 @@ 39617@@ -0,0 +1,14 @@
39627+#include <linux/kernel.h> 39618+#include <linux/kernel.h>
39628+#include <linux/sched.h> 39619+#include <linux/sched.h>
@@ -39638,9 +39629,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_ptrace.c linux-2.6.32.9/grsecurity/gr
39638+#endif 39629+#endif
39639+ return; 39630+ return;
39640+} 39631+}
39641diff -urNp linux-2.6.32.9/grsecurity/grsec_sig.c linux-2.6.32.9/grsecurity/grsec_sig.c 39632diff -urNp linux-2.6.32.10/grsecurity/grsec_sig.c linux-2.6.32.10/grsecurity/grsec_sig.c
39642--- linux-2.6.32.9/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 39633--- linux-2.6.32.10/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
39643+++ linux-2.6.32.9/grsecurity/grsec_sig.c 2010-03-11 20:25:00.221631311 -0500 39634+++ linux-2.6.32.10/grsecurity/grsec_sig.c 2010-03-20 15:58:47.148627499 -0400
39644@@ -0,0 +1,65 @@ 39635@@ -0,0 +1,65 @@
39645+#include <linux/kernel.h> 39636+#include <linux/kernel.h>
39646+#include <linux/sched.h> 39637+#include <linux/sched.h>
@@ -39707,9 +39698,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_sig.c linux-2.6.32.9/grsecurity/grsec
39707+ return; 39698+ return;
39708+} 39699+}
39709+ 39700+
39710diff -urNp linux-2.6.32.9/grsecurity/grsec_sock.c linux-2.6.32.9/grsecurity/grsec_sock.c 39701diff -urNp linux-2.6.32.10/grsecurity/grsec_sock.c linux-2.6.32.10/grsecurity/grsec_sock.c
39711--- linux-2.6.32.9/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 39702--- linux-2.6.32.10/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
39712+++ linux-2.6.32.9/grsecurity/grsec_sock.c 2010-03-11 20:25:00.221631311 -0500 39703+++ linux-2.6.32.10/grsecurity/grsec_sock.c 2010-03-20 15:58:47.148627499 -0400
39713@@ -0,0 +1,271 @@ 39704@@ -0,0 +1,271 @@
39714+#include <linux/kernel.h> 39705+#include <linux/kernel.h>
39715+#include <linux/module.h> 39706+#include <linux/module.h>
@@ -39982,10 +39973,10 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_sock.c linux-2.6.32.9/grsecurity/grse
39982+ return current_cap(); 39973+ return current_cap();
39983+#endif 39974+#endif
39984+} 39975+}
39985diff -urNp linux-2.6.32.9/grsecurity/grsec_sysctl.c linux-2.6.32.9/grsecurity/grsec_sysctl.c 39976diff -urNp linux-2.6.32.10/grsecurity/grsec_sysctl.c linux-2.6.32.10/grsecurity/grsec_sysctl.c
39986--- linux-2.6.32.9/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 39977--- linux-2.6.32.10/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
39987+++ linux-2.6.32.9/grsecurity/grsec_sysctl.c 2010-03-11 20:25:00.221631311 -0500 39978+++ linux-2.6.32.10/grsecurity/grsec_sysctl.c 2010-03-20 16:11:50.117003314 -0400
39988@@ -0,0 +1,429 @@ 39979@@ -0,0 +1,447 @@
39989+#include <linux/kernel.h> 39980+#include <linux/kernel.h>
39990+#include <linux/sched.h> 39981+#include <linux/sched.h>
39991+#include <linux/sysctl.h> 39982+#include <linux/sysctl.h>
@@ -40041,6 +40032,24 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_sysctl.c linux-2.6.32.9/grsecurity/gr
40041+ .proc_handler = &proc_dointvec, 40032+ .proc_handler = &proc_dointvec,
40042+ }, 40033+ },
40043+#endif 40034+#endif
40035+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
40036+ {
40037+ .ctl_name = CTL_UNNUMBERED,
40038+ .procname = "ip_blackhole",
40039+ .data = &grsec_enable_blackhole,
40040+ .maxlen = sizeof(int),
40041+ .mode = 0600,
40042+ .proc_handler = &proc_dointvec,
40043+ },
40044+ {
40045+ .ctl_name = CTL_UNNUMBERED,
40046+ .procname = "lastack_retries",
40047+ .data = &grsec_lastack_retries,
40048+ .maxlen = sizeof(int),
40049+ .mode = 0600,
40050+ .proc_handler = &proc_dointvec,
40051+ },
40052+#endif
40044+#ifdef CONFIG_GRKERNSEC_EXECLOG 40053+#ifdef CONFIG_GRKERNSEC_EXECLOG
40045+ { 40054+ {
40046+ .ctl_name = CTL_UNNUMBERED, 40055+ .ctl_name = CTL_UNNUMBERED,
@@ -40415,9 +40424,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_sysctl.c linux-2.6.32.9/grsecurity/gr
40415+ { .ctl_name = 0 } 40424+ { .ctl_name = 0 }
40416+}; 40425+};
40417+#endif 40426+#endif
40418diff -urNp linux-2.6.32.9/grsecurity/grsec_textrel.c linux-2.6.32.9/grsecurity/grsec_textrel.c 40427diff -urNp linux-2.6.32.10/grsecurity/grsec_textrel.c linux-2.6.32.10/grsecurity/grsec_textrel.c
40419--- linux-2.6.32.9/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 40428--- linux-2.6.32.10/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
40420+++ linux-2.6.32.9/grsecurity/grsec_textrel.c 2010-03-11 20:25:00.221631311 -0500 40429+++ linux-2.6.32.10/grsecurity/grsec_textrel.c 2010-03-20 15:58:47.148627499 -0400
40421@@ -0,0 +1,16 @@ 40430@@ -0,0 +1,16 @@
40422+#include <linux/kernel.h> 40431+#include <linux/kernel.h>
40423+#include <linux/sched.h> 40432+#include <linux/sched.h>
@@ -40435,9 +40444,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_textrel.c linux-2.6.32.9/grsecurity/g
40435+#endif 40444+#endif
40436+ return; 40445+ return;
40437+} 40446+}
40438diff -urNp linux-2.6.32.9/grsecurity/grsec_time.c linux-2.6.32.9/grsecurity/grsec_time.c 40447diff -urNp linux-2.6.32.10/grsecurity/grsec_time.c linux-2.6.32.10/grsecurity/grsec_time.c
40439--- linux-2.6.32.9/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 40448--- linux-2.6.32.10/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
40440+++ linux-2.6.32.9/grsecurity/grsec_time.c 2010-03-11 20:25:00.221631311 -0500 40449+++ linux-2.6.32.10/grsecurity/grsec_time.c 2010-03-20 15:58:47.148627499 -0400
40441@@ -0,0 +1,13 @@ 40450@@ -0,0 +1,13 @@
40442+#include <linux/kernel.h> 40451+#include <linux/kernel.h>
40443+#include <linux/sched.h> 40452+#include <linux/sched.h>
@@ -40452,9 +40461,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_time.c linux-2.6.32.9/grsecurity/grse
40452+#endif 40461+#endif
40453+ return; 40462+ return;
40454+} 40463+}
40455diff -urNp linux-2.6.32.9/grsecurity/grsec_tpe.c linux-2.6.32.9/grsecurity/grsec_tpe.c 40464diff -urNp linux-2.6.32.10/grsecurity/grsec_tpe.c linux-2.6.32.10/grsecurity/grsec_tpe.c
40456--- linux-2.6.32.9/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 40465--- linux-2.6.32.10/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
40457+++ linux-2.6.32.9/grsecurity/grsec_tpe.c 2010-03-11 20:25:00.221631311 -0500 40466+++ linux-2.6.32.10/grsecurity/grsec_tpe.c 2010-03-20 15:58:47.148627499 -0400
40458@@ -0,0 +1,38 @@ 40467@@ -0,0 +1,38 @@
40459+#include <linux/kernel.h> 40468+#include <linux/kernel.h>
40460+#include <linux/sched.h> 40469+#include <linux/sched.h>
@@ -40494,9 +40503,9 @@ diff -urNp linux-2.6.32.9/grsecurity/grsec_tpe.c linux-2.6.32.9/grsecurity/grsec
40494+#endif 40503+#endif
40495+ return 1; 40504+ return 1;
40496+} 40505+}
40497diff -urNp linux-2.6.32.9/grsecurity/grsum.c linux-2.6.32.9/grsecurity/grsum.c 40506diff -urNp linux-2.6.32.10/grsecurity/grsum.c linux-2.6.32.10/grsecurity/grsum.c
40498--- linux-2.6.32.9/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 40507--- linux-2.6.32.10/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
40499+++ linux-2.6.32.9/grsecurity/grsum.c 2010-03-11 20:25:00.221631311 -0500 40508+++ linux-2.6.32.10/grsecurity/grsum.c 2010-03-20 15:58:47.148627499 -0400
40500@@ -0,0 +1,59 @@ 40509@@ -0,0 +1,59 @@
40501+#include <linux/err.h> 40510+#include <linux/err.h>
40502+#include <linux/kernel.h> 40511+#include <linux/kernel.h>
@@ -40557,10 +40566,10 @@ diff -urNp linux-2.6.32.9/grsecurity/grsum.c linux-2.6.32.9/grsecurity/grsum.c
40557+ 40566+
40558+ return retval; 40567+ return retval;
40559+} 40568+}
40560diff -urNp linux-2.6.32.9/grsecurity/Kconfig linux-2.6.32.9/grsecurity/Kconfig 40569diff -urNp linux-2.6.32.10/grsecurity/Kconfig linux-2.6.32.10/grsecurity/Kconfig
40561--- linux-2.6.32.9/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 40570--- linux-2.6.32.10/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
40562+++ linux-2.6.32.9/grsecurity/Kconfig 2010-03-11 20:25:00.221631311 -0500 40571+++ linux-2.6.32.10/grsecurity/Kconfig 2010-03-20 16:35:58.913398417 -0400
40563@@ -0,0 +1,944 @@ 40572@@ -0,0 +1,965 @@
40564+# 40573+#
40565+# grecurity configuration 40574+# grecurity configuration
40566+# 40575+#
@@ -41372,7 +41381,7 @@ diff -urNp linux-2.6.32.9/grsecurity/Kconfig linux-2.6.32.9/grsecurity/Kconfig
41372+ /proc/sys/kernel/random/poolsize. 41381+ /proc/sys/kernel/random/poolsize.
41373+ 41382+
41374+config GRKERNSEC_BLACKHOLE 41383+config GRKERNSEC_BLACKHOLE
41375+ bool "TCP/UDP blackhole" 41384+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
41376+ help 41385+ help
41377+ If you say Y here, neither TCP resets nor ICMP 41386+ If you say Y here, neither TCP resets nor ICMP
41378+ destination-unreachable packets will be sent in response to packets 41387+ destination-unreachable packets will be sent in response to packets
@@ -41382,6 +41391,27 @@ diff -urNp linux-2.6.32.9/grsecurity/Kconfig linux-2.6.32.9/grsecurity/Kconfig
41382+ makes a host more resilient to DoS attacks and reduces network 41391+ makes a host more resilient to DoS attacks and reduces network
41383+ visibility against scanners. 41392+ visibility against scanners.
41384+ 41393+
41394+ The blackhole feature as-implemented is equivalent to the FreeBSD
41395+ blackhole feature, as prevents RST responses to all packets, not
41396+ just SYNs. Under most application behavior this causes no
41397+ problems, but applications (like haproxy) may not close certain
41398+ connections in a way that cleanly terminates them on the remote
41399+ end, leaving the remote host in LAST_ACK state. Because of this
41400+ side-effect and to prevent intentional LAST_ACK DoSes, this
41401+ feature also adds automatic mitigation against such attacks.
41402+ The mitigation drastically reduces the amount of time a socket
41403+ can spend in LAST_ACK state. If you're using haproxy and not
41404+ all servers it connects to have this option enabled, consider
41405+ disabling this feature on the haproxy host.
41406+
41407+ If this option is enabled, two sysctl options with names
41408+ "ip_blackhole" and "lastack_retries" will be created.
41409+ While "ip_blackhole" takes the standard zero/non-zero on/off
41410+ toggle, "lastack_retries" uses the same kinds of values as
41411+ "tcp_retries1" and "tcp_retries2". The default value of 4
41412+ prevents a socket from lasting more than 45 seconds in LAST_ACK
41413+ state.
41414+
41385+config GRKERNSEC_SOCKET 41415+config GRKERNSEC_SOCKET
41386+ bool "Socket restrictions" 41416+ bool "Socket restrictions"
41387+ help 41417+ help
@@ -41505,9 +41535,9 @@ diff -urNp linux-2.6.32.9/grsecurity/Kconfig linux-2.6.32.9/grsecurity/Kconfig
41505+endmenu 41535+endmenu
41506+ 41536+
41507+endmenu 41537+endmenu
41508diff -urNp linux-2.6.32.9/grsecurity/Makefile linux-2.6.32.9/grsecurity/Makefile 41538diff -urNp linux-2.6.32.10/grsecurity/Makefile linux-2.6.32.10/grsecurity/Makefile
41509--- linux-2.6.32.9/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 41539--- linux-2.6.32.10/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
41510+++ linux-2.6.32.9/grsecurity/Makefile 2010-03-11 20:25:00.221631311 -0500 41540+++ linux-2.6.32.10/grsecurity/Makefile 2010-03-20 15:58:47.148627499 -0400
41511@@ -0,0 +1,29 @@ 41541@@ -0,0 +1,29 @@
41512+# grsecurity's ACL system was originally written in 2001 by Michael Dalton 41542+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
41513+# during 2001-2009 it has been completely redesigned by Brad Spengler 41543+# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -41538,9 +41568,9 @@ diff -urNp linux-2.6.32.9/grsecurity/Makefile linux-2.6.32.9/grsecurity/Makefile
41538+ @-chmod -f 700 . 41568+ @-chmod -f 700 .
41539+ @echo ' grsec: protected kernel image paths' 41569+ @echo ' grsec: protected kernel image paths'
41540+endif 41570+endif
41541diff -urNp linux-2.6.32.9/include/acpi/acpi_drivers.h linux-2.6.32.9/include/acpi/acpi_drivers.h 41571diff -urNp linux-2.6.32.10/include/acpi/acpi_drivers.h linux-2.6.32.10/include/acpi/acpi_drivers.h
41542--- linux-2.6.32.9/include/acpi/acpi_drivers.h 2010-02-23 10:38:51.000000000 -0500 41572--- linux-2.6.32.10/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400
41543+++ linux-2.6.32.9/include/acpi/acpi_drivers.h 2010-03-11 20:25:00.221631311 -0500 41573+++ linux-2.6.32.10/include/acpi/acpi_drivers.h 2010-03-20 15:58:47.152569927 -0400
41544@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp 41574@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
41545 Dock Station 41575 Dock Station
41546 -------------------------------------------------------------------------- */ 41576 -------------------------------------------------------------------------- */
@@ -41570,9 +41600,9 @@ diff -urNp linux-2.6.32.9/include/acpi/acpi_drivers.h linux-2.6.32.9/include/acp
41570 void *context) 41600 void *context)
41571 { 41601 {
41572 return -ENODEV; 41602 return -ENODEV;
41573diff -urNp linux-2.6.32.9/include/asm-generic/atomic-long.h linux-2.6.32.9/include/asm-generic/atomic-long.h 41603diff -urNp linux-2.6.32.10/include/asm-generic/atomic-long.h linux-2.6.32.10/include/asm-generic/atomic-long.h
41574--- linux-2.6.32.9/include/asm-generic/atomic-long.h 2010-02-23 10:38:51.000000000 -0500 41604--- linux-2.6.32.10/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400
41575+++ linux-2.6.32.9/include/asm-generic/atomic-long.h 2010-03-11 20:25:00.221631311 -0500 41605+++ linux-2.6.32.10/include/asm-generic/atomic-long.h 2010-03-20 15:58:47.152569927 -0400
41576@@ -22,6 +22,12 @@ 41606@@ -22,6 +22,12 @@
41577 41607
41578 typedef atomic64_t atomic_long_t; 41608 typedef atomic64_t atomic_long_t;
@@ -41793,9 +41823,9 @@ diff -urNp linux-2.6.32.9/include/asm-generic/atomic-long.h linux-2.6.32.9/inclu
41793+#endif 41823+#endif
41794+ 41824+
41795 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ 41825 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
41796diff -urNp linux-2.6.32.9/include/asm-generic/dma-mapping-common.h linux-2.6.32.9/include/asm-generic/dma-mapping-common.h 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
41797--- linux-2.6.32.9/include/asm-generic/dma-mapping-common.h 2010-02-23 10:38:51.000000000 -0500 41827--- linux-2.6.32.10/include/asm-generic/dma-mapping-common.h 2010-03-15 11:52:04.000000000 -0400
41798+++ linux-2.6.32.9/include/asm-generic/dma-mapping-common.h 2010-03-11 20:25:00.221631311 -0500 41828+++ linux-2.6.32.10/include/asm-generic/dma-mapping-common.h 2010-03-20 15:58:47.152569927 -0400
41799@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ 41829@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
41800 enum dma_data_direction dir, 41830 enum dma_data_direction dir,
41801 struct dma_attrs *attrs) 41831 struct dma_attrs *attrs)
@@ -41904,9 +41934,9 @@ diff -urNp linux-2.6.32.9/include/asm-generic/dma-mapping-common.h linux-2.6.32.
41904 41934
41905 BUG_ON(!valid_dma_direction(dir)); 41935 BUG_ON(!valid_dma_direction(dir));
41906 if (ops->sync_sg_for_device) 41936 if (ops->sync_sg_for_device)
41907diff -urNp linux-2.6.32.9/include/asm-generic/futex.h linux-2.6.32.9/include/asm-generic/futex.h 41937diff -urNp linux-2.6.32.10/include/asm-generic/futex.h linux-2.6.32.10/include/asm-generic/futex.h
41908--- linux-2.6.32.9/include/asm-generic/futex.h 2010-02-23 10:38:51.000000000 -0500 41938--- linux-2.6.32.10/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400
41909+++ linux-2.6.32.9/include/asm-generic/futex.h 2010-03-11 20:25:00.221631311 -0500 41939+++ linux-2.6.32.10/include/asm-generic/futex.h 2010-03-20 15:58:47.152569927 -0400
41910@@ -6,7 +6,7 @@ 41940@@ -6,7 +6,7 @@
41911 #include <asm/errno.h> 41941 #include <asm/errno.h>
41912 41942
@@ -41925,9 +41955,9 @@ diff -urNp linux-2.6.32.9/include/asm-generic/futex.h linux-2.6.32.9/include/asm
41925 { 41955 {
41926 return -ENOSYS; 41956 return -ENOSYS;
41927 } 41957 }
41928diff -urNp linux-2.6.32.9/include/asm-generic/int-l64.h linux-2.6.32.9/include/asm-generic/int-l64.h 41958diff -urNp linux-2.6.32.10/include/asm-generic/int-l64.h linux-2.6.32.10/include/asm-generic/int-l64.h
41929--- linux-2.6.32.9/include/asm-generic/int-l64.h 2010-02-23 10:38:51.000000000 -0500 41959--- linux-2.6.32.10/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400
41930+++ linux-2.6.32.9/include/asm-generic/int-l64.h 2010-03-11 20:25:00.221631311 -0500 41960+++ linux-2.6.32.10/include/asm-generic/int-l64.h 2010-03-20 15:58:47.152569927 -0400
41931@@ -46,6 +46,8 @@ typedef unsigned int u32; 41961@@ -46,6 +46,8 @@ typedef unsigned int u32;
41932 typedef signed long s64; 41962 typedef signed long s64;
41933 typedef unsigned long u64; 41963 typedef unsigned long u64;
@@ -41937,9 +41967,9 @@ diff -urNp linux-2.6.32.9/include/asm-generic/int-l64.h linux-2.6.32.9/include/a
41937 #define S8_C(x) x 41967 #define S8_C(x) x
41938 #define U8_C(x) x ## U 41968 #define U8_C(x) x ## U
41939 #define S16_C(x) x 41969 #define S16_C(x) x
41940diff -urNp linux-2.6.32.9/include/asm-generic/int-ll64.h linux-2.6.32.9/include/asm-generic/int-ll64.h 41970diff -urNp linux-2.6.32.10/include/asm-generic/int-ll64.h linux-2.6.32.10/include/asm-generic/int-ll64.h
41941--- linux-2.6.32.9/include/asm-generic/int-ll64.h 2010-02-23 10:38:51.000000000 -0500 41971--- linux-2.6.32.10/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400
41942+++ linux-2.6.32.9/include/asm-generic/int-ll64.h 2010-03-11 20:25:00.221631311 -0500 41972+++ linux-2.6.32.10/include/asm-generic/int-ll64.h 2010-03-20 15:58:47.152569927 -0400
41943@@ -51,6 +51,8 @@ typedef unsigned int u32; 41973@@ -51,6 +51,8 @@ typedef unsigned int u32;
41944 typedef signed long long s64; 41974 typedef signed long long s64;
41945 typedef unsigned long long u64; 41975 typedef unsigned long long u64;
@@ -41949,9 +41979,9 @@ diff -urNp linux-2.6.32.9/include/asm-generic/int-ll64.h linux-2.6.32.9/include/
41949 #define S8_C(x) x 41979 #define S8_C(x) x
41950 #define U8_C(x) x ## U 41980 #define U8_C(x) x ## U
41951 #define S16_C(x) x 41981 #define S16_C(x) x
41952diff -urNp linux-2.6.32.9/include/asm-generic/kmap_types.h linux-2.6.32.9/include/asm-generic/kmap_types.h 41982diff -urNp linux-2.6.32.10/include/asm-generic/kmap_types.h linux-2.6.32.10/include/asm-generic/kmap_types.h
41953--- linux-2.6.32.9/include/asm-generic/kmap_types.h 2010-02-23 10:38:51.000000000 -0500 41983--- linux-2.6.32.10/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
41954+++ linux-2.6.32.9/include/asm-generic/kmap_types.h 2010-03-11 20:25:00.221631311 -0500 41984+++ linux-2.6.32.10/include/asm-generic/kmap_types.h 2010-03-20 15:58:47.152569927 -0400
41955@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, 41985@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
41956 KMAP_D(16) KM_IRQ_PTE, 41986 KMAP_D(16) KM_IRQ_PTE,
41957 KMAP_D(17) KM_NMI, 41987 KMAP_D(17) KM_NMI,
@@ -41962,9 +41992,9 @@ diff -urNp linux-2.6.32.9/include/asm-generic/kmap_types.h linux-2.6.32.9/includ
41962 }; 41992 };
41963 41993
41964 #undef KMAP_D 41994 #undef KMAP_D
41965diff -urNp linux-2.6.32.9/include/asm-generic/pgtable.h linux-2.6.32.9/include/asm-generic/pgtable.h 41995diff -urNp linux-2.6.32.10/include/asm-generic/pgtable.h linux-2.6.32.10/include/asm-generic/pgtable.h
41966--- linux-2.6.32.9/include/asm-generic/pgtable.h 2010-02-23 10:38:51.000000000 -0500 41996--- linux-2.6.32.10/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400
41967+++ linux-2.6.32.9/include/asm-generic/pgtable.h 2010-03-11 20:25:00.221631311 -0500 41997+++ linux-2.6.32.10/include/asm-generic/pgtable.h 2010-03-20 15:58:47.152569927 -0400
41968@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar 41998@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
41969 unsigned long size); 41999 unsigned long size);
41970 #endif 42000 #endif
@@ -41980,9 +42010,9 @@ diff -urNp linux-2.6.32.9/include/asm-generic/pgtable.h linux-2.6.32.9/include/a
41980 #endif /* !__ASSEMBLY__ */ 42010 #endif /* !__ASSEMBLY__ */
41981 42011
41982 #endif /* _ASM_GENERIC_PGTABLE_H */ 42012 #endif /* _ASM_GENERIC_PGTABLE_H */
41983diff -urNp linux-2.6.32.9/include/asm-generic/vmlinux.lds.h linux-2.6.32.9/include/asm-generic/vmlinux.lds.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
41984--- linux-2.6.32.9/include/asm-generic/vmlinux.lds.h 2010-02-23 10:38:51.000000000 -0500 42014--- linux-2.6.32.10/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400
41985+++ linux-2.6.32.9/include/asm-generic/vmlinux.lds.h 2010-03-11 20:25:00.221631311 -0500 42015+++ linux-2.6.32.10/include/asm-generic/vmlinux.lds.h 2010-03-20 15:58:47.152569927 -0400
41986@@ -199,6 +199,7 @@ 42016@@ -199,6 +199,7 @@
41987 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ 42017 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
41988 VMLINUX_SYMBOL(__start_rodata) = .; \ 42018 VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -42021,9 +42051,9 @@ diff -urNp linux-2.6.32.9/include/asm-generic/vmlinux.lds.h linux-2.6.32.9/inclu
42021 42051
42022 /** 42052 /**
42023 * PERCPU - define output section for percpu area, simple version 42053 * PERCPU - define output section for percpu area, simple version
42024diff -urNp linux-2.6.32.9/include/drm/drm_pciids.h linux-2.6.32.9/include/drm/drm_pciids.h 42054diff -urNp linux-2.6.32.10/include/drm/drm_pciids.h linux-2.6.32.10/include/drm/drm_pciids.h
42025--- linux-2.6.32.9/include/drm/drm_pciids.h 2010-02-23 10:38:51.000000000 -0500 42055--- linux-2.6.32.10/include/drm/drm_pciids.h 2010-03-15 11:52:04.000000000 -0400
42026+++ linux-2.6.32.9/include/drm/drm_pciids.h 2010-03-11 20:25:00.221631311 -0500 42056+++ linux-2.6.32.10/include/drm/drm_pciids.h 2010-03-20 15:58:47.152569927 -0400
42027@@ -375,7 +375,7 @@ 42057@@ -375,7 +375,7 @@
42028 {0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 42058 {0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
42029 {0x1002, 0x9713, 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}, \
@@ -42127,9 +42157,9 @@ diff -urNp linux-2.6.32.9/include/drm/drm_pciids.h linux-2.6.32.9/include/drm/dr
42127 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 42157 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
42128- {0, 0, 0} 42158- {0, 0, 0}
42129+ {0, 0, 0, 0, 0, 0} 42159+ {0, 0, 0, 0, 0, 0}
42130diff -urNp linux-2.6.32.9/include/drm/drmP.h linux-2.6.32.9/include/drm/drmP.h 42160diff -urNp linux-2.6.32.10/include/drm/drmP.h linux-2.6.32.10/include/drm/drmP.h
42131--- linux-2.6.32.9/include/drm/drmP.h 2010-02-23 10:38:51.000000000 -0500 42161--- linux-2.6.32.10/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400
42132+++ linux-2.6.32.9/include/drm/drmP.h 2010-03-11 20:25:00.225639644 -0500 42162+++ linux-2.6.32.10/include/drm/drmP.h 2010-03-20 15:58:47.152569927 -0400
42133@@ -814,7 +814,7 @@ struct drm_driver { 42163@@ -814,7 +814,7 @@ struct drm_driver {
42134 void (*vgaarb_irq)(struct drm_device *dev, bool state); 42164 void (*vgaarb_irq)(struct drm_device *dev, bool state);
42135 42165
@@ -42157,9 +42187,9 @@ diff -urNp linux-2.6.32.9/include/drm/drmP.h linux-2.6.32.9/include/drm/drmP.h
42157 /*@} */ 42187 /*@} */
42158 42188
42159 struct list_head filelist; 42189 struct list_head filelist;
42160diff -urNp linux-2.6.32.9/include/linux/a.out.h linux-2.6.32.9/include/linux/a.out.h 42190diff -urNp linux-2.6.32.10/include/linux/a.out.h linux-2.6.32.10/include/linux/a.out.h
42161--- linux-2.6.32.9/include/linux/a.out.h 2010-02-23 10:38:51.000000000 -0500 42191--- linux-2.6.32.10/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400
42162+++ linux-2.6.32.9/include/linux/a.out.h 2010-03-11 20:25:00.225639644 -0500 42192+++ linux-2.6.32.10/include/linux/a.out.h 2010-03-20 15:58:47.152569927 -0400
42163@@ -39,6 +39,14 @@ enum machine_type { 42193@@ -39,6 +39,14 @@ enum machine_type {
42164 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ 42194 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
42165 }; 42195 };
@@ -42175,9 +42205,9 @@ diff -urNp linux-2.6.32.9/include/linux/a.out.h linux-2.6.32.9/include/linux/a.o
42175 #if !defined (N_MAGIC) 42205 #if !defined (N_MAGIC)
42176 #define N_MAGIC(exec) ((exec).a_info & 0xffff) 42206 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
42177 #endif 42207 #endif
42178diff -urNp linux-2.6.32.9/include/linux/atmdev.h linux-2.6.32.9/include/linux/atmdev.h 42208diff -urNp linux-2.6.32.10/include/linux/atmdev.h linux-2.6.32.10/include/linux/atmdev.h
42179--- linux-2.6.32.9/include/linux/atmdev.h 2010-02-23 10:38:51.000000000 -0500 42209--- linux-2.6.32.10/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400
42180+++ linux-2.6.32.9/include/linux/atmdev.h 2010-03-11 20:25:00.225639644 -0500 42210+++ linux-2.6.32.10/include/linux/atmdev.h 2010-03-20 15:58:47.152569927 -0400
42181@@ -237,7 +237,7 @@ struct compat_atm_iobuf { 42211@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
42182 #endif 42212 #endif
42183 42213
@@ -42187,9 +42217,9 @@ diff -urNp linux-2.6.32.9/include/linux/atmdev.h linux-2.6.32.9/include/linux/at
42187 __AAL_STAT_ITEMS 42217 __AAL_STAT_ITEMS
42188 #undef __HANDLE_ITEM 42218 #undef __HANDLE_ITEM
42189 }; 42219 };
42190diff -urNp linux-2.6.32.9/include/linux/backlight.h linux-2.6.32.9/include/linux/backlight.h 42220diff -urNp linux-2.6.32.10/include/linux/backlight.h linux-2.6.32.10/include/linux/backlight.h
42191--- linux-2.6.32.9/include/linux/backlight.h 2010-02-23 10:38:51.000000000 -0500 42221--- linux-2.6.32.10/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400
42192+++ linux-2.6.32.9/include/linux/backlight.h 2010-03-11 20:25:00.225639644 -0500 42222+++ linux-2.6.32.10/include/linux/backlight.h 2010-03-20 15:58:47.152569927 -0400
42193@@ -36,18 +36,18 @@ struct backlight_device; 42223@@ -36,18 +36,18 @@ struct backlight_device;
42194 struct fb_info; 42224 struct fb_info;
42195 42225
@@ -42231,9 +42261,9 @@ diff -urNp linux-2.6.32.9/include/linux/backlight.h linux-2.6.32.9/include/linux
42231 extern void backlight_device_unregister(struct backlight_device *bd); 42261 extern void backlight_device_unregister(struct backlight_device *bd);
42232 extern void backlight_force_update(struct backlight_device *bd, 42262 extern void backlight_force_update(struct backlight_device *bd,
42233 enum backlight_update_reason reason); 42263 enum backlight_update_reason reason);
42234diff -urNp linux-2.6.32.9/include/linux/binfmts.h linux-2.6.32.9/include/linux/binfmts.h 42264diff -urNp linux-2.6.32.10/include/linux/binfmts.h linux-2.6.32.10/include/linux/binfmts.h
42235--- linux-2.6.32.9/include/linux/binfmts.h 2010-02-23 10:38:51.000000000 -0500 42265--- linux-2.6.32.10/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400
42236+++ linux-2.6.32.9/include/linux/binfmts.h 2010-03-11 20:25:00.225639644 -0500 42266+++ linux-2.6.32.10/include/linux/binfmts.h 2010-03-20 15:58:47.152569927 -0400
42237@@ -78,6 +78,7 @@ struct linux_binfmt { 42267@@ -78,6 +78,7 @@ struct linux_binfmt {
42238 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); 42268 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
42239 int (*load_shlib)(struct file *); 42269 int (*load_shlib)(struct file *);
@@ -42242,9 +42272,9 @@ diff -urNp linux-2.6.32.9/include/linux/binfmts.h linux-2.6.32.9/include/linux/b
42242 unsigned long min_coredump; /* minimal dump size */ 42272 unsigned long min_coredump; /* minimal dump size */
42243 int hasvdso; 42273 int hasvdso;
42244 }; 42274 };
42245diff -urNp linux-2.6.32.9/include/linux/blkdev.h linux-2.6.32.9/include/linux/blkdev.h 42275diff -urNp linux-2.6.32.10/include/linux/blkdev.h linux-2.6.32.10/include/linux/blkdev.h
42246--- linux-2.6.32.9/include/linux/blkdev.h 2010-02-23 10:38:51.000000000 -0500 42276--- linux-2.6.32.10/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400
42247+++ linux-2.6.32.9/include/linux/blkdev.h 2010-03-11 20:25:00.225639644 -0500 42277+++ linux-2.6.32.10/include/linux/blkdev.h 2010-03-20 15:58:47.152569927 -0400
42248@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc 42278@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc
42249 #endif /* CONFIG_BLK_DEV_INTEGRITY */ 42279 #endif /* CONFIG_BLK_DEV_INTEGRITY */
42250 42280
@@ -42276,9 +42306,9 @@ diff -urNp linux-2.6.32.9/include/linux/blkdev.h linux-2.6.32.9/include/linux/bl
42276 }; 42306 };
42277 42307
42278 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, 42308 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
42279diff -urNp linux-2.6.32.9/include/linux/cache.h linux-2.6.32.9/include/linux/cache.h 42309diff -urNp linux-2.6.32.10/include/linux/cache.h linux-2.6.32.10/include/linux/cache.h
42280--- linux-2.6.32.9/include/linux/cache.h 2010-02-23 10:38:51.000000000 -0500 42310--- linux-2.6.32.10/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400
42281+++ linux-2.6.32.9/include/linux/cache.h 2010-03-11 20:25:00.225639644 -0500 42311+++ linux-2.6.32.10/include/linux/cache.h 2010-03-20 15:58:47.152569927 -0400
42282@@ -16,6 +16,10 @@ 42312@@ -16,6 +16,10 @@
42283 #define __read_mostly 42313 #define __read_mostly
42284 #endif 42314 #endif
@@ -42290,9 +42320,9 @@ diff -urNp linux-2.6.32.9/include/linux/cache.h linux-2.6.32.9/include/linux/cac
42290 #ifndef ____cacheline_aligned 42320 #ifndef ____cacheline_aligned
42291 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) 42321 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
42292 #endif 42322 #endif
42293diff -urNp linux-2.6.32.9/include/linux/capability.h linux-2.6.32.9/include/linux/capability.h 42323diff -urNp linux-2.6.32.10/include/linux/capability.h linux-2.6.32.10/include/linux/capability.h
42294--- linux-2.6.32.9/include/linux/capability.h 2010-02-23 10:38:51.000000000 -0500 42324--- linux-2.6.32.10/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400
42295+++ linux-2.6.32.9/include/linux/capability.h 2010-03-11 20:25:00.225639644 -0500 42325+++ linux-2.6.32.10/include/linux/capability.h 2010-03-20 15:58:47.152569927 -0400
42296@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff 42326@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
42297 (security_real_capable_noaudit((t), (cap)) == 0) 42327 (security_real_capable_noaudit((t), (cap)) == 0)
42298 42328
@@ -42301,9 +42331,9 @@ diff -urNp linux-2.6.32.9/include/linux/capability.h linux-2.6.32.9/include/linu
42301 42331
42302 /* audit system wants to get cap info from files as well */ 42332 /* audit system wants to get cap info from files as well */
42303 struct dentry; 42333 struct dentry;
42304diff -urNp linux-2.6.32.9/include/linux/compiler-gcc4.h linux-2.6.32.9/include/linux/compiler-gcc4.h 42334diff -urNp linux-2.6.32.10/include/linux/compiler-gcc4.h linux-2.6.32.10/include/linux/compiler-gcc4.h
42305--- linux-2.6.32.9/include/linux/compiler-gcc4.h 2010-02-23 10:38:51.000000000 -0500 42335--- linux-2.6.32.10/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400
42306+++ linux-2.6.32.9/include/linux/compiler-gcc4.h 2010-03-11 20:25:00.225639644 -0500 42336+++ linux-2.6.32.10/include/linux/compiler-gcc4.h 2010-03-20 15:58:47.152569927 -0400
42307@@ -36,4 +36,8 @@ 42337@@ -36,4 +36,8 @@
42308 the kernel context */ 42338 the kernel context */
42309 #define __cold __attribute__((__cold__)) 42339 #define __cold __attribute__((__cold__))
@@ -42313,9 +42343,9 @@ diff -urNp linux-2.6.32.9/include/linux/compiler-gcc4.h linux-2.6.32.9/include/l
42313+#define __bos0(ptr) __bos((ptr), 0) 42343+#define __bos0(ptr) __bos((ptr), 0)
42314+#define __bos1(ptr) __bos((ptr), 1) 42344+#define __bos1(ptr) __bos((ptr), 1)
42315 #endif 42345 #endif
42316diff -urNp linux-2.6.32.9/include/linux/compiler.h linux-2.6.32.9/include/linux/compiler.h 42346diff -urNp linux-2.6.32.10/include/linux/compiler.h linux-2.6.32.10/include/linux/compiler.h
42317--- linux-2.6.32.9/include/linux/compiler.h 2010-02-23 10:38:51.000000000 -0500 42347--- linux-2.6.32.10/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400
42318+++ linux-2.6.32.9/include/linux/compiler.h 2010-03-11 20:25:00.225639644 -0500 42348+++ linux-2.6.32.10/include/linux/compiler.h 2010-03-20 15:58:47.152569927 -0400
42319@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ 42349@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
42320 #define __cold 42350 #define __cold
42321 #endif 42351 #endif
@@ -42339,9 +42369,9 @@ diff -urNp linux-2.6.32.9/include/linux/compiler.h linux-2.6.32.9/include/linux/
42339 /* Simple shorthand for a section definition */ 42369 /* Simple shorthand for a section definition */
42340 #ifndef __section 42370 #ifndef __section
42341 # define __section(S) __attribute__ ((__section__(#S))) 42371 # define __section(S) __attribute__ ((__section__(#S)))
42342diff -urNp linux-2.6.32.9/include/linux/decompress/mm.h linux-2.6.32.9/include/linux/decompress/mm.h 42372diff -urNp linux-2.6.32.10/include/linux/decompress/mm.h linux-2.6.32.10/include/linux/decompress/mm.h
42343--- linux-2.6.32.9/include/linux/decompress/mm.h 2010-02-23 10:38:51.000000000 -0500 42373--- linux-2.6.32.10/include/linux/decompress/mm.h 2010-03-15 11:52:04.000000000 -0400
42344+++ linux-2.6.32.9/include/linux/decompress/mm.h 2010-03-11 20:25:00.225639644 -0500 42374+++ linux-2.6.32.10/include/linux/decompress/mm.h 2010-03-20 15:58:47.152569927 -0400
42345@@ -68,7 +68,7 @@ static void free(void *where) 42375@@ -68,7 +68,7 @@ static void free(void *where)
42346 * warnings when not needed (indeed large_malloc / large_free are not 42376 * warnings when not needed (indeed large_malloc / large_free are not
42347 * needed by inflate */ 42377 * needed by inflate */
@@ -42351,9 +42381,9 @@ diff -urNp linux-2.6.32.9/include/linux/decompress/mm.h linux-2.6.32.9/include/l
42351 #define free(a) kfree(a) 42381 #define free(a) kfree(a)
42352 42382
42353 #define large_malloc(a) vmalloc(a) 42383 #define large_malloc(a) vmalloc(a)
42354diff -urNp linux-2.6.32.9/include/linux/dma-mapping.h linux-2.6.32.9/include/linux/dma-mapping.h 42384diff -urNp linux-2.6.32.10/include/linux/dma-mapping.h linux-2.6.32.10/include/linux/dma-mapping.h
42355--- linux-2.6.32.9/include/linux/dma-mapping.h 2010-02-23 10:38:51.000000000 -0500 42385--- linux-2.6.32.10/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
42356+++ linux-2.6.32.9/include/linux/dma-mapping.h 2010-03-11 20:25:00.225639644 -0500 42386+++ linux-2.6.32.10/include/linux/dma-mapping.h 2010-03-20 15:58:47.152569927 -0400
42357@@ -16,50 +16,50 @@ enum dma_data_direction { 42387@@ -16,50 +16,50 @@ enum dma_data_direction {
42358 }; 42388 };
42359 42389
@@ -42420,9 +42450,9 @@ diff -urNp linux-2.6.32.9/include/linux/dma-mapping.h linux-2.6.32.9/include/lin
42420 }; 42450 };
42421 42451
42422 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) 42452 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
42423diff -urNp linux-2.6.32.9/include/linux/dst.h linux-2.6.32.9/include/linux/dst.h 42453diff -urNp linux-2.6.32.10/include/linux/dst.h linux-2.6.32.10/include/linux/dst.h
42424--- linux-2.6.32.9/include/linux/dst.h 2010-02-23 10:38:51.000000000 -0500 42454--- linux-2.6.32.10/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400
42425+++ linux-2.6.32.9/include/linux/dst.h 2010-03-11 20:25:00.225639644 -0500 42455+++ linux-2.6.32.10/include/linux/dst.h 2010-03-20 15:58:47.152569927 -0400
42426@@ -380,7 +380,7 @@ struct dst_node 42456@@ -380,7 +380,7 @@ struct dst_node
42427 struct thread_pool *pool; 42457 struct thread_pool *pool;
42428 42458
@@ -42432,9 +42462,9 @@ diff -urNp linux-2.6.32.9/include/linux/dst.h linux-2.6.32.9/include/linux/dst.h
42432 42462
42433 /* 42463 /*
42434 * How frequently and how many times transaction 42464 * How frequently and how many times transaction
42435diff -urNp linux-2.6.32.9/include/linux/elf.h linux-2.6.32.9/include/linux/elf.h 42465diff -urNp linux-2.6.32.10/include/linux/elf.h linux-2.6.32.10/include/linux/elf.h
42436--- linux-2.6.32.9/include/linux/elf.h 2010-02-23 10:38:51.000000000 -0500 42466--- linux-2.6.32.10/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400
42437+++ linux-2.6.32.9/include/linux/elf.h 2010-03-11 20:25:00.225639644 -0500 42467+++ linux-2.6.32.10/include/linux/elf.h 2010-03-20 15:58:47.152569927 -0400
42438@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; 42468@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
42439 #define PT_GNU_EH_FRAME 0x6474e550 42469 #define PT_GNU_EH_FRAME 0x6474e550
42440 42470
@@ -42507,21 +42537,22 @@ diff -urNp linux-2.6.32.9/include/linux/elf.h linux-2.6.32.9/include/linux/elf.h
42507 42537
42508 #endif 42538 #endif
42509 42539
42510diff -urNp linux-2.6.32.9/include/linux/fs.h linux-2.6.32.9/include/linux/fs.h 42540diff -urNp linux-2.6.32.10/include/linux/fs.h linux-2.6.32.10/include/linux/fs.h
42511--- linux-2.6.32.9/include/linux/fs.h 2010-02-23 10:38:51.000000000 -0500 42541--- linux-2.6.32.10/include/linux/fs.h 2010-03-15 11:52:04.000000000 -0400
42512+++ linux-2.6.32.9/include/linux/fs.h 2010-03-11 20:25:00.225639644 -0500 42542+++ linux-2.6.32.10/include/linux/fs.h 2010-03-20 16:00:19.024739237 -0400
42513@@ -87,6 +87,10 @@ struct inodes_stat_t { 42543@@ -90,6 +90,11 @@ struct inodes_stat_t {
42514 */ 42544 /* Expect random access pattern */
42515 #define FMODE_NOCMTIME ((__force fmode_t)2048) 42545 #define FMODE_RANDOM ((__force fmode_t)4096)
42516 42546
42517+/* Hack for grsec so as not to require read permission simply to execute 42547+/* Hack for grsec so as not to require read permission simply to execute
42518+ a binary */ 42548+ * a binary
42549+ */
42519+#define FMODE_GREXEC ((__force fmode_t)8192) 42550+#define FMODE_GREXEC ((__force fmode_t)8192)
42520+ 42551+
42521 /* 42552 /*
42522 * The below are the various read and write types that we support. Some of 42553 * The below are the various read and write types that we support. Some of
42523 * them include behavioral modifiers that send information down to the 42554 * them include behavioral modifiers that send information down to the
42524@@ -565,41 +569,41 @@ typedef int (*read_actor_t)(read_descrip 42555@@ -568,41 +573,41 @@ typedef int (*read_actor_t)(read_descrip
42525 unsigned long, unsigned long); 42556 unsigned long, unsigned long);
42526 42557
42527 struct address_space_operations { 42558 struct address_space_operations {
@@ -42580,7 +42611,7 @@ diff -urNp linux-2.6.32.9/include/linux/fs.h linux-2.6.32.9/include/linux/fs.h
42580 }; 42611 };
42581 42612
42582 /* 42613 /*
42583@@ -1027,19 +1031,19 @@ static inline int file_check_writeable(s 42614@@ -1030,19 +1035,19 @@ static inline int file_check_writeable(s
42584 typedef struct files_struct *fl_owner_t; 42615 typedef struct files_struct *fl_owner_t;
42585 42616
42586 struct file_lock_operations { 42617 struct file_lock_operations {
@@ -42610,7 +42641,7 @@ diff -urNp linux-2.6.32.9/include/linux/fs.h linux-2.6.32.9/include/linux/fs.h
42610 }; 42641 };
42611 42642
42612 struct lock_manager { 42643 struct lock_manager {
42613@@ -1436,7 +1440,7 @@ struct fiemap_extent_info { 42644@@ -1439,7 +1444,7 @@ struct fiemap_extent_info {
42614 unsigned int fi_flags; /* Flags as passed from user */ 42645 unsigned int fi_flags; /* Flags as passed from user */
42615 unsigned int fi_extents_mapped; /* Number of mapped extents */ 42646 unsigned int fi_extents_mapped; /* Number of mapped extents */
42616 unsigned int fi_extents_max; /* Size of fiemap_extent array */ 42647 unsigned int fi_extents_max; /* Size of fiemap_extent array */
@@ -42619,7 +42650,7 @@ diff -urNp linux-2.6.32.9/include/linux/fs.h linux-2.6.32.9/include/linux/fs.h
42619 * array */ 42650 * array */
42620 }; 42651 };
42621 int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical, 42652 int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,
42622@@ -1553,30 +1557,30 @@ extern ssize_t vfs_writev(struct file *, 42653@@ -1556,30 +1561,30 @@ extern ssize_t vfs_writev(struct file *,
42623 unsigned long, loff_t *); 42654 unsigned long, loff_t *);
42624 42655
42625 struct super_operations { 42656 struct super_operations {
@@ -42670,9 +42701,9 @@ diff -urNp linux-2.6.32.9/include/linux/fs.h linux-2.6.32.9/include/linux/fs.h
42670 }; 42701 };
42671 42702
42672 /* 42703 /*
42673diff -urNp linux-2.6.32.9/include/linux/fs_struct.h linux-2.6.32.9/include/linux/fs_struct.h 42704diff -urNp linux-2.6.32.10/include/linux/fs_struct.h linux-2.6.32.10/include/linux/fs_struct.h
42674--- linux-2.6.32.9/include/linux/fs_struct.h 2010-02-23 10:38:51.000000000 -0500 42705--- linux-2.6.32.10/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400
42675+++ linux-2.6.32.9/include/linux/fs_struct.h 2010-03-11 20:25:00.225639644 -0500 42706+++ linux-2.6.32.10/include/linux/fs_struct.h 2010-03-20 15:58:47.158060906 -0400
42676@@ -4,7 +4,7 @@ 42707@@ -4,7 +4,7 @@
42677 #include <linux/path.h> 42708 #include <linux/path.h>
42678 42709
@@ -42682,9 +42713,9 @@ diff -urNp linux-2.6.32.9/include/linux/fs_struct.h linux-2.6.32.9/include/linux
42682 rwlock_t lock; 42713 rwlock_t lock;
42683 int umask; 42714 int umask;
42684 int in_exec; 42715 int in_exec;
42685diff -urNp linux-2.6.32.9/include/linux/genhd.h linux-2.6.32.9/include/linux/genhd.h 42716diff -urNp linux-2.6.32.10/include/linux/genhd.h linux-2.6.32.10/include/linux/genhd.h
42686--- linux-2.6.32.9/include/linux/genhd.h 2010-02-23 10:38:51.000000000 -0500 42717--- linux-2.6.32.10/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400
42687+++ linux-2.6.32.9/include/linux/genhd.h 2010-03-11 20:25:00.225639644 -0500 42718+++ linux-2.6.32.10/include/linux/genhd.h 2010-03-20 15:58:47.158060906 -0400
42688@@ -161,7 +161,7 @@ struct gendisk { 42719@@ -161,7 +161,7 @@ struct gendisk {
42689 42720
42690 struct timer_rand_state *random; 42721 struct timer_rand_state *random;
@@ -42694,9 +42725,9 @@ diff -urNp linux-2.6.32.9/include/linux/genhd.h linux-2.6.32.9/include/linux/gen
42694 struct work_struct async_notify; 42725 struct work_struct async_notify;
42695 #ifdef CONFIG_BLK_DEV_INTEGRITY 42726 #ifdef CONFIG_BLK_DEV_INTEGRITY
42696 struct blk_integrity *integrity; 42727 struct blk_integrity *integrity;
42697diff -urNp linux-2.6.32.9/include/linux/gracl.h linux-2.6.32.9/include/linux/gracl.h 42728diff -urNp linux-2.6.32.10/include/linux/gracl.h linux-2.6.32.10/include/linux/gracl.h
42698--- linux-2.6.32.9/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 42729--- linux-2.6.32.10/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
42699+++ linux-2.6.32.9/include/linux/gracl.h 2010-03-11 20:25:00.225639644 -0500 42730+++ linux-2.6.32.10/include/linux/gracl.h 2010-03-20 15:58:47.158060906 -0400
42700@@ -0,0 +1,309 @@ 42731@@ -0,0 +1,309 @@
42701+#ifndef GR_ACL_H 42732+#ifndef GR_ACL_H
42702+#define GR_ACL_H 42733+#define GR_ACL_H
@@ -43007,9 +43038,9 @@ diff -urNp linux-2.6.32.9/include/linux/gracl.h linux-2.6.32.9/include/linux/gra
43007+ 43038+
43008+#endif 43039+#endif
43009+ 43040+
43010diff -urNp linux-2.6.32.9/include/linux/gralloc.h linux-2.6.32.9/include/linux/gralloc.h 43041diff -urNp linux-2.6.32.10/include/linux/gralloc.h linux-2.6.32.10/include/linux/gralloc.h
43011--- linux-2.6.32.9/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 43042--- linux-2.6.32.10/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
43012+++ linux-2.6.32.9/include/linux/gralloc.h 2010-03-11 20:25:00.225639644 -0500 43043+++ linux-2.6.32.10/include/linux/gralloc.h 2010-03-20 15:58:47.158060906 -0400
43013@@ -0,0 +1,9 @@ 43044@@ -0,0 +1,9 @@
43014+#ifndef __GRALLOC_H 43045+#ifndef __GRALLOC_H
43015+#define __GRALLOC_H 43046+#define __GRALLOC_H
@@ -43020,9 +43051,9 @@ diff -urNp linux-2.6.32.9/include/linux/gralloc.h linux-2.6.32.9/include/linux/g
43020+void *acl_alloc_num(unsigned long num, unsigned long len); 43051+void *acl_alloc_num(unsigned long num, unsigned long len);
43021+ 43052+
43022+#endif 43053+#endif
43023diff -urNp linux-2.6.32.9/include/linux/grdefs.h linux-2.6.32.9/include/linux/grdefs.h 43054diff -urNp linux-2.6.32.10/include/linux/grdefs.h linux-2.6.32.10/include/linux/grdefs.h
43024--- linux-2.6.32.9/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 43055--- linux-2.6.32.10/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
43025+++ linux-2.6.32.9/include/linux/grdefs.h 2010-03-11 20:25:00.225639644 -0500 43056+++ linux-2.6.32.10/include/linux/grdefs.h 2010-03-20 15:58:47.158060906 -0400
43026@@ -0,0 +1,136 @@ 43057@@ -0,0 +1,136 @@
43027+#ifndef GRDEFS_H 43058+#ifndef GRDEFS_H
43028+#define GRDEFS_H 43059+#define GRDEFS_H
@@ -43160,10 +43191,10 @@ diff -urNp linux-2.6.32.9/include/linux/grdefs.h linux-2.6.32.9/include/linux/gr
43160+}; 43191+};
43161+ 43192+
43162+#endif 43193+#endif
43163diff -urNp linux-2.6.32.9/include/linux/grinternal.h linux-2.6.32.9/include/linux/grinternal.h 43194diff -urNp linux-2.6.32.10/include/linux/grinternal.h linux-2.6.32.10/include/linux/grinternal.h
43164--- linux-2.6.32.9/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 43195--- linux-2.6.32.10/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
43165+++ linux-2.6.32.9/include/linux/grinternal.h 2010-03-11 20:25:00.233642809 -0500 43196+++ linux-2.6.32.10/include/linux/grinternal.h 2010-03-20 17:35:36.571019099 -0400
43166@@ -0,0 +1,213 @@ 43197@@ -0,0 +1,215 @@
43167+#ifndef __GRINTERNAL_H 43198+#ifndef __GRINTERNAL_H
43168+#define __GRINTERNAL_H 43199+#define __GRINTERNAL_H
43169+ 43200+
@@ -43241,6 +43272,8 @@ diff -urNp linux-2.6.32.9/include/linux/grinternal.h linux-2.6.32.9/include/linu
43241+extern int grsec_enable_mount; 43272+extern int grsec_enable_mount;
43242+extern int grsec_enable_chdir; 43273+extern int grsec_enable_chdir;
43243+extern int grsec_resource_logging; 43274+extern int grsec_resource_logging;
43275+extern int grsec_enable_blackhole;
43276+extern int grsec_lastack_retries;
43244+extern int grsec_lock; 43277+extern int grsec_lock;
43245+ 43278+
43246+extern spinlock_t grsec_alert_lock; 43279+extern spinlock_t grsec_alert_lock;
@@ -43377,10 +43410,10 @@ diff -urNp linux-2.6.32.9/include/linux/grinternal.h linux-2.6.32.9/include/linu
43377+#endif 43410+#endif
43378+ 43411+
43379+#endif 43412+#endif
43380diff -urNp linux-2.6.32.9/include/linux/grmsg.h linux-2.6.32.9/include/linux/grmsg.h 43413diff -urNp linux-2.6.32.10/include/linux/grmsg.h linux-2.6.32.10/include/linux/grmsg.h
43381--- linux-2.6.32.9/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 43414--- linux-2.6.32.10/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
43382+++ linux-2.6.32.9/include/linux/grmsg.h 2010-03-11 20:25:00.233642809 -0500 43415+++ linux-2.6.32.10/include/linux/grmsg.h 2010-03-20 16:57:07.112591863 -0400
43383@@ -0,0 +1,108 @@ 43416@@ -0,0 +1,107 @@
43384+#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" 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"
43385+#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" 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"
43386+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by " 43419+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
@@ -43454,7 +43487,6 @@ diff -urNp linux-2.6.32.9/include/linux/grmsg.h linux-2.6.32.9/include/linux/grm
43454+#define GR_SPROLEF_ACL_MSG "special role %s failure for " 43487+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
43455+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for " 43488+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
43456+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by " 43489+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
43457+#define GR_UNSPROLEF_ACL_MSG "special role unauth of %s failure for "
43458+#define GR_INVMODE_ACL_MSG "invalid mode %d by " 43490+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
43459+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by " 43491+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
43460+#define GR_FAILFORK_MSG "failed fork with errno %d by " 43492+#define GR_FAILFORK_MSG "failed fork with errno %d by "
@@ -43489,10 +43521,10 @@ diff -urNp linux-2.6.32.9/include/linux/grmsg.h linux-2.6.32.9/include/linux/grm
43489+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " 43521+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
43490+#define GR_VM86_MSG "denied use of vm86 by " 43522+#define GR_VM86_MSG "denied use of vm86 by "
43491+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " 43523+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
43492diff -urNp linux-2.6.32.9/include/linux/grsecurity.h linux-2.6.32.9/include/linux/grsecurity.h 43524diff -urNp linux-2.6.32.10/include/linux/grsecurity.h linux-2.6.32.10/include/linux/grsecurity.h
43493--- linux-2.6.32.9/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 43525--- linux-2.6.32.10/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
43494+++ linux-2.6.32.9/include/linux/grsecurity.h 2010-03-11 20:25:00.233642809 -0500 43526+++ linux-2.6.32.10/include/linux/grsecurity.h 2010-03-20 16:38:55.149896257 -0400
43495@@ -0,0 +1,201 @@ 43527@@ -0,0 +1,199 @@
43496+#ifndef GR_SECURITY_H 43528+#ifndef GR_SECURITY_H
43497+#define GR_SECURITY_H 43529+#define GR_SECURITY_H
43498+#include <linux/fs.h> 43530+#include <linux/fs.h>
@@ -43689,14 +43721,12 @@ diff -urNp linux-2.6.32.9/include/linux/grsecurity.h linux-2.6.32.9/include/linu
43689+ struct vm_area_struct *vma); 43721+ struct vm_area_struct *vma);
43690+ 43722+
43691+extern int grsec_enable_dmesg; 43723+extern int grsec_enable_dmesg;
43692+extern int grsec_enable_randsrc;
43693+extern int grsec_enable_shm;
43694+#endif 43724+#endif
43695+ 43725+
43696+#endif 43726+#endif
43697diff -urNp linux-2.6.32.9/include/linux/hdpu_features.h linux-2.6.32.9/include/linux/hdpu_features.h 43727diff -urNp linux-2.6.32.10/include/linux/hdpu_features.h linux-2.6.32.10/include/linux/hdpu_features.h
43698--- linux-2.6.32.9/include/linux/hdpu_features.h 2010-02-23 10:38:51.000000000 -0500 43728--- linux-2.6.32.10/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400
43699+++ linux-2.6.32.9/include/linux/hdpu_features.h 2010-03-11 20:25:00.233642809 -0500 43729+++ linux-2.6.32.10/include/linux/hdpu_features.h 2010-03-20 15:58:47.158060906 -0400
43700@@ -3,7 +3,7 @@ 43730@@ -3,7 +3,7 @@
43701 struct cpustate_t { 43731 struct cpustate_t {
43702 spinlock_t lock; 43732 spinlock_t lock;
@@ -43706,9 +43736,9 @@ diff -urNp linux-2.6.32.9/include/linux/hdpu_features.h linux-2.6.32.9/include/l
43706 unsigned char cached_val; 43736 unsigned char cached_val;
43707 int inited; 43737 int inited;
43708 unsigned long *set_addr; 43738 unsigned long *set_addr;
43709diff -urNp linux-2.6.32.9/include/linux/highmem.h linux-2.6.32.9/include/linux/highmem.h 43739diff -urNp linux-2.6.32.10/include/linux/highmem.h linux-2.6.32.10/include/linux/highmem.h
43710--- linux-2.6.32.9/include/linux/highmem.h 2010-02-23 10:38:51.000000000 -0500 43740--- linux-2.6.32.10/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400
43711+++ linux-2.6.32.9/include/linux/highmem.h 2010-03-11 20:25:00.233642809 -0500 43741+++ linux-2.6.32.10/include/linux/highmem.h 2010-03-20 15:58:47.158060906 -0400
43712@@ -137,6 +137,18 @@ static inline void clear_highpage(struct 43742@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
43713 kunmap_atomic(kaddr, KM_USER0); 43743 kunmap_atomic(kaddr, KM_USER0);
43714 } 43744 }
@@ -43728,9 +43758,9 @@ diff -urNp linux-2.6.32.9/include/linux/highmem.h linux-2.6.32.9/include/linux/h
43728 static inline void zero_user_segments(struct page *page, 43758 static inline void zero_user_segments(struct page *page,
43729 unsigned start1, unsigned end1, 43759 unsigned start1, unsigned end1,
43730 unsigned start2, unsigned end2) 43760 unsigned start2, unsigned end2)
43731diff -urNp linux-2.6.32.9/include/linux/init_task.h linux-2.6.32.9/include/linux/init_task.h 43761diff -urNp linux-2.6.32.10/include/linux/init_task.h linux-2.6.32.10/include/linux/init_task.h
43732--- linux-2.6.32.9/include/linux/init_task.h 2010-02-23 10:38:51.000000000 -0500 43762--- linux-2.6.32.10/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400
43733+++ linux-2.6.32.9/include/linux/init_task.h 2010-03-11 20:25:00.233642809 -0500 43763+++ linux-2.6.32.10/include/linux/init_task.h 2010-03-20 15:58:47.158060906 -0400
43734@@ -115,6 +115,13 @@ extern struct cred init_cred; 43764@@ -115,6 +115,13 @@ extern struct cred init_cred;
43735 # define INIT_PERF_EVENTS(tsk) 43765 # define INIT_PERF_EVENTS(tsk)
43736 #endif 43766 #endif
@@ -43753,9 +43783,9 @@ diff -urNp linux-2.6.32.9/include/linux/init_task.h linux-2.6.32.9/include/linux
43753 } 43783 }
43754 43784
43755 43785
43756diff -urNp linux-2.6.32.9/include/linux/interrupt.h linux-2.6.32.9/include/linux/interrupt.h 43786diff -urNp linux-2.6.32.10/include/linux/interrupt.h linux-2.6.32.10/include/linux/interrupt.h
43757--- linux-2.6.32.9/include/linux/interrupt.h 2010-02-23 10:38:51.000000000 -0500 43787--- linux-2.6.32.10/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400
43758+++ linux-2.6.32.9/include/linux/interrupt.h 2010-03-11 20:25:00.233642809 -0500 43788+++ linux-2.6.32.10/include/linux/interrupt.h 2010-03-20 15:58:47.158060906 -0400
43759@@ -357,7 +357,7 @@ enum 43789@@ -357,7 +357,7 @@ enum
43760 /* map softirq index to softirq name. update 'softirq_to_name' in 43790 /* map softirq index to softirq name. update 'softirq_to_name' in
43761 * kernel/softirq.c when adding a new softirq. 43791 * kernel/softirq.c when adding a new softirq.
@@ -43780,9 +43810,9 @@ diff -urNp linux-2.6.32.9/include/linux/interrupt.h linux-2.6.32.9/include/linux
43780 extern void softirq_init(void); 43810 extern void softirq_init(void);
43781 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) 43811 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
43782 extern void raise_softirq_irqoff(unsigned int nr); 43812 extern void raise_softirq_irqoff(unsigned int nr);
43783diff -urNp linux-2.6.32.9/include/linux/jbd2.h linux-2.6.32.9/include/linux/jbd2.h 43813diff -urNp linux-2.6.32.10/include/linux/jbd2.h linux-2.6.32.10/include/linux/jbd2.h
43784--- linux-2.6.32.9/include/linux/jbd2.h 2010-02-23 10:38:51.000000000 -0500 43814--- linux-2.6.32.10/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400
43785+++ linux-2.6.32.9/include/linux/jbd2.h 2010-03-11 20:25:00.233642809 -0500 43815+++ linux-2.6.32.10/include/linux/jbd2.h 2010-03-20 15:58:47.160547125 -0400
43786@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; 43816@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
43787 } \ 43817 } \
43788 } while (0) 43818 } while (0)
@@ -43792,9 +43822,9 @@ diff -urNp linux-2.6.32.9/include/linux/jbd2.h linux-2.6.32.9/include/linux/jbd2
43792 #endif 43822 #endif
43793 43823
43794 static inline void *jbd2_alloc(size_t size, gfp_t flags) 43824 static inline void *jbd2_alloc(size_t size, gfp_t flags)
43795diff -urNp linux-2.6.32.9/include/linux/jbd.h linux-2.6.32.9/include/linux/jbd.h 43825diff -urNp linux-2.6.32.10/include/linux/jbd.h linux-2.6.32.10/include/linux/jbd.h
43796--- linux-2.6.32.9/include/linux/jbd.h 2010-02-23 10:38:51.000000000 -0500 43826--- linux-2.6.32.10/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400
43797+++ linux-2.6.32.9/include/linux/jbd.h 2010-03-11 20:25:00.233642809 -0500 43827+++ linux-2.6.32.10/include/linux/jbd.h 2010-03-20 15:58:47.160547125 -0400
43798@@ -66,7 +66,7 @@ extern u8 journal_enable_debug; 43828@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
43799 } \ 43829 } \
43800 } while (0) 43830 } while (0)
@@ -43804,9 +43834,9 @@ diff -urNp linux-2.6.32.9/include/linux/jbd.h linux-2.6.32.9/include/linux/jbd.h
43804 #endif 43834 #endif
43805 43835
43806 static inline void *jbd_alloc(size_t size, gfp_t flags) 43836 static inline void *jbd_alloc(size_t size, gfp_t flags)
43807diff -urNp linux-2.6.32.9/include/linux/kallsyms.h linux-2.6.32.9/include/linux/kallsyms.h 43837diff -urNp linux-2.6.32.10/include/linux/kallsyms.h linux-2.6.32.10/include/linux/kallsyms.h
43808--- linux-2.6.32.9/include/linux/kallsyms.h 2010-02-23 10:38:51.000000000 -0500 43838--- linux-2.6.32.10/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400
43809+++ linux-2.6.32.9/include/linux/kallsyms.h 2010-03-11 20:25:00.237359883 -0500 43839+++ linux-2.6.32.10/include/linux/kallsyms.h 2010-03-20 15:58:47.160547125 -0400
43810@@ -15,7 +15,8 @@ 43840@@ -15,7 +15,8 @@
43811 43841
43812 struct module; 43842 struct module;
@@ -43827,9 +43857,9 @@ diff -urNp linux-2.6.32.9/include/linux/kallsyms.h linux-2.6.32.9/include/linux/
43827 43857
43828 /* This macro allows us to keep printk typechecking */ 43858 /* This macro allows us to keep printk typechecking */
43829 static void __check_printsym_format(const char *fmt, ...) 43859 static void __check_printsym_format(const char *fmt, ...)
43830diff -urNp linux-2.6.32.9/include/linux/kgdb.h linux-2.6.32.9/include/linux/kgdb.h 43860diff -urNp linux-2.6.32.10/include/linux/kgdb.h linux-2.6.32.10/include/linux/kgdb.h
43831--- linux-2.6.32.9/include/linux/kgdb.h 2010-02-23 10:38:51.000000000 -0500 43861--- linux-2.6.32.10/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400
43832+++ linux-2.6.32.9/include/linux/kgdb.h 2010-03-11 20:25:00.237359883 -0500 43862+++ linux-2.6.32.10/include/linux/kgdb.h 2010-03-20 15:58:47.160547125 -0400
43833@@ -251,20 +251,20 @@ struct kgdb_arch { 43863@@ -251,20 +251,20 @@ struct kgdb_arch {
43834 */ 43864 */
43835 struct kgdb_io { 43865 struct kgdb_io {
@@ -43860,9 +43890,9 @@ diff -urNp linux-2.6.32.9/include/linux/kgdb.h linux-2.6.32.9/include/linux/kgdb
43860 43890
43861 extern int kgdb_hex2long(char **ptr, unsigned long *long_val); 43891 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
43862 extern int kgdb_mem2hex(char *mem, char *buf, int count); 43892 extern int kgdb_mem2hex(char *mem, char *buf, int count);
43863diff -urNp linux-2.6.32.9/include/linux/kobject.h linux-2.6.32.9/include/linux/kobject.h 43893diff -urNp linux-2.6.32.10/include/linux/kobject.h linux-2.6.32.10/include/linux/kobject.h
43864--- linux-2.6.32.9/include/linux/kobject.h 2010-02-23 10:38:51.000000000 -0500 43894--- linux-2.6.32.10/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400
43865+++ linux-2.6.32.9/include/linux/kobject.h 2010-03-11 20:25:00.237359883 -0500 43895+++ linux-2.6.32.10/include/linux/kobject.h 2010-03-20 15:58:47.160547125 -0400
43866@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob 43896@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
43867 43897
43868 struct kobj_type { 43898 struct kobj_type {
@@ -43911,9 +43941,9 @@ diff -urNp linux-2.6.32.9/include/linux/kobject.h linux-2.6.32.9/include/linux/k
43911 struct kobject *parent_kobj); 43941 struct kobject *parent_kobj);
43912 43942
43913 static inline struct kset *to_kset(struct kobject *kobj) 43943 static inline struct kset *to_kset(struct kobject *kobj)
43914diff -urNp linux-2.6.32.9/include/linux/kvm_host.h linux-2.6.32.9/include/linux/kvm_host.h 43944diff -urNp linux-2.6.32.10/include/linux/kvm_host.h linux-2.6.32.10/include/linux/kvm_host.h
43915--- linux-2.6.32.9/include/linux/kvm_host.h 2010-02-23 10:38:51.000000000 -0500 43945--- linux-2.6.32.10/include/linux/kvm_host.h 2010-03-15 11:52:04.000000000 -0400
43916+++ linux-2.6.32.9/include/linux/kvm_host.h 2010-03-11 20:25:00.237359883 -0500 43946+++ linux-2.6.32.10/include/linux/kvm_host.h 2010-03-20 15:58:47.160547125 -0400
43917@@ -205,7 +205,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc 43947@@ -205,7 +205,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
43918 void vcpu_load(struct kvm_vcpu *vcpu); 43948 void vcpu_load(struct kvm_vcpu *vcpu);
43919 void vcpu_put(struct kvm_vcpu *vcpu); 43949 void vcpu_put(struct kvm_vcpu *vcpu);
@@ -43932,9 +43962,9 @@ diff -urNp linux-2.6.32.9/include/linux/kvm_host.h linux-2.6.32.9/include/linux/
43932 void kvm_arch_exit(void); 43962 void kvm_arch_exit(void);
43933 43963
43934 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); 43964 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
43935diff -urNp linux-2.6.32.9/include/linux/libata.h linux-2.6.32.9/include/linux/libata.h 43965diff -urNp linux-2.6.32.10/include/linux/libata.h linux-2.6.32.10/include/linux/libata.h
43936--- linux-2.6.32.9/include/linux/libata.h 2010-02-23 10:38:51.000000000 -0500 43966--- linux-2.6.32.10/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400
43937+++ linux-2.6.32.9/include/linux/libata.h 2010-03-11 20:25:00.237359883 -0500 43967+++ linux-2.6.32.10/include/linux/libata.h 2010-03-20 15:58:47.160547125 -0400
43938@@ -64,11 +64,11 @@ 43968@@ -64,11 +64,11 @@
43939 #ifdef ATA_VERBOSE_DEBUG 43969 #ifdef ATA_VERBOSE_DEBUG
43940 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) 43970 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -44000,9 +44030,9 @@ diff -urNp linux-2.6.32.9/include/linux/libata.h linux-2.6.32.9/include/linux/li
44000 extern int ata_scsi_detect(struct scsi_host_template *sht); 44030 extern int ata_scsi_detect(struct scsi_host_template *sht);
44001 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); 44031 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
44002 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); 44032 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
44003diff -urNp linux-2.6.32.9/include/linux/lockd/bind.h linux-2.6.32.9/include/linux/lockd/bind.h 44033diff -urNp linux-2.6.32.10/include/linux/lockd/bind.h linux-2.6.32.10/include/linux/lockd/bind.h
44004--- linux-2.6.32.9/include/linux/lockd/bind.h 2010-02-23 10:38:51.000000000 -0500 44034--- linux-2.6.32.10/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400
44005+++ linux-2.6.32.9/include/linux/lockd/bind.h 2010-03-11 20:25:00.237359883 -0500 44035+++ linux-2.6.32.10/include/linux/lockd/bind.h 2010-03-20 15:58:47.160547125 -0400
44006@@ -23,13 +23,13 @@ struct svc_rqst; 44036@@ -23,13 +23,13 @@ struct svc_rqst;
44007 * This is the set of functions for lockd->nfsd communication 44037 * This is the set of functions for lockd->nfsd communication
44008 */ 44038 */
@@ -44020,9 +44050,9 @@ diff -urNp linux-2.6.32.9/include/linux/lockd/bind.h linux-2.6.32.9/include/linu
44020 44050
44021 /* 44051 /*
44022 * Similar to nfs_client_initdata, but without the NFS-specific 44052 * Similar to nfs_client_initdata, but without the NFS-specific
44023diff -urNp linux-2.6.32.9/include/linux/mm.h linux-2.6.32.9/include/linux/mm.h 44053diff -urNp linux-2.6.32.10/include/linux/mm.h linux-2.6.32.10/include/linux/mm.h
44024--- linux-2.6.32.9/include/linux/mm.h 2010-02-23 10:38:51.000000000 -0500 44054--- linux-2.6.32.10/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400
44025+++ linux-2.6.32.9/include/linux/mm.h 2010-03-11 20:25:00.237359883 -0500 44055+++ linux-2.6.32.10/include/linux/mm.h 2010-03-20 15:58:47.160547125 -0400
44026@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void 44056@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void
44027 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ 44057 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
44028 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ 44058 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
@@ -44085,9 +44115,9 @@ diff -urNp linux-2.6.32.9/include/linux/mm.h linux-2.6.32.9/include/linux/mm.h
44085 44115
44086 #endif /* __KERNEL__ */ 44116 #endif /* __KERNEL__ */
44087 #endif /* _LINUX_MM_H */ 44117 #endif /* _LINUX_MM_H */
44088diff -urNp linux-2.6.32.9/include/linux/mm_types.h linux-2.6.32.9/include/linux/mm_types.h 44118diff -urNp linux-2.6.32.10/include/linux/mm_types.h linux-2.6.32.10/include/linux/mm_types.h
44089--- linux-2.6.32.9/include/linux/mm_types.h 2010-02-23 10:38:51.000000000 -0500 44119--- linux-2.6.32.10/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400
44090+++ linux-2.6.32.9/include/linux/mm_types.h 2010-03-11 20:25:00.237359883 -0500 44120+++ linux-2.6.32.10/include/linux/mm_types.h 2010-03-20 15:58:47.160547125 -0400
44091@@ -186,6 +186,8 @@ struct vm_area_struct { 44121@@ -186,6 +186,8 @@ struct vm_area_struct {
44092 #ifdef CONFIG_NUMA 44122 #ifdef CONFIG_NUMA
44093 struct mempolicy *vm_policy; /* NUMA policy for the VMA */ 44123 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -44122,9 +44152,9 @@ diff -urNp linux-2.6.32.9/include/linux/mm_types.h linux-2.6.32.9/include/linux/
44122 }; 44152 };
44123 44153
44124 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ 44154 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
44125diff -urNp linux-2.6.32.9/include/linux/mmu_notifier.h linux-2.6.32.9/include/linux/mmu_notifier.h 44155diff -urNp linux-2.6.32.10/include/linux/mmu_notifier.h linux-2.6.32.10/include/linux/mmu_notifier.h
44126--- linux-2.6.32.9/include/linux/mmu_notifier.h 2010-02-23 10:38:51.000000000 -0500 44156--- linux-2.6.32.10/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400
44127+++ linux-2.6.32.9/include/linux/mmu_notifier.h 2010-03-11 20:25:00.237359883 -0500 44157+++ linux-2.6.32.10/include/linux/mmu_notifier.h 2010-03-20 15:58:47.160547125 -0400
44128@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr 44158@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
44129 */ 44159 */
44130 #define ptep_clear_flush_notify(__vma, __address, __ptep) \ 44160 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -44141,9 +44171,9 @@ diff -urNp linux-2.6.32.9/include/linux/mmu_notifier.h linux-2.6.32.9/include/li
44141 }) 44171 })
44142 44172
44143 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ 44173 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
44144diff -urNp linux-2.6.32.9/include/linux/mod_devicetable.h linux-2.6.32.9/include/linux/mod_devicetable.h 44174diff -urNp linux-2.6.32.10/include/linux/mod_devicetable.h linux-2.6.32.10/include/linux/mod_devicetable.h
44145--- linux-2.6.32.9/include/linux/mod_devicetable.h 2010-02-23 10:38:51.000000000 -0500 44175--- linux-2.6.32.10/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400
44146+++ linux-2.6.32.9/include/linux/mod_devicetable.h 2010-03-11 20:25:00.237359883 -0500 44176+++ linux-2.6.32.10/include/linux/mod_devicetable.h 2010-03-20 15:58:47.160547125 -0400
44147@@ -12,7 +12,7 @@ 44177@@ -12,7 +12,7 @@
44148 typedef unsigned long kernel_ulong_t; 44178 typedef unsigned long kernel_ulong_t;
44149 #endif 44179 #endif
@@ -44162,9 +44192,9 @@ diff -urNp linux-2.6.32.9/include/linux/mod_devicetable.h linux-2.6.32.9/include
44162 44192
44163 struct hid_device_id { 44193 struct hid_device_id {
44164 __u16 bus; 44194 __u16 bus;
44165diff -urNp linux-2.6.32.9/include/linux/module.h linux-2.6.32.9/include/linux/module.h 44195diff -urNp linux-2.6.32.10/include/linux/module.h linux-2.6.32.10/include/linux/module.h
44166--- linux-2.6.32.9/include/linux/module.h 2010-02-23 10:38:51.000000000 -0500 44196--- linux-2.6.32.10/include/linux/module.h 2010-03-15 11:52:04.000000000 -0400
44167+++ linux-2.6.32.9/include/linux/module.h 2010-03-11 20:25:00.237359883 -0500 44197+++ linux-2.6.32.10/include/linux/module.h 2010-03-20 15:58:47.160547125 -0400
44168@@ -287,16 +287,16 @@ struct module 44198@@ -287,16 +287,16 @@ struct module
44169 int (*init)(void); 44199 int (*init)(void);
44170 44200
@@ -44237,9 +44267,9 @@ diff -urNp linux-2.6.32.9/include/linux/module.h linux-2.6.32.9/include/linux/mo
44237 } 44267 }
44238 44268
44239 /* Search for module by name: must hold module_mutex. */ 44269 /* Search for module by name: must hold module_mutex. */
44240diff -urNp linux-2.6.32.9/include/linux/moduleloader.h linux-2.6.32.9/include/linux/moduleloader.h 44270diff -urNp linux-2.6.32.10/include/linux/moduleloader.h linux-2.6.32.10/include/linux/moduleloader.h
44241--- linux-2.6.32.9/include/linux/moduleloader.h 2010-02-23 10:38:51.000000000 -0500 44271--- linux-2.6.32.10/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400
44242+++ linux-2.6.32.9/include/linux/moduleloader.h 2010-03-11 20:25:00.237359883 -0500 44272+++ linux-2.6.32.10/include/linux/moduleloader.h 2010-03-20 15:58:47.160547125 -0400
44243@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st 44273@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
44244 sections. Returns NULL on failure. */ 44274 sections. Returns NULL on failure. */
44245 void *module_alloc(unsigned long size); 44275 void *module_alloc(unsigned long size);
@@ -44262,9 +44292,9 @@ diff -urNp linux-2.6.32.9/include/linux/moduleloader.h linux-2.6.32.9/include/li
44262 /* Apply the given relocation to the (simplified) ELF. Return -error 44292 /* Apply the given relocation to the (simplified) ELF. Return -error
44263 or 0. */ 44293 or 0. */
44264 int apply_relocate(Elf_Shdr *sechdrs, 44294 int apply_relocate(Elf_Shdr *sechdrs,
44265diff -urNp linux-2.6.32.9/include/linux/namei.h linux-2.6.32.9/include/linux/namei.h 44295diff -urNp linux-2.6.32.10/include/linux/namei.h linux-2.6.32.10/include/linux/namei.h
44266--- linux-2.6.32.9/include/linux/namei.h 2010-02-23 10:38:51.000000000 -0500 44296--- linux-2.6.32.10/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400
44267+++ linux-2.6.32.9/include/linux/namei.h 2010-03-11 20:25:00.237359883 -0500 44297+++ linux-2.6.32.10/include/linux/namei.h 2010-03-20 15:58:47.160547125 -0400
44268@@ -22,7 +22,7 @@ struct nameidata { 44298@@ -22,7 +22,7 @@ struct nameidata {
44269 unsigned int flags; 44299 unsigned int flags;
44270 int last_type; 44300 int last_type;
@@ -44289,9 +44319,9 @@ diff -urNp linux-2.6.32.9/include/linux/namei.h linux-2.6.32.9/include/linux/nam
44289 { 44319 {
44290 return nd->saved_names[nd->depth]; 44320 return nd->saved_names[nd->depth];
44291 } 44321 }
44292diff -urNp linux-2.6.32.9/include/linux/nodemask.h linux-2.6.32.9/include/linux/nodemask.h 44322diff -urNp linux-2.6.32.10/include/linux/nodemask.h linux-2.6.32.10/include/linux/nodemask.h
44293--- linux-2.6.32.9/include/linux/nodemask.h 2010-02-23 10:38:51.000000000 -0500 44323--- linux-2.6.32.10/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400
44294+++ linux-2.6.32.9/include/linux/nodemask.h 2010-03-11 20:25:00.237359883 -0500 44324+++ linux-2.6.32.10/include/linux/nodemask.h 2010-03-20 15:58:47.160547125 -0400
44295@@ -464,11 +464,11 @@ static inline int num_node_state(enum no 44325@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
44296 44326
44297 #define any_online_node(mask) \ 44327 #define any_online_node(mask) \
@@ -44308,9 +44338,9 @@ diff -urNp linux-2.6.32.9/include/linux/nodemask.h linux-2.6.32.9/include/linux/
44308 }) 44338 })
44309 44339
44310 #define num_online_nodes() num_node_state(N_ONLINE) 44340 #define num_online_nodes() num_node_state(N_ONLINE)
44311diff -urNp linux-2.6.32.9/include/linux/oprofile.h linux-2.6.32.9/include/linux/oprofile.h 44341diff -urNp linux-2.6.32.10/include/linux/oprofile.h linux-2.6.32.10/include/linux/oprofile.h
44312--- linux-2.6.32.9/include/linux/oprofile.h 2010-02-23 10:38:51.000000000 -0500 44342--- linux-2.6.32.10/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400
44313+++ linux-2.6.32.9/include/linux/oprofile.h 2010-03-11 20:25:00.237359883 -0500 44343+++ linux-2.6.32.10/include/linux/oprofile.h 2010-03-20 15:58:47.160547125 -0400
44314@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super 44344@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
44315 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, 44345 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
44316 char const * name, ulong * val); 44346 char const * name, ulong * val);
@@ -44323,9 +44353,9 @@ diff -urNp linux-2.6.32.9/include/linux/oprofile.h linux-2.6.32.9/include/linux/
44323 44353
44324 /** create a directory */ 44354 /** create a directory */
44325 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, 44355 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
44326diff -urNp linux-2.6.32.9/include/linux/pipe_fs_i.h linux-2.6.32.9/include/linux/pipe_fs_i.h 44356diff -urNp linux-2.6.32.10/include/linux/pipe_fs_i.h linux-2.6.32.10/include/linux/pipe_fs_i.h
44327--- linux-2.6.32.9/include/linux/pipe_fs_i.h 2010-02-23 10:38:51.000000000 -0500 44357--- linux-2.6.32.10/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400
44328+++ linux-2.6.32.9/include/linux/pipe_fs_i.h 2010-03-11 20:25:00.237359883 -0500 44358+++ linux-2.6.32.10/include/linux/pipe_fs_i.h 2010-03-20 15:58:47.160547125 -0400
44329@@ -46,9 +46,9 @@ struct pipe_inode_info { 44359@@ -46,9 +46,9 @@ struct pipe_inode_info {
44330 wait_queue_head_t wait; 44360 wait_queue_head_t wait;
44331 unsigned int nrbufs, curbuf; 44361 unsigned int nrbufs, curbuf;
@@ -44339,9 +44369,9 @@ diff -urNp linux-2.6.32.9/include/linux/pipe_fs_i.h linux-2.6.32.9/include/linux
44339 unsigned int r_counter; 44369 unsigned int r_counter;
44340 unsigned int w_counter; 44370 unsigned int w_counter;
44341 struct fasync_struct *fasync_readers; 44371 struct fasync_struct *fasync_readers;
44342diff -urNp linux-2.6.32.9/include/linux/poison.h linux-2.6.32.9/include/linux/poison.h 44372diff -urNp linux-2.6.32.10/include/linux/poison.h linux-2.6.32.10/include/linux/poison.h
44343--- linux-2.6.32.9/include/linux/poison.h 2010-02-23 10:38:51.000000000 -0500 44373--- linux-2.6.32.10/include/linux/poison.h 2010-03-15 11:52:04.000000000 -0400
44344+++ linux-2.6.32.9/include/linux/poison.h 2010-03-11 20:25:00.237359883 -0500 44374+++ linux-2.6.32.10/include/linux/poison.h 2010-03-20 15:58:47.160547125 -0400
44345@@ -7,8 +7,8 @@ 44375@@ -7,8 +7,8 @@
44346 * under normal circumstances, used to verify that nobody uses 44376 * under normal circumstances, used to verify that nobody uses
44347 * non-initialized list entries. 44377 * non-initialized list entries.
@@ -44353,9 +44383,9 @@ diff -urNp linux-2.6.32.9/include/linux/poison.h linux-2.6.32.9/include/linux/po
44353 44383
44354 /********** include/linux/timer.h **********/ 44384 /********** include/linux/timer.h **********/
44355 /* 44385 /*
44356diff -urNp linux-2.6.32.9/include/linux/proc_fs.h linux-2.6.32.9/include/linux/proc_fs.h 44386diff -urNp linux-2.6.32.10/include/linux/proc_fs.h linux-2.6.32.10/include/linux/proc_fs.h
44357--- linux-2.6.32.9/include/linux/proc_fs.h 2010-02-23 10:38:51.000000000 -0500 44387--- linux-2.6.32.10/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400
44358+++ linux-2.6.32.9/include/linux/proc_fs.h 2010-03-11 20:25:00.237359883 -0500 44388+++ linux-2.6.32.10/include/linux/proc_fs.h 2010-03-20 15:58:47.160547125 -0400
44359@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro 44389@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
44360 return proc_create_data(name, mode, parent, proc_fops, NULL); 44390 return proc_create_data(name, mode, parent, proc_fops, NULL);
44361 } 44391 }
@@ -44376,9 +44406,9 @@ diff -urNp linux-2.6.32.9/include/linux/proc_fs.h linux-2.6.32.9/include/linux/p
44376 static inline struct proc_dir_entry *create_proc_read_entry(const char *name, 44406 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
44377 mode_t mode, struct proc_dir_entry *base, 44407 mode_t mode, struct proc_dir_entry *base,
44378 read_proc_t *read_proc, void * data) 44408 read_proc_t *read_proc, void * data)
44379diff -urNp linux-2.6.32.9/include/linux/random.h linux-2.6.32.9/include/linux/random.h 44409diff -urNp linux-2.6.32.10/include/linux/random.h linux-2.6.32.10/include/linux/random.h
44380--- linux-2.6.32.9/include/linux/random.h 2010-02-23 10:38:51.000000000 -0500 44410--- linux-2.6.32.10/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400
44381+++ linux-2.6.32.9/include/linux/random.h 2010-03-11 20:25:00.237359883 -0500 44411+++ linux-2.6.32.10/include/linux/random.h 2010-03-20 15:58:47.160547125 -0400
44382@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l 44412@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
44383 u32 random32(void); 44413 u32 random32(void);
44384 void srandom32(u32 seed); 44414 void srandom32(u32 seed);
@@ -44391,9 +44421,9 @@ diff -urNp linux-2.6.32.9/include/linux/random.h linux-2.6.32.9/include/linux/ra
44391 #endif /* __KERNEL___ */ 44421 #endif /* __KERNEL___ */
44392 44422
44393 #endif /* _LINUX_RANDOM_H */ 44423 #endif /* _LINUX_RANDOM_H */
44394diff -urNp linux-2.6.32.9/include/linux/reiserfs_fs.h linux-2.6.32.9/include/linux/reiserfs_fs.h 44424diff -urNp linux-2.6.32.10/include/linux/reiserfs_fs.h linux-2.6.32.10/include/linux/reiserfs_fs.h
44395--- linux-2.6.32.9/include/linux/reiserfs_fs.h 2010-02-23 10:38:51.000000000 -0500 44425--- linux-2.6.32.10/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400
44396+++ linux-2.6.32.9/include/linux/reiserfs_fs.h 2010-03-11 20:25:00.237359883 -0500 44426+++ linux-2.6.32.10/include/linux/reiserfs_fs.h 2010-03-20 15:58:47.160547125 -0400
44397@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset 44427@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
44398 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ 44428 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
44399 44429
@@ -44440,9 +44470,9 @@ diff -urNp linux-2.6.32.9/include/linux/reiserfs_fs.h linux-2.6.32.9/include/lin
44440 44470
44441 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) 44471 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
44442 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, 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)
44443diff -urNp linux-2.6.32.9/include/linux/reiserfs_fs_sb.h linux-2.6.32.9/include/linux/reiserfs_fs_sb.h 44473diff -urNp linux-2.6.32.10/include/linux/reiserfs_fs_sb.h linux-2.6.32.10/include/linux/reiserfs_fs_sb.h
44444--- linux-2.6.32.9/include/linux/reiserfs_fs_sb.h 2010-02-23 10:38:51.000000000 -0500 44474--- linux-2.6.32.10/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400
44445+++ linux-2.6.32.9/include/linux/reiserfs_fs_sb.h 2010-03-11 20:25:00.237359883 -0500 44475+++ linux-2.6.32.10/include/linux/reiserfs_fs_sb.h 2010-03-20 15:58:47.160547125 -0400
44446@@ -377,7 +377,7 @@ struct reiserfs_sb_info { 44476@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
44447 /* Comment? -Hans */ 44477 /* Comment? -Hans */
44448 wait_queue_head_t s_wait; 44478 wait_queue_head_t s_wait;
@@ -44452,9 +44482,9 @@ diff -urNp linux-2.6.32.9/include/linux/reiserfs_fs_sb.h linux-2.6.32.9/include/
44452 // tree gets re-balanced 44482 // tree gets re-balanced
44453 unsigned long s_properties; /* File system properties. Currently holds 44483 unsigned long s_properties; /* File system properties. Currently holds
44454 on-disk FS format */ 44484 on-disk FS format */
44455diff -urNp linux-2.6.32.9/include/linux/sched.h linux-2.6.32.9/include/linux/sched.h 44485diff -urNp linux-2.6.32.10/include/linux/sched.h linux-2.6.32.10/include/linux/sched.h
44456--- linux-2.6.32.9/include/linux/sched.h 2010-02-23 10:38:51.000000000 -0500 44486--- linux-2.6.32.10/include/linux/sched.h 2010-03-15 11:52:04.000000000 -0400
44457+++ linux-2.6.32.9/include/linux/sched.h 2010-03-11 20:25:00.237359883 -0500 44487+++ linux-2.6.32.10/include/linux/sched.h 2010-03-20 15:58:47.165359004 -0400
44458@@ -101,6 +101,7 @@ struct bio; 44488@@ -101,6 +101,7 @@ struct bio;
44459 struct fs_struct; 44489 struct fs_struct;
44460 struct bts_context; 44490 struct bts_context;
@@ -44479,7 +44509,7 @@ diff -urNp linux-2.6.32.9/include/linux/sched.h linux-2.6.32.9/include/linux/sch
44479 int oom_adj; /* OOM kill score adjustment (bit shift) */ 44509 int oom_adj; /* OOM kill score adjustment (bit shift) */
44480 }; 44510 };
44481 44511
44482@@ -1214,7 +1224,7 @@ struct rcu_node; 44512@@ -1217,7 +1227,7 @@ struct rcu_node;
44483 44513
44484 struct task_struct { 44514 struct task_struct {
44485 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */ 44515 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
@@ -44488,7 +44518,7 @@ diff -urNp linux-2.6.32.9/include/linux/sched.h linux-2.6.32.9/include/linux/sch
44488 atomic_t usage; 44518 atomic_t usage;
44489 unsigned int flags; /* per process flags, defined below */ 44519 unsigned int flags; /* per process flags, defined below */
44490 unsigned int ptrace; 44520 unsigned int ptrace;
44491@@ -1326,8 +1336,8 @@ struct task_struct { 44521@@ -1329,8 +1339,8 @@ struct task_struct {
44492 struct list_head thread_group; 44522 struct list_head thread_group;
44493 44523
44494 struct completion *vfork_done; /* for vfork() */ 44524 struct completion *vfork_done; /* for vfork() */
@@ -44499,7 +44529,7 @@ diff -urNp linux-2.6.32.9/include/linux/sched.h linux-2.6.32.9/include/linux/sch
44499 44529
44500 cputime_t utime, stime, utimescaled, stimescaled; 44530 cputime_t utime, stime, utimescaled, stimescaled;
44501 cputime_t gtime; 44531 cputime_t gtime;
44502@@ -1341,16 +1351,6 @@ struct task_struct { 44532@@ -1344,16 +1354,6 @@ struct task_struct {
44503 struct task_cputime cputime_expires; 44533 struct task_cputime cputime_expires;
44504 struct list_head cpu_timers[3]; 44534 struct list_head cpu_timers[3];
44505 44535
@@ -44516,7 +44546,7 @@ diff -urNp linux-2.6.32.9/include/linux/sched.h linux-2.6.32.9/include/linux/sch
44516 char comm[TASK_COMM_LEN]; /* executable name excluding path 44546 char comm[TASK_COMM_LEN]; /* executable name excluding path
44517 - access with [gs]et_task_comm (which lock 44547 - access with [gs]et_task_comm (which lock
44518 it with task_lock()) 44548 it with task_lock())
44519@@ -1434,6 +1434,15 @@ struct task_struct { 44549@@ -1437,6 +1437,15 @@ struct task_struct {
44520 int hardirq_context; 44550 int hardirq_context;
44521 int softirq_context; 44551 int softirq_context;
44522 #endif 44552 #endif
@@ -44532,7 +44562,7 @@ diff -urNp linux-2.6.32.9/include/linux/sched.h linux-2.6.32.9/include/linux/sch
44532 #ifdef CONFIG_LOCKDEP 44562 #ifdef CONFIG_LOCKDEP
44533 # define MAX_LOCK_DEPTH 48UL 44563 # define MAX_LOCK_DEPTH 48UL
44534 u64 curr_chain_key; 44564 u64 curr_chain_key;
44535@@ -1454,6 +1463,9 @@ struct task_struct { 44565@@ -1457,6 +1466,9 @@ struct task_struct {
44536 44566
44537 struct backing_dev_info *backing_dev_info; 44567 struct backing_dev_info *backing_dev_info;
44538 44568
@@ -44542,7 +44572,7 @@ diff -urNp linux-2.6.32.9/include/linux/sched.h linux-2.6.32.9/include/linux/sch
44542 struct io_context *io_context; 44572 struct io_context *io_context;
44543 44573
44544 unsigned long ptrace_message; 44574 unsigned long ptrace_message;
44545@@ -1517,6 +1529,19 @@ struct task_struct { 44575@@ -1520,6 +1532,19 @@ struct task_struct {
44546 unsigned long default_timer_slack_ns; 44576 unsigned long default_timer_slack_ns;
44547 44577
44548 struct list_head *scm_work_list; 44578 struct list_head *scm_work_list;
@@ -44562,7 +44592,7 @@ diff -urNp linux-2.6.32.9/include/linux/sched.h linux-2.6.32.9/include/linux/sch
44562 #ifdef CONFIG_FUNCTION_GRAPH_TRACER 44592 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
44563 /* Index of current stored adress in ret_stack */ 44593 /* Index of current stored adress in ret_stack */
44564 int curr_ret_stack; 44594 int curr_ret_stack;
44565@@ -1541,6 +1566,52 @@ struct task_struct { 44595@@ -1544,6 +1569,52 @@ struct task_struct {
44566 unsigned long stack_start; 44596 unsigned long stack_start;
44567 }; 44597 };
44568 44598
@@ -44615,7 +44645,7 @@ diff -urNp linux-2.6.32.9/include/linux/sched.h linux-2.6.32.9/include/linux/sch
44615 /* Future-safe accessor for struct task_struct's cpus_allowed. */ 44645 /* Future-safe accessor for struct task_struct's cpus_allowed. */
44616 #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed) 44646 #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed)
44617 44647
44618@@ -2140,7 +2211,7 @@ extern void __cleanup_sighand(struct sig 44648@@ -2143,7 +2214,7 @@ extern void __cleanup_sighand(struct sig
44619 extern void exit_itimers(struct signal_struct *); 44649 extern void exit_itimers(struct signal_struct *);
44620 extern void flush_itimer_signals(void); 44650 extern void flush_itimer_signals(void);
44621 44651
@@ -44624,7 +44654,7 @@ diff -urNp linux-2.6.32.9/include/linux/sched.h linux-2.6.32.9/include/linux/sch
44624 44654
44625 extern void daemonize(const char *, ...); 44655 extern void daemonize(const char *, ...);
44626 extern int allow_signal(int); 44656 extern int allow_signal(int);
44627@@ -2242,6 +2313,33 @@ static inline void task_unlock(struct ta 44657@@ -2245,6 +2316,33 @@ static inline void task_unlock(struct ta
44628 spin_unlock(&p->alloc_lock); 44658 spin_unlock(&p->alloc_lock);
44629 } 44659 }
44630 44660
@@ -44658,7 +44688,7 @@ diff -urNp linux-2.6.32.9/include/linux/sched.h linux-2.6.32.9/include/linux/sch
44658 extern struct sighand_struct *lock_task_sighand(struct task_struct *tsk, 44688 extern struct sighand_struct *lock_task_sighand(struct task_struct *tsk,
44659 unsigned long *flags); 44689 unsigned long *flags);
44660 44690
44661@@ -2253,8 +2351,8 @@ static inline void unlock_task_sighand(s 44691@@ -2256,8 +2354,8 @@ static inline void unlock_task_sighand(s
44662 44692
44663 #ifndef __HAVE_THREAD_FUNCTIONS 44693 #ifndef __HAVE_THREAD_FUNCTIONS
44664 44694
@@ -44669,7 +44699,7 @@ diff -urNp linux-2.6.32.9/include/linux/sched.h linux-2.6.32.9/include/linux/sch
44669 44699
44670 static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org) 44700 static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org)
44671 { 44701 {
44672@@ -2269,13 +2367,31 @@ static inline unsigned long *end_of_stac 44702@@ -2272,13 +2370,31 @@ static inline unsigned long *end_of_stac
44673 44703
44674 #endif 44704 #endif
44675 44705
@@ -44703,9 +44733,9 @@ diff -urNp linux-2.6.32.9/include/linux/sched.h linux-2.6.32.9/include/linux/sch
44703 extern void thread_info_cache_init(void); 44733 extern void thread_info_cache_init(void);
44704 44734
44705 #ifdef CONFIG_DEBUG_STACK_USAGE 44735 #ifdef CONFIG_DEBUG_STACK_USAGE
44706diff -urNp linux-2.6.32.9/include/linux/screen_info.h linux-2.6.32.9/include/linux/screen_info.h 44736diff -urNp linux-2.6.32.10/include/linux/screen_info.h linux-2.6.32.10/include/linux/screen_info.h
44707--- linux-2.6.32.9/include/linux/screen_info.h 2010-02-23 10:38:51.000000000 -0500 44737--- linux-2.6.32.10/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400
44708+++ linux-2.6.32.9/include/linux/screen_info.h 2010-03-11 20:25:00.237359883 -0500 44738+++ linux-2.6.32.10/include/linux/screen_info.h 2010-03-20 15:58:47.165359004 -0400
44709@@ -42,7 +42,8 @@ struct screen_info { 44739@@ -42,7 +42,8 @@ struct screen_info {
44710 __u16 pages; /* 0x32 */ 44740 __u16 pages; /* 0x32 */
44711 __u16 vesa_attributes; /* 0x34 */ 44741 __u16 vesa_attributes; /* 0x34 */
@@ -44716,9 +44746,9 @@ diff -urNp linux-2.6.32.9/include/linux/screen_info.h linux-2.6.32.9/include/lin
44716 } __attribute__((packed)); 44746 } __attribute__((packed));
44717 44747
44718 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ 44748 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
44719diff -urNp linux-2.6.32.9/include/linux/security.h linux-2.6.32.9/include/linux/security.h 44749diff -urNp linux-2.6.32.10/include/linux/security.h linux-2.6.32.10/include/linux/security.h
44720--- linux-2.6.32.9/include/linux/security.h 2010-02-23 10:38:51.000000000 -0500 44750--- linux-2.6.32.10/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400
44721+++ linux-2.6.32.9/include/linux/security.h 2010-03-11 20:25:00.241635792 -0500 44751+++ linux-2.6.32.10/include/linux/security.h 2010-03-20 15:58:47.165359004 -0400
44722@@ -34,6 +34,7 @@ 44752@@ -34,6 +34,7 @@
44723 #include <linux/key.h> 44753 #include <linux/key.h>
44724 #include <linux/xfrm.h> 44754 #include <linux/xfrm.h>
@@ -44727,9 +44757,9 @@ diff -urNp linux-2.6.32.9/include/linux/security.h linux-2.6.32.9/include/linux/
44727 #include <net/flow.h> 44757 #include <net/flow.h>
44728 44758
44729 /* Maximum number of letters for an LSM name string */ 44759 /* Maximum number of letters for an LSM name string */
44730diff -urNp linux-2.6.32.9/include/linux/shm.h linux-2.6.32.9/include/linux/shm.h 44760diff -urNp linux-2.6.32.10/include/linux/shm.h linux-2.6.32.10/include/linux/shm.h
44731--- linux-2.6.32.9/include/linux/shm.h 2010-02-23 10:38:51.000000000 -0500 44761--- linux-2.6.32.10/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400
44732+++ linux-2.6.32.9/include/linux/shm.h 2010-03-11 20:25:00.241635792 -0500 44762+++ linux-2.6.32.10/include/linux/shm.h 2010-03-20 15:58:47.165359004 -0400
44733@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke 44763@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
44734 pid_t shm_cprid; 44764 pid_t shm_cprid;
44735 pid_t shm_lprid; 44765 pid_t shm_lprid;
@@ -44741,9 +44771,9 @@ diff -urNp linux-2.6.32.9/include/linux/shm.h linux-2.6.32.9/include/linux/shm.h
44741 }; 44771 };
44742 44772
44743 /* shm_mode upper byte flags */ 44773 /* shm_mode upper byte flags */
44744diff -urNp linux-2.6.32.9/include/linux/slab.h linux-2.6.32.9/include/linux/slab.h 44774diff -urNp linux-2.6.32.10/include/linux/slab.h linux-2.6.32.10/include/linux/slab.h
44745--- linux-2.6.32.9/include/linux/slab.h 2010-02-23 10:38:51.000000000 -0500 44775--- linux-2.6.32.10/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400
44746+++ linux-2.6.32.9/include/linux/slab.h 2010-03-11 20:25:00.241635792 -0500 44776+++ linux-2.6.32.10/include/linux/slab.h 2010-03-20 15:58:47.165359004 -0400
44747@@ -11,6 +11,7 @@ 44777@@ -11,6 +11,7 @@
44748 44778
44749 #include <linux/gfp.h> 44779 #include <linux/gfp.h>
@@ -44815,9 +44845,9 @@ diff -urNp linux-2.6.32.9/include/linux/slab.h linux-2.6.32.9/include/linux/slab
44815+}) 44845+})
44816+ 44846+
44817 #endif /* _LINUX_SLAB_H */ 44847 #endif /* _LINUX_SLAB_H */
44818diff -urNp linux-2.6.32.9/include/linux/slub_def.h linux-2.6.32.9/include/linux/slub_def.h 44848diff -urNp linux-2.6.32.10/include/linux/slub_def.h linux-2.6.32.10/include/linux/slub_def.h
44819--- linux-2.6.32.9/include/linux/slub_def.h 2010-02-23 10:38:51.000000000 -0500 44849--- linux-2.6.32.10/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400
44820+++ linux-2.6.32.9/include/linux/slub_def.h 2010-03-11 20:25:00.241635792 -0500 44850+++ linux-2.6.32.10/include/linux/slub_def.h 2010-03-20 15:58:47.165359004 -0400
44821@@ -86,7 +86,7 @@ struct kmem_cache { 44851@@ -86,7 +86,7 @@ struct kmem_cache {
44822 struct kmem_cache_order_objects max; 44852 struct kmem_cache_order_objects max;
44823 struct kmem_cache_order_objects min; 44853 struct kmem_cache_order_objects min;
@@ -44827,9 +44857,9 @@ diff -urNp linux-2.6.32.9/include/linux/slub_def.h linux-2.6.32.9/include/linux/
44827 void (*ctor)(void *); 44857 void (*ctor)(void *);
44828 int inuse; /* Offset to metadata */ 44858 int inuse; /* Offset to metadata */
44829 int align; /* Alignment */ 44859 int align; /* Alignment */
44830diff -urNp linux-2.6.32.9/include/linux/sonet.h linux-2.6.32.9/include/linux/sonet.h 44860diff -urNp linux-2.6.32.10/include/linux/sonet.h linux-2.6.32.10/include/linux/sonet.h
44831--- linux-2.6.32.9/include/linux/sonet.h 2010-02-23 10:38:51.000000000 -0500 44861--- linux-2.6.32.10/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400
44832+++ linux-2.6.32.9/include/linux/sonet.h 2010-03-11 20:25:00.241635792 -0500 44862+++ linux-2.6.32.10/include/linux/sonet.h 2010-03-20 15:58:47.165359004 -0400
44833@@ -61,7 +61,7 @@ struct sonet_stats { 44863@@ -61,7 +61,7 @@ struct sonet_stats {
44834 #include <asm/atomic.h> 44864 #include <asm/atomic.h>
44835 44865
@@ -44839,9 +44869,9 @@ diff -urNp linux-2.6.32.9/include/linux/sonet.h linux-2.6.32.9/include/linux/son
44839 __SONET_ITEMS 44869 __SONET_ITEMS
44840 #undef __HANDLE_ITEM 44870 #undef __HANDLE_ITEM
44841 }; 44871 };
44842diff -urNp linux-2.6.32.9/include/linux/suspend.h linux-2.6.32.9/include/linux/suspend.h 44872diff -urNp linux-2.6.32.10/include/linux/suspend.h linux-2.6.32.10/include/linux/suspend.h
44843--- linux-2.6.32.9/include/linux/suspend.h 2010-02-23 10:38:51.000000000 -0500 44873--- linux-2.6.32.10/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400
44844+++ linux-2.6.32.9/include/linux/suspend.h 2010-03-11 20:25:00.241635792 -0500 44874+++ linux-2.6.32.10/include/linux/suspend.h 2010-03-20 15:58:47.165359004 -0400
44845@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; 44875@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
44846 * which require special recovery actions in that situation. 44876 * which require special recovery actions in that situation.
44847 */ 44877 */
@@ -44930,9 +44960,9 @@ diff -urNp linux-2.6.32.9/include/linux/suspend.h linux-2.6.32.9/include/linux/s
44930 static inline int hibernate(void) { return -ENOSYS; } 44960 static inline int hibernate(void) { return -ENOSYS; }
44931 static inline bool system_entering_hibernation(void) { return false; } 44961 static inline bool system_entering_hibernation(void) { return false; }
44932 #endif /* CONFIG_HIBERNATION */ 44962 #endif /* CONFIG_HIBERNATION */
44933diff -urNp linux-2.6.32.9/include/linux/sysctl.h linux-2.6.32.9/include/linux/sysctl.h 44963diff -urNp linux-2.6.32.10/include/linux/sysctl.h linux-2.6.32.10/include/linux/sysctl.h
44934--- linux-2.6.32.9/include/linux/sysctl.h 2010-02-23 10:38:51.000000000 -0500 44964--- linux-2.6.32.10/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400
44935+++ linux-2.6.32.9/include/linux/sysctl.h 2010-03-11 20:25:00.241635792 -0500 44965+++ linux-2.6.32.10/include/linux/sysctl.h 2010-03-20 15:58:47.165359004 -0400
44936@@ -164,7 +164,11 @@ enum 44966@@ -164,7 +164,11 @@ enum
44937 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ 44967 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
44938 }; 44968 };
@@ -44946,9 +44976,9 @@ diff -urNp linux-2.6.32.9/include/linux/sysctl.h linux-2.6.32.9/include/linux/sy
44946 44976
44947 /* CTL_VM names: */ 44977 /* CTL_VM names: */
44948 enum 44978 enum
44949diff -urNp linux-2.6.32.9/include/linux/sysfs.h linux-2.6.32.9/include/linux/sysfs.h 44979diff -urNp linux-2.6.32.10/include/linux/sysfs.h linux-2.6.32.10/include/linux/sysfs.h
44950--- linux-2.6.32.9/include/linux/sysfs.h 2010-02-23 10:38:51.000000000 -0500 44980--- linux-2.6.32.10/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400
44951+++ linux-2.6.32.9/include/linux/sysfs.h 2010-03-11 20:25:00.241635792 -0500 44981+++ linux-2.6.32.10/include/linux/sysfs.h 2010-03-20 15:58:47.165359004 -0400
44952@@ -75,8 +75,8 @@ struct bin_attribute { 44982@@ -75,8 +75,8 @@ struct bin_attribute {
44953 }; 44983 };
44954 44984
@@ -44960,9 +44990,9 @@ diff -urNp linux-2.6.32.9/include/linux/sysfs.h linux-2.6.32.9/include/linux/sys
44960 }; 44990 };
44961 44991
44962 struct sysfs_dirent; 44992 struct sysfs_dirent;
44963diff -urNp linux-2.6.32.9/include/linux/thread_info.h linux-2.6.32.9/include/linux/thread_info.h 44993diff -urNp linux-2.6.32.10/include/linux/thread_info.h linux-2.6.32.10/include/linux/thread_info.h
44964--- linux-2.6.32.9/include/linux/thread_info.h 2010-02-23 10:38:51.000000000 -0500 44994--- linux-2.6.32.10/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400
44965+++ linux-2.6.32.9/include/linux/thread_info.h 2010-03-11 20:25:00.241635792 -0500 44995+++ linux-2.6.32.10/include/linux/thread_info.h 2010-03-20 15:58:47.165359004 -0400
44966@@ -23,7 +23,7 @@ struct restart_block { 44996@@ -23,7 +23,7 @@ struct restart_block {
44967 }; 44997 };
44968 /* For futex_wait and futex_wait_requeue_pi */ 44998 /* For futex_wait and futex_wait_requeue_pi */
@@ -44972,9 +45002,9 @@ diff -urNp linux-2.6.32.9/include/linux/thread_info.h linux-2.6.32.9/include/lin
44972 u32 val; 45002 u32 val;
44973 u32 flags; 45003 u32 flags;
44974 u32 bitset; 45004 u32 bitset;
44975diff -urNp linux-2.6.32.9/include/linux/tty.h linux-2.6.32.9/include/linux/tty.h 45005diff -urNp linux-2.6.32.10/include/linux/tty.h linux-2.6.32.10/include/linux/tty.h
44976--- linux-2.6.32.9/include/linux/tty.h 2010-02-23 10:38:51.000000000 -0500 45006--- linux-2.6.32.10/include/linux/tty.h 2010-03-15 11:52:04.000000000 -0400
44977+++ linux-2.6.32.9/include/linux/tty.h 2010-03-11 20:25:00.241635792 -0500 45007+++ linux-2.6.32.10/include/linux/tty.h 2010-03-20 15:58:47.165359004 -0400
44978@@ -13,6 +13,7 @@ 45008@@ -13,6 +13,7 @@
44979 #include <linux/tty_driver.h> 45009 #include <linux/tty_driver.h>
44980 #include <linux/tty_ldisc.h> 45010 #include <linux/tty_ldisc.h>
@@ -45010,9 +45040,9 @@ diff -urNp linux-2.6.32.9/include/linux/tty.h linux-2.6.32.9/include/linux/tty.h
45010 45040
45011 /* n_tty.c */ 45041 /* n_tty.c */
45012 extern struct tty_ldisc_ops tty_ldisc_N_TTY; 45042 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
45013diff -urNp linux-2.6.32.9/include/linux/tty_ldisc.h linux-2.6.32.9/include/linux/tty_ldisc.h 45043diff -urNp linux-2.6.32.10/include/linux/tty_ldisc.h linux-2.6.32.10/include/linux/tty_ldisc.h
45014--- linux-2.6.32.9/include/linux/tty_ldisc.h 2010-02-23 10:38:51.000000000 -0500 45044--- linux-2.6.32.10/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400
45015+++ linux-2.6.32.9/include/linux/tty_ldisc.h 2010-03-11 20:25:00.241635792 -0500 45045+++ linux-2.6.32.10/include/linux/tty_ldisc.h 2010-03-20 15:58:47.165359004 -0400
45016@@ -139,7 +139,7 @@ struct tty_ldisc_ops { 45046@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
45017 45047
45018 struct module *owner; 45048 struct module *owner;
@@ -45022,9 +45052,9 @@ diff -urNp linux-2.6.32.9/include/linux/tty_ldisc.h linux-2.6.32.9/include/linux
45022 }; 45052 };
45023 45053
45024 struct tty_ldisc { 45054 struct tty_ldisc {
45025diff -urNp linux-2.6.32.9/include/linux/types.h linux-2.6.32.9/include/linux/types.h 45055diff -urNp linux-2.6.32.10/include/linux/types.h linux-2.6.32.10/include/linux/types.h
45026--- linux-2.6.32.9/include/linux/types.h 2010-02-23 10:38:51.000000000 -0500 45056--- linux-2.6.32.10/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400
45027+++ linux-2.6.32.9/include/linux/types.h 2010-03-11 20:25:00.241635792 -0500 45057+++ linux-2.6.32.10/include/linux/types.h 2010-03-20 15:58:47.168865970 -0400
45028@@ -191,10 +191,26 @@ typedef struct { 45058@@ -191,10 +191,26 @@ typedef struct {
45029 volatile int counter; 45059 volatile int counter;
45030 } atomic_t; 45060 } atomic_t;
@@ -45052,9 +45082,9 @@ diff -urNp linux-2.6.32.9/include/linux/types.h linux-2.6.32.9/include/linux/typ
45052 #endif 45082 #endif
45053 45083
45054 struct ustat { 45084 struct ustat {
45055diff -urNp linux-2.6.32.9/include/linux/uaccess.h linux-2.6.32.9/include/linux/uaccess.h 45085diff -urNp linux-2.6.32.10/include/linux/uaccess.h linux-2.6.32.10/include/linux/uaccess.h
45056--- linux-2.6.32.9/include/linux/uaccess.h 2010-02-23 10:38:51.000000000 -0500 45086--- linux-2.6.32.10/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400
45057+++ linux-2.6.32.9/include/linux/uaccess.h 2010-03-11 20:25:00.241635792 -0500 45087+++ linux-2.6.32.10/include/linux/uaccess.h 2010-03-20 15:58:47.168865970 -0400
45058@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ 45088@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
45059 long ret; \ 45089 long ret; \
45060 mm_segment_t old_fs = get_fs(); \ 45090 mm_segment_t old_fs = get_fs(); \
@@ -45086,9 +45116,9 @@ diff -urNp linux-2.6.32.9/include/linux/uaccess.h linux-2.6.32.9/include/linux/u
45086+extern long probe_kernel_write(void *dst, const void *src, size_t size); 45116+extern long probe_kernel_write(void *dst, const void *src, size_t size);
45087 45117
45088 #endif /* __LINUX_UACCESS_H__ */ 45118 #endif /* __LINUX_UACCESS_H__ */
45089diff -urNp linux-2.6.32.9/include/linux/vmalloc.h linux-2.6.32.9/include/linux/vmalloc.h 45119diff -urNp linux-2.6.32.10/include/linux/vmalloc.h linux-2.6.32.10/include/linux/vmalloc.h
45090--- linux-2.6.32.9/include/linux/vmalloc.h 2010-02-23 10:38:51.000000000 -0500 45120--- linux-2.6.32.10/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400
45091+++ linux-2.6.32.9/include/linux/vmalloc.h 2010-03-11 20:25:00.241635792 -0500 45121+++ linux-2.6.32.10/include/linux/vmalloc.h 2010-03-20 15:58:47.168865970 -0400
45092@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining 45122@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
45093 #define VM_MAP 0x00000004 /* vmap()ed pages */ 45123 #define VM_MAP 0x00000004 /* vmap()ed pages */
45094 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ 45124 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
@@ -45183,9 +45213,9 @@ diff -urNp linux-2.6.32.9/include/linux/vmalloc.h linux-2.6.32.9/include/linux/v
45183+}) 45213+})
45184+ 45214+
45185 #endif /* _LINUX_VMALLOC_H */ 45215 #endif /* _LINUX_VMALLOC_H */
45186diff -urNp linux-2.6.32.9/include/net/irda/ircomm_tty.h linux-2.6.32.9/include/net/irda/ircomm_tty.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
45187--- linux-2.6.32.9/include/net/irda/ircomm_tty.h 2010-02-23 10:38:51.000000000 -0500 45217--- linux-2.6.32.10/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400
45188+++ linux-2.6.32.9/include/net/irda/ircomm_tty.h 2010-03-11 20:25:00.241635792 -0500 45218+++ linux-2.6.32.10/include/net/irda/ircomm_tty.h 2010-03-20 15:58:47.168865970 -0400
45189@@ -105,8 +105,8 @@ struct ircomm_tty_cb { 45219@@ -105,8 +105,8 @@ struct ircomm_tty_cb {
45190 unsigned short close_delay; 45220 unsigned short close_delay;
45191 unsigned short closing_wait; /* time to wait before closing */ 45221 unsigned short closing_wait; /* time to wait before closing */
@@ -45197,9 +45227,9 @@ diff -urNp linux-2.6.32.9/include/net/irda/ircomm_tty.h linux-2.6.32.9/include/n
45197 45227
45198 /* Protect concurent access to : 45228 /* Protect concurent access to :
45199 * o self->open_count 45229 * o self->open_count
45200diff -urNp linux-2.6.32.9/include/net/neighbour.h linux-2.6.32.9/include/net/neighbour.h 45230diff -urNp linux-2.6.32.10/include/net/neighbour.h linux-2.6.32.10/include/net/neighbour.h
45201--- linux-2.6.32.9/include/net/neighbour.h 2010-02-23 10:38:51.000000000 -0500 45231--- linux-2.6.32.10/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400
45202+++ linux-2.6.32.9/include/net/neighbour.h 2010-03-11 20:25:00.241635792 -0500 45232+++ linux-2.6.32.10/include/net/neighbour.h 2010-03-20 15:58:47.168865970 -0400
45203@@ -125,12 +125,12 @@ struct neighbour 45233@@ -125,12 +125,12 @@ struct neighbour
45204 struct neigh_ops 45234 struct neigh_ops
45205 { 45235 {
@@ -45219,9 +45249,9 @@ diff -urNp linux-2.6.32.9/include/net/neighbour.h linux-2.6.32.9/include/net/nei
45219 }; 45249 };
45220 45250
45221 struct pneigh_entry 45251 struct pneigh_entry
45222diff -urNp linux-2.6.32.9/include/net/sctp/sctp.h linux-2.6.32.9/include/net/sctp/sctp.h 45252diff -urNp linux-2.6.32.10/include/net/sctp/sctp.h linux-2.6.32.10/include/net/sctp/sctp.h
45223--- linux-2.6.32.9/include/net/sctp/sctp.h 2010-02-23 10:38:51.000000000 -0500 45253--- linux-2.6.32.10/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400
45224+++ linux-2.6.32.9/include/net/sctp/sctp.h 2010-03-11 20:25:00.241635792 -0500 45254+++ linux-2.6.32.10/include/net/sctp/sctp.h 2010-03-20 15:58:47.168865970 -0400
45225@@ -305,8 +305,8 @@ extern int sctp_debug_flag; 45255@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
45226 45256
45227 #else /* SCTP_DEBUG */ 45257 #else /* SCTP_DEBUG */
@@ -45233,9 +45263,9 @@ diff -urNp linux-2.6.32.9/include/net/sctp/sctp.h linux-2.6.32.9/include/net/sct
45233 #define SCTP_ENABLE_DEBUG 45263 #define SCTP_ENABLE_DEBUG
45234 #define SCTP_DISABLE_DEBUG 45264 #define SCTP_DISABLE_DEBUG
45235 #define SCTP_ASSERT(expr, str, func) 45265 #define SCTP_ASSERT(expr, str, func)
45236diff -urNp linux-2.6.32.9/include/net/tcp.h linux-2.6.32.9/include/net/tcp.h 45266diff -urNp linux-2.6.32.10/include/net/tcp.h linux-2.6.32.10/include/net/tcp.h
45237--- linux-2.6.32.9/include/net/tcp.h 2010-02-23 10:38:51.000000000 -0500 45267--- linux-2.6.32.10/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400
45238+++ linux-2.6.32.9/include/net/tcp.h 2010-03-11 20:25:00.241635792 -0500 45268+++ linux-2.6.32.10/include/net/tcp.h 2010-03-20 15:58:47.168865970 -0400
45239@@ -1420,6 +1420,7 @@ enum tcp_seq_states { 45269@@ -1420,6 +1420,7 @@ enum tcp_seq_states {
45240 struct tcp_seq_afinfo { 45270 struct tcp_seq_afinfo {
45241 char *name; 45271 char *name;
@@ -45244,9 +45274,9 @@ diff -urNp linux-2.6.32.9/include/net/tcp.h linux-2.6.32.9/include/net/tcp.h
45244 struct file_operations seq_fops; 45274 struct file_operations seq_fops;
45245 struct seq_operations seq_ops; 45275 struct seq_operations seq_ops;
45246 }; 45276 };
45247diff -urNp linux-2.6.32.9/include/net/udp.h linux-2.6.32.9/include/net/udp.h 45277diff -urNp linux-2.6.32.10/include/net/udp.h linux-2.6.32.10/include/net/udp.h
45248--- linux-2.6.32.9/include/net/udp.h 2010-02-23 10:38:51.000000000 -0500 45278--- linux-2.6.32.10/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400
45249+++ linux-2.6.32.9/include/net/udp.h 2010-03-11 20:25:00.241635792 -0500 45279+++ linux-2.6.32.10/include/net/udp.h 2010-03-20 15:58:47.168865970 -0400
45250@@ -187,6 +187,7 @@ struct udp_seq_afinfo { 45280@@ -187,6 +187,7 @@ struct udp_seq_afinfo {
45251 char *name; 45281 char *name;
45252 sa_family_t family; 45282 sa_family_t family;
@@ -45255,9 +45285,9 @@ diff -urNp linux-2.6.32.9/include/net/udp.h linux-2.6.32.9/include/net/udp.h
45255 struct file_operations seq_fops; 45285 struct file_operations seq_fops;
45256 struct seq_operations seq_ops; 45286 struct seq_operations seq_ops;
45257 }; 45287 };
45258diff -urNp linux-2.6.32.9/include/sound/ac97_codec.h linux-2.6.32.9/include/sound/ac97_codec.h 45288diff -urNp linux-2.6.32.10/include/sound/ac97_codec.h linux-2.6.32.10/include/sound/ac97_codec.h
45259--- linux-2.6.32.9/include/sound/ac97_codec.h 2010-02-23 10:38:51.000000000 -0500 45289--- linux-2.6.32.10/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400
45260+++ linux-2.6.32.9/include/sound/ac97_codec.h 2010-03-11 20:25:00.241635792 -0500 45290+++ linux-2.6.32.10/include/sound/ac97_codec.h 2010-03-20 15:58:47.168865970 -0400
45261@@ -419,15 +419,15 @@ 45291@@ -419,15 +419,15 @@
45262 struct snd_ac97; 45292 struct snd_ac97;
45263 45293
@@ -45290,9 +45320,9 @@ diff -urNp linux-2.6.32.9/include/sound/ac97_codec.h linux-2.6.32.9/include/soun
45290 void *private_data; 45320 void *private_data;
45291 void (*private_free) (struct snd_ac97 *ac97); 45321 void (*private_free) (struct snd_ac97 *ac97);
45292 /* --- */ 45322 /* --- */
45293diff -urNp linux-2.6.32.9/include/trace/events/irq.h linux-2.6.32.9/include/trace/events/irq.h 45323diff -urNp linux-2.6.32.10/include/trace/events/irq.h linux-2.6.32.10/include/trace/events/irq.h
45294--- linux-2.6.32.9/include/trace/events/irq.h 2010-02-23 10:38:51.000000000 -0500 45324--- linux-2.6.32.10/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400
45295+++ linux-2.6.32.9/include/trace/events/irq.h 2010-03-11 20:25:00.241635792 -0500 45325+++ linux-2.6.32.10/include/trace/events/irq.h 2010-03-20 15:58:47.168865970 -0400
45296@@ -34,7 +34,7 @@ 45326@@ -34,7 +34,7 @@
45297 */ 45327 */
45298 TRACE_EVENT(irq_handler_entry, 45328 TRACE_EVENT(irq_handler_entry,
@@ -45329,9 +45359,9 @@ diff -urNp linux-2.6.32.9/include/trace/events/irq.h linux-2.6.32.9/include/trac
45329 45359
45330 TP_ARGS(h, vec), 45360 TP_ARGS(h, vec),
45331 45361
45332diff -urNp linux-2.6.32.9/include/video/uvesafb.h linux-2.6.32.9/include/video/uvesafb.h 45362diff -urNp linux-2.6.32.10/include/video/uvesafb.h linux-2.6.32.10/include/video/uvesafb.h
45333--- linux-2.6.32.9/include/video/uvesafb.h 2010-02-23 10:38:51.000000000 -0500 45363--- linux-2.6.32.10/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400
45334+++ linux-2.6.32.9/include/video/uvesafb.h 2010-03-11 20:25:00.241635792 -0500 45364+++ linux-2.6.32.10/include/video/uvesafb.h 2010-03-20 15:58:47.168865970 -0400
45335@@ -177,6 +177,7 @@ struct uvesafb_par { 45365@@ -177,6 +177,7 @@ struct uvesafb_par {
45336 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ 45366 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
45337 u8 pmi_setpal; /* PMI for palette changes */ 45367 u8 pmi_setpal; /* PMI for palette changes */
@@ -45340,9 +45370,9 @@ diff -urNp linux-2.6.32.9/include/video/uvesafb.h linux-2.6.32.9/include/video/u
45340 void *pmi_start; 45370 void *pmi_start;
45341 void *pmi_pal; 45371 void *pmi_pal;
45342 u8 *vbe_state_orig; /* 45372 u8 *vbe_state_orig; /*
45343diff -urNp linux-2.6.32.9/init/do_mounts.c linux-2.6.32.9/init/do_mounts.c 45373diff -urNp linux-2.6.32.10/init/do_mounts.c linux-2.6.32.10/init/do_mounts.c
45344--- linux-2.6.32.9/init/do_mounts.c 2010-02-23 10:38:51.000000000 -0500 45374--- linux-2.6.32.10/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400
45345+++ linux-2.6.32.9/init/do_mounts.c 2010-03-11 20:25:00.241635792 -0500 45375+++ linux-2.6.32.10/init/do_mounts.c 2010-03-20 15:58:47.168865970 -0400
45346@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa 45376@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
45347 45377
45348 static int __init do_mount_root(char *name, char *fs, int flags, void *data) 45378 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -45388,9 +45418,9 @@ diff -urNp linux-2.6.32.9/init/do_mounts.c linux-2.6.32.9/init/do_mounts.c
45388+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); 45418+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
45389+ sys_chroot((__force char __user *)"."); 45419+ sys_chroot((__force char __user *)".");
45390 } 45420 }
45391diff -urNp linux-2.6.32.9/init/do_mounts.h linux-2.6.32.9/init/do_mounts.h 45421diff -urNp linux-2.6.32.10/init/do_mounts.h linux-2.6.32.10/init/do_mounts.h
45392--- linux-2.6.32.9/init/do_mounts.h 2010-02-23 10:38:51.000000000 -0500 45422--- linux-2.6.32.10/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400
45393+++ linux-2.6.32.9/init/do_mounts.h 2010-03-11 20:25:00.241635792 -0500 45423+++ linux-2.6.32.10/init/do_mounts.h 2010-03-20 15:58:47.168865970 -0400
45394@@ -15,15 +15,15 @@ extern int root_mountflags; 45424@@ -15,15 +15,15 @@ extern int root_mountflags;
45395 45425
45396 static inline int create_dev(char *name, dev_t dev) 45426 static inline int create_dev(char *name, dev_t dev)
@@ -45410,9 +45440,9 @@ diff -urNp linux-2.6.32.9/init/do_mounts.h linux-2.6.32.9/init/do_mounts.h
45410 return 0; 45440 return 0;
45411 if (!S_ISBLK(stat.st_mode)) 45441 if (!S_ISBLK(stat.st_mode))
45412 return 0; 45442 return 0;
45413diff -urNp linux-2.6.32.9/init/do_mounts_initrd.c linux-2.6.32.9/init/do_mounts_initrd.c 45443diff -urNp linux-2.6.32.10/init/do_mounts_initrd.c linux-2.6.32.10/init/do_mounts_initrd.c
45414--- linux-2.6.32.9/init/do_mounts_initrd.c 2010-02-23 10:38:51.000000000 -0500 45444--- linux-2.6.32.10/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400
45415+++ linux-2.6.32.9/init/do_mounts_initrd.c 2010-03-11 20:25:00.245480360 -0500 45445+++ linux-2.6.32.10/init/do_mounts_initrd.c 2010-03-20 15:58:47.168865970 -0400
45416@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel 45446@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
45417 sys_close(old_fd);sys_close(root_fd); 45447 sys_close(old_fd);sys_close(root_fd);
45418 sys_close(0);sys_close(1);sys_close(2); 45448 sys_close(0);sys_close(1);sys_close(2);
@@ -45496,9 +45526,9 @@ diff -urNp linux-2.6.32.9/init/do_mounts_initrd.c linux-2.6.32.9/init/do_mounts_
45496+ sys_unlink((__force const char __user *)"/initrd.image"); 45526+ sys_unlink((__force const char __user *)"/initrd.image");
45497 return 0; 45527 return 0;
45498 } 45528 }
45499diff -urNp linux-2.6.32.9/init/do_mounts_md.c linux-2.6.32.9/init/do_mounts_md.c 45529diff -urNp linux-2.6.32.10/init/do_mounts_md.c linux-2.6.32.10/init/do_mounts_md.c
45500--- linux-2.6.32.9/init/do_mounts_md.c 2010-02-23 10:38:51.000000000 -0500 45530--- linux-2.6.32.10/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400
45501+++ linux-2.6.32.9/init/do_mounts_md.c 2010-03-11 20:25:00.245480360 -0500 45531+++ linux-2.6.32.10/init/do_mounts_md.c 2010-03-20 15:58:47.168865970 -0400
45502@@ -170,7 +170,7 @@ static void __init md_setup_drive(void) 45532@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
45503 partitioned ? "_d" : "", minor, 45533 partitioned ? "_d" : "", minor,
45504 md_setup_args[ent].device_names); 45534 md_setup_args[ent].device_names);
@@ -45526,9 +45556,9 @@ diff -urNp linux-2.6.32.9/init/do_mounts_md.c linux-2.6.32.9/init/do_mounts_md.c
45526 if (fd >= 0) { 45556 if (fd >= 0) {
45527 sys_ioctl(fd, RAID_AUTORUN, raid_autopart); 45557 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
45528 sys_close(fd); 45558 sys_close(fd);
45529diff -urNp linux-2.6.32.9/init/initramfs.c linux-2.6.32.9/init/initramfs.c 45559diff -urNp linux-2.6.32.10/init/initramfs.c linux-2.6.32.10/init/initramfs.c
45530--- linux-2.6.32.9/init/initramfs.c 2010-02-23 10:38:51.000000000 -0500 45560--- linux-2.6.32.10/init/initramfs.c 2010-03-15 11:52:04.000000000 -0400
45531+++ linux-2.6.32.9/init/initramfs.c 2010-03-11 20:25:00.245480360 -0500 45561+++ linux-2.6.32.10/init/initramfs.c 2010-03-20 15:58:47.168865970 -0400
45532@@ -74,7 +74,7 @@ static void __init free_hash(void) 45562@@ -74,7 +74,7 @@ static void __init free_hash(void)
45533 } 45563 }
45534 } 45564 }
@@ -45637,9 +45667,9 @@ diff -urNp linux-2.6.32.9/init/initramfs.c linux-2.6.32.9/init/initramfs.c
45637 state = SkipIt; 45667 state = SkipIt;
45638 next_state = Reset; 45668 next_state = Reset;
45639 return 0; 45669 return 0;
45640diff -urNp linux-2.6.32.9/init/Kconfig linux-2.6.32.9/init/Kconfig 45670diff -urNp linux-2.6.32.10/init/Kconfig linux-2.6.32.10/init/Kconfig
45641--- linux-2.6.32.9/init/Kconfig 2010-02-23 10:38:51.000000000 -0500 45671--- linux-2.6.32.10/init/Kconfig 2010-03-15 11:52:04.000000000 -0400
45642+++ linux-2.6.32.9/init/Kconfig 2010-03-11 20:25:00.245480360 -0500 45672+++ linux-2.6.32.10/init/Kconfig 2010-03-20 15:58:47.168865970 -0400
45643@@ -1026,7 +1026,7 @@ config SLUB_DEBUG 45673@@ -1026,7 +1026,7 @@ config SLUB_DEBUG
45644 45674
45645 config COMPAT_BRK 45675 config COMPAT_BRK
@@ -45661,9 +45691,9 @@ diff -urNp linux-2.6.32.9/init/Kconfig linux-2.6.32.9/init/Kconfig
45661 45691
45662 config RT_MUTEXES 45692 config RT_MUTEXES
45663 boolean 45693 boolean
45664diff -urNp linux-2.6.32.9/init/main.c linux-2.6.32.9/init/main.c 45694diff -urNp linux-2.6.32.10/init/main.c linux-2.6.32.10/init/main.c
45665--- linux-2.6.32.9/init/main.c 2010-02-23 10:38:51.000000000 -0500 45695--- linux-2.6.32.10/init/main.c 2010-03-15 11:52:04.000000000 -0400
45666+++ linux-2.6.32.9/init/main.c 2010-03-11 20:25:00.245480360 -0500 45696+++ linux-2.6.32.10/init/main.c 2010-03-20 15:58:47.168865970 -0400
45667@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) 45697@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
45668 #ifdef CONFIG_TC 45698 #ifdef CONFIG_TC
45669 extern void tc_init(void); 45699 extern void tc_init(void);
@@ -45793,9 +45823,9 @@ diff -urNp linux-2.6.32.9/init/main.c linux-2.6.32.9/init/main.c
45793 /* 45823 /*
45794 * Ok, we have completed the initial bootup, and 45824 * Ok, we have completed the initial bootup, and
45795 * we're essentially up and running. Get rid of the 45825 * we're essentially up and running. Get rid of the
45796diff -urNp linux-2.6.32.9/init/noinitramfs.c linux-2.6.32.9/init/noinitramfs.c 45826diff -urNp linux-2.6.32.10/init/noinitramfs.c linux-2.6.32.10/init/noinitramfs.c
45797--- linux-2.6.32.9/init/noinitramfs.c 2010-02-23 10:38:51.000000000 -0500 45827--- linux-2.6.32.10/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400
45798+++ linux-2.6.32.9/init/noinitramfs.c 2010-03-11 20:25:00.245480360 -0500 45828+++ linux-2.6.32.10/init/noinitramfs.c 2010-03-20 15:58:47.168865970 -0400
45799@@ -29,7 +29,7 @@ static int __init default_rootfs(void) 45829@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
45800 { 45830 {
45801 int err; 45831 int err;
@@ -45814,9 +45844,9 @@ diff -urNp linux-2.6.32.9/init/noinitramfs.c linux-2.6.32.9/init/noinitramfs.c
45814 if (err < 0) 45844 if (err < 0)
45815 goto out; 45845 goto out;
45816 45846
45817diff -urNp linux-2.6.32.9/ipc/ipc_sysctl.c linux-2.6.32.9/ipc/ipc_sysctl.c 45847diff -urNp linux-2.6.32.10/ipc/ipc_sysctl.c linux-2.6.32.10/ipc/ipc_sysctl.c
45818--- linux-2.6.32.9/ipc/ipc_sysctl.c 2010-02-23 10:38:51.000000000 -0500 45848--- linux-2.6.32.10/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400
45819+++ linux-2.6.32.9/ipc/ipc_sysctl.c 2010-03-11 20:25:00.245480360 -0500 45849+++ linux-2.6.32.10/ipc/ipc_sysctl.c 2010-03-20 15:58:47.168865970 -0400
45820@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] 45850@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
45821 .extra1 = &zero, 45851 .extra1 = &zero,
45822 .extra2 = &one, 45852 .extra2 = &one,
@@ -45835,9 +45865,9 @@ diff -urNp linux-2.6.32.9/ipc/ipc_sysctl.c linux-2.6.32.9/ipc/ipc_sysctl.c
45835 }; 45865 };
45836 45866
45837 static int __init ipc_sysctl_init(void) 45867 static int __init ipc_sysctl_init(void)
45838diff -urNp linux-2.6.32.9/ipc/mqueue.c linux-2.6.32.9/ipc/mqueue.c 45868diff -urNp linux-2.6.32.10/ipc/mqueue.c linux-2.6.32.10/ipc/mqueue.c
45839--- linux-2.6.32.9/ipc/mqueue.c 2010-02-23 10:38:51.000000000 -0500 45869--- linux-2.6.32.10/ipc/mqueue.c 2010-03-15 11:52:04.000000000 -0400
45840+++ linux-2.6.32.9/ipc/mqueue.c 2010-03-11 20:25:00.245480360 -0500 45870+++ linux-2.6.32.10/ipc/mqueue.c 2010-03-20 15:58:47.168865970 -0400
45841@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st 45871@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
45842 mq_bytes = (mq_msg_tblsz + 45872 mq_bytes = (mq_msg_tblsz +
45843 (info->attr.mq_maxmsg * info->attr.mq_msgsize)); 45873 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -45846,9 +45876,9 @@ diff -urNp linux-2.6.32.9/ipc/mqueue.c linux-2.6.32.9/ipc/mqueue.c
45846 spin_lock(&mq_lock); 45876 spin_lock(&mq_lock);
45847 if (u->mq_bytes + mq_bytes < u->mq_bytes || 45877 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
45848 u->mq_bytes + mq_bytes > 45878 u->mq_bytes + mq_bytes >
45849diff -urNp linux-2.6.32.9/ipc/shm.c linux-2.6.32.9/ipc/shm.c 45879diff -urNp linux-2.6.32.10/ipc/shm.c linux-2.6.32.10/ipc/shm.c
45850--- linux-2.6.32.9/ipc/shm.c 2010-02-23 10:38:51.000000000 -0500 45880--- linux-2.6.32.10/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400
45851+++ linux-2.6.32.9/ipc/shm.c 2010-03-11 20:25:00.245480360 -0500 45881+++ linux-2.6.32.10/ipc/shm.c 2010-03-20 15:58:47.168865970 -0400
45852@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name 45882@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
45853 static int sysvipc_shm_proc_show(struct seq_file *s, void *it); 45883 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
45854 #endif 45884 #endif
@@ -45901,9 +45931,9 @@ diff -urNp linux-2.6.32.9/ipc/shm.c linux-2.6.32.9/ipc/shm.c
45901 size = i_size_read(path.dentry->d_inode); 45931 size = i_size_read(path.dentry->d_inode);
45902 shm_unlock(shp); 45932 shm_unlock(shp);
45903 45933
45904diff -urNp linux-2.6.32.9/kernel/acct.c linux-2.6.32.9/kernel/acct.c 45934diff -urNp linux-2.6.32.10/kernel/acct.c linux-2.6.32.10/kernel/acct.c
45905--- linux-2.6.32.9/kernel/acct.c 2010-02-23 10:38:51.000000000 -0500 45935--- linux-2.6.32.10/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400
45906+++ linux-2.6.32.9/kernel/acct.c 2010-03-11 20:25:00.245480360 -0500 45936+++ linux-2.6.32.10/kernel/acct.c 2010-03-20 15:58:47.168865970 -0400
45907@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a 45937@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
45908 */ 45938 */
45909 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; 45939 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -45913,9 +45943,9 @@ diff -urNp linux-2.6.32.9/kernel/acct.c linux-2.6.32.9/kernel/acct.c
45913 sizeof(acct_t), &file->f_pos); 45943 sizeof(acct_t), &file->f_pos);
45914 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; 45944 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
45915 set_fs(fs); 45945 set_fs(fs);
45916diff -urNp linux-2.6.32.9/kernel/capability.c linux-2.6.32.9/kernel/capability.c 45946diff -urNp linux-2.6.32.10/kernel/capability.c linux-2.6.32.10/kernel/capability.c
45917--- linux-2.6.32.9/kernel/capability.c 2010-02-23 10:38:51.000000000 -0500 45947--- linux-2.6.32.10/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400
45918+++ linux-2.6.32.9/kernel/capability.c 2010-03-11 20:25:00.245480360 -0500 45948+++ linux-2.6.32.10/kernel/capability.c 2010-03-20 15:58:47.168865970 -0400
45919@@ -306,10 +306,21 @@ int capable(int cap) 45949@@ -306,10 +306,21 @@ int capable(int cap)
45920 BUG(); 45950 BUG();
45921 } 45951 }
@@ -45939,9 +45969,9 @@ diff -urNp linux-2.6.32.9/kernel/capability.c linux-2.6.32.9/kernel/capability.c
45939+ 45969+
45940 EXPORT_SYMBOL(capable); 45970 EXPORT_SYMBOL(capable);
45941+EXPORT_SYMBOL(capable_nolog); 45971+EXPORT_SYMBOL(capable_nolog);
45942diff -urNp linux-2.6.32.9/kernel/configs.c linux-2.6.32.9/kernel/configs.c 45972diff -urNp linux-2.6.32.10/kernel/configs.c linux-2.6.32.10/kernel/configs.c
45943--- linux-2.6.32.9/kernel/configs.c 2010-02-23 10:38:51.000000000 -0500 45973--- linux-2.6.32.10/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400
45944+++ linux-2.6.32.9/kernel/configs.c 2010-03-11 20:25:00.245480360 -0500 45974+++ linux-2.6.32.10/kernel/configs.c 2010-03-20 15:58:47.168865970 -0400
45945@@ -73,8 +73,19 @@ static int __init ikconfig_init(void) 45975@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
45946 struct proc_dir_entry *entry; 45976 struct proc_dir_entry *entry;
45947 45977
@@ -45962,9 +45992,9 @@ diff -urNp linux-2.6.32.9/kernel/configs.c linux-2.6.32.9/kernel/configs.c
45962 if (!entry) 45992 if (!entry)
45963 return -ENOMEM; 45993 return -ENOMEM;
45964 45994
45965diff -urNp linux-2.6.32.9/kernel/cpu.c linux-2.6.32.9/kernel/cpu.c 45995diff -urNp linux-2.6.32.10/kernel/cpu.c linux-2.6.32.10/kernel/cpu.c
45966--- linux-2.6.32.9/kernel/cpu.c 2010-02-23 10:38:51.000000000 -0500 45996--- linux-2.6.32.10/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400
45967+++ linux-2.6.32.9/kernel/cpu.c 2010-03-11 20:25:00.245480360 -0500 45997+++ linux-2.6.32.10/kernel/cpu.c 2010-03-20 15:58:47.168865970 -0400
45968@@ -19,7 +19,7 @@ 45998@@ -19,7 +19,7 @@
45969 /* Serializes the updates to cpu_online_mask, cpu_present_mask */ 45999 /* Serializes the updates to cpu_online_mask, cpu_present_mask */
45970 static DEFINE_MUTEX(cpu_add_remove_lock); 46000 static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -45974,9 +46004,9 @@ diff -urNp linux-2.6.32.9/kernel/cpu.c linux-2.6.32.9/kernel/cpu.c
45974 46004
45975 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. 46005 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
45976 * Should always be manipulated under cpu_add_remove_lock 46006 * Should always be manipulated under cpu_add_remove_lock
45977diff -urNp linux-2.6.32.9/kernel/cred.c linux-2.6.32.9/kernel/cred.c 46007diff -urNp linux-2.6.32.10/kernel/cred.c linux-2.6.32.10/kernel/cred.c
45978--- linux-2.6.32.9/kernel/cred.c 2010-02-23 10:38:51.000000000 -0500 46008--- linux-2.6.32.10/kernel/cred.c 2010-03-15 11:52:04.000000000 -0400
45979+++ linux-2.6.32.9/kernel/cred.c 2010-03-11 20:25:00.245480360 -0500 46009+++ linux-2.6.32.10/kernel/cred.c 2010-03-20 15:58:47.174047356 -0400
45980@@ -520,6 +520,8 @@ int commit_creds(struct cred *new) 46010@@ -520,6 +520,8 @@ int commit_creds(struct cred *new)
45981 46011
45982 get_cred(new); /* we will require a ref for the subj creds too */ 46012 get_cred(new); /* we will require a ref for the subj creds too */
@@ -45986,9 +46016,9 @@ diff -urNp linux-2.6.32.9/kernel/cred.c linux-2.6.32.9/kernel/cred.c
45986 /* dumpability changes */ 46016 /* dumpability changes */
45987 if (old->euid != new->euid || 46017 if (old->euid != new->euid ||
45988 old->egid != new->egid || 46018 old->egid != new->egid ||
45989diff -urNp linux-2.6.32.9/kernel/exit.c linux-2.6.32.9/kernel/exit.c 46019diff -urNp linux-2.6.32.10/kernel/exit.c linux-2.6.32.10/kernel/exit.c
45990--- linux-2.6.32.9/kernel/exit.c 2010-02-23 10:38:51.000000000 -0500 46020--- linux-2.6.32.10/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400
45991+++ linux-2.6.32.9/kernel/exit.c 2010-03-11 20:25:00.245480360 -0500 46021+++ linux-2.6.32.10/kernel/exit.c 2010-03-20 15:58:47.174047356 -0400
45992@@ -56,6 +56,10 @@ 46022@@ -56,6 +56,10 @@
45993 #include <asm/mmu_context.h> 46023 #include <asm/mmu_context.h>
45994 #include "cred-internals.h" 46024 #include "cred-internals.h"
@@ -46078,9 +46108,9 @@ diff -urNp linux-2.6.32.9/kernel/exit.c linux-2.6.32.9/kernel/exit.c
46078 46108
46079 get_task_struct(p); 46109 get_task_struct(p);
46080 read_unlock(&tasklist_lock); 46110 read_unlock(&tasklist_lock);
46081diff -urNp linux-2.6.32.9/kernel/fork.c linux-2.6.32.9/kernel/fork.c 46111diff -urNp linux-2.6.32.10/kernel/fork.c linux-2.6.32.10/kernel/fork.c
46082--- linux-2.6.32.9/kernel/fork.c 2010-02-23 10:38:51.000000000 -0500 46112--- linux-2.6.32.10/kernel/fork.c 2010-03-15 11:52:04.000000000 -0400
46083+++ linux-2.6.32.9/kernel/fork.c 2010-03-11 20:25:00.245480360 -0500 46113+++ linux-2.6.32.10/kernel/fork.c 2010-03-20 15:58:47.174047356 -0400
46084@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru 46114@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
46085 *stackend = STACK_END_MAGIC; /* for overflow detection */ 46115 *stackend = STACK_END_MAGIC; /* for overflow detection */
46086 46116
@@ -46233,9 +46263,9 @@ diff -urNp linux-2.6.32.9/kernel/fork.c linux-2.6.32.9/kernel/fork.c
46233 } 46263 }
46234 46264
46235 if (new_mm) { 46265 if (new_mm) {
46236diff -urNp linux-2.6.32.9/kernel/futex.c linux-2.6.32.9/kernel/futex.c 46266diff -urNp linux-2.6.32.10/kernel/futex.c linux-2.6.32.10/kernel/futex.c
46237--- linux-2.6.32.9/kernel/futex.c 2010-02-23 10:38:51.000000000 -0500 46267--- linux-2.6.32.10/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400
46238+++ linux-2.6.32.9/kernel/futex.c 2010-03-11 20:25:00.245480360 -0500 46268+++ linux-2.6.32.10/kernel/futex.c 2010-03-20 15:58:47.174047356 -0400
46239@@ -54,6 +54,7 @@ 46269@@ -54,6 +54,7 @@
46240 #include <linux/mount.h> 46270 #include <linux/mount.h>
46241 #include <linux/pagemap.h> 46271 #include <linux/pagemap.h>
@@ -46303,9 +46333,9 @@ diff -urNp linux-2.6.32.9/kernel/futex.c linux-2.6.32.9/kernel/futex.c
46303 { 46333 {
46304 unsigned long uentry; 46334 unsigned long uentry;
46305 46335
46306diff -urNp linux-2.6.32.9/kernel/futex_compat.c linux-2.6.32.9/kernel/futex_compat.c 46336diff -urNp linux-2.6.32.10/kernel/futex_compat.c linux-2.6.32.10/kernel/futex_compat.c
46307--- linux-2.6.32.9/kernel/futex_compat.c 2010-02-23 10:38:51.000000000 -0500 46337--- linux-2.6.32.10/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400
46308+++ linux-2.6.32.9/kernel/futex_compat.c 2010-03-11 20:25:00.245480360 -0500 46338+++ linux-2.6.32.10/kernel/futex_compat.c 2010-03-20 15:58:47.174047356 -0400
46309@@ -10,6 +10,7 @@ 46339@@ -10,6 +10,7 @@
46310 #include <linux/compat.h> 46340 #include <linux/compat.h>
46311 #include <linux/nsproxy.h> 46341 #include <linux/nsproxy.h>
@@ -46343,9 +46373,9 @@ diff -urNp linux-2.6.32.9/kernel/futex_compat.c linux-2.6.32.9/kernel/futex_comp
46343 head = p->compat_robust_list; 46373 head = p->compat_robust_list;
46344 read_unlock(&tasklist_lock); 46374 read_unlock(&tasklist_lock);
46345 } 46375 }
46346diff -urNp linux-2.6.32.9/kernel/gcov/base.c linux-2.6.32.9/kernel/gcov/base.c 46376diff -urNp linux-2.6.32.10/kernel/gcov/base.c linux-2.6.32.10/kernel/gcov/base.c
46347--- linux-2.6.32.9/kernel/gcov/base.c 2010-02-23 10:38:51.000000000 -0500 46377--- linux-2.6.32.10/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400
46348+++ linux-2.6.32.9/kernel/gcov/base.c 2010-03-11 20:25:00.245480360 -0500 46378+++ linux-2.6.32.10/kernel/gcov/base.c 2010-03-20 15:58:47.174047356 -0400
46349@@ -102,11 +102,6 @@ void gcov_enable_events(void) 46379@@ -102,11 +102,6 @@ void gcov_enable_events(void)
46350 } 46380 }
46351 46381
@@ -46367,9 +46397,9 @@ diff -urNp linux-2.6.32.9/kernel/gcov/base.c linux-2.6.32.9/kernel/gcov/base.c
46367 if (prev) 46397 if (prev)
46368 prev->next = info->next; 46398 prev->next = info->next;
46369 else 46399 else
46370diff -urNp linux-2.6.32.9/kernel/hrtimer.c linux-2.6.32.9/kernel/hrtimer.c 46400diff -urNp linux-2.6.32.10/kernel/hrtimer.c linux-2.6.32.10/kernel/hrtimer.c
46371--- linux-2.6.32.9/kernel/hrtimer.c 2010-02-23 10:38:51.000000000 -0500 46401--- linux-2.6.32.10/kernel/hrtimer.c 2010-03-15 11:52:04.000000000 -0400
46372+++ linux-2.6.32.9/kernel/hrtimer.c 2010-03-11 20:25:00.249508434 -0500 46402+++ linux-2.6.32.10/kernel/hrtimer.c 2010-03-20 15:58:47.174047356 -0400
46373@@ -1364,7 +1364,7 @@ void hrtimer_peek_ahead_timers(void) 46403@@ -1364,7 +1364,7 @@ void hrtimer_peek_ahead_timers(void)
46374 local_irq_restore(flags); 46404 local_irq_restore(flags);
46375 } 46405 }
@@ -46379,9 +46409,9 @@ diff -urNp linux-2.6.32.9/kernel/hrtimer.c linux-2.6.32.9/kernel/hrtimer.c
46379 { 46409 {
46380 hrtimer_peek_ahead_timers(); 46410 hrtimer_peek_ahead_timers();
46381 } 46411 }
46382diff -urNp linux-2.6.32.9/kernel/kallsyms.c linux-2.6.32.9/kernel/kallsyms.c 46412diff -urNp linux-2.6.32.10/kernel/kallsyms.c linux-2.6.32.10/kernel/kallsyms.c
46383--- linux-2.6.32.9/kernel/kallsyms.c 2010-02-23 10:38:51.000000000 -0500 46413--- linux-2.6.32.10/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400
46384+++ linux-2.6.32.9/kernel/kallsyms.c 2010-03-11 20:25:00.249508434 -0500 46414+++ linux-2.6.32.10/kernel/kallsyms.c 2010-03-20 15:58:47.174047356 -0400
46385@@ -11,6 +11,9 @@ 46415@@ -11,6 +11,9 @@
46386 * Changed the compression method from stem compression to "table lookup" 46416 * Changed the compression method from stem compression to "table lookup"
46387 * compression (see scripts/kallsyms.c for a more complete description) 46417 * compression (see scripts/kallsyms.c for a more complete description)
@@ -46456,9 +46486,9 @@ diff -urNp linux-2.6.32.9/kernel/kallsyms.c linux-2.6.32.9/kernel/kallsyms.c
46456 if (!iter) 46486 if (!iter)
46457 return -ENOMEM; 46487 return -ENOMEM;
46458 reset_iter(iter, 0); 46488 reset_iter(iter, 0);
46459diff -urNp linux-2.6.32.9/kernel/kgdb.c linux-2.6.32.9/kernel/kgdb.c 46489diff -urNp linux-2.6.32.10/kernel/kgdb.c linux-2.6.32.10/kernel/kgdb.c
46460--- linux-2.6.32.9/kernel/kgdb.c 2010-02-23 10:38:51.000000000 -0500 46490--- linux-2.6.32.10/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
46461+++ linux-2.6.32.9/kernel/kgdb.c 2010-03-11 20:25:00.249508434 -0500 46491+++ linux-2.6.32.10/kernel/kgdb.c 2010-03-20 15:58:47.174047356 -0400
46462@@ -86,7 +86,7 @@ static int kgdb_io_module_registered; 46492@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
46463 /* Guard for recursive entry */ 46493 /* Guard for recursive entry */
46464 static int exception_level; 46494 static int exception_level;
@@ -46486,9 +46516,9 @@ diff -urNp linux-2.6.32.9/kernel/kgdb.c linux-2.6.32.9/kernel/kgdb.c
46486 { 46516 {
46487 BUG_ON(kgdb_connected); 46517 BUG_ON(kgdb_connected);
46488 46518
46489diff -urNp linux-2.6.32.9/kernel/kmod.c linux-2.6.32.9/kernel/kmod.c 46519diff -urNp linux-2.6.32.10/kernel/kmod.c linux-2.6.32.10/kernel/kmod.c
46490--- linux-2.6.32.9/kernel/kmod.c 2010-02-23 10:38:51.000000000 -0500 46520--- linux-2.6.32.10/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400
46491+++ linux-2.6.32.9/kernel/kmod.c 2010-03-11 20:25:00.249508434 -0500 46521+++ linux-2.6.32.10/kernel/kmod.c 2010-03-20 15:58:47.174047356 -0400
46492@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch 46522@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
46493 if (ret >= MODULE_NAME_LEN) 46523 if (ret >= MODULE_NAME_LEN)
46494 return -ENAMETOOLONG; 46524 return -ENAMETOOLONG;
@@ -46508,9 +46538,9 @@ diff -urNp linux-2.6.32.9/kernel/kmod.c linux-2.6.32.9/kernel/kmod.c
46508 /* If modprobe needs a service that is in a module, we get a recursive 46538 /* If modprobe needs a service that is in a module, we get a recursive
46509 * loop. Limit the number of running kmod threads to max_threads/2 or 46539 * loop. Limit the number of running kmod threads to max_threads/2 or
46510 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method 46540 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
46511diff -urNp linux-2.6.32.9/kernel/kprobes.c linux-2.6.32.9/kernel/kprobes.c 46541diff -urNp linux-2.6.32.10/kernel/kprobes.c linux-2.6.32.10/kernel/kprobes.c
46512--- linux-2.6.32.9/kernel/kprobes.c 2010-02-23 10:38:51.000000000 -0500 46542--- linux-2.6.32.10/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400
46513+++ linux-2.6.32.9/kernel/kprobes.c 2010-03-11 20:25:00.249508434 -0500 46543+++ linux-2.6.32.10/kernel/kprobes.c 2010-03-20 15:58:47.174047356 -0400
46514@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ 46544@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
46515 * kernel image and loaded module images reside. This is required 46545 * kernel image and loaded module images reside. This is required
46516 * so x86_64 can correctly handle the %rip-relative fixups. 46546 * so x86_64 can correctly handle the %rip-relative fixups.
@@ -46529,9 +46559,9 @@ diff -urNp linux-2.6.32.9/kernel/kprobes.c linux-2.6.32.9/kernel/kprobes.c
46529 kfree(kip); 46559 kfree(kip);
46530 } 46560 }
46531 return 1; 46561 return 1;
46532diff -urNp linux-2.6.32.9/kernel/lockdep.c linux-2.6.32.9/kernel/lockdep.c 46562diff -urNp linux-2.6.32.10/kernel/lockdep.c linux-2.6.32.10/kernel/lockdep.c
46533--- linux-2.6.32.9/kernel/lockdep.c 2010-02-23 10:38:51.000000000 -0500 46563--- linux-2.6.32.10/kernel/lockdep.c 2010-03-15 11:52:04.000000000 -0400
46534+++ linux-2.6.32.9/kernel/lockdep.c 2010-03-11 20:25:00.249508434 -0500 46564+++ linux-2.6.32.10/kernel/lockdep.c 2010-03-20 15:58:47.178057776 -0400
46535@@ -577,6 +577,10 @@ static int static_obj(void *obj) 46565@@ -577,6 +577,10 @@ static int static_obj(void *obj)
46536 int i; 46566 int i;
46537 #endif 46567 #endif
@@ -46561,9 +46591,9 @@ diff -urNp linux-2.6.32.9/kernel/lockdep.c linux-2.6.32.9/kernel/lockdep.c
46561 printk("the code is fine but needs lockdep annotation.\n"); 46591 printk("the code is fine but needs lockdep annotation.\n");
46562 printk("turning off the locking correctness validator.\n"); 46592 printk("turning off the locking correctness validator.\n");
46563 dump_stack(); 46593 dump_stack();
46564diff -urNp linux-2.6.32.9/kernel/module.c linux-2.6.32.9/kernel/module.c 46594diff -urNp linux-2.6.32.10/kernel/module.c linux-2.6.32.10/kernel/module.c
46565--- linux-2.6.32.9/kernel/module.c 2010-02-23 10:38:51.000000000 -0500 46595--- linux-2.6.32.10/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
46566+++ linux-2.6.32.9/kernel/module.c 2010-03-11 20:25:00.265647686 -0500 46596+++ linux-2.6.32.10/kernel/module.c 2010-03-20 15:58:47.178057776 -0400
46567@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq 46597@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
46568 static BLOCKING_NOTIFIER_HEAD(module_notify_list); 46598 static BLOCKING_NOTIFIER_HEAD(module_notify_list);
46569 46599
@@ -47103,9 +47133,9 @@ diff -urNp linux-2.6.32.9/kernel/module.c linux-2.6.32.9/kernel/module.c
47103 mod = NULL; 47133 mod = NULL;
47104 } 47134 }
47105 return mod; 47135 return mod;
47106diff -urNp linux-2.6.32.9/kernel/panic.c linux-2.6.32.9/kernel/panic.c 47136diff -urNp linux-2.6.32.10/kernel/panic.c linux-2.6.32.10/kernel/panic.c
47107--- linux-2.6.32.9/kernel/panic.c 2010-02-23 10:38:51.000000000 -0500 47137--- linux-2.6.32.10/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400
47108+++ linux-2.6.32.9/kernel/panic.c 2010-03-11 20:25:00.265647686 -0500 47138+++ linux-2.6.32.10/kernel/panic.c 2010-03-20 15:58:47.178057776 -0400
47109@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); 47139@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
47110 */ 47140 */
47111 void __stack_chk_fail(void) 47141 void __stack_chk_fail(void)
@@ -47116,9 +47146,9 @@ diff -urNp linux-2.6.32.9/kernel/panic.c linux-2.6.32.9/kernel/panic.c
47116 __builtin_return_address(0)); 47146 __builtin_return_address(0));
47117 } 47147 }
47118 EXPORT_SYMBOL(__stack_chk_fail); 47148 EXPORT_SYMBOL(__stack_chk_fail);
47119diff -urNp linux-2.6.32.9/kernel/params.c linux-2.6.32.9/kernel/params.c 47149diff -urNp linux-2.6.32.10/kernel/params.c linux-2.6.32.10/kernel/params.c
47120--- linux-2.6.32.9/kernel/params.c 2010-02-23 10:38:51.000000000 -0500 47150--- linux-2.6.32.10/kernel/params.c 2010-03-15 11:52:04.000000000 -0400
47121+++ linux-2.6.32.9/kernel/params.c 2010-03-11 20:25:00.265647686 -0500 47151+++ linux-2.6.32.10/kernel/params.c 2010-03-20 15:58:47.178057776 -0400
47122@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct 47152@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
47123 return ret; 47153 return ret;
47124 } 47154 }
@@ -47137,9 +47167,9 @@ diff -urNp linux-2.6.32.9/kernel/params.c linux-2.6.32.9/kernel/params.c
47137 .filter = uevent_filter, 47167 .filter = uevent_filter,
47138 }; 47168 };
47139 47169
47140diff -urNp linux-2.6.32.9/kernel/pid.c linux-2.6.32.9/kernel/pid.c 47170diff -urNp linux-2.6.32.10/kernel/pid.c linux-2.6.32.10/kernel/pid.c
47141--- linux-2.6.32.9/kernel/pid.c 2010-02-23 10:38:51.000000000 -0500 47171--- linux-2.6.32.10/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400
47142+++ linux-2.6.32.9/kernel/pid.c 2010-03-11 20:25:00.265647686 -0500 47172+++ linux-2.6.32.10/kernel/pid.c 2010-03-20 15:58:47.178057776 -0400
47143@@ -33,6 +33,7 @@ 47173@@ -33,6 +33,7 @@
47144 #include <linux/rculist.h> 47174 #include <linux/rculist.h>
47145 #include <linux/bootmem.h> 47175 #include <linux/bootmem.h>
@@ -47173,9 +47203,9 @@ diff -urNp linux-2.6.32.9/kernel/pid.c linux-2.6.32.9/kernel/pid.c
47173 } 47203 }
47174 47204
47175 struct task_struct *find_task_by_vpid(pid_t vnr) 47205 struct task_struct *find_task_by_vpid(pid_t vnr)
47176diff -urNp linux-2.6.32.9/kernel/posix-cpu-timers.c linux-2.6.32.9/kernel/posix-cpu-timers.c 47206diff -urNp linux-2.6.32.10/kernel/posix-cpu-timers.c linux-2.6.32.10/kernel/posix-cpu-timers.c
47177--- linux-2.6.32.9/kernel/posix-cpu-timers.c 2010-02-23 10:38:51.000000000 -0500 47207--- linux-2.6.32.10/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400
47178+++ linux-2.6.32.9/kernel/posix-cpu-timers.c 2010-03-11 20:25:00.265647686 -0500 47208+++ linux-2.6.32.10/kernel/posix-cpu-timers.c 2010-03-20 15:58:47.178057776 -0400
47179@@ -6,6 +6,7 @@ 47209@@ -6,6 +6,7 @@
47180 #include <linux/posix-timers.h> 47210 #include <linux/posix-timers.h>
47181 #include <linux/errno.h> 47211 #include <linux/errno.h>
@@ -47200,9 +47230,9 @@ diff -urNp linux-2.6.32.9/kernel/posix-cpu-timers.c linux-2.6.32.9/kernel/posix-
47200 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { 47230 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) {
47201 /* 47231 /*
47202 * At the soft limit, send a SIGXCPU every second. 47232 * At the soft limit, send a SIGXCPU every second.
47203diff -urNp linux-2.6.32.9/kernel/power/hibernate.c linux-2.6.32.9/kernel/power/hibernate.c 47233diff -urNp linux-2.6.32.10/kernel/power/hibernate.c linux-2.6.32.10/kernel/power/hibernate.c
47204--- linux-2.6.32.9/kernel/power/hibernate.c 2010-02-23 10:38:51.000000000 -0500 47234--- linux-2.6.32.10/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400
47205+++ linux-2.6.32.9/kernel/power/hibernate.c 2010-03-11 20:25:00.265647686 -0500 47235+++ linux-2.6.32.10/kernel/power/hibernate.c 2010-03-20 15:58:47.178057776 -0400
47206@@ -48,14 +48,14 @@ enum { 47236@@ -48,14 +48,14 @@ enum {
47207 47237
47208 static int hibernation_mode = HIBERNATION_SHUTDOWN; 47238 static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -47220,9 +47250,9 @@ diff -urNp linux-2.6.32.9/kernel/power/hibernate.c linux-2.6.32.9/kernel/power/h
47220 { 47250 {
47221 if (ops && !(ops->begin && ops->end && ops->pre_snapshot 47251 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
47222 && ops->prepare && ops->finish && ops->enter && ops->pre_restore 47252 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
47223diff -urNp linux-2.6.32.9/kernel/power/poweroff.c linux-2.6.32.9/kernel/power/poweroff.c 47253diff -urNp linux-2.6.32.10/kernel/power/poweroff.c linux-2.6.32.10/kernel/power/poweroff.c
47224--- linux-2.6.32.9/kernel/power/poweroff.c 2010-02-23 10:38:51.000000000 -0500 47254--- linux-2.6.32.10/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400
47225+++ linux-2.6.32.9/kernel/power/poweroff.c 2010-03-11 20:25:00.265647686 -0500 47255+++ linux-2.6.32.10/kernel/power/poweroff.c 2010-03-20 15:58:47.178057776 -0400
47226@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof 47256@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
47227 .enable_mask = SYSRQ_ENABLE_BOOT, 47257 .enable_mask = SYSRQ_ENABLE_BOOT,
47228 }; 47258 };
@@ -47232,9 +47262,9 @@ diff -urNp linux-2.6.32.9/kernel/power/poweroff.c linux-2.6.32.9/kernel/power/po
47232 { 47262 {
47233 register_sysrq_key('o', &sysrq_poweroff_op); 47263 register_sysrq_key('o', &sysrq_poweroff_op);
47234 return 0; 47264 return 0;
47235diff -urNp linux-2.6.32.9/kernel/power/process.c linux-2.6.32.9/kernel/power/process.c 47265diff -urNp linux-2.6.32.10/kernel/power/process.c linux-2.6.32.10/kernel/power/process.c
47236--- linux-2.6.32.9/kernel/power/process.c 2010-02-23 10:38:51.000000000 -0500 47266--- linux-2.6.32.10/kernel/power/process.c 2010-03-15 11:52:04.000000000 -0400
47237+++ linux-2.6.32.9/kernel/power/process.c 2010-03-11 20:25:00.265647686 -0500 47267+++ linux-2.6.32.10/kernel/power/process.c 2010-03-20 15:58:47.178057776 -0400
47238@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ 47268@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
47239 struct timeval start, end; 47269 struct timeval start, end;
47240 u64 elapsed_csecs64; 47270 u64 elapsed_csecs64;
@@ -47274,9 +47304,9 @@ diff -urNp linux-2.6.32.9/kernel/power/process.c linux-2.6.32.9/kernel/power/pro
47274 47304
47275 do_gettimeofday(&end); 47305 do_gettimeofday(&end);
47276 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); 47306 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
47277diff -urNp linux-2.6.32.9/kernel/power/suspend.c linux-2.6.32.9/kernel/power/suspend.c 47307diff -urNp linux-2.6.32.10/kernel/power/suspend.c linux-2.6.32.10/kernel/power/suspend.c
47278--- linux-2.6.32.9/kernel/power/suspend.c 2010-02-23 10:38:51.000000000 -0500 47308--- linux-2.6.32.10/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400
47279+++ linux-2.6.32.9/kernel/power/suspend.c 2010-03-11 20:25:00.265647686 -0500 47309+++ linux-2.6.32.10/kernel/power/suspend.c 2010-03-20 15:58:47.178057776 -0400
47280@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M 47310@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
47281 [PM_SUSPEND_MEM] = "mem", 47311 [PM_SUSPEND_MEM] = "mem",
47282 }; 47312 };
@@ -47293,9 +47323,9 @@ diff -urNp linux-2.6.32.9/kernel/power/suspend.c linux-2.6.32.9/kernel/power/sus
47293 { 47323 {
47294 mutex_lock(&pm_mutex); 47324 mutex_lock(&pm_mutex);
47295 suspend_ops = ops; 47325 suspend_ops = ops;
47296diff -urNp linux-2.6.32.9/kernel/printk.c linux-2.6.32.9/kernel/printk.c 47326diff -urNp linux-2.6.32.10/kernel/printk.c linux-2.6.32.10/kernel/printk.c
47297--- linux-2.6.32.9/kernel/printk.c 2010-02-23 10:38:51.000000000 -0500 47327--- linux-2.6.32.10/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400
47298+++ linux-2.6.32.9/kernel/printk.c 2010-03-11 20:25:00.265647686 -0500 47328+++ linux-2.6.32.10/kernel/printk.c 2010-03-20 15:58:47.180647899 -0400
47299@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf 47329@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
47300 char c; 47330 char c;
47301 int error = 0; 47331 int error = 0;
@@ -47308,9 +47338,9 @@ diff -urNp linux-2.6.32.9/kernel/printk.c linux-2.6.32.9/kernel/printk.c
47308 error = security_syslog(type); 47338 error = security_syslog(type);
47309 if (error) 47339 if (error)
47310 return error; 47340 return error;
47311diff -urNp linux-2.6.32.9/kernel/ptrace.c linux-2.6.32.9/kernel/ptrace.c 47341diff -urNp linux-2.6.32.10/kernel/ptrace.c linux-2.6.32.10/kernel/ptrace.c
47312--- linux-2.6.32.9/kernel/ptrace.c 2010-02-23 10:38:51.000000000 -0500 47342--- linux-2.6.32.10/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400
47313+++ linux-2.6.32.9/kernel/ptrace.c 2010-03-11 20:25:00.265647686 -0500 47343+++ linux-2.6.32.10/kernel/ptrace.c 2010-03-20 15:58:47.180647899 -0400
47314@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru 47344@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
47315 cred->gid != tcred->egid || 47345 cred->gid != tcred->egid ||
47316 cred->gid != tcred->sgid || 47346 cred->gid != tcred->sgid ||
@@ -47392,9 +47422,9 @@ diff -urNp linux-2.6.32.9/kernel/ptrace.c linux-2.6.32.9/kernel/ptrace.c
47392 } 47422 }
47393 47423
47394 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) 47424 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
47395diff -urNp linux-2.6.32.9/kernel/rcutree.c linux-2.6.32.9/kernel/rcutree.c 47425diff -urNp linux-2.6.32.10/kernel/rcutree.c linux-2.6.32.10/kernel/rcutree.c
47396--- linux-2.6.32.9/kernel/rcutree.c 2010-02-23 10:38:51.000000000 -0500 47426--- linux-2.6.32.10/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400
47397+++ linux-2.6.32.9/kernel/rcutree.c 2010-03-11 20:25:00.265647686 -0500 47427+++ linux-2.6.32.10/kernel/rcutree.c 2010-03-20 15:58:47.180647899 -0400
47398@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state 47428@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
47399 /* 47429 /*
47400 * Do softirq processing for the current CPU. 47430 * Do softirq processing for the current CPU.
@@ -47404,9 +47434,9 @@ diff -urNp linux-2.6.32.9/kernel/rcutree.c linux-2.6.32.9/kernel/rcutree.c
47404 { 47434 {
47405 /* 47435 /*
47406 * Memory references from any prior RCU read-side critical sections 47436 * Memory references from any prior RCU read-side critical sections
47407diff -urNp linux-2.6.32.9/kernel/relay.c linux-2.6.32.9/kernel/relay.c 47437diff -urNp linux-2.6.32.10/kernel/relay.c linux-2.6.32.10/kernel/relay.c
47408--- linux-2.6.32.9/kernel/relay.c 2010-02-23 10:38:51.000000000 -0500 47438--- linux-2.6.32.10/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400
47409+++ linux-2.6.32.9/kernel/relay.c 2010-03-11 20:25:00.265647686 -0500 47439+++ linux-2.6.32.10/kernel/relay.c 2010-03-20 15:58:47.180647899 -0400
47410@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi 47440@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi
47411 return 0; 47441 return 0;
47412 47442
@@ -47416,9 +47446,9 @@ diff -urNp linux-2.6.32.9/kernel/relay.c linux-2.6.32.9/kernel/relay.c
47416 return ret; 47446 return ret;
47417 47447
47418 if (read_start + ret == nonpad_end) 47448 if (read_start + ret == nonpad_end)
47419diff -urNp linux-2.6.32.9/kernel/resource.c linux-2.6.32.9/kernel/resource.c 47449diff -urNp linux-2.6.32.10/kernel/resource.c linux-2.6.32.10/kernel/resource.c
47420--- linux-2.6.32.9/kernel/resource.c 2010-02-23 10:38:51.000000000 -0500 47450--- linux-2.6.32.10/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400
47421+++ linux-2.6.32.9/kernel/resource.c 2010-03-11 20:25:00.265647686 -0500 47451+++ linux-2.6.32.10/kernel/resource.c 2010-03-20 15:58:47.180647899 -0400
47422@@ -132,8 +132,18 @@ static const struct file_operations proc 47452@@ -132,8 +132,18 @@ static const struct file_operations proc
47423 47453
47424 static int __init ioresources_init(void) 47454 static int __init ioresources_init(void)
@@ -47438,10 +47468,10 @@ diff -urNp linux-2.6.32.9/kernel/resource.c linux-2.6.32.9/kernel/resource.c
47438 return 0; 47468 return 0;
47439 } 47469 }
47440 __initcall(ioresources_init); 47470 __initcall(ioresources_init);
47441diff -urNp linux-2.6.32.9/kernel/sched.c linux-2.6.32.9/kernel/sched.c 47471diff -urNp linux-2.6.32.10/kernel/sched.c linux-2.6.32.10/kernel/sched.c
47442--- linux-2.6.32.9/kernel/sched.c 2010-02-23 10:38:51.000000000 -0500 47472--- linux-2.6.32.10/kernel/sched.c 2010-03-15 11:52:04.000000000 -0400
47443+++ linux-2.6.32.9/kernel/sched.c 2010-03-11 20:25:00.269552001 -0500 47473+++ linux-2.6.32.10/kernel/sched.c 2010-03-20 15:58:47.180647899 -0400
47444@@ -4822,7 +4822,7 @@ out: 47474@@ -4833,7 +4833,7 @@ out:
47445 * In CONFIG_NO_HZ case, the idle load balance owner will do the 47475 * In CONFIG_NO_HZ case, the idle load balance owner will do the
47446 * rebalancing for all the cpus for whom scheduler ticks are stopped. 47476 * rebalancing for all the cpus for whom scheduler ticks are stopped.
47447 */ 47477 */
@@ -47450,7 +47480,7 @@ diff -urNp linux-2.6.32.9/kernel/sched.c linux-2.6.32.9/kernel/sched.c
47450 { 47480 {
47451 int this_cpu = smp_processor_id(); 47481 int this_cpu = smp_processor_id();
47452 struct rq *this_rq = cpu_rq(this_cpu); 47482 struct rq *this_rq = cpu_rq(this_cpu);
47453@@ -6090,6 +6090,8 @@ int can_nice(const struct task_struct *p 47483@@ -6102,6 +6102,8 @@ int can_nice(const struct task_struct *p
47454 /* convert nice value [19,-20] to rlimit style value [1,40] */ 47484 /* convert nice value [19,-20] to rlimit style value [1,40] */
47455 int nice_rlim = 20 - nice; 47485 int nice_rlim = 20 - nice;
47456 47486
@@ -47459,7 +47489,7 @@ diff -urNp linux-2.6.32.9/kernel/sched.c linux-2.6.32.9/kernel/sched.c
47459 return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || 47489 return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
47460 capable(CAP_SYS_NICE)); 47490 capable(CAP_SYS_NICE));
47461 } 47491 }
47462@@ -6123,7 +6125,8 @@ SYSCALL_DEFINE1(nice, int, increment) 47492@@ -6135,7 +6137,8 @@ SYSCALL_DEFINE1(nice, int, increment)
47463 if (nice > 19) 47493 if (nice > 19)
47464 nice = 19; 47494 nice = 19;
47465 47495
@@ -47469,7 +47499,7 @@ diff -urNp linux-2.6.32.9/kernel/sched.c linux-2.6.32.9/kernel/sched.c
47469 return -EPERM; 47499 return -EPERM;
47470 47500
47471 retval = security_task_setnice(current, nice); 47501 retval = security_task_setnice(current, nice);
47472@@ -6273,6 +6276,8 @@ recheck: 47502@@ -6285,6 +6288,8 @@ recheck:
47473 if (rt_policy(policy)) { 47503 if (rt_policy(policy)) {
47474 unsigned long rlim_rtprio; 47504 unsigned long rlim_rtprio;
47475 47505
@@ -47478,7 +47508,7 @@ diff -urNp linux-2.6.32.9/kernel/sched.c linux-2.6.32.9/kernel/sched.c
47478 if (!lock_task_sighand(p, &flags)) 47508 if (!lock_task_sighand(p, &flags))
47479 return -ESRCH; 47509 return -ESRCH;
47480 rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur; 47510 rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur;
47481@@ -7424,7 +7429,7 @@ static struct ctl_table sd_ctl_dir[] = { 47511@@ -7437,7 +7442,7 @@ static struct ctl_table sd_ctl_dir[] = {
47482 .procname = "sched_domain", 47512 .procname = "sched_domain",
47483 .mode = 0555, 47513 .mode = 0555,
47484 }, 47514 },
@@ -47487,7 +47517,7 @@ diff -urNp linux-2.6.32.9/kernel/sched.c linux-2.6.32.9/kernel/sched.c
47487 }; 47517 };
47488 47518
47489 static struct ctl_table sd_ctl_root[] = { 47519 static struct ctl_table sd_ctl_root[] = {
47490@@ -7434,7 +7439,7 @@ static struct ctl_table sd_ctl_root[] = 47520@@ -7447,7 +7452,7 @@ static struct ctl_table sd_ctl_root[] =
47491 .mode = 0555, 47521 .mode = 0555,
47492 .child = sd_ctl_dir, 47522 .child = sd_ctl_dir,
47493 }, 47523 },
@@ -47496,9 +47526,9 @@ diff -urNp linux-2.6.32.9/kernel/sched.c linux-2.6.32.9/kernel/sched.c
47496 }; 47526 };
47497 47527
47498 static struct ctl_table *sd_alloc_ctl_entry(int n) 47528 static struct ctl_table *sd_alloc_ctl_entry(int n)
47499diff -urNp linux-2.6.32.9/kernel/signal.c linux-2.6.32.9/kernel/signal.c 47529diff -urNp linux-2.6.32.10/kernel/signal.c linux-2.6.32.10/kernel/signal.c
47500--- linux-2.6.32.9/kernel/signal.c 2010-02-23 10:38:51.000000000 -0500 47530--- linux-2.6.32.10/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400
47501+++ linux-2.6.32.9/kernel/signal.c 2010-03-11 20:25:00.269552001 -0500 47531+++ linux-2.6.32.10/kernel/signal.c 2010-03-20 15:58:47.180647899 -0400
47502@@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc 47532@@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc
47503 */ 47533 */
47504 user = get_uid(__task_cred(t)->user); 47534 user = get_uid(__task_cred(t)->user);
@@ -47551,9 +47581,9 @@ diff -urNp linux-2.6.32.9/kernel/signal.c linux-2.6.32.9/kernel/signal.c
47551 47581
47552 return ret; 47582 return ret;
47553 } 47583 }
47554diff -urNp linux-2.6.32.9/kernel/smp.c linux-2.6.32.9/kernel/smp.c 47584diff -urNp linux-2.6.32.10/kernel/smp.c linux-2.6.32.10/kernel/smp.c
47555--- linux-2.6.32.9/kernel/smp.c 2010-02-23 10:38:51.000000000 -0500 47585--- linux-2.6.32.10/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400
47556+++ linux-2.6.32.9/kernel/smp.c 2010-03-11 20:25:00.269552001 -0500 47586+++ linux-2.6.32.10/kernel/smp.c 2010-03-20 15:58:47.180647899 -0400
47557@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void 47587@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void
47558 } 47588 }
47559 EXPORT_SYMBOL(smp_call_function); 47589 EXPORT_SYMBOL(smp_call_function);
@@ -47581,9 +47611,9 @@ diff -urNp linux-2.6.32.9/kernel/smp.c linux-2.6.32.9/kernel/smp.c
47581 { 47611 {
47582 spin_unlock_irq(&call_function.lock); 47612 spin_unlock_irq(&call_function.lock);
47583 } 47613 }
47584diff -urNp linux-2.6.32.9/kernel/softirq.c linux-2.6.32.9/kernel/softirq.c 47614diff -urNp linux-2.6.32.10/kernel/softirq.c linux-2.6.32.10/kernel/softirq.c
47585--- linux-2.6.32.9/kernel/softirq.c 2010-02-23 10:38:51.000000000 -0500 47615--- linux-2.6.32.10/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400
47586+++ linux-2.6.32.9/kernel/softirq.c 2010-03-11 20:25:00.269552001 -0500 47616+++ linux-2.6.32.10/kernel/softirq.c 2010-03-20 15:58:47.180647899 -0400
47587@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec 47617@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
47588 47618
47589 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); 47619 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -47638,9 +47668,9 @@ diff -urNp linux-2.6.32.9/kernel/softirq.c linux-2.6.32.9/kernel/softirq.c
47638 { 47668 {
47639 struct tasklet_struct *list; 47669 struct tasklet_struct *list;
47640 47670
47641diff -urNp linux-2.6.32.9/kernel/sys.c linux-2.6.32.9/kernel/sys.c 47671diff -urNp linux-2.6.32.10/kernel/sys.c linux-2.6.32.10/kernel/sys.c
47642--- linux-2.6.32.9/kernel/sys.c 2010-02-23 10:38:51.000000000 -0500 47672--- linux-2.6.32.10/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400
47643+++ linux-2.6.32.9/kernel/sys.c 2010-03-11 20:25:00.269552001 -0500 47673+++ linux-2.6.32.10/kernel/sys.c 2010-03-20 15:58:47.180647899 -0400
47644@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru 47674@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
47645 error = -EACCES; 47675 error = -EACCES;
47646 goto out; 47676 goto out;
@@ -47776,9 +47806,9 @@ diff -urNp linux-2.6.32.9/kernel/sys.c linux-2.6.32.9/kernel/sys.c
47776 error = -EINVAL; 47806 error = -EINVAL;
47777 break; 47807 break;
47778 } 47808 }
47779diff -urNp linux-2.6.32.9/kernel/sysctl.c linux-2.6.32.9/kernel/sysctl.c 47809diff -urNp linux-2.6.32.10/kernel/sysctl.c linux-2.6.32.10/kernel/sysctl.c
47780--- linux-2.6.32.9/kernel/sysctl.c 2010-02-23 10:38:51.000000000 -0500 47810--- linux-2.6.32.10/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400
47781+++ linux-2.6.32.9/kernel/sysctl.c 2010-03-11 20:25:00.269552001 -0500 47811+++ linux-2.6.32.10/kernel/sysctl.c 2010-03-20 15:58:47.180647899 -0400
47782@@ -63,6 +63,13 @@ 47812@@ -63,6 +63,13 @@
47783 static int deprecated_sysctl_warning(struct __sysctl_args *args); 47813 static int deprecated_sysctl_warning(struct __sysctl_args *args);
47784 47814
@@ -47900,9 +47930,9 @@ diff -urNp linux-2.6.32.9/kernel/sysctl.c linux-2.6.32.9/kernel/sysctl.c
47900 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); 47930 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
47901 if (error) 47931 if (error)
47902 return error; 47932 return error;
47903diff -urNp linux-2.6.32.9/kernel/taskstats.c linux-2.6.32.9/kernel/taskstats.c 47933diff -urNp linux-2.6.32.10/kernel/taskstats.c linux-2.6.32.10/kernel/taskstats.c
47904--- linux-2.6.32.9/kernel/taskstats.c 2010-02-23 10:38:51.000000000 -0500 47934--- linux-2.6.32.10/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400
47905+++ linux-2.6.32.9/kernel/taskstats.c 2010-03-11 20:25:00.269552001 -0500 47935+++ linux-2.6.32.10/kernel/taskstats.c 2010-03-20 15:58:47.180647899 -0400
47906@@ -26,9 +26,12 @@ 47936@@ -26,9 +26,12 @@
47907 #include <linux/cgroup.h> 47937 #include <linux/cgroup.h>
47908 #include <linux/fs.h> 47938 #include <linux/fs.h>
@@ -47926,9 +47956,9 @@ diff -urNp linux-2.6.32.9/kernel/taskstats.c linux-2.6.32.9/kernel/taskstats.c
47926 if (!alloc_cpumask_var(&mask, GFP_KERNEL)) 47956 if (!alloc_cpumask_var(&mask, GFP_KERNEL))
47927 return -ENOMEM; 47957 return -ENOMEM;
47928 47958
47929diff -urNp linux-2.6.32.9/kernel/time/tick-broadcast.c linux-2.6.32.9/kernel/time/tick-broadcast.c 47959diff -urNp linux-2.6.32.10/kernel/time/tick-broadcast.c linux-2.6.32.10/kernel/time/tick-broadcast.c
47930--- linux-2.6.32.9/kernel/time/tick-broadcast.c 2010-02-23 10:38:51.000000000 -0500 47960--- linux-2.6.32.10/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400
47931+++ linux-2.6.32.9/kernel/time/tick-broadcast.c 2010-03-11 20:25:00.269552001 -0500 47961+++ linux-2.6.32.10/kernel/time/tick-broadcast.c 2010-03-20 15:58:47.180647899 -0400
47932@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl 47962@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
47933 * then clear the broadcast bit. 47963 * then clear the broadcast bit.
47934 */ 47964 */
@@ -47938,9 +47968,9 @@ diff -urNp linux-2.6.32.9/kernel/time/tick-broadcast.c linux-2.6.32.9/kernel/tim
47938 47968
47939 cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); 47969 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
47940 tick_broadcast_clear_oneshot(cpu); 47970 tick_broadcast_clear_oneshot(cpu);
47941diff -urNp linux-2.6.32.9/kernel/time.c linux-2.6.32.9/kernel/time.c 47971diff -urNp linux-2.6.32.10/kernel/time.c linux-2.6.32.10/kernel/time.c
47942--- linux-2.6.32.9/kernel/time.c 2010-02-23 10:38:51.000000000 -0500 47972--- linux-2.6.32.10/kernel/time.c 2010-03-15 11:52:04.000000000 -0400
47943+++ linux-2.6.32.9/kernel/time.c 2010-03-11 20:25:00.269552001 -0500 47973+++ linux-2.6.32.10/kernel/time.c 2010-03-20 15:58:47.186022161 -0400
47944@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, 47974@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *,
47945 return err; 47975 return err;
47946 47976
@@ -47978,9 +48008,9 @@ diff -urNp linux-2.6.32.9/kernel/time.c linux-2.6.32.9/kernel/time.c
47978 { 48008 {
47979 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) 48009 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
47980 return (USEC_PER_SEC / HZ) * j; 48010 return (USEC_PER_SEC / HZ) * j;
47981diff -urNp linux-2.6.32.9/kernel/timer.c linux-2.6.32.9/kernel/timer.c 48011diff -urNp linux-2.6.32.10/kernel/timer.c linux-2.6.32.10/kernel/timer.c
47982--- linux-2.6.32.9/kernel/timer.c 2010-02-23 10:38:51.000000000 -0500 48012--- linux-2.6.32.10/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400
47983+++ linux-2.6.32.9/kernel/timer.c 2010-03-11 20:25:00.269552001 -0500 48013+++ linux-2.6.32.10/kernel/timer.c 2010-03-20 15:58:47.186022161 -0400
47984@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) 48014@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick)
47985 /* 48015 /*
47986 * This function runs timers and the timer-tq in bottom half context. 48016 * This function runs timers and the timer-tq in bottom half context.
@@ -47990,9 +48020,9 @@ diff -urNp linux-2.6.32.9/kernel/timer.c linux-2.6.32.9/kernel/timer.c
47990 { 48020 {
47991 struct tvec_base *base = __get_cpu_var(tvec_bases); 48021 struct tvec_base *base = __get_cpu_var(tvec_bases);
47992 48022
47993diff -urNp linux-2.6.32.9/kernel/trace/ftrace.c linux-2.6.32.9/kernel/trace/ftrace.c 48023diff -urNp linux-2.6.32.10/kernel/trace/ftrace.c linux-2.6.32.10/kernel/trace/ftrace.c
47994--- linux-2.6.32.9/kernel/trace/ftrace.c 2010-02-23 10:38:51.000000000 -0500 48024--- linux-2.6.32.10/kernel/trace/ftrace.c 2010-03-15 11:52:04.000000000 -0400
47995+++ linux-2.6.32.9/kernel/trace/ftrace.c 2010-03-11 20:25:00.273652130 -0500 48025+++ linux-2.6.32.10/kernel/trace/ftrace.c 2010-03-20 15:58:47.186022161 -0400
47996@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, 48026@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod,
47997 48027
47998 ip = rec->ip; 48028 ip = rec->ip;
@@ -48014,9 +48044,9 @@ diff -urNp linux-2.6.32.9/kernel/trace/ftrace.c linux-2.6.32.9/kernel/trace/ftra
48014 } 48044 }
48015 48045
48016 /* 48046 /*
48017diff -urNp linux-2.6.32.9/kernel/trace/Kconfig linux-2.6.32.9/kernel/trace/Kconfig 48047diff -urNp linux-2.6.32.10/kernel/trace/Kconfig linux-2.6.32.10/kernel/trace/Kconfig
48018--- linux-2.6.32.9/kernel/trace/Kconfig 2010-02-23 10:38:51.000000000 -0500 48048--- linux-2.6.32.10/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400
48019+++ linux-2.6.32.9/kernel/trace/Kconfig 2010-03-11 20:25:00.273652130 -0500 48049+++ linux-2.6.32.10/kernel/trace/Kconfig 2010-03-20 15:58:47.186022161 -0400
48020@@ -126,6 +126,7 @@ if FTRACE 48050@@ -126,6 +126,7 @@ if FTRACE
48021 config FUNCTION_TRACER 48051 config FUNCTION_TRACER
48022 bool "Kernel Function Tracer" 48052 bool "Kernel Function Tracer"
@@ -48033,9 +48063,9 @@ diff -urNp linux-2.6.32.9/kernel/trace/Kconfig linux-2.6.32.9/kernel/trace/Kconf
48033 select FUNCTION_TRACER 48063 select FUNCTION_TRACER
48034 select STACKTRACE 48064 select STACKTRACE
48035 select KALLSYMS 48065 select KALLSYMS
48036diff -urNp linux-2.6.32.9/kernel/trace/trace.c linux-2.6.32.9/kernel/trace/trace.c 48066diff -urNp linux-2.6.32.10/kernel/trace/trace.c linux-2.6.32.10/kernel/trace/trace.c
48037--- linux-2.6.32.9/kernel/trace/trace.c 2010-02-23 10:38:51.000000000 -0500 48067--- linux-2.6.32.10/kernel/trace/trace.c 2010-03-15 11:52:04.000000000 -0400
48038+++ linux-2.6.32.9/kernel/trace/trace.c 2010-03-11 20:25:00.273652130 -0500 48068+++ linux-2.6.32.10/kernel/trace/trace.c 2010-03-20 15:58:47.186022161 -0400
48039@@ -3792,10 +3792,9 @@ static const struct file_operations trac 48069@@ -3792,10 +3792,9 @@ static const struct file_operations trac
48040 }; 48070 };
48041 #endif 48071 #endif
@@ -48060,9 +48090,9 @@ diff -urNp linux-2.6.32.9/kernel/trace/trace.c linux-2.6.32.9/kernel/trace/trace
48060 static int once; 48090 static int once;
48061 struct dentry *d_tracer; 48091 struct dentry *d_tracer;
48062 48092
48063diff -urNp linux-2.6.32.9/kernel/trace/trace_events.c linux-2.6.32.9/kernel/trace/trace_events.c 48093diff -urNp linux-2.6.32.10/kernel/trace/trace_events.c linux-2.6.32.10/kernel/trace/trace_events.c
48064--- linux-2.6.32.9/kernel/trace/trace_events.c 2010-02-23 10:38:51.000000000 -0500 48094--- linux-2.6.32.10/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400
48065+++ linux-2.6.32.9/kernel/trace/trace_events.c 2010-03-11 20:25:00.273652130 -0500 48095+++ linux-2.6.32.10/kernel/trace/trace_events.c 2010-03-20 15:58:47.186022161 -0400
48066@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list 48096@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
48067 * Modules must own their file_operations to keep up with 48097 * Modules must own their file_operations to keep up with
48068 * reference counting. 48098 * reference counting.
@@ -48072,9 +48102,9 @@ diff -urNp linux-2.6.32.9/kernel/trace/trace_events.c linux-2.6.32.9/kernel/trac
48072 struct ftrace_module_file_ops { 48102 struct ftrace_module_file_ops {
48073 struct list_head list; 48103 struct list_head list;
48074 struct module *mod; 48104 struct module *mod;
48075diff -urNp linux-2.6.32.9/kernel/trace/trace_output.c linux-2.6.32.9/kernel/trace/trace_output.c 48105diff -urNp linux-2.6.32.10/kernel/trace/trace_output.c linux-2.6.32.10/kernel/trace/trace_output.c
48076--- linux-2.6.32.9/kernel/trace/trace_output.c 2010-02-23 10:38:51.000000000 -0500 48106--- linux-2.6.32.10/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400
48077+++ linux-2.6.32.9/kernel/trace/trace_output.c 2010-03-11 20:25:00.273652130 -0500 48107+++ linux-2.6.32.10/kernel/trace/trace_output.c 2010-03-20 15:58:47.186022161 -0400
48078@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, 48108@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,
48079 return 0; 48109 return 0;
48080 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); 48110 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -48084,9 +48114,9 @@ diff -urNp linux-2.6.32.9/kernel/trace/trace_output.c linux-2.6.32.9/kernel/trac
48084 if (p) { 48114 if (p) {
48085 s->len = p - s->buffer; 48115 s->len = p - s->buffer;
48086 return 1; 48116 return 1;
48087diff -urNp linux-2.6.32.9/kernel/trace/trace_stack.c linux-2.6.32.9/kernel/trace/trace_stack.c 48117diff -urNp linux-2.6.32.10/kernel/trace/trace_stack.c linux-2.6.32.10/kernel/trace/trace_stack.c
48088--- linux-2.6.32.9/kernel/trace/trace_stack.c 2010-02-23 10:38:51.000000000 -0500 48118--- linux-2.6.32.10/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400
48089+++ linux-2.6.32.9/kernel/trace/trace_stack.c 2010-03-11 20:25:00.273652130 -0500 48119+++ linux-2.6.32.10/kernel/trace/trace_stack.c 2010-03-20 15:58:47.186022161 -0400
48090@@ -50,7 +50,7 @@ static inline void check_stack(void) 48120@@ -50,7 +50,7 @@ static inline void check_stack(void)
48091 return; 48121 return;
48092 48122
@@ -48096,9 +48126,9 @@ diff -urNp linux-2.6.32.9/kernel/trace/trace_stack.c linux-2.6.32.9/kernel/trace
48096 return; 48126 return;
48097 48127
48098 local_irq_save(flags); 48128 local_irq_save(flags);
48099diff -urNp linux-2.6.32.9/kernel/utsname_sysctl.c linux-2.6.32.9/kernel/utsname_sysctl.c 48129diff -urNp linux-2.6.32.10/kernel/utsname_sysctl.c linux-2.6.32.10/kernel/utsname_sysctl.c
48100--- linux-2.6.32.9/kernel/utsname_sysctl.c 2010-02-23 10:38:51.000000000 -0500 48130--- linux-2.6.32.10/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400
48101+++ linux-2.6.32.9/kernel/utsname_sysctl.c 2010-03-11 20:25:00.273652130 -0500 48131+++ linux-2.6.32.10/kernel/utsname_sysctl.c 2010-03-20 15:58:47.186022161 -0400
48102@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] 48132@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
48103 .proc_handler = proc_do_uts_string, 48133 .proc_handler = proc_do_uts_string,
48104 .strategy = sysctl_uts_string, 48134 .strategy = sysctl_uts_string,
@@ -48117,9 +48147,9 @@ diff -urNp linux-2.6.32.9/kernel/utsname_sysctl.c linux-2.6.32.9/kernel/utsname_
48117 }; 48147 };
48118 48148
48119 static int __init utsname_sysctl_init(void) 48149 static int __init utsname_sysctl_init(void)
48120diff -urNp linux-2.6.32.9/lib/bug.c linux-2.6.32.9/lib/bug.c 48150diff -urNp linux-2.6.32.10/lib/bug.c linux-2.6.32.10/lib/bug.c
48121--- linux-2.6.32.9/lib/bug.c 2010-02-23 10:38:51.000000000 -0500 48151--- linux-2.6.32.10/lib/bug.c 2010-03-15 11:52:04.000000000 -0400
48122+++ linux-2.6.32.9/lib/bug.c 2010-03-11 20:25:00.273652130 -0500 48152+++ linux-2.6.32.10/lib/bug.c 2010-03-20 15:58:47.186022161 -0400
48123@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l 48153@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
48124 return BUG_TRAP_TYPE_NONE; 48154 return BUG_TRAP_TYPE_NONE;
48125 48155
@@ -48129,9 +48159,9 @@ diff -urNp linux-2.6.32.9/lib/bug.c linux-2.6.32.9/lib/bug.c
48129 48159
48130 printk(KERN_EMERG "------------[ cut here ]------------\n"); 48160 printk(KERN_EMERG "------------[ cut here ]------------\n");
48131 48161
48132diff -urNp linux-2.6.32.9/lib/debugobjects.c linux-2.6.32.9/lib/debugobjects.c 48162diff -urNp linux-2.6.32.10/lib/debugobjects.c linux-2.6.32.10/lib/debugobjects.c
48133--- linux-2.6.32.9/lib/debugobjects.c 2010-02-23 10:38:51.000000000 -0500 48163--- linux-2.6.32.10/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400
48134+++ linux-2.6.32.9/lib/debugobjects.c 2010-03-11 20:25:00.273652130 -0500 48164+++ linux-2.6.32.10/lib/debugobjects.c 2010-03-20 15:58:47.186022161 -0400
48135@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi 48165@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
48136 if (limit > 4) 48166 if (limit > 4)
48137 return; 48167 return;
@@ -48141,9 +48171,9 @@ diff -urNp linux-2.6.32.9/lib/debugobjects.c linux-2.6.32.9/lib/debugobjects.c
48141 if (is_on_stack == onstack) 48171 if (is_on_stack == onstack)
48142 return; 48172 return;
48143 48173
48144diff -urNp linux-2.6.32.9/lib/dma-debug.c linux-2.6.32.9/lib/dma-debug.c 48174diff -urNp linux-2.6.32.10/lib/dma-debug.c linux-2.6.32.10/lib/dma-debug.c
48145--- linux-2.6.32.9/lib/dma-debug.c 2010-02-23 10:38:51.000000000 -0500 48175--- linux-2.6.32.10/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400
48146+++ linux-2.6.32.9/lib/dma-debug.c 2010-03-11 20:25:00.273652130 -0500 48176+++ linux-2.6.32.10/lib/dma-debug.c 2010-03-20 15:58:47.186022161 -0400
48147@@ -861,7 +861,7 @@ out: 48177@@ -861,7 +861,7 @@ out:
48148 48178
48149 static void check_for_stack(struct device *dev, void *addr) 48179 static void check_for_stack(struct device *dev, void *addr)
@@ -48153,26 +48183,21 @@ diff -urNp linux-2.6.32.9/lib/dma-debug.c linux-2.6.32.9/lib/dma-debug.c
48153 err_printk(dev, NULL, "DMA-API: device driver maps memory from" 48183 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
48154 "stack [addr=%p]\n", addr); 48184 "stack [addr=%p]\n", addr);
48155 } 48185 }
48156diff -urNp linux-2.6.32.9/lib/idr.c linux-2.6.32.9/lib/idr.c 48186diff -urNp linux-2.6.32.10/lib/idr.c linux-2.6.32.10/lib/idr.c
48157--- linux-2.6.32.9/lib/idr.c 2010-02-23 10:38:51.000000000 -0500 48187--- linux-2.6.32.10/lib/idr.c 2010-03-15 11:52:04.000000000 -0400
48158+++ linux-2.6.32.9/lib/idr.c 2010-03-11 20:25:00.273652130 -0500 48188+++ linux-2.6.32.10/lib/idr.c 2010-03-20 16:03:53.500671149 -0400
48159@@ -156,10 +156,12 @@ static int sub_alloc(struct idr *idp, in 48189@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
48160 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; 48190 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
48161 48191
48162 /* if already at the top layer, we need to grow */ 48192 /* if already at the top layer, we need to grow */
48163- if (!(p = pa[l])) { 48193- if (id >= 1 << (idp->layers * IDR_BITS)) {
48164+ if (id >= (1 << (idp->layers * IDR_BITS))) { 48194+ if (id >= (1 << (idp->layers * IDR_BITS))) {
48165 *starting_id = id; 48195 *starting_id = id;
48166 return IDR_NEED_TO_GROW; 48196 return IDR_NEED_TO_GROW;
48167 } 48197 }
48168+ p = pa[l]; 48198diff -urNp linux-2.6.32.10/lib/inflate.c linux-2.6.32.10/lib/inflate.c
48169+ BUG_ON(!p); 48199--- linux-2.6.32.10/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400
48170 48200+++ linux-2.6.32.10/lib/inflate.c 2010-03-20 15:58:47.186022161 -0400
48171 /* If we need to go up one layer, continue the
48172 * loop; otherwise, restart from the top.
48173diff -urNp linux-2.6.32.9/lib/inflate.c linux-2.6.32.9/lib/inflate.c
48174--- linux-2.6.32.9/lib/inflate.c 2010-02-23 10:38:51.000000000 -0500
48175+++ linux-2.6.32.9/lib/inflate.c 2010-03-11 20:25:00.273652130 -0500
48176@@ -266,7 +266,7 @@ static void free(void *where) 48201@@ -266,7 +266,7 @@ static void free(void *where)
48177 malloc_ptr = free_mem_ptr; 48202 malloc_ptr = free_mem_ptr;
48178 } 48203 }
@@ -48182,9 +48207,9 @@ diff -urNp linux-2.6.32.9/lib/inflate.c linux-2.6.32.9/lib/inflate.c
48182 #define free(a) kfree(a) 48207 #define free(a) kfree(a)
48183 #endif 48208 #endif
48184 48209
48185diff -urNp linux-2.6.32.9/lib/Kconfig.debug linux-2.6.32.9/lib/Kconfig.debug 48210diff -urNp linux-2.6.32.10/lib/Kconfig.debug linux-2.6.32.10/lib/Kconfig.debug
48186--- linux-2.6.32.9/lib/Kconfig.debug 2010-02-23 10:38:51.000000000 -0500 48211--- linux-2.6.32.10/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400
48187+++ linux-2.6.32.9/lib/Kconfig.debug 2010-03-11 20:25:00.273652130 -0500 48212+++ linux-2.6.32.10/lib/Kconfig.debug 2010-03-20 15:58:47.186022161 -0400
48188@@ -905,7 +905,7 @@ config LATENCYTOP 48213@@ -905,7 +905,7 @@ config LATENCYTOP
48189 select STACKTRACE 48214 select STACKTRACE
48190 select SCHEDSTATS 48215 select SCHEDSTATS
@@ -48194,9 +48219,9 @@ diff -urNp linux-2.6.32.9/lib/Kconfig.debug linux-2.6.32.9/lib/Kconfig.debug
48194 help 48219 help
48195 Enable this option if you want to use the LatencyTOP tool 48220 Enable this option if you want to use the LatencyTOP tool
48196 to find out which userspace is blocking on what kernel operations. 48221 to find out which userspace is blocking on what kernel operations.
48197diff -urNp linux-2.6.32.9/lib/kobject.c linux-2.6.32.9/lib/kobject.c 48222diff -urNp linux-2.6.32.10/lib/kobject.c linux-2.6.32.10/lib/kobject.c
48198--- linux-2.6.32.9/lib/kobject.c 2010-02-23 10:38:51.000000000 -0500 48223--- linux-2.6.32.10/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400
48199+++ linux-2.6.32.9/lib/kobject.c 2010-03-11 20:25:00.273652130 -0500 48224+++ linux-2.6.32.10/lib/kobject.c 2010-03-20 15:58:47.190048482 -0400
48200@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko 48225@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
48201 return ret; 48226 return ret;
48202 } 48227 }
@@ -48224,9 +48249,9 @@ diff -urNp linux-2.6.32.9/lib/kobject.c linux-2.6.32.9/lib/kobject.c
48224 struct kobject *parent_kobj) 48249 struct kobject *parent_kobj)
48225 { 48250 {
48226 struct kset *kset; 48251 struct kset *kset;
48227diff -urNp linux-2.6.32.9/lib/kobject_uevent.c linux-2.6.32.9/lib/kobject_uevent.c 48252diff -urNp linux-2.6.32.10/lib/kobject_uevent.c linux-2.6.32.10/lib/kobject_uevent.c
48228--- linux-2.6.32.9/lib/kobject_uevent.c 2010-02-23 10:38:51.000000000 -0500 48253--- linux-2.6.32.10/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400
48229+++ linux-2.6.32.9/lib/kobject_uevent.c 2010-03-11 20:25:00.273652130 -0500 48254+++ linux-2.6.32.10/lib/kobject_uevent.c 2010-03-20 15:58:47.190048482 -0400
48230@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k 48255@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
48231 const char *subsystem; 48256 const char *subsystem;
48232 struct kobject *top_kobj; 48257 struct kobject *top_kobj;
@@ -48236,9 +48261,9 @@ diff -urNp linux-2.6.32.9/lib/kobject_uevent.c linux-2.6.32.9/lib/kobject_uevent
48236 u64 seq; 48261 u64 seq;
48237 int i = 0; 48262 int i = 0;
48238 int retval = 0; 48263 int retval = 0;
48239diff -urNp linux-2.6.32.9/lib/parser.c linux-2.6.32.9/lib/parser.c 48264diff -urNp linux-2.6.32.10/lib/parser.c linux-2.6.32.10/lib/parser.c
48240--- linux-2.6.32.9/lib/parser.c 2010-02-23 10:38:51.000000000 -0500 48265--- linux-2.6.32.10/lib/parser.c 2010-03-15 11:52:04.000000000 -0400
48241+++ linux-2.6.32.9/lib/parser.c 2010-03-11 20:25:00.273652130 -0500 48266+++ linux-2.6.32.10/lib/parser.c 2010-03-20 15:58:47.190048482 -0400
48242@@ -126,7 +126,7 @@ static int match_number(substring_t *s, 48267@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
48243 char *buf; 48268 char *buf;
48244 int ret; 48269 int ret;
@@ -48248,9 +48273,9 @@ diff -urNp linux-2.6.32.9/lib/parser.c linux-2.6.32.9/lib/parser.c
48248 if (!buf) 48273 if (!buf)
48249 return -ENOMEM; 48274 return -ENOMEM;
48250 memcpy(buf, s->from, s->to - s->from); 48275 memcpy(buf, s->from, s->to - s->from);
48251diff -urNp linux-2.6.32.9/lib/radix-tree.c linux-2.6.32.9/lib/radix-tree.c 48276diff -urNp linux-2.6.32.10/lib/radix-tree.c linux-2.6.32.10/lib/radix-tree.c
48252--- linux-2.6.32.9/lib/radix-tree.c 2010-02-23 10:38:51.000000000 -0500 48277--- linux-2.6.32.10/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400
48253+++ linux-2.6.32.9/lib/radix-tree.c 2010-03-11 20:25:00.273652130 -0500 48278+++ linux-2.6.32.10/lib/radix-tree.c 2010-03-20 15:58:47.190048482 -0400
48254@@ -81,7 +81,7 @@ struct radix_tree_preload { 48279@@ -81,7 +81,7 @@ struct radix_tree_preload {
48255 int nr; 48280 int nr;
48256 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; 48281 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -48260,9 +48285,9 @@ diff -urNp linux-2.6.32.9/lib/radix-tree.c linux-2.6.32.9/lib/radix-tree.c
48260 48285
48261 static inline gfp_t root_gfp_mask(struct radix_tree_root *root) 48286 static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
48262 { 48287 {
48263diff -urNp linux-2.6.32.9/lib/random32.c linux-2.6.32.9/lib/random32.c 48288diff -urNp linux-2.6.32.10/lib/random32.c linux-2.6.32.10/lib/random32.c
48264--- linux-2.6.32.9/lib/random32.c 2010-02-23 10:38:51.000000000 -0500 48289--- linux-2.6.32.10/lib/random32.c 2010-03-15 11:52:04.000000000 -0400
48265+++ linux-2.6.32.9/lib/random32.c 2010-03-11 20:25:00.273652130 -0500 48290+++ linux-2.6.32.10/lib/random32.c 2010-03-20 15:58:47.190048482 -0400
48266@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * 48291@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
48267 */ 48292 */
48268 static inline u32 __seed(u32 x, u32 m) 48293 static inline u32 __seed(u32 x, u32 m)
@@ -48272,14 +48297,14 @@ diff -urNp linux-2.6.32.9/lib/random32.c linux-2.6.32.9/lib/random32.c
48272 } 48297 }
48273 48298
48274 /** 48299 /**
48275diff -urNp linux-2.6.32.9/localversion-grsec linux-2.6.32.9/localversion-grsec 48300diff -urNp linux-2.6.32.10/localversion-grsec linux-2.6.32.10/localversion-grsec
48276--- linux-2.6.32.9/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 48301--- linux-2.6.32.10/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
48277+++ linux-2.6.32.9/localversion-grsec 2010-03-11 20:25:00.273652130 -0500 48302+++ linux-2.6.32.10/localversion-grsec 2010-03-20 15:58:47.190048482 -0400
48278@@ -0,0 +1 @@ 48303@@ -0,0 +1 @@
48279+-grsec 48304+-grsec
48280diff -urNp linux-2.6.32.9/Makefile linux-2.6.32.9/Makefile 48305diff -urNp linux-2.6.32.10/Makefile linux-2.6.32.10/Makefile
48281--- linux-2.6.32.9/Makefile 2010-02-23 10:38:51.000000000 -0500 48306--- linux-2.6.32.10/Makefile 2010-03-15 11:52:04.000000000 -0400
48282+++ linux-2.6.32.9/Makefile 2010-03-11 20:25:00.277637925 -0500 48307+++ linux-2.6.32.10/Makefile 2010-03-20 15:58:47.190048482 -0400
48283@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" 48308@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
48284 48309
48285 HOSTCC = gcc 48310 HOSTCC = gcc
@@ -48300,9 +48325,9 @@ diff -urNp linux-2.6.32.9/Makefile linux-2.6.32.9/Makefile
48300 48325
48301 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ 48326 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
48302 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ 48327 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
48303diff -urNp linux-2.6.32.9/mm/filemap.c linux-2.6.32.9/mm/filemap.c 48328diff -urNp linux-2.6.32.10/mm/filemap.c linux-2.6.32.10/mm/filemap.c
48304--- linux-2.6.32.9/mm/filemap.c 2010-02-23 10:38:51.000000000 -0500 48329--- linux-2.6.32.10/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400
48305+++ linux-2.6.32.9/mm/filemap.c 2010-03-11 20:25:00.277637925 -0500 48330+++ linux-2.6.32.10/mm/filemap.c 2010-03-20 15:58:47.190048482 -0400
48306@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file 48331@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file
48307 struct address_space *mapping = file->f_mapping; 48332 struct address_space *mapping = file->f_mapping;
48308 48333
@@ -48320,9 +48345,9 @@ diff -urNp linux-2.6.32.9/mm/filemap.c linux-2.6.32.9/mm/filemap.c
48320 if (*pos >= limit) { 48345 if (*pos >= limit) {
48321 send_sig(SIGXFSZ, current, 0); 48346 send_sig(SIGXFSZ, current, 0);
48322 return -EFBIG; 48347 return -EFBIG;
48323diff -urNp linux-2.6.32.9/mm/fremap.c linux-2.6.32.9/mm/fremap.c 48348diff -urNp linux-2.6.32.10/mm/fremap.c linux-2.6.32.10/mm/fremap.c
48324--- linux-2.6.32.9/mm/fremap.c 2010-02-23 10:38:51.000000000 -0500 48349--- linux-2.6.32.10/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400
48325+++ linux-2.6.32.9/mm/fremap.c 2010-03-11 20:25:00.277637925 -0500 48350+++ linux-2.6.32.10/mm/fremap.c 2010-03-20 15:58:47.190048482 -0400
48326@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign 48351@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
48327 retry: 48352 retry:
48328 vma = find_vma(mm, start); 48353 vma = find_vma(mm, start);
@@ -48335,9 +48360,9 @@ diff -urNp linux-2.6.32.9/mm/fremap.c linux-2.6.32.9/mm/fremap.c
48335 /* 48360 /*
48336 * Make sure the vma is shared, that it supports prefaulting, 48361 * Make sure the vma is shared, that it supports prefaulting,
48337 * and that the remapped range is valid and fully within 48362 * and that the remapped range is valid and fully within
48338diff -urNp linux-2.6.32.9/mm/highmem.c linux-2.6.32.9/mm/highmem.c 48363diff -urNp linux-2.6.32.10/mm/highmem.c linux-2.6.32.10/mm/highmem.c
48339--- linux-2.6.32.9/mm/highmem.c 2010-02-23 10:38:51.000000000 -0500 48364--- linux-2.6.32.10/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400
48340+++ linux-2.6.32.9/mm/highmem.c 2010-03-11 20:25:00.277637925 -0500 48365+++ linux-2.6.32.10/mm/highmem.c 2010-03-20 15:58:47.190048482 -0400
48341@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) 48366@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
48342 * So no dangers, even with speculative execution. 48367 * So no dangers, even with speculative execution.
48343 */ 48368 */
@@ -48363,9 +48388,9 @@ diff -urNp linux-2.6.32.9/mm/highmem.c linux-2.6.32.9/mm/highmem.c
48363 pkmap_count[last_pkmap_nr] = 1; 48388 pkmap_count[last_pkmap_nr] = 1;
48364 set_page_address(page, (void *)vaddr); 48389 set_page_address(page, (void *)vaddr);
48365 48390
48366diff -urNp linux-2.6.32.9/mm/hugetlb.c linux-2.6.32.9/mm/hugetlb.c 48391diff -urNp linux-2.6.32.10/mm/hugetlb.c linux-2.6.32.10/mm/hugetlb.c
48367--- linux-2.6.32.9/mm/hugetlb.c 2010-02-23 10:38:51.000000000 -0500 48392--- linux-2.6.32.10/mm/hugetlb.c 2010-03-15 11:52:04.000000000 -0400
48368+++ linux-2.6.32.9/mm/hugetlb.c 2010-03-11 20:25:00.277637925 -0500 48393+++ linux-2.6.32.10/mm/hugetlb.c 2010-03-20 15:58:47.190048482 -0400
48369@@ -1924,6 +1924,26 @@ static int unmap_ref_private(struct mm_s 48394@@ -1924,6 +1924,26 @@ static int unmap_ref_private(struct mm_s
48370 return 1; 48395 return 1;
48371 } 48396 }
@@ -48445,9 +48470,9 @@ diff -urNp linux-2.6.32.9/mm/hugetlb.c linux-2.6.32.9/mm/hugetlb.c
48445 ptep = huge_pte_alloc(mm, address, huge_page_size(h)); 48470 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
48446 if (!ptep) 48471 if (!ptep)
48447 return VM_FAULT_OOM; 48472 return VM_FAULT_OOM;
48448diff -urNp linux-2.6.32.9/mm/Kconfig linux-2.6.32.9/mm/Kconfig 48473diff -urNp linux-2.6.32.10/mm/Kconfig linux-2.6.32.10/mm/Kconfig
48449--- linux-2.6.32.9/mm/Kconfig 2010-02-23 10:38:51.000000000 -0500 48474--- linux-2.6.32.10/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400
48450+++ linux-2.6.32.9/mm/Kconfig 2010-03-11 20:25:00.277637925 -0500 48475+++ linux-2.6.32.10/mm/Kconfig 2010-03-20 15:58:47.190048482 -0400
48451@@ -228,7 +228,7 @@ config KSM 48476@@ -228,7 +228,7 @@ config KSM
48452 config DEFAULT_MMAP_MIN_ADDR 48477 config DEFAULT_MMAP_MIN_ADDR
48453 int "Low address space to protect from user allocation" 48478 int "Low address space to protect from user allocation"
@@ -48457,9 +48482,9 @@ diff -urNp linux-2.6.32.9/mm/Kconfig linux-2.6.32.9/mm/Kconfig
48457 help 48482 help
48458 This is the portion of low virtual memory which should be protected 48483 This is the portion of low virtual memory which should be protected
48459 from userspace allocation. Keeping a user from writing to low pages 48484 from userspace allocation. Keeping a user from writing to low pages
48460diff -urNp linux-2.6.32.9/mm/maccess.c linux-2.6.32.9/mm/maccess.c 48485diff -urNp linux-2.6.32.10/mm/maccess.c linux-2.6.32.10/mm/maccess.c
48461--- linux-2.6.32.9/mm/maccess.c 2010-02-23 10:38:51.000000000 -0500 48486--- linux-2.6.32.10/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400
48462+++ linux-2.6.32.9/mm/maccess.c 2010-03-11 20:25:00.277637925 -0500 48487+++ linux-2.6.32.10/mm/maccess.c 2010-03-20 15:58:47.190048482 -0400
48463@@ -14,7 +14,7 @@ 48488@@ -14,7 +14,7 @@
48464 * Safely read from address @src to the buffer at @dst. If a kernel fault 48489 * Safely read from address @src to the buffer at @dst. If a kernel fault
48465 * happens, handle that and return -EFAULT. 48490 * happens, handle that and return -EFAULT.
@@ -48478,9 +48503,9 @@ diff -urNp linux-2.6.32.9/mm/maccess.c linux-2.6.32.9/mm/maccess.c
48478 { 48503 {
48479 long ret; 48504 long ret;
48480 mm_segment_t old_fs = get_fs(); 48505 mm_segment_t old_fs = get_fs();
48481diff -urNp linux-2.6.32.9/mm/madvise.c linux-2.6.32.9/mm/madvise.c 48506diff -urNp linux-2.6.32.10/mm/madvise.c linux-2.6.32.10/mm/madvise.c
48482--- linux-2.6.32.9/mm/madvise.c 2010-02-23 10:38:51.000000000 -0500 48507--- linux-2.6.32.10/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400
48483+++ linux-2.6.32.9/mm/madvise.c 2010-03-11 20:25:00.277637925 -0500 48508+++ linux-2.6.32.10/mm/madvise.c 2010-03-20 15:58:47.190048482 -0400
48484@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a 48509@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
48485 pgoff_t pgoff; 48510 pgoff_t pgoff;
48486 unsigned long new_flags = vma->vm_flags; 48511 unsigned long new_flags = vma->vm_flags;
@@ -48557,9 +48582,9 @@ diff -urNp linux-2.6.32.9/mm/madvise.c linux-2.6.32.9/mm/madvise.c
48557 error = 0; 48582 error = 0;
48558 if (end == start) 48583 if (end == start)
48559 goto out; 48584 goto out;
48560diff -urNp linux-2.6.32.9/mm/memory.c linux-2.6.32.9/mm/memory.c 48585diff -urNp linux-2.6.32.10/mm/memory.c linux-2.6.32.10/mm/memory.c
48561--- linux-2.6.32.9/mm/memory.c 2010-02-23 10:38:51.000000000 -0500 48586--- linux-2.6.32.10/mm/memory.c 2010-03-15 11:52:04.000000000 -0400
48562+++ linux-2.6.32.9/mm/memory.c 2010-03-11 20:25:00.277637925 -0500 48587+++ linux-2.6.32.10/mm/memory.c 2010-03-20 15:58:47.190048482 -0400
48563@@ -48,6 +48,7 @@ 48588@@ -48,6 +48,7 @@
48564 #include <linux/ksm.h> 48589 #include <linux/ksm.h>
48565 #include <linux/rmap.h> 48590 #include <linux/rmap.h>
@@ -48964,9 +48989,9 @@ diff -urNp linux-2.6.32.9/mm/memory.c linux-2.6.32.9/mm/memory.c
48964 /* 48989 /*
48965 * Make sure the vDSO gets into every core dump. 48990 * Make sure the vDSO gets into every core dump.
48966 * Dumping its contents makes post-mortem fully interpretable later 48991 * Dumping its contents makes post-mortem fully interpretable later
48967diff -urNp linux-2.6.32.9/mm/memory-failure.c linux-2.6.32.9/mm/memory-failure.c 48992diff -urNp linux-2.6.32.10/mm/memory-failure.c linux-2.6.32.10/mm/memory-failure.c
48968--- linux-2.6.32.9/mm/memory-failure.c 2010-02-23 10:38:51.000000000 -0500 48993--- linux-2.6.32.10/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400
48969+++ linux-2.6.32.9/mm/memory-failure.c 2010-03-11 20:25:00.277637925 -0500 48994+++ linux-2.6.32.10/mm/memory-failure.c 2010-03-20 15:58:47.190048482 -0400
48970@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r 48995@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
48971 48996
48972 int sysctl_memory_failure_recovery __read_mostly = 1; 48997 int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -48985,9 +49010,9 @@ diff -urNp linux-2.6.32.9/mm/memory-failure.c linux-2.6.32.9/mm/memory-failure.c
48985 49010
48986 /* 49011 /*
48987 * We need/can do nothing about count=0 pages. 49012 * We need/can do nothing about count=0 pages.
48988diff -urNp linux-2.6.32.9/mm/mempolicy.c linux-2.6.32.9/mm/mempolicy.c 49013diff -urNp linux-2.6.32.10/mm/mempolicy.c linux-2.6.32.10/mm/mempolicy.c
48989--- linux-2.6.32.9/mm/mempolicy.c 2010-02-23 10:38:51.000000000 -0500 49014--- linux-2.6.32.10/mm/mempolicy.c 2010-03-15 11:52:04.000000000 -0400
48990+++ linux-2.6.32.9/mm/mempolicy.c 2010-03-11 20:25:00.281313901 -0500 49015+++ linux-2.6.32.10/mm/mempolicy.c 2010-03-20 15:58:47.194047891 -0400
48991@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st 49016@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
48992 struct vm_area_struct *next; 49017 struct vm_area_struct *next;
48993 int err; 49018 int err;
@@ -49068,9 +49093,9 @@ diff -urNp linux-2.6.32.9/mm/mempolicy.c linux-2.6.32.9/mm/mempolicy.c
49068 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { 49093 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
49069 seq_printf(m, " heap"); 49094 seq_printf(m, " heap");
49070 } else if (vma->vm_start <= mm->start_stack && 49095 } else if (vma->vm_start <= mm->start_stack &&
49071diff -urNp linux-2.6.32.9/mm/migrate.c linux-2.6.32.9/mm/migrate.c 49096diff -urNp linux-2.6.32.10/mm/migrate.c linux-2.6.32.10/mm/migrate.c
49072--- linux-2.6.32.9/mm/migrate.c 2010-02-23 10:38:51.000000000 -0500 49097--- linux-2.6.32.10/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400
49073+++ linux-2.6.32.9/mm/migrate.c 2010-03-11 20:25:00.281313901 -0500 49098+++ linux-2.6.32.10/mm/migrate.c 2010-03-20 15:58:47.194047891 -0400
49074@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 49099@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
49075 if (!mm) 49100 if (!mm)
49076 return -EINVAL; 49101 return -EINVAL;
@@ -49096,9 +49121,9 @@ diff -urNp linux-2.6.32.9/mm/migrate.c linux-2.6.32.9/mm/migrate.c
49096 rcu_read_unlock(); 49121 rcu_read_unlock();
49097 err = -EPERM; 49122 err = -EPERM;
49098 goto out; 49123 goto out;
49099diff -urNp linux-2.6.32.9/mm/mlock.c linux-2.6.32.9/mm/mlock.c 49124diff -urNp linux-2.6.32.10/mm/mlock.c linux-2.6.32.10/mm/mlock.c
49100--- linux-2.6.32.9/mm/mlock.c 2010-02-23 10:38:51.000000000 -0500 49125--- linux-2.6.32.10/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400
49101+++ linux-2.6.32.9/mm/mlock.c 2010-03-11 20:25:00.281313901 -0500 49126+++ linux-2.6.32.10/mm/mlock.c 2010-03-20 15:58:47.194047891 -0400
49102@@ -13,6 +13,7 @@ 49127@@ -13,6 +13,7 @@
49103 #include <linux/pagemap.h> 49128 #include <linux/pagemap.h>
49104 #include <linux/mempolicy.h> 49129 #include <linux/mempolicy.h>
@@ -49167,9 +49192,9 @@ diff -urNp linux-2.6.32.9/mm/mlock.c linux-2.6.32.9/mm/mlock.c
49167 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || 49192 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
49168 capable(CAP_IPC_LOCK)) 49193 capable(CAP_IPC_LOCK))
49169 ret = do_mlockall(flags); 49194 ret = do_mlockall(flags);
49170diff -urNp linux-2.6.32.9/mm/mmap.c linux-2.6.32.9/mm/mmap.c 49195diff -urNp linux-2.6.32.10/mm/mmap.c linux-2.6.32.10/mm/mmap.c
49171--- linux-2.6.32.9/mm/mmap.c 2010-02-23 10:38:51.000000000 -0500 49196--- linux-2.6.32.10/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
49172+++ linux-2.6.32.9/mm/mmap.c 2010-03-11 20:25:00.281313901 -0500 49197+++ linux-2.6.32.10/mm/mmap.c 2010-03-20 15:58:47.194047891 -0400
49173@@ -45,6 +45,16 @@ 49198@@ -45,6 +45,16 @@
49174 #define arch_rebalance_pgtables(addr, len) (addr) 49199 #define arch_rebalance_pgtables(addr, len) (addr)
49175 #endif 49200 #endif
@@ -50258,9 +50283,9 @@ diff -urNp linux-2.6.32.9/mm/mmap.c linux-2.6.32.9/mm/mmap.c
50258 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; 50283 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
50259 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 50284 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
50260 50285
50261diff -urNp linux-2.6.32.9/mm/mprotect.c linux-2.6.32.9/mm/mprotect.c 50286diff -urNp linux-2.6.32.10/mm/mprotect.c linux-2.6.32.10/mm/mprotect.c
50262--- linux-2.6.32.9/mm/mprotect.c 2010-02-23 10:38:51.000000000 -0500 50287--- linux-2.6.32.10/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400
50263+++ linux-2.6.32.9/mm/mprotect.c 2010-03-11 20:25:00.281313901 -0500 50288+++ linux-2.6.32.10/mm/mprotect.c 2010-03-20 15:58:47.194047891 -0400
50264@@ -24,10 +24,16 @@ 50289@@ -24,10 +24,16 @@
50265 #include <linux/mmu_notifier.h> 50290 #include <linux/mmu_notifier.h>
50266 #include <linux/migrate.h> 50291 #include <linux/migrate.h>
@@ -50451,9 +50476,9 @@ diff -urNp linux-2.6.32.9/mm/mprotect.c linux-2.6.32.9/mm/mprotect.c
50451 nstart = tmp; 50476 nstart = tmp;
50452 50477
50453 if (nstart < prev->vm_end) 50478 if (nstart < prev->vm_end)
50454diff -urNp linux-2.6.32.9/mm/mremap.c linux-2.6.32.9/mm/mremap.c 50479diff -urNp linux-2.6.32.10/mm/mremap.c linux-2.6.32.10/mm/mremap.c
50455--- linux-2.6.32.9/mm/mremap.c 2010-02-23 10:38:51.000000000 -0500 50480--- linux-2.6.32.10/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400
50456+++ linux-2.6.32.9/mm/mremap.c 2010-03-11 20:25:00.281313901 -0500 50481+++ linux-2.6.32.10/mm/mremap.c 2010-03-20 15:58:47.194047891 -0400
50457@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str 50482@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
50458 continue; 50483 continue;
50459 pte = ptep_clear_flush(vma, old_addr, old_pte); 50484 pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -50554,9 +50579,9 @@ diff -urNp linux-2.6.32.9/mm/mremap.c linux-2.6.32.9/mm/mremap.c
50554 } 50579 }
50555 out: 50580 out:
50556 if (ret & ~PAGE_MASK) 50581 if (ret & ~PAGE_MASK)
50557diff -urNp linux-2.6.32.9/mm/nommu.c linux-2.6.32.9/mm/nommu.c 50582diff -urNp linux-2.6.32.10/mm/nommu.c linux-2.6.32.10/mm/nommu.c
50558--- linux-2.6.32.9/mm/nommu.c 2010-02-23 10:38:51.000000000 -0500 50583--- linux-2.6.32.10/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400
50559+++ linux-2.6.32.9/mm/nommu.c 2010-03-11 20:25:00.281313901 -0500 50584+++ linux-2.6.32.10/mm/nommu.c 2010-03-20 15:58:47.194047891 -0400
50560@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m 50585@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m
50561 EXPORT_SYMBOL(find_vma); 50586 EXPORT_SYMBOL(find_vma);
50562 50587
@@ -50573,9 +50598,9 @@ diff -urNp linux-2.6.32.9/mm/nommu.c linux-2.6.32.9/mm/nommu.c
50573 * expand a stack to a given address 50598 * expand a stack to a given address
50574 * - not supported under NOMMU conditions 50599 * - not supported under NOMMU conditions
50575 */ 50600 */
50576diff -urNp linux-2.6.32.9/mm/page_alloc.c linux-2.6.32.9/mm/page_alloc.c 50601diff -urNp linux-2.6.32.10/mm/page_alloc.c linux-2.6.32.10/mm/page_alloc.c
50577--- linux-2.6.32.9/mm/page_alloc.c 2010-02-23 10:38:51.000000000 -0500 50602--- linux-2.6.32.10/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400
50578+++ linux-2.6.32.9/mm/page_alloc.c 2010-03-11 20:25:00.281313901 -0500 50603+++ linux-2.6.32.10/mm/page_alloc.c 2010-03-20 15:58:47.194047891 -0400
50579@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page 50604@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page
50580 int bad = 0; 50605 int bad = 0;
50581 int wasMlocked = __TestClearPageMlocked(page); 50606 int wasMlocked = __TestClearPageMlocked(page);
@@ -50623,9 +50648,9 @@ diff -urNp linux-2.6.32.9/mm/page_alloc.c linux-2.6.32.9/mm/page_alloc.c
50623 arch_free_page(page, 0); 50648 arch_free_page(page, 0);
50624 kernel_map_pages(page, 1, 0); 50649 kernel_map_pages(page, 1, 0);
50625 50650
50626diff -urNp linux-2.6.32.9/mm/percpu.c linux-2.6.32.9/mm/percpu.c 50651diff -urNp linux-2.6.32.10/mm/percpu.c linux-2.6.32.10/mm/percpu.c
50627--- linux-2.6.32.9/mm/percpu.c 2010-02-23 10:38:51.000000000 -0500 50652--- linux-2.6.32.10/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400
50628+++ linux-2.6.32.9/mm/percpu.c 2010-03-11 20:25:00.281313901 -0500 50653+++ linux-2.6.32.10/mm/percpu.c 2010-03-20 15:58:47.194047891 -0400
50629@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu 50654@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
50630 static unsigned int pcpu_last_unit_cpu __read_mostly; 50655 static unsigned int pcpu_last_unit_cpu __read_mostly;
50631 50656
@@ -50635,9 +50660,9 @@ diff -urNp linux-2.6.32.9/mm/percpu.c linux-2.6.32.9/mm/percpu.c
50635 EXPORT_SYMBOL_GPL(pcpu_base_addr); 50660 EXPORT_SYMBOL_GPL(pcpu_base_addr);
50636 50661
50637 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ 50662 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
50638diff -urNp linux-2.6.32.9/mm/rmap.c linux-2.6.32.9/mm/rmap.c 50663diff -urNp linux-2.6.32.10/mm/rmap.c linux-2.6.32.10/mm/rmap.c
50639--- linux-2.6.32.9/mm/rmap.c 2010-02-23 10:38:51.000000000 -0500 50664--- linux-2.6.32.10/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400
50640+++ linux-2.6.32.9/mm/rmap.c 2010-03-11 20:25:00.281313901 -0500 50665+++ linux-2.6.32.10/mm/rmap.c 2010-03-20 15:58:47.194047891 -0400
50641@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru 50666@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru
50642 struct mm_struct *mm = vma->vm_mm; 50667 struct mm_struct *mm = vma->vm_mm;
50643 struct anon_vma *allocated; 50668 struct anon_vma *allocated;
@@ -50665,9 +50690,9 @@ diff -urNp linux-2.6.32.9/mm/rmap.c linux-2.6.32.9/mm/rmap.c
50665 vma->anon_vma = anon_vma; 50690 vma->anon_vma = anon_vma;
50666 list_add_tail(&vma->anon_vma_node, &anon_vma->head); 50691 list_add_tail(&vma->anon_vma_node, &anon_vma->head);
50667 allocated = NULL; 50692 allocated = NULL;
50668diff -urNp linux-2.6.32.9/mm/shmem.c linux-2.6.32.9/mm/shmem.c 50693diff -urNp linux-2.6.32.10/mm/shmem.c linux-2.6.32.10/mm/shmem.c
50669--- linux-2.6.32.9/mm/shmem.c 2010-02-23 10:38:51.000000000 -0500 50694--- linux-2.6.32.10/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400
50670+++ linux-2.6.32.9/mm/shmem.c 2010-03-11 20:25:00.281313901 -0500 50695+++ linux-2.6.32.10/mm/shmem.c 2010-03-20 15:58:47.198057227 -0400
50671@@ -31,7 +31,7 @@ 50696@@ -31,7 +31,7 @@
50672 #include <linux/swap.h> 50697 #include <linux/swap.h>
50673 #include <linux/ima.h> 50698 #include <linux/ima.h>
@@ -50677,9 +50702,9 @@ diff -urNp linux-2.6.32.9/mm/shmem.c linux-2.6.32.9/mm/shmem.c
50677 50702
50678 #ifdef CONFIG_SHMEM 50703 #ifdef CONFIG_SHMEM
50679 /* 50704 /*
50680diff -urNp linux-2.6.32.9/mm/slab.c linux-2.6.32.9/mm/slab.c 50705diff -urNp linux-2.6.32.10/mm/slab.c linux-2.6.32.10/mm/slab.c
50681--- linux-2.6.32.9/mm/slab.c 2010-02-23 10:38:51.000000000 -0500 50706--- linux-2.6.32.10/mm/slab.c 2010-03-15 11:52:04.000000000 -0400
50682+++ linux-2.6.32.9/mm/slab.c 2010-03-11 20:25:00.285644592 -0500 50707+++ linux-2.6.32.10/mm/slab.c 2010-03-20 15:58:47.198057227 -0400
50683@@ -308,7 +308,7 @@ struct kmem_list3 { 50708@@ -308,7 +308,7 @@ struct kmem_list3 {
50684 * Need this for bootstrapping a per node allocator. 50709 * Need this for bootstrapping a per node allocator.
50685 */ 50710 */
@@ -50716,7 +50741,7 @@ diff -urNp linux-2.6.32.9/mm/slab.c linux-2.6.32.9/mm/slab.c
50716 50741
50717 /* internal cache of cache description objs */ 50742 /* internal cache of cache description objs */
50718 static struct kmem_cache cache_cache = { 50743 static struct kmem_cache cache_cache = {
50719@@ -4084,7 +4084,7 @@ out: 50744@@ -4082,7 +4082,7 @@ out:
50720 schedule_delayed_work(work, round_jiffies_relative(REAPTIMEOUT_CPUC)); 50745 schedule_delayed_work(work, round_jiffies_relative(REAPTIMEOUT_CPUC));
50721 } 50746 }
50722 50747
@@ -50725,7 +50750,7 @@ diff -urNp linux-2.6.32.9/mm/slab.c linux-2.6.32.9/mm/slab.c
50725 50750
50726 static void print_slabinfo_header(struct seq_file *m) 50751 static void print_slabinfo_header(struct seq_file *m)
50727 { 50752 {
50728@@ -4482,6 +4482,51 @@ static int __init slab_proc_init(void) 50753@@ -4480,6 +4480,51 @@ static int __init slab_proc_init(void)
50729 module_init(slab_proc_init); 50754 module_init(slab_proc_init);
50730 #endif 50755 #endif
50731 50756
@@ -50777,9 +50802,9 @@ diff -urNp linux-2.6.32.9/mm/slab.c linux-2.6.32.9/mm/slab.c
50777 /** 50802 /**
50778 * ksize - get the actual amount of memory allocated for a given object 50803 * ksize - get the actual amount of memory allocated for a given object
50779 * @objp: Pointer to the object 50804 * @objp: Pointer to the object
50780diff -urNp linux-2.6.32.9/mm/slob.c linux-2.6.32.9/mm/slob.c 50805diff -urNp linux-2.6.32.10/mm/slob.c linux-2.6.32.10/mm/slob.c
50781--- linux-2.6.32.9/mm/slob.c 2010-02-23 10:38:51.000000000 -0500 50806--- linux-2.6.32.10/mm/slob.c 2010-03-15 11:52:04.000000000 -0400
50782+++ linux-2.6.32.9/mm/slob.c 2010-03-11 20:25:00.285644592 -0500 50807+++ linux-2.6.32.10/mm/slob.c 2010-03-20 15:58:47.198057227 -0400
50783@@ -29,7 +29,7 @@ 50808@@ -29,7 +29,7 @@
50784 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls 50809 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
50785 * alloc_pages() directly, allocating compound pages so the page order 50810 * alloc_pages() directly, allocating compound pages so the page order
@@ -51100,9 +51125,9 @@ diff -urNp linux-2.6.32.9/mm/slob.c linux-2.6.32.9/mm/slob.c
51100 } 51125 }
51101 51126
51102 trace_kmem_cache_free(_RET_IP_, b); 51127 trace_kmem_cache_free(_RET_IP_, b);
51103diff -urNp linux-2.6.32.9/mm/slub.c linux-2.6.32.9/mm/slub.c 51128diff -urNp linux-2.6.32.10/mm/slub.c linux-2.6.32.10/mm/slub.c
51104--- linux-2.6.32.9/mm/slub.c 2010-02-23 10:38:51.000000000 -0500 51129--- linux-2.6.32.10/mm/slub.c 2010-03-15 11:52:04.000000000 -0400
51105+++ linux-2.6.32.9/mm/slub.c 2010-03-11 20:25:00.285644592 -0500 51130+++ linux-2.6.32.10/mm/slub.c 2010-03-20 15:58:47.198057227 -0400
51106@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * 51131@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache *
51107 51132
51108 page = virt_to_head_page(x); 51133 page = virt_to_head_page(x);
@@ -51259,9 +51284,9 @@ diff -urNp linux-2.6.32.9/mm/slub.c linux-2.6.32.9/mm/slub.c
51259 static void print_slabinfo_header(struct seq_file *m) 51284 static void print_slabinfo_header(struct seq_file *m)
51260 { 51285 {
51261 seq_puts(m, "slabinfo - version: 2.1\n"); 51286 seq_puts(m, "slabinfo - version: 2.1\n");
51262diff -urNp linux-2.6.32.9/mm/util.c linux-2.6.32.9/mm/util.c 51287diff -urNp linux-2.6.32.10/mm/util.c linux-2.6.32.10/mm/util.c
51263--- linux-2.6.32.9/mm/util.c 2010-02-23 10:38:51.000000000 -0500 51288--- linux-2.6.32.10/mm/util.c 2010-03-15 11:52:04.000000000 -0400
51264+++ linux-2.6.32.9/mm/util.c 2010-03-11 20:25:00.285644592 -0500 51289+++ linux-2.6.32.10/mm/util.c 2010-03-20 15:58:47.198057227 -0400
51265@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); 51290@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
51266 void arch_pick_mmap_layout(struct mm_struct *mm) 51291 void arch_pick_mmap_layout(struct mm_struct *mm)
51267 { 51292 {
@@ -51275,9 +51300,9 @@ diff -urNp linux-2.6.32.9/mm/util.c linux-2.6.32.9/mm/util.c
51275 mm->get_unmapped_area = arch_get_unmapped_area; 51300 mm->get_unmapped_area = arch_get_unmapped_area;
51276 mm->unmap_area = arch_unmap_area; 51301 mm->unmap_area = arch_unmap_area;
51277 } 51302 }
51278diff -urNp linux-2.6.32.9/mm/vmalloc.c linux-2.6.32.9/mm/vmalloc.c 51303diff -urNp linux-2.6.32.10/mm/vmalloc.c linux-2.6.32.10/mm/vmalloc.c
51279--- linux-2.6.32.9/mm/vmalloc.c 2010-02-23 10:38:51.000000000 -0500 51304--- linux-2.6.32.10/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400
51280+++ linux-2.6.32.9/mm/vmalloc.c 2010-03-11 20:25:00.285644592 -0500 51305+++ linux-2.6.32.10/mm/vmalloc.c 2010-03-20 15:58:47.198057227 -0400
51281@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, 51306@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
51282 51307
51283 pte = pte_offset_kernel(pmd, addr); 51308 pte = pte_offset_kernel(pmd, addr);
@@ -51488,9 +51513,9 @@ diff -urNp linux-2.6.32.9/mm/vmalloc.c linux-2.6.32.9/mm/vmalloc.c
51488 void *vmalloc_32_user(unsigned long size) 51513 void *vmalloc_32_user(unsigned long size)
51489 { 51514 {
51490 struct vm_struct *area; 51515 struct vm_struct *area;
51491diff -urNp linux-2.6.32.9/net/atm/atm_misc.c linux-2.6.32.9/net/atm/atm_misc.c 51516diff -urNp linux-2.6.32.10/net/atm/atm_misc.c linux-2.6.32.10/net/atm/atm_misc.c
51492--- linux-2.6.32.9/net/atm/atm_misc.c 2010-02-23 10:38:51.000000000 -0500 51517--- linux-2.6.32.10/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400
51493+++ linux-2.6.32.9/net/atm/atm_misc.c 2010-03-11 20:25:00.285644592 -0500 51518+++ linux-2.6.32.10/net/atm/atm_misc.c 2010-03-20 15:58:47.198057227 -0400
51494@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t 51519@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
51495 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) 51520 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
51496 return 1; 51521 return 1;
@@ -51527,9 +51552,9 @@ diff -urNp linux-2.6.32.9/net/atm/atm_misc.c linux-2.6.32.9/net/atm/atm_misc.c
51527 __SONET_ITEMS 51552 __SONET_ITEMS
51528 #undef __HANDLE_ITEM 51553 #undef __HANDLE_ITEM
51529 } 51554 }
51530diff -urNp linux-2.6.32.9/net/atm/proc.c linux-2.6.32.9/net/atm/proc.c 51555diff -urNp linux-2.6.32.10/net/atm/proc.c linux-2.6.32.10/net/atm/proc.c
51531--- linux-2.6.32.9/net/atm/proc.c 2010-02-23 10:38:51.000000000 -0500 51556--- linux-2.6.32.10/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400
51532+++ linux-2.6.32.9/net/atm/proc.c 2010-03-11 20:25:00.285644592 -0500 51557+++ linux-2.6.32.10/net/atm/proc.c 2010-03-20 15:58:47.198057227 -0400
51533@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s 51558@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
51534 const struct k_atm_aal_stats *stats) 51559 const struct k_atm_aal_stats *stats)
51535 { 51560 {
@@ -51543,9 +51568,9 @@ diff -urNp linux-2.6.32.9/net/atm/proc.c linux-2.6.32.9/net/atm/proc.c
51543 } 51568 }
51544 51569
51545 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) 51570 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
51546diff -urNp linux-2.6.32.9/net/atm/resources.c linux-2.6.32.9/net/atm/resources.c 51571diff -urNp linux-2.6.32.10/net/atm/resources.c linux-2.6.32.10/net/atm/resources.c
51547--- linux-2.6.32.9/net/atm/resources.c 2010-02-23 10:38:51.000000000 -0500 51572--- linux-2.6.32.10/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400
51548+++ linux-2.6.32.9/net/atm/resources.c 2010-03-11 20:25:00.285644592 -0500 51573+++ linux-2.6.32.10/net/atm/resources.c 2010-03-20 15:58:47.198057227 -0400
51549@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * 51574@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
51550 static void copy_aal_stats(struct k_atm_aal_stats *from, 51575 static void copy_aal_stats(struct k_atm_aal_stats *from,
51551 struct atm_aal_stats *to) 51576 struct atm_aal_stats *to)
@@ -51564,9 +51589,9 @@ diff -urNp linux-2.6.32.9/net/atm/resources.c linux-2.6.32.9/net/atm/resources.c
51564 __AAL_STAT_ITEMS 51589 __AAL_STAT_ITEMS
51565 #undef __HANDLE_ITEM 51590 #undef __HANDLE_ITEM
51566 } 51591 }
51567diff -urNp linux-2.6.32.9/net/bridge/br_private.h linux-2.6.32.9/net/bridge/br_private.h 51592diff -urNp linux-2.6.32.10/net/bridge/br_private.h linux-2.6.32.10/net/bridge/br_private.h
51568--- linux-2.6.32.9/net/bridge/br_private.h 2010-02-23 10:38:51.000000000 -0500 51593--- linux-2.6.32.10/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400
51569+++ linux-2.6.32.9/net/bridge/br_private.h 2010-03-11 20:25:00.285644592 -0500 51594+++ linux-2.6.32.10/net/bridge/br_private.h 2010-03-20 15:58:47.198057227 -0400
51570@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, 51595@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,
51571 51596
51572 #ifdef CONFIG_SYSFS 51597 #ifdef CONFIG_SYSFS
@@ -51576,9 +51601,9 @@ diff -urNp linux-2.6.32.9/net/bridge/br_private.h linux-2.6.32.9/net/bridge/br_p
51576 extern int br_sysfs_addif(struct net_bridge_port *p); 51601 extern int br_sysfs_addif(struct net_bridge_port *p);
51577 51602
51578 /* br_sysfs_br.c */ 51603 /* br_sysfs_br.c */
51579diff -urNp linux-2.6.32.9/net/bridge/br_stp_if.c linux-2.6.32.9/net/bridge/br_stp_if.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
51580--- linux-2.6.32.9/net/bridge/br_stp_if.c 2010-02-23 10:38:51.000000000 -0500 51605--- linux-2.6.32.10/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400
51581+++ linux-2.6.32.9/net/bridge/br_stp_if.c 2010-03-11 20:25:00.285644592 -0500 51606+++ linux-2.6.32.10/net/bridge/br_stp_if.c 2010-03-20 15:58:47.198057227 -0400
51582@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg 51607@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
51583 char *envp[] = { NULL }; 51608 char *envp[] = { NULL };
51584 51609
@@ -51588,9 +51613,9 @@ diff -urNp linux-2.6.32.9/net/bridge/br_stp_if.c linux-2.6.32.9/net/bridge/br_st
51588 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", 51613 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
51589 br->dev->name, r); 51614 br->dev->name, r);
51590 51615
51591diff -urNp linux-2.6.32.9/net/bridge/br_sysfs_if.c linux-2.6.32.9/net/bridge/br_sysfs_if.c 51616diff -urNp linux-2.6.32.10/net/bridge/br_sysfs_if.c linux-2.6.32.10/net/bridge/br_sysfs_if.c
51592--- linux-2.6.32.9/net/bridge/br_sysfs_if.c 2010-02-23 10:38:51.000000000 -0500 51617--- linux-2.6.32.10/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400
51593+++ linux-2.6.32.9/net/bridge/br_sysfs_if.c 2010-03-11 20:25:00.285644592 -0500 51618+++ linux-2.6.32.10/net/bridge/br_sysfs_if.c 2010-03-20 15:58:47.198057227 -0400
51594@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje 51619@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
51595 return ret; 51620 return ret;
51596 } 51621 }
@@ -51600,9 +51625,9 @@ diff -urNp linux-2.6.32.9/net/bridge/br_sysfs_if.c linux-2.6.32.9/net/bridge/br_
51600 .show = brport_show, 51625 .show = brport_show,
51601 .store = brport_store, 51626 .store = brport_store,
51602 }; 51627 };
51603diff -urNp linux-2.6.32.9/net/core/dev.c linux-2.6.32.9/net/core/dev.c 51628diff -urNp linux-2.6.32.10/net/core/dev.c linux-2.6.32.10/net/core/dev.c
51604--- linux-2.6.32.9/net/core/dev.c 2010-02-23 10:38:51.000000000 -0500 51629--- linux-2.6.32.10/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400
51605+++ linux-2.6.32.9/net/core/dev.c 2010-03-11 20:25:00.285644592 -0500 51630+++ linux-2.6.32.10/net/core/dev.c 2010-03-20 15:58:47.202049690 -0400
51606@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) 51631@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb)
51607 } 51632 }
51608 EXPORT_SYMBOL(netif_rx_ni); 51633 EXPORT_SYMBOL(netif_rx_ni);
@@ -51621,9 +51646,9 @@ diff -urNp linux-2.6.32.9/net/core/dev.c linux-2.6.32.9/net/core/dev.c
51621 { 51646 {
51622 struct list_head *list = &__get_cpu_var(softnet_data).poll_list; 51647 struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
51623 unsigned long time_limit = jiffies + 2; 51648 unsigned long time_limit = jiffies + 2;
51624diff -urNp linux-2.6.32.9/net/core/flow.c linux-2.6.32.9/net/core/flow.c 51649diff -urNp linux-2.6.32.10/net/core/flow.c linux-2.6.32.10/net/core/flow.c
51625--- linux-2.6.32.9/net/core/flow.c 2010-02-23 10:38:51.000000000 -0500 51650--- linux-2.6.32.10/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400
51626+++ linux-2.6.32.9/net/core/flow.c 2010-03-11 20:25:00.285644592 -0500 51651+++ linux-2.6.32.10/net/core/flow.c 2010-03-20 15:58:47.202049690 -0400
51627@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( 51652@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
51628 51653
51629 static u32 flow_hash_shift; 51654 static u32 flow_hash_shift;
@@ -51651,9 +51676,9 @@ diff -urNp linux-2.6.32.9/net/core/flow.c linux-2.6.32.9/net/core/flow.c
51651 51676
51652 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) 51677 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
51653 51678
51654diff -urNp linux-2.6.32.9/net/dccp/ccids/ccid3.c linux-2.6.32.9/net/dccp/ccids/ccid3.c 51679diff -urNp linux-2.6.32.10/net/dccp/ccids/ccid3.c linux-2.6.32.10/net/dccp/ccids/ccid3.c
51655--- linux-2.6.32.9/net/dccp/ccids/ccid3.c 2010-02-23 10:38:51.000000000 -0500 51680--- linux-2.6.32.10/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400
51656+++ linux-2.6.32.9/net/dccp/ccids/ccid3.c 2010-03-11 20:25:00.285644592 -0500 51681+++ linux-2.6.32.10/net/dccp/ccids/ccid3.c 2010-03-20 15:58:47.202049690 -0400
51657@@ -41,7 +41,7 @@ 51682@@ -41,7 +41,7 @@
51658 static int ccid3_debug; 51683 static int ccid3_debug;
51659 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) 51684 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -51663,9 +51688,9 @@ diff -urNp linux-2.6.32.9/net/dccp/ccids/ccid3.c linux-2.6.32.9/net/dccp/ccids/c
51663 #endif 51688 #endif
51664 51689
51665 /* 51690 /*
51666diff -urNp linux-2.6.32.9/net/dccp/dccp.h linux-2.6.32.9/net/dccp/dccp.h 51691diff -urNp linux-2.6.32.10/net/dccp/dccp.h linux-2.6.32.10/net/dccp/dccp.h
51667--- linux-2.6.32.9/net/dccp/dccp.h 2010-02-23 10:38:51.000000000 -0500 51692--- linux-2.6.32.10/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400
51668+++ linux-2.6.32.9/net/dccp/dccp.h 2010-03-11 20:25:00.289641260 -0500 51693+++ linux-2.6.32.10/net/dccp/dccp.h 2010-03-20 15:58:47.202049690 -0400
51669@@ -44,9 +44,9 @@ extern int dccp_debug; 51694@@ -44,9 +44,9 @@ extern int dccp_debug;
51670 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) 51695 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
51671 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) 51696 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
@@ -51679,9 +51704,9 @@ diff -urNp linux-2.6.32.9/net/dccp/dccp.h linux-2.6.32.9/net/dccp/dccp.h
51679 #endif 51704 #endif
51680 51705
51681 extern struct inet_hashinfo dccp_hashinfo; 51706 extern struct inet_hashinfo dccp_hashinfo;
51682diff -urNp linux-2.6.32.9/net/decnet/sysctl_net_decnet.c linux-2.6.32.9/net/decnet/sysctl_net_decnet.c 51707diff -urNp linux-2.6.32.10/net/decnet/sysctl_net_decnet.c linux-2.6.32.10/net/decnet/sysctl_net_decnet.c
51683--- linux-2.6.32.9/net/decnet/sysctl_net_decnet.c 2010-02-23 10:38:51.000000000 -0500 51708--- linux-2.6.32.10/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400
51684+++ linux-2.6.32.9/net/decnet/sysctl_net_decnet.c 2010-03-11 20:25:00.289641260 -0500 51709+++ linux-2.6.32.10/net/decnet/sysctl_net_decnet.c 2010-03-20 15:58:47.202049690 -0400
51685@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t 51710@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
51686 51711
51687 if (len > *lenp) len = *lenp; 51712 if (len > *lenp) len = *lenp;
@@ -51700,9 +51725,9 @@ diff -urNp linux-2.6.32.9/net/decnet/sysctl_net_decnet.c linux-2.6.32.9/net/decn
51700 return -EFAULT; 51725 return -EFAULT;
51701 51726
51702 *lenp = len; 51727 *lenp = len;
51703diff -urNp linux-2.6.32.9/net/ipv4/inet_hashtables.c linux-2.6.32.9/net/ipv4/inet_hashtables.c 51728diff -urNp linux-2.6.32.10/net/ipv4/inet_hashtables.c linux-2.6.32.10/net/ipv4/inet_hashtables.c
51704--- linux-2.6.32.9/net/ipv4/inet_hashtables.c 2010-02-23 10:38:51.000000000 -0500 51729--- linux-2.6.32.10/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400
51705+++ linux-2.6.32.9/net/ipv4/inet_hashtables.c 2010-03-11 20:25:00.289641260 -0500 51730+++ linux-2.6.32.10/net/ipv4/inet_hashtables.c 2010-03-20 15:58:47.202049690 -0400
51706@@ -18,11 +18,14 @@ 51731@@ -18,11 +18,14 @@
51707 #include <linux/sched.h> 51732 #include <linux/sched.h>
51708 #include <linux/slab.h> 51733 #include <linux/slab.h>
@@ -51727,9 +51752,9 @@ diff -urNp linux-2.6.32.9/net/ipv4/inet_hashtables.c linux-2.6.32.9/net/ipv4/ine
51727 if (tw) { 51752 if (tw) {
51728 inet_twsk_deschedule(tw, death_row); 51753 inet_twsk_deschedule(tw, death_row);
51729 inet_twsk_put(tw); 51754 inet_twsk_put(tw);
51730diff -urNp linux-2.6.32.9/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.9/net/ipv4/netfilter/nf_nat_snmp_basic.c 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
51731--- linux-2.6.32.9/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-02-23 10:38:51.000000000 -0500 51756--- linux-2.6.32.10/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400
51732+++ linux-2.6.32.9/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-11 20:25:00.289641260 -0500 51757+++ linux-2.6.32.10/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-20 15:58:47.202049690 -0400
51733@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( 51758@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
51734 51759
51735 *len = 0; 51760 *len = 0;
@@ -51739,47 +51764,81 @@ diff -urNp linux-2.6.32.9/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.9/
51739 if (*octets == NULL) { 51764 if (*octets == NULL) {
51740 if (net_ratelimit()) 51765 if (net_ratelimit())
51741 printk("OOM in bsalg (%d)\n", __LINE__); 51766 printk("OOM in bsalg (%d)\n", __LINE__);
51742diff -urNp linux-2.6.32.9/net/ipv4/tcp_ipv4.c linux-2.6.32.9/net/ipv4/tcp_ipv4.c 51767diff -urNp linux-2.6.32.10/net/ipv4/tcp_ipv4.c linux-2.6.32.10/net/ipv4/tcp_ipv4.c
51743--- linux-2.6.32.9/net/ipv4/tcp_ipv4.c 2010-02-23 10:38:51.000000000 -0500 51768--- linux-2.6.32.10/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400
51744+++ linux-2.6.32.9/net/ipv4/tcp_ipv4.c 2010-03-11 20:25:00.289641260 -0500 51769+++ linux-2.6.32.10/net/ipv4/tcp_ipv4.c 2010-03-20 16:43:40.608963983 -0400
51745@@ -1542,6 +1542,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc 51770@@ -84,6 +84,9 @@
51746 return 0; 51771 int sysctl_tcp_tw_reuse __read_mostly;
51772 int sysctl_tcp_low_latency __read_mostly;
51747 51773
51748 reset:
51749+#ifdef CONFIG_GRKERNSEC_BLACKHOLE 51774+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
51750+ if (!skb->dev || (skb->dev->flags & IFF_LOOPBACK)) 51775+extern int grsec_enable_blackhole;
51751+#endif 51776+#endif
51752 tcp_v4_send_reset(rsk, skb); 51777
51753 discard: 51778 #ifdef CONFIG_TCP_MD5SIG
51754 kfree_skb(skb); 51779 static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
51755@@ -1650,6 +1653,9 @@ no_tcp_socket: 51780@@ -1603,12 +1606,20 @@ int tcp_v4_rcv(struct sk_buff *skb)
51781 TCP_SKB_CB(skb)->sacked = 0;
51782
51783 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
51784- if (!sk)
51785+ if (!sk) {
51786+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
51787+ ret = 1;
51788+#endif
51789 goto no_tcp_socket;
51790+ }
51791
51792 process:
51793- if (sk->sk_state == TCP_TIME_WAIT)
51794+ if (sk->sk_state == TCP_TIME_WAIT) {
51795+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
51796+ ret = 2;
51797+#endif
51798 goto do_time_wait;
51799+ }
51800
51801 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))
51802 goto discard_and_relse;
51803@@ -1650,6 +1661,10 @@ no_tcp_socket:
51756 bad_packet: 51804 bad_packet:
51757 TCP_INC_STATS_BH(net, TCP_MIB_INERRS); 51805 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
51758 } else { 51806 } else {
51759+#ifdef CONFIG_GRKERNSEC_BLACKHOLE 51807+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
51760+ if (skb->dev->flags & IFF_LOOPBACK) 51808+ if (!grsec_enable_blackhole || (ret == 1 &&
51809+ (skb->dev->flags & IFF_LOOPBACK)))
51761+#endif 51810+#endif
51762 tcp_v4_send_reset(NULL, skb); 51811 tcp_v4_send_reset(NULL, skb);
51763 } 51812 }
51764 51813
51765diff -urNp linux-2.6.32.9/net/ipv4/tcp_minisocks.c linux-2.6.32.9/net/ipv4/tcp_minisocks.c 51814diff -urNp linux-2.6.32.10/net/ipv4/tcp_minisocks.c linux-2.6.32.10/net/ipv4/tcp_minisocks.c
51766--- linux-2.6.32.9/net/ipv4/tcp_minisocks.c 2010-02-23 10:38:51.000000000 -0500 51815--- linux-2.6.32.10/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400
51767+++ linux-2.6.32.9/net/ipv4/tcp_minisocks.c 2010-03-11 20:25:00.289641260 -0500 51816+++ linux-2.6.32.10/net/ipv4/tcp_minisocks.c 2010-03-21 15:08:35.843551109 -0400
51768@@ -672,8 +672,11 @@ listen_overflow: 51817@@ -26,6 +26,10 @@
51818 #include <net/inet_common.h>
51819 #include <net/xfrm.h>
51820
51821+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
51822+extern int grsec_enable_blackhole;
51823+#endif
51824+
51825 #ifdef CONFIG_SYSCTL
51826 #define SYNC_INIT 0 /* let the user enable it */
51827 #else
51828@@ -672,6 +676,10 @@ listen_overflow:
51769 51829
51770 embryonic_reset: 51830 embryonic_reset:
51771 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS); 51831 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
51772+ 51832+
51773+#ifndef CONFIG_GRKERNSEC_BLACKHOLE 51833+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
51834+ if (!grsec_enable_blackhole)
51835+#endif
51774 if (!(flg & TCP_FLAG_RST)) 51836 if (!(flg & TCP_FLAG_RST))
51775 req->rsk_ops->send_reset(sk, skb); 51837 req->rsk_ops->send_reset(sk, skb);
51776+#endif
51777 51838
51778 inet_csk_reqsk_queue_drop(sk, req, prev); 51839diff -urNp linux-2.6.32.10/net/ipv4/tcp_probe.c linux-2.6.32.10/net/ipv4/tcp_probe.c
51779 return NULL; 51840--- linux-2.6.32.10/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400
51780diff -urNp linux-2.6.32.9/net/ipv4/tcp_probe.c linux-2.6.32.9/net/ipv4/tcp_probe.c 51841+++ linux-2.6.32.10/net/ipv4/tcp_probe.c 2010-03-20 15:58:47.202049690 -0400
51781--- linux-2.6.32.9/net/ipv4/tcp_probe.c 2010-02-23 10:38:51.000000000 -0500
51782+++ linux-2.6.32.9/net/ipv4/tcp_probe.c 2010-03-11 20:25:00.289641260 -0500
51783@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file 51842@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
51784 if (cnt + width >= len) 51843 if (cnt + width >= len)
51785 break; 51844 break;
@@ -51789,9 +51848,37 @@ diff -urNp linux-2.6.32.9/net/ipv4/tcp_probe.c linux-2.6.32.9/net/ipv4/tcp_probe
51789 return -EFAULT; 51848 return -EFAULT;
51790 cnt += width; 51849 cnt += width;
51791 } 51850 }
51792diff -urNp linux-2.6.32.9/net/ipv4/udp.c linux-2.6.32.9/net/ipv4/udp.c 51851diff -urNp linux-2.6.32.10/net/ipv4/tcp_timer.c linux-2.6.32.10/net/ipv4/tcp_timer.c
51793--- linux-2.6.32.9/net/ipv4/udp.c 2010-02-23 10:38:51.000000000 -0500 51852--- linux-2.6.32.10/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400
51794+++ linux-2.6.32.9/net/ipv4/udp.c 2010-03-11 20:25:00.289641260 -0500 51853+++ linux-2.6.32.10/net/ipv4/tcp_timer.c 2010-03-20 16:54:07.060562571 -0400
51854@@ -21,6 +21,10 @@
51855 #include <linux/module.h>
51856 #include <net/tcp.h>
51857
51858+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
51859+extern int grsec_lastack_retries;
51860+#endif
51861+
51862 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
51863 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
51864 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
51865@@ -164,6 +168,13 @@ static int tcp_write_timeout(struct sock
51866 }
51867 }
51868
51869+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
51870+ if ((sk->sk_state == TCP_LAST_ACK) &&
51871+ (grsec_lastack_retries > 0) &&
51872+ (grsec_lastack_retries < retry_until))
51873+ retry_until = grsec_lastack_retries;
51874+#endif
51875+
51876 if (retransmits_timed_out(sk, retry_until)) {
51877 /* Has it gone just too far? */
51878 tcp_write_err(sk);
51879diff -urNp linux-2.6.32.10/net/ipv4/udp.c linux-2.6.32.10/net/ipv4/udp.c
51880--- linux-2.6.32.10/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
51795@@ -86,6 +86,7 @@ 51882@@ -86,6 +86,7 @@
51796 #include <linux/types.h> 51883 #include <linux/types.h>
51797 #include <linux/fcntl.h> 51884 #include <linux/fcntl.h>
@@ -51800,7 +51887,18 @@ diff -urNp linux-2.6.32.9/net/ipv4/udp.c linux-2.6.32.9/net/ipv4/udp.c
51800 #include <linux/socket.h> 51887 #include <linux/socket.h>
51801 #include <linux/sockios.h> 51888 #include <linux/sockios.h>
51802 #include <linux/igmp.h> 51889 #include <linux/igmp.h>
51803@@ -371,6 +372,9 @@ found: 51890@@ -106,6 +107,10 @@
51891 #include <net/xfrm.h>
51892 #include "udp_impl.h"
51893
51894+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
51895+extern int grsec_enable_blackhole;
51896+#endif
51897+
51898 struct udp_table udp_table;
51899 EXPORT_SYMBOL(udp_table);
51900
51901@@ -371,6 +376,9 @@ found:
51804 return s; 51902 return s;
51805 } 51903 }
51806 51904
@@ -51810,7 +51908,7 @@ diff -urNp linux-2.6.32.9/net/ipv4/udp.c linux-2.6.32.9/net/ipv4/udp.c
51810 /* 51908 /*
51811 * This routine is called by the ICMP module when it gets some 51909 * This routine is called by the ICMP module when it gets some
51812 * sort of error condition. If err < 0 then the socket should 51910 * sort of error condition. If err < 0 then the socket should
51813@@ -639,9 +643,18 @@ int udp_sendmsg(struct kiocb *iocb, stru 51911@@ -639,9 +647,18 @@ int udp_sendmsg(struct kiocb *iocb, stru
51814 dport = usin->sin_port; 51912 dport = usin->sin_port;
51815 if (dport == 0) 51913 if (dport == 0)
51816 return -EINVAL; 51914 return -EINVAL;
@@ -51829,7 +51927,7 @@ diff -urNp linux-2.6.32.9/net/ipv4/udp.c linux-2.6.32.9/net/ipv4/udp.c
51829 daddr = inet->daddr; 51927 daddr = inet->daddr;
51830 dport = inet->dport; 51928 dport = inet->dport;
51831 /* Open fast path for connected socket. 51929 /* Open fast path for connected socket.
51832@@ -945,6 +958,10 @@ try_again: 51930@@ -945,6 +962,10 @@ try_again:
51833 if (!skb) 51931 if (!skb)
51834 goto out; 51932 goto out;
51835 51933
@@ -51840,19 +51938,19 @@ diff -urNp linux-2.6.32.9/net/ipv4/udp.c linux-2.6.32.9/net/ipv4/udp.c
51840 ulen = skb->len - sizeof(struct udphdr); 51938 ulen = skb->len - sizeof(struct udphdr);
51841 copied = len; 51939 copied = len;
51842 if (copied > ulen) 51940 if (copied > ulen)
51843@@ -1335,6 +1352,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, 51941@@ -1335,6 +1356,9 @@ int __udp4_lib_rcv(struct sk_buff *skb,
51844 goto csum_error; 51942 goto csum_error;
51845 51943
51846 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); 51944 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
51847+#ifdef CONFIG_GRKERNSEC_BLACKHOLE 51945+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
51848+ if (skb->dev->flags & IFF_LOOPBACK) 51946+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
51849+#endif 51947+#endif
51850 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); 51948 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
51851 51949
51852 /* 51950 /*
51853diff -urNp linux-2.6.32.9/net/ipv6/exthdrs.c linux-2.6.32.9/net/ipv6/exthdrs.c 51951diff -urNp linux-2.6.32.10/net/ipv6/exthdrs.c linux-2.6.32.10/net/ipv6/exthdrs.c
51854--- linux-2.6.32.9/net/ipv6/exthdrs.c 2010-02-23 10:38:51.000000000 -0500 51952--- linux-2.6.32.10/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400
51855+++ linux-2.6.32.9/net/ipv6/exthdrs.c 2010-03-11 20:25:00.289641260 -0500 51953+++ linux-2.6.32.10/net/ipv6/exthdrs.c 2010-03-20 15:58:47.202049690 -0400
51856@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt 51954@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
51857 .type = IPV6_TLV_JUMBO, 51955 .type = IPV6_TLV_JUMBO,
51858 .func = ipv6_hop_jumbo, 51956 .func = ipv6_hop_jumbo,
@@ -51862,9 +51960,9 @@ diff -urNp linux-2.6.32.9/net/ipv6/exthdrs.c linux-2.6.32.9/net/ipv6/exthdrs.c
51862 }; 51960 };
51863 51961
51864 int ipv6_parse_hopopts(struct sk_buff *skb) 51962 int ipv6_parse_hopopts(struct sk_buff *skb)
51865diff -urNp linux-2.6.32.9/net/ipv6/raw.c linux-2.6.32.9/net/ipv6/raw.c 51963diff -urNp linux-2.6.32.10/net/ipv6/raw.c linux-2.6.32.10/net/ipv6/raw.c
51866--- linux-2.6.32.9/net/ipv6/raw.c 2010-02-23 10:38:51.000000000 -0500 51964--- linux-2.6.32.10/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400
51867+++ linux-2.6.32.9/net/ipv6/raw.c 2010-03-11 20:25:00.289641260 -0500 51965+++ linux-2.6.32.10/net/ipv6/raw.c 2010-03-20 15:58:47.202049690 -0400
51868@@ -600,7 +600,7 @@ out: 51966@@ -600,7 +600,7 @@ out:
51869 return err; 51967 return err;
51870 } 51968 }
@@ -51874,9 +51972,9 @@ diff -urNp linux-2.6.32.9/net/ipv6/raw.c linux-2.6.32.9/net/ipv6/raw.c
51874 struct flowi *fl, struct rt6_info *rt, 51972 struct flowi *fl, struct rt6_info *rt,
51875 unsigned int flags) 51973 unsigned int flags)
51876 { 51974 {
51877diff -urNp linux-2.6.32.9/net/ipv6/tcp_ipv6.c linux-2.6.32.9/net/ipv6/tcp_ipv6.c 51975diff -urNp linux-2.6.32.10/net/ipv6/tcp_ipv6.c linux-2.6.32.10/net/ipv6/tcp_ipv6.c
51878--- linux-2.6.32.9/net/ipv6/tcp_ipv6.c 2010-02-23 10:38:51.000000000 -0500 51976--- linux-2.6.32.10/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400
51879+++ linux-2.6.32.9/net/ipv6/tcp_ipv6.c 2010-03-11 20:25:00.289641260 -0500 51977+++ linux-2.6.32.10/net/ipv6/tcp_ipv6.c 2010-03-20 15:58:47.205034038 -0400
51880@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk 51978@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk
51881 return 0; 51979 return 0;
51882 51980
@@ -51897,9 +51995,9 @@ diff -urNp linux-2.6.32.9/net/ipv6/tcp_ipv6.c linux-2.6.32.9/net/ipv6/tcp_ipv6.c
51897 tcp_v6_send_reset(NULL, skb); 51995 tcp_v6_send_reset(NULL, skb);
51898 } 51996 }
51899 51997
51900diff -urNp linux-2.6.32.9/net/ipv6/udp.c linux-2.6.32.9/net/ipv6/udp.c 51998diff -urNp linux-2.6.32.10/net/ipv6/udp.c linux-2.6.32.10/net/ipv6/udp.c
51901--- linux-2.6.32.9/net/ipv6/udp.c 2010-02-23 10:38:51.000000000 -0500 51999--- linux-2.6.32.10/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400
51902+++ linux-2.6.32.9/net/ipv6/udp.c 2010-03-11 20:25:00.289641260 -0500 52000+++ linux-2.6.32.10/net/ipv6/udp.c 2010-03-20 15:58:47.205034038 -0400
51903@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, 52001@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb,
51904 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, 52002 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
51905 proto == IPPROTO_UDPLITE); 52003 proto == IPPROTO_UDPLITE);
@@ -51910,9 +52008,9 @@ diff -urNp linux-2.6.32.9/net/ipv6/udp.c linux-2.6.32.9/net/ipv6/udp.c
51910 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); 52008 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
51911 52009
51912 kfree_skb(skb); 52010 kfree_skb(skb);
51913diff -urNp linux-2.6.32.9/net/irda/ircomm/ircomm_tty.c linux-2.6.32.9/net/irda/ircomm/ircomm_tty.c 52011diff -urNp linux-2.6.32.10/net/irda/ircomm/ircomm_tty.c linux-2.6.32.10/net/irda/ircomm/ircomm_tty.c
51914--- linux-2.6.32.9/net/irda/ircomm/ircomm_tty.c 2010-02-23 10:38:51.000000000 -0500 52012--- linux-2.6.32.10/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400
51915+++ linux-2.6.32.9/net/irda/ircomm/ircomm_tty.c 2010-03-11 20:25:00.289641260 -0500 52013+++ linux-2.6.32.10/net/irda/ircomm/ircomm_tty.c 2010-03-20 15:58:47.205034038 -0400
51916@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st 52014@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
51917 add_wait_queue(&self->open_wait, &wait); 52015 add_wait_queue(&self->open_wait, &wait);
51918 52016
@@ -52035,9 +52133,9 @@ diff -urNp linux-2.6.32.9/net/irda/ircomm/ircomm_tty.c linux-2.6.32.9/net/irda/i
52035 seq_printf(m, "Max data size: %d\n", self->max_data_size); 52133 seq_printf(m, "Max data size: %d\n", self->max_data_size);
52036 seq_printf(m, "Max header size: %d\n", self->max_header_size); 52134 seq_printf(m, "Max header size: %d\n", self->max_header_size);
52037 52135
52038diff -urNp linux-2.6.32.9/net/mac80211/ieee80211_i.h linux-2.6.32.9/net/mac80211/ieee80211_i.h 52136diff -urNp linux-2.6.32.10/net/mac80211/ieee80211_i.h linux-2.6.32.10/net/mac80211/ieee80211_i.h
52039--- linux-2.6.32.9/net/mac80211/ieee80211_i.h 2010-02-23 10:38:51.000000000 -0500 52137--- linux-2.6.32.10/net/mac80211/ieee80211_i.h 2010-03-15 11:52:04.000000000 -0400
52040+++ linux-2.6.32.9/net/mac80211/ieee80211_i.h 2010-03-11 20:25:00.289641260 -0500 52138+++ linux-2.6.32.10/net/mac80211/ieee80211_i.h 2010-03-20 15:58:47.205034038 -0400
52041@@ -634,7 +634,7 @@ struct ieee80211_local { 52139@@ -634,7 +634,7 @@ struct ieee80211_local {
52042 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ 52140 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
52043 spinlock_t queue_stop_reason_lock; 52141 spinlock_t queue_stop_reason_lock;
@@ -52047,9 +52145,9 @@ diff -urNp linux-2.6.32.9/net/mac80211/ieee80211_i.h linux-2.6.32.9/net/mac80211
52047 int monitors, cooked_mntrs; 52145 int monitors, cooked_mntrs;
52048 /* number of interfaces with corresponding FIF_ flags */ 52146 /* number of interfaces with corresponding FIF_ flags */
52049 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; 52147 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
52050diff -urNp linux-2.6.32.9/net/mac80211/iface.c linux-2.6.32.9/net/mac80211/iface.c 52148diff -urNp linux-2.6.32.10/net/mac80211/iface.c linux-2.6.32.10/net/mac80211/iface.c
52051--- linux-2.6.32.9/net/mac80211/iface.c 2010-02-23 10:38:51.000000000 -0500 52149--- linux-2.6.32.10/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400
52052+++ linux-2.6.32.9/net/mac80211/iface.c 2010-03-11 20:25:00.289641260 -0500 52150+++ linux-2.6.32.10/net/mac80211/iface.c 2010-03-20 15:58:47.205034038 -0400
52053@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev 52151@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
52054 break; 52152 break;
52055 } 52153 }
@@ -52104,9 +52202,9 @@ diff -urNp linux-2.6.32.9/net/mac80211/iface.c linux-2.6.32.9/net/mac80211/iface
52104 ieee80211_clear_tx_pending(local); 52202 ieee80211_clear_tx_pending(local);
52105 ieee80211_stop_device(local); 52203 ieee80211_stop_device(local);
52106 52204
52107diff -urNp linux-2.6.32.9/net/mac80211/main.c linux-2.6.32.9/net/mac80211/main.c 52205diff -urNp linux-2.6.32.10/net/mac80211/main.c linux-2.6.32.10/net/mac80211/main.c
52108--- linux-2.6.32.9/net/mac80211/main.c 2010-02-23 10:38:51.000000000 -0500 52206--- linux-2.6.32.10/net/mac80211/main.c 2010-03-15 11:52:04.000000000 -0400
52109+++ linux-2.6.32.9/net/mac80211/main.c 2010-03-11 20:25:00.289641260 -0500 52207+++ linux-2.6.32.10/net/mac80211/main.c 2010-03-20 15:58:47.205034038 -0400
52110@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 52208@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
52111 local->hw.conf.power_level = power; 52209 local->hw.conf.power_level = power;
52112 } 52210 }
@@ -52116,9 +52214,9 @@ diff -urNp linux-2.6.32.9/net/mac80211/main.c linux-2.6.32.9/net/mac80211/main.c
52116 ret = drv_config(local, changed); 52214 ret = drv_config(local, changed);
52117 /* 52215 /*
52118 * Goal: 52216 * Goal:
52119diff -urNp linux-2.6.32.9/net/mac80211/pm.c linux-2.6.32.9/net/mac80211/pm.c 52217diff -urNp linux-2.6.32.10/net/mac80211/pm.c linux-2.6.32.10/net/mac80211/pm.c
52120--- linux-2.6.32.9/net/mac80211/pm.c 2010-02-23 10:38:51.000000000 -0500 52218--- linux-2.6.32.10/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400
52121+++ linux-2.6.32.9/net/mac80211/pm.c 2010-03-11 20:25:00.289641260 -0500 52219+++ linux-2.6.32.10/net/mac80211/pm.c 2010-03-20 15:58:47.205034038 -0400
52122@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 52220@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
52123 } 52221 }
52124 52222
@@ -52128,9 +52226,9 @@ diff -urNp linux-2.6.32.9/net/mac80211/pm.c linux-2.6.32.9/net/mac80211/pm.c
52128 ieee80211_stop_device(local); 52226 ieee80211_stop_device(local);
52129 52227
52130 local->suspended = true; 52228 local->suspended = true;
52131diff -urNp linux-2.6.32.9/net/mac80211/rate.c linux-2.6.32.9/net/mac80211/rate.c 52229diff -urNp linux-2.6.32.10/net/mac80211/rate.c linux-2.6.32.10/net/mac80211/rate.c
52132--- linux-2.6.32.9/net/mac80211/rate.c 2010-02-23 10:38:51.000000000 -0500 52230--- linux-2.6.32.10/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400
52133+++ linux-2.6.32.9/net/mac80211/rate.c 2010-03-11 20:25:00.289641260 -0500 52231+++ linux-2.6.32.10/net/mac80211/rate.c 2010-03-20 15:58:47.205034038 -0400
52134@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct 52232@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
52135 struct rate_control_ref *ref, *old; 52233 struct rate_control_ref *ref, *old;
52136 52234
@@ -52140,9 +52238,9 @@ diff -urNp linux-2.6.32.9/net/mac80211/rate.c linux-2.6.32.9/net/mac80211/rate.c
52140 return -EBUSY; 52238 return -EBUSY;
52141 52239
52142 ref = rate_control_alloc(name, local); 52240 ref = rate_control_alloc(name, local);
52143diff -urNp linux-2.6.32.9/net/mac80211/util.c linux-2.6.32.9/net/mac80211/util.c 52241diff -urNp linux-2.6.32.10/net/mac80211/util.c linux-2.6.32.10/net/mac80211/util.c
52144--- linux-2.6.32.9/net/mac80211/util.c 2010-02-23 10:38:51.000000000 -0500 52242--- linux-2.6.32.10/net/mac80211/util.c 2010-03-15 11:52:04.000000000 -0400
52145+++ linux-2.6.32.9/net/mac80211/util.c 2010-03-11 20:25:00.289641260 -0500 52243+++ linux-2.6.32.10/net/mac80211/util.c 2010-03-20 15:58:47.205034038 -0400
52146@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ 52244@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_
52147 local->resuming = true; 52245 local->resuming = true;
52148 52246
@@ -52160,9 +52258,9 @@ diff -urNp linux-2.6.32.9/net/mac80211/util.c linux-2.6.32.9/net/mac80211/util.c
52160 if (res) { 52258 if (res) {
52161 WARN(local->suspended, "Harware became unavailable " 52259 WARN(local->suspended, "Harware became unavailable "
52162 "upon resume. This is could be a software issue" 52260 "upon resume. This is could be a software issue"
52163diff -urNp linux-2.6.32.9/net/sctp/socket.c linux-2.6.32.9/net/sctp/socket.c 52261diff -urNp linux-2.6.32.10/net/sctp/socket.c linux-2.6.32.10/net/sctp/socket.c
52164--- linux-2.6.32.9/net/sctp/socket.c 2010-02-23 10:38:51.000000000 -0500 52262--- linux-2.6.32.10/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400
52165+++ linux-2.6.32.9/net/sctp/socket.c 2010-03-11 20:25:00.293652567 -0500 52263+++ linux-2.6.32.10/net/sctp/socket.c 2010-03-20 15:58:47.205034038 -0400
52166@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc 52264@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
52167 struct sctp_sndrcvinfo *sinfo; 52265 struct sctp_sndrcvinfo *sinfo;
52168 struct sctp_initmsg *sinit; 52266 struct sctp_initmsg *sinit;
@@ -52180,9 +52278,9 @@ diff -urNp linux-2.6.32.9/net/sctp/socket.c linux-2.6.32.9/net/sctp/socket.c
52180 52278
52181 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); 52279 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
52182 if (pp->fastreuse && sk->sk_reuse && 52280 if (pp->fastreuse && sk->sk_reuse &&
52183diff -urNp linux-2.6.32.9/net/socket.c linux-2.6.32.9/net/socket.c 52281diff -urNp linux-2.6.32.10/net/socket.c linux-2.6.32.10/net/socket.c
52184--- linux-2.6.32.9/net/socket.c 2010-02-23 10:38:51.000000000 -0500 52282--- linux-2.6.32.10/net/socket.c 2010-03-15 11:52:04.000000000 -0400
52185+++ linux-2.6.32.9/net/socket.c 2010-03-11 20:25:00.293652567 -0500 52283+++ linux-2.6.32.10/net/socket.c 2010-03-20 15:58:47.208549091 -0400
52186@@ -87,6 +87,7 @@ 52284@@ -87,6 +87,7 @@
52187 #include <linux/wireless.h> 52285 #include <linux/wireless.h>
52188 #include <linux/nsproxy.h> 52286 #include <linux/nsproxy.h>
@@ -52337,9 +52435,9 @@ diff -urNp linux-2.6.32.9/net/socket.c linux-2.6.32.9/net/socket.c
52337 err = 52435 err =
52338 security_socket_connect(sock, (struct sockaddr *)&address, addrlen); 52436 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
52339 if (err) 52437 if (err)
52340diff -urNp linux-2.6.32.9/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.9/net/sunrpc/xprtrdma/svc_rdma.c 52438diff -urNp linux-2.6.32.10/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.10/net/sunrpc/xprtrdma/svc_rdma.c
52341--- linux-2.6.32.9/net/sunrpc/xprtrdma/svc_rdma.c 2010-02-23 10:38:51.000000000 -0500 52439--- linux-2.6.32.10/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400
52342+++ linux-2.6.32.9/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-11 20:25:00.293652567 -0500 52440+++ linux-2.6.32.10/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-20 15:58:47.208549091 -0400
52343@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta 52441@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
52344 len -= *ppos; 52442 len -= *ppos;
52345 if (len > *lenp) 52443 if (len > *lenp)
@@ -52349,9 +52447,9 @@ diff -urNp linux-2.6.32.9/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.9/net/sunr
52349 return -EFAULT; 52447 return -EFAULT;
52350 *lenp = len; 52448 *lenp = len;
52351 *ppos += len; 52449 *ppos += len;
52352diff -urNp linux-2.6.32.9/net/sysctl_net.c linux-2.6.32.9/net/sysctl_net.c 52450diff -urNp linux-2.6.32.10/net/sysctl_net.c linux-2.6.32.10/net/sysctl_net.c
52353--- linux-2.6.32.9/net/sysctl_net.c 2010-02-23 10:38:51.000000000 -0500 52451--- linux-2.6.32.10/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400
52354+++ linux-2.6.32.9/net/sysctl_net.c 2010-03-11 20:25:00.293652567 -0500 52452+++ linux-2.6.32.10/net/sysctl_net.c 2010-03-20 15:58:47.208549091 -0400
52355@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct 52453@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
52356 struct ctl_table *table) 52454 struct ctl_table *table)
52357 { 52455 {
@@ -52361,9 +52459,9 @@ diff -urNp linux-2.6.32.9/net/sysctl_net.c linux-2.6.32.9/net/sysctl_net.c
52361 int mode = (table->mode >> 6) & 7; 52459 int mode = (table->mode >> 6) & 7;
52362 return (mode << 6) | (mode << 3) | mode; 52460 return (mode << 6) | (mode << 3) | mode;
52363 } 52461 }
52364diff -urNp linux-2.6.32.9/net/unix/af_unix.c linux-2.6.32.9/net/unix/af_unix.c 52462diff -urNp linux-2.6.32.10/net/unix/af_unix.c linux-2.6.32.10/net/unix/af_unix.c
52365--- linux-2.6.32.9/net/unix/af_unix.c 2010-02-23 10:38:51.000000000 -0500 52463--- linux-2.6.32.10/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400
52366+++ linux-2.6.32.9/net/unix/af_unix.c 2010-03-11 20:25:00.293652567 -0500 52464+++ linux-2.6.32.10/net/unix/af_unix.c 2010-03-20 15:58:47.208549091 -0400
52367@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru 52465@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru
52368 err = -ECONNREFUSED; 52466 err = -ECONNREFUSED;
52369 if (!S_ISSOCK(inode->i_mode)) 52467 if (!S_ISSOCK(inode->i_mode))
@@ -52421,9 +52519,9 @@ diff -urNp linux-2.6.32.9/net/unix/af_unix.c linux-2.6.32.9/net/unix/af_unix.c
52421 list = &unix_socket_table[addr->hash]; 52519 list = &unix_socket_table[addr->hash];
52422 } else { 52520 } else {
52423 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; 52521 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
52424diff -urNp linux-2.6.32.9/samples/kobject/kset-example.c linux-2.6.32.9/samples/kobject/kset-example.c 52522diff -urNp linux-2.6.32.10/samples/kobject/kset-example.c linux-2.6.32.10/samples/kobject/kset-example.c
52425--- linux-2.6.32.9/samples/kobject/kset-example.c 2010-02-23 10:38:51.000000000 -0500 52523--- linux-2.6.32.10/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400
52426+++ linux-2.6.32.9/samples/kobject/kset-example.c 2010-03-11 20:25:00.293652567 -0500 52524+++ linux-2.6.32.10/samples/kobject/kset-example.c 2010-03-20 15:58:47.208549091 -0400
52427@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob 52525@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
52428 } 52526 }
52429 52527
@@ -52433,9 +52531,9 @@ diff -urNp linux-2.6.32.9/samples/kobject/kset-example.c linux-2.6.32.9/samples/
52433 .show = foo_attr_show, 52531 .show = foo_attr_show,
52434 .store = foo_attr_store, 52532 .store = foo_attr_store,
52435 }; 52533 };
52436diff -urNp linux-2.6.32.9/scripts/basic/fixdep.c linux-2.6.32.9/scripts/basic/fixdep.c 52534diff -urNp linux-2.6.32.10/scripts/basic/fixdep.c linux-2.6.32.10/scripts/basic/fixdep.c
52437--- linux-2.6.32.9/scripts/basic/fixdep.c 2010-02-23 10:38:51.000000000 -0500 52535--- linux-2.6.32.10/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400
52438+++ linux-2.6.32.9/scripts/basic/fixdep.c 2010-03-11 20:25:00.293652567 -0500 52536+++ linux-2.6.32.10/scripts/basic/fixdep.c 2010-03-20 15:58:47.208549091 -0400
52439@@ -222,9 +222,9 @@ static void use_config(char *m, int slen 52537@@ -222,9 +222,9 @@ static void use_config(char *m, int slen
52440 52538
52441 static void parse_config_file(char *map, size_t len) 52539 static void parse_config_file(char *map, size_t len)
@@ -52457,9 +52555,9 @@ diff -urNp linux-2.6.32.9/scripts/basic/fixdep.c linux-2.6.32.9/scripts/basic/fi
52457 52555
52458 if (*p != INT_CONF) { 52556 if (*p != INT_CONF) {
52459 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", 52557 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
52460diff -urNp linux-2.6.32.9/scripts/kallsyms.c linux-2.6.32.9/scripts/kallsyms.c 52558diff -urNp linux-2.6.32.10/scripts/kallsyms.c linux-2.6.32.10/scripts/kallsyms.c
52461--- linux-2.6.32.9/scripts/kallsyms.c 2010-02-23 10:38:51.000000000 -0500 52559--- linux-2.6.32.10/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400
52462+++ linux-2.6.32.9/scripts/kallsyms.c 2010-03-11 20:25:00.293652567 -0500 52560+++ linux-2.6.32.10/scripts/kallsyms.c 2010-03-20 15:58:47.208549091 -0400
52463@@ -43,10 +43,10 @@ struct text_range { 52561@@ -43,10 +43,10 @@ struct text_range {
52464 52562
52465 static unsigned long long _text; 52563 static unsigned long long _text;
@@ -52475,9 +52573,9 @@ diff -urNp linux-2.6.32.9/scripts/kallsyms.c linux-2.6.32.9/scripts/kallsyms.c
52475 }; 52573 };
52476 #define text_range_text (&text_ranges[0]) 52574 #define text_range_text (&text_ranges[0])
52477 #define text_range_inittext (&text_ranges[1]) 52575 #define text_range_inittext (&text_ranges[1])
52478diff -urNp linux-2.6.32.9/scripts/mod/file2alias.c linux-2.6.32.9/scripts/mod/file2alias.c 52576diff -urNp linux-2.6.32.10/scripts/mod/file2alias.c linux-2.6.32.10/scripts/mod/file2alias.c
52479--- linux-2.6.32.9/scripts/mod/file2alias.c 2010-02-23 10:38:51.000000000 -0500 52577--- linux-2.6.32.10/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400
52480+++ linux-2.6.32.9/scripts/mod/file2alias.c 2010-03-11 20:25:00.293652567 -0500 52578+++ linux-2.6.32.10/scripts/mod/file2alias.c 2010-03-20 15:58:47.208549091 -0400
52481@@ -72,7 +72,7 @@ static void device_id_check(const char * 52579@@ -72,7 +72,7 @@ static void device_id_check(const char *
52482 unsigned long size, unsigned long id_size, 52580 unsigned long size, unsigned long id_size,
52483 void *symval) 52581 void *symval)
@@ -52532,9 +52630,9 @@ diff -urNp linux-2.6.32.9/scripts/mod/file2alias.c linux-2.6.32.9/scripts/mod/fi
52532 52630
52533 sprintf(alias, "dmi*"); 52631 sprintf(alias, "dmi*");
52534 52632
52535diff -urNp linux-2.6.32.9/scripts/mod/modpost.c linux-2.6.32.9/scripts/mod/modpost.c 52633diff -urNp linux-2.6.32.10/scripts/mod/modpost.c linux-2.6.32.10/scripts/mod/modpost.c
52536--- linux-2.6.32.9/scripts/mod/modpost.c 2010-02-23 10:38:51.000000000 -0500 52634--- linux-2.6.32.10/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400
52537+++ linux-2.6.32.9/scripts/mod/modpost.c 2010-03-11 20:25:00.293652567 -0500 52635+++ linux-2.6.32.10/scripts/mod/modpost.c 2010-03-20 15:58:47.208549091 -0400
52538@@ -835,6 +835,7 @@ enum mismatch { 52636@@ -835,6 +835,7 @@ enum mismatch {
52539 INIT_TO_EXIT, 52637 INIT_TO_EXIT,
52540 EXIT_TO_INIT, 52638 EXIT_TO_INIT,
@@ -52602,9 +52700,9 @@ diff -urNp linux-2.6.32.9/scripts/mod/modpost.c linux-2.6.32.9/scripts/mod/modpo
52602 goto close_write; 52700 goto close_write;
52603 52701
52604 tmp = NOFAIL(malloc(b->pos)); 52702 tmp = NOFAIL(malloc(b->pos));
52605diff -urNp linux-2.6.32.9/scripts/mod/modpost.h linux-2.6.32.9/scripts/mod/modpost.h 52703diff -urNp linux-2.6.32.10/scripts/mod/modpost.h linux-2.6.32.10/scripts/mod/modpost.h
52606--- linux-2.6.32.9/scripts/mod/modpost.h 2010-02-23 10:38:51.000000000 -0500 52704--- linux-2.6.32.10/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400
52607+++ linux-2.6.32.9/scripts/mod/modpost.h 2010-03-11 20:25:00.293652567 -0500 52705+++ linux-2.6.32.10/scripts/mod/modpost.h 2010-03-20 15:58:47.208549091 -0400
52608@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e 52706@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
52609 52707
52610 struct buffer { 52708 struct buffer {
@@ -52624,9 +52722,9 @@ diff -urNp linux-2.6.32.9/scripts/mod/modpost.h linux-2.6.32.9/scripts/mod/modpo
52624 52722
52625 struct module { 52723 struct module {
52626 struct module *next; 52724 struct module *next;
52627diff -urNp linux-2.6.32.9/scripts/mod/sumversion.c linux-2.6.32.9/scripts/mod/sumversion.c 52725diff -urNp linux-2.6.32.10/scripts/mod/sumversion.c linux-2.6.32.10/scripts/mod/sumversion.c
52628--- linux-2.6.32.9/scripts/mod/sumversion.c 2010-02-23 10:38:51.000000000 -0500 52726--- linux-2.6.32.10/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400
52629+++ linux-2.6.32.9/scripts/mod/sumversion.c 2010-03-11 20:25:00.293652567 -0500 52727+++ linux-2.6.32.10/scripts/mod/sumversion.c 2010-03-20 15:58:47.208549091 -0400
52630@@ -455,7 +455,7 @@ static void write_version(const char *fi 52728@@ -455,7 +455,7 @@ static void write_version(const char *fi
52631 goto out; 52729 goto out;
52632 } 52730 }
@@ -52636,9 +52734,9 @@ diff -urNp linux-2.6.32.9/scripts/mod/sumversion.c linux-2.6.32.9/scripts/mod/su
52636 warn("writing sum in %s failed: %s\n", 52734 warn("writing sum in %s failed: %s\n",
52637 filename, strerror(errno)); 52735 filename, strerror(errno));
52638 goto out; 52736 goto out;
52639diff -urNp linux-2.6.32.9/scripts/pnmtologo.c linux-2.6.32.9/scripts/pnmtologo.c 52737diff -urNp linux-2.6.32.10/scripts/pnmtologo.c linux-2.6.32.10/scripts/pnmtologo.c
52640--- linux-2.6.32.9/scripts/pnmtologo.c 2010-02-23 10:38:51.000000000 -0500 52738--- linux-2.6.32.10/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400
52641+++ linux-2.6.32.9/scripts/pnmtologo.c 2010-03-11 20:25:00.293652567 -0500 52739+++ linux-2.6.32.10/scripts/pnmtologo.c 2010-03-20 15:58:47.208549091 -0400
52642@@ -237,14 +237,14 @@ static void write_header(void) 52740@@ -237,14 +237,14 @@ static void write_header(void)
52643 fprintf(out, " * Linux logo %s\n", logoname); 52741 fprintf(out, " * Linux logo %s\n", logoname);
52644 fputs(" */\n\n", out); 52742 fputs(" */\n\n", out);
@@ -52665,9 +52763,9 @@ diff -urNp linux-2.6.32.9/scripts/pnmtologo.c linux-2.6.32.9/scripts/pnmtologo.c
52665 logoname); 52763 logoname);
52666 write_hex_cnt = 0; 52764 write_hex_cnt = 0;
52667 for (i = 0; i < logo_clutsize; i++) { 52765 for (i = 0; i < logo_clutsize; i++) {
52668diff -urNp linux-2.6.32.9/security/commoncap.c linux-2.6.32.9/security/commoncap.c 52766diff -urNp linux-2.6.32.10/security/commoncap.c linux-2.6.32.10/security/commoncap.c
52669--- linux-2.6.32.9/security/commoncap.c 2010-02-23 10:38:51.000000000 -0500 52767--- linux-2.6.32.10/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400
52670+++ linux-2.6.32.9/security/commoncap.c 2010-03-11 20:25:00.293652567 -0500 52768+++ linux-2.6.32.10/security/commoncap.c 2010-03-20 15:58:47.208549091 -0400
52671@@ -27,7 +27,7 @@ 52769@@ -27,7 +27,7 @@
52672 #include <linux/sched.h> 52770 #include <linux/sched.h>
52673 #include <linux/prctl.h> 52771 #include <linux/prctl.h>
@@ -52690,9 +52788,9 @@ diff -urNp linux-2.6.32.9/security/commoncap.c linux-2.6.32.9/security/commoncap
52690 return 0; 52788 return 0;
52691 } 52789 }
52692 52790
52693diff -urNp linux-2.6.32.9/security/integrity/ima/ima_api.c linux-2.6.32.9/security/integrity/ima/ima_api.c 52791diff -urNp linux-2.6.32.10/security/integrity/ima/ima_api.c linux-2.6.32.10/security/integrity/ima/ima_api.c
52694--- linux-2.6.32.9/security/integrity/ima/ima_api.c 2010-02-23 10:38:51.000000000 -0500 52792--- linux-2.6.32.10/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400
52695+++ linux-2.6.32.9/security/integrity/ima/ima_api.c 2010-03-11 20:25:00.297380044 -0500 52793+++ linux-2.6.32.10/security/integrity/ima/ima_api.c 2010-03-20 15:58:47.208549091 -0400
52696@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino 52794@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
52697 int result; 52795 int result;
52698 52796
@@ -52702,9 +52800,9 @@ diff -urNp linux-2.6.32.9/security/integrity/ima/ima_api.c linux-2.6.32.9/securi
52702 52800
52703 entry = kmalloc(sizeof(*entry), GFP_KERNEL); 52801 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
52704 if (!entry) { 52802 if (!entry) {
52705diff -urNp linux-2.6.32.9/security/integrity/ima/ima_fs.c linux-2.6.32.9/security/integrity/ima/ima_fs.c 52803diff -urNp linux-2.6.32.10/security/integrity/ima/ima_fs.c linux-2.6.32.10/security/integrity/ima/ima_fs.c
52706--- linux-2.6.32.9/security/integrity/ima/ima_fs.c 2010-02-23 10:38:51.000000000 -0500 52804--- linux-2.6.32.10/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400
52707+++ linux-2.6.32.9/security/integrity/ima/ima_fs.c 2010-03-11 20:25:00.297380044 -0500 52805+++ linux-2.6.32.10/security/integrity/ima/ima_fs.c 2010-03-20 15:58:47.208549091 -0400
52708@@ -27,12 +27,12 @@ 52806@@ -27,12 +27,12 @@
52709 static int valid_policy = 1; 52807 static int valid_policy = 1;
52710 #define TMPBUFLEN 12 52808 #define TMPBUFLEN 12
@@ -52720,9 +52818,9 @@ diff -urNp linux-2.6.32.9/security/integrity/ima/ima_fs.c linux-2.6.32.9/securit
52720 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); 52818 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
52721 } 52819 }
52722 52820
52723diff -urNp linux-2.6.32.9/security/integrity/ima/ima.h linux-2.6.32.9/security/integrity/ima/ima.h 52821diff -urNp linux-2.6.32.10/security/integrity/ima/ima.h linux-2.6.32.10/security/integrity/ima/ima.h
52724--- linux-2.6.32.9/security/integrity/ima/ima.h 2010-02-23 10:38:51.000000000 -0500 52822--- linux-2.6.32.10/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400
52725+++ linux-2.6.32.9/security/integrity/ima/ima.h 2010-03-11 20:25:00.297380044 -0500 52823+++ linux-2.6.32.10/security/integrity/ima/ima.h 2010-03-20 15:58:47.208549091 -0400
52726@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino 52824@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
52727 extern spinlock_t ima_queue_lock; 52825 extern spinlock_t ima_queue_lock;
52728 52826
@@ -52734,9 +52832,9 @@ diff -urNp linux-2.6.32.9/security/integrity/ima/ima.h linux-2.6.32.9/security/i
52734 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; 52832 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
52735 }; 52833 };
52736 extern struct ima_h_table ima_htable; 52834 extern struct ima_h_table ima_htable;
52737diff -urNp linux-2.6.32.9/security/integrity/ima/ima_queue.c linux-2.6.32.9/security/integrity/ima/ima_queue.c 52835diff -urNp linux-2.6.32.10/security/integrity/ima/ima_queue.c linux-2.6.32.10/security/integrity/ima/ima_queue.c
52738--- linux-2.6.32.9/security/integrity/ima/ima_queue.c 2010-02-23 10:38:51.000000000 -0500 52836--- linux-2.6.32.10/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400
52739+++ linux-2.6.32.9/security/integrity/ima/ima_queue.c 2010-03-11 20:25:00.297380044 -0500 52837+++ linux-2.6.32.10/security/integrity/ima/ima_queue.c 2010-03-20 15:58:47.208549091 -0400
52740@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i 52838@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
52741 INIT_LIST_HEAD(&qe->later); 52839 INIT_LIST_HEAD(&qe->later);
52742 list_add_tail_rcu(&qe->later, &ima_measurements); 52840 list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -52746,9 +52844,9 @@ diff -urNp linux-2.6.32.9/security/integrity/ima/ima_queue.c linux-2.6.32.9/secu
52746 key = ima_hash_key(entry->digest); 52844 key = ima_hash_key(entry->digest);
52747 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); 52845 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
52748 return 0; 52846 return 0;
52749diff -urNp linux-2.6.32.9/security/Kconfig linux-2.6.32.9/security/Kconfig 52847diff -urNp linux-2.6.32.10/security/Kconfig linux-2.6.32.10/security/Kconfig
52750--- linux-2.6.32.9/security/Kconfig 2010-02-23 10:38:51.000000000 -0500 52848--- linux-2.6.32.10/security/Kconfig 2010-03-15 11:52:04.000000000 -0400
52751+++ linux-2.6.32.9/security/Kconfig 2010-03-11 20:25:00.297380044 -0500 52849+++ linux-2.6.32.10/security/Kconfig 2010-03-20 17:03:48.864664841 -0400
52752@@ -4,6 +4,488 @@ 52850@@ -4,6 +4,488 @@
52753 52851
52754 menu "Security options" 52852 menu "Security options"
@@ -52759,7 +52857,7 @@ diff -urNp linux-2.6.32.9/security/Kconfig linux-2.6.32.9/security/Kconfig
52759+ 52857+
52760+config PAX 52858+config PAX
52761+ bool "Enable various PaX features" 52859+ bool "Enable various PaX features"
52762+ depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS32 || MIPS64 || PARISC || PPC32 || PPC64 || SPARC32 || SPARC64 || X86) 52860+ depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS32 || MIPS64 || PARISC || PPC || SPARC || X86)
52763+ help 52861+ help
52764+ This allows you to enable various PaX features. PaX adds 52862+ This allows you to enable various PaX features. PaX adds
52765+ intrusion prevention mechanisms to the kernel that reduce 52863+ intrusion prevention mechanisms to the kernel that reduce
@@ -52848,7 +52946,7 @@ diff -urNp linux-2.6.32.9/security/Kconfig linux-2.6.32.9/security/Kconfig
52848+ 52946+
52849+config PAX_NOEXEC 52947+config PAX_NOEXEC
52850+ bool "Enforce non-executable pages" 52948+ bool "Enforce non-executable pages"
52851+ depends on (PAX_EI_PAX || PAX_PT_PAX_FLAGS || PAX_HAVE_ACL_FLAGS || PAX_HOOK_ACL_FLAGS) && (ALPHA || (ARM && (CPU_V6 || CPU_V7)) || IA64 || MIPS32 || MIPS64 || PARISC || PPC32 || PPC64 || S390 || SPARC32 || SPARC64 || X86) 52949+ depends on (PAX_EI_PAX || PAX_PT_PAX_FLAGS || PAX_HAVE_ACL_FLAGS || PAX_HOOK_ACL_FLAGS) && (ALPHA || (ARM && (CPU_V6 || CPU_V7)) || IA64 || MIPS || PARISC || PPC || S390 || SPARC || X86)
52852+ help 52950+ help
52853+ By design some architectures do not allow for protecting memory 52951+ By design some architectures do not allow for protecting memory
52854+ pages against execution or even if they do, Linux does not make 52952+ pages against execution or even if they do, Linux does not make
@@ -53015,7 +53113,7 @@ diff -urNp linux-2.6.32.9/security/Kconfig linux-2.6.32.9/security/Kconfig
53015+ 53113+
53016+config PAX_EMUPLT 53114+config PAX_EMUPLT
53017+ bool "Automatically emulate ELF PLT" 53115+ bool "Automatically emulate ELF PLT"
53018+ depends on PAX_MPROTECT && (ALPHA || PARISC || SPARC32 || SPARC64) 53116+ depends on PAX_MPROTECT && (ALPHA || PARISC || SPARC)
53019+ default y 53117+ default y
53020+ help 53118+ help
53021+ Enabling this option will have the kernel automatically detect 53119+ Enabling this option will have the kernel automatically detect
@@ -53032,7 +53130,7 @@ diff -urNp linux-2.6.32.9/security/Kconfig linux-2.6.32.9/security/Kconfig
53032+ 53130+
53033+config PAX_DLRESOLVE 53131+config PAX_DLRESOLVE
53034+ bool 'Emulate old glibc resolver stub' 53132+ bool 'Emulate old glibc resolver stub'
53035+ depends on PAX_EMUPLT && (SPARC32 || SPARC64) 53133+ depends on PAX_EMUPLT && SPARC
53036+ default n 53134+ default n
53037+ help 53135+ help
53038+ This option is needed if userland has an old glibc (before 2.4) 53136+ This option is needed if userland has an old glibc (before 2.4)
@@ -53041,7 +53139,7 @@ diff -urNp linux-2.6.32.9/security/Kconfig linux-2.6.32.9/security/Kconfig
53041+ 53139+
53042+config PAX_KERNEXEC 53140+config PAX_KERNEXEC
53043+ bool "Enforce non-executable kernel pages" 53141+ bool "Enforce non-executable kernel pages"
53044+ depends on PAX_NOEXEC && (PPC32 || PPC64 || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN 53142+ depends on PAX_NOEXEC && (PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN
53045+ help 53143+ help
53046+ This is the kernel land equivalent of PAGEEXEC and MPROTECT, 53144+ This is the kernel land equivalent of PAGEEXEC and MPROTECT,
53047+ that is, enabling this option will make it harder to inject 53145+ that is, enabling this option will make it harder to inject
@@ -53214,7 +53312,7 @@ diff -urNp linux-2.6.32.9/security/Kconfig linux-2.6.32.9/security/Kconfig
53214+ 53312+
53215+config PAX_USERCOPY 53313+config PAX_USERCOPY
53216+ bool "Bounds check heap object copies between kernel and userland" 53314+ bool "Bounds check heap object copies between kernel and userland"
53217+ depends on X86 || PPC32 || PPC64 || SPARC32 || SPARC64 53315+ depends on X86 || PPC || SPARC
53218+ depends on GRKERNSEC && (SLAB || SLUB || SLOB) 53316+ depends on GRKERNSEC && (SLAB || SLUB || SLOB)
53219+ help 53317+ help
53220+ By saying Y here the kernel will enforce the size of heap objects 53318+ By saying Y here the kernel will enforce the size of heap objects
@@ -53247,9 +53345,9 @@ diff -urNp linux-2.6.32.9/security/Kconfig linux-2.6.32.9/security/Kconfig
53247 help 53345 help
53248 This is the portion of low virtual memory which should be protected 53346 This is the portion of low virtual memory which should be protected
53249 from userspace allocation. Keeping a user from writing to low pages 53347 from userspace allocation. Keeping a user from writing to low pages
53250diff -urNp linux-2.6.32.9/security/min_addr.c linux-2.6.32.9/security/min_addr.c 53348diff -urNp linux-2.6.32.10/security/min_addr.c linux-2.6.32.10/security/min_addr.c
53251--- linux-2.6.32.9/security/min_addr.c 2010-02-23 10:38:51.000000000 -0500 53349--- linux-2.6.32.10/security/min_addr.c 2010-03-15 11:52:04.000000000 -0400
53252+++ linux-2.6.32.9/security/min_addr.c 2010-03-11 20:25:00.297380044 -0500 53350+++ linux-2.6.32.10/security/min_addr.c 2010-03-20 15:58:47.208549091 -0400
53253@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG 53351@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
53254 */ 53352 */
53255 static void update_mmap_min_addr(void) 53353 static void update_mmap_min_addr(void)
@@ -53276,9 +53374,9 @@ diff -urNp linux-2.6.32.9/security/min_addr.c linux-2.6.32.9/security/min_addr.c
53276 ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos); 53374 ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
53277 53375
53278 update_mmap_min_addr(); 53376 update_mmap_min_addr();
53279diff -urNp linux-2.6.32.9/sound/aoa/codecs/onyx.c linux-2.6.32.9/sound/aoa/codecs/onyx.c 53377diff -urNp linux-2.6.32.10/sound/aoa/codecs/onyx.c linux-2.6.32.10/sound/aoa/codecs/onyx.c
53280--- linux-2.6.32.9/sound/aoa/codecs/onyx.c 2010-02-23 10:38:51.000000000 -0500 53378--- linux-2.6.32.10/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400
53281+++ linux-2.6.32.9/sound/aoa/codecs/onyx.c 2010-03-11 20:25:00.297380044 -0500 53379+++ linux-2.6.32.10/sound/aoa/codecs/onyx.c 2010-03-20 15:58:47.208549091 -0400
53282@@ -53,7 +53,7 @@ struct onyx { 53380@@ -53,7 +53,7 @@ struct onyx {
53283 spdif_locked:1, 53381 spdif_locked:1,
53284 analog_locked:1, 53382 analog_locked:1,
@@ -53307,9 +53405,9 @@ diff -urNp linux-2.6.32.9/sound/aoa/codecs/onyx.c linux-2.6.32.9/sound/aoa/codec
53307 onyx->spdif_locked = onyx->analog_locked = 0; 53405 onyx->spdif_locked = onyx->analog_locked = 0;
53308 mutex_unlock(&onyx->mutex); 53406 mutex_unlock(&onyx->mutex);
53309 53407
53310diff -urNp linux-2.6.32.9/sound/core/oss/pcm_oss.c linux-2.6.32.9/sound/core/oss/pcm_oss.c 53408diff -urNp linux-2.6.32.10/sound/core/oss/pcm_oss.c linux-2.6.32.10/sound/core/oss/pcm_oss.c
53311--- linux-2.6.32.9/sound/core/oss/pcm_oss.c 2010-02-23 10:38:51.000000000 -0500 53409--- linux-2.6.32.10/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400
53312+++ linux-2.6.32.9/sound/core/oss/pcm_oss.c 2010-03-11 20:25:00.297380044 -0500 53410+++ linux-2.6.32.10/sound/core/oss/pcm_oss.c 2010-03-20 15:58:47.212551922 -0400
53313@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct 53411@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
53314 } 53412 }
53315 } 53413 }
@@ -53321,9 +53419,9 @@ diff -urNp linux-2.6.32.9/sound/core/oss/pcm_oss.c linux-2.6.32.9/sound/core/oss
53321 #endif /* CONFIG_SND_VERBOSE_PROCFS */ 53419 #endif /* CONFIG_SND_VERBOSE_PROCFS */
53322 53420
53323 /* 53421 /*
53324diff -urNp linux-2.6.32.9/sound/core/seq/seq_lock.h linux-2.6.32.9/sound/core/seq/seq_lock.h 53422diff -urNp linux-2.6.32.10/sound/core/seq/seq_lock.h linux-2.6.32.10/sound/core/seq/seq_lock.h
53325--- linux-2.6.32.9/sound/core/seq/seq_lock.h 2010-02-23 10:38:51.000000000 -0500 53423--- linux-2.6.32.10/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400
53326+++ linux-2.6.32.9/sound/core/seq/seq_lock.h 2010-03-11 20:25:00.297380044 -0500 53424+++ linux-2.6.32.10/sound/core/seq/seq_lock.h 2010-03-20 15:58:47.212551922 -0400
53327@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo 53425@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
53328 #else /* SMP || CONFIG_SND_DEBUG */ 53426 #else /* SMP || CONFIG_SND_DEBUG */
53329 53427
@@ -53339,9 +53437,9 @@ diff -urNp linux-2.6.32.9/sound/core/seq/seq_lock.h linux-2.6.32.9/sound/core/se
53339 53437
53340 #endif /* SMP || CONFIG_SND_DEBUG */ 53438 #endif /* SMP || CONFIG_SND_DEBUG */
53341 53439
53342diff -urNp linux-2.6.32.9/sound/drivers/mts64.c linux-2.6.32.9/sound/drivers/mts64.c 53440diff -urNp linux-2.6.32.10/sound/drivers/mts64.c linux-2.6.32.10/sound/drivers/mts64.c
53343--- linux-2.6.32.9/sound/drivers/mts64.c 2010-02-23 10:38:51.000000000 -0500 53441--- linux-2.6.32.10/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400
53344+++ linux-2.6.32.9/sound/drivers/mts64.c 2010-03-11 20:25:00.297380044 -0500 53442+++ linux-2.6.32.10/sound/drivers/mts64.c 2010-03-20 15:58:47.212551922 -0400
53345@@ -65,7 +65,7 @@ struct mts64 { 53443@@ -65,7 +65,7 @@ struct mts64 {
53346 struct pardevice *pardev; 53444 struct pardevice *pardev;
53347 int pardev_claimed; 53445 int pardev_claimed;
@@ -53390,9 +53488,9 @@ diff -urNp linux-2.6.32.9/sound/drivers/mts64.c linux-2.6.32.9/sound/drivers/mts
53390 53488
53391 return 0; 53489 return 0;
53392 } 53490 }
53393diff -urNp linux-2.6.32.9/sound/drivers/portman2x4.c linux-2.6.32.9/sound/drivers/portman2x4.c 53491diff -urNp linux-2.6.32.10/sound/drivers/portman2x4.c linux-2.6.32.10/sound/drivers/portman2x4.c
53394--- linux-2.6.32.9/sound/drivers/portman2x4.c 2010-02-23 10:38:51.000000000 -0500 53492--- linux-2.6.32.10/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400
53395+++ linux-2.6.32.9/sound/drivers/portman2x4.c 2010-03-11 20:25:00.297380044 -0500 53493+++ linux-2.6.32.10/sound/drivers/portman2x4.c 2010-03-20 15:58:47.212551922 -0400
53396@@ -83,7 +83,7 @@ struct portman { 53494@@ -83,7 +83,7 @@ struct portman {
53397 struct pardevice *pardev; 53495 struct pardevice *pardev;
53398 int pardev_claimed; 53496 int pardev_claimed;
@@ -53402,9 +53500,9 @@ diff -urNp linux-2.6.32.9/sound/drivers/portman2x4.c linux-2.6.32.9/sound/driver
53402 int mode[PORTMAN_NUM_INPUT_PORTS]; 53500 int mode[PORTMAN_NUM_INPUT_PORTS];
53403 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; 53501 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
53404 }; 53502 };
53405diff -urNp linux-2.6.32.9/sound/oss/sb_audio.c linux-2.6.32.9/sound/oss/sb_audio.c 53503diff -urNp linux-2.6.32.10/sound/oss/sb_audio.c linux-2.6.32.10/sound/oss/sb_audio.c
53406--- linux-2.6.32.9/sound/oss/sb_audio.c 2010-02-23 10:38:51.000000000 -0500 53504--- linux-2.6.32.10/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400
53407+++ linux-2.6.32.9/sound/oss/sb_audio.c 2010-03-11 20:25:00.297380044 -0500 53505+++ linux-2.6.32.10/sound/oss/sb_audio.c 2010-03-20 15:58:47.212551922 -0400
53408@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, 53506@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
53409 buf16 = (signed short *)(localbuf + localoffs); 53507 buf16 = (signed short *)(localbuf + localoffs);
53410 while (c) 53508 while (c)
@@ -53414,9 +53512,9 @@ diff -urNp linux-2.6.32.9/sound/oss/sb_audio.c linux-2.6.32.9/sound/oss/sb_audio
53414 if (copy_from_user(lbuf8, 53512 if (copy_from_user(lbuf8,
53415 userbuf+useroffs + p, 53513 userbuf+useroffs + p,
53416 locallen)) 53514 locallen))
53417diff -urNp linux-2.6.32.9/sound/pci/ac97/ac97_codec.c linux-2.6.32.9/sound/pci/ac97/ac97_codec.c 53515diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_codec.c linux-2.6.32.10/sound/pci/ac97/ac97_codec.c
53418--- linux-2.6.32.9/sound/pci/ac97/ac97_codec.c 2010-02-23 10:38:51.000000000 -0500 53516--- linux-2.6.32.10/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400
53419+++ linux-2.6.32.9/sound/pci/ac97/ac97_codec.c 2010-03-11 20:25:00.297380044 -0500 53517+++ linux-2.6.32.10/sound/pci/ac97/ac97_codec.c 2010-03-20 15:58:47.212551922 -0400
53420@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc 53518@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
53421 } 53519 }
53422 53520
@@ -53426,9 +53524,9 @@ diff -urNp linux-2.6.32.9/sound/pci/ac97/ac97_codec.c linux-2.6.32.9/sound/pci/a
53426 53524
53427 #ifdef CONFIG_SND_AC97_POWER_SAVE 53525 #ifdef CONFIG_SND_AC97_POWER_SAVE
53428 static void do_update_power(struct work_struct *work) 53526 static void do_update_power(struct work_struct *work)
53429diff -urNp linux-2.6.32.9/sound/pci/ac97/ac97_patch.c linux-2.6.32.9/sound/pci/ac97/ac97_patch.c 53527diff -urNp linux-2.6.32.10/sound/pci/ac97/ac97_patch.c linux-2.6.32.10/sound/pci/ac97/ac97_patch.c
53430--- linux-2.6.32.9/sound/pci/ac97/ac97_patch.c 2010-02-23 10:38:51.000000000 -0500 53528--- linux-2.6.32.10/sound/pci/ac97/ac97_patch.c 2010-03-15 11:52:04.000000000 -0400
53431+++ linux-2.6.32.9/sound/pci/ac97/ac97_patch.c 2010-03-11 20:25:00.301313721 -0500 53529+++ linux-2.6.32.10/sound/pci/ac97/ac97_patch.c 2010-03-20 15:58:47.212551922 -0400
53432@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd 53530@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
53433 return 0; 53531 return 0;
53434 } 53532 }
@@ -53735,9 +53833,9 @@ diff -urNp linux-2.6.32.9/sound/pci/ac97/ac97_patch.c linux-2.6.32.9/sound/pci/a
53735 .build_specific = patch_ucb1400_specific, 53833 .build_specific = patch_ucb1400_specific,
53736 }; 53834 };
53737 53835
53738diff -urNp linux-2.6.32.9/sound/pci/ens1370.c linux-2.6.32.9/sound/pci/ens1370.c 53836diff -urNp linux-2.6.32.10/sound/pci/ens1370.c linux-2.6.32.10/sound/pci/ens1370.c
53739--- linux-2.6.32.9/sound/pci/ens1370.c 2010-02-23 10:38:51.000000000 -0500 53837--- linux-2.6.32.10/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400
53740+++ linux-2.6.32.9/sound/pci/ens1370.c 2010-03-11 20:25:00.301313721 -0500 53838+++ linux-2.6.32.10/sound/pci/ens1370.c 2010-03-20 15:58:47.212551922 -0400
53741@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci 53839@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
53742 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ 53840 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
53743 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ 53841 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
@@ -53747,9 +53845,9 @@ diff -urNp linux-2.6.32.9/sound/pci/ens1370.c linux-2.6.32.9/sound/pci/ens1370.c
53747 }; 53845 };
53748 53846
53749 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); 53847 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
53750diff -urNp linux-2.6.32.9/sound/pci/intel8x0.c linux-2.6.32.9/sound/pci/intel8x0.c 53848diff -urNp linux-2.6.32.10/sound/pci/intel8x0.c linux-2.6.32.10/sound/pci/intel8x0.c
53751--- linux-2.6.32.9/sound/pci/intel8x0.c 2010-02-23 10:38:51.000000000 -0500 53849--- linux-2.6.32.10/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400
53752+++ linux-2.6.32.9/sound/pci/intel8x0.c 2010-03-11 20:25:00.301313721 -0500 53850+++ linux-2.6.32.10/sound/pci/intel8x0.c 2010-03-20 15:58:47.212551922 -0400
53753@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 53851@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
53754 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 53852 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
53755 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ 53853 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
@@ -53768,9 +53866,9 @@ diff -urNp linux-2.6.32.9/sound/pci/intel8x0.c linux-2.6.32.9/sound/pci/intel8x0
53768 }; 53866 };
53769 53867
53770 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, 53868 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
53771diff -urNp linux-2.6.32.9/sound/pci/intel8x0m.c linux-2.6.32.9/sound/pci/intel8x0m.c 53869diff -urNp linux-2.6.32.10/sound/pci/intel8x0m.c linux-2.6.32.10/sound/pci/intel8x0m.c
53772--- linux-2.6.32.9/sound/pci/intel8x0m.c 2010-02-23 10:38:51.000000000 -0500 53870--- linux-2.6.32.10/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400
53773+++ linux-2.6.32.9/sound/pci/intel8x0m.c 2010-03-11 20:25:00.301313721 -0500 53871+++ linux-2.6.32.10/sound/pci/intel8x0m.c 2010-03-20 15:58:47.212551922 -0400
53774@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 53872@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
53775 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 53873 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
53776 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ 53874 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
@@ -53789,9 +53887,9 @@ diff -urNp linux-2.6.32.9/sound/pci/intel8x0m.c linux-2.6.32.9/sound/pci/intel8x
53789 }; 53887 };
53790 53888
53791 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, 53889 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
53792diff -urNp linux-2.6.32.9/usr/gen_init_cpio.c linux-2.6.32.9/usr/gen_init_cpio.c 53890diff -urNp linux-2.6.32.10/usr/gen_init_cpio.c linux-2.6.32.10/usr/gen_init_cpio.c
53793--- linux-2.6.32.9/usr/gen_init_cpio.c 2010-02-23 10:38:51.000000000 -0500 53891--- linux-2.6.32.10/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400
53794+++ linux-2.6.32.9/usr/gen_init_cpio.c 2010-03-11 20:25:00.301313721 -0500 53892+++ linux-2.6.32.10/usr/gen_init_cpio.c 2010-03-20 15:58:47.212551922 -0400
53795@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, 53893@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
53796 int retval; 53894 int retval;
53797 int rc = -1; 53895 int rc = -1;
@@ -53814,9 +53912,9 @@ diff -urNp linux-2.6.32.9/usr/gen_init_cpio.c linux-2.6.32.9/usr/gen_init_cpio.c
53814 } else 53912 } else
53815 break; 53913 break;
53816 } 53914 }
53817diff -urNp linux-2.6.32.9/virt/kvm/kvm_main.c linux-2.6.32.9/virt/kvm/kvm_main.c 53915diff -urNp linux-2.6.32.10/virt/kvm/kvm_main.c linux-2.6.32.10/virt/kvm/kvm_main.c
53818--- linux-2.6.32.9/virt/kvm/kvm_main.c 2010-02-23 10:38:51.000000000 -0500 53916--- linux-2.6.32.10/virt/kvm/kvm_main.c 2010-03-15 11:52:04.000000000 -0400
53819+++ linux-2.6.32.9/virt/kvm/kvm_main.c 2010-03-11 20:25:00.301313721 -0500 53917+++ linux-2.6.32.10/virt/kvm/kvm_main.c 2010-03-20 15:58:47.212551922 -0400
53820@@ -1745,6 +1745,7 @@ static int kvm_vcpu_release(struct inode 53918@@ -1745,6 +1745,7 @@ static int kvm_vcpu_release(struct inode
53821 return 0; 53919 return 0;
53822 } 53920 }
© 2015 Mike Crute