aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-03-03 12:07:54 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-03-03 19:45:08 +0000
commit72136ed3ea5b9d5f1e65452c3f6dc983ed7d826e (patch)
tree7b9338b156da284a04ebac14c22ec7db2e831dce
parentfff4acd466bfd686ae3b103c5f88f45304febf80 (diff)
downloadalpine_aports-72136ed3ea5b9d5f1e65452c3f6dc983ed7d826e.tar.bz2
alpine_aports-72136ed3ea5b9d5f1e65452c3f6dc983ed7d826e.tar.xz
alpine_aports-72136ed3ea5b9d5f1e65452c3f6dc983ed7d826e.zip
main/linux-grsec: upgraed to grsecurity-2.1.14-2.6.32.9-201002231820
(cherry picked from commit c14895917b22f1e10ba2b8a838149804e2d99a19)
Diffstat
-rw-r--r--main/linux-grsec/APKBUILD12
-rw-r--r--main/linux-grsec/grsecurity-2.1.14-2.6.32.9-201002231820.patch (renamed from main/linux-grsec/grsecurity-2.1.14-2.6.32.8-201002132204.patch)7622
-rw-r--r--main/linux-grsec/kernelconfig.x866
3 files changed, 4115 insertions, 3525 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 61dc52c3b1..e87fb96dd0 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.8 5pkgver=2.6.32.9
6_kernver=2.6.32 6_kernver=2.6.32
7pkgrel=1 7pkgrel=0
8pkgdesc="Linux kernel with grsecurity" 8pkgdesc="Linux kernel with grsecurity"
9url=http://grsecurity.net 9url=http://grsecurity.net
10depends="mkinitfs linux-firmware" 10depends="mkinitfs linux-firmware"
@@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
14install= 14install=
15source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 15source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
16 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 16 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
17 grsecurity-2.1.14-2.6.32.8-201002132204.patch 17 grsecurity-2.1.14-2.6.32.9-201002231820.patch
18 kernelconfig.x86 18 kernelconfig.x86
19 " 19 "
20subpackages="$pkgname-dev linux-firmware:firmware" 20subpackages="$pkgname-dev linux-firmware:firmware"
@@ -119,6 +119,6 @@ firmware() {
119} 119}
120 120
121md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 121md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
122eabf01da4c72f7ea5b4e4bf8e8535e5f patch-2.6.32.8.bz2 1227f615dd3b4a3b19fb86e479996a2deb5 patch-2.6.32.9.bz2
123005313c701b97f37bb3f49977ec0d596 grsecurity-2.1.14-2.6.32.8-201002132204.patch 1237da77829d4d994498218c412caed1db8 grsecurity-2.1.14-2.6.32.9-201002231820.patch
124281d56ac34b2903456df769fd42d81f2 kernelconfig.x86" 124782074af6a1f1b1b1c9a33f5ac1b42bf kernelconfig.x86"
diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.32.8-201002132204.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.32.9-201002231820.patch
index 89ad85ae09..09d2f5da28 100644
--- a/main/linux-grsec/grsecurity-2.1.14-2.6.32.8-201002132204.patch
+++ b/main/linux-grsec/grsecurity-2.1.14-2.6.32.9-201002231820.patch
@@ -1,6 +1,6 @@
1diff -urNp linux-2.6.32.8/arch/alpha/include/asm/elf.h linux-2.6.32.8/arch/alpha/include/asm/elf.h 1diff -urNp linux-2.6.32.9/arch/alpha/include/asm/elf.h linux-2.6.32.9/arch/alpha/include/asm/elf.h
2--- linux-2.6.32.8/arch/alpha/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 2--- linux-2.6.32.9/arch/alpha/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
3+++ linux-2.6.32.8/arch/alpha/include/asm/elf.h 2010-02-13 21:45:09.811766877 -0500 3+++ linux-2.6.32.9/arch/alpha/include/asm/elf.h 2010-02-23 17:09:53.067670152 -0500
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.8/arch/alpha/include/asm/elf.h linux-2.6.32.8/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.8/arch/alpha/include/asm/pgtable.h linux-2.6.32.8/arch/alpha/include/asm/pgtable.h 18diff -urNp linux-2.6.32.9/arch/alpha/include/asm/pgtable.h linux-2.6.32.9/arch/alpha/include/asm/pgtable.h
19--- linux-2.6.32.8/arch/alpha/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500 19--- linux-2.6.32.9/arch/alpha/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500
20+++ linux-2.6.32.8/arch/alpha/include/asm/pgtable.h 2010-02-13 21:45:09.811766877 -0500 20+++ linux-2.6.32.9/arch/alpha/include/asm/pgtable.h 2010-02-23 17:09:53.067670152 -0500
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.8/arch/alpha/include/asm/pgtable.h linux-2.6.32.8/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.8/arch/alpha/kernel/module.c linux-2.6.32.8/arch/alpha/kernel/module.c 39diff -urNp linux-2.6.32.9/arch/alpha/kernel/module.c linux-2.6.32.9/arch/alpha/kernel/module.c
40--- linux-2.6.32.8/arch/alpha/kernel/module.c 2010-02-09 07:57:19.000000000 -0500 40--- linux-2.6.32.9/arch/alpha/kernel/module.c 2010-02-09 07:57:19.000000000 -0500
41+++ linux-2.6.32.8/arch/alpha/kernel/module.c 2010-02-13 21:45:09.812704357 -0500 41+++ linux-2.6.32.9/arch/alpha/kernel/module.c 2010-02-23 17:09:53.067670152 -0500
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.8/arch/alpha/kernel/module.c linux-2.6.32.8/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.8/arch/alpha/kernel/osf_sys.c linux-2.6.32.8/arch/alpha/kernel/osf_sys.c 51diff -urNp linux-2.6.32.9/arch/alpha/kernel/osf_sys.c linux-2.6.32.9/arch/alpha/kernel/osf_sys.c
52--- linux-2.6.32.8/arch/alpha/kernel/osf_sys.c 2010-02-09 07:57:19.000000000 -0500 52--- linux-2.6.32.9/arch/alpha/kernel/osf_sys.c 2010-02-09 07:57:19.000000000 -0500
53+++ linux-2.6.32.8/arch/alpha/kernel/osf_sys.c 2010-02-13 21:45:09.812704357 -0500 53+++ linux-2.6.32.9/arch/alpha/kernel/osf_sys.c 2010-02-23 17:09:53.067670152 -0500
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.8/arch/alpha/kernel/osf_sys.c linux-2.6.32.8/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.8/arch/alpha/mm/fault.c linux-2.6.32.8/arch/alpha/mm/fault.c 76diff -urNp linux-2.6.32.9/arch/alpha/mm/fault.c linux-2.6.32.9/arch/alpha/mm/fault.c
77--- linux-2.6.32.8/arch/alpha/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 77--- linux-2.6.32.9/arch/alpha/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
78+++ linux-2.6.32.8/arch/alpha/mm/fault.c 2010-02-13 21:45:09.812704357 -0500 78+++ linux-2.6.32.9/arch/alpha/mm/fault.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/alpha/mm/fault.c linux-2.6.32.8/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.8/arch/arm/include/asm/elf.h linux-2.6.32.8/arch/arm/include/asm/elf.h 235diff -urNp linux-2.6.32.9/arch/arm/include/asm/elf.h linux-2.6.32.9/arch/arm/include/asm/elf.h
236--- linux-2.6.32.8/arch/arm/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 236--- linux-2.6.32.9/arch/arm/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
237+++ linux-2.6.32.8/arch/arm/include/asm/elf.h 2010-02-13 21:45:09.813814150 -0500 237+++ linux-2.6.32.9/arch/arm/include/asm/elf.h 2010-02-23 17:09:53.071672140 -0500
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.8/arch/arm/include/asm/elf.h linux-2.6.32.8/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.8/arch/arm/include/asm/kmap_types.h linux-2.6.32.8/arch/arm/include/asm/kmap_types.h 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
255--- linux-2.6.32.8/arch/arm/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500 255--- linux-2.6.32.9/arch/arm/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500
256+++ linux-2.6.32.8/arch/arm/include/asm/kmap_types.h 2010-02-13 21:45:09.813814150 -0500 256+++ linux-2.6.32.9/arch/arm/include/asm/kmap_types.h 2010-02-23 17:09:53.071672140 -0500
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.8/arch/arm/include/asm/kmap_types.h linux-2.6.32.8/arch/
262 KM_TYPE_NR 262 KM_TYPE_NR
263 }; 263 };
264 264
265diff -urNp linux-2.6.32.8/arch/arm/include/asm/uaccess.h linux-2.6.32.8/arch/arm/include/asm/uaccess.h 265diff -urNp linux-2.6.32.9/arch/arm/include/asm/uaccess.h linux-2.6.32.9/arch/arm/include/asm/uaccess.h
266--- linux-2.6.32.8/arch/arm/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500 266--- linux-2.6.32.9/arch/arm/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500
267+++ linux-2.6.32.8/arch/arm/include/asm/uaccess.h 2010-02-13 21:45:09.813814150 -0500 267+++ linux-2.6.32.9/arch/arm/include/asm/uaccess.h 2010-02-23 17:09:53.071672140 -0500
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.8/arch/arm/include/asm/uaccess.h linux-2.6.32.8/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.8/arch/arm/kernel/kgdb.c linux-2.6.32.8/arch/arm/kernel/kgdb.c 288diff -urNp linux-2.6.32.9/arch/arm/kernel/kgdb.c linux-2.6.32.9/arch/arm/kernel/kgdb.c
289--- linux-2.6.32.8/arch/arm/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500 289--- linux-2.6.32.9/arch/arm/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500
290+++ linux-2.6.32.8/arch/arm/kernel/kgdb.c 2010-02-13 21:45:09.813814150 -0500 290+++ linux-2.6.32.9/arch/arm/kernel/kgdb.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/arm/kernel/kgdb.c linux-2.6.32.8/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.8/arch/arm/mach-at91/pm.c linux-2.6.32.8/arch/arm/mach-at91/pm.c 300diff -urNp linux-2.6.32.9/arch/arm/mach-at91/pm.c linux-2.6.32.9/arch/arm/mach-at91/pm.c
301--- linux-2.6.32.8/arch/arm/mach-at91/pm.c 2010-02-09 07:57:19.000000000 -0500 301--- linux-2.6.32.9/arch/arm/mach-at91/pm.c 2010-02-09 07:57:19.000000000 -0500
302+++ linux-2.6.32.8/arch/arm/mach-at91/pm.c 2010-02-13 21:45:09.813814150 -0500 302+++ linux-2.6.32.9/arch/arm/mach-at91/pm.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/arm/mach-at91/pm.c linux-2.6.32.8/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.8/arch/arm/mach-omap1/pm.c linux-2.6.32.8/arch/arm/mach-omap1/pm.c 312diff -urNp linux-2.6.32.9/arch/arm/mach-omap1/pm.c linux-2.6.32.9/arch/arm/mach-omap1/pm.c
313--- linux-2.6.32.8/arch/arm/mach-omap1/pm.c 2010-02-09 07:57:19.000000000 -0500 313--- linux-2.6.32.9/arch/arm/mach-omap1/pm.c 2010-02-09 07:57:19.000000000 -0500
314+++ linux-2.6.32.8/arch/arm/mach-omap1/pm.c 2010-02-13 21:45:09.814898798 -0500 314+++ linux-2.6.32.9/arch/arm/mach-omap1/pm.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/arm/mach-omap1/pm.c linux-2.6.32.8/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.8/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.8/arch/arm/mach-omap2/pm24xx.c 324diff -urNp linux-2.6.32.9/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.9/arch/arm/mach-omap2/pm24xx.c
325--- linux-2.6.32.8/arch/arm/mach-omap2/pm24xx.c 2010-02-09 07:57:19.000000000 -0500 325--- linux-2.6.32.9/arch/arm/mach-omap2/pm24xx.c 2010-02-09 07:57:19.000000000 -0500
326+++ linux-2.6.32.8/arch/arm/mach-omap2/pm24xx.c 2010-02-13 21:45:09.814898798 -0500 326+++ linux-2.6.32.9/arch/arm/mach-omap2/pm24xx.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.8/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.8/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.8/arch/arm/mach-omap2/pm34xx.c 336diff -urNp linux-2.6.32.9/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.9/arch/arm/mach-omap2/pm34xx.c
337--- linux-2.6.32.8/arch/arm/mach-omap2/pm34xx.c 2010-02-09 07:57:19.000000000 -0500 337--- linux-2.6.32.9/arch/arm/mach-omap2/pm34xx.c 2010-02-09 07:57:19.000000000 -0500
338+++ linux-2.6.32.8/arch/arm/mach-omap2/pm34xx.c 2010-02-13 21:45:09.814898798 -0500 338+++ linux-2.6.32.9/arch/arm/mach-omap2/pm34xx.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.8/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.8/arch/arm/mach-pnx4008/pm.c linux-2.6.32.8/arch/arm/mach-pnx4008/pm.c 348diff -urNp linux-2.6.32.9/arch/arm/mach-pnx4008/pm.c linux-2.6.32.9/arch/arm/mach-pnx4008/pm.c
349--- linux-2.6.32.8/arch/arm/mach-pnx4008/pm.c 2010-02-09 07:57:19.000000000 -0500 349--- linux-2.6.32.9/arch/arm/mach-pnx4008/pm.c 2010-02-09 07:57:19.000000000 -0500
350+++ linux-2.6.32.8/arch/arm/mach-pnx4008/pm.c 2010-02-13 21:45:09.814898798 -0500 350+++ linux-2.6.32.9/arch/arm/mach-pnx4008/pm.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/arm/mach-pnx4008/pm.c linux-2.6.32.8/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.8/arch/arm/mach-pxa/pm.c linux-2.6.32.8/arch/arm/mach-pxa/pm.c 360diff -urNp linux-2.6.32.9/arch/arm/mach-pxa/pm.c linux-2.6.32.9/arch/arm/mach-pxa/pm.c
361--- linux-2.6.32.8/arch/arm/mach-pxa/pm.c 2010-02-09 07:57:19.000000000 -0500 361--- linux-2.6.32.9/arch/arm/mach-pxa/pm.c 2010-02-09 07:57:19.000000000 -0500
362+++ linux-2.6.32.8/arch/arm/mach-pxa/pm.c 2010-02-13 21:45:09.814898798 -0500 362+++ linux-2.6.32.9/arch/arm/mach-pxa/pm.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/arm/mach-pxa/pm.c linux-2.6.32.8/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.8/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.8/arch/arm/mach-pxa/sharpsl_pm.c 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
373--- linux-2.6.32.8/arch/arm/mach-pxa/sharpsl_pm.c 2010-02-09 07:57:19.000000000 -0500 373--- linux-2.6.32.9/arch/arm/mach-pxa/sharpsl_pm.c 2010-02-09 07:57:19.000000000 -0500
374+++ linux-2.6.32.8/arch/arm/mach-pxa/sharpsl_pm.c 2010-02-13 21:45:09.815898883 -0500 374+++ linux-2.6.32.9/arch/arm/mach-pxa/sharpsl_pm.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.8/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.8/arch/arm/mach-sa1100/pm.c linux-2.6.32.8/arch/arm/mach-sa1100/pm.c 384diff -urNp linux-2.6.32.9/arch/arm/mach-sa1100/pm.c linux-2.6.32.9/arch/arm/mach-sa1100/pm.c
385--- linux-2.6.32.8/arch/arm/mach-sa1100/pm.c 2010-02-09 07:57:19.000000000 -0500 385--- linux-2.6.32.9/arch/arm/mach-sa1100/pm.c 2010-02-09 07:57:19.000000000 -0500
386+++ linux-2.6.32.8/arch/arm/mach-sa1100/pm.c 2010-02-13 21:45:09.815898883 -0500 386+++ linux-2.6.32.9/arch/arm/mach-sa1100/pm.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/arm/mach-sa1100/pm.c linux-2.6.32.8/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.8/arch/arm/mm/fault.c linux-2.6.32.8/arch/arm/mm/fault.c 396diff -urNp linux-2.6.32.9/arch/arm/mm/fault.c linux-2.6.32.9/arch/arm/mm/fault.c
397--- linux-2.6.32.8/arch/arm/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 397--- linux-2.6.32.9/arch/arm/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
398+++ linux-2.6.32.8/arch/arm/mm/fault.c 2010-02-13 21:45:09.815898883 -0500 398+++ linux-2.6.32.9/arch/arm/mm/fault.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/arm/mm/fault.c linux-2.6.32.8/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.8/arch/arm/mm/mmap.c linux-2.6.32.8/arch/arm/mm/mmap.c 447diff -urNp linux-2.6.32.9/arch/arm/mm/mmap.c linux-2.6.32.9/arch/arm/mm/mmap.c
448--- linux-2.6.32.8/arch/arm/mm/mmap.c 2010-02-09 07:57:19.000000000 -0500 448--- linux-2.6.32.9/arch/arm/mm/mmap.c 2010-02-09 07:57:19.000000000 -0500
449+++ linux-2.6.32.8/arch/arm/mm/mmap.c 2010-02-13 21:45:09.821722719 -0500 449+++ linux-2.6.32.9/arch/arm/mm/mmap.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/arm/mm/mmap.c linux-2.6.32.8/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.8/arch/arm/plat-s3c/pm.c linux-2.6.32.8/arch/arm/plat-s3c/pm.c 486diff -urNp linux-2.6.32.9/arch/arm/plat-s3c/pm.c linux-2.6.32.9/arch/arm/plat-s3c/pm.c
487--- linux-2.6.32.8/arch/arm/plat-s3c/pm.c 2010-02-09 07:57:19.000000000 -0500 487--- linux-2.6.32.9/arch/arm/plat-s3c/pm.c 2010-02-09 07:57:19.000000000 -0500
488+++ linux-2.6.32.8/arch/arm/plat-s3c/pm.c 2010-02-13 21:45:09.821722719 -0500 488+++ linux-2.6.32.9/arch/arm/plat-s3c/pm.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/arm/plat-s3c/pm.c linux-2.6.32.8/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.8/arch/avr32/include/asm/elf.h linux-2.6.32.8/arch/avr32/include/asm/elf.h 498diff -urNp linux-2.6.32.9/arch/avr32/include/asm/elf.h linux-2.6.32.9/arch/avr32/include/asm/elf.h
499--- linux-2.6.32.8/arch/avr32/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 499--- linux-2.6.32.9/arch/avr32/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
500+++ linux-2.6.32.8/arch/avr32/include/asm/elf.h 2010-02-13 21:45:09.821722719 -0500 500+++ linux-2.6.32.9/arch/avr32/include/asm/elf.h 2010-02-23 17:09:53.071672140 -0500
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.8/arch/avr32/include/asm/elf.h linux-2.6.32.8/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.8/arch/avr32/include/asm/kmap_types.h linux-2.6.32.8/arch/avr32/include/asm/kmap_types.h 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
518--- linux-2.6.32.8/arch/avr32/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500 518--- linux-2.6.32.9/arch/avr32/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500
519+++ linux-2.6.32.8/arch/avr32/include/asm/kmap_types.h 2010-02-13 21:45:09.821722719 -0500 519+++ linux-2.6.32.9/arch/avr32/include/asm/kmap_types.h 2010-02-23 17:09:53.071672140 -0500
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.8/arch/avr32/include/asm/kmap_types.h linux-2.6.32.8/arc
527 }; 527 };
528 528
529 #undef D 529 #undef D
530diff -urNp linux-2.6.32.8/arch/avr32/mach-at32ap/pm.c linux-2.6.32.8/arch/avr32/mach-at32ap/pm.c 530diff -urNp linux-2.6.32.9/arch/avr32/mach-at32ap/pm.c linux-2.6.32.9/arch/avr32/mach-at32ap/pm.c
531--- linux-2.6.32.8/arch/avr32/mach-at32ap/pm.c 2010-02-09 07:57:19.000000000 -0500 531--- linux-2.6.32.9/arch/avr32/mach-at32ap/pm.c 2010-02-09 07:57:19.000000000 -0500
532+++ linux-2.6.32.8/arch/avr32/mach-at32ap/pm.c 2010-02-13 21:45:09.821722719 -0500 532+++ linux-2.6.32.9/arch/avr32/mach-at32ap/pm.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/avr32/mach-at32ap/pm.c linux-2.6.32.8/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.8/arch/avr32/mm/fault.c linux-2.6.32.8/arch/avr32/mm/fault.c 542diff -urNp linux-2.6.32.9/arch/avr32/mm/fault.c linux-2.6.32.9/arch/avr32/mm/fault.c
543--- linux-2.6.32.8/arch/avr32/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 543--- linux-2.6.32.9/arch/avr32/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
544+++ linux-2.6.32.8/arch/avr32/mm/fault.c 2010-02-13 21:45:09.821722719 -0500 544+++ linux-2.6.32.9/arch/avr32/mm/fault.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/avr32/mm/fault.c linux-2.6.32.8/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.8/arch/blackfin/kernel/kgdb.c linux-2.6.32.8/arch/blackfin/kernel/kgdb.c 586diff -urNp linux-2.6.32.9/arch/blackfin/kernel/kgdb.c linux-2.6.32.9/arch/blackfin/kernel/kgdb.c
587--- linux-2.6.32.8/arch/blackfin/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500 587--- linux-2.6.32.9/arch/blackfin/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500
588+++ linux-2.6.32.8/arch/blackfin/kernel/kgdb.c 2010-02-13 21:45:09.823650214 -0500 588+++ linux-2.6.32.9/arch/blackfin/kernel/kgdb.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/blackfin/kernel/kgdb.c linux-2.6.32.8/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.8/arch/blackfin/mach-common/pm.c linux-2.6.32.8/arch/blackfin/mach-common/pm.c 598diff -urNp linux-2.6.32.9/arch/blackfin/mach-common/pm.c linux-2.6.32.9/arch/blackfin/mach-common/pm.c
599--- linux-2.6.32.8/arch/blackfin/mach-common/pm.c 2010-02-09 07:57:19.000000000 -0500 599--- linux-2.6.32.9/arch/blackfin/mach-common/pm.c 2010-02-09 07:57:19.000000000 -0500
600+++ linux-2.6.32.8/arch/blackfin/mach-common/pm.c 2010-02-13 21:45:09.823650214 -0500 600+++ linux-2.6.32.9/arch/blackfin/mach-common/pm.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/blackfin/mach-common/pm.c linux-2.6.32.8/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.8/arch/frv/include/asm/kmap_types.h linux-2.6.32.8/arch/frv/include/asm/kmap_types.h 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
611--- linux-2.6.32.8/arch/frv/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500 611--- linux-2.6.32.9/arch/frv/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500
612+++ linux-2.6.32.8/arch/frv/include/asm/kmap_types.h 2010-02-13 21:45:09.823650214 -0500 612+++ linux-2.6.32.9/arch/frv/include/asm/kmap_types.h 2010-02-23 17:09:53.071672140 -0500
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.8/arch/frv/include/asm/kmap_types.h linux-2.6.32.8/arch/
618 KM_TYPE_NR 618 KM_TYPE_NR
619 }; 619 };
620 620
621diff -urNp linux-2.6.32.8/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.8/arch/ia64/hp/common/hwsw_iommu.c 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
622--- linux-2.6.32.8/arch/ia64/hp/common/hwsw_iommu.c 2010-02-09 07:57:19.000000000 -0500 622--- linux-2.6.32.9/arch/ia64/hp/common/hwsw_iommu.c 2010-02-09 07:57:19.000000000 -0500
623+++ linux-2.6.32.8/arch/ia64/hp/common/hwsw_iommu.c 2010-02-13 21:45:09.823650214 -0500 623+++ linux-2.6.32.9/arch/ia64/hp/common/hwsw_iommu.c 2010-02-23 17:09:53.071672140 -0500
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.8/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.8/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.8/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.8/arch/ia64/hp/common/sba_iommu.c 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
643--- linux-2.6.32.8/arch/ia64/hp/common/sba_iommu.c 2010-02-09 07:57:19.000000000 -0500 643--- linux-2.6.32.9/arch/ia64/hp/common/sba_iommu.c 2010-02-09 07:57:19.000000000 -0500
644+++ linux-2.6.32.8/arch/ia64/hp/common/sba_iommu.c 2010-02-13 21:45:09.823650214 -0500 644+++ linux-2.6.32.9/arch/ia64/hp/common/sba_iommu.c 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.8/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.8/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.8/arch/ia64/ia32/binfmt_elf32.c 663diff -urNp linux-2.6.32.9/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.9/arch/ia64/ia32/binfmt_elf32.c
664--- linux-2.6.32.8/arch/ia64/ia32/binfmt_elf32.c 2010-02-09 07:57:19.000000000 -0500 664--- linux-2.6.32.9/arch/ia64/ia32/binfmt_elf32.c 2010-02-09 07:57:19.000000000 -0500
665+++ linux-2.6.32.8/arch/ia64/ia32/binfmt_elf32.c 2010-02-13 21:45:09.824898259 -0500 665+++ linux-2.6.32.9/arch/ia64/ia32/binfmt_elf32.c 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.8/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.8/arch/ia64/ia32/ia32priv.h linux-2.6.32.8/arch/ia64/ia32/ia32priv.h 680diff -urNp linux-2.6.32.9/arch/ia64/ia32/ia32priv.h linux-2.6.32.9/arch/ia64/ia32/ia32priv.h
681--- linux-2.6.32.8/arch/ia64/ia32/ia32priv.h 2010-02-09 07:57:19.000000000 -0500 681--- linux-2.6.32.9/arch/ia64/ia32/ia32priv.h 2010-02-09 07:57:19.000000000 -0500
682+++ linux-2.6.32.8/arch/ia64/ia32/ia32priv.h 2010-02-13 21:45:09.824898259 -0500 682+++ linux-2.6.32.9/arch/ia64/ia32/ia32priv.h 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/ia32/ia32priv.h linux-2.6.32.8/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.8/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.8/arch/ia64/include/asm/dma-mapping.h 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
700--- linux-2.6.32.8/arch/ia64/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500 700--- linux-2.6.32.9/arch/ia64/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500
701+++ linux-2.6.32.8/arch/ia64/include/asm/dma-mapping.h 2010-02-13 21:45:09.824898259 -0500 701+++ linux-2.6.32.9/arch/ia64/include/asm/dma-mapping.h 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.8/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.8/arch/ia64/include/asm/elf.h linux-2.6.32.8/arch/ia64/include/asm/elf.h 745diff -urNp linux-2.6.32.9/arch/ia64/include/asm/elf.h linux-2.6.32.9/arch/ia64/include/asm/elf.h
746--- linux-2.6.32.8/arch/ia64/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 746--- linux-2.6.32.9/arch/ia64/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
747+++ linux-2.6.32.8/arch/ia64/include/asm/elf.h 2010-02-13 21:45:09.824898259 -0500 747+++ linux-2.6.32.9/arch/ia64/include/asm/elf.h 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/include/asm/elf.h linux-2.6.32.8/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.8/arch/ia64/include/asm/machvec.h linux-2.6.32.8/arch/ia64/include/asm/machvec.h 762diff -urNp linux-2.6.32.9/arch/ia64/include/asm/machvec.h linux-2.6.32.9/arch/ia64/include/asm/machvec.h
763--- linux-2.6.32.8/arch/ia64/include/asm/machvec.h 2010-02-09 07:57:19.000000000 -0500 763--- linux-2.6.32.9/arch/ia64/include/asm/machvec.h 2010-02-09 07:57:19.000000000 -0500
764+++ linux-2.6.32.8/arch/ia64/include/asm/machvec.h 2010-02-13 21:45:09.824898259 -0500 764+++ linux-2.6.32.9/arch/ia64/include/asm/machvec.h 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/include/asm/machvec.h linux-2.6.32.8/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.8/arch/ia64/include/asm/pgtable.h linux-2.6.32.8/arch/ia64/include/asm/pgtable.h 783diff -urNp linux-2.6.32.9/arch/ia64/include/asm/pgtable.h linux-2.6.32.9/arch/ia64/include/asm/pgtable.h
784--- linux-2.6.32.8/arch/ia64/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500 784--- linux-2.6.32.9/arch/ia64/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500
785+++ linux-2.6.32.8/arch/ia64/include/asm/pgtable.h 2010-02-13 21:45:09.824898259 -0500 785+++ linux-2.6.32.9/arch/ia64/include/asm/pgtable.h 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/include/asm/pgtable.h linux-2.6.32.8/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.8/arch/ia64/include/asm/uaccess.h linux-2.6.32.8/arch/ia64/include/asm/uaccess.h 804diff -urNp linux-2.6.32.9/arch/ia64/include/asm/uaccess.h linux-2.6.32.9/arch/ia64/include/asm/uaccess.h
805--- linux-2.6.32.8/arch/ia64/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500 805--- linux-2.6.32.9/arch/ia64/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500
806+++ linux-2.6.32.8/arch/ia64/include/asm/uaccess.h 2010-02-13 21:45:09.825895338 -0500 806+++ linux-2.6.32.9/arch/ia64/include/asm/uaccess.h 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/include/asm/uaccess.h linux-2.6.32.8/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.8/arch/ia64/kernel/dma-mapping.c linux-2.6.32.8/arch/ia64/kernel/dma-mapping.c 825diff -urNp linux-2.6.32.9/arch/ia64/kernel/dma-mapping.c linux-2.6.32.9/arch/ia64/kernel/dma-mapping.c
826--- linux-2.6.32.8/arch/ia64/kernel/dma-mapping.c 2010-02-09 07:57:19.000000000 -0500 826--- linux-2.6.32.9/arch/ia64/kernel/dma-mapping.c 2010-02-09 07:57:19.000000000 -0500
827+++ linux-2.6.32.8/arch/ia64/kernel/dma-mapping.c 2010-02-13 21:45:09.825895338 -0500 827+++ linux-2.6.32.9/arch/ia64/kernel/dma-mapping.c 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/kernel/dma-mapping.c linux-2.6.32.8/arch/ia6
843 { 843 {
844 return dma_ops; 844 return dma_ops;
845 } 845 }
846diff -urNp linux-2.6.32.8/arch/ia64/kernel/module.c linux-2.6.32.8/arch/ia64/kernel/module.c 846diff -urNp linux-2.6.32.9/arch/ia64/kernel/module.c linux-2.6.32.9/arch/ia64/kernel/module.c
847--- linux-2.6.32.8/arch/ia64/kernel/module.c 2010-02-09 07:57:19.000000000 -0500 847--- linux-2.6.32.9/arch/ia64/kernel/module.c 2010-02-09 07:57:19.000000000 -0500
848+++ linux-2.6.32.8/arch/ia64/kernel/module.c 2010-02-13 21:45:09.826722735 -0500 848+++ linux-2.6.32.9/arch/ia64/kernel/module.c 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/kernel/module.c linux-2.6.32.8/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.8/arch/ia64/kernel/pci-dma.c linux-2.6.32.8/arch/ia64/kernel/pci-dma.c 937diff -urNp linux-2.6.32.9/arch/ia64/kernel/pci-dma.c linux-2.6.32.9/arch/ia64/kernel/pci-dma.c
938--- linux-2.6.32.8/arch/ia64/kernel/pci-dma.c 2010-02-09 07:57:19.000000000 -0500 938--- linux-2.6.32.9/arch/ia64/kernel/pci-dma.c 2010-02-09 07:57:19.000000000 -0500
939+++ linux-2.6.32.8/arch/ia64/kernel/pci-dma.c 2010-02-13 21:45:09.826722735 -0500 939+++ linux-2.6.32.9/arch/ia64/kernel/pci-dma.c 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/kernel/pci-dma.c linux-2.6.32.8/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.8/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.8/arch/ia64/kernel/pci-swiotlb.c 949diff -urNp linux-2.6.32.9/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.9/arch/ia64/kernel/pci-swiotlb.c
950--- linux-2.6.32.8/arch/ia64/kernel/pci-swiotlb.c 2010-02-09 07:57:19.000000000 -0500 950--- linux-2.6.32.9/arch/ia64/kernel/pci-swiotlb.c 2010-02-09 07:57:19.000000000 -0500
951+++ linux-2.6.32.8/arch/ia64/kernel/pci-swiotlb.c 2010-02-13 21:45:09.826722735 -0500 951+++ linux-2.6.32.9/arch/ia64/kernel/pci-swiotlb.c 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.8/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.8/arch/ia64/kernel/sys_ia64.c linux-2.6.32.8/arch/ia64/kernel/sys_ia64.c 961diff -urNp linux-2.6.32.9/arch/ia64/kernel/sys_ia64.c linux-2.6.32.9/arch/ia64/kernel/sys_ia64.c
962--- linux-2.6.32.8/arch/ia64/kernel/sys_ia64.c 2010-02-09 07:57:19.000000000 -0500 962--- linux-2.6.32.9/arch/ia64/kernel/sys_ia64.c 2010-02-09 07:57:19.000000000 -0500
963+++ linux-2.6.32.8/arch/ia64/kernel/sys_ia64.c 2010-02-13 21:45:09.826722735 -0500 963+++ linux-2.6.32.9/arch/ia64/kernel/sys_ia64.c 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/kernel/sys_ia64.c linux-2.6.32.8/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.8/arch/ia64/kernel/topology.c linux-2.6.32.8/arch/ia64/kernel/topology.c 990diff -urNp linux-2.6.32.9/arch/ia64/kernel/topology.c linux-2.6.32.9/arch/ia64/kernel/topology.c
991--- linux-2.6.32.8/arch/ia64/kernel/topology.c 2010-02-09 07:57:19.000000000 -0500 991--- linux-2.6.32.9/arch/ia64/kernel/topology.c 2010-02-09 07:57:19.000000000 -0500
992+++ linux-2.6.32.8/arch/ia64/kernel/topology.c 2010-02-13 21:45:09.826722735 -0500 992+++ linux-2.6.32.9/arch/ia64/kernel/topology.c 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/kernel/topology.c linux-2.6.32.8/arch/ia64/k
999 .show = cache_show 999 .show = cache_show
1000 }; 1000 };
1001 1001
1002diff -urNp linux-2.6.32.8/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.8/arch/ia64/kernel/vmlinux.lds.S 1002diff -urNp linux-2.6.32.9/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.9/arch/ia64/kernel/vmlinux.lds.S
1003--- linux-2.6.32.8/arch/ia64/kernel/vmlinux.lds.S 2010-02-09 07:57:19.000000000 -0500 1003--- linux-2.6.32.9/arch/ia64/kernel/vmlinux.lds.S 2010-02-09 07:57:19.000000000 -0500
1004+++ linux-2.6.32.8/arch/ia64/kernel/vmlinux.lds.S 2010-02-13 21:45:09.826722735 -0500 1004+++ linux-2.6.32.9/arch/ia64/kernel/vmlinux.lds.S 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.8/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.8/arch/ia64/mm/fault.c linux-2.6.32.8/arch/ia64/mm/fault.c 1014diff -urNp linux-2.6.32.9/arch/ia64/mm/fault.c linux-2.6.32.9/arch/ia64/mm/fault.c
1015--- linux-2.6.32.8/arch/ia64/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 1015--- linux-2.6.32.9/arch/ia64/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
1016+++ linux-2.6.32.8/arch/ia64/mm/fault.c 2010-02-13 21:45:09.827899663 -0500 1016+++ linux-2.6.32.9/arch/ia64/mm/fault.c 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/mm/fault.c linux-2.6.32.8/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.8/arch/ia64/mm/init.c linux-2.6.32.8/arch/ia64/mm/init.c 1066diff -urNp linux-2.6.32.9/arch/ia64/mm/init.c linux-2.6.32.9/arch/ia64/mm/init.c
1067--- linux-2.6.32.8/arch/ia64/mm/init.c 2010-02-09 07:57:19.000000000 -0500 1067--- linux-2.6.32.9/arch/ia64/mm/init.c 2010-02-09 07:57:19.000000000 -0500
1068+++ linux-2.6.32.8/arch/ia64/mm/init.c 2010-02-13 21:45:09.827899663 -0500 1068+++ linux-2.6.32.9/arch/ia64/mm/init.c 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/mm/init.c linux-2.6.32.8/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.8/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.8/arch/ia64/sn/pci/pci_dma.c 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
1090--- linux-2.6.32.8/arch/ia64/sn/pci/pci_dma.c 2010-02-09 07:57:19.000000000 -0500 1090--- linux-2.6.32.9/arch/ia64/sn/pci/pci_dma.c 2010-02-09 07:57:19.000000000 -0500
1091+++ linux-2.6.32.8/arch/ia64/sn/pci/pci_dma.c 2010-02-13 21:45:09.827899663 -0500 1091+++ linux-2.6.32.9/arch/ia64/sn/pci/pci_dma.c 2010-02-23 17:09:53.075664142 -0500
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.8/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.8/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.8/arch/m32r/lib/usercopy.c linux-2.6.32.8/arch/m32r/lib/usercopy.c 1101diff -urNp linux-2.6.32.9/arch/m32r/lib/usercopy.c linux-2.6.32.9/arch/m32r/lib/usercopy.c
1102--- linux-2.6.32.8/arch/m32r/lib/usercopy.c 2010-02-09 07:57:19.000000000 -0500 1102--- linux-2.6.32.9/arch/m32r/lib/usercopy.c 2010-02-09 07:57:19.000000000 -0500
1103+++ linux-2.6.32.8/arch/m32r/lib/usercopy.c 2010-02-13 21:45:09.827899663 -0500 1103+++ linux-2.6.32.9/arch/m32r/lib/usercopy.c 2010-02-23 17:09:53.075664142 -0500
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.8/arch/m32r/lib/usercopy.c linux-2.6.32.8/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.8/arch/mips/alchemy/devboards/pm.c linux-2.6.32.8/arch/mips/alchemy/devboards/pm.c 1124diff -urNp linux-2.6.32.9/arch/mips/alchemy/devboards/pm.c linux-2.6.32.9/arch/mips/alchemy/devboards/pm.c
1125--- linux-2.6.32.8/arch/mips/alchemy/devboards/pm.c 2010-02-09 07:57:19.000000000 -0500 1125--- linux-2.6.32.9/arch/mips/alchemy/devboards/pm.c 2010-02-09 07:57:19.000000000 -0500
1126+++ linux-2.6.32.8/arch/mips/alchemy/devboards/pm.c 2010-02-13 21:45:09.827899663 -0500 1126+++ linux-2.6.32.9/arch/mips/alchemy/devboards/pm.c 2010-02-23 17:09:53.075664142 -0500
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.8/arch/mips/alchemy/devboards/pm.c linux-2.6.32.8/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.8/arch/mips/include/asm/elf.h linux-2.6.32.8/arch/mips/include/asm/elf.h 1136diff -urNp linux-2.6.32.9/arch/mips/include/asm/elf.h linux-2.6.32.9/arch/mips/include/asm/elf.h
1137--- linux-2.6.32.8/arch/mips/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 1137--- linux-2.6.32.9/arch/mips/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
1138+++ linux-2.6.32.8/arch/mips/include/asm/elf.h 2010-02-13 21:45:09.828845559 -0500 1138+++ linux-2.6.32.9/arch/mips/include/asm/elf.h 2010-02-23 17:09:53.075664142 -0500
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.8/arch/mips/include/asm/elf.h linux-2.6.32.8/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.8/arch/mips/include/asm/page.h linux-2.6.32.8/arch/mips/include/asm/page.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
1152--- linux-2.6.32.8/arch/mips/include/asm/page.h 2010-02-09 07:57:19.000000000 -0500 1152--- linux-2.6.32.9/arch/mips/include/asm/page.h 2010-02-09 07:57:19.000000000 -0500
1153+++ linux-2.6.32.8/arch/mips/include/asm/page.h 2010-02-13 21:45:09.828845559 -0500 1153+++ linux-2.6.32.9/arch/mips/include/asm/page.h 2010-02-23 17:09:53.075664142 -0500
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.8/arch/mips/include/asm/page.h linux-2.6.32.8/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.8/arch/mips/include/asm/system.h linux-2.6.32.8/arch/mips/include/asm/system.h 1163diff -urNp linux-2.6.32.9/arch/mips/include/asm/system.h linux-2.6.32.9/arch/mips/include/asm/system.h
1164--- linux-2.6.32.8/arch/mips/include/asm/system.h 2010-02-09 07:57:19.000000000 -0500 1164--- linux-2.6.32.9/arch/mips/include/asm/system.h 2010-02-09 07:57:19.000000000 -0500
1165+++ linux-2.6.32.8/arch/mips/include/asm/system.h 2010-02-13 21:45:09.828845559 -0500 1165+++ linux-2.6.32.9/arch/mips/include/asm/system.h 2010-02-23 17:09:53.075664142 -0500
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.8/arch/mips/include/asm/system.h linux-2.6.32.8/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.8/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.8/arch/mips/kernel/binfmt_elfn32.c 1174diff -urNp linux-2.6.32.9/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.9/arch/mips/kernel/binfmt_elfn32.c
1175--- linux-2.6.32.8/arch/mips/kernel/binfmt_elfn32.c 2010-02-09 07:57:19.000000000 -0500 1175--- linux-2.6.32.9/arch/mips/kernel/binfmt_elfn32.c 2010-02-09 07:57:19.000000000 -0500
1176+++ linux-2.6.32.8/arch/mips/kernel/binfmt_elfn32.c 2010-02-13 21:45:09.828845559 -0500 1176+++ linux-2.6.32.9/arch/mips/kernel/binfmt_elfn32.c 2010-02-23 17:09:53.075664142 -0500
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.8/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.8/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.8/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.8/arch/mips/kernel/binfmt_elfo32.c 1191diff -urNp linux-2.6.32.9/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.9/arch/mips/kernel/binfmt_elfo32.c
1192--- linux-2.6.32.8/arch/mips/kernel/binfmt_elfo32.c 2010-02-09 07:57:19.000000000 -0500 1192--- linux-2.6.32.9/arch/mips/kernel/binfmt_elfo32.c 2010-02-09 07:57:19.000000000 -0500
1193+++ linux-2.6.32.8/arch/mips/kernel/binfmt_elfo32.c 2010-02-13 21:45:09.828845559 -0500 1193+++ linux-2.6.32.9/arch/mips/kernel/binfmt_elfo32.c 2010-02-23 17:09:53.075664142 -0500
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.8/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.8/arch/m
1205 #include <asm/processor.h> 1205 #include <asm/processor.h>
1206 1206
1207 /* 1207 /*
1208diff -urNp linux-2.6.32.8/arch/mips/kernel/kgdb.c linux-2.6.32.8/arch/mips/kernel/kgdb.c 1208diff -urNp linux-2.6.32.9/arch/mips/kernel/kgdb.c linux-2.6.32.9/arch/mips/kernel/kgdb.c
1209--- linux-2.6.32.8/arch/mips/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500 1209--- linux-2.6.32.9/arch/mips/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500
1210+++ linux-2.6.32.8/arch/mips/kernel/kgdb.c 2010-02-13 21:45:09.828845559 -0500 1210+++ linux-2.6.32.9/arch/mips/kernel/kgdb.c 2010-02-23 17:09:53.079699812 -0500
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.8/arch/mips/kernel/kgdb.c linux-2.6.32.8/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.8/arch/mips/kernel/process.c linux-2.6.32.8/arch/mips/kernel/process.c 1219diff -urNp linux-2.6.32.9/arch/mips/kernel/process.c linux-2.6.32.9/arch/mips/kernel/process.c
1220--- linux-2.6.32.8/arch/mips/kernel/process.c 2010-02-09 07:57:19.000000000 -0500 1220--- linux-2.6.32.9/arch/mips/kernel/process.c 2010-02-09 07:57:19.000000000 -0500
1221+++ linux-2.6.32.8/arch/mips/kernel/process.c 2010-02-13 21:45:09.829920333 -0500 1221+++ linux-2.6.32.9/arch/mips/kernel/process.c 2010-02-23 17:09:53.079699812 -0500
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.8/arch/mips/kernel/process.c linux-2.6.32.8/arch/mips/ke
1235- 1235-
1236- return sp & ALMASK; 1236- return sp & ALMASK;
1237-} 1237-}
1238diff -urNp linux-2.6.32.8/arch/mips/kernel/syscall.c linux-2.6.32.8/arch/mips/kernel/syscall.c 1238diff -urNp linux-2.6.32.9/arch/mips/kernel/syscall.c linux-2.6.32.9/arch/mips/kernel/syscall.c
1239--- linux-2.6.32.8/arch/mips/kernel/syscall.c 2010-02-09 07:57:19.000000000 -0500 1239--- linux-2.6.32.9/arch/mips/kernel/syscall.c 2010-02-09 07:57:19.000000000 -0500
1240+++ linux-2.6.32.8/arch/mips/kernel/syscall.c 2010-02-13 21:45:09.829920333 -0500 1240+++ linux-2.6.32.9/arch/mips/kernel/syscall.c 2010-02-23 17:09:53.079699812 -0500
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.8/arch/mips/kernel/syscall.c linux-2.6.32.8/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.8/arch/mips/mm/fault.c linux-2.6.32.8/arch/mips/mm/fault.c 1262diff -urNp linux-2.6.32.9/arch/mips/mm/fault.c linux-2.6.32.9/arch/mips/mm/fault.c
1263--- linux-2.6.32.8/arch/mips/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 1263--- linux-2.6.32.9/arch/mips/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
1264+++ linux-2.6.32.8/arch/mips/mm/fault.c 2010-02-13 21:45:09.829920333 -0500 1264+++ linux-2.6.32.9/arch/mips/mm/fault.c 2010-02-23 17:09:53.079699812 -0500
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.8/arch/mips/mm/fault.c linux-2.6.32.8/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.8/arch/parisc/include/asm/elf.h linux-2.6.32.8/arch/parisc/include/asm/elf.h 1289diff -urNp linux-2.6.32.9/arch/parisc/include/asm/elf.h linux-2.6.32.9/arch/parisc/include/asm/elf.h
1290--- linux-2.6.32.8/arch/parisc/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 1290--- linux-2.6.32.9/arch/parisc/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
1291+++ linux-2.6.32.8/arch/parisc/include/asm/elf.h 2010-02-13 21:45:09.829920333 -0500 1291+++ linux-2.6.32.9/arch/parisc/include/asm/elf.h 2010-02-23 17:09:53.079699812 -0500
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.8/arch/parisc/include/asm/elf.h linux-2.6.32.8/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.8/arch/parisc/include/asm/pgtable.h linux-2.6.32.8/arch/parisc/include/asm/pgtable.h 1306diff -urNp linux-2.6.32.9/arch/parisc/include/asm/pgtable.h linux-2.6.32.9/arch/parisc/include/asm/pgtable.h
1307--- linux-2.6.32.8/arch/parisc/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500 1307--- linux-2.6.32.9/arch/parisc/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500
1308+++ linux-2.6.32.8/arch/parisc/include/asm/pgtable.h 2010-02-13 21:45:09.830901823 -0500 1308+++ linux-2.6.32.9/arch/parisc/include/asm/pgtable.h 2010-02-23 17:09:53.079699812 -0500
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.8/arch/parisc/include/asm/pgtable.h linux-2.6.32.8/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.8/arch/parisc/kernel/module.c linux-2.6.32.8/arch/parisc/kernel/module.c 1327diff -urNp linux-2.6.32.9/arch/parisc/kernel/module.c linux-2.6.32.9/arch/parisc/kernel/module.c
1328--- linux-2.6.32.8/arch/parisc/kernel/module.c 2010-02-09 07:57:19.000000000 -0500 1328--- linux-2.6.32.9/arch/parisc/kernel/module.c 2010-02-09 07:57:19.000000000 -0500
1329+++ linux-2.6.32.8/arch/parisc/kernel/module.c 2010-02-13 21:45:09.831900516 -0500 1329+++ linux-2.6.32.9/arch/parisc/kernel/module.c 2010-02-23 17:09:53.079699812 -0500
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.8/arch/parisc/kernel/module.c linux-2.6.32.8/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.8/arch/parisc/kernel/sys_parisc.c linux-2.6.32.8/arch/parisc/kernel/sys_parisc.c 1430diff -urNp linux-2.6.32.9/arch/parisc/kernel/sys_parisc.c linux-2.6.32.9/arch/parisc/kernel/sys_parisc.c
1431--- linux-2.6.32.8/arch/parisc/kernel/sys_parisc.c 2010-02-09 07:57:19.000000000 -0500 1431--- linux-2.6.32.9/arch/parisc/kernel/sys_parisc.c 2010-02-09 07:57:19.000000000 -0500
1432+++ linux-2.6.32.8/arch/parisc/kernel/sys_parisc.c 2010-02-13 21:45:09.831900516 -0500 1432+++ linux-2.6.32.9/arch/parisc/kernel/sys_parisc.c 2010-02-23 17:09:53.079699812 -0500
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.8/arch/parisc/kernel/sys_parisc.c linux-2.6.32.8/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.8/arch/parisc/kernel/traps.c linux-2.6.32.8/arch/parisc/kernel/traps.c 1442diff -urNp linux-2.6.32.9/arch/parisc/kernel/traps.c linux-2.6.32.9/arch/parisc/kernel/traps.c
1443--- linux-2.6.32.8/arch/parisc/kernel/traps.c 2010-02-09 07:57:19.000000000 -0500 1443--- linux-2.6.32.9/arch/parisc/kernel/traps.c 2010-02-09 07:57:19.000000000 -0500
1444+++ linux-2.6.32.8/arch/parisc/kernel/traps.c 2010-02-13 21:45:09.831900516 -0500 1444+++ linux-2.6.32.9/arch/parisc/kernel/traps.c 2010-02-23 17:09:53.079699812 -0500
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.8/arch/parisc/kernel/traps.c linux-2.6.32.8/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.8/arch/parisc/mm/fault.c linux-2.6.32.8/arch/parisc/mm/fault.c 1456diff -urNp linux-2.6.32.9/arch/parisc/mm/fault.c linux-2.6.32.9/arch/parisc/mm/fault.c
1457--- linux-2.6.32.8/arch/parisc/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 1457--- linux-2.6.32.9/arch/parisc/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
1458+++ linux-2.6.32.8/arch/parisc/mm/fault.c 2010-02-13 21:45:09.831900516 -0500 1458+++ linux-2.6.32.9/arch/parisc/mm/fault.c 2010-02-23 17:09:53.079699812 -0500
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.8/arch/parisc/mm/fault.c linux-2.6.32.8/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.8/arch/powerpc/include/asm/device.h linux-2.6.32.8/arch/powerpc/include/asm/device.h 1628diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/device.h linux-2.6.32.9/arch/powerpc/include/asm/device.h
1629--- linux-2.6.32.8/arch/powerpc/include/asm/device.h 2010-02-09 07:57:19.000000000 -0500 1629--- linux-2.6.32.9/arch/powerpc/include/asm/device.h 2010-02-09 07:57:19.000000000 -0500
1630+++ linux-2.6.32.8/arch/powerpc/include/asm/device.h 2010-02-13 21:45:09.831900516 -0500 1630+++ linux-2.6.32.9/arch/powerpc/include/asm/device.h 2010-02-23 17:09:53.079699812 -0500
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,15 +1637,12 @@ diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/device.h linux-2.6.32.8/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.8/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.8/arch/powerpc/include/asm/dma-mapping.h 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
1641--- linux-2.6.32.8/arch/powerpc/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500 1641--- linux-2.6.32.9/arch/powerpc/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500
1642+++ linux-2.6.32.8/arch/powerpc/include/asm/dma-mapping.h 2010-02-13 21:45:09.832900799 -0500 1642+++ linux-2.6.32.9/arch/powerpc/include/asm/dma-mapping.h 2010-02-23 17:09:53.079699812 -0500
1643@@ -67,11 +67,11 @@ static inline unsigned long device_to_ma 1643@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
1644 * Available generic sets of operations
1645 */
1646 #ifdef CONFIG_PPC64 1644 #ifdef CONFIG_PPC64
1647-extern struct dma_map_ops dma_iommu_ops; 1645 extern struct dma_map_ops dma_iommu_ops;
1648+extern const struct dma_map_ops dma_iommu_ops;
1649 #endif 1646 #endif
1650-extern struct dma_map_ops dma_direct_ops; 1647-extern struct dma_map_ops dma_direct_ops;
1651+extern const struct dma_map_ops dma_direct_ops; 1648+extern const struct dma_map_ops dma_direct_ops;
@@ -1709,9 +1706,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.8/
1709 1706
1710 if (dma_ops->mapping_error) 1707 if (dma_ops->mapping_error)
1711 return dma_ops->mapping_error(dev, dma_addr); 1708 return dma_ops->mapping_error(dev, dma_addr);
1712diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/elf.h linux-2.6.32.8/arch/powerpc/include/asm/elf.h 1709diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/elf.h linux-2.6.32.9/arch/powerpc/include/asm/elf.h
1713--- linux-2.6.32.8/arch/powerpc/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 1710--- linux-2.6.32.9/arch/powerpc/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
1714+++ linux-2.6.32.8/arch/powerpc/include/asm/elf.h 2010-02-13 21:45:09.832900799 -0500 1711+++ linux-2.6.32.9/arch/powerpc/include/asm/elf.h 2010-02-23 17:09:53.079699812 -0500
1715@@ -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
1716 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
1717 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. */
@@ -1744,9 +1741,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/elf.h linux-2.6.32.8/arch/pow
1744 #endif /* __KERNEL__ */ 1741 #endif /* __KERNEL__ */
1745 1742
1746 /* 1743 /*
1747diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/iommu.h linux-2.6.32.8/arch/powerpc/include/asm/iommu.h 1744diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/iommu.h linux-2.6.32.9/arch/powerpc/include/asm/iommu.h
1748--- linux-2.6.32.8/arch/powerpc/include/asm/iommu.h 2010-02-09 07:57:19.000000000 -0500 1745--- linux-2.6.32.9/arch/powerpc/include/asm/iommu.h 2010-02-09 07:57:19.000000000 -0500
1749+++ linux-2.6.32.8/arch/powerpc/include/asm/iommu.h 2010-02-13 21:45:09.832900799 -0500 1746+++ linux-2.6.32.9/arch/powerpc/include/asm/iommu.h 2010-02-23 17:09:53.079699812 -0500
1750@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi 1747@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
1751 extern void iommu_init_early_dart(void); 1748 extern void iommu_init_early_dart(void);
1752 extern void iommu_init_early_pasemi(void); 1749 extern void iommu_init_early_pasemi(void);
@@ -1757,9 +1754,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/iommu.h linux-2.6.32.8/arch/p
1757 #ifdef CONFIG_PCI 1754 #ifdef CONFIG_PCI
1758 extern void pci_iommu_init(void); 1755 extern void pci_iommu_init(void);
1759 extern void pci_direct_iommu_init(void); 1756 extern void pci_direct_iommu_init(void);
1760diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.8/arch/powerpc/include/asm/kmap_types.h 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
1761--- linux-2.6.32.8/arch/powerpc/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500 1758--- linux-2.6.32.9/arch/powerpc/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500
1762+++ linux-2.6.32.8/arch/powerpc/include/asm/kmap_types.h 2010-02-13 21:45:09.832900799 -0500 1759+++ linux-2.6.32.9/arch/powerpc/include/asm/kmap_types.h 2010-02-23 17:09:53.079699812 -0500
1763@@ -26,6 +26,7 @@ enum km_type { 1760@@ -26,6 +26,7 @@ enum km_type {
1764 KM_SOFTIRQ1, 1761 KM_SOFTIRQ1,
1765 KM_PPC_SYNC_PAGE, 1762 KM_PPC_SYNC_PAGE,
@@ -1768,9 +1765,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.8/a
1768 KM_TYPE_NR 1765 KM_TYPE_NR
1769 }; 1766 };
1770 1767
1771diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/page_64.h linux-2.6.32.8/arch/powerpc/include/asm/page_64.h 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
1772--- linux-2.6.32.8/arch/powerpc/include/asm/page_64.h 2010-02-09 07:57:19.000000000 -0500 1769--- linux-2.6.32.9/arch/powerpc/include/asm/page_64.h 2010-02-09 07:57:19.000000000 -0500
1773+++ linux-2.6.32.8/arch/powerpc/include/asm/page_64.h 2010-02-13 21:45:09.833587787 -0500 1770+++ linux-2.6.32.9/arch/powerpc/include/asm/page_64.h 2010-02-23 17:09:53.079699812 -0500
1774@@ -180,15 +180,18 @@ do { \ 1771@@ -180,15 +180,18 @@ do { \
1775 * 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
1776 * we turn execute permission off. 1773 * we turn execute permission off.
@@ -1792,9 +1789,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/page_64.h linux-2.6.32.8/arch
1792 1789
1793 #include <asm-generic/getorder.h> 1790 #include <asm-generic/getorder.h>
1794 1791
1795diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/page.h linux-2.6.32.8/arch/powerpc/include/asm/page.h 1792diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/page.h linux-2.6.32.9/arch/powerpc/include/asm/page.h
1796--- linux-2.6.32.8/arch/powerpc/include/asm/page.h 2010-02-09 07:57:19.000000000 -0500 1793--- linux-2.6.32.9/arch/powerpc/include/asm/page.h 2010-02-09 07:57:19.000000000 -0500
1797+++ linux-2.6.32.8/arch/powerpc/include/asm/page.h 2010-02-13 21:45:09.833587787 -0500 1794+++ linux-2.6.32.9/arch/powerpc/include/asm/page.h 2010-02-23 17:09:53.079699812 -0500
1798@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; 1795@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
1799 * and needs to be executable. This means the whole heap ends 1796 * and needs to be executable. This means the whole heap ends
1800 * up being executable. 1797 * up being executable.
@@ -1807,9 +1804,19 @@ diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/page.h linux-2.6.32.8/arch/po
1807 1804
1808 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ 1805 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
1809 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) 1806 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
1810diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/pci.h linux-2.6.32.8/arch/powerpc/include/asm/pci.h 1807@@ -145,6 +146,9 @@ extern phys_addr_t kernstart_addr;
1811--- linux-2.6.32.8/arch/powerpc/include/asm/pci.h 2010-02-09 07:57:19.000000000 -0500 1808 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
1812+++ linux-2.6.32.8/arch/powerpc/include/asm/pci.h 2010-02-13 21:45:09.833587787 -0500 1809 #endif
1810
1811+#define ktla_ktva(addr) (addr)
1812+#define ktva_ktla(addr) (addr)
1813+
1814 #ifndef __ASSEMBLY__
1815
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
1818--- linux-2.6.32.9/arch/powerpc/include/asm/pci.h 2010-02-09 07:57:19.000000000 -0500
1819+++ linux-2.6.32.9/arch/powerpc/include/asm/pci.h 2010-02-23 17:09:53.079699812 -0500
1813@@ -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
1814 } 1821 }
1815 1822
@@ -1821,38 +1828,20 @@ diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/pci.h linux-2.6.32.8/arch/pow
1821 #else /* CONFIG_PCI */ 1828 #else /* CONFIG_PCI */
1822 #define set_pci_dma_ops(d) 1829 #define set_pci_dma_ops(d)
1823 #define get_pci_dma_ops() NULL 1830 #define get_pci_dma_ops() NULL
1824diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/pte-common.h linux-2.6.32.8/arch/powerpc/include/asm/pte-common.h 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
1825--- linux-2.6.32.8/arch/powerpc/include/asm/pte-common.h 2010-02-09 07:57:19.000000000 -0500 1832--- linux-2.6.32.9/arch/powerpc/include/asm/pte-hash32.h 2010-02-09 07:57:19.000000000 -0500
1826+++ linux-2.6.32.8/arch/powerpc/include/asm/pte-common.h 2010-02-13 21:45:09.833587787 -0500 1833+++ linux-2.6.32.9/arch/powerpc/include/asm/pte-hash32.h 2010-02-23 17:09:53.079699812 -0500
1827@@ -123,11 +123,11 @@ extern unsigned long bad_call_to_PMD_PAG
1828 */
1829 #define PAGE_NONE __pgprot(_PAGE_BASE)
1830 #define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW)
1831-#define PAGE_SHARED_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW | _PAGE_EXEC)
1832+#define PAGE_SHARED_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW | _PAGE_EXEC | _PAGE_HWEXEC)
1833 #define PAGE_COPY __pgprot(_PAGE_BASE | _PAGE_USER)
1834-#define PAGE_COPY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC)
1835+#define PAGE_COPY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC | _PAGE_HWEXEC)
1836 #define PAGE_READONLY __pgprot(_PAGE_BASE | _PAGE_USER)
1837-#define PAGE_READONLY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC)
1838+#define PAGE_READONLY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC | _PAGE_HWEXEC)
1839
1840 #define __P000 PAGE_NONE
1841 #define __P001 PAGE_READONLY
1842diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.8/arch/powerpc/include/asm/pte-hash32.h
1843--- linux-2.6.32.8/arch/powerpc/include/asm/pte-hash32.h 2010-02-09 07:57:19.000000000 -0500
1844+++ linux-2.6.32.8/arch/powerpc/include/asm/pte-hash32.h 2010-02-13 21:45:09.833587787 -0500
1845@@ -21,6 +21,7 @@ 1834@@ -21,6 +21,7 @@
1846 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ 1835 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
1847 #define _PAGE_USER 0x004 /* usermode access allowed */ 1836 #define _PAGE_USER 0x004 /* usermode access allowed */
1848 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */ 1837 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
1849+#define _PAGE_HWEXEC _PAGE_GUARDED 1838+#define _PAGE_EXEC _PAGE_GUARDED
1850 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ 1839 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
1851 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ 1840 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
1852 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ 1841 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
1853diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/reg.h linux-2.6.32.8/arch/powerpc/include/asm/reg.h 1842diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/reg.h linux-2.6.32.9/arch/powerpc/include/asm/reg.h
1854--- linux-2.6.32.8/arch/powerpc/include/asm/reg.h 2010-02-09 07:57:19.000000000 -0500 1843--- linux-2.6.32.9/arch/powerpc/include/asm/reg.h 2010-02-09 07:57:19.000000000 -0500
1855+++ linux-2.6.32.8/arch/powerpc/include/asm/reg.h 2010-02-13 21:45:09.834899255 -0500 1844+++ linux-2.6.32.9/arch/powerpc/include/asm/reg.h 2010-02-23 17:09:53.079699812 -0500
1856@@ -191,6 +191,7 @@ 1845@@ -191,6 +191,7 @@
1857 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ 1846 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
1858 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ 1847 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -1861,9 +1850,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/reg.h linux-2.6.32.8/arch/pow
1861 #define DSISR_PROTFAULT 0x08000000 /* protection fault */ 1850 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
1862 #define DSISR_ISSTORE 0x02000000 /* access was a store */ 1851 #define DSISR_ISSTORE 0x02000000 /* access was a store */
1863 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ 1852 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
1864diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.8/arch/powerpc/include/asm/swiotlb.h 1853diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.9/arch/powerpc/include/asm/swiotlb.h
1865--- linux-2.6.32.8/arch/powerpc/include/asm/swiotlb.h 2010-02-09 07:57:19.000000000 -0500 1854--- linux-2.6.32.9/arch/powerpc/include/asm/swiotlb.h 2010-02-09 07:57:19.000000000 -0500
1866+++ linux-2.6.32.8/arch/powerpc/include/asm/swiotlb.h 2010-02-13 21:45:09.834899255 -0500 1855+++ linux-2.6.32.9/arch/powerpc/include/asm/swiotlb.h 2010-02-23 17:09:53.079699812 -0500
1867@@ -13,7 +13,7 @@ 1856@@ -13,7 +13,7 @@
1868 1857
1869 #include <linux/swiotlb.h> 1858 #include <linux/swiotlb.h>
@@ -1873,9 +1862,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.8/arch
1873 1862
1874 static inline void dma_mark_clean(void *addr, size_t size) {} 1863 static inline void dma_mark_clean(void *addr, size_t size) {}
1875 1864
1876diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/uaccess.h linux-2.6.32.8/arch/powerpc/include/asm/uaccess.h 1865diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/uaccess.h linux-2.6.32.9/arch/powerpc/include/asm/uaccess.h
1877--- linux-2.6.32.8/arch/powerpc/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500 1866--- linux-2.6.32.9/arch/powerpc/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500
1878+++ linux-2.6.32.8/arch/powerpc/include/asm/uaccess.h 2010-02-13 21:45:09.834899255 -0500 1867+++ linux-2.6.32.9/arch/powerpc/include/asm/uaccess.h 2010-02-23 17:09:53.079699812 -0500
1879@@ -327,52 +327,6 @@ do { \ 1868@@ -327,52 +327,6 @@ do { \
1880 extern unsigned long __copy_tofrom_user(void __user *to, 1869 extern unsigned long __copy_tofrom_user(void __user *to,
1881 const void __user *from, unsigned long size); 1870 const void __user *from, unsigned long size);
@@ -2044,9 +2033,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/uaccess.h linux-2.6.32.8/arch
2044 extern unsigned long __clear_user(void __user *addr, unsigned long size); 2033 extern unsigned long __clear_user(void __user *addr, unsigned long size);
2045 2034
2046 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)
2047diff -urNp linux-2.6.32.8/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.8/arch/powerpc/kernel/cacheinfo.c 2036diff -urNp linux-2.6.32.9/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.9/arch/powerpc/kernel/cacheinfo.c
2048--- linux-2.6.32.8/arch/powerpc/kernel/cacheinfo.c 2010-02-09 07:57:19.000000000 -0500 2037--- linux-2.6.32.9/arch/powerpc/kernel/cacheinfo.c 2010-02-09 07:57:19.000000000 -0500
2049+++ linux-2.6.32.8/arch/powerpc/kernel/cacheinfo.c 2010-02-13 21:45:09.834899255 -0500 2038+++ linux-2.6.32.9/arch/powerpc/kernel/cacheinfo.c 2010-02-23 17:09:53.083571404 -0500
2050@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde 2039@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
2051 &cache_assoc_attr, 2040 &cache_assoc_attr,
2052 }; 2041 };
@@ -2056,9 +2045,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.8/arch/po
2056 .show = cache_index_show, 2045 .show = cache_index_show,
2057 }; 2046 };
2058 2047
2059diff -urNp linux-2.6.32.8/arch/powerpc/kernel/dma.c linux-2.6.32.8/arch/powerpc/kernel/dma.c 2048diff -urNp linux-2.6.32.9/arch/powerpc/kernel/dma.c linux-2.6.32.9/arch/powerpc/kernel/dma.c
2060--- linux-2.6.32.8/arch/powerpc/kernel/dma.c 2010-02-09 07:57:19.000000000 -0500 2049--- linux-2.6.32.9/arch/powerpc/kernel/dma.c 2010-02-09 07:57:19.000000000 -0500
2061+++ linux-2.6.32.8/arch/powerpc/kernel/dma.c 2010-02-13 21:45:09.835915802 -0500 2050+++ linux-2.6.32.9/arch/powerpc/kernel/dma.c 2010-02-23 17:09:53.083571404 -0500
2062@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl 2051@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
2063 } 2052 }
2064 #endif 2053 #endif
@@ -2068,9 +2057,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/kernel/dma.c linux-2.6.32.8/arch/powerpc/
2068 .alloc_coherent = dma_direct_alloc_coherent, 2057 .alloc_coherent = dma_direct_alloc_coherent,
2069 .free_coherent = dma_direct_free_coherent, 2058 .free_coherent = dma_direct_free_coherent,
2070 .map_sg = dma_direct_map_sg, 2059 .map_sg = dma_direct_map_sg,
2071diff -urNp linux-2.6.32.8/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.8/arch/powerpc/kernel/dma-iommu.c 2060diff -urNp linux-2.6.32.9/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.9/arch/powerpc/kernel/dma-iommu.c
2072--- linux-2.6.32.8/arch/powerpc/kernel/dma-iommu.c 2010-02-09 07:57:19.000000000 -0500 2061--- linux-2.6.32.9/arch/powerpc/kernel/dma-iommu.c 2010-02-09 07:57:19.000000000 -0500
2073+++ linux-2.6.32.8/arch/powerpc/kernel/dma-iommu.c 2010-02-13 21:45:09.835915802 -0500 2062+++ linux-2.6.32.9/arch/powerpc/kernel/dma-iommu.c 2010-02-23 17:09:53.083571404 -0500
2074@@ -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
2075 } 2064 }
2076 2065
@@ -2080,18 +2069,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.8/arch/po
2080 { 2069 {
2081 struct iommu_table *tbl = get_iommu_table_base(dev); 2070 struct iommu_table *tbl = get_iommu_table_base(dev);
2082 2071
2083@@ -89,7 +89,7 @@ static int dma_iommu_dma_supported(struc 2072diff -urNp linux-2.6.32.9/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.9/arch/powerpc/kernel/dma-swiotlb.c
2084 return 1; 2073--- linux-2.6.32.9/arch/powerpc/kernel/dma-swiotlb.c 2010-02-09 07:57:19.000000000 -0500
2085 } 2074+++ linux-2.6.32.9/arch/powerpc/kernel/dma-swiotlb.c 2010-02-23 17:09:53.083571404 -0500
2086
2087-struct dma_map_ops dma_iommu_ops = {
2088+const struct dma_map_ops dma_iommu_ops = {
2089 .alloc_coherent = dma_iommu_alloc_coherent,
2090 .free_coherent = dma_iommu_free_coherent,
2091 .map_sg = dma_iommu_map_sg,
2092diff -urNp linux-2.6.32.8/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.8/arch/powerpc/kernel/dma-swiotlb.c
2093--- linux-2.6.32.8/arch/powerpc/kernel/dma-swiotlb.c 2010-02-09 07:57:19.000000000 -0500
2094+++ linux-2.6.32.8/arch/powerpc/kernel/dma-swiotlb.c 2010-02-13 21:45:09.835915802 -0500
2095@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; 2075@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
2096 * map_page, and unmap_page on highmem, use normal dma_ops 2076 * map_page, and unmap_page on highmem, use normal dma_ops
2097 * for everything else. 2077 * for everything else.
@@ -2101,9 +2081,45 @@ diff -urNp linux-2.6.32.8/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.8/arch/
2101 .alloc_coherent = dma_direct_alloc_coherent, 2081 .alloc_coherent = dma_direct_alloc_coherent,
2102 .free_coherent = dma_direct_free_coherent, 2082 .free_coherent = dma_direct_free_coherent,
2103 .map_sg = swiotlb_map_sg_attrs, 2083 .map_sg = swiotlb_map_sg_attrs,
2104diff -urNp linux-2.6.32.8/arch/powerpc/kernel/ibmebus.c linux-2.6.32.8/arch/powerpc/kernel/ibmebus.c 2084diff -urNp linux-2.6.32.9/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.9/arch/powerpc/kernel/exceptions-64e.S
2105--- linux-2.6.32.8/arch/powerpc/kernel/ibmebus.c 2010-02-09 07:57:19.000000000 -0500 2085--- linux-2.6.32.9/arch/powerpc/kernel/exceptions-64e.S 2010-02-09 07:57:19.000000000 -0500
2106+++ linux-2.6.32.8/arch/powerpc/kernel/ibmebus.c 2010-02-13 21:45:09.835915802 -0500 2086+++ linux-2.6.32.9/arch/powerpc/kernel/exceptions-64e.S 2010-02-23 17:09:53.083571404 -0500
2087@@ -455,6 +455,7 @@ storage_fault_common:
2088 std r14,_DAR(r1)
2089 std r15,_DSISR(r1)
2090 addi r3,r1,STACK_FRAME_OVERHEAD
2091+ bl .save_nvgprs
2092 mr r4,r14
2093 mr r5,r15
2094 ld r14,PACA_EXGEN+EX_R14(r13)
2095@@ -464,8 +465,7 @@ storage_fault_common:
2096 cmpdi r3,0
2097 bne- 1f
2098 b .ret_from_except_lite
2099-1: bl .save_nvgprs
2100- mr r5,r3
2101+1: mr r5,r3
2102 addi r3,r1,STACK_FRAME_OVERHEAD
2103 ld r4,_DAR(r1)
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
2106--- linux-2.6.32.9/arch/powerpc/kernel/exceptions-64s.S 2010-02-09 07:57:19.000000000 -0500
2107+++ linux-2.6.32.9/arch/powerpc/kernel/exceptions-64s.S 2010-02-23 17:09:53.083571404 -0500
2108@@ -818,10 +818,10 @@ handle_page_fault:
2109 11: ld r4,_DAR(r1)
2110 ld r5,_DSISR(r1)
2111 addi r3,r1,STACK_FRAME_OVERHEAD
2112+ bl .save_nvgprs
2113 bl .do_page_fault
2114 cmpdi r3,0
2115 beq+ 13f
2116- bl .save_nvgprs
2117 mr r5,r3
2118 addi r3,r1,STACK_FRAME_OVERHEAD
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
2121--- linux-2.6.32.9/arch/powerpc/kernel/ibmebus.c 2010-02-09 07:57:19.000000000 -0500
2122+++ linux-2.6.32.9/arch/powerpc/kernel/ibmebus.c 2010-02-23 17:09:53.083571404 -0500
2107@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct 2123@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
2108 return 1; 2124 return 1;
2109 } 2125 }
@@ -2113,9 +2129,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/kernel/ibmebus.c linux-2.6.32.8/arch/powe
2113 .alloc_coherent = ibmebus_alloc_coherent, 2129 .alloc_coherent = ibmebus_alloc_coherent,
2114 .free_coherent = ibmebus_free_coherent, 2130 .free_coherent = ibmebus_free_coherent,
2115 .map_sg = ibmebus_map_sg, 2131 .map_sg = ibmebus_map_sg,
2116diff -urNp linux-2.6.32.8/arch/powerpc/kernel/kgdb.c linux-2.6.32.8/arch/powerpc/kernel/kgdb.c 2132diff -urNp linux-2.6.32.9/arch/powerpc/kernel/kgdb.c linux-2.6.32.9/arch/powerpc/kernel/kgdb.c
2117--- linux-2.6.32.8/arch/powerpc/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500 2133--- linux-2.6.32.9/arch/powerpc/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500
2118+++ linux-2.6.32.8/arch/powerpc/kernel/kgdb.c 2010-02-13 21:45:09.835915802 -0500 2134+++ linux-2.6.32.9/arch/powerpc/kernel/kgdb.c 2010-02-23 17:09:53.083571404 -0500
2119@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct 2135@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
2120 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) 2136 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
2121 return 0; 2137 return 0;
@@ -2134,9 +2150,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/kernel/kgdb.c linux-2.6.32.8/arch/powerpc
2134 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, 2150 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
2135 }; 2151 };
2136 2152
2137diff -urNp linux-2.6.32.8/arch/powerpc/kernel/module_32.c linux-2.6.32.8/arch/powerpc/kernel/module_32.c 2153diff -urNp linux-2.6.32.9/arch/powerpc/kernel/module_32.c linux-2.6.32.9/arch/powerpc/kernel/module_32.c
2138--- linux-2.6.32.8/arch/powerpc/kernel/module_32.c 2010-02-09 07:57:19.000000000 -0500 2154--- linux-2.6.32.9/arch/powerpc/kernel/module_32.c 2010-02-09 07:57:19.000000000 -0500
2139+++ linux-2.6.32.8/arch/powerpc/kernel/module_32.c 2010-02-13 21:45:09.835915802 -0500 2155+++ linux-2.6.32.9/arch/powerpc/kernel/module_32.c 2010-02-23 17:09:53.083571404 -0500
2140@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr 2156@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
2141 me->arch.core_plt_section = i; 2157 me->arch.core_plt_section = i;
2142 } 2158 }
@@ -2166,9 +2182,51 @@ diff -urNp linux-2.6.32.8/arch/powerpc/kernel/module_32.c linux-2.6.32.8/arch/po
2166 2182
2167 /* Find this entry, or if that fails, the next avail. entry */ 2183 /* Find this entry, or if that fails, the next avail. entry */
2168 while (entry->jump[0]) { 2184 while (entry->jump[0]) {
2169diff -urNp linux-2.6.32.8/arch/powerpc/kernel/pci-common.c linux-2.6.32.8/arch/powerpc/kernel/pci-common.c 2185diff -urNp linux-2.6.32.9/arch/powerpc/kernel/module.c linux-2.6.32.9/arch/powerpc/kernel/module.c
2170--- linux-2.6.32.8/arch/powerpc/kernel/pci-common.c 2010-02-09 07:57:19.000000000 -0500 2186--- linux-2.6.32.9/arch/powerpc/kernel/module.c 2010-02-09 07:57:19.000000000 -0500
2171+++ linux-2.6.32.8/arch/powerpc/kernel/pci-common.c 2010-02-13 21:45:09.836904472 -0500 2187+++ linux-2.6.32.9/arch/powerpc/kernel/module.c 2010-02-23 17:09:53.083571404 -0500
2188@@ -31,11 +31,24 @@
2189
2190 LIST_HEAD(module_bug_list);
2191
2192+#ifdef CONFIG_PAX_KERNEXEC
2193 void *module_alloc(unsigned long size)
2194 {
2195 if (size == 0)
2196 return NULL;
2197
2198+ return vmalloc(size);
2199+}
2200+
2201+void *module_alloc_exec(unsigned long size)
2202+#else
2203+void *module_alloc(unsigned long size)
2204+#endif
2205+
2206+{
2207+ if (size == 0)
2208+ return NULL;
2209+
2210 return vmalloc_exec(size);
2211 }
2212
2213@@ -45,6 +58,13 @@ void module_free(struct module *mod, voi
2214 vfree(module_region);
2215 }
2216
2217+#ifdef CONFIG_PAX_KERNEXEC
2218+void module_free_exec(struct module *mod, void *module_region)
2219+{
2220+ module_free(mod, module_region);
2221+}
2222+#endif
2223+
2224 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
2225 const Elf_Shdr *sechdrs,
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
2228--- linux-2.6.32.9/arch/powerpc/kernel/pci-common.c 2010-02-09 07:57:19.000000000 -0500
2229+++ linux-2.6.32.9/arch/powerpc/kernel/pci-common.c 2010-02-23 17:09:53.083571404 -0500
2172@@ -50,14 +50,14 @@ resource_size_t isa_mem_base; 2230@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
2173 unsigned int ppc_pci_flags = 0; 2231 unsigned int ppc_pci_flags = 0;
2174 2232
@@ -2187,9 +2245,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/kernel/pci-common.c linux-2.6.32.8/arch/p
2187 { 2245 {
2188 return pci_dma_ops; 2246 return pci_dma_ops;
2189 } 2247 }
2190diff -urNp linux-2.6.32.8/arch/powerpc/kernel/process.c linux-2.6.32.8/arch/powerpc/kernel/process.c 2248diff -urNp linux-2.6.32.9/arch/powerpc/kernel/process.c linux-2.6.32.9/arch/powerpc/kernel/process.c
2191--- linux-2.6.32.8/arch/powerpc/kernel/process.c 2010-02-09 07:57:19.000000000 -0500 2249--- linux-2.6.32.9/arch/powerpc/kernel/process.c 2010-02-09 07:57:19.000000000 -0500
2192+++ linux-2.6.32.8/arch/powerpc/kernel/process.c 2010-02-13 21:45:09.836904472 -0500 2250+++ linux-2.6.32.9/arch/powerpc/kernel/process.c 2010-02-23 17:09:53.083571404 -0500
2193@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned 2251@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned
2194 sp -= get_random_int() & ~PAGE_MASK; 2252 sp -= get_random_int() & ~PAGE_MASK;
2195 return sp & ~0xf; 2253 return sp & ~0xf;
@@ -2242,9 +2300,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/kernel/process.c linux-2.6.32.8/arch/powe
2242- 2300-
2243- return ret; 2301- return ret;
2244-} 2302-}
2245diff -urNp linux-2.6.32.8/arch/powerpc/kernel/signal_32.c linux-2.6.32.8/arch/powerpc/kernel/signal_32.c 2303diff -urNp linux-2.6.32.9/arch/powerpc/kernel/signal_32.c linux-2.6.32.9/arch/powerpc/kernel/signal_32.c
2246--- linux-2.6.32.8/arch/powerpc/kernel/signal_32.c 2010-02-09 07:57:19.000000000 -0500 2304--- linux-2.6.32.9/arch/powerpc/kernel/signal_32.c 2010-02-09 07:57:19.000000000 -0500
2247+++ linux-2.6.32.8/arch/powerpc/kernel/signal_32.c 2010-02-13 21:45:09.837900642 -0500 2305+++ linux-2.6.32.9/arch/powerpc/kernel/signal_32.c 2010-02-23 17:09:53.083571404 -0500
2248@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig 2306@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
2249 /* Save user registers on the stack */ 2307 /* Save user registers on the stack */
2250 frame = &rt_sf->uc.uc_mcontext; 2308 frame = &rt_sf->uc.uc_mcontext;
@@ -2254,9 +2312,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/kernel/signal_32.c linux-2.6.32.8/arch/po
2254 if (save_user_regs(regs, frame, 0, 1)) 2312 if (save_user_regs(regs, frame, 0, 1))
2255 goto badframe; 2313 goto badframe;
2256 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; 2314 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
2257diff -urNp linux-2.6.32.8/arch/powerpc/kernel/signal_64.c linux-2.6.32.8/arch/powerpc/kernel/signal_64.c 2315diff -urNp linux-2.6.32.9/arch/powerpc/kernel/signal_64.c linux-2.6.32.9/arch/powerpc/kernel/signal_64.c
2258--- linux-2.6.32.8/arch/powerpc/kernel/signal_64.c 2010-02-09 07:57:19.000000000 -0500 2316--- linux-2.6.32.9/arch/powerpc/kernel/signal_64.c 2010-02-09 07:57:19.000000000 -0500
2259+++ linux-2.6.32.8/arch/powerpc/kernel/signal_64.c 2010-02-13 21:45:09.837900642 -0500 2317+++ linux-2.6.32.9/arch/powerpc/kernel/signal_64.c 2010-02-23 17:09:53.083571404 -0500
2260@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct 2318@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
2261 current->thread.fpscr.val = 0; 2319 current->thread.fpscr.val = 0;
2262 2320
@@ -2266,9 +2324,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/kernel/signal_64.c linux-2.6.32.8/arch/po
2266 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; 2324 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
2267 } else { 2325 } else {
2268 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); 2326 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
2269diff -urNp linux-2.6.32.8/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.8/arch/powerpc/kernel/sys_ppc32.c 2327diff -urNp linux-2.6.32.9/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.9/arch/powerpc/kernel/sys_ppc32.c
2270--- linux-2.6.32.8/arch/powerpc/kernel/sys_ppc32.c 2010-02-09 07:57:19.000000000 -0500 2328--- linux-2.6.32.9/arch/powerpc/kernel/sys_ppc32.c 2010-02-09 07:57:19.000000000 -0500
2271+++ linux-2.6.32.8/arch/powerpc/kernel/sys_ppc32.c 2010-02-13 21:45:09.838557679 -0500 2329+++ linux-2.6.32.9/arch/powerpc/kernel/sys_ppc32.c 2010-02-23 17:09:53.083571404 -0500
2272@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct 2330@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
2273 if (oldlenp) { 2331 if (oldlenp) {
2274 if (!error) { 2332 if (!error) {
@@ -2282,9 +2340,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.8/arch/po
2282 } 2340 }
2283 return error; 2341 return error;
2284 } 2342 }
2285diff -urNp linux-2.6.32.8/arch/powerpc/kernel/vdso.c linux-2.6.32.8/arch/powerpc/kernel/vdso.c 2343diff -urNp linux-2.6.32.9/arch/powerpc/kernel/vdso.c linux-2.6.32.9/arch/powerpc/kernel/vdso.c
2286--- linux-2.6.32.8/arch/powerpc/kernel/vdso.c 2010-02-09 07:57:19.000000000 -0500 2344--- linux-2.6.32.9/arch/powerpc/kernel/vdso.c 2010-02-09 07:57:19.000000000 -0500
2287+++ linux-2.6.32.8/arch/powerpc/kernel/vdso.c 2010-02-13 21:45:09.838557679 -0500 2345+++ linux-2.6.32.9/arch/powerpc/kernel/vdso.c 2010-02-23 17:09:53.083571404 -0500
2288@@ -36,6 +36,7 @@ 2346@@ -36,6 +36,7 @@
2289 #include <asm/firmware.h> 2347 #include <asm/firmware.h>
2290 #include <asm/vdso.h> 2348 #include <asm/vdso.h>
@@ -2311,9 +2369,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/kernel/vdso.c linux-2.6.32.8/arch/powerpc
2311 if (IS_ERR_VALUE(vdso_base)) { 2369 if (IS_ERR_VALUE(vdso_base)) {
2312 rc = vdso_base; 2370 rc = vdso_base;
2313 goto fail_mmapsem; 2371 goto fail_mmapsem;
2314diff -urNp linux-2.6.32.8/arch/powerpc/kernel/vio.c linux-2.6.32.8/arch/powerpc/kernel/vio.c 2372diff -urNp linux-2.6.32.9/arch/powerpc/kernel/vio.c linux-2.6.32.9/arch/powerpc/kernel/vio.c
2315--- linux-2.6.32.8/arch/powerpc/kernel/vio.c 2010-02-09 07:57:19.000000000 -0500 2373--- linux-2.6.32.9/arch/powerpc/kernel/vio.c 2010-02-09 07:57:19.000000000 -0500
2316+++ linux-2.6.32.8/arch/powerpc/kernel/vio.c 2010-02-13 21:45:09.838557679 -0500 2374+++ linux-2.6.32.9/arch/powerpc/kernel/vio.c 2010-02-23 17:09:53.083571404 -0500
2317@@ -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
2318 vio_cmo_dealloc(viodev, alloc_size); 2376 vio_cmo_dealloc(viodev, alloc_size);
2319 } 2377 }
@@ -2336,9 +2394,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/kernel/vio.c linux-2.6.32.8/arch/powerpc/
2336 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; 2394 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
2337 } 2395 }
2338 2396
2339diff -urNp linux-2.6.32.8/arch/powerpc/lib/usercopy_64.c linux-2.6.32.8/arch/powerpc/lib/usercopy_64.c 2397diff -urNp linux-2.6.32.9/arch/powerpc/lib/usercopy_64.c linux-2.6.32.9/arch/powerpc/lib/usercopy_64.c
2340--- linux-2.6.32.8/arch/powerpc/lib/usercopy_64.c 2010-02-09 07:57:19.000000000 -0500 2398--- linux-2.6.32.9/arch/powerpc/lib/usercopy_64.c 2010-02-09 07:57:19.000000000 -0500
2341+++ linux-2.6.32.8/arch/powerpc/lib/usercopy_64.c 2010-02-13 21:45:09.838557679 -0500 2399+++ linux-2.6.32.9/arch/powerpc/lib/usercopy_64.c 2010-02-23 17:09:53.083571404 -0500
2342@@ -9,22 +9,6 @@ 2400@@ -9,22 +9,6 @@
2343 #include <linux/module.h> 2401 #include <linux/module.h>
2344 #include <asm/uaccess.h> 2402 #include <asm/uaccess.h>
@@ -2370,9 +2428,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/lib/usercopy_64.c linux-2.6.32.8/arch/pow
2370-EXPORT_SYMBOL(copy_to_user); 2428-EXPORT_SYMBOL(copy_to_user);
2371 EXPORT_SYMBOL(copy_in_user); 2429 EXPORT_SYMBOL(copy_in_user);
2372 2430
2373diff -urNp linux-2.6.32.8/arch/powerpc/mm/fault.c linux-2.6.32.8/arch/powerpc/mm/fault.c 2431diff -urNp linux-2.6.32.9/arch/powerpc/mm/fault.c linux-2.6.32.9/arch/powerpc/mm/fault.c
2374--- linux-2.6.32.8/arch/powerpc/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 2432--- linux-2.6.32.9/arch/powerpc/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
2375+++ linux-2.6.32.8/arch/powerpc/mm/fault.c 2010-02-13 21:45:09.839726452 -0500 2433+++ linux-2.6.32.9/arch/powerpc/mm/fault.c 2010-02-23 17:09:53.083571404 -0500
2376@@ -30,6 +30,10 @@ 2434@@ -30,6 +30,10 @@
2377 #include <linux/kprobes.h> 2435 #include <linux/kprobes.h>
2378 #include <linux/kdebug.h> 2436 #include <linux/kdebug.h>
@@ -2414,7 +2472,7 @@ diff -urNp linux-2.6.32.8/arch/powerpc/mm/fault.c linux-2.6.32.8/arch/powerpc/mm
2414+ printk(KERN_ERR "PAX: bytes at PC: "); 2472+ printk(KERN_ERR "PAX: bytes at PC: ");
2415+ for (i = 0; i < 5; i++) { 2473+ for (i = 0; i < 5; i++) {
2416+ unsigned int c; 2474+ unsigned int c;
2417+ if (get_user(c, (unsigned int *)pc+i)) 2475+ if (get_user(c, (unsigned int __user *)pc+i))
2418+ printk(KERN_CONT "???????? "); 2476+ printk(KERN_CONT "???????? ");
2419+ else 2477+ else
2420+ printk(KERN_CONT "%08x ", c); 2478+ printk(KERN_CONT "%08x ", c);
@@ -2477,9 +2535,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/mm/fault.c linux-2.6.32.8/arch/powerpc/mm
2477 _exception(SIGSEGV, regs, code, address); 2535 _exception(SIGSEGV, regs, code, address);
2478 return 0; 2536 return 0;
2479 } 2537 }
2480diff -urNp linux-2.6.32.8/arch/powerpc/mm/mmap_64.c linux-2.6.32.8/arch/powerpc/mm/mmap_64.c 2538diff -urNp linux-2.6.32.9/arch/powerpc/mm/mmap_64.c linux-2.6.32.9/arch/powerpc/mm/mmap_64.c
2481--- linux-2.6.32.8/arch/powerpc/mm/mmap_64.c 2010-02-09 07:57:19.000000000 -0500 2539--- linux-2.6.32.9/arch/powerpc/mm/mmap_64.c 2010-02-09 07:57:19.000000000 -0500
2482+++ linux-2.6.32.8/arch/powerpc/mm/mmap_64.c 2010-02-13 21:45:09.839726452 -0500 2540+++ linux-2.6.32.9/arch/powerpc/mm/mmap_64.c 2010-02-23 17:09:53.083571404 -0500
2483@@ -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
2484 */ 2542 */
2485 if (mmap_is_legacy()) { 2543 if (mmap_is_legacy()) {
@@ -2503,9 +2561,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/mm/mmap_64.c linux-2.6.32.8/arch/powerpc/
2503 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 2561 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
2504 mm->unmap_area = arch_unmap_area_topdown; 2562 mm->unmap_area = arch_unmap_area_topdown;
2505 } 2563 }
2506diff -urNp linux-2.6.32.8/arch/powerpc/mm/slice.c linux-2.6.32.8/arch/powerpc/mm/slice.c 2564diff -urNp linux-2.6.32.9/arch/powerpc/mm/slice.c linux-2.6.32.9/arch/powerpc/mm/slice.c
2507--- linux-2.6.32.8/arch/powerpc/mm/slice.c 2010-02-09 07:57:19.000000000 -0500 2565--- linux-2.6.32.9/arch/powerpc/mm/slice.c 2010-02-09 07:57:19.000000000 -0500
2508+++ linux-2.6.32.8/arch/powerpc/mm/slice.c 2010-02-13 21:45:09.839726452 -0500 2566+++ linux-2.6.32.9/arch/powerpc/mm/slice.c 2010-02-23 17:09:53.083571404 -0500
2509@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un 2567@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un
2510 if (fixed && addr > (mm->task_size - len)) 2568 if (fixed && addr > (mm->task_size - len))
2511 return -EINVAL; 2569 return -EINVAL;
@@ -2518,9 +2576,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/mm/slice.c linux-2.6.32.8/arch/powerpc/mm
2518 /* If hint, make sure it matches our alignment restrictions */ 2576 /* If hint, make sure it matches our alignment restrictions */
2519 if (!fixed && addr) { 2577 if (!fixed && addr) {
2520 addr = _ALIGN_UP(addr, 1ul << pshift); 2578 addr = _ALIGN_UP(addr, 1ul << pshift);
2521diff -urNp linux-2.6.32.8/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.8/arch/powerpc/platforms/52xx/lite5200_pm.c 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
2522--- linux-2.6.32.8/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-02-09 07:57:19.000000000 -0500 2580--- linux-2.6.32.9/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-02-09 07:57:19.000000000 -0500
2523+++ linux-2.6.32.8/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-02-13 21:45:09.839726452 -0500 2581+++ linux-2.6.32.9/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-02-23 17:09:53.083571404 -0500
2524@@ -235,7 +235,7 @@ static void lite5200_pm_end(void) 2582@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
2525 lite5200_pm_target_state = PM_SUSPEND_ON; 2583 lite5200_pm_target_state = PM_SUSPEND_ON;
2526 } 2584 }
@@ -2530,9 +2588,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32
2530 .valid = lite5200_pm_valid, 2588 .valid = lite5200_pm_valid,
2531 .begin = lite5200_pm_begin, 2589 .begin = lite5200_pm_begin,
2532 .prepare = lite5200_pm_prepare, 2590 .prepare = lite5200_pm_prepare,
2533diff -urNp linux-2.6.32.8/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.8/arch/powerpc/platforms/52xx/mpc52xx_pm.c 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
2534--- linux-2.6.32.8/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-02-09 07:57:19.000000000 -0500 2592--- linux-2.6.32.9/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-02-09 07:57:19.000000000 -0500
2535+++ linux-2.6.32.8/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-02-13 21:45:09.839726452 -0500 2593+++ linux-2.6.32.9/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-02-23 17:09:53.083571404 -0500
2536@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) 2594@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
2537 iounmap(mbar); 2595 iounmap(mbar);
2538 } 2596 }
@@ -2542,9 +2600,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.
2542 .valid = mpc52xx_pm_valid, 2600 .valid = mpc52xx_pm_valid,
2543 .prepare = mpc52xx_pm_prepare, 2601 .prepare = mpc52xx_pm_prepare,
2544 .enter = mpc52xx_pm_enter, 2602 .enter = mpc52xx_pm_enter,
2545diff -urNp linux-2.6.32.8/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.8/arch/powerpc/platforms/83xx/suspend.c 2603diff -urNp linux-2.6.32.9/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.9/arch/powerpc/platforms/83xx/suspend.c
2546--- linux-2.6.32.8/arch/powerpc/platforms/83xx/suspend.c 2010-02-09 07:57:19.000000000 -0500 2604--- linux-2.6.32.9/arch/powerpc/platforms/83xx/suspend.c 2010-02-09 07:57:19.000000000 -0500
2547+++ linux-2.6.32.8/arch/powerpc/platforms/83xx/suspend.c 2010-02-13 21:45:09.839726452 -0500 2605+++ linux-2.6.32.9/arch/powerpc/platforms/83xx/suspend.c 2010-02-23 17:09:53.088041045 -0500
2548@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) 2606@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
2549 return ret; 2607 return ret;
2550 } 2608 }
@@ -2554,9 +2612,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.8/a
2554 .valid = mpc83xx_suspend_valid, 2612 .valid = mpc83xx_suspend_valid,
2555 .begin = mpc83xx_suspend_begin, 2613 .begin = mpc83xx_suspend_begin,
2556 .enter = mpc83xx_suspend_enter, 2614 .enter = mpc83xx_suspend_enter,
2557diff -urNp linux-2.6.32.8/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.8/arch/powerpc/platforms/cell/iommu.c 2615diff -urNp linux-2.6.32.9/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.9/arch/powerpc/platforms/cell/iommu.c
2558--- linux-2.6.32.8/arch/powerpc/platforms/cell/iommu.c 2010-02-09 07:57:19.000000000 -0500 2616--- linux-2.6.32.9/arch/powerpc/platforms/cell/iommu.c 2010-02-09 07:57:19.000000000 -0500
2559+++ linux-2.6.32.8/arch/powerpc/platforms/cell/iommu.c 2010-02-13 21:45:09.840902449 -0500 2617+++ linux-2.6.32.9/arch/powerpc/platforms/cell/iommu.c 2010-02-23 17:09:53.088041045 -0500
2560@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc 2618@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
2561 2619
2562 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);
@@ -2566,9 +2624,9 @@ diff -urNp linux-2.6.32.8/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.8/arc
2566 .alloc_coherent = dma_fixed_alloc_coherent, 2624 .alloc_coherent = dma_fixed_alloc_coherent,
2567 .free_coherent = dma_fixed_free_coherent, 2625 .free_coherent = dma_fixed_free_coherent,
2568 .map_sg = dma_fixed_map_sg, 2626 .map_sg = dma_fixed_map_sg,
2569diff -urNp linux-2.6.32.8/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.8/arch/powerpc/platforms/ps3/system-bus.c 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
2570--- linux-2.6.32.8/arch/powerpc/platforms/ps3/system-bus.c 2010-02-09 07:57:19.000000000 -0500 2628--- linux-2.6.32.9/arch/powerpc/platforms/ps3/system-bus.c 2010-02-09 07:57:19.000000000 -0500
2571+++ linux-2.6.32.8/arch/powerpc/platforms/ps3/system-bus.c 2010-02-13 21:45:09.840902449 -0500 2629+++ linux-2.6.32.9/arch/powerpc/platforms/ps3/system-bus.c 2010-02-23 17:09:53.088041045 -0500
2572@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi 2630@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
2573 return mask >= DMA_BIT_MASK(32); 2631 return mask >= DMA_BIT_MASK(32);
2574 } 2632 }
@@ -2587,9 +2645,57 @@ diff -urNp linux-2.6.32.8/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.8
2587 .alloc_coherent = ps3_alloc_coherent, 2645 .alloc_coherent = ps3_alloc_coherent,
2588 .free_coherent = ps3_free_coherent, 2646 .free_coherent = ps3_free_coherent,
2589 .map_sg = ps3_ioc0_map_sg, 2647 .map_sg = ps3_ioc0_map_sg,
2590diff -urNp linux-2.6.32.8/arch/s390/include/asm/uaccess.h linux-2.6.32.8/arch/s390/include/asm/uaccess.h 2648diff -urNp linux-2.6.32.9/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.9/arch/powerpc/platforms/pseries/Kconfig
2591--- linux-2.6.32.8/arch/s390/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500 2649--- linux-2.6.32.9/arch/powerpc/platforms/pseries/Kconfig 2010-02-09 07:57:19.000000000 -0500
2592+++ linux-2.6.32.8/arch/s390/include/asm/uaccess.h 2010-02-13 21:45:09.840902449 -0500 2650+++ linux-2.6.32.9/arch/powerpc/platforms/pseries/Kconfig 2010-02-23 17:09:53.088041045 -0500
2651@@ -2,6 +2,8 @@ config PPC_PSERIES
2652 depends on PPC64 && PPC_BOOK3S
2653 bool "IBM pSeries & new (POWER5-based) iSeries"
2654 select MPIC
2655+ select PCI_MSI
2656+ select XICS
2657 select PPC_I8259
2658 select PPC_RTAS
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
2661--- linux-2.6.32.9/arch/s390/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
2662+++ linux-2.6.32.9/arch/s390/include/asm/elf.h 2010-02-23 17:09:53.088041045 -0500
2663@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
2664 that it will "exec", and that there is sufficient room for the brk. */
2665 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
2666
2667+#ifdef CONFIG_PAX_ASLR
2668+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
2669+
2670+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26 )
2671+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26 )
2672+#endif
2673+
2674 /* This yields a mask that user programs can use to figure out what
2675 instruction set this CPU supports. */
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
2678--- linux-2.6.32.9/arch/s390/include/asm/setup.h 2010-02-09 07:57:19.000000000 -0500
2679+++ linux-2.6.32.9/arch/s390/include/asm/setup.h 2010-02-23 17:09:53.088041045 -0500
2680@@ -50,13 +50,13 @@ extern unsigned long memory_end;
2681 void detect_memory_layout(struct mem_chunk chunk[]);
2682
2683 #ifdef CONFIG_S390_SWITCH_AMODE
2684-extern unsigned int switch_amode;
2685+#define switch_amode (1)
2686 #else
2687 #define switch_amode (0)
2688 #endif
2689
2690 #ifdef CONFIG_S390_EXEC_PROTECT
2691-extern unsigned int s390_noexec;
2692+#define s390_noexec (1)
2693 #else
2694 #define s390_noexec (0)
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
2697--- linux-2.6.32.9/arch/s390/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500
2698+++ linux-2.6.32.9/arch/s390/include/asm/uaccess.h 2010-02-23 17:09:53.088041045 -0500
2593@@ -232,6 +232,10 @@ static inline unsigned long __must_check 2699@@ -232,6 +232,10 @@ static inline unsigned long __must_check
2594 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)
2595 { 2701 {
@@ -2622,9 +2728,49 @@ diff -urNp linux-2.6.32.8/arch/s390/include/asm/uaccess.h linux-2.6.32.8/arch/s3
2622 if (access_ok(VERIFY_READ, from, n)) 2728 if (access_ok(VERIFY_READ, from, n))
2623 n = __copy_from_user(to, from, n); 2729 n = __copy_from_user(to, from, n);
2624 else 2730 else
2625diff -urNp linux-2.6.32.8/arch/s390/kernel/module.c linux-2.6.32.8/arch/s390/kernel/module.c 2731diff -urNp linux-2.6.32.9/arch/s390/Kconfig linux-2.6.32.9/arch/s390/Kconfig
2626--- linux-2.6.32.8/arch/s390/kernel/module.c 2010-02-09 07:57:19.000000000 -0500 2732--- linux-2.6.32.9/arch/s390/Kconfig 2010-02-09 07:57:19.000000000 -0500
2627+++ linux-2.6.32.8/arch/s390/kernel/module.c 2010-02-13 21:45:09.840902449 -0500 2733+++ linux-2.6.32.9/arch/s390/Kconfig 2010-02-23 17:09:53.088041045 -0500
2734@@ -194,28 +194,26 @@ config AUDIT_ARCH
2735
2736 config S390_SWITCH_AMODE
2737 bool "Switch kernel/user addressing modes"
2738+ default y
2739 help
2740 This option allows to switch the addressing modes of kernel and user
2741- space. The kernel parameter switch_amode=on will enable this feature,
2742- default is disabled. Enabling this (via kernel parameter) on machines
2743- earlier than IBM System z9-109 EC/BC will reduce system performance.
2744+ space. Enabling this on machines earlier than IBM System z9-109 EC/BC
2745+ will reduce system performance.
2746
2747 Note that this option will also be selected by selecting the execute
2748- protection option below. Enabling the execute protection via the
2749- noexec kernel parameter will also switch the addressing modes,
2750- independent of the switch_amode kernel parameter.
2751+ protection option below. Enabling the execute protection will also
2752+ switch the addressing modes, independent of this option.
2753
2754
2755 config S390_EXEC_PROTECT
2756 bool "Data execute protection"
2757+ default y
2758 select S390_SWITCH_AMODE
2759 help
2760 This option allows to enable a buffer overflow protection for user
2761 space programs and it also selects the addressing mode option above.
2762- The kernel parameter noexec=on will enable this feature and also
2763- switch the addressing modes, default is disabled. Enabling this (via
2764- kernel parameter) on machines earlier than IBM System z9-109 EC/BC
2765- will reduce system performance.
2766+ Enabling this on machines earlier than IBM System z9-109 EC/BC will
2767+ reduce system performance.
2768
2769 comment "Code generation options"
2770
2771diff -urNp linux-2.6.32.9/arch/s390/kernel/module.c linux-2.6.32.9/arch/s390/kernel/module.c
2772--- linux-2.6.32.9/arch/s390/kernel/module.c 2010-02-09 07:57:19.000000000 -0500
2773+++ linux-2.6.32.9/arch/s390/kernel/module.c 2010-02-23 17:09:53.088041045 -0500
2628@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, 2774@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
2629 2775
2630 /* Increase core size by size of got & plt and set start 2776 /* Increase core size by size of got & plt and set start
@@ -2696,9 +2842,114 @@ diff -urNp linux-2.6.32.8/arch/s390/kernel/module.c linux-2.6.32.8/arch/s390/ker
2696 rela->r_addend - loc; 2842 rela->r_addend - loc;
2697 if (r_type == R_390_GOTPC) 2843 if (r_type == R_390_GOTPC)
2698 *(unsigned int *) loc = val; 2844 *(unsigned int *) loc = val;
2699diff -urNp linux-2.6.32.8/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.8/arch/sh/boards/mach-hp6xx/pm.c 2845diff -urNp linux-2.6.32.9/arch/s390/kernel/setup.c linux-2.6.32.9/arch/s390/kernel/setup.c
2700--- linux-2.6.32.8/arch/sh/boards/mach-hp6xx/pm.c 2010-02-09 07:57:19.000000000 -0500 2846--- linux-2.6.32.9/arch/s390/kernel/setup.c 2010-02-09 07:57:19.000000000 -0500
2701+++ linux-2.6.32.8/arch/sh/boards/mach-hp6xx/pm.c 2010-02-13 21:45:09.841903398 -0500 2847+++ linux-2.6.32.9/arch/s390/kernel/setup.c 2010-02-23 17:09:53.088041045 -0500
2848@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
2849 early_param("mem", early_parse_mem);
2850
2851 #ifdef CONFIG_S390_SWITCH_AMODE
2852-unsigned int switch_amode = 0;
2853-EXPORT_SYMBOL_GPL(switch_amode);
2854-
2855 static int set_amode_and_uaccess(unsigned long user_amode,
2856 unsigned long user32_amode)
2857 {
2858@@ -334,17 +331,6 @@ static int set_amode_and_uaccess(unsigne
2859 return 0;
2860 }
2861 }
2862-
2863-/*
2864- * Switch kernel/user addressing modes?
2865- */
2866-static int __init early_parse_switch_amode(char *p)
2867-{
2868- switch_amode = 1;
2869- return 0;
2870-}
2871-early_param("switch_amode", early_parse_switch_amode);
2872-
2873 #else /* CONFIG_S390_SWITCH_AMODE */
2874 static inline int set_amode_and_uaccess(unsigned long user_amode,
2875 unsigned long user32_amode)
2876@@ -353,24 +339,6 @@ static inline int set_amode_and_uaccess(
2877 }
2878 #endif /* CONFIG_S390_SWITCH_AMODE */
2879
2880-#ifdef CONFIG_S390_EXEC_PROTECT
2881-unsigned int s390_noexec = 0;
2882-EXPORT_SYMBOL_GPL(s390_noexec);
2883-
2884-/*
2885- * Enable execute protection?
2886- */
2887-static int __init early_parse_noexec(char *p)
2888-{
2889- if (!strncmp(p, "off", 3))
2890- return 0;
2891- switch_amode = 1;
2892- s390_noexec = 1;
2893- return 0;
2894-}
2895-early_param("noexec", early_parse_noexec);
2896-#endif /* CONFIG_S390_EXEC_PROTECT */
2897-
2898 static void setup_addressing_mode(void)
2899 {
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
2902--- linux-2.6.32.9/arch/s390/mm/mmap.c 2010-02-09 07:57:19.000000000 -0500
2903+++ linux-2.6.32.9/arch/s390/mm/mmap.c 2010-02-23 17:09:53.088041045 -0500
2904@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
2905 */
2906 if (mmap_is_legacy()) {
2907 mm->mmap_base = TASK_UNMAPPED_BASE;
2908+
2909+#ifdef CONFIG_PAX_RANDMMAP
2910+ if (mm->pax_flags & MF_PAX_RANDMMAP)
2911+ mm->mmap_base += mm->delta_mmap;
2912+#endif
2913+
2914 mm->get_unmapped_area = arch_get_unmapped_area;
2915 mm->unmap_area = arch_unmap_area;
2916 } else {
2917 mm->mmap_base = mmap_base();
2918+
2919+#ifdef CONFIG_PAX_RANDMMAP
2920+ if (mm->pax_flags & MF_PAX_RANDMMAP)
2921+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
2922+#endif
2923+
2924 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
2925 mm->unmap_area = arch_unmap_area_topdown;
2926 }
2927@@ -153,10 +165,22 @@ void arch_pick_mmap_layout(struct mm_str
2928 */
2929 if (mmap_is_legacy()) {
2930 mm->mmap_base = TASK_UNMAPPED_BASE;
2931+
2932+#ifdef CONFIG_PAX_RANDMMAP
2933+ if (mm->pax_flags & MF_PAX_RANDMMAP)
2934+ mm->mmap_base += mm->delta_mmap;
2935+#endif
2936+
2937 mm->get_unmapped_area = s390_get_unmapped_area;
2938 mm->unmap_area = arch_unmap_area;
2939 } else {
2940 mm->mmap_base = mmap_base();
2941+
2942+#ifdef CONFIG_PAX_RANDMMAP
2943+ if (mm->pax_flags & MF_PAX_RANDMMAP)
2944+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
2945+#endif
2946+
2947 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
2948 mm->unmap_area = arch_unmap_area_topdown;
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
2951--- linux-2.6.32.9/arch/sh/boards/mach-hp6xx/pm.c 2010-02-09 07:57:19.000000000 -0500
2952+++ linux-2.6.32.9/arch/sh/boards/mach-hp6xx/pm.c 2010-02-23 17:09:53.088041045 -0500
2702@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ 2953@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
2703 return 0; 2954 return 0;
2704 } 2955 }
@@ -2708,9 +2959,9 @@ diff -urNp linux-2.6.32.8/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.8/arch/sh/
2708 .enter = hp6x0_pm_enter, 2959 .enter = hp6x0_pm_enter,
2709 .valid = suspend_valid_only_mem, 2960 .valid = suspend_valid_only_mem,
2710 }; 2961 };
2711diff -urNp linux-2.6.32.8/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.8/arch/sh/kernel/cpu/sh4/sq.c 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
2712--- linux-2.6.32.8/arch/sh/kernel/cpu/sh4/sq.c 2010-02-09 07:57:19.000000000 -0500 2963--- linux-2.6.32.9/arch/sh/kernel/cpu/sh4/sq.c 2010-02-09 07:57:19.000000000 -0500
2713+++ linux-2.6.32.8/arch/sh/kernel/cpu/sh4/sq.c 2010-02-13 21:45:09.841903398 -0500 2964+++ linux-2.6.32.9/arch/sh/kernel/cpu/sh4/sq.c 2010-02-23 17:09:53.088041045 -0500
2714@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ 2965@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
2715 NULL, 2966 NULL,
2716 }; 2967 };
@@ -2720,9 +2971,9 @@ diff -urNp linux-2.6.32.8/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.8/arch/sh/ker
2720 .show = sq_sysfs_show, 2971 .show = sq_sysfs_show,
2721 .store = sq_sysfs_store, 2972 .store = sq_sysfs_store,
2722 }; 2973 };
2723diff -urNp linux-2.6.32.8/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.8/arch/sh/kernel/cpu/shmobile/pm.c 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
2724--- linux-2.6.32.8/arch/sh/kernel/cpu/shmobile/pm.c 2010-02-09 07:57:19.000000000 -0500 2975--- linux-2.6.32.9/arch/sh/kernel/cpu/shmobile/pm.c 2010-02-09 07:57:19.000000000 -0500
2725+++ linux-2.6.32.8/arch/sh/kernel/cpu/shmobile/pm.c 2010-02-13 21:45:09.841903398 -0500 2976+++ linux-2.6.32.9/arch/sh/kernel/cpu/shmobile/pm.c 2010-02-23 17:09:53.088041045 -0500
2726@@ -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
2727 return 0; 2978 return 0;
2728 } 2979 }
@@ -2732,9 +2983,9 @@ diff -urNp linux-2.6.32.8/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.8/arch/s
2732 .enter = sh_pm_enter, 2983 .enter = sh_pm_enter,
2733 .valid = suspend_valid_only_mem, 2984 .valid = suspend_valid_only_mem,
2734 }; 2985 };
2735diff -urNp linux-2.6.32.8/arch/sh/kernel/kgdb.c linux-2.6.32.8/arch/sh/kernel/kgdb.c 2986diff -urNp linux-2.6.32.9/arch/sh/kernel/kgdb.c linux-2.6.32.9/arch/sh/kernel/kgdb.c
2736--- linux-2.6.32.8/arch/sh/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500 2987--- linux-2.6.32.9/arch/sh/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500
2737+++ linux-2.6.32.8/arch/sh/kernel/kgdb.c 2010-02-13 21:45:09.841903398 -0500 2988+++ linux-2.6.32.9/arch/sh/kernel/kgdb.c 2010-02-23 17:09:53.088041045 -0500
2738@@ -271,7 +271,7 @@ void kgdb_arch_exit(void) 2989@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
2739 { 2990 {
2740 } 2991 }
@@ -2744,21 +2995,33 @@ diff -urNp linux-2.6.32.8/arch/sh/kernel/kgdb.c linux-2.6.32.8/arch/sh/kernel/kg
2744 /* Breakpoint instruction: trapa #0x3c */ 2995 /* Breakpoint instruction: trapa #0x3c */
2745 #ifdef CONFIG_CPU_LITTLE_ENDIAN 2996 #ifdef CONFIG_CPU_LITTLE_ENDIAN
2746 .gdb_bpt_instr = { 0x3c, 0xc3 }, 2997 .gdb_bpt_instr = { 0x3c, 0xc3 },
2747diff -urNp linux-2.6.32.8/arch/sparc/include/asm/atomic_64.h linux-2.6.32.8/arch/sparc/include/asm/atomic_64.h 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
2748--- linux-2.6.32.8/arch/sparc/include/asm/atomic_64.h 2010-02-09 07:57:19.000000000 -0500 2999--- linux-2.6.32.9/arch/sparc/include/asm/atomic_64.h 2010-02-09 07:57:19.000000000 -0500
2749+++ linux-2.6.32.8/arch/sparc/include/asm/atomic_64.h 2010-02-13 21:45:09.841903398 -0500 3000+++ linux-2.6.32.9/arch/sparc/include/asm/atomic_64.h 2010-02-23 17:09:53.088041045 -0500
2750@@ -14,18 +14,26 @@ 3001@@ -14,18 +14,38 @@
2751 #define ATOMIC64_INIT(i) { (i) } 3002 #define ATOMIC64_INIT(i) { (i) }
2752 3003
2753 #define atomic_read(v) ((v)->counter) 3004 #define atomic_read(v) ((v)->counter)
2754+#define atomic_read_unchecked(v) ((v)->counter) 3005+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
3006+{
3007+ return v->counter;
3008+}
2755 #define atomic64_read(v) ((v)->counter) 3009 #define atomic64_read(v) ((v)->counter)
2756+#define atomic64_read_unchecked(v) ((v)->counter) 3010+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
3011+{
3012+ return v->counter;
3013+}
2757 3014
2758 #define atomic_set(v, i) (((v)->counter) = i) 3015 #define atomic_set(v, i) (((v)->counter) = i)
2759+#define atomic_set_unchecked(v, i) (((v)->counter) = i) 3016+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
3017+{
3018+ v->counter = i;
3019+}
2760 #define atomic64_set(v, i) (((v)->counter) = i) 3020 #define atomic64_set(v, i) (((v)->counter) = i)
2761+#define atomic64_set_unchecked(v, i) (((v)->counter) = i) 3021+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
3022+{
3023+ v->counter = i;
3024+}
2762 3025
2763 extern void atomic_add(int, atomic_t *); 3026 extern void atomic_add(int, atomic_t *);
2764+extern void atomic_add_unchecked(int, atomic_unchecked_t *); 3027+extern void atomic_add_unchecked(int, atomic_unchecked_t *);
@@ -2774,7 +3037,7 @@ diff -urNp linux-2.6.32.8/arch/sparc/include/asm/atomic_64.h linux-2.6.32.8/arch
2774 extern int atomic_sub_ret(int, atomic_t *); 3037 extern int atomic_sub_ret(int, atomic_t *);
2775 extern int atomic64_sub_ret(int, atomic64_t *); 3038 extern int atomic64_sub_ret(int, atomic64_t *);
2776 3039
2777@@ -34,6 +42,7 @@ extern int atomic64_sub_ret(int, atomic6 3040@@ -34,6 +54,7 @@ extern int atomic64_sub_ret(int, atomic6
2778 3041
2779 #define atomic_inc_return(v) atomic_add_ret(1, v) 3042 #define atomic_inc_return(v) atomic_add_ret(1, v)
2780 #define atomic64_inc_return(v) atomic64_add_ret(1, v) 3043 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
@@ -2782,17 +3045,23 @@ diff -urNp linux-2.6.32.8/arch/sparc/include/asm/atomic_64.h linux-2.6.32.8/arch
2782 3045
2783 #define atomic_sub_return(i, v) atomic_sub_ret(i, v) 3046 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
2784 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v) 3047 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
2785@@ -59,7 +68,9 @@ extern int atomic64_sub_ret(int, atomic6 3048@@ -59,7 +80,15 @@ extern int atomic64_sub_ret(int, atomic6
2786 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0) 3049 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
2787 3050
2788 #define atomic_inc(v) atomic_add(1, v) 3051 #define atomic_inc(v) atomic_add(1, v)
2789+#define atomic_inc_unchecked(v) atomic_add_unchecked(1, v) 3052+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
3053+{
3054+ atomic_add_unchecked(1, v);
3055+}
2790 #define atomic64_inc(v) atomic64_add(1, v) 3056 #define atomic64_inc(v) atomic64_add(1, v)
2791+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, v) 3057+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
3058+{
3059+ atomic64_add_unchecked(1, v);
3060+}
2792 3061
2793 #define atomic_dec(v) atomic_sub(1, v) 3062 #define atomic_dec(v) atomic_sub(1, v)
2794 #define atomic64_dec(v) atomic64_sub(1, v) 3063 #define atomic64_dec(v) atomic64_sub(1, v)
2795@@ -72,17 +83,28 @@ extern int atomic64_sub_ret(int, atomic6 3064@@ -72,17 +101,28 @@ extern int atomic64_sub_ret(int, atomic6
2796 3065
2797 static inline int atomic_add_unless(atomic_t *v, int a, int u) 3066 static inline int atomic_add_unless(atomic_t *v, int a, int u)
2798 { 3067 {
@@ -2825,7 +3094,7 @@ diff -urNp linux-2.6.32.8/arch/sparc/include/asm/atomic_64.h linux-2.6.32.8/arch
2825 } 3094 }
2826 3095
2827 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) 3096 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
2828@@ -93,17 +115,28 @@ static inline int atomic_add_unless(atom 3097@@ -93,17 +133,28 @@ static inline int atomic_add_unless(atom
2829 3098
2830 static inline int atomic64_add_unless(atomic64_t *v, long a, long u) 3099 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
2831 { 3100 {
@@ -2858,9 +3127,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/include/asm/atomic_64.h linux-2.6.32.8/arch
2858 } 3127 }
2859 3128
2860 #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)
2861diff -urNp linux-2.6.32.8/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.8/arch/sparc/include/asm/dma-mapping.h 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
2862--- linux-2.6.32.8/arch/sparc/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500 3131--- linux-2.6.32.9/arch/sparc/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500
2863+++ linux-2.6.32.8/arch/sparc/include/asm/dma-mapping.h 2010-02-13 21:45:09.841903398 -0500 3132+++ linux-2.6.32.9/arch/sparc/include/asm/dma-mapping.h 2010-02-23 17:09:53.088041045 -0500
2864@@ -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
2865 #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)
2866 #define dma_is_consistent(d, h) (1) 3135 #define dma_is_consistent(d, h) (1)
@@ -2892,9 +3161,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.8/ar
2892 3161
2893 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); 3162 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
2894 ops->free_coherent(dev, size, cpu_addr, dma_handle); 3163 ops->free_coherent(dev, size, cpu_addr, dma_handle);
2895diff -urNp linux-2.6.32.8/arch/sparc/include/asm/elf_32.h linux-2.6.32.8/arch/sparc/include/asm/elf_32.h 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
2896--- linux-2.6.32.8/arch/sparc/include/asm/elf_32.h 2010-02-09 07:57:19.000000000 -0500 3165--- linux-2.6.32.9/arch/sparc/include/asm/elf_32.h 2010-02-09 07:57:19.000000000 -0500
2897+++ linux-2.6.32.8/arch/sparc/include/asm/elf_32.h 2010-02-13 21:45:09.842907991 -0500 3166+++ linux-2.6.32.9/arch/sparc/include/asm/elf_32.h 2010-02-23 17:09:53.088041045 -0500
2898@@ -116,6 +116,13 @@ typedef struct { 3167@@ -116,6 +116,13 @@ typedef struct {
2899 3168
2900 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) 3169 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -2909,9 +3178,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/include/asm/elf_32.h linux-2.6.32.8/arch/sp
2909 /* 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
2910 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
2911 on Sparc. */ 3180 on Sparc. */
2912diff -urNp linux-2.6.32.8/arch/sparc/include/asm/elf_64.h linux-2.6.32.8/arch/sparc/include/asm/elf_64.h 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
2913--- linux-2.6.32.8/arch/sparc/include/asm/elf_64.h 2010-02-09 07:57:19.000000000 -0500 3182--- linux-2.6.32.9/arch/sparc/include/asm/elf_64.h 2010-02-09 07:57:19.000000000 -0500
2914+++ linux-2.6.32.8/arch/sparc/include/asm/elf_64.h 2010-02-13 21:45:09.842907991 -0500 3183+++ linux-2.6.32.9/arch/sparc/include/asm/elf_64.h 2010-02-23 17:09:53.088041045 -0500
2915@@ -163,6 +163,12 @@ typedef struct { 3184@@ -163,6 +163,12 @@ typedef struct {
2916 #define ELF_ET_DYN_BASE 0x0000010000000000UL 3185 #define ELF_ET_DYN_BASE 0x0000010000000000UL
2917 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL 3186 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -2919,15 +3188,15 @@ diff -urNp linux-2.6.32.8/arch/sparc/include/asm/elf_64.h linux-2.6.32.8/arch/sp
2919+#ifdef CONFIG_PAX_ASLR 3188+#ifdef CONFIG_PAX_ASLR
2920+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL) 3189+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
2921+ 3190+
2922+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28 ) 3191+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
2923+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29 ) 3192+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
2924+#endif 3193+#endif
2925 3194
2926 /* 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
2927 instruction set this cpu supports. */ 3196 instruction set this cpu supports. */
2928diff -urNp linux-2.6.32.8/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.8/arch/sparc/include/asm/pgtable_32.h 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
2929--- linux-2.6.32.8/arch/sparc/include/asm/pgtable_32.h 2010-02-09 07:57:19.000000000 -0500 3198--- linux-2.6.32.9/arch/sparc/include/asm/pgtable_32.h 2010-02-09 07:57:19.000000000 -0500
2930+++ linux-2.6.32.8/arch/sparc/include/asm/pgtable_32.h 2010-02-13 21:45:09.842907991 -0500 3199+++ linux-2.6.32.9/arch/sparc/include/asm/pgtable_32.h 2010-02-23 17:09:53.088041045 -0500
2931@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) 3200@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
2932 BTFIXUPDEF_INT(page_none) 3201 BTFIXUPDEF_INT(page_none)
2933 BTFIXUPDEF_INT(page_copy) 3202 BTFIXUPDEF_INT(page_copy)
@@ -2959,9 +3228,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.8/arc
2959 extern unsigned long page_kernel; 3228 extern unsigned long page_kernel;
2960 3229
2961 #ifdef MODULE 3230 #ifdef MODULE
2962diff -urNp linux-2.6.32.8/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.8/arch/sparc/include/asm/pgtsrmmu.h 3231diff -urNp linux-2.6.32.9/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.9/arch/sparc/include/asm/pgtsrmmu.h
2963--- linux-2.6.32.8/arch/sparc/include/asm/pgtsrmmu.h 2010-02-09 07:57:19.000000000 -0500 3232--- linux-2.6.32.9/arch/sparc/include/asm/pgtsrmmu.h 2010-02-09 07:57:19.000000000 -0500
2964+++ linux-2.6.32.8/arch/sparc/include/asm/pgtsrmmu.h 2010-02-13 21:45:09.842907991 -0500 3233+++ linux-2.6.32.9/arch/sparc/include/asm/pgtsrmmu.h 2010-02-23 17:09:53.088041045 -0500
2965@@ -115,6 +115,13 @@ 3234@@ -115,6 +115,13 @@
2966 SRMMU_EXEC | SRMMU_REF) 3235 SRMMU_EXEC | SRMMU_REF)
2967 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ 3236 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -2976,9 +3245,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.8/arch/
2976 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ 3245 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
2977 SRMMU_DIRTY | SRMMU_REF) 3246 SRMMU_DIRTY | SRMMU_REF)
2978 3247
2979diff -urNp linux-2.6.32.8/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.8/arch/sparc/include/asm/spinlock_64.h 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
2980--- linux-2.6.32.8/arch/sparc/include/asm/spinlock_64.h 2010-02-09 07:57:19.000000000 -0500 3249--- linux-2.6.32.9/arch/sparc/include/asm/spinlock_64.h 2010-02-09 07:57:19.000000000 -0500
2981+++ linux-2.6.32.8/arch/sparc/include/asm/spinlock_64.h 2010-02-13 21:45:09.843906297 -0500 3250+++ linux-2.6.32.9/arch/sparc/include/asm/spinlock_64.h 2010-02-23 17:09:53.091669311 -0500
2982@@ -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
2983 __asm__ __volatile__ ( 3252 __asm__ __volatile__ (
2984 "1: ldsw [%2], %0\n" 3253 "1: ldsw [%2], %0\n"
@@ -3030,9 +3299,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.8/ar
3030 " cas [%2], %0, %1\n" 3299 " cas [%2], %0, %1\n"
3031 " cmp %0, %1\n" 3300 " cmp %0, %1\n"
3032 " bne,pn %%xcc, 1b\n" 3301 " bne,pn %%xcc, 1b\n"
3033diff -urNp linux-2.6.32.8/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.8/arch/sparc/include/asm/uaccess_32.h 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
3034--- linux-2.6.32.8/arch/sparc/include/asm/uaccess_32.h 2010-02-09 07:57:19.000000000 -0500 3303--- linux-2.6.32.9/arch/sparc/include/asm/uaccess_32.h 2010-02-09 07:57:19.000000000 -0500
3035+++ linux-2.6.32.8/arch/sparc/include/asm/uaccess_32.h 2010-02-13 21:45:09.843906297 -0500 3304+++ linux-2.6.32.9/arch/sparc/include/asm/uaccess_32.h 2010-02-23 17:09:53.091669311 -0500
3036@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ 3305@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
3037 3306
3038 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)
@@ -3084,9 +3353,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.8/arc
3084 return __copy_user((__force void __user *) to, from, n); 3353 return __copy_user((__force void __user *) to, from, n);
3085 } 3354 }
3086 3355
3087diff -urNp linux-2.6.32.8/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.8/arch/sparc/include/asm/uaccess_64.h 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
3088--- linux-2.6.32.8/arch/sparc/include/asm/uaccess_64.h 2010-02-09 07:57:19.000000000 -0500 3357--- linux-2.6.32.9/arch/sparc/include/asm/uaccess_64.h 2010-02-09 07:57:19.000000000 -0500
3089+++ linux-2.6.32.8/arch/sparc/include/asm/uaccess_64.h 2010-02-13 21:45:09.843906297 -0500 3358+++ linux-2.6.32.9/arch/sparc/include/asm/uaccess_64.h 2010-02-23 17:09:53.091669311 -0500
3090@@ -9,6 +9,7 @@ 3359@@ -9,6 +9,7 @@
3091 #include <linux/compiler.h> 3360 #include <linux/compiler.h>
3092 #include <linux/string.h> 3361 #include <linux/string.h>
@@ -3137,9 +3406,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.8/arc
3137 if (unlikely(ret)) 3406 if (unlikely(ret))
3138 ret = copy_to_user_fixup(to, from, size); 3407 ret = copy_to_user_fixup(to, from, size);
3139 return ret; 3408 return ret;
3140diff -urNp linux-2.6.32.8/arch/sparc/kernel/iommu.c linux-2.6.32.8/arch/sparc/kernel/iommu.c 3409diff -urNp linux-2.6.32.9/arch/sparc/kernel/iommu.c linux-2.6.32.9/arch/sparc/kernel/iommu.c
3141--- linux-2.6.32.8/arch/sparc/kernel/iommu.c 2010-02-09 07:57:19.000000000 -0500 3410--- linux-2.6.32.9/arch/sparc/kernel/iommu.c 2010-02-09 07:57:19.000000000 -0500
3142+++ linux-2.6.32.8/arch/sparc/kernel/iommu.c 2010-02-13 21:45:09.844854516 -0500 3411+++ linux-2.6.32.9/arch/sparc/kernel/iommu.c 2010-02-23 17:09:53.091669311 -0500
3143@@ -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
3144 spin_unlock_irqrestore(&iommu->lock, flags); 3413 spin_unlock_irqrestore(&iommu->lock, flags);
3145 } 3414 }
@@ -3158,9 +3427,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/kernel/iommu.c linux-2.6.32.8/arch/sparc/ke
3158 EXPORT_SYMBOL(dma_ops); 3427 EXPORT_SYMBOL(dma_ops);
3159 3428
3160 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);
3161diff -urNp linux-2.6.32.8/arch/sparc/kernel/ioport.c linux-2.6.32.8/arch/sparc/kernel/ioport.c 3430diff -urNp linux-2.6.32.9/arch/sparc/kernel/ioport.c linux-2.6.32.9/arch/sparc/kernel/ioport.c
3162--- linux-2.6.32.8/arch/sparc/kernel/ioport.c 2010-02-09 07:57:19.000000000 -0500 3431--- linux-2.6.32.9/arch/sparc/kernel/ioport.c 2010-02-09 07:57:19.000000000 -0500
3163+++ linux-2.6.32.8/arch/sparc/kernel/ioport.c 2010-02-13 21:45:09.844854516 -0500 3432+++ linux-2.6.32.9/arch/sparc/kernel/ioport.c 2010-02-23 17:09:53.091669311 -0500
3164@@ -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
3165 BUG(); 3434 BUG();
3166 } 3435 }
@@ -3188,9 +3457,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/kernel/ioport.c linux-2.6.32.8/arch/sparc/k
3188 .alloc_coherent = pci32_alloc_coherent, 3457 .alloc_coherent = pci32_alloc_coherent,
3189 .free_coherent = pci32_free_coherent, 3458 .free_coherent = pci32_free_coherent,
3190 .map_page = pci32_map_page, 3459 .map_page = pci32_map_page,
3191diff -urNp linux-2.6.32.8/arch/sparc/kernel/kgdb_32.c linux-2.6.32.8/arch/sparc/kernel/kgdb_32.c 3460diff -urNp linux-2.6.32.9/arch/sparc/kernel/kgdb_32.c linux-2.6.32.9/arch/sparc/kernel/kgdb_32.c
3192--- linux-2.6.32.8/arch/sparc/kernel/kgdb_32.c 2010-02-09 07:57:19.000000000 -0500 3461--- linux-2.6.32.9/arch/sparc/kernel/kgdb_32.c 2010-02-09 07:57:19.000000000 -0500
3193+++ linux-2.6.32.8/arch/sparc/kernel/kgdb_32.c 2010-02-13 21:45:09.844854516 -0500 3462+++ linux-2.6.32.9/arch/sparc/kernel/kgdb_32.c 2010-02-23 17:09:53.091669311 -0500
3194@@ -158,7 +158,7 @@ void kgdb_arch_exit(void) 3463@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
3195 { 3464 {
3196 } 3465 }
@@ -3200,9 +3469,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/kernel/kgdb_32.c linux-2.6.32.8/arch/sparc/
3200 /* Breakpoint instruction: ta 0x7d */ 3469 /* Breakpoint instruction: ta 0x7d */
3201 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, 3470 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
3202 }; 3471 };
3203diff -urNp linux-2.6.32.8/arch/sparc/kernel/kgdb_64.c linux-2.6.32.8/arch/sparc/kernel/kgdb_64.c 3472diff -urNp linux-2.6.32.9/arch/sparc/kernel/kgdb_64.c linux-2.6.32.9/arch/sparc/kernel/kgdb_64.c
3204--- linux-2.6.32.8/arch/sparc/kernel/kgdb_64.c 2010-02-09 07:57:19.000000000 -0500 3473--- linux-2.6.32.9/arch/sparc/kernel/kgdb_64.c 2010-02-09 07:57:19.000000000 -0500
3205+++ linux-2.6.32.8/arch/sparc/kernel/kgdb_64.c 2010-02-13 21:45:09.845656514 -0500 3474+++ linux-2.6.32.9/arch/sparc/kernel/kgdb_64.c 2010-02-23 17:09:53.091669311 -0500
3206@@ -180,7 +180,7 @@ void kgdb_arch_exit(void) 3475@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
3207 { 3476 {
3208 } 3477 }
@@ -3212,9 +3481,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/kernel/kgdb_64.c linux-2.6.32.8/arch/sparc/
3212 /* Breakpoint instruction: ta 0x72 */ 3481 /* Breakpoint instruction: ta 0x72 */
3213 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, 3482 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
3214 }; 3483 };
3215diff -urNp linux-2.6.32.8/arch/sparc/kernel/Makefile linux-2.6.32.8/arch/sparc/kernel/Makefile 3484diff -urNp linux-2.6.32.9/arch/sparc/kernel/Makefile linux-2.6.32.9/arch/sparc/kernel/Makefile
3216--- linux-2.6.32.8/arch/sparc/kernel/Makefile 2010-02-09 07:57:19.000000000 -0500 3485--- linux-2.6.32.9/arch/sparc/kernel/Makefile 2010-02-09 07:57:19.000000000 -0500
3217+++ linux-2.6.32.8/arch/sparc/kernel/Makefile 2010-02-13 21:45:09.845656514 -0500 3486+++ linux-2.6.32.9/arch/sparc/kernel/Makefile 2010-02-23 17:09:53.091669311 -0500
3218@@ -3,7 +3,7 @@ 3487@@ -3,7 +3,7 @@
3219 # 3488 #
3220 3489
@@ -3224,9 +3493,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/kernel/Makefile linux-2.6.32.8/arch/sparc/k
3224 3493
3225 extra-y := head_$(BITS).o 3494 extra-y := head_$(BITS).o
3226 extra-y += init_task.o 3495 extra-y += init_task.o
3227diff -urNp linux-2.6.32.8/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.8/arch/sparc/kernel/pci_sun4v.c 3496diff -urNp linux-2.6.32.9/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.9/arch/sparc/kernel/pci_sun4v.c
3228--- linux-2.6.32.8/arch/sparc/kernel/pci_sun4v.c 2010-02-09 07:57:19.000000000 -0500 3497--- linux-2.6.32.9/arch/sparc/kernel/pci_sun4v.c 2010-02-09 07:57:19.000000000 -0500
3229+++ linux-2.6.32.8/arch/sparc/kernel/pci_sun4v.c 2010-02-13 21:45:09.845656514 -0500 3498+++ linux-2.6.32.9/arch/sparc/kernel/pci_sun4v.c 2010-02-23 17:09:53.091669311 -0500
3230@@ -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
3231 spin_unlock_irqrestore(&iommu->lock, flags); 3500 spin_unlock_irqrestore(&iommu->lock, flags);
3232 } 3501 }
@@ -3236,9 +3505,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.8/arch/spar
3236 .alloc_coherent = dma_4v_alloc_coherent, 3505 .alloc_coherent = dma_4v_alloc_coherent,
3237 .free_coherent = dma_4v_free_coherent, 3506 .free_coherent = dma_4v_free_coherent,
3238 .map_page = dma_4v_map_page, 3507 .map_page = dma_4v_map_page,
3239diff -urNp linux-2.6.32.8/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.8/arch/sparc/kernel/sys_sparc_32.c 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
3240--- linux-2.6.32.8/arch/sparc/kernel/sys_sparc_32.c 2010-02-09 07:57:19.000000000 -0500 3509--- linux-2.6.32.9/arch/sparc/kernel/sys_sparc_32.c 2010-02-09 07:57:19.000000000 -0500
3241+++ linux-2.6.32.8/arch/sparc/kernel/sys_sparc_32.c 2010-02-13 21:45:09.845656514 -0500 3510+++ linux-2.6.32.9/arch/sparc/kernel/sys_sparc_32.c 2010-02-23 17:09:53.091669311 -0500
3242@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str 3511@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
3243 if (ARCH_SUN4C && len > 0x20000000) 3512 if (ARCH_SUN4C && len > 0x20000000)
3244 return -ENOMEM; 3513 return -ENOMEM;
@@ -3248,9 +3517,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.8/arch/s
3248 3517
3249 if (flags & MAP_SHARED) 3518 if (flags & MAP_SHARED)
3250 addr = COLOUR_ALIGN(addr); 3519 addr = COLOUR_ALIGN(addr);
3251diff -urNp linux-2.6.32.8/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.8/arch/sparc/kernel/sys_sparc_64.c 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
3252--- linux-2.6.32.8/arch/sparc/kernel/sys_sparc_64.c 2010-02-09 07:57:19.000000000 -0500 3521--- linux-2.6.32.9/arch/sparc/kernel/sys_sparc_64.c 2010-02-09 07:57:19.000000000 -0500
3253+++ linux-2.6.32.8/arch/sparc/kernel/sys_sparc_64.c 2010-02-13 21:45:09.845656514 -0500 3522+++ linux-2.6.32.9/arch/sparc/kernel/sys_sparc_64.c 2010-02-23 17:09:53.091669311 -0500
3254@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str 3523@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
3255 /* We do not accept a shared mapping if it would violate 3524 /* We do not accept a shared mapping if it would violate
3256 * cache aliasing constraints. 3525 * cache aliasing constraints.
@@ -3329,9 +3598,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.8/arch/s
3329 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 3598 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
3330 mm->unmap_area = arch_unmap_area_topdown; 3599 mm->unmap_area = arch_unmap_area_topdown;
3331 } 3600 }
3332diff -urNp linux-2.6.32.8/arch/sparc/kernel/traps_64.c linux-2.6.32.8/arch/sparc/kernel/traps_64.c 3601diff -urNp linux-2.6.32.9/arch/sparc/kernel/traps_64.c linux-2.6.32.9/arch/sparc/kernel/traps_64.c
3333--- linux-2.6.32.8/arch/sparc/kernel/traps_64.c 2010-02-09 07:57:19.000000000 -0500 3602--- linux-2.6.32.9/arch/sparc/kernel/traps_64.c 2010-02-09 07:57:19.000000000 -0500
3334+++ linux-2.6.32.8/arch/sparc/kernel/traps_64.c 2010-02-13 21:45:09.846727737 -0500 3603+++ linux-2.6.32.9/arch/sparc/kernel/traps_64.c 2010-02-23 17:09:53.091669311 -0500
3335@@ -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
3336 3605
3337 lvl -= 0x100; 3606 lvl -= 0x100;
@@ -3363,9 +3632,27 @@ diff -urNp linux-2.6.32.8/arch/sparc/kernel/traps_64.c linux-2.6.32.8/arch/sparc
3363 dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); 3632 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
3364 3633
3365 sprintf (buffer, "Bad trap %lx at tl>0", lvl); 3634 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
3366diff -urNp linux-2.6.32.8/arch/sparc/lib/atomic_64.S linux-2.6.32.8/arch/sparc/lib/atomic_64.S 3635diff -urNp linux-2.6.32.9/arch/sparc/kernel/tsb.S linux-2.6.32.9/arch/sparc/kernel/tsb.S
3367--- linux-2.6.32.8/arch/sparc/lib/atomic_64.S 2010-02-09 07:57:19.000000000 -0500 3636--- linux-2.6.32.9/arch/sparc/kernel/tsb.S 2010-02-09 07:57:19.000000000 -0500
3368+++ linux-2.6.32.8/arch/sparc/lib/atomic_64.S 2010-02-13 21:45:09.846727737 -0500 3637+++ linux-2.6.32.9/arch/sparc/kernel/tsb.S 2010-02-23 17:09:53.091669311 -0500
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-09 07:57:19.000000000 -0500
3655+++ linux-2.6.32.9/arch/sparc/lib/atomic_64.S 2010-02-23 17:09:53.091669311 -0500
3369@@ -18,7 +18,12 @@ 3656@@ -18,7 +18,12 @@
3370 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ 3657 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
3371 BACKOFF_SETUP(%o2) 3658 BACKOFF_SETUP(%o2)
@@ -3559,9 +3846,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/lib/atomic_64.S linux-2.6.32.8/arch/sparc/l
3559 casx [%o1], %g1, %g7 3846 casx [%o1], %g1, %g7
3560 cmp %g1, %g7 3847 cmp %g1, %g7
3561 bne,pn %xcc, 2f 3848 bne,pn %xcc, 2f
3562diff -urNp linux-2.6.32.8/arch/sparc/lib/ksyms.c linux-2.6.32.8/arch/sparc/lib/ksyms.c 3849diff -urNp linux-2.6.32.9/arch/sparc/lib/ksyms.c linux-2.6.32.9/arch/sparc/lib/ksyms.c
3563--- linux-2.6.32.8/arch/sparc/lib/ksyms.c 2010-02-09 07:57:19.000000000 -0500 3850--- linux-2.6.32.9/arch/sparc/lib/ksyms.c 2010-02-09 07:57:19.000000000 -0500
3564+++ linux-2.6.32.8/arch/sparc/lib/ksyms.c 2010-02-13 21:45:09.867638822 -0500 3851+++ linux-2.6.32.9/arch/sparc/lib/ksyms.c 2010-02-23 17:09:53.091669311 -0500
3565@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write); 3852@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write);
3566 3853
3567 /* Atomic counter implementation. */ 3854 /* Atomic counter implementation. */
@@ -3573,9 +3860,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/lib/ksyms.c linux-2.6.32.8/arch/sparc/lib/k
3573 EXPORT_SYMBOL(atomic_sub_ret); 3860 EXPORT_SYMBOL(atomic_sub_ret);
3574 EXPORT_SYMBOL(atomic64_add); 3861 EXPORT_SYMBOL(atomic64_add);
3575 EXPORT_SYMBOL(atomic64_add_ret); 3862 EXPORT_SYMBOL(atomic64_add_ret);
3576diff -urNp linux-2.6.32.8/arch/sparc/lib/rwsem_64.S linux-2.6.32.8/arch/sparc/lib/rwsem_64.S 3863diff -urNp linux-2.6.32.9/arch/sparc/lib/rwsem_64.S linux-2.6.32.9/arch/sparc/lib/rwsem_64.S
3577--- linux-2.6.32.8/arch/sparc/lib/rwsem_64.S 2010-02-09 07:57:19.000000000 -0500 3864--- linux-2.6.32.9/arch/sparc/lib/rwsem_64.S 2010-02-09 07:57:19.000000000 -0500
3578+++ linux-2.6.32.8/arch/sparc/lib/rwsem_64.S 2010-02-13 21:45:09.867638822 -0500 3865+++ linux-2.6.32.9/arch/sparc/lib/rwsem_64.S 2010-02-23 17:09:53.091669311 -0500
3579@@ -11,7 +11,12 @@ 3866@@ -11,7 +11,12 @@
3580 .globl __down_read 3867 .globl __down_read
3581 __down_read: 3868 __down_read:
@@ -3674,9 +3961,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/lib/rwsem_64.S linux-2.6.32.8/arch/sparc/li
3674 cas [%o0], %g3, %g7 3961 cas [%o0], %g3, %g7
3675 cmp %g3, %g7 3962 cmp %g3, %g7
3676 bne,pn %icc, 1b 3963 bne,pn %icc, 1b
3677diff -urNp linux-2.6.32.8/arch/sparc/Makefile linux-2.6.32.8/arch/sparc/Makefile 3964diff -urNp linux-2.6.32.9/arch/sparc/Makefile linux-2.6.32.9/arch/sparc/Makefile
3678--- linux-2.6.32.8/arch/sparc/Makefile 2010-02-09 07:57:19.000000000 -0500 3965--- linux-2.6.32.9/arch/sparc/Makefile 2010-02-09 07:57:19.000000000 -0500
3679+++ linux-2.6.32.8/arch/sparc/Makefile 2010-02-13 21:45:09.867638822 -0500 3966+++ linux-2.6.32.9/arch/sparc/Makefile 2010-02-23 17:09:53.091669311 -0500
3680@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc 3967@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
3681 # Export what is needed by arch/sparc/boot/Makefile 3968 # Export what is needed by arch/sparc/boot/Makefile
3682 export VMLINUX_INIT VMLINUX_MAIN 3969 export VMLINUX_INIT VMLINUX_MAIN
@@ -3686,9 +3973,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/Makefile linux-2.6.32.8/arch/sparc/Makefile
3686 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) 3973 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
3687 VMLINUX_MAIN += $(drivers-y) $(net-y) 3974 VMLINUX_MAIN += $(drivers-y) $(net-y)
3688 3975
3689diff -urNp linux-2.6.32.8/arch/sparc/mm/fault_32.c linux-2.6.32.8/arch/sparc/mm/fault_32.c 3976diff -urNp linux-2.6.32.9/arch/sparc/mm/fault_32.c linux-2.6.32.9/arch/sparc/mm/fault_32.c
3690--- linux-2.6.32.8/arch/sparc/mm/fault_32.c 2010-02-09 07:57:19.000000000 -0500 3977--- linux-2.6.32.9/arch/sparc/mm/fault_32.c 2010-02-09 07:57:19.000000000 -0500
3691+++ linux-2.6.32.8/arch/sparc/mm/fault_32.c 2010-02-13 21:45:09.868766986 -0500 3978+++ linux-2.6.32.9/arch/sparc/mm/fault_32.c 2010-02-23 17:09:53.091669311 -0500
3692@@ -21,6 +21,9 @@ 3979@@ -21,6 +21,9 @@
3693 #include <linux/interrupt.h> 3980 #include <linux/interrupt.h>
3694 #include <linux/module.h> 3981 #include <linux/module.h>
@@ -3953,7 +4240,7 @@ diff -urNp linux-2.6.32.8/arch/sparc/mm/fault_32.c linux-2.6.32.8/arch/sparc/mm/
3953+ unsigned long i; 4240+ unsigned long i;
3954+ 4241+
3955+ printk(KERN_ERR "PAX: bytes at PC: "); 4242+ printk(KERN_ERR "PAX: bytes at PC: ");
3956+ for (i = 0; i < 5; i++) { 4243+ for (i = 0; i < 8; i++) {
3957+ unsigned int c; 4244+ unsigned int c;
3958+ if (get_user(c, (unsigned int *)pc+i)) 4245+ if (get_user(c, (unsigned int *)pc+i))
3959+ printk(KERN_CONT "???????? "); 4246+ printk(KERN_CONT "???????? ");
@@ -3992,9 +4279,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/mm/fault_32.c linux-2.6.32.8/arch/sparc/mm/
3992 /* Allow reads even for write-only mappings */ 4279 /* Allow reads even for write-only mappings */
3993 if(!(vma->vm_flags & (VM_READ | VM_EXEC))) 4280 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
3994 goto bad_area; 4281 goto bad_area;
3995diff -urNp linux-2.6.32.8/arch/sparc/mm/fault_64.c linux-2.6.32.8/arch/sparc/mm/fault_64.c 4282diff -urNp linux-2.6.32.9/arch/sparc/mm/fault_64.c linux-2.6.32.9/arch/sparc/mm/fault_64.c
3996--- linux-2.6.32.8/arch/sparc/mm/fault_64.c 2010-02-09 07:57:19.000000000 -0500 4283--- linux-2.6.32.9/arch/sparc/mm/fault_64.c 2010-02-09 07:57:19.000000000 -0500
3997+++ linux-2.6.32.8/arch/sparc/mm/fault_64.c 2010-02-13 21:45:09.868766986 -0500 4284+++ linux-2.6.32.9/arch/sparc/mm/fault_64.c 2010-02-23 17:11:24.403715775 -0500
3998@@ -20,6 +20,9 @@ 4285@@ -20,6 +20,9 @@
3999 #include <linux/kprobes.h> 4286 #include <linux/kprobes.h>
4000 #include <linux/kdebug.h> 4287 #include <linux/kdebug.h>
@@ -4005,7 +4292,7 @@ diff -urNp linux-2.6.32.8/arch/sparc/mm/fault_64.c linux-2.6.32.8/arch/sparc/mm/
4005 4292
4006 #include <asm/page.h> 4293 #include <asm/page.h>
4007 #include <asm/pgtable.h> 4294 #include <asm/pgtable.h>
4008@@ -249,6 +252,416 @@ static void noinline bogus_32bit_fault_a 4295@@ -249,6 +252,456 @@ static void noinline bogus_32bit_fault_a
4009 show_regs(regs); 4296 show_regs(regs);
4010 } 4297 }
4011 4298
@@ -4148,16 +4435,18 @@ diff -urNp linux-2.6.32.8/arch/sparc/mm/fault_64.c linux-2.6.32.8/arch/sparc/mm/
4148+ } while (0); 4435+ } while (0);
4149+ 4436+
4150+ do { /* PaX: patched PLT emulation #4 */ 4437+ do { /* PaX: patched PLT emulation #4 */
4151+ unsigned int mov1, call, mov2; 4438+ unsigned int sethi, mov1, call, mov2;
4152+ 4439+
4153+ err = get_user(mov1, (unsigned int *)regs->tpc); 4440+ err = get_user(sethi, (unsigned int *)regs->tpc);
4154+ err |= get_user(call, (unsigned int *)(regs->tpc+4)); 4441+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
4155+ err |= get_user(mov2, (unsigned int *)(regs->tpc+8)); 4442+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
4443+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
4156+ 4444+
4157+ if (err) 4445+ if (err)
4158+ break; 4446+ break;
4159+ 4447+
4160+ if (mov1 == 0x8210000FU && 4448+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
4449+ mov1 == 0x8210000FU &&
4161+ (call & 0xC0000000U) == 0x40000000U && 4450+ (call & 0xC0000000U) == 0x40000000U &&
4162+ mov2 == 0x9E100001U) 4451+ mov2 == 0x9E100001U)
4163+ { 4452+ {
@@ -4176,24 +4465,26 @@ diff -urNp linux-2.6.32.8/arch/sparc/mm/fault_64.c linux-2.6.32.8/arch/sparc/mm/
4176+ } while (0); 4465+ } while (0);
4177+ 4466+
4178+ do { /* PaX: patched PLT emulation #5 */ 4467+ do { /* PaX: patched PLT emulation #5 */
4179+ unsigned int sethi1, sethi2, or1, or2, sllx, jmpl, nop; 4468+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
4180+ 4469+
4181+ err = get_user(sethi1, (unsigned int *)regs->tpc); 4470+ err = get_user(sethi, (unsigned int *)regs->tpc);
4182+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4)); 4471+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
4183+ err |= get_user(or1, (unsigned int *)(regs->tpc+8)); 4472+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
4184+ err |= get_user(or2, (unsigned int *)(regs->tpc+12)); 4473+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
4185+ err |= get_user(sllx, (unsigned int *)(regs->tpc+16)); 4474+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
4186+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20)); 4475+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
4187+ err |= get_user(nop, (unsigned int *)(regs->tpc+24)); 4476+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
4477+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
4188+ 4478+
4189+ if (err) 4479+ if (err)
4190+ break; 4480+ break;
4191+ 4481+
4192+ if ((sethi1 & 0xFFC00000U) == 0x03000000U && 4482+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
4483+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
4193+ (sethi2 & 0xFFC00000U) == 0x0B000000U && 4484+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
4194+ (or1 & 0xFFFFE000U) == 0x82106000U && 4485+ (or1 & 0xFFFFE000U) == 0x82106000U &&
4195+ (or2 & 0xFFFFE000U) == 0x8A116000U && 4486+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
4196+ sllx == 0x83287020 && 4487+ sllx == 0x83287020U &&
4197+ jmpl == 0x81C04005U && 4488+ jmpl == 0x81C04005U &&
4198+ nop == 0x01000000U) 4489+ nop == 0x01000000U)
4199+ { 4490+ {
@@ -4210,21 +4501,23 @@ diff -urNp linux-2.6.32.8/arch/sparc/mm/fault_64.c linux-2.6.32.8/arch/sparc/mm/
4210+ } while (0); 4501+ } while (0);
4211+ 4502+
4212+ do { /* PaX: patched PLT emulation #6 */ 4503+ do { /* PaX: patched PLT emulation #6 */
4213+ unsigned int sethi1, sethi2, sllx, or, jmpl, nop; 4504+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
4214+ 4505+
4215+ err = get_user(sethi1, (unsigned int *)regs->tpc); 4506+ err = get_user(sethi, (unsigned int *)regs->tpc);
4216+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4)); 4507+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
4217+ err |= get_user(sllx, (unsigned int *)(regs->tpc+8)); 4508+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
4218+ err |= get_user(or, (unsigned int *)(regs->tpc+12)); 4509+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
4219+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+16)); 4510+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
4220+ err |= get_user(nop, (unsigned int *)(regs->tpc+20)); 4511+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
4512+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
4221+ 4513+
4222+ if (err) 4514+ if (err)
4223+ break; 4515+ break;
4224+ 4516+
4225+ if ((sethi1 & 0xFFC00000U) == 0x03000000U && 4517+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
4518+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
4226+ (sethi2 & 0xFFC00000U) == 0x0B000000U && 4519+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
4227+ sllx == 0x83287020 && 4520+ sllx == 0x83287020U &&
4228+ (or & 0xFFFFE000U) == 0x8A116000U && 4521+ (or & 0xFFFFE000U) == 0x8A116000U &&
4229+ jmpl == 0x81C04005U && 4522+ jmpl == 0x81C04005U &&
4230+ nop == 0x01000000U) 4523+ nop == 0x01000000U)
@@ -4257,6 +4550,7 @@ diff -urNp linux-2.6.32.8/arch/sparc/mm/fault_64.c linux-2.6.32.8/arch/sparc/mm/
4257+ { 4550+ {
4258+ unsigned long addr; 4551+ unsigned long addr;
4259+ unsigned int save, call; 4552+ unsigned int save, call;
4553+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
4260+ 4554+
4261+ if ((ba & 0xFFC00000U) == 0x30800000U) 4555+ if ((ba & 0xFFC00000U) == 0x30800000U)
4262+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2); 4556+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
@@ -4339,6 +4633,39 @@ diff -urNp linux-2.6.32.8/arch/sparc/mm/fault_64.c linux-2.6.32.8/arch/sparc/mm/
4339+ regs->tnpc = addr+4; 4633+ regs->tnpc = addr+4;
4340+ return 3; 4634+ return 3;
4341+ } 4635+ }
4636+
4637+ /* PaX: 64-bit PLT stub */
4638+ err = get_user(sethi1, (unsigned int *)addr);
4639+ err |= get_user(sethi2, (unsigned int *)(addr+4));
4640+ err |= get_user(or1, (unsigned int *)(addr+8));
4641+ err |= get_user(or2, (unsigned int *)(addr+12));
4642+ err |= get_user(sllx, (unsigned int *)(addr+16));
4643+ err |= get_user(add, (unsigned int *)(addr+20));
4644+ err |= get_user(jmpl, (unsigned int *)(addr+24));
4645+ err |= get_user(nop, (unsigned int *)(addr+28));
4646+ if (err)
4647+ break;
4648+
4649+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
4650+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
4651+ (or1 & 0xFFFFE000U) == 0x88112000U &&
4652+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
4653+ sllx == 0x89293020U &&
4654+ add == 0x8A010005U &&
4655+ jmpl == 0x89C14000U &&
4656+ nop == 0x01000000U)
4657+ {
4658+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
4659+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
4660+ regs->u_regs[UREG_G4] <<= 32;
4661+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
4662+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
4663+ regs->u_regs[UREG_G4] = addr + 24;
4664+ addr = regs->u_regs[UREG_G5];
4665+ regs->tpc = addr;
4666+ regs->tnpc = addr+4;
4667+ return 3;
4668+ }
4342+ } 4669+ }
4343+ } while (0); 4670+ } while (0);
4344+ 4671+
@@ -4408,7 +4735,7 @@ diff -urNp linux-2.6.32.8/arch/sparc/mm/fault_64.c linux-2.6.32.8/arch/sparc/mm/
4408+ unsigned long i; 4735+ unsigned long i;
4409+ 4736+
4410+ printk(KERN_ERR "PAX: bytes at PC: "); 4737+ printk(KERN_ERR "PAX: bytes at PC: ");
4411+ for (i = 0; i < 5; i++) { 4738+ for (i = 0; i < 8; i++) {
4412+ unsigned int c; 4739+ unsigned int c;
4413+ if (get_user(c, (unsigned int *)pc+i)) 4740+ if (get_user(c, (unsigned int *)pc+i))
4414+ printk(KERN_CONT "???????? "); 4741+ printk(KERN_CONT "???????? ");
@@ -4422,7 +4749,7 @@ diff -urNp linux-2.6.32.8/arch/sparc/mm/fault_64.c linux-2.6.32.8/arch/sparc/mm/
4422 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) 4749 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
4423 { 4750 {
4424 struct mm_struct *mm = current->mm; 4751 struct mm_struct *mm = current->mm;
4425@@ -315,6 +728,29 @@ asmlinkage void __kprobes do_sparc64_fau 4752@@ -315,6 +768,29 @@ asmlinkage void __kprobes do_sparc64_fau
4426 if (!vma) 4753 if (!vma)
4427 goto bad_area; 4754 goto bad_area;
4428 4755
@@ -4452,9 +4779,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/mm/fault_64.c linux-2.6.32.8/arch/sparc/mm/
4452 /* Pure DTLB misses do not tell us whether the fault causing 4779 /* Pure DTLB misses do not tell us whether the fault causing
4453 * load/store/atomic was a write or not, it only says that there 4780 * load/store/atomic was a write or not, it only says that there
4454 * was no match. So in such a case we (carefully) read the 4781 * was no match. So in such a case we (carefully) read the
4455diff -urNp linux-2.6.32.8/arch/sparc/mm/init_32.c linux-2.6.32.8/arch/sparc/mm/init_32.c 4782diff -urNp linux-2.6.32.9/arch/sparc/mm/init_32.c linux-2.6.32.9/arch/sparc/mm/init_32.c
4456--- linux-2.6.32.8/arch/sparc/mm/init_32.c 2010-02-09 07:57:19.000000000 -0500 4783--- linux-2.6.32.9/arch/sparc/mm/init_32.c 2010-02-09 07:57:19.000000000 -0500
4457+++ linux-2.6.32.8/arch/sparc/mm/init_32.c 2010-02-13 21:45:09.868766986 -0500 4784+++ linux-2.6.32.9/arch/sparc/mm/init_32.c 2010-02-23 17:09:53.095660904 -0500
4458@@ -317,6 +317,9 @@ extern void device_scan(void); 4785@@ -317,6 +317,9 @@ extern void device_scan(void);
4459 pgprot_t PAGE_SHARED __read_mostly; 4786 pgprot_t PAGE_SHARED __read_mostly;
4460 EXPORT_SYMBOL(PAGE_SHARED); 4787 EXPORT_SYMBOL(PAGE_SHARED);
@@ -4489,9 +4816,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/mm/init_32.c linux-2.6.32.8/arch/sparc/mm/i
4489 protection_map[12] = PAGE_READONLY; 4816 protection_map[12] = PAGE_READONLY;
4490 protection_map[13] = PAGE_READONLY; 4817 protection_map[13] = PAGE_READONLY;
4491 protection_map[14] = PAGE_SHARED; 4818 protection_map[14] = PAGE_SHARED;
4492diff -urNp linux-2.6.32.8/arch/sparc/mm/Makefile linux-2.6.32.8/arch/sparc/mm/Makefile 4819diff -urNp linux-2.6.32.9/arch/sparc/mm/Makefile linux-2.6.32.9/arch/sparc/mm/Makefile
4493--- linux-2.6.32.8/arch/sparc/mm/Makefile 2010-02-09 07:57:19.000000000 -0500 4820--- linux-2.6.32.9/arch/sparc/mm/Makefile 2010-02-09 07:57:19.000000000 -0500
4494+++ linux-2.6.32.8/arch/sparc/mm/Makefile 2010-02-13 21:45:09.869909278 -0500 4821+++ linux-2.6.32.9/arch/sparc/mm/Makefile 2010-02-23 17:09:53.095660904 -0500
4495@@ -2,7 +2,7 @@ 4822@@ -2,7 +2,7 @@
4496 # 4823 #
4497 4824
@@ -4501,9 +4828,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/mm/Makefile linux-2.6.32.8/arch/sparc/mm/Ma
4501 4828
4502 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o 4829 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
4503 obj-y += fault_$(BITS).o 4830 obj-y += fault_$(BITS).o
4504diff -urNp linux-2.6.32.8/arch/sparc/mm/srmmu.c linux-2.6.32.8/arch/sparc/mm/srmmu.c 4831diff -urNp linux-2.6.32.9/arch/sparc/mm/srmmu.c linux-2.6.32.9/arch/sparc/mm/srmmu.c
4505--- linux-2.6.32.8/arch/sparc/mm/srmmu.c 2010-02-09 07:57:19.000000000 -0500 4832--- linux-2.6.32.9/arch/sparc/mm/srmmu.c 2010-02-09 07:57:19.000000000 -0500
4506+++ linux-2.6.32.8/arch/sparc/mm/srmmu.c 2010-02-13 21:45:09.869909278 -0500 4833+++ linux-2.6.32.9/arch/sparc/mm/srmmu.c 2010-02-23 17:09:53.095660904 -0500
4507@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) 4834@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
4508 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); 4835 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
4509 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); 4836 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -4518,9 +4845,9 @@ diff -urNp linux-2.6.32.8/arch/sparc/mm/srmmu.c linux-2.6.32.8/arch/sparc/mm/srm
4518 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); 4845 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
4519 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); 4846 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
4520 4847
4521diff -urNp linux-2.6.32.8/arch/um/include/asm/kmap_types.h linux-2.6.32.8/arch/um/include/asm/kmap_types.h 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
4522--- linux-2.6.32.8/arch/um/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500 4849--- linux-2.6.32.9/arch/um/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500
4523+++ linux-2.6.32.8/arch/um/include/asm/kmap_types.h 2010-02-13 21:45:09.870806418 -0500 4850+++ linux-2.6.32.9/arch/um/include/asm/kmap_types.h 2010-02-23 17:09:53.095660904 -0500
4524@@ -23,6 +23,7 @@ enum km_type { 4851@@ -23,6 +23,7 @@ enum km_type {
4525 KM_IRQ1, 4852 KM_IRQ1,
4526 KM_SOFTIRQ0, 4853 KM_SOFTIRQ0,
@@ -4529,9 +4856,9 @@ diff -urNp linux-2.6.32.8/arch/um/include/asm/kmap_types.h linux-2.6.32.8/arch/u
4529 KM_TYPE_NR 4856 KM_TYPE_NR
4530 }; 4857 };
4531 4858
4532diff -urNp linux-2.6.32.8/arch/um/include/asm/page.h linux-2.6.32.8/arch/um/include/asm/page.h 4859diff -urNp linux-2.6.32.9/arch/um/include/asm/page.h linux-2.6.32.9/arch/um/include/asm/page.h
4533--- linux-2.6.32.8/arch/um/include/asm/page.h 2010-02-09 07:57:19.000000000 -0500 4860--- linux-2.6.32.9/arch/um/include/asm/page.h 2010-02-09 07:57:19.000000000 -0500
4534+++ linux-2.6.32.8/arch/um/include/asm/page.h 2010-02-13 21:45:09.870806418 -0500 4861+++ linux-2.6.32.9/arch/um/include/asm/page.h 2010-02-23 17:09:53.095660904 -0500
4535@@ -14,6 +14,9 @@ 4862@@ -14,6 +14,9 @@
4536 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) 4863 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
4537 #define PAGE_MASK (~(PAGE_SIZE-1)) 4864 #define PAGE_MASK (~(PAGE_SIZE-1))
@@ -4542,9 +4869,9 @@ diff -urNp linux-2.6.32.8/arch/um/include/asm/page.h linux-2.6.32.8/arch/um/incl
4542 #ifndef __ASSEMBLY__ 4869 #ifndef __ASSEMBLY__
4543 4870
4544 struct page; 4871 struct page;
4545diff -urNp linux-2.6.32.8/arch/um/sys-i386/syscalls.c linux-2.6.32.8/arch/um/sys-i386/syscalls.c 4872diff -urNp linux-2.6.32.9/arch/um/sys-i386/syscalls.c linux-2.6.32.9/arch/um/sys-i386/syscalls.c
4546--- linux-2.6.32.8/arch/um/sys-i386/syscalls.c 2010-02-09 07:57:19.000000000 -0500 4873--- linux-2.6.32.9/arch/um/sys-i386/syscalls.c 2010-02-09 07:57:19.000000000 -0500
4547+++ linux-2.6.32.8/arch/um/sys-i386/syscalls.c 2010-02-13 21:45:09.871908799 -0500 4874+++ linux-2.6.32.9/arch/um/sys-i386/syscalls.c 2010-02-23 17:09:53.095660904 -0500
4548@@ -11,6 +11,21 @@ 4875@@ -11,6 +11,21 @@
4549 #include "asm/uaccess.h" 4876 #include "asm/uaccess.h"
4550 #include "asm/unistd.h" 4877 #include "asm/unistd.h"
@@ -4567,9 +4894,9 @@ diff -urNp linux-2.6.32.8/arch/um/sys-i386/syscalls.c linux-2.6.32.8/arch/um/sys
4567 /* 4894 /*
4568 * Perform the select(nd, in, out, ex, tv) and mmap() system 4895 * Perform the select(nd, in, out, ex, tv) and mmap() system
4569 * calls. Linux/i386 didn't use to be able to handle more than 4896 * calls. Linux/i386 didn't use to be able to handle more than
4570diff -urNp linux-2.6.32.8/arch/x86/boot/bitops.h linux-2.6.32.8/arch/x86/boot/bitops.h 4897diff -urNp linux-2.6.32.9/arch/x86/boot/bitops.h linux-2.6.32.9/arch/x86/boot/bitops.h
4571--- linux-2.6.32.8/arch/x86/boot/bitops.h 2010-02-09 07:57:19.000000000 -0500 4898--- linux-2.6.32.9/arch/x86/boot/bitops.h 2010-02-09 07:57:19.000000000 -0500
4572+++ linux-2.6.32.8/arch/x86/boot/bitops.h 2010-02-13 21:45:09.871908799 -0500 4899+++ linux-2.6.32.9/arch/x86/boot/bitops.h 2010-02-23 17:09:53.095660904 -0500
4573@@ -26,7 +26,7 @@ static inline int variable_test_bit(int 4900@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
4574 u8 v; 4901 u8 v;
4575 const u32 *p = (const u32 *)addr; 4902 const u32 *p = (const u32 *)addr;
@@ -4588,9 +4915,9 @@ diff -urNp linux-2.6.32.8/arch/x86/boot/bitops.h linux-2.6.32.8/arch/x86/boot/bi
4588 } 4915 }
4589 4916
4590 #endif /* BOOT_BITOPS_H */ 4917 #endif /* BOOT_BITOPS_H */
4591diff -urNp linux-2.6.32.8/arch/x86/boot/boot.h linux-2.6.32.8/arch/x86/boot/boot.h 4918diff -urNp linux-2.6.32.9/arch/x86/boot/boot.h linux-2.6.32.9/arch/x86/boot/boot.h
4592--- linux-2.6.32.8/arch/x86/boot/boot.h 2010-02-09 07:57:19.000000000 -0500 4919--- linux-2.6.32.9/arch/x86/boot/boot.h 2010-02-09 07:57:19.000000000 -0500
4593+++ linux-2.6.32.8/arch/x86/boot/boot.h 2010-02-13 21:45:09.871908799 -0500 4920+++ linux-2.6.32.9/arch/x86/boot/boot.h 2010-02-23 17:09:53.095660904 -0500
4594@@ -82,7 +82,7 @@ static inline void io_delay(void) 4921@@ -82,7 +82,7 @@ static inline void io_delay(void)
4595 static inline u16 ds(void) 4922 static inline u16 ds(void)
4596 { 4923 {
@@ -4609,9 +4936,9 @@ diff -urNp linux-2.6.32.8/arch/x86/boot/boot.h linux-2.6.32.8/arch/x86/boot/boot
4609 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); 4936 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
4610 return diff; 4937 return diff;
4611 } 4938 }
4612diff -urNp linux-2.6.32.8/arch/x86/boot/compressed/head_32.S linux-2.6.32.8/arch/x86/boot/compressed/head_32.S 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
4613--- linux-2.6.32.8/arch/x86/boot/compressed/head_32.S 2010-02-09 07:57:19.000000000 -0500 4940--- linux-2.6.32.9/arch/x86/boot/compressed/head_32.S 2010-02-09 07:57:19.000000000 -0500
4614+++ linux-2.6.32.8/arch/x86/boot/compressed/head_32.S 2010-02-13 21:45:09.871908799 -0500 4941+++ linux-2.6.32.9/arch/x86/boot/compressed/head_32.S 2010-02-23 17:09:53.095660904 -0500
4615@@ -76,7 +76,7 @@ ENTRY(startup_32) 4942@@ -76,7 +76,7 @@ ENTRY(startup_32)
4616 notl %eax 4943 notl %eax
4617 andl %eax, %ebx 4944 andl %eax, %ebx
@@ -4640,9 +4967,9 @@ diff -urNp linux-2.6.32.8/arch/x86/boot/compressed/head_32.S linux-2.6.32.8/arch
4640 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) 4967 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
4641 jmp 1b 4968 jmp 1b
4642 2: 4969 2:
4643diff -urNp linux-2.6.32.8/arch/x86/boot/compressed/head_64.S linux-2.6.32.8/arch/x86/boot/compressed/head_64.S 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
4644--- linux-2.6.32.8/arch/x86/boot/compressed/head_64.S 2010-02-09 07:57:19.000000000 -0500 4971--- linux-2.6.32.9/arch/x86/boot/compressed/head_64.S 2010-02-09 07:57:19.000000000 -0500
4645+++ linux-2.6.32.8/arch/x86/boot/compressed/head_64.S 2010-02-13 21:45:09.871908799 -0500 4972+++ linux-2.6.32.9/arch/x86/boot/compressed/head_64.S 2010-02-23 17:09:53.095660904 -0500
4646@@ -91,7 +91,7 @@ ENTRY(startup_32) 4973@@ -91,7 +91,7 @@ ENTRY(startup_32)
4647 notl %eax 4974 notl %eax
4648 andl %eax, %ebx 4975 andl %eax, %ebx
@@ -4661,9 +4988,9 @@ diff -urNp linux-2.6.32.8/arch/x86/boot/compressed/head_64.S linux-2.6.32.8/arch
4661 #endif 4988 #endif
4662 4989
4663 /* Target address to relocate to for decompression */ 4990 /* Target address to relocate to for decompression */
4664diff -urNp linux-2.6.32.8/arch/x86/boot/compressed/misc.c linux-2.6.32.8/arch/x86/boot/compressed/misc.c 4991diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/misc.c linux-2.6.32.9/arch/x86/boot/compressed/misc.c
4665--- linux-2.6.32.8/arch/x86/boot/compressed/misc.c 2010-02-09 07:57:19.000000000 -0500 4992--- linux-2.6.32.9/arch/x86/boot/compressed/misc.c 2010-02-09 07:57:19.000000000 -0500
4666+++ linux-2.6.32.8/arch/x86/boot/compressed/misc.c 2010-02-13 21:45:09.871908799 -0500 4993+++ linux-2.6.32.9/arch/x86/boot/compressed/misc.c 2010-02-23 17:09:53.095660904 -0500
4667@@ -288,7 +288,7 @@ static void parse_elf(void *output) 4994@@ -288,7 +288,7 @@ static void parse_elf(void *output)
4668 case PT_LOAD: 4995 case PT_LOAD:
4669 #ifdef CONFIG_RELOCATABLE 4996 #ifdef CONFIG_RELOCATABLE
@@ -4682,9 +5009,9 @@ diff -urNp linux-2.6.32.8/arch/x86/boot/compressed/misc.c linux-2.6.32.8/arch/x8
4682 error("Wrong destination address"); 5009 error("Wrong destination address");
4683 #endif 5010 #endif
4684 5011
4685diff -urNp linux-2.6.32.8/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.8/arch/x86/boot/compressed/mkpiggy.c 5012diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.9/arch/x86/boot/compressed/mkpiggy.c
4686--- linux-2.6.32.8/arch/x86/boot/compressed/mkpiggy.c 2010-02-09 07:57:19.000000000 -0500 5013--- linux-2.6.32.9/arch/x86/boot/compressed/mkpiggy.c 2010-02-09 07:57:19.000000000 -0500
4687+++ linux-2.6.32.8/arch/x86/boot/compressed/mkpiggy.c 2010-02-13 21:45:09.872920514 -0500 5014+++ linux-2.6.32.9/arch/x86/boot/compressed/mkpiggy.c 2010-02-23 17:09:53.095660904 -0500
4688@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) 5015@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
4689 5016
4690 offs = (olen > ilen) ? olen - ilen : 0; 5017 offs = (olen > ilen) ? olen - ilen : 0;
@@ -4694,9 +5021,9 @@ diff -urNp linux-2.6.32.8/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.8/arch
4694 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ 5021 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
4695 5022
4696 printf(".section \".rodata.compressed\",\"a\",@progbits\n"); 5023 printf(".section \".rodata.compressed\",\"a\",@progbits\n");
4697diff -urNp linux-2.6.32.8/arch/x86/boot/compressed/relocs.c linux-2.6.32.8/arch/x86/boot/compressed/relocs.c 5024diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/relocs.c linux-2.6.32.9/arch/x86/boot/compressed/relocs.c
4698--- linux-2.6.32.8/arch/x86/boot/compressed/relocs.c 2010-02-09 07:57:19.000000000 -0500 5025--- linux-2.6.32.9/arch/x86/boot/compressed/relocs.c 2010-02-09 07:57:19.000000000 -0500
4699+++ linux-2.6.32.8/arch/x86/boot/compressed/relocs.c 2010-02-13 21:45:09.872920514 -0500 5026+++ linux-2.6.32.9/arch/x86/boot/compressed/relocs.c 2010-02-23 17:09:53.095660904 -0500
4700@@ -10,8 +10,11 @@ 5027@@ -10,8 +10,11 @@
4701 #define USE_BSD 5028 #define USE_BSD
4702 #include <endian.h> 5029 #include <endian.h>
@@ -4897,9 +5224,9 @@ diff -urNp linux-2.6.32.8/arch/x86/boot/compressed/relocs.c linux-2.6.32.8/arch/
4897 read_shdrs(fp); 5224 read_shdrs(fp);
4898 read_strtabs(fp); 5225 read_strtabs(fp);
4899 read_symtabs(fp); 5226 read_symtabs(fp);
4900diff -urNp linux-2.6.32.8/arch/x86/boot/cpucheck.c linux-2.6.32.8/arch/x86/boot/cpucheck.c 5227diff -urNp linux-2.6.32.9/arch/x86/boot/cpucheck.c linux-2.6.32.9/arch/x86/boot/cpucheck.c
4901--- linux-2.6.32.8/arch/x86/boot/cpucheck.c 2010-02-09 07:57:19.000000000 -0500 5228--- linux-2.6.32.9/arch/x86/boot/cpucheck.c 2010-02-09 07:57:19.000000000 -0500
4902+++ linux-2.6.32.8/arch/x86/boot/cpucheck.c 2010-02-13 21:45:09.873557512 -0500 5229+++ linux-2.6.32.9/arch/x86/boot/cpucheck.c 2010-02-23 17:09:53.095660904 -0500
4903@@ -74,7 +74,7 @@ static int has_fpu(void) 5230@@ -74,7 +74,7 @@ static int has_fpu(void)
4904 u16 fcw = -1, fsw = -1; 5231 u16 fcw = -1, fsw = -1;
4905 u32 cr0; 5232 u32 cr0;
@@ -4995,9 +5322,9 @@ diff -urNp linux-2.6.32.8/arch/x86/boot/cpucheck.c linux-2.6.32.8/arch/x86/boot/
4995 5322
4996 err = check_flags(); 5323 err = check_flags();
4997 } 5324 }
4998diff -urNp linux-2.6.32.8/arch/x86/boot/header.S linux-2.6.32.8/arch/x86/boot/header.S 5325diff -urNp linux-2.6.32.9/arch/x86/boot/header.S linux-2.6.32.9/arch/x86/boot/header.S
4999--- linux-2.6.32.8/arch/x86/boot/header.S 2010-02-09 07:57:19.000000000 -0500 5326--- linux-2.6.32.9/arch/x86/boot/header.S 2010-02-09 07:57:19.000000000 -0500
5000+++ linux-2.6.32.8/arch/x86/boot/header.S 2010-02-13 21:45:09.873557512 -0500 5327+++ linux-2.6.32.9/arch/x86/boot/header.S 2010-02-23 17:09:53.095660904 -0500
5001@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical 5328@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
5002 # single linked list of 5329 # single linked list of
5003 # struct setup_data 5330 # struct setup_data
@@ -5007,9 +5334,9 @@ diff -urNp linux-2.6.32.8/arch/x86/boot/header.S linux-2.6.32.8/arch/x86/boot/he
5007 5334
5008 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) 5335 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
5009 #define VO_INIT_SIZE (VO__end - VO__text) 5336 #define VO_INIT_SIZE (VO__end - VO__text)
5010diff -urNp linux-2.6.32.8/arch/x86/boot/video-vesa.c linux-2.6.32.8/arch/x86/boot/video-vesa.c 5337diff -urNp linux-2.6.32.9/arch/x86/boot/video-vesa.c linux-2.6.32.9/arch/x86/boot/video-vesa.c
5011--- linux-2.6.32.8/arch/x86/boot/video-vesa.c 2010-02-09 07:57:19.000000000 -0500 5338--- linux-2.6.32.9/arch/x86/boot/video-vesa.c 2010-02-09 07:57:19.000000000 -0500
5012+++ linux-2.6.32.8/arch/x86/boot/video-vesa.c 2010-02-13 21:45:09.873557512 -0500 5339+++ linux-2.6.32.9/arch/x86/boot/video-vesa.c 2010-02-23 17:09:53.095660904 -0500
5013@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) 5340@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
5014 5341
5015 boot_params.screen_info.vesapm_seg = oreg.es; 5342 boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5018,9 +5345,9 @@ diff -urNp linux-2.6.32.8/arch/x86/boot/video-vesa.c linux-2.6.32.8/arch/x86/boo
5018 } 5345 }
5019 5346
5020 /* 5347 /*
5021diff -urNp linux-2.6.32.8/arch/x86/ia32/ia32_signal.c linux-2.6.32.8/arch/x86/ia32/ia32_signal.c 5348diff -urNp linux-2.6.32.9/arch/x86/ia32/ia32_signal.c linux-2.6.32.9/arch/x86/ia32/ia32_signal.c
5022--- linux-2.6.32.8/arch/x86/ia32/ia32_signal.c 2010-02-09 07:57:19.000000000 -0500 5349--- linux-2.6.32.9/arch/x86/ia32/ia32_signal.c 2010-02-09 07:57:19.000000000 -0500
5023+++ linux-2.6.32.8/arch/x86/ia32/ia32_signal.c 2010-02-13 21:45:09.873557512 -0500 5350+++ linux-2.6.32.9/arch/x86/ia32/ia32_signal.c 2010-02-23 17:09:53.095660904 -0500
5024@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 5351@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
5025 sp -= frame_size; 5352 sp -= frame_size;
5026 /* Align the stack pointer according to the i386 ABI, 5353 /* Align the stack pointer according to the i386 ABI,
@@ -5039,9 +5366,9 @@ diff -urNp linux-2.6.32.8/arch/x86/ia32/ia32_signal.c linux-2.6.32.8/arch/x86/ia
5039 }; 5366 };
5040 5367
5041 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); 5368 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
5042diff -urNp linux-2.6.32.8/arch/x86/include/asm/alternative.h linux-2.6.32.8/arch/x86/include/asm/alternative.h 5369diff -urNp linux-2.6.32.9/arch/x86/include/asm/alternative.h linux-2.6.32.9/arch/x86/include/asm/alternative.h
5043--- linux-2.6.32.8/arch/x86/include/asm/alternative.h 2010-02-09 07:57:19.000000000 -0500 5370--- linux-2.6.32.9/arch/x86/include/asm/alternative.h 2010-02-09 07:57:19.000000000 -0500
5044+++ linux-2.6.32.8/arch/x86/include/asm/alternative.h 2010-02-13 21:45:09.873557512 -0500 5371+++ linux-2.6.32.9/arch/x86/include/asm/alternative.h 2010-02-23 17:09:53.095660904 -0500
5045@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit 5372@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
5046 " .byte 662b-661b\n" /* sourcelen */ \ 5373 " .byte 662b-661b\n" /* sourcelen */ \
5047 " .byte 664f-663f\n" /* replacementlen */ \ 5374 " .byte 664f-663f\n" /* replacementlen */ \
@@ -5051,9 +5378,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/alternative.h linux-2.6.32.8/arch
5051 "663:\n\t" newinstr "\n664:\n" /* replacement */ \ 5378 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
5052 ".previous" 5379 ".previous"
5053 5380
5054diff -urNp linux-2.6.32.8/arch/x86/include/asm/apm.h linux-2.6.32.8/arch/x86/include/asm/apm.h 5381diff -urNp linux-2.6.32.9/arch/x86/include/asm/apm.h linux-2.6.32.9/arch/x86/include/asm/apm.h
5055--- linux-2.6.32.8/arch/x86/include/asm/apm.h 2010-02-09 07:57:19.000000000 -0500 5382--- linux-2.6.32.9/arch/x86/include/asm/apm.h 2010-02-09 07:57:19.000000000 -0500
5056+++ linux-2.6.32.8/arch/x86/include/asm/apm.h 2010-02-13 21:45:09.873557512 -0500 5383+++ linux-2.6.32.9/arch/x86/include/asm/apm.h 2010-02-23 17:09:53.095660904 -0500
5057@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 5384@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
5058 __asm__ __volatile__(APM_DO_ZERO_SEGS 5385 __asm__ __volatile__(APM_DO_ZERO_SEGS
5059 "pushl %%edi\n\t" 5386 "pushl %%edi\n\t"
@@ -5072,9 +5399,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/apm.h linux-2.6.32.8/arch/x86/inc
5072 "setc %%bl\n\t" 5399 "setc %%bl\n\t"
5073 "popl %%ebp\n\t" 5400 "popl %%ebp\n\t"
5074 "popl %%edi\n\t" 5401 "popl %%edi\n\t"
5075diff -urNp linux-2.6.32.8/arch/x86/include/asm/atomic_32.h linux-2.6.32.8/arch/x86/include/asm/atomic_32.h 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
5076--- linux-2.6.32.8/arch/x86/include/asm/atomic_32.h 2010-02-09 07:57:19.000000000 -0500 5403--- linux-2.6.32.9/arch/x86/include/asm/atomic_32.h 2010-02-09 07:57:19.000000000 -0500
5077+++ linux-2.6.32.8/arch/x86/include/asm/atomic_32.h 2010-02-13 21:45:09.874879408 -0500 5404+++ linux-2.6.32.9/arch/x86/include/asm/atomic_32.h 2010-02-23 17:09:53.095660904 -0500
5078@@ -25,6 +25,17 @@ static inline int atomic_read(const atom 5405@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
5079 } 5406 }
5080 5407
@@ -5405,9 +5732,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/atomic_32.h linux-2.6.32.8/arch/x
5405 #define ATOMIC64_INIT(val) { (val) } 5732 #define ATOMIC64_INIT(val) { (val) }
5406 5733
5407 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); 5734 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
5408diff -urNp linux-2.6.32.8/arch/x86/include/asm/atomic_64.h linux-2.6.32.8/arch/x86/include/asm/atomic_64.h 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
5409--- linux-2.6.32.8/arch/x86/include/asm/atomic_64.h 2010-02-09 07:57:19.000000000 -0500 5736--- linux-2.6.32.9/arch/x86/include/asm/atomic_64.h 2010-02-09 07:57:19.000000000 -0500
5410+++ linux-2.6.32.8/arch/x86/include/asm/atomic_64.h 2010-02-13 21:45:09.875659651 -0500 5737+++ linux-2.6.32.9/arch/x86/include/asm/atomic_64.h 2010-02-23 17:09:53.099748973 -0500
5411@@ -24,6 +24,17 @@ static inline int atomic_read(const atom 5738@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
5412 } 5739 }
5413 5740
@@ -5985,9 +6312,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/atomic_64.h linux-2.6.32.8/arch/x
5985 } 6312 }
5986 6313
5987 /** 6314 /**
5988diff -urNp linux-2.6.32.8/arch/x86/include/asm/boot.h linux-2.6.32.8/arch/x86/include/asm/boot.h 6315diff -urNp linux-2.6.32.9/arch/x86/include/asm/boot.h linux-2.6.32.9/arch/x86/include/asm/boot.h
5989--- linux-2.6.32.8/arch/x86/include/asm/boot.h 2010-02-09 07:57:19.000000000 -0500 6316--- linux-2.6.32.9/arch/x86/include/asm/boot.h 2010-02-09 07:57:19.000000000 -0500
5990+++ linux-2.6.32.8/arch/x86/include/asm/boot.h 2010-02-13 21:45:09.875659651 -0500 6317+++ linux-2.6.32.9/arch/x86/include/asm/boot.h 2010-02-23 17:09:53.099748973 -0500
5991@@ -11,10 +11,15 @@ 6318@@ -11,10 +11,15 @@
5992 #include <asm/pgtable_types.h> 6319 #include <asm/pgtable_types.h>
5993 6320
@@ -6005,9 +6332,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/boot.h linux-2.6.32.8/arch/x86/in
6005 /* Minimum kernel alignment, as a power of two */ 6332 /* Minimum kernel alignment, as a power of two */
6006 #ifdef CONFIG_X86_64 6333 #ifdef CONFIG_X86_64
6007 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT 6334 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
6008diff -urNp linux-2.6.32.8/arch/x86/include/asm/cache.h linux-2.6.32.8/arch/x86/include/asm/cache.h 6335diff -urNp linux-2.6.32.9/arch/x86/include/asm/cache.h linux-2.6.32.9/arch/x86/include/asm/cache.h
6009--- linux-2.6.32.8/arch/x86/include/asm/cache.h 2010-02-09 07:57:19.000000000 -0500 6336--- linux-2.6.32.9/arch/x86/include/asm/cache.h 2010-02-09 07:57:19.000000000 -0500
6010+++ linux-2.6.32.8/arch/x86/include/asm/cache.h 2010-02-13 21:45:09.875659651 -0500 6337+++ linux-2.6.32.9/arch/x86/include/asm/cache.h 2010-02-23 17:09:53.099748973 -0500
6011@@ -8,6 +8,7 @@ 6338@@ -8,6 +8,7 @@
6012 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) 6339 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6013 6340
@@ -6016,9 +6343,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/cache.h linux-2.6.32.8/arch/x86/i
6016 6343
6017 #ifdef CONFIG_X86_VSMP 6344 #ifdef CONFIG_X86_VSMP
6018 /* vSMP Internode cacheline shift */ 6345 /* vSMP Internode cacheline shift */
6019diff -urNp linux-2.6.32.8/arch/x86/include/asm/checksum_32.h linux-2.6.32.8/arch/x86/include/asm/checksum_32.h 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
6020--- linux-2.6.32.8/arch/x86/include/asm/checksum_32.h 2010-02-09 07:57:19.000000000 -0500 6347--- linux-2.6.32.9/arch/x86/include/asm/checksum_32.h 2010-02-09 07:57:19.000000000 -0500
6021+++ linux-2.6.32.8/arch/x86/include/asm/checksum_32.h 2010-02-13 21:45:09.875659651 -0500 6348+++ linux-2.6.32.9/arch/x86/include/asm/checksum_32.h 2010-02-23 17:09:53.099748973 -0500
6022@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene 6349@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
6023 int len, __wsum sum, 6350 int len, __wsum sum,
6024 int *src_err_ptr, int *dst_err_ptr); 6351 int *src_err_ptr, int *dst_err_ptr);
@@ -6052,9 +6379,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/checksum_32.h linux-2.6.32.8/arch
6052 len, sum, NULL, err_ptr); 6379 len, sum, NULL, err_ptr);
6053 6380
6054 if (len) 6381 if (len)
6055diff -urNp linux-2.6.32.8/arch/x86/include/asm/desc.h linux-2.6.32.8/arch/x86/include/asm/desc.h 6382diff -urNp linux-2.6.32.9/arch/x86/include/asm/desc.h linux-2.6.32.9/arch/x86/include/asm/desc.h
6056--- linux-2.6.32.8/arch/x86/include/asm/desc.h 2010-02-09 07:57:19.000000000 -0500 6383--- linux-2.6.32.9/arch/x86/include/asm/desc.h 2010-02-09 07:57:19.000000000 -0500
6057+++ linux-2.6.32.8/arch/x86/include/asm/desc.h 2010-02-13 21:45:09.875659651 -0500 6384+++ linux-2.6.32.9/arch/x86/include/asm/desc.h 2010-02-23 17:09:53.099748973 -0500
6058@@ -4,6 +4,7 @@ 6385@@ -4,6 +4,7 @@
6059 #include <asm/desc_defs.h> 6386 #include <asm/desc_defs.h>
6060 #include <asm/ldt.h> 6387 #include <asm/ldt.h>
@@ -6165,9 +6492,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/desc.h linux-2.6.32.8/arch/x86/in
6165+#endif 6492+#endif
6166+ 6493+
6167 #endif /* _ASM_X86_DESC_H */ 6494 #endif /* _ASM_X86_DESC_H */
6168diff -urNp linux-2.6.32.8/arch/x86/include/asm/device.h linux-2.6.32.8/arch/x86/include/asm/device.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
6169--- linux-2.6.32.8/arch/x86/include/asm/device.h 2010-02-09 07:57:19.000000000 -0500 6496--- linux-2.6.32.9/arch/x86/include/asm/device.h 2010-02-09 07:57:19.000000000 -0500
6170+++ linux-2.6.32.8/arch/x86/include/asm/device.h 2010-02-13 21:45:09.876706383 -0500 6497+++ linux-2.6.32.9/arch/x86/include/asm/device.h 2010-02-23 17:09:53.099748973 -0500
6171@@ -6,7 +6,7 @@ struct dev_archdata { 6498@@ -6,7 +6,7 @@ struct dev_archdata {
6172 void *acpi_handle; 6499 void *acpi_handle;
6173 #endif 6500 #endif
@@ -6177,9 +6504,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/device.h linux-2.6.32.8/arch/x86/
6177 #endif 6504 #endif
6178 #ifdef CONFIG_DMAR 6505 #ifdef CONFIG_DMAR
6179 void *iommu; /* hook for IOMMU specific extension */ 6506 void *iommu; /* hook for IOMMU specific extension */
6180diff -urNp linux-2.6.32.8/arch/x86/include/asm/dma-mapping.h linux-2.6.32.8/arch/x86/include/asm/dma-mapping.h 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
6181--- linux-2.6.32.8/arch/x86/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500 6508--- linux-2.6.32.9/arch/x86/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500
6182+++ linux-2.6.32.8/arch/x86/include/asm/dma-mapping.h 2010-02-13 21:45:09.876706383 -0500 6509+++ linux-2.6.32.9/arch/x86/include/asm/dma-mapping.h 2010-02-23 17:09:53.099748973 -0500
6183@@ -25,9 +25,9 @@ extern int iommu_merge; 6510@@ -25,9 +25,9 @@ extern int iommu_merge;
6184 extern struct device x86_dma_fallback_dev; 6511 extern struct device x86_dma_fallback_dev;
6185 extern int panic_on_overflow; 6512 extern int panic_on_overflow;
@@ -6219,9 +6546,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/dma-mapping.h linux-2.6.32.8/arch
6219 6546
6220 WARN_ON(irqs_disabled()); /* for portability */ 6547 WARN_ON(irqs_disabled()); /* for portability */
6221 6548
6222diff -urNp linux-2.6.32.8/arch/x86/include/asm/e820.h linux-2.6.32.8/arch/x86/include/asm/e820.h 6549diff -urNp linux-2.6.32.9/arch/x86/include/asm/e820.h linux-2.6.32.9/arch/x86/include/asm/e820.h
6223--- linux-2.6.32.8/arch/x86/include/asm/e820.h 2010-02-09 07:57:19.000000000 -0500 6550--- linux-2.6.32.9/arch/x86/include/asm/e820.h 2010-02-09 07:57:19.000000000 -0500
6224+++ linux-2.6.32.8/arch/x86/include/asm/e820.h 2010-02-13 21:45:09.876706383 -0500 6551+++ linux-2.6.32.9/arch/x86/include/asm/e820.h 2010-02-23 17:09:53.099748973 -0500
6225@@ -133,7 +133,7 @@ extern char *default_machine_specific_me 6552@@ -133,7 +133,7 @@ extern char *default_machine_specific_me
6226 #define ISA_END_ADDRESS 0x100000 6553 #define ISA_END_ADDRESS 0x100000
6227 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) 6554 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
@@ -6231,9 +6558,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/e820.h linux-2.6.32.8/arch/x86/in
6231 #define BIOS_END 0x00100000 6558 #define BIOS_END 0x00100000
6232 6559
6233 #ifdef __KERNEL__ 6560 #ifdef __KERNEL__
6234diff -urNp linux-2.6.32.8/arch/x86/include/asm/elf.h linux-2.6.32.8/arch/x86/include/asm/elf.h 6561diff -urNp linux-2.6.32.9/arch/x86/include/asm/elf.h linux-2.6.32.9/arch/x86/include/asm/elf.h
6235--- linux-2.6.32.8/arch/x86/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 6562--- linux-2.6.32.9/arch/x86/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
6236+++ linux-2.6.32.8/arch/x86/include/asm/elf.h 2010-02-13 21:45:09.876706383 -0500 6563+++ linux-2.6.32.9/arch/x86/include/asm/elf.h 2010-02-23 17:09:53.099748973 -0500
6237@@ -257,7 +257,25 @@ extern int force_personality32; 6564@@ -257,7 +257,25 @@ extern int force_personality32;
6238 the loader. We need to make sure that it is out of the way of the program 6565 the loader. We need to make sure that it is out of the way of the program
6239 that it will "exec", and that there is sufficient room for the brk. */ 6566 that it will "exec", and that there is sufficient room for the brk. */
@@ -6287,9 +6614,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/elf.h linux-2.6.32.8/arch/x86/inc
6287-#define arch_randomize_brk arch_randomize_brk 6614-#define arch_randomize_brk arch_randomize_brk
6288- 6615-
6289 #endif /* _ASM_X86_ELF_H */ 6616 #endif /* _ASM_X86_ELF_H */
6290diff -urNp linux-2.6.32.8/arch/x86/include/asm/futex.h linux-2.6.32.8/arch/x86/include/asm/futex.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
6291--- linux-2.6.32.8/arch/x86/include/asm/futex.h 2010-02-09 07:57:19.000000000 -0500 6618--- linux-2.6.32.9/arch/x86/include/asm/futex.h 2010-02-09 07:57:19.000000000 -0500
6292+++ linux-2.6.32.8/arch/x86/include/asm/futex.h 2010-02-13 21:45:09.876706383 -0500 6619+++ linux-2.6.32.9/arch/x86/include/asm/futex.h 2010-02-23 17:09:53.099748973 -0500
6293@@ -11,6 +11,40 @@ 6620@@ -11,6 +11,40 @@
6294 #include <asm/processor.h> 6621 #include <asm/processor.h>
6295 #include <asm/system.h> 6622 #include <asm/system.h>
@@ -6401,9 +6728,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/futex.h linux-2.6.32.8/arch/x86/i
6401 : "memory" 6728 : "memory"
6402 ); 6729 );
6403 6730
6404diff -urNp linux-2.6.32.8/arch/x86/include/asm/i387.h linux-2.6.32.8/arch/x86/include/asm/i387.h 6731diff -urNp linux-2.6.32.9/arch/x86/include/asm/i387.h linux-2.6.32.9/arch/x86/include/asm/i387.h
6405--- linux-2.6.32.8/arch/x86/include/asm/i387.h 2010-02-09 07:57:19.000000000 -0500 6732--- linux-2.6.32.9/arch/x86/include/asm/i387.h 2010-02-09 07:57:19.000000000 -0500
6406+++ linux-2.6.32.8/arch/x86/include/asm/i387.h 2010-02-13 21:45:09.877907600 -0500 6733+++ linux-2.6.32.9/arch/x86/include/asm/i387.h 2010-02-23 17:09:53.099748973 -0500
6407@@ -195,13 +195,8 @@ static inline int fxrstor_checking(struc 6734@@ -195,13 +195,8 @@ static inline int fxrstor_checking(struc
6408 } 6735 }
6409 6736
@@ -6420,9 +6747,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/i387.h linux-2.6.32.8/arch/x86/in
6420 6747
6421 /* 6748 /*
6422 * These must be called with preempt disabled 6749 * These must be called with preempt disabled
6423diff -urNp linux-2.6.32.8/arch/x86/include/asm/io_64.h linux-2.6.32.8/arch/x86/include/asm/io_64.h 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
6424--- linux-2.6.32.8/arch/x86/include/asm/io_64.h 2010-02-09 07:57:19.000000000 -0500 6751--- linux-2.6.32.9/arch/x86/include/asm/io_64.h 2010-02-09 07:57:19.000000000 -0500
6425+++ linux-2.6.32.8/arch/x86/include/asm/io_64.h 2010-02-13 21:45:09.877907600 -0500 6752+++ linux-2.6.32.9/arch/x86/include/asm/io_64.h 2010-02-23 17:09:53.099748973 -0500
6426@@ -140,6 +140,17 @@ __OUTS(l) 6753@@ -140,6 +140,17 @@ __OUTS(l)
6427 6754
6428 #include <linux/vmalloc.h> 6755 #include <linux/vmalloc.h>
@@ -6441,9 +6768,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/io_64.h linux-2.6.32.8/arch/x86/i
6441 #include <asm-generic/iomap.h> 6768 #include <asm-generic/iomap.h>
6442 6769
6443 void __memcpy_fromio(void *, unsigned long, unsigned); 6770 void __memcpy_fromio(void *, unsigned long, unsigned);
6444diff -urNp linux-2.6.32.8/arch/x86/include/asm/iommu.h linux-2.6.32.8/arch/x86/include/asm/iommu.h 6771diff -urNp linux-2.6.32.9/arch/x86/include/asm/iommu.h linux-2.6.32.9/arch/x86/include/asm/iommu.h
6445--- linux-2.6.32.8/arch/x86/include/asm/iommu.h 2010-02-09 07:57:19.000000000 -0500 6772--- linux-2.6.32.9/arch/x86/include/asm/iommu.h 2010-02-09 07:57:19.000000000 -0500
6446+++ linux-2.6.32.8/arch/x86/include/asm/iommu.h 2010-02-13 21:45:09.877907600 -0500 6773+++ linux-2.6.32.9/arch/x86/include/asm/iommu.h 2010-02-23 17:09:53.099748973 -0500
6447@@ -3,7 +3,7 @@ 6774@@ -3,7 +3,7 @@
6448 6775
6449 extern void pci_iommu_shutdown(void); 6776 extern void pci_iommu_shutdown(void);
@@ -6453,28 +6780,29 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/iommu.h linux-2.6.32.8/arch/x86/i
6453 extern int force_iommu, no_iommu; 6780 extern int force_iommu, no_iommu;
6454 extern int iommu_detected; 6781 extern int iommu_detected;
6455 extern int iommu_pass_through; 6782 extern int iommu_pass_through;
6456diff -urNp linux-2.6.32.8/arch/x86/include/asm/irqflags.h linux-2.6.32.8/arch/x86/include/asm/irqflags.h 6783diff -urNp linux-2.6.32.9/arch/x86/include/asm/irqflags.h linux-2.6.32.9/arch/x86/include/asm/irqflags.h
6457--- linux-2.6.32.8/arch/x86/include/asm/irqflags.h 2010-02-09 07:57:19.000000000 -0500 6784--- linux-2.6.32.9/arch/x86/include/asm/irqflags.h 2010-02-09 07:57:19.000000000 -0500
6458+++ linux-2.6.32.8/arch/x86/include/asm/irqflags.h 2010-02-13 21:45:09.877907600 -0500 6785+++ linux-2.6.32.9/arch/x86/include/asm/irqflags.h 2010-02-23 17:09:53.099748973 -0500
6459@@ -146,6 +146,27 @@ static inline unsigned long __raw_local_ 6786@@ -146,6 +146,28 @@ static inline unsigned long __raw_local_
6460 #define INTERRUPT_RETURN iret 6787 #define INTERRUPT_RETURN iret
6461 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit 6788 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
6462 #define GET_CR0_INTO_EAX movl %cr0, %eax 6789 #define GET_CR0_INTO_EAX movl %cr0, %eax
6463+ 6790+
6464+/* PaX: special register usage in entry_32.S, beware */ 6791+/* PaX: special register usage in entry_32.S, beware */
6465+#ifdef CONFIG_PAX_KERNEXEC 6792+#ifdef CONFIG_PAX_KERNEXEC
6466+#define PAX_EXIT_KERNEL \ 6793+#define PAX_EXIT_KERNEL \
6467+ bt $16, %esi; \ 6794+ cmpw $__KERNEXEC_KERNEL_CS, PT_CS(%esp);\
6468+ jc 1f; \ 6795+ jnz 1f; \
6469+ movl %esi, %cr0; \ 6796+ movl %cr0, %esi; \
6797+ btc $16, %esi; \
6798+ movl %esi, %cr0; \
6470+1: 6799+1:
6471+ 6800+
6472+#define PAX_ENTER_KERNEL \ 6801+#define PAX_ENTER_KERNEL \
6473+ movl %cr0, %esi; \ 6802+ movl %cr0, %esi; \
6474+ movl %esi, %edx; \ 6803+ bts $16, %esi; \
6475+ bts $16, %edx; \ 6804+ jc 1f; \
6476+ jc 1f; \ 6805+ movl %esi, %cr0; \
6477+ movl %edx, %cr0; \
6478+1: 6806+1:
6479+#else 6807+#else
6480+#define PAX_EXIT_KERNEL 6808+#define PAX_EXIT_KERNEL
@@ -6484,9 +6812,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/irqflags.h linux-2.6.32.8/arch/x8
6484 #endif 6812 #endif
6485 6813
6486 6814
6487diff -urNp linux-2.6.32.8/arch/x86/include/asm/kvm_host.h linux-2.6.32.8/arch/x86/include/asm/kvm_host.h 6815diff -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
6488--- linux-2.6.32.8/arch/x86/include/asm/kvm_host.h 2010-02-09 07:57:19.000000000 -0500 6816--- linux-2.6.32.9/arch/x86/include/asm/kvm_host.h 2010-02-09 07:57:19.000000000 -0500
6489+++ linux-2.6.32.8/arch/x86/include/asm/kvm_host.h 2010-02-13 21:45:09.878752773 -0500 6817+++ linux-2.6.32.9/arch/x86/include/asm/kvm_host.h 2010-02-23 17:09:53.099748973 -0500
6490@@ -531,7 +531,7 @@ struct kvm_x86_ops { 6818@@ -531,7 +531,7 @@ struct kvm_x86_ops {
6491 const struct trace_print_flags *exit_reasons_str; 6819 const struct trace_print_flags *exit_reasons_str;
6492 }; 6820 };
@@ -6496,9 +6824,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/kvm_host.h linux-2.6.32.8/arch/x8
6496 6824
6497 int kvm_mmu_module_init(void); 6825 int kvm_mmu_module_init(void);
6498 void kvm_mmu_module_exit(void); 6826 void kvm_mmu_module_exit(void);
6499diff -urNp linux-2.6.32.8/arch/x86/include/asm/local.h linux-2.6.32.8/arch/x86/include/asm/local.h 6827diff -urNp linux-2.6.32.9/arch/x86/include/asm/local.h linux-2.6.32.9/arch/x86/include/asm/local.h
6500--- linux-2.6.32.8/arch/x86/include/asm/local.h 2010-02-09 07:57:19.000000000 -0500 6828--- linux-2.6.32.9/arch/x86/include/asm/local.h 2010-02-09 07:57:19.000000000 -0500
6501+++ linux-2.6.32.8/arch/x86/include/asm/local.h 2010-02-13 21:45:09.878752773 -0500 6829+++ linux-2.6.32.9/arch/x86/include/asm/local.h 2010-02-23 17:09:53.099748973 -0500
6502@@ -18,26 +18,90 @@ typedef struct { 6830@@ -18,26 +18,90 @@ typedef struct {
6503 6831
6504 static inline void local_inc(local_t *l) 6832 static inline void local_inc(local_t *l)
@@ -6723,9 +7051,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/local.h linux-2.6.32.8/arch/x86/i
6723 : "+r" (i), "+m" (l->a.counter) 7051 : "+r" (i), "+m" (l->a.counter)
6724 : : "memory"); 7052 : : "memory");
6725 return i + __i; 7053 return i + __i;
6726diff -urNp linux-2.6.32.8/arch/x86/include/asm/microcode.h linux-2.6.32.8/arch/x86/include/asm/microcode.h 7054diff -urNp linux-2.6.32.9/arch/x86/include/asm/microcode.h linux-2.6.32.9/arch/x86/include/asm/microcode.h
6727--- linux-2.6.32.8/arch/x86/include/asm/microcode.h 2010-02-09 07:57:19.000000000 -0500 7055--- linux-2.6.32.9/arch/x86/include/asm/microcode.h 2010-02-09 07:57:19.000000000 -0500
6728+++ linux-2.6.32.8/arch/x86/include/asm/microcode.h 2010-02-13 21:45:09.878752773 -0500 7056+++ linux-2.6.32.9/arch/x86/include/asm/microcode.h 2010-02-23 17:09:53.099748973 -0500
6729@@ -12,13 +12,13 @@ struct device; 7057@@ -12,13 +12,13 @@ struct device;
6730 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; 7058 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
6731 7059
@@ -6766,9 +7094,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/microcode.h linux-2.6.32.8/arch/x
6766 { 7094 {
6767 return NULL; 7095 return NULL;
6768 } 7096 }
6769diff -urNp linux-2.6.32.8/arch/x86/include/asm/mman.h linux-2.6.32.8/arch/x86/include/asm/mman.h 7097diff -urNp linux-2.6.32.9/arch/x86/include/asm/mman.h linux-2.6.32.9/arch/x86/include/asm/mman.h
6770--- linux-2.6.32.8/arch/x86/include/asm/mman.h 2010-02-09 07:57:19.000000000 -0500 7098--- linux-2.6.32.9/arch/x86/include/asm/mman.h 2010-02-09 07:57:19.000000000 -0500
6771+++ linux-2.6.32.8/arch/x86/include/asm/mman.h 2010-02-13 21:45:09.878752773 -0500 7099+++ linux-2.6.32.9/arch/x86/include/asm/mman.h 2010-02-23 17:09:53.099748973 -0500
6772@@ -5,4 +5,14 @@ 7100@@ -5,4 +5,14 @@
6773 7101
6774 #include <asm-generic/mman.h> 7102 #include <asm-generic/mman.h>
@@ -6784,9 +7112,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/mman.h linux-2.6.32.8/arch/x86/in
6784+#endif 7112+#endif
6785+ 7113+
6786 #endif /* _ASM_X86_MMAN_H */ 7114 #endif /* _ASM_X86_MMAN_H */
6787diff -urNp linux-2.6.32.8/arch/x86/include/asm/mmu_context.h linux-2.6.32.8/arch/x86/include/asm/mmu_context.h 7115diff -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
6788--- linux-2.6.32.8/arch/x86/include/asm/mmu_context.h 2010-02-09 07:57:19.000000000 -0500 7116--- linux-2.6.32.9/arch/x86/include/asm/mmu_context.h 2010-02-09 07:57:19.000000000 -0500
6789+++ linux-2.6.32.8/arch/x86/include/asm/mmu_context.h 2010-02-13 21:45:09.878752773 -0500 7117+++ linux-2.6.32.9/arch/x86/include/asm/mmu_context.h 2010-02-23 17:09:53.099748973 -0500
6790@@ -34,11 +34,17 @@ static inline void switch_mm(struct mm_s 7118@@ -34,11 +34,17 @@ static inline void switch_mm(struct mm_s
6791 struct task_struct *tsk) 7119 struct task_struct *tsk)
6792 { 7120 {
@@ -6852,9 +7180,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/mmu_context.h linux-2.6.32.8/arch
6852 } 7180 }
6853 } 7181 }
6854 #endif 7182 #endif
6855diff -urNp linux-2.6.32.8/arch/x86/include/asm/mmu.h linux-2.6.32.8/arch/x86/include/asm/mmu.h 7183diff -urNp linux-2.6.32.9/arch/x86/include/asm/mmu.h linux-2.6.32.9/arch/x86/include/asm/mmu.h
6856--- linux-2.6.32.8/arch/x86/include/asm/mmu.h 2010-02-09 07:57:19.000000000 -0500 7184--- linux-2.6.32.9/arch/x86/include/asm/mmu.h 2010-02-09 07:57:19.000000000 -0500
6857+++ linux-2.6.32.8/arch/x86/include/asm/mmu.h 2010-02-13 21:45:09.878752773 -0500 7185+++ linux-2.6.32.9/arch/x86/include/asm/mmu.h 2010-02-23 17:09:53.099748973 -0500
6858@@ -9,10 +9,23 @@ 7186@@ -9,10 +9,23 @@
6859 * we put the segment information here. 7187 * we put the segment information here.
6860 */ 7188 */
@@ -6881,9 +7209,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/mmu.h linux-2.6.32.8/arch/x86/inc
6881 } mm_context_t; 7209 } mm_context_t;
6882 7210
6883 #ifdef CONFIG_SMP 7211 #ifdef CONFIG_SMP
6884diff -urNp linux-2.6.32.8/arch/x86/include/asm/module.h linux-2.6.32.8/arch/x86/include/asm/module.h 7212diff -urNp linux-2.6.32.9/arch/x86/include/asm/module.h linux-2.6.32.9/arch/x86/include/asm/module.h
6885--- linux-2.6.32.8/arch/x86/include/asm/module.h 2010-02-09 07:57:19.000000000 -0500 7213--- linux-2.6.32.9/arch/x86/include/asm/module.h 2010-02-09 07:57:19.000000000 -0500
6886+++ linux-2.6.32.8/arch/x86/include/asm/module.h 2010-02-13 21:45:09.879916919 -0500 7214+++ linux-2.6.32.9/arch/x86/include/asm/module.h 2010-02-23 17:09:53.099748973 -0500
6887@@ -65,7 +65,12 @@ 7215@@ -65,7 +65,12 @@
6888 # else 7216 # else
6889 # define MODULE_STACKSIZE "" 7217 # define MODULE_STACKSIZE ""
@@ -6898,9 +7226,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/module.h linux-2.6.32.8/arch/x86/
6898 #endif 7226 #endif
6899 7227
6900 #endif /* _ASM_X86_MODULE_H */ 7228 #endif /* _ASM_X86_MODULE_H */
6901diff -urNp linux-2.6.32.8/arch/x86/include/asm/page_32_types.h linux-2.6.32.8/arch/x86/include/asm/page_32_types.h 7229diff -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
6902--- linux-2.6.32.8/arch/x86/include/asm/page_32_types.h 2010-02-09 07:57:19.000000000 -0500 7230--- linux-2.6.32.9/arch/x86/include/asm/page_32_types.h 2010-02-09 07:57:19.000000000 -0500
6903+++ linux-2.6.32.8/arch/x86/include/asm/page_32_types.h 2010-02-13 21:45:09.879916919 -0500 7231+++ linux-2.6.32.9/arch/x86/include/asm/page_32_types.h 2010-02-23 17:09:53.099748973 -0500
6904@@ -15,6 +15,10 @@ 7232@@ -15,6 +15,10 @@
6905 */ 7233 */
6906 #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) 7234 #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
@@ -6912,9 +7240,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/page_32_types.h linux-2.6.32.8/ar
6912 #ifdef CONFIG_4KSTACKS 7240 #ifdef CONFIG_4KSTACKS
6913 #define THREAD_ORDER 0 7241 #define THREAD_ORDER 0
6914 #else 7242 #else
6915diff -urNp linux-2.6.32.8/arch/x86/include/asm/page_64_types.h linux-2.6.32.8/arch/x86/include/asm/page_64_types.h 7243diff -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
6916--- linux-2.6.32.8/arch/x86/include/asm/page_64_types.h 2010-02-09 07:57:19.000000000 -0500 7244--- linux-2.6.32.9/arch/x86/include/asm/page_64_types.h 2010-02-09 07:57:19.000000000 -0500
6917+++ linux-2.6.32.8/arch/x86/include/asm/page_64_types.h 2010-02-13 21:45:09.879916919 -0500 7245+++ linux-2.6.32.9/arch/x86/include/asm/page_64_types.h 2010-02-23 17:09:53.099748973 -0500
6918@@ -39,6 +39,9 @@ 7246@@ -39,6 +39,9 @@
6919 #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) 7247 #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START)
6920 #define __START_KERNEL_map _AC(0xffffffff80000000, UL) 7248 #define __START_KERNEL_map _AC(0xffffffff80000000, UL)
@@ -6925,9 +7253,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/page_64_types.h linux-2.6.32.8/ar
6925 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ 7253 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
6926 #define __PHYSICAL_MASK_SHIFT 46 7254 #define __PHYSICAL_MASK_SHIFT 46
6927 #define __VIRTUAL_MASK_SHIFT 47 7255 #define __VIRTUAL_MASK_SHIFT 47
6928diff -urNp linux-2.6.32.8/arch/x86/include/asm/paravirt.h linux-2.6.32.8/arch/x86/include/asm/paravirt.h 7256diff -urNp linux-2.6.32.9/arch/x86/include/asm/paravirt.h linux-2.6.32.9/arch/x86/include/asm/paravirt.h
6929--- linux-2.6.32.8/arch/x86/include/asm/paravirt.h 2010-02-09 07:57:19.000000000 -0500 7257--- linux-2.6.32.9/arch/x86/include/asm/paravirt.h 2010-02-09 07:57:19.000000000 -0500
6930+++ linux-2.6.32.8/arch/x86/include/asm/paravirt.h 2010-02-13 21:45:09.880585024 -0500 7258+++ linux-2.6.32.9/arch/x86/include/asm/paravirt.h 2010-02-23 17:09:53.103663728 -0500
6931@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned 7259@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
6932 pv_mmu_ops.set_fixmap(idx, phys, flags); 7260 pv_mmu_ops.set_fixmap(idx, phys, flags);
6933 } 7261 }
@@ -6975,10 +7303,11 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/paravirt.h linux-2.6.32.8/arch/x8
6975+ 7303+
6976+#ifdef CONFIG_PAX_KERNEXEC 7304+#ifdef CONFIG_PAX_KERNEXEC
6977+#define PAX_EXIT_KERNEL \ 7305+#define PAX_EXIT_KERNEL \
6978+ bt $16, %esi; \ 7306+ cmpw $__KERNEXEC_KERNEL_CS, PT_CS(%esp); \
6979+ jc 1f; \ 7307+ jnz 1f; \
6980+ push %eax; push %ecx; \ 7308+ push %eax; push %ecx; \
6981+ movl %esi, %eax; \ 7309+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
7310+ btc $16, %eax; \
6982+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);\ 7311+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);\
6983+ pop %ecx; pop %eax; \ 7312+ pop %ecx; pop %eax; \
6984+1: 7313+1:
@@ -6986,7 +7315,6 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/paravirt.h linux-2.6.32.8/arch/x8
6986+#define PAX_ENTER_KERNEL \ 7315+#define PAX_ENTER_KERNEL \
6987+ push %eax; push %ecx; \ 7316+ push %eax; push %ecx; \
6988+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \ 7317+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
6989+ movl %eax, %esi; \
6990+ bts $16, %eax; \ 7318+ bts $16, %eax; \
6991+ jc 1f; \ 7319+ jc 1f; \
6992+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);\ 7320+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);\
@@ -7000,9 +7328,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/paravirt.h linux-2.6.32.8/arch/x8
7000 #define GET_CR0_INTO_EAX \ 7328 #define GET_CR0_INTO_EAX \
7001 push %ecx; push %edx; \ 7329 push %ecx; push %edx; \
7002 call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \ 7330 call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
7003diff -urNp linux-2.6.32.8/arch/x86/include/asm/paravirt_types.h linux-2.6.32.8/arch/x86/include/asm/paravirt_types.h 7331diff -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
7004--- linux-2.6.32.8/arch/x86/include/asm/paravirt_types.h 2010-02-09 07:57:19.000000000 -0500 7332--- linux-2.6.32.9/arch/x86/include/asm/paravirt_types.h 2010-02-09 07:57:19.000000000 -0500
7005+++ linux-2.6.32.8/arch/x86/include/asm/paravirt_types.h 2010-02-13 21:45:09.880585024 -0500 7333+++ linux-2.6.32.9/arch/x86/include/asm/paravirt_types.h 2010-02-23 17:09:53.103663728 -0500
7006@@ -316,6 +316,12 @@ struct pv_mmu_ops { 7334@@ -316,6 +316,12 @@ struct pv_mmu_ops {
7007 an mfn. We can tell which is which from the index. */ 7335 an mfn. We can tell which is which from the index. */
7008 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, 7336 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
@@ -7016,9 +7344,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/paravirt_types.h linux-2.6.32.8/a
7016 }; 7344 };
7017 7345
7018 struct raw_spinlock; 7346 struct raw_spinlock;
7019diff -urNp linux-2.6.32.8/arch/x86/include/asm/pci_x86.h linux-2.6.32.8/arch/x86/include/asm/pci_x86.h 7347diff -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
7020--- linux-2.6.32.8/arch/x86/include/asm/pci_x86.h 2010-02-09 07:57:19.000000000 -0500 7348--- linux-2.6.32.9/arch/x86/include/asm/pci_x86.h 2010-02-09 07:57:19.000000000 -0500
7021+++ linux-2.6.32.8/arch/x86/include/asm/pci_x86.h 2010-02-13 21:45:09.880585024 -0500 7349+++ linux-2.6.32.9/arch/x86/include/asm/pci_x86.h 2010-02-23 17:09:53.103663728 -0500
7022@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct 7350@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
7023 extern void (*pcibios_disable_irq)(struct pci_dev *dev); 7351 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
7024 7352
@@ -7041,9 +7369,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/pci_x86.h linux-2.6.32.8/arch/x86
7041 extern bool port_cf9_safe; 7369 extern bool port_cf9_safe;
7042 7370
7043 /* arch_initcall level */ 7371 /* arch_initcall level */
7044diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgalloc.h linux-2.6.32.8/arch/x86/include/asm/pgalloc.h 7372diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgalloc.h linux-2.6.32.9/arch/x86/include/asm/pgalloc.h
7045--- linux-2.6.32.8/arch/x86/include/asm/pgalloc.h 2010-02-09 07:57:19.000000000 -0500 7373--- linux-2.6.32.9/arch/x86/include/asm/pgalloc.h 2010-02-09 07:57:19.000000000 -0500
7046+++ linux-2.6.32.8/arch/x86/include/asm/pgalloc.h 2010-02-13 21:45:09.880585024 -0500 7374+++ linux-2.6.32.9/arch/x86/include/asm/pgalloc.h 2010-02-23 17:09:53.103663728 -0500
7047@@ -58,6 +58,13 @@ static inline void pmd_populate_kernel(s 7375@@ -58,6 +58,13 @@ static inline void pmd_populate_kernel(s
7048 pmd_t *pmd, pte_t *pte) 7376 pmd_t *pmd, pte_t *pte)
7049 { 7377 {
@@ -7058,9 +7386,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgalloc.h linux-2.6.32.8/arch/x86
7058 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); 7386 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
7059 } 7387 }
7060 7388
7061diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.8/arch/x86/include/asm/pgtable-2level.h 7389diff -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
7062--- linux-2.6.32.8/arch/x86/include/asm/pgtable-2level.h 2010-02-09 07:57:19.000000000 -0500 7390--- linux-2.6.32.9/arch/x86/include/asm/pgtable-2level.h 2010-02-09 07:57:19.000000000 -0500
7063+++ linux-2.6.32.8/arch/x86/include/asm/pgtable-2level.h 2010-02-13 21:45:09.881750536 -0500 7391+++ linux-2.6.32.9/arch/x86/include/asm/pgtable-2level.h 2010-02-23 17:09:53.103663728 -0500
7064@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 7392@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
7065 7393
7066 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 7394 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7071,9 +7399,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.8/a
7071 } 7399 }
7072 7400
7073 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) 7401 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
7074diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable_32.h linux-2.6.32.8/arch/x86/include/asm/pgtable_32.h 7402diff -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
7075--- linux-2.6.32.8/arch/x86/include/asm/pgtable_32.h 2010-02-09 07:57:19.000000000 -0500 7403--- linux-2.6.32.9/arch/x86/include/asm/pgtable_32.h 2010-02-09 07:57:19.000000000 -0500
7076+++ linux-2.6.32.8/arch/x86/include/asm/pgtable_32.h 2010-02-13 21:45:09.881750536 -0500 7404+++ linux-2.6.32.9/arch/x86/include/asm/pgtable_32.h 2010-02-23 17:09:53.103663728 -0500
7077@@ -26,8 +26,6 @@ 7405@@ -26,8 +26,6 @@
7078 struct mm_struct; 7406 struct mm_struct;
7079 struct vm_area_struct; 7407 struct vm_area_struct;
@@ -7115,9 +7443,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable_32.h linux-2.6.32.8/arch/
7115 /* 7443 /*
7116 * kern_addr_valid() is (1) for FLATMEM and (0) for 7444 * kern_addr_valid() is (1) for FLATMEM and (0) for
7117 * SPARSEMEM and DISCONTIGMEM 7445 * SPARSEMEM and DISCONTIGMEM
7118diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.8/arch/x86/include/asm/pgtable_32_types.h 7446diff -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
7119--- linux-2.6.32.8/arch/x86/include/asm/pgtable_32_types.h 2010-02-09 07:57:19.000000000 -0500 7447--- linux-2.6.32.9/arch/x86/include/asm/pgtable_32_types.h 2010-02-09 07:57:19.000000000 -0500
7120+++ linux-2.6.32.8/arch/x86/include/asm/pgtable_32_types.h 2010-02-13 21:45:09.881750536 -0500 7448+++ linux-2.6.32.9/arch/x86/include/asm/pgtable_32_types.h 2010-02-23 17:09:53.103663728 -0500
7121@@ -8,7 +8,7 @@ 7449@@ -8,7 +8,7 @@
7122 */ 7450 */
7123 #ifdef CONFIG_X86_PAE 7451 #ifdef CONFIG_X86_PAE
@@ -7147,9 +7475,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.8
7147 #define MODULES_VADDR VMALLOC_START 7475 #define MODULES_VADDR VMALLOC_START
7148 #define MODULES_END VMALLOC_END 7476 #define MODULES_END VMALLOC_END
7149 #define MODULES_LEN (MODULES_VADDR - MODULES_END) 7477 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
7150diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.8/arch/x86/include/asm/pgtable-3level.h 7478diff -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
7151--- linux-2.6.32.8/arch/x86/include/asm/pgtable-3level.h 2010-02-09 07:57:19.000000000 -0500 7479--- linux-2.6.32.9/arch/x86/include/asm/pgtable-3level.h 2010-02-09 07:57:19.000000000 -0500
7152+++ linux-2.6.32.8/arch/x86/include/asm/pgtable-3level.h 2010-02-13 21:45:09.881750536 -0500 7480+++ linux-2.6.32.9/arch/x86/include/asm/pgtable-3level.h 2010-02-23 17:09:53.103663728 -0500
7153@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic 7481@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
7154 7482
7155 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 7483 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7167,9 +7495,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.8/a
7167 } 7495 }
7168 7496
7169 /* 7497 /*
7170diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable_64.h linux-2.6.32.8/arch/x86/include/asm/pgtable_64.h 7498diff -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
7171--- linux-2.6.32.8/arch/x86/include/asm/pgtable_64.h 2010-02-09 07:57:19.000000000 -0500 7499--- linux-2.6.32.9/arch/x86/include/asm/pgtable_64.h 2010-02-09 07:57:19.000000000 -0500
7172+++ linux-2.6.32.8/arch/x86/include/asm/pgtable_64.h 2010-02-13 21:45:09.881750536 -0500 7500+++ linux-2.6.32.9/arch/x86/include/asm/pgtable_64.h 2010-02-23 17:09:53.103663728 -0500
7173@@ -16,9 +16,12 @@ 7501@@ -16,9 +16,12 @@
7174 7502
7175 extern pud_t level3_kernel_pgt[512]; 7503 extern pud_t level3_kernel_pgt[512];
@@ -7204,10 +7532,10 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable_64.h linux-2.6.32.8/arch/
7204 } 7532 }
7205 7533
7206 static inline void native_pgd_clear(pgd_t *pgd) 7534 static inline void native_pgd_clear(pgd_t *pgd)
7207diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable.h linux-2.6.32.8/arch/x86/include/asm/pgtable.h 7535diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable.h linux-2.6.32.9/arch/x86/include/asm/pgtable.h
7208--- linux-2.6.32.8/arch/x86/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500 7536--- linux-2.6.32.9/arch/x86/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500
7209+++ linux-2.6.32.8/arch/x86/include/asm/pgtable.h 2010-02-13 21:45:09.881750536 -0500 7537+++ linux-2.6.32.9/arch/x86/include/asm/pgtable.h 2010-02-23 17:09:53.103663728 -0500
7210@@ -74,12 +74,51 @@ extern struct list_head pgd_list; 7538@@ -74,12 +74,61 @@ extern struct list_head pgd_list;
7211 7539
7212 #define arch_end_context_switch(prev) do {} while(0) 7540 #define arch_end_context_switch(prev) do {} while(0)
7213 7541
@@ -7227,6 +7555,11 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable.h linux-2.6.32.8/arch/x86
7227+ barrier(); 7555+ barrier();
7228+ cr0 = read_cr0(); 7556+ cr0 = read_cr0();
7229+ BUG_ON(unlikely(!(cr0 & X86_CR0_WP))); 7557+ BUG_ON(unlikely(!(cr0 & X86_CR0_WP)));
7558+
7559+#ifdef CONFIG_X86_32
7560+ asm volatile("ljmp %0,$1f; 1:\n\t" : : "i"(__KERNEXEC_KERNEL_CS), "m"(__force_order));
7561+#endif
7562+
7230+ write_cr0(cr0 & ~X86_CR0_WP); 7563+ write_cr0(cr0 & ~X86_CR0_WP);
7231+ return cr0; 7564+ return cr0;
7232+} 7565+}
@@ -7237,6 +7570,11 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable.h linux-2.6.32.8/arch/x86
7237+ 7570+
7238+ cr0 = read_cr0(); 7571+ cr0 = read_cr0();
7239+ BUG_ON(unlikely(cr0 & X86_CR0_WP)); 7572+ BUG_ON(unlikely(cr0 & X86_CR0_WP));
7573+
7574+#ifdef CONFIG_X86_32
7575+ asm volatile("ljmp %0,$1f; 1:\n\t" : : "i"(__KERNEL_CS), "m"(__force_order));
7576+#endif
7577+
7240+ write_cr0(cr0 | X86_CR0_WP); 7578+ write_cr0(cr0 | X86_CR0_WP);
7241+ barrier(); 7579+ barrier();
7242+ preempt_enable_no_resched(); 7580+ preempt_enable_no_resched();
@@ -7259,7 +7597,7 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable.h linux-2.6.32.8/arch/x86
7259 static inline int pte_dirty(pte_t pte) 7597 static inline int pte_dirty(pte_t pte)
7260 { 7598 {
7261 return pte_flags(pte) & _PAGE_DIRTY; 7599 return pte_flags(pte) & _PAGE_DIRTY;
7262@@ -167,9 +206,29 @@ static inline pte_t pte_wrprotect(pte_t 7600@@ -167,9 +216,29 @@ static inline pte_t pte_wrprotect(pte_t
7263 return pte_clear_flags(pte, _PAGE_RW); 7601 return pte_clear_flags(pte, _PAGE_RW);
7264 } 7602 }
7265 7603
@@ -7290,7 +7628,7 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable.h linux-2.6.32.8/arch/x86
7290 } 7628 }
7291 7629
7292 static inline pte_t pte_mkdirty(pte_t pte) 7630 static inline pte_t pte_mkdirty(pte_t pte)
7293@@ -472,7 +531,7 @@ static inline pud_t *pud_offset(pgd_t *p 7631@@ -472,7 +541,7 @@ static inline pud_t *pud_offset(pgd_t *p
7294 7632
7295 static inline int pgd_bad(pgd_t pgd) 7633 static inline int pgd_bad(pgd_t pgd)
7296 { 7634 {
@@ -7299,20 +7637,24 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable.h linux-2.6.32.8/arch/x86
7299 } 7637 }
7300 7638
7301 static inline int pgd_none(pgd_t pgd) 7639 static inline int pgd_none(pgd_t pgd)
7302@@ -613,7 +672,9 @@ static inline void ptep_set_wrprotect(st 7640@@ -611,9 +680,12 @@ static inline void ptep_set_wrprotect(st
7641 * dst and src can be on the same page, but the range must not overlap,
7642 * and must not cross a page boundary.
7303 */ 7643 */
7304 static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) 7644-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
7645+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
7305 { 7646 {
7306- memcpy(dst, src, count * sizeof(pgd_t)); 7647- memcpy(dst, src, count * sizeof(pgd_t));
7307+ pax_open_kernel(); 7648+ pax_open_kernel();
7308+ memcpy(dst, src, count * sizeof(pgd_t)); 7649+ while (count--)
7650+ *dst++ = *src++;
7309+ pax_close_kernel(); 7651+ pax_close_kernel();
7310 } 7652 }
7311 7653
7312 7654
7313diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable_types.h linux-2.6.32.8/arch/x86/include/asm/pgtable_types.h 7655diff -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
7314--- linux-2.6.32.8/arch/x86/include/asm/pgtable_types.h 2010-02-09 07:57:19.000000000 -0500 7656--- linux-2.6.32.9/arch/x86/include/asm/pgtable_types.h 2010-02-09 07:57:19.000000000 -0500
7315+++ linux-2.6.32.8/arch/x86/include/asm/pgtable_types.h 2010-02-13 21:45:09.882907109 -0500 7657+++ linux-2.6.32.9/arch/x86/include/asm/pgtable_types.h 2010-02-23 17:09:53.103663728 -0500
7316@@ -16,12 +16,11 @@ 7658@@ -16,12 +16,11 @@
7317 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ 7659 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
7318 #define _PAGE_BIT_PAT 7 /* on 4KB pages */ 7660 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -7397,9 +7739,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable_types.h linux-2.6.32.8/ar
7397 7739
7398 #define pgprot_writecombine pgprot_writecombine 7740 #define pgprot_writecombine pgprot_writecombine
7399 extern pgprot_t pgprot_writecombine(pgprot_t prot); 7741 extern pgprot_t pgprot_writecombine(pgprot_t prot);
7400diff -urNp linux-2.6.32.8/arch/x86/include/asm/processor.h linux-2.6.32.8/arch/x86/include/asm/processor.h 7742diff -urNp linux-2.6.32.9/arch/x86/include/asm/processor.h linux-2.6.32.9/arch/x86/include/asm/processor.h
7401--- linux-2.6.32.8/arch/x86/include/asm/processor.h 2010-02-09 07:57:19.000000000 -0500 7743--- linux-2.6.32.9/arch/x86/include/asm/processor.h 2010-02-09 07:57:19.000000000 -0500
7402+++ linux-2.6.32.8/arch/x86/include/asm/processor.h 2010-02-13 21:45:09.883637641 -0500 7744+++ linux-2.6.32.9/arch/x86/include/asm/processor.h 2010-02-23 17:09:53.103663728 -0500
7403@@ -272,7 +272,7 @@ struct tss_struct { 7745@@ -272,7 +272,7 @@ struct tss_struct {
7404 7746
7405 } ____cacheline_aligned; 7747 } ____cacheline_aligned;
@@ -7479,9 +7821,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/processor.h linux-2.6.32.8/arch/x
7479 #define KSTK_EIP(task) (task_pt_regs(task)->ip) 7821 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
7480 7822
7481 /* Get/set a process' ability to use the timestamp counter instruction */ 7823 /* Get/set a process' ability to use the timestamp counter instruction */
7482diff -urNp linux-2.6.32.8/arch/x86/include/asm/ptrace.h linux-2.6.32.8/arch/x86/include/asm/ptrace.h 7824diff -urNp linux-2.6.32.9/arch/x86/include/asm/ptrace.h linux-2.6.32.9/arch/x86/include/asm/ptrace.h
7483--- linux-2.6.32.8/arch/x86/include/asm/ptrace.h 2010-02-09 07:57:19.000000000 -0500 7825--- linux-2.6.32.9/arch/x86/include/asm/ptrace.h 2010-02-09 07:57:19.000000000 -0500
7484+++ linux-2.6.32.8/arch/x86/include/asm/ptrace.h 2010-02-13 21:45:09.883637641 -0500 7826+++ linux-2.6.32.9/arch/x86/include/asm/ptrace.h 2010-02-23 17:09:53.103663728 -0500
7485@@ -151,28 +151,29 @@ static inline unsigned long regs_return_ 7827@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
7486 } 7828 }
7487 7829
@@ -7518,9 +7860,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/ptrace.h linux-2.6.32.8/arch/x86/
7518 #endif 7860 #endif
7519 } 7861 }
7520 7862
7521diff -urNp linux-2.6.32.8/arch/x86/include/asm/reboot.h linux-2.6.32.8/arch/x86/include/asm/reboot.h 7863diff -urNp linux-2.6.32.9/arch/x86/include/asm/reboot.h linux-2.6.32.9/arch/x86/include/asm/reboot.h
7522--- linux-2.6.32.8/arch/x86/include/asm/reboot.h 2010-02-09 07:57:19.000000000 -0500 7864--- linux-2.6.32.9/arch/x86/include/asm/reboot.h 2010-02-09 07:57:19.000000000 -0500
7523+++ linux-2.6.32.8/arch/x86/include/asm/reboot.h 2010-02-13 21:45:09.883637641 -0500 7865+++ linux-2.6.32.9/arch/x86/include/asm/reboot.h 2010-02-23 17:09:53.103663728 -0500
7524@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; 7866@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
7525 7867
7526 void native_machine_crash_shutdown(struct pt_regs *regs); 7868 void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -7530,9 +7872,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/reboot.h linux-2.6.32.8/arch/x86/
7530 7872
7531 typedef void (*nmi_shootdown_cb)(int, struct die_args*); 7873 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
7532 void nmi_shootdown_cpus(nmi_shootdown_cb callback); 7874 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
7533diff -urNp linux-2.6.32.8/arch/x86/include/asm/rwsem.h linux-2.6.32.8/arch/x86/include/asm/rwsem.h 7875diff -urNp linux-2.6.32.9/arch/x86/include/asm/rwsem.h linux-2.6.32.9/arch/x86/include/asm/rwsem.h
7534--- linux-2.6.32.8/arch/x86/include/asm/rwsem.h 2010-02-09 07:57:19.000000000 -0500 7876--- linux-2.6.32.9/arch/x86/include/asm/rwsem.h 2010-02-09 07:57:19.000000000 -0500
7535+++ linux-2.6.32.8/arch/x86/include/asm/rwsem.h 2010-02-13 21:45:09.883637641 -0500 7877+++ linux-2.6.32.9/arch/x86/include/asm/rwsem.h 2010-02-23 17:09:53.103663728 -0500
7536@@ -106,10 +106,26 @@ static inline void __down_read(struct rw 7878@@ -106,10 +106,26 @@ static inline void __down_read(struct rw
7537 { 7879 {
7538 asm volatile("# beginning down_read\n\t" 7880 asm volatile("# beginning down_read\n\t"
@@ -7765,10 +8107,30 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/rwsem.h linux-2.6.32.8/arch/x86/i
7765 : "+r" (tmp), "+m" (sem->count) 8107 : "+r" (tmp), "+m" (sem->count)
7766 : : "memory"); 8108 : : "memory");
7767 8109
7768diff -urNp linux-2.6.32.8/arch/x86/include/asm/segment.h linux-2.6.32.8/arch/x86/include/asm/segment.h 8110diff -urNp linux-2.6.32.9/arch/x86/include/asm/segment.h linux-2.6.32.9/arch/x86/include/asm/segment.h
7769--- linux-2.6.32.8/arch/x86/include/asm/segment.h 2010-02-09 07:57:19.000000000 -0500 8111--- linux-2.6.32.9/arch/x86/include/asm/segment.h 2010-02-09 07:57:19.000000000 -0500
7770+++ linux-2.6.32.8/arch/x86/include/asm/segment.h 2010-02-13 21:45:09.910684727 -0500 8112+++ linux-2.6.32.9/arch/x86/include/asm/segment.h 2010-02-23 17:09:53.103663728 -0500
7771@@ -88,7 +88,7 @@ 8113@@ -62,8 +62,8 @@
8114 * 26 - ESPFIX small SS
8115 * 27 - per-cpu [ offset to per-cpu data area ]
8116 * 28 - stack_canary-20 [ for stack protector ]
8117- * 29 - unused
8118- * 30 - unused
8119+ * 29 - PCI BIOS CS
8120+ * 30 - PCI BIOS DS
8121 * 31 - TSS for double fault handler
8122 */
8123 #define GDT_ENTRY_TLS_MIN 6
8124@@ -77,6 +77,8 @@
8125
8126 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE + 0)
8127
8128+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
8129+
8130 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE + 1)
8131
8132 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE + 4)
8133@@ -88,7 +90,7 @@
7772 #define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14) 8134 #define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14)
7773 #define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8) 8135 #define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)
7774 8136
@@ -7777,7 +8139,7 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/segment.h linux-2.6.32.8/arch/x86
7777 #ifdef CONFIG_SMP 8139 #ifdef CONFIG_SMP
7778 #define __KERNEL_PERCPU (GDT_ENTRY_PERCPU * 8) 8140 #define __KERNEL_PERCPU (GDT_ENTRY_PERCPU * 8)
7779 #else 8141 #else
7780@@ -102,6 +102,12 @@ 8142@@ -102,6 +104,12 @@
7781 #define __KERNEL_STACK_CANARY 0 8143 #define __KERNEL_STACK_CANARY 0
7782 #endif 8144 #endif
7783 8145
@@ -7790,7 +8152,7 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/segment.h linux-2.6.32.8/arch/x86
7790 #define GDT_ENTRY_DOUBLEFAULT_TSS 31 8152 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
7791 8153
7792 /* 8154 /*
7793@@ -139,7 +145,7 @@ 8155@@ -139,12 +147,13 @@
7794 */ 8156 */
7795 8157
7796 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */ 8158 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
@@ -7799,9 +8161,23 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/segment.h linux-2.6.32.8/arch/x86
7799 8161
7800 8162
7801 #else 8163 #else
7802diff -urNp linux-2.6.32.8/arch/x86/include/asm/spinlock.h linux-2.6.32.8/arch/x86/include/asm/spinlock.h 8164 #include <asm/cache.h>
7803--- linux-2.6.32.8/arch/x86/include/asm/spinlock.h 2010-02-09 07:57:19.000000000 -0500 8165
7804+++ linux-2.6.32.8/arch/x86/include/asm/spinlock.h 2010-02-13 21:45:09.910684727 -0500 8166+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 0
8167 #define GDT_ENTRY_KERNEL32_CS 1
8168 #define GDT_ENTRY_KERNEL_CS 2
8169 #define GDT_ENTRY_KERNEL_DS 3
8170@@ -183,6 +192,7 @@
8171 #endif
8172
8173 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS * 8)
8174+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS * 8)
8175 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
8176 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
8177 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
8178diff -urNp linux-2.6.32.9/arch/x86/include/asm/spinlock.h linux-2.6.32.9/arch/x86/include/asm/spinlock.h
8179--- linux-2.6.32.9/arch/x86/include/asm/spinlock.h 2010-02-09 07:57:19.000000000 -0500
8180+++ linux-2.6.32.9/arch/x86/include/asm/spinlock.h 2010-02-23 17:09:53.103663728 -0500
7805@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r 8181@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r
7806 static inline void __raw_read_lock(raw_rwlock_t *rw) 8182 static inline void __raw_read_lock(raw_rwlock_t *rw)
7807 { 8183 {
@@ -7905,9 +8281,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/spinlock.h linux-2.6.32.8/arch/x8
7905 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); 8281 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
7906 } 8282 }
7907 8283
7908diff -urNp linux-2.6.32.8/arch/x86/include/asm/system.h linux-2.6.32.8/arch/x86/include/asm/system.h 8284diff -urNp linux-2.6.32.9/arch/x86/include/asm/system.h linux-2.6.32.9/arch/x86/include/asm/system.h
7909--- linux-2.6.32.8/arch/x86/include/asm/system.h 2010-02-09 07:57:19.000000000 -0500 8285--- linux-2.6.32.9/arch/x86/include/asm/system.h 2010-02-09 07:57:19.000000000 -0500
7910+++ linux-2.6.32.8/arch/x86/include/asm/system.h 2010-02-13 21:45:09.910684727 -0500 8286+++ linux-2.6.32.9/arch/x86/include/asm/system.h 2010-02-23 17:09:53.103663728 -0500
7911@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un 8287@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
7912 { 8288 {
7913 unsigned long __limit; 8289 unsigned long __limit;
@@ -7926,9 +8302,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/system.h linux-2.6.32.8/arch/x86/
7926 extern void free_init_pages(char *what, unsigned long begin, unsigned long end); 8302 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
7927 8303
7928 void default_idle(void); 8304 void default_idle(void);
7929diff -urNp linux-2.6.32.8/arch/x86/include/asm/uaccess_32.h linux-2.6.32.8/arch/x86/include/asm/uaccess_32.h 8305diff -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
7930--- linux-2.6.32.8/arch/x86/include/asm/uaccess_32.h 2010-02-09 07:57:19.000000000 -0500 8306--- linux-2.6.32.9/arch/x86/include/asm/uaccess_32.h 2010-02-09 07:57:19.000000000 -0500
7931+++ linux-2.6.32.8/arch/x86/include/asm/uaccess_32.h 2010-02-13 21:45:09.910684727 -0500 8307+++ linux-2.6.32.9/arch/x86/include/asm/uaccess_32.h 2010-02-23 17:09:53.103663728 -0500
7932@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u 8308@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
7933 static __always_inline unsigned long __must_check 8309 static __always_inline unsigned long __must_check
7934 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) 8310 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -8058,9 +8434,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/uaccess_32.h linux-2.6.32.8/arch/
8058 long __must_check strncpy_from_user(char *dst, const char __user *src, 8434 long __must_check strncpy_from_user(char *dst, const char __user *src,
8059 long count); 8435 long count);
8060 long __must_check __strncpy_from_user(char *dst, 8436 long __must_check __strncpy_from_user(char *dst,
8061diff -urNp linux-2.6.32.8/arch/x86/include/asm/uaccess_64.h linux-2.6.32.8/arch/x86/include/asm/uaccess_64.h 8437diff -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
8062--- linux-2.6.32.8/arch/x86/include/asm/uaccess_64.h 2010-02-09 07:57:19.000000000 -0500 8438--- linux-2.6.32.9/arch/x86/include/asm/uaccess_64.h 2010-02-09 07:57:19.000000000 -0500
8063+++ linux-2.6.32.8/arch/x86/include/asm/uaccess_64.h 2010-02-13 21:45:09.910684727 -0500 8439+++ linux-2.6.32.9/arch/x86/include/asm/uaccess_64.h 2010-02-23 17:09:53.103663728 -0500
8064@@ -10,6 +10,8 @@ 8440@@ -10,6 +10,8 @@
8065 #include <linux/lockdep.h> 8441 #include <linux/lockdep.h>
8066 #include <asm/page.h> 8442 #include <asm/page.h>
@@ -8211,9 +8587,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/uaccess_64.h linux-2.6.32.8/arch/
8211 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); 8587 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
8212 8588
8213 #endif /* _ASM_X86_UACCESS_64_H */ 8589 #endif /* _ASM_X86_UACCESS_64_H */
8214diff -urNp linux-2.6.32.8/arch/x86/include/asm/uaccess.h linux-2.6.32.8/arch/x86/include/asm/uaccess.h 8590diff -urNp linux-2.6.32.9/arch/x86/include/asm/uaccess.h linux-2.6.32.9/arch/x86/include/asm/uaccess.h
8215--- linux-2.6.32.8/arch/x86/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500 8591--- linux-2.6.32.9/arch/x86/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500
8216+++ linux-2.6.32.8/arch/x86/include/asm/uaccess.h 2010-02-13 21:45:09.911906943 -0500 8592+++ linux-2.6.32.9/arch/x86/include/asm/uaccess.h 2010-02-23 17:09:53.103663728 -0500
8217@@ -8,8 +8,11 @@ 8593@@ -8,8 +8,11 @@
8218 #include <linux/thread_info.h> 8594 #include <linux/thread_info.h>
8219 #include <linux/prefetch.h> 8595 #include <linux/prefetch.h>
@@ -8412,9 +8788,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/uaccess.h linux-2.6.32.8/arch/x86
8412 #ifdef CONFIG_X86_32 8788 #ifdef CONFIG_X86_32
8413 # include "uaccess_32.h" 8789 # include "uaccess_32.h"
8414 #else 8790 #else
8415diff -urNp linux-2.6.32.8/arch/x86/include/asm/vgtod.h linux-2.6.32.8/arch/x86/include/asm/vgtod.h 8791diff -urNp linux-2.6.32.9/arch/x86/include/asm/vgtod.h linux-2.6.32.9/arch/x86/include/asm/vgtod.h
8416--- linux-2.6.32.8/arch/x86/include/asm/vgtod.h 2010-02-09 07:57:19.000000000 -0500 8792--- linux-2.6.32.9/arch/x86/include/asm/vgtod.h 2010-02-09 07:57:19.000000000 -0500
8417+++ linux-2.6.32.8/arch/x86/include/asm/vgtod.h 2010-02-13 21:45:09.911906943 -0500 8793+++ linux-2.6.32.9/arch/x86/include/asm/vgtod.h 2010-02-23 17:09:53.108051644 -0500
8418@@ -14,6 +14,7 @@ struct vsyscall_gtod_data { 8794@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
8419 int sysctl_enabled; 8795 int sysctl_enabled;
8420 struct timezone sys_tz; 8796 struct timezone sys_tz;
@@ -8423,9 +8799,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/vgtod.h linux-2.6.32.8/arch/x86/i
8423 cycle_t (*vread)(void); 8799 cycle_t (*vread)(void);
8424 cycle_t cycle_last; 8800 cycle_t cycle_last;
8425 cycle_t mask; 8801 cycle_t mask;
8426diff -urNp linux-2.6.32.8/arch/x86/include/asm/vmi.h linux-2.6.32.8/arch/x86/include/asm/vmi.h 8802diff -urNp linux-2.6.32.9/arch/x86/include/asm/vmi.h linux-2.6.32.9/arch/x86/include/asm/vmi.h
8427--- linux-2.6.32.8/arch/x86/include/asm/vmi.h 2010-02-09 07:57:19.000000000 -0500 8803--- linux-2.6.32.9/arch/x86/include/asm/vmi.h 2010-02-09 07:57:19.000000000 -0500
8428+++ linux-2.6.32.8/arch/x86/include/asm/vmi.h 2010-02-13 21:45:09.911906943 -0500 8804+++ linux-2.6.32.9/arch/x86/include/asm/vmi.h 2010-02-23 17:09:53.108051644 -0500
8429@@ -191,6 +191,7 @@ struct vrom_header { 8805@@ -191,6 +191,7 @@ struct vrom_header {
8430 u8 reserved[96]; /* Reserved for headers */ 8806 u8 reserved[96]; /* Reserved for headers */
8431 char vmi_init[8]; /* VMI_Init jump point */ 8807 char vmi_init[8]; /* VMI_Init jump point */
@@ -8434,9 +8810,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/vmi.h linux-2.6.32.8/arch/x86/inc
8434 } __attribute__((packed)); 8810 } __attribute__((packed));
8435 8811
8436 struct pnp_header { 8812 struct pnp_header {
8437diff -urNp linux-2.6.32.8/arch/x86/include/asm/vsyscall.h linux-2.6.32.8/arch/x86/include/asm/vsyscall.h 8813diff -urNp linux-2.6.32.9/arch/x86/include/asm/vsyscall.h linux-2.6.32.9/arch/x86/include/asm/vsyscall.h
8438--- linux-2.6.32.8/arch/x86/include/asm/vsyscall.h 2010-02-09 07:57:19.000000000 -0500 8814--- linux-2.6.32.9/arch/x86/include/asm/vsyscall.h 2010-02-09 07:57:19.000000000 -0500
8439+++ linux-2.6.32.8/arch/x86/include/asm/vsyscall.h 2010-02-13 21:45:09.911906943 -0500 8815+++ linux-2.6.32.9/arch/x86/include/asm/vsyscall.h 2010-02-23 17:09:53.108051644 -0500
8440@@ -15,9 +15,10 @@ enum vsyscall_num { 8816@@ -15,9 +15,10 @@ enum vsyscall_num {
8441 8817
8442 #ifdef __KERNEL__ 8818 #ifdef __KERNEL__
@@ -8467,9 +8843,9 @@ diff -urNp linux-2.6.32.8/arch/x86/include/asm/vsyscall.h linux-2.6.32.8/arch/x8
8467 #endif /* __KERNEL__ */ 8843 #endif /* __KERNEL__ */
8468 8844
8469 #endif /* _ASM_X86_VSYSCALL_H */ 8845 #endif /* _ASM_X86_VSYSCALL_H */
8470diff -urNp linux-2.6.32.8/arch/x86/Kconfig linux-2.6.32.8/arch/x86/Kconfig 8846diff -urNp linux-2.6.32.9/arch/x86/Kconfig linux-2.6.32.9/arch/x86/Kconfig
8471--- linux-2.6.32.8/arch/x86/Kconfig 2010-02-09 07:57:19.000000000 -0500 8847--- linux-2.6.32.9/arch/x86/Kconfig 2010-02-09 07:57:19.000000000 -0500
8472+++ linux-2.6.32.8/arch/x86/Kconfig 2010-02-13 21:45:09.912905886 -0500 8848+++ linux-2.6.32.9/arch/x86/Kconfig 2010-02-23 17:09:53.108051644 -0500
8473@@ -1083,7 +1083,7 @@ config PAGE_OFFSET 8849@@ -1083,7 +1083,7 @@ config PAGE_OFFSET
8474 hex 8850 hex
8475 default 0xB0000000 if VMSPLIT_3G_OPT 8851 default 0xB0000000 if VMSPLIT_3G_OPT
@@ -8516,9 +8892,9 @@ diff -urNp linux-2.6.32.8/arch/x86/Kconfig linux-2.6.32.8/arch/x86/Kconfig
8516 ---help--- 8892 ---help---
8517 Map the 32-bit VDSO to the predictable old-style address too. 8893 Map the 32-bit VDSO to the predictable old-style address too.
8518 ---help--- 8894 ---help---
8519diff -urNp linux-2.6.32.8/arch/x86/Kconfig.cpu linux-2.6.32.8/arch/x86/Kconfig.cpu 8895diff -urNp linux-2.6.32.9/arch/x86/Kconfig.cpu linux-2.6.32.9/arch/x86/Kconfig.cpu
8520--- linux-2.6.32.8/arch/x86/Kconfig.cpu 2010-02-09 07:57:19.000000000 -0500 8896--- linux-2.6.32.9/arch/x86/Kconfig.cpu 2010-02-09 07:57:19.000000000 -0500
8521+++ linux-2.6.32.8/arch/x86/Kconfig.cpu 2010-02-13 21:45:09.912905886 -0500 8897+++ linux-2.6.32.9/arch/x86/Kconfig.cpu 2010-02-23 17:09:53.108051644 -0500
8522@@ -340,7 +340,7 @@ config X86_PPRO_FENCE 8898@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
8523 8899
8524 config X86_F00F_BUG 8900 config X86_F00F_BUG
@@ -8546,9 +8922,9 @@ diff -urNp linux-2.6.32.8/arch/x86/Kconfig.cpu linux-2.6.32.8/arch/x86/Kconfig.c
8546 8922
8547 config X86_MINIMUM_CPU_FAMILY 8923 config X86_MINIMUM_CPU_FAMILY
8548 int 8924 int
8549diff -urNp linux-2.6.32.8/arch/x86/Kconfig.debug linux-2.6.32.8/arch/x86/Kconfig.debug 8925diff -urNp linux-2.6.32.9/arch/x86/Kconfig.debug linux-2.6.32.9/arch/x86/Kconfig.debug
8550--- linux-2.6.32.8/arch/x86/Kconfig.debug 2010-02-09 07:57:19.000000000 -0500 8926--- linux-2.6.32.9/arch/x86/Kconfig.debug 2010-02-09 07:57:19.000000000 -0500
8551+++ linux-2.6.32.8/arch/x86/Kconfig.debug 2010-02-13 21:45:09.912905886 -0500 8927+++ linux-2.6.32.9/arch/x86/Kconfig.debug 2010-02-23 17:09:53.108051644 -0500
8552@@ -99,7 +99,7 @@ config X86_PTDUMP 8928@@ -99,7 +99,7 @@ config X86_PTDUMP
8553 config DEBUG_RODATA 8929 config DEBUG_RODATA
8554 bool "Write protect kernel read-only data structures" 8930 bool "Write protect kernel read-only data structures"
@@ -8558,9 +8934,9 @@ diff -urNp linux-2.6.32.8/arch/x86/Kconfig.debug linux-2.6.32.8/arch/x86/Kconfig
8558 ---help--- 8934 ---help---
8559 Mark the kernel read-only data as write-protected in the pagetables, 8935 Mark the kernel read-only data as write-protected in the pagetables,
8560 in order to catch accidental (and incorrect) writes to such const 8936 in order to catch accidental (and incorrect) writes to such const
8561diff -urNp linux-2.6.32.8/arch/x86/kernel/acpi/boot.c linux-2.6.32.8/arch/x86/kernel/acpi/boot.c 8937diff -urNp linux-2.6.32.9/arch/x86/kernel/acpi/boot.c linux-2.6.32.9/arch/x86/kernel/acpi/boot.c
8562--- linux-2.6.32.8/arch/x86/kernel/acpi/boot.c 2010-02-09 07:57:19.000000000 -0500 8938--- linux-2.6.32.9/arch/x86/kernel/acpi/boot.c 2010-02-09 07:57:19.000000000 -0500
8563+++ linux-2.6.32.8/arch/x86/kernel/acpi/boot.c 2010-02-13 21:45:09.913909174 -0500 8939+++ linux-2.6.32.9/arch/x86/kernel/acpi/boot.c 2010-02-23 17:09:53.108051644 -0500
8564@@ -1508,7 +1508,7 @@ static struct dmi_system_id __initdata a 8940@@ -1508,7 +1508,7 @@ static struct dmi_system_id __initdata a
8565 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), 8941 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
8566 }, 8942 },
@@ -8570,9 +8946,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/acpi/boot.c linux-2.6.32.8/arch/x86/ke
8570 }; 8946 };
8571 8947
8572 /* 8948 /*
8573diff -urNp linux-2.6.32.8/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.8/arch/x86/kernel/acpi/realmode/wakeup.S 8949diff -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
8574--- linux-2.6.32.8/arch/x86/kernel/acpi/realmode/wakeup.S 2010-02-09 07:57:19.000000000 -0500 8950--- linux-2.6.32.9/arch/x86/kernel/acpi/realmode/wakeup.S 2010-02-09 07:57:19.000000000 -0500
8575+++ linux-2.6.32.8/arch/x86/kernel/acpi/realmode/wakeup.S 2010-02-13 21:45:09.913909174 -0500 8951+++ linux-2.6.32.9/arch/x86/kernel/acpi/realmode/wakeup.S 2010-02-23 17:09:53.108051644 -0500
8576@@ -104,7 +104,7 @@ _start: 8952@@ -104,7 +104,7 @@ _start:
8577 movl %eax, %ecx 8953 movl %eax, %ecx
8578 orl %edx, %ecx 8954 orl %edx, %ecx
@@ -8582,9 +8958,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.8/
8582 wrmsr 8958 wrmsr
8583 1: 8959 1:
8584 8960
8585diff -urNp linux-2.6.32.8/arch/x86/kernel/acpi/sleep.c linux-2.6.32.8/arch/x86/kernel/acpi/sleep.c 8961diff -urNp linux-2.6.32.9/arch/x86/kernel/acpi/sleep.c linux-2.6.32.9/arch/x86/kernel/acpi/sleep.c
8586--- linux-2.6.32.8/arch/x86/kernel/acpi/sleep.c 2010-02-09 07:57:19.000000000 -0500 8962--- linux-2.6.32.9/arch/x86/kernel/acpi/sleep.c 2010-02-09 07:57:19.000000000 -0500
8587+++ linux-2.6.32.8/arch/x86/kernel/acpi/sleep.c 2010-02-13 21:45:09.913909174 -0500 8963+++ linux-2.6.32.9/arch/x86/kernel/acpi/sleep.c 2010-02-23 17:09:53.108051644 -0500
8588@@ -11,11 +11,12 @@ 8964@@ -11,11 +11,12 @@
8589 #include <linux/cpumask.h> 8965 #include <linux/cpumask.h>
8590 #include <asm/segment.h> 8966 #include <asm/segment.h>
@@ -8629,9 +9005,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/acpi/sleep.c linux-2.6.32.8/arch/x86/k
8629 } 9005 }
8630 9006
8631 9007
8632diff -urNp linux-2.6.32.8/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.8/arch/x86/kernel/acpi/wakeup_32.S 9008diff -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
8633--- linux-2.6.32.8/arch/x86/kernel/acpi/wakeup_32.S 2010-02-09 07:57:19.000000000 -0500 9009--- linux-2.6.32.9/arch/x86/kernel/acpi/wakeup_32.S 2010-02-09 07:57:19.000000000 -0500
8634+++ linux-2.6.32.8/arch/x86/kernel/acpi/wakeup_32.S 2010-02-13 21:45:09.913909174 -0500 9010+++ linux-2.6.32.9/arch/x86/kernel/acpi/wakeup_32.S 2010-02-23 17:09:53.108051644 -0500
8635@@ -30,13 +30,11 @@ wakeup_pmode_return: 9011@@ -30,13 +30,11 @@ wakeup_pmode_return:
8636 # and restore the stack ... but you need gdt for this to work 9012 # and restore the stack ... but you need gdt for this to work
8637 movl saved_context_esp, %esp 9013 movl saved_context_esp, %esp
@@ -8648,9 +9024,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.8/arch/x
8648 9024
8649 bogus_magic: 9025 bogus_magic:
8650 jmp bogus_magic 9026 jmp bogus_magic
8651diff -urNp linux-2.6.32.8/arch/x86/kernel/alternative.c linux-2.6.32.8/arch/x86/kernel/alternative.c 9027diff -urNp linux-2.6.32.9/arch/x86/kernel/alternative.c linux-2.6.32.9/arch/x86/kernel/alternative.c
8652--- linux-2.6.32.8/arch/x86/kernel/alternative.c 2010-02-09 07:57:19.000000000 -0500 9028--- linux-2.6.32.9/arch/x86/kernel/alternative.c 2010-02-09 07:57:19.000000000 -0500
8653+++ linux-2.6.32.8/arch/x86/kernel/alternative.c 2010-02-13 21:45:09.913909174 -0500 9029+++ linux-2.6.32.9/arch/x86/kernel/alternative.c 2010-02-23 17:09:53.108051644 -0500
8654@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str 9030@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
8655 9031
8656 BUG_ON(p->len > MAX_PATCH_LEN); 9032 BUG_ON(p->len > MAX_PATCH_LEN);
@@ -8723,10 +9099,10 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/alternative.c linux-2.6.32.8/arch/x86/
8723+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); 9099+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]);
8724 return addr; 9100 return addr;
8725 } 9101 }
8726diff -urNp linux-2.6.32.8/arch/x86/kernel/amd_iommu.c linux-2.6.32.8/arch/x86/kernel/amd_iommu.c 9102diff -urNp linux-2.6.32.9/arch/x86/kernel/amd_iommu.c linux-2.6.32.9/arch/x86/kernel/amd_iommu.c
8727--- linux-2.6.32.8/arch/x86/kernel/amd_iommu.c 2010-02-09 07:57:19.000000000 -0500 9103--- linux-2.6.32.9/arch/x86/kernel/amd_iommu.c 2010-02-23 17:04:11.759589893 -0500
8728+++ linux-2.6.32.8/arch/x86/kernel/amd_iommu.c 2010-02-13 21:45:09.914908941 -0500 9104+++ linux-2.6.32.9/arch/x86/kernel/amd_iommu.c 2010-02-23 17:09:53.108051644 -0500
8729@@ -2073,7 +2073,7 @@ static void prealloc_protection_domains( 9105@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains(
8730 } 9106 }
8731 } 9107 }
8732 9108
@@ -8735,9 +9111,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/amd_iommu.c linux-2.6.32.8/arch/x86/ke
8735 .alloc_coherent = alloc_coherent, 9111 .alloc_coherent = alloc_coherent,
8736 .free_coherent = free_coherent, 9112 .free_coherent = free_coherent,
8737 .map_page = map_page, 9113 .map_page = map_page,
8738diff -urNp linux-2.6.32.8/arch/x86/kernel/apic/io_apic.c linux-2.6.32.8/arch/x86/kernel/apic/io_apic.c 9114diff -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
8739--- linux-2.6.32.8/arch/x86/kernel/apic/io_apic.c 2010-02-09 07:57:19.000000000 -0500 9115--- linux-2.6.32.9/arch/x86/kernel/apic/io_apic.c 2010-02-23 17:04:11.805135472 -0500
8740+++ linux-2.6.32.8/arch/x86/kernel/apic/io_apic.c 2010-02-13 21:45:09.914908941 -0500 9116+++ linux-2.6.32.9/arch/x86/kernel/apic/io_apic.c 2010-02-23 17:09:53.108051644 -0500
8741@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi 9117@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi
8742 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, 9118 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
8743 GFP_ATOMIC); 9119 GFP_ATOMIC);
@@ -8774,9 +9150,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/apic/io_apic.c linux-2.6.32.8/arch/x86
8774 { 9150 {
8775 spin_unlock(&vector_lock); 9151 spin_unlock(&vector_lock);
8776 } 9152 }
8777diff -urNp linux-2.6.32.8/arch/x86/kernel/apm_32.c linux-2.6.32.8/arch/x86/kernel/apm_32.c 9153diff -urNp linux-2.6.32.9/arch/x86/kernel/apm_32.c linux-2.6.32.9/arch/x86/kernel/apm_32.c
8778--- linux-2.6.32.8/arch/x86/kernel/apm_32.c 2010-02-09 07:57:19.000000000 -0500 9154--- linux-2.6.32.9/arch/x86/kernel/apm_32.c 2010-02-09 07:57:19.000000000 -0500
8779+++ linux-2.6.32.8/arch/x86/kernel/apm_32.c 2010-02-13 21:45:09.915910546 -0500 9155+++ linux-2.6.32.9/arch/x86/kernel/apm_32.c 2010-02-23 17:09:53.108051644 -0500
8780@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); 9156@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
8781 * This is for buggy BIOS's that refer to (real mode) segment 0x40 9157 * This is for buggy BIOS's that refer to (real mode) segment 0x40
8782 * even though they are called in protected mode. 9158 * even though they are called in protected mode.
@@ -8878,9 +9254,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/apm_32.c linux-2.6.32.8/arch/x86/kerne
8878 9254
8879 proc_create("apm", 0, NULL, &apm_file_ops); 9255 proc_create("apm", 0, NULL, &apm_file_ops);
8880 9256
8881diff -urNp linux-2.6.32.8/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.8/arch/x86/kernel/asm-offsets_32.c 9257diff -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
8882--- linux-2.6.32.8/arch/x86/kernel/asm-offsets_32.c 2010-02-09 07:57:19.000000000 -0500 9258--- linux-2.6.32.9/arch/x86/kernel/asm-offsets_32.c 2010-02-09 07:57:19.000000000 -0500
8883+++ linux-2.6.32.8/arch/x86/kernel/asm-offsets_32.c 2010-02-13 21:45:09.915910546 -0500 9259+++ linux-2.6.32.9/arch/x86/kernel/asm-offsets_32.c 2010-02-23 17:09:53.112027314 -0500
8884@@ -115,6 +115,11 @@ void foo(void) 9260@@ -115,6 +115,11 @@ void foo(void)
8885 OFFSET(PV_CPU_iret, pv_cpu_ops, iret); 9261 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
8886 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 9262 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
@@ -8893,9 +9269,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.8/arch/x
8893 #endif 9269 #endif
8894 9270
8895 #ifdef CONFIG_XEN 9271 #ifdef CONFIG_XEN
8896diff -urNp linux-2.6.32.8/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.8/arch/x86/kernel/asm-offsets_64.c 9272diff -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
8897--- linux-2.6.32.8/arch/x86/kernel/asm-offsets_64.c 2010-02-09 07:57:19.000000000 -0500 9273--- linux-2.6.32.9/arch/x86/kernel/asm-offsets_64.c 2010-02-09 07:57:19.000000000 -0500
8898+++ linux-2.6.32.8/arch/x86/kernel/asm-offsets_64.c 2010-02-13 21:45:09.915910546 -0500 9274+++ linux-2.6.32.9/arch/x86/kernel/asm-offsets_64.c 2010-02-23 17:09:53.112027314 -0500
8899@@ -115,6 +115,7 @@ int main(void) 9275@@ -115,6 +115,7 @@ int main(void)
8900 ENTRY(cr8); 9276 ENTRY(cr8);
8901 BLANK(); 9277 BLANK();
@@ -8904,9 +9280,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.8/arch/x
8904 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); 9280 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
8905 BLANK(); 9281 BLANK();
8906 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); 9282 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
8907diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/common.c linux-2.6.32.8/arch/x86/kernel/cpu/common.c 9283diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/common.c linux-2.6.32.9/arch/x86/kernel/cpu/common.c
8908--- linux-2.6.32.8/arch/x86/kernel/cpu/common.c 2010-02-09 07:57:19.000000000 -0500 9284--- linux-2.6.32.9/arch/x86/kernel/cpu/common.c 2010-02-09 07:57:19.000000000 -0500
8909+++ linux-2.6.32.8/arch/x86/kernel/cpu/common.c 2010-02-13 21:45:09.916905622 -0500 9285+++ linux-2.6.32.9/arch/x86/kernel/cpu/common.c 2010-02-23 17:09:53.112027314 -0500
8910@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon 9286@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
8911 9287
8912 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; 9288 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -9006,9 +9382,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/common.c linux-2.6.32.8/arch/x86/k
9006 struct thread_struct *thread = &curr->thread; 9382 struct thread_struct *thread = &curr->thread;
9007 9383
9008 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { 9384 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
9009diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.8/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 9385diff -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
9010--- linux-2.6.32.8/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-02-09 07:57:19.000000000 -0500 9386--- linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-02-09 07:57:19.000000000 -0500
9011+++ linux-2.6.32.8/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-02-13 21:45:09.916905622 -0500 9387+++ linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-02-23 17:09:53.112027314 -0500
9012@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any 9388@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
9013 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), 9389 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
9014 }, 9390 },
@@ -9018,9 +9394,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.3
9018 }; 9394 };
9019 9395
9020 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) 9396 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
9021diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.8/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 9397diff -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
9022--- linux-2.6.32.8/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-02-09 07:57:19.000000000 -0500 9398--- linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-02-09 07:57:19.000000000 -0500
9023+++ linux-2.6.32.8/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-02-13 21:45:09.916905622 -0500 9399+++ linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-02-23 17:09:53.112027314 -0500
9024@@ -225,7 +225,7 @@ static struct cpu_model models[] = 9400@@ -225,7 +225,7 @@ static struct cpu_model models[] =
9025 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, 9401 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
9026 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, 9402 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
@@ -9030,9 +9406,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux
9030 }; 9406 };
9031 #undef _BANIAS 9407 #undef _BANIAS
9032 #undef BANIAS 9408 #undef BANIAS
9033diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/intel.c linux-2.6.32.8/arch/x86/kernel/cpu/intel.c 9409diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/intel.c linux-2.6.32.9/arch/x86/kernel/cpu/intel.c
9034--- linux-2.6.32.8/arch/x86/kernel/cpu/intel.c 2010-02-09 07:57:19.000000000 -0500 9410--- linux-2.6.32.9/arch/x86/kernel/cpu/intel.c 2010-02-09 07:57:19.000000000 -0500
9035+++ linux-2.6.32.8/arch/x86/kernel/cpu/intel.c 2010-02-13 21:45:09.931803413 -0500 9411+++ linux-2.6.32.9/arch/x86/kernel/cpu/intel.c 2010-02-23 17:09:53.112027314 -0500
9036@@ -139,7 +139,7 @@ static void __cpuinit trap_init_f00f_bug 9412@@ -139,7 +139,7 @@ static void __cpuinit trap_init_f00f_bug
9037 * Update the IDT descriptor and reload the IDT so that 9413 * Update the IDT descriptor and reload the IDT so that
9038 * it uses the read-only mapped virtual address. 9414 * it uses the read-only mapped virtual address.
@@ -9042,9 +9418,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/intel.c linux-2.6.32.8/arch/x86/ke
9042 load_idt(&idt_descr); 9418 load_idt(&idt_descr);
9043 } 9419 }
9044 #endif 9420 #endif
9045diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.8/arch/x86/kernel/cpu/intel_cacheinfo.c 9421diff -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
9046--- linux-2.6.32.8/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-02-09 07:57:19.000000000 -0500 9422--- linux-2.6.32.9/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-02-09 07:57:19.000000000 -0500
9047+++ linux-2.6.32.8/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-02-13 21:45:09.931803413 -0500 9423+++ linux-2.6.32.9/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-02-23 17:09:53.112027314 -0500
9048@@ -863,7 +863,7 @@ static ssize_t store(struct kobject *kob 9424@@ -863,7 +863,7 @@ static ssize_t store(struct kobject *kob
9049 return ret; 9425 return ret;
9050 } 9426 }
@@ -9054,9 +9430,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.8/a
9054 .show = show, 9430 .show = show,
9055 .store = store, 9431 .store = store,
9056 }; 9432 };
9057diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/Makefile linux-2.6.32.8/arch/x86/kernel/cpu/Makefile 9433diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/Makefile linux-2.6.32.9/arch/x86/kernel/cpu/Makefile
9058--- linux-2.6.32.8/arch/x86/kernel/cpu/Makefile 2010-02-09 07:57:19.000000000 -0500 9434--- linux-2.6.32.9/arch/x86/kernel/cpu/Makefile 2010-02-09 07:57:19.000000000 -0500
9059+++ linux-2.6.32.8/arch/x86/kernel/cpu/Makefile 2010-02-13 21:45:09.931803413 -0500 9435+++ linux-2.6.32.9/arch/x86/kernel/cpu/Makefile 2010-02-23 17:09:53.112027314 -0500
9060@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER 9436@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
9061 CFLAGS_REMOVE_common.o = -pg 9437 CFLAGS_REMOVE_common.o = -pg
9062 endif 9438 endif
@@ -9068,9 +9444,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/Makefile linux-2.6.32.8/arch/x86/k
9068 obj-y := intel_cacheinfo.o addon_cpuid_features.o 9444 obj-y := intel_cacheinfo.o addon_cpuid_features.o
9069 obj-y += proc.o capflags.o powerflags.o common.o 9445 obj-y += proc.o capflags.o powerflags.o common.o
9070 obj-y += vmware.o hypervisor.o sched.o 9446 obj-y += vmware.o hypervisor.o sched.o
9071diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.8/arch/x86/kernel/cpu/mcheck/mce_amd.c 9447diff -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
9072--- linux-2.6.32.8/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-02-09 07:57:19.000000000 -0500 9448--- linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-02-09 07:57:19.000000000 -0500
9073+++ linux-2.6.32.8/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-02-13 21:45:09.932921573 -0500 9449+++ linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-02-23 17:09:53.112027314 -0500
9074@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob 9450@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob
9075 return ret; 9451 return ret;
9076 } 9452 }
@@ -9080,9 +9456,18 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.8/ar
9080 .show = show, 9456 .show = show,
9081 .store = store, 9457 .store = store,
9082 }; 9458 };
9083diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.8/arch/x86/kernel/cpu/mcheck/mce.c 9459diff -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
9084--- linux-2.6.32.8/arch/x86/kernel/cpu/mcheck/mce.c 2010-02-09 07:57:19.000000000 -0500 9460--- linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce.c 2010-02-09 07:57:19.000000000 -0500
9085+++ linux-2.6.32.8/arch/x86/kernel/cpu/mcheck/mce.c 2010-02-13 21:45:09.932921573 -0500 9461+++ linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce.c 2010-02-23 17:09:53.112027314 -0500
9462@@ -187,7 +187,7 @@ static void print_mce(struct mce *m)
9463 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
9464 m->cs, m->ip);
9465
9466- if (m->cs == __KERNEL_CS)
9467+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
9468 print_symbol("{%s}", m->ip);
9469 pr_cont("\n");
9470 }
9086@@ -1429,14 +1429,14 @@ void __cpuinit mcheck_init(struct cpuinf 9471@@ -1429,14 +1429,14 @@ void __cpuinit mcheck_init(struct cpuinf
9087 */ 9472 */
9088 9473
@@ -9126,9 +9511,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.8/arch/x
9126 }; 9511 };
9127 9512
9128 /* 9513 /*
9129diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/amd.c 9514diff -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
9130--- linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/amd.c 2010-02-09 07:57:19.000000000 -0500 9515--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/amd.c 2010-02-09 07:57:19.000000000 -0500
9131+++ linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/amd.c 2010-02-13 21:45:09.932921573 -0500 9516+++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/amd.c 2010-02-23 17:09:53.112027314 -0500
9132@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base 9517@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
9133 return 0; 9518 return 0;
9134 } 9519 }
@@ -9138,9 +9523,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.8/arch/x86
9138 .vendor = X86_VENDOR_AMD, 9523 .vendor = X86_VENDOR_AMD,
9139 .set = amd_set_mtrr, 9524 .set = amd_set_mtrr,
9140 .get = amd_get_mtrr, 9525 .get = amd_get_mtrr,
9141diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/centaur.c 9526diff -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
9142--- linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/centaur.c 2010-02-09 07:57:19.000000000 -0500 9527--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/centaur.c 2010-02-09 07:57:19.000000000 -0500
9143+++ linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/centaur.c 2010-02-13 21:45:09.933919306 -0500 9528+++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/centaur.c 2010-02-23 17:09:53.112027314 -0500
9144@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long 9529@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
9145 return 0; 9530 return 0;
9146 } 9531 }
@@ -9150,9 +9535,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.8/arch
9150 .vendor = X86_VENDOR_CENTAUR, 9535 .vendor = X86_VENDOR_CENTAUR,
9151 .set = centaur_set_mcr, 9536 .set = centaur_set_mcr,
9152 .get = centaur_get_mcr, 9537 .get = centaur_get_mcr,
9153diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/cyrix.c 9538diff -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
9154--- linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-02-09 07:57:19.000000000 -0500 9539--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-02-09 07:57:19.000000000 -0500
9155+++ linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-02-13 21:45:09.933919306 -0500 9540+++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-02-23 17:09:53.112027314 -0500
9156@@ -265,7 +265,7 @@ static void cyrix_set_all(void) 9541@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
9157 post_set(); 9542 post_set();
9158 } 9543 }
@@ -9162,9 +9547,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.8/arch/x
9162 .vendor = X86_VENDOR_CYRIX, 9547 .vendor = X86_VENDOR_CYRIX,
9163 .set_all = cyrix_set_all, 9548 .set_all = cyrix_set_all,
9164 .set = cyrix_set_arr, 9549 .set = cyrix_set_arr,
9165diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/generic.c 9550diff -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
9166--- linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/generic.c 2010-02-09 07:57:19.000000000 -0500 9551--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/generic.c 2010-02-09 07:57:19.000000000 -0500
9167+++ linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/generic.c 2010-02-13 21:45:09.933919306 -0500 9552+++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/generic.c 2010-02-23 17:09:53.112027314 -0500
9168@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra 9553@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
9169 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ 9554 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
9170 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ 9555 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
@@ -9183,9 +9568,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.8/arch
9183 .use_intel_if = 1, 9568 .use_intel_if = 1,
9184 .set_all = generic_set_all, 9569 .set_all = generic_set_all,
9185 .get = generic_get_mtrr, 9570 .get = generic_get_mtrr,
9186diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/main.c 9571diff -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
9187--- linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/main.c 2010-02-09 07:57:19.000000000 -0500 9572--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/main.c 2010-02-09 07:57:19.000000000 -0500
9188+++ linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/main.c 2010-02-13 21:45:09.933919306 -0500 9573+++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/main.c 2010-02-23 17:09:53.112027314 -0500
9189@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); 9574@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
9190 u64 size_or_mask, size_and_mask; 9575 u64 size_or_mask, size_and_mask;
9191 static bool mtrr_aps_delayed_init; 9576 static bool mtrr_aps_delayed_init;
@@ -9204,9 +9589,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.8/arch/x8
9204 { 9589 {
9205 if (ops->vendor && ops->vendor < X86_VENDOR_NUM) 9590 if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
9206 mtrr_ops[ops->vendor] = ops; 9591 mtrr_ops[ops->vendor] = ops;
9207diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/mtrr.h 9592diff -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
9208--- linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-02-09 07:57:19.000000000 -0500 9593--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-02-09 07:57:19.000000000 -0500
9209+++ linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-02-13 21:45:09.933919306 -0500 9594+++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-02-23 17:09:53.115579436 -0500
9210@@ -12,19 +12,19 @@ 9595@@ -12,19 +12,19 @@
9211 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; 9596 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
9212 9597
@@ -9257,9 +9642,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.8/arch/x8
9257 9642
9258 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) 9643 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
9259 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) 9644 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
9260diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.8/arch/x86/kernel/cpu/perfctr-watchdog.c 9645diff -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
9261--- linux-2.6.32.8/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-02-09 07:57:19.000000000 -0500 9646--- linux-2.6.32.9/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-02-09 07:57:19.000000000 -0500
9262+++ linux-2.6.32.8/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-02-13 21:45:09.934923901 -0500 9647+++ linux-2.6.32.9/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-02-23 17:09:53.115579436 -0500
9263@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { 9648@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
9264 9649
9265 /* Interface defining a CPU specific perfctr watchdog */ 9650 /* Interface defining a CPU specific perfctr watchdog */
@@ -9293,9 +9678,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.8/
9293 static struct wd_ops intel_arch_wd_ops __read_mostly = { 9678 static struct wd_ops intel_arch_wd_ops __read_mostly = {
9294 .reserve = single_msr_reserve, 9679 .reserve = single_msr_reserve,
9295 .unreserve = single_msr_unreserve, 9680 .unreserve = single_msr_unreserve,
9296diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.8/arch/x86/kernel/cpu/perf_event.c 9681diff -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
9297--- linux-2.6.32.8/arch/x86/kernel/cpu/perf_event.c 2010-02-09 07:57:19.000000000 -0500 9682--- linux-2.6.32.9/arch/x86/kernel/cpu/perf_event.c 2010-02-09 07:57:19.000000000 -0500
9298+++ linux-2.6.32.8/arch/x86/kernel/cpu/perf_event.c 2010-02-13 21:45:09.934923901 -0500 9683+++ linux-2.6.32.9/arch/x86/kernel/cpu/perf_event.c 2010-02-23 17:09:53.115579436 -0500
9299@@ -2252,7 +2252,7 @@ perf_callchain_user(struct pt_regs *regs 9684@@ -2252,7 +2252,7 @@ perf_callchain_user(struct pt_regs *regs
9300 break; 9685 break;
9301 9686
@@ -9305,9 +9690,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.8/arch/x
9305 } 9690 }
9306 } 9691 }
9307 9692
9308diff -urNp linux-2.6.32.8/arch/x86/kernel/crash.c linux-2.6.32.8/arch/x86/kernel/crash.c 9693diff -urNp linux-2.6.32.9/arch/x86/kernel/crash.c linux-2.6.32.9/arch/x86/kernel/crash.c
9309--- linux-2.6.32.8/arch/x86/kernel/crash.c 2010-02-09 07:57:19.000000000 -0500 9694--- linux-2.6.32.9/arch/x86/kernel/crash.c 2010-02-09 07:57:19.000000000 -0500
9310+++ linux-2.6.32.8/arch/x86/kernel/crash.c 2010-02-13 21:45:09.934923901 -0500 9695+++ linux-2.6.32.9/arch/x86/kernel/crash.c 2010-02-23 17:09:53.115579436 -0500
9311@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, 9696@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu,
9312 regs = args->regs; 9697 regs = args->regs;
9313 9698
@@ -9317,9 +9702,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/crash.c linux-2.6.32.8/arch/x86/kernel
9317 crash_fixup_ss_esp(&fixed_regs, regs); 9702 crash_fixup_ss_esp(&fixed_regs, regs);
9318 regs = &fixed_regs; 9703 regs = &fixed_regs;
9319 } 9704 }
9320diff -urNp linux-2.6.32.8/arch/x86/kernel/doublefault_32.c linux-2.6.32.8/arch/x86/kernel/doublefault_32.c 9705diff -urNp linux-2.6.32.9/arch/x86/kernel/doublefault_32.c linux-2.6.32.9/arch/x86/kernel/doublefault_32.c
9321--- linux-2.6.32.8/arch/x86/kernel/doublefault_32.c 2010-02-09 07:57:19.000000000 -0500 9706--- linux-2.6.32.9/arch/x86/kernel/doublefault_32.c 2010-02-09 07:57:19.000000000 -0500
9322+++ linux-2.6.32.8/arch/x86/kernel/doublefault_32.c 2010-02-13 21:45:09.935911670 -0500 9707+++ linux-2.6.32.9/arch/x86/kernel/doublefault_32.c 2010-02-23 17:09:53.115579436 -0500
9323@@ -11,7 +11,7 @@ 9708@@ -11,7 +11,7 @@
9324 9709
9325 #define DOUBLEFAULT_STACKSIZE (1024) 9710 #define DOUBLEFAULT_STACKSIZE (1024)
@@ -9351,9 +9736,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/doublefault_32.c linux-2.6.32.8/arch/x
9351 .fs = __KERNEL_PERCPU, 9736 .fs = __KERNEL_PERCPU,
9352 9737
9353 .__cr3 = __pa_nodebug(swapper_pg_dir), 9738 .__cr3 = __pa_nodebug(swapper_pg_dir),
9354diff -urNp linux-2.6.32.8/arch/x86/kernel/dumpstack_32.c linux-2.6.32.8/arch/x86/kernel/dumpstack_32.c 9739diff -urNp linux-2.6.32.9/arch/x86/kernel/dumpstack_32.c linux-2.6.32.9/arch/x86/kernel/dumpstack_32.c
9355--- linux-2.6.32.8/arch/x86/kernel/dumpstack_32.c 2010-02-09 07:57:19.000000000 -0500 9740--- linux-2.6.32.9/arch/x86/kernel/dumpstack_32.c 2010-02-09 07:57:19.000000000 -0500
9356+++ linux-2.6.32.8/arch/x86/kernel/dumpstack_32.c 2010-02-13 21:45:09.935911670 -0500 9741+++ linux-2.6.32.9/arch/x86/kernel/dumpstack_32.c 2010-02-23 17:09:53.115579436 -0500
9357@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs 9742@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs
9358 * When in-kernel, we also print out the stack and code at the 9743 * When in-kernel, we also print out the stack and code at the
9359 * time of the fault.. 9744 * time of the fault..
@@ -9398,9 +9783,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/dumpstack_32.c linux-2.6.32.8/arch/x86
9398 if (ip < PAGE_OFFSET) 9783 if (ip < PAGE_OFFSET)
9399 return 0; 9784 return 0;
9400 if (probe_kernel_address((unsigned short *)ip, ud2)) 9785 if (probe_kernel_address((unsigned short *)ip, ud2))
9401diff -urNp linux-2.6.32.8/arch/x86/kernel/dumpstack.c linux-2.6.32.8/arch/x86/kernel/dumpstack.c 9786diff -urNp linux-2.6.32.9/arch/x86/kernel/dumpstack.c linux-2.6.32.9/arch/x86/kernel/dumpstack.c
9402--- linux-2.6.32.8/arch/x86/kernel/dumpstack.c 2010-02-09 07:57:19.000000000 -0500 9787--- linux-2.6.32.9/arch/x86/kernel/dumpstack.c 2010-02-09 07:57:19.000000000 -0500
9403+++ linux-2.6.32.8/arch/x86/kernel/dumpstack.c 2010-02-13 21:45:09.935911670 -0500 9788+++ linux-2.6.32.9/arch/x86/kernel/dumpstack.c 2010-02-23 17:09:53.115579436 -0500
9404@@ -180,7 +180,7 @@ void dump_stack(void) 9789@@ -180,7 +180,7 @@ void dump_stack(void)
9405 #endif 9790 #endif
9406 9791
@@ -9428,9 +9813,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/dumpstack.c linux-2.6.32.8/arch/x86/ke
9428 report_bug(regs->ip, regs); 9813 report_bug(regs->ip, regs);
9429 9814
9430 if (__die(str, regs, err)) 9815 if (__die(str, regs, err))
9431diff -urNp linux-2.6.32.8/arch/x86/kernel/e820.c linux-2.6.32.8/arch/x86/kernel/e820.c 9816diff -urNp linux-2.6.32.9/arch/x86/kernel/e820.c linux-2.6.32.9/arch/x86/kernel/e820.c
9432--- linux-2.6.32.8/arch/x86/kernel/e820.c 2010-02-09 07:57:19.000000000 -0500 9817--- linux-2.6.32.9/arch/x86/kernel/e820.c 2010-02-09 07:57:19.000000000 -0500
9433+++ linux-2.6.32.8/arch/x86/kernel/e820.c 2010-02-13 21:45:09.935911670 -0500 9818+++ linux-2.6.32.9/arch/x86/kernel/e820.c 2010-02-23 17:09:53.115579436 -0500
9434@@ -733,7 +733,10 @@ struct early_res { 9819@@ -733,7 +733,10 @@ struct early_res {
9435 }; 9820 };
9436 static struct early_res early_res[MAX_EARLY_RES] __initdata = { 9821 static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -9443,9 +9828,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/e820.c linux-2.6.32.8/arch/x86/kernel/
9443 }; 9828 };
9444 9829
9445 static int __init find_overlapped_early(u64 start, u64 end) 9830 static int __init find_overlapped_early(u64 start, u64 end)
9446diff -urNp linux-2.6.32.8/arch/x86/kernel/efi_32.c linux-2.6.32.8/arch/x86/kernel/efi_32.c 9831diff -urNp linux-2.6.32.9/arch/x86/kernel/efi_32.c linux-2.6.32.9/arch/x86/kernel/efi_32.c
9447--- linux-2.6.32.8/arch/x86/kernel/efi_32.c 2010-02-09 07:57:19.000000000 -0500 9832--- linux-2.6.32.9/arch/x86/kernel/efi_32.c 2010-02-09 07:57:19.000000000 -0500
9448+++ linux-2.6.32.8/arch/x86/kernel/efi_32.c 2010-02-13 21:45:09.935911670 -0500 9833+++ linux-2.6.32.9/arch/x86/kernel/efi_32.c 2010-02-23 17:09:53.115579436 -0500
9449@@ -38,70 +38,38 @@ 9834@@ -38,70 +38,38 @@
9450 */ 9835 */
9451 9836
@@ -9526,9 +9911,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/efi_32.c linux-2.6.32.8/arch/x86/kerne
9526 9911
9527 /* 9912 /*
9528 * After the lock is released, the original page table is restored. 9913 * After the lock is released, the original page table is restored.
9529diff -urNp linux-2.6.32.8/arch/x86/kernel/efi_stub_32.S linux-2.6.32.8/arch/x86/kernel/efi_stub_32.S 9914diff -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
9530--- linux-2.6.32.8/arch/x86/kernel/efi_stub_32.S 2010-02-09 07:57:19.000000000 -0500 9915--- linux-2.6.32.9/arch/x86/kernel/efi_stub_32.S 2010-02-09 07:57:19.000000000 -0500
9531+++ linux-2.6.32.8/arch/x86/kernel/efi_stub_32.S 2010-02-13 21:45:09.936909632 -0500 9916+++ linux-2.6.32.9/arch/x86/kernel/efi_stub_32.S 2010-02-23 17:09:53.115579436 -0500
9532@@ -6,6 +6,7 @@ 9917@@ -6,6 +6,7 @@
9533 */ 9918 */
9534 9919
@@ -9627,9 +10012,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/efi_stub_32.S linux-2.6.32.8/arch/x86/
9627 saved_return_addr: 10012 saved_return_addr:
9628 .long 0 10013 .long 0
9629 efi_rt_function_ptr: 10014 efi_rt_function_ptr:
9630diff -urNp linux-2.6.32.8/arch/x86/kernel/entry_32.S linux-2.6.32.8/arch/x86/kernel/entry_32.S 10015diff -urNp linux-2.6.32.9/arch/x86/kernel/entry_32.S linux-2.6.32.9/arch/x86/kernel/entry_32.S
9631--- linux-2.6.32.8/arch/x86/kernel/entry_32.S 2010-02-09 07:57:19.000000000 -0500 10016--- linux-2.6.32.9/arch/x86/kernel/entry_32.S 2010-02-09 07:57:19.000000000 -0500
9632+++ linux-2.6.32.8/arch/x86/kernel/entry_32.S 2010-02-13 21:45:09.936909632 -0500 10017+++ linux-2.6.32.9/arch/x86/kernel/entry_32.S 2010-02-23 17:09:53.115579436 -0500
9633@@ -191,7 +191,7 @@ 10018@@ -191,7 +191,7 @@
9634 10019
9635 #endif /* CONFIG_X86_32_LAZY_GS */ 10020 #endif /* CONFIG_X86_32_LAZY_GS */
@@ -9883,9 +10268,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/entry_32.S linux-2.6.32.8/arch/x86/ker
9883 RESTORE_REGS 10268 RESTORE_REGS
9884 lss 12+4(%esp), %esp # back to espfix stack 10269 lss 12+4(%esp), %esp # back to espfix stack
9885 CFI_ADJUST_CFA_OFFSET -24 10270 CFI_ADJUST_CFA_OFFSET -24
9886diff -urNp linux-2.6.32.8/arch/x86/kernel/entry_64.S linux-2.6.32.8/arch/x86/kernel/entry_64.S 10271diff -urNp linux-2.6.32.9/arch/x86/kernel/entry_64.S linux-2.6.32.9/arch/x86/kernel/entry_64.S
9887--- linux-2.6.32.8/arch/x86/kernel/entry_64.S 2010-02-09 07:57:19.000000000 -0500 10272--- linux-2.6.32.9/arch/x86/kernel/entry_64.S 2010-02-09 07:57:19.000000000 -0500
9888+++ linux-2.6.32.8/arch/x86/kernel/entry_64.S 2010-02-13 21:45:09.936909632 -0500 10273+++ linux-2.6.32.9/arch/x86/kernel/entry_64.S 2010-02-23 17:09:53.115579436 -0500
9889@@ -1068,7 +1068,12 @@ ENTRY(\sym) 10274@@ -1068,7 +1068,12 @@ ENTRY(\sym)
9890 TRACE_IRQS_OFF 10275 TRACE_IRQS_OFF
9891 movq %rsp,%rdi /* pt_regs pointer */ 10276 movq %rsp,%rdi /* pt_regs pointer */
@@ -9900,9 +10285,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/entry_64.S linux-2.6.32.8/arch/x86/ker
9900 subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) 10285 subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
9901 call \do_sym 10286 call \do_sym
9902 addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) 10287 addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
9903diff -urNp linux-2.6.32.8/arch/x86/kernel/ftrace.c linux-2.6.32.8/arch/x86/kernel/ftrace.c 10288diff -urNp linux-2.6.32.9/arch/x86/kernel/ftrace.c linux-2.6.32.9/arch/x86/kernel/ftrace.c
9904--- linux-2.6.32.8/arch/x86/kernel/ftrace.c 2010-02-09 07:57:19.000000000 -0500 10289--- linux-2.6.32.9/arch/x86/kernel/ftrace.c 2010-02-09 07:57:19.000000000 -0500
9905+++ linux-2.6.32.8/arch/x86/kernel/ftrace.c 2010-02-13 21:45:09.937911582 -0500 10290+++ linux-2.6.32.9/arch/x86/kernel/ftrace.c 2010-02-23 17:09:53.115579436 -0500
9906@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) 10291@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
9907 { 10292 {
9908 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { 10293 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -9968,9 +10353,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/ftrace.c linux-2.6.32.8/arch/x86/kerne
9968 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) 10353 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
9969 return -EFAULT; 10354 return -EFAULT;
9970 10355
9971diff -urNp linux-2.6.32.8/arch/x86/kernel/head32.c linux-2.6.32.8/arch/x86/kernel/head32.c 10356diff -urNp linux-2.6.32.9/arch/x86/kernel/head32.c linux-2.6.32.9/arch/x86/kernel/head32.c
9972--- linux-2.6.32.8/arch/x86/kernel/head32.c 2010-02-09 07:57:19.000000000 -0500 10357--- linux-2.6.32.9/arch/x86/kernel/head32.c 2010-02-09 07:57:19.000000000 -0500
9973+++ linux-2.6.32.8/arch/x86/kernel/head32.c 2010-02-13 21:45:09.937911582 -0500 10358+++ linux-2.6.32.9/arch/x86/kernel/head32.c 2010-02-23 17:09:53.115579436 -0500
9974@@ -16,6 +16,7 @@ 10359@@ -16,6 +16,7 @@
9975 #include <asm/apic.h> 10360 #include <asm/apic.h>
9976 #include <asm/io_apic.h> 10361 #include <asm/io_apic.h>
@@ -9988,9 +10373,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head32.c linux-2.6.32.8/arch/x86/kerne
9988 10373
9989 #ifdef CONFIG_BLK_DEV_INITRD 10374 #ifdef CONFIG_BLK_DEV_INITRD
9990 /* Reserve INITRD */ 10375 /* Reserve INITRD */
9991diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kernel/head_32.S 10376diff -urNp linux-2.6.32.9/arch/x86/kernel/head_32.S linux-2.6.32.9/arch/x86/kernel/head_32.S
9992--- linux-2.6.32.8/arch/x86/kernel/head_32.S 2010-02-09 07:57:19.000000000 -0500 10377--- linux-2.6.32.9/arch/x86/kernel/head_32.S 2010-02-09 07:57:19.000000000 -0500
9993+++ linux-2.6.32.8/arch/x86/kernel/head_32.S 2010-02-13 21:45:09.937911582 -0500 10378+++ linux-2.6.32.9/arch/x86/kernel/head_32.S 2010-02-23 17:09:53.115579436 -0500
9994@@ -19,10 +19,17 @@ 10379@@ -19,10 +19,17 @@
9995 #include <asm/setup.h> 10380 #include <asm/setup.h>
9996 #include <asm/processor-flags.h> 10381 #include <asm/processor-flags.h>
@@ -10049,7 +10434,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10049 ENTRY(startup_32) 10434 ENTRY(startup_32)
10050 /* test KEEP_SEGMENTS flag to see if the bootloader is asking 10435 /* test KEEP_SEGMENTS flag to see if the bootloader is asking
10051 us to not reload segments */ 10436 us to not reload segments */
10052@@ -97,6 +113,52 @@ ENTRY(startup_32) 10437@@ -97,6 +113,55 @@ ENTRY(startup_32)
10053 movl %eax,%gs 10438 movl %eax,%gs
10054 2: 10439 2:
10055 10440
@@ -10091,9 +10476,12 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10091+ addl $__PAGE_OFFSET,%eax 10476+ addl $__PAGE_OFFSET,%eax
10092+1: 10477+1:
10093+ movw %ax,__KERNEL_CS + 2(%edi) 10478+ movw %ax,__KERNEL_CS + 2(%edi)
10479+ movw %ax,__KERNEXEC_KERNEL_CS + 2(%edi)
10094+ rorl $16,%eax 10480+ rorl $16,%eax
10095+ movb %al,__KERNEL_CS + 4(%edi) 10481+ movb %al,__KERNEL_CS + 4(%edi)
10482+ movb %al,__KERNEXEC_KERNEL_CS + 4(%edi)
10096+ movb %ah,__KERNEL_CS + 7(%edi) 10483+ movb %ah,__KERNEL_CS + 7(%edi)
10484+ movb %ah,__KERNEXEC_KERNEL_CS + 7(%edi)
10097+ rorl $16,%eax 10485+ rorl $16,%eax
10098+ addl $PAGE_SIZE_asm,%edi 10486+ addl $PAGE_SIZE_asm,%edi
10099+ loop 1b 10487+ loop 1b
@@ -10102,7 +10490,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10102 /* 10490 /*
10103 * Clear BSS first so that there are no surprises... 10491 * Clear BSS first so that there are no surprises...
10104 */ 10492 */
10105@@ -140,9 +202,7 @@ ENTRY(startup_32) 10493@@ -140,9 +205,7 @@ ENTRY(startup_32)
10106 cmpl $num_subarch_entries, %eax 10494 cmpl $num_subarch_entries, %eax
10107 jae bad_subarch 10495 jae bad_subarch
10108 10496
@@ -10113,7 +10501,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10113 10501
10114 bad_subarch: 10502 bad_subarch:
10115 WEAK(lguest_entry) 10503 WEAK(lguest_entry)
10116@@ -154,10 +214,10 @@ WEAK(xen_entry) 10504@@ -154,10 +217,10 @@ WEAK(xen_entry)
10117 __INITDATA 10505 __INITDATA
10118 10506
10119 subarch_entries: 10507 subarch_entries:
@@ -10128,7 +10516,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10128 num_subarch_entries = (. - subarch_entries) / 4 10516 num_subarch_entries = (. - subarch_entries) / 4
10129 .previous 10517 .previous
10130 #endif /* CONFIG_PARAVIRT */ 10518 #endif /* CONFIG_PARAVIRT */
10131@@ -218,8 +278,11 @@ default_entry: 10519@@ -218,8 +281,11 @@ default_entry:
10132 movl %eax, pa(max_pfn_mapped) 10520 movl %eax, pa(max_pfn_mapped)
10133 10521
10134 /* Do early initialization of the fixmap area */ 10522 /* Do early initialization of the fixmap area */
@@ -10142,7 +10530,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10142 #else /* Not PAE */ 10530 #else /* Not PAE */
10143 10531
10144 page_pde_offset = (__PAGE_OFFSET >> 20); 10532 page_pde_offset = (__PAGE_OFFSET >> 20);
10145@@ -249,8 +312,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20); 10533@@ -249,8 +315,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
10146 movl %eax, pa(max_pfn_mapped) 10534 movl %eax, pa(max_pfn_mapped)
10147 10535
10148 /* Do early initialization of the fixmap area */ 10536 /* Do early initialization of the fixmap area */
@@ -10156,7 +10544,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10156 #endif 10544 #endif
10157 jmp 3f 10545 jmp 3f
10158 /* 10546 /*
10159@@ -297,6 +363,7 @@ ENTRY(startup_32_smp) 10547@@ -297,6 +366,7 @@ ENTRY(startup_32_smp)
10160 orl %edx,%eax 10548 orl %edx,%eax
10161 movl %eax,%cr4 10549 movl %eax,%cr4
10162 10550
@@ -10164,7 +10552,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10164 btl $5, %eax # check if PAE is enabled 10552 btl $5, %eax # check if PAE is enabled
10165 jnc 6f 10553 jnc 6f
10166 10554
10167@@ -312,13 +379,17 @@ ENTRY(startup_32_smp) 10555@@ -312,13 +382,17 @@ ENTRY(startup_32_smp)
10168 jnc 6f 10556 jnc 6f
10169 10557
10170 /* Setup EFER (Extended Feature Enable Register) */ 10558 /* Setup EFER (Extended Feature Enable Register) */
@@ -10183,7 +10571,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10183 6: 10571 6:
10184 10572
10185 /* 10573 /*
10186@@ -344,9 +415,7 @@ ENTRY(startup_32_smp) 10574@@ -344,9 +418,7 @@ ENTRY(startup_32_smp)
10187 10575
10188 #ifdef CONFIG_SMP 10576 #ifdef CONFIG_SMP
10189 cmpb $0, ready 10577 cmpb $0, ready
@@ -10194,7 +10582,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10194 #endif /* CONFIG_SMP */ 10582 #endif /* CONFIG_SMP */
10195 10583
10196 /* 10584 /*
10197@@ -424,7 +493,7 @@ is386: movl $2,%ecx # set MP 10585@@ -424,7 +496,7 @@ is386: movl $2,%ecx # set MP
10198 1: movl $(__KERNEL_DS),%eax # reload all the segment registers 10586 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
10199 movl %eax,%ss # after changing gdt. 10587 movl %eax,%ss # after changing gdt.
10200 10588
@@ -10203,7 +10591,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10203 movl %eax,%ds 10591 movl %eax,%ds
10204 movl %eax,%es 10592 movl %eax,%es
10205 10593
10206@@ -438,8 +507,11 @@ is386: movl $2,%ecx # set MP 10594@@ -438,8 +510,11 @@ is386: movl $2,%ecx # set MP
10207 */ 10595 */
10208 cmpb $0,ready 10596 cmpb $0,ready
10209 jne 1f 10597 jne 1f
@@ -10216,7 +10604,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10216 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax) 10604 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
10217 shrl $16, %ecx 10605 shrl $16, %ecx
10218 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax) 10606 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
10219@@ -457,10 +529,6 @@ is386: movl $2,%ecx # set MP 10607@@ -457,10 +532,6 @@ is386: movl $2,%ecx # set MP
10220 #ifdef CONFIG_SMP 10608 #ifdef CONFIG_SMP
10221 movb ready, %cl 10609 movb ready, %cl
10222 movb $1, ready 10610 movb $1, ready
@@ -10227,7 +10615,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10227 #endif /* CONFIG_SMP */ 10615 #endif /* CONFIG_SMP */
10228 jmp *(initial_code) 10616 jmp *(initial_code)
10229 10617
10230@@ -546,22 +614,22 @@ early_page_fault: 10618@@ -546,22 +617,22 @@ early_page_fault:
10231 jmp early_fault 10619 jmp early_fault
10232 10620
10233 early_fault: 10621 early_fault:
@@ -10255,7 +10643,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10255 hlt_loop: 10643 hlt_loop:
10256 hlt 10644 hlt
10257 jmp hlt_loop 10645 jmp hlt_loop
10258@@ -569,8 +637,11 @@ hlt_loop: 10646@@ -569,8 +640,11 @@ hlt_loop:
10259 /* This is the default interrupt "handler" :-) */ 10647 /* This is the default interrupt "handler" :-) */
10260 ALIGN 10648 ALIGN
10261 ignore_int: 10649 ignore_int:
@@ -10268,7 +10656,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10268 pushl %eax 10656 pushl %eax
10269 pushl %ecx 10657 pushl %ecx
10270 pushl %edx 10658 pushl %edx
10271@@ -579,9 +650,6 @@ ignore_int: 10659@@ -579,9 +653,6 @@ ignore_int:
10272 movl $(__KERNEL_DS),%eax 10660 movl $(__KERNEL_DS),%eax
10273 movl %eax,%ds 10661 movl %eax,%ds
10274 movl %eax,%es 10662 movl %eax,%es
@@ -10278,7 +10666,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10278 pushl 16(%esp) 10666 pushl 16(%esp)
10279 pushl 24(%esp) 10667 pushl 24(%esp)
10280 pushl 32(%esp) 10668 pushl 32(%esp)
10281@@ -608,27 +676,37 @@ ENTRY(initial_code) 10669@@ -608,27 +679,37 @@ ENTRY(initial_code)
10282 /* 10670 /*
10283 * BSS section 10671 * BSS section
10284 */ 10672 */
@@ -10321,7 +10709,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10321 ENTRY(swapper_pg_dir) 10709 ENTRY(swapper_pg_dir)
10322 .long pa(swapper_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */ 10710 .long pa(swapper_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
10323 # if KPMDS == 3 10711 # if KPMDS == 3
10324@@ -651,11 +729,12 @@ ENTRY(swapper_pg_dir) 10712@@ -651,11 +732,12 @@ ENTRY(swapper_pg_dir)
10325 10713
10326 .data 10714 .data
10327 ENTRY(stack_start) 10715 ENTRY(stack_start)
@@ -10335,7 +10723,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10335 early_recursion_flag: 10723 early_recursion_flag:
10336 .long 0 10724 .long 0
10337 10725
10338@@ -691,7 +770,7 @@ fault_msg: 10726@@ -691,7 +773,7 @@ fault_msg:
10339 .word 0 # 32 bit align gdt_desc.address 10727 .word 0 # 32 bit align gdt_desc.address
10340 boot_gdt_descr: 10728 boot_gdt_descr:
10341 .word __BOOT_DS+7 10729 .word __BOOT_DS+7
@@ -10344,7 +10732,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10344 10732
10345 .word 0 # 32-bit align idt_desc.address 10733 .word 0 # 32-bit align idt_desc.address
10346 idt_descr: 10734 idt_descr:
10347@@ -702,7 +781,7 @@ idt_descr: 10735@@ -702,7 +784,7 @@ idt_descr:
10348 .word 0 # 32 bit align gdt_desc.address 10736 .word 0 # 32 bit align gdt_desc.address
10349 ENTRY(early_gdt_descr) 10737 ENTRY(early_gdt_descr)
10350 .word GDT_ENTRIES*8-1 10738 .word GDT_ENTRIES*8-1
@@ -10353,7 +10741,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10353 10741
10354 /* 10742 /*
10355 * The boot_gdt must mirror the equivalent in setup.S and is 10743 * The boot_gdt must mirror the equivalent in setup.S and is
10356@@ -711,5 +790,59 @@ ENTRY(early_gdt_descr) 10744@@ -711,5 +793,65 @@ ENTRY(early_gdt_descr)
10357 .align L1_CACHE_BYTES 10745 .align L1_CACHE_BYTES
10358 ENTRY(boot_gdt) 10746 ENTRY(boot_gdt)
10359 .fill GDT_ENTRY_BOOT_CS,8,0 10747 .fill GDT_ENTRY_BOOT_CS,8,0
@@ -10369,7 +10757,13 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10369+ .quad 0x0000000000000000 /* 0x0b reserved */ 10757+ .quad 0x0000000000000000 /* 0x0b reserved */
10370+ .quad 0x0000000000000000 /* 0x13 reserved */ 10758+ .quad 0x0000000000000000 /* 0x13 reserved */
10371+ .quad 0x0000000000000000 /* 0x1b reserved */ 10759+ .quad 0x0000000000000000 /* 0x1b reserved */
10760+
10761+#ifdef CONFIG_PAX_KERNEXEC
10762+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
10763+#else
10372+ .quad 0x0000000000000000 /* 0x20 unused */ 10764+ .quad 0x0000000000000000 /* 0x20 unused */
10765+#endif
10766+
10373+ .quad 0x0000000000000000 /* 0x28 unused */ 10767+ .quad 0x0000000000000000 /* 0x28 unused */
10374+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */ 10768+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
10375+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */ 10769+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
@@ -10415,9 +10809,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kern
10415+ /* Be sure this is zeroed to avoid false validations in Xen */ 10809+ /* Be sure this is zeroed to avoid false validations in Xen */
10416+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0 10810+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
10417+ .endr 10811+ .endr
10418diff -urNp linux-2.6.32.8/arch/x86/kernel/head_64.S linux-2.6.32.8/arch/x86/kernel/head_64.S 10812diff -urNp linux-2.6.32.9/arch/x86/kernel/head_64.S linux-2.6.32.9/arch/x86/kernel/head_64.S
10419--- linux-2.6.32.8/arch/x86/kernel/head_64.S 2010-02-09 07:57:19.000000000 -0500 10813--- linux-2.6.32.9/arch/x86/kernel/head_64.S 2010-02-09 07:57:19.000000000 -0500
10420+++ linux-2.6.32.8/arch/x86/kernel/head_64.S 2010-02-13 21:45:09.938915283 -0500 10814+++ linux-2.6.32.9/arch/x86/kernel/head_64.S 2010-02-23 17:09:53.115579436 -0500
10421@@ -38,6 +38,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET 10815@@ -38,6 +38,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET
10422 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET) 10816 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
10423 L4_START_KERNEL = pgd_index(__START_KERNEL_map) 10817 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
@@ -10530,7 +10924,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_64.S linux-2.6.32.8/arch/x86/kern
10530 #define NEXT_PAGE(name) \ 10924 #define NEXT_PAGE(name) \
10531 .balign PAGE_SIZE; \ 10925 .balign PAGE_SIZE; \
10532 ENTRY(name) 10926 ENTRY(name)
10533@@ -350,13 +350,35 @@ NEXT_PAGE(init_level4_pgt) 10927@@ -350,13 +350,29 @@ NEXT_PAGE(init_level4_pgt)
10534 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE 10928 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
10535 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0 10929 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
10536 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE 10930 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
@@ -10542,12 +10936,6 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_64.S linux-2.6.32.8/arch/x86/kern
10542 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */ 10936 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
10543 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE 10937 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
10544 10938
10545+#ifdef CONFIG_PAX_MEMORY_UDEREF
10546+ .rept NR_CPUS - 1
10547+ .fill 512,8,0
10548+ .endr
10549+#endif
10550+
10551 NEXT_PAGE(level3_ident_pgt) 10939 NEXT_PAGE(level3_ident_pgt)
10552 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE 10940 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
10553+#ifdef CONFIG_XEN 10941+#ifdef CONFIG_XEN
@@ -10566,7 +10954,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_64.S linux-2.6.32.8/arch/x86/kern
10566 10954
10567 NEXT_PAGE(level3_kernel_pgt) 10955 NEXT_PAGE(level3_kernel_pgt)
10568 .fill L3_START_KERNEL,8,0 10956 .fill L3_START_KERNEL,8,0
10569@@ -364,20 +386,23 @@ NEXT_PAGE(level3_kernel_pgt) 10957@@ -364,20 +380,23 @@ NEXT_PAGE(level3_kernel_pgt)
10570 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE 10958 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
10571 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE 10959 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
10572 10960
@@ -10598,7 +10986,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_64.S linux-2.6.32.8/arch/x86/kern
10598 10986
10599 NEXT_PAGE(level2_kernel_pgt) 10987 NEXT_PAGE(level2_kernel_pgt)
10600 /* 10988 /*
10601@@ -390,33 +415,49 @@ NEXT_PAGE(level2_kernel_pgt) 10989@@ -390,33 +409,49 @@ NEXT_PAGE(level2_kernel_pgt)
10602 * If you want to increase this then increase MODULES_VADDR 10990 * If you want to increase this then increase MODULES_VADDR
10603 * too.) 10991 * too.)
10604 */ 10992 */
@@ -10658,9 +11046,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/head_64.S linux-2.6.32.8/arch/x86/kern
10658 11046
10659 __PAGE_ALIGNED_BSS 11047 __PAGE_ALIGNED_BSS
10660 .align PAGE_SIZE 11048 .align PAGE_SIZE
10661diff -urNp linux-2.6.32.8/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.8/arch/x86/kernel/i386_ksyms_32.c 11049diff -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
10662--- linux-2.6.32.8/arch/x86/kernel/i386_ksyms_32.c 2010-02-09 07:57:19.000000000 -0500 11050--- linux-2.6.32.9/arch/x86/kernel/i386_ksyms_32.c 2010-02-09 07:57:19.000000000 -0500
10663+++ linux-2.6.32.8/arch/x86/kernel/i386_ksyms_32.c 2010-02-13 21:45:09.938915283 -0500 11051+++ linux-2.6.32.9/arch/x86/kernel/i386_ksyms_32.c 2010-02-23 17:09:53.115579436 -0500
10664@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); 11052@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
10665 EXPORT_SYMBOL(cmpxchg8b_emu); 11053 EXPORT_SYMBOL(cmpxchg8b_emu);
10666 #endif 11054 #endif
@@ -10682,9 +11070,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.8/arch/x8
10682+#ifdef CONFIG_PAX_KERNEXEC 11070+#ifdef CONFIG_PAX_KERNEXEC
10683+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); 11071+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
10684+#endif 11072+#endif
10685diff -urNp linux-2.6.32.8/arch/x86/kernel/init_task.c linux-2.6.32.8/arch/x86/kernel/init_task.c 11073diff -urNp linux-2.6.32.9/arch/x86/kernel/init_task.c linux-2.6.32.9/arch/x86/kernel/init_task.c
10686--- linux-2.6.32.8/arch/x86/kernel/init_task.c 2010-02-09 07:57:19.000000000 -0500 11074--- linux-2.6.32.9/arch/x86/kernel/init_task.c 2010-02-09 07:57:19.000000000 -0500
10687+++ linux-2.6.32.8/arch/x86/kernel/init_task.c 2010-02-13 21:45:09.938915283 -0500 11075+++ linux-2.6.32.9/arch/x86/kernel/init_task.c 2010-02-23 17:09:53.115579436 -0500
10688@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); 11076@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
10689 * section. Since TSS's are completely CPU-local, we want them 11077 * section. Since TSS's are completely CPU-local, we want them
10690 * on exact cacheline boundaries, to eliminate cacheline ping-pong. 11078 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -10693,9 +11081,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/init_task.c linux-2.6.32.8/arch/x86/ke
10693- 11081-
10694+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; 11082+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
10695+EXPORT_SYMBOL(init_tss); 11083+EXPORT_SYMBOL(init_tss);
10696diff -urNp linux-2.6.32.8/arch/x86/kernel/ioport.c linux-2.6.32.8/arch/x86/kernel/ioport.c 11084diff -urNp linux-2.6.32.9/arch/x86/kernel/ioport.c linux-2.6.32.9/arch/x86/kernel/ioport.c
10697--- linux-2.6.32.8/arch/x86/kernel/ioport.c 2010-02-09 07:57:19.000000000 -0500 11085--- linux-2.6.32.9/arch/x86/kernel/ioport.c 2010-02-09 07:57:19.000000000 -0500
10698+++ linux-2.6.32.8/arch/x86/kernel/ioport.c 2010-02-13 21:45:09.938915283 -0500 11086+++ linux-2.6.32.9/arch/x86/kernel/ioport.c 2010-02-23 17:09:53.120037276 -0500
10699@@ -6,6 +6,7 @@ 11087@@ -6,6 +6,7 @@
10700 #include <linux/sched.h> 11088 #include <linux/sched.h>
10701 #include <linux/kernel.h> 11089 #include <linux/kernel.h>
@@ -10740,9 +11128,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/ioport.c linux-2.6.32.8/arch/x86/kerne
10740 } 11128 }
10741 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); 11129 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
10742 11130
10743diff -urNp linux-2.6.32.8/arch/x86/kernel/irq_32.c linux-2.6.32.8/arch/x86/kernel/irq_32.c 11131diff -urNp linux-2.6.32.9/arch/x86/kernel/irq_32.c linux-2.6.32.9/arch/x86/kernel/irq_32.c
10744--- linux-2.6.32.8/arch/x86/kernel/irq_32.c 2010-02-09 07:57:19.000000000 -0500 11132--- linux-2.6.32.9/arch/x86/kernel/irq_32.c 2010-02-09 07:57:19.000000000 -0500
10745+++ linux-2.6.32.8/arch/x86/kernel/irq_32.c 2010-02-13 21:45:09.938915283 -0500 11133+++ linux-2.6.32.9/arch/x86/kernel/irq_32.c 2010-02-23 17:09:53.120037276 -0500
10746@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc 11134@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
10747 return 0; 11135 return 0;
10748 11136
@@ -10761,9 +11149,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/irq_32.c linux-2.6.32.8/arch/x86/kerne
10761 11149
10762 call_on_stack(__do_softirq, isp); 11150 call_on_stack(__do_softirq, isp);
10763 /* 11151 /*
10764diff -urNp linux-2.6.32.8/arch/x86/kernel/kgdb.c linux-2.6.32.8/arch/x86/kernel/kgdb.c 11152diff -urNp linux-2.6.32.9/arch/x86/kernel/kgdb.c linux-2.6.32.9/arch/x86/kernel/kgdb.c
10765--- linux-2.6.32.8/arch/x86/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500 11153--- linux-2.6.32.9/arch/x86/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500
10766+++ linux-2.6.32.8/arch/x86/kernel/kgdb.c 2010-02-13 21:45:09.938915283 -0500 11154+++ linux-2.6.32.9/arch/x86/kernel/kgdb.c 2010-02-23 17:09:53.120037276 -0500
10767@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception 11155@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
10768 return instruction_pointer(regs); 11156 return instruction_pointer(regs);
10769 } 11157 }
@@ -10773,9 +11161,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/kgdb.c linux-2.6.32.8/arch/x86/kernel/
10773 /* Breakpoint instruction: */ 11161 /* Breakpoint instruction: */
10774 .gdb_bpt_instr = { 0xcc }, 11162 .gdb_bpt_instr = { 0xcc },
10775 .flags = KGDB_HW_BREAKPOINT, 11163 .flags = KGDB_HW_BREAKPOINT,
10776diff -urNp linux-2.6.32.8/arch/x86/kernel/kprobes.c linux-2.6.32.8/arch/x86/kernel/kprobes.c 11164diff -urNp linux-2.6.32.9/arch/x86/kernel/kprobes.c linux-2.6.32.9/arch/x86/kernel/kprobes.c
10777--- linux-2.6.32.8/arch/x86/kernel/kprobes.c 2010-02-09 07:57:19.000000000 -0500 11165--- linux-2.6.32.9/arch/x86/kernel/kprobes.c 2010-02-09 07:57:19.000000000 -0500
10778+++ linux-2.6.32.8/arch/x86/kernel/kprobes.c 2010-02-13 21:45:09.939914630 -0500 11166+++ linux-2.6.32.9/arch/x86/kernel/kprobes.c 2010-02-23 17:09:53.120037276 -0500
10779@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f 11167@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
10780 char op; 11168 char op;
10781 s32 raddr; 11169 s32 raddr;
@@ -10858,9 +11246,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/kprobes.c linux-2.6.32.8/arch/x86/kern
10858 return ret; 11246 return ret;
10859 11247
10860 switch (val) { 11248 switch (val) {
10861diff -urNp linux-2.6.32.8/arch/x86/kernel/ldt.c linux-2.6.32.8/arch/x86/kernel/ldt.c 11249diff -urNp linux-2.6.32.9/arch/x86/kernel/ldt.c linux-2.6.32.9/arch/x86/kernel/ldt.c
10862--- linux-2.6.32.8/arch/x86/kernel/ldt.c 2010-02-09 07:57:19.000000000 -0500 11250--- linux-2.6.32.9/arch/x86/kernel/ldt.c 2010-02-09 07:57:19.000000000 -0500
10863+++ linux-2.6.32.8/arch/x86/kernel/ldt.c 2010-02-13 21:45:09.939914630 -0500 11251+++ linux-2.6.32.9/arch/x86/kernel/ldt.c 2010-02-23 17:09:53.120037276 -0500
10864@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i 11252@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
10865 if (reload) { 11253 if (reload) {
10866 #ifdef CONFIG_SMP 11254 #ifdef CONFIG_SMP
@@ -10925,9 +11313,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/ldt.c linux-2.6.32.8/arch/x86/kernel/l
10925 fill_ldt(&ldt, &ldt_info); 11313 fill_ldt(&ldt, &ldt_info);
10926 if (oldmode) 11314 if (oldmode)
10927 ldt.avl = 0; 11315 ldt.avl = 0;
10928diff -urNp linux-2.6.32.8/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.8/arch/x86/kernel/machine_kexec_32.c 11316diff -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
10929--- linux-2.6.32.8/arch/x86/kernel/machine_kexec_32.c 2010-02-09 07:57:19.000000000 -0500 11317--- linux-2.6.32.9/arch/x86/kernel/machine_kexec_32.c 2010-02-09 07:57:19.000000000 -0500
10930+++ linux-2.6.32.8/arch/x86/kernel/machine_kexec_32.c 2010-02-13 21:45:09.939914630 -0500 11318+++ linux-2.6.32.9/arch/x86/kernel/machine_kexec_32.c 2010-02-23 17:09:53.120037276 -0500
10931@@ -26,7 +26,7 @@ 11319@@ -26,7 +26,7 @@
10932 #include <asm/system.h> 11320 #include <asm/system.h>
10933 #include <asm/cacheflush.h> 11321 #include <asm/cacheflush.h>
@@ -10955,9 +11343,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.8/arch
10955 11343
10956 relocate_kernel_ptr = control_page; 11344 relocate_kernel_ptr = control_page;
10957 page_list[PA_CONTROL_PAGE] = __pa(control_page); 11345 page_list[PA_CONTROL_PAGE] = __pa(control_page);
10958diff -urNp linux-2.6.32.8/arch/x86/kernel/microcode_amd.c linux-2.6.32.8/arch/x86/kernel/microcode_amd.c 11346diff -urNp linux-2.6.32.9/arch/x86/kernel/microcode_amd.c linux-2.6.32.9/arch/x86/kernel/microcode_amd.c
10959--- linux-2.6.32.8/arch/x86/kernel/microcode_amd.c 2010-02-09 07:57:19.000000000 -0500 11347--- linux-2.6.32.9/arch/x86/kernel/microcode_amd.c 2010-02-09 07:57:19.000000000 -0500
10960+++ linux-2.6.32.8/arch/x86/kernel/microcode_amd.c 2010-02-13 21:45:09.939914630 -0500 11348+++ linux-2.6.32.9/arch/x86/kernel/microcode_amd.c 2010-02-23 17:09:53.120037276 -0500
10961@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c 11349@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
10962 uci->mc = NULL; 11350 uci->mc = NULL;
10963 } 11351 }
@@ -10976,9 +11364,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/microcode_amd.c linux-2.6.32.8/arch/x8
10976 { 11364 {
10977 return &microcode_amd_ops; 11365 return &microcode_amd_ops;
10978 } 11366 }
10979diff -urNp linux-2.6.32.8/arch/x86/kernel/microcode_core.c linux-2.6.32.8/arch/x86/kernel/microcode_core.c 11367diff -urNp linux-2.6.32.9/arch/x86/kernel/microcode_core.c linux-2.6.32.9/arch/x86/kernel/microcode_core.c
10980--- linux-2.6.32.8/arch/x86/kernel/microcode_core.c 2010-02-09 07:57:19.000000000 -0500 11368--- linux-2.6.32.9/arch/x86/kernel/microcode_core.c 2010-02-09 07:57:19.000000000 -0500
10981+++ linux-2.6.32.8/arch/x86/kernel/microcode_core.c 2010-02-13 21:45:09.939914630 -0500 11369+++ linux-2.6.32.9/arch/x86/kernel/microcode_core.c 2010-02-23 17:09:53.120037276 -0500
10982@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); 11370@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
10983 11371
10984 #define MICROCODE_VERSION "2.00" 11372 #define MICROCODE_VERSION "2.00"
@@ -10988,9 +11376,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/microcode_core.c linux-2.6.32.8/arch/x
10988 11376
10989 /* 11377 /*
10990 * Synchronization. 11378 * Synchronization.
10991diff -urNp linux-2.6.32.8/arch/x86/kernel/microcode_intel.c linux-2.6.32.8/arch/x86/kernel/microcode_intel.c 11379diff -urNp linux-2.6.32.9/arch/x86/kernel/microcode_intel.c linux-2.6.32.9/arch/x86/kernel/microcode_intel.c
10992--- linux-2.6.32.8/arch/x86/kernel/microcode_intel.c 2010-02-09 07:57:19.000000000 -0500 11380--- linux-2.6.32.9/arch/x86/kernel/microcode_intel.c 2010-02-09 07:57:19.000000000 -0500
10993+++ linux-2.6.32.8/arch/x86/kernel/microcode_intel.c 2010-02-13 21:45:09.940916339 -0500 11381+++ linux-2.6.32.9/arch/x86/kernel/microcode_intel.c 2010-02-23 17:09:53.120037276 -0500
10994@@ -443,13 +443,13 @@ static enum ucode_state request_microcod 11382@@ -443,13 +443,13 @@ static enum ucode_state request_microcod
10995 11383
10996 static int get_ucode_user(void *to, const void *from, size_t n) 11384 static int get_ucode_user(void *to, const void *from, size_t n)
@@ -11025,9 +11413,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/microcode_intel.c linux-2.6.32.8/arch/
11025 { 11413 {
11026 return &microcode_intel_ops; 11414 return &microcode_intel_ops;
11027 } 11415 }
11028diff -urNp linux-2.6.32.8/arch/x86/kernel/module.c linux-2.6.32.8/arch/x86/kernel/module.c 11416diff -urNp linux-2.6.32.9/arch/x86/kernel/module.c linux-2.6.32.9/arch/x86/kernel/module.c
11029--- linux-2.6.32.8/arch/x86/kernel/module.c 2010-02-09 07:57:19.000000000 -0500 11417--- linux-2.6.32.9/arch/x86/kernel/module.c 2010-02-09 07:57:19.000000000 -0500
11030+++ linux-2.6.32.8/arch/x86/kernel/module.c 2010-02-13 21:45:09.940916339 -0500 11418+++ linux-2.6.32.9/arch/x86/kernel/module.c 2010-02-23 17:09:53.120037276 -0500
11031@@ -34,7 +34,7 @@ 11419@@ -34,7 +34,7 @@
11032 #define DEBUGP(fmt...) 11420 #define DEBUGP(fmt...)
11033 #endif 11421 #endif
@@ -11037,7 +11425,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/module.c linux-2.6.32.8/arch/x86/kerne
11037 { 11425 {
11038 struct vm_struct *area; 11426 struct vm_struct *area;
11039 11427
11040@@ -48,9 +48,90 @@ void *module_alloc(unsigned long size) 11428@@ -48,8 +48,18 @@ void *module_alloc(unsigned long size)
11041 if (!area) 11429 if (!area)
11042 return NULL; 11430 return NULL;
11043 11431
@@ -11046,13 +11434,24 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/module.c linux-2.6.32.8/arch/x86/kerne
11046+ return __vmalloc_area(area, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot); 11434+ return __vmalloc_area(area, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot);
11047+} 11435+}
11048+ 11436+
11049+#ifdef CONFIG_PAX_KERNEXEC
11050+#ifdef CONFIG_X86_32
11051+void *module_alloc(unsigned long size) 11437+void *module_alloc(unsigned long size)
11052+{ 11438+{
11439+
11440+#ifdef CONFIG_PAX_KERNEXEC
11053+ return __module_alloc(size, PAGE_KERNEL); 11441+ return __module_alloc(size, PAGE_KERNEL);
11054+} 11442+#else
11055+ 11443+ return __module_alloc(size, PAGE_KERNEL_EXEC);
11444+#endif
11445+
11446 }
11447
11448 /* Free memory returned from module_alloc */
11449@@ -58,6 +68,40 @@ void module_free(struct module *mod, voi
11450 vfree(module_region);
11451 }
11452
11453+#ifdef CONFIG_PAX_KERNEXEC
11454+#ifdef CONFIG_X86_32
11056+void *module_alloc_exec(unsigned long size) 11455+void *module_alloc_exec(unsigned long size)
11057+{ 11456+{
11058+ struct vm_struct *area; 11457+ struct vm_struct *area;
@@ -11061,58 +11460,20 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/module.c linux-2.6.32.8/arch/x86/kerne
11061+ return NULL; 11460+ return NULL;
11062+ 11461+
11063+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END); 11462+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
11064+ if (area) 11463+ return area ? area->addr : NULL;
11065+ return area->addr;
11066+
11067+ return NULL;
11068+} 11464+}
11069+EXPORT_SYMBOL(module_alloc_exec); 11465+EXPORT_SYMBOL(module_alloc_exec);
11070+ 11466+
11071+void module_free_exec(struct module *mod, void *module_region) 11467+void module_free_exec(struct module *mod, void *module_region)
11072+{ 11468+{
11073+ struct vm_struct **p, *tmp; 11469+ vunmap(module_region);
11074+
11075+ if (!module_region)
11076+ return;
11077+
11078+ if ((PAGE_SIZE-1) & (unsigned long)module_region) {
11079+ printk(KERN_ERR "Trying to module_free_exec() bad address (%p)\n", module_region);
11080+ WARN_ON(1);
11081+ return;
11082+ }
11083+
11084+ write_lock(&vmlist_lock);
11085+ for (p = &vmlist; (tmp = *p) != NULL; p = &tmp->next)
11086+ if (tmp->addr == module_region)
11087+ break;
11088+
11089+ if (tmp) {
11090+ pax_open_kernel();
11091+ memset(tmp->addr, 0xCC, tmp->size);
11092+ pax_close_kernel();
11093+
11094+ *p = tmp->next;
11095+ kfree(tmp);
11096+ }
11097+ write_unlock(&vmlist_lock);
11098+
11099+ if (!tmp) {
11100+ printk(KERN_ERR "Trying to module_free_exec() nonexistent vm area (%p)\n",
11101+ module_region);
11102+ WARN_ON(1);
11103+ }
11104+} 11470+}
11105+EXPORT_SYMBOL(module_free_exec); 11471+EXPORT_SYMBOL(module_free_exec);
11106+#else 11472+#else
11107+void *module_alloc(unsigned long size)
11108+{
11109+ return __module_alloc(size, PAGE_KERNEL);
11110+}
11111+
11112+void module_free_exec(struct module *mod, void *module_region) 11473+void module_free_exec(struct module *mod, void *module_region)
11113+{ 11474+{
11114+ module_free(mod, module_region); 11475+ module_free(mod, module_region);
11115 } 11476+}
11116+EXPORT_SYMBOL(module_free_exec); 11477+EXPORT_SYMBOL(module_free_exec);
11117+ 11478+
11118+void *module_alloc_exec(unsigned long size) 11479+void *module_alloc_exec(unsigned long size)
@@ -11121,16 +11482,12 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/module.c linux-2.6.32.8/arch/x86/kerne
11121+} 11482+}
11122+EXPORT_SYMBOL(module_alloc_exec); 11483+EXPORT_SYMBOL(module_alloc_exec);
11123+#endif 11484+#endif
11124+#else
11125+void *module_alloc(unsigned long size)
11126+{
11127+ return __module_alloc(size, PAGE_KERNEL_EXEC);
11128+}
11129+#endif 11485+#endif
11130 11486+
11131 /* Free memory returned from module_alloc */ 11487 /* We don't need anything special. */
11132 void module_free(struct module *mod, void *module_region) 11488 int module_frob_arch_sections(Elf_Ehdr *hdr,
11133@@ -77,14 +158,16 @@ int apply_relocate(Elf32_Shdr *sechdrs, 11489 Elf_Shdr *sechdrs,
11490@@ -77,14 +121,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
11134 unsigned int i; 11491 unsigned int i;
11135 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr; 11492 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
11136 Elf32_Sym *sym; 11493 Elf32_Sym *sym;
@@ -11150,7 +11507,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/module.c linux-2.6.32.8/arch/x86/kerne
11150 /* This is the symbol it is referring to. Note that all 11507 /* This is the symbol it is referring to. Note that all
11151 undefined symbols have been resolved. */ 11508 undefined symbols have been resolved. */
11152 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr 11509 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
11153@@ -93,11 +176,15 @@ int apply_relocate(Elf32_Shdr *sechdrs, 11510@@ -93,11 +139,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
11154 switch (ELF32_R_TYPE(rel[i].r_info)) { 11511 switch (ELF32_R_TYPE(rel[i].r_info)) {
11155 case R_386_32: 11512 case R_386_32:
11156 /* We add the value into the location given */ 11513 /* We add the value into the location given */
@@ -11168,7 +11525,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/module.c linux-2.6.32.8/arch/x86/kerne
11168 break; 11525 break;
11169 default: 11526 default:
11170 printk(KERN_ERR "module %s: Unknown relocation: %u\n", 11527 printk(KERN_ERR "module %s: Unknown relocation: %u\n",
11171@@ -153,21 +240,30 @@ int apply_relocate_add(Elf64_Shdr *sechd 11528@@ -153,21 +203,30 @@ int apply_relocate_add(Elf64_Shdr *sechd
11172 case R_X86_64_NONE: 11529 case R_X86_64_NONE:
11173 break; 11530 break;
11174 case R_X86_64_64: 11531 case R_X86_64_64:
@@ -11199,9 +11556,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/module.c linux-2.6.32.8/arch/x86/kerne
11199 #if 0 11556 #if 0
11200 if ((s64)val != *(s32 *)loc) 11557 if ((s64)val != *(s32 *)loc)
11201 goto overflow; 11558 goto overflow;
11202diff -urNp linux-2.6.32.8/arch/x86/kernel/paravirt.c linux-2.6.32.8/arch/x86/kernel/paravirt.c 11559diff -urNp linux-2.6.32.9/arch/x86/kernel/paravirt.c linux-2.6.32.9/arch/x86/kernel/paravirt.c
11203--- linux-2.6.32.8/arch/x86/kernel/paravirt.c 2010-02-09 07:57:19.000000000 -0500 11560--- linux-2.6.32.9/arch/x86/kernel/paravirt.c 2010-02-09 07:57:19.000000000 -0500
11204+++ linux-2.6.32.8/arch/x86/kernel/paravirt.c 2010-02-13 21:45:09.940916339 -0500 11561+++ linux-2.6.32.9/arch/x86/kernel/paravirt.c 2010-02-23 17:09:53.120037276 -0500
11205@@ -120,9 +120,9 @@ unsigned paravirt_patch_jmp(void *insnbu 11562@@ -120,9 +120,9 @@ unsigned paravirt_patch_jmp(void *insnbu
11206 11563
11207 /* Neat trick to map patch type back to the call within the 11564 /* Neat trick to map patch type back to the call within the
@@ -11306,9 +11663,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/paravirt.c linux-2.6.32.8/arch/x86/ker
11306 }; 11663 };
11307 11664
11308 EXPORT_SYMBOL_GPL(pv_time_ops); 11665 EXPORT_SYMBOL_GPL(pv_time_ops);
11309diff -urNp linux-2.6.32.8/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.8/arch/x86/kernel/paravirt-spinlocks.c 11666diff -urNp linux-2.6.32.9/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.9/arch/x86/kernel/paravirt-spinlocks.c
11310--- linux-2.6.32.8/arch/x86/kernel/paravirt-spinlocks.c 2010-02-09 07:57:19.000000000 -0500 11667--- linux-2.6.32.9/arch/x86/kernel/paravirt-spinlocks.c 2010-02-09 07:57:19.000000000 -0500
11311+++ linux-2.6.32.8/arch/x86/kernel/paravirt-spinlocks.c 2010-02-13 21:45:09.940916339 -0500 11668+++ linux-2.6.32.9/arch/x86/kernel/paravirt-spinlocks.c 2010-02-23 17:09:53.120037276 -0500
11312@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * 11669@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
11313 __raw_spin_lock(lock); 11670 __raw_spin_lock(lock);
11314 } 11671 }
@@ -11318,9 +11675,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.8/ar
11318 #ifdef CONFIG_SMP 11675 #ifdef CONFIG_SMP
11319 .spin_is_locked = __ticket_spin_is_locked, 11676 .spin_is_locked = __ticket_spin_is_locked,
11320 .spin_is_contended = __ticket_spin_is_contended, 11677 .spin_is_contended = __ticket_spin_is_contended,
11321diff -urNp linux-2.6.32.8/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.8/arch/x86/kernel/pci-calgary_64.c 11678diff -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
11322--- linux-2.6.32.8/arch/x86/kernel/pci-calgary_64.c 2010-02-09 07:57:19.000000000 -0500 11679--- linux-2.6.32.9/arch/x86/kernel/pci-calgary_64.c 2010-02-09 07:57:19.000000000 -0500
11323+++ linux-2.6.32.8/arch/x86/kernel/pci-calgary_64.c 2010-02-13 21:45:09.941934459 -0500 11680+++ linux-2.6.32.9/arch/x86/kernel/pci-calgary_64.c 2010-02-23 17:09:53.120037276 -0500
11324@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct 11681@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct
11325 free_pages((unsigned long)vaddr, get_order(size)); 11682 free_pages((unsigned long)vaddr, get_order(size));
11326 } 11683 }
@@ -11330,9 +11687,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.8/arch/x
11330 .alloc_coherent = calgary_alloc_coherent, 11687 .alloc_coherent = calgary_alloc_coherent,
11331 .free_coherent = calgary_free_coherent, 11688 .free_coherent = calgary_free_coherent,
11332 .map_sg = calgary_map_sg, 11689 .map_sg = calgary_map_sg,
11333diff -urNp linux-2.6.32.8/arch/x86/kernel/pci-dma.c linux-2.6.32.8/arch/x86/kernel/pci-dma.c 11690diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-dma.c linux-2.6.32.9/arch/x86/kernel/pci-dma.c
11334--- linux-2.6.32.8/arch/x86/kernel/pci-dma.c 2010-02-09 07:57:19.000000000 -0500 11691--- linux-2.6.32.9/arch/x86/kernel/pci-dma.c 2010-02-09 07:57:19.000000000 -0500
11335+++ linux-2.6.32.8/arch/x86/kernel/pci-dma.c 2010-02-13 21:45:09.941934459 -0500 11692+++ linux-2.6.32.9/arch/x86/kernel/pci-dma.c 2010-02-23 17:09:53.120037276 -0500
11336@@ -14,7 +14,7 @@ 11693@@ -14,7 +14,7 @@
11337 11694
11338 static int forbid_dac __read_mostly; 11695 static int forbid_dac __read_mostly;
@@ -11351,9 +11708,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/pci-dma.c linux-2.6.32.8/arch/x86/kern
11351 11708
11352 #ifdef CONFIG_PCI 11709 #ifdef CONFIG_PCI
11353 if (mask > 0xffffffff && forbid_dac > 0) { 11710 if (mask > 0xffffffff && forbid_dac > 0) {
11354diff -urNp linux-2.6.32.8/arch/x86/kernel/pci-gart_64.c linux-2.6.32.8/arch/x86/kernel/pci-gart_64.c 11711diff -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
11355--- linux-2.6.32.8/arch/x86/kernel/pci-gart_64.c 2010-02-09 07:57:19.000000000 -0500 11712--- linux-2.6.32.9/arch/x86/kernel/pci-gart_64.c 2010-02-09 07:57:19.000000000 -0500
11356+++ linux-2.6.32.8/arch/x86/kernel/pci-gart_64.c 2010-02-13 21:45:09.941934459 -0500 11713+++ linux-2.6.32.9/arch/x86/kernel/pci-gart_64.c 2010-02-23 17:09:53.120037276 -0500
11357@@ -679,7 +679,7 @@ static __init int init_k8_gatt(struct ag 11714@@ -679,7 +679,7 @@ static __init int init_k8_gatt(struct ag
11358 return -1; 11715 return -1;
11359 } 11716 }
@@ -11363,9 +11720,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/pci-gart_64.c linux-2.6.32.8/arch/x86/
11363 .map_sg = gart_map_sg, 11720 .map_sg = gart_map_sg,
11364 .unmap_sg = gart_unmap_sg, 11721 .unmap_sg = gart_unmap_sg,
11365 .map_page = gart_map_page, 11722 .map_page = gart_map_page,
11366diff -urNp linux-2.6.32.8/arch/x86/kernel/pci-nommu.c linux-2.6.32.8/arch/x86/kernel/pci-nommu.c 11723diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-nommu.c linux-2.6.32.9/arch/x86/kernel/pci-nommu.c
11367--- linux-2.6.32.8/arch/x86/kernel/pci-nommu.c 2010-02-09 07:57:19.000000000 -0500 11724--- linux-2.6.32.9/arch/x86/kernel/pci-nommu.c 2010-02-09 07:57:19.000000000 -0500
11368+++ linux-2.6.32.8/arch/x86/kernel/pci-nommu.c 2010-02-13 21:45:09.941934459 -0500 11725+++ linux-2.6.32.9/arch/x86/kernel/pci-nommu.c 2010-02-23 17:09:53.120037276 -0500
11369@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str 11726@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
11370 flush_write_buffers(); 11727 flush_write_buffers();
11371 } 11728 }
@@ -11375,9 +11732,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/pci-nommu.c linux-2.6.32.8/arch/x86/ke
11375 .alloc_coherent = dma_generic_alloc_coherent, 11732 .alloc_coherent = dma_generic_alloc_coherent,
11376 .free_coherent = nommu_free_coherent, 11733 .free_coherent = nommu_free_coherent,
11377 .map_sg = nommu_map_sg, 11734 .map_sg = nommu_map_sg,
11378diff -urNp linux-2.6.32.8/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.8/arch/x86/kernel/pci-swiotlb.c 11735diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.9/arch/x86/kernel/pci-swiotlb.c
11379--- linux-2.6.32.8/arch/x86/kernel/pci-swiotlb.c 2010-02-09 07:57:19.000000000 -0500 11736--- linux-2.6.32.9/arch/x86/kernel/pci-swiotlb.c 2010-02-09 07:57:19.000000000 -0500
11380+++ linux-2.6.32.8/arch/x86/kernel/pci-swiotlb.c 2010-02-13 21:45:09.942909175 -0500 11737+++ linux-2.6.32.9/arch/x86/kernel/pci-swiotlb.c 2010-02-23 17:09:53.120037276 -0500
11381@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( 11738@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
11382 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); 11739 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
11383 } 11740 }
@@ -11387,9 +11744,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.8/arch/x86/
11387 .mapping_error = swiotlb_dma_mapping_error, 11744 .mapping_error = swiotlb_dma_mapping_error,
11388 .alloc_coherent = x86_swiotlb_alloc_coherent, 11745 .alloc_coherent = x86_swiotlb_alloc_coherent,
11389 .free_coherent = swiotlb_free_coherent, 11746 .free_coherent = swiotlb_free_coherent,
11390diff -urNp linux-2.6.32.8/arch/x86/kernel/process_32.c linux-2.6.32.8/arch/x86/kernel/process_32.c 11747diff -urNp linux-2.6.32.9/arch/x86/kernel/process_32.c linux-2.6.32.9/arch/x86/kernel/process_32.c
11391--- linux-2.6.32.8/arch/x86/kernel/process_32.c 2010-02-09 07:57:19.000000000 -0500 11748--- linux-2.6.32.9/arch/x86/kernel/process_32.c 2010-02-09 07:57:19.000000000 -0500
11392+++ linux-2.6.32.8/arch/x86/kernel/process_32.c 2010-02-13 21:45:09.942909175 -0500 11749+++ linux-2.6.32.9/arch/x86/kernel/process_32.c 2010-02-23 17:09:53.120037276 -0500
11393@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as 11750@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
11394 unsigned long thread_saved_pc(struct task_struct *tsk) 11751 unsigned long thread_saved_pc(struct task_struct *tsk)
11395 { 11752 {
@@ -11484,9 +11841,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/process_32.c linux-2.6.32.8/arch/x86/k
11484+ load_sp0(init_tss + smp_processor_id(), thread); 11841+ load_sp0(init_tss + smp_processor_id(), thread);
11485+} 11842+}
11486+#endif 11843+#endif
11487diff -urNp linux-2.6.32.8/arch/x86/kernel/process_64.c linux-2.6.32.8/arch/x86/kernel/process_64.c 11844diff -urNp linux-2.6.32.9/arch/x86/kernel/process_64.c linux-2.6.32.9/arch/x86/kernel/process_64.c
11488--- linux-2.6.32.8/arch/x86/kernel/process_64.c 2010-02-09 07:57:19.000000000 -0500 11845--- linux-2.6.32.9/arch/x86/kernel/process_64.c 2010-02-09 07:57:19.000000000 -0500
11489+++ linux-2.6.32.8/arch/x86/kernel/process_64.c 2010-02-13 21:45:09.943634227 -0500 11846+++ linux-2.6.32.9/arch/x86/kernel/process_64.c 2010-02-23 17:09:53.120037276 -0500
11490@@ -91,7 +91,7 @@ static void __exit_idle(void) 11847@@ -91,7 +91,7 @@ static void __exit_idle(void)
11491 void exit_idle(void) 11848 void exit_idle(void)
11492 { 11849 {
@@ -11529,9 +11886,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/process_64.c linux-2.6.32.8/arch/x86/k
11529 return 0; 11886 return 0;
11530 ip = *(u64 *)(fp+8); 11887 ip = *(u64 *)(fp+8);
11531 if (!in_sched_functions(ip)) 11888 if (!in_sched_functions(ip))
11532diff -urNp linux-2.6.32.8/arch/x86/kernel/process.c linux-2.6.32.8/arch/x86/kernel/process.c 11889diff -urNp linux-2.6.32.9/arch/x86/kernel/process.c linux-2.6.32.9/arch/x86/kernel/process.c
11533--- linux-2.6.32.8/arch/x86/kernel/process.c 2010-02-09 07:57:19.000000000 -0500 11890--- linux-2.6.32.9/arch/x86/kernel/process.c 2010-02-09 07:57:19.000000000 -0500
11534+++ linux-2.6.32.8/arch/x86/kernel/process.c 2010-02-13 21:45:09.943634227 -0500 11891+++ linux-2.6.32.9/arch/x86/kernel/process.c 2010-02-23 17:09:53.123619300 -0500
11535@@ -73,7 +73,7 @@ void exit_thread(void) 11892@@ -73,7 +73,7 @@ void exit_thread(void)
11536 unsigned long *bp = t->io_bitmap_ptr; 11893 unsigned long *bp = t->io_bitmap_ptr;
11537 11894
@@ -11569,9 +11926,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/process.c linux-2.6.32.8/arch/x86/kern
11569- return randomize_range(mm->brk, range_end, 0) ? : mm->brk; 11926- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
11570-} 11927-}
11571- 11928-
11572diff -urNp linux-2.6.32.8/arch/x86/kernel/ptrace.c linux-2.6.32.8/arch/x86/kernel/ptrace.c 11929diff -urNp linux-2.6.32.9/arch/x86/kernel/ptrace.c linux-2.6.32.9/arch/x86/kernel/ptrace.c
11573--- linux-2.6.32.8/arch/x86/kernel/ptrace.c 2010-02-09 07:57:19.000000000 -0500 11930--- linux-2.6.32.9/arch/x86/kernel/ptrace.c 2010-02-09 07:57:19.000000000 -0500
11574+++ linux-2.6.32.8/arch/x86/kernel/ptrace.c 2010-02-13 21:45:09.943634227 -0500 11931+++ linux-2.6.32.9/arch/x86/kernel/ptrace.c 2010-02-23 17:09:53.123619300 -0500
11575@@ -925,7 +925,7 @@ static const struct user_regset_view use 11932@@ -925,7 +925,7 @@ static const struct user_regset_view use
11576 long arch_ptrace(struct task_struct *child, long request, long addr, long data) 11933 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
11577 { 11934 {
@@ -11640,9 +11997,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/ptrace.c linux-2.6.32.8/arch/x86/kerne
11640 11997
11641 /* Send us the fake SIGTRAP */ 11998 /* Send us the fake SIGTRAP */
11642 force_sig_info(SIGTRAP, &info, tsk); 11999 force_sig_info(SIGTRAP, &info, tsk);
11643diff -urNp linux-2.6.32.8/arch/x86/kernel/reboot.c linux-2.6.32.8/arch/x86/kernel/reboot.c 12000diff -urNp linux-2.6.32.9/arch/x86/kernel/reboot.c linux-2.6.32.9/arch/x86/kernel/reboot.c
11644--- linux-2.6.32.8/arch/x86/kernel/reboot.c 2010-02-09 07:57:19.000000000 -0500 12001--- linux-2.6.32.9/arch/x86/kernel/reboot.c 2010-02-09 07:57:19.000000000 -0500
11645+++ linux-2.6.32.8/arch/x86/kernel/reboot.c 2010-02-13 21:45:09.943634227 -0500 12002+++ linux-2.6.32.9/arch/x86/kernel/reboot.c 2010-02-23 17:09:53.123619300 -0500
11646@@ -33,7 +33,7 @@ void (*pm_power_off)(void); 12003@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
11647 EXPORT_SYMBOL(pm_power_off); 12004 EXPORT_SYMBOL(pm_power_off);
11648 12005
@@ -11719,9 +12076,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/reboot.c linux-2.6.32.8/arch/x86/kerne
11719 12076
11720 /* Set up the IDT for real mode. */ 12077 /* Set up the IDT for real mode. */
11721 load_idt(&real_mode_idt); 12078 load_idt(&real_mode_idt);
11722diff -urNp linux-2.6.32.8/arch/x86/kernel/setup.c linux-2.6.32.8/arch/x86/kernel/setup.c 12079diff -urNp linux-2.6.32.9/arch/x86/kernel/setup.c linux-2.6.32.9/arch/x86/kernel/setup.c
11723--- linux-2.6.32.8/arch/x86/kernel/setup.c 2010-02-09 07:57:19.000000000 -0500 12080--- linux-2.6.32.9/arch/x86/kernel/setup.c 2010-02-09 07:57:19.000000000 -0500
11724+++ linux-2.6.32.8/arch/x86/kernel/setup.c 2010-02-13 21:45:09.944914539 -0500 12081+++ linux-2.6.32.9/arch/x86/kernel/setup.c 2010-02-23 17:09:53.123619300 -0500
11725@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p) 12082@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p)
11726 12083
11727 if (!boot_params.hdr.root_flags) 12084 if (!boot_params.hdr.root_flags)
@@ -11742,9 +12099,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/setup.c linux-2.6.32.8/arch/x86/kernel
11742 data_resource.end = virt_to_phys(_edata)-1; 12099 data_resource.end = virt_to_phys(_edata)-1;
11743 bss_resource.start = virt_to_phys(&__bss_start); 12100 bss_resource.start = virt_to_phys(&__bss_start);
11744 bss_resource.end = virt_to_phys(&__bss_stop)-1; 12101 bss_resource.end = virt_to_phys(&__bss_stop)-1;
11745diff -urNp linux-2.6.32.8/arch/x86/kernel/setup_percpu.c linux-2.6.32.8/arch/x86/kernel/setup_percpu.c 12102diff -urNp linux-2.6.32.9/arch/x86/kernel/setup_percpu.c linux-2.6.32.9/arch/x86/kernel/setup_percpu.c
11746--- linux-2.6.32.8/arch/x86/kernel/setup_percpu.c 2010-02-09 07:57:19.000000000 -0500 12103--- linux-2.6.32.9/arch/x86/kernel/setup_percpu.c 2010-02-09 07:57:19.000000000 -0500
11747+++ linux-2.6.32.8/arch/x86/kernel/setup_percpu.c 2010-02-13 21:45:09.944914539 -0500 12104+++ linux-2.6.32.9/arch/x86/kernel/setup_percpu.c 2010-02-23 17:09:53.123619300 -0500
11748@@ -25,19 +25,17 @@ 12105@@ -25,19 +25,17 @@
11749 # define DBG(x...) 12106 # define DBG(x...)
11750 #endif 12107 #endif
@@ -11815,9 +12172,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/setup_percpu.c linux-2.6.32.8/arch/x86
11815 /* 12172 /*
11816 * Up to this point, the boot CPU has been using .data.init 12173 * Up to this point, the boot CPU has been using .data.init
11817 * area. Reload any changed state for the boot CPU. 12174 * area. Reload any changed state for the boot CPU.
11818diff -urNp linux-2.6.32.8/arch/x86/kernel/signal.c linux-2.6.32.8/arch/x86/kernel/signal.c 12175diff -urNp linux-2.6.32.9/arch/x86/kernel/signal.c linux-2.6.32.9/arch/x86/kernel/signal.c
11819--- linux-2.6.32.8/arch/x86/kernel/signal.c 2010-02-09 07:57:19.000000000 -0500 12176--- linux-2.6.32.9/arch/x86/kernel/signal.c 2010-02-09 07:57:19.000000000 -0500
11820+++ linux-2.6.32.8/arch/x86/kernel/signal.c 2010-02-13 21:45:09.944914539 -0500 12177+++ linux-2.6.32.9/arch/x86/kernel/signal.c 2010-02-23 17:09:53.123619300 -0500
11821@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi 12178@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
11822 * Align the stack pointer according to the i386 ABI, 12179 * Align the stack pointer according to the i386 ABI,
11823 * i.e. so that on function entry ((sp + 4) & 15) == 0. 12180 * i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -11889,9 +12246,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/signal.c linux-2.6.32.8/arch/x86/kerne
11889 return; 12246 return;
11890 12247
11891 if (current_thread_info()->status & TS_RESTORE_SIGMASK) 12248 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
11892diff -urNp linux-2.6.32.8/arch/x86/kernel/smpboot.c linux-2.6.32.8/arch/x86/kernel/smpboot.c 12249diff -urNp linux-2.6.32.9/arch/x86/kernel/smpboot.c linux-2.6.32.9/arch/x86/kernel/smpboot.c
11893--- linux-2.6.32.8/arch/x86/kernel/smpboot.c 2010-02-09 07:57:19.000000000 -0500 12250--- linux-2.6.32.9/arch/x86/kernel/smpboot.c 2010-02-09 07:57:19.000000000 -0500
11894+++ linux-2.6.32.8/arch/x86/kernel/smpboot.c 2010-02-13 21:45:09.944914539 -0500 12251+++ linux-2.6.32.9/arch/x86/kernel/smpboot.c 2010-02-23 17:09:53.123619300 -0500
11895@@ -729,7 +729,11 @@ do_rest: 12252@@ -729,7 +729,11 @@ do_rest:
11896 (unsigned long)task_stack_page(c_idle.idle) - 12253 (unsigned long)task_stack_page(c_idle.idle) -
11897 KERNEL_STACK_OFFSET + THREAD_SIZE; 12254 KERNEL_STACK_OFFSET + THREAD_SIZE;
@@ -11904,9 +12261,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/smpboot.c linux-2.6.32.8/arch/x86/kern
11904 initial_code = (unsigned long)start_secondary; 12261 initial_code = (unsigned long)start_secondary;
11905 stack_start.sp = (void *) c_idle.idle->thread.sp; 12262 stack_start.sp = (void *) c_idle.idle->thread.sp;
11906 12263
11907diff -urNp linux-2.6.32.8/arch/x86/kernel/step.c linux-2.6.32.8/arch/x86/kernel/step.c 12264diff -urNp linux-2.6.32.9/arch/x86/kernel/step.c linux-2.6.32.9/arch/x86/kernel/step.c
11908--- linux-2.6.32.8/arch/x86/kernel/step.c 2010-02-09 07:57:19.000000000 -0500 12265--- linux-2.6.32.9/arch/x86/kernel/step.c 2010-02-09 07:57:19.000000000 -0500
11909+++ linux-2.6.32.8/arch/x86/kernel/step.c 2010-02-13 21:45:09.945907876 -0500 12266+++ linux-2.6.32.9/arch/x86/kernel/step.c 2010-02-23 17:09:53.123619300 -0500
11910@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc 12267@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
11911 struct desc_struct *desc; 12268 struct desc_struct *desc;
11912 unsigned long base; 12269 unsigned long base;
@@ -11939,17 +12296,17 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/step.c linux-2.6.32.8/arch/x86/kernel/
11939 /* 32-bit mode: register increment */ 12296 /* 32-bit mode: register increment */
11940 return 0; 12297 return 0;
11941 /* 64-bit mode: REX prefix */ 12298 /* 64-bit mode: REX prefix */
11942diff -urNp linux-2.6.32.8/arch/x86/kernel/syscall_table_32.S linux-2.6.32.8/arch/x86/kernel/syscall_table_32.S 12299diff -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
11943--- linux-2.6.32.8/arch/x86/kernel/syscall_table_32.S 2010-02-09 07:57:19.000000000 -0500 12300--- linux-2.6.32.9/arch/x86/kernel/syscall_table_32.S 2010-02-09 07:57:19.000000000 -0500
11944+++ linux-2.6.32.8/arch/x86/kernel/syscall_table_32.S 2010-02-13 21:45:09.945907876 -0500 12301+++ linux-2.6.32.9/arch/x86/kernel/syscall_table_32.S 2010-02-23 17:09:53.123619300 -0500
11945@@ -1,3 +1,4 @@ 12302@@ -1,3 +1,4 @@
11946+.section .rodata,"a",@progbits 12303+.section .rodata,"a",@progbits
11947 ENTRY(sys_call_table) 12304 ENTRY(sys_call_table)
11948 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ 12305 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
11949 .long sys_exit 12306 .long sys_exit
11950diff -urNp linux-2.6.32.8/arch/x86/kernel/sys_i386_32.c linux-2.6.32.8/arch/x86/kernel/sys_i386_32.c 12307diff -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
11951--- linux-2.6.32.8/arch/x86/kernel/sys_i386_32.c 2010-02-09 07:57:19.000000000 -0500 12308--- linux-2.6.32.9/arch/x86/kernel/sys_i386_32.c 2010-02-09 07:57:19.000000000 -0500
11952+++ linux-2.6.32.8/arch/x86/kernel/sys_i386_32.c 2010-02-13 21:45:09.945907876 -0500 12309+++ linux-2.6.32.9/arch/x86/kernel/sys_i386_32.c 2010-02-23 17:09:53.123619300 -0500
11953@@ -24,6 +24,21 @@ 12310@@ -24,6 +24,21 @@
11954 12311
11955 #include <asm/syscalls.h> 12312 #include <asm/syscalls.h>
@@ -12196,9 +12553,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/sys_i386_32.c linux-2.6.32.8/arch/x86/
12196 } 12553 }
12197 case 1: /* iBCS2 emulator entry point */ 12554 case 1: /* iBCS2 emulator entry point */
12198 if (!segment_eq(get_fs(), get_ds())) 12555 if (!segment_eq(get_fs(), get_ds()))
12199diff -urNp linux-2.6.32.8/arch/x86/kernel/sys_x86_64.c linux-2.6.32.8/arch/x86/kernel/sys_x86_64.c 12556diff -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
12200--- linux-2.6.32.8/arch/x86/kernel/sys_x86_64.c 2010-02-09 07:57:19.000000000 -0500 12557--- linux-2.6.32.9/arch/x86/kernel/sys_x86_64.c 2010-02-09 07:57:19.000000000 -0500
12201+++ linux-2.6.32.8/arch/x86/kernel/sys_x86_64.c 2010-02-13 21:45:09.945907876 -0500 12558+++ linux-2.6.32.9/arch/x86/kernel/sys_x86_64.c 2010-02-23 17:09:53.123619300 -0500
12202@@ -32,8 +32,8 @@ out: 12559@@ -32,8 +32,8 @@ out:
12203 return error; 12560 return error;
12204 } 12561 }
@@ -12280,9 +12637,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/sys_x86_64.c linux-2.6.32.8/arch/x86/k
12280 mm->cached_hole_size = ~0UL; 12637 mm->cached_hole_size = ~0UL;
12281 12638
12282 return addr; 12639 return addr;
12283diff -urNp linux-2.6.32.8/arch/x86/kernel/time.c linux-2.6.32.8/arch/x86/kernel/time.c 12640diff -urNp linux-2.6.32.9/arch/x86/kernel/time.c linux-2.6.32.9/arch/x86/kernel/time.c
12284--- linux-2.6.32.8/arch/x86/kernel/time.c 2010-02-09 07:57:19.000000000 -0500 12641--- linux-2.6.32.9/arch/x86/kernel/time.c 2010-02-09 07:57:19.000000000 -0500
12285+++ linux-2.6.32.8/arch/x86/kernel/time.c 2010-02-13 21:45:09.946861743 -0500 12642+++ linux-2.6.32.9/arch/x86/kernel/time.c 2010-02-23 17:09:53.123619300 -0500
12286@@ -26,17 +26,13 @@ 12643@@ -26,17 +26,13 @@
12287 int timer_ack; 12644 int timer_ack;
12288 #endif 12645 #endif
@@ -12321,9 +12678,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/time.c linux-2.6.32.8/arch/x86/kernel/
12321 } 12678 }
12322 return pc; 12679 return pc;
12323 } 12680 }
12324diff -urNp linux-2.6.32.8/arch/x86/kernel/tls.c linux-2.6.32.8/arch/x86/kernel/tls.c 12681diff -urNp linux-2.6.32.9/arch/x86/kernel/tls.c linux-2.6.32.9/arch/x86/kernel/tls.c
12325--- linux-2.6.32.8/arch/x86/kernel/tls.c 2010-02-09 07:57:19.000000000 -0500 12682--- linux-2.6.32.9/arch/x86/kernel/tls.c 2010-02-09 07:57:19.000000000 -0500
12326+++ linux-2.6.32.8/arch/x86/kernel/tls.c 2010-02-13 21:45:09.946861743 -0500 12683+++ linux-2.6.32.9/arch/x86/kernel/tls.c 2010-02-23 17:09:53.123619300 -0500
12327@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc 12684@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
12328 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) 12685 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
12329 return -EINVAL; 12686 return -EINVAL;
@@ -12336,9 +12693,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/tls.c linux-2.6.32.8/arch/x86/kernel/t
12336 set_tls_desc(p, idx, &info, 1); 12693 set_tls_desc(p, idx, &info, 1);
12337 12694
12338 return 0; 12695 return 0;
12339diff -urNp linux-2.6.32.8/arch/x86/kernel/trampoline_32.S linux-2.6.32.8/arch/x86/kernel/trampoline_32.S 12696diff -urNp linux-2.6.32.9/arch/x86/kernel/trampoline_32.S linux-2.6.32.9/arch/x86/kernel/trampoline_32.S
12340--- linux-2.6.32.8/arch/x86/kernel/trampoline_32.S 2010-02-09 07:57:19.000000000 -0500 12697--- linux-2.6.32.9/arch/x86/kernel/trampoline_32.S 2010-02-09 07:57:19.000000000 -0500
12341+++ linux-2.6.32.8/arch/x86/kernel/trampoline_32.S 2010-02-13 21:45:09.946861743 -0500 12698+++ linux-2.6.32.9/arch/x86/kernel/trampoline_32.S 2010-02-23 17:09:53.123619300 -0500
12342@@ -32,6 +32,12 @@ 12699@@ -32,6 +32,12 @@
12343 #include <asm/segment.h> 12700 #include <asm/segment.h>
12344 #include <asm/page_types.h> 12701 #include <asm/page_types.h>
@@ -12361,9 +12718,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/trampoline_32.S linux-2.6.32.8/arch/x8
12361 12718
12362 # These need to be in the same 64K segment as the above; 12719 # These need to be in the same 64K segment as the above;
12363 # hence we don't use the boot_gdt_descr defined in head.S 12720 # hence we don't use the boot_gdt_descr defined in head.S
12364diff -urNp linux-2.6.32.8/arch/x86/kernel/traps.c linux-2.6.32.8/arch/x86/kernel/traps.c 12721diff -urNp linux-2.6.32.9/arch/x86/kernel/traps.c linux-2.6.32.9/arch/x86/kernel/traps.c
12365--- linux-2.6.32.8/arch/x86/kernel/traps.c 2010-02-09 07:57:19.000000000 -0500 12722--- linux-2.6.32.9/arch/x86/kernel/traps.c 2010-02-09 07:57:19.000000000 -0500
12366+++ linux-2.6.32.8/arch/x86/kernel/traps.c 2010-02-13 21:45:09.946861743 -0500 12723+++ linux-2.6.32.9/arch/x86/kernel/traps.c 2010-02-23 17:09:53.123619300 -0500
12367@@ -69,12 +69,6 @@ asmlinkage int system_call(void); 12724@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
12368 12725
12369 /* Do we ignore FPU interrupts ? */ 12726 /* Do we ignore FPU interrupts ? */
@@ -12424,7 +12781,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/traps.c linux-2.6.32.8/arch/x86/kernel
12424 tsk->thread.trap_no = trapnr; 12781 tsk->thread.trap_no = trapnr;
12425+ 12782+
12426+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) 12783+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12427+ if (trapnr == 12 && (regs->cs & 0xFFFF) == __KERNEL_CS) 12784+ if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
12428+ str = "PAX: suspicious stack segment fault"; 12785+ str = "PAX: suspicious stack segment fault";
12429+#endif 12786+#endif
12430+ 12787+
@@ -12478,7 +12835,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/traps.c linux-2.6.32.8/arch/x86/kernel
12478 return; 12835 return;
12479+ 12836+
12480+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) 12837+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12481+ if ((regs->cs & 0xFFFF) == __KERNEL_CS) 12838+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
12482+ die("PAX: suspicious general protection fault", regs, error_code); 12839+ die("PAX: suspicious general protection fault", regs, error_code);
12483+ else 12840+ else
12484+#endif 12841+#endif
@@ -12513,9 +12870,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/traps.c linux-2.6.32.8/arch/x86/kernel
12513 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); 12870 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
12514 return; 12871 return;
12515 } 12872 }
12516diff -urNp linux-2.6.32.8/arch/x86/kernel/tsc.c linux-2.6.32.8/arch/x86/kernel/tsc.c 12873diff -urNp linux-2.6.32.9/arch/x86/kernel/tsc.c linux-2.6.32.9/arch/x86/kernel/tsc.c
12517--- linux-2.6.32.8/arch/x86/kernel/tsc.c 2010-02-09 07:57:19.000000000 -0500 12874--- linux-2.6.32.9/arch/x86/kernel/tsc.c 2010-02-09 07:57:19.000000000 -0500
12518+++ linux-2.6.32.8/arch/x86/kernel/tsc.c 2010-02-13 21:45:09.947770893 -0500 12875+++ linux-2.6.32.9/arch/x86/kernel/tsc.c 2010-02-23 17:09:53.123619300 -0500
12519@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b 12876@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b
12520 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), 12877 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
12521 }, 12878 },
@@ -12525,9 +12882,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/tsc.c linux-2.6.32.8/arch/x86/kernel/t
12525 }; 12882 };
12526 12883
12527 static void __init check_system_tsc_reliable(void) 12884 static void __init check_system_tsc_reliable(void)
12528diff -urNp linux-2.6.32.8/arch/x86/kernel/vm86_32.c linux-2.6.32.8/arch/x86/kernel/vm86_32.c 12885diff -urNp linux-2.6.32.9/arch/x86/kernel/vm86_32.c linux-2.6.32.9/arch/x86/kernel/vm86_32.c
12529--- linux-2.6.32.8/arch/x86/kernel/vm86_32.c 2010-02-09 07:57:19.000000000 -0500 12886--- linux-2.6.32.9/arch/x86/kernel/vm86_32.c 2010-02-09 07:57:19.000000000 -0500
12530+++ linux-2.6.32.8/arch/x86/kernel/vm86_32.c 2010-02-13 21:45:09.947770893 -0500 12887+++ linux-2.6.32.9/arch/x86/kernel/vm86_32.c 2010-02-23 17:09:53.123619300 -0500
12531@@ -41,6 +41,7 @@ 12888@@ -41,6 +41,7 @@
12532 #include <linux/ptrace.h> 12889 #include <linux/ptrace.h>
12533 #include <linux/audit.h> 12890 #include <linux/audit.h>
@@ -12592,9 +12949,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/vm86_32.c linux-2.6.32.8/arch/x86/kern
12592 if (get_user(segoffs, intr_ptr)) 12949 if (get_user(segoffs, intr_ptr))
12593 goto cannot_handle; 12950 goto cannot_handle;
12594 if ((segoffs >> 16) == BIOSSEG) 12951 if ((segoffs >> 16) == BIOSSEG)
12595diff -urNp linux-2.6.32.8/arch/x86/kernel/vmi_32.c linux-2.6.32.8/arch/x86/kernel/vmi_32.c 12952diff -urNp linux-2.6.32.9/arch/x86/kernel/vmi_32.c linux-2.6.32.9/arch/x86/kernel/vmi_32.c
12596--- linux-2.6.32.8/arch/x86/kernel/vmi_32.c 2010-02-09 07:57:19.000000000 -0500 12953--- linux-2.6.32.9/arch/x86/kernel/vmi_32.c 2010-02-09 07:57:19.000000000 -0500
12597+++ linux-2.6.32.8/arch/x86/kernel/vmi_32.c 2010-02-13 21:45:09.947770893 -0500 12954+++ linux-2.6.32.9/arch/x86/kernel/vmi_32.c 2010-02-23 17:09:53.123619300 -0500
12598@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) 12955@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
12599 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); 12956 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
12600 12957
@@ -12754,9 +13111,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/vmi_32.c linux-2.6.32.8/arch/x86/kerne
12754 return; 13111 return;
12755 13112
12756 local_irq_save(flags); 13113 local_irq_save(flags);
12757diff -urNp linux-2.6.32.8/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.8/arch/x86/kernel/vmlinux.lds.S 13114diff -urNp linux-2.6.32.9/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.9/arch/x86/kernel/vmlinux.lds.S
12758--- linux-2.6.32.8/arch/x86/kernel/vmlinux.lds.S 2010-02-09 07:57:19.000000000 -0500 13115--- linux-2.6.32.9/arch/x86/kernel/vmlinux.lds.S 2010-02-09 07:57:19.000000000 -0500
12759+++ linux-2.6.32.8/arch/x86/kernel/vmlinux.lds.S 2010-02-13 21:45:09.948909328 -0500 13116+++ linux-2.6.32.9/arch/x86/kernel/vmlinux.lds.S 2010-02-23 17:09:53.127681323 -0500
12760@@ -26,6 +26,22 @@ 13117@@ -26,6 +26,22 @@
12761 #include <asm/page_types.h> 13118 #include <asm/page_types.h>
12762 #include <asm/cache.h> 13119 #include <asm/cache.h>
@@ -12886,7 +13243,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.8/arch/x86/
12886+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES) 13243+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES)
12887+ MODULES_EXEC_VADDR = .; 13244+ MODULES_EXEC_VADDR = .;
12888+ BYTE(0) 13245+ BYTE(0)
12889+ . += (8 * 1024 * 1024); 13246+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
12890+ . = ALIGN(PMD_SIZE); 13247+ . = ALIGN(PMD_SIZE);
12891+ MODULES_EXEC_END = . - 1; 13248+ MODULES_EXEC_END = . - 1;
12892+#endif 13249+#endif
@@ -13044,9 +13401,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.8/arch/x86/
13044 "kernel image bigger than KERNEL_IMAGE_SIZE"); 13401 "kernel image bigger than KERNEL_IMAGE_SIZE");
13045 13402
13046 #ifdef CONFIG_SMP 13403 #ifdef CONFIG_SMP
13047diff -urNp linux-2.6.32.8/arch/x86/kernel/vsyscall_64.c linux-2.6.32.8/arch/x86/kernel/vsyscall_64.c 13404diff -urNp linux-2.6.32.9/arch/x86/kernel/vsyscall_64.c linux-2.6.32.9/arch/x86/kernel/vsyscall_64.c
13048--- linux-2.6.32.8/arch/x86/kernel/vsyscall_64.c 2010-02-09 07:57:19.000000000 -0500 13405--- linux-2.6.32.9/arch/x86/kernel/vsyscall_64.c 2010-02-09 07:57:19.000000000 -0500
13049+++ linux-2.6.32.8/arch/x86/kernel/vsyscall_64.c 2010-02-13 21:45:09.948909328 -0500 13406+++ linux-2.6.32.9/arch/x86/kernel/vsyscall_64.c 2010-02-23 17:09:53.127681323 -0500
13050@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa 13407@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa
13051 13408
13052 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); 13409 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -13080,9 +13437,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/vsyscall_64.c linux-2.6.32.8/arch/x86/
13080 }; 13437 };
13081 #endif 13438 #endif
13082 13439
13083diff -urNp linux-2.6.32.8/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.8/arch/x86/kernel/x8664_ksyms_64.c 13440diff -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
13084--- linux-2.6.32.8/arch/x86/kernel/x8664_ksyms_64.c 2010-02-09 07:57:19.000000000 -0500 13441--- linux-2.6.32.9/arch/x86/kernel/x8664_ksyms_64.c 2010-02-09 07:57:19.000000000 -0500
13085+++ linux-2.6.32.8/arch/x86/kernel/x8664_ksyms_64.c 2010-02-13 21:45:09.948909328 -0500 13442+++ linux-2.6.32.9/arch/x86/kernel/x8664_ksyms_64.c 2010-02-23 17:09:53.127681323 -0500
13086@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); 13443@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
13087 13444
13088 EXPORT_SYMBOL(copy_user_generic); 13445 EXPORT_SYMBOL(copy_user_generic);
@@ -13092,9 +13449,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.8/arch/x
13092 EXPORT_SYMBOL(__copy_from_user_inatomic); 13449 EXPORT_SYMBOL(__copy_from_user_inatomic);
13093 13450
13094 EXPORT_SYMBOL(copy_page); 13451 EXPORT_SYMBOL(copy_page);
13095diff -urNp linux-2.6.32.8/arch/x86/kernel/xsave.c linux-2.6.32.8/arch/x86/kernel/xsave.c 13452diff -urNp linux-2.6.32.9/arch/x86/kernel/xsave.c linux-2.6.32.9/arch/x86/kernel/xsave.c
13096--- linux-2.6.32.8/arch/x86/kernel/xsave.c 2010-02-09 07:57:19.000000000 -0500 13453--- linux-2.6.32.9/arch/x86/kernel/xsave.c 2010-02-09 07:57:19.000000000 -0500
13097+++ linux-2.6.32.8/arch/x86/kernel/xsave.c 2010-02-13 21:45:09.948909328 -0500 13454+++ linux-2.6.32.9/arch/x86/kernel/xsave.c 2010-02-23 17:09:53.127681323 -0500
13098@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ 13455@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
13099 fx_sw_user->xstate_size > fx_sw_user->extended_size) 13456 fx_sw_user->xstate_size > fx_sw_user->extended_size)
13100 return -1; 13457 return -1;
@@ -13122,9 +13479,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kernel/xsave.c linux-2.6.32.8/arch/x86/kernel
13122 buf); 13479 buf);
13123 if (unlikely(err)) { 13480 if (unlikely(err)) {
13124 /* 13481 /*
13125diff -urNp linux-2.6.32.8/arch/x86/kvm/emulate.c linux-2.6.32.8/arch/x86/kvm/emulate.c 13482diff -urNp linux-2.6.32.9/arch/x86/kvm/emulate.c linux-2.6.32.9/arch/x86/kvm/emulate.c
13126--- linux-2.6.32.8/arch/x86/kvm/emulate.c 2010-02-09 07:57:19.000000000 -0500 13483--- linux-2.6.32.9/arch/x86/kvm/emulate.c 2010-02-09 07:57:19.000000000 -0500
13127+++ linux-2.6.32.8/arch/x86/kvm/emulate.c 2010-02-13 21:45:09.949559591 -0500 13484+++ linux-2.6.32.9/arch/x86/kvm/emulate.c 2010-02-23 17:09:53.127681323 -0500
13128@@ -389,6 +389,7 @@ static u32 group2_table[] = { 13485@@ -389,6 +389,7 @@ static u32 group2_table[] = {
13129 13486
13130 #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \ 13487 #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \
@@ -13150,9 +13507,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kvm/emulate.c linux-2.6.32.8/arch/x86/kvm/emu
13150 switch ((_dst).bytes) { \ 13507 switch ((_dst).bytes) { \
13151 case 1: \ 13508 case 1: \
13152 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ 13509 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
13153diff -urNp linux-2.6.32.8/arch/x86/kvm/svm.c linux-2.6.32.8/arch/x86/kvm/svm.c 13510diff -urNp linux-2.6.32.9/arch/x86/kvm/svm.c linux-2.6.32.9/arch/x86/kvm/svm.c
13154--- linux-2.6.32.8/arch/x86/kvm/svm.c 2010-02-09 07:57:19.000000000 -0500 13511--- linux-2.6.32.9/arch/x86/kvm/svm.c 2010-02-09 07:57:19.000000000 -0500
13155+++ linux-2.6.32.8/arch/x86/kvm/svm.c 2010-02-13 21:45:09.949559591 -0500 13512+++ linux-2.6.32.9/arch/x86/kvm/svm.c 2010-02-23 17:09:53.127681323 -0500
13156@@ -2389,9 +2389,12 @@ static int handle_exit(struct kvm_run *k 13513@@ -2389,9 +2389,12 @@ static int handle_exit(struct kvm_run *k
13157 static void reload_tss(struct kvm_vcpu *vcpu) 13514 static void reload_tss(struct kvm_vcpu *vcpu)
13158 { 13515 {
@@ -13176,9 +13533,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kvm/svm.c linux-2.6.32.8/arch/x86/kvm/svm.c
13176 .cpu_has_kvm_support = has_svm, 13533 .cpu_has_kvm_support = has_svm,
13177 .disabled_by_bios = is_disabled, 13534 .disabled_by_bios = is_disabled,
13178 .hardware_setup = svm_hardware_setup, 13535 .hardware_setup = svm_hardware_setup,
13179diff -urNp linux-2.6.32.8/arch/x86/kvm/vmx.c linux-2.6.32.8/arch/x86/kvm/vmx.c 13536diff -urNp linux-2.6.32.9/arch/x86/kvm/vmx.c linux-2.6.32.9/arch/x86/kvm/vmx.c
13180--- linux-2.6.32.8/arch/x86/kvm/vmx.c 2010-02-09 07:57:19.000000000 -0500 13537--- linux-2.6.32.9/arch/x86/kvm/vmx.c 2010-02-09 07:57:19.000000000 -0500
13181+++ linux-2.6.32.8/arch/x86/kvm/vmx.c 2010-02-13 21:45:09.950839132 -0500 13538+++ linux-2.6.32.9/arch/x86/kvm/vmx.c 2010-02-23 17:09:53.127681323 -0500
13182@@ -566,7 +566,11 @@ static void reload_tss(void) 13539@@ -566,7 +566,11 @@ static void reload_tss(void)
13183 13540
13184 kvm_get_gdt(&gdt); 13541 kvm_get_gdt(&gdt);
@@ -13257,9 +13614,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kvm/vmx.c linux-2.6.32.8/arch/x86/kvm/vmx.c
13257 .cpu_has_kvm_support = cpu_has_kvm_support, 13614 .cpu_has_kvm_support = cpu_has_kvm_support,
13258 .disabled_by_bios = vmx_disabled_by_bios, 13615 .disabled_by_bios = vmx_disabled_by_bios,
13259 .hardware_setup = hardware_setup, 13616 .hardware_setup = hardware_setup,
13260diff -urNp linux-2.6.32.8/arch/x86/kvm/x86.c linux-2.6.32.8/arch/x86/kvm/x86.c 13617diff -urNp linux-2.6.32.9/arch/x86/kvm/x86.c linux-2.6.32.9/arch/x86/kvm/x86.c
13261--- linux-2.6.32.8/arch/x86/kvm/x86.c 2010-02-09 07:57:19.000000000 -0500 13618--- linux-2.6.32.9/arch/x86/kvm/x86.c 2010-02-23 17:04:11.867584476 -0500
13262+++ linux-2.6.32.8/arch/x86/kvm/x86.c 2010-02-13 21:45:09.951822983 -0500 13619+++ linux-2.6.32.9/arch/x86/kvm/x86.c 2010-02-23 17:09:53.127681323 -0500
13263@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct 13620@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct
13264 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, 13621 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
13265 struct kvm_cpuid_entry2 __user *entries); 13622 struct kvm_cpuid_entry2 __user *entries);
@@ -13339,7 +13696,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kvm/x86.c linux-2.6.32.8/arch/x86/kvm/x86.c
13339 { NULL } 13696 { NULL }
13340 }; 13697 };
13341 13698
13342@@ -1659,7 +1659,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru 13699@@ -1658,7 +1658,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
13343 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, 13700 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
13344 struct kvm_interrupt *irq) 13701 struct kvm_interrupt *irq)
13345 { 13702 {
@@ -13348,7 +13705,7 @@ diff -urNp linux-2.6.32.8/arch/x86/kvm/x86.c linux-2.6.32.8/arch/x86/kvm/x86.c
13348 return -EINVAL; 13705 return -EINVAL;
13349 if (irqchip_in_kernel(vcpu->kvm)) 13706 if (irqchip_in_kernel(vcpu->kvm))
13350 return -ENXIO; 13707 return -ENXIO;
13351@@ -3171,10 +3171,10 @@ static struct notifier_block kvmclock_cp 13708@@ -3170,10 +3170,10 @@ static struct notifier_block kvmclock_cp
13352 .notifier_call = kvmclock_cpufreq_notifier 13709 .notifier_call = kvmclock_cpufreq_notifier
13353 }; 13710 };
13354 13711
@@ -13361,9 +13718,9 @@ diff -urNp linux-2.6.32.8/arch/x86/kvm/x86.c linux-2.6.32.8/arch/x86/kvm/x86.c
13361 13718
13362 if (kvm_x86_ops) { 13719 if (kvm_x86_ops) {
13363 printk(KERN_ERR "kvm: already loaded the other module\n"); 13720 printk(KERN_ERR "kvm: already loaded the other module\n");
13364diff -urNp linux-2.6.32.8/arch/x86/lib/checksum_32.S linux-2.6.32.8/arch/x86/lib/checksum_32.S 13721diff -urNp linux-2.6.32.9/arch/x86/lib/checksum_32.S linux-2.6.32.9/arch/x86/lib/checksum_32.S
13365--- linux-2.6.32.8/arch/x86/lib/checksum_32.S 2010-02-09 07:57:19.000000000 -0500 13722--- linux-2.6.32.9/arch/x86/lib/checksum_32.S 2010-02-09 07:57:19.000000000 -0500
13366+++ linux-2.6.32.8/arch/x86/lib/checksum_32.S 2010-02-13 21:45:09.952704205 -0500 13723+++ linux-2.6.32.9/arch/x86/lib/checksum_32.S 2010-02-23 17:09:53.127681323 -0500
13367@@ -28,7 +28,8 @@ 13724@@ -28,7 +28,8 @@
13368 #include <linux/linkage.h> 13725 #include <linux/linkage.h>
13369 #include <asm/dwarf2.h> 13726 #include <asm/dwarf2.h>
@@ -13609,9 +13966,9 @@ diff -urNp linux-2.6.32.8/arch/x86/lib/checksum_32.S linux-2.6.32.8/arch/x86/lib
13609 13966
13610 #undef ROUND 13967 #undef ROUND
13611 #undef ROUND1 13968 #undef ROUND1
13612diff -urNp linux-2.6.32.8/arch/x86/lib/clear_page_64.S linux-2.6.32.8/arch/x86/lib/clear_page_64.S 13969diff -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
13613--- linux-2.6.32.8/arch/x86/lib/clear_page_64.S 2010-02-09 07:57:19.000000000 -0500 13970--- linux-2.6.32.9/arch/x86/lib/clear_page_64.S 2010-02-09 07:57:19.000000000 -0500
13614+++ linux-2.6.32.8/arch/x86/lib/clear_page_64.S 2010-02-13 21:45:09.952704205 -0500 13971+++ linux-2.6.32.9/arch/x86/lib/clear_page_64.S 2010-02-23 17:09:53.127681323 -0500
13615@@ -43,7 +43,7 @@ ENDPROC(clear_page) 13972@@ -43,7 +43,7 @@ ENDPROC(clear_page)
13616 13973
13617 #include <asm/cpufeature.h> 13974 #include <asm/cpufeature.h>
@@ -13621,9 +13978,9 @@ diff -urNp linux-2.6.32.8/arch/x86/lib/clear_page_64.S linux-2.6.32.8/arch/x86/l
13621 1: .byte 0xeb /* jmp <disp8> */ 13978 1: .byte 0xeb /* jmp <disp8> */
13622 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 13979 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
13623 2: 13980 2:
13624diff -urNp linux-2.6.32.8/arch/x86/lib/copy_page_64.S linux-2.6.32.8/arch/x86/lib/copy_page_64.S 13981diff -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
13625--- linux-2.6.32.8/arch/x86/lib/copy_page_64.S 2010-02-09 07:57:19.000000000 -0500 13982--- linux-2.6.32.9/arch/x86/lib/copy_page_64.S 2010-02-09 07:57:19.000000000 -0500
13626+++ linux-2.6.32.8/arch/x86/lib/copy_page_64.S 2010-02-13 21:45:09.952704205 -0500 13983+++ linux-2.6.32.9/arch/x86/lib/copy_page_64.S 2010-02-23 17:09:53.127681323 -0500
13627@@ -104,7 +104,7 @@ ENDPROC(copy_page) 13984@@ -104,7 +104,7 @@ ENDPROC(copy_page)
13628 13985
13629 #include <asm/cpufeature.h> 13986 #include <asm/cpufeature.h>
@@ -13633,9 +13990,9 @@ diff -urNp linux-2.6.32.8/arch/x86/lib/copy_page_64.S linux-2.6.32.8/arch/x86/li
13633 1: .byte 0xeb /* jmp <disp8> */ 13990 1: .byte 0xeb /* jmp <disp8> */
13634 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 13991 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
13635 2: 13992 2:
13636diff -urNp linux-2.6.32.8/arch/x86/lib/copy_user_64.S linux-2.6.32.8/arch/x86/lib/copy_user_64.S 13993diff -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
13637--- linux-2.6.32.8/arch/x86/lib/copy_user_64.S 2010-02-09 07:57:19.000000000 -0500 13994--- linux-2.6.32.9/arch/x86/lib/copy_user_64.S 2010-02-09 07:57:19.000000000 -0500
13638+++ linux-2.6.32.8/arch/x86/lib/copy_user_64.S 2010-02-13 21:45:09.952704205 -0500 13995+++ linux-2.6.32.9/arch/x86/lib/copy_user_64.S 2010-02-23 17:09:53.127681323 -0500
13639@@ -21,7 +21,7 @@ 13996@@ -21,7 +21,7 @@
13640 .byte 0xe9 /* 32bit jump */ 13997 .byte 0xe9 /* 32bit jump */
13641 .long \orig-1f /* by default jump to orig */ 13998 .long \orig-1f /* by default jump to orig */
@@ -13687,9 +14044,9 @@ diff -urNp linux-2.6.32.8/arch/x86/lib/copy_user_64.S linux-2.6.32.8/arch/x86/li
13687 movl %edx,%ecx 14044 movl %edx,%ecx
13688 xorl %eax,%eax 14045 xorl %eax,%eax
13689 rep 14046 rep
13690diff -urNp linux-2.6.32.8/arch/x86/lib/getuser.S linux-2.6.32.8/arch/x86/lib/getuser.S 14047diff -urNp linux-2.6.32.9/arch/x86/lib/getuser.S linux-2.6.32.9/arch/x86/lib/getuser.S
13691--- linux-2.6.32.8/arch/x86/lib/getuser.S 2010-02-09 07:57:19.000000000 -0500 14048--- linux-2.6.32.9/arch/x86/lib/getuser.S 2010-02-09 07:57:19.000000000 -0500
13692+++ linux-2.6.32.8/arch/x86/lib/getuser.S 2010-02-13 21:45:09.952704205 -0500 14049+++ linux-2.6.32.9/arch/x86/lib/getuser.S 2010-02-23 17:09:53.127681323 -0500
13693@@ -33,14 +33,28 @@ 14050@@ -33,14 +33,28 @@
13694 #include <asm/asm-offsets.h> 14051 #include <asm/asm-offsets.h>
13695 #include <asm/thread_info.h> 14052 #include <asm/thread_info.h>
@@ -13782,9 +14139,9 @@ diff -urNp linux-2.6.32.8/arch/x86/lib/getuser.S linux-2.6.32.8/arch/x86/lib/get
13782 xor %edx,%edx 14139 xor %edx,%edx
13783 mov $(-EFAULT),%_ASM_AX 14140 mov $(-EFAULT),%_ASM_AX
13784 ret 14141 ret
13785diff -urNp linux-2.6.32.8/arch/x86/lib/memcpy_64.S linux-2.6.32.8/arch/x86/lib/memcpy_64.S 14142diff -urNp linux-2.6.32.9/arch/x86/lib/memcpy_64.S linux-2.6.32.9/arch/x86/lib/memcpy_64.S
13786--- linux-2.6.32.8/arch/x86/lib/memcpy_64.S 2010-02-09 07:57:19.000000000 -0500 14143--- linux-2.6.32.9/arch/x86/lib/memcpy_64.S 2010-02-09 07:57:19.000000000 -0500
13787+++ linux-2.6.32.8/arch/x86/lib/memcpy_64.S 2010-02-13 21:45:09.952704205 -0500 14144+++ linux-2.6.32.9/arch/x86/lib/memcpy_64.S 2010-02-23 17:09:53.127681323 -0500
13788@@ -128,7 +128,7 @@ ENDPROC(__memcpy) 14145@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
13789 * It is also a lot simpler. Use this when possible: 14146 * It is also a lot simpler. Use this when possible:
13790 */ 14147 */
@@ -13794,9 +14151,9 @@ diff -urNp linux-2.6.32.8/arch/x86/lib/memcpy_64.S linux-2.6.32.8/arch/x86/lib/m
13794 1: .byte 0xeb /* jmp <disp8> */ 14151 1: .byte 0xeb /* jmp <disp8> */
13795 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 14152 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
13796 2: 14153 2:
13797diff -urNp linux-2.6.32.8/arch/x86/lib/memset_64.S linux-2.6.32.8/arch/x86/lib/memset_64.S 14154diff -urNp linux-2.6.32.9/arch/x86/lib/memset_64.S linux-2.6.32.9/arch/x86/lib/memset_64.S
13798--- linux-2.6.32.8/arch/x86/lib/memset_64.S 2010-02-09 07:57:19.000000000 -0500 14155--- linux-2.6.32.9/arch/x86/lib/memset_64.S 2010-02-09 07:57:19.000000000 -0500
13799+++ linux-2.6.32.8/arch/x86/lib/memset_64.S 2010-02-13 21:45:09.952704205 -0500 14156+++ linux-2.6.32.9/arch/x86/lib/memset_64.S 2010-02-23 17:09:53.127681323 -0500
13800@@ -118,7 +118,7 @@ ENDPROC(__memset) 14157@@ -118,7 +118,7 @@ ENDPROC(__memset)
13801 14158
13802 #include <asm/cpufeature.h> 14159 #include <asm/cpufeature.h>
@@ -13806,9 +14163,9 @@ diff -urNp linux-2.6.32.8/arch/x86/lib/memset_64.S linux-2.6.32.8/arch/x86/lib/m
13806 1: .byte 0xeb /* jmp <disp8> */ 14163 1: .byte 0xeb /* jmp <disp8> */
13807 .byte (memset_c - memset) - (2f - 1b) /* offset */ 14164 .byte (memset_c - memset) - (2f - 1b) /* offset */
13808 2: 14165 2:
13809diff -urNp linux-2.6.32.8/arch/x86/lib/mmx_32.c linux-2.6.32.8/arch/x86/lib/mmx_32.c 14166diff -urNp linux-2.6.32.9/arch/x86/lib/mmx_32.c linux-2.6.32.9/arch/x86/lib/mmx_32.c
13810--- linux-2.6.32.8/arch/x86/lib/mmx_32.c 2010-02-09 07:57:19.000000000 -0500 14167--- linux-2.6.32.9/arch/x86/lib/mmx_32.c 2010-02-09 07:57:19.000000000 -0500
13811+++ linux-2.6.32.8/arch/x86/lib/mmx_32.c 2010-02-13 21:45:09.953906564 -0500 14168+++ linux-2.6.32.9/arch/x86/lib/mmx_32.c 2010-02-23 17:09:53.127681323 -0500
13812@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * 14169@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
13813 { 14170 {
13814 void *p; 14171 void *p;
@@ -14124,9 +14481,9 @@ diff -urNp linux-2.6.32.8/arch/x86/lib/mmx_32.c linux-2.6.32.8/arch/x86/lib/mmx_
14124 14481
14125 from += 64; 14482 from += 64;
14126 to += 64; 14483 to += 64;
14127diff -urNp linux-2.6.32.8/arch/x86/lib/putuser.S linux-2.6.32.8/arch/x86/lib/putuser.S 14484diff -urNp linux-2.6.32.9/arch/x86/lib/putuser.S linux-2.6.32.9/arch/x86/lib/putuser.S
14128--- linux-2.6.32.8/arch/x86/lib/putuser.S 2010-02-09 07:57:19.000000000 -0500 14485--- linux-2.6.32.9/arch/x86/lib/putuser.S 2010-02-09 07:57:19.000000000 -0500
14129+++ linux-2.6.32.8/arch/x86/lib/putuser.S 2010-02-13 21:45:09.953906564 -0500 14486+++ linux-2.6.32.9/arch/x86/lib/putuser.S 2010-02-23 17:09:53.127681323 -0500
14130@@ -15,6 +15,7 @@ 14487@@ -15,6 +15,7 @@
14131 #include <asm/thread_info.h> 14488 #include <asm/thread_info.h>
14132 #include <asm/errno.h> 14489 #include <asm/errno.h>
@@ -14230,9 +14587,9 @@ diff -urNp linux-2.6.32.8/arch/x86/lib/putuser.S linux-2.6.32.8/arch/x86/lib/put
14230 movl $-EFAULT,%eax 14587 movl $-EFAULT,%eax
14231 EXIT 14588 EXIT
14232 END(bad_put_user) 14589 END(bad_put_user)
14233diff -urNp linux-2.6.32.8/arch/x86/lib/usercopy_32.c linux-2.6.32.8/arch/x86/lib/usercopy_32.c 14590diff -urNp linux-2.6.32.9/arch/x86/lib/usercopy_32.c linux-2.6.32.9/arch/x86/lib/usercopy_32.c
14234--- linux-2.6.32.8/arch/x86/lib/usercopy_32.c 2010-02-09 07:57:19.000000000 -0500 14591--- linux-2.6.32.9/arch/x86/lib/usercopy_32.c 2010-02-09 07:57:19.000000000 -0500
14235+++ linux-2.6.32.8/arch/x86/lib/usercopy_32.c 2010-02-13 21:45:09.954603773 -0500 14592+++ linux-2.6.32.9/arch/x86/lib/usercopy_32.c 2010-02-23 17:09:53.132248096 -0500
14236@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned 14593@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
14237 * Copy a null terminated string from userspace. 14594 * Copy a null terminated string from userspace.
14238 */ 14595 */
@@ -15201,9 +15558,9 @@ diff -urNp linux-2.6.32.8/arch/x86/lib/usercopy_32.c linux-2.6.32.8/arch/x86/lib
15201+#endif 15558+#endif
15202+ 15559+
15203+EXPORT_SYMBOL(set_fs); 15560+EXPORT_SYMBOL(set_fs);
15204diff -urNp linux-2.6.32.8/arch/x86/Makefile linux-2.6.32.8/arch/x86/Makefile 15561diff -urNp linux-2.6.32.9/arch/x86/Makefile linux-2.6.32.9/arch/x86/Makefile
15205--- linux-2.6.32.8/arch/x86/Makefile 2010-02-09 07:57:19.000000000 -0500 15562--- linux-2.6.32.9/arch/x86/Makefile 2010-02-09 07:57:19.000000000 -0500
15206+++ linux-2.6.32.8/arch/x86/Makefile 2010-02-13 21:45:09.954603773 -0500 15563+++ linux-2.6.32.9/arch/x86/Makefile 2010-02-23 17:09:53.132248096 -0500
15207@@ -189,3 +189,12 @@ define archhelp 15564@@ -189,3 +189,12 @@ define archhelp
15208 echo ' FDARGS="..." arguments for the booted kernel' 15565 echo ' FDARGS="..." arguments for the booted kernel'
15209 echo ' FDINITRD=file initrd for the booted kernel' 15566 echo ' FDINITRD=file initrd for the booted kernel'
@@ -15217,9 +15574,9 @@ diff -urNp linux-2.6.32.8/arch/x86/Makefile linux-2.6.32.8/arch/x86/Makefile
15217+ 15574+
15218+archprepare: 15575+archprepare:
15219+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) 15576+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
15220diff -urNp linux-2.6.32.8/arch/x86/mm/extable.c linux-2.6.32.8/arch/x86/mm/extable.c 15577diff -urNp linux-2.6.32.9/arch/x86/mm/extable.c linux-2.6.32.9/arch/x86/mm/extable.c
15221--- linux-2.6.32.8/arch/x86/mm/extable.c 2010-02-09 07:57:19.000000000 -0500 15578--- linux-2.6.32.9/arch/x86/mm/extable.c 2010-02-09 07:57:19.000000000 -0500
15222+++ linux-2.6.32.8/arch/x86/mm/extable.c 2010-02-13 21:45:09.954603773 -0500 15579+++ linux-2.6.32.9/arch/x86/mm/extable.c 2010-02-23 17:09:53.132248096 -0500
15223@@ -1,14 +1,71 @@ 15580@@ -1,14 +1,71 @@
15224 #include <linux/module.h> 15581 #include <linux/module.h>
15225 #include <linux/spinlock.h> 15582 #include <linux/spinlock.h>
@@ -15293,9 +15650,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/extable.c linux-2.6.32.8/arch/x86/mm/extab
15293 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; 15650 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
15294 extern u32 pnp_bios_is_utter_crap; 15651 extern u32 pnp_bios_is_utter_crap;
15295 pnp_bios_is_utter_crap = 1; 15652 pnp_bios_is_utter_crap = 1;
15296diff -urNp linux-2.6.32.8/arch/x86/mm/fault.c linux-2.6.32.8/arch/x86/mm/fault.c 15653diff -urNp linux-2.6.32.9/arch/x86/mm/fault.c linux-2.6.32.9/arch/x86/mm/fault.c
15297--- linux-2.6.32.8/arch/x86/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 15654--- linux-2.6.32.9/arch/x86/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
15298+++ linux-2.6.32.8/arch/x86/mm/fault.c 2010-02-13 21:45:09.955769141 -0500 15655+++ linux-2.6.32.9/arch/x86/mm/fault.c 2010-02-23 17:09:53.132248096 -0500
15299@@ -11,10 +11,14 @@ 15656@@ -11,10 +11,14 @@
15300 #include <linux/kprobes.h> /* __kprobes, ... */ 15657 #include <linux/kprobes.h> /* __kprobes, ... */
15301 #include <linux/mmiotrace.h> /* kmmio_handler, ... */ 15658 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
@@ -15862,9 +16219,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/fault.c linux-2.6.32.8/arch/x86/mm/fault.c
15862+ 16219+
15863+ return ret ? -EFAULT : 0; 16220+ return ret ? -EFAULT : 0;
15864+} 16221+}
15865diff -urNp linux-2.6.32.8/arch/x86/mm/gup.c linux-2.6.32.8/arch/x86/mm/gup.c 16222diff -urNp linux-2.6.32.9/arch/x86/mm/gup.c linux-2.6.32.9/arch/x86/mm/gup.c
15866--- linux-2.6.32.8/arch/x86/mm/gup.c 2010-02-09 07:57:19.000000000 -0500 16223--- linux-2.6.32.9/arch/x86/mm/gup.c 2010-02-09 07:57:19.000000000 -0500
15867+++ linux-2.6.32.8/arch/x86/mm/gup.c 2010-02-13 21:45:09.955769141 -0500 16224+++ linux-2.6.32.9/arch/x86/mm/gup.c 2010-02-23 17:09:53.132248096 -0500
15868@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long 16225@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
15869 addr = start; 16226 addr = start;
15870 len = (unsigned long) nr_pages << PAGE_SHIFT; 16227 len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -15874,9 +16231,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/gup.c linux-2.6.32.8/arch/x86/mm/gup.c
15874 (void __user *)start, len))) 16231 (void __user *)start, len)))
15875 return 0; 16232 return 0;
15876 16233
15877diff -urNp linux-2.6.32.8/arch/x86/mm/highmem_32.c linux-2.6.32.8/arch/x86/mm/highmem_32.c 16234diff -urNp linux-2.6.32.9/arch/x86/mm/highmem_32.c linux-2.6.32.9/arch/x86/mm/highmem_32.c
15878--- linux-2.6.32.8/arch/x86/mm/highmem_32.c 2010-02-09 07:57:19.000000000 -0500 16235--- linux-2.6.32.9/arch/x86/mm/highmem_32.c 2010-02-09 07:57:19.000000000 -0500
15879+++ linux-2.6.32.8/arch/x86/mm/highmem_32.c 2010-02-13 21:45:09.955769141 -0500 16236+++ linux-2.6.32.9/arch/x86/mm/highmem_32.c 2010-02-23 17:09:53.132248096 -0500
15880@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page 16237@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
15881 idx = type + KM_TYPE_NR*smp_processor_id(); 16238 idx = type + KM_TYPE_NR*smp_processor_id();
15882 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); 16239 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -15888,9 +16245,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/highmem_32.c linux-2.6.32.8/arch/x86/mm/hi
15888 16245
15889 return (void *)vaddr; 16246 return (void *)vaddr;
15890 } 16247 }
15891diff -urNp linux-2.6.32.8/arch/x86/mm/hugetlbpage.c linux-2.6.32.8/arch/x86/mm/hugetlbpage.c 16248diff -urNp linux-2.6.32.9/arch/x86/mm/hugetlbpage.c linux-2.6.32.9/arch/x86/mm/hugetlbpage.c
15892--- linux-2.6.32.8/arch/x86/mm/hugetlbpage.c 2010-02-09 07:57:19.000000000 -0500 16249--- linux-2.6.32.9/arch/x86/mm/hugetlbpage.c 2010-02-09 07:57:19.000000000 -0500
15893+++ linux-2.6.32.8/arch/x86/mm/hugetlbpage.c 2010-02-13 21:45:09.956759932 -0500 16250+++ linux-2.6.32.9/arch/x86/mm/hugetlbpage.c 2010-02-23 17:09:53.132248096 -0500
15894@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe 16251@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe
15895 struct hstate *h = hstate_file(file); 16252 struct hstate *h = hstate_file(file);
15896 struct mm_struct *mm = current->mm; 16253 struct mm_struct *mm = current->mm;
@@ -16025,9 +16382,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/hugetlbpage.c linux-2.6.32.8/arch/x86/mm/h
16025 (!vma || addr + len <= vma->vm_start)) 16382 (!vma || addr + len <= vma->vm_start))
16026 return addr; 16383 return addr;
16027 } 16384 }
16028diff -urNp linux-2.6.32.8/arch/x86/mm/init_32.c linux-2.6.32.8/arch/x86/mm/init_32.c 16385diff -urNp linux-2.6.32.9/arch/x86/mm/init_32.c linux-2.6.32.9/arch/x86/mm/init_32.c
16029--- linux-2.6.32.8/arch/x86/mm/init_32.c 2010-02-09 07:57:19.000000000 -0500 16386--- linux-2.6.32.9/arch/x86/mm/init_32.c 2010-02-09 07:57:19.000000000 -0500
16030+++ linux-2.6.32.8/arch/x86/mm/init_32.c 2010-02-13 21:45:09.956759932 -0500 16387+++ linux-2.6.32.9/arch/x86/mm/init_32.c 2010-02-23 17:09:53.132248096 -0500
16031@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) 16388@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
16032 } 16389 }
16033 16390
@@ -16309,9 +16666,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/init_32.c linux-2.6.32.8/arch/x86/mm/init_
16309 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); 16666 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
16310 printk(KERN_INFO "Write protecting the kernel text: %luk\n", 16667 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
16311 size >> 10); 16668 size >> 10);
16312diff -urNp linux-2.6.32.8/arch/x86/mm/init_64.c linux-2.6.32.8/arch/x86/mm/init_64.c 16669diff -urNp linux-2.6.32.9/arch/x86/mm/init_64.c linux-2.6.32.9/arch/x86/mm/init_64.c
16313--- linux-2.6.32.8/arch/x86/mm/init_64.c 2010-02-09 07:57:19.000000000 -0500 16670--- linux-2.6.32.9/arch/x86/mm/init_64.c 2010-02-09 07:57:19.000000000 -0500
16314+++ linux-2.6.32.8/arch/x86/mm/init_64.c 2010-02-13 21:45:09.956759932 -0500 16671+++ linux-2.6.32.9/arch/x86/mm/init_64.c 2010-02-23 17:09:53.132248096 -0500
16315@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 16672@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
16316 pmd = fill_pmd(pud, vaddr); 16673 pmd = fill_pmd(pud, vaddr);
16317 pte = fill_pte(pmd, vaddr); 16674 pte = fill_pte(pmd, vaddr);
@@ -16359,9 +16716,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/init_64.c linux-2.6.32.8/arch/x86/mm/init_
16359 return "[vdso]"; 16716 return "[vdso]";
16360 if (vma == &gate_vma) 16717 if (vma == &gate_vma)
16361 return "[vsyscall]"; 16718 return "[vsyscall]";
16362diff -urNp linux-2.6.32.8/arch/x86/mm/init.c linux-2.6.32.8/arch/x86/mm/init.c 16719diff -urNp linux-2.6.32.9/arch/x86/mm/init.c linux-2.6.32.9/arch/x86/mm/init.c
16363--- linux-2.6.32.8/arch/x86/mm/init.c 2010-02-09 07:57:19.000000000 -0500 16720--- linux-2.6.32.9/arch/x86/mm/init.c 2010-02-09 07:57:19.000000000 -0500
16364+++ linux-2.6.32.8/arch/x86/mm/init.c 2010-02-13 21:45:09.956759932 -0500 16721+++ linux-2.6.32.9/arch/x86/mm/init.c 2010-02-23 17:09:53.132248096 -0500
16365@@ -331,7 +331,13 @@ unsigned long __init_refok init_memory_m 16722@@ -331,7 +331,13 @@ unsigned long __init_refok init_memory_m
16366 */ 16723 */
16367 int devmem_is_allowed(unsigned long pagenr) 16724 int devmem_is_allowed(unsigned long pagenr)
@@ -16461,9 +16818,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/init.c linux-2.6.32.8/arch/x86/mm/init.c
16461 free_init_pages("unused kernel memory", 16818 free_init_pages("unused kernel memory",
16462 (unsigned long)(&__init_begin), 16819 (unsigned long)(&__init_begin),
16463 (unsigned long)(&__init_end)); 16820 (unsigned long)(&__init_end));
16464diff -urNp linux-2.6.32.8/arch/x86/mm/iomap_32.c linux-2.6.32.8/arch/x86/mm/iomap_32.c 16821diff -urNp linux-2.6.32.9/arch/x86/mm/iomap_32.c linux-2.6.32.9/arch/x86/mm/iomap_32.c
16465--- linux-2.6.32.8/arch/x86/mm/iomap_32.c 2010-02-09 07:57:19.000000000 -0500 16822--- linux-2.6.32.9/arch/x86/mm/iomap_32.c 2010-02-09 07:57:19.000000000 -0500
16466+++ linux-2.6.32.8/arch/x86/mm/iomap_32.c 2010-02-13 21:45:09.957914582 -0500 16823+++ linux-2.6.32.9/arch/x86/mm/iomap_32.c 2010-02-23 17:09:53.132248096 -0500
16467@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long 16824@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
16468 debug_kmap_atomic(type); 16825 debug_kmap_atomic(type);
16469 idx = type + KM_TYPE_NR * smp_processor_id(); 16826 idx = type + KM_TYPE_NR * smp_processor_id();
@@ -16476,9 +16833,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/iomap_32.c linux-2.6.32.8/arch/x86/mm/ioma
16476 arch_flush_lazy_mmu_mode(); 16833 arch_flush_lazy_mmu_mode();
16477 16834
16478 return (void *)vaddr; 16835 return (void *)vaddr;
16479diff -urNp linux-2.6.32.8/arch/x86/mm/ioremap.c linux-2.6.32.8/arch/x86/mm/ioremap.c 16836diff -urNp linux-2.6.32.9/arch/x86/mm/ioremap.c linux-2.6.32.9/arch/x86/mm/ioremap.c
16480--- linux-2.6.32.8/arch/x86/mm/ioremap.c 2010-02-09 07:57:19.000000000 -0500 16837--- linux-2.6.32.9/arch/x86/mm/ioremap.c 2010-02-09 07:57:19.000000000 -0500
16481+++ linux-2.6.32.8/arch/x86/mm/ioremap.c 2010-02-13 21:45:09.957914582 -0500 16838+++ linux-2.6.32.9/arch/x86/mm/ioremap.c 2010-02-23 17:09:53.132248096 -0500
16482@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) 16839@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
16483 * Second special case: Some BIOSen report the PC BIOS 16840 * Second special case: Some BIOSen report the PC BIOS
16484 * area (640->1Mb) as ram even though it is not. 16841 * area (640->1Mb) as ram even though it is not.
@@ -16490,7 +16847,7 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/ioremap.c linux-2.6.32.8/arch/x86/mm/iorem
16490 return 0; 16847 return 0;
16491 16848
16492 for (i = 0; i < e820.nr_map; i++) { 16849 for (i = 0; i < e820.nr_map; i++) {
16493@@ -137,10 +137,7 @@ static void __iomem *__ioremap_caller(re 16850@@ -137,13 +137,10 @@ static void __iomem *__ioremap_caller(re
16494 /* 16851 /*
16495 * Don't allow anybody to remap normal RAM that we're using.. 16852 * Don't allow anybody to remap normal RAM that we're using..
16496 */ 16853 */
@@ -16501,7 +16858,11 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/ioremap.c linux-2.6.32.8/arch/x86/mm/iorem
16501+ for (pfn = phys_addr >> PAGE_SHIFT; ((resource_size_t)pfn << PAGE_SHIFT) < (last_addr & PAGE_MASK); pfn++) { 16858+ for (pfn = phys_addr >> PAGE_SHIFT; ((resource_size_t)pfn << PAGE_SHIFT) < (last_addr & PAGE_MASK); pfn++) {
16502 int is_ram = page_is_ram(pfn); 16859 int is_ram = page_is_ram(pfn);
16503 16860
16504 if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn))) 16861- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
16862+ if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
16863 return NULL;
16864 WARN_ON_ONCE(is_ram);
16865 }
16505@@ -407,7 +404,7 @@ static int __init early_ioremap_debug_se 16866@@ -407,7 +404,7 @@ static int __init early_ioremap_debug_se
16506 early_param("early_ioremap_debug", early_ioremap_debug_setup); 16867 early_param("early_ioremap_debug", early_ioremap_debug_setup);
16507 16868
@@ -16521,9 +16882,24 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/ioremap.c linux-2.6.32.8/arch/x86/mm/iorem
16521 16882
16522 /* 16883 /*
16523 * The boot-ioremap range spans multiple pmds, for which 16884 * The boot-ioremap range spans multiple pmds, for which
16524diff -urNp linux-2.6.32.8/arch/x86/mm/mmap.c linux-2.6.32.8/arch/x86/mm/mmap.c 16885diff -urNp linux-2.6.32.9/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.9/arch/x86/mm/kmemcheck/kmemcheck.c
16525--- linux-2.6.32.8/arch/x86/mm/mmap.c 2010-02-09 07:57:19.000000000 -0500 16886--- linux-2.6.32.9/arch/x86/mm/kmemcheck/kmemcheck.c 2010-02-09 07:57:19.000000000 -0500
16526+++ linux-2.6.32.8/arch/x86/mm/mmap.c 2010-02-13 21:45:09.957914582 -0500 16887+++ linux-2.6.32.9/arch/x86/mm/kmemcheck/kmemcheck.c 2010-02-23 17:09:53.132248096 -0500
16888@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
16889 * memory (e.g. tracked pages)? For now, we need this to avoid
16890 * invoking kmemcheck for PnP BIOS calls.
16891 */
16892- if (regs->flags & X86_VM_MASK)
16893+ if (v8086_mode(regs))
16894 return false;
16895- if (regs->cs != __KERNEL_CS)
16896+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
16897 return false;
16898
16899 pte = kmemcheck_pte_lookup(address);
16900diff -urNp linux-2.6.32.9/arch/x86/mm/mmap.c linux-2.6.32.9/arch/x86/mm/mmap.c
16901--- linux-2.6.32.9/arch/x86/mm/mmap.c 2010-02-09 07:57:19.000000000 -0500
16902+++ linux-2.6.32.9/arch/x86/mm/mmap.c 2010-02-23 17:09:53.132248096 -0500
16527@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size 16903@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
16528 * Leave an at least ~128 MB hole with possible stack randomization. 16904 * Leave an at least ~128 MB hole with possible stack randomization.
16529 */ 16905 */
@@ -16605,9 +16981,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/mmap.c linux-2.6.32.8/arch/x86/mm/mmap.c
16605 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 16981 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
16606 mm->unmap_area = arch_unmap_area_topdown; 16982 mm->unmap_area = arch_unmap_area_topdown;
16607 } 16983 }
16608diff -urNp linux-2.6.32.8/arch/x86/mm/numa_32.c linux-2.6.32.8/arch/x86/mm/numa_32.c 16984diff -urNp linux-2.6.32.9/arch/x86/mm/numa_32.c linux-2.6.32.9/arch/x86/mm/numa_32.c
16609--- linux-2.6.32.8/arch/x86/mm/numa_32.c 2010-02-09 07:57:19.000000000 -0500 16985--- linux-2.6.32.9/arch/x86/mm/numa_32.c 2010-02-09 07:57:19.000000000 -0500
16610+++ linux-2.6.32.8/arch/x86/mm/numa_32.c 2010-02-13 21:45:09.957914582 -0500 16986+++ linux-2.6.32.9/arch/x86/mm/numa_32.c 2010-02-23 17:09:53.136027747 -0500
16611@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int 16987@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
16612 } 16988 }
16613 #endif 16989 #endif
@@ -16616,9 +16992,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/numa_32.c linux-2.6.32.8/arch/x86/mm/numa_
16616 extern unsigned long highend_pfn, highstart_pfn; 16992 extern unsigned long highend_pfn, highstart_pfn;
16617 16993
16618 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) 16994 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
16619diff -urNp linux-2.6.32.8/arch/x86/mm/pageattr.c linux-2.6.32.8/arch/x86/mm/pageattr.c 16995diff -urNp linux-2.6.32.9/arch/x86/mm/pageattr.c linux-2.6.32.9/arch/x86/mm/pageattr.c
16620--- linux-2.6.32.8/arch/x86/mm/pageattr.c 2010-02-09 07:57:19.000000000 -0500 16996--- linux-2.6.32.9/arch/x86/mm/pageattr.c 2010-02-09 07:57:19.000000000 -0500
16621+++ linux-2.6.32.8/arch/x86/mm/pageattr.c 2010-02-13 21:45:09.957914582 -0500 16997+++ linux-2.6.32.9/arch/x86/mm/pageattr.c 2010-02-23 17:09:53.136027747 -0500
16622@@ -268,9 +268,10 @@ static inline pgprot_t static_protection 16998@@ -268,9 +268,10 @@ static inline pgprot_t static_protection
16623 * Does not cover __inittext since that is gone later on. On 16999 * Does not cover __inittext since that is gone later on. On
16624 * 64bit we do not enforce !NX on the low mapping 17000 * 64bit we do not enforce !NX on the low mapping
@@ -16650,9 +17026,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/pageattr.c linux-2.6.32.8/arch/x86/mm/page
16650 #ifdef CONFIG_X86_32 17026 #ifdef CONFIG_X86_32
16651 if (!SHARED_KERNEL_PMD) { 17027 if (!SHARED_KERNEL_PMD) {
16652 struct page *page; 17028 struct page *page;
16653diff -urNp linux-2.6.32.8/arch/x86/mm/pageattr-test.c linux-2.6.32.8/arch/x86/mm/pageattr-test.c 17029diff -urNp linux-2.6.32.9/arch/x86/mm/pageattr-test.c linux-2.6.32.9/arch/x86/mm/pageattr-test.c
16654--- linux-2.6.32.8/arch/x86/mm/pageattr-test.c 2010-02-09 07:57:19.000000000 -0500 17030--- linux-2.6.32.9/arch/x86/mm/pageattr-test.c 2010-02-09 07:57:19.000000000 -0500
16655+++ linux-2.6.32.8/arch/x86/mm/pageattr-test.c 2010-02-13 21:45:09.958914748 -0500 17031+++ linux-2.6.32.9/arch/x86/mm/pageattr-test.c 2010-02-23 17:09:53.136027747 -0500
16656@@ -36,7 +36,7 @@ enum { 17032@@ -36,7 +36,7 @@ enum {
16657 17033
16658 static int pte_testbit(pte_t pte) 17034 static int pte_testbit(pte_t pte)
@@ -16662,9 +17038,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/pageattr-test.c linux-2.6.32.8/arch/x86/mm
16662 } 17038 }
16663 17039
16664 struct split_state { 17040 struct split_state {
16665diff -urNp linux-2.6.32.8/arch/x86/mm/pat.c linux-2.6.32.8/arch/x86/mm/pat.c 17041diff -urNp linux-2.6.32.9/arch/x86/mm/pat.c linux-2.6.32.9/arch/x86/mm/pat.c
16666--- linux-2.6.32.8/arch/x86/mm/pat.c 2010-02-09 07:57:19.000000000 -0500 17042--- linux-2.6.32.9/arch/x86/mm/pat.c 2010-02-09 07:57:19.000000000 -0500
16667+++ linux-2.6.32.8/arch/x86/mm/pat.c 2010-02-13 21:45:09.958914748 -0500 17043+++ linux-2.6.32.9/arch/x86/mm/pat.c 2010-02-23 17:09:53.136027747 -0500
16668@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct 17044@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
16669 17045
16670 conflict: 17046 conflict:
@@ -16701,9 +17077,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/pat.c linux-2.6.32.8/arch/x86/mm/pat.c
16701 cattr_name(want_flags), 17077 cattr_name(want_flags),
16702 (unsigned long long)paddr, 17078 (unsigned long long)paddr,
16703 (unsigned long long)(paddr + size), 17079 (unsigned long long)(paddr + size),
16704diff -urNp linux-2.6.32.8/arch/x86/mm/pgtable_32.c linux-2.6.32.8/arch/x86/mm/pgtable_32.c 17080diff -urNp linux-2.6.32.9/arch/x86/mm/pgtable_32.c linux-2.6.32.9/arch/x86/mm/pgtable_32.c
16705--- linux-2.6.32.8/arch/x86/mm/pgtable_32.c 2010-02-09 07:57:19.000000000 -0500 17081--- linux-2.6.32.9/arch/x86/mm/pgtable_32.c 2010-02-09 07:57:19.000000000 -0500
16706+++ linux-2.6.32.8/arch/x86/mm/pgtable_32.c 2010-02-13 21:45:09.958914748 -0500 17082+++ linux-2.6.32.9/arch/x86/mm/pgtable_32.c 2010-02-23 17:09:53.136027747 -0500
16707@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, 17083@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
16708 return; 17084 return;
16709 } 17085 }
@@ -16718,9 +17094,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/pgtable_32.c linux-2.6.32.8/arch/x86/mm/pg
16718 17094
16719 /* 17095 /*
16720 * It's enough to flush this one mapping. 17096 * It's enough to flush this one mapping.
16721diff -urNp linux-2.6.32.8/arch/x86/mm/setup_nx.c linux-2.6.32.8/arch/x86/mm/setup_nx.c 17097diff -urNp linux-2.6.32.9/arch/x86/mm/setup_nx.c linux-2.6.32.9/arch/x86/mm/setup_nx.c
16722--- linux-2.6.32.8/arch/x86/mm/setup_nx.c 2010-02-09 07:57:19.000000000 -0500 17098--- linux-2.6.32.9/arch/x86/mm/setup_nx.c 2010-02-09 07:57:19.000000000 -0500
16723+++ linux-2.6.32.8/arch/x86/mm/setup_nx.c 2010-02-13 21:45:09.958914748 -0500 17099+++ linux-2.6.32.9/arch/x86/mm/setup_nx.c 2010-02-23 17:09:53.136027747 -0500
16724@@ -4,11 +4,10 @@ 17100@@ -4,11 +4,10 @@
16725 17101
16726 #include <asm/pgtable.h> 17102 #include <asm/pgtable.h>
@@ -16786,9 +17162,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/setup_nx.c linux-2.6.32.8/arch/x86/mm/setu
16786 __supported_pte_mask &= ~_PAGE_NX; 17162 __supported_pte_mask &= ~_PAGE_NX;
16787 } 17163 }
16788 #endif 17164 #endif
16789diff -urNp linux-2.6.32.8/arch/x86/mm/tlb.c linux-2.6.32.8/arch/x86/mm/tlb.c 17165diff -urNp linux-2.6.32.9/arch/x86/mm/tlb.c linux-2.6.32.9/arch/x86/mm/tlb.c
16790--- linux-2.6.32.8/arch/x86/mm/tlb.c 2010-02-09 07:57:19.000000000 -0500 17166--- linux-2.6.32.9/arch/x86/mm/tlb.c 2010-02-09 07:57:19.000000000 -0500
16791+++ linux-2.6.32.8/arch/x86/mm/tlb.c 2010-02-13 21:45:09.958914748 -0500 17167+++ linux-2.6.32.9/arch/x86/mm/tlb.c 2010-02-23 17:09:53.136027747 -0500
16792@@ -12,7 +12,7 @@ 17168@@ -12,7 +12,7 @@
16793 #include <asm/uv/uv.h> 17169 #include <asm/uv/uv.h>
16794 17170
@@ -16798,9 +17174,9 @@ diff -urNp linux-2.6.32.8/arch/x86/mm/tlb.c linux-2.6.32.8/arch/x86/mm/tlb.c
16798 17174
16799 /* 17175 /*
16800 * Smarter SMP flushing macros. 17176 * Smarter SMP flushing macros.
16801diff -urNp linux-2.6.32.8/arch/x86/oprofile/backtrace.c linux-2.6.32.8/arch/x86/oprofile/backtrace.c 17177diff -urNp linux-2.6.32.9/arch/x86/oprofile/backtrace.c linux-2.6.32.9/arch/x86/oprofile/backtrace.c
16802--- linux-2.6.32.8/arch/x86/oprofile/backtrace.c 2010-02-09 07:57:19.000000000 -0500 17178--- linux-2.6.32.9/arch/x86/oprofile/backtrace.c 2010-02-09 07:57:19.000000000 -0500
16803+++ linux-2.6.32.8/arch/x86/oprofile/backtrace.c 2010-02-13 21:45:09.958914748 -0500 17179+++ linux-2.6.32.9/arch/x86/oprofile/backtrace.c 2010-02-23 17:09:53.136027747 -0500
16804@@ -37,7 +37,7 @@ static void backtrace_address(void *data 17180@@ -37,7 +37,7 @@ static void backtrace_address(void *data
16805 unsigned int *depth = data; 17181 unsigned int *depth = data;
16806 17182
@@ -16828,9 +17204,9 @@ diff -urNp linux-2.6.32.8/arch/x86/oprofile/backtrace.c linux-2.6.32.8/arch/x86/
16828 unsigned long stack = kernel_stack_pointer(regs); 17204 unsigned long stack = kernel_stack_pointer(regs);
16829 if (depth) 17205 if (depth)
16830 dump_trace(NULL, regs, (unsigned long *)stack, 0, 17206 dump_trace(NULL, regs, (unsigned long *)stack, 0,
16831diff -urNp linux-2.6.32.8/arch/x86/oprofile/op_model_p4.c linux-2.6.32.8/arch/x86/oprofile/op_model_p4.c 17207diff -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
16832--- linux-2.6.32.8/arch/x86/oprofile/op_model_p4.c 2010-02-09 07:57:19.000000000 -0500 17208--- linux-2.6.32.9/arch/x86/oprofile/op_model_p4.c 2010-02-09 07:57:19.000000000 -0500
16833+++ linux-2.6.32.8/arch/x86/oprofile/op_model_p4.c 2010-02-13 21:45:09.959928454 -0500 17209+++ linux-2.6.32.9/arch/x86/oprofile/op_model_p4.c 2010-02-23 17:09:53.136027747 -0500
16834@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo 17210@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
16835 #endif 17211 #endif
16836 } 17212 }
@@ -16840,9 +17216,9 @@ diff -urNp linux-2.6.32.8/arch/x86/oprofile/op_model_p4.c linux-2.6.32.8/arch/x8
16840 { 17216 {
16841 #ifdef CONFIG_SMP 17217 #ifdef CONFIG_SMP
16842 return smp_num_siblings == 2 ? 2 : 1; 17218 return smp_num_siblings == 2 ? 2 : 1;
16843diff -urNp linux-2.6.32.8/arch/x86/pci/common.c linux-2.6.32.8/arch/x86/pci/common.c 17219diff -urNp linux-2.6.32.9/arch/x86/pci/common.c linux-2.6.32.9/arch/x86/pci/common.c
16844--- linux-2.6.32.8/arch/x86/pci/common.c 2010-02-09 07:57:19.000000000 -0500 17220--- linux-2.6.32.9/arch/x86/pci/common.c 2010-02-09 07:57:19.000000000 -0500
16845+++ linux-2.6.32.8/arch/x86/pci/common.c 2010-02-13 21:45:09.959928454 -0500 17221+++ linux-2.6.32.9/arch/x86/pci/common.c 2010-02-23 17:09:53.136027747 -0500
16846@@ -31,8 +31,8 @@ int noioapicreroute = 1; 17222@@ -31,8 +31,8 @@ int noioapicreroute = 1;
16847 int pcibios_last_bus = -1; 17223 int pcibios_last_bus = -1;
16848 unsigned long pirq_table_addr; 17224 unsigned long pirq_table_addr;
@@ -16863,9 +17239,9 @@ diff -urNp linux-2.6.32.8/arch/x86/pci/common.c linux-2.6.32.8/arch/x86/pci/comm
16863 }; 17239 };
16864 17240
16865 void __init dmi_check_pciprobe(void) 17241 void __init dmi_check_pciprobe(void)
16866diff -urNp linux-2.6.32.8/arch/x86/pci/direct.c linux-2.6.32.8/arch/x86/pci/direct.c 17242diff -urNp linux-2.6.32.9/arch/x86/pci/direct.c linux-2.6.32.9/arch/x86/pci/direct.c
16867--- linux-2.6.32.8/arch/x86/pci/direct.c 2010-02-09 07:57:19.000000000 -0500 17243--- linux-2.6.32.9/arch/x86/pci/direct.c 2010-02-09 07:57:19.000000000 -0500
16868+++ linux-2.6.32.8/arch/x86/pci/direct.c 2010-02-13 21:45:09.959928454 -0500 17244+++ linux-2.6.32.9/arch/x86/pci/direct.c 2010-02-23 17:09:53.136027747 -0500
16869@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 17245@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
16870 17246
16871 #undef PCI_CONF1_ADDRESS 17247 #undef PCI_CONF1_ADDRESS
@@ -16893,9 +17269,9 @@ diff -urNp linux-2.6.32.8/arch/x86/pci/direct.c linux-2.6.32.8/arch/x86/pci/dire
16893 { 17269 {
16894 u32 x = 0; 17270 u32 x = 0;
16895 int year, devfn; 17271 int year, devfn;
16896diff -urNp linux-2.6.32.8/arch/x86/pci/fixup.c linux-2.6.32.8/arch/x86/pci/fixup.c 17272diff -urNp linux-2.6.32.9/arch/x86/pci/fixup.c linux-2.6.32.9/arch/x86/pci/fixup.c
16897--- linux-2.6.32.8/arch/x86/pci/fixup.c 2010-02-09 07:57:19.000000000 -0500 17273--- linux-2.6.32.9/arch/x86/pci/fixup.c 2010-02-09 07:57:19.000000000 -0500
16898+++ linux-2.6.32.8/arch/x86/pci/fixup.c 2010-02-13 21:45:09.959928454 -0500 17274+++ linux-2.6.32.9/arch/x86/pci/fixup.c 2010-02-23 17:09:53.136027747 -0500
16899@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi 17275@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
16900 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), 17276 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
16901 }, 17277 },
@@ -16914,9 +17290,9 @@ diff -urNp linux-2.6.32.8/arch/x86/pci/fixup.c linux-2.6.32.8/arch/x86/pci/fixup
16914 }; 17290 };
16915 17291
16916 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) 17292 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
16917diff -urNp linux-2.6.32.8/arch/x86/pci/irq.c linux-2.6.32.8/arch/x86/pci/irq.c 17293diff -urNp linux-2.6.32.9/arch/x86/pci/irq.c linux-2.6.32.9/arch/x86/pci/irq.c
16918--- linux-2.6.32.8/arch/x86/pci/irq.c 2010-02-09 07:57:19.000000000 -0500 17294--- linux-2.6.32.9/arch/x86/pci/irq.c 2010-02-09 07:57:19.000000000 -0500
16919+++ linux-2.6.32.8/arch/x86/pci/irq.c 2010-02-13 21:45:09.960963118 -0500 17295+++ linux-2.6.32.9/arch/x86/pci/irq.c 2010-02-23 17:09:53.136027747 -0500
16920@@ -543,7 +543,7 @@ static __init int intel_router_probe(str 17296@@ -543,7 +543,7 @@ static __init int intel_router_probe(str
16921 static struct pci_device_id __initdata pirq_440gx[] = { 17297 static struct pci_device_id __initdata pirq_440gx[] = {
16922 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, 17298 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
@@ -16935,9 +17311,9 @@ diff -urNp linux-2.6.32.8/arch/x86/pci/irq.c linux-2.6.32.8/arch/x86/pci/irq.c
16935 }; 17311 };
16936 17312
16937 int __init pcibios_irq_init(void) 17313 int __init pcibios_irq_init(void)
16938diff -urNp linux-2.6.32.8/arch/x86/pci/mmconfig_32.c linux-2.6.32.8/arch/x86/pci/mmconfig_32.c 17314diff -urNp linux-2.6.32.9/arch/x86/pci/mmconfig_32.c linux-2.6.32.9/arch/x86/pci/mmconfig_32.c
16939--- linux-2.6.32.8/arch/x86/pci/mmconfig_32.c 2010-02-09 07:57:19.000000000 -0500 17315--- linux-2.6.32.9/arch/x86/pci/mmconfig_32.c 2010-02-09 07:57:19.000000000 -0500
16940+++ linux-2.6.32.8/arch/x86/pci/mmconfig_32.c 2010-02-13 21:45:09.960963118 -0500 17316+++ linux-2.6.32.9/arch/x86/pci/mmconfig_32.c 2010-02-23 17:09:53.136027747 -0500
16941@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int 17317@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
16942 return 0; 17318 return 0;
16943 } 17319 }
@@ -16947,9 +17323,9 @@ diff -urNp linux-2.6.32.8/arch/x86/pci/mmconfig_32.c linux-2.6.32.8/arch/x86/pci
16947 .read = pci_mmcfg_read, 17323 .read = pci_mmcfg_read,
16948 .write = pci_mmcfg_write, 17324 .write = pci_mmcfg_write,
16949 }; 17325 };
16950diff -urNp linux-2.6.32.8/arch/x86/pci/mmconfig_64.c linux-2.6.32.8/arch/x86/pci/mmconfig_64.c 17326diff -urNp linux-2.6.32.9/arch/x86/pci/mmconfig_64.c linux-2.6.32.9/arch/x86/pci/mmconfig_64.c
16951--- linux-2.6.32.8/arch/x86/pci/mmconfig_64.c 2010-02-09 07:57:19.000000000 -0500 17327--- linux-2.6.32.9/arch/x86/pci/mmconfig_64.c 2010-02-09 07:57:19.000000000 -0500
16952+++ linux-2.6.32.8/arch/x86/pci/mmconfig_64.c 2010-02-13 21:45:09.960963118 -0500 17328+++ linux-2.6.32.9/arch/x86/pci/mmconfig_64.c 2010-02-23 17:09:53.136027747 -0500
16953@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int 17329@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
16954 return 0; 17330 return 0;
16955 } 17331 }
@@ -16959,9 +17335,9 @@ diff -urNp linux-2.6.32.8/arch/x86/pci/mmconfig_64.c linux-2.6.32.8/arch/x86/pci
16959 .read = pci_mmcfg_read, 17335 .read = pci_mmcfg_read,
16960 .write = pci_mmcfg_write, 17336 .write = pci_mmcfg_write,
16961 }; 17337 };
16962diff -urNp linux-2.6.32.8/arch/x86/pci/numaq_32.c linux-2.6.32.8/arch/x86/pci/numaq_32.c 17338diff -urNp linux-2.6.32.9/arch/x86/pci/numaq_32.c linux-2.6.32.9/arch/x86/pci/numaq_32.c
16963--- linux-2.6.32.8/arch/x86/pci/numaq_32.c 2010-02-09 07:57:19.000000000 -0500 17339--- linux-2.6.32.9/arch/x86/pci/numaq_32.c 2010-02-09 07:57:19.000000000 -0500
16964+++ linux-2.6.32.8/arch/x86/pci/numaq_32.c 2010-02-13 21:45:09.960963118 -0500 17340+++ linux-2.6.32.9/arch/x86/pci/numaq_32.c 2010-02-23 17:09:53.136027747 -0500
16965@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i 17341@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
16966 17342
16967 #undef PCI_CONF1_MQ_ADDRESS 17343 #undef PCI_CONF1_MQ_ADDRESS
@@ -16971,9 +17347,9 @@ diff -urNp linux-2.6.32.8/arch/x86/pci/numaq_32.c linux-2.6.32.8/arch/x86/pci/nu
16971 .read = pci_conf1_mq_read, 17347 .read = pci_conf1_mq_read,
16972 .write = pci_conf1_mq_write 17348 .write = pci_conf1_mq_write
16973 }; 17349 };
16974diff -urNp linux-2.6.32.8/arch/x86/pci/olpc.c linux-2.6.32.8/arch/x86/pci/olpc.c 17350diff -urNp linux-2.6.32.9/arch/x86/pci/olpc.c linux-2.6.32.9/arch/x86/pci/olpc.c
16975--- linux-2.6.32.8/arch/x86/pci/olpc.c 2010-02-09 07:57:19.000000000 -0500 17351--- linux-2.6.32.9/arch/x86/pci/olpc.c 2010-02-09 07:57:19.000000000 -0500
16976+++ linux-2.6.32.8/arch/x86/pci/olpc.c 2010-02-13 21:45:09.960963118 -0500 17352+++ linux-2.6.32.9/arch/x86/pci/olpc.c 2010-02-23 17:09:53.136027747 -0500
16977@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s 17353@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
16978 return 0; 17354 return 0;
16979 } 17355 }
@@ -16983,9 +17359,9 @@ diff -urNp linux-2.6.32.8/arch/x86/pci/olpc.c linux-2.6.32.8/arch/x86/pci/olpc.c
16983 .read = pci_olpc_read, 17359 .read = pci_olpc_read,
16984 .write = pci_olpc_write, 17360 .write = pci_olpc_write,
16985 }; 17361 };
16986diff -urNp linux-2.6.32.8/arch/x86/pci/pcbios.c linux-2.6.32.8/arch/x86/pci/pcbios.c 17362diff -urNp linux-2.6.32.9/arch/x86/pci/pcbios.c linux-2.6.32.9/arch/x86/pci/pcbios.c
16987--- linux-2.6.32.8/arch/x86/pci/pcbios.c 2010-02-09 07:57:19.000000000 -0500 17363--- linux-2.6.32.9/arch/x86/pci/pcbios.c 2010-02-09 07:57:19.000000000 -0500
16988+++ linux-2.6.32.8/arch/x86/pci/pcbios.c 2010-02-13 21:45:09.961955603 -0500 17364+++ linux-2.6.32.9/arch/x86/pci/pcbios.c 2010-02-23 17:09:53.136027747 -0500
16989@@ -56,50 +56,93 @@ union bios32 { 17365@@ -56,50 +56,93 @@ union bios32 {
16990 static struct { 17366 static struct {
16991 unsigned long address; 17367 unsigned long address;
@@ -17308,9 +17684,9 @@ diff -urNp linux-2.6.32.8/arch/x86/pci/pcbios.c linux-2.6.32.8/arch/x86/pci/pcbi
17308 return !(ret & 0xff00); 17684 return !(ret & 0xff00);
17309 } 17685 }
17310 EXPORT_SYMBOL(pcibios_set_irq_routing); 17686 EXPORT_SYMBOL(pcibios_set_irq_routing);
17311diff -urNp linux-2.6.32.8/arch/x86/power/cpu.c linux-2.6.32.8/arch/x86/power/cpu.c 17687diff -urNp linux-2.6.32.9/arch/x86/power/cpu.c linux-2.6.32.9/arch/x86/power/cpu.c
17312--- linux-2.6.32.8/arch/x86/power/cpu.c 2010-02-09 07:57:19.000000000 -0500 17688--- linux-2.6.32.9/arch/x86/power/cpu.c 2010-02-09 07:57:19.000000000 -0500
17313+++ linux-2.6.32.8/arch/x86/power/cpu.c 2010-02-13 21:45:09.961955603 -0500 17689+++ linux-2.6.32.9/arch/x86/power/cpu.c 2010-02-23 17:09:53.136027747 -0500
17314@@ -126,7 +126,7 @@ static void do_fpu_end(void) 17690@@ -126,7 +126,7 @@ static void do_fpu_end(void)
17315 static void fix_processor_context(void) 17691 static void fix_processor_context(void)
17316 { 17692 {
@@ -17330,9 +17706,9 @@ diff -urNp linux-2.6.32.8/arch/x86/power/cpu.c linux-2.6.32.8/arch/x86/power/cpu
17330 17706
17331 syscall_init(); /* This sets MSR_*STAR and related */ 17707 syscall_init(); /* This sets MSR_*STAR and related */
17332 #endif 17708 #endif
17333diff -urNp linux-2.6.32.8/arch/x86/vdso/Makefile linux-2.6.32.8/arch/x86/vdso/Makefile 17709diff -urNp linux-2.6.32.9/arch/x86/vdso/Makefile linux-2.6.32.9/arch/x86/vdso/Makefile
17334--- linux-2.6.32.8/arch/x86/vdso/Makefile 2010-02-09 07:57:19.000000000 -0500 17710--- linux-2.6.32.9/arch/x86/vdso/Makefile 2010-02-09 07:57:19.000000000 -0500
17335+++ linux-2.6.32.8/arch/x86/vdso/Makefile 2010-02-13 21:45:09.961955603 -0500 17711+++ linux-2.6.32.9/arch/x86/vdso/Makefile 2010-02-23 17:09:53.136027747 -0500
17336@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ 17712@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
17337 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ 17713 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
17338 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) 17714 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -17342,9 +17718,9 @@ diff -urNp linux-2.6.32.8/arch/x86/vdso/Makefile linux-2.6.32.8/arch/x86/vdso/Ma
17342 GCOV_PROFILE := n 17718 GCOV_PROFILE := n
17343 17719
17344 # 17720 #
17345diff -urNp linux-2.6.32.8/arch/x86/vdso/vclock_gettime.c linux-2.6.32.8/arch/x86/vdso/vclock_gettime.c 17721diff -urNp linux-2.6.32.9/arch/x86/vdso/vclock_gettime.c linux-2.6.32.9/arch/x86/vdso/vclock_gettime.c
17346--- linux-2.6.32.8/arch/x86/vdso/vclock_gettime.c 2010-02-09 07:57:19.000000000 -0500 17722--- linux-2.6.32.9/arch/x86/vdso/vclock_gettime.c 2010-02-09 07:57:19.000000000 -0500
17347+++ linux-2.6.32.8/arch/x86/vdso/vclock_gettime.c 2010-02-13 21:45:09.961955603 -0500 17723+++ linux-2.6.32.9/arch/x86/vdso/vclock_gettime.c 2010-02-23 17:09:53.136027747 -0500
17348@@ -22,24 +22,48 @@ 17724@@ -22,24 +22,48 @@
17349 #include <asm/hpet.h> 17725 #include <asm/hpet.h>
17350 #include <asm/unistd.h> 17726 #include <asm/unistd.h>
@@ -17443,9 +17819,9 @@ diff -urNp linux-2.6.32.8/arch/x86/vdso/vclock_gettime.c linux-2.6.32.8/arch/x86
17443 } 17819 }
17444 int gettimeofday(struct timeval *, struct timezone *) 17820 int gettimeofday(struct timeval *, struct timezone *)
17445 __attribute__((weak, alias("__vdso_gettimeofday"))); 17821 __attribute__((weak, alias("__vdso_gettimeofday")));
17446diff -urNp linux-2.6.32.8/arch/x86/vdso/vdso32-setup.c linux-2.6.32.8/arch/x86/vdso/vdso32-setup.c 17822diff -urNp linux-2.6.32.9/arch/x86/vdso/vdso32-setup.c linux-2.6.32.9/arch/x86/vdso/vdso32-setup.c
17447--- linux-2.6.32.8/arch/x86/vdso/vdso32-setup.c 2010-02-09 07:57:19.000000000 -0500 17823--- linux-2.6.32.9/arch/x86/vdso/vdso32-setup.c 2010-02-09 07:57:19.000000000 -0500
17448+++ linux-2.6.32.8/arch/x86/vdso/vdso32-setup.c 2010-02-13 21:45:09.962950495 -0500 17824+++ linux-2.6.32.9/arch/x86/vdso/vdso32-setup.c 2010-02-23 17:09:53.136027747 -0500
17449@@ -25,6 +25,7 @@ 17825@@ -25,6 +25,7 @@
17450 #include <asm/tlbflush.h> 17826 #include <asm/tlbflush.h>
17451 #include <asm/vdso.h> 17827 #include <asm/vdso.h>
@@ -17546,9 +17922,9 @@ diff -urNp linux-2.6.32.8/arch/x86/vdso/vdso32-setup.c linux-2.6.32.8/arch/x86/v
17546 return &gate_vma; 17922 return &gate_vma;
17547 return NULL; 17923 return NULL;
17548 } 17924 }
17549diff -urNp linux-2.6.32.8/arch/x86/vdso/vdso.lds.S linux-2.6.32.8/arch/x86/vdso/vdso.lds.S 17925diff -urNp linux-2.6.32.9/arch/x86/vdso/vdso.lds.S linux-2.6.32.9/arch/x86/vdso/vdso.lds.S
17550--- linux-2.6.32.8/arch/x86/vdso/vdso.lds.S 2010-02-09 07:57:19.000000000 -0500 17926--- linux-2.6.32.9/arch/x86/vdso/vdso.lds.S 2010-02-09 07:57:19.000000000 -0500
17551+++ linux-2.6.32.8/arch/x86/vdso/vdso.lds.S 2010-02-13 21:45:09.962950495 -0500 17927+++ linux-2.6.32.9/arch/x86/vdso/vdso.lds.S 2010-02-23 17:09:53.136027747 -0500
17552@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; 17928@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
17553 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; 17929 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
17554 #include "vextern.h" 17930 #include "vextern.h"
@@ -17559,9 +17935,9 @@ diff -urNp linux-2.6.32.8/arch/x86/vdso/vdso.lds.S linux-2.6.32.8/arch/x86/vdso/
17559+VEXTERN(fallback_time) 17935+VEXTERN(fallback_time)
17560+VEXTERN(getcpu) 17936+VEXTERN(getcpu)
17561+#undef VEXTERN 17937+#undef VEXTERN
17562diff -urNp linux-2.6.32.8/arch/x86/vdso/vextern.h linux-2.6.32.8/arch/x86/vdso/vextern.h 17938diff -urNp linux-2.6.32.9/arch/x86/vdso/vextern.h linux-2.6.32.9/arch/x86/vdso/vextern.h
17563--- linux-2.6.32.8/arch/x86/vdso/vextern.h 2010-02-09 07:57:19.000000000 -0500 17939--- linux-2.6.32.9/arch/x86/vdso/vextern.h 2010-02-09 07:57:19.000000000 -0500
17564+++ linux-2.6.32.8/arch/x86/vdso/vextern.h 2010-02-13 21:45:09.962950495 -0500 17940+++ linux-2.6.32.9/arch/x86/vdso/vextern.h 2010-02-23 17:09:53.136027747 -0500
17565@@ -11,6 +11,5 @@ 17941@@ -11,6 +11,5 @@
17566 put into vextern.h and be referenced as a pointer with vdso prefix. 17942 put into vextern.h and be referenced as a pointer with vdso prefix.
17567 The main kernel later fills in the values. */ 17943 The main kernel later fills in the values. */
@@ -17569,9 +17945,9 @@ diff -urNp linux-2.6.32.8/arch/x86/vdso/vextern.h linux-2.6.32.8/arch/x86/vdso/v
17569-VEXTERN(jiffies) 17945-VEXTERN(jiffies)
17570 VEXTERN(vgetcpu_mode) 17946 VEXTERN(vgetcpu_mode)
17571 VEXTERN(vsyscall_gtod_data) 17947 VEXTERN(vsyscall_gtod_data)
17572diff -urNp linux-2.6.32.8/arch/x86/vdso/vma.c linux-2.6.32.8/arch/x86/vdso/vma.c 17948diff -urNp linux-2.6.32.9/arch/x86/vdso/vma.c linux-2.6.32.9/arch/x86/vdso/vma.c
17573--- linux-2.6.32.8/arch/x86/vdso/vma.c 2010-02-09 07:57:19.000000000 -0500 17949--- linux-2.6.32.9/arch/x86/vdso/vma.c 2010-02-09 07:57:19.000000000 -0500
17574+++ linux-2.6.32.8/arch/x86/vdso/vma.c 2010-02-13 21:45:09.962950495 -0500 17950+++ linux-2.6.32.9/arch/x86/vdso/vma.c 2010-02-23 17:09:53.136027747 -0500
17575@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) 17951@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
17576 if (!vbase) 17952 if (!vbase)
17577 goto oom; 17953 goto oom;
@@ -17618,9 +17994,9 @@ diff -urNp linux-2.6.32.8/arch/x86/vdso/vma.c linux-2.6.32.8/arch/x86/vdso/vma.c
17618- return 0; 17994- return 0;
17619-} 17995-}
17620-__setup("vdso=", vdso_setup); 17996-__setup("vdso=", vdso_setup);
17621diff -urNp linux-2.6.32.8/arch/x86/xen/enlighten.c linux-2.6.32.8/arch/x86/xen/enlighten.c 17997diff -urNp linux-2.6.32.9/arch/x86/xen/enlighten.c linux-2.6.32.9/arch/x86/xen/enlighten.c
17622--- linux-2.6.32.8/arch/x86/xen/enlighten.c 2010-02-09 07:57:19.000000000 -0500 17998--- linux-2.6.32.9/arch/x86/xen/enlighten.c 2010-02-09 07:57:19.000000000 -0500
17623+++ linux-2.6.32.8/arch/x86/xen/enlighten.c 2010-02-13 21:45:09.963763375 -0500 17999+++ linux-2.6.32.9/arch/x86/xen/enlighten.c 2010-02-23 17:09:53.140103788 -0500
17624@@ -70,8 +70,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); 18000@@ -70,8 +70,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
17625 18001
17626 struct shared_info xen_dummy_shared_info; 18002 struct shared_info xen_dummy_shared_info;
@@ -17653,9 +18029,9 @@ diff -urNp linux-2.6.32.8/arch/x86/xen/enlighten.c linux-2.6.32.8/arch/x86/xen/e
17653 xen_smp_init(); 18029 xen_smp_init();
17654 18030
17655 pgd = (pgd_t *)xen_start_info->pt_base; 18031 pgd = (pgd_t *)xen_start_info->pt_base;
17656diff -urNp linux-2.6.32.8/arch/x86/xen/mmu.c linux-2.6.32.8/arch/x86/xen/mmu.c 18032diff -urNp linux-2.6.32.9/arch/x86/xen/mmu.c linux-2.6.32.9/arch/x86/xen/mmu.c
17657--- linux-2.6.32.8/arch/x86/xen/mmu.c 2010-02-09 07:57:19.000000000 -0500 18033--- linux-2.6.32.9/arch/x86/xen/mmu.c 2010-02-09 07:57:19.000000000 -0500
17658+++ linux-2.6.32.8/arch/x86/xen/mmu.c 2010-02-13 21:45:09.963763375 -0500 18034+++ linux-2.6.32.9/arch/x86/xen/mmu.c 2010-02-23 17:09:53.140103788 -0500
17659@@ -1710,6 +1710,8 @@ __init pgd_t *xen_setup_kernel_pagetable 18035@@ -1710,6 +1710,8 @@ __init pgd_t *xen_setup_kernel_pagetable
17660 convert_pfn_mfn(init_level4_pgt); 18036 convert_pfn_mfn(init_level4_pgt);
17661 convert_pfn_mfn(level3_ident_pgt); 18037 convert_pfn_mfn(level3_ident_pgt);
@@ -17676,9 +18052,9 @@ diff -urNp linux-2.6.32.8/arch/x86/xen/mmu.c linux-2.6.32.8/arch/x86/xen/mmu.c
17676 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); 18052 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
17677 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); 18053 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
17678 18054
17679diff -urNp linux-2.6.32.8/arch/x86/xen/smp.c linux-2.6.32.8/arch/x86/xen/smp.c 18055diff -urNp linux-2.6.32.9/arch/x86/xen/smp.c linux-2.6.32.9/arch/x86/xen/smp.c
17680--- linux-2.6.32.8/arch/x86/xen/smp.c 2010-02-09 07:57:19.000000000 -0500 18056--- linux-2.6.32.9/arch/x86/xen/smp.c 2010-02-09 07:57:19.000000000 -0500
17681+++ linux-2.6.32.8/arch/x86/xen/smp.c 2010-02-13 21:45:09.963763375 -0500 18057+++ linux-2.6.32.9/arch/x86/xen/smp.c 2010-02-23 17:09:53.140103788 -0500
17682@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ 18058@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
17683 { 18059 {
17684 BUG_ON(smp_processor_id() != 0); 18060 BUG_ON(smp_processor_id() != 0);
@@ -17702,9 +18078,9 @@ diff -urNp linux-2.6.32.8/arch/x86/xen/smp.c linux-2.6.32.8/arch/x86/xen/smp.c
17702 ctxt->user_regs.ss = __KERNEL_DS; 18078 ctxt->user_regs.ss = __KERNEL_DS;
17703 #ifdef CONFIG_X86_32 18079 #ifdef CONFIG_X86_32
17704 ctxt->user_regs.fs = __KERNEL_PERCPU; 18080 ctxt->user_regs.fs = __KERNEL_PERCPU;
17705diff -urNp linux-2.6.32.8/arch/x86/xen/xen-ops.h linux-2.6.32.8/arch/x86/xen/xen-ops.h 18081diff -urNp linux-2.6.32.9/arch/x86/xen/xen-ops.h linux-2.6.32.9/arch/x86/xen/xen-ops.h
17706--- linux-2.6.32.8/arch/x86/xen/xen-ops.h 2010-02-09 07:57:19.000000000 -0500 18082--- linux-2.6.32.9/arch/x86/xen/xen-ops.h 2010-02-09 07:57:19.000000000 -0500
17707+++ linux-2.6.32.8/arch/x86/xen/xen-ops.h 2010-02-13 21:45:09.963763375 -0500 18083+++ linux-2.6.32.9/arch/x86/xen/xen-ops.h 2010-02-23 17:09:53.140103788 -0500
17708@@ -10,8 +10,6 @@ 18084@@ -10,8 +10,6 @@
17709 extern const char xen_hypervisor_callback[]; 18085 extern const char xen_hypervisor_callback[];
17710 extern const char xen_failsafe_callback[]; 18086 extern const char xen_failsafe_callback[];
@@ -17714,9 +18090,9 @@ diff -urNp linux-2.6.32.8/arch/x86/xen/xen-ops.h linux-2.6.32.8/arch/x86/xen/xen
17714 struct trap_info; 18090 struct trap_info;
17715 void xen_copy_trap_info(struct trap_info *traps); 18091 void xen_copy_trap_info(struct trap_info *traps);
17716 18092
17717diff -urNp linux-2.6.32.8/block/blk-integrity.c linux-2.6.32.8/block/blk-integrity.c 18093diff -urNp linux-2.6.32.9/block/blk-integrity.c linux-2.6.32.9/block/blk-integrity.c
17718--- linux-2.6.32.8/block/blk-integrity.c 2010-02-09 07:57:19.000000000 -0500 18094--- linux-2.6.32.9/block/blk-integrity.c 2010-02-09 07:57:19.000000000 -0500
17719+++ linux-2.6.32.8/block/blk-integrity.c 2010-02-13 21:45:09.964626281 -0500 18095+++ linux-2.6.32.9/block/blk-integrity.c 2010-02-23 17:09:53.140103788 -0500
17720@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs 18096@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
17721 NULL, 18097 NULL,
17722 }; 18098 };
@@ -17726,9 +18102,21 @@ diff -urNp linux-2.6.32.8/block/blk-integrity.c linux-2.6.32.8/block/blk-integri
17726 .show = &integrity_attr_show, 18102 .show = &integrity_attr_show,
17727 .store = &integrity_attr_store, 18103 .store = &integrity_attr_store,
17728 }; 18104 };
17729diff -urNp linux-2.6.32.8/block/blk-map.c linux-2.6.32.8/block/blk-map.c 18105diff -urNp linux-2.6.32.9/block/blk-iopoll.c linux-2.6.32.9/block/blk-iopoll.c
17730--- linux-2.6.32.8/block/blk-map.c 2010-02-09 07:57:19.000000000 -0500 18106--- linux-2.6.32.9/block/blk-iopoll.c 2010-02-09 07:57:19.000000000 -0500
17731+++ linux-2.6.32.8/block/blk-map.c 2010-02-13 21:45:09.964626281 -0500 18107+++ linux-2.6.32.9/block/blk-iopoll.c 2010-02-23 17:09:53.140103788 -0500
18108@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
18109 }
18110 EXPORT_SYMBOL(blk_iopoll_complete);
18111
18112-static void blk_iopoll_softirq(struct softirq_action *h)
18113+static void blk_iopoll_softirq(void)
18114 {
18115 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
18116 int rearm = 0, budget = blk_iopoll_budget;
18117diff -urNp linux-2.6.32.9/block/blk-map.c linux-2.6.32.9/block/blk-map.c
18118--- linux-2.6.32.9/block/blk-map.c 2010-02-09 07:57:19.000000000 -0500
18119+++ linux-2.6.32.9/block/blk-map.c 2010-02-23 17:09:53.140103788 -0500
17732@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ 18120@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
17733 * direct dma. else, set up kernel bounce buffers 18121 * direct dma. else, set up kernel bounce buffers
17734 */ 18122 */
@@ -17747,9 +18135,21 @@ diff -urNp linux-2.6.32.8/block/blk-map.c linux-2.6.32.8/block/blk-map.c
17747 if (do_copy) 18135 if (do_copy)
17748 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); 18136 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
17749 else 18137 else
17750diff -urNp linux-2.6.32.8/block/blk-sysfs.c linux-2.6.32.8/block/blk-sysfs.c 18138diff -urNp linux-2.6.32.9/block/blk-softirq.c linux-2.6.32.9/block/blk-softirq.c
17751--- linux-2.6.32.8/block/blk-sysfs.c 2010-02-09 07:57:19.000000000 -0500 18139--- linux-2.6.32.9/block/blk-softirq.c 2010-02-09 07:57:19.000000000 -0500
17752+++ linux-2.6.32.8/block/blk-sysfs.c 2010-02-13 21:45:09.964626281 -0500 18140+++ linux-2.6.32.9/block/blk-softirq.c 2010-02-23 17:09:53.140103788 -0500
18141@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
18142 * Softirq action handler - move entries to local list and loop over them
18143 * while passing them to the queue registered handler.
18144 */
18145-static void blk_done_softirq(struct softirq_action *h)
18146+static void blk_done_softirq(void)
18147 {
18148 struct list_head *cpu_list, local_list;
18149
18150diff -urNp linux-2.6.32.9/block/blk-sysfs.c linux-2.6.32.9/block/blk-sysfs.c
18151--- linux-2.6.32.9/block/blk-sysfs.c 2010-02-09 07:57:19.000000000 -0500
18152+++ linux-2.6.32.9/block/blk-sysfs.c 2010-02-23 17:09:53.140103788 -0500
17753@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob 18153@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
17754 kmem_cache_free(blk_requestq_cachep, q); 18154 kmem_cache_free(blk_requestq_cachep, q);
17755 } 18155 }
@@ -17759,9 +18159,9 @@ diff -urNp linux-2.6.32.8/block/blk-sysfs.c linux-2.6.32.8/block/blk-sysfs.c
17759 .show = queue_attr_show, 18159 .show = queue_attr_show,
17760 .store = queue_attr_store, 18160 .store = queue_attr_store,
17761 }; 18161 };
17762diff -urNp linux-2.6.32.8/block/elevator.c linux-2.6.32.8/block/elevator.c 18162diff -urNp linux-2.6.32.9/block/elevator.c linux-2.6.32.9/block/elevator.c
17763--- linux-2.6.32.8/block/elevator.c 2010-02-09 07:57:19.000000000 -0500 18163--- linux-2.6.32.9/block/elevator.c 2010-02-09 07:57:19.000000000 -0500
17764+++ linux-2.6.32.8/block/elevator.c 2010-02-13 21:45:09.964626281 -0500 18164+++ linux-2.6.32.9/block/elevator.c 2010-02-23 17:09:53.140103788 -0500
17765@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str 18165@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
17766 return error; 18166 return error;
17767 } 18167 }
@@ -17771,9 +18171,9 @@ diff -urNp linux-2.6.32.8/block/elevator.c linux-2.6.32.8/block/elevator.c
17771 .show = elv_attr_show, 18171 .show = elv_attr_show,
17772 .store = elv_attr_store, 18172 .store = elv_attr_store,
17773 }; 18173 };
17774diff -urNp linux-2.6.32.8/crypto/lrw.c linux-2.6.32.8/crypto/lrw.c 18174diff -urNp linux-2.6.32.9/crypto/lrw.c linux-2.6.32.9/crypto/lrw.c
17775--- linux-2.6.32.8/crypto/lrw.c 2010-02-09 07:57:19.000000000 -0500 18175--- linux-2.6.32.9/crypto/lrw.c 2010-02-09 07:57:19.000000000 -0500
17776+++ linux-2.6.32.8/crypto/lrw.c 2010-02-13 21:45:09.964626281 -0500 18176+++ linux-2.6.32.9/crypto/lrw.c 2010-02-23 17:09:53.140103788 -0500
17777@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par 18177@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
17778 struct priv *ctx = crypto_tfm_ctx(parent); 18178 struct priv *ctx = crypto_tfm_ctx(parent);
17779 struct crypto_cipher *child = ctx->child; 18179 struct crypto_cipher *child = ctx->child;
@@ -17783,9 +18183,9 @@ diff -urNp linux-2.6.32.8/crypto/lrw.c linux-2.6.32.8/crypto/lrw.c
17783 int bsize = crypto_cipher_blocksize(child); 18183 int bsize = crypto_cipher_blocksize(child);
17784 18184
17785 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); 18185 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
17786diff -urNp linux-2.6.32.8/Documentation/dontdiff linux-2.6.32.8/Documentation/dontdiff 18186diff -urNp linux-2.6.32.9/Documentation/dontdiff linux-2.6.32.9/Documentation/dontdiff
17787--- linux-2.6.32.8/Documentation/dontdiff 2010-02-09 07:57:19.000000000 -0500 18187--- linux-2.6.32.9/Documentation/dontdiff 2010-02-09 07:57:19.000000000 -0500
17788+++ linux-2.6.32.8/Documentation/dontdiff 2010-02-13 21:45:09.964626281 -0500 18188+++ linux-2.6.32.9/Documentation/dontdiff 2010-02-23 17:09:53.140103788 -0500
17789@@ -3,6 +3,7 @@ 18189@@ -3,6 +3,7 @@
17790 *.bin 18190 *.bin
17791 *.cpio 18191 *.cpio
@@ -17892,9 +18292,9 @@ diff -urNp linux-2.6.32.8/Documentation/dontdiff linux-2.6.32.8/Documentation/do
17892 zImage* 18292 zImage*
17893 zconf.hash.c 18293 zconf.hash.c
17894+zoffset.h 18294+zoffset.h
17895diff -urNp linux-2.6.32.8/Documentation/kernel-parameters.txt linux-2.6.32.8/Documentation/kernel-parameters.txt 18295diff -urNp linux-2.6.32.9/Documentation/kernel-parameters.txt linux-2.6.32.9/Documentation/kernel-parameters.txt
17896--- linux-2.6.32.8/Documentation/kernel-parameters.txt 2010-02-09 07:57:19.000000000 -0500 18296--- linux-2.6.32.9/Documentation/kernel-parameters.txt 2010-02-09 07:57:19.000000000 -0500
17897+++ linux-2.6.32.8/Documentation/kernel-parameters.txt 2010-02-13 21:45:09.965912024 -0500 18297+++ linux-2.6.32.9/Documentation/kernel-parameters.txt 2010-02-23 17:09:53.140103788 -0500
17898@@ -1833,6 +1833,12 @@ and is between 256 and 4096 characters. 18298@@ -1833,6 +1833,12 @@ and is between 256 and 4096 characters.
17899 the specified number of seconds. This is to be used if 18299 the specified number of seconds. This is to be used if
17900 your oopses keep scrolling off the screen. 18300 your oopses keep scrolling off the screen.
@@ -17908,9 +18308,9 @@ diff -urNp linux-2.6.32.8/Documentation/kernel-parameters.txt linux-2.6.32.8/Doc
17908 pcbit= [HW,ISDN] 18308 pcbit= [HW,ISDN]
17909 18309
17910 pcd. [PARIDE] 18310 pcd. [PARIDE]
17911diff -urNp linux-2.6.32.8/drivers/acpi/battery.c linux-2.6.32.8/drivers/acpi/battery.c 18311diff -urNp linux-2.6.32.9/drivers/acpi/battery.c linux-2.6.32.9/drivers/acpi/battery.c
17912--- linux-2.6.32.8/drivers/acpi/battery.c 2010-02-09 07:57:19.000000000 -0500 18312--- linux-2.6.32.9/drivers/acpi/battery.c 2010-02-09 07:57:19.000000000 -0500
17913+++ linux-2.6.32.8/drivers/acpi/battery.c 2010-02-13 21:45:09.965912024 -0500 18313+++ linux-2.6.32.9/drivers/acpi/battery.c 2010-02-23 17:09:53.140103788 -0500
17914@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); 18314@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
17915 } 18315 }
17916 18316
@@ -17920,9 +18320,9 @@ diff -urNp linux-2.6.32.8/drivers/acpi/battery.c linux-2.6.32.8/drivers/acpi/bat
17920 mode_t mode; 18320 mode_t mode;
17921 const char *name; 18321 const char *name;
17922 } acpi_battery_file[] = { 18322 } acpi_battery_file[] = {
17923diff -urNp linux-2.6.32.8/drivers/acpi/blacklist.c linux-2.6.32.8/drivers/acpi/blacklist.c 18323diff -urNp linux-2.6.32.9/drivers/acpi/blacklist.c linux-2.6.32.9/drivers/acpi/blacklist.c
17924--- linux-2.6.32.8/drivers/acpi/blacklist.c 2010-02-09 07:57:19.000000000 -0500 18324--- linux-2.6.32.9/drivers/acpi/blacklist.c 2010-02-09 07:57:19.000000000 -0500
17925+++ linux-2.6.32.8/drivers/acpi/blacklist.c 2010-02-13 21:45:09.966914395 -0500 18325+++ linux-2.6.32.9/drivers/acpi/blacklist.c 2010-02-23 17:09:53.140103788 -0500
17926@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b 18326@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
17927 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, 18327 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
17928 "Incorrect _ADR", 1}, 18328 "Incorrect _ADR", 1},
@@ -17932,9 +18332,9 @@ diff -urNp linux-2.6.32.8/drivers/acpi/blacklist.c linux-2.6.32.8/drivers/acpi/b
17932 }; 18332 };
17933 18333
17934 #if CONFIG_ACPI_BLACKLIST_YEAR 18334 #if CONFIG_ACPI_BLACKLIST_YEAR
17935diff -urNp linux-2.6.32.8/drivers/acpi/dock.c linux-2.6.32.8/drivers/acpi/dock.c 18335diff -urNp linux-2.6.32.9/drivers/acpi/dock.c linux-2.6.32.9/drivers/acpi/dock.c
17936--- linux-2.6.32.8/drivers/acpi/dock.c 2010-02-09 07:57:19.000000000 -0500 18336--- linux-2.6.32.9/drivers/acpi/dock.c 2010-02-09 07:57:19.000000000 -0500
17937+++ linux-2.6.32.8/drivers/acpi/dock.c 2010-02-13 21:45:09.966914395 -0500 18337+++ linux-2.6.32.9/drivers/acpi/dock.c 2010-02-23 17:09:53.140103788 -0500
17938@@ -77,7 +77,7 @@ struct dock_dependent_device { 18338@@ -77,7 +77,7 @@ struct dock_dependent_device {
17939 struct list_head list; 18339 struct list_head list;
17940 struct list_head hotplug_list; 18340 struct list_head hotplug_list;
@@ -17953,9 +18353,9 @@ diff -urNp linux-2.6.32.8/drivers/acpi/dock.c linux-2.6.32.8/drivers/acpi/dock.c
17953 void *context) 18353 void *context)
17954 { 18354 {
17955 struct dock_dependent_device *dd; 18355 struct dock_dependent_device *dd;
17956diff -urNp linux-2.6.32.8/drivers/acpi/osl.c linux-2.6.32.8/drivers/acpi/osl.c 18356diff -urNp linux-2.6.32.9/drivers/acpi/osl.c linux-2.6.32.9/drivers/acpi/osl.c
17957--- linux-2.6.32.8/drivers/acpi/osl.c 2010-02-09 07:57:19.000000000 -0500 18357--- linux-2.6.32.9/drivers/acpi/osl.c 2010-02-09 07:57:19.000000000 -0500
17958+++ linux-2.6.32.8/drivers/acpi/osl.c 2010-02-13 21:45:09.966914395 -0500 18358+++ linux-2.6.32.9/drivers/acpi/osl.c 2010-02-23 17:09:53.140103788 -0500
17959@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres 18359@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
17960 void __iomem *virt_addr; 18360 void __iomem *virt_addr;
17961 18361
@@ -17974,9 +18374,9 @@ diff -urNp linux-2.6.32.8/drivers/acpi/osl.c linux-2.6.32.8/drivers/acpi/osl.c
17974 18374
17975 switch (width) { 18375 switch (width) {
17976 case 8: 18376 case 8:
17977diff -urNp linux-2.6.32.8/drivers/acpi/processor_core.c linux-2.6.32.8/drivers/acpi/processor_core.c 18377diff -urNp linux-2.6.32.9/drivers/acpi/processor_core.c linux-2.6.32.9/drivers/acpi/processor_core.c
17978--- linux-2.6.32.8/drivers/acpi/processor_core.c 2010-02-09 07:57:19.000000000 -0500 18378--- linux-2.6.32.9/drivers/acpi/processor_core.c 2010-02-09 07:57:19.000000000 -0500
17979+++ linux-2.6.32.8/drivers/acpi/processor_core.c 2010-02-13 21:45:09.967911024 -0500 18379+++ linux-2.6.32.9/drivers/acpi/processor_core.c 2010-02-23 17:09:53.140103788 -0500
17980@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( 18380@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add(
17981 return 0; 18381 return 0;
17982 } 18382 }
@@ -17986,21 +18386,21 @@ diff -urNp linux-2.6.32.8/drivers/acpi/processor_core.c linux-2.6.32.8/drivers/a
17986 18386
17987 /* 18387 /*
17988 * Buggy BIOS check 18388 * Buggy BIOS check
17989diff -urNp linux-2.6.32.8/drivers/acpi/processor_idle.c linux-2.6.32.8/drivers/acpi/processor_idle.c 18389diff -urNp linux-2.6.32.9/drivers/acpi/processor_idle.c linux-2.6.32.9/drivers/acpi/processor_idle.c
17990--- linux-2.6.32.8/drivers/acpi/processor_idle.c 2010-02-09 07:57:19.000000000 -0500 18390--- linux-2.6.32.9/drivers/acpi/processor_idle.c 2010-02-23 17:04:11.889592859 -0500
17991+++ linux-2.6.32.8/drivers/acpi/processor_idle.c 2010-02-13 21:45:09.967911024 -0500 18391+++ linux-2.6.32.9/drivers/acpi/processor_idle.c 2010-02-23 17:26:35.520309994 -0500
17992@@ -110,7 +110,7 @@ static struct dmi_system_id __cpuinitdat 18392@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat
17993 DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), 18393 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
17994 DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")}, 18394 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
17995 (void *)2}, 18395 (void *)1},
17996- {}, 18396- {},
17997+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL}, 18397+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL},
17998 }; 18398 };
17999 18399
18000 18400
18001diff -urNp linux-2.6.32.8/drivers/acpi/sleep.c linux-2.6.32.8/drivers/acpi/sleep.c 18401diff -urNp linux-2.6.32.9/drivers/acpi/sleep.c linux-2.6.32.9/drivers/acpi/sleep.c
18002--- linux-2.6.32.8/drivers/acpi/sleep.c 2010-02-09 07:57:19.000000000 -0500 18402--- linux-2.6.32.9/drivers/acpi/sleep.c 2010-02-09 07:57:19.000000000 -0500
18003+++ linux-2.6.32.8/drivers/acpi/sleep.c 2010-02-13 21:45:09.968667670 -0500 18403+++ linux-2.6.32.9/drivers/acpi/sleep.c 2010-02-23 17:09:53.140103788 -0500
18004@@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp 18404@@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp
18005 } 18405 }
18006 } 18406 }
@@ -18037,9 +18437,9 @@ diff -urNp linux-2.6.32.8/drivers/acpi/sleep.c linux-2.6.32.8/drivers/acpi/sleep
18037 .begin = acpi_hibernation_begin_old, 18437 .begin = acpi_hibernation_begin_old,
18038 .end = acpi_pm_end, 18438 .end = acpi_pm_end,
18039 .pre_snapshot = acpi_hibernation_pre_snapshot_old, 18439 .pre_snapshot = acpi_hibernation_pre_snapshot_old,
18040diff -urNp linux-2.6.32.8/drivers/acpi/video.c linux-2.6.32.8/drivers/acpi/video.c 18440diff -urNp linux-2.6.32.9/drivers/acpi/video.c linux-2.6.32.9/drivers/acpi/video.c
18041--- linux-2.6.32.8/drivers/acpi/video.c 2010-02-09 07:57:19.000000000 -0500 18441--- linux-2.6.32.9/drivers/acpi/video.c 2010-02-09 07:57:19.000000000 -0500
18042+++ linux-2.6.32.8/drivers/acpi/video.c 2010-02-13 21:45:09.968667670 -0500 18442+++ linux-2.6.32.9/drivers/acpi/video.c 2010-02-23 17:09:53.144538224 -0500
18043@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str 18443@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
18044 vd->brightness->levels[request_level]); 18444 vd->brightness->levels[request_level]);
18045 } 18445 }
@@ -18049,9 +18449,9 @@ diff -urNp linux-2.6.32.8/drivers/acpi/video.c linux-2.6.32.8/drivers/acpi/video
18049 .get_brightness = acpi_video_get_brightness, 18449 .get_brightness = acpi_video_get_brightness,
18050 .update_status = acpi_video_set_brightness, 18450 .update_status = acpi_video_set_brightness,
18051 }; 18451 };
18052diff -urNp linux-2.6.32.8/drivers/ata/ahci.c linux-2.6.32.8/drivers/ata/ahci.c 18452diff -urNp linux-2.6.32.9/drivers/ata/ahci.c linux-2.6.32.9/drivers/ata/ahci.c
18053--- linux-2.6.32.8/drivers/ata/ahci.c 2010-02-09 07:57:19.000000000 -0500 18453--- linux-2.6.32.9/drivers/ata/ahci.c 2010-02-23 17:04:11.996660027 -0500
18054+++ linux-2.6.32.8/drivers/ata/ahci.c 2010-02-13 21:45:09.968667670 -0500 18454+++ linux-2.6.32.9/drivers/ata/ahci.c 2010-02-23 17:09:53.144538224 -0500
18055@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh 18455@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
18056 .sdev_attrs = ahci_sdev_attrs, 18456 .sdev_attrs = ahci_sdev_attrs,
18057 }; 18457 };
@@ -18091,9 +18491,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/ahci.c linux-2.6.32.8/drivers/ata/ahci.c
18091 }; 18491 };
18092 18492
18093 18493
18094diff -urNp linux-2.6.32.8/drivers/ata/ata_generic.c linux-2.6.32.8/drivers/ata/ata_generic.c 18494diff -urNp linux-2.6.32.9/drivers/ata/ata_generic.c linux-2.6.32.9/drivers/ata/ata_generic.c
18095--- linux-2.6.32.8/drivers/ata/ata_generic.c 2010-02-09 07:57:19.000000000 -0500 18495--- linux-2.6.32.9/drivers/ata/ata_generic.c 2010-02-09 07:57:19.000000000 -0500
18096+++ linux-2.6.32.8/drivers/ata/ata_generic.c 2010-02-13 21:45:09.969913365 -0500 18496+++ linux-2.6.32.9/drivers/ata/ata_generic.c 2010-02-23 17:09:53.144538224 -0500
18097@@ -95,7 +95,7 @@ static struct scsi_host_template generic 18497@@ -95,7 +95,7 @@ static struct scsi_host_template generic
18098 ATA_BMDMA_SHT(DRV_NAME), 18498 ATA_BMDMA_SHT(DRV_NAME),
18099 }; 18499 };
@@ -18103,9 +18503,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/ata_generic.c linux-2.6.32.8/drivers/ata/a
18103 .inherits = &ata_bmdma_port_ops, 18503 .inherits = &ata_bmdma_port_ops,
18104 .cable_detect = ata_cable_unknown, 18504 .cable_detect = ata_cable_unknown,
18105 .set_mode = generic_set_mode, 18505 .set_mode = generic_set_mode,
18106diff -urNp linux-2.6.32.8/drivers/ata/ata_piix.c linux-2.6.32.8/drivers/ata/ata_piix.c 18506diff -urNp linux-2.6.32.9/drivers/ata/ata_piix.c linux-2.6.32.9/drivers/ata/ata_piix.c
18107--- linux-2.6.32.8/drivers/ata/ata_piix.c 2010-02-09 07:57:19.000000000 -0500 18507--- linux-2.6.32.9/drivers/ata/ata_piix.c 2010-02-09 07:57:19.000000000 -0500
18108+++ linux-2.6.32.8/drivers/ata/ata_piix.c 2010-02-13 21:45:09.969913365 -0500 18508+++ linux-2.6.32.9/drivers/ata/ata_piix.c 2010-02-23 17:09:53.144538224 -0500
18109@@ -291,7 +291,7 @@ static const struct pci_device_id piix_p 18509@@ -291,7 +291,7 @@ static const struct pci_device_id piix_p
18110 { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, 18510 { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
18111 /* SATA Controller IDE (PCH) */ 18511 /* SATA Controller IDE (PCH) */
@@ -18169,9 +18569,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/ata_piix.c linux-2.6.32.8/drivers/ata/ata_
18169 }; 18569 };
18170 static const char *oemstrs[] = { 18570 static const char *oemstrs[] = {
18171 "Tecra M3,", 18571 "Tecra M3,",
18172diff -urNp linux-2.6.32.8/drivers/ata/libata-acpi.c linux-2.6.32.8/drivers/ata/libata-acpi.c 18572diff -urNp linux-2.6.32.9/drivers/ata/libata-acpi.c linux-2.6.32.9/drivers/ata/libata-acpi.c
18173--- linux-2.6.32.8/drivers/ata/libata-acpi.c 2010-02-09 07:57:19.000000000 -0500 18573--- linux-2.6.32.9/drivers/ata/libata-acpi.c 2010-02-09 07:57:19.000000000 -0500
18174+++ linux-2.6.32.8/drivers/ata/libata-acpi.c 2010-02-13 21:45:09.970607464 -0500 18574+++ linux-2.6.32.9/drivers/ata/libata-acpi.c 2010-02-23 17:09:53.144538224 -0500
18175@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han 18575@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
18176 ata_acpi_uevent(dev->link->ap, dev, event); 18576 ata_acpi_uevent(dev->link->ap, dev, event);
18177 } 18577 }
@@ -18187,9 +18587,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/libata-acpi.c linux-2.6.32.8/drivers/ata/l
18187 .handler = ata_acpi_ap_notify_dock, 18587 .handler = ata_acpi_ap_notify_dock,
18188 .uevent = ata_acpi_ap_uevent, 18588 .uevent = ata_acpi_ap_uevent,
18189 }; 18589 };
18190diff -urNp linux-2.6.32.8/drivers/ata/libata-core.c linux-2.6.32.8/drivers/ata/libata-core.c 18590diff -urNp linux-2.6.32.9/drivers/ata/libata-core.c linux-2.6.32.9/drivers/ata/libata-core.c
18191--- linux-2.6.32.8/drivers/ata/libata-core.c 2010-02-09 07:57:19.000000000 -0500 18591--- linux-2.6.32.9/drivers/ata/libata-core.c 2010-02-09 07:57:19.000000000 -0500
18192+++ linux-2.6.32.8/drivers/ata/libata-core.c 2010-02-13 21:45:09.971561414 -0500 18592+++ linux-2.6.32.9/drivers/ata/libata-core.c 2010-02-23 17:09:53.144538224 -0500
18193@@ -896,7 +896,7 @@ static const struct ata_xfer_ent { 18593@@ -896,7 +896,7 @@ static const struct ata_xfer_ent {
18194 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, 18594 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
18195 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, 18595 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
@@ -18263,9 +18663,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/libata-core.c linux-2.6.32.8/drivers/ata/l
18263 .qc_prep = ata_noop_qc_prep, 18663 .qc_prep = ata_noop_qc_prep,
18264 .qc_issue = ata_dummy_qc_issue, 18664 .qc_issue = ata_dummy_qc_issue,
18265 .error_handler = ata_dummy_error_handler, 18665 .error_handler = ata_dummy_error_handler,
18266diff -urNp linux-2.6.32.8/drivers/ata/libata-eh.c linux-2.6.32.8/drivers/ata/libata-eh.c 18666diff -urNp linux-2.6.32.9/drivers/ata/libata-eh.c linux-2.6.32.9/drivers/ata/libata-eh.c
18267--- linux-2.6.32.8/drivers/ata/libata-eh.c 2010-02-09 07:57:19.000000000 -0500 18667--- linux-2.6.32.9/drivers/ata/libata-eh.c 2010-02-09 07:57:19.000000000 -0500
18268+++ linux-2.6.32.8/drivers/ata/libata-eh.c 2010-02-13 21:45:09.972566875 -0500 18668+++ linux-2.6.32.9/drivers/ata/libata-eh.c 2010-02-23 17:09:53.148068131 -0500
18269@@ -3581,7 +3581,7 @@ void ata_do_eh(struct ata_port *ap, ata_ 18669@@ -3581,7 +3581,7 @@ void ata_do_eh(struct ata_port *ap, ata_
18270 */ 18670 */
18271 void ata_std_error_handler(struct ata_port *ap) 18671 void ata_std_error_handler(struct ata_port *ap)
@@ -18275,9 +18675,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/libata-eh.c linux-2.6.32.8/drivers/ata/lib
18275 ata_reset_fn_t hardreset = ops->hardreset; 18675 ata_reset_fn_t hardreset = ops->hardreset;
18276 18676
18277 /* ignore built-in hardreset if SCR access is not available */ 18677 /* ignore built-in hardreset if SCR access is not available */
18278diff -urNp linux-2.6.32.8/drivers/ata/libata-pmp.c linux-2.6.32.8/drivers/ata/libata-pmp.c 18678diff -urNp linux-2.6.32.9/drivers/ata/libata-pmp.c linux-2.6.32.9/drivers/ata/libata-pmp.c
18279--- linux-2.6.32.8/drivers/ata/libata-pmp.c 2010-02-09 07:57:19.000000000 -0500 18679--- linux-2.6.32.9/drivers/ata/libata-pmp.c 2010-02-09 07:57:19.000000000 -0500
18280+++ linux-2.6.32.8/drivers/ata/libata-pmp.c 2010-02-13 21:45:09.972566875 -0500 18680+++ linux-2.6.32.9/drivers/ata/libata-pmp.c 2010-02-23 17:09:53.148068131 -0500
18281@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str 18681@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
18282 */ 18682 */
18283 static int sata_pmp_eh_recover(struct ata_port *ap) 18683 static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -18287,9 +18687,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/libata-pmp.c linux-2.6.32.8/drivers/ata/li
18287 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; 18687 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
18288 struct ata_link *pmp_link = &ap->link; 18688 struct ata_link *pmp_link = &ap->link;
18289 struct ata_device *pmp_dev = pmp_link->device; 18689 struct ata_device *pmp_dev = pmp_link->device;
18290diff -urNp linux-2.6.32.8/drivers/ata/pata_acpi.c linux-2.6.32.8/drivers/ata/pata_acpi.c 18690diff -urNp linux-2.6.32.9/drivers/ata/pata_acpi.c linux-2.6.32.9/drivers/ata/pata_acpi.c
18291--- linux-2.6.32.8/drivers/ata/pata_acpi.c 2010-02-09 07:57:19.000000000 -0500 18691--- linux-2.6.32.9/drivers/ata/pata_acpi.c 2010-02-09 07:57:19.000000000 -0500
18292+++ linux-2.6.32.8/drivers/ata/pata_acpi.c 2010-02-13 21:45:09.972566875 -0500 18692+++ linux-2.6.32.9/drivers/ata/pata_acpi.c 2010-02-23 17:09:53.148068131 -0500
18293@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s 18693@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
18294 ATA_BMDMA_SHT(DRV_NAME), 18694 ATA_BMDMA_SHT(DRV_NAME),
18295 }; 18695 };
@@ -18299,9 +18699,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_acpi.c linux-2.6.32.8/drivers/ata/pat
18299 .inherits = &ata_bmdma_port_ops, 18699 .inherits = &ata_bmdma_port_ops,
18300 .qc_issue = pacpi_qc_issue, 18700 .qc_issue = pacpi_qc_issue,
18301 .cable_detect = pacpi_cable_detect, 18701 .cable_detect = pacpi_cable_detect,
18302diff -urNp linux-2.6.32.8/drivers/ata/pata_ali.c linux-2.6.32.8/drivers/ata/pata_ali.c 18702diff -urNp linux-2.6.32.9/drivers/ata/pata_ali.c linux-2.6.32.9/drivers/ata/pata_ali.c
18303--- linux-2.6.32.8/drivers/ata/pata_ali.c 2010-02-09 07:57:19.000000000 -0500 18703--- linux-2.6.32.9/drivers/ata/pata_ali.c 2010-02-09 07:57:19.000000000 -0500
18304+++ linux-2.6.32.8/drivers/ata/pata_ali.c 2010-02-13 21:45:09.972566875 -0500 18704+++ linux-2.6.32.9/drivers/ata/pata_ali.c 2010-02-23 17:09:53.148068131 -0500
18305@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht 18705@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
18306 * Port operations for PIO only ALi 18706 * Port operations for PIO only ALi
18307 */ 18707 */
@@ -18347,9 +18747,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_ali.c linux-2.6.32.8/drivers/ata/pata
18347 .inherits = &ali_dma_base_ops, 18747 .inherits = &ali_dma_base_ops,
18348 .check_atapi_dma = ali_check_atapi_dma, 18748 .check_atapi_dma = ali_check_atapi_dma,
18349 .dev_config = ali_warn_atapi_dma, 18749 .dev_config = ali_warn_atapi_dma,
18350diff -urNp linux-2.6.32.8/drivers/ata/pata_amd.c linux-2.6.32.8/drivers/ata/pata_amd.c 18750diff -urNp linux-2.6.32.9/drivers/ata/pata_amd.c linux-2.6.32.9/drivers/ata/pata_amd.c
18351--- linux-2.6.32.8/drivers/ata/pata_amd.c 2010-02-09 07:57:19.000000000 -0500 18751--- linux-2.6.32.9/drivers/ata/pata_amd.c 2010-02-09 07:57:19.000000000 -0500
18352+++ linux-2.6.32.8/drivers/ata/pata_amd.c 2010-02-13 21:45:09.973742262 -0500 18752+++ linux-2.6.32.9/drivers/ata/pata_amd.c 2010-02-23 17:09:53.148068131 -0500
18353@@ -397,28 +397,28 @@ static const struct ata_port_operations 18753@@ -397,28 +397,28 @@ static const struct ata_port_operations
18354 .prereset = amd_pre_reset, 18754 .prereset = amd_pre_reset,
18355 }; 18755 };
@@ -18399,9 +18799,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_amd.c linux-2.6.32.8/drivers/ata/pata
18399 .inherits = &nv_base_port_ops, 18799 .inherits = &nv_base_port_ops,
18400 .set_piomode = nv133_set_piomode, 18800 .set_piomode = nv133_set_piomode,
18401 .set_dmamode = nv133_set_dmamode, 18801 .set_dmamode = nv133_set_dmamode,
18402diff -urNp linux-2.6.32.8/drivers/ata/pata_artop.c linux-2.6.32.8/drivers/ata/pata_artop.c 18802diff -urNp linux-2.6.32.9/drivers/ata/pata_artop.c linux-2.6.32.9/drivers/ata/pata_artop.c
18403--- linux-2.6.32.8/drivers/ata/pata_artop.c 2010-02-09 07:57:19.000000000 -0500 18803--- linux-2.6.32.9/drivers/ata/pata_artop.c 2010-02-09 07:57:19.000000000 -0500
18404+++ linux-2.6.32.8/drivers/ata/pata_artop.c 2010-02-13 21:45:09.973742262 -0500 18804+++ linux-2.6.32.9/drivers/ata/pata_artop.c 2010-02-23 17:09:53.148068131 -0500
18405@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s 18805@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
18406 ATA_BMDMA_SHT(DRV_NAME), 18806 ATA_BMDMA_SHT(DRV_NAME),
18407 }; 18807 };
@@ -18420,9 +18820,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_artop.c linux-2.6.32.8/drivers/ata/pa
18420 .inherits = &ata_bmdma_port_ops, 18820 .inherits = &ata_bmdma_port_ops,
18421 .cable_detect = artop6260_cable_detect, 18821 .cable_detect = artop6260_cable_detect,
18422 .set_piomode = artop6260_set_piomode, 18822 .set_piomode = artop6260_set_piomode,
18423diff -urNp linux-2.6.32.8/drivers/ata/pata_at32.c linux-2.6.32.8/drivers/ata/pata_at32.c 18823diff -urNp linux-2.6.32.9/drivers/ata/pata_at32.c linux-2.6.32.9/drivers/ata/pata_at32.c
18424--- linux-2.6.32.8/drivers/ata/pata_at32.c 2010-02-09 07:57:19.000000000 -0500 18824--- linux-2.6.32.9/drivers/ata/pata_at32.c 2010-02-09 07:57:19.000000000 -0500
18425+++ linux-2.6.32.8/drivers/ata/pata_at32.c 2010-02-13 21:45:09.973742262 -0500 18825+++ linux-2.6.32.9/drivers/ata/pata_at32.c 2010-02-23 17:09:53.148068131 -0500
18426@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh 18826@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
18427 ATA_PIO_SHT(DRV_NAME), 18827 ATA_PIO_SHT(DRV_NAME),
18428 }; 18828 };
@@ -18432,9 +18832,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_at32.c linux-2.6.32.8/drivers/ata/pat
18432 .inherits = &ata_sff_port_ops, 18832 .inherits = &ata_sff_port_ops,
18433 .cable_detect = ata_cable_40wire, 18833 .cable_detect = ata_cable_40wire,
18434 .set_piomode = pata_at32_set_piomode, 18834 .set_piomode = pata_at32_set_piomode,
18435diff -urNp linux-2.6.32.8/drivers/ata/pata_at91.c linux-2.6.32.8/drivers/ata/pata_at91.c 18835diff -urNp linux-2.6.32.9/drivers/ata/pata_at91.c linux-2.6.32.9/drivers/ata/pata_at91.c
18436--- linux-2.6.32.8/drivers/ata/pata_at91.c 2010-02-09 07:57:19.000000000 -0500 18836--- linux-2.6.32.9/drivers/ata/pata_at91.c 2010-02-09 07:57:19.000000000 -0500
18437+++ linux-2.6.32.8/drivers/ata/pata_at91.c 2010-02-13 21:45:09.973742262 -0500 18837+++ linux-2.6.32.9/drivers/ata/pata_at91.c 2010-02-23 17:09:53.148068131 -0500
18438@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at 18838@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
18439 ATA_PIO_SHT(DRV_NAME), 18839 ATA_PIO_SHT(DRV_NAME),
18440 }; 18840 };
@@ -18444,9 +18844,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_at91.c linux-2.6.32.8/drivers/ata/pat
18444 .inherits = &ata_sff_port_ops, 18844 .inherits = &ata_sff_port_ops,
18445 18845
18446 .sff_data_xfer = pata_at91_data_xfer_noirq, 18846 .sff_data_xfer = pata_at91_data_xfer_noirq,
18447diff -urNp linux-2.6.32.8/drivers/ata/pata_atiixp.c linux-2.6.32.8/drivers/ata/pata_atiixp.c 18847diff -urNp linux-2.6.32.9/drivers/ata/pata_atiixp.c linux-2.6.32.9/drivers/ata/pata_atiixp.c
18448--- linux-2.6.32.8/drivers/ata/pata_atiixp.c 2010-02-09 07:57:19.000000000 -0500 18848--- linux-2.6.32.9/drivers/ata/pata_atiixp.c 2010-02-09 07:57:19.000000000 -0500
18449+++ linux-2.6.32.8/drivers/ata/pata_atiixp.c 2010-02-13 21:45:09.973742262 -0500 18849+++ linux-2.6.32.9/drivers/ata/pata_atiixp.c 2010-02-23 17:09:53.148068131 -0500
18450@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ 18850@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
18451 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 18851 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
18452 }; 18852 };
@@ -18456,9 +18856,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_atiixp.c linux-2.6.32.8/drivers/ata/p
18456 .inherits = &ata_bmdma_port_ops, 18856 .inherits = &ata_bmdma_port_ops,
18457 18857
18458 .qc_prep = ata_sff_dumb_qc_prep, 18858 .qc_prep = ata_sff_dumb_qc_prep,
18459diff -urNp linux-2.6.32.8/drivers/ata/pata_atp867x.c linux-2.6.32.8/drivers/ata/pata_atp867x.c 18859diff -urNp linux-2.6.32.9/drivers/ata/pata_atp867x.c linux-2.6.32.9/drivers/ata/pata_atp867x.c
18460--- linux-2.6.32.8/drivers/ata/pata_atp867x.c 2010-02-09 07:57:19.000000000 -0500 18860--- linux-2.6.32.9/drivers/ata/pata_atp867x.c 2010-02-09 07:57:19.000000000 -0500
18461+++ linux-2.6.32.8/drivers/ata/pata_atp867x.c 2010-02-13 21:45:09.973742262 -0500 18861+++ linux-2.6.32.9/drivers/ata/pata_atp867x.c 2010-02-23 17:09:53.148068131 -0500
18462@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x 18862@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
18463 ATA_BMDMA_SHT(DRV_NAME), 18863 ATA_BMDMA_SHT(DRV_NAME),
18464 }; 18864 };
@@ -18468,9 +18868,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_atp867x.c linux-2.6.32.8/drivers/ata/
18468 .inherits = &ata_bmdma_port_ops, 18868 .inherits = &ata_bmdma_port_ops,
18469 .cable_detect = atp867x_cable_detect, 18869 .cable_detect = atp867x_cable_detect,
18470 .set_piomode = atp867x_set_piomode, 18870 .set_piomode = atp867x_set_piomode,
18471diff -urNp linux-2.6.32.8/drivers/ata/pata_bf54x.c linux-2.6.32.8/drivers/ata/pata_bf54x.c 18871diff -urNp linux-2.6.32.9/drivers/ata/pata_bf54x.c linux-2.6.32.9/drivers/ata/pata_bf54x.c
18472--- linux-2.6.32.8/drivers/ata/pata_bf54x.c 2010-02-09 07:57:19.000000000 -0500 18872--- linux-2.6.32.9/drivers/ata/pata_bf54x.c 2010-02-09 07:57:19.000000000 -0500
18473+++ linux-2.6.32.8/drivers/ata/pata_bf54x.c 2010-02-13 21:45:09.974924005 -0500 18873+++ linux-2.6.32.9/drivers/ata/pata_bf54x.c 2010-02-23 17:09:53.148068131 -0500
18474@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh 18874@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
18475 .dma_boundary = ATA_DMA_BOUNDARY, 18875 .dma_boundary = ATA_DMA_BOUNDARY,
18476 }; 18876 };
@@ -18480,9 +18880,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_bf54x.c linux-2.6.32.8/drivers/ata/pa
18480 .inherits = &ata_sff_port_ops, 18880 .inherits = &ata_sff_port_ops,
18481 18881
18482 .set_piomode = bfin_set_piomode, 18882 .set_piomode = bfin_set_piomode,
18483diff -urNp linux-2.6.32.8/drivers/ata/pata_cmd640.c linux-2.6.32.8/drivers/ata/pata_cmd640.c 18883diff -urNp linux-2.6.32.9/drivers/ata/pata_cmd640.c linux-2.6.32.9/drivers/ata/pata_cmd640.c
18484--- linux-2.6.32.8/drivers/ata/pata_cmd640.c 2010-02-09 07:57:19.000000000 -0500 18884--- linux-2.6.32.9/drivers/ata/pata_cmd640.c 2010-02-09 07:57:19.000000000 -0500
18485+++ linux-2.6.32.8/drivers/ata/pata_cmd640.c 2010-02-13 21:45:09.974924005 -0500 18885+++ linux-2.6.32.9/drivers/ata/pata_cmd640.c 2010-02-23 17:09:53.148068131 -0500
18486@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ 18886@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
18487 ATA_BMDMA_SHT(DRV_NAME), 18887 ATA_BMDMA_SHT(DRV_NAME),
18488 }; 18888 };
@@ -18492,9 +18892,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_cmd640.c linux-2.6.32.8/drivers/ata/p
18492 .inherits = &ata_bmdma_port_ops, 18892 .inherits = &ata_bmdma_port_ops,
18493 /* In theory xfer_noirq is not needed once we kill the prefetcher */ 18893 /* In theory xfer_noirq is not needed once we kill the prefetcher */
18494 .sff_data_xfer = ata_sff_data_xfer_noirq, 18894 .sff_data_xfer = ata_sff_data_xfer_noirq,
18495diff -urNp linux-2.6.32.8/drivers/ata/pata_cmd64x.c linux-2.6.32.8/drivers/ata/pata_cmd64x.c 18895diff -urNp linux-2.6.32.9/drivers/ata/pata_cmd64x.c linux-2.6.32.9/drivers/ata/pata_cmd64x.c
18496--- linux-2.6.32.8/drivers/ata/pata_cmd64x.c 2010-02-09 07:57:19.000000000 -0500 18896--- linux-2.6.32.9/drivers/ata/pata_cmd64x.c 2010-02-09 07:57:19.000000000 -0500
18497+++ linux-2.6.32.8/drivers/ata/pata_cmd64x.c 2010-02-13 21:45:09.974924005 -0500 18897+++ linux-2.6.32.9/drivers/ata/pata_cmd64x.c 2010-02-23 17:09:53.148068131 -0500
18498@@ -275,18 +275,18 @@ static const struct ata_port_operations 18898@@ -275,18 +275,18 @@ static const struct ata_port_operations
18499 .set_dmamode = cmd64x_set_dmamode, 18899 .set_dmamode = cmd64x_set_dmamode,
18500 }; 18900 };
@@ -18517,9 +18917,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_cmd64x.c linux-2.6.32.8/drivers/ata/p
18517 .inherits = &cmd64x_base_ops, 18917 .inherits = &cmd64x_base_ops,
18518 .bmdma_stop = cmd648_bmdma_stop, 18918 .bmdma_stop = cmd648_bmdma_stop,
18519 .cable_detect = cmd648_cable_detect, 18919 .cable_detect = cmd648_cable_detect,
18520diff -urNp linux-2.6.32.8/drivers/ata/pata_cs5520.c linux-2.6.32.8/drivers/ata/pata_cs5520.c 18920diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5520.c linux-2.6.32.9/drivers/ata/pata_cs5520.c
18521--- linux-2.6.32.8/drivers/ata/pata_cs5520.c 2010-02-09 07:57:19.000000000 -0500 18921--- linux-2.6.32.9/drivers/ata/pata_cs5520.c 2010-02-09 07:57:19.000000000 -0500
18522+++ linux-2.6.32.8/drivers/ata/pata_cs5520.c 2010-02-13 21:45:09.974924005 -0500 18922+++ linux-2.6.32.9/drivers/ata/pata_cs5520.c 2010-02-23 17:09:53.148068131 -0500
18523@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ 18923@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
18524 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 18924 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
18525 }; 18925 };
@@ -18529,9 +18929,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_cs5520.c linux-2.6.32.8/drivers/ata/p
18529 .inherits = &ata_bmdma_port_ops, 18929 .inherits = &ata_bmdma_port_ops,
18530 .qc_prep = ata_sff_dumb_qc_prep, 18930 .qc_prep = ata_sff_dumb_qc_prep,
18531 .cable_detect = ata_cable_40wire, 18931 .cable_detect = ata_cable_40wire,
18532diff -urNp linux-2.6.32.8/drivers/ata/pata_cs5530.c linux-2.6.32.8/drivers/ata/pata_cs5530.c 18932diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5530.c linux-2.6.32.9/drivers/ata/pata_cs5530.c
18533--- linux-2.6.32.8/drivers/ata/pata_cs5530.c 2010-02-09 07:57:19.000000000 -0500 18933--- linux-2.6.32.9/drivers/ata/pata_cs5530.c 2010-02-09 07:57:19.000000000 -0500
18534+++ linux-2.6.32.8/drivers/ata/pata_cs5530.c 2010-02-13 21:45:09.974924005 -0500 18934+++ linux-2.6.32.9/drivers/ata/pata_cs5530.c 2010-02-23 17:09:53.148068131 -0500
18535@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ 18935@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
18536 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 18936 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
18537 }; 18937 };
@@ -18541,9 +18941,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_cs5530.c linux-2.6.32.8/drivers/ata/p
18541 .inherits = &ata_bmdma_port_ops, 18941 .inherits = &ata_bmdma_port_ops,
18542 18942
18543 .qc_prep = ata_sff_dumb_qc_prep, 18943 .qc_prep = ata_sff_dumb_qc_prep,
18544diff -urNp linux-2.6.32.8/drivers/ata/pata_cs5535.c linux-2.6.32.8/drivers/ata/pata_cs5535.c 18944diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5535.c linux-2.6.32.9/drivers/ata/pata_cs5535.c
18545--- linux-2.6.32.8/drivers/ata/pata_cs5535.c 2010-02-09 07:57:19.000000000 -0500 18945--- linux-2.6.32.9/drivers/ata/pata_cs5535.c 2010-02-09 07:57:19.000000000 -0500
18546+++ linux-2.6.32.8/drivers/ata/pata_cs5535.c 2010-02-13 21:45:09.975874127 -0500 18946+++ linux-2.6.32.9/drivers/ata/pata_cs5535.c 2010-02-23 17:09:53.148068131 -0500
18547@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ 18947@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
18548 ATA_BMDMA_SHT(DRV_NAME), 18948 ATA_BMDMA_SHT(DRV_NAME),
18549 }; 18949 };
@@ -18553,9 +18953,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_cs5535.c linux-2.6.32.8/drivers/ata/p
18553 .inherits = &ata_bmdma_port_ops, 18953 .inherits = &ata_bmdma_port_ops,
18554 .cable_detect = cs5535_cable_detect, 18954 .cable_detect = cs5535_cable_detect,
18555 .set_piomode = cs5535_set_piomode, 18955 .set_piomode = cs5535_set_piomode,
18556diff -urNp linux-2.6.32.8/drivers/ata/pata_cs5536.c linux-2.6.32.8/drivers/ata/pata_cs5536.c 18956diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5536.c linux-2.6.32.9/drivers/ata/pata_cs5536.c
18557--- linux-2.6.32.8/drivers/ata/pata_cs5536.c 2010-02-09 07:57:19.000000000 -0500 18957--- linux-2.6.32.9/drivers/ata/pata_cs5536.c 2010-02-09 07:57:19.000000000 -0500
18558+++ linux-2.6.32.8/drivers/ata/pata_cs5536.c 2010-02-13 21:45:09.975874127 -0500 18958+++ linux-2.6.32.9/drivers/ata/pata_cs5536.c 2010-02-23 17:09:53.148068131 -0500
18559@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ 18959@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
18560 ATA_BMDMA_SHT(DRV_NAME), 18960 ATA_BMDMA_SHT(DRV_NAME),
18561 }; 18961 };
@@ -18565,9 +18965,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_cs5536.c linux-2.6.32.8/drivers/ata/p
18565 .inherits = &ata_bmdma_port_ops, 18965 .inherits = &ata_bmdma_port_ops,
18566 .cable_detect = cs5536_cable_detect, 18966 .cable_detect = cs5536_cable_detect,
18567 .set_piomode = cs5536_set_piomode, 18967 .set_piomode = cs5536_set_piomode,
18568diff -urNp linux-2.6.32.8/drivers/ata/pata_cypress.c linux-2.6.32.8/drivers/ata/pata_cypress.c 18968diff -urNp linux-2.6.32.9/drivers/ata/pata_cypress.c linux-2.6.32.9/drivers/ata/pata_cypress.c
18569--- linux-2.6.32.8/drivers/ata/pata_cypress.c 2010-02-09 07:57:19.000000000 -0500 18969--- linux-2.6.32.9/drivers/ata/pata_cypress.c 2010-02-09 07:57:19.000000000 -0500
18570+++ linux-2.6.32.8/drivers/ata/pata_cypress.c 2010-02-13 21:45:09.975874127 -0500 18970+++ linux-2.6.32.9/drivers/ata/pata_cypress.c 2010-02-23 17:09:53.148068131 -0500
18571@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 18971@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
18572 ATA_BMDMA_SHT(DRV_NAME), 18972 ATA_BMDMA_SHT(DRV_NAME),
18573 }; 18973 };
@@ -18577,9 +18977,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_cypress.c linux-2.6.32.8/drivers/ata/
18577 .inherits = &ata_bmdma_port_ops, 18977 .inherits = &ata_bmdma_port_ops,
18578 .cable_detect = ata_cable_40wire, 18978 .cable_detect = ata_cable_40wire,
18579 .set_piomode = cy82c693_set_piomode, 18979 .set_piomode = cy82c693_set_piomode,
18580diff -urNp linux-2.6.32.8/drivers/ata/pata_efar.c linux-2.6.32.8/drivers/ata/pata_efar.c 18980diff -urNp linux-2.6.32.9/drivers/ata/pata_efar.c linux-2.6.32.9/drivers/ata/pata_efar.c
18581--- linux-2.6.32.8/drivers/ata/pata_efar.c 2010-02-09 07:57:19.000000000 -0500 18981--- linux-2.6.32.9/drivers/ata/pata_efar.c 2010-02-09 07:57:19.000000000 -0500
18582+++ linux-2.6.32.8/drivers/ata/pata_efar.c 2010-02-13 21:45:09.975874127 -0500 18982+++ linux-2.6.32.9/drivers/ata/pata_efar.c 2010-02-23 17:09:53.148068131 -0500
18583@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh 18983@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
18584 ATA_BMDMA_SHT(DRV_NAME), 18984 ATA_BMDMA_SHT(DRV_NAME),
18585 }; 18985 };
@@ -18589,9 +18989,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_efar.c linux-2.6.32.8/drivers/ata/pat
18589 .inherits = &ata_bmdma_port_ops, 18989 .inherits = &ata_bmdma_port_ops,
18590 .cable_detect = efar_cable_detect, 18990 .cable_detect = efar_cable_detect,
18591 .set_piomode = efar_set_piomode, 18991 .set_piomode = efar_set_piomode,
18592diff -urNp linux-2.6.32.8/drivers/ata/pata_hpt366.c linux-2.6.32.8/drivers/ata/pata_hpt366.c 18992diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt366.c linux-2.6.32.9/drivers/ata/pata_hpt366.c
18593--- linux-2.6.32.8/drivers/ata/pata_hpt366.c 2010-02-09 07:57:19.000000000 -0500 18993--- linux-2.6.32.9/drivers/ata/pata_hpt366.c 2010-02-09 07:57:19.000000000 -0500
18594+++ linux-2.6.32.8/drivers/ata/pata_hpt366.c 2010-02-13 21:45:09.975874127 -0500 18994+++ linux-2.6.32.9/drivers/ata/pata_hpt366.c 2010-02-23 17:09:53.148068131 -0500
18595@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ 18995@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
18596 * Configuration for HPT366/68 18996 * Configuration for HPT366/68
18597 */ 18997 */
@@ -18601,9 +19001,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_hpt366.c linux-2.6.32.8/drivers/ata/p
18601 .inherits = &ata_bmdma_port_ops, 19001 .inherits = &ata_bmdma_port_ops,
18602 .cable_detect = hpt36x_cable_detect, 19002 .cable_detect = hpt36x_cable_detect,
18603 .mode_filter = hpt366_filter, 19003 .mode_filter = hpt366_filter,
18604diff -urNp linux-2.6.32.8/drivers/ata/pata_hpt37x.c linux-2.6.32.8/drivers/ata/pata_hpt37x.c 19004diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt37x.c linux-2.6.32.9/drivers/ata/pata_hpt37x.c
18605--- linux-2.6.32.8/drivers/ata/pata_hpt37x.c 2010-02-09 07:57:19.000000000 -0500 19005--- linux-2.6.32.9/drivers/ata/pata_hpt37x.c 2010-02-09 07:57:19.000000000 -0500
18606+++ linux-2.6.32.8/drivers/ata/pata_hpt37x.c 2010-02-13 21:45:09.976718792 -0500 19006+++ linux-2.6.32.9/drivers/ata/pata_hpt37x.c 2010-02-23 17:09:53.148068131 -0500
18607@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ 19007@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
18608 * Configuration for HPT370 19008 * Configuration for HPT370
18609 */ 19009 */
@@ -18640,9 +19040,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_hpt37x.c linux-2.6.32.8/drivers/ata/p
18640 .inherits = &hpt372_port_ops, 19040 .inherits = &hpt372_port_ops,
18641 .prereset = hpt374_fn1_pre_reset, 19041 .prereset = hpt374_fn1_pre_reset,
18642 }; 19042 };
18643diff -urNp linux-2.6.32.8/drivers/ata/pata_hpt3x2n.c linux-2.6.32.8/drivers/ata/pata_hpt3x2n.c 19043diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt3x2n.c linux-2.6.32.9/drivers/ata/pata_hpt3x2n.c
18644--- linux-2.6.32.8/drivers/ata/pata_hpt3x2n.c 2010-02-09 07:57:19.000000000 -0500 19044--- linux-2.6.32.9/drivers/ata/pata_hpt3x2n.c 2010-02-09 07:57:19.000000000 -0500
18645+++ linux-2.6.32.8/drivers/ata/pata_hpt3x2n.c 2010-02-13 21:45:09.976718792 -0500 19045+++ linux-2.6.32.9/drivers/ata/pata_hpt3x2n.c 2010-02-23 17:09:53.148068131 -0500
18646@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n 19046@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
18647 * Configuration for HPT3x2n. 19047 * Configuration for HPT3x2n.
18648 */ 19048 */
@@ -18652,9 +19052,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_hpt3x2n.c linux-2.6.32.8/drivers/ata/
18652 .inherits = &ata_bmdma_port_ops, 19052 .inherits = &ata_bmdma_port_ops,
18653 19053
18654 .bmdma_stop = hpt3x2n_bmdma_stop, 19054 .bmdma_stop = hpt3x2n_bmdma_stop,
18655diff -urNp linux-2.6.32.8/drivers/ata/pata_hpt3x3.c linux-2.6.32.8/drivers/ata/pata_hpt3x3.c 19055diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt3x3.c linux-2.6.32.9/drivers/ata/pata_hpt3x3.c
18656--- linux-2.6.32.8/drivers/ata/pata_hpt3x3.c 2010-02-09 07:57:19.000000000 -0500 19056--- linux-2.6.32.9/drivers/ata/pata_hpt3x3.c 2010-02-09 07:57:19.000000000 -0500
18657+++ linux-2.6.32.8/drivers/ata/pata_hpt3x3.c 2010-02-13 21:45:09.976718792 -0500 19057+++ linux-2.6.32.9/drivers/ata/pata_hpt3x3.c 2010-02-23 17:09:53.148068131 -0500
18658@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ 19058@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
18659 ATA_BMDMA_SHT(DRV_NAME), 19059 ATA_BMDMA_SHT(DRV_NAME),
18660 }; 19060 };
@@ -18664,9 +19064,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_hpt3x3.c linux-2.6.32.8/drivers/ata/p
18664 .inherits = &ata_bmdma_port_ops, 19064 .inherits = &ata_bmdma_port_ops,
18665 .cable_detect = ata_cable_40wire, 19065 .cable_detect = ata_cable_40wire,
18666 .set_piomode = hpt3x3_set_piomode, 19066 .set_piomode = hpt3x3_set_piomode,
18667diff -urNp linux-2.6.32.8/drivers/ata/pata_icside.c linux-2.6.32.8/drivers/ata/pata_icside.c 19067diff -urNp linux-2.6.32.9/drivers/ata/pata_icside.c linux-2.6.32.9/drivers/ata/pata_icside.c
18668--- linux-2.6.32.8/drivers/ata/pata_icside.c 2010-02-09 07:57:19.000000000 -0500 19068--- linux-2.6.32.9/drivers/ata/pata_icside.c 2010-02-09 07:57:19.000000000 -0500
18669+++ linux-2.6.32.8/drivers/ata/pata_icside.c 2010-02-13 21:45:09.976718792 -0500 19069+++ linux-2.6.32.9/drivers/ata/pata_icside.c 2010-02-23 17:09:53.148068131 -0500
18670@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct 19070@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
18671 } 19071 }
18672 } 19072 }
@@ -18676,9 +19076,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_icside.c linux-2.6.32.8/drivers/ata/p
18676 .inherits = &ata_sff_port_ops, 19076 .inherits = &ata_sff_port_ops,
18677 /* no need to build any PRD tables for DMA */ 19077 /* no need to build any PRD tables for DMA */
18678 .qc_prep = ata_noop_qc_prep, 19078 .qc_prep = ata_noop_qc_prep,
18679diff -urNp linux-2.6.32.8/drivers/ata/pata_isapnp.c linux-2.6.32.8/drivers/ata/pata_isapnp.c 19079diff -urNp linux-2.6.32.9/drivers/ata/pata_isapnp.c linux-2.6.32.9/drivers/ata/pata_isapnp.c
18680--- linux-2.6.32.8/drivers/ata/pata_isapnp.c 2010-02-09 07:57:19.000000000 -0500 19080--- linux-2.6.32.9/drivers/ata/pata_isapnp.c 2010-02-09 07:57:19.000000000 -0500
18681+++ linux-2.6.32.8/drivers/ata/pata_isapnp.c 2010-02-13 21:45:09.976718792 -0500 19081+++ linux-2.6.32.9/drivers/ata/pata_isapnp.c 2010-02-23 17:09:53.152210910 -0500
18682@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ 19082@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
18683 ATA_PIO_SHT(DRV_NAME), 19083 ATA_PIO_SHT(DRV_NAME),
18684 }; 19084 };
@@ -18694,9 +19094,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_isapnp.c linux-2.6.32.8/drivers/ata/p
18694 .inherits = &ata_sff_port_ops, 19094 .inherits = &ata_sff_port_ops,
18695 .cable_detect = ata_cable_40wire, 19095 .cable_detect = ata_cable_40wire,
18696 /* No altstatus so we don't want to use the lost interrupt poll */ 19096 /* No altstatus so we don't want to use the lost interrupt poll */
18697diff -urNp linux-2.6.32.8/drivers/ata/pata_it8213.c linux-2.6.32.8/drivers/ata/pata_it8213.c 19097diff -urNp linux-2.6.32.9/drivers/ata/pata_it8213.c linux-2.6.32.9/drivers/ata/pata_it8213.c
18698--- linux-2.6.32.8/drivers/ata/pata_it8213.c 2010-02-09 07:57:19.000000000 -0500 19098--- linux-2.6.32.9/drivers/ata/pata_it8213.c 2010-02-09 07:57:19.000000000 -0500
18699+++ linux-2.6.32.8/drivers/ata/pata_it8213.c 2010-02-13 21:45:09.977915761 -0500 19099+++ linux-2.6.32.9/drivers/ata/pata_it8213.c 2010-02-23 17:09:53.152210910 -0500
18700@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ 19100@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
18701 }; 19101 };
18702 19102
@@ -18706,9 +19106,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_it8213.c linux-2.6.32.8/drivers/ata/p
18706 .inherits = &ata_bmdma_port_ops, 19106 .inherits = &ata_bmdma_port_ops,
18707 .cable_detect = it8213_cable_detect, 19107 .cable_detect = it8213_cable_detect,
18708 .set_piomode = it8213_set_piomode, 19108 .set_piomode = it8213_set_piomode,
18709diff -urNp linux-2.6.32.8/drivers/ata/pata_it821x.c linux-2.6.32.8/drivers/ata/pata_it821x.c 19109diff -urNp linux-2.6.32.9/drivers/ata/pata_it821x.c linux-2.6.32.9/drivers/ata/pata_it821x.c
18710--- linux-2.6.32.8/drivers/ata/pata_it821x.c 2010-02-09 07:57:19.000000000 -0500 19110--- linux-2.6.32.9/drivers/ata/pata_it821x.c 2010-02-09 07:57:19.000000000 -0500
18711+++ linux-2.6.32.8/drivers/ata/pata_it821x.c 2010-02-13 21:45:09.977915761 -0500 19111+++ linux-2.6.32.9/drivers/ata/pata_it821x.c 2010-02-23 17:09:53.152210910 -0500
18712@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ 19112@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
18713 ATA_BMDMA_SHT(DRV_NAME), 19113 ATA_BMDMA_SHT(DRV_NAME),
18714 }; 19114 };
@@ -18736,9 +19136,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_it821x.c linux-2.6.32.8/drivers/ata/p
18736 .inherits = &ata_bmdma_port_ops, 19136 .inherits = &ata_bmdma_port_ops,
18737 19137
18738 .check_atapi_dma= it821x_check_atapi_dma, 19138 .check_atapi_dma= it821x_check_atapi_dma,
18739diff -urNp linux-2.6.32.8/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.8/drivers/ata/pata_ixp4xx_cf.c 19139diff -urNp linux-2.6.32.9/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.9/drivers/ata/pata_ixp4xx_cf.c
18740--- linux-2.6.32.8/drivers/ata/pata_ixp4xx_cf.c 2010-02-09 07:57:19.000000000 -0500 19140--- linux-2.6.32.9/drivers/ata/pata_ixp4xx_cf.c 2010-02-09 07:57:19.000000000 -0500
18741+++ linux-2.6.32.8/drivers/ata/pata_ixp4xx_cf.c 2010-02-13 21:45:09.977915761 -0500 19141+++ linux-2.6.32.9/drivers/ata/pata_ixp4xx_cf.c 2010-02-23 17:09:53.152210910 -0500
18742@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ 19142@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
18743 ATA_PIO_SHT(DRV_NAME), 19143 ATA_PIO_SHT(DRV_NAME),
18744 }; 19144 };
@@ -18748,9 +19148,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.8/drivers/at
18748 .inherits = &ata_sff_port_ops, 19148 .inherits = &ata_sff_port_ops,
18749 .sff_data_xfer = ixp4xx_mmio_data_xfer, 19149 .sff_data_xfer = ixp4xx_mmio_data_xfer,
18750 .cable_detect = ata_cable_40wire, 19150 .cable_detect = ata_cable_40wire,
18751diff -urNp linux-2.6.32.8/drivers/ata/pata_jmicron.c linux-2.6.32.8/drivers/ata/pata_jmicron.c 19151diff -urNp linux-2.6.32.9/drivers/ata/pata_jmicron.c linux-2.6.32.9/drivers/ata/pata_jmicron.c
18752--- linux-2.6.32.8/drivers/ata/pata_jmicron.c 2010-02-09 07:57:19.000000000 -0500 19152--- linux-2.6.32.9/drivers/ata/pata_jmicron.c 2010-02-09 07:57:19.000000000 -0500
18753+++ linux-2.6.32.8/drivers/ata/pata_jmicron.c 2010-02-13 21:45:09.977915761 -0500 19153+++ linux-2.6.32.9/drivers/ata/pata_jmicron.c 2010-02-23 17:09:53.152210910 -0500
18754@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron 19154@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
18755 ATA_BMDMA_SHT(DRV_NAME), 19155 ATA_BMDMA_SHT(DRV_NAME),
18756 }; 19156 };
@@ -18760,9 +19160,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_jmicron.c linux-2.6.32.8/drivers/ata/
18760 .inherits = &ata_bmdma_port_ops, 19160 .inherits = &ata_bmdma_port_ops,
18761 .prereset = jmicron_pre_reset, 19161 .prereset = jmicron_pre_reset,
18762 }; 19162 };
18763diff -urNp linux-2.6.32.8/drivers/ata/pata_legacy.c linux-2.6.32.8/drivers/ata/pata_legacy.c 19163diff -urNp linux-2.6.32.9/drivers/ata/pata_legacy.c linux-2.6.32.9/drivers/ata/pata_legacy.c
18764--- linux-2.6.32.8/drivers/ata/pata_legacy.c 2010-02-09 07:57:19.000000000 -0500 19164--- linux-2.6.32.9/drivers/ata/pata_legacy.c 2010-02-09 07:57:19.000000000 -0500
18765+++ linux-2.6.32.8/drivers/ata/pata_legacy.c 2010-02-13 21:45:09.978723801 -0500 19165+++ linux-2.6.32.9/drivers/ata/pata_legacy.c 2010-02-23 17:09:53.152210910 -0500
18766@@ -106,7 +106,7 @@ struct legacy_probe { 19166@@ -106,7 +106,7 @@ struct legacy_probe {
18767 19167
18768 struct legacy_controller { 19168 struct legacy_controller {
@@ -18874,9 +19274,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_legacy.c linux-2.6.32.8/drivers/ata/p
18874 struct legacy_data *ld = &legacy_data[probe->slot]; 19274 struct legacy_data *ld = &legacy_data[probe->slot];
18875 struct ata_host *host = NULL; 19275 struct ata_host *host = NULL;
18876 struct ata_port *ap; 19276 struct ata_port *ap;
18877diff -urNp linux-2.6.32.8/drivers/ata/pata_marvell.c linux-2.6.32.8/drivers/ata/pata_marvell.c 19277diff -urNp linux-2.6.32.9/drivers/ata/pata_marvell.c linux-2.6.32.9/drivers/ata/pata_marvell.c
18878--- linux-2.6.32.8/drivers/ata/pata_marvell.c 2010-02-09 07:57:19.000000000 -0500 19278--- linux-2.6.32.9/drivers/ata/pata_marvell.c 2010-02-09 07:57:19.000000000 -0500
18879+++ linux-2.6.32.8/drivers/ata/pata_marvell.c 2010-02-13 21:45:09.978723801 -0500 19279+++ linux-2.6.32.9/drivers/ata/pata_marvell.c 2010-02-23 17:09:53.152210910 -0500
18880@@ -100,7 +100,7 @@ static struct scsi_host_template marvell 19280@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
18881 ATA_BMDMA_SHT(DRV_NAME), 19281 ATA_BMDMA_SHT(DRV_NAME),
18882 }; 19282 };
@@ -18886,9 +19286,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_marvell.c linux-2.6.32.8/drivers/ata/
18886 .inherits = &ata_bmdma_port_ops, 19286 .inherits = &ata_bmdma_port_ops,
18887 .cable_detect = marvell_cable_detect, 19287 .cable_detect = marvell_cable_detect,
18888 .prereset = marvell_pre_reset, 19288 .prereset = marvell_pre_reset,
18889diff -urNp linux-2.6.32.8/drivers/ata/pata_mpc52xx.c linux-2.6.32.8/drivers/ata/pata_mpc52xx.c 19289diff -urNp linux-2.6.32.9/drivers/ata/pata_mpc52xx.c linux-2.6.32.9/drivers/ata/pata_mpc52xx.c
18890--- linux-2.6.32.8/drivers/ata/pata_mpc52xx.c 2010-02-09 07:57:19.000000000 -0500 19290--- linux-2.6.32.9/drivers/ata/pata_mpc52xx.c 2010-02-09 07:57:19.000000000 -0500
18891+++ linux-2.6.32.8/drivers/ata/pata_mpc52xx.c 2010-02-13 21:45:09.978723801 -0500 19291+++ linux-2.6.32.9/drivers/ata/pata_mpc52xx.c 2010-02-23 17:09:53.152210910 -0500
18892@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx 19292@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
18893 ATA_PIO_SHT(DRV_NAME), 19293 ATA_PIO_SHT(DRV_NAME),
18894 }; 19294 };
@@ -18898,9 +19298,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_mpc52xx.c linux-2.6.32.8/drivers/ata/
18898 .inherits = &ata_sff_port_ops, 19298 .inherits = &ata_sff_port_ops,
18899 .sff_dev_select = mpc52xx_ata_dev_select, 19299 .sff_dev_select = mpc52xx_ata_dev_select,
18900 .set_piomode = mpc52xx_ata_set_piomode, 19300 .set_piomode = mpc52xx_ata_set_piomode,
18901diff -urNp linux-2.6.32.8/drivers/ata/pata_mpiix.c linux-2.6.32.8/drivers/ata/pata_mpiix.c 19301diff -urNp linux-2.6.32.9/drivers/ata/pata_mpiix.c linux-2.6.32.9/drivers/ata/pata_mpiix.c
18902--- linux-2.6.32.8/drivers/ata/pata_mpiix.c 2010-02-09 07:57:19.000000000 -0500 19302--- linux-2.6.32.9/drivers/ata/pata_mpiix.c 2010-02-09 07:57:19.000000000 -0500
18903+++ linux-2.6.32.8/drivers/ata/pata_mpiix.c 2010-02-13 21:45:09.978723801 -0500 19303+++ linux-2.6.32.9/drivers/ata/pata_mpiix.c 2010-02-23 17:09:53.152210910 -0500
18904@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s 19304@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
18905 ATA_PIO_SHT(DRV_NAME), 19305 ATA_PIO_SHT(DRV_NAME),
18906 }; 19306 };
@@ -18910,9 +19310,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_mpiix.c linux-2.6.32.8/drivers/ata/pa
18910 .inherits = &ata_sff_port_ops, 19310 .inherits = &ata_sff_port_ops,
18911 .qc_issue = mpiix_qc_issue, 19311 .qc_issue = mpiix_qc_issue,
18912 .cable_detect = ata_cable_40wire, 19312 .cable_detect = ata_cable_40wire,
18913diff -urNp linux-2.6.32.8/drivers/ata/pata_netcell.c linux-2.6.32.8/drivers/ata/pata_netcell.c 19313diff -urNp linux-2.6.32.9/drivers/ata/pata_netcell.c linux-2.6.32.9/drivers/ata/pata_netcell.c
18914--- linux-2.6.32.8/drivers/ata/pata_netcell.c 2010-02-09 07:57:19.000000000 -0500 19314--- linux-2.6.32.9/drivers/ata/pata_netcell.c 2010-02-09 07:57:19.000000000 -0500
18915+++ linux-2.6.32.8/drivers/ata/pata_netcell.c 2010-02-13 21:45:09.978723801 -0500 19315+++ linux-2.6.32.9/drivers/ata/pata_netcell.c 2010-02-23 17:09:53.152210910 -0500
18916@@ -34,7 +34,7 @@ static struct scsi_host_template netcell 19316@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
18917 ATA_BMDMA_SHT(DRV_NAME), 19317 ATA_BMDMA_SHT(DRV_NAME),
18918 }; 19318 };
@@ -18922,9 +19322,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_netcell.c linux-2.6.32.8/drivers/ata/
18922 .inherits = &ata_bmdma_port_ops, 19322 .inherits = &ata_bmdma_port_ops,
18923 .cable_detect = ata_cable_80wire, 19323 .cable_detect = ata_cable_80wire,
18924 .read_id = netcell_read_id, 19324 .read_id = netcell_read_id,
18925diff -urNp linux-2.6.32.8/drivers/ata/pata_ninja32.c linux-2.6.32.8/drivers/ata/pata_ninja32.c 19325diff -urNp linux-2.6.32.9/drivers/ata/pata_ninja32.c linux-2.6.32.9/drivers/ata/pata_ninja32.c
18926--- linux-2.6.32.8/drivers/ata/pata_ninja32.c 2010-02-09 07:57:19.000000000 -0500 19326--- linux-2.6.32.9/drivers/ata/pata_ninja32.c 2010-02-09 07:57:19.000000000 -0500
18927+++ linux-2.6.32.8/drivers/ata/pata_ninja32.c 2010-02-13 21:45:09.978723801 -0500 19327+++ linux-2.6.32.9/drivers/ata/pata_ninja32.c 2010-02-23 17:09:53.152210910 -0500
18928@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 19328@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
18929 ATA_BMDMA_SHT(DRV_NAME), 19329 ATA_BMDMA_SHT(DRV_NAME),
18930 }; 19330 };
@@ -18934,9 +19334,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_ninja32.c linux-2.6.32.8/drivers/ata/
18934 .inherits = &ata_bmdma_port_ops, 19334 .inherits = &ata_bmdma_port_ops,
18935 .sff_dev_select = ninja32_dev_select, 19335 .sff_dev_select = ninja32_dev_select,
18936 .cable_detect = ata_cable_40wire, 19336 .cable_detect = ata_cable_40wire,
18937diff -urNp linux-2.6.32.8/drivers/ata/pata_ns87410.c linux-2.6.32.8/drivers/ata/pata_ns87410.c 19337diff -urNp linux-2.6.32.9/drivers/ata/pata_ns87410.c linux-2.6.32.9/drivers/ata/pata_ns87410.c
18938--- linux-2.6.32.8/drivers/ata/pata_ns87410.c 2010-02-09 07:57:19.000000000 -0500 19338--- linux-2.6.32.9/drivers/ata/pata_ns87410.c 2010-02-09 07:57:19.000000000 -0500
18939+++ linux-2.6.32.8/drivers/ata/pata_ns87410.c 2010-02-13 21:45:09.979916980 -0500 19339+++ linux-2.6.32.9/drivers/ata/pata_ns87410.c 2010-02-23 17:09:53.152210910 -0500
18940@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 19340@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
18941 ATA_PIO_SHT(DRV_NAME), 19341 ATA_PIO_SHT(DRV_NAME),
18942 }; 19342 };
@@ -18946,9 +19346,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_ns87410.c linux-2.6.32.8/drivers/ata/
18946 .inherits = &ata_sff_port_ops, 19346 .inherits = &ata_sff_port_ops,
18947 .qc_issue = ns87410_qc_issue, 19347 .qc_issue = ns87410_qc_issue,
18948 .cable_detect = ata_cable_40wire, 19348 .cable_detect = ata_cable_40wire,
18949diff -urNp linux-2.6.32.8/drivers/ata/pata_ns87415.c linux-2.6.32.8/drivers/ata/pata_ns87415.c 19349diff -urNp linux-2.6.32.9/drivers/ata/pata_ns87415.c linux-2.6.32.9/drivers/ata/pata_ns87415.c
18950--- linux-2.6.32.8/drivers/ata/pata_ns87415.c 2010-02-09 07:57:19.000000000 -0500 19350--- linux-2.6.32.9/drivers/ata/pata_ns87415.c 2010-02-09 07:57:19.000000000 -0500
18951+++ linux-2.6.32.8/drivers/ata/pata_ns87415.c 2010-02-13 21:45:09.979916980 -0500 19351+++ linux-2.6.32.9/drivers/ata/pata_ns87415.c 2010-02-23 17:09:53.152210910 -0500
18952@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at 19352@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
18953 } 19353 }
18954 #endif /* 87560 SuperIO Support */ 19354 #endif /* 87560 SuperIO Support */
@@ -18967,9 +19367,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_ns87415.c linux-2.6.32.8/drivers/ata/
18967 .inherits = &ns87415_pata_ops, 19367 .inherits = &ns87415_pata_ops,
18968 .sff_tf_read = ns87560_tf_read, 19368 .sff_tf_read = ns87560_tf_read,
18969 .sff_check_status = ns87560_check_status, 19369 .sff_check_status = ns87560_check_status,
18970diff -urNp linux-2.6.32.8/drivers/ata/pata_octeon_cf.c linux-2.6.32.8/drivers/ata/pata_octeon_cf.c 19370diff -urNp linux-2.6.32.9/drivers/ata/pata_octeon_cf.c linux-2.6.32.9/drivers/ata/pata_octeon_cf.c
18971--- linux-2.6.32.8/drivers/ata/pata_octeon_cf.c 2010-02-09 07:57:19.000000000 -0500 19371--- linux-2.6.32.9/drivers/ata/pata_octeon_cf.c 2010-02-09 07:57:19.000000000 -0500
18972+++ linux-2.6.32.8/drivers/ata/pata_octeon_cf.c 2010-02-13 21:45:09.980545710 -0500 19372+++ linux-2.6.32.9/drivers/ata/pata_octeon_cf.c 2010-02-23 17:09:53.152210910 -0500
18973@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s 19373@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
18974 return 0; 19374 return 0;
18975 } 19375 }
@@ -18978,9 +19378,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_octeon_cf.c linux-2.6.32.8/drivers/at
18978 static struct ata_port_operations octeon_cf_ops = { 19378 static struct ata_port_operations octeon_cf_ops = {
18979 .inherits = &ata_sff_port_ops, 19379 .inherits = &ata_sff_port_ops,
18980 .check_atapi_dma = octeon_cf_check_atapi_dma, 19380 .check_atapi_dma = octeon_cf_check_atapi_dma,
18981diff -urNp linux-2.6.32.8/drivers/ata/pata_oldpiix.c linux-2.6.32.8/drivers/ata/pata_oldpiix.c 19381diff -urNp linux-2.6.32.9/drivers/ata/pata_oldpiix.c linux-2.6.32.9/drivers/ata/pata_oldpiix.c
18982--- linux-2.6.32.8/drivers/ata/pata_oldpiix.c 2010-02-09 07:57:19.000000000 -0500 19382--- linux-2.6.32.9/drivers/ata/pata_oldpiix.c 2010-02-09 07:57:19.000000000 -0500
18983+++ linux-2.6.32.8/drivers/ata/pata_oldpiix.c 2010-02-13 21:45:09.980545710 -0500 19383+++ linux-2.6.32.9/drivers/ata/pata_oldpiix.c 2010-02-23 17:09:53.152210910 -0500
18984@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix 19384@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
18985 ATA_BMDMA_SHT(DRV_NAME), 19385 ATA_BMDMA_SHT(DRV_NAME),
18986 }; 19386 };
@@ -18990,9 +19390,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_oldpiix.c linux-2.6.32.8/drivers/ata/
18990 .inherits = &ata_bmdma_port_ops, 19390 .inherits = &ata_bmdma_port_ops,
18991 .qc_issue = oldpiix_qc_issue, 19391 .qc_issue = oldpiix_qc_issue,
18992 .cable_detect = ata_cable_40wire, 19392 .cable_detect = ata_cable_40wire,
18993diff -urNp linux-2.6.32.8/drivers/ata/pata_opti.c linux-2.6.32.8/drivers/ata/pata_opti.c 19393diff -urNp linux-2.6.32.9/drivers/ata/pata_opti.c linux-2.6.32.9/drivers/ata/pata_opti.c
18994--- linux-2.6.32.8/drivers/ata/pata_opti.c 2010-02-09 07:57:19.000000000 -0500 19394--- linux-2.6.32.9/drivers/ata/pata_opti.c 2010-02-09 07:57:19.000000000 -0500
18995+++ linux-2.6.32.8/drivers/ata/pata_opti.c 2010-02-13 21:45:09.980545710 -0500 19395+++ linux-2.6.32.9/drivers/ata/pata_opti.c 2010-02-23 17:09:53.152210910 -0500
18996@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh 19396@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
18997 ATA_PIO_SHT(DRV_NAME), 19397 ATA_PIO_SHT(DRV_NAME),
18998 }; 19398 };
@@ -19002,9 +19402,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_opti.c linux-2.6.32.8/drivers/ata/pat
19002 .inherits = &ata_sff_port_ops, 19402 .inherits = &ata_sff_port_ops,
19003 .cable_detect = ata_cable_40wire, 19403 .cable_detect = ata_cable_40wire,
19004 .set_piomode = opti_set_piomode, 19404 .set_piomode = opti_set_piomode,
19005diff -urNp linux-2.6.32.8/drivers/ata/pata_optidma.c linux-2.6.32.8/drivers/ata/pata_optidma.c 19405diff -urNp linux-2.6.32.9/drivers/ata/pata_optidma.c linux-2.6.32.9/drivers/ata/pata_optidma.c
19006--- linux-2.6.32.8/drivers/ata/pata_optidma.c 2010-02-09 07:57:19.000000000 -0500 19406--- linux-2.6.32.9/drivers/ata/pata_optidma.c 2010-02-09 07:57:19.000000000 -0500
19007+++ linux-2.6.32.8/drivers/ata/pata_optidma.c 2010-02-13 21:45:09.980545710 -0500 19407+++ linux-2.6.32.9/drivers/ata/pata_optidma.c 2010-02-23 17:09:53.152210910 -0500
19008@@ -337,7 +337,7 @@ static struct scsi_host_template optidma 19408@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
19009 ATA_BMDMA_SHT(DRV_NAME), 19409 ATA_BMDMA_SHT(DRV_NAME),
19010 }; 19410 };
@@ -19023,9 +19423,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_optidma.c linux-2.6.32.8/drivers/ata/
19023 .inherits = &optidma_port_ops, 19423 .inherits = &optidma_port_ops,
19024 .set_piomode = optiplus_set_pio_mode, 19424 .set_piomode = optiplus_set_pio_mode,
19025 .set_dmamode = optiplus_set_dma_mode, 19425 .set_dmamode = optiplus_set_dma_mode,
19026diff -urNp linux-2.6.32.8/drivers/ata/pata_palmld.c linux-2.6.32.8/drivers/ata/pata_palmld.c 19426diff -urNp linux-2.6.32.9/drivers/ata/pata_palmld.c linux-2.6.32.9/drivers/ata/pata_palmld.c
19027--- linux-2.6.32.8/drivers/ata/pata_palmld.c 2010-02-09 07:57:19.000000000 -0500 19427--- linux-2.6.32.9/drivers/ata/pata_palmld.c 2010-02-09 07:57:19.000000000 -0500
19028+++ linux-2.6.32.8/drivers/ata/pata_palmld.c 2010-02-13 21:45:09.980545710 -0500 19428+++ linux-2.6.32.9/drivers/ata/pata_palmld.c 2010-02-23 17:09:53.152210910 -0500
19029@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ 19429@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
19030 ATA_PIO_SHT(DRV_NAME), 19430 ATA_PIO_SHT(DRV_NAME),
19031 }; 19431 };
@@ -19035,9 +19435,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_palmld.c linux-2.6.32.8/drivers/ata/p
19035 .inherits = &ata_sff_port_ops, 19435 .inherits = &ata_sff_port_ops,
19036 .sff_data_xfer = ata_sff_data_xfer_noirq, 19436 .sff_data_xfer = ata_sff_data_xfer_noirq,
19037 .cable_detect = ata_cable_40wire, 19437 .cable_detect = ata_cable_40wire,
19038diff -urNp linux-2.6.32.8/drivers/ata/pata_pcmcia.c linux-2.6.32.8/drivers/ata/pata_pcmcia.c 19438diff -urNp linux-2.6.32.9/drivers/ata/pata_pcmcia.c linux-2.6.32.9/drivers/ata/pata_pcmcia.c
19039--- linux-2.6.32.8/drivers/ata/pata_pcmcia.c 2010-02-09 07:57:19.000000000 -0500 19439--- linux-2.6.32.9/drivers/ata/pata_pcmcia.c 2010-02-09 07:57:19.000000000 -0500
19040+++ linux-2.6.32.8/drivers/ata/pata_pcmcia.c 2010-02-13 21:45:09.980545710 -0500 19440+++ linux-2.6.32.9/drivers/ata/pata_pcmcia.c 2010-02-23 17:09:53.152210910 -0500
19041@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ 19441@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
19042 ATA_PIO_SHT(DRV_NAME), 19442 ATA_PIO_SHT(DRV_NAME),
19043 }; 19443 };
@@ -19064,9 +19464,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_pcmcia.c linux-2.6.32.8/drivers/ata/p
19064 19464
19065 info = kzalloc(sizeof(*info), GFP_KERNEL); 19465 info = kzalloc(sizeof(*info), GFP_KERNEL);
19066 if (info == NULL) 19466 if (info == NULL)
19067diff -urNp linux-2.6.32.8/drivers/ata/pata_pdc2027x.c linux-2.6.32.8/drivers/ata/pata_pdc2027x.c 19467diff -urNp linux-2.6.32.9/drivers/ata/pata_pdc2027x.c linux-2.6.32.9/drivers/ata/pata_pdc2027x.c
19068--- linux-2.6.32.8/drivers/ata/pata_pdc2027x.c 2010-02-09 07:57:19.000000000 -0500 19468--- linux-2.6.32.9/drivers/ata/pata_pdc2027x.c 2010-02-09 07:57:19.000000000 -0500
19069+++ linux-2.6.32.8/drivers/ata/pata_pdc2027x.c 2010-02-13 21:45:09.981697006 -0500 19469+++ linux-2.6.32.9/drivers/ata/pata_pdc2027x.c 2010-02-23 17:09:53.152210910 -0500
19070@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 19470@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
19071 ATA_BMDMA_SHT(DRV_NAME), 19471 ATA_BMDMA_SHT(DRV_NAME),
19072 }; 19472 };
@@ -19084,9 +19484,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_pdc2027x.c linux-2.6.32.8/drivers/ata
19084 .inherits = &pdc2027x_pata100_ops, 19484 .inherits = &pdc2027x_pata100_ops,
19085 .mode_filter = pdc2027x_mode_filter, 19485 .mode_filter = pdc2027x_mode_filter,
19086 .set_piomode = pdc2027x_set_piomode, 19486 .set_piomode = pdc2027x_set_piomode,
19087diff -urNp linux-2.6.32.8/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.8/drivers/ata/pata_pdc202xx_old.c 19487diff -urNp linux-2.6.32.9/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.9/drivers/ata/pata_pdc202xx_old.c
19088--- linux-2.6.32.8/drivers/ata/pata_pdc202xx_old.c 2010-02-09 07:57:19.000000000 -0500 19488--- linux-2.6.32.9/drivers/ata/pata_pdc202xx_old.c 2010-02-09 07:57:19.000000000 -0500
19089+++ linux-2.6.32.8/drivers/ata/pata_pdc202xx_old.c 2010-02-13 21:45:09.981697006 -0500 19489+++ linux-2.6.32.9/drivers/ata/pata_pdc202xx_old.c 2010-02-23 17:09:53.152210910 -0500
19090@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x 19490@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x
19091 ATA_BMDMA_SHT(DRV_NAME), 19491 ATA_BMDMA_SHT(DRV_NAME),
19092 }; 19492 };
@@ -19105,9 +19505,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.8/drivers
19105 .inherits = &pdc2024x_port_ops, 19505 .inherits = &pdc2024x_port_ops,
19106 19506
19107 .check_atapi_dma = pdc2026x_check_atapi_dma, 19507 .check_atapi_dma = pdc2026x_check_atapi_dma,
19108diff -urNp linux-2.6.32.8/drivers/ata/pata_platform.c linux-2.6.32.8/drivers/ata/pata_platform.c 19508diff -urNp linux-2.6.32.9/drivers/ata/pata_platform.c linux-2.6.32.9/drivers/ata/pata_platform.c
19109--- linux-2.6.32.8/drivers/ata/pata_platform.c 2010-02-09 07:57:19.000000000 -0500 19509--- linux-2.6.32.9/drivers/ata/pata_platform.c 2010-02-09 07:57:19.000000000 -0500
19110+++ linux-2.6.32.8/drivers/ata/pata_platform.c 2010-02-13 21:45:09.981697006 -0500 19510+++ linux-2.6.32.9/drivers/ata/pata_platform.c 2010-02-23 17:09:53.152210910 -0500
19111@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl 19511@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
19112 ATA_PIO_SHT(DRV_NAME), 19512 ATA_PIO_SHT(DRV_NAME),
19113 }; 19513 };
@@ -19117,9 +19517,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_platform.c linux-2.6.32.8/drivers/ata
19117 .inherits = &ata_sff_port_ops, 19517 .inherits = &ata_sff_port_ops,
19118 .sff_data_xfer = ata_sff_data_xfer_noirq, 19518 .sff_data_xfer = ata_sff_data_xfer_noirq,
19119 .cable_detect = ata_cable_unknown, 19519 .cable_detect = ata_cable_unknown,
19120diff -urNp linux-2.6.32.8/drivers/ata/pata_qdi.c linux-2.6.32.8/drivers/ata/pata_qdi.c 19520diff -urNp linux-2.6.32.9/drivers/ata/pata_qdi.c linux-2.6.32.9/drivers/ata/pata_qdi.c
19121--- linux-2.6.32.8/drivers/ata/pata_qdi.c 2010-02-09 07:57:19.000000000 -0500 19521--- linux-2.6.32.9/drivers/ata/pata_qdi.c 2010-02-09 07:57:19.000000000 -0500
19122+++ linux-2.6.32.8/drivers/ata/pata_qdi.c 2010-02-13 21:45:09.981697006 -0500 19522+++ linux-2.6.32.9/drivers/ata/pata_qdi.c 2010-02-23 17:09:53.152210910 -0500
19123@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht 19523@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
19124 ATA_PIO_SHT(DRV_NAME), 19524 ATA_PIO_SHT(DRV_NAME),
19125 }; 19525 };
@@ -19138,9 +19538,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_qdi.c linux-2.6.32.8/drivers/ata/pata
19138 .inherits = &qdi6500_port_ops, 19538 .inherits = &qdi6500_port_ops,
19139 .set_piomode = qdi6580_set_piomode, 19539 .set_piomode = qdi6580_set_piomode,
19140 }; 19540 };
19141diff -urNp linux-2.6.32.8/drivers/ata/pata_radisys.c linux-2.6.32.8/drivers/ata/pata_radisys.c 19541diff -urNp linux-2.6.32.9/drivers/ata/pata_radisys.c linux-2.6.32.9/drivers/ata/pata_radisys.c
19142--- linux-2.6.32.8/drivers/ata/pata_radisys.c 2010-02-09 07:57:19.000000000 -0500 19542--- linux-2.6.32.9/drivers/ata/pata_radisys.c 2010-02-09 07:57:19.000000000 -0500
19143+++ linux-2.6.32.8/drivers/ata/pata_radisys.c 2010-02-13 21:45:09.981697006 -0500 19543+++ linux-2.6.32.9/drivers/ata/pata_radisys.c 2010-02-23 17:09:53.152210910 -0500
19144@@ -187,7 +187,7 @@ static struct scsi_host_template radisys 19544@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
19145 ATA_BMDMA_SHT(DRV_NAME), 19545 ATA_BMDMA_SHT(DRV_NAME),
19146 }; 19546 };
@@ -19150,9 +19550,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_radisys.c linux-2.6.32.8/drivers/ata/
19150 .inherits = &ata_bmdma_port_ops, 19550 .inherits = &ata_bmdma_port_ops,
19151 .qc_issue = radisys_qc_issue, 19551 .qc_issue = radisys_qc_issue,
19152 .cable_detect = ata_cable_unknown, 19552 .cable_detect = ata_cable_unknown,
19153diff -urNp linux-2.6.32.8/drivers/ata/pata_rb532_cf.c linux-2.6.32.8/drivers/ata/pata_rb532_cf.c 19553diff -urNp linux-2.6.32.9/drivers/ata/pata_rb532_cf.c linux-2.6.32.9/drivers/ata/pata_rb532_cf.c
19154--- linux-2.6.32.8/drivers/ata/pata_rb532_cf.c 2010-02-09 07:57:19.000000000 -0500 19554--- linux-2.6.32.9/drivers/ata/pata_rb532_cf.c 2010-02-09 07:57:19.000000000 -0500
19155+++ linux-2.6.32.8/drivers/ata/pata_rb532_cf.c 2010-02-13 21:45:09.982529657 -0500 19555+++ linux-2.6.32.9/drivers/ata/pata_rb532_cf.c 2010-02-23 17:09:53.152210910 -0500
19156@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle 19556@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
19157 return IRQ_HANDLED; 19557 return IRQ_HANDLED;
19158 } 19558 }
@@ -19162,9 +19562,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_rb532_cf.c linux-2.6.32.8/drivers/ata
19162 .inherits = &ata_sff_port_ops, 19562 .inherits = &ata_sff_port_ops,
19163 .sff_data_xfer = ata_sff_data_xfer32, 19563 .sff_data_xfer = ata_sff_data_xfer32,
19164 }; 19564 };
19165diff -urNp linux-2.6.32.8/drivers/ata/pata_rdc.c linux-2.6.32.8/drivers/ata/pata_rdc.c 19565diff -urNp linux-2.6.32.9/drivers/ata/pata_rdc.c linux-2.6.32.9/drivers/ata/pata_rdc.c
19166--- linux-2.6.32.8/drivers/ata/pata_rdc.c 2010-02-09 07:57:19.000000000 -0500 19566--- linux-2.6.32.9/drivers/ata/pata_rdc.c 2010-02-09 07:57:19.000000000 -0500
19167+++ linux-2.6.32.8/drivers/ata/pata_rdc.c 2010-02-13 21:45:09.982529657 -0500 19567+++ linux-2.6.32.9/drivers/ata/pata_rdc.c 2010-02-23 17:09:53.156212249 -0500
19168@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p 19568@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
19169 pci_write_config_byte(dev, 0x48, udma_enable); 19569 pci_write_config_byte(dev, 0x48, udma_enable);
19170 } 19570 }
@@ -19174,9 +19574,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_rdc.c linux-2.6.32.8/drivers/ata/pata
19174 .inherits = &ata_bmdma32_port_ops, 19574 .inherits = &ata_bmdma32_port_ops,
19175 .cable_detect = rdc_pata_cable_detect, 19575 .cable_detect = rdc_pata_cable_detect,
19176 .set_piomode = rdc_set_piomode, 19576 .set_piomode = rdc_set_piomode,
19177diff -urNp linux-2.6.32.8/drivers/ata/pata_rz1000.c linux-2.6.32.8/drivers/ata/pata_rz1000.c 19577diff -urNp linux-2.6.32.9/drivers/ata/pata_rz1000.c linux-2.6.32.9/drivers/ata/pata_rz1000.c
19178--- linux-2.6.32.8/drivers/ata/pata_rz1000.c 2010-02-09 07:57:19.000000000 -0500 19578--- linux-2.6.32.9/drivers/ata/pata_rz1000.c 2010-02-09 07:57:19.000000000 -0500
19179+++ linux-2.6.32.8/drivers/ata/pata_rz1000.c 2010-02-13 21:45:09.982529657 -0500 19579+++ linux-2.6.32.9/drivers/ata/pata_rz1000.c 2010-02-23 17:09:53.156212249 -0500
19180@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ 19580@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
19181 ATA_PIO_SHT(DRV_NAME), 19581 ATA_PIO_SHT(DRV_NAME),
19182 }; 19582 };
@@ -19186,9 +19586,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_rz1000.c linux-2.6.32.8/drivers/ata/p
19186 .inherits = &ata_sff_port_ops, 19586 .inherits = &ata_sff_port_ops,
19187 .cable_detect = ata_cable_40wire, 19587 .cable_detect = ata_cable_40wire,
19188 .set_mode = rz1000_set_mode, 19588 .set_mode = rz1000_set_mode,
19189diff -urNp linux-2.6.32.8/drivers/ata/pata_sc1200.c linux-2.6.32.8/drivers/ata/pata_sc1200.c 19589diff -urNp linux-2.6.32.9/drivers/ata/pata_sc1200.c linux-2.6.32.9/drivers/ata/pata_sc1200.c
19190--- linux-2.6.32.8/drivers/ata/pata_sc1200.c 2010-02-09 07:57:19.000000000 -0500 19590--- linux-2.6.32.9/drivers/ata/pata_sc1200.c 2010-02-09 07:57:19.000000000 -0500
19191+++ linux-2.6.32.8/drivers/ata/pata_sc1200.c 2010-02-13 21:45:09.982529657 -0500 19591+++ linux-2.6.32.9/drivers/ata/pata_sc1200.c 2010-02-23 17:09:53.156212249 -0500
19192@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ 19592@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
19193 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 19593 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
19194 }; 19594 };
@@ -19198,9 +19598,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_sc1200.c linux-2.6.32.8/drivers/ata/p
19198 .inherits = &ata_bmdma_port_ops, 19598 .inherits = &ata_bmdma_port_ops,
19199 .qc_prep = ata_sff_dumb_qc_prep, 19599 .qc_prep = ata_sff_dumb_qc_prep,
19200 .qc_issue = sc1200_qc_issue, 19600 .qc_issue = sc1200_qc_issue,
19201diff -urNp linux-2.6.32.8/drivers/ata/pata_scc.c linux-2.6.32.8/drivers/ata/pata_scc.c 19601diff -urNp linux-2.6.32.9/drivers/ata/pata_scc.c linux-2.6.32.9/drivers/ata/pata_scc.c
19202--- linux-2.6.32.8/drivers/ata/pata_scc.c 2010-02-09 07:57:19.000000000 -0500 19602--- linux-2.6.32.9/drivers/ata/pata_scc.c 2010-02-09 07:57:19.000000000 -0500
19203+++ linux-2.6.32.8/drivers/ata/pata_scc.c 2010-02-13 21:45:09.982529657 -0500 19603+++ linux-2.6.32.9/drivers/ata/pata_scc.c 2010-02-23 17:09:53.156212249 -0500
19204@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht 19604@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
19205 ATA_BMDMA_SHT(DRV_NAME), 19605 ATA_BMDMA_SHT(DRV_NAME),
19206 }; 19606 };
@@ -19210,9 +19610,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_scc.c linux-2.6.32.8/drivers/ata/pata
19210 .inherits = &ata_bmdma_port_ops, 19610 .inherits = &ata_bmdma_port_ops,
19211 19611
19212 .set_piomode = scc_set_piomode, 19612 .set_piomode = scc_set_piomode,
19213diff -urNp linux-2.6.32.8/drivers/ata/pata_sch.c linux-2.6.32.8/drivers/ata/pata_sch.c 19613diff -urNp linux-2.6.32.9/drivers/ata/pata_sch.c linux-2.6.32.9/drivers/ata/pata_sch.c
19214--- linux-2.6.32.8/drivers/ata/pata_sch.c 2010-02-09 07:57:19.000000000 -0500 19614--- linux-2.6.32.9/drivers/ata/pata_sch.c 2010-02-09 07:57:19.000000000 -0500
19215+++ linux-2.6.32.8/drivers/ata/pata_sch.c 2010-02-13 21:45:09.982529657 -0500 19615+++ linux-2.6.32.9/drivers/ata/pata_sch.c 2010-02-23 17:09:53.156212249 -0500
19216@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht 19616@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
19217 ATA_BMDMA_SHT(DRV_NAME), 19617 ATA_BMDMA_SHT(DRV_NAME),
19218 }; 19618 };
@@ -19222,9 +19622,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_sch.c linux-2.6.32.8/drivers/ata/pata
19222 .inherits = &ata_bmdma_port_ops, 19622 .inherits = &ata_bmdma_port_ops,
19223 .cable_detect = ata_cable_unknown, 19623 .cable_detect = ata_cable_unknown,
19224 .set_piomode = sch_set_piomode, 19624 .set_piomode = sch_set_piomode,
19225diff -urNp linux-2.6.32.8/drivers/ata/pata_serverworks.c linux-2.6.32.8/drivers/ata/pata_serverworks.c 19625diff -urNp linux-2.6.32.9/drivers/ata/pata_serverworks.c linux-2.6.32.9/drivers/ata/pata_serverworks.c
19226--- linux-2.6.32.8/drivers/ata/pata_serverworks.c 2010-02-09 07:57:19.000000000 -0500 19626--- linux-2.6.32.9/drivers/ata/pata_serverworks.c 2010-02-09 07:57:19.000000000 -0500
19227+++ linux-2.6.32.8/drivers/ata/pata_serverworks.c 2010-02-13 21:45:09.983718354 -0500 19627+++ linux-2.6.32.9/drivers/ata/pata_serverworks.c 2010-02-23 17:09:53.156212249 -0500
19228@@ -299,7 +299,7 @@ static struct scsi_host_template serverw 19628@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
19229 ATA_BMDMA_SHT(DRV_NAME), 19629 ATA_BMDMA_SHT(DRV_NAME),
19230 }; 19630 };
@@ -19243,9 +19643,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_serverworks.c linux-2.6.32.8/drivers/
19243 .inherits = &serverworks_osb4_port_ops, 19643 .inherits = &serverworks_osb4_port_ops,
19244 .mode_filter = serverworks_csb_filter, 19644 .mode_filter = serverworks_csb_filter,
19245 }; 19645 };
19246diff -urNp linux-2.6.32.8/drivers/ata/pata_sil680.c linux-2.6.32.8/drivers/ata/pata_sil680.c 19646diff -urNp linux-2.6.32.9/drivers/ata/pata_sil680.c linux-2.6.32.9/drivers/ata/pata_sil680.c
19247--- linux-2.6.32.8/drivers/ata/pata_sil680.c 2010-02-09 07:57:19.000000000 -0500 19647--- linux-2.6.32.9/drivers/ata/pata_sil680.c 2010-02-09 07:57:19.000000000 -0500
19248+++ linux-2.6.32.8/drivers/ata/pata_sil680.c 2010-02-13 21:45:09.983718354 -0500 19648+++ linux-2.6.32.9/drivers/ata/pata_sil680.c 2010-02-23 17:09:53.156212249 -0500
19249@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ 19649@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
19250 ATA_BMDMA_SHT(DRV_NAME), 19650 ATA_BMDMA_SHT(DRV_NAME),
19251 }; 19651 };
@@ -19255,9 +19655,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_sil680.c linux-2.6.32.8/drivers/ata/p
19255 .inherits = &ata_bmdma32_port_ops, 19655 .inherits = &ata_bmdma32_port_ops,
19256 .cable_detect = sil680_cable_detect, 19656 .cable_detect = sil680_cable_detect,
19257 .set_piomode = sil680_set_piomode, 19657 .set_piomode = sil680_set_piomode,
19258diff -urNp linux-2.6.32.8/drivers/ata/pata_sis.c linux-2.6.32.8/drivers/ata/pata_sis.c 19658diff -urNp linux-2.6.32.9/drivers/ata/pata_sis.c linux-2.6.32.9/drivers/ata/pata_sis.c
19259--- linux-2.6.32.8/drivers/ata/pata_sis.c 2010-02-09 07:57:19.000000000 -0500 19659--- linux-2.6.32.9/drivers/ata/pata_sis.c 2010-02-09 07:57:19.000000000 -0500
19260+++ linux-2.6.32.8/drivers/ata/pata_sis.c 2010-02-13 21:45:09.983718354 -0500 19660+++ linux-2.6.32.9/drivers/ata/pata_sis.c 2010-02-23 17:09:53.156212249 -0500
19261@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht 19661@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
19262 ATA_BMDMA_SHT(DRV_NAME), 19662 ATA_BMDMA_SHT(DRV_NAME),
19263 }; 19663 };
@@ -19313,9 +19713,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_sis.c linux-2.6.32.8/drivers/ata/pata
19313 .inherits = &sis_base_ops, 19713 .inherits = &sis_base_ops,
19314 .set_piomode = sis_old_set_piomode, 19714 .set_piomode = sis_old_set_piomode,
19315 .set_dmamode = sis_old_set_dmamode, 19715 .set_dmamode = sis_old_set_dmamode,
19316diff -urNp linux-2.6.32.8/drivers/ata/pata_sl82c105.c linux-2.6.32.8/drivers/ata/pata_sl82c105.c 19716diff -urNp linux-2.6.32.9/drivers/ata/pata_sl82c105.c linux-2.6.32.9/drivers/ata/pata_sl82c105.c
19317--- linux-2.6.32.8/drivers/ata/pata_sl82c105.c 2010-02-09 07:57:19.000000000 -0500 19717--- linux-2.6.32.9/drivers/ata/pata_sl82c105.c 2010-02-09 07:57:19.000000000 -0500
19318+++ linux-2.6.32.8/drivers/ata/pata_sl82c105.c 2010-02-13 21:45:09.983718354 -0500 19718+++ linux-2.6.32.9/drivers/ata/pata_sl82c105.c 2010-02-23 17:09:53.156212249 -0500
19319@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 19719@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
19320 ATA_BMDMA_SHT(DRV_NAME), 19720 ATA_BMDMA_SHT(DRV_NAME),
19321 }; 19721 };
@@ -19325,9 +19725,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_sl82c105.c linux-2.6.32.8/drivers/ata
19325 .inherits = &ata_bmdma_port_ops, 19725 .inherits = &ata_bmdma_port_ops,
19326 .qc_defer = sl82c105_qc_defer, 19726 .qc_defer = sl82c105_qc_defer,
19327 .bmdma_start = sl82c105_bmdma_start, 19727 .bmdma_start = sl82c105_bmdma_start,
19328diff -urNp linux-2.6.32.8/drivers/ata/pata_triflex.c linux-2.6.32.8/drivers/ata/pata_triflex.c 19728diff -urNp linux-2.6.32.9/drivers/ata/pata_triflex.c linux-2.6.32.9/drivers/ata/pata_triflex.c
19329--- linux-2.6.32.8/drivers/ata/pata_triflex.c 2010-02-09 07:57:19.000000000 -0500 19729--- linux-2.6.32.9/drivers/ata/pata_triflex.c 2010-02-09 07:57:19.000000000 -0500
19330+++ linux-2.6.32.8/drivers/ata/pata_triflex.c 2010-02-13 21:45:09.984613969 -0500 19730+++ linux-2.6.32.9/drivers/ata/pata_triflex.c 2010-02-23 17:09:53.156212249 -0500
19331@@ -178,7 +178,7 @@ static struct scsi_host_template triflex 19731@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
19332 ATA_BMDMA_SHT(DRV_NAME), 19732 ATA_BMDMA_SHT(DRV_NAME),
19333 }; 19733 };
@@ -19337,9 +19737,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_triflex.c linux-2.6.32.8/drivers/ata/
19337 .inherits = &ata_bmdma_port_ops, 19737 .inherits = &ata_bmdma_port_ops,
19338 .bmdma_start = triflex_bmdma_start, 19738 .bmdma_start = triflex_bmdma_start,
19339 .bmdma_stop = triflex_bmdma_stop, 19739 .bmdma_stop = triflex_bmdma_stop,
19340diff -urNp linux-2.6.32.8/drivers/ata/pata_via.c linux-2.6.32.8/drivers/ata/pata_via.c 19740diff -urNp linux-2.6.32.9/drivers/ata/pata_via.c linux-2.6.32.9/drivers/ata/pata_via.c
19341--- linux-2.6.32.8/drivers/ata/pata_via.c 2010-02-09 07:57:19.000000000 -0500 19741--- linux-2.6.32.9/drivers/ata/pata_via.c 2010-02-09 07:57:19.000000000 -0500
19342+++ linux-2.6.32.8/drivers/ata/pata_via.c 2010-02-13 21:45:09.984613969 -0500 19742+++ linux-2.6.32.9/drivers/ata/pata_via.c 2010-02-23 17:09:53.156212249 -0500
19343@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht 19743@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
19344 ATA_BMDMA_SHT(DRV_NAME), 19744 ATA_BMDMA_SHT(DRV_NAME),
19345 }; 19745 };
@@ -19358,9 +19758,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_via.c linux-2.6.32.8/drivers/ata/pata
19358 .inherits = &via_port_ops, 19758 .inherits = &via_port_ops,
19359 .sff_data_xfer = ata_sff_data_xfer_noirq, 19759 .sff_data_xfer = ata_sff_data_xfer_noirq,
19360 }; 19760 };
19361diff -urNp linux-2.6.32.8/drivers/ata/pata_winbond.c linux-2.6.32.8/drivers/ata/pata_winbond.c 19761diff -urNp linux-2.6.32.9/drivers/ata/pata_winbond.c linux-2.6.32.9/drivers/ata/pata_winbond.c
19362--- linux-2.6.32.8/drivers/ata/pata_winbond.c 2010-02-09 07:57:19.000000000 -0500 19762--- linux-2.6.32.9/drivers/ata/pata_winbond.c 2010-02-09 07:57:19.000000000 -0500
19363+++ linux-2.6.32.8/drivers/ata/pata_winbond.c 2010-02-13 21:45:09.984613969 -0500 19763+++ linux-2.6.32.9/drivers/ata/pata_winbond.c 2010-02-23 17:09:53.156212249 -0500
19364@@ -125,7 +125,7 @@ static struct scsi_host_template winbond 19764@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
19365 ATA_PIO_SHT(DRV_NAME), 19765 ATA_PIO_SHT(DRV_NAME),
19366 }; 19766 };
@@ -19370,9 +19770,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pata_winbond.c linux-2.6.32.8/drivers/ata/
19370 .inherits = &ata_sff_port_ops, 19770 .inherits = &ata_sff_port_ops,
19371 .sff_data_xfer = winbond_data_xfer, 19771 .sff_data_xfer = winbond_data_xfer,
19372 .cable_detect = ata_cable_40wire, 19772 .cable_detect = ata_cable_40wire,
19373diff -urNp linux-2.6.32.8/drivers/ata/pdc_adma.c linux-2.6.32.8/drivers/ata/pdc_adma.c 19773diff -urNp linux-2.6.32.9/drivers/ata/pdc_adma.c linux-2.6.32.9/drivers/ata/pdc_adma.c
19374--- linux-2.6.32.8/drivers/ata/pdc_adma.c 2010-02-09 07:57:19.000000000 -0500 19774--- linux-2.6.32.9/drivers/ata/pdc_adma.c 2010-02-09 07:57:19.000000000 -0500
19375+++ linux-2.6.32.8/drivers/ata/pdc_adma.c 2010-02-13 21:45:09.984613969 -0500 19775+++ linux-2.6.32.9/drivers/ata/pdc_adma.c 2010-02-23 17:09:53.156212249 -0500
19376@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at 19776@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
19377 .dma_boundary = ADMA_DMA_BOUNDARY, 19777 .dma_boundary = ADMA_DMA_BOUNDARY,
19378 }; 19778 };
@@ -19382,9 +19782,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/pdc_adma.c linux-2.6.32.8/drivers/ata/pdc_
19382 .inherits = &ata_sff_port_ops, 19782 .inherits = &ata_sff_port_ops,
19383 19783
19384 .lost_interrupt = ATA_OP_NULL, 19784 .lost_interrupt = ATA_OP_NULL,
19385diff -urNp linux-2.6.32.8/drivers/ata/sata_fsl.c linux-2.6.32.8/drivers/ata/sata_fsl.c 19785diff -urNp linux-2.6.32.9/drivers/ata/sata_fsl.c linux-2.6.32.9/drivers/ata/sata_fsl.c
19386--- linux-2.6.32.8/drivers/ata/sata_fsl.c 2010-02-09 07:57:19.000000000 -0500 19786--- linux-2.6.32.9/drivers/ata/sata_fsl.c 2010-02-09 07:57:19.000000000 -0500
19387+++ linux-2.6.32.8/drivers/ata/sata_fsl.c 2010-02-13 21:45:09.984613969 -0500 19787+++ linux-2.6.32.9/drivers/ata/sata_fsl.c 2010-02-23 17:09:53.156212249 -0500
19388@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs 19788@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
19389 .dma_boundary = ATA_DMA_BOUNDARY, 19789 .dma_boundary = ATA_DMA_BOUNDARY,
19390 }; 19790 };
@@ -19394,9 +19794,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/sata_fsl.c linux-2.6.32.8/drivers/ata/sata
19394 .inherits = &sata_pmp_port_ops, 19794 .inherits = &sata_pmp_port_ops,
19395 19795
19396 .qc_defer = ata_std_qc_defer, 19796 .qc_defer = ata_std_qc_defer,
19397diff -urNp linux-2.6.32.8/drivers/ata/sata_inic162x.c linux-2.6.32.8/drivers/ata/sata_inic162x.c 19797diff -urNp linux-2.6.32.9/drivers/ata/sata_inic162x.c linux-2.6.32.9/drivers/ata/sata_inic162x.c
19398--- linux-2.6.32.8/drivers/ata/sata_inic162x.c 2010-02-09 07:57:19.000000000 -0500 19798--- linux-2.6.32.9/drivers/ata/sata_inic162x.c 2010-02-09 07:57:19.000000000 -0500
19399+++ linux-2.6.32.8/drivers/ata/sata_inic162x.c 2010-02-13 21:45:09.984613969 -0500 19799+++ linux-2.6.32.9/drivers/ata/sata_inic162x.c 2010-02-23 17:09:53.156212249 -0500
19400@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po 19800@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
19401 return 0; 19801 return 0;
19402 } 19802 }
@@ -19406,9 +19806,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/sata_inic162x.c linux-2.6.32.8/drivers/ata
19406 .inherits = &sata_port_ops, 19806 .inherits = &sata_port_ops,
19407 19807
19408 .check_atapi_dma = inic_check_atapi_dma, 19808 .check_atapi_dma = inic_check_atapi_dma,
19409diff -urNp linux-2.6.32.8/drivers/ata/sata_mv.c linux-2.6.32.8/drivers/ata/sata_mv.c 19809diff -urNp linux-2.6.32.9/drivers/ata/sata_mv.c linux-2.6.32.9/drivers/ata/sata_mv.c
19410--- linux-2.6.32.8/drivers/ata/sata_mv.c 2010-02-09 07:57:19.000000000 -0500 19810--- linux-2.6.32.9/drivers/ata/sata_mv.c 2010-02-09 07:57:19.000000000 -0500
19411+++ linux-2.6.32.8/drivers/ata/sata_mv.c 2010-02-13 21:45:09.985913173 -0500 19811+++ linux-2.6.32.9/drivers/ata/sata_mv.c 2010-02-23 17:09:53.156212249 -0500
19412@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht 19812@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
19413 .dma_boundary = MV_DMA_BOUNDARY, 19813 .dma_boundary = MV_DMA_BOUNDARY,
19414 }; 19814 };
@@ -19436,9 +19836,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/sata_mv.c linux-2.6.32.8/drivers/ata/sata_
19436 .inherits = &mv6_ops, 19836 .inherits = &mv6_ops,
19437 .dev_config = ATA_OP_NULL, 19837 .dev_config = ATA_OP_NULL,
19438 .qc_prep = mv_qc_prep_iie, 19838 .qc_prep = mv_qc_prep_iie,
19439diff -urNp linux-2.6.32.8/drivers/ata/sata_nv.c linux-2.6.32.8/drivers/ata/sata_nv.c 19839diff -urNp linux-2.6.32.9/drivers/ata/sata_nv.c linux-2.6.32.9/drivers/ata/sata_nv.c
19440--- linux-2.6.32.8/drivers/ata/sata_nv.c 2010-02-09 07:57:19.000000000 -0500 19840--- linux-2.6.32.9/drivers/ata/sata_nv.c 2010-02-09 07:57:19.000000000 -0500
19441+++ linux-2.6.32.8/drivers/ata/sata_nv.c 2010-02-13 21:45:09.986912953 -0500 19841+++ linux-2.6.32.9/drivers/ata/sata_nv.c 2010-02-23 17:09:53.156212249 -0500
19442@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc 19842@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
19443 * cases. Define nv_hardreset() which only kicks in for post-boot 19843 * cases. Define nv_hardreset() which only kicks in for post-boot
19444 * probing and use it for all variants. 19844 * probing and use it for all variants.
@@ -19481,9 +19881,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/sata_nv.c linux-2.6.32.8/drivers/ata/sata_
19481 .inherits = &nv_generic_ops, 19881 .inherits = &nv_generic_ops,
19482 19882
19483 .qc_defer = ata_std_qc_defer, 19883 .qc_defer = ata_std_qc_defer,
19484diff -urNp linux-2.6.32.8/drivers/ata/sata_promise.c linux-2.6.32.8/drivers/ata/sata_promise.c 19884diff -urNp linux-2.6.32.9/drivers/ata/sata_promise.c linux-2.6.32.9/drivers/ata/sata_promise.c
19485--- linux-2.6.32.8/drivers/ata/sata_promise.c 2010-02-09 07:57:19.000000000 -0500 19885--- linux-2.6.32.9/drivers/ata/sata_promise.c 2010-02-09 07:57:19.000000000 -0500
19486+++ linux-2.6.32.8/drivers/ata/sata_promise.c 2010-02-13 21:45:09.987528022 -0500 19886+++ linux-2.6.32.9/drivers/ata/sata_promise.c 2010-02-23 17:09:53.156212249 -0500
19487@@ -195,7 +195,7 @@ static const struct ata_port_operations 19887@@ -195,7 +195,7 @@ static const struct ata_port_operations
19488 .error_handler = pdc_error_handler, 19888 .error_handler = pdc_error_handler,
19489 }; 19889 };
@@ -19510,9 +19910,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/sata_promise.c linux-2.6.32.8/drivers/ata/
19510 .inherits = &pdc_common_ops, 19910 .inherits = &pdc_common_ops,
19511 .cable_detect = pdc_pata_cable_detect, 19911 .cable_detect = pdc_pata_cable_detect,
19512 .freeze = pdc_freeze, 19912 .freeze = pdc_freeze,
19513diff -urNp linux-2.6.32.8/drivers/ata/sata_qstor.c linux-2.6.32.8/drivers/ata/sata_qstor.c 19913diff -urNp linux-2.6.32.9/drivers/ata/sata_qstor.c linux-2.6.32.9/drivers/ata/sata_qstor.c
19514--- linux-2.6.32.8/drivers/ata/sata_qstor.c 2010-02-09 07:57:19.000000000 -0500 19914--- linux-2.6.32.9/drivers/ata/sata_qstor.c 2010-02-09 07:57:19.000000000 -0500
19515+++ linux-2.6.32.8/drivers/ata/sata_qstor.c 2010-02-13 21:45:09.987528022 -0500 19915+++ linux-2.6.32.9/drivers/ata/sata_qstor.c 2010-02-23 17:09:53.156212249 -0500
19516@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ 19916@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
19517 .dma_boundary = QS_DMA_BOUNDARY, 19917 .dma_boundary = QS_DMA_BOUNDARY,
19518 }; 19918 };
@@ -19522,9 +19922,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/sata_qstor.c linux-2.6.32.8/drivers/ata/sa
19522 .inherits = &ata_sff_port_ops, 19922 .inherits = &ata_sff_port_ops,
19523 19923
19524 .check_atapi_dma = qs_check_atapi_dma, 19924 .check_atapi_dma = qs_check_atapi_dma,
19525diff -urNp linux-2.6.32.8/drivers/ata/sata_sil24.c linux-2.6.32.8/drivers/ata/sata_sil24.c 19925diff -urNp linux-2.6.32.9/drivers/ata/sata_sil24.c linux-2.6.32.9/drivers/ata/sata_sil24.c
19526--- linux-2.6.32.8/drivers/ata/sata_sil24.c 2010-02-09 07:57:19.000000000 -0500 19926--- linux-2.6.32.9/drivers/ata/sata_sil24.c 2010-02-09 07:57:19.000000000 -0500
19527+++ linux-2.6.32.8/drivers/ata/sata_sil24.c 2010-02-13 21:45:09.987528022 -0500 19927+++ linux-2.6.32.9/drivers/ata/sata_sil24.c 2010-02-23 17:09:53.160339709 -0500
19528@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s 19928@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
19529 .dma_boundary = ATA_DMA_BOUNDARY, 19929 .dma_boundary = ATA_DMA_BOUNDARY,
19530 }; 19930 };
@@ -19534,9 +19934,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/sata_sil24.c linux-2.6.32.8/drivers/ata/sa
19534 .inherits = &sata_pmp_port_ops, 19934 .inherits = &sata_pmp_port_ops,
19535 19935
19536 .qc_defer = sil24_qc_defer, 19936 .qc_defer = sil24_qc_defer,
19537diff -urNp linux-2.6.32.8/drivers/ata/sata_sil.c linux-2.6.32.8/drivers/ata/sata_sil.c 19937diff -urNp linux-2.6.32.9/drivers/ata/sata_sil.c linux-2.6.32.9/drivers/ata/sata_sil.c
19538--- linux-2.6.32.8/drivers/ata/sata_sil.c 2010-02-09 07:57:19.000000000 -0500 19938--- linux-2.6.32.9/drivers/ata/sata_sil.c 2010-02-09 07:57:19.000000000 -0500
19539+++ linux-2.6.32.8/drivers/ata/sata_sil.c 2010-02-13 21:45:09.987528022 -0500 19939+++ linux-2.6.32.9/drivers/ata/sata_sil.c 2010-02-23 17:09:53.160339709 -0500
19540@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht 19940@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
19541 .sg_tablesize = ATA_MAX_PRD 19941 .sg_tablesize = ATA_MAX_PRD
19542 }; 19942 };
@@ -19546,9 +19946,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/sata_sil.c linux-2.6.32.8/drivers/ata/sata
19546 .inherits = &ata_bmdma32_port_ops, 19946 .inherits = &ata_bmdma32_port_ops,
19547 .dev_config = sil_dev_config, 19947 .dev_config = sil_dev_config,
19548 .set_mode = sil_set_mode, 19948 .set_mode = sil_set_mode,
19549diff -urNp linux-2.6.32.8/drivers/ata/sata_sis.c linux-2.6.32.8/drivers/ata/sata_sis.c 19949diff -urNp linux-2.6.32.9/drivers/ata/sata_sis.c linux-2.6.32.9/drivers/ata/sata_sis.c
19550--- linux-2.6.32.8/drivers/ata/sata_sis.c 2010-02-09 07:57:19.000000000 -0500 19950--- linux-2.6.32.9/drivers/ata/sata_sis.c 2010-02-09 07:57:19.000000000 -0500
19551+++ linux-2.6.32.8/drivers/ata/sata_sis.c 2010-02-13 21:45:09.988599653 -0500 19951+++ linux-2.6.32.9/drivers/ata/sata_sis.c 2010-02-23 17:09:53.160339709 -0500
19552@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht 19952@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
19553 ATA_BMDMA_SHT(DRV_NAME), 19953 ATA_BMDMA_SHT(DRV_NAME),
19554 }; 19954 };
@@ -19558,9 +19958,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/sata_sis.c linux-2.6.32.8/drivers/ata/sata
19558 .inherits = &ata_bmdma_port_ops, 19958 .inherits = &ata_bmdma_port_ops,
19559 .scr_read = sis_scr_read, 19959 .scr_read = sis_scr_read,
19560 .scr_write = sis_scr_write, 19960 .scr_write = sis_scr_write,
19561diff -urNp linux-2.6.32.8/drivers/ata/sata_svw.c linux-2.6.32.8/drivers/ata/sata_svw.c 19961diff -urNp linux-2.6.32.9/drivers/ata/sata_svw.c linux-2.6.32.9/drivers/ata/sata_svw.c
19562--- linux-2.6.32.8/drivers/ata/sata_svw.c 2010-02-09 07:57:19.000000000 -0500 19962--- linux-2.6.32.9/drivers/ata/sata_svw.c 2010-02-09 07:57:19.000000000 -0500
19563+++ linux-2.6.32.8/drivers/ata/sata_svw.c 2010-02-13 21:45:09.988599653 -0500 19963+++ linux-2.6.32.9/drivers/ata/sata_svw.c 2010-02-23 17:09:53.160339709 -0500
19564@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata 19964@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
19565 }; 19965 };
19566 19966
@@ -19570,9 +19970,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/sata_svw.c linux-2.6.32.8/drivers/ata/sata
19570 .inherits = &ata_bmdma_port_ops, 19970 .inherits = &ata_bmdma_port_ops,
19571 .sff_tf_load = k2_sata_tf_load, 19971 .sff_tf_load = k2_sata_tf_load,
19572 .sff_tf_read = k2_sata_tf_read, 19972 .sff_tf_read = k2_sata_tf_read,
19573diff -urNp linux-2.6.32.8/drivers/ata/sata_sx4.c linux-2.6.32.8/drivers/ata/sata_sx4.c 19973diff -urNp linux-2.6.32.9/drivers/ata/sata_sx4.c linux-2.6.32.9/drivers/ata/sata_sx4.c
19574--- linux-2.6.32.8/drivers/ata/sata_sx4.c 2010-02-09 07:57:19.000000000 -0500 19974--- linux-2.6.32.9/drivers/ata/sata_sx4.c 2010-02-09 07:57:19.000000000 -0500
19575+++ linux-2.6.32.8/drivers/ata/sata_sx4.c 2010-02-13 21:45:09.988599653 -0500 19975+++ linux-2.6.32.9/drivers/ata/sata_sx4.c 2010-02-23 17:09:53.160339709 -0500
19576@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat 19976@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
19577 }; 19977 };
19578 19978
@@ -19582,9 +19982,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/sata_sx4.c linux-2.6.32.8/drivers/ata/sata
19582 .inherits = &ata_sff_port_ops, 19982 .inherits = &ata_sff_port_ops,
19583 19983
19584 .check_atapi_dma = pdc_check_atapi_dma, 19984 .check_atapi_dma = pdc_check_atapi_dma,
19585diff -urNp linux-2.6.32.8/drivers/ata/sata_uli.c linux-2.6.32.8/drivers/ata/sata_uli.c 19985diff -urNp linux-2.6.32.9/drivers/ata/sata_uli.c linux-2.6.32.9/drivers/ata/sata_uli.c
19586--- linux-2.6.32.8/drivers/ata/sata_uli.c 2010-02-09 07:57:19.000000000 -0500 19986--- linux-2.6.32.9/drivers/ata/sata_uli.c 2010-02-09 07:57:19.000000000 -0500
19587+++ linux-2.6.32.8/drivers/ata/sata_uli.c 2010-02-13 21:45:09.988599653 -0500 19987+++ linux-2.6.32.9/drivers/ata/sata_uli.c 2010-02-23 17:09:53.160339709 -0500
19588@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht 19988@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
19589 ATA_BMDMA_SHT(DRV_NAME), 19989 ATA_BMDMA_SHT(DRV_NAME),
19590 }; 19990 };
@@ -19594,9 +19994,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/sata_uli.c linux-2.6.32.8/drivers/ata/sata
19594 .inherits = &ata_bmdma_port_ops, 19994 .inherits = &ata_bmdma_port_ops,
19595 .scr_read = uli_scr_read, 19995 .scr_read = uli_scr_read,
19596 .scr_write = uli_scr_write, 19996 .scr_write = uli_scr_write,
19597diff -urNp linux-2.6.32.8/drivers/ata/sata_via.c linux-2.6.32.8/drivers/ata/sata_via.c 19997diff -urNp linux-2.6.32.9/drivers/ata/sata_via.c linux-2.6.32.9/drivers/ata/sata_via.c
19598--- linux-2.6.32.8/drivers/ata/sata_via.c 2010-02-09 07:57:19.000000000 -0500 19998--- linux-2.6.32.9/drivers/ata/sata_via.c 2010-02-09 07:57:19.000000000 -0500
19599+++ linux-2.6.32.8/drivers/ata/sata_via.c 2010-02-13 21:45:09.988599653 -0500 19999+++ linux-2.6.32.9/drivers/ata/sata_via.c 2010-02-23 17:09:53.160339709 -0500
19600@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh 20000@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
19601 ATA_BMDMA_SHT(DRV_NAME), 20001 ATA_BMDMA_SHT(DRV_NAME),
19602 }; 20002 };
@@ -19634,9 +20034,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/sata_via.c linux-2.6.32.8/drivers/ata/sata
19634 .inherits = &svia_base_ops, 20034 .inherits = &svia_base_ops,
19635 .hardreset = sata_std_hardreset, 20035 .hardreset = sata_std_hardreset,
19636 .scr_read = vt8251_scr_read, 20036 .scr_read = vt8251_scr_read,
19637diff -urNp linux-2.6.32.8/drivers/ata/sata_vsc.c linux-2.6.32.8/drivers/ata/sata_vsc.c 20037diff -urNp linux-2.6.32.9/drivers/ata/sata_vsc.c linux-2.6.32.9/drivers/ata/sata_vsc.c
19638--- linux-2.6.32.8/drivers/ata/sata_vsc.c 2010-02-09 07:57:19.000000000 -0500 20038--- linux-2.6.32.9/drivers/ata/sata_vsc.c 2010-02-09 07:57:19.000000000 -0500
19639+++ linux-2.6.32.8/drivers/ata/sata_vsc.c 2010-02-13 21:45:09.989745888 -0500 20039+++ linux-2.6.32.9/drivers/ata/sata_vsc.c 2010-02-23 17:09:53.160339709 -0500
19640@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat 20040@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
19641 }; 20041 };
19642 20042
@@ -19646,9 +20046,9 @@ diff -urNp linux-2.6.32.8/drivers/ata/sata_vsc.c linux-2.6.32.8/drivers/ata/sata
19646 .inherits = &ata_bmdma_port_ops, 20046 .inherits = &ata_bmdma_port_ops,
19647 /* The IRQ handling is not quite standard SFF behaviour so we 20047 /* The IRQ handling is not quite standard SFF behaviour so we
19648 cannot use the default lost interrupt handler */ 20048 cannot use the default lost interrupt handler */
19649diff -urNp linux-2.6.32.8/drivers/atm/adummy.c linux-2.6.32.8/drivers/atm/adummy.c 20049diff -urNp linux-2.6.32.9/drivers/atm/adummy.c linux-2.6.32.9/drivers/atm/adummy.c
19650--- linux-2.6.32.8/drivers/atm/adummy.c 2010-02-09 07:57:19.000000000 -0500 20050--- linux-2.6.32.9/drivers/atm/adummy.c 2010-02-09 07:57:19.000000000 -0500
19651+++ linux-2.6.32.8/drivers/atm/adummy.c 2010-02-13 21:45:09.989745888 -0500 20051+++ linux-2.6.32.9/drivers/atm/adummy.c 2010-02-23 17:09:53.160339709 -0500
19652@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct 20052@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
19653 vcc->pop(vcc, skb); 20053 vcc->pop(vcc, skb);
19654 else 20054 else
@@ -19658,9 +20058,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/adummy.c linux-2.6.32.8/drivers/atm/adummy
19658 20058
19659 return 0; 20059 return 0;
19660 } 20060 }
19661diff -urNp linux-2.6.32.8/drivers/atm/ambassador.c linux-2.6.32.8/drivers/atm/ambassador.c 20061diff -urNp linux-2.6.32.9/drivers/atm/ambassador.c linux-2.6.32.9/drivers/atm/ambassador.c
19662--- linux-2.6.32.8/drivers/atm/ambassador.c 2010-02-09 07:57:19.000000000 -0500 20062--- linux-2.6.32.9/drivers/atm/ambassador.c 2010-02-09 07:57:19.000000000 -0500
19663+++ linux-2.6.32.8/drivers/atm/ambassador.c 2010-02-13 21:45:09.989745888 -0500 20063+++ linux-2.6.32.9/drivers/atm/ambassador.c 2010-02-23 17:09:53.160339709 -0500
19664@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, 20064@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
19665 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); 20065 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
19666 20066
@@ -19697,9 +20097,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/ambassador.c linux-2.6.32.8/drivers/atm/am
19697 return -ENOMEM; // ? 20097 return -ENOMEM; // ?
19698 } 20098 }
19699 20099
19700diff -urNp linux-2.6.32.8/drivers/atm/atmtcp.c linux-2.6.32.8/drivers/atm/atmtcp.c 20100diff -urNp linux-2.6.32.9/drivers/atm/atmtcp.c linux-2.6.32.9/drivers/atm/atmtcp.c
19701--- linux-2.6.32.8/drivers/atm/atmtcp.c 2010-02-09 07:57:19.000000000 -0500 20101--- linux-2.6.32.9/drivers/atm/atmtcp.c 2010-02-09 07:57:19.000000000 -0500
19702+++ linux-2.6.32.8/drivers/atm/atmtcp.c 2010-02-13 21:45:09.989745888 -0500 20102+++ linux-2.6.32.9/drivers/atm/atmtcp.c 2010-02-23 17:09:53.160339709 -0500
19703@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc 20103@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc
19704 if (vcc->pop) vcc->pop(vcc,skb); 20104 if (vcc->pop) vcc->pop(vcc,skb);
19705 else dev_kfree_skb(skb); 20105 else dev_kfree_skb(skb);
@@ -19749,9 +20149,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/atmtcp.c linux-2.6.32.8/drivers/atm/atmtcp
19749 done: 20149 done:
19750 if (vcc->pop) vcc->pop(vcc,skb); 20150 if (vcc->pop) vcc->pop(vcc,skb);
19751 else dev_kfree_skb(skb); 20151 else dev_kfree_skb(skb);
19752diff -urNp linux-2.6.32.8/drivers/atm/eni.c linux-2.6.32.8/drivers/atm/eni.c 20152diff -urNp linux-2.6.32.9/drivers/atm/eni.c linux-2.6.32.9/drivers/atm/eni.c
19753--- linux-2.6.32.8/drivers/atm/eni.c 2010-02-09 07:57:19.000000000 -0500 20153--- linux-2.6.32.9/drivers/atm/eni.c 2010-02-09 07:57:19.000000000 -0500
19754+++ linux-2.6.32.8/drivers/atm/eni.c 2010-02-13 21:45:09.990789947 -0500 20154+++ linux-2.6.32.9/drivers/atm/eni.c 2010-02-23 17:09:53.160339709 -0500
19755@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) 20155@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
19756 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", 20156 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
19757 vcc->dev->number); 20157 vcc->dev->number);
@@ -19797,9 +20197,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/eni.c linux-2.6.32.8/drivers/atm/eni.c
19797 wake_up(&eni_dev->tx_wait); 20197 wake_up(&eni_dev->tx_wait);
19798 dma_complete++; 20198 dma_complete++;
19799 } 20199 }
19800diff -urNp linux-2.6.32.8/drivers/atm/firestream.c linux-2.6.32.8/drivers/atm/firestream.c 20200diff -urNp linux-2.6.32.9/drivers/atm/firestream.c linux-2.6.32.9/drivers/atm/firestream.c
19801--- linux-2.6.32.8/drivers/atm/firestream.c 2010-02-09 07:57:19.000000000 -0500 20201--- linux-2.6.32.9/drivers/atm/firestream.c 2010-02-09 07:57:19.000000000 -0500
19802+++ linux-2.6.32.8/drivers/atm/firestream.c 2010-02-13 21:45:09.990789947 -0500 20202+++ linux-2.6.32.9/drivers/atm/firestream.c 2010-02-23 17:09:53.160339709 -0500
19803@@ -748,7 +748,7 @@ static void process_txdone_queue (struct 20203@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
19804 } 20204 }
19805 } 20205 }
@@ -19833,9 +20233,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/firestream.c linux-2.6.32.8/drivers/atm/fi
19833 break; 20233 break;
19834 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ 20234 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
19835 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 20235 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
19836diff -urNp linux-2.6.32.8/drivers/atm/fore200e.c linux-2.6.32.8/drivers/atm/fore200e.c 20236diff -urNp linux-2.6.32.9/drivers/atm/fore200e.c linux-2.6.32.9/drivers/atm/fore200e.c
19837--- linux-2.6.32.8/drivers/atm/fore200e.c 2010-02-09 07:57:19.000000000 -0500 20237--- linux-2.6.32.9/drivers/atm/fore200e.c 2010-02-09 07:57:19.000000000 -0500
19838+++ linux-2.6.32.8/drivers/atm/fore200e.c 2010-02-13 21:45:09.991878639 -0500 20238+++ linux-2.6.32.9/drivers/atm/fore200e.c 2010-02-23 17:09:53.160339709 -0500
19839@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 20239@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
19840 #endif 20240 #endif
19841 /* check error condition */ 20241 /* check error condition */
@@ -19892,9 +20292,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/fore200e.c linux-2.6.32.8/drivers/atm/fore
19892 20292
19893 fore200e->tx_sat++; 20293 fore200e->tx_sat++;
19894 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", 20294 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
19895diff -urNp linux-2.6.32.8/drivers/atm/he.c linux-2.6.32.8/drivers/atm/he.c 20295diff -urNp linux-2.6.32.9/drivers/atm/he.c linux-2.6.32.9/drivers/atm/he.c
19896--- linux-2.6.32.8/drivers/atm/he.c 2010-02-09 07:57:19.000000000 -0500 20296--- linux-2.6.32.9/drivers/atm/he.c 2010-02-09 07:57:19.000000000 -0500
19897+++ linux-2.6.32.8/drivers/atm/he.c 2010-02-13 21:45:09.992913799 -0500 20297+++ linux-2.6.32.9/drivers/atm/he.c 2010-02-23 17:09:53.164177137 -0500
19898@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i 20298@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
19899 20299
19900 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { 20300 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -19976,9 +20376,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/he.c linux-2.6.32.8/drivers/atm/he.c
19976 20376
19977 return 0; 20377 return 0;
19978 } 20378 }
19979diff -urNp linux-2.6.32.8/drivers/atm/horizon.c linux-2.6.32.8/drivers/atm/horizon.c 20379diff -urNp linux-2.6.32.9/drivers/atm/horizon.c linux-2.6.32.9/drivers/atm/horizon.c
19980--- linux-2.6.32.8/drivers/atm/horizon.c 2010-02-09 07:57:19.000000000 -0500 20380--- linux-2.6.32.9/drivers/atm/horizon.c 2010-02-09 07:57:19.000000000 -0500
19981+++ linux-2.6.32.8/drivers/atm/horizon.c 2010-02-13 21:45:09.992913799 -0500 20381+++ linux-2.6.32.9/drivers/atm/horizon.c 2010-02-23 17:09:53.164177137 -0500
19982@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, 20382@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
19983 { 20383 {
19984 struct atm_vcc * vcc = ATM_SKB(skb)->vcc; 20384 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -19997,9 +20397,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/horizon.c linux-2.6.32.8/drivers/atm/horiz
19997 20397
19998 // free the skb 20398 // free the skb
19999 hrz_kfree_skb (skb); 20399 hrz_kfree_skb (skb);
20000diff -urNp linux-2.6.32.8/drivers/atm/idt77252.c linux-2.6.32.8/drivers/atm/idt77252.c 20400diff -urNp linux-2.6.32.9/drivers/atm/idt77252.c linux-2.6.32.9/drivers/atm/idt77252.c
20001--- linux-2.6.32.8/drivers/atm/idt77252.c 2010-02-09 07:57:19.000000000 -0500 20401--- linux-2.6.32.9/drivers/atm/idt77252.c 2010-02-09 07:57:19.000000000 -0500
20002+++ linux-2.6.32.8/drivers/atm/idt77252.c 2010-02-13 21:45:09.993916768 -0500 20402+++ linux-2.6.32.9/drivers/atm/idt77252.c 2010-02-23 17:09:53.164177137 -0500
20003@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str 20403@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
20004 else 20404 else
20005 dev_kfree_skb(skb); 20405 dev_kfree_skb(skb);
@@ -20154,9 +20554,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/idt77252.c linux-2.6.32.8/drivers/atm/idt7
20154 return -ENOMEM; 20554 return -ENOMEM;
20155 } 20555 }
20156 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); 20556 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
20157diff -urNp linux-2.6.32.8/drivers/atm/iphase.c linux-2.6.32.8/drivers/atm/iphase.c 20557diff -urNp linux-2.6.32.9/drivers/atm/iphase.c linux-2.6.32.9/drivers/atm/iphase.c
20158--- linux-2.6.32.8/drivers/atm/iphase.c 2010-02-09 07:57:19.000000000 -0500 20558--- linux-2.6.32.9/drivers/atm/iphase.c 2010-02-09 07:57:19.000000000 -0500
20159+++ linux-2.6.32.8/drivers/atm/iphase.c 2010-02-13 21:45:09.994917324 -0500 20559+++ linux-2.6.32.9/drivers/atm/iphase.c 2010-02-23 17:09:53.164177137 -0500
20160@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) 20560@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)
20161 status = (u_short) (buf_desc_ptr->desc_mode); 20561 status = (u_short) (buf_desc_ptr->desc_mode);
20162 if (status & (RX_CER | RX_PTE | RX_OFL)) 20562 if (status & (RX_CER | RX_PTE | RX_OFL))
@@ -20253,9 +20653,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/iphase.c linux-2.6.32.8/drivers/atm/iphase
20253 if (iavcc->vc_desc_cnt > 10) { 20653 if (iavcc->vc_desc_cnt > 10) {
20254 vcc->tx_quota = vcc->tx_quota * 3 / 4; 20654 vcc->tx_quota = vcc->tx_quota * 3 / 4;
20255 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); 20655 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
20256diff -urNp linux-2.6.32.8/drivers/atm/lanai.c linux-2.6.32.8/drivers/atm/lanai.c 20656diff -urNp linux-2.6.32.9/drivers/atm/lanai.c linux-2.6.32.9/drivers/atm/lanai.c
20257--- linux-2.6.32.8/drivers/atm/lanai.c 2010-02-09 07:57:19.000000000 -0500 20657--- linux-2.6.32.9/drivers/atm/lanai.c 2010-02-09 07:57:19.000000000 -0500
20258+++ linux-2.6.32.8/drivers/atm/lanai.c 2010-02-13 21:45:09.995625472 -0500 20658+++ linux-2.6.32.9/drivers/atm/lanai.c 2010-02-23 17:09:53.164177137 -0500
20259@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l 20659@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
20260 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); 20660 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
20261 lanai_endtx(lanai, lvcc); 20661 lanai_endtx(lanai, lvcc);
@@ -20310,9 +20710,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/lanai.c linux-2.6.32.8/drivers/atm/lanai.c
20310 lvcc->stats.x.aal5.service_rxcrc++; 20710 lvcc->stats.x.aal5.service_rxcrc++;
20311 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; 20711 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
20312 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); 20712 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
20313diff -urNp linux-2.6.32.8/drivers/atm/nicstar.c linux-2.6.32.8/drivers/atm/nicstar.c 20713diff -urNp linux-2.6.32.9/drivers/atm/nicstar.c linux-2.6.32.9/drivers/atm/nicstar.c
20314--- linux-2.6.32.8/drivers/atm/nicstar.c 2010-02-09 07:57:19.000000000 -0500 20714--- linux-2.6.32.9/drivers/atm/nicstar.c 2010-02-09 07:57:19.000000000 -0500
20315+++ linux-2.6.32.8/drivers/atm/nicstar.c 2010-02-13 21:45:09.996835361 -0500 20715+++ linux-2.6.32.9/drivers/atm/nicstar.c 2010-02-23 17:09:53.164177137 -0500
20316@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, 20716@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
20317 if ((vc = (vc_map *) vcc->dev_data) == NULL) 20717 if ((vc = (vc_map *) vcc->dev_data) == NULL)
20318 { 20718 {
@@ -20515,9 +20915,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/nicstar.c linux-2.6.32.8/drivers/atm/nicst
20515 } 20915 }
20516 } 20916 }
20517 20917
20518diff -urNp linux-2.6.32.8/drivers/atm/solos-pci.c linux-2.6.32.8/drivers/atm/solos-pci.c 20918diff -urNp linux-2.6.32.9/drivers/atm/solos-pci.c linux-2.6.32.9/drivers/atm/solos-pci.c
20519--- linux-2.6.32.8/drivers/atm/solos-pci.c 2010-02-09 07:57:19.000000000 -0500 20919--- linux-2.6.32.9/drivers/atm/solos-pci.c 2010-02-09 07:57:19.000000000 -0500
20520+++ linux-2.6.32.8/drivers/atm/solos-pci.c 2010-02-13 21:45:09.996835361 -0500 20920+++ linux-2.6.32.9/drivers/atm/solos-pci.c 2010-02-23 17:09:53.164177137 -0500
20521@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) 20921@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
20522 } 20922 }
20523 atm_charge(vcc, skb->truesize); 20923 atm_charge(vcc, skb->truesize);
@@ -20536,9 +20936,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/solos-pci.c linux-2.6.32.8/drivers/atm/sol
20536 solos_pop(vcc, oldskb); 20936 solos_pop(vcc, oldskb);
20537 } else 20937 } else
20538 dev_kfree_skb_irq(oldskb); 20938 dev_kfree_skb_irq(oldskb);
20539diff -urNp linux-2.6.32.8/drivers/atm/suni.c linux-2.6.32.8/drivers/atm/suni.c 20939diff -urNp linux-2.6.32.9/drivers/atm/suni.c linux-2.6.32.9/drivers/atm/suni.c
20540--- linux-2.6.32.8/drivers/atm/suni.c 2010-02-09 07:57:19.000000000 -0500 20940--- linux-2.6.32.9/drivers/atm/suni.c 2010-02-09 07:57:19.000000000 -0500
20541+++ linux-2.6.32.8/drivers/atm/suni.c 2010-02-13 21:45:09.997543003 -0500 20941+++ linux-2.6.32.9/drivers/atm/suni.c 2010-02-23 17:09:53.168233068 -0500
20542@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); 20942@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
20543 20943
20544 20944
@@ -20550,9 +20950,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/suni.c linux-2.6.32.8/drivers/atm/suni.c
20550 20950
20551 20951
20552 static void suni_hz(unsigned long from_timer) 20952 static void suni_hz(unsigned long from_timer)
20553diff -urNp linux-2.6.32.8/drivers/atm/uPD98402.c linux-2.6.32.8/drivers/atm/uPD98402.c 20953diff -urNp linux-2.6.32.9/drivers/atm/uPD98402.c linux-2.6.32.9/drivers/atm/uPD98402.c
20554--- linux-2.6.32.8/drivers/atm/uPD98402.c 2010-02-09 07:57:19.000000000 -0500 20954--- linux-2.6.32.9/drivers/atm/uPD98402.c 2010-02-09 07:57:19.000000000 -0500
20555+++ linux-2.6.32.8/drivers/atm/uPD98402.c 2010-02-13 21:45:09.997543003 -0500 20955+++ linux-2.6.32.9/drivers/atm/uPD98402.c 2010-02-23 17:09:53.168233068 -0500
20556@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d 20956@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
20557 struct sonet_stats tmp; 20957 struct sonet_stats tmp;
20558 int error = 0; 20958 int error = 0;
@@ -20597,9 +20997,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/uPD98402.c linux-2.6.32.8/drivers/atm/uPD9
20597 return 0; 20997 return 0;
20598 } 20998 }
20599 20999
20600diff -urNp linux-2.6.32.8/drivers/atm/zatm.c linux-2.6.32.8/drivers/atm/zatm.c 21000diff -urNp linux-2.6.32.9/drivers/atm/zatm.c linux-2.6.32.9/drivers/atm/zatm.c
20601--- linux-2.6.32.8/drivers/atm/zatm.c 2010-02-09 07:57:19.000000000 -0500 21001--- linux-2.6.32.9/drivers/atm/zatm.c 2010-02-09 07:57:19.000000000 -0500
20602+++ linux-2.6.32.8/drivers/atm/zatm.c 2010-02-13 21:45:09.997543003 -0500 21002+++ linux-2.6.32.9/drivers/atm/zatm.c 2010-02-23 17:09:53.168233068 -0500
20603@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy 21003@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
20604 } 21004 }
20605 if (!size) { 21005 if (!size) {
@@ -20627,9 +21027,9 @@ diff -urNp linux-2.6.32.8/drivers/atm/zatm.c linux-2.6.32.8/drivers/atm/zatm.c
20627 wake_up(&zatm_vcc->tx_wait); 21027 wake_up(&zatm_vcc->tx_wait);
20628 } 21028 }
20629 21029
20630diff -urNp linux-2.6.32.8/drivers/base/bus.c linux-2.6.32.8/drivers/base/bus.c 21030diff -urNp linux-2.6.32.9/drivers/base/bus.c linux-2.6.32.9/drivers/base/bus.c
20631--- linux-2.6.32.8/drivers/base/bus.c 2010-02-09 07:57:19.000000000 -0500 21031--- linux-2.6.32.9/drivers/base/bus.c 2010-02-09 07:57:19.000000000 -0500
20632+++ linux-2.6.32.8/drivers/base/bus.c 2010-02-13 21:45:09.997543003 -0500 21032+++ linux-2.6.32.9/drivers/base/bus.c 2010-02-23 17:09:53.168233068 -0500
20633@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob 21033@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
20634 return ret; 21034 return ret;
20635 } 21035 }
@@ -20657,11 +21057,11 @@ diff -urNp linux-2.6.32.8/drivers/base/bus.c linux-2.6.32.8/drivers/base/bus.c
20657 .filter = bus_uevent_filter, 21057 .filter = bus_uevent_filter,
20658 }; 21058 };
20659 21059
20660diff -urNp linux-2.6.32.8/drivers/base/class.c linux-2.6.32.8/drivers/base/class.c 21060diff -urNp linux-2.6.32.9/drivers/base/class.c linux-2.6.32.9/drivers/base/class.c
20661--- linux-2.6.32.8/drivers/base/class.c 2010-02-09 07:57:19.000000000 -0500 21061--- linux-2.6.32.9/drivers/base/class.c 2010-02-23 17:04:12.007594284 -0500
20662+++ linux-2.6.32.8/drivers/base/class.c 2010-02-13 21:45:09.997543003 -0500 21062+++ linux-2.6.32.9/drivers/base/class.c 2010-02-23 17:25:23.631619477 -0500
20663@@ -61,7 +61,7 @@ static void class_release(struct kobject 21063@@ -63,7 +63,7 @@ static void class_release(struct kobject
20664 "be careful\n", class->name); 21064 kfree(cp);
20665 } 21065 }
20666 21066
20667-static struct sysfs_ops class_sysfs_ops = { 21067-static struct sysfs_ops class_sysfs_ops = {
@@ -20669,9 +21069,9 @@ diff -urNp linux-2.6.32.8/drivers/base/class.c linux-2.6.32.8/drivers/base/class
20669 .show = class_attr_show, 21069 .show = class_attr_show,
20670 .store = class_attr_store, 21070 .store = class_attr_store,
20671 }; 21071 };
20672diff -urNp linux-2.6.32.8/drivers/base/core.c linux-2.6.32.8/drivers/base/core.c 21072diff -urNp linux-2.6.32.9/drivers/base/core.c linux-2.6.32.9/drivers/base/core.c
20673--- linux-2.6.32.8/drivers/base/core.c 2010-02-09 07:57:19.000000000 -0500 21073--- linux-2.6.32.9/drivers/base/core.c 2010-02-09 07:57:19.000000000 -0500
20674+++ linux-2.6.32.8/drivers/base/core.c 2010-02-13 21:45:09.998872688 -0500 21074+++ linux-2.6.32.9/drivers/base/core.c 2010-02-23 17:09:53.168233068 -0500
20675@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob 21075@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
20676 return ret; 21076 return ret;
20677 } 21077 }
@@ -20690,9 +21090,9 @@ diff -urNp linux-2.6.32.8/drivers/base/core.c linux-2.6.32.8/drivers/base/core.c
20690 .filter = dev_uevent_filter, 21090 .filter = dev_uevent_filter,
20691 .name = dev_uevent_name, 21091 .name = dev_uevent_name,
20692 .uevent = dev_uevent, 21092 .uevent = dev_uevent,
20693diff -urNp linux-2.6.32.8/drivers/base/memory.c linux-2.6.32.8/drivers/base/memory.c 21093diff -urNp linux-2.6.32.9/drivers/base/memory.c linux-2.6.32.9/drivers/base/memory.c
20694--- linux-2.6.32.8/drivers/base/memory.c 2010-02-09 07:57:19.000000000 -0500 21094--- linux-2.6.32.9/drivers/base/memory.c 2010-02-09 07:57:19.000000000 -0500
20695+++ linux-2.6.32.8/drivers/base/memory.c 2010-02-13 21:45:09.998872688 -0500 21095+++ linux-2.6.32.9/drivers/base/memory.c 2010-02-23 17:09:53.168233068 -0500
20696@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks 21096@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
20697 return retval; 21097 return retval;
20698 } 21098 }
@@ -20702,9 +21102,9 @@ diff -urNp linux-2.6.32.8/drivers/base/memory.c linux-2.6.32.8/drivers/base/memo
20702 .name = memory_uevent_name, 21102 .name = memory_uevent_name,
20703 .uevent = memory_uevent, 21103 .uevent = memory_uevent,
20704 }; 21104 };
20705diff -urNp linux-2.6.32.8/drivers/base/sys.c linux-2.6.32.8/drivers/base/sys.c 21105diff -urNp linux-2.6.32.9/drivers/base/sys.c linux-2.6.32.9/drivers/base/sys.c
20706--- linux-2.6.32.8/drivers/base/sys.c 2010-02-09 07:57:19.000000000 -0500 21106--- linux-2.6.32.9/drivers/base/sys.c 2010-02-09 07:57:19.000000000 -0500
20707+++ linux-2.6.32.8/drivers/base/sys.c 2010-02-13 21:45:09.998872688 -0500 21107+++ linux-2.6.32.9/drivers/base/sys.c 2010-02-23 17:09:53.168233068 -0500
20708@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc 21108@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
20709 return -EIO; 21109 return -EIO;
20710 } 21110 }
@@ -20723,9 +21123,9 @@ diff -urNp linux-2.6.32.8/drivers/base/sys.c linux-2.6.32.8/drivers/base/sys.c
20723 .show = sysdev_class_show, 21123 .show = sysdev_class_show,
20724 .store = sysdev_class_store, 21124 .store = sysdev_class_store,
20725 }; 21125 };
20726diff -urNp linux-2.6.32.8/drivers/block/pktcdvd.c linux-2.6.32.8/drivers/block/pktcdvd.c 21126diff -urNp linux-2.6.32.9/drivers/block/pktcdvd.c linux-2.6.32.9/drivers/block/pktcdvd.c
20727--- linux-2.6.32.8/drivers/block/pktcdvd.c 2010-02-09 07:57:19.000000000 -0500 21127--- linux-2.6.32.9/drivers/block/pktcdvd.c 2010-02-09 07:57:19.000000000 -0500
20728+++ linux-2.6.32.8/drivers/block/pktcdvd.c 2010-02-13 21:45:09.999912339 -0500 21128+++ linux-2.6.32.9/drivers/block/pktcdvd.c 2010-02-23 17:09:53.168233068 -0500
20729@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob 21129@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
20730 return len; 21130 return len;
20731 } 21131 }
@@ -20735,9 +21135,9 @@ diff -urNp linux-2.6.32.8/drivers/block/pktcdvd.c linux-2.6.32.8/drivers/block/p
20735 .show = kobj_pkt_show, 21135 .show = kobj_pkt_show,
20736 .store = kobj_pkt_store 21136 .store = kobj_pkt_store
20737 }; 21137 };
20738diff -urNp linux-2.6.32.8/drivers/char/agp/frontend.c linux-2.6.32.8/drivers/char/agp/frontend.c 21138diff -urNp linux-2.6.32.9/drivers/char/agp/frontend.c linux-2.6.32.9/drivers/char/agp/frontend.c
20739--- linux-2.6.32.8/drivers/char/agp/frontend.c 2010-02-09 07:57:19.000000000 -0500 21139--- linux-2.6.32.9/drivers/char/agp/frontend.c 2010-02-09 07:57:19.000000000 -0500
20740+++ linux-2.6.32.8/drivers/char/agp/frontend.c 2010-02-13 21:45:09.999912339 -0500 21140+++ linux-2.6.32.9/drivers/char/agp/frontend.c 2010-02-23 17:09:53.168233068 -0500
20741@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag 21141@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
20742 if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) 21142 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
20743 return -EFAULT; 21143 return -EFAULT;
@@ -20747,9 +21147,9 @@ diff -urNp linux-2.6.32.8/drivers/char/agp/frontend.c linux-2.6.32.8/drivers/cha
20747 return -EFAULT; 21147 return -EFAULT;
20748 21148
20749 client = agp_find_client_by_pid(reserve.pid); 21149 client = agp_find_client_by_pid(reserve.pid);
20750diff -urNp linux-2.6.32.8/drivers/char/agp/intel-agp.c linux-2.6.32.8/drivers/char/agp/intel-agp.c 21150diff -urNp linux-2.6.32.9/drivers/char/agp/intel-agp.c linux-2.6.32.9/drivers/char/agp/intel-agp.c
20751--- linux-2.6.32.8/drivers/char/agp/intel-agp.c 2010-02-09 07:57:19.000000000 -0500 21151--- linux-2.6.32.9/drivers/char/agp/intel-agp.c 2010-02-09 07:57:19.000000000 -0500
20752+++ linux-2.6.32.8/drivers/char/agp/intel-agp.c 2010-02-13 21:45:09.999912339 -0500 21152+++ linux-2.6.32.9/drivers/char/agp/intel-agp.c 2010-02-23 17:09:53.168233068 -0500
20753@@ -2571,7 +2571,7 @@ static struct pci_device_id agp_intel_pc 21153@@ -2571,7 +2571,7 @@ static struct pci_device_id agp_intel_pc
20754 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), 21154 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
20755 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), 21155 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
@@ -20759,9 +21159,9 @@ diff -urNp linux-2.6.32.8/drivers/char/agp/intel-agp.c linux-2.6.32.8/drivers/ch
20759 }; 21159 };
20760 21160
20761 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); 21161 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
20762diff -urNp linux-2.6.32.8/drivers/char/hpet.c linux-2.6.32.8/drivers/char/hpet.c 21162diff -urNp linux-2.6.32.9/drivers/char/hpet.c linux-2.6.32.9/drivers/char/hpet.c
20763--- linux-2.6.32.8/drivers/char/hpet.c 2010-02-09 07:57:19.000000000 -0500 21163--- linux-2.6.32.9/drivers/char/hpet.c 2010-02-09 07:57:19.000000000 -0500
20764+++ linux-2.6.32.8/drivers/char/hpet.c 2010-02-13 21:45:10.000894801 -0500 21164+++ linux-2.6.32.9/drivers/char/hpet.c 2010-02-23 17:09:53.168233068 -0500
20765@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv 21165@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv
20766 }, 21166 },
20767 }; 21167 };
@@ -20771,9 +21171,9 @@ diff -urNp linux-2.6.32.8/drivers/char/hpet.c linux-2.6.32.8/drivers/char/hpet.c
20771 21171
20772 static int __init hpet_init(void) 21172 static int __init hpet_init(void)
20773 { 21173 {
20774diff -urNp linux-2.6.32.8/drivers/char/hvc_beat.c linux-2.6.32.8/drivers/char/hvc_beat.c 21174diff -urNp linux-2.6.32.9/drivers/char/hvc_beat.c linux-2.6.32.9/drivers/char/hvc_beat.c
20775--- linux-2.6.32.8/drivers/char/hvc_beat.c 2010-02-09 07:57:19.000000000 -0500 21175--- linux-2.6.32.9/drivers/char/hvc_beat.c 2010-02-09 07:57:19.000000000 -0500
20776+++ linux-2.6.32.8/drivers/char/hvc_beat.c 2010-02-13 21:45:10.000894801 -0500 21176+++ linux-2.6.32.9/drivers/char/hvc_beat.c 2010-02-23 17:09:53.168233068 -0500
20777@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v 21177@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
20778 return cnt; 21178 return cnt;
20779 } 21179 }
@@ -20783,9 +21183,9 @@ diff -urNp linux-2.6.32.8/drivers/char/hvc_beat.c linux-2.6.32.8/drivers/char/hv
20783 .get_chars = hvc_beat_get_chars, 21183 .get_chars = hvc_beat_get_chars,
20784 .put_chars = hvc_beat_put_chars, 21184 .put_chars = hvc_beat_put_chars,
20785 }; 21185 };
20786diff -urNp linux-2.6.32.8/drivers/char/hvc_console.c linux-2.6.32.8/drivers/char/hvc_console.c 21186diff -urNp linux-2.6.32.9/drivers/char/hvc_console.c linux-2.6.32.9/drivers/char/hvc_console.c
20787--- linux-2.6.32.8/drivers/char/hvc_console.c 2010-02-09 07:57:19.000000000 -0500 21187--- linux-2.6.32.9/drivers/char/hvc_console.c 2010-02-09 07:57:19.000000000 -0500
20788+++ linux-2.6.32.8/drivers/char/hvc_console.c 2010-02-13 21:45:10.000894801 -0500 21188+++ linux-2.6.32.9/drivers/char/hvc_console.c 2010-02-23 17:09:53.168233068 -0500
20789@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind 21189@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
20790 * console interfaces but can still be used as a tty device. This has to be 21190 * console interfaces but can still be used as a tty device. This has to be
20791 * static because kmalloc will not work during early console init. 21191 * static because kmalloc will not work during early console init.
@@ -20813,9 +21213,9 @@ diff -urNp linux-2.6.32.8/drivers/char/hvc_console.c linux-2.6.32.8/drivers/char
20813 { 21213 {
20814 struct hvc_struct *hp; 21214 struct hvc_struct *hp;
20815 int i; 21215 int i;
20816diff -urNp linux-2.6.32.8/drivers/char/hvc_console.h linux-2.6.32.8/drivers/char/hvc_console.h 21216diff -urNp linux-2.6.32.9/drivers/char/hvc_console.h linux-2.6.32.9/drivers/char/hvc_console.h
20817--- linux-2.6.32.8/drivers/char/hvc_console.h 2010-02-09 07:57:19.000000000 -0500 21217--- linux-2.6.32.9/drivers/char/hvc_console.h 2010-02-09 07:57:19.000000000 -0500
20818+++ linux-2.6.32.8/drivers/char/hvc_console.h 2010-02-13 21:45:10.000894801 -0500 21218+++ linux-2.6.32.9/drivers/char/hvc_console.h 2010-02-23 17:09:53.168233068 -0500
20819@@ -55,7 +55,7 @@ struct hvc_struct { 21219@@ -55,7 +55,7 @@ struct hvc_struct {
20820 int outbuf_size; 21220 int outbuf_size;
20821 int n_outbuf; 21221 int n_outbuf;
@@ -20839,9 +21239,9 @@ diff -urNp linux-2.6.32.8/drivers/char/hvc_console.h linux-2.6.32.8/drivers/char
20839 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ 21239 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
20840 extern int hvc_remove(struct hvc_struct *hp); 21240 extern int hvc_remove(struct hvc_struct *hp);
20841 21241
20842diff -urNp linux-2.6.32.8/drivers/char/hvc_iseries.c linux-2.6.32.8/drivers/char/hvc_iseries.c 21242diff -urNp linux-2.6.32.9/drivers/char/hvc_iseries.c linux-2.6.32.9/drivers/char/hvc_iseries.c
20843--- linux-2.6.32.8/drivers/char/hvc_iseries.c 2010-02-09 07:57:19.000000000 -0500 21243--- linux-2.6.32.9/drivers/char/hvc_iseries.c 2010-02-09 07:57:19.000000000 -0500
20844+++ linux-2.6.32.8/drivers/char/hvc_iseries.c 2010-02-13 21:45:10.001795492 -0500 21244+++ linux-2.6.32.9/drivers/char/hvc_iseries.c 2010-02-23 17:09:53.168233068 -0500
20845@@ -197,7 +197,7 @@ done: 21245@@ -197,7 +197,7 @@ done:
20846 return sent; 21246 return sent;
20847 } 21247 }
@@ -20851,9 +21251,9 @@ diff -urNp linux-2.6.32.8/drivers/char/hvc_iseries.c linux-2.6.32.8/drivers/char
20851 .get_chars = get_chars, 21251 .get_chars = get_chars,
20852 .put_chars = put_chars, 21252 .put_chars = put_chars,
20853 .notifier_add = notifier_add_irq, 21253 .notifier_add = notifier_add_irq,
20854diff -urNp linux-2.6.32.8/drivers/char/hvc_iucv.c linux-2.6.32.8/drivers/char/hvc_iucv.c 21254diff -urNp linux-2.6.32.9/drivers/char/hvc_iucv.c linux-2.6.32.9/drivers/char/hvc_iucv.c
20855--- linux-2.6.32.8/drivers/char/hvc_iucv.c 2010-02-09 07:57:19.000000000 -0500 21255--- linux-2.6.32.9/drivers/char/hvc_iucv.c 2010-02-09 07:57:19.000000000 -0500
20856+++ linux-2.6.32.8/drivers/char/hvc_iucv.c 2010-02-13 21:45:10.001795492 -0500 21256+++ linux-2.6.32.9/drivers/char/hvc_iucv.c 2010-02-23 17:09:53.172065136 -0500
20857@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru 21257@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
20858 21258
20859 21259
@@ -20863,9 +21263,9 @@ diff -urNp linux-2.6.32.8/drivers/char/hvc_iucv.c linux-2.6.32.8/drivers/char/hv
20863 .get_chars = hvc_iucv_get_chars, 21263 .get_chars = hvc_iucv_get_chars,
20864 .put_chars = hvc_iucv_put_chars, 21264 .put_chars = hvc_iucv_put_chars,
20865 .notifier_add = hvc_iucv_notifier_add, 21265 .notifier_add = hvc_iucv_notifier_add,
20866diff -urNp linux-2.6.32.8/drivers/char/hvc_rtas.c linux-2.6.32.8/drivers/char/hvc_rtas.c 21266diff -urNp linux-2.6.32.9/drivers/char/hvc_rtas.c linux-2.6.32.9/drivers/char/hvc_rtas.c
20867--- linux-2.6.32.8/drivers/char/hvc_rtas.c 2010-02-09 07:57:19.000000000 -0500 21267--- linux-2.6.32.9/drivers/char/hvc_rtas.c 2010-02-09 07:57:19.000000000 -0500
20868+++ linux-2.6.32.8/drivers/char/hvc_rtas.c 2010-02-13 21:45:10.001795492 -0500 21268+++ linux-2.6.32.9/drivers/char/hvc_rtas.c 2010-02-23 17:09:53.172065136 -0500
20869@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ 21269@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
20870 return i; 21270 return i;
20871 } 21271 }
@@ -20875,9 +21275,9 @@ diff -urNp linux-2.6.32.8/drivers/char/hvc_rtas.c linux-2.6.32.8/drivers/char/hv
20875 .get_chars = hvc_rtas_read_console, 21275 .get_chars = hvc_rtas_read_console,
20876 .put_chars = hvc_rtas_write_console, 21276 .put_chars = hvc_rtas_write_console,
20877 }; 21277 };
20878diff -urNp linux-2.6.32.8/drivers/char/hvcs.c linux-2.6.32.8/drivers/char/hvcs.c 21278diff -urNp linux-2.6.32.9/drivers/char/hvcs.c linux-2.6.32.9/drivers/char/hvcs.c
20879--- linux-2.6.32.8/drivers/char/hvcs.c 2010-02-09 07:57:19.000000000 -0500 21279--- linux-2.6.32.9/drivers/char/hvcs.c 2010-02-09 07:57:19.000000000 -0500
20880+++ linux-2.6.32.8/drivers/char/hvcs.c 2010-02-13 21:45:10.002636361 -0500 21280+++ linux-2.6.32.9/drivers/char/hvcs.c 2010-02-23 17:09:53.172065136 -0500
20881@@ -269,7 +269,7 @@ struct hvcs_struct { 21281@@ -269,7 +269,7 @@ struct hvcs_struct {
20882 unsigned int index; 21282 unsigned int index;
20883 21283
@@ -20972,9 +21372,9 @@ diff -urNp linux-2.6.32.8/drivers/char/hvcs.c linux-2.6.32.8/drivers/char/hvcs.c
20972 return 0; 21372 return 0;
20973 21373
20974 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; 21374 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
20975diff -urNp linux-2.6.32.8/drivers/char/hvc_udbg.c linux-2.6.32.8/drivers/char/hvc_udbg.c 21375diff -urNp linux-2.6.32.9/drivers/char/hvc_udbg.c linux-2.6.32.9/drivers/char/hvc_udbg.c
20976--- linux-2.6.32.8/drivers/char/hvc_udbg.c 2010-02-09 07:57:19.000000000 -0500 21376--- linux-2.6.32.9/drivers/char/hvc_udbg.c 2010-02-09 07:57:19.000000000 -0500
20977+++ linux-2.6.32.8/drivers/char/hvc_udbg.c 2010-02-13 21:45:10.002636361 -0500 21377+++ linux-2.6.32.9/drivers/char/hvc_udbg.c 2010-02-23 17:09:53.172065136 -0500
20978@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno 21378@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
20979 return i; 21379 return i;
20980 } 21380 }
@@ -20984,9 +21384,9 @@ diff -urNp linux-2.6.32.8/drivers/char/hvc_udbg.c linux-2.6.32.8/drivers/char/hv
20984 .get_chars = hvc_udbg_get, 21384 .get_chars = hvc_udbg_get,
20985 .put_chars = hvc_udbg_put, 21385 .put_chars = hvc_udbg_put,
20986 }; 21386 };
20987diff -urNp linux-2.6.32.8/drivers/char/hvc_vio.c linux-2.6.32.8/drivers/char/hvc_vio.c 21387diff -urNp linux-2.6.32.9/drivers/char/hvc_vio.c linux-2.6.32.9/drivers/char/hvc_vio.c
20988--- linux-2.6.32.8/drivers/char/hvc_vio.c 2010-02-09 07:57:19.000000000 -0500 21388--- linux-2.6.32.9/drivers/char/hvc_vio.c 2010-02-09 07:57:19.000000000 -0500
20989+++ linux-2.6.32.8/drivers/char/hvc_vio.c 2010-02-13 21:45:10.002636361 -0500 21389+++ linux-2.6.32.9/drivers/char/hvc_vio.c 2010-02-23 17:09:53.172065136 -0500
20990@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v 21390@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
20991 return got; 21391 return got;
20992 } 21392 }
@@ -20996,9 +21396,9 @@ diff -urNp linux-2.6.32.8/drivers/char/hvc_vio.c linux-2.6.32.8/drivers/char/hvc
20996 .get_chars = filtered_get_chars, 21396 .get_chars = filtered_get_chars,
20997 .put_chars = hvc_put_chars, 21397 .put_chars = hvc_put_chars,
20998 .notifier_add = notifier_add_irq, 21398 .notifier_add = notifier_add_irq,
20999diff -urNp linux-2.6.32.8/drivers/char/hvc_xen.c linux-2.6.32.8/drivers/char/hvc_xen.c 21399diff -urNp linux-2.6.32.9/drivers/char/hvc_xen.c linux-2.6.32.9/drivers/char/hvc_xen.c
21000--- linux-2.6.32.8/drivers/char/hvc_xen.c 2010-02-09 07:57:19.000000000 -0500 21400--- linux-2.6.32.9/drivers/char/hvc_xen.c 2010-02-09 07:57:19.000000000 -0500
21001+++ linux-2.6.32.8/drivers/char/hvc_xen.c 2010-02-13 21:45:10.002636361 -0500 21401+++ linux-2.6.32.9/drivers/char/hvc_xen.c 2010-02-23 17:09:53.172065136 -0500
21002@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno 21402@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
21003 return recv; 21403 return recv;
21004 } 21404 }
@@ -21008,9 +21408,9 @@ diff -urNp linux-2.6.32.8/drivers/char/hvc_xen.c linux-2.6.32.8/drivers/char/hvc
21008 .get_chars = read_console, 21408 .get_chars = read_console,
21009 .put_chars = write_console, 21409 .put_chars = write_console,
21010 .notifier_add = notifier_add_irq, 21410 .notifier_add = notifier_add_irq,
21011diff -urNp linux-2.6.32.8/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.8/drivers/char/ipmi/ipmi_msghandler.c 21411diff -urNp linux-2.6.32.9/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.9/drivers/char/ipmi/ipmi_msghandler.c
21012--- linux-2.6.32.8/drivers/char/ipmi/ipmi_msghandler.c 2010-02-09 07:57:19.000000000 -0500 21412--- linux-2.6.32.9/drivers/char/ipmi/ipmi_msghandler.c 2010-02-09 07:57:19.000000000 -0500
21013+++ linux-2.6.32.8/drivers/char/ipmi/ipmi_msghandler.c 2010-02-13 21:45:10.003914851 -0500 21413+++ linux-2.6.32.9/drivers/char/ipmi/ipmi_msghandler.c 2010-02-23 17:09:53.172065136 -0500
21014@@ -414,7 +414,7 @@ struct ipmi_smi { 21414@@ -414,7 +414,7 @@ struct ipmi_smi {
21015 struct proc_dir_entry *proc_dir; 21415 struct proc_dir_entry *proc_dir;
21016 char proc_dir_name[10]; 21416 char proc_dir_name[10];
@@ -21041,9 +21441,9 @@ diff -urNp linux-2.6.32.8/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.8/dri
21041 21441
21042 intf->proc_dir = NULL; 21442 intf->proc_dir = NULL;
21043 21443
21044diff -urNp linux-2.6.32.8/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.8/drivers/char/ipmi/ipmi_si_intf.c 21444diff -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
21045--- linux-2.6.32.8/drivers/char/ipmi/ipmi_si_intf.c 2010-02-09 07:57:19.000000000 -0500 21445--- linux-2.6.32.9/drivers/char/ipmi/ipmi_si_intf.c 2010-02-09 07:57:19.000000000 -0500
21046+++ linux-2.6.32.8/drivers/char/ipmi/ipmi_si_intf.c 2010-02-13 21:45:10.004609991 -0500 21446+++ linux-2.6.32.9/drivers/char/ipmi/ipmi_si_intf.c 2010-02-23 17:09:53.172065136 -0500
21047@@ -277,7 +277,7 @@ struct smi_info { 21447@@ -277,7 +277,7 @@ struct smi_info {
21048 unsigned char slave_addr; 21448 unsigned char slave_addr;
21049 21449
@@ -21074,9 +21474,9 @@ diff -urNp linux-2.6.32.8/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.8/driver
21074 21474
21075 new_smi->interrupt_disabled = 0; 21475 new_smi->interrupt_disabled = 0;
21076 atomic_set(&new_smi->stop_operation, 0); 21476 atomic_set(&new_smi->stop_operation, 0);
21077diff -urNp linux-2.6.32.8/drivers/char/keyboard.c linux-2.6.32.8/drivers/char/keyboard.c 21477diff -urNp linux-2.6.32.9/drivers/char/keyboard.c linux-2.6.32.9/drivers/char/keyboard.c
21078--- linux-2.6.32.8/drivers/char/keyboard.c 2010-02-09 07:57:19.000000000 -0500 21478--- linux-2.6.32.9/drivers/char/keyboard.c 2010-02-09 07:57:19.000000000 -0500
21079+++ linux-2.6.32.8/drivers/char/keyboard.c 2010-02-13 21:45:10.005543380 -0500 21479+++ linux-2.6.32.9/drivers/char/keyboard.c 2010-02-23 17:09:53.172065136 -0500
21080@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u 21480@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
21081 kbd->kbdmode == VC_MEDIUMRAW) && 21481 kbd->kbdmode == VC_MEDIUMRAW) &&
21082 value != KVAL(K_SAK)) 21482 value != KVAL(K_SAK))
@@ -21103,9 +21503,9 @@ diff -urNp linux-2.6.32.8/drivers/char/keyboard.c linux-2.6.32.8/drivers/char/ke
21103 }; 21503 };
21104 21504
21105 MODULE_DEVICE_TABLE(input, kbd_ids); 21505 MODULE_DEVICE_TABLE(input, kbd_ids);
21106diff -urNp linux-2.6.32.8/drivers/char/mem.c linux-2.6.32.8/drivers/char/mem.c 21506diff -urNp linux-2.6.32.9/drivers/char/mem.c linux-2.6.32.9/drivers/char/mem.c
21107--- linux-2.6.32.8/drivers/char/mem.c 2010-02-09 07:57:19.000000000 -0500 21507--- linux-2.6.32.9/drivers/char/mem.c 2010-02-23 17:04:12.039606376 -0500
21108+++ linux-2.6.32.8/drivers/char/mem.c 2010-02-13 21:45:10.005543380 -0500 21508+++ linux-2.6.32.9/drivers/char/mem.c 2010-02-23 17:28:21.287708349 -0500
21109@@ -18,6 +18,7 @@ 21509@@ -18,6 +18,7 @@
21110 #include <linux/raw.h> 21510 #include <linux/raw.h>
21111 #include <linux/tty.h> 21511 #include <linux/tty.h>
@@ -21122,10 +21522,10 @@ diff -urNp linux-2.6.32.8/drivers/char/mem.c linux-2.6.32.8/drivers/char/mem.c
21122+extern struct file_operations grsec_fops; 21522+extern struct file_operations grsec_fops;
21123+#endif 21523+#endif
21124+ 21524+
21125 /* 21525 static inline unsigned long size_inside_page(unsigned long start,
21126 * Architectures vary in how they handle caching for addresses 21526 unsigned long size)
21127 * outside of main memory. 21527 {
21128@@ -192,6 +197,11 @@ static ssize_t write_mem(struct file * f 21528@@ -205,6 +210,11 @@ static ssize_t write_mem(struct file * f
21129 if (!valid_phys_addr_range(p, count)) 21529 if (!valid_phys_addr_range(p, count))
21130 return -EFAULT; 21530 return -EFAULT;
21131 21531
@@ -21137,7 +21537,7 @@ diff -urNp linux-2.6.32.8/drivers/char/mem.c linux-2.6.32.8/drivers/char/mem.c
21137 written = 0; 21537 written = 0;
21138 21538
21139 #ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED 21539 #ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
21140@@ -324,6 +334,11 @@ static int mmap_mem(struct file * file, 21540@@ -337,6 +347,11 @@ static int mmap_mem(struct file * file,
21141 &vma->vm_page_prot)) 21541 &vma->vm_page_prot))
21142 return -EINVAL; 21542 return -EINVAL;
21143 21543
@@ -21149,9 +21549,9 @@ diff -urNp linux-2.6.32.8/drivers/char/mem.c linux-2.6.32.8/drivers/char/mem.c
21149 vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_pgoff, 21549 vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_pgoff,
21150 size, 21550 size,
21151 vma->vm_page_prot); 21551 vma->vm_page_prot);
21152@@ -558,6 +573,11 @@ static ssize_t write_kmem(struct file * 21552@@ -560,6 +575,11 @@ static ssize_t write_kmem(struct file *
21153 ssize_t written;
21154 char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ 21553 char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
21554 int err = 0;
21155 21555
21156+#ifdef CONFIG_GRKERNSEC_KMEM 21556+#ifdef CONFIG_GRKERNSEC_KMEM
21157+ gr_handle_kmem_write(); 21557+ gr_handle_kmem_write();
@@ -21161,7 +21561,7 @@ diff -urNp linux-2.6.32.8/drivers/char/mem.c linux-2.6.32.8/drivers/char/mem.c
21161 if (p < (unsigned long) high_memory) { 21561 if (p < (unsigned long) high_memory) {
21162 21562
21163 wrote = count; 21563 wrote = count;
21164@@ -763,6 +783,16 @@ static loff_t memory_lseek(struct file * 21564@@ -765,6 +785,16 @@ static loff_t memory_lseek(struct file *
21165 21565
21166 static int open_port(struct inode * inode, struct file * filp) 21566 static int open_port(struct inode * inode, struct file * filp)
21167 { 21567 {
@@ -21178,7 +21578,7 @@ diff -urNp linux-2.6.32.8/drivers/char/mem.c linux-2.6.32.8/drivers/char/mem.c
21178 return capable(CAP_SYS_RAWIO) ? 0 : -EPERM; 21578 return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
21179 } 21579 }
21180 21580
21181@@ -770,7 +800,6 @@ static int open_port(struct inode * inod 21581@@ -772,7 +802,6 @@ static int open_port(struct inode * inod
21182 #define full_lseek null_lseek 21582 #define full_lseek null_lseek
21183 #define write_zero write_null 21583 #define write_zero write_null
21184 #define read_full read_zero 21584 #define read_full read_zero
@@ -21186,7 +21586,7 @@ diff -urNp linux-2.6.32.8/drivers/char/mem.c linux-2.6.32.8/drivers/char/mem.c
21186 #define open_kmem open_mem 21586 #define open_kmem open_mem
21187 #define open_oldmem open_mem 21587 #define open_oldmem open_mem
21188 21588
21189@@ -886,6 +915,9 @@ static const struct memdev { 21589@@ -888,6 +917,9 @@ static const struct memdev {
21190 #ifdef CONFIG_CRASH_DUMP 21590 #ifdef CONFIG_CRASH_DUMP
21191 [12] = { "oldmem", 0, &oldmem_fops, NULL }, 21591 [12] = { "oldmem", 0, &oldmem_fops, NULL },
21192 #endif 21592 #endif
@@ -21196,9 +21596,9 @@ diff -urNp linux-2.6.32.8/drivers/char/mem.c linux-2.6.32.8/drivers/char/mem.c
21196 }; 21596 };
21197 21597
21198 static int memory_open(struct inode *inode, struct file *filp) 21598 static int memory_open(struct inode *inode, struct file *filp)
21199diff -urNp linux-2.6.32.8/drivers/char/nvram.c linux-2.6.32.8/drivers/char/nvram.c 21599diff -urNp linux-2.6.32.9/drivers/char/nvram.c linux-2.6.32.9/drivers/char/nvram.c
21200--- linux-2.6.32.8/drivers/char/nvram.c 2010-02-09 07:57:19.000000000 -0500 21600--- linux-2.6.32.9/drivers/char/nvram.c 2010-02-09 07:57:19.000000000 -0500
21201+++ linux-2.6.32.8/drivers/char/nvram.c 2010-02-13 21:45:10.005543380 -0500 21601+++ linux-2.6.32.9/drivers/char/nvram.c 2010-02-23 17:09:53.172065136 -0500
21202@@ -429,7 +429,10 @@ static const struct file_operations nvra 21602@@ -429,7 +429,10 @@ static const struct file_operations nvra
21203 static struct miscdevice nvram_dev = { 21603 static struct miscdevice nvram_dev = {
21204 NVRAM_MINOR, 21604 NVRAM_MINOR,
@@ -21211,9 +21611,9 @@ diff -urNp linux-2.6.32.8/drivers/char/nvram.c linux-2.6.32.8/drivers/char/nvram
21211 }; 21611 };
21212 21612
21213 static int __init nvram_init(void) 21613 static int __init nvram_init(void)
21214diff -urNp linux-2.6.32.8/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.8/drivers/char/pcmcia/ipwireless/tty.c 21614diff -urNp linux-2.6.32.9/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.9/drivers/char/pcmcia/ipwireless/tty.c
21215--- linux-2.6.32.8/drivers/char/pcmcia/ipwireless/tty.c 2010-02-09 07:57:19.000000000 -0500 21615--- linux-2.6.32.9/drivers/char/pcmcia/ipwireless/tty.c 2010-02-09 07:57:19.000000000 -0500
21216+++ linux-2.6.32.8/drivers/char/pcmcia/ipwireless/tty.c 2010-02-13 21:45:10.005543380 -0500 21616+++ linux-2.6.32.9/drivers/char/pcmcia/ipwireless/tty.c 2010-02-23 17:09:53.172065136 -0500
21217@@ -51,7 +51,7 @@ struct ipw_tty { 21617@@ -51,7 +51,7 @@ struct ipw_tty {
21218 int tty_type; 21618 int tty_type;
21219 struct ipw_network *network; 21619 struct ipw_network *network;
@@ -21328,9 +21728,9 @@ diff -urNp linux-2.6.32.8/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.8/dr
21328 do_ipw_close(ttyj); 21728 do_ipw_close(ttyj);
21329 ipwireless_disassociate_network_ttys(network, 21729 ipwireless_disassociate_network_ttys(network,
21330 ttyj->channel_idx); 21730 ttyj->channel_idx);
21331diff -urNp linux-2.6.32.8/drivers/char/pty.c linux-2.6.32.8/drivers/char/pty.c 21731diff -urNp linux-2.6.32.9/drivers/char/pty.c linux-2.6.32.9/drivers/char/pty.c
21332--- linux-2.6.32.8/drivers/char/pty.c 2010-02-09 07:57:19.000000000 -0500 21732--- linux-2.6.32.9/drivers/char/pty.c 2010-02-09 07:57:19.000000000 -0500
21333+++ linux-2.6.32.8/drivers/char/pty.c 2010-02-13 21:45:10.006915632 -0500 21733+++ linux-2.6.32.9/drivers/char/pty.c 2010-02-23 17:09:53.176362503 -0500
21334@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode 21734@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
21335 return ret; 21735 return ret;
21336 } 21736 }
@@ -21361,9 +21761,9 @@ diff -urNp linux-2.6.32.8/drivers/char/pty.c linux-2.6.32.8/drivers/char/pty.c
21361 cdev_init(&ptmx_cdev, &ptmx_fops); 21761 cdev_init(&ptmx_cdev, &ptmx_fops);
21362 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || 21762 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
21363 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) 21763 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
21364diff -urNp linux-2.6.32.8/drivers/char/random.c linux-2.6.32.8/drivers/char/random.c 21764diff -urNp linux-2.6.32.9/drivers/char/random.c linux-2.6.32.9/drivers/char/random.c
21365--- linux-2.6.32.8/drivers/char/random.c 2010-02-09 07:57:19.000000000 -0500 21765--- linux-2.6.32.9/drivers/char/random.c 2010-02-09 07:57:19.000000000 -0500
21366+++ linux-2.6.32.8/drivers/char/random.c 2010-02-13 21:45:10.006915632 -0500 21766+++ linux-2.6.32.9/drivers/char/random.c 2010-02-23 17:09:53.176362503 -0500
21367@@ -254,8 +254,13 @@ 21767@@ -254,8 +254,13 @@
21368 /* 21768 /*
21369 * Configuration information 21769 * Configuration information
@@ -21405,9 +21805,9 @@ diff -urNp linux-2.6.32.8/drivers/char/random.c linux-2.6.32.8/drivers/char/rand
21405 static int max_write_thresh = INPUT_POOL_WORDS * 32; 21805 static int max_write_thresh = INPUT_POOL_WORDS * 32;
21406 static char sysctl_bootid[16]; 21806 static char sysctl_bootid[16];
21407 21807
21408diff -urNp linux-2.6.32.8/drivers/char/sonypi.c linux-2.6.32.8/drivers/char/sonypi.c 21808diff -urNp linux-2.6.32.9/drivers/char/sonypi.c linux-2.6.32.9/drivers/char/sonypi.c
21409--- linux-2.6.32.8/drivers/char/sonypi.c 2010-02-09 07:57:19.000000000 -0500 21809--- linux-2.6.32.9/drivers/char/sonypi.c 2010-02-09 07:57:19.000000000 -0500
21410+++ linux-2.6.32.8/drivers/char/sonypi.c 2010-02-13 21:45:10.007915557 -0500 21810+++ linux-2.6.32.9/drivers/char/sonypi.c 2010-02-23 17:09:53.176362503 -0500
21411@@ -491,7 +491,7 @@ static struct sonypi_device { 21811@@ -491,7 +491,7 @@ static struct sonypi_device {
21412 spinlock_t fifo_lock; 21812 spinlock_t fifo_lock;
21413 wait_queue_head_t fifo_proc_list; 21813 wait_queue_head_t fifo_proc_list;
@@ -21438,9 +21838,9 @@ diff -urNp linux-2.6.32.8/drivers/char/sonypi.c linux-2.6.32.8/drivers/char/sony
21438 mutex_unlock(&sonypi_device.lock); 21838 mutex_unlock(&sonypi_device.lock);
21439 unlock_kernel(); 21839 unlock_kernel();
21440 return 0; 21840 return 0;
21441diff -urNp linux-2.6.32.8/drivers/char/tpm/tpm_bios.c linux-2.6.32.8/drivers/char/tpm/tpm_bios.c 21841diff -urNp linux-2.6.32.9/drivers/char/tpm/tpm_bios.c linux-2.6.32.9/drivers/char/tpm/tpm_bios.c
21442--- linux-2.6.32.8/drivers/char/tpm/tpm_bios.c 2010-02-09 07:57:19.000000000 -0500 21842--- linux-2.6.32.9/drivers/char/tpm/tpm_bios.c 2010-02-09 07:57:19.000000000 -0500
21443+++ linux-2.6.32.8/drivers/char/tpm/tpm_bios.c 2010-02-13 21:45:10.007915557 -0500 21843+++ linux-2.6.32.9/drivers/char/tpm/tpm_bios.c 2010-02-23 17:09:53.176362503 -0500
21444@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start 21844@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
21445 event = addr; 21845 event = addr;
21446 21846
@@ -21481,9 +21881,9 @@ diff -urNp linux-2.6.32.8/drivers/char/tpm/tpm_bios.c linux-2.6.32.8/drivers/cha
21481 21881
21482 memcpy(log->bios_event_log, virt, len); 21882 memcpy(log->bios_event_log, virt, len);
21483 21883
21484diff -urNp linux-2.6.32.8/drivers/char/tty_io.c linux-2.6.32.8/drivers/char/tty_io.c 21884diff -urNp linux-2.6.32.9/drivers/char/tty_io.c linux-2.6.32.9/drivers/char/tty_io.c
21485--- linux-2.6.32.8/drivers/char/tty_io.c 2010-02-09 07:57:19.000000000 -0500 21885--- linux-2.6.32.9/drivers/char/tty_io.c 2010-02-23 17:04:12.063589634 -0500
21486+++ linux-2.6.32.8/drivers/char/tty_io.c 2010-02-13 21:45:10.008914507 -0500 21886+++ linux-2.6.32.9/drivers/char/tty_io.c 2010-02-23 17:09:53.176362503 -0500
21487@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list 21887@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
21488 DEFINE_MUTEX(tty_mutex); 21888 DEFINE_MUTEX(tty_mutex);
21489 EXPORT_SYMBOL(tty_mutex); 21889 EXPORT_SYMBOL(tty_mutex);
@@ -21580,7 +21980,7 @@ diff -urNp linux-2.6.32.8/drivers/char/tty_io.c linux-2.6.32.8/drivers/char/tty_
21580 { 21980 {
21581 struct tty_struct *tty; 21981 struct tty_struct *tty;
21582 unsigned long flags; 21982 unsigned long flags;
21583@@ -1944,6 +1941,8 @@ out: 21983@@ -1946,6 +1943,8 @@ out:
21584 return retval; 21984 return retval;
21585 } 21985 }
21586 21986
@@ -21589,7 +21989,7 @@ diff -urNp linux-2.6.32.8/drivers/char/tty_io.c linux-2.6.32.8/drivers/char/tty_
21589 /** 21989 /**
21590 * tiocsti - fake input character 21990 * tiocsti - fake input character
21591 * @tty: tty to fake input into 21991 * @tty: tty to fake input into
21592@@ -2578,8 +2577,10 @@ long tty_ioctl(struct file *file, unsign 21992@@ -2580,8 +2579,10 @@ long tty_ioctl(struct file *file, unsign
21593 return retval; 21993 return retval;
21594 } 21994 }
21595 21995
@@ -21601,7 +22001,7 @@ diff -urNp linux-2.6.32.8/drivers/char/tty_io.c linux-2.6.32.8/drivers/char/tty_
21601 unsigned long arg) 22001 unsigned long arg)
21602 { 22002 {
21603 struct inode *inode = file->f_dentry->d_inode; 22003 struct inode *inode = file->f_dentry->d_inode;
21604@@ -2603,6 +2604,8 @@ static long tty_compat_ioctl(struct file 22004@@ -2605,6 +2606,8 @@ static long tty_compat_ioctl(struct file
21605 22005
21606 return retval; 22006 return retval;
21607 } 22007 }
@@ -21610,7 +22010,7 @@ diff -urNp linux-2.6.32.8/drivers/char/tty_io.c linux-2.6.32.8/drivers/char/tty_
21610 #endif 22010 #endif
21611 22011
21612 /* 22012 /*
21613@@ -3046,11 +3049,6 @@ struct tty_struct *get_current_tty(void) 22013@@ -3048,11 +3051,6 @@ struct tty_struct *get_current_tty(void)
21614 } 22014 }
21615 EXPORT_SYMBOL_GPL(get_current_tty); 22015 EXPORT_SYMBOL_GPL(get_current_tty);
21616 22016
@@ -21622,9 +22022,9 @@ diff -urNp linux-2.6.32.8/drivers/char/tty_io.c linux-2.6.32.8/drivers/char/tty_
21622 /* 22022 /*
21623 * Initialize the console device. This is called *early*, so 22023 * Initialize the console device. This is called *early*, so
21624 * we can't necessarily depend on lots of kernel help here. 22024 * we can't necessarily depend on lots of kernel help here.
21625diff -urNp linux-2.6.32.8/drivers/char/tty_ldisc.c linux-2.6.32.8/drivers/char/tty_ldisc.c 22025diff -urNp linux-2.6.32.9/drivers/char/tty_ldisc.c linux-2.6.32.9/drivers/char/tty_ldisc.c
21626--- linux-2.6.32.8/drivers/char/tty_ldisc.c 2010-02-09 07:57:19.000000000 -0500 22026--- linux-2.6.32.9/drivers/char/tty_ldisc.c 2010-02-09 07:57:19.000000000 -0500
21627+++ linux-2.6.32.8/drivers/char/tty_ldisc.c 2010-02-13 21:45:10.008914507 -0500 22027+++ linux-2.6.32.9/drivers/char/tty_ldisc.c 2010-02-23 17:09:53.176362503 -0500
21628@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * 22028@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc *
21629 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { 22029 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
21630 struct tty_ldisc_ops *ldo = ld->ops; 22030 struct tty_ldisc_ops *ldo = ld->ops;
@@ -21670,9 +22070,9 @@ diff -urNp linux-2.6.32.8/drivers/char/tty_ldisc.c linux-2.6.32.8/drivers/char/t
21670 module_put(ldops->owner); 22070 module_put(ldops->owner);
21671 spin_unlock_irqrestore(&tty_ldisc_lock, flags); 22071 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
21672 } 22072 }
21673diff -urNp linux-2.6.32.8/drivers/char/virtio_console.c linux-2.6.32.8/drivers/char/virtio_console.c 22073diff -urNp linux-2.6.32.9/drivers/char/virtio_console.c linux-2.6.32.9/drivers/char/virtio_console.c
21674--- linux-2.6.32.8/drivers/char/virtio_console.c 2010-02-09 07:57:19.000000000 -0500 22074--- linux-2.6.32.9/drivers/char/virtio_console.c 2010-02-09 07:57:19.000000000 -0500
21675+++ linux-2.6.32.8/drivers/char/virtio_console.c 2010-02-13 21:45:10.008914507 -0500 22075+++ linux-2.6.32.9/drivers/char/virtio_console.c 2010-02-23 17:09:53.176362503 -0500
21676@@ -44,6 +44,7 @@ static unsigned int in_len; 22076@@ -44,6 +44,7 @@ static unsigned int in_len;
21677 static char *in, *inbuf; 22077 static char *in, *inbuf;
21678 22078
@@ -21681,9 +22081,9 @@ diff -urNp linux-2.6.32.8/drivers/char/virtio_console.c linux-2.6.32.8/drivers/c
21681 static struct hv_ops virtio_cons; 22081 static struct hv_ops virtio_cons;
21682 22082
21683 /* The hvc device */ 22083 /* The hvc device */
21684diff -urNp linux-2.6.32.8/drivers/char/vt_ioctl.c linux-2.6.32.8/drivers/char/vt_ioctl.c 22084diff -urNp linux-2.6.32.9/drivers/char/vt_ioctl.c linux-2.6.32.9/drivers/char/vt_ioctl.c
21685--- linux-2.6.32.8/drivers/char/vt_ioctl.c 2010-02-09 07:57:19.000000000 -0500 22085--- linux-2.6.32.9/drivers/char/vt_ioctl.c 2010-02-09 07:57:19.000000000 -0500
21686+++ linux-2.6.32.8/drivers/char/vt_ioctl.c 2010-02-13 21:45:10.009931341 -0500 22086+++ linux-2.6.32.9/drivers/char/vt_ioctl.c 2010-02-23 17:09:53.176362503 -0500
21687@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ 22087@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __
21688 case KDSKBENT: 22088 case KDSKBENT:
21689 if (!perm) 22089 if (!perm)
@@ -21711,9 +22111,9 @@ diff -urNp linux-2.6.32.8/drivers/char/vt_ioctl.c linux-2.6.32.8/drivers/char/vt
21711 q = func_table[i]; 22111 q = func_table[i];
21712 first_free = funcbufptr + (funcbufsize - funcbufleft); 22112 first_free = funcbufptr + (funcbufsize - funcbufleft);
21713 for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 22113 for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++)
21714diff -urNp linux-2.6.32.8/drivers/cpufreq/cpufreq.c linux-2.6.32.8/drivers/cpufreq/cpufreq.c 22114diff -urNp linux-2.6.32.9/drivers/cpufreq/cpufreq.c linux-2.6.32.9/drivers/cpufreq/cpufreq.c
21715--- linux-2.6.32.8/drivers/cpufreq/cpufreq.c 2010-02-09 07:57:19.000000000 -0500 22115--- linux-2.6.32.9/drivers/cpufreq/cpufreq.c 2010-02-09 07:57:19.000000000 -0500
21716+++ linux-2.6.32.8/drivers/cpufreq/cpufreq.c 2010-02-13 21:45:10.009931341 -0500 22116+++ linux-2.6.32.9/drivers/cpufreq/cpufreq.c 2010-02-23 17:09:53.176362503 -0500
21717@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct 22117@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
21718 complete(&policy->kobj_unregister); 22118 complete(&policy->kobj_unregister);
21719 } 22119 }
@@ -21723,9 +22123,9 @@ diff -urNp linux-2.6.32.8/drivers/cpufreq/cpufreq.c linux-2.6.32.8/drivers/cpufr
21723 .show = show, 22123 .show = show,
21724 .store = store, 22124 .store = store,
21725 }; 22125 };
21726diff -urNp linux-2.6.32.8/drivers/cpuidle/sysfs.c linux-2.6.32.8/drivers/cpuidle/sysfs.c 22126diff -urNp linux-2.6.32.9/drivers/cpuidle/sysfs.c linux-2.6.32.9/drivers/cpuidle/sysfs.c
21727--- linux-2.6.32.8/drivers/cpuidle/sysfs.c 2010-02-09 07:57:19.000000000 -0500 22127--- linux-2.6.32.9/drivers/cpuidle/sysfs.c 2010-02-09 07:57:19.000000000 -0500
21728+++ linux-2.6.32.8/drivers/cpuidle/sysfs.c 2010-02-13 21:45:10.010916781 -0500 22128+++ linux-2.6.32.9/drivers/cpuidle/sysfs.c 2010-02-23 17:09:53.176362503 -0500
21729@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj 22129@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
21730 return ret; 22130 return ret;
21731 } 22131 }
@@ -21744,9 +22144,9 @@ diff -urNp linux-2.6.32.8/drivers/cpuidle/sysfs.c linux-2.6.32.8/drivers/cpuidle
21744 .show = cpuidle_state_show, 22144 .show = cpuidle_state_show,
21745 }; 22145 };
21746 22146
21747diff -urNp linux-2.6.32.8/drivers/dma/ioat/dma.c linux-2.6.32.8/drivers/dma/ioat/dma.c 22147diff -urNp linux-2.6.32.9/drivers/dma/ioat/dma.c linux-2.6.32.9/drivers/dma/ioat/dma.c
21748--- linux-2.6.32.8/drivers/dma/ioat/dma.c 2010-02-09 07:57:19.000000000 -0500 22148--- linux-2.6.32.9/drivers/dma/ioat/dma.c 2010-02-09 07:57:19.000000000 -0500
21749+++ linux-2.6.32.8/drivers/dma/ioat/dma.c 2010-02-13 21:45:10.010916781 -0500 22149+++ linux-2.6.32.9/drivers/dma/ioat/dma.c 2010-02-23 17:09:53.176362503 -0500
21750@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str 22150@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
21751 return entry->show(&chan->common, page); 22151 return entry->show(&chan->common, page);
21752 } 22152 }
@@ -21756,9 +22156,9 @@ diff -urNp linux-2.6.32.8/drivers/dma/ioat/dma.c linux-2.6.32.8/drivers/dma/ioat
21756 .show = ioat_attr_show, 22156 .show = ioat_attr_show,
21757 }; 22157 };
21758 22158
21759diff -urNp linux-2.6.32.8/drivers/dma/ioat/dma.h linux-2.6.32.8/drivers/dma/ioat/dma.h 22159diff -urNp linux-2.6.32.9/drivers/dma/ioat/dma.h linux-2.6.32.9/drivers/dma/ioat/dma.h
21760--- linux-2.6.32.8/drivers/dma/ioat/dma.h 2010-02-09 07:57:19.000000000 -0500 22160--- linux-2.6.32.9/drivers/dma/ioat/dma.h 2010-02-09 07:57:19.000000000 -0500
21761+++ linux-2.6.32.8/drivers/dma/ioat/dma.h 2010-02-13 21:45:10.010916781 -0500 22161+++ linux-2.6.32.9/drivers/dma/ioat/dma.h 2010-02-23 17:09:53.176362503 -0500
21762@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c 22162@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
21763 unsigned long *phys_complete); 22163 unsigned long *phys_complete);
21764 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); 22164 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
@@ -21768,9 +22168,9 @@ diff -urNp linux-2.6.32.8/drivers/dma/ioat/dma.h linux-2.6.32.8/drivers/dma/ioat
21768 extern struct ioat_sysfs_entry ioat_version_attr; 22168 extern struct ioat_sysfs_entry ioat_version_attr;
21769 extern struct ioat_sysfs_entry ioat_cap_attr; 22169 extern struct ioat_sysfs_entry ioat_cap_attr;
21770 #endif /* IOATDMA_H */ 22170 #endif /* IOATDMA_H */
21771diff -urNp linux-2.6.32.8/drivers/edac/edac_core.h linux-2.6.32.8/drivers/edac/edac_core.h 22171diff -urNp linux-2.6.32.9/drivers/edac/edac_core.h linux-2.6.32.9/drivers/edac/edac_core.h
21772--- linux-2.6.32.8/drivers/edac/edac_core.h 2010-02-09 07:57:19.000000000 -0500 22172--- linux-2.6.32.9/drivers/edac/edac_core.h 2010-02-09 07:57:19.000000000 -0500
21773+++ linux-2.6.32.8/drivers/edac/edac_core.h 2010-02-13 21:45:10.011663466 -0500 22173+++ linux-2.6.32.9/drivers/edac/edac_core.h 2010-02-23 17:09:53.176362503 -0500
21774@@ -99,11 +99,11 @@ extern int edac_debug_level; 22174@@ -99,11 +99,11 @@ extern int edac_debug_level;
21775 22175
21776 #else /* !CONFIG_EDAC_DEBUG */ 22176 #else /* !CONFIG_EDAC_DEBUG */
@@ -21788,9 +22188,9 @@ diff -urNp linux-2.6.32.8/drivers/edac/edac_core.h linux-2.6.32.8/drivers/edac/e
21788 22188
21789 #endif /* !CONFIG_EDAC_DEBUG */ 22189 #endif /* !CONFIG_EDAC_DEBUG */
21790 22190
21791diff -urNp linux-2.6.32.8/drivers/edac/edac_device_sysfs.c linux-2.6.32.8/drivers/edac/edac_device_sysfs.c 22191diff -urNp linux-2.6.32.9/drivers/edac/edac_device_sysfs.c linux-2.6.32.9/drivers/edac/edac_device_sysfs.c
21792--- linux-2.6.32.8/drivers/edac/edac_device_sysfs.c 2010-02-09 07:57:19.000000000 -0500 22192--- linux-2.6.32.9/drivers/edac/edac_device_sysfs.c 2010-02-09 07:57:19.000000000 -0500
21793+++ linux-2.6.32.8/drivers/edac/edac_device_sysfs.c 2010-02-13 21:45:10.011663466 -0500 22193+++ linux-2.6.32.9/drivers/edac/edac_device_sysfs.c 2010-02-23 17:09:53.176362503 -0500
21794@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s 22194@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
21795 } 22195 }
21796 22196
@@ -21818,9 +22218,9 @@ diff -urNp linux-2.6.32.8/drivers/edac/edac_device_sysfs.c linux-2.6.32.8/driver
21818 .show = edac_dev_block_show, 22218 .show = edac_dev_block_show,
21819 .store = edac_dev_block_store 22219 .store = edac_dev_block_store
21820 }; 22220 };
21821diff -urNp linux-2.6.32.8/drivers/edac/edac_mc_sysfs.c linux-2.6.32.8/drivers/edac/edac_mc_sysfs.c 22221diff -urNp linux-2.6.32.9/drivers/edac/edac_mc_sysfs.c linux-2.6.32.9/drivers/edac/edac_mc_sysfs.c
21822--- linux-2.6.32.8/drivers/edac/edac_mc_sysfs.c 2010-02-09 07:57:19.000000000 -0500 22222--- linux-2.6.32.9/drivers/edac/edac_mc_sysfs.c 2010-02-09 07:57:19.000000000 -0500
21823+++ linux-2.6.32.8/drivers/edac/edac_mc_sysfs.c 2010-02-13 21:45:10.011663466 -0500 22223+++ linux-2.6.32.9/drivers/edac/edac_mc_sysfs.c 2010-02-23 17:09:53.176362503 -0500
21824@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob 22224@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
21825 return -EIO; 22225 return -EIO;
21826 } 22226 }
@@ -21839,9 +22239,9 @@ diff -urNp linux-2.6.32.8/drivers/edac/edac_mc_sysfs.c linux-2.6.32.8/drivers/ed
21839 .show = mcidev_show, 22239 .show = mcidev_show,
21840 .store = mcidev_store 22240 .store = mcidev_store
21841 }; 22241 };
21842diff -urNp linux-2.6.32.8/drivers/edac/edac_pci_sysfs.c linux-2.6.32.8/drivers/edac/edac_pci_sysfs.c 22242diff -urNp linux-2.6.32.9/drivers/edac/edac_pci_sysfs.c linux-2.6.32.9/drivers/edac/edac_pci_sysfs.c
21843--- linux-2.6.32.8/drivers/edac/edac_pci_sysfs.c 2010-02-09 07:57:19.000000000 -0500 22243--- linux-2.6.32.9/drivers/edac/edac_pci_sysfs.c 2010-02-09 07:57:19.000000000 -0500
21844+++ linux-2.6.32.8/drivers/edac/edac_pci_sysfs.c 2010-02-13 21:45:10.012688081 -0500 22244+++ linux-2.6.32.9/drivers/edac/edac_pci_sysfs.c 2010-02-23 17:09:53.180370058 -0500
21845@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s 22245@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
21846 } 22246 }
21847 22247
@@ -21860,9 +22260,9 @@ diff -urNp linux-2.6.32.8/drivers/edac/edac_pci_sysfs.c linux-2.6.32.8/drivers/e
21860 .show = edac_pci_dev_show, 22260 .show = edac_pci_dev_show,
21861 .store = edac_pci_dev_store 22261 .store = edac_pci_dev_store
21862 }; 22262 };
21863diff -urNp linux-2.6.32.8/drivers/firmware/dmi_scan.c linux-2.6.32.8/drivers/firmware/dmi_scan.c 22263diff -urNp linux-2.6.32.9/drivers/firmware/dmi_scan.c linux-2.6.32.9/drivers/firmware/dmi_scan.c
21864--- linux-2.6.32.8/drivers/firmware/dmi_scan.c 2010-02-09 07:57:19.000000000 -0500 22264--- linux-2.6.32.9/drivers/firmware/dmi_scan.c 2010-02-09 07:57:19.000000000 -0500
21865+++ linux-2.6.32.8/drivers/firmware/dmi_scan.c 2010-02-13 21:45:10.012688081 -0500 22265+++ linux-2.6.32.9/drivers/firmware/dmi_scan.c 2010-02-23 17:09:53.180370058 -0500
21866@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) 22266@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
21867 } 22267 }
21868 } 22268 }
@@ -21875,9 +22275,9 @@ diff -urNp linux-2.6.32.8/drivers/firmware/dmi_scan.c linux-2.6.32.8/drivers/fir
21875 p = dmi_ioremap(0xF0000, 0x10000); 22275 p = dmi_ioremap(0xF0000, 0x10000);
21876 if (p == NULL) 22276 if (p == NULL)
21877 goto error; 22277 goto error;
21878diff -urNp linux-2.6.32.8/drivers/firmware/edd.c linux-2.6.32.8/drivers/firmware/edd.c 22278diff -urNp linux-2.6.32.9/drivers/firmware/edd.c linux-2.6.32.9/drivers/firmware/edd.c
21879--- linux-2.6.32.8/drivers/firmware/edd.c 2010-02-09 07:57:19.000000000 -0500 22279--- linux-2.6.32.9/drivers/firmware/edd.c 2010-02-09 07:57:19.000000000 -0500
21880+++ linux-2.6.32.8/drivers/firmware/edd.c 2010-02-13 21:45:10.012688081 -0500 22280+++ linux-2.6.32.9/drivers/firmware/edd.c 2010-02-23 17:09:53.180370058 -0500
21881@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str 22281@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
21882 return ret; 22282 return ret;
21883 } 22283 }
@@ -21887,9 +22287,9 @@ diff -urNp linux-2.6.32.8/drivers/firmware/edd.c linux-2.6.32.8/drivers/firmware
21887 .show = edd_attr_show, 22287 .show = edd_attr_show,
21888 }; 22288 };
21889 22289
21890diff -urNp linux-2.6.32.8/drivers/firmware/efivars.c linux-2.6.32.8/drivers/firmware/efivars.c 22290diff -urNp linux-2.6.32.9/drivers/firmware/efivars.c linux-2.6.32.9/drivers/firmware/efivars.c
21891--- linux-2.6.32.8/drivers/firmware/efivars.c 2010-02-09 07:57:19.000000000 -0500 22291--- linux-2.6.32.9/drivers/firmware/efivars.c 2010-02-09 07:57:19.000000000 -0500
21892+++ linux-2.6.32.8/drivers/firmware/efivars.c 2010-02-13 21:45:10.012688081 -0500 22292+++ linux-2.6.32.9/drivers/firmware/efivars.c 2010-02-23 17:09:53.180370058 -0500
21893@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct 22293@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
21894 return ret; 22294 return ret;
21895 } 22295 }
@@ -21899,9 +22299,9 @@ diff -urNp linux-2.6.32.8/drivers/firmware/efivars.c linux-2.6.32.8/drivers/firm
21899 .show = efivar_attr_show, 22299 .show = efivar_attr_show,
21900 .store = efivar_attr_store, 22300 .store = efivar_attr_store,
21901 }; 22301 };
21902diff -urNp linux-2.6.32.8/drivers/firmware/iscsi_ibft.c linux-2.6.32.8/drivers/firmware/iscsi_ibft.c 22302diff -urNp linux-2.6.32.9/drivers/firmware/iscsi_ibft.c linux-2.6.32.9/drivers/firmware/iscsi_ibft.c
21903--- linux-2.6.32.8/drivers/firmware/iscsi_ibft.c 2010-02-09 07:57:19.000000000 -0500 22303--- linux-2.6.32.9/drivers/firmware/iscsi_ibft.c 2010-02-09 07:57:19.000000000 -0500
21904+++ linux-2.6.32.8/drivers/firmware/iscsi_ibft.c 2010-02-13 21:45:10.013915471 -0500 22304+++ linux-2.6.32.9/drivers/firmware/iscsi_ibft.c 2010-02-23 17:09:53.180370058 -0500
21905@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc 22305@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
21906 return ret; 22306 return ret;
21907 } 22307 }
@@ -21911,9 +22311,9 @@ diff -urNp linux-2.6.32.8/drivers/firmware/iscsi_ibft.c linux-2.6.32.8/drivers/f
21911 .show = ibft_show_attribute, 22311 .show = ibft_show_attribute,
21912 }; 22312 };
21913 22313
21914diff -urNp linux-2.6.32.8/drivers/firmware/memmap.c linux-2.6.32.8/drivers/firmware/memmap.c 22314diff -urNp linux-2.6.32.9/drivers/firmware/memmap.c linux-2.6.32.9/drivers/firmware/memmap.c
21915--- linux-2.6.32.8/drivers/firmware/memmap.c 2010-02-09 07:57:19.000000000 -0500 22315--- linux-2.6.32.9/drivers/firmware/memmap.c 2010-02-09 07:57:19.000000000 -0500
21916+++ linux-2.6.32.8/drivers/firmware/memmap.c 2010-02-13 21:45:10.013915471 -0500 22316+++ linux-2.6.32.9/drivers/firmware/memmap.c 2010-02-23 17:09:53.180370058 -0500
21917@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { 22317@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
21918 NULL 22318 NULL
21919 }; 22319 };
@@ -21923,9 +22323,9 @@ diff -urNp linux-2.6.32.8/drivers/firmware/memmap.c linux-2.6.32.8/drivers/firmw
21923 .show = memmap_attr_show, 22323 .show = memmap_attr_show,
21924 }; 22324 };
21925 22325
21926diff -urNp linux-2.6.32.8/drivers/gpu/drm/drm_drv.c linux-2.6.32.8/drivers/gpu/drm/drm_drv.c 22326diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_drv.c linux-2.6.32.9/drivers/gpu/drm/drm_drv.c
21927--- linux-2.6.32.8/drivers/gpu/drm/drm_drv.c 2010-02-09 07:57:19.000000000 -0500 22327--- linux-2.6.32.9/drivers/gpu/drm/drm_drv.c 2010-02-09 07:57:19.000000000 -0500
21928+++ linux-2.6.32.8/drivers/gpu/drm/drm_drv.c 2010-02-13 21:45:10.013915471 -0500 22328+++ linux-2.6.32.9/drivers/gpu/drm/drm_drv.c 2010-02-23 17:09:53.180370058 -0500
21929@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc 22329@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
21930 char *kdata = NULL; 22330 char *kdata = NULL;
21931 22331
@@ -21935,9 +22335,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/drm_drv.c linux-2.6.32.8/drivers/gpu/d
21935 ++file_priv->ioctl_count; 22335 ++file_priv->ioctl_count;
21936 22336
21937 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", 22337 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
21938diff -urNp linux-2.6.32.8/drivers/gpu/drm/drm_fops.c linux-2.6.32.8/drivers/gpu/drm/drm_fops.c 22338diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_fops.c linux-2.6.32.9/drivers/gpu/drm/drm_fops.c
21939--- linux-2.6.32.8/drivers/gpu/drm/drm_fops.c 2010-02-09 07:57:19.000000000 -0500 22339--- linux-2.6.32.9/drivers/gpu/drm/drm_fops.c 2010-02-09 07:57:19.000000000 -0500
21940+++ linux-2.6.32.8/drivers/gpu/drm/drm_fops.c 2010-02-13 21:45:10.014681849 -0500 22340+++ linux-2.6.32.9/drivers/gpu/drm/drm_fops.c 2010-02-23 17:09:53.180370058 -0500
21941@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * 22341@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
21942 } 22342 }
21943 22343
@@ -21989,9 +22389,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/drm_fops.c linux-2.6.32.8/drivers/gpu/
21989 if (atomic_read(&dev->ioctl_count)) { 22389 if (atomic_read(&dev->ioctl_count)) {
21990 DRM_ERROR("Device busy: %d\n", 22390 DRM_ERROR("Device busy: %d\n",
21991 atomic_read(&dev->ioctl_count)); 22391 atomic_read(&dev->ioctl_count));
21992diff -urNp linux-2.6.32.8/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.8/drivers/gpu/drm/drm_ioctl.c 22392diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.9/drivers/gpu/drm/drm_ioctl.c
21993--- linux-2.6.32.8/drivers/gpu/drm/drm_ioctl.c 2010-02-09 07:57:19.000000000 -0500 22393--- linux-2.6.32.9/drivers/gpu/drm/drm_ioctl.c 2010-02-09 07:57:19.000000000 -0500
21994+++ linux-2.6.32.8/drivers/gpu/drm/drm_ioctl.c 2010-02-13 21:45:10.014681849 -0500 22394+++ linux-2.6.32.9/drivers/gpu/drm/drm_ioctl.c 2010-02-23 17:09:53.180370058 -0500
21995@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, 22395@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
21996 stats->data[i].value = 22396 stats->data[i].value =
21997 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); 22397 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -22001,9 +22401,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.8/drivers/gpu
22001 stats->data[i].type = dev->types[i]; 22401 stats->data[i].type = dev->types[i];
22002 } 22402 }
22003 22403
22004diff -urNp linux-2.6.32.8/drivers/gpu/drm/drm_lock.c linux-2.6.32.8/drivers/gpu/drm/drm_lock.c 22404diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_lock.c linux-2.6.32.9/drivers/gpu/drm/drm_lock.c
22005--- linux-2.6.32.8/drivers/gpu/drm/drm_lock.c 2010-02-09 07:57:19.000000000 -0500 22405--- linux-2.6.32.9/drivers/gpu/drm/drm_lock.c 2010-02-09 07:57:19.000000000 -0500
22006+++ linux-2.6.32.8/drivers/gpu/drm/drm_lock.c 2010-02-13 21:45:10.014681849 -0500 22406+++ linux-2.6.32.9/drivers/gpu/drm/drm_lock.c 2010-02-23 17:09:53.180370058 -0500
22007@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi 22407@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
22008 if (drm_lock_take(&master->lock, lock->context)) { 22408 if (drm_lock_take(&master->lock, lock->context)) {
22009 master->lock.file_priv = file_priv; 22409 master->lock.file_priv = file_priv;
@@ -22022,9 +22422,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/drm_lock.c linux-2.6.32.8/drivers/gpu/
22022 22422
22023 /* kernel_context_switch isn't used by any of the x86 drm 22423 /* kernel_context_switch isn't used by any of the x86 drm
22024 * modules but is required by the Sparc driver. 22424 * modules but is required by the Sparc driver.
22025diff -urNp linux-2.6.32.8/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.8/drivers/gpu/drm/i810/i810_dma.c 22425diff -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
22026--- linux-2.6.32.8/drivers/gpu/drm/i810/i810_dma.c 2010-02-09 07:57:19.000000000 -0500 22426--- linux-2.6.32.9/drivers/gpu/drm/i810/i810_dma.c 2010-02-09 07:57:19.000000000 -0500
22027+++ linux-2.6.32.8/drivers/gpu/drm/i810/i810_dma.c 2010-02-13 21:45:10.014681849 -0500 22427+++ linux-2.6.32.9/drivers/gpu/drm/i810/i810_dma.c 2010-02-23 17:09:53.180370058 -0500
22028@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de 22428@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
22029 dma->buflist[vertex->idx], 22429 dma->buflist[vertex->idx],
22030 vertex->discard, vertex->used); 22430 vertex->discard, vertex->used);
@@ -22047,9 +22447,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.8/drivers
22047 sarea_priv->last_enqueue = dev_priv->counter - 1; 22447 sarea_priv->last_enqueue = dev_priv->counter - 1;
22048 sarea_priv->last_dispatch = (int)hw_status[5]; 22448 sarea_priv->last_dispatch = (int)hw_status[5];
22049 22449
22050diff -urNp linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ch7017.c 22450diff -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
22051--- linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ch7017.c 2010-02-09 07:57:19.000000000 -0500 22451--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7017.c 2010-02-09 07:57:19.000000000 -0500
22052+++ linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ch7017.c 2010-02-13 21:45:10.015720619 -0500 22452+++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7017.c 2010-02-23 17:09:53.180370058 -0500
22053@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ 22453@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
22054 } 22454 }
22055 } 22455 }
@@ -22059,9 +22459,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.8/drive
22059 .init = ch7017_init, 22459 .init = ch7017_init,
22060 .detect = ch7017_detect, 22460 .detect = ch7017_detect,
22061 .mode_valid = ch7017_mode_valid, 22461 .mode_valid = ch7017_mode_valid,
22062diff -urNp linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ch7xxx.c 22462diff -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
22063--- linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-02-09 07:57:19.000000000 -0500 22463--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-02-09 07:57:19.000000000 -0500
22064+++ linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-02-13 21:45:10.015720619 -0500 22464+++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-02-23 17:09:53.180370058 -0500
22065@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ 22465@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
22066 } 22466 }
22067 } 22467 }
@@ -22071,9 +22471,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.8/drive
22071 .init = ch7xxx_init, 22471 .init = ch7xxx_init,
22072 .detect = ch7xxx_detect, 22472 .detect = ch7xxx_detect,
22073 .mode_valid = ch7xxx_mode_valid, 22473 .mode_valid = ch7xxx_mode_valid,
22074diff -urNp linux-2.6.32.8/drivers/gpu/drm/i915/dvo.h linux-2.6.32.8/drivers/gpu/drm/i915/dvo.h 22474diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo.h linux-2.6.32.9/drivers/gpu/drm/i915/dvo.h
22075--- linux-2.6.32.8/drivers/gpu/drm/i915/dvo.h 2010-02-09 07:57:19.000000000 -0500 22475--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo.h 2010-02-09 07:57:19.000000000 -0500
22076+++ linux-2.6.32.8/drivers/gpu/drm/i915/dvo.h 2010-02-13 21:45:10.015720619 -0500 22476+++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo.h 2010-02-23 17:09:53.180370058 -0500
22077@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { 22477@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
22078 * 22478 *
22079 * \return singly-linked list of modes or NULL if no modes found. 22479 * \return singly-linked list of modes or NULL if no modes found.
@@ -22106,9 +22506,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/i915/dvo.h linux-2.6.32.8/drivers/gpu/
22106+extern const struct intel_dvo_dev_ops ch7017_ops; 22506+extern const struct intel_dvo_dev_ops ch7017_ops;
22107 22507
22108 #endif /* _INTEL_DVO_H */ 22508 #endif /* _INTEL_DVO_H */
22109diff -urNp linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ivch.c 22509diff -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
22110--- linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ivch.c 2010-02-09 07:57:19.000000000 -0500 22510--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ivch.c 2010-02-09 07:57:19.000000000 -0500
22111+++ linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ivch.c 2010-02-13 21:45:10.015720619 -0500 22511+++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ivch.c 2010-02-23 17:09:53.180370058 -0500
22112@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv 22512@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
22113 } 22513 }
22114 } 22514 }
@@ -22118,9 +22518,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.8/drivers
22118 .init = ivch_init, 22518 .init = ivch_init,
22119 .dpms = ivch_dpms, 22519 .dpms = ivch_dpms,
22120 .save = ivch_save, 22520 .save = ivch_save,
22121diff -urNp linux-2.6.32.8/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.8/drivers/gpu/drm/i915/dvo_sil164.c 22521diff -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
22122--- linux-2.6.32.8/drivers/gpu/drm/i915/dvo_sil164.c 2010-02-09 07:57:19.000000000 -0500 22522--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo_sil164.c 2010-02-09 07:57:19.000000000 -0500
22123+++ linux-2.6.32.8/drivers/gpu/drm/i915/dvo_sil164.c 2010-02-13 21:45:10.015720619 -0500 22523+++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo_sil164.c 2010-02-23 17:09:53.180370058 -0500
22124@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ 22524@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
22125 } 22525 }
22126 } 22526 }
@@ -22130,9 +22530,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.8/drive
22130 .init = sil164_init, 22530 .init = sil164_init,
22131 .detect = sil164_detect, 22531 .detect = sil164_detect,
22132 .mode_valid = sil164_mode_valid, 22532 .mode_valid = sil164_mode_valid,
22133diff -urNp linux-2.6.32.8/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.8/drivers/gpu/drm/i915/dvo_tfp410.c 22533diff -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
22134--- linux-2.6.32.8/drivers/gpu/drm/i915/dvo_tfp410.c 2010-02-09 07:57:19.000000000 -0500 22534--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo_tfp410.c 2010-02-09 07:57:19.000000000 -0500
22135+++ linux-2.6.32.8/drivers/gpu/drm/i915/dvo_tfp410.c 2010-02-13 21:45:10.016934380 -0500 22535+++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo_tfp410.c 2010-02-23 17:09:53.180370058 -0500
22136@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ 22536@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
22137 } 22537 }
22138 } 22538 }
@@ -22142,9 +22542,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.8/drive
22142 .init = tfp410_init, 22542 .init = tfp410_init,
22143 .detect = tfp410_detect, 22543 .detect = tfp410_detect,
22144 .mode_valid = tfp410_mode_valid, 22544 .mode_valid = tfp410_mode_valid,
22145diff -urNp linux-2.6.32.8/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.8/drivers/gpu/drm/i915/i915_drv.c 22545diff -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
22146--- linux-2.6.32.8/drivers/gpu/drm/i915/i915_drv.c 2010-02-09 07:57:19.000000000 -0500 22546--- linux-2.6.32.9/drivers/gpu/drm/i915/i915_drv.c 2010-02-09 07:57:19.000000000 -0500
22147+++ linux-2.6.32.8/drivers/gpu/drm/i915/i915_drv.c 2010-02-13 21:45:10.016934380 -0500 22547+++ linux-2.6.32.9/drivers/gpu/drm/i915/i915_drv.c 2010-02-23 17:09:53.180370058 -0500
22148@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) 22548@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev)
22149 return i915_resume(dev); 22549 return i915_resume(dev);
22150 } 22550 }
@@ -22154,9 +22554,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.8/drivers
22154 .fault = i915_gem_fault, 22554 .fault = i915_gem_fault,
22155 .open = drm_gem_vm_open, 22555 .open = drm_gem_vm_open,
22156 .close = drm_gem_vm_close, 22556 .close = drm_gem_vm_close,
22157diff -urNp linux-2.6.32.8/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.8/drivers/gpu/drm/radeon/mkregtable.c 22557diff -urNp linux-2.6.32.9/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.9/drivers/gpu/drm/radeon/mkregtable.c
22158--- linux-2.6.32.8/drivers/gpu/drm/radeon/mkregtable.c 2010-02-09 07:57:19.000000000 -0500 22558--- linux-2.6.32.9/drivers/gpu/drm/radeon/mkregtable.c 2010-02-09 07:57:19.000000000 -0500
22159+++ linux-2.6.32.8/drivers/gpu/drm/radeon/mkregtable.c 2010-02-13 21:45:10.016934380 -0500 22559+++ linux-2.6.32.9/drivers/gpu/drm/radeon/mkregtable.c 2010-02-23 17:09:53.180370058 -0500
22160@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 22560@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
22161 regex_t mask_rex; 22561 regex_t mask_rex;
22162 regmatch_t match[4]; 22562 regmatch_t match[4];
@@ -22174,9 +22574,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.8/dri
22174 22574
22175 if (regcomp 22575 if (regcomp
22176 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { 22576 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
22177diff -urNp linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_atombios.c 22577diff -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
22178--- linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_atombios.c 2010-02-09 07:57:19.000000000 -0500 22578--- linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_atombios.c 2010-02-09 07:57:19.000000000 -0500
22179+++ linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_atombios.c 2010-02-13 21:45:10.017571167 -0500 22579+++ linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_atombios.c 2010-02-23 17:09:53.184132288 -0500
22180@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o 22580@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o
22181 } 22581 }
22182 } 22582 }
@@ -22201,9 +22601,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.
22201 22601
22202 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); 22602 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
22203 22603
22204diff -urNp linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_state.c 22604diff -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
22205--- linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_state.c 2010-02-09 07:57:19.000000000 -0500 22605--- linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_state.c 2010-02-09 07:57:19.000000000 -0500
22206+++ linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_state.c 2010-02-13 21:45:10.017571167 -0500 22606+++ linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_state.c 2010-02-23 17:09:53.184132288 -0500
22207@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm 22607@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm
22208 { 22608 {
22209 drm_radeon_private_t *dev_priv = dev->dev_private; 22609 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -22213,9 +22613,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.8/d
22213 22613
22214 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); 22614 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
22215 22615
22216diff -urNp linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_ttm.c 22616diff -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
22217--- linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_ttm.c 2010-02-09 07:57:19.000000000 -0500 22617--- linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_ttm.c 2010-02-09 07:57:19.000000000 -0500
22218+++ linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_ttm.c 2010-02-13 21:45:10.017571167 -0500 22618+++ linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_ttm.c 2010-02-23 17:09:53.184132288 -0500
22219@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic 22619@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
22220 DRM_INFO("radeon: ttm finalized\n"); 22620 DRM_INFO("radeon: ttm finalized\n");
22221 } 22621 }
@@ -22267,9 +22667,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.8/dri
22267 } 22667 }
22268 22668
22269 22669
22270diff -urNp linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_bo.c 22670diff -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
22271--- linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_bo.c 2010-02-09 07:57:19.000000000 -0500 22671--- linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo.c 2010-02-09 07:57:19.000000000 -0500
22272+++ linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_bo.c 2010-02-13 21:45:10.018931040 -0500 22672+++ linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo.c 2010-02-23 17:09:53.184132288 -0500
22273@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a 22673@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a
22274 NULL 22674 NULL
22275 }; 22675 };
@@ -22279,9 +22679,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.8/drivers/gp
22279 .show = &ttm_bo_global_show 22679 .show = &ttm_bo_global_show
22280 }; 22680 };
22281 22681
22282diff -urNp linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_bo_vm.c 22682diff -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
22283--- linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-02-09 07:57:19.000000000 -0500 22683--- linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-02-09 07:57:19.000000000 -0500
22284+++ linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-02-13 21:45:10.018931040 -0500 22684+++ linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-02-23 17:09:53.184132288 -0500
22285@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are 22685@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
22286 { 22686 {
22287 struct ttm_buffer_object *bo = (struct ttm_buffer_object *) 22687 struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -22302,9 +22702,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.8/drivers
22302 /* 22702 /*
22303 * Work around locking order reversal in fault / nopfn 22703 * Work around locking order reversal in fault / nopfn
22304 * between mmap_sem and bo_reserve: Perform a trylock operation 22704 * between mmap_sem and bo_reserve: Perform a trylock operation
22305diff -urNp linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_global.c 22705diff -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
22306--- linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_global.c 2010-02-09 07:57:19.000000000 -0500 22706--- linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_global.c 2010-02-09 07:57:19.000000000 -0500
22307+++ linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_global.c 2010-02-13 21:45:10.018931040 -0500 22707+++ linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_global.c 2010-02-23 17:09:53.184132288 -0500
22308@@ -36,7 +36,7 @@ 22708@@ -36,7 +36,7 @@
22309 struct ttm_global_item { 22709 struct ttm_global_item {
22310 struct mutex mutex; 22710 struct mutex mutex;
@@ -22362,9 +22762,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.8/driver
22362 ref->release(ref); 22762 ref->release(ref);
22363 item->object = NULL; 22763 item->object = NULL;
22364 } 22764 }
22365diff -urNp linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_memory.c 22765diff -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
22366--- linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_memory.c 2010-02-09 07:57:19.000000000 -0500 22766--- linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_memory.c 2010-02-09 07:57:19.000000000 -0500
22367+++ linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_memory.c 2010-02-13 21:45:10.018931040 -0500 22767+++ linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_memory.c 2010-02-23 17:09:53.184132288 -0500
22368@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at 22768@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
22369 NULL 22769 NULL
22370 }; 22770 };
@@ -22374,9 +22774,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.8/driver
22374 .show = &ttm_mem_zone_show, 22774 .show = &ttm_mem_zone_show,
22375 .store = &ttm_mem_zone_store 22775 .store = &ttm_mem_zone_store
22376 }; 22776 };
22377diff -urNp linux-2.6.32.8/drivers/gpu/vga/vgaarb.c linux-2.6.32.8/drivers/gpu/vga/vgaarb.c 22777diff -urNp linux-2.6.32.9/drivers/gpu/vga/vgaarb.c linux-2.6.32.9/drivers/gpu/vga/vgaarb.c
22378--- linux-2.6.32.8/drivers/gpu/vga/vgaarb.c 2010-02-09 07:57:19.000000000 -0500 22778--- linux-2.6.32.9/drivers/gpu/vga/vgaarb.c 2010-02-09 07:57:19.000000000 -0500
22379+++ linux-2.6.32.8/drivers/gpu/vga/vgaarb.c 2010-02-13 21:45:10.019921006 -0500 22779+++ linux-2.6.32.9/drivers/gpu/vga/vgaarb.c 2010-02-23 17:09:53.184132288 -0500
22380@@ -961,7 +961,7 @@ static ssize_t vga_arb_write(struct file 22780@@ -961,7 +961,7 @@ static ssize_t vga_arb_write(struct file
22381 remaining -= 7; 22781 remaining -= 7;
22382 pr_devel("client 0x%p called 'target'\n", priv); 22782 pr_devel("client 0x%p called 'target'\n", priv);
@@ -22386,9 +22786,9 @@ diff -urNp linux-2.6.32.8/drivers/gpu/vga/vgaarb.c linux-2.6.32.8/drivers/gpu/vg
22386 pdev = pci_dev_get(vga_default_device()); 22786 pdev = pci_dev_get(vga_default_device());
22387 else { 22787 else {
22388 if (!vga_pci_str_to_vars(curr_pos, remaining, 22788 if (!vga_pci_str_to_vars(curr_pos, remaining,
22389diff -urNp linux-2.6.32.8/drivers/hwmon/k8temp.c linux-2.6.32.8/drivers/hwmon/k8temp.c 22789diff -urNp linux-2.6.32.9/drivers/hwmon/k8temp.c linux-2.6.32.9/drivers/hwmon/k8temp.c
22390--- linux-2.6.32.8/drivers/hwmon/k8temp.c 2010-02-09 07:57:19.000000000 -0500 22790--- linux-2.6.32.9/drivers/hwmon/k8temp.c 2010-02-09 07:57:19.000000000 -0500
22391+++ linux-2.6.32.8/drivers/hwmon/k8temp.c 2010-02-13 21:45:10.032681336 -0500 22791+++ linux-2.6.32.9/drivers/hwmon/k8temp.c 2010-02-23 17:09:53.184132288 -0500
22392@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n 22792@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
22393 22793
22394 static struct pci_device_id k8temp_ids[] = { 22794 static struct pci_device_id k8temp_ids[] = {
@@ -22398,9 +22798,9 @@ diff -urNp linux-2.6.32.8/drivers/hwmon/k8temp.c linux-2.6.32.8/drivers/hwmon/k8
22398 }; 22798 };
22399 22799
22400 MODULE_DEVICE_TABLE(pci, k8temp_ids); 22800 MODULE_DEVICE_TABLE(pci, k8temp_ids);
22401diff -urNp linux-2.6.32.8/drivers/hwmon/sis5595.c linux-2.6.32.8/drivers/hwmon/sis5595.c 22801diff -urNp linux-2.6.32.9/drivers/hwmon/sis5595.c linux-2.6.32.9/drivers/hwmon/sis5595.c
22402--- linux-2.6.32.8/drivers/hwmon/sis5595.c 2010-02-09 07:57:19.000000000 -0500 22802--- linux-2.6.32.9/drivers/hwmon/sis5595.c 2010-02-09 07:57:19.000000000 -0500
22403+++ linux-2.6.32.8/drivers/hwmon/sis5595.c 2010-02-13 21:45:10.039746836 -0500 22803+++ linux-2.6.32.9/drivers/hwmon/sis5595.c 2010-02-23 17:09:53.184132288 -0500
22404@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda 22804@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
22405 22805
22406 static struct pci_device_id sis5595_pci_ids[] = { 22806 static struct pci_device_id sis5595_pci_ids[] = {
@@ -22410,9 +22810,9 @@ diff -urNp linux-2.6.32.8/drivers/hwmon/sis5595.c linux-2.6.32.8/drivers/hwmon/s
22410 }; 22810 };
22411 22811
22412 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); 22812 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
22413diff -urNp linux-2.6.32.8/drivers/hwmon/via686a.c linux-2.6.32.8/drivers/hwmon/via686a.c 22813diff -urNp linux-2.6.32.9/drivers/hwmon/via686a.c linux-2.6.32.9/drivers/hwmon/via686a.c
22414--- linux-2.6.32.8/drivers/hwmon/via686a.c 2010-02-09 07:57:19.000000000 -0500 22814--- linux-2.6.32.9/drivers/hwmon/via686a.c 2010-02-09 07:57:19.000000000 -0500
22415+++ linux-2.6.32.8/drivers/hwmon/via686a.c 2010-02-13 21:45:10.040778396 -0500 22815+++ linux-2.6.32.9/drivers/hwmon/via686a.c 2010-02-23 17:09:53.184132288 -0500
22416@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda 22816@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
22417 22817
22418 static struct pci_device_id via686a_pci_ids[] = { 22818 static struct pci_device_id via686a_pci_ids[] = {
@@ -22422,9 +22822,9 @@ diff -urNp linux-2.6.32.8/drivers/hwmon/via686a.c linux-2.6.32.8/drivers/hwmon/v
22422 }; 22822 };
22423 22823
22424 MODULE_DEVICE_TABLE(pci, via686a_pci_ids); 22824 MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
22425diff -urNp linux-2.6.32.8/drivers/hwmon/vt8231.c linux-2.6.32.8/drivers/hwmon/vt8231.c 22825diff -urNp linux-2.6.32.9/drivers/hwmon/vt8231.c linux-2.6.32.9/drivers/hwmon/vt8231.c
22426--- linux-2.6.32.8/drivers/hwmon/vt8231.c 2010-02-09 07:57:19.000000000 -0500 22826--- linux-2.6.32.9/drivers/hwmon/vt8231.c 2010-02-09 07:57:19.000000000 -0500
22427+++ linux-2.6.32.8/drivers/hwmon/vt8231.c 2010-02-13 21:45:10.047624370 -0500 22827+++ linux-2.6.32.9/drivers/hwmon/vt8231.c 2010-02-23 17:09:53.184132288 -0500
22428@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri 22828@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
22429 22829
22430 static struct pci_device_id vt8231_pci_ids[] = { 22830 static struct pci_device_id vt8231_pci_ids[] = {
@@ -22434,9 +22834,9 @@ diff -urNp linux-2.6.32.8/drivers/hwmon/vt8231.c linux-2.6.32.8/drivers/hwmon/vt
22434 }; 22834 };
22435 22835
22436 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); 22836 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
22437diff -urNp linux-2.6.32.8/drivers/hwmon/w83791d.c linux-2.6.32.8/drivers/hwmon/w83791d.c 22837diff -urNp linux-2.6.32.9/drivers/hwmon/w83791d.c linux-2.6.32.9/drivers/hwmon/w83791d.c
22438--- linux-2.6.32.8/drivers/hwmon/w83791d.c 2010-02-09 07:57:19.000000000 -0500 22838--- linux-2.6.32.9/drivers/hwmon/w83791d.c 2010-02-09 07:57:19.000000000 -0500
22439+++ linux-2.6.32.8/drivers/hwmon/w83791d.c 2010-02-13 21:45:10.061571155 -0500 22839+++ linux-2.6.32.9/drivers/hwmon/w83791d.c 2010-02-23 17:09:53.184132288 -0500
22440@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli 22840@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
22441 struct i2c_board_info *info); 22841 struct i2c_board_info *info);
22442 static int w83791d_remove(struct i2c_client *client); 22842 static int w83791d_remove(struct i2c_client *client);
@@ -22448,9 +22848,9 @@ diff -urNp linux-2.6.32.8/drivers/hwmon/w83791d.c linux-2.6.32.8/drivers/hwmon/w
22448 static struct w83791d_data *w83791d_update_device(struct device *dev); 22848 static struct w83791d_data *w83791d_update_device(struct device *dev);
22449 22849
22450 #ifdef DEBUG 22850 #ifdef DEBUG
22451diff -urNp linux-2.6.32.8/drivers/i2c/busses/i2c-i801.c linux-2.6.32.8/drivers/i2c/busses/i2c-i801.c 22851diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-i801.c linux-2.6.32.9/drivers/i2c/busses/i2c-i801.c
22452--- linux-2.6.32.8/drivers/i2c/busses/i2c-i801.c 2010-02-09 07:57:19.000000000 -0500 22852--- linux-2.6.32.9/drivers/i2c/busses/i2c-i801.c 2010-02-09 07:57:19.000000000 -0500
22453+++ linux-2.6.32.8/drivers/i2c/busses/i2c-i801.c 2010-02-13 21:45:10.061571155 -0500 22853+++ linux-2.6.32.9/drivers/i2c/busses/i2c-i801.c 2010-02-23 17:09:53.188075376 -0500
22454@@ -578,7 +578,7 @@ static struct pci_device_id i801_ids[] = 22854@@ -578,7 +578,7 @@ static struct pci_device_id i801_ids[] =
22455 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) }, 22855 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
22456 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, 22856 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
@@ -22460,9 +22860,9 @@ diff -urNp linux-2.6.32.8/drivers/i2c/busses/i2c-i801.c linux-2.6.32.8/drivers/i
22460 }; 22860 };
22461 22861
22462 MODULE_DEVICE_TABLE (pci, i801_ids); 22862 MODULE_DEVICE_TABLE (pci, i801_ids);
22463diff -urNp linux-2.6.32.8/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.8/drivers/i2c/busses/i2c-piix4.c 22863diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.9/drivers/i2c/busses/i2c-piix4.c
22464--- linux-2.6.32.8/drivers/i2c/busses/i2c-piix4.c 2010-02-09 07:57:19.000000000 -0500 22864--- linux-2.6.32.9/drivers/i2c/busses/i2c-piix4.c 2010-02-09 07:57:19.000000000 -0500
22465+++ linux-2.6.32.8/drivers/i2c/busses/i2c-piix4.c 2010-02-13 21:45:10.062687264 -0500 22865+++ linux-2.6.32.9/drivers/i2c/busses/i2c-piix4.c 2010-02-23 17:09:53.188075376 -0500
22466@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat 22866@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
22467 .ident = "IBM", 22867 .ident = "IBM",
22468 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, 22868 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -22481,9 +22881,9 @@ diff -urNp linux-2.6.32.8/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.8/drivers/
22481 }; 22881 };
22482 22882
22483 MODULE_DEVICE_TABLE (pci, piix4_ids); 22883 MODULE_DEVICE_TABLE (pci, piix4_ids);
22484diff -urNp linux-2.6.32.8/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.8/drivers/i2c/busses/i2c-sis630.c 22884diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.9/drivers/i2c/busses/i2c-sis630.c
22485--- linux-2.6.32.8/drivers/i2c/busses/i2c-sis630.c 2010-02-09 07:57:19.000000000 -0500 22885--- linux-2.6.32.9/drivers/i2c/busses/i2c-sis630.c 2010-02-09 07:57:19.000000000 -0500
22486+++ linux-2.6.32.8/drivers/i2c/busses/i2c-sis630.c 2010-02-13 21:45:10.062687264 -0500 22886+++ linux-2.6.32.9/drivers/i2c/busses/i2c-sis630.c 2010-02-23 17:09:53.188075376 -0500
22487@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter 22887@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
22488 static struct pci_device_id sis630_ids[] __devinitdata = { 22888 static struct pci_device_id sis630_ids[] __devinitdata = {
22489 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, 22889 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
@@ -22493,9 +22893,9 @@ diff -urNp linux-2.6.32.8/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.8/drivers
22493 }; 22893 };
22494 22894
22495 MODULE_DEVICE_TABLE (pci, sis630_ids); 22895 MODULE_DEVICE_TABLE (pci, sis630_ids);
22496diff -urNp linux-2.6.32.8/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.8/drivers/i2c/busses/i2c-sis96x.c 22896diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.9/drivers/i2c/busses/i2c-sis96x.c
22497--- linux-2.6.32.8/drivers/i2c/busses/i2c-sis96x.c 2010-02-09 07:57:19.000000000 -0500 22897--- linux-2.6.32.9/drivers/i2c/busses/i2c-sis96x.c 2010-02-09 07:57:19.000000000 -0500
22498+++ linux-2.6.32.8/drivers/i2c/busses/i2c-sis96x.c 2010-02-13 21:45:10.062687264 -0500 22898+++ linux-2.6.32.9/drivers/i2c/busses/i2c-sis96x.c 2010-02-23 17:09:53.188075376 -0500
22499@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter 22899@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
22500 22900
22501 static struct pci_device_id sis96x_ids[] = { 22901 static struct pci_device_id sis96x_ids[] = {
@@ -22505,9 +22905,9 @@ diff -urNp linux-2.6.32.8/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.8/drivers
22505 }; 22905 };
22506 22906
22507 MODULE_DEVICE_TABLE (pci, sis96x_ids); 22907 MODULE_DEVICE_TABLE (pci, sis96x_ids);
22508diff -urNp linux-2.6.32.8/drivers/ide/ide-cd.c linux-2.6.32.8/drivers/ide/ide-cd.c 22908diff -urNp linux-2.6.32.9/drivers/ide/ide-cd.c linux-2.6.32.9/drivers/ide/ide-cd.c
22509--- linux-2.6.32.8/drivers/ide/ide-cd.c 2010-02-09 07:57:19.000000000 -0500 22909--- linux-2.6.32.9/drivers/ide/ide-cd.c 2010-02-09 07:57:19.000000000 -0500
22510+++ linux-2.6.32.8/drivers/ide/ide-cd.c 2010-02-13 21:45:10.062687264 -0500 22910+++ linux-2.6.32.9/drivers/ide/ide-cd.c 2010-02-23 17:09:53.188075376 -0500
22511@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ 22911@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_
22512 alignment = queue_dma_alignment(q) | q->dma_pad_mask; 22912 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
22513 if ((unsigned long)buf & alignment 22913 if ((unsigned long)buf & alignment
@@ -22517,9 +22917,9 @@ diff -urNp linux-2.6.32.8/drivers/ide/ide-cd.c linux-2.6.32.8/drivers/ide/ide-cd
22517 drive->dma = 0; 22917 drive->dma = 0;
22518 } 22918 }
22519 } 22919 }
22520diff -urNp linux-2.6.32.8/drivers/ieee1394/dv1394.c linux-2.6.32.8/drivers/ieee1394/dv1394.c 22920diff -urNp linux-2.6.32.9/drivers/ieee1394/dv1394.c linux-2.6.32.9/drivers/ieee1394/dv1394.c
22521--- linux-2.6.32.8/drivers/ieee1394/dv1394.c 2010-02-09 07:57:19.000000000 -0500 22921--- linux-2.6.32.9/drivers/ieee1394/dv1394.c 2010-02-09 07:57:19.000000000 -0500
22522+++ linux-2.6.32.8/drivers/ieee1394/dv1394.c 2010-02-13 21:45:10.063917726 -0500 22922+++ linux-2.6.32.9/drivers/ieee1394/dv1394.c 2010-02-23 17:09:53.188075376 -0500
22523@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c 22923@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
22524 based upon DIF section and sequence 22924 based upon DIF section and sequence
22525 */ 22925 */
@@ -22538,9 +22938,9 @@ diff -urNp linux-2.6.32.8/drivers/ieee1394/dv1394.c linux-2.6.32.8/drivers/ieee1
22538 }; 22938 };
22539 22939
22540 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); 22940 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
22541diff -urNp linux-2.6.32.8/drivers/ieee1394/eth1394.c linux-2.6.32.8/drivers/ieee1394/eth1394.c 22941diff -urNp linux-2.6.32.9/drivers/ieee1394/eth1394.c linux-2.6.32.9/drivers/ieee1394/eth1394.c
22542--- linux-2.6.32.8/drivers/ieee1394/eth1394.c 2010-02-09 07:57:19.000000000 -0500 22942--- linux-2.6.32.9/drivers/ieee1394/eth1394.c 2010-02-09 07:57:19.000000000 -0500
22543+++ linux-2.6.32.8/drivers/ieee1394/eth1394.c 2010-02-13 21:45:10.063917726 -0500 22943+++ linux-2.6.32.9/drivers/ieee1394/eth1394.c 2010-02-23 17:09:53.188075376 -0500
22544@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e 22944@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
22545 .specifier_id = ETHER1394_GASP_SPECIFIER_ID, 22945 .specifier_id = ETHER1394_GASP_SPECIFIER_ID,
22546 .version = ETHER1394_GASP_VERSION, 22946 .version = ETHER1394_GASP_VERSION,
@@ -22550,9 +22950,9 @@ diff -urNp linux-2.6.32.8/drivers/ieee1394/eth1394.c linux-2.6.32.8/drivers/ieee
22550 }; 22950 };
22551 22951
22552 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); 22952 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
22553diff -urNp linux-2.6.32.8/drivers/ieee1394/hosts.c linux-2.6.32.8/drivers/ieee1394/hosts.c 22953diff -urNp linux-2.6.32.9/drivers/ieee1394/hosts.c linux-2.6.32.9/drivers/ieee1394/hosts.c
22554--- linux-2.6.32.8/drivers/ieee1394/hosts.c 2010-02-09 07:57:19.000000000 -0500 22954--- linux-2.6.32.9/drivers/ieee1394/hosts.c 2010-02-09 07:57:19.000000000 -0500
22555+++ linux-2.6.32.8/drivers/ieee1394/hosts.c 2010-02-13 21:45:10.063917726 -0500 22955+++ linux-2.6.32.9/drivers/ieee1394/hosts.c 2010-02-23 17:09:53.188075376 -0500
22556@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso 22956@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
22557 } 22957 }
22558 22958
@@ -22561,9 +22961,9 @@ diff -urNp linux-2.6.32.8/drivers/ieee1394/hosts.c linux-2.6.32.8/drivers/ieee13
22561 .transmit_packet = dummy_transmit_packet, 22961 .transmit_packet = dummy_transmit_packet,
22562 .devctl = dummy_devctl, 22962 .devctl = dummy_devctl,
22563 .isoctl = dummy_isoctl 22963 .isoctl = dummy_isoctl
22564diff -urNp linux-2.6.32.8/drivers/ieee1394/ohci1394.c linux-2.6.32.8/drivers/ieee1394/ohci1394.c 22964diff -urNp linux-2.6.32.9/drivers/ieee1394/ohci1394.c linux-2.6.32.9/drivers/ieee1394/ohci1394.c
22565--- linux-2.6.32.8/drivers/ieee1394/ohci1394.c 2010-02-09 07:57:19.000000000 -0500 22965--- linux-2.6.32.9/drivers/ieee1394/ohci1394.c 2010-02-09 07:57:19.000000000 -0500
22566+++ linux-2.6.32.8/drivers/ieee1394/ohci1394.c 2010-02-13 21:45:10.064919809 -0500 22966+++ linux-2.6.32.9/drivers/ieee1394/ohci1394.c 2010-02-23 17:09:53.188075376 -0500
22567@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ 22967@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
22568 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) 22968 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
22569 22969
@@ -22585,9 +22985,9 @@ diff -urNp linux-2.6.32.8/drivers/ieee1394/ohci1394.c linux-2.6.32.8/drivers/iee
22585 }; 22985 };
22586 22986
22587 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); 22987 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
22588diff -urNp linux-2.6.32.8/drivers/ieee1394/raw1394.c linux-2.6.32.8/drivers/ieee1394/raw1394.c 22988diff -urNp linux-2.6.32.9/drivers/ieee1394/raw1394.c linux-2.6.32.9/drivers/ieee1394/raw1394.c
22589--- linux-2.6.32.8/drivers/ieee1394/raw1394.c 2010-02-09 07:57:19.000000000 -0500 22989--- linux-2.6.32.9/drivers/ieee1394/raw1394.c 2010-02-09 07:57:19.000000000 -0500
22590+++ linux-2.6.32.8/drivers/ieee1394/raw1394.c 2010-02-13 21:45:10.065926079 -0500 22990+++ linux-2.6.32.9/drivers/ieee1394/raw1394.c 2010-02-23 17:09:53.188075376 -0500
22591@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r 22991@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
22592 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 22992 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
22593 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 22993 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -22597,9 +22997,9 @@ diff -urNp linux-2.6.32.8/drivers/ieee1394/raw1394.c linux-2.6.32.8/drivers/ieee
22597 }; 22997 };
22598 22998
22599 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); 22999 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
22600diff -urNp linux-2.6.32.8/drivers/ieee1394/sbp2.c linux-2.6.32.8/drivers/ieee1394/sbp2.c 23000diff -urNp linux-2.6.32.9/drivers/ieee1394/sbp2.c linux-2.6.32.9/drivers/ieee1394/sbp2.c
22601--- linux-2.6.32.8/drivers/ieee1394/sbp2.c 2010-02-09 07:57:19.000000000 -0500 23001--- linux-2.6.32.9/drivers/ieee1394/sbp2.c 2010-02-09 07:57:19.000000000 -0500
22602+++ linux-2.6.32.8/drivers/ieee1394/sbp2.c 2010-02-13 21:45:10.065926079 -0500 23002+++ linux-2.6.32.9/drivers/ieee1394/sbp2.c 2010-02-23 17:09:53.192542032 -0500
22603@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s 23003@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s
22604 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 23004 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
22605 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, 23005 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -22618,9 +23018,9 @@ diff -urNp linux-2.6.32.8/drivers/ieee1394/sbp2.c linux-2.6.32.8/drivers/ieee139
22618 { 23018 {
22619 int ret; 23019 int ret;
22620 23020
22621diff -urNp linux-2.6.32.8/drivers/ieee1394/video1394.c linux-2.6.32.8/drivers/ieee1394/video1394.c 23021diff -urNp linux-2.6.32.9/drivers/ieee1394/video1394.c linux-2.6.32.9/drivers/ieee1394/video1394.c
22622--- linux-2.6.32.8/drivers/ieee1394/video1394.c 2010-02-09 07:57:19.000000000 -0500 23022--- linux-2.6.32.9/drivers/ieee1394/video1394.c 2010-02-09 07:57:19.000000000 -0500
22623+++ linux-2.6.32.8/drivers/ieee1394/video1394.c 2010-02-13 21:45:10.066804756 -0500 23023+++ linux-2.6.32.9/drivers/ieee1394/video1394.c 2010-02-23 17:09:53.192542032 -0500
22624@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v 23024@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
22625 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 23025 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
22626 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff 23026 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
@@ -22630,9 +23030,9 @@ diff -urNp linux-2.6.32.8/drivers/ieee1394/video1394.c linux-2.6.32.8/drivers/ie
22630 }; 23030 };
22631 23031
22632 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); 23032 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
22633diff -urNp linux-2.6.32.8/drivers/infiniband/core/cm.c linux-2.6.32.8/drivers/infiniband/core/cm.c 23033diff -urNp linux-2.6.32.9/drivers/infiniband/core/cm.c linux-2.6.32.9/drivers/infiniband/core/cm.c
22634--- linux-2.6.32.8/drivers/infiniband/core/cm.c 2010-02-09 07:57:19.000000000 -0500 23034--- linux-2.6.32.9/drivers/infiniband/core/cm.c 2010-02-09 07:57:19.000000000 -0500
22635+++ linux-2.6.32.8/drivers/infiniband/core/cm.c 2010-02-13 21:45:10.067784303 -0500 23035+++ linux-2.6.32.9/drivers/infiniband/core/cm.c 2010-02-23 17:09:53.192542032 -0500
22636@@ -112,7 +112,7 @@ static char const counter_group_names[CM 23036@@ -112,7 +112,7 @@ static char const counter_group_names[CM
22637 23037
22638 struct cm_counter_group { 23038 struct cm_counter_group {
@@ -22776,9 +23176,9 @@ diff -urNp linux-2.6.32.8/drivers/infiniband/core/cm.c linux-2.6.32.8/drivers/in
22776 .show = cm_show_counter 23176 .show = cm_show_counter
22777 }; 23177 };
22778 23178
22779diff -urNp linux-2.6.32.8/drivers/infiniband/core/sysfs.c linux-2.6.32.8/drivers/infiniband/core/sysfs.c 23179diff -urNp linux-2.6.32.9/drivers/infiniband/core/sysfs.c linux-2.6.32.9/drivers/infiniband/core/sysfs.c
22780--- linux-2.6.32.8/drivers/infiniband/core/sysfs.c 2010-02-09 07:57:19.000000000 -0500 23180--- linux-2.6.32.9/drivers/infiniband/core/sysfs.c 2010-02-09 07:57:19.000000000 -0500
22781+++ linux-2.6.32.8/drivers/infiniband/core/sysfs.c 2010-02-13 21:45:10.067784303 -0500 23181+++ linux-2.6.32.9/drivers/infiniband/core/sysfs.c 2010-02-23 17:09:53.192542032 -0500
22782@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob 23182@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
22783 return port_attr->show(p, port_attr, buf); 23183 return port_attr->show(p, port_attr, buf);
22784 } 23184 }
@@ -22788,9 +23188,9 @@ diff -urNp linux-2.6.32.8/drivers/infiniband/core/sysfs.c linux-2.6.32.8/drivers
22788 .show = port_attr_show 23188 .show = port_attr_show
22789 }; 23189 };
22790 23190
22791diff -urNp linux-2.6.32.8/drivers/input/keyboard/atkbd.c linux-2.6.32.8/drivers/input/keyboard/atkbd.c 23191diff -urNp linux-2.6.32.9/drivers/input/keyboard/atkbd.c linux-2.6.32.9/drivers/input/keyboard/atkbd.c
22792--- linux-2.6.32.8/drivers/input/keyboard/atkbd.c 2010-02-09 07:57:19.000000000 -0500 23192--- linux-2.6.32.9/drivers/input/keyboard/atkbd.c 2010-02-09 07:57:19.000000000 -0500
22793+++ linux-2.6.32.8/drivers/input/keyboard/atkbd.c 2010-02-13 21:45:10.067784303 -0500 23193+++ linux-2.6.32.9/drivers/input/keyboard/atkbd.c 2010-02-23 17:09:53.192542032 -0500
22794@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri 23194@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
22795 .id = SERIO_ANY, 23195 .id = SERIO_ANY,
22796 .extra = SERIO_ANY, 23196 .extra = SERIO_ANY,
@@ -22800,9 +23200,9 @@ diff -urNp linux-2.6.32.8/drivers/input/keyboard/atkbd.c linux-2.6.32.8/drivers/
22800 }; 23200 };
22801 23201
22802 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); 23202 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
22803diff -urNp linux-2.6.32.8/drivers/input/mouse/lifebook.c linux-2.6.32.8/drivers/input/mouse/lifebook.c 23203diff -urNp linux-2.6.32.9/drivers/input/mouse/lifebook.c linux-2.6.32.9/drivers/input/mouse/lifebook.c
22804--- linux-2.6.32.8/drivers/input/mouse/lifebook.c 2010-02-09 07:57:19.000000000 -0500 23204--- linux-2.6.32.9/drivers/input/mouse/lifebook.c 2010-02-09 07:57:19.000000000 -0500
22805+++ linux-2.6.32.8/drivers/input/mouse/lifebook.c 2010-02-13 21:45:10.068726317 -0500 23205+++ linux-2.6.32.9/drivers/input/mouse/lifebook.c 2010-02-23 17:09:53.192542032 -0500
22806@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo 23206@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
22807 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), 23207 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
22808 }, 23208 },
@@ -22812,9 +23212,9 @@ diff -urNp linux-2.6.32.8/drivers/input/mouse/lifebook.c linux-2.6.32.8/drivers/
22812 }; 23212 };
22813 23213
22814 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) 23214 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
22815diff -urNp linux-2.6.32.8/drivers/input/mouse/psmouse-base.c linux-2.6.32.8/drivers/input/mouse/psmouse-base.c 23215diff -urNp linux-2.6.32.9/drivers/input/mouse/psmouse-base.c linux-2.6.32.9/drivers/input/mouse/psmouse-base.c
22816--- linux-2.6.32.8/drivers/input/mouse/psmouse-base.c 2010-02-09 07:57:19.000000000 -0500 23216--- linux-2.6.32.9/drivers/input/mouse/psmouse-base.c 2010-02-09 07:57:19.000000000 -0500
22817+++ linux-2.6.32.8/drivers/input/mouse/psmouse-base.c 2010-02-13 21:45:10.068726317 -0500 23217+++ linux-2.6.32.9/drivers/input/mouse/psmouse-base.c 2010-02-23 17:09:53.192542032 -0500
22818@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se 23218@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se
22819 .id = SERIO_ANY, 23219 .id = SERIO_ANY,
22820 .extra = SERIO_ANY, 23220 .extra = SERIO_ANY,
@@ -22824,9 +23224,9 @@ diff -urNp linux-2.6.32.8/drivers/input/mouse/psmouse-base.c linux-2.6.32.8/driv
22824 }; 23224 };
22825 23225
22826 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); 23226 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
22827diff -urNp linux-2.6.32.8/drivers/input/mouse/synaptics.c linux-2.6.32.8/drivers/input/mouse/synaptics.c 23227diff -urNp linux-2.6.32.9/drivers/input/mouse/synaptics.c linux-2.6.32.9/drivers/input/mouse/synaptics.c
22828--- linux-2.6.32.8/drivers/input/mouse/synaptics.c 2010-02-09 07:57:19.000000000 -0500 23228--- linux-2.6.32.9/drivers/input/mouse/synaptics.c 2010-02-09 07:57:19.000000000 -0500
22829+++ linux-2.6.32.8/drivers/input/mouse/synaptics.c 2010-02-13 21:45:10.068726317 -0500 23229+++ linux-2.6.32.9/drivers/input/mouse/synaptics.c 2010-02-23 17:09:53.192542032 -0500
22830@@ -437,7 +437,7 @@ static void synaptics_process_packet(str 23230@@ -437,7 +437,7 @@ static void synaptics_process_packet(str
22831 break; 23231 break;
22832 case 2: 23232 case 2:
@@ -22855,9 +23255,9 @@ diff -urNp linux-2.6.32.8/drivers/input/mouse/synaptics.c linux-2.6.32.8/drivers
22855 }; 23255 };
22856 #endif 23256 #endif
22857 23257
22858diff -urNp linux-2.6.32.8/drivers/input/mousedev.c linux-2.6.32.8/drivers/input/mousedev.c 23258diff -urNp linux-2.6.32.9/drivers/input/mousedev.c linux-2.6.32.9/drivers/input/mousedev.c
22859--- linux-2.6.32.8/drivers/input/mousedev.c 2010-02-09 07:57:19.000000000 -0500 23259--- linux-2.6.32.9/drivers/input/mousedev.c 2010-02-09 07:57:19.000000000 -0500
22860+++ linux-2.6.32.8/drivers/input/mousedev.c 2010-02-13 21:45:10.068726317 -0500 23260+++ linux-2.6.32.9/drivers/input/mousedev.c 2010-02-23 17:09:53.192542032 -0500
22861@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han 23261@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
22862 23262
22863 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX 23263 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -22867,9 +23267,9 @@ diff -urNp linux-2.6.32.8/drivers/input/mousedev.c linux-2.6.32.8/drivers/input/
22867 }; 23267 };
22868 static int psaux_registered; 23268 static int psaux_registered;
22869 #endif 23269 #endif
22870diff -urNp linux-2.6.32.8/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.8/drivers/input/serio/i8042-x86ia64io.h 23270diff -urNp linux-2.6.32.9/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.9/drivers/input/serio/i8042-x86ia64io.h
22871--- linux-2.6.32.8/drivers/input/serio/i8042-x86ia64io.h 2010-02-09 07:57:19.000000000 -0500 23271--- linux-2.6.32.9/drivers/input/serio/i8042-x86ia64io.h 2010-02-09 07:57:19.000000000 -0500
22872+++ linux-2.6.32.8/drivers/input/serio/i8042-x86ia64io.h 2010-02-13 21:45:10.069838999 -0500 23272+++ linux-2.6.32.9/drivers/input/serio/i8042-x86ia64io.h 2010-02-23 17:09:53.192542032 -0500
22873@@ -172,7 +172,7 @@ static const struct dmi_system_id __init 23273@@ -172,7 +172,7 @@ static const struct dmi_system_id __init
22874 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), 23274 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
22875 }, 23275 },
@@ -22924,9 +23324,9 @@ diff -urNp linux-2.6.32.8/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.8/d
22924 }; 23324 };
22925 23325
22926 #endif /* CONFIG_X86 */ 23326 #endif /* CONFIG_X86 */
22927diff -urNp linux-2.6.32.8/drivers/input/serio/serio_raw.c linux-2.6.32.8/drivers/input/serio/serio_raw.c 23327diff -urNp linux-2.6.32.9/drivers/input/serio/serio_raw.c linux-2.6.32.9/drivers/input/serio/serio_raw.c
22928--- linux-2.6.32.8/drivers/input/serio/serio_raw.c 2010-02-09 07:57:19.000000000 -0500 23328--- linux-2.6.32.9/drivers/input/serio/serio_raw.c 2010-02-09 07:57:19.000000000 -0500
22929+++ linux-2.6.32.8/drivers/input/serio/serio_raw.c 2010-02-13 21:45:10.069838999 -0500 23329+++ linux-2.6.32.9/drivers/input/serio/serio_raw.c 2010-02-23 17:09:53.192542032 -0500
22930@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ 23330@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
22931 .id = SERIO_ANY, 23331 .id = SERIO_ANY,
22932 .extra = SERIO_ANY, 23332 .extra = SERIO_ANY,
@@ -22936,9 +23336,9 @@ diff -urNp linux-2.6.32.8/drivers/input/serio/serio_raw.c linux-2.6.32.8/drivers
22936 }; 23336 };
22937 23337
22938 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); 23338 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
22939diff -urNp linux-2.6.32.8/drivers/isdn/gigaset/common.c linux-2.6.32.8/drivers/isdn/gigaset/common.c 23339diff -urNp linux-2.6.32.9/drivers/isdn/gigaset/common.c linux-2.6.32.9/drivers/isdn/gigaset/common.c
22940--- linux-2.6.32.8/drivers/isdn/gigaset/common.c 2010-02-09 07:57:19.000000000 -0500 23340--- linux-2.6.32.9/drivers/isdn/gigaset/common.c 2010-02-09 07:57:19.000000000 -0500
22941+++ linux-2.6.32.8/drivers/isdn/gigaset/common.c 2010-02-13 21:45:10.073803057 -0500 23341+++ linux-2.6.32.9/drivers/isdn/gigaset/common.c 2010-02-23 17:09:53.192542032 -0500
22942@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct 23342@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
22943 cs->commands_pending = 0; 23343 cs->commands_pending = 0;
22944 cs->cur_at_seq = 0; 23344 cs->cur_at_seq = 0;
@@ -22948,9 +23348,9 @@ diff -urNp linux-2.6.32.8/drivers/isdn/gigaset/common.c linux-2.6.32.8/drivers/i
22948 cs->dev = NULL; 23348 cs->dev = NULL;
22949 cs->tty = NULL; 23349 cs->tty = NULL;
22950 cs->tty_dev = NULL; 23350 cs->tty_dev = NULL;
22951diff -urNp linux-2.6.32.8/drivers/isdn/gigaset/gigaset.h linux-2.6.32.8/drivers/isdn/gigaset/gigaset.h 23351diff -urNp linux-2.6.32.9/drivers/isdn/gigaset/gigaset.h linux-2.6.32.9/drivers/isdn/gigaset/gigaset.h
22952--- linux-2.6.32.8/drivers/isdn/gigaset/gigaset.h 2010-02-09 07:57:19.000000000 -0500 23352--- linux-2.6.32.9/drivers/isdn/gigaset/gigaset.h 2010-02-09 07:57:19.000000000 -0500
22953+++ linux-2.6.32.8/drivers/isdn/gigaset/gigaset.h 2010-02-13 21:45:10.093233277 -0500 23353+++ linux-2.6.32.9/drivers/isdn/gigaset/gigaset.h 2010-02-23 17:09:53.192542032 -0500
22954@@ -446,7 +446,7 @@ struct cardstate { 23354@@ -446,7 +446,7 @@ struct cardstate {
22955 spinlock_t cmdlock; 23355 spinlock_t cmdlock;
22956 unsigned curlen, cmdbytes; 23356 unsigned curlen, cmdbytes;
@@ -22960,9 +23360,9 @@ diff -urNp linux-2.6.32.8/drivers/isdn/gigaset/gigaset.h linux-2.6.32.8/drivers/
22960 struct tty_struct *tty; 23360 struct tty_struct *tty;
22961 struct tasklet_struct if_wake_tasklet; 23361 struct tasklet_struct if_wake_tasklet;
22962 unsigned control_state; 23362 unsigned control_state;
22963diff -urNp linux-2.6.32.8/drivers/isdn/gigaset/interface.c linux-2.6.32.8/drivers/isdn/gigaset/interface.c 23363diff -urNp linux-2.6.32.9/drivers/isdn/gigaset/interface.c linux-2.6.32.9/drivers/isdn/gigaset/interface.c
22964--- linux-2.6.32.8/drivers/isdn/gigaset/interface.c 2010-02-09 07:57:19.000000000 -0500 23364--- linux-2.6.32.9/drivers/isdn/gigaset/interface.c 2010-02-09 07:57:19.000000000 -0500
22965+++ linux-2.6.32.8/drivers/isdn/gigaset/interface.c 2010-02-13 21:45:10.130654965 -0500 23365+++ linux-2.6.32.9/drivers/isdn/gigaset/interface.c 2010-02-23 17:09:53.196332354 -0500
22966@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt 23366@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
22967 return -ERESTARTSYS; // FIXME -EINTR? 23367 return -ERESTARTSYS; // FIXME -EINTR?
22968 tty->driver_data = cs; 23368 tty->driver_data = cs;
@@ -23050,9 +23450,9 @@ diff -urNp linux-2.6.32.8/drivers/isdn/gigaset/interface.c linux-2.6.32.8/driver
23050 dev_warn(cs->dev, "%s: device not opened\n", __func__); 23450 dev_warn(cs->dev, "%s: device not opened\n", __func__);
23051 goto out; 23451 goto out;
23052 } 23452 }
23053diff -urNp linux-2.6.32.8/drivers/lguest/core.c linux-2.6.32.8/drivers/lguest/core.c 23453diff -urNp linux-2.6.32.9/drivers/lguest/core.c linux-2.6.32.9/drivers/lguest/core.c
23054--- linux-2.6.32.8/drivers/lguest/core.c 2010-02-09 07:57:19.000000000 -0500 23454--- linux-2.6.32.9/drivers/lguest/core.c 2010-02-09 07:57:19.000000000 -0500
23055+++ linux-2.6.32.8/drivers/lguest/core.c 2010-02-13 21:45:10.132604395 -0500 23455+++ linux-2.6.32.9/drivers/lguest/core.c 2010-02-23 17:09:53.196332354 -0500
23056@@ -91,9 +91,17 @@ static __init int map_switcher(void) 23456@@ -91,9 +91,17 @@ static __init int map_switcher(void)
23057 * it's worked so far. The end address needs +1 because __get_vm_area 23457 * it's worked so far. The end address needs +1 because __get_vm_area
23058 * allocates an extra guard page, so we need space for that. 23458 * allocates an extra guard page, so we need space for that.
@@ -23071,9 +23471,9 @@ diff -urNp linux-2.6.32.8/drivers/lguest/core.c linux-2.6.32.8/drivers/lguest/co
23071 if (!switcher_vma) { 23471 if (!switcher_vma) {
23072 err = -ENOMEM; 23472 err = -ENOMEM;
23073 printk("lguest: could not map switcher pages high\n"); 23473 printk("lguest: could not map switcher pages high\n");
23074diff -urNp linux-2.6.32.8/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.8/drivers/macintosh/via-pmu-backlight.c 23474diff -urNp linux-2.6.32.9/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.9/drivers/macintosh/via-pmu-backlight.c
23075--- linux-2.6.32.8/drivers/macintosh/via-pmu-backlight.c 2010-02-09 07:57:19.000000000 -0500 23475--- linux-2.6.32.9/drivers/macintosh/via-pmu-backlight.c 2010-02-09 07:57:19.000000000 -0500
23076+++ linux-2.6.32.8/drivers/macintosh/via-pmu-backlight.c 2010-02-13 21:45:10.138763534 -0500 23476+++ linux-2.6.32.9/drivers/macintosh/via-pmu-backlight.c 2010-02-23 17:09:53.196332354 -0500
23077@@ -15,7 +15,7 @@ 23477@@ -15,7 +15,7 @@
23078 23478
23079 #define MAX_PMU_LEVEL 0xFF 23479 #define MAX_PMU_LEVEL 0xFF
@@ -23092,9 +23492,9 @@ diff -urNp linux-2.6.32.8/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.8/d
23092 .get_brightness = pmu_backlight_get_brightness, 23492 .get_brightness = pmu_backlight_get_brightness,
23093 .update_status = pmu_backlight_update_status, 23493 .update_status = pmu_backlight_update_status,
23094 23494
23095diff -urNp linux-2.6.32.8/drivers/macintosh/via-pmu.c linux-2.6.32.8/drivers/macintosh/via-pmu.c 23495diff -urNp linux-2.6.32.9/drivers/macintosh/via-pmu.c linux-2.6.32.9/drivers/macintosh/via-pmu.c
23096--- linux-2.6.32.8/drivers/macintosh/via-pmu.c 2010-02-09 07:57:19.000000000 -0500 23496--- linux-2.6.32.9/drivers/macintosh/via-pmu.c 2010-02-09 07:57:19.000000000 -0500
23097+++ linux-2.6.32.8/drivers/macintosh/via-pmu.c 2010-02-13 21:45:10.138763534 -0500 23497+++ linux-2.6.32.9/drivers/macintosh/via-pmu.c 2010-02-23 17:09:53.196332354 -0500
23098@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state 23498@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
23099 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); 23499 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
23100 } 23500 }
@@ -23104,9 +23504,9 @@ diff -urNp linux-2.6.32.8/drivers/macintosh/via-pmu.c linux-2.6.32.8/drivers/mac
23104 .enter = powerbook_sleep, 23504 .enter = powerbook_sleep,
23105 .valid = pmu_sleep_valid, 23505 .valid = pmu_sleep_valid,
23106 }; 23506 };
23107diff -urNp linux-2.6.32.8/drivers/md/bitmap.c linux-2.6.32.8/drivers/md/bitmap.c 23507diff -urNp linux-2.6.32.9/drivers/md/bitmap.c linux-2.6.32.9/drivers/md/bitmap.c
23108--- linux-2.6.32.8/drivers/md/bitmap.c 2010-02-09 07:57:19.000000000 -0500 23508--- linux-2.6.32.9/drivers/md/bitmap.c 2010-02-09 07:57:19.000000000 -0500
23109+++ linux-2.6.32.8/drivers/md/bitmap.c 2010-02-13 21:45:10.139938162 -0500 23509+++ linux-2.6.32.9/drivers/md/bitmap.c 2010-02-23 17:09:53.196332354 -0500
23110@@ -58,7 +58,7 @@ 23510@@ -58,7 +58,7 @@
23111 # if DEBUG > 0 23511 # if DEBUG > 0
23112 # define PRINTK(x...) printk(KERN_DEBUG x) 23512 # define PRINTK(x...) printk(KERN_DEBUG x)
@@ -23116,9 +23516,9 @@ diff -urNp linux-2.6.32.8/drivers/md/bitmap.c linux-2.6.32.8/drivers/md/bitmap.c
23116 # endif 23516 # endif
23117 #endif 23517 #endif
23118 23518
23119diff -urNp linux-2.6.32.8/drivers/md/dm-sysfs.c linux-2.6.32.8/drivers/md/dm-sysfs.c 23519diff -urNp linux-2.6.32.9/drivers/md/dm-sysfs.c linux-2.6.32.9/drivers/md/dm-sysfs.c
23120--- linux-2.6.32.8/drivers/md/dm-sysfs.c 2010-02-09 07:57:19.000000000 -0500 23520--- linux-2.6.32.9/drivers/md/dm-sysfs.c 2010-02-09 07:57:19.000000000 -0500
23121+++ linux-2.6.32.8/drivers/md/dm-sysfs.c 2010-02-13 21:45:10.139938162 -0500 23521+++ linux-2.6.32.9/drivers/md/dm-sysfs.c 2010-02-23 17:09:53.196332354 -0500
23122@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { 23522@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
23123 NULL, 23523 NULL,
23124 }; 23524 };
@@ -23128,9 +23528,9 @@ diff -urNp linux-2.6.32.8/drivers/md/dm-sysfs.c linux-2.6.32.8/drivers/md/dm-sys
23128 .show = dm_attr_show, 23528 .show = dm_attr_show,
23129 }; 23529 };
23130 23530
23131diff -urNp linux-2.6.32.8/drivers/md/dm-table.c linux-2.6.32.8/drivers/md/dm-table.c 23531diff -urNp linux-2.6.32.9/drivers/md/dm-table.c linux-2.6.32.9/drivers/md/dm-table.c
23132--- linux-2.6.32.8/drivers/md/dm-table.c 2010-02-09 07:57:19.000000000 -0500 23532--- linux-2.6.32.9/drivers/md/dm-table.c 2010-02-09 07:57:19.000000000 -0500
23133+++ linux-2.6.32.8/drivers/md/dm-table.c 2010-02-13 21:45:10.139938162 -0500 23533+++ linux-2.6.32.9/drivers/md/dm-table.c 2010-02-23 17:09:53.196332354 -0500
23134@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct 23534@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
23135 if (!dev_size) 23535 if (!dev_size)
23136 return 0; 23536 return 0;
@@ -23140,9 +23540,9 @@ diff -urNp linux-2.6.32.8/drivers/md/dm-table.c linux-2.6.32.8/drivers/md/dm-tab
23140 DMWARN("%s: %s too small for target: " 23540 DMWARN("%s: %s too small for target: "
23141 "start=%llu, len=%llu, dev_size=%llu", 23541 "start=%llu, len=%llu, dev_size=%llu",
23142 dm_device_name(ti->table->md), bdevname(bdev, b), 23542 dm_device_name(ti->table->md), bdevname(bdev, b),
23143diff -urNp linux-2.6.32.8/drivers/md/md.c linux-2.6.32.8/drivers/md/md.c 23543diff -urNp linux-2.6.32.9/drivers/md/md.c linux-2.6.32.9/drivers/md/md.c
23144--- linux-2.6.32.8/drivers/md/md.c 2010-02-09 07:57:19.000000000 -0500 23544--- linux-2.6.32.9/drivers/md/md.c 2010-02-09 07:57:19.000000000 -0500
23145+++ linux-2.6.32.8/drivers/md/md.c 2010-02-13 21:45:10.140934310 -0500 23545+++ linux-2.6.32.9/drivers/md/md.c 2010-02-23 17:09:53.196332354 -0500
23146@@ -2508,7 +2508,7 @@ static void rdev_free(struct kobject *ko 23546@@ -2508,7 +2508,7 @@ static void rdev_free(struct kobject *ko
23147 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); 23547 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
23148 kfree(rdev); 23548 kfree(rdev);
@@ -23179,9 +23579,9 @@ diff -urNp linux-2.6.32.8/drivers/md/md.c linux-2.6.32.8/drivers/md/md.c
23179 /* sync IO will cause sync_io to increase before the disk_stats 23579 /* sync IO will cause sync_io to increase before the disk_stats
23180 * as sync_io is counted when a request starts, and 23580 * as sync_io is counted when a request starts, and
23181 * disk_stats is counted when it completes. 23581 * disk_stats is counted when it completes.
23182diff -urNp linux-2.6.32.8/drivers/md/md.h linux-2.6.32.8/drivers/md/md.h 23582diff -urNp linux-2.6.32.9/drivers/md/md.h linux-2.6.32.9/drivers/md/md.h
23183--- linux-2.6.32.8/drivers/md/md.h 2010-02-09 07:57:19.000000000 -0500 23583--- linux-2.6.32.9/drivers/md/md.h 2010-02-09 07:57:19.000000000 -0500
23184+++ linux-2.6.32.8/drivers/md/md.h 2010-02-13 21:45:10.141934021 -0500 23584+++ linux-2.6.32.9/drivers/md/md.h 2010-02-23 17:09:53.196332354 -0500
23185@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ 23585@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
23186 23586
23187 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) 23587 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
@@ -23191,9 +23591,9 @@ diff -urNp linux-2.6.32.8/drivers/md/md.h linux-2.6.32.8/drivers/md/md.h
23191 } 23591 }
23192 23592
23193 struct mdk_personality 23593 struct mdk_personality
23194diff -urNp linux-2.6.32.8/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.8/drivers/media/dvb/dvb-core/dvbdev.c 23594diff -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
23195--- linux-2.6.32.8/drivers/media/dvb/dvb-core/dvbdev.c 2010-02-09 07:57:19.000000000 -0500 23595--- linux-2.6.32.9/drivers/media/dvb/dvb-core/dvbdev.c 2010-02-09 07:57:19.000000000 -0500
23196+++ linux-2.6.32.8/drivers/media/dvb/dvb-core/dvbdev.c 2010-02-13 21:45:10.141934021 -0500 23596+++ linux-2.6.32.9/drivers/media/dvb/dvb-core/dvbdev.c 2010-02-23 17:09:53.196332354 -0500
23197@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt 23597@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
23198 const struct dvb_device *template, void *priv, int type) 23598 const struct dvb_device *template, void *priv, int type)
23199 { 23599 {
@@ -23202,9 +23602,9 @@ diff -urNp linux-2.6.32.8/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.8/dri
23202 struct file_operations *dvbdevfops; 23602 struct file_operations *dvbdevfops;
23203 struct device *clsdev; 23603 struct device *clsdev;
23204 int minor; 23604 int minor;
23205diff -urNp linux-2.6.32.8/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.8/drivers/media/video/usbvideo/konicawc.c 23605diff -urNp linux-2.6.32.9/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.9/drivers/media/video/usbvideo/konicawc.c
23206--- linux-2.6.32.8/drivers/media/video/usbvideo/konicawc.c 2010-02-09 07:57:19.000000000 -0500 23606--- linux-2.6.32.9/drivers/media/video/usbvideo/konicawc.c 2010-02-09 07:57:19.000000000 -0500
23207+++ linux-2.6.32.8/drivers/media/video/usbvideo/konicawc.c 2010-02-13 21:45:10.141934021 -0500 23607+++ linux-2.6.32.9/drivers/media/video/usbvideo/konicawc.c 2010-02-23 17:09:53.196332354 -0500
23208@@ -225,7 +225,7 @@ static void konicawc_register_input(stru 23608@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
23209 int error; 23609 int error;
23210 23610
@@ -23214,9 +23614,9 @@ diff -urNp linux-2.6.32.8/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.8
23214 23614
23215 cam->input = input_dev = input_allocate_device(); 23615 cam->input = input_dev = input_allocate_device();
23216 if (!input_dev) { 23616 if (!input_dev) {
23217diff -urNp linux-2.6.32.8/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.8/drivers/media/video/usbvideo/quickcam_messenger.c 23617diff -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
23218--- linux-2.6.32.8/drivers/media/video/usbvideo/quickcam_messenger.c 2010-02-09 07:57:19.000000000 -0500 23618--- linux-2.6.32.9/drivers/media/video/usbvideo/quickcam_messenger.c 2010-02-09 07:57:19.000000000 -0500
23219+++ linux-2.6.32.8/drivers/media/video/usbvideo/quickcam_messenger.c 2010-02-13 21:45:10.141934021 -0500 23619+++ linux-2.6.32.9/drivers/media/video/usbvideo/quickcam_messenger.c 2010-02-23 17:09:53.196332354 -0500
23220@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc 23620@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
23221 int error; 23621 int error;
23222 23622
@@ -23226,9 +23626,9 @@ diff -urNp linux-2.6.32.8/drivers/media/video/usbvideo/quickcam_messenger.c linu
23226 23626
23227 cam->input = input_dev = input_allocate_device(); 23627 cam->input = input_dev = input_allocate_device();
23228 if (!input_dev) { 23628 if (!input_dev) {
23229diff -urNp linux-2.6.32.8/drivers/message/i2o/i2o_proc.c linux-2.6.32.8/drivers/message/i2o/i2o_proc.c 23629diff -urNp linux-2.6.32.9/drivers/message/i2o/i2o_proc.c linux-2.6.32.9/drivers/message/i2o/i2o_proc.c
23230--- linux-2.6.32.8/drivers/message/i2o/i2o_proc.c 2010-02-09 07:57:19.000000000 -0500 23630--- linux-2.6.32.9/drivers/message/i2o/i2o_proc.c 2010-02-09 07:57:19.000000000 -0500
23231+++ linux-2.6.32.8/drivers/message/i2o/i2o_proc.c 2010-02-13 21:45:10.142934900 -0500 23631+++ linux-2.6.32.9/drivers/message/i2o/i2o_proc.c 2010-02-23 17:09:53.200463728 -0500
23232@@ -259,13 +259,6 @@ static char *scsi_devices[] = { 23632@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
23233 "Array Controller Device" 23633 "Array Controller Device"
23234 }; 23634 };
@@ -23315,9 +23715,9 @@ diff -urNp linux-2.6.32.8/drivers/message/i2o/i2o_proc.c linux-2.6.32.8/drivers/
23315 23715
23316 return 0; 23716 return 0;
23317 } 23717 }
23318diff -urNp linux-2.6.32.8/drivers/misc/kgdbts.c linux-2.6.32.8/drivers/misc/kgdbts.c 23718diff -urNp linux-2.6.32.9/drivers/misc/kgdbts.c linux-2.6.32.9/drivers/misc/kgdbts.c
23319--- linux-2.6.32.8/drivers/misc/kgdbts.c 2010-02-09 07:57:19.000000000 -0500 23719--- linux-2.6.32.9/drivers/misc/kgdbts.c 2010-02-09 07:57:19.000000000 -0500
23320+++ linux-2.6.32.8/drivers/misc/kgdbts.c 2010-02-13 21:45:10.142934900 -0500 23720+++ linux-2.6.32.9/drivers/misc/kgdbts.c 2010-02-23 17:09:53.200463728 -0500
23321@@ -118,7 +118,7 @@ 23721@@ -118,7 +118,7 @@
23322 } while (0) 23722 } while (0)
23323 #define MAX_CONFIG_LEN 40 23723 #define MAX_CONFIG_LEN 40
@@ -23336,9 +23736,9 @@ diff -urNp linux-2.6.32.8/drivers/misc/kgdbts.c linux-2.6.32.8/drivers/misc/kgdb
23336 .name = "kgdbts", 23736 .name = "kgdbts",
23337 .read_char = kgdbts_get_char, 23737 .read_char = kgdbts_get_char,
23338 .write_char = kgdbts_put_char, 23738 .write_char = kgdbts_put_char,
23339diff -urNp linux-2.6.32.8/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.8/drivers/misc/sgi-gru/gruhandles.c 23739diff -urNp linux-2.6.32.9/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.9/drivers/misc/sgi-gru/gruhandles.c
23340--- linux-2.6.32.8/drivers/misc/sgi-gru/gruhandles.c 2010-02-09 07:57:19.000000000 -0500 23740--- linux-2.6.32.9/drivers/misc/sgi-gru/gruhandles.c 2010-02-09 07:57:19.000000000 -0500
23341+++ linux-2.6.32.8/drivers/misc/sgi-gru/gruhandles.c 2010-02-13 21:45:10.142934900 -0500 23741+++ linux-2.6.32.9/drivers/misc/sgi-gru/gruhandles.c 2010-02-23 17:09:53.200463728 -0500
23342@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic 23742@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
23343 23743
23344 static void update_mcs_stats(enum mcs_op op, unsigned long clks) 23744 static void update_mcs_stats(enum mcs_op op, unsigned long clks)
@@ -23350,9 +23750,9 @@ diff -urNp linux-2.6.32.8/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.8/drive
23350 if (mcs_op_statistics[op].max < clks) 23750 if (mcs_op_statistics[op].max < clks)
23351 mcs_op_statistics[op].max = clks; 23751 mcs_op_statistics[op].max = clks;
23352 } 23752 }
23353diff -urNp linux-2.6.32.8/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.8/drivers/misc/sgi-gru/gruprocfs.c 23753diff -urNp linux-2.6.32.9/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.9/drivers/misc/sgi-gru/gruprocfs.c
23354--- linux-2.6.32.8/drivers/misc/sgi-gru/gruprocfs.c 2010-02-09 07:57:19.000000000 -0500 23754--- linux-2.6.32.9/drivers/misc/sgi-gru/gruprocfs.c 2010-02-09 07:57:19.000000000 -0500
23355+++ linux-2.6.32.8/drivers/misc/sgi-gru/gruprocfs.c 2010-02-13 21:45:10.143934106 -0500 23755+++ linux-2.6.32.9/drivers/misc/sgi-gru/gruprocfs.c 2010-02-23 17:09:53.200463728 -0500
23356@@ -32,9 +32,9 @@ 23756@@ -32,9 +32,9 @@
23357 23757
23358 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) 23758 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -23376,9 +23776,9 @@ diff -urNp linux-2.6.32.8/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.8/driver
23376 max = mcs_op_statistics[op].max; 23776 max = mcs_op_statistics[op].max;
23377 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, 23777 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
23378 count ? total / count : 0, max); 23778 count ? total / count : 0, max);
23379diff -urNp linux-2.6.32.8/drivers/misc/sgi-gru/grutables.h linux-2.6.32.8/drivers/misc/sgi-gru/grutables.h 23779diff -urNp linux-2.6.32.9/drivers/misc/sgi-gru/grutables.h linux-2.6.32.9/drivers/misc/sgi-gru/grutables.h
23380--- linux-2.6.32.8/drivers/misc/sgi-gru/grutables.h 2010-02-09 07:57:19.000000000 -0500 23780--- linux-2.6.32.9/drivers/misc/sgi-gru/grutables.h 2010-02-09 07:57:19.000000000 -0500
23381+++ linux-2.6.32.8/drivers/misc/sgi-gru/grutables.h 2010-02-13 21:45:10.143934106 -0500 23781+++ linux-2.6.32.9/drivers/misc/sgi-gru/grutables.h 2010-02-23 17:09:53.200463728 -0500
23382@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; 23782@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
23383 * GRU statistics. 23783 * GRU statistics.
23384 */ 23784 */
@@ -23562,9 +23962,9 @@ diff -urNp linux-2.6.32.8/drivers/misc/sgi-gru/grutables.h linux-2.6.32.8/driver
23562 } while (0) 23962 } while (0)
23563 23963
23564 #ifdef CONFIG_SGI_GRU_DEBUG 23964 #ifdef CONFIG_SGI_GRU_DEBUG
23565diff -urNp linux-2.6.32.8/drivers/mtd/devices/doc2000.c linux-2.6.32.8/drivers/mtd/devices/doc2000.c 23965diff -urNp linux-2.6.32.9/drivers/mtd/devices/doc2000.c linux-2.6.32.9/drivers/mtd/devices/doc2000.c
23566--- linux-2.6.32.8/drivers/mtd/devices/doc2000.c 2010-02-09 07:57:19.000000000 -0500 23966--- linux-2.6.32.9/drivers/mtd/devices/doc2000.c 2010-02-09 07:57:19.000000000 -0500
23567+++ linux-2.6.32.8/drivers/mtd/devices/doc2000.c 2010-02-13 21:45:10.143934106 -0500 23967+++ linux-2.6.32.9/drivers/mtd/devices/doc2000.c 2010-02-23 17:09:53.200463728 -0500
23568@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt 23968@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
23569 23969
23570 /* The ECC will not be calculated correctly if less than 512 is written */ 23970 /* The ECC will not be calculated correctly if less than 512 is written */
@@ -23574,9 +23974,9 @@ diff -urNp linux-2.6.32.8/drivers/mtd/devices/doc2000.c linux-2.6.32.8/drivers/m
23574 printk(KERN_WARNING 23974 printk(KERN_WARNING
23575 "ECC needs a full sector write (adr: %lx size %lx)\n", 23975 "ECC needs a full sector write (adr: %lx size %lx)\n",
23576 (long) to, (long) len); 23976 (long) to, (long) len);
23577diff -urNp linux-2.6.32.8/drivers/mtd/devices/doc2001.c linux-2.6.32.8/drivers/mtd/devices/doc2001.c 23977diff -urNp linux-2.6.32.9/drivers/mtd/devices/doc2001.c linux-2.6.32.9/drivers/mtd/devices/doc2001.c
23578--- linux-2.6.32.8/drivers/mtd/devices/doc2001.c 2010-02-09 07:57:19.000000000 -0500 23978--- linux-2.6.32.9/drivers/mtd/devices/doc2001.c 2010-02-09 07:57:19.000000000 -0500
23579+++ linux-2.6.32.8/drivers/mtd/devices/doc2001.c 2010-02-13 21:45:10.143934106 -0500 23979+++ linux-2.6.32.9/drivers/mtd/devices/doc2001.c 2010-02-23 17:09:53.200463728 -0500
23580@@ -395,6 +395,8 @@ static int doc_read (struct mtd_info *mt 23980@@ -395,6 +395,8 @@ static int doc_read (struct mtd_info *mt
23581 /* Don't allow read past end of device */ 23981 /* Don't allow read past end of device */
23582 if (from >= this->totlen) 23982 if (from >= this->totlen)
@@ -23586,9 +23986,9 @@ diff -urNp linux-2.6.32.8/drivers/mtd/devices/doc2001.c linux-2.6.32.8/drivers/m
23586 23986
23587 /* Don't allow a single read to cross a 512-byte block boundary */ 23987 /* Don't allow a single read to cross a 512-byte block boundary */
23588 if (from + len > ((from | 0x1ff) + 1)) 23988 if (from + len > ((from | 0x1ff) + 1))
23589diff -urNp linux-2.6.32.8/drivers/mtd/ubi/build.c linux-2.6.32.8/drivers/mtd/ubi/build.c 23989diff -urNp linux-2.6.32.9/drivers/mtd/ubi/build.c linux-2.6.32.9/drivers/mtd/ubi/build.c
23590--- linux-2.6.32.8/drivers/mtd/ubi/build.c 2010-02-09 07:57:19.000000000 -0500 23990--- linux-2.6.32.9/drivers/mtd/ubi/build.c 2010-02-09 07:57:19.000000000 -0500
23591+++ linux-2.6.32.8/drivers/mtd/ubi/build.c 2010-02-13 21:45:10.144934657 -0500 23991+++ linux-2.6.32.9/drivers/mtd/ubi/build.c 2010-02-23 17:09:53.200463728 -0500
23592@@ -1255,7 +1255,7 @@ module_exit(ubi_exit); 23992@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
23593 static int __init bytes_str_to_int(const char *str) 23993 static int __init bytes_str_to_int(const char *str)
23594 { 23994 {
@@ -23628,9 +24028,9 @@ diff -urNp linux-2.6.32.8/drivers/mtd/ubi/build.c linux-2.6.32.8/drivers/mtd/ubi
23628 } 24028 }
23629 24029
23630 /** 24030 /**
23631diff -urNp linux-2.6.32.8/drivers/net/e1000e/82571.c linux-2.6.32.8/drivers/net/e1000e/82571.c 24031diff -urNp linux-2.6.32.9/drivers/net/e1000e/82571.c linux-2.6.32.9/drivers/net/e1000e/82571.c
23632--- linux-2.6.32.8/drivers/net/e1000e/82571.c 2010-02-09 07:57:19.000000000 -0500 24032--- linux-2.6.32.9/drivers/net/e1000e/82571.c 2010-02-09 07:57:19.000000000 -0500
23633+++ linux-2.6.32.8/drivers/net/e1000e/82571.c 2010-02-13 21:45:10.160609386 -0500 24033+++ linux-2.6.32.9/drivers/net/e1000e/82571.c 2010-02-23 17:09:53.200463728 -0500
23634@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s 24034@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
23635 { 24035 {
23636 struct e1000_hw *hw = &adapter->hw; 24036 struct e1000_hw *hw = &adapter->hw;
@@ -23684,9 +24084,9 @@ diff -urNp linux-2.6.32.8/drivers/net/e1000e/82571.c linux-2.6.32.8/drivers/net/
23684 .acquire_nvm = e1000_acquire_nvm_82571, 24084 .acquire_nvm = e1000_acquire_nvm_82571,
23685 .read_nvm = e1000e_read_nvm_eerd, 24085 .read_nvm = e1000e_read_nvm_eerd,
23686 .release_nvm = e1000_release_nvm_82571, 24086 .release_nvm = e1000_release_nvm_82571,
23687diff -urNp linux-2.6.32.8/drivers/net/e1000e/e1000.h linux-2.6.32.8/drivers/net/e1000e/e1000.h 24087diff -urNp linux-2.6.32.9/drivers/net/e1000e/e1000.h linux-2.6.32.9/drivers/net/e1000e/e1000.h
23688--- linux-2.6.32.8/drivers/net/e1000e/e1000.h 2010-02-09 07:57:19.000000000 -0500 24088--- linux-2.6.32.9/drivers/net/e1000e/e1000.h 2010-02-09 07:57:19.000000000 -0500
23689+++ linux-2.6.32.8/drivers/net/e1000e/e1000.h 2010-02-13 21:45:10.170595267 -0500 24089+++ linux-2.6.32.9/drivers/net/e1000e/e1000.h 2010-02-23 17:09:53.200463728 -0500
23690@@ -375,9 +375,9 @@ struct e1000_info { 24090@@ -375,9 +375,9 @@ struct e1000_info {
23691 u32 pba; 24091 u32 pba;
23692 u32 max_hw_frame_size; 24092 u32 max_hw_frame_size;
@@ -23700,9 +24100,9 @@ diff -urNp linux-2.6.32.8/drivers/net/e1000e/e1000.h linux-2.6.32.8/drivers/net/
23700 }; 24100 };
23701 24101
23702 /* hardware capability, feature, and workaround flags */ 24102 /* hardware capability, feature, and workaround flags */
23703diff -urNp linux-2.6.32.8/drivers/net/e1000e/es2lan.c linux-2.6.32.8/drivers/net/e1000e/es2lan.c 24103diff -urNp linux-2.6.32.9/drivers/net/e1000e/es2lan.c linux-2.6.32.9/drivers/net/e1000e/es2lan.c
23704--- linux-2.6.32.8/drivers/net/e1000e/es2lan.c 2010-02-09 07:57:19.000000000 -0500 24104--- linux-2.6.32.9/drivers/net/e1000e/es2lan.c 2010-02-09 07:57:19.000000000 -0500
23705+++ linux-2.6.32.8/drivers/net/e1000e/es2lan.c 2010-02-13 21:45:10.179919462 -0500 24105+++ linux-2.6.32.9/drivers/net/e1000e/es2lan.c 2010-02-23 17:09:53.200463728 -0500
23706@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es 24106@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
23707 { 24107 {
23708 struct e1000_hw *hw = &adapter->hw; 24108 struct e1000_hw *hw = &adapter->hw;
@@ -23738,9 +24138,9 @@ diff -urNp linux-2.6.32.8/drivers/net/e1000e/es2lan.c linux-2.6.32.8/drivers/net
23738 .acquire_nvm = e1000_acquire_nvm_80003es2lan, 24138 .acquire_nvm = e1000_acquire_nvm_80003es2lan,
23739 .read_nvm = e1000e_read_nvm_eerd, 24139 .read_nvm = e1000e_read_nvm_eerd,
23740 .release_nvm = e1000_release_nvm_80003es2lan, 24140 .release_nvm = e1000_release_nvm_80003es2lan,
23741diff -urNp linux-2.6.32.8/drivers/net/e1000e/hw.h linux-2.6.32.8/drivers/net/e1000e/hw.h 24141diff -urNp linux-2.6.32.9/drivers/net/e1000e/hw.h linux-2.6.32.9/drivers/net/e1000e/hw.h
23742--- linux-2.6.32.8/drivers/net/e1000e/hw.h 2010-02-09 07:57:19.000000000 -0500 24142--- linux-2.6.32.9/drivers/net/e1000e/hw.h 2010-02-09 07:57:19.000000000 -0500
23743+++ linux-2.6.32.8/drivers/net/e1000e/hw.h 2010-02-13 21:45:10.186947543 -0500 24143+++ linux-2.6.32.9/drivers/net/e1000e/hw.h 2010-02-23 17:09:53.200463728 -0500
23744@@ -755,34 +755,34 @@ struct e1000_mac_operations { 24144@@ -755,34 +755,34 @@ struct e1000_mac_operations {
23745 24145
23746 /* Function pointers for the PHY. */ 24146 /* Function pointers for the PHY. */
@@ -23800,9 +24200,9 @@ diff -urNp linux-2.6.32.8/drivers/net/e1000e/hw.h linux-2.6.32.8/drivers/net/e10
23800 }; 24200 };
23801 24201
23802 struct e1000_mac_info { 24202 struct e1000_mac_info {
23803diff -urNp linux-2.6.32.8/drivers/net/e1000e/ich8lan.c linux-2.6.32.8/drivers/net/e1000e/ich8lan.c 24203diff -urNp linux-2.6.32.9/drivers/net/e1000e/ich8lan.c linux-2.6.32.9/drivers/net/e1000e/ich8lan.c
23804--- linux-2.6.32.8/drivers/net/e1000e/ich8lan.c 2010-02-09 07:57:19.000000000 -0500 24204--- linux-2.6.32.9/drivers/net/e1000e/ich8lan.c 2010-02-09 07:57:19.000000000 -0500
23805+++ linux-2.6.32.8/drivers/net/e1000e/ich8lan.c 2010-02-13 21:45:10.205066189 -0500 24205+++ linux-2.6.32.9/drivers/net/e1000e/ich8lan.c 2010-02-23 17:09:53.200463728 -0500
23806@@ -3451,7 +3451,7 @@ static void e1000_clear_hw_cntrs_ich8lan 24206@@ -3451,7 +3451,7 @@ static void e1000_clear_hw_cntrs_ich8lan
23807 } 24207 }
23808 } 24208 }
@@ -23830,9 +24230,9 @@ diff -urNp linux-2.6.32.8/drivers/net/e1000e/ich8lan.c linux-2.6.32.8/drivers/ne
23830 .acquire_nvm = e1000_acquire_nvm_ich8lan, 24230 .acquire_nvm = e1000_acquire_nvm_ich8lan,
23831 .read_nvm = e1000_read_nvm_ich8lan, 24231 .read_nvm = e1000_read_nvm_ich8lan,
23832 .release_nvm = e1000_release_nvm_ich8lan, 24232 .release_nvm = e1000_release_nvm_ich8lan,
23833diff -urNp linux-2.6.32.8/drivers/net/ibmveth.c linux-2.6.32.8/drivers/net/ibmveth.c 24233diff -urNp linux-2.6.32.9/drivers/net/ibmveth.c linux-2.6.32.9/drivers/net/ibmveth.c
23834--- linux-2.6.32.8/drivers/net/ibmveth.c 2010-02-09 07:57:19.000000000 -0500 24234--- linux-2.6.32.9/drivers/net/ibmveth.c 2010-02-09 07:57:19.000000000 -0500
23835+++ linux-2.6.32.8/drivers/net/ibmveth.c 2010-02-13 21:45:10.217838624 -0500 24235+++ linux-2.6.32.9/drivers/net/ibmveth.c 2010-02-23 17:09:53.200463728 -0500
23836@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr 24236@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
23837 NULL, 24237 NULL,
23838 }; 24238 };
@@ -23842,9 +24242,9 @@ diff -urNp linux-2.6.32.8/drivers/net/ibmveth.c linux-2.6.32.8/drivers/net/ibmve
23842 .show = veth_pool_show, 24242 .show = veth_pool_show,
23843 .store = veth_pool_store, 24243 .store = veth_pool_store,
23844 }; 24244 };
23845diff -urNp linux-2.6.32.8/drivers/net/igb/e1000_82575.c linux-2.6.32.8/drivers/net/igb/e1000_82575.c 24245diff -urNp linux-2.6.32.9/drivers/net/igb/e1000_82575.c linux-2.6.32.9/drivers/net/igb/e1000_82575.c
23846--- linux-2.6.32.8/drivers/net/igb/e1000_82575.c 2010-02-09 07:57:19.000000000 -0500 24246--- linux-2.6.32.9/drivers/net/igb/e1000_82575.c 2010-02-09 07:57:19.000000000 -0500
23847+++ linux-2.6.32.8/drivers/net/igb/e1000_82575.c 2010-02-13 21:45:10.217838624 -0500 24247+++ linux-2.6.32.9/drivers/net/igb/e1000_82575.c 2010-02-23 17:09:53.200463728 -0500
23848@@ -1400,7 +1400,7 @@ void igb_vmdq_set_replication_pf(struct 24248@@ -1400,7 +1400,7 @@ void igb_vmdq_set_replication_pf(struct
23849 wr32(E1000_VT_CTL, vt_ctl); 24249 wr32(E1000_VT_CTL, vt_ctl);
23850 } 24250 }
@@ -23870,9 +24270,9 @@ diff -urNp linux-2.6.32.8/drivers/net/igb/e1000_82575.c linux-2.6.32.8/drivers/n
23870 .acquire = igb_acquire_nvm_82575, 24270 .acquire = igb_acquire_nvm_82575,
23871 .read = igb_read_nvm_eerd, 24271 .read = igb_read_nvm_eerd,
23872 .release = igb_release_nvm_82575, 24272 .release = igb_release_nvm_82575,
23873diff -urNp linux-2.6.32.8/drivers/net/igb/e1000_hw.h linux-2.6.32.8/drivers/net/igb/e1000_hw.h 24273diff -urNp linux-2.6.32.9/drivers/net/igb/e1000_hw.h linux-2.6.32.9/drivers/net/igb/e1000_hw.h
23874--- linux-2.6.32.8/drivers/net/igb/e1000_hw.h 2010-02-09 07:57:19.000000000 -0500 24274--- linux-2.6.32.9/drivers/net/igb/e1000_hw.h 2010-02-09 07:57:19.000000000 -0500
23875+++ linux-2.6.32.8/drivers/net/igb/e1000_hw.h 2010-02-13 21:45:10.217838624 -0500 24275+++ linux-2.6.32.9/drivers/net/igb/e1000_hw.h 2010-02-23 17:09:53.204540597 -0500
23876@@ -302,17 +302,17 @@ struct e1000_phy_operations { 24276@@ -302,17 +302,17 @@ struct e1000_phy_operations {
23877 }; 24277 };
23878 24278
@@ -23898,9 +24298,9 @@ diff -urNp linux-2.6.32.8/drivers/net/igb/e1000_hw.h linux-2.6.32.8/drivers/net/
23898 }; 24298 };
23899 24299
23900 extern const struct e1000_info e1000_82575_info; 24300 extern const struct e1000_info e1000_82575_info;
23901diff -urNp linux-2.6.32.8/drivers/net/irda/vlsi_ir.c linux-2.6.32.8/drivers/net/irda/vlsi_ir.c 24301diff -urNp linux-2.6.32.9/drivers/net/irda/vlsi_ir.c linux-2.6.32.9/drivers/net/irda/vlsi_ir.c
23902--- linux-2.6.32.8/drivers/net/irda/vlsi_ir.c 2010-02-09 07:57:19.000000000 -0500 24302--- linux-2.6.32.9/drivers/net/irda/vlsi_ir.c 2010-02-09 07:57:19.000000000 -0500
23903+++ linux-2.6.32.8/drivers/net/irda/vlsi_ir.c 2010-02-13 21:45:10.219890998 -0500 24303+++ linux-2.6.32.9/drivers/net/irda/vlsi_ir.c 2010-02-23 17:09:53.204540597 -0500
23904@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( 24304@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
23905 /* no race - tx-ring already empty */ 24305 /* no race - tx-ring already empty */
23906 vlsi_set_baud(idev, iobase); 24306 vlsi_set_baud(idev, iobase);
@@ -23917,9 +24317,9 @@ diff -urNp linux-2.6.32.8/drivers/net/irda/vlsi_ir.c linux-2.6.32.8/drivers/net/
23917 spin_unlock_irqrestore(&idev->lock, flags); 24317 spin_unlock_irqrestore(&idev->lock, flags);
23918 dev_kfree_skb_any(skb); 24318 dev_kfree_skb_any(skb);
23919 return NETDEV_TX_OK; 24319 return NETDEV_TX_OK;
23920diff -urNp linux-2.6.32.8/drivers/net/iseries_veth.c linux-2.6.32.8/drivers/net/iseries_veth.c 24320diff -urNp linux-2.6.32.9/drivers/net/iseries_veth.c linux-2.6.32.9/drivers/net/iseries_veth.c
23921--- linux-2.6.32.8/drivers/net/iseries_veth.c 2010-02-09 07:57:19.000000000 -0500 24321--- linux-2.6.32.9/drivers/net/iseries_veth.c 2010-02-09 07:57:19.000000000 -0500
23922+++ linux-2.6.32.8/drivers/net/iseries_veth.c 2010-02-13 21:45:10.219890998 -0500 24322+++ linux-2.6.32.9/drivers/net/iseries_veth.c 2010-02-23 17:09:53.204540597 -0500
23923@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul 24323@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
23924 NULL 24324 NULL
23925 }; 24325 };
@@ -23938,9 +24338,9 @@ diff -urNp linux-2.6.32.8/drivers/net/iseries_veth.c linux-2.6.32.8/drivers/net/
23938 .show = veth_port_attribute_show 24338 .show = veth_port_attribute_show
23939 }; 24339 };
23940 24340
23941diff -urNp linux-2.6.32.8/drivers/net/pcnet32.c linux-2.6.32.8/drivers/net/pcnet32.c 24341diff -urNp linux-2.6.32.9/drivers/net/pcnet32.c linux-2.6.32.9/drivers/net/pcnet32.c
23942--- linux-2.6.32.8/drivers/net/pcnet32.c 2010-02-09 07:57:19.000000000 -0500 24342--- linux-2.6.32.9/drivers/net/pcnet32.c 2010-02-09 07:57:19.000000000 -0500
23943+++ linux-2.6.32.8/drivers/net/pcnet32.c 2010-02-13 21:45:10.229817912 -0500 24343+++ linux-2.6.32.9/drivers/net/pcnet32.c 2010-02-23 17:09:53.204540597 -0500
23944@@ -79,7 +79,7 @@ static int cards_found; 24344@@ -79,7 +79,7 @@ static int cards_found;
23945 /* 24345 /*
23946 * VLB I/O addresses 24346 * VLB I/O addresses
@@ -23950,9 +24350,9 @@ diff -urNp linux-2.6.32.8/drivers/net/pcnet32.c linux-2.6.32.8/drivers/net/pcnet
23950 { 0x300, 0x320, 0x340, 0x360, 0 }; 24350 { 0x300, 0x320, 0x340, 0x360, 0 };
23951 24351
23952 static int pcnet32_debug = 0; 24352 static int pcnet32_debug = 0;
23953diff -urNp linux-2.6.32.8/drivers/net/tg3.h linux-2.6.32.8/drivers/net/tg3.h 24353diff -urNp linux-2.6.32.9/drivers/net/tg3.h linux-2.6.32.9/drivers/net/tg3.h
23954--- linux-2.6.32.8/drivers/net/tg3.h 2010-02-09 07:57:19.000000000 -0500 24354--- linux-2.6.32.9/drivers/net/tg3.h 2010-02-09 07:57:19.000000000 -0500
23955+++ linux-2.6.32.8/drivers/net/tg3.h 2010-02-13 21:45:10.248017589 -0500 24355+++ linux-2.6.32.9/drivers/net/tg3.h 2010-02-23 17:09:53.204540597 -0500
23956@@ -95,6 +95,7 @@ 24356@@ -95,6 +95,7 @@
23957 #define CHIPREV_ID_5750_A0 0x4000 24357 #define CHIPREV_ID_5750_A0 0x4000
23958 #define CHIPREV_ID_5750_A1 0x4001 24358 #define CHIPREV_ID_5750_A1 0x4001
@@ -23961,9 +24361,9 @@ diff -urNp linux-2.6.32.8/drivers/net/tg3.h linux-2.6.32.8/drivers/net/tg3.h
23961 #define CHIPREV_ID_5750_C2 0x4202 24361 #define CHIPREV_ID_5750_C2 0x4202
23962 #define CHIPREV_ID_5752_A0_HW 0x5000 24362 #define CHIPREV_ID_5752_A0_HW 0x5000
23963 #define CHIPREV_ID_5752_A0 0x6000 24363 #define CHIPREV_ID_5752_A0 0x6000
23964diff -urNp linux-2.6.32.8/drivers/net/usb/hso.c linux-2.6.32.8/drivers/net/usb/hso.c 24364diff -urNp linux-2.6.32.9/drivers/net/usb/hso.c linux-2.6.32.9/drivers/net/usb/hso.c
23965--- linux-2.6.32.8/drivers/net/usb/hso.c 2010-02-09 07:57:19.000000000 -0500 24365--- linux-2.6.32.9/drivers/net/usb/hso.c 2010-02-09 07:57:19.000000000 -0500
23966+++ linux-2.6.32.8/drivers/net/usb/hso.c 2010-02-13 21:45:10.264948656 -0500 24366+++ linux-2.6.32.9/drivers/net/usb/hso.c 2010-02-23 17:09:53.204540597 -0500
23967@@ -258,7 +258,7 @@ struct hso_serial { 24367@@ -258,7 +258,7 @@ struct hso_serial {
23968 24368
23969 /* from usb_serial_port */ 24369 /* from usb_serial_port */
@@ -24042,9 +24442,9 @@ diff -urNp linux-2.6.32.8/drivers/net/usb/hso.c linux-2.6.32.8/drivers/net/usb/h
24042 result = 24442 result =
24043 hso_start_serial_device(serial_table[i], GFP_NOIO); 24443 hso_start_serial_device(serial_table[i], GFP_NOIO);
24044 hso_kick_transmit(dev2ser(serial_table[i])); 24444 hso_kick_transmit(dev2ser(serial_table[i]));
24045diff -urNp linux-2.6.32.8/drivers/net/wireless/b43/debugfs.c linux-2.6.32.8/drivers/net/wireless/b43/debugfs.c 24445diff -urNp linux-2.6.32.9/drivers/net/wireless/b43/debugfs.c linux-2.6.32.9/drivers/net/wireless/b43/debugfs.c
24046--- linux-2.6.32.8/drivers/net/wireless/b43/debugfs.c 2010-02-09 07:57:19.000000000 -0500 24446--- linux-2.6.32.9/drivers/net/wireless/b43/debugfs.c 2010-02-09 07:57:19.000000000 -0500
24047+++ linux-2.6.32.8/drivers/net/wireless/b43/debugfs.c 2010-02-13 21:45:10.287952126 -0500 24447+++ linux-2.6.32.9/drivers/net/wireless/b43/debugfs.c 2010-02-23 17:09:53.204540597 -0500
24048@@ -43,7 +43,7 @@ static struct dentry *rootdir; 24448@@ -43,7 +43,7 @@ static struct dentry *rootdir;
24049 struct b43_debugfs_fops { 24449 struct b43_debugfs_fops {
24050 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); 24450 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -24054,9 +24454,9 @@ diff -urNp linux-2.6.32.8/drivers/net/wireless/b43/debugfs.c linux-2.6.32.8/driv
24054 /* Offset of struct b43_dfs_file in struct b43_dfsentry */ 24454 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
24055 size_t file_struct_offset; 24455 size_t file_struct_offset;
24056 }; 24456 };
24057diff -urNp linux-2.6.32.8/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.8/drivers/net/wireless/b43legacy/debugfs.c 24457diff -urNp linux-2.6.32.9/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.9/drivers/net/wireless/b43legacy/debugfs.c
24058--- linux-2.6.32.8/drivers/net/wireless/b43legacy/debugfs.c 2010-02-09 07:57:19.000000000 -0500 24458--- linux-2.6.32.9/drivers/net/wireless/b43legacy/debugfs.c 2010-02-09 07:57:19.000000000 -0500
24059+++ linux-2.6.32.8/drivers/net/wireless/b43legacy/debugfs.c 2010-02-13 21:45:10.296619802 -0500 24459+++ linux-2.6.32.9/drivers/net/wireless/b43legacy/debugfs.c 2010-02-23 17:09:53.204540597 -0500
24060@@ -44,7 +44,7 @@ static struct dentry *rootdir; 24460@@ -44,7 +44,7 @@ static struct dentry *rootdir;
24061 struct b43legacy_debugfs_fops { 24461 struct b43legacy_debugfs_fops {
24062 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); 24462 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -24066,9 +24466,9 @@ diff -urNp linux-2.6.32.8/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.
24066 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ 24466 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
24067 size_t file_struct_offset; 24467 size_t file_struct_offset;
24068 /* Take wl->irq_lock before calling read/write? */ 24468 /* Take wl->irq_lock before calling read/write? */
24069diff -urNp linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-1000.c 24469diff -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
24070--- linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-02-09 07:57:19.000000000 -0500 24470--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-02-09 07:57:19.000000000 -0500
24071+++ linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-02-13 21:45:10.303949683 -0500 24471+++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-02-23 17:09:53.204540597 -0500
24072@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = 24472@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
24073 }, 24473 },
24074 }; 24474 };
@@ -24078,9 +24478,9 @@ diff -urNp linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.8
24078 .ucode = &iwl5000_ucode, 24478 .ucode = &iwl5000_ucode,
24079 .lib = &iwl1000_lib, 24479 .lib = &iwl1000_lib,
24080 .hcmd = &iwl5000_hcmd, 24480 .hcmd = &iwl5000_hcmd,
24081diff -urNp linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-3945.c 24481diff -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
24082--- linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-02-09 07:57:19.000000000 -0500 24482--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-02-09 07:57:19.000000000 -0500
24083+++ linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-02-13 21:45:10.305603791 -0500 24483+++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-02-23 17:09:53.204540597 -0500
24084@@ -2876,7 +2876,7 @@ static struct iwl_hcmd_utils_ops iwl3945 24484@@ -2876,7 +2876,7 @@ static struct iwl_hcmd_utils_ops iwl3945
24085 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, 24485 .build_addsta_hcmd = iwl3945_build_addsta_hcmd,
24086 }; 24486 };
@@ -24090,9 +24490,9 @@ diff -urNp linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.8
24090 .ucode = &iwl3945_ucode, 24490 .ucode = &iwl3945_ucode,
24091 .lib = &iwl3945_lib, 24491 .lib = &iwl3945_lib,
24092 .hcmd = &iwl3945_hcmd, 24492 .hcmd = &iwl3945_hcmd,
24093diff -urNp linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-4965.c 24493diff -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
24094--- linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-02-09 07:57:19.000000000 -0500 24494--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-02-09 07:57:19.000000000 -0500
24095+++ linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-02-13 21:45:10.307959764 -0500 24495+++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-02-23 17:09:53.204540597 -0500
24096@@ -2335,7 +2335,7 @@ static struct iwl_lib_ops iwl4965_lib = 24496@@ -2335,7 +2335,7 @@ static struct iwl_lib_ops iwl4965_lib =
24097 }, 24497 },
24098 }; 24498 };
@@ -24102,9 +24502,9 @@ diff -urNp linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.8
24102 .ucode = &iwl4965_ucode, 24502 .ucode = &iwl4965_ucode,
24103 .lib = &iwl4965_lib, 24503 .lib = &iwl4965_lib,
24104 .hcmd = &iwl4965_hcmd, 24504 .hcmd = &iwl4965_hcmd,
24105diff -urNp linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-5000.c 24505diff -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
24106--- linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-02-09 07:57:19.000000000 -0500 24506--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-02-09 07:57:19.000000000 -0500
24107+++ linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-02-13 21:45:10.316138607 -0500 24507+++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-02-23 17:09:53.204540597 -0500
24108@@ -1628,14 +1628,14 @@ static struct iwl_lib_ops iwl5150_lib = 24508@@ -1628,14 +1628,14 @@ static struct iwl_lib_ops iwl5150_lib =
24109 }, 24509 },
24110 }; 24510 };
@@ -24122,9 +24522,9 @@ diff -urNp linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.8
24122 .ucode = &iwl5000_ucode, 24522 .ucode = &iwl5000_ucode,
24123 .lib = &iwl5150_lib, 24523 .lib = &iwl5150_lib,
24124 .hcmd = &iwl5000_hcmd, 24524 .hcmd = &iwl5000_hcmd,
24125diff -urNp linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-6000.c 24525diff -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
24126--- linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-02-09 07:57:19.000000000 -0500 24526--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-02-09 07:57:19.000000000 -0500
24127+++ linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-02-13 21:45:10.316788245 -0500 24527+++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-02-23 17:09:53.208535454 -0500
24128@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 24528@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
24129 .calc_rssi = iwl5000_calc_rssi, 24529 .calc_rssi = iwl5000_calc_rssi,
24130 }; 24530 };
@@ -24134,9 +24534,9 @@ diff -urNp linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.8
24134 .ucode = &iwl5000_ucode, 24534 .ucode = &iwl5000_ucode,
24135 .lib = &iwl6000_lib, 24535 .lib = &iwl6000_lib,
24136 .hcmd = &iwl5000_hcmd, 24536 .hcmd = &iwl5000_hcmd,
24137diff -urNp linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-dev.h 24537diff -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
24138--- linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-02-09 07:57:19.000000000 -0500 24538--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-02-09 07:57:19.000000000 -0500
24139+++ linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-02-13 21:45:10.317687263 -0500 24539+++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-02-23 17:09:53.208535454 -0500
24140@@ -67,7 +67,7 @@ struct iwl_tx_queue; 24540@@ -67,7 +67,7 @@ struct iwl_tx_queue;
24141 24541
24142 /* shared structures from iwl-5000.c */ 24542 /* shared structures from iwl-5000.c */
@@ -24146,9 +24546,9 @@ diff -urNp linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.8/
24146 extern struct iwl_ucode_ops iwl5000_ucode; 24546 extern struct iwl_ucode_ops iwl5000_ucode;
24147 extern struct iwl_lib_ops iwl5000_lib; 24547 extern struct iwl_lib_ops iwl5000_lib;
24148 extern struct iwl_hcmd_ops iwl5000_hcmd; 24548 extern struct iwl_hcmd_ops iwl5000_hcmd;
24149diff -urNp linux-2.6.32.8/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.8/drivers/net/wireless/libertas/debugfs.c 24549diff -urNp linux-2.6.32.9/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.9/drivers/net/wireless/libertas/debugfs.c
24150--- linux-2.6.32.8/drivers/net/wireless/libertas/debugfs.c 2010-02-09 07:57:19.000000000 -0500 24550--- linux-2.6.32.9/drivers/net/wireless/libertas/debugfs.c 2010-02-09 07:57:19.000000000 -0500
24151+++ linux-2.6.32.8/drivers/net/wireless/libertas/debugfs.c 2010-02-13 21:45:10.325943460 -0500 24551+++ linux-2.6.32.9/drivers/net/wireless/libertas/debugfs.c 2010-02-23 17:09:53.208535454 -0500
24152@@ -708,7 +708,7 @@ out_unlock: 24552@@ -708,7 +708,7 @@ out_unlock:
24153 struct lbs_debugfs_files { 24553 struct lbs_debugfs_files {
24154 const char *name; 24554 const char *name;
@@ -24158,9 +24558,9 @@ diff -urNp linux-2.6.32.8/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.8
24158 }; 24558 };
24159 24559
24160 static const struct lbs_debugfs_files debugfs_files[] = { 24560 static const struct lbs_debugfs_files debugfs_files[] = {
24161diff -urNp linux-2.6.32.8/drivers/oprofile/buffer_sync.c linux-2.6.32.8/drivers/oprofile/buffer_sync.c 24561diff -urNp linux-2.6.32.9/drivers/oprofile/buffer_sync.c linux-2.6.32.9/drivers/oprofile/buffer_sync.c
24162--- linux-2.6.32.8/drivers/oprofile/buffer_sync.c 2010-02-09 07:57:19.000000000 -0500 24562--- linux-2.6.32.9/drivers/oprofile/buffer_sync.c 2010-02-09 07:57:19.000000000 -0500
24163+++ linux-2.6.32.8/drivers/oprofile/buffer_sync.c 2010-02-13 21:45:10.325943460 -0500 24563+++ linux-2.6.32.9/drivers/oprofile/buffer_sync.c 2010-02-23 17:09:53.208535454 -0500
24164@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en 24564@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en
24165 if (cookie == NO_COOKIE) 24565 if (cookie == NO_COOKIE)
24166 offset = pc; 24566 offset = pc;
@@ -24196,9 +24596,9 @@ diff -urNp linux-2.6.32.8/drivers/oprofile/buffer_sync.c linux-2.6.32.8/drivers/
24196 } 24596 }
24197 } 24597 }
24198 release_mm(mm); 24598 release_mm(mm);
24199diff -urNp linux-2.6.32.8/drivers/oprofile/event_buffer.c linux-2.6.32.8/drivers/oprofile/event_buffer.c 24599diff -urNp linux-2.6.32.9/drivers/oprofile/event_buffer.c linux-2.6.32.9/drivers/oprofile/event_buffer.c
24200--- linux-2.6.32.8/drivers/oprofile/event_buffer.c 2010-02-09 07:57:19.000000000 -0500 24600--- linux-2.6.32.9/drivers/oprofile/event_buffer.c 2010-02-09 07:57:19.000000000 -0500
24201+++ linux-2.6.32.8/drivers/oprofile/event_buffer.c 2010-02-13 21:45:10.325943460 -0500 24601+++ linux-2.6.32.9/drivers/oprofile/event_buffer.c 2010-02-23 17:09:53.208535454 -0500
24202@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value 24602@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
24203 } 24603 }
24204 24604
@@ -24208,9 +24608,9 @@ diff -urNp linux-2.6.32.8/drivers/oprofile/event_buffer.c linux-2.6.32.8/drivers
24208 return; 24608 return;
24209 } 24609 }
24210 24610
24211diff -urNp linux-2.6.32.8/drivers/oprofile/oprof.c linux-2.6.32.8/drivers/oprofile/oprof.c 24611diff -urNp linux-2.6.32.9/drivers/oprofile/oprof.c linux-2.6.32.9/drivers/oprofile/oprof.c
24212--- linux-2.6.32.8/drivers/oprofile/oprof.c 2010-02-09 07:57:19.000000000 -0500 24612--- linux-2.6.32.9/drivers/oprofile/oprof.c 2010-02-09 07:57:19.000000000 -0500
24213+++ linux-2.6.32.8/drivers/oprofile/oprof.c 2010-02-13 21:45:10.325943460 -0500 24613+++ linux-2.6.32.9/drivers/oprofile/oprof.c 2010-02-23 17:09:53.208535454 -0500
24214@@ -110,7 +110,7 @@ static void switch_worker(struct work_st 24614@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
24215 if (oprofile_ops.switch_events()) 24615 if (oprofile_ops.switch_events())
24216 return; 24616 return;
@@ -24220,9 +24620,9 @@ diff -urNp linux-2.6.32.8/drivers/oprofile/oprof.c linux-2.6.32.8/drivers/oprofi
24220 start_switch_worker(); 24620 start_switch_worker();
24221 } 24621 }
24222 24622
24223diff -urNp linux-2.6.32.8/drivers/oprofile/oprofilefs.c linux-2.6.32.8/drivers/oprofile/oprofilefs.c 24623diff -urNp linux-2.6.32.9/drivers/oprofile/oprofilefs.c linux-2.6.32.9/drivers/oprofile/oprofilefs.c
24224--- linux-2.6.32.8/drivers/oprofile/oprofilefs.c 2010-02-09 07:57:19.000000000 -0500 24624--- linux-2.6.32.9/drivers/oprofile/oprofilefs.c 2010-02-09 07:57:19.000000000 -0500
24225+++ linux-2.6.32.8/drivers/oprofile/oprofilefs.c 2010-02-13 21:45:10.326952614 -0500 24625+++ linux-2.6.32.9/drivers/oprofile/oprofilefs.c 2010-02-23 17:09:53.208535454 -0500
24226@@ -187,7 +187,7 @@ static const struct file_operations atom 24626@@ -187,7 +187,7 @@ static const struct file_operations atom
24227 24627
24228 24628
@@ -24232,9 +24632,9 @@ diff -urNp linux-2.6.32.8/drivers/oprofile/oprofilefs.c linux-2.6.32.8/drivers/o
24232 { 24632 {
24233 struct dentry *d = __oprofilefs_create_file(sb, root, name, 24633 struct dentry *d = __oprofilefs_create_file(sb, root, name,
24234 &atomic_ro_fops, 0444); 24634 &atomic_ro_fops, 0444);
24235diff -urNp linux-2.6.32.8/drivers/oprofile/oprofile_stats.c linux-2.6.32.8/drivers/oprofile/oprofile_stats.c 24635diff -urNp linux-2.6.32.9/drivers/oprofile/oprofile_stats.c linux-2.6.32.9/drivers/oprofile/oprofile_stats.c
24236--- linux-2.6.32.8/drivers/oprofile/oprofile_stats.c 2010-02-09 07:57:19.000000000 -0500 24636--- linux-2.6.32.9/drivers/oprofile/oprofile_stats.c 2010-02-09 07:57:19.000000000 -0500
24237+++ linux-2.6.32.8/drivers/oprofile/oprofile_stats.c 2010-02-13 21:45:10.326952614 -0500 24637+++ linux-2.6.32.9/drivers/oprofile/oprofile_stats.c 2010-02-23 17:09:53.208535454 -0500
24238@@ -30,11 +30,11 @@ void oprofile_reset_stats(void) 24638@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
24239 cpu_buf->sample_invalid_eip = 0; 24639 cpu_buf->sample_invalid_eip = 0;
24240 } 24640 }
@@ -24252,9 +24652,9 @@ diff -urNp linux-2.6.32.8/drivers/oprofile/oprofile_stats.c linux-2.6.32.8/drive
24252 } 24652 }
24253 24653
24254 24654
24255diff -urNp linux-2.6.32.8/drivers/oprofile/oprofile_stats.h linux-2.6.32.8/drivers/oprofile/oprofile_stats.h 24655diff -urNp linux-2.6.32.9/drivers/oprofile/oprofile_stats.h linux-2.6.32.9/drivers/oprofile/oprofile_stats.h
24256--- linux-2.6.32.8/drivers/oprofile/oprofile_stats.h 2010-02-09 07:57:19.000000000 -0500 24656--- linux-2.6.32.9/drivers/oprofile/oprofile_stats.h 2010-02-09 07:57:19.000000000 -0500
24257+++ linux-2.6.32.8/drivers/oprofile/oprofile_stats.h 2010-02-13 21:45:10.326952614 -0500 24657+++ linux-2.6.32.9/drivers/oprofile/oprofile_stats.h 2010-02-23 17:09:53.208535454 -0500
24258@@ -13,11 +13,11 @@ 24658@@ -13,11 +13,11 @@
24259 #include <asm/atomic.h> 24659 #include <asm/atomic.h>
24260 24660
@@ -24272,9 +24672,9 @@ diff -urNp linux-2.6.32.8/drivers/oprofile/oprofile_stats.h linux-2.6.32.8/drive
24272 }; 24672 };
24273 24673
24274 extern struct oprofile_stat_struct oprofile_stats; 24674 extern struct oprofile_stat_struct oprofile_stats;
24275diff -urNp linux-2.6.32.8/drivers/parisc/pdc_stable.c linux-2.6.32.8/drivers/parisc/pdc_stable.c 24675diff -urNp linux-2.6.32.9/drivers/parisc/pdc_stable.c linux-2.6.32.9/drivers/parisc/pdc_stable.c
24276--- linux-2.6.32.8/drivers/parisc/pdc_stable.c 2010-02-09 07:57:19.000000000 -0500 24676--- linux-2.6.32.9/drivers/parisc/pdc_stable.c 2010-02-09 07:57:19.000000000 -0500
24277+++ linux-2.6.32.8/drivers/parisc/pdc_stable.c 2010-02-13 21:45:10.326952614 -0500 24677+++ linux-2.6.32.9/drivers/parisc/pdc_stable.c 2010-02-23 17:09:53.208535454 -0500
24278@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj 24678@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
24279 return ret; 24679 return ret;
24280 } 24680 }
@@ -24284,9 +24684,9 @@ diff -urNp linux-2.6.32.8/drivers/parisc/pdc_stable.c linux-2.6.32.8/drivers/par
24284 .show = pdcspath_attr_show, 24684 .show = pdcspath_attr_show,
24285 .store = pdcspath_attr_store, 24685 .store = pdcspath_attr_store,
24286 }; 24686 };
24287diff -urNp linux-2.6.32.8/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.8/drivers/pci/hotplug/acpiphp_glue.c 24687diff -urNp linux-2.6.32.9/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.9/drivers/pci/hotplug/acpiphp_glue.c
24288--- linux-2.6.32.8/drivers/pci/hotplug/acpiphp_glue.c 2010-02-09 07:57:19.000000000 -0500 24688--- linux-2.6.32.9/drivers/pci/hotplug/acpiphp_glue.c 2010-02-09 07:57:19.000000000 -0500
24289+++ linux-2.6.32.8/drivers/pci/hotplug/acpiphp_glue.c 2010-02-13 21:45:10.327955058 -0500 24689+++ linux-2.6.32.9/drivers/pci/hotplug/acpiphp_glue.c 2010-02-23 17:09:53.208535454 -0500
24290@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif 24690@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
24291 } 24691 }
24292 24692
@@ -24296,9 +24696,9 @@ diff -urNp linux-2.6.32.8/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.8/driv
24296 .handler = handle_hotplug_event_func, 24696 .handler = handle_hotplug_event_func,
24297 }; 24697 };
24298 24698
24299diff -urNp linux-2.6.32.8/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.8/drivers/pci/hotplug/cpqphp_nvram.c 24699diff -urNp linux-2.6.32.9/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.9/drivers/pci/hotplug/cpqphp_nvram.c
24300--- linux-2.6.32.8/drivers/pci/hotplug/cpqphp_nvram.c 2010-02-09 07:57:19.000000000 -0500 24700--- linux-2.6.32.9/drivers/pci/hotplug/cpqphp_nvram.c 2010-02-09 07:57:19.000000000 -0500
24301+++ linux-2.6.32.8/drivers/pci/hotplug/cpqphp_nvram.c 2010-02-13 21:45:10.327955058 -0500 24701+++ linux-2.6.32.9/drivers/pci/hotplug/cpqphp_nvram.c 2010-02-23 17:09:53.208535454 -0500
24302@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ 24702@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
24303 24703
24304 void compaq_nvram_init (void __iomem *rom_start) 24704 void compaq_nvram_init (void __iomem *rom_start)
@@ -24313,9 +24713,9 @@ diff -urNp linux-2.6.32.8/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.8/driv
24313 dbg("int15 entry = %p\n", compaq_int15_entry_point); 24713 dbg("int15 entry = %p\n", compaq_int15_entry_point);
24314 24714
24315 /* initialize our int15 lock */ 24715 /* initialize our int15 lock */
24316diff -urNp linux-2.6.32.8/drivers/pci/hotplug/fakephp.c linux-2.6.32.8/drivers/pci/hotplug/fakephp.c 24716diff -urNp linux-2.6.32.9/drivers/pci/hotplug/fakephp.c linux-2.6.32.9/drivers/pci/hotplug/fakephp.c
24317--- linux-2.6.32.8/drivers/pci/hotplug/fakephp.c 2010-02-09 07:57:19.000000000 -0500 24717--- linux-2.6.32.9/drivers/pci/hotplug/fakephp.c 2010-02-09 07:57:19.000000000 -0500
24318+++ linux-2.6.32.8/drivers/pci/hotplug/fakephp.c 2010-02-13 21:45:10.328531374 -0500 24718+++ linux-2.6.32.9/drivers/pci/hotplug/fakephp.c 2010-02-23 17:09:53.208535454 -0500
24319@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec 24719@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
24320 } 24720 }
24321 24721
@@ -24325,9 +24725,9 @@ diff -urNp linux-2.6.32.8/drivers/pci/hotplug/fakephp.c linux-2.6.32.8/drivers/p
24325 .store = legacy_store, .show = legacy_show 24725 .store = legacy_store, .show = legacy_show
24326 }, 24726 },
24327 .release = &legacy_release, 24727 .release = &legacy_release,
24328diff -urNp linux-2.6.32.8/drivers/pci/intel-iommu.c linux-2.6.32.8/drivers/pci/intel-iommu.c 24728diff -urNp linux-2.6.32.9/drivers/pci/intel-iommu.c linux-2.6.32.9/drivers/pci/intel-iommu.c
24329--- linux-2.6.32.8/drivers/pci/intel-iommu.c 2010-02-09 07:57:19.000000000 -0500 24729--- linux-2.6.32.9/drivers/pci/intel-iommu.c 2010-02-09 07:57:19.000000000 -0500
24330+++ linux-2.6.32.8/drivers/pci/intel-iommu.c 2010-02-13 21:45:10.328531374 -0500 24730+++ linux-2.6.32.9/drivers/pci/intel-iommu.c 2010-02-23 17:09:53.208535454 -0500
24331@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de 24731@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de
24332 return !dma_addr; 24732 return !dma_addr;
24333 } 24733 }
@@ -24337,9 +24737,9 @@ diff -urNp linux-2.6.32.8/drivers/pci/intel-iommu.c linux-2.6.32.8/drivers/pci/i
24337 .alloc_coherent = intel_alloc_coherent, 24737 .alloc_coherent = intel_alloc_coherent,
24338 .free_coherent = intel_free_coherent, 24738 .free_coherent = intel_free_coherent,
24339 .map_sg = intel_map_sg, 24739 .map_sg = intel_map_sg,
24340diff -urNp linux-2.6.32.8/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.8/drivers/pci/pcie/portdrv_pci.c 24740diff -urNp linux-2.6.32.9/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.9/drivers/pci/pcie/portdrv_pci.c
24341--- linux-2.6.32.8/drivers/pci/pcie/portdrv_pci.c 2010-02-09 07:57:19.000000000 -0500 24741--- linux-2.6.32.9/drivers/pci/pcie/portdrv_pci.c 2010-02-09 07:57:19.000000000 -0500
24342+++ linux-2.6.32.8/drivers/pci/pcie/portdrv_pci.c 2010-02-13 21:45:10.328531374 -0500 24742+++ linux-2.6.32.9/drivers/pci/pcie/portdrv_pci.c 2010-02-23 17:09:53.208535454 -0500
24343@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru 24743@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru
24344 static const struct pci_device_id port_pci_ids[] = { { 24744 static const struct pci_device_id port_pci_ids[] = { {
24345 /* handle any PCI-Express port */ 24745 /* handle any PCI-Express port */
@@ -24349,9 +24749,9 @@ diff -urNp linux-2.6.32.8/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.8/drivers/
24349 }; 24749 };
24350 MODULE_DEVICE_TABLE(pci, port_pci_ids); 24750 MODULE_DEVICE_TABLE(pci, port_pci_ids);
24351 24751
24352diff -urNp linux-2.6.32.8/drivers/pci/proc.c linux-2.6.32.8/drivers/pci/proc.c 24752diff -urNp linux-2.6.32.9/drivers/pci/proc.c linux-2.6.32.9/drivers/pci/proc.c
24353--- linux-2.6.32.8/drivers/pci/proc.c 2010-02-09 07:57:19.000000000 -0500 24753--- linux-2.6.32.9/drivers/pci/proc.c 2010-02-09 07:57:19.000000000 -0500
24354+++ linux-2.6.32.8/drivers/pci/proc.c 2010-02-13 21:45:10.328531374 -0500 24754+++ linux-2.6.32.9/drivers/pci/proc.c 2010-02-23 17:09:53.208535454 -0500
24355@@ -480,7 +480,16 @@ static const struct file_operations proc 24755@@ -480,7 +480,16 @@ static const struct file_operations proc
24356 static int __init pci_proc_init(void) 24756 static int __init pci_proc_init(void)
24357 { 24757 {
@@ -24369,9 +24769,9 @@ diff -urNp linux-2.6.32.8/drivers/pci/proc.c linux-2.6.32.8/drivers/pci/proc.c
24369 proc_create("devices", 0, proc_bus_pci_dir, 24769 proc_create("devices", 0, proc_bus_pci_dir,
24370 &proc_bus_pci_dev_operations); 24770 &proc_bus_pci_dev_operations);
24371 proc_initialized = 1; 24771 proc_initialized = 1;
24372diff -urNp linux-2.6.32.8/drivers/pci/slot.c linux-2.6.32.8/drivers/pci/slot.c 24772diff -urNp linux-2.6.32.9/drivers/pci/slot.c linux-2.6.32.9/drivers/pci/slot.c
24373--- linux-2.6.32.8/drivers/pci/slot.c 2010-02-09 07:57:19.000000000 -0500 24773--- linux-2.6.32.9/drivers/pci/slot.c 2010-02-09 07:57:19.000000000 -0500
24374+++ linux-2.6.32.8/drivers/pci/slot.c 2010-02-13 21:45:10.328531374 -0500 24774+++ linux-2.6.32.9/drivers/pci/slot.c 2010-02-23 17:09:53.208535454 -0500
24375@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc 24775@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
24376 return attribute->store ? attribute->store(slot, buf, len) : -EIO; 24776 return attribute->store ? attribute->store(slot, buf, len) : -EIO;
24377 } 24777 }
@@ -24381,9 +24781,9 @@ diff -urNp linux-2.6.32.8/drivers/pci/slot.c linux-2.6.32.8/drivers/pci/slot.c
24381 .show = pci_slot_attr_show, 24781 .show = pci_slot_attr_show,
24382 .store = pci_slot_attr_store, 24782 .store = pci_slot_attr_store,
24383 }; 24783 };
24384diff -urNp linux-2.6.32.8/drivers/pcmcia/ti113x.h linux-2.6.32.8/drivers/pcmcia/ti113x.h 24784diff -urNp linux-2.6.32.9/drivers/pcmcia/ti113x.h linux-2.6.32.9/drivers/pcmcia/ti113x.h
24385--- linux-2.6.32.8/drivers/pcmcia/ti113x.h 2010-02-09 07:57:19.000000000 -0500 24785--- linux-2.6.32.9/drivers/pcmcia/ti113x.h 2010-02-09 07:57:19.000000000 -0500
24386+++ linux-2.6.32.8/drivers/pcmcia/ti113x.h 2010-02-13 21:45:10.329952331 -0500 24786+++ linux-2.6.32.9/drivers/pcmcia/ti113x.h 2010-02-23 17:09:53.208535454 -0500
24387@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl 24787@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl
24388 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, 24788 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
24389 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), 24789 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
@@ -24393,9 +24793,9 @@ diff -urNp linux-2.6.32.8/drivers/pcmcia/ti113x.h linux-2.6.32.8/drivers/pcmcia/
24393 }; 24793 };
24394 24794
24395 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) 24795 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
24396diff -urNp linux-2.6.32.8/drivers/pcmcia/yenta_socket.c linux-2.6.32.8/drivers/pcmcia/yenta_socket.c 24796diff -urNp linux-2.6.32.9/drivers/pcmcia/yenta_socket.c linux-2.6.32.9/drivers/pcmcia/yenta_socket.c
24397--- linux-2.6.32.8/drivers/pcmcia/yenta_socket.c 2010-02-09 07:57:19.000000000 -0500 24797--- linux-2.6.32.9/drivers/pcmcia/yenta_socket.c 2010-02-09 07:57:19.000000000 -0500
24398+++ linux-2.6.32.8/drivers/pcmcia/yenta_socket.c 2010-02-13 21:45:10.329952331 -0500 24798+++ linux-2.6.32.9/drivers/pcmcia/yenta_socket.c 2010-02-23 17:09:53.208535454 -0500
24399@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table 24799@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
24400 24800
24401 /* match any cardbus bridge */ 24801 /* match any cardbus bridge */
@@ -24405,9 +24805,9 @@ diff -urNp linux-2.6.32.8/drivers/pcmcia/yenta_socket.c linux-2.6.32.8/drivers/p
24405 }; 24805 };
24406 MODULE_DEVICE_TABLE(pci, yenta_table); 24806 MODULE_DEVICE_TABLE(pci, yenta_table);
24407 24807
24408diff -urNp linux-2.6.32.8/drivers/platform/x86/acer-wmi.c linux-2.6.32.8/drivers/platform/x86/acer-wmi.c 24808diff -urNp linux-2.6.32.9/drivers/platform/x86/acer-wmi.c linux-2.6.32.9/drivers/platform/x86/acer-wmi.c
24409--- linux-2.6.32.8/drivers/platform/x86/acer-wmi.c 2010-02-09 07:57:19.000000000 -0500 24809--- linux-2.6.32.9/drivers/platform/x86/acer-wmi.c 2010-02-09 07:57:19.000000000 -0500
24410+++ linux-2.6.32.8/drivers/platform/x86/acer-wmi.c 2010-02-13 21:45:10.330810874 -0500 24810+++ linux-2.6.32.9/drivers/platform/x86/acer-wmi.c 2010-02-23 17:09:53.208535454 -0500
24411@@ -918,7 +918,7 @@ static int update_bl_status(struct backl 24811@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
24412 return 0; 24812 return 0;
24413 } 24813 }
@@ -24417,9 +24817,9 @@ diff -urNp linux-2.6.32.8/drivers/platform/x86/acer-wmi.c linux-2.6.32.8/drivers
24417 .get_brightness = read_brightness, 24817 .get_brightness = read_brightness,
24418 .update_status = update_bl_status, 24818 .update_status = update_bl_status,
24419 }; 24819 };
24420diff -urNp linux-2.6.32.8/drivers/platform/x86/asus_acpi.c linux-2.6.32.8/drivers/platform/x86/asus_acpi.c 24820diff -urNp linux-2.6.32.9/drivers/platform/x86/asus_acpi.c linux-2.6.32.9/drivers/platform/x86/asus_acpi.c
24421--- linux-2.6.32.8/drivers/platform/x86/asus_acpi.c 2010-02-09 07:57:19.000000000 -0500 24821--- linux-2.6.32.9/drivers/platform/x86/asus_acpi.c 2010-02-09 07:57:19.000000000 -0500
24422+++ linux-2.6.32.8/drivers/platform/x86/asus_acpi.c 2010-02-13 21:45:10.330810874 -0500 24822+++ linux-2.6.32.9/drivers/platform/x86/asus_acpi.c 2010-02-23 17:09:53.212539101 -0500
24423@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ 24823@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
24424 return 0; 24824 return 0;
24425 } 24825 }
@@ -24429,9 +24829,9 @@ diff -urNp linux-2.6.32.8/drivers/platform/x86/asus_acpi.c linux-2.6.32.8/driver
24429 .get_brightness = read_brightness, 24829 .get_brightness = read_brightness,
24430 .update_status = set_brightness_status, 24830 .update_status = set_brightness_status,
24431 }; 24831 };
24432diff -urNp linux-2.6.32.8/drivers/platform/x86/asus-laptop.c linux-2.6.32.8/drivers/platform/x86/asus-laptop.c 24832diff -urNp linux-2.6.32.9/drivers/platform/x86/asus-laptop.c linux-2.6.32.9/drivers/platform/x86/asus-laptop.c
24433--- linux-2.6.32.8/drivers/platform/x86/asus-laptop.c 2010-02-09 07:57:19.000000000 -0500 24833--- linux-2.6.32.9/drivers/platform/x86/asus-laptop.c 2010-02-09 07:57:19.000000000 -0500
24434+++ linux-2.6.32.8/drivers/platform/x86/asus-laptop.c 2010-02-13 21:45:10.331560373 -0500 24834+++ linux-2.6.32.9/drivers/platform/x86/asus-laptop.c 2010-02-23 17:09:53.212539101 -0500
24435@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac 24835@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
24436 */ 24836 */
24437 static int read_brightness(struct backlight_device *bd); 24837 static int read_brightness(struct backlight_device *bd);
@@ -24441,9 +24841,9 @@ diff -urNp linux-2.6.32.8/drivers/platform/x86/asus-laptop.c linux-2.6.32.8/driv
24441 .get_brightness = read_brightness, 24841 .get_brightness = read_brightness,
24442 .update_status = update_bl_status, 24842 .update_status = update_bl_status,
24443 }; 24843 };
24444diff -urNp linux-2.6.32.8/drivers/platform/x86/compal-laptop.c linux-2.6.32.8/drivers/platform/x86/compal-laptop.c 24844diff -urNp linux-2.6.32.9/drivers/platform/x86/compal-laptop.c linux-2.6.32.9/drivers/platform/x86/compal-laptop.c
24445--- linux-2.6.32.8/drivers/platform/x86/compal-laptop.c 2010-02-09 07:57:19.000000000 -0500 24845--- linux-2.6.32.9/drivers/platform/x86/compal-laptop.c 2010-02-09 07:57:19.000000000 -0500
24446+++ linux-2.6.32.8/drivers/platform/x86/compal-laptop.c 2010-02-13 21:45:10.331560373 -0500 24846+++ linux-2.6.32.9/drivers/platform/x86/compal-laptop.c 2010-02-23 17:09:53.212539101 -0500
24447@@ -163,7 +163,7 @@ static int bl_update_status(struct backl 24847@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
24448 return set_lcd_level(b->props.brightness); 24848 return set_lcd_level(b->props.brightness);
24449 } 24849 }
@@ -24453,9 +24853,9 @@ diff -urNp linux-2.6.32.8/drivers/platform/x86/compal-laptop.c linux-2.6.32.8/dr
24453 .get_brightness = bl_get_brightness, 24853 .get_brightness = bl_get_brightness,
24454 .update_status = bl_update_status, 24854 .update_status = bl_update_status,
24455 }; 24855 };
24456diff -urNp linux-2.6.32.8/drivers/platform/x86/dell-laptop.c linux-2.6.32.8/drivers/platform/x86/dell-laptop.c 24856diff -urNp linux-2.6.32.9/drivers/platform/x86/dell-laptop.c linux-2.6.32.9/drivers/platform/x86/dell-laptop.c
24457--- linux-2.6.32.8/drivers/platform/x86/dell-laptop.c 2010-02-09 07:57:19.000000000 -0500 24857--- linux-2.6.32.9/drivers/platform/x86/dell-laptop.c 2010-02-09 07:57:19.000000000 -0500
24458+++ linux-2.6.32.8/drivers/platform/x86/dell-laptop.c 2010-02-13 21:45:10.331560373 -0500 24858+++ linux-2.6.32.9/drivers/platform/x86/dell-laptop.c 2010-02-23 17:09:53.212539101 -0500
24459@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac 24859@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
24460 return buffer.output[1]; 24860 return buffer.output[1];
24461 } 24861 }
@@ -24465,9 +24865,9 @@ diff -urNp linux-2.6.32.8/drivers/platform/x86/dell-laptop.c linux-2.6.32.8/driv
24465 .get_brightness = dell_get_intensity, 24865 .get_brightness = dell_get_intensity,
24466 .update_status = dell_send_intensity, 24866 .update_status = dell_send_intensity,
24467 }; 24867 };
24468diff -urNp linux-2.6.32.8/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.8/drivers/platform/x86/eeepc-laptop.c 24868diff -urNp linux-2.6.32.9/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.9/drivers/platform/x86/eeepc-laptop.c
24469--- linux-2.6.32.8/drivers/platform/x86/eeepc-laptop.c 2010-02-09 07:57:19.000000000 -0500 24869--- linux-2.6.32.9/drivers/platform/x86/eeepc-laptop.c 2010-02-09 07:57:19.000000000 -0500
24470+++ linux-2.6.32.8/drivers/platform/x86/eeepc-laptop.c 2010-02-13 21:45:10.331560373 -0500 24870+++ linux-2.6.32.9/drivers/platform/x86/eeepc-laptop.c 2010-02-23 17:09:53.212539101 -0500
24471@@ -242,7 +242,7 @@ static struct device *eeepc_hwmon_device 24871@@ -242,7 +242,7 @@ static struct device *eeepc_hwmon_device
24472 */ 24872 */
24473 static int read_brightness(struct backlight_device *bd); 24873 static int read_brightness(struct backlight_device *bd);
@@ -24477,9 +24877,9 @@ diff -urNp linux-2.6.32.8/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.8/dri
24477 .get_brightness = read_brightness, 24877 .get_brightness = read_brightness,
24478 .update_status = update_bl_status, 24878 .update_status = update_bl_status,
24479 }; 24879 };
24480diff -urNp linux-2.6.32.8/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.8/drivers/platform/x86/fujitsu-laptop.c 24880diff -urNp linux-2.6.32.9/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.9/drivers/platform/x86/fujitsu-laptop.c
24481--- linux-2.6.32.8/drivers/platform/x86/fujitsu-laptop.c 2010-02-09 07:57:19.000000000 -0500 24881--- linux-2.6.32.9/drivers/platform/x86/fujitsu-laptop.c 2010-02-09 07:57:19.000000000 -0500
24482+++ linux-2.6.32.8/drivers/platform/x86/fujitsu-laptop.c 2010-02-13 21:45:10.331560373 -0500 24882+++ linux-2.6.32.9/drivers/platform/x86/fujitsu-laptop.c 2010-02-23 17:09:53.212539101 -0500
24483@@ -436,7 +436,7 @@ static int bl_update_status(struct backl 24883@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
24484 return ret; 24884 return ret;
24485 } 24885 }
@@ -24489,9 +24889,9 @@ diff -urNp linux-2.6.32.8/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.8/d
24489 .get_brightness = bl_get_brightness, 24889 .get_brightness = bl_get_brightness,
24490 .update_status = bl_update_status, 24890 .update_status = bl_update_status,
24491 }; 24891 };
24492diff -urNp linux-2.6.32.8/drivers/platform/x86/msi-laptop.c linux-2.6.32.8/drivers/platform/x86/msi-laptop.c 24892diff -urNp linux-2.6.32.9/drivers/platform/x86/msi-laptop.c linux-2.6.32.9/drivers/platform/x86/msi-laptop.c
24493--- linux-2.6.32.8/drivers/platform/x86/msi-laptop.c 2010-02-09 07:57:19.000000000 -0500 24893--- linux-2.6.32.9/drivers/platform/x86/msi-laptop.c 2010-02-09 07:57:19.000000000 -0500
24494+++ linux-2.6.32.8/drivers/platform/x86/msi-laptop.c 2010-02-13 21:45:10.331560373 -0500 24894+++ linux-2.6.32.9/drivers/platform/x86/msi-laptop.c 2010-02-23 17:09:53.212539101 -0500
24495@@ -161,7 +161,7 @@ static int bl_update_status(struct backl 24895@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
24496 return set_lcd_level(b->props.brightness); 24896 return set_lcd_level(b->props.brightness);
24497 } 24897 }
@@ -24501,9 +24901,9 @@ diff -urNp linux-2.6.32.8/drivers/platform/x86/msi-laptop.c linux-2.6.32.8/drive
24501 .get_brightness = bl_get_brightness, 24901 .get_brightness = bl_get_brightness,
24502 .update_status = bl_update_status, 24902 .update_status = bl_update_status,
24503 }; 24903 };
24504diff -urNp linux-2.6.32.8/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.8/drivers/platform/x86/panasonic-laptop.c 24904diff -urNp linux-2.6.32.9/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.9/drivers/platform/x86/panasonic-laptop.c
24505--- linux-2.6.32.8/drivers/platform/x86/panasonic-laptop.c 2010-02-09 07:57:19.000000000 -0500 24905--- linux-2.6.32.9/drivers/platform/x86/panasonic-laptop.c 2010-02-09 07:57:19.000000000 -0500
24506+++ linux-2.6.32.8/drivers/platform/x86/panasonic-laptop.c 2010-02-13 21:45:10.332951292 -0500 24906+++ linux-2.6.32.9/drivers/platform/x86/panasonic-laptop.c 2010-02-23 17:09:53.212539101 -0500
24507@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh 24907@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
24508 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); 24908 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
24509 } 24909 }
@@ -24513,9 +24913,9 @@ diff -urNp linux-2.6.32.8/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.8
24513 .get_brightness = bl_get, 24913 .get_brightness = bl_get,
24514 .update_status = bl_set_status, 24914 .update_status = bl_set_status,
24515 }; 24915 };
24516diff -urNp linux-2.6.32.8/drivers/platform/x86/sony-laptop.c linux-2.6.32.8/drivers/platform/x86/sony-laptop.c 24916diff -urNp linux-2.6.32.9/drivers/platform/x86/sony-laptop.c linux-2.6.32.9/drivers/platform/x86/sony-laptop.c
24517--- linux-2.6.32.8/drivers/platform/x86/sony-laptop.c 2010-02-09 07:57:19.000000000 -0500 24917--- linux-2.6.32.9/drivers/platform/x86/sony-laptop.c 2010-02-09 07:57:19.000000000 -0500
24518+++ linux-2.6.32.8/drivers/platform/x86/sony-laptop.c 2010-02-13 21:45:10.333721156 -0500 24918+++ linux-2.6.32.9/drivers/platform/x86/sony-laptop.c 2010-02-23 17:09:53.212539101 -0500
24519@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness 24919@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
24520 } 24920 }
24521 24921
@@ -24525,9 +24925,9 @@ diff -urNp linux-2.6.32.8/drivers/platform/x86/sony-laptop.c linux-2.6.32.8/driv
24525 .update_status = sony_backlight_update_status, 24925 .update_status = sony_backlight_update_status,
24526 .get_brightness = sony_backlight_get_brightness, 24926 .get_brightness = sony_backlight_get_brightness,
24527 }; 24927 };
24528diff -urNp linux-2.6.32.8/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.8/drivers/platform/x86/thinkpad_acpi.c 24928diff -urNp linux-2.6.32.9/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.9/drivers/platform/x86/thinkpad_acpi.c
24529--- linux-2.6.32.8/drivers/platform/x86/thinkpad_acpi.c 2010-02-09 07:57:19.000000000 -0500 24929--- linux-2.6.32.9/drivers/platform/x86/thinkpad_acpi.c 2010-02-09 07:57:19.000000000 -0500
24530+++ linux-2.6.32.8/drivers/platform/x86/thinkpad_acpi.c 2010-02-13 21:45:10.334955247 -0500 24930+++ linux-2.6.32.9/drivers/platform/x86/thinkpad_acpi.c 2010-02-23 17:09:53.212539101 -0500
24531@@ -6073,7 +6073,7 @@ static int brightness_get(struct backlig 24931@@ -6073,7 +6073,7 @@ static int brightness_get(struct backlig
24532 return status & TP_EC_BACKLIGHT_LVLMSK; 24932 return status & TP_EC_BACKLIGHT_LVLMSK;
24533 } 24933 }
@@ -24537,9 +24937,9 @@ diff -urNp linux-2.6.32.8/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.8/dr
24537 .get_brightness = brightness_get, 24937 .get_brightness = brightness_get,
24538 .update_status = brightness_update_status, 24938 .update_status = brightness_update_status,
24539 }; 24939 };
24540diff -urNp linux-2.6.32.8/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.8/drivers/platform/x86/toshiba_acpi.c 24940diff -urNp linux-2.6.32.9/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.9/drivers/platform/x86/toshiba_acpi.c
24541--- linux-2.6.32.8/drivers/platform/x86/toshiba_acpi.c 2010-02-09 07:57:19.000000000 -0500 24941--- linux-2.6.32.9/drivers/platform/x86/toshiba_acpi.c 2010-02-09 07:57:19.000000000 -0500
24542+++ linux-2.6.32.8/drivers/platform/x86/toshiba_acpi.c 2010-02-13 21:45:10.335648314 -0500 24942+++ linux-2.6.32.9/drivers/platform/x86/toshiba_acpi.c 2010-02-23 17:09:53.212539101 -0500
24543@@ -671,7 +671,7 @@ static acpi_status remove_device(void) 24943@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
24544 return AE_OK; 24944 return AE_OK;
24545 } 24945 }
@@ -24549,9 +24949,9 @@ diff -urNp linux-2.6.32.8/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.8/dri
24549 .get_brightness = get_lcd, 24949 .get_brightness = get_lcd,
24550 .update_status = set_lcd_status, 24950 .update_status = set_lcd_status,
24551 }; 24951 };
24552diff -urNp linux-2.6.32.8/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.8/drivers/pnp/pnpbios/bioscalls.c 24952diff -urNp linux-2.6.32.9/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.9/drivers/pnp/pnpbios/bioscalls.c
24553--- linux-2.6.32.8/drivers/pnp/pnpbios/bioscalls.c 2010-02-09 07:57:19.000000000 -0500 24953--- linux-2.6.32.9/drivers/pnp/pnpbios/bioscalls.c 2010-02-09 07:57:19.000000000 -0500
24554+++ linux-2.6.32.8/drivers/pnp/pnpbios/bioscalls.c 2010-02-13 21:45:10.335648314 -0500 24954+++ linux-2.6.32.9/drivers/pnp/pnpbios/bioscalls.c 2010-02-23 17:09:53.212539101 -0500
24555@@ -60,7 +60,7 @@ do { \ 24955@@ -60,7 +60,7 @@ do { \
24556 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ 24956 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
24557 } while(0) 24957 } while(0)
@@ -24608,9 +25008,9 @@ diff -urNp linux-2.6.32.8/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.8/drivers
24608+ 25008+
24609+ pax_close_kernel(); 25009+ pax_close_kernel();
24610 } 25010 }
24611diff -urNp linux-2.6.32.8/drivers/pnp/quirks.c linux-2.6.32.8/drivers/pnp/quirks.c 25011diff -urNp linux-2.6.32.9/drivers/pnp/quirks.c linux-2.6.32.9/drivers/pnp/quirks.c
24612--- linux-2.6.32.8/drivers/pnp/quirks.c 2010-02-09 07:57:19.000000000 -0500 25012--- linux-2.6.32.9/drivers/pnp/quirks.c 2010-02-09 07:57:19.000000000 -0500
24613+++ linux-2.6.32.8/drivers/pnp/quirks.c 2010-02-13 21:45:10.335648314 -0500 25013+++ linux-2.6.32.9/drivers/pnp/quirks.c 2010-02-23 17:09:53.212539101 -0500
24614@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { 25014@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
24615 /* PnP resources that might overlap PCI BARs */ 25015 /* PnP resources that might overlap PCI BARs */
24616 {"PNP0c01", quirk_system_pci_resources}, 25016 {"PNP0c01", quirk_system_pci_resources},
@@ -24620,9 +25020,9 @@ diff -urNp linux-2.6.32.8/drivers/pnp/quirks.c linux-2.6.32.8/drivers/pnp/quirks
24620 }; 25020 };
24621 25021
24622 void pnp_fixup_device(struct pnp_dev *dev) 25022 void pnp_fixup_device(struct pnp_dev *dev)
24623diff -urNp linux-2.6.32.8/drivers/pnp/resource.c linux-2.6.32.8/drivers/pnp/resource.c 25023diff -urNp linux-2.6.32.9/drivers/pnp/resource.c linux-2.6.32.9/drivers/pnp/resource.c
24624--- linux-2.6.32.8/drivers/pnp/resource.c 2010-02-09 07:57:19.000000000 -0500 25024--- linux-2.6.32.9/drivers/pnp/resource.c 2010-02-09 07:57:19.000000000 -0500
24625+++ linux-2.6.32.8/drivers/pnp/resource.c 2010-02-13 21:45:10.335648314 -0500 25025+++ linux-2.6.32.9/drivers/pnp/resource.c 2010-02-23 17:09:53.212539101 -0500
24626@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s 25026@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
24627 return 1; 25027 return 1;
24628 25028
@@ -24641,9 +25041,9 @@ diff -urNp linux-2.6.32.8/drivers/pnp/resource.c linux-2.6.32.8/drivers/pnp/reso
24641 return 0; 25041 return 0;
24642 25042
24643 /* check if the resource is reserved */ 25043 /* check if the resource is reserved */
24644diff -urNp linux-2.6.32.8/drivers/s390/cio/qdio_perf.c linux-2.6.32.8/drivers/s390/cio/qdio_perf.c 25044diff -urNp linux-2.6.32.9/drivers/s390/cio/qdio_perf.c linux-2.6.32.9/drivers/s390/cio/qdio_perf.c
24645--- linux-2.6.32.8/drivers/s390/cio/qdio_perf.c 2010-02-09 07:57:19.000000000 -0500 25045--- linux-2.6.32.9/drivers/s390/cio/qdio_perf.c 2010-02-09 07:57:19.000000000 -0500
24646+++ linux-2.6.32.8/drivers/s390/cio/qdio_perf.c 2010-02-13 21:45:10.335648314 -0500 25046+++ linux-2.6.32.9/drivers/s390/cio/qdio_perf.c 2010-02-23 17:09:53.216464462 -0500
24647@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ 25047@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
24648 static int qdio_perf_proc_show(struct seq_file *m, void *v) 25048 static int qdio_perf_proc_show(struct seq_file *m, void *v)
24649 { 25049 {
@@ -24719,9 +25119,9 @@ diff -urNp linux-2.6.32.8/drivers/s390/cio/qdio_perf.c linux-2.6.32.8/drivers/s3
24719 seq_printf(m, "\n"); 25119 seq_printf(m, "\n");
24720 return 0; 25120 return 0;
24721 } 25121 }
24722diff -urNp linux-2.6.32.8/drivers/s390/cio/qdio_perf.h linux-2.6.32.8/drivers/s390/cio/qdio_perf.h 25122diff -urNp linux-2.6.32.9/drivers/s390/cio/qdio_perf.h linux-2.6.32.9/drivers/s390/cio/qdio_perf.h
24723--- linux-2.6.32.8/drivers/s390/cio/qdio_perf.h 2010-02-09 07:57:19.000000000 -0500 25123--- linux-2.6.32.9/drivers/s390/cio/qdio_perf.h 2010-02-09 07:57:19.000000000 -0500
24724+++ linux-2.6.32.8/drivers/s390/cio/qdio_perf.h 2010-02-13 21:45:10.336669798 -0500 25124+++ linux-2.6.32.9/drivers/s390/cio/qdio_perf.h 2010-02-23 17:09:53.216464462 -0500
24725@@ -13,46 +13,46 @@ 25125@@ -13,46 +13,46 @@
24726 25126
24727 struct qdio_perf_stats { 25127 struct qdio_perf_stats {
@@ -24794,9 +25194,9 @@ diff -urNp linux-2.6.32.8/drivers/s390/cio/qdio_perf.h linux-2.6.32.8/drivers/s3
24794 } 25194 }
24795 25195
24796 int qdio_setup_perf_stats(void); 25196 int qdio_setup_perf_stats(void);
24797diff -urNp linux-2.6.32.8/drivers/scsi/ipr.c linux-2.6.32.8/drivers/scsi/ipr.c 25197diff -urNp linux-2.6.32.9/drivers/scsi/ipr.c linux-2.6.32.9/drivers/scsi/ipr.c
24798--- linux-2.6.32.8/drivers/scsi/ipr.c 2010-02-09 07:57:19.000000000 -0500 25198--- linux-2.6.32.9/drivers/scsi/ipr.c 2010-02-09 07:57:19.000000000 -0500
24799+++ linux-2.6.32.8/drivers/scsi/ipr.c 2010-02-13 21:45:10.370958126 -0500 25199+++ linux-2.6.32.9/drivers/scsi/ipr.c 2010-02-23 17:09:53.216464462 -0500
24800@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q 25200@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
24801 return true; 25201 return true;
24802 } 25202 }
@@ -24806,9 +25206,9 @@ diff -urNp linux-2.6.32.8/drivers/scsi/ipr.c linux-2.6.32.8/drivers/scsi/ipr.c
24806 .phy_reset = ipr_ata_phy_reset, 25206 .phy_reset = ipr_ata_phy_reset,
24807 .hardreset = ipr_sata_reset, 25207 .hardreset = ipr_sata_reset,
24808 .post_internal_cmd = ipr_ata_post_internal, 25208 .post_internal_cmd = ipr_ata_post_internal,
24809diff -urNp linux-2.6.32.8/drivers/scsi/libfc/fc_exch.c linux-2.6.32.8/drivers/scsi/libfc/fc_exch.c 25209diff -urNp linux-2.6.32.9/drivers/scsi/libfc/fc_exch.c linux-2.6.32.9/drivers/scsi/libfc/fc_exch.c
24810--- linux-2.6.32.8/drivers/scsi/libfc/fc_exch.c 2010-02-09 07:57:19.000000000 -0500 25210--- linux-2.6.32.9/drivers/scsi/libfc/fc_exch.c 2010-02-09 07:57:19.000000000 -0500
24811+++ linux-2.6.32.8/drivers/scsi/libfc/fc_exch.c 2010-02-13 21:45:10.441707501 -0500 25211+++ linux-2.6.32.9/drivers/scsi/libfc/fc_exch.c 2010-02-23 17:09:53.216464462 -0500
24812@@ -86,12 +86,12 @@ struct fc_exch_mgr { 25212@@ -86,12 +86,12 @@ struct fc_exch_mgr {
24813 * all together if not used XXX 25213 * all together if not used XXX
24814 */ 25214 */
@@ -24930,9 +25330,9 @@ diff -urNp linux-2.6.32.8/drivers/scsi/libfc/fc_exch.c linux-2.6.32.8/drivers/sc
24930 25330
24931 fc_frame_free(fp); 25331 fc_frame_free(fp);
24932 } 25332 }
24933diff -urNp linux-2.6.32.8/drivers/scsi/libsas/sas_ata.c linux-2.6.32.8/drivers/scsi/libsas/sas_ata.c 25333diff -urNp linux-2.6.32.9/drivers/scsi/libsas/sas_ata.c linux-2.6.32.9/drivers/scsi/libsas/sas_ata.c
24934--- linux-2.6.32.8/drivers/scsi/libsas/sas_ata.c 2010-02-09 07:57:19.000000000 -0500 25334--- linux-2.6.32.9/drivers/scsi/libsas/sas_ata.c 2010-02-09 07:57:19.000000000 -0500
24935+++ linux-2.6.32.8/drivers/scsi/libsas/sas_ata.c 2010-02-13 21:45:10.458739896 -0500 25335+++ linux-2.6.32.9/drivers/scsi/libsas/sas_ata.c 2010-02-23 17:09:53.216464462 -0500
24936@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l 25336@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
24937 } 25337 }
24938 } 25338 }
@@ -24942,9 +25342,9 @@ diff -urNp linux-2.6.32.8/drivers/scsi/libsas/sas_ata.c linux-2.6.32.8/drivers/s
24942 .phy_reset = sas_ata_phy_reset, 25342 .phy_reset = sas_ata_phy_reset,
24943 .post_internal_cmd = sas_ata_post_internal, 25343 .post_internal_cmd = sas_ata_post_internal,
24944 .qc_prep = ata_noop_qc_prep, 25344 .qc_prep = ata_noop_qc_prep,
24945diff -urNp linux-2.6.32.8/drivers/scsi/scsi_logging.h linux-2.6.32.8/drivers/scsi/scsi_logging.h 25345diff -urNp linux-2.6.32.9/drivers/scsi/scsi_logging.h linux-2.6.32.9/drivers/scsi/scsi_logging.h
24946--- linux-2.6.32.8/drivers/scsi/scsi_logging.h 2010-02-09 07:57:19.000000000 -0500 25346--- linux-2.6.32.9/drivers/scsi/scsi_logging.h 2010-02-09 07:57:19.000000000 -0500
24947+++ linux-2.6.32.8/drivers/scsi/scsi_logging.h 2010-02-13 21:45:10.464989461 -0500 25347+++ linux-2.6.32.9/drivers/scsi/scsi_logging.h 2010-02-23 17:09:53.216464462 -0500
24948@@ -51,7 +51,7 @@ do { \ 25348@@ -51,7 +51,7 @@ do { \
24949 } while (0); \ 25349 } while (0); \
24950 } while (0) 25350 } while (0)
@@ -24954,9 +25354,9 @@ diff -urNp linux-2.6.32.8/drivers/scsi/scsi_logging.h linux-2.6.32.8/drivers/scs
24954 #endif /* CONFIG_SCSI_LOGGING */ 25354 #endif /* CONFIG_SCSI_LOGGING */
24955 25355
24956 /* 25356 /*
24957diff -urNp linux-2.6.32.8/drivers/scsi/sg.c linux-2.6.32.8/drivers/scsi/sg.c 25357diff -urNp linux-2.6.32.9/drivers/scsi/sg.c linux-2.6.32.9/drivers/scsi/sg.c
24958--- linux-2.6.32.8/drivers/scsi/sg.c 2010-02-09 07:57:19.000000000 -0500 25358--- linux-2.6.32.9/drivers/scsi/sg.c 2010-02-09 07:57:19.000000000 -0500
24959+++ linux-2.6.32.8/drivers/scsi/sg.c 2010-02-13 21:45:10.480707047 -0500 25359+++ linux-2.6.32.9/drivers/scsi/sg.c 2010-02-23 17:09:53.216464462 -0500
24960@@ -2292,7 +2292,7 @@ struct sg_proc_leaf { 25360@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
24961 const struct file_operations * fops; 25361 const struct file_operations * fops;
24962 }; 25362 };
@@ -24975,9 +25375,9 @@ diff -urNp linux-2.6.32.8/drivers/scsi/sg.c linux-2.6.32.8/drivers/scsi/sg.c
24975 25375
24976 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); 25376 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
24977 if (!sg_proc_sgp) 25377 if (!sg_proc_sgp)
24978diff -urNp linux-2.6.32.8/drivers/serial/8250_pci.c linux-2.6.32.8/drivers/serial/8250_pci.c 25378diff -urNp linux-2.6.32.9/drivers/serial/8250_pci.c linux-2.6.32.9/drivers/serial/8250_pci.c
24979--- linux-2.6.32.8/drivers/serial/8250_pci.c 2010-02-09 07:57:19.000000000 -0500 25379--- linux-2.6.32.9/drivers/serial/8250_pci.c 2010-02-09 07:57:19.000000000 -0500
24980+++ linux-2.6.32.8/drivers/serial/8250_pci.c 2010-02-13 21:45:10.481540388 -0500 25380+++ linux-2.6.32.9/drivers/serial/8250_pci.c 2010-02-23 17:09:53.216464462 -0500
24981@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t 25381@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
24982 PCI_ANY_ID, PCI_ANY_ID, 25382 PCI_ANY_ID, PCI_ANY_ID,
24983 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, 25383 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
@@ -24987,9 +25387,9 @@ diff -urNp linux-2.6.32.8/drivers/serial/8250_pci.c linux-2.6.32.8/drivers/seria
24987 }; 25387 };
24988 25388
24989 static struct pci_driver serial_pci_driver = { 25389 static struct pci_driver serial_pci_driver = {
24990diff -urNp linux-2.6.32.8/drivers/serial/kgdboc.c linux-2.6.32.8/drivers/serial/kgdboc.c 25390diff -urNp linux-2.6.32.9/drivers/serial/kgdboc.c linux-2.6.32.9/drivers/serial/kgdboc.c
24991--- linux-2.6.32.8/drivers/serial/kgdboc.c 2010-02-09 07:57:19.000000000 -0500 25391--- linux-2.6.32.9/drivers/serial/kgdboc.c 2010-02-09 07:57:19.000000000 -0500
24992+++ linux-2.6.32.8/drivers/serial/kgdboc.c 2010-02-13 21:45:10.481540388 -0500 25392+++ linux-2.6.32.9/drivers/serial/kgdboc.c 2010-02-23 17:09:53.216464462 -0500
24993@@ -18,7 +18,7 @@ 25393@@ -18,7 +18,7 @@
24994 25394
24995 #define MAX_CONFIG_LEN 40 25395 #define MAX_CONFIG_LEN 40
@@ -25008,9 +25408,9 @@ diff -urNp linux-2.6.32.8/drivers/serial/kgdboc.c linux-2.6.32.8/drivers/serial/
25008 .name = "kgdboc", 25408 .name = "kgdboc",
25009 .read_char = kgdboc_get_char, 25409 .read_char = kgdboc_get_char,
25010 .write_char = kgdboc_put_char, 25410 .write_char = kgdboc_put_char,
25011diff -urNp linux-2.6.32.8/drivers/staging/android/binder.c linux-2.6.32.8/drivers/staging/android/binder.c 25411diff -urNp linux-2.6.32.9/drivers/staging/android/binder.c linux-2.6.32.9/drivers/staging/android/binder.c
25012--- linux-2.6.32.8/drivers/staging/android/binder.c 2010-02-09 07:57:19.000000000 -0500 25412--- linux-2.6.32.9/drivers/staging/android/binder.c 2010-02-09 07:57:19.000000000 -0500
25013+++ linux-2.6.32.8/drivers/staging/android/binder.c 2010-02-13 21:45:10.481540388 -0500 25413+++ linux-2.6.32.9/drivers/staging/android/binder.c 2010-02-23 17:09:53.216464462 -0500
25014@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a 25414@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
25015 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); 25415 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
25016 } 25416 }
@@ -25020,9 +25420,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/android/binder.c linux-2.6.32.8/driver
25020 .open = binder_vma_open, 25420 .open = binder_vma_open,
25021 .close = binder_vma_close, 25421 .close = binder_vma_close,
25022 }; 25422 };
25023diff -urNp linux-2.6.32.8/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.8/drivers/staging/b3dfg/b3dfg.c 25423diff -urNp linux-2.6.32.9/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.9/drivers/staging/b3dfg/b3dfg.c
25024--- linux-2.6.32.8/drivers/staging/b3dfg/b3dfg.c 2010-02-09 07:57:19.000000000 -0500 25424--- linux-2.6.32.9/drivers/staging/b3dfg/b3dfg.c 2010-02-09 07:57:19.000000000 -0500
25025+++ linux-2.6.32.8/drivers/staging/b3dfg/b3dfg.c 2010-02-13 21:45:10.482757658 -0500 25425+++ linux-2.6.32.9/drivers/staging/b3dfg/b3dfg.c 2010-02-23 17:09:53.220509464 -0500
25026@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are 25426@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
25027 return VM_FAULT_NOPAGE; 25427 return VM_FAULT_NOPAGE;
25028 } 25428 }
@@ -25041,9 +25441,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.8/drivers/s
25041 .owner = THIS_MODULE, 25441 .owner = THIS_MODULE,
25042 .open = b3dfg_open, 25442 .open = b3dfg_open,
25043 .release = b3dfg_release, 25443 .release = b3dfg_release,
25044diff -urNp linux-2.6.32.8/drivers/staging/comedi/comedi_fops.c linux-2.6.32.8/drivers/staging/comedi/comedi_fops.c 25444diff -urNp linux-2.6.32.9/drivers/staging/comedi/comedi_fops.c linux-2.6.32.9/drivers/staging/comedi/comedi_fops.c
25045--- linux-2.6.32.8/drivers/staging/comedi/comedi_fops.c 2010-02-09 07:57:19.000000000 -0500 25445--- linux-2.6.32.9/drivers/staging/comedi/comedi_fops.c 2010-02-09 07:57:19.000000000 -0500
25046+++ linux-2.6.32.8/drivers/staging/comedi/comedi_fops.c 2010-02-13 21:45:10.482757658 -0500 25446+++ linux-2.6.32.9/drivers/staging/comedi/comedi_fops.c 2010-02-23 17:09:53.220509464 -0500
25047@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct 25447@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
25048 mutex_unlock(&dev->mutex); 25448 mutex_unlock(&dev->mutex);
25049 } 25449 }
@@ -25053,9 +25453,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/comedi/comedi_fops.c linux-2.6.32.8/dr
25053 .close = comedi_unmap, 25453 .close = comedi_unmap,
25054 }; 25454 };
25055 25455
25056diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.8/drivers/staging/dream/qdsp5/adsp_driver.c 25456diff -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
25057--- linux-2.6.32.8/drivers/staging/dream/qdsp5/adsp_driver.c 2010-02-09 07:57:19.000000000 -0500 25457--- linux-2.6.32.9/drivers/staging/dream/qdsp5/adsp_driver.c 2010-02-09 07:57:19.000000000 -0500
25058+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/adsp_driver.c 2010-02-13 21:45:10.483595617 -0500 25458+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/adsp_driver.c 2010-02-23 17:09:53.220509464 -0500
25059@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi 25459@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
25060 static dev_t adsp_devno; 25460 static dev_t adsp_devno;
25061 static struct class *adsp_class; 25461 static struct class *adsp_class;
@@ -25065,9 +25465,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32
25065 .owner = THIS_MODULE, 25465 .owner = THIS_MODULE,
25066 .open = adsp_open, 25466 .open = adsp_open,
25067 .unlocked_ioctl = adsp_ioctl, 25467 .unlocked_ioctl = adsp_ioctl,
25068diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_aac.c 25468diff -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
25069--- linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_aac.c 2010-02-09 07:57:19.000000000 -0500 25469--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_aac.c 2010-02-09 07:57:19.000000000 -0500
25070+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_aac.c 2010-02-13 21:45:10.483595617 -0500 25470+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_aac.c 2010-02-23 17:09:53.220509464 -0500
25071@@ -1022,7 +1022,7 @@ done: 25471@@ -1022,7 +1022,7 @@ done:
25072 return rc; 25472 return rc;
25073 } 25473 }
@@ -25077,9 +25477,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.8
25077 .owner = THIS_MODULE, 25477 .owner = THIS_MODULE,
25078 .open = audio_open, 25478 .open = audio_open,
25079 .release = audio_release, 25479 .release = audio_release,
25080diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_amrnb.c 25480diff -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
25081--- linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-02-09 07:57:19.000000000 -0500 25481--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-02-09 07:57:19.000000000 -0500
25082+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-02-13 21:45:10.483595617 -0500 25482+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-02-23 17:09:53.220509464 -0500
25083@@ -833,7 +833,7 @@ done: 25483@@ -833,7 +833,7 @@ done:
25084 return rc; 25484 return rc;
25085 } 25485 }
@@ -25089,9 +25489,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32
25089 .owner = THIS_MODULE, 25489 .owner = THIS_MODULE,
25090 .open = audamrnb_open, 25490 .open = audamrnb_open,
25091 .release = audamrnb_release, 25491 .release = audamrnb_release,
25092diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_evrc.c 25492diff -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
25093--- linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_evrc.c 2010-02-09 07:57:19.000000000 -0500 25493--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_evrc.c 2010-02-09 07:57:19.000000000 -0500
25094+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_evrc.c 2010-02-13 21:45:10.483595617 -0500 25494+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_evrc.c 2010-02-23 17:09:53.220509464 -0500
25095@@ -805,7 +805,7 @@ dma_fail: 25495@@ -805,7 +805,7 @@ dma_fail:
25096 return rc; 25496 return rc;
25097 } 25497 }
@@ -25101,9 +25501,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.
25101 .owner = THIS_MODULE, 25501 .owner = THIS_MODULE,
25102 .open = audevrc_open, 25502 .open = audevrc_open,
25103 .release = audevrc_release, 25503 .release = audevrc_release,
25104diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_in.c 25504diff -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
25105--- linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_in.c 2010-02-09 07:57:19.000000000 -0500 25505--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_in.c 2010-02-09 07:57:19.000000000 -0500
25106+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_in.c 2010-02-13 21:45:10.484594348 -0500 25506+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_in.c 2010-02-23 17:09:53.220509464 -0500
25107@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino 25507@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
25108 return 0; 25508 return 0;
25109 } 25509 }
@@ -25122,9 +25522,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.8/
25122 .owner = THIS_MODULE, 25522 .owner = THIS_MODULE,
25123 .open = audpre_open, 25523 .open = audpre_open,
25124 .unlocked_ioctl = audpre_ioctl, 25524 .unlocked_ioctl = audpre_ioctl,
25125diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_mp3.c 25525diff -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
25126--- linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_mp3.c 2010-02-09 07:57:19.000000000 -0500 25526--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_mp3.c 2010-02-09 07:57:19.000000000 -0500
25127+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_mp3.c 2010-02-13 21:45:10.484594348 -0500 25527+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_mp3.c 2010-02-23 17:09:53.220509464 -0500
25128@@ -941,7 +941,7 @@ done: 25528@@ -941,7 +941,7 @@ done:
25129 return rc; 25529 return rc;
25130 } 25530 }
@@ -25134,9 +25534,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.8
25134 .owner = THIS_MODULE, 25534 .owner = THIS_MODULE,
25135 .open = audio_open, 25535 .open = audio_open,
25136 .release = audio_release, 25536 .release = audio_release,
25137diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_out.c 25537diff -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
25138--- linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_out.c 2010-02-09 07:57:19.000000000 -0500 25538--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_out.c 2010-02-09 07:57:19.000000000 -0500
25139+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_out.c 2010-02-13 21:45:10.484594348 -0500 25539+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_out.c 2010-02-23 17:09:53.220509464 -0500
25140@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod 25540@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
25141 return 0; 25541 return 0;
25142 } 25542 }
@@ -25155,9 +25555,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.8
25155 .owner = THIS_MODULE, 25555 .owner = THIS_MODULE,
25156 .open = audpp_open, 25556 .open = audpp_open,
25157 .unlocked_ioctl = audpp_ioctl, 25557 .unlocked_ioctl = audpp_ioctl,
25158diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_qcelp.c 25558diff -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
25159--- linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-02-09 07:57:19.000000000 -0500 25559--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-02-09 07:57:19.000000000 -0500
25160+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-02-13 21:45:10.485557746 -0500 25560+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-02-23 17:09:53.220509464 -0500
25161@@ -816,7 +816,7 @@ err: 25561@@ -816,7 +816,7 @@ err:
25162 return rc; 25562 return rc;
25163 } 25563 }
@@ -25167,9 +25567,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32
25167 .owner = THIS_MODULE, 25567 .owner = THIS_MODULE,
25168 .open = audqcelp_open, 25568 .open = audqcelp_open,
25169 .release = audqcelp_release, 25569 .release = audqcelp_release,
25170diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.8/drivers/staging/dream/qdsp5/snd.c 25570diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.9/drivers/staging/dream/qdsp5/snd.c
25171--- linux-2.6.32.8/drivers/staging/dream/qdsp5/snd.c 2010-02-09 07:57:19.000000000 -0500 25571--- linux-2.6.32.9/drivers/staging/dream/qdsp5/snd.c 2010-02-09 07:57:19.000000000 -0500
25172+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/snd.c 2010-02-13 21:45:10.485557746 -0500 25572+++ linux-2.6.32.9/drivers/staging/dream/qdsp5/snd.c 2010-02-23 17:09:53.220509464 -0500
25173@@ -242,7 +242,7 @@ err: 25573@@ -242,7 +242,7 @@ err:
25174 return rc; 25574 return rc;
25175 } 25575 }
@@ -25179,9 +25579,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.8/drive
25179 .owner = THIS_MODULE, 25579 .owner = THIS_MODULE,
25180 .open = snd_open, 25580 .open = snd_open,
25181 .release = snd_release, 25581 .release = snd_release,
25182diff -urNp linux-2.6.32.8/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.8/drivers/staging/dream/smd/smd_qmi.c 25582diff -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
25183--- linux-2.6.32.8/drivers/staging/dream/smd/smd_qmi.c 2010-02-09 07:57:19.000000000 -0500 25583--- linux-2.6.32.9/drivers/staging/dream/smd/smd_qmi.c 2010-02-09 07:57:19.000000000 -0500
25184+++ linux-2.6.32.8/drivers/staging/dream/smd/smd_qmi.c 2010-02-13 21:45:10.485557746 -0500 25584+++ linux-2.6.32.9/drivers/staging/dream/smd/smd_qmi.c 2010-02-23 17:09:53.220509464 -0500
25185@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, 25585@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
25186 return 0; 25586 return 0;
25187 } 25587 }
@@ -25191,9 +25591,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.8/dri
25191 .owner = THIS_MODULE, 25591 .owner = THIS_MODULE,
25192 .read = qmi_read, 25592 .read = qmi_read,
25193 .write = qmi_write, 25593 .write = qmi_write,
25194diff -urNp linux-2.6.32.8/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.8/drivers/staging/dream/smd/smd_rpcrouter_device.c 25594diff -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
25195--- linux-2.6.32.8/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-02-09 07:57:19.000000000 -0500 25595--- linux-2.6.32.9/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-02-09 07:57:19.000000000 -0500
25196+++ linux-2.6.32.8/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-02-13 21:45:10.485557746 -0500 25596+++ linux-2.6.32.9/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-02-23 17:09:53.220509464 -0500
25197@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file 25597@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
25198 return rc; 25598 return rc;
25199 } 25599 }
@@ -25212,9 +25612,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/dream/smd/smd_rpcrouter_device.c linux
25212 .owner = THIS_MODULE, 25612 .owner = THIS_MODULE,
25213 .open = rpcrouter_open, 25613 .open = rpcrouter_open,
25214 .release = rpcrouter_release, 25614 .release = rpcrouter_release,
25215diff -urNp linux-2.6.32.8/drivers/staging/dst/dcore.c linux-2.6.32.8/drivers/staging/dst/dcore.c 25615diff -urNp linux-2.6.32.9/drivers/staging/dst/dcore.c linux-2.6.32.9/drivers/staging/dst/dcore.c
25216--- linux-2.6.32.8/drivers/staging/dst/dcore.c 2010-02-09 07:57:19.000000000 -0500 25616--- linux-2.6.32.9/drivers/staging/dst/dcore.c 2010-02-09 07:57:19.000000000 -0500
25217+++ linux-2.6.32.8/drivers/staging/dst/dcore.c 2010-02-13 21:45:10.486568692 -0500 25617+++ linux-2.6.32.9/drivers/staging/dst/dcore.c 2010-02-23 17:09:53.220509464 -0500
25218@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi 25618@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
25219 return 0; 25619 return 0;
25220 } 25620 }
@@ -25233,9 +25633,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/dst/dcore.c linux-2.6.32.8/drivers/sta
25233 snprintf(n->name, sizeof(n->name), "%s", ctl->name); 25633 snprintf(n->name, sizeof(n->name), "%s", ctl->name);
25234 25634
25235 err = dst_node_sysfs_init(n); 25635 err = dst_node_sysfs_init(n);
25236diff -urNp linux-2.6.32.8/drivers/staging/dst/trans.c linux-2.6.32.8/drivers/staging/dst/trans.c 25636diff -urNp linux-2.6.32.9/drivers/staging/dst/trans.c linux-2.6.32.9/drivers/staging/dst/trans.c
25237--- linux-2.6.32.8/drivers/staging/dst/trans.c 2010-02-09 07:57:19.000000000 -0500 25637--- linux-2.6.32.9/drivers/staging/dst/trans.c 2010-02-09 07:57:19.000000000 -0500
25238+++ linux-2.6.32.8/drivers/staging/dst/trans.c 2010-02-13 21:45:10.486568692 -0500 25638+++ linux-2.6.32.9/drivers/staging/dst/trans.c 2010-02-23 17:09:53.220509464 -0500
25239@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, 25639@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
25240 t->error = 0; 25640 t->error = 0;
25241 t->retries = 0; 25641 t->retries = 0;
@@ -25245,9 +25645,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/dst/trans.c linux-2.6.32.8/drivers/sta
25245 25645
25246 t->enc = bio_data_dir(bio); 25646 t->enc = bio_data_dir(bio);
25247 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); 25647 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
25248diff -urNp linux-2.6.32.8/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.8/drivers/staging/go7007/go7007-v4l2.c 25648diff -urNp linux-2.6.32.9/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.9/drivers/staging/go7007/go7007-v4l2.c
25249--- linux-2.6.32.8/drivers/staging/go7007/go7007-v4l2.c 2010-02-09 07:57:19.000000000 -0500 25649--- linux-2.6.32.9/drivers/staging/go7007/go7007-v4l2.c 2010-02-09 07:57:19.000000000 -0500
25250+++ linux-2.6.32.8/drivers/staging/go7007/go7007-v4l2.c 2010-02-13 21:45:10.486568692 -0500 25650+++ linux-2.6.32.9/drivers/staging/go7007/go7007-v4l2.c 2010-02-23 17:09:53.220509464 -0500
25251@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are 25651@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
25252 return 0; 25652 return 0;
25253 } 25653 }
@@ -25257,9 +25657,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.8/dr
25257 .open = go7007_vm_open, 25657 .open = go7007_vm_open,
25258 .close = go7007_vm_close, 25658 .close = go7007_vm_close,
25259 .fault = go7007_vm_fault, 25659 .fault = go7007_vm_fault,
25260diff -urNp linux-2.6.32.8/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.8/drivers/staging/hv/blkvsc_drv.c 25660diff -urNp linux-2.6.32.9/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.9/drivers/staging/hv/blkvsc_drv.c
25261--- linux-2.6.32.8/drivers/staging/hv/blkvsc_drv.c 2010-02-09 07:57:19.000000000 -0500 25661--- linux-2.6.32.9/drivers/staging/hv/blkvsc_drv.c 2010-02-09 07:57:19.000000000 -0500
25262+++ linux-2.6.32.8/drivers/staging/hv/blkvsc_drv.c 2010-02-13 21:45:10.486568692 -0500 25662+++ linux-2.6.32.9/drivers/staging/hv/blkvsc_drv.c 2010-02-23 17:09:53.220509464 -0500
25263@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV 25663@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
25264 /* The one and only one */ 25664 /* The one and only one */
25265 static struct blkvsc_driver_context g_blkvsc_drv; 25665 static struct blkvsc_driver_context g_blkvsc_drv;
@@ -25269,9 +25669,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.8/drivers
25269 .owner = THIS_MODULE, 25669 .owner = THIS_MODULE,
25270 .open = blkvsc_open, 25670 .open = blkvsc_open,
25271 .release = blkvsc_release, 25671 .release = blkvsc_release,
25272diff -urNp linux-2.6.32.8/drivers/staging/panel/panel.c linux-2.6.32.8/drivers/staging/panel/panel.c 25672diff -urNp linux-2.6.32.9/drivers/staging/panel/panel.c linux-2.6.32.9/drivers/staging/panel/panel.c
25273--- linux-2.6.32.8/drivers/staging/panel/panel.c 2010-02-09 07:57:19.000000000 -0500 25673--- linux-2.6.32.9/drivers/staging/panel/panel.c 2010-02-09 07:57:19.000000000 -0500
25274+++ linux-2.6.32.8/drivers/staging/panel/panel.c 2010-02-13 21:45:10.487839826 -0500 25674+++ linux-2.6.32.9/drivers/staging/panel/panel.c 2010-02-23 17:09:53.224545810 -0500
25275@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino 25675@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
25276 return 0; 25676 return 0;
25277 } 25677 }
@@ -25290,9 +25690,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/panel/panel.c linux-2.6.32.8/drivers/s
25290 .read = keypad_read, /* read */ 25690 .read = keypad_read, /* read */
25291 .open = keypad_open, /* open */ 25691 .open = keypad_open, /* open */
25292 .release = keypad_release, /* close */ 25692 .release = keypad_release, /* close */
25293diff -urNp linux-2.6.32.8/drivers/staging/phison/phison.c linux-2.6.32.8/drivers/staging/phison/phison.c 25693diff -urNp linux-2.6.32.9/drivers/staging/phison/phison.c linux-2.6.32.9/drivers/staging/phison/phison.c
25294--- linux-2.6.32.8/drivers/staging/phison/phison.c 2010-02-09 07:57:19.000000000 -0500 25694--- linux-2.6.32.9/drivers/staging/phison/phison.c 2010-02-09 07:57:19.000000000 -0500
25295+++ linux-2.6.32.8/drivers/staging/phison/phison.c 2010-02-13 21:45:10.487839826 -0500 25695+++ linux-2.6.32.9/drivers/staging/phison/phison.c 2010-02-23 17:09:53.224545810 -0500
25296@@ -43,7 +43,7 @@ static struct scsi_host_template phison_ 25696@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
25297 ATA_BMDMA_SHT(DRV_NAME), 25697 ATA_BMDMA_SHT(DRV_NAME),
25298 }; 25698 };
@@ -25302,9 +25702,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/phison/phison.c linux-2.6.32.8/drivers
25302 .inherits = &ata_bmdma_port_ops, 25702 .inherits = &ata_bmdma_port_ops,
25303 .prereset = phison_pre_reset, 25703 .prereset = phison_pre_reset,
25304 }; 25704 };
25305diff -urNp linux-2.6.32.8/drivers/staging/poch/poch.c linux-2.6.32.8/drivers/staging/poch/poch.c 25705diff -urNp linux-2.6.32.9/drivers/staging/poch/poch.c linux-2.6.32.9/drivers/staging/poch/poch.c
25306--- linux-2.6.32.8/drivers/staging/poch/poch.c 2010-02-09 07:57:19.000000000 -0500 25706--- linux-2.6.32.9/drivers/staging/poch/poch.c 2010-02-09 07:57:19.000000000 -0500
25307+++ linux-2.6.32.8/drivers/staging/poch/poch.c 2010-02-13 21:45:10.488526629 -0500 25707+++ linux-2.6.32.9/drivers/staging/poch/poch.c 2010-02-23 17:09:53.224545810 -0500
25308@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod 25708@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
25309 return 0; 25709 return 0;
25310 } 25710 }
@@ -25314,9 +25714,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/poch/poch.c linux-2.6.32.8/drivers/sta
25314 .owner = THIS_MODULE, 25714 .owner = THIS_MODULE,
25315 .open = poch_open, 25715 .open = poch_open,
25316 .release = poch_release, 25716 .release = poch_release,
25317diff -urNp linux-2.6.32.8/drivers/staging/pohmelfs/inode.c linux-2.6.32.8/drivers/staging/pohmelfs/inode.c 25717diff -urNp linux-2.6.32.9/drivers/staging/pohmelfs/inode.c linux-2.6.32.9/drivers/staging/pohmelfs/inode.c
25318--- linux-2.6.32.8/drivers/staging/pohmelfs/inode.c 2010-02-09 07:57:19.000000000 -0500 25718--- linux-2.6.32.9/drivers/staging/pohmelfs/inode.c 2010-02-09 07:57:19.000000000 -0500
25319+++ linux-2.6.32.8/drivers/staging/pohmelfs/inode.c 2010-02-13 21:45:10.488526629 -0500 25719+++ linux-2.6.32.9/drivers/staging/pohmelfs/inode.c 2010-02-23 17:09:53.224545810 -0500
25320@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su 25720@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
25321 mutex_init(&psb->mcache_lock); 25721 mutex_init(&psb->mcache_lock);
25322 psb->mcache_root = RB_ROOT; 25722 psb->mcache_root = RB_ROOT;
@@ -25326,9 +25726,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/pohmelfs/inode.c linux-2.6.32.8/driver
25326 25726
25327 psb->trans_max_pages = 100; 25727 psb->trans_max_pages = 100;
25328 25728
25329diff -urNp linux-2.6.32.8/drivers/staging/pohmelfs/mcache.c linux-2.6.32.8/drivers/staging/pohmelfs/mcache.c 25729diff -urNp linux-2.6.32.9/drivers/staging/pohmelfs/mcache.c linux-2.6.32.9/drivers/staging/pohmelfs/mcache.c
25330--- linux-2.6.32.8/drivers/staging/pohmelfs/mcache.c 2010-02-09 07:57:19.000000000 -0500 25730--- linux-2.6.32.9/drivers/staging/pohmelfs/mcache.c 2010-02-09 07:57:19.000000000 -0500
25331+++ linux-2.6.32.8/drivers/staging/pohmelfs/mcache.c 2010-02-13 21:45:10.488526629 -0500 25731+++ linux-2.6.32.9/drivers/staging/pohmelfs/mcache.c 2010-02-23 17:09:53.224545810 -0500
25332@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ 25732@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
25333 m->data = data; 25733 m->data = data;
25334 m->start = start; 25734 m->start = start;
@@ -25338,9 +25738,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/pohmelfs/mcache.c linux-2.6.32.8/drive
25338 25738
25339 mutex_lock(&psb->mcache_lock); 25739 mutex_lock(&psb->mcache_lock);
25340 err = pohmelfs_mcache_insert(psb, m); 25740 err = pohmelfs_mcache_insert(psb, m);
25341diff -urNp linux-2.6.32.8/drivers/staging/pohmelfs/netfs.h linux-2.6.32.8/drivers/staging/pohmelfs/netfs.h 25741diff -urNp linux-2.6.32.9/drivers/staging/pohmelfs/netfs.h linux-2.6.32.9/drivers/staging/pohmelfs/netfs.h
25342--- linux-2.6.32.8/drivers/staging/pohmelfs/netfs.h 2010-02-09 07:57:19.000000000 -0500 25742--- linux-2.6.32.9/drivers/staging/pohmelfs/netfs.h 2010-02-09 07:57:19.000000000 -0500
25343+++ linux-2.6.32.8/drivers/staging/pohmelfs/netfs.h 2010-02-13 21:45:10.489553191 -0500 25743+++ linux-2.6.32.9/drivers/staging/pohmelfs/netfs.h 2010-02-23 17:09:53.224545810 -0500
25344@@ -570,7 +570,7 @@ struct pohmelfs_config; 25744@@ -570,7 +570,7 @@ struct pohmelfs_config;
25345 struct pohmelfs_sb { 25745 struct pohmelfs_sb {
25346 struct rb_root mcache_root; 25746 struct rb_root mcache_root;
@@ -25350,9 +25750,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/pohmelfs/netfs.h linux-2.6.32.8/driver
25350 unsigned long mcache_timeout; 25750 unsigned long mcache_timeout;
25351 25751
25352 unsigned int idx; 25752 unsigned int idx;
25353diff -urNp linux-2.6.32.8/drivers/staging/sep/sep_driver.c linux-2.6.32.8/drivers/staging/sep/sep_driver.c 25753diff -urNp linux-2.6.32.9/drivers/staging/sep/sep_driver.c linux-2.6.32.9/drivers/staging/sep/sep_driver.c
25354--- linux-2.6.32.8/drivers/staging/sep/sep_driver.c 2010-02-09 07:57:19.000000000 -0500 25754--- linux-2.6.32.9/drivers/staging/sep/sep_driver.c 2010-02-09 07:57:19.000000000 -0500
25355+++ linux-2.6.32.8/drivers/staging/sep/sep_driver.c 2010-02-13 21:45:10.489553191 -0500 25755+++ linux-2.6.32.9/drivers/staging/sep/sep_driver.c 2010-02-23 17:09:53.224545810 -0500
25356@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver 25756@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
25357 static dev_t sep_devno; 25757 static dev_t sep_devno;
25358 25758
@@ -25362,9 +25762,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/sep/sep_driver.c linux-2.6.32.8/driver
25362 .owner = THIS_MODULE, 25762 .owner = THIS_MODULE,
25363 .ioctl = sep_ioctl, 25763 .ioctl = sep_ioctl,
25364 .poll = sep_poll, 25764 .poll = sep_poll,
25365diff -urNp linux-2.6.32.8/drivers/staging/vme/devices/vme_user.c linux-2.6.32.8/drivers/staging/vme/devices/vme_user.c 25765diff -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
25366--- linux-2.6.32.8/drivers/staging/vme/devices/vme_user.c 2010-02-09 07:57:19.000000000 -0500 25766--- linux-2.6.32.9/drivers/staging/vme/devices/vme_user.c 2010-02-09 07:57:19.000000000 -0500
25367+++ linux-2.6.32.8/drivers/staging/vme/devices/vme_user.c 2010-02-13 21:45:10.490650005 -0500 25767+++ linux-2.6.32.9/drivers/staging/vme/devices/vme_user.c 2010-02-23 17:09:53.224545810 -0500
25368@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * 25768@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
25369 static int __init vme_user_probe(struct device *, int, int); 25769 static int __init vme_user_probe(struct device *, int, int);
25370 static int __exit vme_user_remove(struct device *, int, int); 25770 static int __exit vme_user_remove(struct device *, int, int);
@@ -25374,9 +25774,9 @@ diff -urNp linux-2.6.32.8/drivers/staging/vme/devices/vme_user.c linux-2.6.32.8/
25374 .open = vme_user_open, 25774 .open = vme_user_open,
25375 .release = vme_user_release, 25775 .release = vme_user_release,
25376 .read = vme_user_read, 25776 .read = vme_user_read,
25377diff -urNp linux-2.6.32.8/drivers/uio/uio.c linux-2.6.32.8/drivers/uio/uio.c 25777diff -urNp linux-2.6.32.9/drivers/uio/uio.c linux-2.6.32.9/drivers/uio/uio.c
25378--- linux-2.6.32.8/drivers/uio/uio.c 2010-02-09 07:57:19.000000000 -0500 25778--- linux-2.6.32.9/drivers/uio/uio.c 2010-02-09 07:57:19.000000000 -0500
25379+++ linux-2.6.32.8/drivers/uio/uio.c 2010-02-13 21:45:10.490650005 -0500 25779+++ linux-2.6.32.9/drivers/uio/uio.c 2010-02-23 17:09:53.224545810 -0500
25380@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj 25780@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj
25381 return entry->show(mem, buf); 25781 return entry->show(mem, buf);
25382 } 25782 }
@@ -25395,9 +25795,9 @@ diff -urNp linux-2.6.32.8/drivers/uio/uio.c linux-2.6.32.8/drivers/uio/uio.c
25395 .show = portio_type_show, 25795 .show = portio_type_show,
25396 }; 25796 };
25397 25797
25398diff -urNp linux-2.6.32.8/drivers/usb/atm/usbatm.c linux-2.6.32.8/drivers/usb/atm/usbatm.c 25798diff -urNp linux-2.6.32.9/drivers/usb/atm/usbatm.c linux-2.6.32.9/drivers/usb/atm/usbatm.c
25399--- linux-2.6.32.8/drivers/usb/atm/usbatm.c 2010-02-09 07:57:19.000000000 -0500 25799--- linux-2.6.32.9/drivers/usb/atm/usbatm.c 2010-02-09 07:57:19.000000000 -0500
25400+++ linux-2.6.32.8/drivers/usb/atm/usbatm.c 2010-02-13 21:45:10.509100500 -0500 25800+++ linux-2.6.32.9/drivers/usb/atm/usbatm.c 2010-02-23 17:09:53.258048533 -0500
25401@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru 25801@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
25402 if (printk_ratelimit()) 25802 if (printk_ratelimit())
25403 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", 25803 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -25477,9 +25877,9 @@ diff -urNp linux-2.6.32.8/drivers/usb/atm/usbatm.c linux-2.6.32.8/drivers/usb/at
25477 25877
25478 if (!left--) { 25878 if (!left--) {
25479 if (instance->disconnected) 25879 if (instance->disconnected)
25480diff -urNp linux-2.6.32.8/drivers/usb/class/cdc-acm.c linux-2.6.32.8/drivers/usb/class/cdc-acm.c 25880diff -urNp linux-2.6.32.9/drivers/usb/class/cdc-acm.c linux-2.6.32.9/drivers/usb/class/cdc-acm.c
25481--- linux-2.6.32.8/drivers/usb/class/cdc-acm.c 2010-02-09 07:57:19.000000000 -0500 25881--- linux-2.6.32.9/drivers/usb/class/cdc-acm.c 2010-02-09 07:57:19.000000000 -0500
25482+++ linux-2.6.32.8/drivers/usb/class/cdc-acm.c 2010-02-13 21:45:10.521578125 -0500 25882+++ linux-2.6.32.9/drivers/usb/class/cdc-acm.c 2010-02-23 17:09:53.258048533 -0500
25483@@ -1534,7 +1534,7 @@ static struct usb_device_id acm_ids[] = 25883@@ -1534,7 +1534,7 @@ static struct usb_device_id acm_ids[] =
25484 USB_CDC_ACM_PROTO_AT_CDMA) }, 25884 USB_CDC_ACM_PROTO_AT_CDMA) },
25485 25885
@@ -25489,9 +25889,9 @@ diff -urNp linux-2.6.32.8/drivers/usb/class/cdc-acm.c linux-2.6.32.8/drivers/usb
25489 }; 25889 };
25490 25890
25491 MODULE_DEVICE_TABLE(usb, acm_ids); 25891 MODULE_DEVICE_TABLE(usb, acm_ids);
25492diff -urNp linux-2.6.32.8/drivers/usb/class/usblp.c linux-2.6.32.8/drivers/usb/class/usblp.c 25892diff -urNp linux-2.6.32.9/drivers/usb/class/usblp.c linux-2.6.32.9/drivers/usb/class/usblp.c
25493--- linux-2.6.32.8/drivers/usb/class/usblp.c 2010-02-09 07:57:19.000000000 -0500 25893--- linux-2.6.32.9/drivers/usb/class/usblp.c 2010-02-09 07:57:19.000000000 -0500
25494+++ linux-2.6.32.8/drivers/usb/class/usblp.c 2010-02-13 21:45:10.524983430 -0500 25894+++ linux-2.6.32.9/drivers/usb/class/usblp.c 2010-02-23 17:09:53.258048533 -0500
25495@@ -228,7 +228,7 @@ static const struct quirk_printer_struct 25895@@ -228,7 +228,7 @@ static const struct quirk_printer_struct
25496 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ 25896 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
25497 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ 25897 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
@@ -25510,9 +25910,9 @@ diff -urNp linux-2.6.32.8/drivers/usb/class/usblp.c linux-2.6.32.8/drivers/usb/c
25510 }; 25910 };
25511 25911
25512 MODULE_DEVICE_TABLE (usb, usblp_ids); 25912 MODULE_DEVICE_TABLE (usb, usblp_ids);
25513diff -urNp linux-2.6.32.8/drivers/usb/core/hcd.c linux-2.6.32.8/drivers/usb/core/hcd.c 25913diff -urNp linux-2.6.32.9/drivers/usb/core/hcd.c linux-2.6.32.9/drivers/usb/core/hcd.c
25514--- linux-2.6.32.8/drivers/usb/core/hcd.c 2010-02-09 07:57:19.000000000 -0500 25914--- linux-2.6.32.9/drivers/usb/core/hcd.c 2010-02-09 07:57:19.000000000 -0500
25515+++ linux-2.6.32.8/drivers/usb/core/hcd.c 2010-02-13 21:45:10.542592706 -0500 25915+++ linux-2.6.32.9/drivers/usb/core/hcd.c 2010-02-23 17:09:53.258048533 -0500
25516@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd 25916@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
25517 25917
25518 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 25918 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -25531,9 +25931,9 @@ diff -urNp linux-2.6.32.8/drivers/usb/core/hcd.c linux-2.6.32.8/drivers/usb/core
25531 { 25931 {
25532 25932
25533 if (mon_ops) 25933 if (mon_ops)
25534diff -urNp linux-2.6.32.8/drivers/usb/core/hcd.h linux-2.6.32.8/drivers/usb/core/hcd.h 25934diff -urNp linux-2.6.32.9/drivers/usb/core/hcd.h linux-2.6.32.9/drivers/usb/core/hcd.h
25535--- linux-2.6.32.8/drivers/usb/core/hcd.h 2010-02-09 07:57:19.000000000 -0500 25935--- linux-2.6.32.9/drivers/usb/core/hcd.h 2010-02-09 07:57:19.000000000 -0500
25536+++ linux-2.6.32.8/drivers/usb/core/hcd.h 2010-02-13 21:45:10.543870491 -0500 25936+++ linux-2.6.32.9/drivers/usb/core/hcd.h 2010-02-23 17:09:53.258048533 -0500
25537@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { 25937@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
25538 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 25938 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
25539 25939
@@ -25561,9 +25961,9 @@ diff -urNp linux-2.6.32.8/drivers/usb/core/hcd.h linux-2.6.32.8/drivers/usb/core
25561 void usb_mon_deregister(void); 25961 void usb_mon_deregister(void);
25562 25962
25563 #else 25963 #else
25564diff -urNp linux-2.6.32.8/drivers/usb/core/hub.c linux-2.6.32.8/drivers/usb/core/hub.c 25964diff -urNp linux-2.6.32.9/drivers/usb/core/hub.c linux-2.6.32.9/drivers/usb/core/hub.c
25565--- linux-2.6.32.8/drivers/usb/core/hub.c 2010-02-09 07:57:19.000000000 -0500 25965--- linux-2.6.32.9/drivers/usb/core/hub.c 2010-02-09 07:57:19.000000000 -0500
25566+++ linux-2.6.32.8/drivers/usb/core/hub.c 2010-02-13 21:45:10.561963072 -0500 25966+++ linux-2.6.32.9/drivers/usb/core/hub.c 2010-02-23 17:09:53.260755480 -0500
25567@@ -3385,7 +3385,7 @@ static struct usb_device_id hub_id_table 25967@@ -3385,7 +3385,7 @@ static struct usb_device_id hub_id_table
25568 .bDeviceClass = USB_CLASS_HUB}, 25968 .bDeviceClass = USB_CLASS_HUB},
25569 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, 25969 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
@@ -25573,9 +25973,9 @@ diff -urNp linux-2.6.32.8/drivers/usb/core/hub.c linux-2.6.32.8/drivers/usb/core
25573 }; 25973 };
25574 25974
25575 MODULE_DEVICE_TABLE (usb, hub_id_table); 25975 MODULE_DEVICE_TABLE (usb, hub_id_table);
25576diff -urNp linux-2.6.32.8/drivers/usb/core/message.c linux-2.6.32.8/drivers/usb/core/message.c 25976diff -urNp linux-2.6.32.9/drivers/usb/core/message.c linux-2.6.32.9/drivers/usb/core/message.c
25577--- linux-2.6.32.8/drivers/usb/core/message.c 2010-02-09 07:57:19.000000000 -0500 25977--- linux-2.6.32.9/drivers/usb/core/message.c 2010-02-09 07:57:19.000000000 -0500
25578+++ linux-2.6.32.8/drivers/usb/core/message.c 2010-02-13 21:45:10.582813809 -0500 25978+++ linux-2.6.32.9/drivers/usb/core/message.c 2010-02-23 17:09:53.260755480 -0500
25579@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device 25979@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
25580 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); 25980 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
25581 if (buf) { 25981 if (buf) {
@@ -25587,9 +25987,9 @@ diff -urNp linux-2.6.32.8/drivers/usb/core/message.c linux-2.6.32.8/drivers/usb/
25587 if (!smallbuf) 25987 if (!smallbuf)
25588 return buf; 25988 return buf;
25589 memcpy(smallbuf, buf, len); 25989 memcpy(smallbuf, buf, len);
25590diff -urNp linux-2.6.32.8/drivers/usb/host/ehci-pci.c linux-2.6.32.8/drivers/usb/host/ehci-pci.c 25990diff -urNp linux-2.6.32.9/drivers/usb/host/ehci-pci.c linux-2.6.32.9/drivers/usb/host/ehci-pci.c
25591--- linux-2.6.32.8/drivers/usb/host/ehci-pci.c 2010-02-09 07:57:19.000000000 -0500 25991--- linux-2.6.32.9/drivers/usb/host/ehci-pci.c 2010-02-09 07:57:19.000000000 -0500
25592+++ linux-2.6.32.8/drivers/usb/host/ehci-pci.c 2010-02-13 21:45:10.595921524 -0500 25992+++ linux-2.6.32.9/drivers/usb/host/ehci-pci.c 2010-02-23 17:09:53.260755480 -0500
25593@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id 25993@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id
25594 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), 25994 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
25595 .driver_data = (unsigned long) &ehci_pci_hc_driver, 25995 .driver_data = (unsigned long) &ehci_pci_hc_driver,
@@ -25599,9 +25999,9 @@ diff -urNp linux-2.6.32.8/drivers/usb/host/ehci-pci.c linux-2.6.32.8/drivers/usb
25599 }; 25999 };
25600 MODULE_DEVICE_TABLE(pci, pci_ids); 26000 MODULE_DEVICE_TABLE(pci, pci_ids);
25601 26001
25602diff -urNp linux-2.6.32.8/drivers/usb/host/uhci-hcd.c linux-2.6.32.8/drivers/usb/host/uhci-hcd.c 26002diff -urNp linux-2.6.32.9/drivers/usb/host/uhci-hcd.c linux-2.6.32.9/drivers/usb/host/uhci-hcd.c
25603--- linux-2.6.32.8/drivers/usb/host/uhci-hcd.c 2010-02-09 07:57:19.000000000 -0500 26003--- linux-2.6.32.9/drivers/usb/host/uhci-hcd.c 2010-02-09 07:57:19.000000000 -0500
25604+++ linux-2.6.32.8/drivers/usb/host/uhci-hcd.c 2010-02-13 21:45:10.619990345 -0500 26004+++ linux-2.6.32.9/drivers/usb/host/uhci-hcd.c 2010-02-23 17:09:53.260755480 -0500
25605@@ -940,7 +940,7 @@ static const struct pci_device_id uhci_p 26005@@ -940,7 +940,7 @@ static const struct pci_device_id uhci_p
25606 /* handle any USB UHCI controller */ 26006 /* handle any USB UHCI controller */
25607 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), 26007 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
@@ -25611,9 +26011,9 @@ diff -urNp linux-2.6.32.8/drivers/usb/host/uhci-hcd.c linux-2.6.32.8/drivers/usb
25611 }; 26011 };
25612 26012
25613 MODULE_DEVICE_TABLE(pci, uhci_pci_ids); 26013 MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
25614diff -urNp linux-2.6.32.8/drivers/usb/misc/appledisplay.c linux-2.6.32.8/drivers/usb/misc/appledisplay.c 26014diff -urNp linux-2.6.32.9/drivers/usb/misc/appledisplay.c linux-2.6.32.9/drivers/usb/misc/appledisplay.c
25615--- linux-2.6.32.8/drivers/usb/misc/appledisplay.c 2010-02-09 07:57:19.000000000 -0500 26015--- linux-2.6.32.9/drivers/usb/misc/appledisplay.c 2010-02-09 07:57:19.000000000 -0500
25616+++ linux-2.6.32.8/drivers/usb/misc/appledisplay.c 2010-02-13 21:45:10.623984076 -0500 26016+++ linux-2.6.32.9/drivers/usb/misc/appledisplay.c 2010-02-23 17:09:53.260755480 -0500
25617@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes 26017@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
25618 return pdata->msgdata[1]; 26018 return pdata->msgdata[1];
25619 } 26019 }
@@ -25623,9 +26023,9 @@ diff -urNp linux-2.6.32.8/drivers/usb/misc/appledisplay.c linux-2.6.32.8/drivers
25623 .get_brightness = appledisplay_bl_get_brightness, 26023 .get_brightness = appledisplay_bl_get_brightness,
25624 .update_status = appledisplay_bl_update_status, 26024 .update_status = appledisplay_bl_update_status,
25625 }; 26025 };
25626diff -urNp linux-2.6.32.8/drivers/usb/mon/mon_main.c linux-2.6.32.8/drivers/usb/mon/mon_main.c 26026diff -urNp linux-2.6.32.9/drivers/usb/mon/mon_main.c linux-2.6.32.9/drivers/usb/mon/mon_main.c
25627--- linux-2.6.32.8/drivers/usb/mon/mon_main.c 2010-02-09 07:57:19.000000000 -0500 26027--- linux-2.6.32.9/drivers/usb/mon/mon_main.c 2010-02-09 07:57:19.000000000 -0500
25628+++ linux-2.6.32.8/drivers/usb/mon/mon_main.c 2010-02-13 21:45:10.624642702 -0500 26028+++ linux-2.6.32.9/drivers/usb/mon/mon_main.c 2010-02-23 17:09:53.260755480 -0500
25629@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { 26029@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
25630 /* 26030 /*
25631 * Ops 26031 * Ops
@@ -25635,9 +26035,9 @@ diff -urNp linux-2.6.32.8/drivers/usb/mon/mon_main.c linux-2.6.32.8/drivers/usb/
25635 .urb_submit = mon_submit, 26035 .urb_submit = mon_submit,
25636 .urb_submit_error = mon_submit_error, 26036 .urb_submit_error = mon_submit_error,
25637 .urb_complete = mon_complete, 26037 .urb_complete = mon_complete,
25638diff -urNp linux-2.6.32.8/drivers/usb/storage/debug.h linux-2.6.32.8/drivers/usb/storage/debug.h 26038diff -urNp linux-2.6.32.9/drivers/usb/storage/debug.h linux-2.6.32.9/drivers/usb/storage/debug.h
25639--- linux-2.6.32.8/drivers/usb/storage/debug.h 2010-02-09 07:57:19.000000000 -0500 26039--- linux-2.6.32.9/drivers/usb/storage/debug.h 2010-02-09 07:57:19.000000000 -0500
25640+++ linux-2.6.32.8/drivers/usb/storage/debug.h 2010-02-13 21:45:10.624642702 -0500 26040+++ linux-2.6.32.9/drivers/usb/storage/debug.h 2010-02-23 17:09:53.260755480 -0500
25641@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char 26041@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
25642 #define US_DEBUGPX(x...) printk( x ) 26042 #define US_DEBUGPX(x...) printk( x )
25643 #define US_DEBUG(x) x 26043 #define US_DEBUG(x) x
@@ -25651,9 +26051,9 @@ diff -urNp linux-2.6.32.8/drivers/usb/storage/debug.h linux-2.6.32.8/drivers/usb
25651 #endif 26051 #endif
25652 26052
25653 #endif 26053 #endif
25654diff -urNp linux-2.6.32.8/drivers/usb/storage/usb.c linux-2.6.32.8/drivers/usb/storage/usb.c 26054diff -urNp linux-2.6.32.9/drivers/usb/storage/usb.c linux-2.6.32.9/drivers/usb/storage/usb.c
25655--- linux-2.6.32.8/drivers/usb/storage/usb.c 2010-02-09 07:57:19.000000000 -0500 26055--- linux-2.6.32.9/drivers/usb/storage/usb.c 2010-02-09 07:57:19.000000000 -0500
25656+++ linux-2.6.32.8/drivers/usb/storage/usb.c 2010-02-13 21:45:10.625583095 -0500 26056+++ linux-2.6.32.9/drivers/usb/storage/usb.c 2010-02-23 17:09:53.260755480 -0500
25657@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l 26057@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
25658 26058
25659 static struct us_unusual_dev us_unusual_dev_list[] = { 26059 static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -25663,9 +26063,9 @@ diff -urNp linux-2.6.32.8/drivers/usb/storage/usb.c linux-2.6.32.8/drivers/usb/s
25663 }; 26063 };
25664 26064
25665 #undef UNUSUAL_DEV 26065 #undef UNUSUAL_DEV
25666diff -urNp linux-2.6.32.8/drivers/usb/storage/usual-tables.c linux-2.6.32.8/drivers/usb/storage/usual-tables.c 26066diff -urNp linux-2.6.32.9/drivers/usb/storage/usual-tables.c linux-2.6.32.9/drivers/usb/storage/usual-tables.c
25667--- linux-2.6.32.8/drivers/usb/storage/usual-tables.c 2010-02-09 07:57:19.000000000 -0500 26067--- linux-2.6.32.9/drivers/usb/storage/usual-tables.c 2010-02-09 07:57:19.000000000 -0500
25668+++ linux-2.6.32.8/drivers/usb/storage/usual-tables.c 2010-02-13 21:45:10.626656310 -0500 26068+++ linux-2.6.32.9/drivers/usb/storage/usual-tables.c 2010-02-23 17:09:53.260755480 -0500
25669@@ -48,7 +48,7 @@ 26069@@ -48,7 +48,7 @@
25670 26070
25671 struct usb_device_id usb_storage_usb_ids[] = { 26071 struct usb_device_id usb_storage_usb_ids[] = {
@@ -25675,9 +26075,9 @@ diff -urNp linux-2.6.32.8/drivers/usb/storage/usual-tables.c linux-2.6.32.8/driv
25675 }; 26075 };
25676 EXPORT_SYMBOL_GPL(usb_storage_usb_ids); 26076 EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
25677 26077
25678diff -urNp linux-2.6.32.8/drivers/uwb/wlp/messages.c linux-2.6.32.8/drivers/uwb/wlp/messages.c 26078diff -urNp linux-2.6.32.9/drivers/uwb/wlp/messages.c linux-2.6.32.9/drivers/uwb/wlp/messages.c
25679--- linux-2.6.32.8/drivers/uwb/wlp/messages.c 2010-02-09 07:57:19.000000000 -0500 26079--- linux-2.6.32.9/drivers/uwb/wlp/messages.c 2010-02-09 07:57:19.000000000 -0500
25680+++ linux-2.6.32.8/drivers/uwb/wlp/messages.c 2010-02-13 21:45:10.626656310 -0500 26080+++ linux-2.6.32.9/drivers/uwb/wlp/messages.c 2010-02-23 17:09:53.260755480 -0500
25681@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct 26081@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
25682 size_t len = skb->len; 26082 size_t len = skb->len;
25683 size_t used; 26083 size_t used;
@@ -25687,9 +26087,9 @@ diff -urNp linux-2.6.32.8/drivers/uwb/wlp/messages.c linux-2.6.32.8/drivers/uwb/
25687 enum wlp_assc_error assc_err; 26087 enum wlp_assc_error assc_err;
25688 char enonce_buf[WLP_WSS_NONCE_STRSIZE]; 26088 char enonce_buf[WLP_WSS_NONCE_STRSIZE];
25689 char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; 26089 char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
25690diff -urNp linux-2.6.32.8/drivers/uwb/wlp/sysfs.c linux-2.6.32.8/drivers/uwb/wlp/sysfs.c 26090diff -urNp linux-2.6.32.9/drivers/uwb/wlp/sysfs.c linux-2.6.32.9/drivers/uwb/wlp/sysfs.c
25691--- linux-2.6.32.8/drivers/uwb/wlp/sysfs.c 2010-02-09 07:57:19.000000000 -0500 26091--- linux-2.6.32.9/drivers/uwb/wlp/sysfs.c 2010-02-09 07:57:19.000000000 -0500
25692+++ linux-2.6.32.8/drivers/uwb/wlp/sysfs.c 2010-02-13 21:45:10.626656310 -0500 26092+++ linux-2.6.32.9/drivers/uwb/wlp/sysfs.c 2010-02-23 17:09:53.263724942 -0500
25693@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec 26093@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
25694 return ret; 26094 return ret;
25695 } 26095 }
@@ -25700,9 +26100,9 @@ diff -urNp linux-2.6.32.8/drivers/uwb/wlp/sysfs.c linux-2.6.32.8/drivers/uwb/wlp
25700 .show = wlp_wss_attr_show, 26100 .show = wlp_wss_attr_show,
25701 .store = wlp_wss_attr_store, 26101 .store = wlp_wss_attr_store,
25702 }; 26102 };
25703diff -urNp linux-2.6.32.8/drivers/video/atmel_lcdfb.c linux-2.6.32.8/drivers/video/atmel_lcdfb.c 26103diff -urNp linux-2.6.32.9/drivers/video/atmel_lcdfb.c linux-2.6.32.9/drivers/video/atmel_lcdfb.c
25704--- linux-2.6.32.8/drivers/video/atmel_lcdfb.c 2010-02-09 07:57:19.000000000 -0500 26104--- linux-2.6.32.9/drivers/video/atmel_lcdfb.c 2010-02-09 07:57:19.000000000 -0500
25705+++ linux-2.6.32.8/drivers/video/atmel_lcdfb.c 2010-02-13 21:45:10.626656310 -0500 26105+++ linux-2.6.32.9/drivers/video/atmel_lcdfb.c 2010-02-23 17:09:53.263724942 -0500
25706@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc 26106@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
25707 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); 26107 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
25708 } 26108 }
@@ -25712,9 +26112,9 @@ diff -urNp linux-2.6.32.8/drivers/video/atmel_lcdfb.c linux-2.6.32.8/drivers/vid
25712 .update_status = atmel_bl_update_status, 26112 .update_status = atmel_bl_update_status,
25713 .get_brightness = atmel_bl_get_brightness, 26113 .get_brightness = atmel_bl_get_brightness,
25714 }; 26114 };
25715diff -urNp linux-2.6.32.8/drivers/video/aty/aty128fb.c linux-2.6.32.8/drivers/video/aty/aty128fb.c 26115diff -urNp linux-2.6.32.9/drivers/video/aty/aty128fb.c linux-2.6.32.9/drivers/video/aty/aty128fb.c
25716--- linux-2.6.32.8/drivers/video/aty/aty128fb.c 2010-02-09 07:57:19.000000000 -0500 26116--- linux-2.6.32.9/drivers/video/aty/aty128fb.c 2010-02-09 07:57:19.000000000 -0500
25717+++ linux-2.6.32.8/drivers/video/aty/aty128fb.c 2010-02-13 21:45:10.627987902 -0500 26117+++ linux-2.6.32.9/drivers/video/aty/aty128fb.c 2010-02-23 17:09:53.263724942 -0500
25718@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru 26118@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
25719 return bd->props.brightness; 26119 return bd->props.brightness;
25720 } 26120 }
@@ -25724,9 +26124,9 @@ diff -urNp linux-2.6.32.8/drivers/video/aty/aty128fb.c linux-2.6.32.8/drivers/vi
25724 .get_brightness = aty128_bl_get_brightness, 26124 .get_brightness = aty128_bl_get_brightness,
25725 .update_status = aty128_bl_update_status, 26125 .update_status = aty128_bl_update_status,
25726 }; 26126 };
25727diff -urNp linux-2.6.32.8/drivers/video/aty/atyfb_base.c linux-2.6.32.8/drivers/video/aty/atyfb_base.c 26127diff -urNp linux-2.6.32.9/drivers/video/aty/atyfb_base.c linux-2.6.32.9/drivers/video/aty/atyfb_base.c
25728--- linux-2.6.32.8/drivers/video/aty/atyfb_base.c 2010-02-09 07:57:19.000000000 -0500 26128--- linux-2.6.32.9/drivers/video/aty/atyfb_base.c 2010-02-09 07:57:19.000000000 -0500
25729+++ linux-2.6.32.8/drivers/video/aty/atyfb_base.c 2010-02-13 21:45:10.628618696 -0500 26129+++ linux-2.6.32.9/drivers/video/aty/atyfb_base.c 2010-02-23 17:09:53.263724942 -0500
25730@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct 26130@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
25731 return bd->props.brightness; 26131 return bd->props.brightness;
25732 } 26132 }
@@ -25736,9 +26136,9 @@ diff -urNp linux-2.6.32.8/drivers/video/aty/atyfb_base.c linux-2.6.32.8/drivers/
25736 .get_brightness = aty_bl_get_brightness, 26136 .get_brightness = aty_bl_get_brightness,
25737 .update_status = aty_bl_update_status, 26137 .update_status = aty_bl_update_status,
25738 }; 26138 };
25739diff -urNp linux-2.6.32.8/drivers/video/aty/radeon_backlight.c linux-2.6.32.8/drivers/video/aty/radeon_backlight.c 26139diff -urNp linux-2.6.32.9/drivers/video/aty/radeon_backlight.c linux-2.6.32.9/drivers/video/aty/radeon_backlight.c
25740--- linux-2.6.32.8/drivers/video/aty/radeon_backlight.c 2010-02-09 07:57:19.000000000 -0500 26140--- linux-2.6.32.9/drivers/video/aty/radeon_backlight.c 2010-02-09 07:57:19.000000000 -0500
25741+++ linux-2.6.32.8/drivers/video/aty/radeon_backlight.c 2010-02-13 21:45:10.628618696 -0500 26141+++ linux-2.6.32.9/drivers/video/aty/radeon_backlight.c 2010-02-23 17:09:53.263724942 -0500
25742@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru 26142@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
25743 return bd->props.brightness; 26143 return bd->props.brightness;
25744 } 26144 }
@@ -25748,9 +26148,9 @@ diff -urNp linux-2.6.32.8/drivers/video/aty/radeon_backlight.c linux-2.6.32.8/dr
25748 .get_brightness = radeon_bl_get_brightness, 26148 .get_brightness = radeon_bl_get_brightness,
25749 .update_status = radeon_bl_update_status, 26149 .update_status = radeon_bl_update_status,
25750 }; 26150 };
25751diff -urNp linux-2.6.32.8/drivers/video/backlight/adp5520_bl.c linux-2.6.32.8/drivers/video/backlight/adp5520_bl.c 26151diff -urNp linux-2.6.32.9/drivers/video/backlight/adp5520_bl.c linux-2.6.32.9/drivers/video/backlight/adp5520_bl.c
25752--- linux-2.6.32.8/drivers/video/backlight/adp5520_bl.c 2010-02-09 07:57:19.000000000 -0500 26152--- linux-2.6.32.9/drivers/video/backlight/adp5520_bl.c 2010-02-09 07:57:19.000000000 -0500
25753+++ linux-2.6.32.8/drivers/video/backlight/adp5520_bl.c 2010-02-13 21:45:10.628618696 -0500 26153+++ linux-2.6.32.9/drivers/video/backlight/adp5520_bl.c 2010-02-23 17:09:53.263724942 -0500
25754@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str 26154@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
25755 return error ? data->current_brightness : reg_val; 26155 return error ? data->current_brightness : reg_val;
25756 } 26156 }
@@ -25760,9 +26160,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/adp5520_bl.c linux-2.6.32.8/dr
25760 .update_status = adp5520_bl_update_status, 26160 .update_status = adp5520_bl_update_status,
25761 .get_brightness = adp5520_bl_get_brightness, 26161 .get_brightness = adp5520_bl_get_brightness,
25762 }; 26162 };
25763diff -urNp linux-2.6.32.8/drivers/video/backlight/adx_bl.c linux-2.6.32.8/drivers/video/backlight/adx_bl.c 26163diff -urNp linux-2.6.32.9/drivers/video/backlight/adx_bl.c linux-2.6.32.9/drivers/video/backlight/adx_bl.c
25764--- linux-2.6.32.8/drivers/video/backlight/adx_bl.c 2010-02-09 07:57:19.000000000 -0500 26164--- linux-2.6.32.9/drivers/video/backlight/adx_bl.c 2010-02-09 07:57:19.000000000 -0500
25765+++ linux-2.6.32.8/drivers/video/backlight/adx_bl.c 2010-02-13 21:45:10.628618696 -0500 26165+++ linux-2.6.32.9/drivers/video/backlight/adx_bl.c 2010-02-23 17:09:53.263724942 -0500
25766@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct 26166@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
25767 return 1; 26167 return 1;
25768 } 26168 }
@@ -25772,9 +26172,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/adx_bl.c linux-2.6.32.8/driver
25772 .options = 0, 26172 .options = 0,
25773 .update_status = adx_backlight_update_status, 26173 .update_status = adx_backlight_update_status,
25774 .get_brightness = adx_backlight_get_brightness, 26174 .get_brightness = adx_backlight_get_brightness,
25775diff -urNp linux-2.6.32.8/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.8/drivers/video/backlight/atmel-pwm-bl.c 26175diff -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
25776--- linux-2.6.32.8/drivers/video/backlight/atmel-pwm-bl.c 2010-02-09 07:57:19.000000000 -0500 26176--- linux-2.6.32.9/drivers/video/backlight/atmel-pwm-bl.c 2010-02-09 07:57:19.000000000 -0500
25777+++ linux-2.6.32.8/drivers/video/backlight/atmel-pwm-bl.c 2010-02-13 21:45:10.629575593 -0500 26177+++ linux-2.6.32.9/drivers/video/backlight/atmel-pwm-bl.c 2010-02-23 17:09:53.263724942 -0500
25778@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct 26178@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
25779 return pwm_channel_enable(&pwmbl->pwmc); 26179 return pwm_channel_enable(&pwmbl->pwmc);
25780 } 26180 }
@@ -25784,9 +26184,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.8/
25784 .get_brightness = atmel_pwm_bl_get_intensity, 26184 .get_brightness = atmel_pwm_bl_get_intensity,
25785 .update_status = atmel_pwm_bl_set_intensity, 26185 .update_status = atmel_pwm_bl_set_intensity,
25786 }; 26186 };
25787diff -urNp linux-2.6.32.8/drivers/video/backlight/backlight.c linux-2.6.32.8/drivers/video/backlight/backlight.c 26187diff -urNp linux-2.6.32.9/drivers/video/backlight/backlight.c linux-2.6.32.9/drivers/video/backlight/backlight.c
25788--- linux-2.6.32.8/drivers/video/backlight/backlight.c 2010-02-09 07:57:19.000000000 -0500 26188--- linux-2.6.32.9/drivers/video/backlight/backlight.c 2010-02-09 07:57:19.000000000 -0500
25789+++ linux-2.6.32.8/drivers/video/backlight/backlight.c 2010-02-13 21:45:10.629575593 -0500 26189+++ linux-2.6.32.9/drivers/video/backlight/backlight.c 2010-02-23 17:09:53.263724942 -0500
25790@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); 26190@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
25791 * ERR_PTR() or a pointer to the newly allocated device. 26191 * ERR_PTR() or a pointer to the newly allocated device.
25792 */ 26192 */
@@ -25796,9 +26196,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/backlight.c linux-2.6.32.8/dri
25796 { 26196 {
25797 struct backlight_device *new_bd; 26197 struct backlight_device *new_bd;
25798 int rc; 26198 int rc;
25799diff -urNp linux-2.6.32.8/drivers/video/backlight/corgi_lcd.c linux-2.6.32.8/drivers/video/backlight/corgi_lcd.c 26199diff -urNp linux-2.6.32.9/drivers/video/backlight/corgi_lcd.c linux-2.6.32.9/drivers/video/backlight/corgi_lcd.c
25800--- linux-2.6.32.8/drivers/video/backlight/corgi_lcd.c 2010-02-09 07:57:19.000000000 -0500 26200--- linux-2.6.32.9/drivers/video/backlight/corgi_lcd.c 2010-02-09 07:57:19.000000000 -0500
25801+++ linux-2.6.32.8/drivers/video/backlight/corgi_lcd.c 2010-02-13 21:45:10.629575593 -0500 26201+++ linux-2.6.32.9/drivers/video/backlight/corgi_lcd.c 2010-02-23 17:09:53.263724942 -0500
25802@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit 26202@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
25803 } 26203 }
25804 EXPORT_SYMBOL(corgi_lcd_limit_intensity); 26204 EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -25808,9 +26208,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/corgi_lcd.c linux-2.6.32.8/dri
25808 .get_brightness = corgi_bl_get_intensity, 26208 .get_brightness = corgi_bl_get_intensity,
25809 .update_status = corgi_bl_update_status, 26209 .update_status = corgi_bl_update_status,
25810 }; 26210 };
25811diff -urNp linux-2.6.32.8/drivers/video/backlight/cr_bllcd.c linux-2.6.32.8/drivers/video/backlight/cr_bllcd.c 26211diff -urNp linux-2.6.32.9/drivers/video/backlight/cr_bllcd.c linux-2.6.32.9/drivers/video/backlight/cr_bllcd.c
25812--- linux-2.6.32.8/drivers/video/backlight/cr_bllcd.c 2010-02-09 07:57:19.000000000 -0500 26212--- linux-2.6.32.9/drivers/video/backlight/cr_bllcd.c 2010-02-09 07:57:19.000000000 -0500
25813+++ linux-2.6.32.8/drivers/video/backlight/cr_bllcd.c 2010-02-13 21:45:10.629575593 -0500 26213+++ linux-2.6.32.9/drivers/video/backlight/cr_bllcd.c 2010-02-23 17:09:53.263724942 -0500
25814@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st 26214@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
25815 return intensity; 26215 return intensity;
25816 } 26216 }
@@ -25820,9 +26220,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/cr_bllcd.c linux-2.6.32.8/driv
25820 .get_brightness = cr_backlight_get_intensity, 26220 .get_brightness = cr_backlight_get_intensity,
25821 .update_status = cr_backlight_set_intensity, 26221 .update_status = cr_backlight_set_intensity,
25822 }; 26222 };
25823diff -urNp linux-2.6.32.8/drivers/video/backlight/da903x_bl.c linux-2.6.32.8/drivers/video/backlight/da903x_bl.c 26223diff -urNp linux-2.6.32.9/drivers/video/backlight/da903x_bl.c linux-2.6.32.9/drivers/video/backlight/da903x_bl.c
25824--- linux-2.6.32.8/drivers/video/backlight/da903x_bl.c 2010-02-09 07:57:19.000000000 -0500 26224--- linux-2.6.32.9/drivers/video/backlight/da903x_bl.c 2010-02-09 07:57:19.000000000 -0500
25825+++ linux-2.6.32.8/drivers/video/backlight/da903x_bl.c 2010-02-13 21:45:10.629575593 -0500 26225+++ linux-2.6.32.9/drivers/video/backlight/da903x_bl.c 2010-02-23 17:09:53.263724942 -0500
25826@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne 26226@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
25827 return data->current_brightness; 26227 return data->current_brightness;
25828 } 26228 }
@@ -25832,9 +26232,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/da903x_bl.c linux-2.6.32.8/dri
25832 .update_status = da903x_backlight_update_status, 26232 .update_status = da903x_backlight_update_status,
25833 .get_brightness = da903x_backlight_get_brightness, 26233 .get_brightness = da903x_backlight_get_brightness,
25834 }; 26234 };
25835diff -urNp linux-2.6.32.8/drivers/video/backlight/generic_bl.c linux-2.6.32.8/drivers/video/backlight/generic_bl.c 26235diff -urNp linux-2.6.32.9/drivers/video/backlight/generic_bl.c linux-2.6.32.9/drivers/video/backlight/generic_bl.c
25836--- linux-2.6.32.8/drivers/video/backlight/generic_bl.c 2010-02-09 07:57:19.000000000 -0500 26236--- linux-2.6.32.9/drivers/video/backlight/generic_bl.c 2010-02-09 07:57:19.000000000 -0500
25837+++ linux-2.6.32.8/drivers/video/backlight/generic_bl.c 2010-02-13 21:45:10.630567678 -0500 26237+++ linux-2.6.32.9/drivers/video/backlight/generic_bl.c 2010-02-23 17:09:53.263724942 -0500
25838@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) 26238@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
25839 } 26239 }
25840 EXPORT_SYMBOL(corgibl_limit_intensity); 26240 EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -25844,9 +26244,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/generic_bl.c linux-2.6.32.8/dr
25844 .options = BL_CORE_SUSPENDRESUME, 26244 .options = BL_CORE_SUSPENDRESUME,
25845 .get_brightness = genericbl_get_intensity, 26245 .get_brightness = genericbl_get_intensity,
25846 .update_status = genericbl_send_intensity, 26246 .update_status = genericbl_send_intensity,
25847diff -urNp linux-2.6.32.8/drivers/video/backlight/hp680_bl.c linux-2.6.32.8/drivers/video/backlight/hp680_bl.c 26247diff -urNp linux-2.6.32.9/drivers/video/backlight/hp680_bl.c linux-2.6.32.9/drivers/video/backlight/hp680_bl.c
25848--- linux-2.6.32.8/drivers/video/backlight/hp680_bl.c 2010-02-09 07:57:19.000000000 -0500 26248--- linux-2.6.32.9/drivers/video/backlight/hp680_bl.c 2010-02-09 07:57:19.000000000 -0500
25849+++ linux-2.6.32.8/drivers/video/backlight/hp680_bl.c 2010-02-13 21:45:10.630567678 -0500 26249+++ linux-2.6.32.9/drivers/video/backlight/hp680_bl.c 2010-02-23 17:09:53.263724942 -0500
25850@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct 26250@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
25851 return current_intensity; 26251 return current_intensity;
25852 } 26252 }
@@ -25856,9 +26256,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/hp680_bl.c linux-2.6.32.8/driv
25856 .get_brightness = hp680bl_get_intensity, 26256 .get_brightness = hp680bl_get_intensity,
25857 .update_status = hp680bl_set_intensity, 26257 .update_status = hp680bl_set_intensity,
25858 }; 26258 };
25859diff -urNp linux-2.6.32.8/drivers/video/backlight/jornada720_bl.c linux-2.6.32.8/drivers/video/backlight/jornada720_bl.c 26259diff -urNp linux-2.6.32.9/drivers/video/backlight/jornada720_bl.c linux-2.6.32.9/drivers/video/backlight/jornada720_bl.c
25860--- linux-2.6.32.8/drivers/video/backlight/jornada720_bl.c 2010-02-09 07:57:19.000000000 -0500 26260--- linux-2.6.32.9/drivers/video/backlight/jornada720_bl.c 2010-02-09 07:57:19.000000000 -0500
25861+++ linux-2.6.32.8/drivers/video/backlight/jornada720_bl.c 2010-02-13 21:45:10.630567678 -0500 26261+++ linux-2.6.32.9/drivers/video/backlight/jornada720_bl.c 2010-02-23 17:09:53.263724942 -0500
25862@@ -93,7 +93,7 @@ out: 26262@@ -93,7 +93,7 @@ out:
25863 return ret; 26263 return ret;
25864 } 26264 }
@@ -25868,9 +26268,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/jornada720_bl.c linux-2.6.32.8
25868 .get_brightness = jornada_bl_get_brightness, 26268 .get_brightness = jornada_bl_get_brightness,
25869 .update_status = jornada_bl_update_status, 26269 .update_status = jornada_bl_update_status,
25870 .options = BL_CORE_SUSPENDRESUME, 26270 .options = BL_CORE_SUSPENDRESUME,
25871diff -urNp linux-2.6.32.8/drivers/video/backlight/kb3886_bl.c linux-2.6.32.8/drivers/video/backlight/kb3886_bl.c 26271diff -urNp linux-2.6.32.9/drivers/video/backlight/kb3886_bl.c linux-2.6.32.9/drivers/video/backlight/kb3886_bl.c
25872--- linux-2.6.32.8/drivers/video/backlight/kb3886_bl.c 2010-02-09 07:57:19.000000000 -0500 26272--- linux-2.6.32.9/drivers/video/backlight/kb3886_bl.c 2010-02-09 07:57:19.000000000 -0500
25873+++ linux-2.6.32.8/drivers/video/backlight/kb3886_bl.c 2010-02-13 21:45:10.630567678 -0500 26273+++ linux-2.6.32.9/drivers/video/backlight/kb3886_bl.c 2010-02-23 17:09:53.263724942 -0500
25874@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct 26274@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
25875 return kb3886bl_intensity; 26275 return kb3886bl_intensity;
25876 } 26276 }
@@ -25880,9 +26280,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/kb3886_bl.c linux-2.6.32.8/dri
25880 .get_brightness = kb3886bl_get_intensity, 26280 .get_brightness = kb3886bl_get_intensity,
25881 .update_status = kb3886bl_send_intensity, 26281 .update_status = kb3886bl_send_intensity,
25882 }; 26282 };
25883diff -urNp linux-2.6.32.8/drivers/video/backlight/locomolcd.c linux-2.6.32.8/drivers/video/backlight/locomolcd.c 26283diff -urNp linux-2.6.32.9/drivers/video/backlight/locomolcd.c linux-2.6.32.9/drivers/video/backlight/locomolcd.c
25884--- linux-2.6.32.8/drivers/video/backlight/locomolcd.c 2010-02-09 07:57:19.000000000 -0500 26284--- linux-2.6.32.9/drivers/video/backlight/locomolcd.c 2010-02-09 07:57:19.000000000 -0500
25885+++ linux-2.6.32.8/drivers/video/backlight/locomolcd.c 2010-02-13 21:45:10.630567678 -0500 26285+++ linux-2.6.32.9/drivers/video/backlight/locomolcd.c 2010-02-23 17:09:53.263724942 -0500
25886@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc 26286@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
25887 return current_intensity; 26287 return current_intensity;
25888 } 26288 }
@@ -25892,9 +26292,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/locomolcd.c linux-2.6.32.8/dri
25892 .get_brightness = locomolcd_get_intensity, 26292 .get_brightness = locomolcd_get_intensity,
25893 .update_status = locomolcd_set_intensity, 26293 .update_status = locomolcd_set_intensity,
25894 }; 26294 };
25895diff -urNp linux-2.6.32.8/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.8/drivers/video/backlight/mbp_nvidia_bl.c 26295diff -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
25896--- linux-2.6.32.8/drivers/video/backlight/mbp_nvidia_bl.c 2010-02-09 07:57:19.000000000 -0500 26296--- linux-2.6.32.9/drivers/video/backlight/mbp_nvidia_bl.c 2010-02-09 07:57:19.000000000 -0500
25897+++ linux-2.6.32.8/drivers/video/backlight/mbp_nvidia_bl.c 2010-02-13 21:45:10.630567678 -0500 26297+++ linux-2.6.32.9/drivers/video/backlight/mbp_nvidia_bl.c 2010-02-23 17:09:53.263724942 -0500
25898@@ -33,7 +33,7 @@ struct dmi_match_data { 26298@@ -33,7 +33,7 @@ struct dmi_match_data {
25899 unsigned long iostart; 26299 unsigned long iostart;
25900 unsigned long iolen; 26300 unsigned long iolen;
@@ -25904,9 +26304,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.8
25904 }; 26304 };
25905 26305
25906 /* Module parameters. */ 26306 /* Module parameters. */
25907diff -urNp linux-2.6.32.8/drivers/video/backlight/omap1_bl.c linux-2.6.32.8/drivers/video/backlight/omap1_bl.c 26307diff -urNp linux-2.6.32.9/drivers/video/backlight/omap1_bl.c linux-2.6.32.9/drivers/video/backlight/omap1_bl.c
25908--- linux-2.6.32.8/drivers/video/backlight/omap1_bl.c 2010-02-09 07:57:19.000000000 -0500 26308--- linux-2.6.32.9/drivers/video/backlight/omap1_bl.c 2010-02-09 07:57:19.000000000 -0500
25909+++ linux-2.6.32.8/drivers/video/backlight/omap1_bl.c 2010-02-13 21:45:10.631602484 -0500 26309+++ linux-2.6.32.9/drivers/video/backlight/omap1_bl.c 2010-02-23 17:09:53.263724942 -0500
25910@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b 26310@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
25911 return bl->current_intensity; 26311 return bl->current_intensity;
25912 } 26312 }
@@ -25916,9 +26316,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/omap1_bl.c linux-2.6.32.8/driv
25916 .get_brightness = omapbl_get_intensity, 26316 .get_brightness = omapbl_get_intensity,
25917 .update_status = omapbl_update_status, 26317 .update_status = omapbl_update_status,
25918 }; 26318 };
25919diff -urNp linux-2.6.32.8/drivers/video/backlight/progear_bl.c linux-2.6.32.8/drivers/video/backlight/progear_bl.c 26319diff -urNp linux-2.6.32.9/drivers/video/backlight/progear_bl.c linux-2.6.32.9/drivers/video/backlight/progear_bl.c
25920--- linux-2.6.32.8/drivers/video/backlight/progear_bl.c 2010-02-09 07:57:19.000000000 -0500 26320--- linux-2.6.32.9/drivers/video/backlight/progear_bl.c 2010-02-09 07:57:19.000000000 -0500
25921+++ linux-2.6.32.8/drivers/video/backlight/progear_bl.c 2010-02-13 21:45:10.631602484 -0500 26321+++ linux-2.6.32.9/drivers/video/backlight/progear_bl.c 2010-02-23 17:09:53.263724942 -0500
25922@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc 26322@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
25923 return intensity - HW_LEVEL_MIN; 26323 return intensity - HW_LEVEL_MIN;
25924 } 26324 }
@@ -25928,9 +26328,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/progear_bl.c linux-2.6.32.8/dr
25928 .get_brightness = progearbl_get_intensity, 26328 .get_brightness = progearbl_get_intensity,
25929 .update_status = progearbl_set_intensity, 26329 .update_status = progearbl_set_intensity,
25930 }; 26330 };
25931diff -urNp linux-2.6.32.8/drivers/video/backlight/pwm_bl.c linux-2.6.32.8/drivers/video/backlight/pwm_bl.c 26331diff -urNp linux-2.6.32.9/drivers/video/backlight/pwm_bl.c linux-2.6.32.9/drivers/video/backlight/pwm_bl.c
25932--- linux-2.6.32.8/drivers/video/backlight/pwm_bl.c 2010-02-09 07:57:19.000000000 -0500 26332--- linux-2.6.32.9/drivers/video/backlight/pwm_bl.c 2010-02-09 07:57:19.000000000 -0500
25933+++ linux-2.6.32.8/drivers/video/backlight/pwm_bl.c 2010-02-13 21:45:10.631602484 -0500 26333+++ linux-2.6.32.9/drivers/video/backlight/pwm_bl.c 2010-02-23 17:09:53.263724942 -0500
25934@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( 26334@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
25935 return bl->props.brightness; 26335 return bl->props.brightness;
25936 } 26336 }
@@ -25940,9 +26340,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/pwm_bl.c linux-2.6.32.8/driver
25940 .update_status = pwm_backlight_update_status, 26340 .update_status = pwm_backlight_update_status,
25941 .get_brightness = pwm_backlight_get_brightness, 26341 .get_brightness = pwm_backlight_get_brightness,
25942 }; 26342 };
25943diff -urNp linux-2.6.32.8/drivers/video/backlight/tosa_bl.c linux-2.6.32.8/drivers/video/backlight/tosa_bl.c 26343diff -urNp linux-2.6.32.9/drivers/video/backlight/tosa_bl.c linux-2.6.32.9/drivers/video/backlight/tosa_bl.c
25944--- linux-2.6.32.8/drivers/video/backlight/tosa_bl.c 2010-02-09 07:57:19.000000000 -0500 26344--- linux-2.6.32.9/drivers/video/backlight/tosa_bl.c 2010-02-09 07:57:19.000000000 -0500
25945+++ linux-2.6.32.8/drivers/video/backlight/tosa_bl.c 2010-02-13 21:45:10.631602484 -0500 26345+++ linux-2.6.32.9/drivers/video/backlight/tosa_bl.c 2010-02-23 17:09:53.268343828 -0500
25946@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct 26346@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
25947 return props->brightness; 26347 return props->brightness;
25948 } 26348 }
@@ -25952,9 +26352,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/tosa_bl.c linux-2.6.32.8/drive
25952 .get_brightness = tosa_bl_get_brightness, 26352 .get_brightness = tosa_bl_get_brightness,
25953 .update_status = tosa_bl_update_status, 26353 .update_status = tosa_bl_update_status,
25954 }; 26354 };
25955diff -urNp linux-2.6.32.8/drivers/video/backlight/wm831x_bl.c linux-2.6.32.8/drivers/video/backlight/wm831x_bl.c 26355diff -urNp linux-2.6.32.9/drivers/video/backlight/wm831x_bl.c linux-2.6.32.9/drivers/video/backlight/wm831x_bl.c
25956--- linux-2.6.32.8/drivers/video/backlight/wm831x_bl.c 2010-02-09 07:57:19.000000000 -0500 26356--- linux-2.6.32.9/drivers/video/backlight/wm831x_bl.c 2010-02-09 07:57:19.000000000 -0500
25957+++ linux-2.6.32.8/drivers/video/backlight/wm831x_bl.c 2010-02-13 21:45:10.631602484 -0500 26357+++ linux-2.6.32.9/drivers/video/backlight/wm831x_bl.c 2010-02-23 17:09:53.268343828 -0500
25958@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne 26358@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
25959 return data->current_brightness; 26359 return data->current_brightness;
25960 } 26360 }
@@ -25964,9 +26364,9 @@ diff -urNp linux-2.6.32.8/drivers/video/backlight/wm831x_bl.c linux-2.6.32.8/dri
25964 .options = BL_CORE_SUSPENDRESUME, 26364 .options = BL_CORE_SUSPENDRESUME,
25965 .update_status = wm831x_backlight_update_status, 26365 .update_status = wm831x_backlight_update_status,
25966 .get_brightness = wm831x_backlight_get_brightness, 26366 .get_brightness = wm831x_backlight_get_brightness,
25967diff -urNp linux-2.6.32.8/drivers/video/bf54x-lq043fb.c linux-2.6.32.8/drivers/video/bf54x-lq043fb.c 26367diff -urNp linux-2.6.32.9/drivers/video/bf54x-lq043fb.c linux-2.6.32.9/drivers/video/bf54x-lq043fb.c
25968--- linux-2.6.32.8/drivers/video/bf54x-lq043fb.c 2010-02-09 07:57:19.000000000 -0500 26368--- linux-2.6.32.9/drivers/video/bf54x-lq043fb.c 2010-02-09 07:57:19.000000000 -0500
25969+++ linux-2.6.32.8/drivers/video/bf54x-lq043fb.c 2010-02-13 21:45:10.631602484 -0500 26369+++ linux-2.6.32.9/drivers/video/bf54x-lq043fb.c 2010-02-23 17:09:53.268343828 -0500
25970@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back 26370@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
25971 return 0; 26371 return 0;
25972 } 26372 }
@@ -25976,9 +26376,9 @@ diff -urNp linux-2.6.32.8/drivers/video/bf54x-lq043fb.c linux-2.6.32.8/drivers/v
25976 .get_brightness = bl_get_brightness, 26376 .get_brightness = bl_get_brightness,
25977 }; 26377 };
25978 26378
25979diff -urNp linux-2.6.32.8/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.8/drivers/video/bfin-t350mcqb-fb.c 26379diff -urNp linux-2.6.32.9/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.9/drivers/video/bfin-t350mcqb-fb.c
25980--- linux-2.6.32.8/drivers/video/bfin-t350mcqb-fb.c 2010-02-09 07:57:19.000000000 -0500 26380--- linux-2.6.32.9/drivers/video/bfin-t350mcqb-fb.c 2010-02-09 07:57:19.000000000 -0500
25981+++ linux-2.6.32.8/drivers/video/bfin-t350mcqb-fb.c 2010-02-13 21:45:10.631602484 -0500 26381+++ linux-2.6.32.9/drivers/video/bfin-t350mcqb-fb.c 2010-02-23 17:09:53.268343828 -0500
25982@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back 26382@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
25983 return 0; 26383 return 0;
25984 } 26384 }
@@ -25988,9 +26388,9 @@ diff -urNp linux-2.6.32.8/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.8/driver
25988 .get_brightness = bl_get_brightness, 26388 .get_brightness = bl_get_brightness,
25989 }; 26389 };
25990 26390
25991diff -urNp linux-2.6.32.8/drivers/video/fbmem.c linux-2.6.32.8/drivers/video/fbmem.c 26391diff -urNp linux-2.6.32.9/drivers/video/fbmem.c linux-2.6.32.9/drivers/video/fbmem.c
25992--- linux-2.6.32.8/drivers/video/fbmem.c 2010-02-09 07:57:19.000000000 -0500 26392--- linux-2.6.32.9/drivers/video/fbmem.c 2010-02-09 07:57:19.000000000 -0500
25993+++ linux-2.6.32.8/drivers/video/fbmem.c 2010-02-13 21:45:10.632994619 -0500 26393+++ linux-2.6.32.9/drivers/video/fbmem.c 2010-02-23 17:09:53.268343828 -0500
25994@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in 26394@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
25995 image->dx += image->width + 8; 26395 image->dx += image->width + 8;
25996 } 26396 }
@@ -26018,9 +26418,9 @@ diff -urNp linux-2.6.32.8/drivers/video/fbmem.c linux-2.6.32.8/drivers/video/fbm
26018 return -EINVAL; 26418 return -EINVAL;
26019 if (!registered_fb[con2fb.framebuffer]) 26419 if (!registered_fb[con2fb.framebuffer])
26020 request_module("fb%d", con2fb.framebuffer); 26420 request_module("fb%d", con2fb.framebuffer);
26021diff -urNp linux-2.6.32.8/drivers/video/fbmon.c linux-2.6.32.8/drivers/video/fbmon.c 26421diff -urNp linux-2.6.32.9/drivers/video/fbmon.c linux-2.6.32.9/drivers/video/fbmon.c
26022--- linux-2.6.32.8/drivers/video/fbmon.c 2010-02-09 07:57:19.000000000 -0500 26422--- linux-2.6.32.9/drivers/video/fbmon.c 2010-02-09 07:57:19.000000000 -0500
26023+++ linux-2.6.32.8/drivers/video/fbmon.c 2010-02-13 21:45:10.633534805 -0500 26423+++ linux-2.6.32.9/drivers/video/fbmon.c 2010-02-23 17:09:53.268343828 -0500
26024@@ -45,7 +45,7 @@ 26424@@ -45,7 +45,7 @@
26025 #ifdef DEBUG 26425 #ifdef DEBUG
26026 #define DPRINTK(fmt, args...) printk(fmt,## args) 26426 #define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -26030,9 +26430,9 @@ diff -urNp linux-2.6.32.8/drivers/video/fbmon.c linux-2.6.32.8/drivers/video/fbm
26030 #endif 26430 #endif
26031 26431
26032 #define FBMON_FIX_HEADER 1 26432 #define FBMON_FIX_HEADER 1
26033diff -urNp linux-2.6.32.8/drivers/video/i810/i810_accel.c linux-2.6.32.8/drivers/video/i810/i810_accel.c 26433diff -urNp linux-2.6.32.9/drivers/video/i810/i810_accel.c linux-2.6.32.9/drivers/video/i810/i810_accel.c
26034--- linux-2.6.32.8/drivers/video/i810/i810_accel.c 2010-02-09 07:57:19.000000000 -0500 26434--- linux-2.6.32.9/drivers/video/i810/i810_accel.c 2010-02-09 07:57:19.000000000 -0500
26035+++ linux-2.6.32.8/drivers/video/i810/i810_accel.c 2010-02-13 21:45:10.633534805 -0500 26435+++ linux-2.6.32.9/drivers/video/i810/i810_accel.c 2010-02-23 17:09:53.268343828 -0500
26036@@ -73,6 +73,7 @@ static inline int wait_for_space(struct 26436@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
26037 } 26437 }
26038 } 26438 }
@@ -26041,9 +26441,9 @@ diff -urNp linux-2.6.32.8/drivers/video/i810/i810_accel.c linux-2.6.32.8/drivers
26041 i810_report_error(mmio); 26441 i810_report_error(mmio);
26042 par->dev_flags |= LOCKUP; 26442 par->dev_flags |= LOCKUP;
26043 info->pixmap.scan_align = 1; 26443 info->pixmap.scan_align = 1;
26044diff -urNp linux-2.6.32.8/drivers/video/i810/i810_main.c linux-2.6.32.8/drivers/video/i810/i810_main.c 26444diff -urNp linux-2.6.32.9/drivers/video/i810/i810_main.c linux-2.6.32.9/drivers/video/i810/i810_main.c
26045--- linux-2.6.32.8/drivers/video/i810/i810_main.c 2010-02-09 07:57:19.000000000 -0500 26445--- linux-2.6.32.9/drivers/video/i810/i810_main.c 2010-02-09 07:57:19.000000000 -0500
26046+++ linux-2.6.32.8/drivers/video/i810/i810_main.c 2010-02-13 21:45:10.633534805 -0500 26446+++ linux-2.6.32.9/drivers/video/i810/i810_main.c 2010-02-23 17:09:53.268343828 -0500
26047@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t 26447@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
26048 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, 26448 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
26049 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, 26449 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
@@ -26053,9 +26453,9 @@ diff -urNp linux-2.6.32.8/drivers/video/i810/i810_main.c linux-2.6.32.8/drivers/
26053 }; 26453 };
26054 26454
26055 static struct pci_driver i810fb_driver = { 26455 static struct pci_driver i810fb_driver = {
26056diff -urNp linux-2.6.32.8/drivers/video/modedb.c linux-2.6.32.8/drivers/video/modedb.c 26456diff -urNp linux-2.6.32.9/drivers/video/modedb.c linux-2.6.32.9/drivers/video/modedb.c
26057--- linux-2.6.32.8/drivers/video/modedb.c 2010-02-09 07:57:19.000000000 -0500 26457--- linux-2.6.32.9/drivers/video/modedb.c 2010-02-09 07:57:19.000000000 -0500
26058+++ linux-2.6.32.8/drivers/video/modedb.c 2010-02-13 21:45:10.634599709 -0500 26458+++ linux-2.6.32.9/drivers/video/modedb.c 2010-02-23 17:09:53.268343828 -0500
26059@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ 26459@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
26060 { 26460 {
26061 /* 640x400 @ 70 Hz, 31.5 kHz hsync */ 26461 /* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -26356,9 +26756,9 @@ diff -urNp linux-2.6.32.8/drivers/video/modedb.c linux-2.6.32.8/drivers/video/mo
26356 }, 26756 },
26357 }; 26757 };
26358 26758
26359diff -urNp linux-2.6.32.8/drivers/video/nvidia/nv_backlight.c linux-2.6.32.8/drivers/video/nvidia/nv_backlight.c 26759diff -urNp linux-2.6.32.9/drivers/video/nvidia/nv_backlight.c linux-2.6.32.9/drivers/video/nvidia/nv_backlight.c
26360--- linux-2.6.32.8/drivers/video/nvidia/nv_backlight.c 2010-02-09 07:57:19.000000000 -0500 26760--- linux-2.6.32.9/drivers/video/nvidia/nv_backlight.c 2010-02-09 07:57:19.000000000 -0500
26361+++ linux-2.6.32.8/drivers/video/nvidia/nv_backlight.c 2010-02-13 21:45:10.634599709 -0500 26761+++ linux-2.6.32.9/drivers/video/nvidia/nv_backlight.c 2010-02-23 17:09:53.268343828 -0500
26362@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru 26762@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
26363 return bd->props.brightness; 26763 return bd->props.brightness;
26364 } 26764 }
@@ -26368,9 +26768,9 @@ diff -urNp linux-2.6.32.8/drivers/video/nvidia/nv_backlight.c linux-2.6.32.8/dri
26368 .get_brightness = nvidia_bl_get_brightness, 26768 .get_brightness = nvidia_bl_get_brightness,
26369 .update_status = nvidia_bl_update_status, 26769 .update_status = nvidia_bl_update_status,
26370 }; 26770 };
26371diff -urNp linux-2.6.32.8/drivers/video/riva/fbdev.c linux-2.6.32.8/drivers/video/riva/fbdev.c 26771diff -urNp linux-2.6.32.9/drivers/video/riva/fbdev.c linux-2.6.32.9/drivers/video/riva/fbdev.c
26372--- linux-2.6.32.8/drivers/video/riva/fbdev.c 2010-02-09 07:57:19.000000000 -0500 26772--- linux-2.6.32.9/drivers/video/riva/fbdev.c 2010-02-09 07:57:19.000000000 -0500
26373+++ linux-2.6.32.8/drivers/video/riva/fbdev.c 2010-02-13 21:45:10.635686555 -0500 26773+++ linux-2.6.32.9/drivers/video/riva/fbdev.c 2010-02-23 17:09:53.268343828 -0500
26374@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct 26774@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
26375 return bd->props.brightness; 26775 return bd->props.brightness;
26376 } 26776 }
@@ -26380,9 +26780,9 @@ diff -urNp linux-2.6.32.8/drivers/video/riva/fbdev.c linux-2.6.32.8/drivers/vide
26380 .get_brightness = riva_bl_get_brightness, 26780 .get_brightness = riva_bl_get_brightness,
26381 .update_status = riva_bl_update_status, 26781 .update_status = riva_bl_update_status,
26382 }; 26782 };
26383diff -urNp linux-2.6.32.8/drivers/video/uvesafb.c linux-2.6.32.8/drivers/video/uvesafb.c 26783diff -urNp linux-2.6.32.9/drivers/video/uvesafb.c linux-2.6.32.9/drivers/video/uvesafb.c
26384--- linux-2.6.32.8/drivers/video/uvesafb.c 2010-02-09 07:57:19.000000000 -0500 26784--- linux-2.6.32.9/drivers/video/uvesafb.c 2010-02-09 07:57:19.000000000 -0500
26385+++ linux-2.6.32.8/drivers/video/uvesafb.c 2010-02-13 21:45:10.635686555 -0500 26785+++ linux-2.6.32.9/drivers/video/uvesafb.c 2010-02-23 17:09:53.268343828 -0500
26386@@ -18,6 +18,7 @@ 26786@@ -18,6 +18,7 @@
26387 #include <linux/fb.h> 26787 #include <linux/fb.h>
26388 #include <linux/io.h> 26788 #include <linux/io.h>
@@ -26458,9 +26858,9 @@ diff -urNp linux-2.6.32.8/drivers/video/uvesafb.c linux-2.6.32.8/drivers/video/u
26458 } 26858 }
26459 26859
26460 framebuffer_release(info); 26860 framebuffer_release(info);
26461diff -urNp linux-2.6.32.8/drivers/video/vesafb.c linux-2.6.32.8/drivers/video/vesafb.c 26861diff -urNp linux-2.6.32.9/drivers/video/vesafb.c linux-2.6.32.9/drivers/video/vesafb.c
26462--- linux-2.6.32.8/drivers/video/vesafb.c 2010-02-09 07:57:19.000000000 -0500 26862--- linux-2.6.32.9/drivers/video/vesafb.c 2010-02-09 07:57:19.000000000 -0500
26463+++ linux-2.6.32.8/drivers/video/vesafb.c 2010-02-13 21:45:10.635686555 -0500 26863+++ linux-2.6.32.9/drivers/video/vesafb.c 2010-02-23 17:09:53.268343828 -0500
26464@@ -9,6 +9,7 @@ 26864@@ -9,6 +9,7 @@
26465 */ 26865 */
26466 26866
@@ -26564,9 +26964,9 @@ diff -urNp linux-2.6.32.8/drivers/video/vesafb.c linux-2.6.32.8/drivers/video/ve
26564 if (info->screen_base) 26964 if (info->screen_base)
26565 iounmap(info->screen_base); 26965 iounmap(info->screen_base);
26566 framebuffer_release(info); 26966 framebuffer_release(info);
26567diff -urNp linux-2.6.32.8/drivers/xen/sys-hypervisor.c linux-2.6.32.8/drivers/xen/sys-hypervisor.c 26967diff -urNp linux-2.6.32.9/drivers/xen/sys-hypervisor.c linux-2.6.32.9/drivers/xen/sys-hypervisor.c
26568--- linux-2.6.32.8/drivers/xen/sys-hypervisor.c 2010-02-09 07:57:19.000000000 -0500 26968--- linux-2.6.32.9/drivers/xen/sys-hypervisor.c 2010-02-09 07:57:19.000000000 -0500
26569+++ linux-2.6.32.8/drivers/xen/sys-hypervisor.c 2010-02-13 21:45:10.635686555 -0500 26969+++ linux-2.6.32.9/drivers/xen/sys-hypervisor.c 2010-02-23 17:09:53.268343828 -0500
26570@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko 26970@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
26571 return 0; 26971 return 0;
26572 } 26972 }
@@ -26576,9 +26976,9 @@ diff -urNp linux-2.6.32.8/drivers/xen/sys-hypervisor.c linux-2.6.32.8/drivers/xe
26576 .show = hyp_sysfs_show, 26976 .show = hyp_sysfs_show,
26577 .store = hyp_sysfs_store, 26977 .store = hyp_sysfs_store,
26578 }; 26978 };
26579diff -urNp linux-2.6.32.8/fs/9p/vfs_inode.c linux-2.6.32.8/fs/9p/vfs_inode.c 26979diff -urNp linux-2.6.32.9/fs/9p/vfs_inode.c linux-2.6.32.9/fs/9p/vfs_inode.c
26580--- linux-2.6.32.8/fs/9p/vfs_inode.c 2010-02-09 07:57:19.000000000 -0500 26980--- linux-2.6.32.9/fs/9p/vfs_inode.c 2010-02-09 07:57:19.000000000 -0500
26581+++ linux-2.6.32.8/fs/9p/vfs_inode.c 2010-02-13 21:45:10.635686555 -0500 26981+++ linux-2.6.32.9/fs/9p/vfs_inode.c 2010-02-23 17:09:53.272463050 -0500
26582@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct 26982@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
26583 static void 26983 static void
26584 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 26984 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -26588,9 +26988,9 @@ diff -urNp linux-2.6.32.8/fs/9p/vfs_inode.c linux-2.6.32.8/fs/9p/vfs_inode.c
26588 26988
26589 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, 26989 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
26590 IS_ERR(s) ? "<error>" : s); 26990 IS_ERR(s) ? "<error>" : s);
26591diff -urNp linux-2.6.32.8/fs/aio.c linux-2.6.32.8/fs/aio.c 26991diff -urNp linux-2.6.32.9/fs/aio.c linux-2.6.32.9/fs/aio.c
26592--- linux-2.6.32.8/fs/aio.c 2010-02-09 07:57:19.000000000 -0500 26992--- linux-2.6.32.9/fs/aio.c 2010-02-09 07:57:19.000000000 -0500
26593+++ linux-2.6.32.8/fs/aio.c 2010-02-13 21:45:10.636989162 -0500 26993+++ linux-2.6.32.9/fs/aio.c 2010-02-23 17:09:53.272463050 -0500
26594@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx 26994@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx
26595 size += sizeof(struct io_event) * nr_events; 26995 size += sizeof(struct io_event) * nr_events;
26596 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; 26996 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -26600,9 +27000,9 @@ diff -urNp linux-2.6.32.8/fs/aio.c linux-2.6.32.8/fs/aio.c
26600 return -EINVAL; 27000 return -EINVAL;
26601 27001
26602 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); 27002 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
26603diff -urNp linux-2.6.32.8/fs/attr.c linux-2.6.32.8/fs/attr.c 27003diff -urNp linux-2.6.32.9/fs/attr.c linux-2.6.32.9/fs/attr.c
26604--- linux-2.6.32.8/fs/attr.c 2010-02-09 07:57:19.000000000 -0500 27004--- linux-2.6.32.9/fs/attr.c 2010-02-09 07:57:19.000000000 -0500
26605+++ linux-2.6.32.8/fs/attr.c 2010-02-13 21:45:10.636989162 -0500 27005+++ linux-2.6.32.9/fs/attr.c 2010-02-23 17:09:53.272463050 -0500
26606@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode 27006@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
26607 unsigned long limit; 27007 unsigned long limit;
26608 27008
@@ -26611,9 +27011,9 @@ diff -urNp linux-2.6.32.8/fs/attr.c linux-2.6.32.8/fs/attr.c
26611 if (limit != RLIM_INFINITY && offset > limit) 27011 if (limit != RLIM_INFINITY && offset > limit)
26612 goto out_sig; 27012 goto out_sig;
26613 if (offset > inode->i_sb->s_maxbytes) 27013 if (offset > inode->i_sb->s_maxbytes)
26614diff -urNp linux-2.6.32.8/fs/autofs/root.c linux-2.6.32.8/fs/autofs/root.c 27014diff -urNp linux-2.6.32.9/fs/autofs/root.c linux-2.6.32.9/fs/autofs/root.c
26615--- linux-2.6.32.8/fs/autofs/root.c 2010-02-09 07:57:19.000000000 -0500 27015--- linux-2.6.32.9/fs/autofs/root.c 2010-02-09 07:57:19.000000000 -0500
26616+++ linux-2.6.32.8/fs/autofs/root.c 2010-02-13 21:45:10.636989162 -0500 27016+++ linux-2.6.32.9/fs/autofs/root.c 2010-02-23 17:09:53.272463050 -0500
26617@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in 27017@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
26618 set_bit(n,sbi->symlink_bitmap); 27018 set_bit(n,sbi->symlink_bitmap);
26619 sl = &sbi->symlink[n]; 27019 sl = &sbi->symlink[n];
@@ -26624,9 +27024,9 @@ diff -urNp linux-2.6.32.8/fs/autofs/root.c linux-2.6.32.8/fs/autofs/root.c
26624 if (!sl->data) { 27024 if (!sl->data) {
26625 clear_bit(n,sbi->symlink_bitmap); 27025 clear_bit(n,sbi->symlink_bitmap);
26626 unlock_kernel(); 27026 unlock_kernel();
26627diff -urNp linux-2.6.32.8/fs/autofs4/symlink.c linux-2.6.32.8/fs/autofs4/symlink.c 27027diff -urNp linux-2.6.32.9/fs/autofs4/symlink.c linux-2.6.32.9/fs/autofs4/symlink.c
26628--- linux-2.6.32.8/fs/autofs4/symlink.c 2010-02-09 07:57:19.000000000 -0500 27028--- linux-2.6.32.9/fs/autofs4/symlink.c 2010-02-09 07:57:19.000000000 -0500
26629+++ linux-2.6.32.8/fs/autofs4/symlink.c 2010-02-13 21:45:10.636989162 -0500 27029+++ linux-2.6.32.9/fs/autofs4/symlink.c 2010-02-23 17:09:53.272463050 -0500
26630@@ -15,7 +15,7 @@ 27030@@ -15,7 +15,7 @@
26631 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) 27031 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
26632 { 27032 {
@@ -26636,9 +27036,9 @@ diff -urNp linux-2.6.32.8/fs/autofs4/symlink.c linux-2.6.32.8/fs/autofs4/symlink
26636 return NULL; 27036 return NULL;
26637 } 27037 }
26638 27038
26639diff -urNp linux-2.6.32.8/fs/befs/linuxvfs.c linux-2.6.32.8/fs/befs/linuxvfs.c 27039diff -urNp linux-2.6.32.9/fs/befs/linuxvfs.c linux-2.6.32.9/fs/befs/linuxvfs.c
26640--- linux-2.6.32.8/fs/befs/linuxvfs.c 2010-02-09 07:57:19.000000000 -0500 27040--- linux-2.6.32.9/fs/befs/linuxvfs.c 2010-02-23 17:04:12.513858925 -0500
26641+++ linux-2.6.32.8/fs/befs/linuxvfs.c 2010-02-13 21:45:10.637988657 -0500 27041+++ linux-2.6.32.9/fs/befs/linuxvfs.c 2010-02-23 17:09:53.272463050 -0500
26642@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry 27042@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
26643 { 27043 {
26644 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); 27044 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -26648,9 +27048,9 @@ diff -urNp linux-2.6.32.8/fs/befs/linuxvfs.c linux-2.6.32.8/fs/befs/linuxvfs.c
26648 if (!IS_ERR(link)) 27048 if (!IS_ERR(link))
26649 kfree(link); 27049 kfree(link);
26650 } 27050 }
26651diff -urNp linux-2.6.32.8/fs/binfmt_aout.c linux-2.6.32.8/fs/binfmt_aout.c 27051diff -urNp linux-2.6.32.9/fs/binfmt_aout.c linux-2.6.32.9/fs/binfmt_aout.c
26652--- linux-2.6.32.8/fs/binfmt_aout.c 2010-02-09 07:57:19.000000000 -0500 27052--- linux-2.6.32.9/fs/binfmt_aout.c 2010-02-09 07:57:19.000000000 -0500
26653+++ linux-2.6.32.8/fs/binfmt_aout.c 2010-02-13 21:45:10.637988657 -0500 27053+++ linux-2.6.32.9/fs/binfmt_aout.c 2010-02-23 17:09:53.272463050 -0500
26654@@ -16,6 +16,7 @@ 27054@@ -16,6 +16,7 @@
26655 #include <linux/string.h> 27055 #include <linux/string.h>
26656 #include <linux/fs.h> 27056 #include <linux/fs.h>
@@ -26718,9 +27118,9 @@ diff -urNp linux-2.6.32.8/fs/binfmt_aout.c linux-2.6.32.8/fs/binfmt_aout.c
26718 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, 27118 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
26719 fd_offset + ex.a_text); 27119 fd_offset + ex.a_text);
26720 up_write(&current->mm->mmap_sem); 27120 up_write(&current->mm->mmap_sem);
26721diff -urNp linux-2.6.32.8/fs/binfmt_elf.c linux-2.6.32.8/fs/binfmt_elf.c 27121diff -urNp linux-2.6.32.9/fs/binfmt_elf.c linux-2.6.32.9/fs/binfmt_elf.c
26722--- linux-2.6.32.8/fs/binfmt_elf.c 2010-02-09 07:57:19.000000000 -0500 27122--- linux-2.6.32.9/fs/binfmt_elf.c 2010-02-09 07:57:19.000000000 -0500
26723+++ linux-2.6.32.8/fs/binfmt_elf.c 2010-02-13 21:45:10.638995106 -0500 27123+++ linux-2.6.32.9/fs/binfmt_elf.c 2010-02-23 17:09:53.272463050 -0500
26724@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str 27124@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
26725 #define elf_core_dump NULL 27125 #define elf_core_dump NULL
26726 #endif 27126 #endif
@@ -27090,6 +27490,10 @@ diff -urNp linux-2.6.32.8/fs/binfmt_elf.c linux-2.6.32.8/fs/binfmt_elf.c
27090+ put_cpu(); 27490+ put_cpu();
27091+ } 27491+ }
27092+#endif 27492+#endif
27493
27494 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
27495 may depend on the personality. */
27496 SET_PERSONALITY(loc->elf_ex);
27093+ 27497+
27094+#ifdef CONFIG_PAX_ASLR 27498+#ifdef CONFIG_PAX_ASLR
27095+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) { 27499+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
@@ -27097,10 +27501,6 @@ diff -urNp linux-2.6.32.8/fs/binfmt_elf.c linux-2.6.32.8/fs/binfmt_elf.c
27097+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT; 27501+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
27098+ } 27502+ }
27099+#endif 27503+#endif
27100
27101 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
27102 may depend on the personality. */
27103 SET_PERSONALITY(loc->elf_ex);
27104+ 27504+
27105+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) 27505+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
27106+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) { 27506+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
@@ -27352,9 +27752,9 @@ diff -urNp linux-2.6.32.8/fs/binfmt_elf.c linux-2.6.32.8/fs/binfmt_elf.c
27352 static int __init init_elf_binfmt(void) 27752 static int __init init_elf_binfmt(void)
27353 { 27753 {
27354 return register_binfmt(&elf_format); 27754 return register_binfmt(&elf_format);
27355diff -urNp linux-2.6.32.8/fs/binfmt_flat.c linux-2.6.32.8/fs/binfmt_flat.c 27755diff -urNp linux-2.6.32.9/fs/binfmt_flat.c linux-2.6.32.9/fs/binfmt_flat.c
27356--- linux-2.6.32.8/fs/binfmt_flat.c 2010-02-09 07:57:19.000000000 -0500 27756--- linux-2.6.32.9/fs/binfmt_flat.c 2010-02-09 07:57:19.000000000 -0500
27357+++ linux-2.6.32.8/fs/binfmt_flat.c 2010-02-13 21:45:10.638995106 -0500 27757+++ linux-2.6.32.9/fs/binfmt_flat.c 2010-02-23 17:09:53.272463050 -0500
27358@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b 27758@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
27359 realdatastart = (unsigned long) -ENOMEM; 27759 realdatastart = (unsigned long) -ENOMEM;
27360 printk("Unable to allocate RAM for process data, errno %d\n", 27760 printk("Unable to allocate RAM for process data, errno %d\n",
@@ -27387,9 +27787,9 @@ diff -urNp linux-2.6.32.8/fs/binfmt_flat.c linux-2.6.32.8/fs/binfmt_flat.c
27387 ret = result; 27787 ret = result;
27388 goto err; 27788 goto err;
27389 } 27789 }
27390diff -urNp linux-2.6.32.8/fs/binfmt_misc.c linux-2.6.32.8/fs/binfmt_misc.c 27790diff -urNp linux-2.6.32.9/fs/binfmt_misc.c linux-2.6.32.9/fs/binfmt_misc.c
27391--- linux-2.6.32.8/fs/binfmt_misc.c 2010-02-09 07:57:19.000000000 -0500 27791--- linux-2.6.32.9/fs/binfmt_misc.c 2010-02-09 07:57:19.000000000 -0500
27392+++ linux-2.6.32.8/fs/binfmt_misc.c 2010-02-13 21:45:10.638995106 -0500 27792+++ linux-2.6.32.9/fs/binfmt_misc.c 2010-02-23 17:09:53.272463050 -0500
27393@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl 27793@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
27394 static struct tree_descr bm_files[] = { 27794 static struct tree_descr bm_files[] = {
27395 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, 27795 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
@@ -27399,9 +27799,9 @@ diff -urNp linux-2.6.32.8/fs/binfmt_misc.c linux-2.6.32.8/fs/binfmt_misc.c
27399 }; 27799 };
27400 int err = simple_fill_super(sb, 0x42494e4d, bm_files); 27800 int err = simple_fill_super(sb, 0x42494e4d, bm_files);
27401 if (!err) 27801 if (!err)
27402diff -urNp linux-2.6.32.8/fs/bio.c linux-2.6.32.8/fs/bio.c 27802diff -urNp linux-2.6.32.9/fs/bio.c linux-2.6.32.9/fs/bio.c
27403--- linux-2.6.32.8/fs/bio.c 2010-02-09 07:57:19.000000000 -0500 27803--- linux-2.6.32.9/fs/bio.c 2010-02-09 07:57:19.000000000 -0500
27404+++ linux-2.6.32.8/fs/bio.c 2010-02-13 21:45:10.639989586 -0500 27804+++ linux-2.6.32.9/fs/bio.c 2010-02-23 17:09:53.272463050 -0500
27405@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr 27805@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
27406 27806
27407 i = 0; 27807 i = 0;
@@ -27420,9 +27820,9 @@ diff -urNp linux-2.6.32.8/fs/bio.c linux-2.6.32.8/fs/bio.c
27420 27820
27421 __bio_for_each_segment(bvec, bio, i, 0) { 27821 __bio_for_each_segment(bvec, bio, i, 0) {
27422 char *addr = page_address(bvec->bv_page); 27822 char *addr = page_address(bvec->bv_page);
27423diff -urNp linux-2.6.32.8/fs/btrfs/ctree.c linux-2.6.32.8/fs/btrfs/ctree.c 27823diff -urNp linux-2.6.32.9/fs/btrfs/ctree.c linux-2.6.32.9/fs/btrfs/ctree.c
27424--- linux-2.6.32.8/fs/btrfs/ctree.c 2010-02-09 07:57:19.000000000 -0500 27824--- linux-2.6.32.9/fs/btrfs/ctree.c 2010-02-09 07:57:19.000000000 -0500
27425+++ linux-2.6.32.8/fs/btrfs/ctree.c 2010-02-13 21:45:10.639989586 -0500 27825+++ linux-2.6.32.9/fs/btrfs/ctree.c 2010-02-23 17:09:53.272463050 -0500
27426@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran 27826@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran
27427 27827
27428 ret = 0; 27828 ret = 0;
@@ -27431,9 +27831,9 @@ diff -urNp linux-2.6.32.8/fs/btrfs/ctree.c linux-2.6.32.8/fs/btrfs/ctree.c
27431 btrfs_cpu_key_to_disk(&disk_key, cpu_key); 27831 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
27432 ret = fixup_low_keys(trans, root, path, &disk_key, 1); 27832 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
27433 } 27833 }
27434diff -urNp linux-2.6.32.8/fs/btrfs/disk-io.c linux-2.6.32.8/fs/btrfs/disk-io.c 27834diff -urNp linux-2.6.32.9/fs/btrfs/disk-io.c linux-2.6.32.9/fs/btrfs/disk-io.c
27435--- linux-2.6.32.8/fs/btrfs/disk-io.c 2010-02-09 07:57:19.000000000 -0500 27835--- linux-2.6.32.9/fs/btrfs/disk-io.c 2010-02-09 07:57:19.000000000 -0500
27436+++ linux-2.6.32.8/fs/btrfs/disk-io.c 2010-02-13 21:45:10.640989847 -0500 27836+++ linux-2.6.32.9/fs/btrfs/disk-io.c 2010-02-23 17:09:53.276137164 -0500
27437@@ -39,7 +39,7 @@ 27837@@ -39,7 +39,7 @@
27438 #include "tree-log.h" 27838 #include "tree-log.h"
27439 #include "free-space-cache.h" 27839 #include "free-space-cache.h"
@@ -27452,9 +27852,9 @@ diff -urNp linux-2.6.32.8/fs/btrfs/disk-io.c linux-2.6.32.8/fs/btrfs/disk-io.c
27452 .write_cache_pages_lock_hook = btree_lock_page_hook, 27852 .write_cache_pages_lock_hook = btree_lock_page_hook,
27453 .readpage_end_io_hook = btree_readpage_end_io_hook, 27853 .readpage_end_io_hook = btree_readpage_end_io_hook,
27454 .submit_bio_hook = btree_submit_bio_hook, 27854 .submit_bio_hook = btree_submit_bio_hook,
27455diff -urNp linux-2.6.32.8/fs/btrfs/extent_io.h linux-2.6.32.8/fs/btrfs/extent_io.h 27855diff -urNp linux-2.6.32.9/fs/btrfs/extent_io.h linux-2.6.32.9/fs/btrfs/extent_io.h
27456--- linux-2.6.32.8/fs/btrfs/extent_io.h 2010-02-09 07:57:19.000000000 -0500 27856--- linux-2.6.32.9/fs/btrfs/extent_io.h 2010-02-09 07:57:19.000000000 -0500
27457+++ linux-2.6.32.8/fs/btrfs/extent_io.h 2010-02-13 21:45:10.640989847 -0500 27857+++ linux-2.6.32.9/fs/btrfs/extent_io.h 2010-02-23 17:09:53.276137164 -0500
27458@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s 27858@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
27459 struct bio *bio, int mirror_num, 27859 struct bio *bio, int mirror_num,
27460 unsigned long bio_flags); 27860 unsigned long bio_flags);
@@ -27515,9 +27915,9 @@ diff -urNp linux-2.6.32.8/fs/btrfs/extent_io.h linux-2.6.32.8/fs/btrfs/extent_io
27515 }; 27915 };
27516 27916
27517 struct extent_state { 27917 struct extent_state {
27518diff -urNp linux-2.6.32.8/fs/btrfs/free-space-cache.c linux-2.6.32.8/fs/btrfs/free-space-cache.c 27918diff -urNp linux-2.6.32.9/fs/btrfs/free-space-cache.c linux-2.6.32.9/fs/btrfs/free-space-cache.c
27519--- linux-2.6.32.8/fs/btrfs/free-space-cache.c 2010-02-09 07:57:19.000000000 -0500 27919--- linux-2.6.32.9/fs/btrfs/free-space-cache.c 2010-02-09 07:57:19.000000000 -0500
27520+++ linux-2.6.32.8/fs/btrfs/free-space-cache.c 2010-02-13 21:45:10.641726018 -0500 27920+++ linux-2.6.32.9/fs/btrfs/free-space-cache.c 2010-02-23 17:09:53.276137164 -0500
27521@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf 27921@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
27522 27922
27523 while(1) { 27923 while(1) {
@@ -27536,9 +27936,9 @@ diff -urNp linux-2.6.32.8/fs/btrfs/free-space-cache.c linux-2.6.32.8/fs/btrfs/fr
27536 27936
27537 if (entry->bitmap && entry->bytes > bytes + empty_size) { 27937 if (entry->bitmap && entry->bytes > bytes + empty_size) {
27538 ret = btrfs_bitmap_cluster(block_group, entry, cluster, 27938 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
27539diff -urNp linux-2.6.32.8/fs/btrfs/inode.c linux-2.6.32.8/fs/btrfs/inode.c 27939diff -urNp linux-2.6.32.9/fs/btrfs/inode.c linux-2.6.32.9/fs/btrfs/inode.c
27540--- linux-2.6.32.8/fs/btrfs/inode.c 2010-02-09 07:57:19.000000000 -0500 27940--- linux-2.6.32.9/fs/btrfs/inode.c 2010-02-09 07:57:19.000000000 -0500
27541+++ linux-2.6.32.8/fs/btrfs/inode.c 2010-02-13 21:45:10.641726018 -0500 27941+++ linux-2.6.32.9/fs/btrfs/inode.c 2010-02-23 17:09:53.276137164 -0500
27542@@ -63,7 +63,7 @@ static const struct inode_operations btr 27942@@ -63,7 +63,7 @@ static const struct inode_operations btr
27543 static const struct address_space_operations btrfs_aops; 27943 static const struct address_space_operations btrfs_aops;
27544 static const struct address_space_operations btrfs_symlink_aops; 27944 static const struct address_space_operations btrfs_symlink_aops;
@@ -27557,9 +27957,9 @@ diff -urNp linux-2.6.32.8/fs/btrfs/inode.c linux-2.6.32.8/fs/btrfs/inode.c
27557 .fill_delalloc = run_delalloc_range, 27957 .fill_delalloc = run_delalloc_range,
27558 .submit_bio_hook = btrfs_submit_bio_hook, 27958 .submit_bio_hook = btrfs_submit_bio_hook,
27559 .merge_bio_hook = btrfs_merge_bio_hook, 27959 .merge_bio_hook = btrfs_merge_bio_hook,
27560diff -urNp linux-2.6.32.8/fs/btrfs/sysfs.c linux-2.6.32.8/fs/btrfs/sysfs.c 27960diff -urNp linux-2.6.32.9/fs/btrfs/sysfs.c linux-2.6.32.9/fs/btrfs/sysfs.c
27561--- linux-2.6.32.8/fs/btrfs/sysfs.c 2010-02-09 07:57:19.000000000 -0500 27961--- linux-2.6.32.9/fs/btrfs/sysfs.c 2010-02-09 07:57:19.000000000 -0500
27562+++ linux-2.6.32.8/fs/btrfs/sysfs.c 2010-02-13 21:45:10.642985738 -0500 27962+++ linux-2.6.32.9/fs/btrfs/sysfs.c 2010-02-23 17:09:53.276137164 -0500
27563@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko 27963@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
27564 complete(&root->kobj_unregister); 27964 complete(&root->kobj_unregister);
27565 } 27965 }
@@ -27575,9 +27975,9 @@ diff -urNp linux-2.6.32.8/fs/btrfs/sysfs.c linux-2.6.32.8/fs/btrfs/sysfs.c
27575 .show = btrfs_root_attr_show, 27975 .show = btrfs_root_attr_show,
27576 .store = btrfs_root_attr_store, 27976 .store = btrfs_root_attr_store,
27577 }; 27977 };
27578diff -urNp linux-2.6.32.8/fs/buffer.c linux-2.6.32.8/fs/buffer.c 27978diff -urNp linux-2.6.32.9/fs/buffer.c linux-2.6.32.9/fs/buffer.c
27579--- linux-2.6.32.8/fs/buffer.c 2010-02-09 07:57:19.000000000 -0500 27979--- linux-2.6.32.9/fs/buffer.c 2010-02-09 07:57:19.000000000 -0500
27580+++ linux-2.6.32.8/fs/buffer.c 2010-02-13 21:45:10.642985738 -0500 27980+++ linux-2.6.32.9/fs/buffer.c 2010-02-23 17:09:53.276137164 -0500
27581@@ -25,6 +25,7 @@ 27981@@ -25,6 +25,7 @@
27582 #include <linux/percpu.h> 27982 #include <linux/percpu.h>
27583 #include <linux/slab.h> 27983 #include <linux/slab.h>
@@ -27586,9 +27986,9 @@ diff -urNp linux-2.6.32.8/fs/buffer.c linux-2.6.32.8/fs/buffer.c
27586 #include <linux/blkdev.h> 27986 #include <linux/blkdev.h>
27587 #include <linux/file.h> 27987 #include <linux/file.h>
27588 #include <linux/quotaops.h> 27988 #include <linux/quotaops.h>
27589diff -urNp linux-2.6.32.8/fs/cachefiles/rdwr.c linux-2.6.32.8/fs/cachefiles/rdwr.c 27989diff -urNp linux-2.6.32.9/fs/cachefiles/rdwr.c linux-2.6.32.9/fs/cachefiles/rdwr.c
27590--- linux-2.6.32.8/fs/cachefiles/rdwr.c 2010-02-09 07:57:19.000000000 -0500 27990--- linux-2.6.32.9/fs/cachefiles/rdwr.c 2010-02-09 07:57:19.000000000 -0500
27591+++ linux-2.6.32.8/fs/cachefiles/rdwr.c 2010-02-13 21:45:10.643871834 -0500 27991+++ linux-2.6.32.9/fs/cachefiles/rdwr.c 2010-02-23 17:09:53.276137164 -0500
27592@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache 27992@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
27593 old_fs = get_fs(); 27993 old_fs = get_fs();
27594 set_fs(KERNEL_DS); 27994 set_fs(KERNEL_DS);
@@ -27598,9 +27998,9 @@ diff -urNp linux-2.6.32.8/fs/cachefiles/rdwr.c linux-2.6.32.8/fs/cachefiles/rdwr
27598 set_fs(old_fs); 27998 set_fs(old_fs);
27599 kunmap(page); 27999 kunmap(page);
27600 if (ret != len) 28000 if (ret != len)
27601diff -urNp linux-2.6.32.8/fs/cifs/cifs_uniupr.h linux-2.6.32.8/fs/cifs/cifs_uniupr.h 28001diff -urNp linux-2.6.32.9/fs/cifs/cifs_uniupr.h linux-2.6.32.9/fs/cifs/cifs_uniupr.h
27602--- linux-2.6.32.8/fs/cifs/cifs_uniupr.h 2010-02-09 07:57:19.000000000 -0500 28002--- linux-2.6.32.9/fs/cifs/cifs_uniupr.h 2010-02-09 07:57:19.000000000 -0500
27603+++ linux-2.6.32.8/fs/cifs/cifs_uniupr.h 2010-02-13 21:45:10.643871834 -0500 28003+++ linux-2.6.32.9/fs/cifs/cifs_uniupr.h 2010-02-23 17:09:53.276137164 -0500
27604@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa 28004@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
27605 {0x0490, 0x04cc, UniCaseRangeU0490}, 28005 {0x0490, 0x04cc, UniCaseRangeU0490},
27606 {0x1e00, 0x1ffc, UniCaseRangeU1e00}, 28006 {0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -27610,9 +28010,9 @@ diff -urNp linux-2.6.32.8/fs/cifs/cifs_uniupr.h linux-2.6.32.8/fs/cifs/cifs_uniu
27610 }; 28010 };
27611 #endif 28011 #endif
27612 28012
27613diff -urNp linux-2.6.32.8/fs/cifs/link.c linux-2.6.32.8/fs/cifs/link.c 28013diff -urNp linux-2.6.32.9/fs/cifs/link.c linux-2.6.32.9/fs/cifs/link.c
27614--- linux-2.6.32.8/fs/cifs/link.c 2010-02-09 07:57:19.000000000 -0500 28014--- linux-2.6.32.9/fs/cifs/link.c 2010-02-09 07:57:19.000000000 -0500
27615+++ linux-2.6.32.8/fs/cifs/link.c 2010-02-13 21:45:10.643871834 -0500 28015+++ linux-2.6.32.9/fs/cifs/link.c 2010-02-23 17:09:53.276137164 -0500
27616@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct 28016@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
27617 28017
27618 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) 28018 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -27622,9 +28022,9 @@ diff -urNp linux-2.6.32.8/fs/cifs/link.c linux-2.6.32.8/fs/cifs/link.c
27622 if (!IS_ERR(p)) 28022 if (!IS_ERR(p))
27623 kfree(p); 28023 kfree(p);
27624 } 28024 }
27625diff -urNp linux-2.6.32.8/fs/compat_binfmt_elf.c linux-2.6.32.8/fs/compat_binfmt_elf.c 28025diff -urNp linux-2.6.32.9/fs/compat_binfmt_elf.c linux-2.6.32.9/fs/compat_binfmt_elf.c
27626--- linux-2.6.32.8/fs/compat_binfmt_elf.c 2010-02-09 07:57:19.000000000 -0500 28026--- linux-2.6.32.9/fs/compat_binfmt_elf.c 2010-02-09 07:57:19.000000000 -0500
27627+++ linux-2.6.32.8/fs/compat_binfmt_elf.c 2010-02-13 21:45:10.644552131 -0500 28027+++ linux-2.6.32.9/fs/compat_binfmt_elf.c 2010-02-23 17:09:53.276137164 -0500
27628@@ -29,10 +29,12 @@ 28028@@ -29,10 +29,12 @@
27629 #undef elfhdr 28029 #undef elfhdr
27630 #undef elf_phdr 28030 #undef elf_phdr
@@ -27638,9 +28038,9 @@ diff -urNp linux-2.6.32.8/fs/compat_binfmt_elf.c linux-2.6.32.8/fs/compat_binfmt
27638 #define elf_addr_t Elf32_Addr 28038 #define elf_addr_t Elf32_Addr
27639 28039
27640 /* 28040 /*
27641diff -urNp linux-2.6.32.8/fs/compat.c linux-2.6.32.8/fs/compat.c 28041diff -urNp linux-2.6.32.9/fs/compat.c linux-2.6.32.9/fs/compat.c
27642--- linux-2.6.32.8/fs/compat.c 2010-02-09 07:57:19.000000000 -0500 28042--- linux-2.6.32.9/fs/compat.c 2010-02-09 07:57:19.000000000 -0500
27643+++ linux-2.6.32.8/fs/compat.c 2010-02-13 21:45:10.644552131 -0500 28043+++ linux-2.6.32.9/fs/compat.c 2010-02-23 17:09:53.276137164 -0500
27644@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, 28044@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc,
27645 if (!kmapped_page || kpos != (pos & PAGE_MASK)) { 28045 if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
27646 struct page *page; 28046 struct page *page;
@@ -27740,9 +28140,9 @@ diff -urNp linux-2.6.32.8/fs/compat.c linux-2.6.32.8/fs/compat.c
27740 out: 28140 out:
27741 if (bprm->mm) 28141 if (bprm->mm)
27742 mmput(bprm->mm); 28142 mmput(bprm->mm);
27743diff -urNp linux-2.6.32.8/fs/compat_ioctl.c linux-2.6.32.8/fs/compat_ioctl.c 28143diff -urNp linux-2.6.32.9/fs/compat_ioctl.c linux-2.6.32.9/fs/compat_ioctl.c
27744--- linux-2.6.32.8/fs/compat_ioctl.c 2010-02-09 07:57:19.000000000 -0500 28144--- linux-2.6.32.9/fs/compat_ioctl.c 2010-02-09 07:57:19.000000000 -0500
27745+++ linux-2.6.32.8/fs/compat_ioctl.c 2010-02-13 21:45:10.645620829 -0500 28145+++ linux-2.6.32.9/fs/compat_ioctl.c 2010-02-23 17:09:53.276137164 -0500
27746@@ -1827,15 +1827,15 @@ struct ioctl_trans { 28146@@ -1827,15 +1827,15 @@ struct ioctl_trans {
27747 }; 28147 };
27748 28148
@@ -27762,9 +28162,9 @@ diff -urNp linux-2.6.32.8/fs/compat_ioctl.c linux-2.6.32.8/fs/compat_ioctl.c
27762 28162
27763 /* ioctl should not be warned about even if it's not implemented. 28163 /* ioctl should not be warned about even if it's not implemented.
27764 Valid reasons to use this: 28164 Valid reasons to use this:
27765diff -urNp linux-2.6.32.8/fs/debugfs/inode.c linux-2.6.32.8/fs/debugfs/inode.c 28165diff -urNp linux-2.6.32.9/fs/debugfs/inode.c linux-2.6.32.9/fs/debugfs/inode.c
27766--- linux-2.6.32.8/fs/debugfs/inode.c 2010-02-09 07:57:19.000000000 -0500 28166--- linux-2.6.32.9/fs/debugfs/inode.c 2010-02-09 07:57:19.000000000 -0500
27767+++ linux-2.6.32.8/fs/debugfs/inode.c 2010-02-13 21:45:10.645620829 -0500 28167+++ linux-2.6.32.9/fs/debugfs/inode.c 2010-02-23 17:09:53.276137164 -0500
27768@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc 28168@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
27769 28169
27770 static int debug_fill_super(struct super_block *sb, void *data, int silent) 28170 static int debug_fill_super(struct super_block *sb, void *data, int silent)
@@ -27774,9 +28174,9 @@ diff -urNp linux-2.6.32.8/fs/debugfs/inode.c linux-2.6.32.8/fs/debugfs/inode.c
27774 28174
27775 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); 28175 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
27776 } 28176 }
27777diff -urNp linux-2.6.32.8/fs/dlm/lockspace.c linux-2.6.32.8/fs/dlm/lockspace.c 28177diff -urNp linux-2.6.32.9/fs/dlm/lockspace.c linux-2.6.32.9/fs/dlm/lockspace.c
27778--- linux-2.6.32.8/fs/dlm/lockspace.c 2010-02-09 07:57:19.000000000 -0500 28178--- linux-2.6.32.9/fs/dlm/lockspace.c 2010-02-09 07:57:19.000000000 -0500
27779+++ linux-2.6.32.8/fs/dlm/lockspace.c 2010-02-13 21:45:10.645620829 -0500 28179+++ linux-2.6.32.9/fs/dlm/lockspace.c 2010-02-23 17:09:53.280435608 -0500
27780@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc 28180@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
27781 kfree(ls); 28181 kfree(ls);
27782 } 28182 }
@@ -27786,9 +28186,9 @@ diff -urNp linux-2.6.32.8/fs/dlm/lockspace.c linux-2.6.32.8/fs/dlm/lockspace.c
27786 .show = dlm_attr_show, 28186 .show = dlm_attr_show,
27787 .store = dlm_attr_store, 28187 .store = dlm_attr_store,
27788 }; 28188 };
27789diff -urNp linux-2.6.32.8/fs/ecryptfs/inode.c linux-2.6.32.8/fs/ecryptfs/inode.c 28189diff -urNp linux-2.6.32.9/fs/ecryptfs/inode.c linux-2.6.32.9/fs/ecryptfs/inode.c
27790--- linux-2.6.32.8/fs/ecryptfs/inode.c 2010-02-09 07:57:19.000000000 -0500 28190--- linux-2.6.32.9/fs/ecryptfs/inode.c 2010-02-23 17:04:12.533572395 -0500
27791+++ linux-2.6.32.8/fs/ecryptfs/inode.c 2010-02-13 21:45:10.645620829 -0500 28191+++ linux-2.6.32.9/fs/ecryptfs/inode.c 2010-02-23 17:09:53.280435608 -0500
27792@@ -676,7 +676,7 @@ ecryptfs_readlink(struct dentry *dentry, 28192@@ -676,7 +676,7 @@ ecryptfs_readlink(struct dentry *dentry,
27793 old_fs = get_fs(); 28193 old_fs = get_fs();
27794 set_fs(get_ds()); 28194 set_fs(get_ds());
@@ -27807,9 +28207,9 @@ diff -urNp linux-2.6.32.8/fs/ecryptfs/inode.c linux-2.6.32.8/fs/ecryptfs/inode.c
27807 set_fs(old_fs); 28207 set_fs(old_fs);
27808 if (rc < 0) 28208 if (rc < 0)
27809 goto out_free; 28209 goto out_free;
27810diff -urNp linux-2.6.32.8/fs/exec.c linux-2.6.32.8/fs/exec.c 28210diff -urNp linux-2.6.32.9/fs/exec.c linux-2.6.32.9/fs/exec.c
27811--- linux-2.6.32.8/fs/exec.c 2010-02-09 07:57:19.000000000 -0500 28211--- linux-2.6.32.9/fs/exec.c 2010-02-23 17:04:12.533572395 -0500
27812+++ linux-2.6.32.8/fs/exec.c 2010-02-13 21:45:10.668537553 -0500 28212+++ linux-2.6.32.9/fs/exec.c 2010-02-23 17:24:19.199824476 -0500
27813@@ -56,12 +56,24 @@ 28213@@ -56,12 +56,24 @@
27814 #include <linux/fsnotify.h> 28214 #include <linux/fsnotify.h>
27815 #include <linux/fs_struct.h> 28215 #include <linux/fs_struct.h>
@@ -27921,7 +28321,7 @@ diff -urNp linux-2.6.32.8/fs/exec.c linux-2.6.32.8/fs/exec.c
27921 /* 28321 /*
27922 * cover the whole range: [new_start, old_end) 28322 * cover the whole range: [new_start, old_end)
27923 */ 28323 */
27924@@ -602,6 +622,14 @@ int setup_arg_pages(struct linux_binprm 28324@@ -605,6 +625,14 @@ int setup_arg_pages(struct linux_binprm
27925 bprm->exec -= stack_shift; 28325 bprm->exec -= stack_shift;
27926 28326
27927 down_write(&mm->mmap_sem); 28327 down_write(&mm->mmap_sem);
@@ -27936,7 +28336,7 @@ diff -urNp linux-2.6.32.8/fs/exec.c linux-2.6.32.8/fs/exec.c
27936 vm_flags = VM_STACK_FLAGS; 28336 vm_flags = VM_STACK_FLAGS;
27937 28337
27938 /* 28338 /*
27939@@ -615,19 +643,24 @@ int setup_arg_pages(struct linux_binprm 28339@@ -618,19 +646,24 @@ int setup_arg_pages(struct linux_binprm
27940 vm_flags &= ~VM_EXEC; 28340 vm_flags &= ~VM_EXEC;
27941 vm_flags |= mm->def_flags; 28341 vm_flags |= mm->def_flags;
27942 28342
@@ -27965,10 +28365,18 @@ diff -urNp linux-2.6.32.8/fs/exec.c linux-2.6.32.8/fs/exec.c
27965- goto out_unlock; 28365- goto out_unlock;
27966- } 28366- }
27967- 28367-
28368 stack_expand = EXTRA_STACK_VM_PAGES * PAGE_SIZE;
28369 stack_size = vma->vm_end - vma->vm_start;
28370 /*
28371@@ -638,7 +671,6 @@ int setup_arg_pages(struct linux_binprm
28372 * will align it up.
28373 */
28374 rlim_stack = rlimit(RLIMIT_STACK) & PAGE_MASK;
28375- rlim_stack = min(rlim_stack, stack_size);
27968 #ifdef CONFIG_STACK_GROWSUP 28376 #ifdef CONFIG_STACK_GROWSUP
27969 stack_base = vma->vm_end + EXTRA_STACK_VM_PAGES * PAGE_SIZE; 28377 if (stack_size + stack_expand > rlim_stack)
27970 #else 28378 stack_base = vma->vm_start + rlim_stack;
27971@@ -651,7 +684,7 @@ struct file *open_exec(const char *name) 28379@@ -668,7 +700,7 @@ struct file *open_exec(const char *name)
27972 int err; 28380 int err;
27973 28381
27974 file = do_filp_open(AT_FDCWD, name, 28382 file = do_filp_open(AT_FDCWD, name,
@@ -27977,7 +28385,7 @@ diff -urNp linux-2.6.32.8/fs/exec.c linux-2.6.32.8/fs/exec.c
27977 MAY_EXEC | MAY_OPEN); 28385 MAY_EXEC | MAY_OPEN);
27978 if (IS_ERR(file)) 28386 if (IS_ERR(file))
27979 goto out; 28387 goto out;
27980@@ -688,7 +721,7 @@ int kernel_read(struct file *file, loff_ 28388@@ -705,7 +737,7 @@ int kernel_read(struct file *file, loff_
27981 old_fs = get_fs(); 28389 old_fs = get_fs();
27982 set_fs(get_ds()); 28390 set_fs(get_ds());
27983 /* The cast to a user pointer is valid due to the set_fs() */ 28391 /* The cast to a user pointer is valid due to the set_fs() */
@@ -27986,7 +28394,7 @@ diff -urNp linux-2.6.32.8/fs/exec.c linux-2.6.32.8/fs/exec.c
27986 set_fs(old_fs); 28394 set_fs(old_fs);
27987 return result; 28395 return result;
27988 } 28396 }
27989@@ -1094,7 +1127,7 @@ int check_unsafe_exec(struct linux_binpr 28397@@ -1111,7 +1143,7 @@ int check_unsafe_exec(struct linux_binpr
27990 } 28398 }
27991 rcu_read_unlock(); 28399 rcu_read_unlock();
27992 28400
@@ -27995,7 +28403,7 @@ diff -urNp linux-2.6.32.8/fs/exec.c linux-2.6.32.8/fs/exec.c
27995 bprm->unsafe |= LSM_UNSAFE_SHARE; 28403 bprm->unsafe |= LSM_UNSAFE_SHARE;
27996 } else { 28404 } else {
27997 res = -EAGAIN; 28405 res = -EAGAIN;
27998@@ -1293,6 +1326,11 @@ int do_execve(char * filename, 28406@@ -1310,6 +1342,11 @@ int do_execve(char * filename,
27999 char __user *__user *envp, 28407 char __user *__user *envp,
28000 struct pt_regs * regs) 28408 struct pt_regs * regs)
28001 { 28409 {
@@ -28007,7 +28415,7 @@ diff -urNp linux-2.6.32.8/fs/exec.c linux-2.6.32.8/fs/exec.c
28007 struct linux_binprm *bprm; 28415 struct linux_binprm *bprm;
28008 struct file *file; 28416 struct file *file;
28009 struct files_struct *displaced; 28417 struct files_struct *displaced;
28010@@ -1329,6 +1367,18 @@ int do_execve(char * filename, 28418@@ -1346,6 +1383,18 @@ int do_execve(char * filename,
28011 bprm->filename = filename; 28419 bprm->filename = filename;
28012 bprm->interp = filename; 28420 bprm->interp = filename;
28013 28421
@@ -28026,7 +28434,7 @@ diff -urNp linux-2.6.32.8/fs/exec.c linux-2.6.32.8/fs/exec.c
28026 retval = bprm_mm_init(bprm); 28434 retval = bprm_mm_init(bprm);
28027 if (retval) 28435 if (retval)
28028 goto out_file; 28436 goto out_file;
28029@@ -1358,10 +1408,41 @@ int do_execve(char * filename, 28437@@ -1375,10 +1424,41 @@ int do_execve(char * filename,
28030 if (retval < 0) 28438 if (retval < 0)
28031 goto out; 28439 goto out;
28032 28440
@@ -28069,7 +28477,7 @@ diff -urNp linux-2.6.32.8/fs/exec.c linux-2.6.32.8/fs/exec.c
28069 28477
28070 current->stack_start = current->mm->start_stack; 28478 current->stack_start = current->mm->start_stack;
28071 28479
28072@@ -1374,6 +1455,14 @@ int do_execve(char * filename, 28480@@ -1391,6 +1471,14 @@ int do_execve(char * filename,
28073 put_files_struct(displaced); 28481 put_files_struct(displaced);
28074 return retval; 28482 return retval;
28075 28483
@@ -28084,7 +28492,7 @@ diff -urNp linux-2.6.32.8/fs/exec.c linux-2.6.32.8/fs/exec.c
28084 out: 28492 out:
28085 if (bprm->mm) 28493 if (bprm->mm)
28086 mmput (bprm->mm); 28494 mmput (bprm->mm);
28087@@ -1537,6 +1626,169 @@ out: 28495@@ -1554,6 +1642,169 @@ out:
28088 return ispipe; 28496 return ispipe;
28089 } 28497 }
28090 28498
@@ -28254,7 +28662,7 @@ diff -urNp linux-2.6.32.8/fs/exec.c linux-2.6.32.8/fs/exec.c
28254 static int zap_process(struct task_struct *start) 28662 static int zap_process(struct task_struct *start)
28255 { 28663 {
28256 struct task_struct *t; 28664 struct task_struct *t;
28257@@ -1739,17 +1991,17 @@ static void wait_for_dump_helpers(struct 28665@@ -1756,17 +2007,17 @@ static void wait_for_dump_helpers(struct
28258 pipe = file->f_path.dentry->d_inode->i_pipe; 28666 pipe = file->f_path.dentry->d_inode->i_pipe;
28259 28667
28260 pipe_lock(pipe); 28668 pipe_lock(pipe);
@@ -28277,7 +28685,7 @@ diff -urNp linux-2.6.32.8/fs/exec.c linux-2.6.32.8/fs/exec.c
28277 pipe_unlock(pipe); 28685 pipe_unlock(pipe);
28278 28686
28279 } 28687 }
28280@@ -1820,6 +2072,10 @@ void do_coredump(long signr, int exit_co 28688@@ -1837,6 +2088,10 @@ void do_coredump(long signr, int exit_co
28281 */ 28689 */
28282 clear_thread_flag(TIF_SIGPENDING); 28690 clear_thread_flag(TIF_SIGPENDING);
28283 28691
@@ -28288,9 +28696,9 @@ diff -urNp linux-2.6.32.8/fs/exec.c linux-2.6.32.8/fs/exec.c
28288 /* 28696 /*
28289 * lock_kernel() because format_corename() is controlled by sysctl, which 28697 * lock_kernel() because format_corename() is controlled by sysctl, which
28290 * uses lock_kernel() 28698 * uses lock_kernel()
28291diff -urNp linux-2.6.32.8/fs/ext2/balloc.c linux-2.6.32.8/fs/ext2/balloc.c 28699diff -urNp linux-2.6.32.9/fs/ext2/balloc.c linux-2.6.32.9/fs/ext2/balloc.c
28292--- linux-2.6.32.8/fs/ext2/balloc.c 2010-02-09 07:57:19.000000000 -0500 28700--- linux-2.6.32.9/fs/ext2/balloc.c 2010-02-09 07:57:19.000000000 -0500
28293+++ linux-2.6.32.8/fs/ext2/balloc.c 2010-02-13 21:45:10.669604037 -0500 28701+++ linux-2.6.32.9/fs/ext2/balloc.c 2010-02-23 17:09:53.280435608 -0500
28294@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e 28702@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
28295 28703
28296 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 28704 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -28300,9 +28708,9 @@ diff -urNp linux-2.6.32.8/fs/ext2/balloc.c linux-2.6.32.8/fs/ext2/balloc.c
28300 sbi->s_resuid != current_fsuid() && 28708 sbi->s_resuid != current_fsuid() &&
28301 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 28709 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
28302 return 0; 28710 return 0;
28303diff -urNp linux-2.6.32.8/fs/ext3/balloc.c linux-2.6.32.8/fs/ext3/balloc.c 28711diff -urNp linux-2.6.32.9/fs/ext3/balloc.c linux-2.6.32.9/fs/ext3/balloc.c
28304--- linux-2.6.32.8/fs/ext3/balloc.c 2010-02-09 07:57:19.000000000 -0500 28712--- linux-2.6.32.9/fs/ext3/balloc.c 2010-02-09 07:57:19.000000000 -0500
28305+++ linux-2.6.32.8/fs/ext3/balloc.c 2010-02-13 21:45:10.669604037 -0500 28713+++ linux-2.6.32.9/fs/ext3/balloc.c 2010-02-23 17:09:53.280435608 -0500
28306@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e 28714@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
28307 28715
28308 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 28716 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -28312,9 +28720,9 @@ diff -urNp linux-2.6.32.8/fs/ext3/balloc.c linux-2.6.32.8/fs/ext3/balloc.c
28312 sbi->s_resuid != current_fsuid() && 28720 sbi->s_resuid != current_fsuid() &&
28313 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 28721 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
28314 return 0; 28722 return 0;
28315diff -urNp linux-2.6.32.8/fs/ext3/namei.c linux-2.6.32.8/fs/ext3/namei.c 28723diff -urNp linux-2.6.32.9/fs/ext3/namei.c linux-2.6.32.9/fs/ext3/namei.c
28316--- linux-2.6.32.8/fs/ext3/namei.c 2010-02-09 07:57:19.000000000 -0500 28724--- linux-2.6.32.9/fs/ext3/namei.c 2010-02-09 07:57:19.000000000 -0500
28317+++ linux-2.6.32.8/fs/ext3/namei.c 2010-02-13 21:45:10.670656699 -0500 28725+++ linux-2.6.32.9/fs/ext3/namei.c 2010-02-23 17:09:53.280435608 -0500
28318@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split 28726@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
28319 char *data1 = (*bh)->b_data, *data2; 28727 char *data1 = (*bh)->b_data, *data2;
28320 unsigned split, move, size; 28728 unsigned split, move, size;
@@ -28324,9 +28732,9 @@ diff -urNp linux-2.6.32.8/fs/ext3/namei.c linux-2.6.32.8/fs/ext3/namei.c
28324 28732
28325 bh2 = ext3_append (handle, dir, &newblock, &err); 28733 bh2 = ext3_append (handle, dir, &newblock, &err);
28326 if (!(bh2)) { 28734 if (!(bh2)) {
28327diff -urNp linux-2.6.32.8/fs/ext3/xattr.c linux-2.6.32.8/fs/ext3/xattr.c 28735diff -urNp linux-2.6.32.9/fs/ext3/xattr.c linux-2.6.32.9/fs/ext3/xattr.c
28328--- linux-2.6.32.8/fs/ext3/xattr.c 2010-02-09 07:57:19.000000000 -0500 28736--- linux-2.6.32.9/fs/ext3/xattr.c 2010-02-09 07:57:19.000000000 -0500
28329+++ linux-2.6.32.8/fs/ext3/xattr.c 2010-02-13 21:45:10.670656699 -0500 28737+++ linux-2.6.32.9/fs/ext3/xattr.c 2010-02-23 17:09:53.280435608 -0500
28330@@ -89,8 +89,8 @@ 28738@@ -89,8 +89,8 @@
28331 printk("\n"); \ 28739 printk("\n"); \
28332 } while (0) 28740 } while (0)
@@ -28338,9 +28746,9 @@ diff -urNp linux-2.6.32.8/fs/ext3/xattr.c linux-2.6.32.8/fs/ext3/xattr.c
28338 #endif 28746 #endif
28339 28747
28340 static void ext3_xattr_cache_insert(struct buffer_head *); 28748 static void ext3_xattr_cache_insert(struct buffer_head *);
28341diff -urNp linux-2.6.32.8/fs/ext4/balloc.c linux-2.6.32.8/fs/ext4/balloc.c 28749diff -urNp linux-2.6.32.9/fs/ext4/balloc.c linux-2.6.32.9/fs/ext4/balloc.c
28342--- linux-2.6.32.8/fs/ext4/balloc.c 2010-02-09 07:57:19.000000000 -0500 28750--- linux-2.6.32.9/fs/ext4/balloc.c 2010-02-09 07:57:19.000000000 -0500
28343+++ linux-2.6.32.8/fs/ext4/balloc.c 2010-02-13 21:45:10.670656699 -0500 28751+++ linux-2.6.32.9/fs/ext4/balloc.c 2010-02-23 17:09:53.280435608 -0500
28344@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ 28752@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_
28345 /* Hm, nope. Are (enough) root reserved blocks available? */ 28753 /* Hm, nope. Are (enough) root reserved blocks available? */
28346 if (sbi->s_resuid == current_fsuid() || 28754 if (sbi->s_resuid == current_fsuid() ||
@@ -28350,9 +28758,9 @@ diff -urNp linux-2.6.32.8/fs/ext4/balloc.c linux-2.6.32.8/fs/ext4/balloc.c
28350 if (free_blocks >= (nblocks + dirty_blocks)) 28758 if (free_blocks >= (nblocks + dirty_blocks))
28351 return 1; 28759 return 1;
28352 } 28760 }
28353diff -urNp linux-2.6.32.8/fs/ext4/ioctl.c linux-2.6.32.8/fs/ext4/ioctl.c 28761diff -urNp linux-2.6.32.9/fs/ext4/ioctl.c linux-2.6.32.9/fs/ext4/ioctl.c
28354--- linux-2.6.32.8/fs/ext4/ioctl.c 2010-02-09 07:57:19.000000000 -0500 28762--- linux-2.6.32.9/fs/ext4/ioctl.c 2010-02-09 07:57:19.000000000 -0500
28355+++ linux-2.6.32.8/fs/ext4/ioctl.c 2010-02-13 21:45:10.670656699 -0500 28763+++ linux-2.6.32.9/fs/ext4/ioctl.c 2010-02-23 17:09:53.280435608 -0500
28356@@ -221,6 +221,9 @@ setversion_out: 28764@@ -221,6 +221,9 @@ setversion_out:
28357 struct file *donor_filp; 28765 struct file *donor_filp;
28358 int err; 28766 int err;
@@ -28363,9 +28771,9 @@ diff -urNp linux-2.6.32.8/fs/ext4/ioctl.c linux-2.6.32.8/fs/ext4/ioctl.c
28363 if (!(filp->f_mode & FMODE_READ) || 28771 if (!(filp->f_mode & FMODE_READ) ||
28364 !(filp->f_mode & FMODE_WRITE)) 28772 !(filp->f_mode & FMODE_WRITE))
28365 return -EBADF; 28773 return -EBADF;
28366diff -urNp linux-2.6.32.8/fs/ext4/namei.c linux-2.6.32.8/fs/ext4/namei.c 28774diff -urNp linux-2.6.32.9/fs/ext4/namei.c linux-2.6.32.9/fs/ext4/namei.c
28367--- linux-2.6.32.8/fs/ext4/namei.c 2010-02-09 07:57:19.000000000 -0500 28775--- linux-2.6.32.9/fs/ext4/namei.c 2010-02-09 07:57:19.000000000 -0500
28368+++ linux-2.6.32.8/fs/ext4/namei.c 2010-02-13 21:45:10.671989622 -0500 28776+++ linux-2.6.32.9/fs/ext4/namei.c 2010-02-23 17:09:53.280435608 -0500
28369@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split 28777@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
28370 char *data1 = (*bh)->b_data, *data2; 28778 char *data1 = (*bh)->b_data, *data2;
28371 unsigned split, move, size; 28779 unsigned split, move, size;
@@ -28375,9 +28783,9 @@ diff -urNp linux-2.6.32.8/fs/ext4/namei.c linux-2.6.32.8/fs/ext4/namei.c
28375 28783
28376 bh2 = ext4_append (handle, dir, &newblock, &err); 28784 bh2 = ext4_append (handle, dir, &newblock, &err);
28377 if (!(bh2)) { 28785 if (!(bh2)) {
28378diff -urNp linux-2.6.32.8/fs/ext4/super.c linux-2.6.32.8/fs/ext4/super.c 28786diff -urNp linux-2.6.32.9/fs/ext4/super.c linux-2.6.32.9/fs/ext4/super.c
28379--- linux-2.6.32.8/fs/ext4/super.c 2010-02-09 07:57:19.000000000 -0500 28787--- linux-2.6.32.9/fs/ext4/super.c 2010-02-09 07:57:19.000000000 -0500
28380+++ linux-2.6.32.8/fs/ext4/super.c 2010-02-13 21:45:10.672576567 -0500 28788+++ linux-2.6.32.9/fs/ext4/super.c 2010-02-23 17:09:53.284244949 -0500
28381@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje 28789@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje
28382 } 28790 }
28383 28791
@@ -28387,10 +28795,10 @@ diff -urNp linux-2.6.32.8/fs/ext4/super.c linux-2.6.32.8/fs/ext4/super.c
28387 .show = ext4_attr_show, 28795 .show = ext4_attr_show,
28388 .store = ext4_attr_store, 28796 .store = ext4_attr_store,
28389 }; 28797 };
28390diff -urNp linux-2.6.32.8/fs/fcntl.c linux-2.6.32.8/fs/fcntl.c 28798diff -urNp linux-2.6.32.9/fs/fcntl.c linux-2.6.32.9/fs/fcntl.c
28391--- linux-2.6.32.8/fs/fcntl.c 2010-02-09 07:57:19.000000000 -0500 28799--- linux-2.6.32.9/fs/fcntl.c 2010-02-23 17:04:12.533572395 -0500
28392+++ linux-2.6.32.8/fs/fcntl.c 2010-02-13 21:45:10.672576567 -0500 28800+++ linux-2.6.32.9/fs/fcntl.c 2010-02-23 17:09:53.284244949 -0500
28393@@ -346,6 +346,7 @@ static long do_fcntl(int fd, unsigned in 28801@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in
28394 switch (cmd) { 28802 switch (cmd) {
28395 case F_DUPFD: 28803 case F_DUPFD:
28396 case F_DUPFD_CLOEXEC: 28804 case F_DUPFD_CLOEXEC:
@@ -28398,7 +28806,7 @@ diff -urNp linux-2.6.32.8/fs/fcntl.c linux-2.6.32.8/fs/fcntl.c
28398 if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 28806 if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
28399 break; 28807 break;
28400 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0); 28808 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
28401@@ -502,7 +503,8 @@ static inline int sigio_perm(struct task 28809@@ -500,7 +501,8 @@ static inline int sigio_perm(struct task
28402 ret = ((fown->euid == 0 || 28810 ret = ((fown->euid == 0 ||
28403 fown->euid == cred->suid || fown->euid == cred->uid || 28811 fown->euid == cred->suid || fown->euid == cred->uid ||
28404 fown->uid == cred->suid || fown->uid == cred->uid) && 28812 fown->uid == cred->suid || fown->uid == cred->uid) &&
@@ -28408,9 +28816,9 @@ diff -urNp linux-2.6.32.8/fs/fcntl.c linux-2.6.32.8/fs/fcntl.c
28408 rcu_read_unlock(); 28816 rcu_read_unlock();
28409 return ret; 28817 return ret;
28410 } 28818 }
28411diff -urNp linux-2.6.32.8/fs/fifo.c linux-2.6.32.8/fs/fifo.c 28819diff -urNp linux-2.6.32.9/fs/fifo.c linux-2.6.32.9/fs/fifo.c
28412--- linux-2.6.32.8/fs/fifo.c 2010-02-09 07:57:19.000000000 -0500 28820--- linux-2.6.32.9/fs/fifo.c 2010-02-09 07:57:19.000000000 -0500
28413+++ linux-2.6.32.8/fs/fifo.c 2010-02-13 21:45:10.673575968 -0500 28821+++ linux-2.6.32.9/fs/fifo.c 2010-02-23 17:09:53.284244949 -0500
28414@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode 28822@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
28415 */ 28823 */
28416 filp->f_op = &read_pipefifo_fops; 28824 filp->f_op = &read_pipefifo_fops;
@@ -28481,9 +28889,9 @@ diff -urNp linux-2.6.32.8/fs/fifo.c linux-2.6.32.8/fs/fifo.c
28481 free_pipe_info(inode); 28889 free_pipe_info(inode);
28482 28890
28483 err_nocleanup: 28891 err_nocleanup:
28484diff -urNp linux-2.6.32.8/fs/file.c linux-2.6.32.8/fs/file.c 28892diff -urNp linux-2.6.32.9/fs/file.c linux-2.6.32.9/fs/file.c
28485--- linux-2.6.32.8/fs/file.c 2010-02-09 07:57:19.000000000 -0500 28893--- linux-2.6.32.9/fs/file.c 2010-02-09 07:57:19.000000000 -0500
28486+++ linux-2.6.32.8/fs/file.c 2010-02-13 21:45:10.673575968 -0500 28894+++ linux-2.6.32.9/fs/file.c 2010-02-23 17:09:53.284244949 -0500
28487@@ -14,6 +14,7 @@ 28895@@ -14,6 +14,7 @@
28488 #include <linux/slab.h> 28896 #include <linux/slab.h>
28489 #include <linux/vmalloc.h> 28897 #include <linux/vmalloc.h>
@@ -28501,9 +28909,9 @@ diff -urNp linux-2.6.32.8/fs/file.c linux-2.6.32.8/fs/file.c
28501 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 28909 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
28502 return -EMFILE; 28910 return -EMFILE;
28503 28911
28504diff -urNp linux-2.6.32.8/fs/fs_struct.c linux-2.6.32.8/fs/fs_struct.c 28912diff -urNp linux-2.6.32.9/fs/fs_struct.c linux-2.6.32.9/fs/fs_struct.c
28505--- linux-2.6.32.8/fs/fs_struct.c 2010-02-09 07:57:19.000000000 -0500 28913--- linux-2.6.32.9/fs/fs_struct.c 2010-02-09 07:57:19.000000000 -0500
28506+++ linux-2.6.32.8/fs/fs_struct.c 2010-02-13 21:45:10.673575968 -0500 28914+++ linux-2.6.32.9/fs/fs_struct.c 2010-02-23 17:09:53.284244949 -0500
28507@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo 28915@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo
28508 struct task_struct *g, *p; 28916 struct task_struct *g, *p;
28509 struct fs_struct *fs; 28917 struct fs_struct *fs;
@@ -28608,9 +29016,9 @@ diff -urNp linux-2.6.32.8/fs/fs_struct.c linux-2.6.32.8/fs/fs_struct.c
28608 29016
28609 task_unlock(current); 29017 task_unlock(current);
28610 if (kill) 29018 if (kill)
28611diff -urNp linux-2.6.32.8/fs/fuse/control.c linux-2.6.32.8/fs/fuse/control.c 29019diff -urNp linux-2.6.32.9/fs/fuse/control.c linux-2.6.32.9/fs/fuse/control.c
28612--- linux-2.6.32.8/fs/fuse/control.c 2010-02-09 07:57:19.000000000 -0500 29020--- linux-2.6.32.9/fs/fuse/control.c 2010-02-09 07:57:19.000000000 -0500
28613+++ linux-2.6.32.8/fs/fuse/control.c 2010-02-13 21:45:10.673575968 -0500 29021+++ linux-2.6.32.9/fs/fuse/control.c 2010-02-23 17:09:53.284244949 -0500
28614@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co 29022@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
28615 29023
28616 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) 29024 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
@@ -28620,9 +29028,9 @@ diff -urNp linux-2.6.32.8/fs/fuse/control.c linux-2.6.32.8/fs/fuse/control.c
28620 struct fuse_conn *fc; 29028 struct fuse_conn *fc;
28621 int err; 29029 int err;
28622 29030
28623diff -urNp linux-2.6.32.8/fs/fuse/cuse.c linux-2.6.32.8/fs/fuse/cuse.c 29031diff -urNp linux-2.6.32.9/fs/fuse/cuse.c linux-2.6.32.9/fs/fuse/cuse.c
28624--- linux-2.6.32.8/fs/fuse/cuse.c 2010-02-09 07:57:19.000000000 -0500 29032--- linux-2.6.32.9/fs/fuse/cuse.c 2010-02-09 07:57:19.000000000 -0500
28625+++ linux-2.6.32.8/fs/fuse/cuse.c 2010-02-13 21:45:10.674581526 -0500 29033+++ linux-2.6.32.9/fs/fuse/cuse.c 2010-02-23 17:09:53.284244949 -0500
28626@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i 29034@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
28627 return rc; 29035 return rc;
28628 } 29036 }
@@ -28657,9 +29065,9 @@ diff -urNp linux-2.6.32.8/fs/fuse/cuse.c linux-2.6.32.8/fs/fuse/cuse.c
28657 cuse_class = class_create(THIS_MODULE, "cuse"); 29065 cuse_class = class_create(THIS_MODULE, "cuse");
28658 if (IS_ERR(cuse_class)) 29066 if (IS_ERR(cuse_class))
28659 return PTR_ERR(cuse_class); 29067 return PTR_ERR(cuse_class);
28660diff -urNp linux-2.6.32.8/fs/fuse/dev.c linux-2.6.32.8/fs/fuse/dev.c 29068diff -urNp linux-2.6.32.9/fs/fuse/dev.c linux-2.6.32.9/fs/fuse/dev.c
28661--- linux-2.6.32.8/fs/fuse/dev.c 2010-02-09 07:57:19.000000000 -0500 29069--- linux-2.6.32.9/fs/fuse/dev.c 2010-02-09 07:57:19.000000000 -0500
28662+++ linux-2.6.32.8/fs/fuse/dev.c 2010-02-13 21:45:10.674581526 -0500 29070+++ linux-2.6.32.9/fs/fuse/dev.c 2010-02-23 17:09:53.284244949 -0500
28663@@ -745,7 +745,7 @@ __releases(&fc->lock) 29071@@ -745,7 +745,7 @@ __releases(&fc->lock)
28664 * request_end(). Otherwise add it to the processing list, and set 29072 * request_end(). Otherwise add it to the processing list, and set
28665 * the 'sent' flag. 29073 * the 'sent' flag.
@@ -28765,9 +29173,9 @@ diff -urNp linux-2.6.32.8/fs/fuse/dev.c linux-2.6.32.8/fs/fuse/dev.c
28765 29173
28766 const struct file_operations fuse_dev_operations = { 29174 const struct file_operations fuse_dev_operations = {
28767 .owner = THIS_MODULE, 29175 .owner = THIS_MODULE,
28768diff -urNp linux-2.6.32.8/fs/fuse/dir.c linux-2.6.32.8/fs/fuse/dir.c 29176diff -urNp linux-2.6.32.9/fs/fuse/dir.c linux-2.6.32.9/fs/fuse/dir.c
28769--- linux-2.6.32.8/fs/fuse/dir.c 2010-02-09 07:57:19.000000000 -0500 29177--- linux-2.6.32.9/fs/fuse/dir.c 2010-02-09 07:57:19.000000000 -0500
28770+++ linux-2.6.32.8/fs/fuse/dir.c 2010-02-13 21:45:10.674581526 -0500 29178+++ linux-2.6.32.9/fs/fuse/dir.c 2010-02-23 17:09:53.284244949 -0500
28771@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de 29179@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
28772 return link; 29180 return link;
28773 } 29181 }
@@ -28777,9 +29185,9 @@ diff -urNp linux-2.6.32.8/fs/fuse/dir.c linux-2.6.32.8/fs/fuse/dir.c
28777 { 29185 {
28778 if (!IS_ERR(link)) 29186 if (!IS_ERR(link))
28779 free_page((unsigned long) link); 29187 free_page((unsigned long) link);
28780diff -urNp linux-2.6.32.8/fs/fuse/fuse_i.h linux-2.6.32.8/fs/fuse/fuse_i.h 29188diff -urNp linux-2.6.32.9/fs/fuse/fuse_i.h linux-2.6.32.9/fs/fuse/fuse_i.h
28781--- linux-2.6.32.8/fs/fuse/fuse_i.h 2010-02-09 07:57:19.000000000 -0500 29189--- linux-2.6.32.9/fs/fuse/fuse_i.h 2010-02-09 07:57:19.000000000 -0500
28782+++ linux-2.6.32.8/fs/fuse/fuse_i.h 2010-02-13 21:45:10.676633973 -0500 29190+++ linux-2.6.32.9/fs/fuse/fuse_i.h 2010-02-23 17:09:53.284244949 -0500
28783@@ -521,6 +521,16 @@ extern const struct file_operations fuse 29191@@ -521,6 +521,16 @@ extern const struct file_operations fuse
28784 29192
28785 extern const struct dentry_operations fuse_dentry_operations; 29193 extern const struct dentry_operations fuse_dentry_operations;
@@ -28797,9 +29205,9 @@ diff -urNp linux-2.6.32.8/fs/fuse/fuse_i.h linux-2.6.32.8/fs/fuse/fuse_i.h
28797 /** 29205 /**
28798 * Inode to nodeid comparison. 29206 * Inode to nodeid comparison.
28799 */ 29207 */
28800diff -urNp linux-2.6.32.8/fs/gfs2/sys.c linux-2.6.32.8/fs/gfs2/sys.c 29208diff -urNp linux-2.6.32.9/fs/gfs2/sys.c linux-2.6.32.9/fs/gfs2/sys.c
28801--- linux-2.6.32.8/fs/gfs2/sys.c 2010-02-09 07:57:19.000000000 -0500 29209--- linux-2.6.32.9/fs/gfs2/sys.c 2010-02-09 07:57:19.000000000 -0500
28802+++ linux-2.6.32.8/fs/gfs2/sys.c 2010-02-13 21:45:10.676633973 -0500 29210+++ linux-2.6.32.9/fs/gfs2/sys.c 2010-02-23 17:09:53.284244949 -0500
28803@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko 29211@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
28804 return a->store ? a->store(sdp, buf, len) : len; 29212 return a->store ? a->store(sdp, buf, len) : len;
28805 } 29213 }
@@ -28818,9 +29226,9 @@ diff -urNp linux-2.6.32.8/fs/gfs2/sys.c linux-2.6.32.8/fs/gfs2/sys.c
28818 .uevent = gfs2_uevent, 29226 .uevent = gfs2_uevent,
28819 }; 29227 };
28820 29228
28821diff -urNp linux-2.6.32.8/fs/hfs/inode.c linux-2.6.32.8/fs/hfs/inode.c 29229diff -urNp linux-2.6.32.9/fs/hfs/inode.c linux-2.6.32.9/fs/hfs/inode.c
28822--- linux-2.6.32.8/fs/hfs/inode.c 2010-02-09 07:57:19.000000000 -0500 29230--- linux-2.6.32.9/fs/hfs/inode.c 2010-02-09 07:57:19.000000000 -0500
28823+++ linux-2.6.32.8/fs/hfs/inode.c 2010-02-13 21:45:10.676633973 -0500 29231+++ linux-2.6.32.9/fs/hfs/inode.c 2010-02-23 17:09:53.284244949 -0500
28824@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, 29232@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
28825 29233
28826 if (S_ISDIR(main_inode->i_mode)) { 29234 if (S_ISDIR(main_inode->i_mode)) {
@@ -28839,9 +29247,9 @@ diff -urNp linux-2.6.32.8/fs/hfs/inode.c linux-2.6.32.8/fs/hfs/inode.c
28839 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, 29247 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
28840 sizeof(struct hfs_cat_file)); 29248 sizeof(struct hfs_cat_file));
28841 if (rec.type != HFS_CDR_FIL || 29249 if (rec.type != HFS_CDR_FIL ||
28842diff -urNp linux-2.6.32.8/fs/hfsplus/inode.c linux-2.6.32.8/fs/hfsplus/inode.c 29250diff -urNp linux-2.6.32.9/fs/hfsplus/inode.c linux-2.6.32.9/fs/hfsplus/inode.c
28843--- linux-2.6.32.8/fs/hfsplus/inode.c 2010-02-09 07:57:19.000000000 -0500 29251--- linux-2.6.32.9/fs/hfsplus/inode.c 2010-02-09 07:57:19.000000000 -0500
28844+++ linux-2.6.32.8/fs/hfsplus/inode.c 2010-02-13 21:45:10.676633973 -0500 29252+++ linux-2.6.32.9/fs/hfsplus/inode.c 2010-02-23 17:09:53.284244949 -0500
28845@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode 29253@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
28846 struct hfsplus_cat_folder *folder = &entry.folder; 29254 struct hfsplus_cat_folder *folder = &entry.folder;
28847 29255
@@ -28878,9 +29286,9 @@ diff -urNp linux-2.6.32.8/fs/hfsplus/inode.c linux-2.6.32.8/fs/hfsplus/inode.c
28878 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, 29286 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
28879 sizeof(struct hfsplus_cat_file)); 29287 sizeof(struct hfsplus_cat_file));
28880 hfsplus_inode_write_fork(inode, &file->data_fork); 29288 hfsplus_inode_write_fork(inode, &file->data_fork);
28881diff -urNp linux-2.6.32.8/fs/ioctl.c linux-2.6.32.8/fs/ioctl.c 29289diff -urNp linux-2.6.32.9/fs/ioctl.c linux-2.6.32.9/fs/ioctl.c
28882--- linux-2.6.32.8/fs/ioctl.c 2010-02-09 07:57:19.000000000 -0500 29290--- linux-2.6.32.9/fs/ioctl.c 2010-02-09 07:57:19.000000000 -0500
28883+++ linux-2.6.32.8/fs/ioctl.c 2010-02-13 21:45:10.677706610 -0500 29291+++ linux-2.6.32.9/fs/ioctl.c 2010-02-23 17:09:53.284244949 -0500
28884@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema 29292@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
28885 u64 phys, u64 len, u32 flags) 29293 u64 phys, u64 len, u32 flags)
28886 { 29294 {
@@ -28908,9 +29316,9 @@ diff -urNp linux-2.6.32.8/fs/ioctl.c linux-2.6.32.8/fs/ioctl.c
28908 error = -EFAULT; 29316 error = -EFAULT;
28909 29317
28910 return error; 29318 return error;
28911diff -urNp linux-2.6.32.8/fs/jffs2/debug.h linux-2.6.32.8/fs/jffs2/debug.h 29319diff -urNp linux-2.6.32.9/fs/jffs2/debug.h linux-2.6.32.9/fs/jffs2/debug.h
28912--- linux-2.6.32.8/fs/jffs2/debug.h 2010-02-09 07:57:19.000000000 -0500 29320--- linux-2.6.32.9/fs/jffs2/debug.h 2010-02-09 07:57:19.000000000 -0500
28913+++ linux-2.6.32.8/fs/jffs2/debug.h 2010-02-13 21:45:10.677706610 -0500 29321+++ linux-2.6.32.9/fs/jffs2/debug.h 2010-02-23 17:09:53.284244949 -0500
28914@@ -52,13 +52,13 @@ 29322@@ -52,13 +52,13 @@
28915 #if CONFIG_JFFS2_FS_DEBUG > 0 29323 #if CONFIG_JFFS2_FS_DEBUG > 0
28916 #define D1(x) x 29324 #define D1(x) x
@@ -29012,9 +29420,9 @@ diff -urNp linux-2.6.32.8/fs/jffs2/debug.h linux-2.6.32.8/fs/jffs2/debug.h
29012 #endif 29420 #endif
29013 29421
29014 /* "Sanity" checks */ 29422 /* "Sanity" checks */
29015diff -urNp linux-2.6.32.8/fs/jffs2/erase.c linux-2.6.32.8/fs/jffs2/erase.c 29423diff -urNp linux-2.6.32.9/fs/jffs2/erase.c linux-2.6.32.9/fs/jffs2/erase.c
29016--- linux-2.6.32.8/fs/jffs2/erase.c 2010-02-09 07:57:19.000000000 -0500 29424--- linux-2.6.32.9/fs/jffs2/erase.c 2010-02-09 07:57:19.000000000 -0500
29017+++ linux-2.6.32.8/fs/jffs2/erase.c 2010-02-13 21:45:10.677706610 -0500 29425+++ linux-2.6.32.9/fs/jffs2/erase.c 2010-02-23 17:09:53.284244949 -0500
29018@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru 29426@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
29019 struct jffs2_unknown_node marker = { 29427 struct jffs2_unknown_node marker = {
29020 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), 29428 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -29025,9 +29433,9 @@ diff -urNp linux-2.6.32.8/fs/jffs2/erase.c linux-2.6.32.8/fs/jffs2/erase.c
29025 }; 29433 };
29026 29434
29027 jffs2_prealloc_raw_node_refs(c, jeb, 1); 29435 jffs2_prealloc_raw_node_refs(c, jeb, 1);
29028diff -urNp linux-2.6.32.8/fs/jffs2/summary.h linux-2.6.32.8/fs/jffs2/summary.h 29436diff -urNp linux-2.6.32.9/fs/jffs2/summary.h linux-2.6.32.9/fs/jffs2/summary.h
29029--- linux-2.6.32.8/fs/jffs2/summary.h 2010-02-09 07:57:19.000000000 -0500 29437--- linux-2.6.32.9/fs/jffs2/summary.h 2010-02-09 07:57:19.000000000 -0500
29030+++ linux-2.6.32.8/fs/jffs2/summary.h 2010-02-13 21:45:10.677706610 -0500 29438+++ linux-2.6.32.9/fs/jffs2/summary.h 2010-02-23 17:09:53.284244949 -0500
29031@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ 29439@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
29032 29440
29033 #define jffs2_sum_active() (0) 29441 #define jffs2_sum_active() (0)
@@ -29056,9 +29464,9 @@ diff -urNp linux-2.6.32.8/fs/jffs2/summary.h linux-2.6.32.8/fs/jffs2/summary.h
29056 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) 29464 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
29057 29465
29058 #endif /* CONFIG_JFFS2_SUMMARY */ 29466 #endif /* CONFIG_JFFS2_SUMMARY */
29059diff -urNp linux-2.6.32.8/fs/jffs2/wbuf.c linux-2.6.32.8/fs/jffs2/wbuf.c 29467diff -urNp linux-2.6.32.9/fs/jffs2/wbuf.c linux-2.6.32.9/fs/jffs2/wbuf.c
29060--- linux-2.6.32.8/fs/jffs2/wbuf.c 2010-02-09 07:57:19.000000000 -0500 29468--- linux-2.6.32.9/fs/jffs2/wbuf.c 2010-02-09 07:57:19.000000000 -0500
29061+++ linux-2.6.32.8/fs/jffs2/wbuf.c 2010-02-13 21:45:10.678610654 -0500 29469+++ linux-2.6.32.9/fs/jffs2/wbuf.c 2010-02-23 17:09:53.284244949 -0500
29062@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o 29470@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
29063 { 29471 {
29064 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), 29472 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -29069,9 +29477,9 @@ diff -urNp linux-2.6.32.8/fs/jffs2/wbuf.c linux-2.6.32.8/fs/jffs2/wbuf.c
29069 }; 29477 };
29070 29478
29071 /* 29479 /*
29072diff -urNp linux-2.6.32.8/fs/lockd/svc.c linux-2.6.32.8/fs/lockd/svc.c 29480diff -urNp linux-2.6.32.9/fs/lockd/svc.c linux-2.6.32.9/fs/lockd/svc.c
29073--- linux-2.6.32.8/fs/lockd/svc.c 2010-02-09 07:57:19.000000000 -0500 29481--- linux-2.6.32.9/fs/lockd/svc.c 2010-02-09 07:57:19.000000000 -0500
29074+++ linux-2.6.32.8/fs/lockd/svc.c 2010-02-13 21:45:10.678610654 -0500 29482+++ linux-2.6.32.9/fs/lockd/svc.c 2010-02-23 17:09:53.288151568 -0500
29075@@ -43,7 +43,7 @@ 29483@@ -43,7 +43,7 @@
29076 29484
29077 static struct svc_program nlmsvc_program; 29485 static struct svc_program nlmsvc_program;
@@ -29081,9 +29489,9 @@ diff -urNp linux-2.6.32.8/fs/lockd/svc.c linux-2.6.32.8/fs/lockd/svc.c
29081 EXPORT_SYMBOL_GPL(nlmsvc_ops); 29489 EXPORT_SYMBOL_GPL(nlmsvc_ops);
29082 29490
29083 static DEFINE_MUTEX(nlmsvc_mutex); 29491 static DEFINE_MUTEX(nlmsvc_mutex);
29084diff -urNp linux-2.6.32.8/fs/locks.c linux-2.6.32.8/fs/locks.c 29492diff -urNp linux-2.6.32.9/fs/locks.c linux-2.6.32.9/fs/locks.c
29085--- linux-2.6.32.8/fs/locks.c 2010-02-09 07:57:19.000000000 -0500 29493--- linux-2.6.32.9/fs/locks.c 2010-02-09 07:57:19.000000000 -0500
29086+++ linux-2.6.32.8/fs/locks.c 2010-02-13 21:45:10.678610654 -0500 29494+++ linux-2.6.32.9/fs/locks.c 2010-02-23 17:09:53.288151568 -0500
29087@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil 29495@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
29088 return; 29496 return;
29089 29497
@@ -29105,9 +29513,9 @@ diff -urNp linux-2.6.32.8/fs/locks.c linux-2.6.32.8/fs/locks.c
29105 } 29513 }
29106 29514
29107 lock_kernel(); 29515 lock_kernel();
29108diff -urNp linux-2.6.32.8/fs/namei.c linux-2.6.32.8/fs/namei.c 29516diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c
29109--- linux-2.6.32.8/fs/namei.c 2010-02-09 07:57:19.000000000 -0500 29517--- linux-2.6.32.9/fs/namei.c 2010-02-09 07:57:19.000000000 -0500
29110+++ linux-2.6.32.8/fs/namei.c 2010-02-13 21:45:10.679768509 -0500 29518+++ linux-2.6.32.9/fs/namei.c 2010-02-23 17:09:53.288151568 -0500
29111@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l 29519@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l
29112 cookie = dentry->d_inode->i_op->follow_link(dentry, nd); 29520 cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
29113 error = PTR_ERR(cookie); 29521 error = PTR_ERR(cookie);
@@ -29434,9 +29842,9 @@ diff -urNp linux-2.6.32.8/fs/namei.c linux-2.6.32.8/fs/namei.c
29434 exit6: 29842 exit6:
29435 mnt_drop_write(oldnd.path.mnt); 29843 mnt_drop_write(oldnd.path.mnt);
29436 exit5: 29844 exit5:
29437diff -urNp linux-2.6.32.8/fs/namespace.c linux-2.6.32.8/fs/namespace.c 29845diff -urNp linux-2.6.32.9/fs/namespace.c linux-2.6.32.9/fs/namespace.c
29438--- linux-2.6.32.8/fs/namespace.c 2010-02-09 07:57:19.000000000 -0500 29846--- linux-2.6.32.9/fs/namespace.c 2010-02-09 07:57:19.000000000 -0500
29439+++ linux-2.6.32.8/fs/namespace.c 2010-02-13 21:45:10.680637387 -0500 29847+++ linux-2.6.32.9/fs/namespace.c 2010-02-23 17:09:53.288151568 -0500
29440@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn 29848@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
29441 if (!(sb->s_flags & MS_RDONLY)) 29849 if (!(sb->s_flags & MS_RDONLY))
29442 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); 29850 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -29497,9 +29905,9 @@ diff -urNp linux-2.6.32.8/fs/namespace.c linux-2.6.32.8/fs/namespace.c
29497 read_lock(&current->fs->lock); 29905 read_lock(&current->fs->lock);
29498 root = current->fs->root; 29906 root = current->fs->root;
29499 path_get(&current->fs->root); 29907 path_get(&current->fs->root);
29500diff -urNp linux-2.6.32.8/fs/nfs/inode.c linux-2.6.32.8/fs/nfs/inode.c 29908diff -urNp linux-2.6.32.9/fs/nfs/inode.c linux-2.6.32.9/fs/nfs/inode.c
29501--- linux-2.6.32.8/fs/nfs/inode.c 2010-02-09 07:57:19.000000000 -0500 29909--- linux-2.6.32.9/fs/nfs/inode.c 2010-02-09 07:57:19.000000000 -0500
29502+++ linux-2.6.32.8/fs/nfs/inode.c 2010-02-13 21:45:10.680637387 -0500 29910+++ linux-2.6.32.9/fs/nfs/inode.c 2010-02-23 17:09:53.288151568 -0500
29503@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st 29911@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
29504 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); 29912 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
29505 } 29913 }
@@ -29520,9 +29928,9 @@ diff -urNp linux-2.6.32.8/fs/nfs/inode.c linux-2.6.32.8/fs/nfs/inode.c
29520 } 29928 }
29521 29929
29522 void nfs_fattr_init(struct nfs_fattr *fattr) 29930 void nfs_fattr_init(struct nfs_fattr *fattr)
29523diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c 29931diff -urNp linux-2.6.32.9/fs/nfs/nfs4proc.c linux-2.6.32.9/fs/nfs/nfs4proc.c
29524--- linux-2.6.32.8/fs/nfs/nfs4proc.c 2010-02-09 07:57:19.000000000 -0500 29932--- linux-2.6.32.9/fs/nfs/nfs4proc.c 2010-02-23 17:04:12.571669129 -0500
29525+++ linux-2.6.32.8/fs/nfs/nfs4proc.c 2010-02-13 21:45:10.682015439 -0500 29933+++ linux-2.6.32.9/fs/nfs/nfs4proc.c 2010-02-23 17:09:53.288151568 -0500
29526@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct 29934@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct
29527 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) 29935 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
29528 { 29936 {
@@ -29550,7 +29958,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29550 int err; 29958 int err;
29551 29959
29552 do { 29960 do {
29553@@ -1589,7 +1589,7 @@ out_err: 29961@@ -1591,7 +1591,7 @@ out_err:
29554 29962
29555 static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cred) 29963 static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cred)
29556 { 29964 {
@@ -29559,7 +29967,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29559 struct nfs4_state *res; 29967 struct nfs4_state *res;
29560 int status; 29968 int status;
29561 29969
29562@@ -1680,7 +1680,7 @@ static int nfs4_do_setattr(struct inode 29970@@ -1682,7 +1682,7 @@ static int nfs4_do_setattr(struct inode
29563 struct nfs4_state *state) 29971 struct nfs4_state *state)
29564 { 29972 {
29565 struct nfs_server *server = NFS_SERVER(inode); 29973 struct nfs_server *server = NFS_SERVER(inode);
@@ -29568,7 +29976,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29568 int err; 29976 int err;
29569 do { 29977 do {
29570 err = nfs4_handle_exception(server, 29978 err = nfs4_handle_exception(server,
29571@@ -2046,7 +2046,7 @@ static int _nfs4_server_capabilities(str 29979@@ -2048,7 +2048,7 @@ static int _nfs4_server_capabilities(str
29572 29980
29573 int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle) 29981 int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)
29574 { 29982 {
@@ -29577,7 +29985,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29577 int err; 29985 int err;
29578 do { 29986 do {
29579 err = nfs4_handle_exception(server, 29987 err = nfs4_handle_exception(server,
29580@@ -2080,7 +2080,7 @@ static int _nfs4_lookup_root(struct nfs_ 29988@@ -2082,7 +2082,7 @@ static int _nfs4_lookup_root(struct nfs_
29581 static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle, 29989 static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle,
29582 struct nfs_fsinfo *info) 29990 struct nfs_fsinfo *info)
29583 { 29991 {
@@ -29586,7 +29994,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29586 int err; 29994 int err;
29587 do { 29995 do {
29588 err = nfs4_handle_exception(server, 29996 err = nfs4_handle_exception(server,
29589@@ -2169,7 +2169,7 @@ static int _nfs4_proc_getattr(struct nfs 29997@@ -2171,7 +2171,7 @@ static int _nfs4_proc_getattr(struct nfs
29590 29998
29591 static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr) 29999 static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
29592 { 30000 {
@@ -29595,7 +30003,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29595 int err; 30003 int err;
29596 do { 30004 do {
29597 err = nfs4_handle_exception(server, 30005 err = nfs4_handle_exception(server,
29598@@ -2257,7 +2257,7 @@ static int nfs4_proc_lookupfh(struct nfs 30006@@ -2259,7 +2259,7 @@ static int nfs4_proc_lookupfh(struct nfs
29599 struct qstr *name, struct nfs_fh *fhandle, 30007 struct qstr *name, struct nfs_fh *fhandle,
29600 struct nfs_fattr *fattr) 30008 struct nfs_fattr *fattr)
29601 { 30009 {
@@ -29604,7 +30012,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29604 int err; 30012 int err;
29605 do { 30013 do {
29606 err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr); 30014 err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr);
29607@@ -2286,7 +2286,7 @@ static int _nfs4_proc_lookup(struct inod 30015@@ -2288,7 +2288,7 @@ static int _nfs4_proc_lookup(struct inod
29608 30016
29609 static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr) 30017 static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
29610 { 30018 {
@@ -29613,7 +30021,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29613 int err; 30021 int err;
29614 do { 30022 do {
29615 err = nfs4_handle_exception(NFS_SERVER(dir), 30023 err = nfs4_handle_exception(NFS_SERVER(dir),
29616@@ -2350,7 +2350,7 @@ static int _nfs4_proc_access(struct inod 30024@@ -2352,7 +2352,7 @@ static int _nfs4_proc_access(struct inod
29617 30025
29618 static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry) 30026 static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry)
29619 { 30027 {
@@ -29622,7 +30030,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29622 int err; 30030 int err;
29623 do { 30031 do {
29624 err = nfs4_handle_exception(NFS_SERVER(inode), 30032 err = nfs4_handle_exception(NFS_SERVER(inode),
29625@@ -2406,7 +2406,7 @@ static int _nfs4_proc_readlink(struct in 30033@@ -2408,7 +2408,7 @@ static int _nfs4_proc_readlink(struct in
29626 static int nfs4_proc_readlink(struct inode *inode, struct page *page, 30034 static int nfs4_proc_readlink(struct inode *inode, struct page *page,
29627 unsigned int pgbase, unsigned int pglen) 30035 unsigned int pgbase, unsigned int pglen)
29628 { 30036 {
@@ -29631,7 +30039,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29631 int err; 30039 int err;
29632 do { 30040 do {
29633 err = nfs4_handle_exception(NFS_SERVER(inode), 30041 err = nfs4_handle_exception(NFS_SERVER(inode),
29634@@ -2504,7 +2504,7 @@ static int _nfs4_proc_remove(struct inod 30042@@ -2506,7 +2506,7 @@ static int _nfs4_proc_remove(struct inod
29635 30043
29636 static int nfs4_proc_remove(struct inode *dir, struct qstr *name) 30044 static int nfs4_proc_remove(struct inode *dir, struct qstr *name)
29637 { 30045 {
@@ -29640,7 +30048,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29640 int err; 30048 int err;
29641 do { 30049 do {
29642 err = nfs4_handle_exception(NFS_SERVER(dir), 30050 err = nfs4_handle_exception(NFS_SERVER(dir),
29643@@ -2578,7 +2578,7 @@ static int _nfs4_proc_rename(struct inod 30051@@ -2580,7 +2580,7 @@ static int _nfs4_proc_rename(struct inod
29644 static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name, 30052 static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name,
29645 struct inode *new_dir, struct qstr *new_name) 30053 struct inode *new_dir, struct qstr *new_name)
29646 { 30054 {
@@ -29649,7 +30057,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29649 int err; 30057 int err;
29650 do { 30058 do {
29651 err = nfs4_handle_exception(NFS_SERVER(old_dir), 30059 err = nfs4_handle_exception(NFS_SERVER(old_dir),
29652@@ -2625,7 +2625,7 @@ static int _nfs4_proc_link(struct inode 30060@@ -2627,7 +2627,7 @@ static int _nfs4_proc_link(struct inode
29653 30061
29654 static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name) 30062 static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name)
29655 { 30063 {
@@ -29658,7 +30066,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29658 int err; 30066 int err;
29659 do { 30067 do {
29660 err = nfs4_handle_exception(NFS_SERVER(inode), 30068 err = nfs4_handle_exception(NFS_SERVER(inode),
29661@@ -2717,7 +2717,7 @@ out: 30069@@ -2719,7 +2719,7 @@ out:
29662 static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry, 30070 static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry,
29663 struct page *page, unsigned int len, struct iattr *sattr) 30071 struct page *page, unsigned int len, struct iattr *sattr)
29664 { 30072 {
@@ -29667,7 +30075,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29667 int err; 30075 int err;
29668 do { 30076 do {
29669 err = nfs4_handle_exception(NFS_SERVER(dir), 30077 err = nfs4_handle_exception(NFS_SERVER(dir),
29670@@ -2748,7 +2748,7 @@ out: 30078@@ -2750,7 +2750,7 @@ out:
29671 static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, 30079 static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,
29672 struct iattr *sattr) 30080 struct iattr *sattr)
29673 { 30081 {
@@ -29676,7 +30084,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29676 int err; 30084 int err;
29677 do { 30085 do {
29678 err = nfs4_handle_exception(NFS_SERVER(dir), 30086 err = nfs4_handle_exception(NFS_SERVER(dir),
29679@@ -2797,7 +2797,7 @@ static int _nfs4_proc_readdir(struct den 30087@@ -2799,7 +2799,7 @@ static int _nfs4_proc_readdir(struct den
29680 static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, 30088 static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
29681 u64 cookie, struct page *page, unsigned int count, int plus) 30089 u64 cookie, struct page *page, unsigned int count, int plus)
29682 { 30090 {
@@ -29685,7 +30093,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29685 int err; 30093 int err;
29686 do { 30094 do {
29687 err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode), 30095 err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode),
29688@@ -2845,7 +2845,7 @@ out: 30096@@ -2847,7 +2847,7 @@ out:
29689 static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, 30097 static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry,
29690 struct iattr *sattr, dev_t rdev) 30098 struct iattr *sattr, dev_t rdev)
29691 { 30099 {
@@ -29694,7 +30102,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29694 int err; 30102 int err;
29695 do { 30103 do {
29696 err = nfs4_handle_exception(NFS_SERVER(dir), 30104 err = nfs4_handle_exception(NFS_SERVER(dir),
29697@@ -2877,7 +2877,7 @@ static int _nfs4_proc_statfs(struct nfs_ 30105@@ -2879,7 +2879,7 @@ static int _nfs4_proc_statfs(struct nfs_
29698 30106
29699 static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat) 30107 static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat)
29700 { 30108 {
@@ -29703,7 +30111,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29703 int err; 30111 int err;
29704 do { 30112 do {
29705 err = nfs4_handle_exception(server, 30113 err = nfs4_handle_exception(server,
29706@@ -2908,7 +2908,7 @@ static int _nfs4_do_fsinfo(struct nfs_se 30114@@ -2910,7 +2910,7 @@ static int _nfs4_do_fsinfo(struct nfs_se
29707 30115
29708 static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo) 30116 static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo)
29709 { 30117 {
@@ -29712,7 +30120,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29712 int err; 30120 int err;
29713 30121
29714 do { 30122 do {
29715@@ -2954,7 +2954,7 @@ static int _nfs4_proc_pathconf(struct nf 30123@@ -2956,7 +2956,7 @@ static int _nfs4_proc_pathconf(struct nf
29716 static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle, 30124 static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,
29717 struct nfs_pathconf *pathconf) 30125 struct nfs_pathconf *pathconf)
29718 { 30126 {
@@ -29721,7 +30129,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29721 int err; 30129 int err;
29722 30130
29723 do { 30131 do {
29724@@ -3253,7 +3253,7 @@ out_free: 30132@@ -3255,7 +3255,7 @@ out_free:
29725 30133
29726 static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen) 30134 static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen)
29727 { 30135 {
@@ -29730,7 +30138,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29730 ssize_t ret; 30138 ssize_t ret;
29731 do { 30139 do {
29732 ret = __nfs4_get_acl_uncached(inode, buf, buflen); 30140 ret = __nfs4_get_acl_uncached(inode, buf, buflen);
29733@@ -3309,7 +3309,7 @@ static int __nfs4_proc_set_acl(struct in 30141@@ -3311,7 +3311,7 @@ static int __nfs4_proc_set_acl(struct in
29734 30142
29735 static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen) 30143 static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen)
29736 { 30144 {
@@ -29739,7 +30147,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29739 int err; 30147 int err;
29740 do { 30148 do {
29741 err = nfs4_handle_exception(NFS_SERVER(inode), 30149 err = nfs4_handle_exception(NFS_SERVER(inode),
29742@@ -3574,7 +3574,7 @@ out: 30150@@ -3576,7 +3576,7 @@ out:
29743 int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync) 30151 int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync)
29744 { 30152 {
29745 struct nfs_server *server = NFS_SERVER(inode); 30153 struct nfs_server *server = NFS_SERVER(inode);
@@ -29748,7 +30156,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29748 int err; 30156 int err;
29749 do { 30157 do {
29750 err = _nfs4_proc_delegreturn(inode, cred, stateid, issync); 30158 err = _nfs4_proc_delegreturn(inode, cred, stateid, issync);
29751@@ -3647,7 +3647,7 @@ out: 30159@@ -3649,7 +3649,7 @@ out:
29752 30160
29753 static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request) 30161 static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request)
29754 { 30162 {
@@ -29757,7 +30165,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29757 int err; 30165 int err;
29758 30166
29759 do { 30167 do {
29760@@ -4021,7 +4021,7 @@ static int _nfs4_do_setlk(struct nfs4_st 30168@@ -4042,7 +4042,7 @@ static int _nfs4_do_setlk(struct nfs4_st
29761 static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request) 30169 static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request)
29762 { 30170 {
29763 struct nfs_server *server = NFS_SERVER(state->inode); 30171 struct nfs_server *server = NFS_SERVER(state->inode);
@@ -29766,7 +30174,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29766 int err; 30174 int err;
29767 30175
29768 do { 30176 do {
29769@@ -4039,7 +4039,7 @@ static int nfs4_lock_reclaim(struct nfs4 30177@@ -4060,7 +4060,7 @@ static int nfs4_lock_reclaim(struct nfs4
29770 static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request) 30178 static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request)
29771 { 30179 {
29772 struct nfs_server *server = NFS_SERVER(state->inode); 30180 struct nfs_server *server = NFS_SERVER(state->inode);
@@ -29775,7 +30183,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29775 int err; 30183 int err;
29776 30184
29777 err = nfs4_set_lock_state(state, request); 30185 err = nfs4_set_lock_state(state, request);
29778@@ -4094,7 +4094,7 @@ out: 30186@@ -4118,7 +4118,7 @@ out:
29779 30187
29780 static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request) 30188 static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)
29781 { 30189 {
@@ -29784,7 +30192,7 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29784 int err; 30192 int err;
29785 30193
29786 do { 30194 do {
29787@@ -4154,7 +4154,7 @@ nfs4_proc_lock(struct file *filp, int cm 30195@@ -4178,7 +4178,7 @@ nfs4_proc_lock(struct file *filp, int cm
29788 int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl) 30196 int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl)
29789 { 30197 {
29790 struct nfs_server *server = NFS_SERVER(state->inode); 30198 struct nfs_server *server = NFS_SERVER(state->inode);
@@ -29793,9 +30201,9 @@ diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29793 int err; 30201 int err;
29794 30202
29795 err = nfs4_set_lock_state(state, fl); 30203 err = nfs4_set_lock_state(state, fl);
29796diff -urNp linux-2.6.32.8/fs/nfsd/lockd.c linux-2.6.32.8/fs/nfsd/lockd.c 30204diff -urNp linux-2.6.32.9/fs/nfsd/lockd.c linux-2.6.32.9/fs/nfsd/lockd.c
29797--- linux-2.6.32.8/fs/nfsd/lockd.c 2010-02-09 07:57:19.000000000 -0500 30205--- linux-2.6.32.9/fs/nfsd/lockd.c 2010-02-09 07:57:19.000000000 -0500
29798+++ linux-2.6.32.8/fs/nfsd/lockd.c 2010-02-13 21:45:10.682015439 -0500 30206+++ linux-2.6.32.9/fs/nfsd/lockd.c 2010-02-23 17:09:53.288151568 -0500
29799@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) 30207@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
29800 fput(filp); 30208 fput(filp);
29801 } 30209 }
@@ -29805,9 +30213,9 @@ diff -urNp linux-2.6.32.8/fs/nfsd/lockd.c linux-2.6.32.8/fs/nfsd/lockd.c
29805 .fopen = nlm_fopen, /* open file for locking */ 30213 .fopen = nlm_fopen, /* open file for locking */
29806 .fclose = nlm_fclose, /* close file */ 30214 .fclose = nlm_fclose, /* close file */
29807 }; 30215 };
29808diff -urNp linux-2.6.32.8/fs/nfsd/vfs.c linux-2.6.32.8/fs/nfsd/vfs.c 30216diff -urNp linux-2.6.32.9/fs/nfsd/vfs.c linux-2.6.32.9/fs/nfsd/vfs.c
29809--- linux-2.6.32.8/fs/nfsd/vfs.c 2010-02-09 07:57:19.000000000 -0500 30217--- linux-2.6.32.9/fs/nfsd/vfs.c 2010-02-09 07:57:19.000000000 -0500
29810+++ linux-2.6.32.8/fs/nfsd/vfs.c 2010-02-13 21:45:10.682559458 -0500 30218+++ linux-2.6.32.9/fs/nfsd/vfs.c 2010-02-23 17:09:53.288151568 -0500
29811@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st 30219@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
29812 } else { 30220 } else {
29813 oldfs = get_fs(); 30221 oldfs = get_fs();
@@ -29835,9 +30243,9 @@ diff -urNp linux-2.6.32.8/fs/nfsd/vfs.c linux-2.6.32.8/fs/nfsd/vfs.c
29835 set_fs(oldfs); 30243 set_fs(oldfs);
29836 30244
29837 if (host_err < 0) 30245 if (host_err < 0)
29838diff -urNp linux-2.6.32.8/fs/nls/nls_base.c linux-2.6.32.8/fs/nls/nls_base.c 30246diff -urNp linux-2.6.32.9/fs/nls/nls_base.c linux-2.6.32.9/fs/nls/nls_base.c
29839--- linux-2.6.32.8/fs/nls/nls_base.c 2010-02-09 07:57:19.000000000 -0500 30247--- linux-2.6.32.9/fs/nls/nls_base.c 2010-02-09 07:57:19.000000000 -0500
29840+++ linux-2.6.32.8/fs/nls/nls_base.c 2010-02-13 21:45:10.682559458 -0500 30248+++ linux-2.6.32.9/fs/nls/nls_base.c 2010-02-23 17:09:53.288151568 -0500
29841@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl 30249@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
29842 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, 30250 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
29843 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, 30251 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
@@ -29847,9 +30255,9 @@ diff -urNp linux-2.6.32.8/fs/nls/nls_base.c linux-2.6.32.8/fs/nls/nls_base.c
29847 }; 30255 };
29848 30256
29849 #define UNICODE_MAX 0x0010ffff 30257 #define UNICODE_MAX 0x0010ffff
29850diff -urNp linux-2.6.32.8/fs/ntfs/file.c linux-2.6.32.8/fs/ntfs/file.c 30258diff -urNp linux-2.6.32.9/fs/ntfs/file.c linux-2.6.32.9/fs/ntfs/file.c
29851--- linux-2.6.32.8/fs/ntfs/file.c 2010-02-09 07:57:19.000000000 -0500 30259--- linux-2.6.32.9/fs/ntfs/file.c 2010-02-09 07:57:19.000000000 -0500
29852+++ linux-2.6.32.8/fs/ntfs/file.c 2010-02-13 21:45:10.682559458 -0500 30260+++ linux-2.6.32.9/fs/ntfs/file.c 2010-02-23 17:09:53.288151568 -0500
29853@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ 30261@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
29854 #endif /* NTFS_RW */ 30262 #endif /* NTFS_RW */
29855 }; 30263 };
@@ -29859,9 +30267,9 @@ diff -urNp linux-2.6.32.8/fs/ntfs/file.c linux-2.6.32.8/fs/ntfs/file.c
29859 30267
29860-const struct inode_operations ntfs_empty_inode_ops = {}; 30268-const struct inode_operations ntfs_empty_inode_ops = {};
29861+const struct inode_operations ntfs_empty_inode_ops __read_only; 30269+const struct inode_operations ntfs_empty_inode_ops __read_only;
29862diff -urNp linux-2.6.32.8/fs/ocfs2/cluster/masklog.c linux-2.6.32.8/fs/ocfs2/cluster/masklog.c 30270diff -urNp linux-2.6.32.9/fs/ocfs2/cluster/masklog.c linux-2.6.32.9/fs/ocfs2/cluster/masklog.c
29863--- linux-2.6.32.8/fs/ocfs2/cluster/masklog.c 2010-02-09 07:57:19.000000000 -0500 30271--- linux-2.6.32.9/fs/ocfs2/cluster/masklog.c 2010-02-09 07:57:19.000000000 -0500
29864+++ linux-2.6.32.8/fs/ocfs2/cluster/masklog.c 2010-02-13 21:45:10.683847796 -0500 30272+++ linux-2.6.32.9/fs/ocfs2/cluster/masklog.c 2010-02-23 17:09:53.288151568 -0500
29865@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject 30273@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
29866 return mlog_mask_store(mlog_attr->mask, buf, count); 30274 return mlog_mask_store(mlog_attr->mask, buf, count);
29867 } 30275 }
@@ -29871,9 +30279,9 @@ diff -urNp linux-2.6.32.8/fs/ocfs2/cluster/masklog.c linux-2.6.32.8/fs/ocfs2/clu
29871 .show = mlog_show, 30279 .show = mlog_show,
29872 .store = mlog_store, 30280 .store = mlog_store,
29873 }; 30281 };
29874diff -urNp linux-2.6.32.8/fs/ocfs2/localalloc.c linux-2.6.32.8/fs/ocfs2/localalloc.c 30282diff -urNp linux-2.6.32.9/fs/ocfs2/localalloc.c linux-2.6.32.9/fs/ocfs2/localalloc.c
29875--- linux-2.6.32.8/fs/ocfs2/localalloc.c 2010-02-09 07:57:19.000000000 -0500 30283--- linux-2.6.32.9/fs/ocfs2/localalloc.c 2010-02-09 07:57:19.000000000 -0500
29876+++ linux-2.6.32.8/fs/ocfs2/localalloc.c 2010-02-13 21:45:10.683847796 -0500 30284+++ linux-2.6.32.9/fs/ocfs2/localalloc.c 2010-02-23 17:09:53.292465795 -0500
29877@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo 30285@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
29878 goto bail; 30286 goto bail;
29879 } 30287 }
@@ -29883,9 +30291,9 @@ diff -urNp linux-2.6.32.8/fs/ocfs2/localalloc.c linux-2.6.32.8/fs/ocfs2/localall
29883 30291
29884 status = 0; 30292 status = 0;
29885 bail: 30293 bail:
29886diff -urNp linux-2.6.32.8/fs/ocfs2/ocfs2.h linux-2.6.32.8/fs/ocfs2/ocfs2.h 30294diff -urNp linux-2.6.32.9/fs/ocfs2/ocfs2.h linux-2.6.32.9/fs/ocfs2/ocfs2.h
29887--- linux-2.6.32.8/fs/ocfs2/ocfs2.h 2010-02-09 07:57:19.000000000 -0500 30295--- linux-2.6.32.9/fs/ocfs2/ocfs2.h 2010-02-09 07:57:19.000000000 -0500
29888+++ linux-2.6.32.8/fs/ocfs2/ocfs2.h 2010-02-13 21:45:10.683847796 -0500 30296+++ linux-2.6.32.9/fs/ocfs2/ocfs2.h 2010-02-23 17:09:53.292465795 -0500
29889@@ -217,11 +217,11 @@ enum ocfs2_vol_state 30297@@ -217,11 +217,11 @@ enum ocfs2_vol_state
29890 30298
29891 struct ocfs2_alloc_stats 30299 struct ocfs2_alloc_stats
@@ -29903,9 +30311,9 @@ diff -urNp linux-2.6.32.8/fs/ocfs2/ocfs2.h linux-2.6.32.8/fs/ocfs2/ocfs2.h
29903 }; 30311 };
29904 30312
29905 enum ocfs2_local_alloc_state 30313 enum ocfs2_local_alloc_state
29906diff -urNp linux-2.6.32.8/fs/ocfs2/suballoc.c linux-2.6.32.8/fs/ocfs2/suballoc.c 30314diff -urNp linux-2.6.32.9/fs/ocfs2/suballoc.c linux-2.6.32.9/fs/ocfs2/suballoc.c
29907--- linux-2.6.32.8/fs/ocfs2/suballoc.c 2010-02-09 07:57:19.000000000 -0500 30315--- linux-2.6.32.9/fs/ocfs2/suballoc.c 2010-02-09 07:57:19.000000000 -0500
29908+++ linux-2.6.32.8/fs/ocfs2/suballoc.c 2010-02-13 21:45:10.684768778 -0500 30316+++ linux-2.6.32.9/fs/ocfs2/suballoc.c 2010-02-23 17:09:53.292465795 -0500
29909@@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s 30317@@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s
29910 mlog_errno(status); 30318 mlog_errno(status);
29911 goto bail; 30319 goto bail;
@@ -29951,9 +30359,9 @@ diff -urNp linux-2.6.32.8/fs/ocfs2/suballoc.c linux-2.6.32.8/fs/ocfs2/suballoc.c
29951 } 30359 }
29952 } 30360 }
29953 if (status < 0) { 30361 if (status < 0) {
29954diff -urNp linux-2.6.32.8/fs/ocfs2/super.c linux-2.6.32.8/fs/ocfs2/super.c 30362diff -urNp linux-2.6.32.9/fs/ocfs2/super.c linux-2.6.32.9/fs/ocfs2/super.c
29955--- linux-2.6.32.8/fs/ocfs2/super.c 2010-02-09 07:57:19.000000000 -0500 30363--- linux-2.6.32.9/fs/ocfs2/super.c 2010-02-09 07:57:19.000000000 -0500
29956+++ linux-2.6.32.8/fs/ocfs2/super.c 2010-02-13 21:45:10.685631253 -0500 30364+++ linux-2.6.32.9/fs/ocfs2/super.c 2010-02-23 17:09:53.292465795 -0500
29957@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s 30365@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
29958 "%10s => GlobalAllocs: %d LocalAllocs: %d " 30366 "%10s => GlobalAllocs: %d LocalAllocs: %d "
29959 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", 30367 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
@@ -29988,9 +30396,9 @@ diff -urNp linux-2.6.32.8/fs/ocfs2/super.c linux-2.6.32.8/fs/ocfs2/super.c
29988 30396
29989 /* Copy the blockcheck stats from the superblock probe */ 30397 /* Copy the blockcheck stats from the superblock probe */
29990 osb->osb_ecc_stats = *stats; 30398 osb->osb_ecc_stats = *stats;
29991diff -urNp linux-2.6.32.8/fs/open.c linux-2.6.32.8/fs/open.c 30399diff -urNp linux-2.6.32.9/fs/open.c linux-2.6.32.9/fs/open.c
29992--- linux-2.6.32.8/fs/open.c 2010-02-09 07:57:19.000000000 -0500 30400--- linux-2.6.32.9/fs/open.c 2010-02-09 07:57:19.000000000 -0500
29993+++ linux-2.6.32.8/fs/open.c 2010-02-13 21:45:10.685631253 -0500 30401+++ linux-2.6.32.9/fs/open.c 2010-02-23 17:09:53.292465795 -0500
29994@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l 30402@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l
29995 if (length < 0) 30403 if (length < 0)
29996 return -EINVAL; 30404 return -EINVAL;
@@ -30164,9 +30572,9 @@ diff -urNp linux-2.6.32.8/fs/open.c linux-2.6.32.8/fs/open.c
30164 mnt_drop_write(file->f_path.mnt); 30572 mnt_drop_write(file->f_path.mnt);
30165 out_fput: 30573 out_fput:
30166 fput(file); 30574 fput(file);
30167diff -urNp linux-2.6.32.8/fs/pipe.c linux-2.6.32.8/fs/pipe.c 30575diff -urNp linux-2.6.32.9/fs/pipe.c linux-2.6.32.9/fs/pipe.c
30168--- linux-2.6.32.8/fs/pipe.c 2010-02-09 07:57:19.000000000 -0500 30576--- linux-2.6.32.9/fs/pipe.c 2010-02-09 07:57:19.000000000 -0500
30169+++ linux-2.6.32.8/fs/pipe.c 2010-02-13 21:45:10.685631253 -0500 30577+++ linux-2.6.32.9/fs/pipe.c 2010-02-23 17:09:53.292465795 -0500
30170@@ -401,9 +401,9 @@ redo: 30578@@ -401,9 +401,9 @@ redo:
30171 } 30579 }
30172 if (bufs) /* More to do? */ 30580 if (bufs) /* More to do? */
@@ -30290,9 +30698,9 @@ diff -urNp linux-2.6.32.8/fs/pipe.c linux-2.6.32.8/fs/pipe.c
30290 inode->i_fop = &rdwr_pipefifo_fops; 30698 inode->i_fop = &rdwr_pipefifo_fops;
30291 30699
30292 /* 30700 /*
30293diff -urNp linux-2.6.32.8/fs/proc/array.c linux-2.6.32.8/fs/proc/array.c 30701diff -urNp linux-2.6.32.9/fs/proc/array.c linux-2.6.32.9/fs/proc/array.c
30294--- linux-2.6.32.8/fs/proc/array.c 2010-02-09 07:57:19.000000000 -0500 30702--- linux-2.6.32.9/fs/proc/array.c 2010-02-09 07:57:19.000000000 -0500
30295+++ linux-2.6.32.8/fs/proc/array.c 2010-02-13 21:45:10.685631253 -0500 30703+++ linux-2.6.32.9/fs/proc/array.c 2010-02-23 17:09:53.292465795 -0500
30296@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct 30704@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct
30297 } 30705 }
30298 #endif /* CONFIG_MMU */ 30706 #endif /* CONFIG_MMU */
@@ -30383,9 +30791,9 @@ diff -urNp linux-2.6.32.8/fs/proc/array.c linux-2.6.32.8/fs/proc/array.c
30383+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); 30791+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
30384+} 30792+}
30385+#endif 30793+#endif
30386diff -urNp linux-2.6.32.8/fs/proc/base.c linux-2.6.32.8/fs/proc/base.c 30794diff -urNp linux-2.6.32.9/fs/proc/base.c linux-2.6.32.9/fs/proc/base.c
30387--- linux-2.6.32.8/fs/proc/base.c 2010-02-09 07:57:19.000000000 -0500 30795--- linux-2.6.32.9/fs/proc/base.c 2010-02-09 07:57:19.000000000 -0500
30388+++ linux-2.6.32.8/fs/proc/base.c 2010-02-13 21:45:10.687007868 -0500 30796+++ linux-2.6.32.9/fs/proc/base.c 2010-02-23 17:09:53.292465795 -0500
30389@@ -102,6 +102,22 @@ struct pid_entry { 30797@@ -102,6 +102,22 @@ struct pid_entry {
30390 union proc_op op; 30798 union proc_op op;
30391 }; 30799 };
@@ -30742,9 +31150,9 @@ diff -urNp linux-2.6.32.8/fs/proc/base.c linux-2.6.32.8/fs/proc/base.c
30742 ONE("stack", S_IRUSR, proc_pid_stack), 31150 ONE("stack", S_IRUSR, proc_pid_stack),
30743 #endif 31151 #endif
30744 #ifdef CONFIG_SCHEDSTATS 31152 #ifdef CONFIG_SCHEDSTATS
30745diff -urNp linux-2.6.32.8/fs/proc/cmdline.c linux-2.6.32.8/fs/proc/cmdline.c 31153diff -urNp linux-2.6.32.9/fs/proc/cmdline.c linux-2.6.32.9/fs/proc/cmdline.c
30746--- linux-2.6.32.8/fs/proc/cmdline.c 2010-02-09 07:57:19.000000000 -0500 31154--- linux-2.6.32.9/fs/proc/cmdline.c 2010-02-09 07:57:19.000000000 -0500
30747+++ linux-2.6.32.8/fs/proc/cmdline.c 2010-02-13 21:45:10.687007868 -0500 31155+++ linux-2.6.32.9/fs/proc/cmdline.c 2010-02-23 17:09:53.292465795 -0500
30748@@ -23,7 +23,11 @@ static const struct file_operations cmdl 31156@@ -23,7 +23,11 @@ static const struct file_operations cmdl
30749 31157
30750 static int __init proc_cmdline_init(void) 31158 static int __init proc_cmdline_init(void)
@@ -30757,9 +31165,9 @@ diff -urNp linux-2.6.32.8/fs/proc/cmdline.c linux-2.6.32.8/fs/proc/cmdline.c
30757 return 0; 31165 return 0;
30758 } 31166 }
30759 module_init(proc_cmdline_init); 31167 module_init(proc_cmdline_init);
30760diff -urNp linux-2.6.32.8/fs/proc/devices.c linux-2.6.32.8/fs/proc/devices.c 31168diff -urNp linux-2.6.32.9/fs/proc/devices.c linux-2.6.32.9/fs/proc/devices.c
30761--- linux-2.6.32.8/fs/proc/devices.c 2010-02-09 07:57:19.000000000 -0500 31169--- linux-2.6.32.9/fs/proc/devices.c 2010-02-09 07:57:19.000000000 -0500
30762+++ linux-2.6.32.8/fs/proc/devices.c 2010-02-13 21:45:10.687007868 -0500 31170+++ linux-2.6.32.9/fs/proc/devices.c 2010-02-23 17:09:53.292465795 -0500
30763@@ -64,7 +64,11 @@ static const struct file_operations proc 31171@@ -64,7 +64,11 @@ static const struct file_operations proc
30764 31172
30765 static int __init proc_devices_init(void) 31173 static int __init proc_devices_init(void)
@@ -30772,9 +31180,9 @@ diff -urNp linux-2.6.32.8/fs/proc/devices.c linux-2.6.32.8/fs/proc/devices.c
30772 return 0; 31180 return 0;
30773 } 31181 }
30774 module_init(proc_devices_init); 31182 module_init(proc_devices_init);
30775diff -urNp linux-2.6.32.8/fs/proc/inode.c linux-2.6.32.8/fs/proc/inode.c 31183diff -urNp linux-2.6.32.9/fs/proc/inode.c linux-2.6.32.9/fs/proc/inode.c
30776--- linux-2.6.32.8/fs/proc/inode.c 2010-02-09 07:57:19.000000000 -0500 31184--- linux-2.6.32.9/fs/proc/inode.c 2010-02-09 07:57:19.000000000 -0500
30777+++ linux-2.6.32.8/fs/proc/inode.c 2010-02-13 21:45:10.687007868 -0500 31185+++ linux-2.6.32.9/fs/proc/inode.c 2010-02-23 17:09:53.292465795 -0500
30778@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe 31186@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
30779 if (de->mode) { 31187 if (de->mode) {
30780 inode->i_mode = de->mode; 31188 inode->i_mode = de->mode;
@@ -30787,9 +31195,9 @@ diff -urNp linux-2.6.32.8/fs/proc/inode.c linux-2.6.32.8/fs/proc/inode.c
30787 } 31195 }
30788 if (de->size) 31196 if (de->size)
30789 inode->i_size = de->size; 31197 inode->i_size = de->size;
30790diff -urNp linux-2.6.32.8/fs/proc/internal.h linux-2.6.32.8/fs/proc/internal.h 31198diff -urNp linux-2.6.32.9/fs/proc/internal.h linux-2.6.32.9/fs/proc/internal.h
30791--- linux-2.6.32.8/fs/proc/internal.h 2010-02-09 07:57:19.000000000 -0500 31199--- linux-2.6.32.9/fs/proc/internal.h 2010-02-09 07:57:19.000000000 -0500
30792+++ linux-2.6.32.8/fs/proc/internal.h 2010-02-13 21:45:10.729725690 -0500 31200+++ linux-2.6.32.9/fs/proc/internal.h 2010-02-23 17:09:53.292465795 -0500
30793@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi 31201@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
30794 struct pid *pid, struct task_struct *task); 31202 struct pid *pid, struct task_struct *task);
30795 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, 31203 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -30800,9 +31208,9 @@ diff -urNp linux-2.6.32.8/fs/proc/internal.h linux-2.6.32.8/fs/proc/internal.h
30800 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); 31208 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
30801 31209
30802 extern const struct file_operations proc_maps_operations; 31210 extern const struct file_operations proc_maps_operations;
30803diff -urNp linux-2.6.32.8/fs/proc/Kconfig linux-2.6.32.8/fs/proc/Kconfig 31211diff -urNp linux-2.6.32.9/fs/proc/Kconfig linux-2.6.32.9/fs/proc/Kconfig
30804--- linux-2.6.32.8/fs/proc/Kconfig 2010-02-09 07:57:19.000000000 -0500 31212--- linux-2.6.32.9/fs/proc/Kconfig 2010-02-09 07:57:19.000000000 -0500
30805+++ linux-2.6.32.8/fs/proc/Kconfig 2010-02-13 21:45:10.729725690 -0500 31213+++ linux-2.6.32.9/fs/proc/Kconfig 2010-02-23 17:09:53.296048133 -0500
30806@@ -30,12 +30,12 @@ config PROC_FS 31214@@ -30,12 +30,12 @@ config PROC_FS
30807 31215
30808 config PROC_KCORE 31216 config PROC_KCORE
@@ -30830,9 +31238,9 @@ diff -urNp linux-2.6.32.8/fs/proc/Kconfig linux-2.6.32.8/fs/proc/Kconfig
30830 bool "Enable /proc page monitoring" if EMBEDDED 31238 bool "Enable /proc page monitoring" if EMBEDDED
30831 help 31239 help
30832 Various /proc files exist to monitor process memory utilization: 31240 Various /proc files exist to monitor process memory utilization:
30833diff -urNp linux-2.6.32.8/fs/proc/kcore.c linux-2.6.32.8/fs/proc/kcore.c 31241diff -urNp linux-2.6.32.9/fs/proc/kcore.c linux-2.6.32.9/fs/proc/kcore.c
30834--- linux-2.6.32.8/fs/proc/kcore.c 2010-02-09 07:57:19.000000000 -0500 31242--- linux-2.6.32.9/fs/proc/kcore.c 2010-02-09 07:57:19.000000000 -0500
30835+++ linux-2.6.32.8/fs/proc/kcore.c 2010-02-13 21:45:10.729725690 -0500 31243+++ linux-2.6.32.9/fs/proc/kcore.c 2010-02-23 17:09:53.296048133 -0500
30836@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use 31244@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use
30837 31245
30838 static int open_kcore(struct inode *inode, struct file *filp) 31246 static int open_kcore(struct inode *inode, struct file *filp)
@@ -30843,9 +31251,9 @@ diff -urNp linux-2.6.32.8/fs/proc/kcore.c linux-2.6.32.8/fs/proc/kcore.c
30843 if (!capable(CAP_SYS_RAWIO)) 31251 if (!capable(CAP_SYS_RAWIO))
30844 return -EPERM; 31252 return -EPERM;
30845 if (kcore_need_update) 31253 if (kcore_need_update)
30846diff -urNp linux-2.6.32.8/fs/proc/meminfo.c linux-2.6.32.8/fs/proc/meminfo.c 31254diff -urNp linux-2.6.32.9/fs/proc/meminfo.c linux-2.6.32.9/fs/proc/meminfo.c
30847--- linux-2.6.32.8/fs/proc/meminfo.c 2010-02-09 07:57:19.000000000 -0500 31255--- linux-2.6.32.9/fs/proc/meminfo.c 2010-02-09 07:57:19.000000000 -0500
30848+++ linux-2.6.32.8/fs/proc/meminfo.c 2010-02-13 21:45:10.729725690 -0500 31256+++ linux-2.6.32.9/fs/proc/meminfo.c 2010-02-23 17:09:53.296048133 -0500
30849@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ 31257@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
30850 vmi.used >> 10, 31258 vmi.used >> 10,
30851 vmi.largest_chunk >> 10 31259 vmi.largest_chunk >> 10
@@ -30855,9 +31263,9 @@ diff -urNp linux-2.6.32.8/fs/proc/meminfo.c linux-2.6.32.8/fs/proc/meminfo.c
30855 #endif 31263 #endif
30856 ); 31264 );
30857 31265
30858diff -urNp linux-2.6.32.8/fs/proc/nommu.c linux-2.6.32.8/fs/proc/nommu.c 31266diff -urNp linux-2.6.32.9/fs/proc/nommu.c linux-2.6.32.9/fs/proc/nommu.c
30859--- linux-2.6.32.8/fs/proc/nommu.c 2010-02-09 07:57:19.000000000 -0500 31267--- linux-2.6.32.9/fs/proc/nommu.c 2010-02-09 07:57:19.000000000 -0500
30860+++ linux-2.6.32.8/fs/proc/nommu.c 2010-02-13 21:45:10.729725690 -0500 31268+++ linux-2.6.32.9/fs/proc/nommu.c 2010-02-23 17:09:53.296048133 -0500
30861@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ 31269@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
30862 if (len < 1) 31270 if (len < 1)
30863 len = 1; 31271 len = 1;
@@ -30867,9 +31275,9 @@ diff -urNp linux-2.6.32.8/fs/proc/nommu.c linux-2.6.32.8/fs/proc/nommu.c
30867 } 31275 }
30868 31276
30869 seq_putc(m, '\n'); 31277 seq_putc(m, '\n');
30870diff -urNp linux-2.6.32.8/fs/proc/proc_net.c linux-2.6.32.8/fs/proc/proc_net.c 31278diff -urNp linux-2.6.32.9/fs/proc/proc_net.c linux-2.6.32.9/fs/proc/proc_net.c
30871--- linux-2.6.32.8/fs/proc/proc_net.c 2010-02-09 07:57:19.000000000 -0500 31279--- linux-2.6.32.9/fs/proc/proc_net.c 2010-02-09 07:57:19.000000000 -0500
30872+++ linux-2.6.32.8/fs/proc/proc_net.c 2010-02-13 21:45:10.729725690 -0500 31280+++ linux-2.6.32.9/fs/proc/proc_net.c 2010-02-23 17:09:53.296048133 -0500
30873@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str 31281@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
30874 struct task_struct *task; 31282 struct task_struct *task;
30875 struct nsproxy *ns; 31283 struct nsproxy *ns;
@@ -30888,9 +31296,9 @@ diff -urNp linux-2.6.32.8/fs/proc/proc_net.c linux-2.6.32.8/fs/proc/proc_net.c
30888 31296
30889 rcu_read_lock(); 31297 rcu_read_lock();
30890 task = pid_task(proc_pid(dir), PIDTYPE_PID); 31298 task = pid_task(proc_pid(dir), PIDTYPE_PID);
30891diff -urNp linux-2.6.32.8/fs/proc/proc_sysctl.c linux-2.6.32.8/fs/proc/proc_sysctl.c 31299diff -urNp linux-2.6.32.9/fs/proc/proc_sysctl.c linux-2.6.32.9/fs/proc/proc_sysctl.c
30892--- linux-2.6.32.8/fs/proc/proc_sysctl.c 2010-02-09 07:57:19.000000000 -0500 31300--- linux-2.6.32.9/fs/proc/proc_sysctl.c 2010-02-09 07:57:19.000000000 -0500
30893+++ linux-2.6.32.8/fs/proc/proc_sysctl.c 2010-02-13 21:45:10.730996248 -0500 31301+++ linux-2.6.32.9/fs/proc/proc_sysctl.c 2010-02-23 17:09:53.296048133 -0500
30894@@ -7,6 +7,8 @@ 31302@@ -7,6 +7,8 @@
30895 #include <linux/security.h> 31303 #include <linux/security.h>
30896 #include "internal.h" 31304 #include "internal.h"
@@ -30930,9 +31338,9 @@ diff -urNp linux-2.6.32.8/fs/proc/proc_sysctl.c linux-2.6.32.8/fs/proc/proc_sysc
30930 generic_fillattr(inode, stat); 31338 generic_fillattr(inode, stat);
30931 if (table) 31339 if (table)
30932 stat->mode = (stat->mode & S_IFMT) | table->mode; 31340 stat->mode = (stat->mode & S_IFMT) | table->mode;
30933diff -urNp linux-2.6.32.8/fs/proc/root.c linux-2.6.32.8/fs/proc/root.c 31341diff -urNp linux-2.6.32.9/fs/proc/root.c linux-2.6.32.9/fs/proc/root.c
30934--- linux-2.6.32.8/fs/proc/root.c 2010-02-09 07:57:19.000000000 -0500 31342--- linux-2.6.32.9/fs/proc/root.c 2010-02-09 07:57:19.000000000 -0500
30935+++ linux-2.6.32.8/fs/proc/root.c 2010-02-13 21:45:10.730996248 -0500 31343+++ linux-2.6.32.9/fs/proc/root.c 2010-02-23 17:09:53.296048133 -0500
30936@@ -134,7 +134,15 @@ void __init proc_root_init(void) 31344@@ -134,7 +134,15 @@ void __init proc_root_init(void)
30937 #ifdef CONFIG_PROC_DEVICETREE 31345 #ifdef CONFIG_PROC_DEVICETREE
30938 proc_device_tree_init(); 31346 proc_device_tree_init();
@@ -30949,9 +31357,9 @@ diff -urNp linux-2.6.32.8/fs/proc/root.c linux-2.6.32.8/fs/proc/root.c
30949 proc_sys_init(); 31357 proc_sys_init();
30950 } 31358 }
30951 31359
30952diff -urNp linux-2.6.32.8/fs/proc/task_mmu.c linux-2.6.32.8/fs/proc/task_mmu.c 31360diff -urNp linux-2.6.32.9/fs/proc/task_mmu.c linux-2.6.32.9/fs/proc/task_mmu.c
30953--- linux-2.6.32.8/fs/proc/task_mmu.c 2010-02-09 07:57:19.000000000 -0500 31361--- linux-2.6.32.9/fs/proc/task_mmu.c 2010-02-09 07:57:19.000000000 -0500
30954+++ linux-2.6.32.8/fs/proc/task_mmu.c 2010-02-13 21:45:10.730996248 -0500 31362+++ linux-2.6.32.9/fs/proc/task_mmu.c 2010-02-23 17:09:53.296048133 -0500
30955@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct 31363@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
30956 "VmStk:\t%8lu kB\n" 31364 "VmStk:\t%8lu kB\n"
30957 "VmExe:\t%8lu kB\n" 31365 "VmExe:\t%8lu kB\n"
@@ -31072,9 +31480,9 @@ diff -urNp linux-2.6.32.8/fs/proc/task_mmu.c linux-2.6.32.8/fs/proc/task_mmu.c
31072 mss.resident >> 10, 31480 mss.resident >> 10,
31073 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), 31481 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
31074 mss.shared_clean >> 10, 31482 mss.shared_clean >> 10,
31075diff -urNp linux-2.6.32.8/fs/proc/task_nommu.c linux-2.6.32.8/fs/proc/task_nommu.c 31483diff -urNp linux-2.6.32.9/fs/proc/task_nommu.c linux-2.6.32.9/fs/proc/task_nommu.c
31076--- linux-2.6.32.8/fs/proc/task_nommu.c 2010-02-09 07:57:19.000000000 -0500 31484--- linux-2.6.32.9/fs/proc/task_nommu.c 2010-02-09 07:57:19.000000000 -0500
31077+++ linux-2.6.32.8/fs/proc/task_nommu.c 2010-02-13 21:45:10.731753900 -0500 31485+++ linux-2.6.32.9/fs/proc/task_nommu.c 2010-02-23 17:09:53.296048133 -0500
31078@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct 31486@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
31079 else 31487 else
31080 bytes += kobjsize(mm); 31488 bytes += kobjsize(mm);
@@ -31093,9 +31501,9 @@ diff -urNp linux-2.6.32.8/fs/proc/task_nommu.c linux-2.6.32.8/fs/proc/task_nommu
31093 } 31501 }
31094 31502
31095 seq_putc(m, '\n'); 31503 seq_putc(m, '\n');
31096diff -urNp linux-2.6.32.8/fs/readdir.c linux-2.6.32.8/fs/readdir.c 31504diff -urNp linux-2.6.32.9/fs/readdir.c linux-2.6.32.9/fs/readdir.c
31097--- linux-2.6.32.8/fs/readdir.c 2010-02-09 07:57:19.000000000 -0500 31505--- linux-2.6.32.9/fs/readdir.c 2010-02-09 07:57:19.000000000 -0500
31098+++ linux-2.6.32.8/fs/readdir.c 2010-02-13 21:45:10.731753900 -0500 31506+++ linux-2.6.32.9/fs/readdir.c 2010-02-23 17:09:53.296048133 -0500
31099@@ -16,6 +16,7 @@ 31507@@ -16,6 +16,7 @@
31100 #include <linux/security.h> 31508 #include <linux/security.h>
31101 #include <linux/syscalls.h> 31509 #include <linux/syscalls.h>
@@ -31185,9 +31593,9 @@ diff -urNp linux-2.6.32.8/fs/readdir.c linux-2.6.32.8/fs/readdir.c
31185 buf.count = count; 31593 buf.count = count;
31186 buf.error = 0; 31594 buf.error = 0;
31187 31595
31188diff -urNp linux-2.6.32.8/fs/reiserfs/do_balan.c linux-2.6.32.8/fs/reiserfs/do_balan.c 31596diff -urNp linux-2.6.32.9/fs/reiserfs/do_balan.c linux-2.6.32.9/fs/reiserfs/do_balan.c
31189--- linux-2.6.32.8/fs/reiserfs/do_balan.c 2010-02-09 07:57:19.000000000 -0500 31597--- linux-2.6.32.9/fs/reiserfs/do_balan.c 2010-02-09 07:57:19.000000000 -0500
31190+++ linux-2.6.32.8/fs/reiserfs/do_balan.c 2010-02-13 21:45:10.731753900 -0500 31598+++ linux-2.6.32.9/fs/reiserfs/do_balan.c 2010-02-23 17:09:53.296048133 -0500
31191@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, 31599@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
31192 return; 31600 return;
31193 } 31601 }
@@ -31197,9 +31605,9 @@ diff -urNp linux-2.6.32.8/fs/reiserfs/do_balan.c linux-2.6.32.8/fs/reiserfs/do_b
31197 do_balance_starts(tb); 31605 do_balance_starts(tb);
31198 31606
31199 /* balance leaf returns 0 except if combining L R and S into 31607 /* balance leaf returns 0 except if combining L R and S into
31200diff -urNp linux-2.6.32.8/fs/reiserfs/item_ops.c linux-2.6.32.8/fs/reiserfs/item_ops.c 31608diff -urNp linux-2.6.32.9/fs/reiserfs/item_ops.c linux-2.6.32.9/fs/reiserfs/item_ops.c
31201--- linux-2.6.32.8/fs/reiserfs/item_ops.c 2010-02-09 07:57:19.000000000 -0500 31609--- linux-2.6.32.9/fs/reiserfs/item_ops.c 2010-02-09 07:57:19.000000000 -0500
31202+++ linux-2.6.32.8/fs/reiserfs/item_ops.c 2010-02-13 21:45:10.732792506 -0500 31610+++ linux-2.6.32.9/fs/reiserfs/item_ops.c 2010-02-23 17:09:53.296048133 -0500
31203@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i 31611@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
31204 vi->vi_index, vi->vi_type, vi->vi_ih); 31612 vi->vi_index, vi->vi_type, vi->vi_ih);
31205 } 31613 }
@@ -31254,9 +31662,9 @@ diff -urNp linux-2.6.32.8/fs/reiserfs/item_ops.c linux-2.6.32.8/fs/reiserfs/item
31254 &stat_data_ops, 31662 &stat_data_ops,
31255 &indirect_ops, 31663 &indirect_ops,
31256 &direct_ops, 31664 &direct_ops,
31257diff -urNp linux-2.6.32.8/fs/reiserfs/procfs.c linux-2.6.32.8/fs/reiserfs/procfs.c 31665diff -urNp linux-2.6.32.9/fs/reiserfs/procfs.c linux-2.6.32.9/fs/reiserfs/procfs.c
31258--- linux-2.6.32.8/fs/reiserfs/procfs.c 2010-02-09 07:57:19.000000000 -0500 31666--- linux-2.6.32.9/fs/reiserfs/procfs.c 2010-02-09 07:57:19.000000000 -0500
31259+++ linux-2.6.32.8/fs/reiserfs/procfs.c 2010-02-13 21:45:10.732792506 -0500 31667+++ linux-2.6.32.9/fs/reiserfs/procfs.c 2010-02-23 17:09:53.296048133 -0500
31260@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m 31668@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
31261 "SMALL_TAILS " : "NO_TAILS ", 31669 "SMALL_TAILS " : "NO_TAILS ",
31262 replay_only(sb) ? "REPLAY_ONLY " : "", 31670 replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -31266,9 +31674,9 @@ diff -urNp linux-2.6.32.8/fs/reiserfs/procfs.c linux-2.6.32.8/fs/reiserfs/procfs
31266 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), 31674 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
31267 SF(s_do_balance), SF(s_unneeded_left_neighbor), 31675 SF(s_do_balance), SF(s_unneeded_left_neighbor),
31268 SF(s_good_search_by_key_reada), SF(s_bmaps), 31676 SF(s_good_search_by_key_reada), SF(s_bmaps),
31269diff -urNp linux-2.6.32.8/fs/select.c linux-2.6.32.8/fs/select.c 31677diff -urNp linux-2.6.32.9/fs/select.c linux-2.6.32.9/fs/select.c
31270--- linux-2.6.32.8/fs/select.c 2010-02-09 07:57:19.000000000 -0500 31678--- linux-2.6.32.9/fs/select.c 2010-02-09 07:57:19.000000000 -0500
31271+++ linux-2.6.32.8/fs/select.c 2010-02-13 21:45:10.732792506 -0500 31679+++ linux-2.6.32.9/fs/select.c 2010-02-23 17:09:53.296048133 -0500
31272@@ -20,6 +20,7 @@ 31680@@ -20,6 +20,7 @@
31273 #include <linux/module.h> 31681 #include <linux/module.h>
31274 #include <linux/slab.h> 31682 #include <linux/slab.h>
@@ -31285,9 +31693,9 @@ diff -urNp linux-2.6.32.8/fs/select.c linux-2.6.32.8/fs/select.c
31285 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 31693 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
31286 return -EINVAL; 31694 return -EINVAL;
31287 31695
31288diff -urNp linux-2.6.32.8/fs/seq_file.c linux-2.6.32.8/fs/seq_file.c 31696diff -urNp linux-2.6.32.9/fs/seq_file.c linux-2.6.32.9/fs/seq_file.c
31289--- linux-2.6.32.8/fs/seq_file.c 2010-02-09 07:57:19.000000000 -0500 31697--- linux-2.6.32.9/fs/seq_file.c 2010-02-09 07:57:19.000000000 -0500
31290+++ linux-2.6.32.8/fs/seq_file.c 2010-02-13 21:45:10.732792506 -0500 31698+++ linux-2.6.32.9/fs/seq_file.c 2010-02-23 17:09:53.296048133 -0500
31291@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 31699@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
31292 return 0; 31700 return 0;
31293 } 31701 }
@@ -31328,9 +31736,9 @@ diff -urNp linux-2.6.32.8/fs/seq_file.c linux-2.6.32.8/fs/seq_file.c
31328 if (!m->buf) 31736 if (!m->buf)
31329 goto Enomem; 31737 goto Enomem;
31330 m->count = 0; 31738 m->count = 0;
31331diff -urNp linux-2.6.32.8/fs/smbfs/symlink.c linux-2.6.32.8/fs/smbfs/symlink.c 31739diff -urNp linux-2.6.32.9/fs/smbfs/symlink.c linux-2.6.32.9/fs/smbfs/symlink.c
31332--- linux-2.6.32.8/fs/smbfs/symlink.c 2010-02-09 07:57:19.000000000 -0500 31740--- linux-2.6.32.9/fs/smbfs/symlink.c 2010-02-09 07:57:19.000000000 -0500
31333+++ linux-2.6.32.8/fs/smbfs/symlink.c 2010-02-13 21:45:10.734003722 -0500 31741+++ linux-2.6.32.9/fs/smbfs/symlink.c 2010-02-23 17:09:53.296048133 -0500
31334@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent 31742@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
31335 31743
31336 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 31744 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -31340,9 +31748,9 @@ diff -urNp linux-2.6.32.8/fs/smbfs/symlink.c linux-2.6.32.8/fs/smbfs/symlink.c
31340 if (!IS_ERR(s)) 31748 if (!IS_ERR(s))
31341 __putname(s); 31749 __putname(s);
31342 } 31750 }
31343diff -urNp linux-2.6.32.8/fs/splice.c linux-2.6.32.8/fs/splice.c 31751diff -urNp linux-2.6.32.9/fs/splice.c linux-2.6.32.9/fs/splice.c
31344--- linux-2.6.32.8/fs/splice.c 2010-02-09 07:57:19.000000000 -0500 31752--- linux-2.6.32.9/fs/splice.c 2010-02-09 07:57:19.000000000 -0500
31345+++ linux-2.6.32.8/fs/splice.c 2010-02-13 21:45:10.734003722 -0500 31753+++ linux-2.6.32.9/fs/splice.c 2010-02-23 17:09:53.300060401 -0500
31346@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode 31754@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
31347 pipe_lock(pipe); 31755 pipe_lock(pipe);
31348 31756
@@ -31481,9 +31889,9 @@ diff -urNp linux-2.6.32.8/fs/splice.c linux-2.6.32.8/fs/splice.c
31481 ret = -EAGAIN; 31889 ret = -EAGAIN;
31482 31890
31483 pipe_unlock(ipipe); 31891 pipe_unlock(ipipe);
31484diff -urNp linux-2.6.32.8/fs/sysfs/file.c linux-2.6.32.8/fs/sysfs/file.c 31892diff -urNp linux-2.6.32.9/fs/sysfs/file.c linux-2.6.32.9/fs/sysfs/file.c
31485--- linux-2.6.32.8/fs/sysfs/file.c 2010-02-09 07:57:19.000000000 -0500 31893--- linux-2.6.32.9/fs/sysfs/file.c 2010-02-09 07:57:19.000000000 -0500
31486+++ linux-2.6.32.8/fs/sysfs/file.c 2010-02-13 21:45:10.734003722 -0500 31894+++ linux-2.6.32.9/fs/sysfs/file.c 2010-02-23 17:09:53.300060401 -0500
31487@@ -53,7 +53,7 @@ struct sysfs_buffer { 31895@@ -53,7 +53,7 @@ struct sysfs_buffer {
31488 size_t count; 31896 size_t count;
31489 loff_t pos; 31897 loff_t pos;
@@ -31520,9 +31928,9 @@ diff -urNp linux-2.6.32.8/fs/sysfs/file.c linux-2.6.32.8/fs/sysfs/file.c
31520 int error = -EACCES; 31928 int error = -EACCES;
31521 char *p; 31929 char *p;
31522 31930
31523diff -urNp linux-2.6.32.8/fs/sysfs/symlink.c linux-2.6.32.8/fs/sysfs/symlink.c 31931diff -urNp linux-2.6.32.9/fs/sysfs/symlink.c linux-2.6.32.9/fs/sysfs/symlink.c
31524--- linux-2.6.32.8/fs/sysfs/symlink.c 2010-02-09 07:57:19.000000000 -0500 31932--- linux-2.6.32.9/fs/sysfs/symlink.c 2010-02-09 07:57:19.000000000 -0500
31525+++ linux-2.6.32.8/fs/sysfs/symlink.c 2010-02-13 21:45:10.734995279 -0500 31933+++ linux-2.6.32.9/fs/sysfs/symlink.c 2010-02-23 17:09:53.300060401 -0500
31526@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de 31934@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
31527 31935
31528 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) 31936 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -31532,9 +31940,9 @@ diff -urNp linux-2.6.32.8/fs/sysfs/symlink.c linux-2.6.32.8/fs/sysfs/symlink.c
31532 if (!IS_ERR(page)) 31940 if (!IS_ERR(page))
31533 free_page((unsigned long)page); 31941 free_page((unsigned long)page);
31534 } 31942 }
31535diff -urNp linux-2.6.32.8/fs/udf/balloc.c linux-2.6.32.8/fs/udf/balloc.c 31943diff -urNp linux-2.6.32.9/fs/udf/balloc.c linux-2.6.32.9/fs/udf/balloc.c
31536--- linux-2.6.32.8/fs/udf/balloc.c 2010-02-09 07:57:19.000000000 -0500 31944--- linux-2.6.32.9/fs/udf/balloc.c 2010-02-09 07:57:19.000000000 -0500
31537+++ linux-2.6.32.8/fs/udf/balloc.c 2010-02-13 21:45:10.734995279 -0500 31945+++ linux-2.6.32.9/fs/udf/balloc.c 2010-02-23 17:09:53.300060401 -0500
31538@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc 31946@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
31539 31947
31540 mutex_lock(&sbi->s_alloc_mutex); 31948 mutex_lock(&sbi->s_alloc_mutex);
@@ -31557,9 +31965,9 @@ diff -urNp linux-2.6.32.8/fs/udf/balloc.c linux-2.6.32.8/fs/udf/balloc.c
31557 udf_debug("%d < %d || %d + %d > %d\n", 31965 udf_debug("%d < %d || %d + %d > %d\n",
31558 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, 31966 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
31559 partmap->s_partition_len); 31967 partmap->s_partition_len);
31560diff -urNp linux-2.6.32.8/fs/utimes.c linux-2.6.32.8/fs/utimes.c 31968diff -urNp linux-2.6.32.9/fs/utimes.c linux-2.6.32.9/fs/utimes.c
31561--- linux-2.6.32.8/fs/utimes.c 2010-02-09 07:57:19.000000000 -0500 31969--- linux-2.6.32.9/fs/utimes.c 2010-02-09 07:57:19.000000000 -0500
31562+++ linux-2.6.32.8/fs/utimes.c 2010-02-13 21:45:10.734995279 -0500 31970+++ linux-2.6.32.9/fs/utimes.c 2010-02-23 17:09:53.300060401 -0500
31563@@ -1,6 +1,7 @@ 31971@@ -1,6 +1,7 @@
31564 #include <linux/compiler.h> 31972 #include <linux/compiler.h>
31565 #include <linux/file.h> 31973 #include <linux/file.h>
@@ -31581,9 +31989,9 @@ diff -urNp linux-2.6.32.8/fs/utimes.c linux-2.6.32.8/fs/utimes.c
31581 mutex_lock(&inode->i_mutex); 31989 mutex_lock(&inode->i_mutex);
31582 error = notify_change(path->dentry, &newattrs); 31990 error = notify_change(path->dentry, &newattrs);
31583 mutex_unlock(&inode->i_mutex); 31991 mutex_unlock(&inode->i_mutex);
31584diff -urNp linux-2.6.32.8/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.8/fs/xfs/linux-2.6/xfs_iops.c 31992diff -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
31585--- linux-2.6.32.8/fs/xfs/linux-2.6/xfs_iops.c 2010-02-09 07:57:19.000000000 -0500 31993--- linux-2.6.32.9/fs/xfs/linux-2.6/xfs_iops.c 2010-02-09 07:57:19.000000000 -0500
31586+++ linux-2.6.32.8/fs/xfs/linux-2.6/xfs_iops.c 2010-02-13 21:45:10.734995279 -0500 31994+++ linux-2.6.32.9/fs/xfs/linux-2.6/xfs_iops.c 2010-02-23 17:09:53.300060401 -0500
31587@@ -468,7 +468,7 @@ xfs_vn_put_link( 31995@@ -468,7 +468,7 @@ xfs_vn_put_link(
31588 struct nameidata *nd, 31996 struct nameidata *nd,
31589 void *p) 31997 void *p)
@@ -31593,9 +32001,9 @@ diff -urNp linux-2.6.32.8/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.8/fs/xfs/linu
31593 32001
31594 if (!IS_ERR(s)) 32002 if (!IS_ERR(s))
31595 kfree(s); 32003 kfree(s);
31596diff -urNp linux-2.6.32.8/fs/xfs/xfs_bmap.c linux-2.6.32.8/fs/xfs/xfs_bmap.c 32004diff -urNp linux-2.6.32.9/fs/xfs/xfs_bmap.c linux-2.6.32.9/fs/xfs/xfs_bmap.c
31597--- linux-2.6.32.8/fs/xfs/xfs_bmap.c 2010-02-09 07:57:19.000000000 -0500 32005--- linux-2.6.32.9/fs/xfs/xfs_bmap.c 2010-02-09 07:57:19.000000000 -0500
31598+++ linux-2.6.32.8/fs/xfs/xfs_bmap.c 2010-02-13 21:45:10.736823823 -0500 32006+++ linux-2.6.32.9/fs/xfs/xfs_bmap.c 2010-02-23 17:09:53.300060401 -0500
31599@@ -360,7 +360,7 @@ xfs_bmap_validate_ret( 32007@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
31600 int nmap, 32008 int nmap,
31601 int ret_nmap); 32009 int ret_nmap);
@@ -31605,9 +32013,9 @@ diff -urNp linux-2.6.32.8/fs/xfs/xfs_bmap.c linux-2.6.32.8/fs/xfs/xfs_bmap.c
31605 #endif /* DEBUG */ 32013 #endif /* DEBUG */
31606 32014
31607 #if defined(XFS_RW_TRACE) 32015 #if defined(XFS_RW_TRACE)
31608diff -urNp linux-2.6.32.8/grsecurity/gracl_alloc.c linux-2.6.32.8/grsecurity/gracl_alloc.c 32016diff -urNp linux-2.6.32.9/grsecurity/gracl_alloc.c linux-2.6.32.9/grsecurity/gracl_alloc.c
31609--- linux-2.6.32.8/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 32017--- linux-2.6.32.9/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
31610+++ linux-2.6.32.8/grsecurity/gracl_alloc.c 2010-02-13 21:45:10.736823823 -0500 32018+++ linux-2.6.32.9/grsecurity/gracl_alloc.c 2010-02-23 17:09:53.300060401 -0500
31611@@ -0,0 +1,105 @@ 32019@@ -0,0 +1,105 @@
31612+#include <linux/kernel.h> 32020+#include <linux/kernel.h>
31613+#include <linux/mm.h> 32021+#include <linux/mm.h>
@@ -31714,9 +32122,9 @@ diff -urNp linux-2.6.32.8/grsecurity/gracl_alloc.c linux-2.6.32.8/grsecurity/gra
31714+ else 32122+ else
31715+ return 1; 32123+ return 1;
31716+} 32124+}
31717diff -urNp linux-2.6.32.8/grsecurity/gracl.c linux-2.6.32.8/grsecurity/gracl.c 32125diff -urNp linux-2.6.32.9/grsecurity/gracl.c linux-2.6.32.9/grsecurity/gracl.c
31718--- linux-2.6.32.8/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 32126--- linux-2.6.32.9/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
31719+++ linux-2.6.32.8/grsecurity/gracl.c 2010-02-13 21:45:10.738840239 -0500 32127+++ linux-2.6.32.9/grsecurity/gracl.c 2010-02-23 17:09:53.304046495 -0500
31720@@ -0,0 +1,3918 @@ 32128@@ -0,0 +1,3918 @@
31721+#include <linux/kernel.h> 32129+#include <linux/kernel.h>
31722+#include <linux/module.h> 32130+#include <linux/module.h>
@@ -35636,9 +36044,9 @@ diff -urNp linux-2.6.32.8/grsecurity/gracl.c linux-2.6.32.8/grsecurity/gracl.c
35636+EXPORT_SYMBOL(gr_check_group_change); 36044+EXPORT_SYMBOL(gr_check_group_change);
35637+#endif 36045+#endif
35638+ 36046+
35639diff -urNp linux-2.6.32.8/grsecurity/gracl_cap.c linux-2.6.32.8/grsecurity/gracl_cap.c 36047diff -urNp linux-2.6.32.9/grsecurity/gracl_cap.c linux-2.6.32.9/grsecurity/gracl_cap.c
35640--- linux-2.6.32.8/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 36048--- linux-2.6.32.9/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
35641+++ linux-2.6.32.8/grsecurity/gracl_cap.c 2010-02-13 21:45:10.738840239 -0500 36049+++ linux-2.6.32.9/grsecurity/gracl_cap.c 2010-02-23 17:09:53.304046495 -0500
35642@@ -0,0 +1,131 @@ 36050@@ -0,0 +1,131 @@
35643+#include <linux/kernel.h> 36051+#include <linux/kernel.h>
35644+#include <linux/module.h> 36052+#include <linux/module.h>
@@ -35771,9 +36179,9 @@ diff -urNp linux-2.6.32.8/grsecurity/gracl_cap.c linux-2.6.32.8/grsecurity/gracl
35771+ return 0; 36179+ return 0;
35772+} 36180+}
35773+ 36181+
35774diff -urNp linux-2.6.32.8/grsecurity/gracl_fs.c linux-2.6.32.8/grsecurity/gracl_fs.c 36182diff -urNp linux-2.6.32.9/grsecurity/gracl_fs.c linux-2.6.32.9/grsecurity/gracl_fs.c
35775--- linux-2.6.32.8/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 36183--- linux-2.6.32.9/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
35776+++ linux-2.6.32.8/grsecurity/gracl_fs.c 2010-02-13 21:45:10.738840239 -0500 36184+++ linux-2.6.32.9/grsecurity/gracl_fs.c 2010-02-23 17:09:53.304046495 -0500
35777@@ -0,0 +1,424 @@ 36185@@ -0,0 +1,424 @@
35778+#include <linux/kernel.h> 36186+#include <linux/kernel.h>
35779+#include <linux/sched.h> 36187+#include <linux/sched.h>
@@ -36199,9 +36607,9 @@ diff -urNp linux-2.6.32.8/grsecurity/gracl_fs.c linux-2.6.32.8/grsecurity/gracl_
36199+ 36607+
36200+ return 0; 36608+ return 0;
36201+} 36609+}
36202diff -urNp linux-2.6.32.8/grsecurity/gracl_ip.c linux-2.6.32.8/grsecurity/gracl_ip.c 36610diff -urNp linux-2.6.32.9/grsecurity/gracl_ip.c linux-2.6.32.9/grsecurity/gracl_ip.c
36203--- linux-2.6.32.8/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 36611--- linux-2.6.32.9/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
36204+++ linux-2.6.32.8/grsecurity/gracl_ip.c 2010-02-13 21:45:10.739890317 -0500 36612+++ linux-2.6.32.9/grsecurity/gracl_ip.c 2010-02-23 17:09:53.304046495 -0500
36205@@ -0,0 +1,339 @@ 36613@@ -0,0 +1,339 @@
36206+#include <linux/kernel.h> 36614+#include <linux/kernel.h>
36207+#include <asm/uaccess.h> 36615+#include <asm/uaccess.h>
@@ -36542,9 +36950,9 @@ diff -urNp linux-2.6.32.8/grsecurity/gracl_ip.c linux-2.6.32.8/grsecurity/gracl_
36542+ 36950+
36543+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); 36951+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
36544+} 36952+}
36545diff -urNp linux-2.6.32.8/grsecurity/gracl_learn.c linux-2.6.32.8/grsecurity/gracl_learn.c 36953diff -urNp linux-2.6.32.9/grsecurity/gracl_learn.c linux-2.6.32.9/grsecurity/gracl_learn.c
36546--- linux-2.6.32.8/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 36954--- linux-2.6.32.9/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
36547+++ linux-2.6.32.8/grsecurity/gracl_learn.c 2010-02-13 21:45:10.739890317 -0500 36955+++ linux-2.6.32.9/grsecurity/gracl_learn.c 2010-02-23 17:09:53.304046495 -0500
36548@@ -0,0 +1,211 @@ 36956@@ -0,0 +1,211 @@
36549+#include <linux/kernel.h> 36957+#include <linux/kernel.h>
36550+#include <linux/mm.h> 36958+#include <linux/mm.h>
@@ -36757,9 +37165,9 @@ diff -urNp linux-2.6.32.8/grsecurity/gracl_learn.c linux-2.6.32.8/grsecurity/gra
36757+ .release = close_learn, 37165+ .release = close_learn,
36758+ .poll = poll_learn, 37166+ .poll = poll_learn,
36759+}; 37167+};
36760diff -urNp linux-2.6.32.8/grsecurity/gracl_res.c linux-2.6.32.8/grsecurity/gracl_res.c 37168diff -urNp linux-2.6.32.9/grsecurity/gracl_res.c linux-2.6.32.9/grsecurity/gracl_res.c
36761--- linux-2.6.32.8/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 37169--- linux-2.6.32.9/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
36762+++ linux-2.6.32.8/grsecurity/gracl_res.c 2010-02-13 21:45:10.739890317 -0500 37170+++ linux-2.6.32.9/grsecurity/gracl_res.c 2010-02-23 17:09:53.304046495 -0500
36763@@ -0,0 +1,65 @@ 37171@@ -0,0 +1,65 @@
36764+#include <linux/kernel.h> 37172+#include <linux/kernel.h>
36765+#include <linux/sched.h> 37173+#include <linux/sched.h>
@@ -36826,9 +37234,9 @@ diff -urNp linux-2.6.32.8/grsecurity/gracl_res.c linux-2.6.32.8/grsecurity/gracl
36826+ rcu_read_unlock(); 37234+ rcu_read_unlock();
36827+ return; 37235+ return;
36828+} 37236+}
36829diff -urNp linux-2.6.32.8/grsecurity/gracl_segv.c linux-2.6.32.8/grsecurity/gracl_segv.c 37237diff -urNp linux-2.6.32.9/grsecurity/gracl_segv.c linux-2.6.32.9/grsecurity/gracl_segv.c
36830--- linux-2.6.32.8/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 37238--- linux-2.6.32.9/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
36831+++ linux-2.6.32.8/grsecurity/gracl_segv.c 2010-02-13 21:45:10.739890317 -0500 37239+++ linux-2.6.32.9/grsecurity/gracl_segv.c 2010-02-23 17:09:53.304046495 -0500
36832@@ -0,0 +1,310 @@ 37240@@ -0,0 +1,310 @@
36833+#include <linux/kernel.h> 37241+#include <linux/kernel.h>
36834+#include <linux/mm.h> 37242+#include <linux/mm.h>
@@ -37140,9 +37548,9 @@ diff -urNp linux-2.6.32.8/grsecurity/gracl_segv.c linux-2.6.32.8/grsecurity/grac
37140+ 37548+
37141+ return; 37549+ return;
37142+} 37550+}
37143diff -urNp linux-2.6.32.8/grsecurity/gracl_shm.c linux-2.6.32.8/grsecurity/gracl_shm.c 37551diff -urNp linux-2.6.32.9/grsecurity/gracl_shm.c linux-2.6.32.9/grsecurity/gracl_shm.c
37144--- linux-2.6.32.8/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 37552--- linux-2.6.32.9/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
37145+++ linux-2.6.32.8/grsecurity/gracl_shm.c 2010-02-13 21:45:10.739890317 -0500 37553+++ linux-2.6.32.9/grsecurity/gracl_shm.c 2010-02-23 17:09:53.304046495 -0500
37146@@ -0,0 +1,37 @@ 37554@@ -0,0 +1,37 @@
37147+#include <linux/kernel.h> 37555+#include <linux/kernel.h>
37148+#include <linux/mm.h> 37556+#include <linux/mm.h>
@@ -37181,9 +37589,9 @@ diff -urNp linux-2.6.32.8/grsecurity/gracl_shm.c linux-2.6.32.8/grsecurity/gracl
37181+ 37589+
37182+ return 1; 37590+ return 1;
37183+} 37591+}
37184diff -urNp linux-2.6.32.8/grsecurity/grsec_chdir.c linux-2.6.32.8/grsecurity/grsec_chdir.c 37592diff -urNp linux-2.6.32.9/grsecurity/grsec_chdir.c linux-2.6.32.9/grsecurity/grsec_chdir.c
37185--- linux-2.6.32.8/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 37593--- linux-2.6.32.9/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
37186+++ linux-2.6.32.8/grsecurity/grsec_chdir.c 2010-02-13 21:45:10.739890317 -0500 37594+++ linux-2.6.32.9/grsecurity/grsec_chdir.c 2010-02-23 17:09:53.304046495 -0500
37187@@ -0,0 +1,19 @@ 37595@@ -0,0 +1,19 @@
37188+#include <linux/kernel.h> 37596+#include <linux/kernel.h>
37189+#include <linux/sched.h> 37597+#include <linux/sched.h>
@@ -37204,9 +37612,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_chdir.c linux-2.6.32.8/grsecurity/grs
37204+#endif 37612+#endif
37205+ return; 37613+ return;
37206+} 37614+}
37207diff -urNp linux-2.6.32.8/grsecurity/grsec_chroot.c linux-2.6.32.8/grsecurity/grsec_chroot.c 37615diff -urNp linux-2.6.32.9/grsecurity/grsec_chroot.c linux-2.6.32.9/grsecurity/grsec_chroot.c
37208--- linux-2.6.32.8/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 37616--- linux-2.6.32.9/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
37209+++ linux-2.6.32.8/grsecurity/grsec_chroot.c 2010-02-13 21:45:10.739890317 -0500 37617+++ linux-2.6.32.9/grsecurity/grsec_chroot.c 2010-02-23 17:09:53.304046495 -0500
37210@@ -0,0 +1,348 @@ 37618@@ -0,0 +1,348 @@
37211+#include <linux/kernel.h> 37619+#include <linux/kernel.h>
37212+#include <linux/module.h> 37620+#include <linux/module.h>
@@ -37556,9 +37964,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_chroot.c linux-2.6.32.8/grsecurity/gr
37556+#ifdef CONFIG_SECURITY 37964+#ifdef CONFIG_SECURITY
37557+EXPORT_SYMBOL(gr_handle_chroot_caps); 37965+EXPORT_SYMBOL(gr_handle_chroot_caps);
37558+#endif 37966+#endif
37559diff -urNp linux-2.6.32.8/grsecurity/grsec_disabled.c linux-2.6.32.8/grsecurity/grsec_disabled.c 37967diff -urNp linux-2.6.32.9/grsecurity/grsec_disabled.c linux-2.6.32.9/grsecurity/grsec_disabled.c
37560--- linux-2.6.32.8/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 37968--- linux-2.6.32.9/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
37561+++ linux-2.6.32.8/grsecurity/grsec_disabled.c 2010-02-13 21:45:10.741002819 -0500 37969+++ linux-2.6.32.9/grsecurity/grsec_disabled.c 2010-02-23 17:09:53.304046495 -0500
37562@@ -0,0 +1,426 @@ 37970@@ -0,0 +1,426 @@
37563+#include <linux/kernel.h> 37971+#include <linux/kernel.h>
37564+#include <linux/module.h> 37972+#include <linux/module.h>
@@ -37986,9 +38394,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_disabled.c linux-2.6.32.8/grsecurity/
37986+EXPORT_SYMBOL(gr_check_user_change); 38394+EXPORT_SYMBOL(gr_check_user_change);
37987+EXPORT_SYMBOL(gr_check_group_change); 38395+EXPORT_SYMBOL(gr_check_group_change);
37988+#endif 38396+#endif
37989diff -urNp linux-2.6.32.8/grsecurity/grsec_exec.c linux-2.6.32.8/grsecurity/grsec_exec.c 38397diff -urNp linux-2.6.32.9/grsecurity/grsec_exec.c linux-2.6.32.9/grsecurity/grsec_exec.c
37990--- linux-2.6.32.8/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 38398--- linux-2.6.32.9/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
37991+++ linux-2.6.32.8/grsecurity/grsec_exec.c 2010-02-13 21:45:10.741002819 -0500 38399+++ linux-2.6.32.9/grsecurity/grsec_exec.c 2010-02-23 17:09:53.304046495 -0500
37992@@ -0,0 +1,89 @@ 38400@@ -0,0 +1,89 @@
37993+#include <linux/kernel.h> 38401+#include <linux/kernel.h>
37994+#include <linux/sched.h> 38402+#include <linux/sched.h>
@@ -38079,9 +38487,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_exec.c linux-2.6.32.8/grsecurity/grse
38079+#endif 38487+#endif
38080+ return; 38488+ return;
38081+} 38489+}
38082diff -urNp linux-2.6.32.8/grsecurity/grsec_fifo.c linux-2.6.32.8/grsecurity/grsec_fifo.c 38490diff -urNp linux-2.6.32.9/grsecurity/grsec_fifo.c linux-2.6.32.9/grsecurity/grsec_fifo.c
38083--- linux-2.6.32.8/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 38491--- linux-2.6.32.9/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
38084+++ linux-2.6.32.8/grsecurity/grsec_fifo.c 2010-02-13 21:45:10.741002819 -0500 38492+++ linux-2.6.32.9/grsecurity/grsec_fifo.c 2010-02-23 17:09:53.304046495 -0500
38085@@ -0,0 +1,24 @@ 38493@@ -0,0 +1,24 @@
38086+#include <linux/kernel.h> 38494+#include <linux/kernel.h>
38087+#include <linux/sched.h> 38495+#include <linux/sched.h>
@@ -38107,9 +38515,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_fifo.c linux-2.6.32.8/grsecurity/grse
38107+#endif 38515+#endif
38108+ return 0; 38516+ return 0;
38109+} 38517+}
38110diff -urNp linux-2.6.32.8/grsecurity/grsec_fork.c linux-2.6.32.8/grsecurity/grsec_fork.c 38518diff -urNp linux-2.6.32.9/grsecurity/grsec_fork.c linux-2.6.32.9/grsecurity/grsec_fork.c
38111--- linux-2.6.32.8/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 38519--- linux-2.6.32.9/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
38112+++ linux-2.6.32.8/grsecurity/grsec_fork.c 2010-02-13 21:45:10.741002819 -0500 38520+++ linux-2.6.32.9/grsecurity/grsec_fork.c 2010-02-23 17:09:53.304046495 -0500
38113@@ -0,0 +1,15 @@ 38521@@ -0,0 +1,15 @@
38114+#include <linux/kernel.h> 38522+#include <linux/kernel.h>
38115+#include <linux/sched.h> 38523+#include <linux/sched.h>
@@ -38126,9 +38534,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_fork.c linux-2.6.32.8/grsecurity/grse
38126+#endif 38534+#endif
38127+ return; 38535+ return;
38128+} 38536+}
38129diff -urNp linux-2.6.32.8/grsecurity/grsec_init.c linux-2.6.32.8/grsecurity/grsec_init.c 38537diff -urNp linux-2.6.32.9/grsecurity/grsec_init.c linux-2.6.32.9/grsecurity/grsec_init.c
38130--- linux-2.6.32.8/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 38538--- linux-2.6.32.9/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
38131+++ linux-2.6.32.8/grsecurity/grsec_init.c 2010-02-13 21:45:10.741002819 -0500 38539+++ linux-2.6.32.9/grsecurity/grsec_init.c 2010-02-23 17:09:53.304046495 -0500
38132@@ -0,0 +1,231 @@ 38540@@ -0,0 +1,231 @@
38133+#include <linux/kernel.h> 38541+#include <linux/kernel.h>
38134+#include <linux/sched.h> 38542+#include <linux/sched.h>
@@ -38361,9 +38769,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_init.c linux-2.6.32.8/grsecurity/grse
38361+ 38769+
38362+ return; 38770+ return;
38363+} 38771+}
38364diff -urNp linux-2.6.32.8/grsecurity/grsec_link.c linux-2.6.32.8/grsecurity/grsec_link.c 38772diff -urNp linux-2.6.32.9/grsecurity/grsec_link.c linux-2.6.32.9/grsecurity/grsec_link.c
38365--- linux-2.6.32.8/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 38773--- linux-2.6.32.9/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
38366+++ linux-2.6.32.8/grsecurity/grsec_link.c 2010-02-13 21:45:10.741002819 -0500 38774+++ linux-2.6.32.9/grsecurity/grsec_link.c 2010-02-23 17:09:53.304046495 -0500
38367@@ -0,0 +1,43 @@ 38775@@ -0,0 +1,43 @@
38368+#include <linux/kernel.h> 38776+#include <linux/kernel.h>
38369+#include <linux/sched.h> 38777+#include <linux/sched.h>
@@ -38408,9 +38816,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_link.c linux-2.6.32.8/grsecurity/grse
38408+#endif 38816+#endif
38409+ return 0; 38817+ return 0;
38410+} 38818+}
38411diff -urNp linux-2.6.32.8/grsecurity/grsec_log.c linux-2.6.32.8/grsecurity/grsec_log.c 38819diff -urNp linux-2.6.32.9/grsecurity/grsec_log.c linux-2.6.32.9/grsecurity/grsec_log.c
38412--- linux-2.6.32.8/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 38820--- linux-2.6.32.9/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
38413+++ linux-2.6.32.8/grsecurity/grsec_log.c 2010-02-13 21:45:10.741997676 -0500 38821+++ linux-2.6.32.9/grsecurity/grsec_log.c 2010-02-23 17:09:53.304046495 -0500
38414@@ -0,0 +1,296 @@ 38822@@ -0,0 +1,296 @@
38415+#include <linux/kernel.h> 38823+#include <linux/kernel.h>
38416+#include <linux/sched.h> 38824+#include <linux/sched.h>
@@ -38708,9 +39116,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_log.c linux-2.6.32.8/grsecurity/grsec
38708+ gr_log_end(audit); 39116+ gr_log_end(audit);
38709+ END_LOCKS(audit); 39117+ END_LOCKS(audit);
38710+} 39118+}
38711diff -urNp linux-2.6.32.8/grsecurity/grsec_mem.c linux-2.6.32.8/grsecurity/grsec_mem.c 39119diff -urNp linux-2.6.32.9/grsecurity/grsec_mem.c linux-2.6.32.9/grsecurity/grsec_mem.c
38712--- linux-2.6.32.8/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 39120--- linux-2.6.32.9/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
38713+++ linux-2.6.32.8/grsecurity/grsec_mem.c 2010-02-13 21:45:10.741997676 -0500 39121+++ linux-2.6.32.9/grsecurity/grsec_mem.c 2010-02-23 17:09:53.304046495 -0500
38714@@ -0,0 +1,85 @@ 39122@@ -0,0 +1,85 @@
38715+#include <linux/kernel.h> 39123+#include <linux/kernel.h>
38716+#include <linux/sched.h> 39124+#include <linux/sched.h>
@@ -38797,9 +39205,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_mem.c linux-2.6.32.8/grsecurity/grsec
38797+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); 39205+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
38798+ return; 39206+ return;
38799+} 39207+}
38800diff -urNp linux-2.6.32.8/grsecurity/grsec_mount.c linux-2.6.32.8/grsecurity/grsec_mount.c 39208diff -urNp linux-2.6.32.9/grsecurity/grsec_mount.c linux-2.6.32.9/grsecurity/grsec_mount.c
38801--- linux-2.6.32.8/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 39209--- linux-2.6.32.9/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
38802+++ linux-2.6.32.8/grsecurity/grsec_mount.c 2010-02-13 21:45:10.741997676 -0500 39210+++ linux-2.6.32.9/grsecurity/grsec_mount.c 2010-02-23 17:09:53.304046495 -0500
38803@@ -0,0 +1,62 @@ 39211@@ -0,0 +1,62 @@
38804+#include <linux/kernel.h> 39212+#include <linux/kernel.h>
38805+#include <linux/sched.h> 39213+#include <linux/sched.h>
@@ -38863,9 +39271,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_mount.c linux-2.6.32.8/grsecurity/grs
38863+#endif 39271+#endif
38864+ return 0; 39272+ return 0;
38865+} 39273+}
38866diff -urNp linux-2.6.32.8/grsecurity/grsec_sig.c linux-2.6.32.8/grsecurity/grsec_sig.c 39274diff -urNp linux-2.6.32.9/grsecurity/grsec_sig.c linux-2.6.32.9/grsecurity/grsec_sig.c
38867--- linux-2.6.32.8/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 39275--- linux-2.6.32.9/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
38868+++ linux-2.6.32.8/grsecurity/grsec_sig.c 2010-02-13 21:45:10.741997676 -0500 39276+++ linux-2.6.32.9/grsecurity/grsec_sig.c 2010-02-23 17:09:53.304046495 -0500
38869@@ -0,0 +1,65 @@ 39277@@ -0,0 +1,65 @@
38870+#include <linux/kernel.h> 39278+#include <linux/kernel.h>
38871+#include <linux/sched.h> 39279+#include <linux/sched.h>
@@ -38932,9 +39340,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_sig.c linux-2.6.32.8/grsecurity/grsec
38932+ return; 39340+ return;
38933+} 39341+}
38934+ 39342+
38935diff -urNp linux-2.6.32.8/grsecurity/grsec_sock.c linux-2.6.32.8/grsecurity/grsec_sock.c 39343diff -urNp linux-2.6.32.9/grsecurity/grsec_sock.c linux-2.6.32.9/grsecurity/grsec_sock.c
38936--- linux-2.6.32.8/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 39344--- linux-2.6.32.9/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
38937+++ linux-2.6.32.8/grsecurity/grsec_sock.c 2010-02-13 21:45:10.741997676 -0500 39345+++ linux-2.6.32.9/grsecurity/grsec_sock.c 2010-02-23 17:09:53.304046495 -0500
38938@@ -0,0 +1,271 @@ 39346@@ -0,0 +1,271 @@
38939+#include <linux/kernel.h> 39347+#include <linux/kernel.h>
38940+#include <linux/module.h> 39348+#include <linux/module.h>
@@ -39207,9 +39615,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_sock.c linux-2.6.32.8/grsecurity/grse
39207+ return current_cap(); 39615+ return current_cap();
39208+#endif 39616+#endif
39209+} 39617+}
39210diff -urNp linux-2.6.32.8/grsecurity/grsec_sysctl.c linux-2.6.32.8/grsecurity/grsec_sysctl.c 39618diff -urNp linux-2.6.32.9/grsecurity/grsec_sysctl.c linux-2.6.32.9/grsecurity/grsec_sysctl.c
39211--- linux-2.6.32.8/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 39619--- linux-2.6.32.9/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
39212+++ linux-2.6.32.8/grsecurity/grsec_sysctl.c 2010-02-13 21:45:10.742887999 -0500 39620+++ linux-2.6.32.9/grsecurity/grsec_sysctl.c 2010-02-23 17:09:53.304046495 -0500
39213@@ -0,0 +1,419 @@ 39621@@ -0,0 +1,419 @@
39214+#include <linux/kernel.h> 39622+#include <linux/kernel.h>
39215+#include <linux/sched.h> 39623+#include <linux/sched.h>
@@ -39630,9 +40038,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_sysctl.c linux-2.6.32.8/grsecurity/gr
39630+ { .ctl_name = 0 } 40038+ { .ctl_name = 0 }
39631+}; 40039+};
39632+#endif 40040+#endif
39633diff -urNp linux-2.6.32.8/grsecurity/grsec_textrel.c linux-2.6.32.8/grsecurity/grsec_textrel.c 40041diff -urNp linux-2.6.32.9/grsecurity/grsec_textrel.c linux-2.6.32.9/grsecurity/grsec_textrel.c
39634--- linux-2.6.32.8/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 40042--- linux-2.6.32.9/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
39635+++ linux-2.6.32.8/grsecurity/grsec_textrel.c 2010-02-13 21:45:10.742887999 -0500 40043+++ linux-2.6.32.9/grsecurity/grsec_textrel.c 2010-02-23 17:09:53.304046495 -0500
39636@@ -0,0 +1,16 @@ 40044@@ -0,0 +1,16 @@
39637+#include <linux/kernel.h> 40045+#include <linux/kernel.h>
39638+#include <linux/sched.h> 40046+#include <linux/sched.h>
@@ -39650,9 +40058,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_textrel.c linux-2.6.32.8/grsecurity/g
39650+#endif 40058+#endif
39651+ return; 40059+ return;
39652+} 40060+}
39653diff -urNp linux-2.6.32.8/grsecurity/grsec_time.c linux-2.6.32.8/grsecurity/grsec_time.c 40061diff -urNp linux-2.6.32.9/grsecurity/grsec_time.c linux-2.6.32.9/grsecurity/grsec_time.c
39654--- linux-2.6.32.8/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 40062--- linux-2.6.32.9/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
39655+++ linux-2.6.32.8/grsecurity/grsec_time.c 2010-02-13 21:45:10.742887999 -0500 40063+++ linux-2.6.32.9/grsecurity/grsec_time.c 2010-02-23 17:09:53.304046495 -0500
39656@@ -0,0 +1,13 @@ 40064@@ -0,0 +1,13 @@
39657+#include <linux/kernel.h> 40065+#include <linux/kernel.h>
39658+#include <linux/sched.h> 40066+#include <linux/sched.h>
@@ -39667,9 +40075,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_time.c linux-2.6.32.8/grsecurity/grse
39667+#endif 40075+#endif
39668+ return; 40076+ return;
39669+} 40077+}
39670diff -urNp linux-2.6.32.8/grsecurity/grsec_tpe.c linux-2.6.32.8/grsecurity/grsec_tpe.c 40078diff -urNp linux-2.6.32.9/grsecurity/grsec_tpe.c linux-2.6.32.9/grsecurity/grsec_tpe.c
39671--- linux-2.6.32.8/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 40079--- linux-2.6.32.9/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
39672+++ linux-2.6.32.8/grsecurity/grsec_tpe.c 2010-02-13 21:45:10.742887999 -0500 40080+++ linux-2.6.32.9/grsecurity/grsec_tpe.c 2010-02-23 17:09:53.304046495 -0500
39673@@ -0,0 +1,38 @@ 40081@@ -0,0 +1,38 @@
39674+#include <linux/kernel.h> 40082+#include <linux/kernel.h>
39675+#include <linux/sched.h> 40083+#include <linux/sched.h>
@@ -39709,9 +40117,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsec_tpe.c linux-2.6.32.8/grsecurity/grsec
39709+#endif 40117+#endif
39710+ return 1; 40118+ return 1;
39711+} 40119+}
39712diff -urNp linux-2.6.32.8/grsecurity/grsum.c linux-2.6.32.8/grsecurity/grsum.c 40120diff -urNp linux-2.6.32.9/grsecurity/grsum.c linux-2.6.32.9/grsecurity/grsum.c
39713--- linux-2.6.32.8/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 40121--- linux-2.6.32.9/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
39714+++ linux-2.6.32.8/grsecurity/grsum.c 2010-02-13 21:45:10.742887999 -0500 40122+++ linux-2.6.32.9/grsecurity/grsum.c 2010-02-23 17:09:53.304046495 -0500
39715@@ -0,0 +1,59 @@ 40123@@ -0,0 +1,59 @@
39716+#include <linux/err.h> 40124+#include <linux/err.h>
39717+#include <linux/kernel.h> 40125+#include <linux/kernel.h>
@@ -39772,9 +40180,9 @@ diff -urNp linux-2.6.32.8/grsecurity/grsum.c linux-2.6.32.8/grsecurity/grsum.c
39772+ 40180+
39773+ return retval; 40181+ return retval;
39774+} 40182+}
39775diff -urNp linux-2.6.32.8/grsecurity/Kconfig linux-2.6.32.8/grsecurity/Kconfig 40183diff -urNp linux-2.6.32.9/grsecurity/Kconfig linux-2.6.32.9/grsecurity/Kconfig
39776--- linux-2.6.32.8/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 40184--- linux-2.6.32.9/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
39777+++ linux-2.6.32.8/grsecurity/Kconfig 2010-02-13 21:45:10.743995742 -0500 40185+++ linux-2.6.32.9/grsecurity/Kconfig 2010-02-23 17:09:53.308131663 -0500
39778@@ -0,0 +1,937 @@ 40186@@ -0,0 +1,937 @@
39779+# 40187+#
39780+# grecurity configuration 40188+# grecurity configuration
@@ -39926,7 +40334,7 @@ diff -urNp linux-2.6.32.8/grsecurity/Kconfig linux-2.6.32.8/grsecurity/Kconfig
39926+ select PAX_EI_PAX 40334+ select PAX_EI_PAX
39927+ select PAX_PT_PAX_FLAGS 40335+ select PAX_PT_PAX_FLAGS
39928+ select PAX_HAVE_ACL_FLAGS 40336+ select PAX_HAVE_ACL_FLAGS
39929+ select PAX_KERNEXEC if (X86 && (!X86_32 || X86_WP_WORKS_OK) && !XEN) 40337+ select PAX_KERNEXEC if ((PPC32 || PPC64 || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
39930+ select PAX_MEMORY_UDEREF if (X86_32 && !XEN) 40338+ select PAX_MEMORY_UDEREF if (X86_32 && !XEN)
39931+ select PAX_RANDKSTACK if (X86_TSC && !X86_64) 40339+ select PAX_RANDKSTACK if (X86_TSC && !X86_64)
39932+ select PAX_SEGMEXEC if (X86_32) 40340+ select PAX_SEGMEXEC if (X86_32)
@@ -40713,9 +41121,9 @@ diff -urNp linux-2.6.32.8/grsecurity/Kconfig linux-2.6.32.8/grsecurity/Kconfig
40713+endmenu 41121+endmenu
40714+ 41122+
40715+endmenu 41123+endmenu
40716diff -urNp linux-2.6.32.8/grsecurity/Makefile linux-2.6.32.8/grsecurity/Makefile 41124diff -urNp linux-2.6.32.9/grsecurity/Makefile linux-2.6.32.9/grsecurity/Makefile
40717--- linux-2.6.32.8/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 41125--- linux-2.6.32.9/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
40718+++ linux-2.6.32.8/grsecurity/Makefile 2010-02-13 21:45:10.743995742 -0500 41126+++ linux-2.6.32.9/grsecurity/Makefile 2010-02-23 17:09:53.308131663 -0500
40719@@ -0,0 +1,29 @@ 41127@@ -0,0 +1,29 @@
40720+# grsecurity's ACL system was originally written in 2001 by Michael Dalton 41128+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
40721+# during 2001-2009 it has been completely redesigned by Brad Spengler 41129+# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -40746,9 +41154,9 @@ diff -urNp linux-2.6.32.8/grsecurity/Makefile linux-2.6.32.8/grsecurity/Makefile
40746+ @-chmod -f 700 . 41154+ @-chmod -f 700 .
40747+ @echo ' grsec: protected kernel image paths' 41155+ @echo ' grsec: protected kernel image paths'
40748+endif 41156+endif
40749diff -urNp linux-2.6.32.8/include/acpi/acpi_drivers.h linux-2.6.32.8/include/acpi/acpi_drivers.h 41157diff -urNp linux-2.6.32.9/include/acpi/acpi_drivers.h linux-2.6.32.9/include/acpi/acpi_drivers.h
40750--- linux-2.6.32.8/include/acpi/acpi_drivers.h 2010-02-09 07:57:19.000000000 -0500 41158--- linux-2.6.32.9/include/acpi/acpi_drivers.h 2010-02-09 07:57:19.000000000 -0500
40751+++ linux-2.6.32.8/include/acpi/acpi_drivers.h 2010-02-13 21:45:10.743995742 -0500 41159+++ linux-2.6.32.9/include/acpi/acpi_drivers.h 2010-02-23 17:09:53.308131663 -0500
40752@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp 41160@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
40753 Dock Station 41161 Dock Station
40754 -------------------------------------------------------------------------- */ 41162 -------------------------------------------------------------------------- */
@@ -40778,9 +41186,9 @@ diff -urNp linux-2.6.32.8/include/acpi/acpi_drivers.h linux-2.6.32.8/include/acp
40778 void *context) 41186 void *context)
40779 { 41187 {
40780 return -ENODEV; 41188 return -ENODEV;
40781diff -urNp linux-2.6.32.8/include/asm-generic/atomic-long.h linux-2.6.32.8/include/asm-generic/atomic-long.h 41189diff -urNp linux-2.6.32.9/include/asm-generic/atomic-long.h linux-2.6.32.9/include/asm-generic/atomic-long.h
40782--- linux-2.6.32.8/include/asm-generic/atomic-long.h 2010-02-09 07:57:19.000000000 -0500 41190--- linux-2.6.32.9/include/asm-generic/atomic-long.h 2010-02-09 07:57:19.000000000 -0500
40783+++ linux-2.6.32.8/include/asm-generic/atomic-long.h 2010-02-13 21:45:10.743995742 -0500 41191+++ linux-2.6.32.9/include/asm-generic/atomic-long.h 2010-02-23 17:09:53.308131663 -0500
40784@@ -22,6 +22,12 @@ 41192@@ -22,6 +22,12 @@
40785 41193
40786 typedef atomic64_t atomic_long_t; 41194 typedef atomic64_t atomic_long_t;
@@ -41001,9 +41409,9 @@ diff -urNp linux-2.6.32.8/include/asm-generic/atomic-long.h linux-2.6.32.8/inclu
41001+#endif 41409+#endif
41002+ 41410+
41003 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ 41411 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
41004diff -urNp linux-2.6.32.8/include/asm-generic/dma-mapping-common.h linux-2.6.32.8/include/asm-generic/dma-mapping-common.h 41412diff -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
41005--- linux-2.6.32.8/include/asm-generic/dma-mapping-common.h 2010-02-09 07:57:19.000000000 -0500 41413--- linux-2.6.32.9/include/asm-generic/dma-mapping-common.h 2010-02-09 07:57:19.000000000 -0500
41006+++ linux-2.6.32.8/include/asm-generic/dma-mapping-common.h 2010-02-13 21:45:10.744996520 -0500 41414+++ linux-2.6.32.9/include/asm-generic/dma-mapping-common.h 2010-02-23 17:09:53.308131663 -0500
41007@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ 41415@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
41008 enum dma_data_direction dir, 41416 enum dma_data_direction dir,
41009 struct dma_attrs *attrs) 41417 struct dma_attrs *attrs)
@@ -41112,9 +41520,9 @@ diff -urNp linux-2.6.32.8/include/asm-generic/dma-mapping-common.h linux-2.6.32.
41112 41520
41113 BUG_ON(!valid_dma_direction(dir)); 41521 BUG_ON(!valid_dma_direction(dir));
41114 if (ops->sync_sg_for_device) 41522 if (ops->sync_sg_for_device)
41115diff -urNp linux-2.6.32.8/include/asm-generic/futex.h linux-2.6.32.8/include/asm-generic/futex.h 41523diff -urNp linux-2.6.32.9/include/asm-generic/futex.h linux-2.6.32.9/include/asm-generic/futex.h
41116--- linux-2.6.32.8/include/asm-generic/futex.h 2010-02-09 07:57:19.000000000 -0500 41524--- linux-2.6.32.9/include/asm-generic/futex.h 2010-02-09 07:57:19.000000000 -0500
41117+++ linux-2.6.32.8/include/asm-generic/futex.h 2010-02-13 21:45:10.744996520 -0500 41525+++ linux-2.6.32.9/include/asm-generic/futex.h 2010-02-23 17:09:53.308131663 -0500
41118@@ -6,7 +6,7 @@ 41526@@ -6,7 +6,7 @@
41119 #include <asm/errno.h> 41527 #include <asm/errno.h>
41120 41528
@@ -41133,9 +41541,9 @@ diff -urNp linux-2.6.32.8/include/asm-generic/futex.h linux-2.6.32.8/include/asm
41133 { 41541 {
41134 return -ENOSYS; 41542 return -ENOSYS;
41135 } 41543 }
41136diff -urNp linux-2.6.32.8/include/asm-generic/int-l64.h linux-2.6.32.8/include/asm-generic/int-l64.h 41544diff -urNp linux-2.6.32.9/include/asm-generic/int-l64.h linux-2.6.32.9/include/asm-generic/int-l64.h
41137--- linux-2.6.32.8/include/asm-generic/int-l64.h 2010-02-09 07:57:19.000000000 -0500 41545--- linux-2.6.32.9/include/asm-generic/int-l64.h 2010-02-09 07:57:19.000000000 -0500
41138+++ linux-2.6.32.8/include/asm-generic/int-l64.h 2010-02-13 21:45:10.744996520 -0500 41546+++ linux-2.6.32.9/include/asm-generic/int-l64.h 2010-02-23 17:09:53.308131663 -0500
41139@@ -46,6 +46,8 @@ typedef unsigned int u32; 41547@@ -46,6 +46,8 @@ typedef unsigned int u32;
41140 typedef signed long s64; 41548 typedef signed long s64;
41141 typedef unsigned long u64; 41549 typedef unsigned long u64;
@@ -41145,9 +41553,9 @@ diff -urNp linux-2.6.32.8/include/asm-generic/int-l64.h linux-2.6.32.8/include/a
41145 #define S8_C(x) x 41553 #define S8_C(x) x
41146 #define U8_C(x) x ## U 41554 #define U8_C(x) x ## U
41147 #define S16_C(x) x 41555 #define S16_C(x) x
41148diff -urNp linux-2.6.32.8/include/asm-generic/int-ll64.h linux-2.6.32.8/include/asm-generic/int-ll64.h 41556diff -urNp linux-2.6.32.9/include/asm-generic/int-ll64.h linux-2.6.32.9/include/asm-generic/int-ll64.h
41149--- linux-2.6.32.8/include/asm-generic/int-ll64.h 2010-02-09 07:57:19.000000000 -0500 41557--- linux-2.6.32.9/include/asm-generic/int-ll64.h 2010-02-09 07:57:19.000000000 -0500
41150+++ linux-2.6.32.8/include/asm-generic/int-ll64.h 2010-02-13 21:45:10.744996520 -0500 41558+++ linux-2.6.32.9/include/asm-generic/int-ll64.h 2010-02-23 17:09:53.308131663 -0500
41151@@ -51,6 +51,8 @@ typedef unsigned int u32; 41559@@ -51,6 +51,8 @@ typedef unsigned int u32;
41152 typedef signed long long s64; 41560 typedef signed long long s64;
41153 typedef unsigned long long u64; 41561 typedef unsigned long long u64;
@@ -41157,9 +41565,9 @@ diff -urNp linux-2.6.32.8/include/asm-generic/int-ll64.h linux-2.6.32.8/include/
41157 #define S8_C(x) x 41565 #define S8_C(x) x
41158 #define U8_C(x) x ## U 41566 #define U8_C(x) x ## U
41159 #define S16_C(x) x 41567 #define S16_C(x) x
41160diff -urNp linux-2.6.32.8/include/asm-generic/kmap_types.h linux-2.6.32.8/include/asm-generic/kmap_types.h 41568diff -urNp linux-2.6.32.9/include/asm-generic/kmap_types.h linux-2.6.32.9/include/asm-generic/kmap_types.h
41161--- linux-2.6.32.8/include/asm-generic/kmap_types.h 2010-02-09 07:57:19.000000000 -0500 41569--- linux-2.6.32.9/include/asm-generic/kmap_types.h 2010-02-09 07:57:19.000000000 -0500
41162+++ linux-2.6.32.8/include/asm-generic/kmap_types.h 2010-02-13 21:45:10.744996520 -0500 41570+++ linux-2.6.32.9/include/asm-generic/kmap_types.h 2010-02-23 17:09:53.308131663 -0500
41163@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, 41571@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
41164 KMAP_D(16) KM_IRQ_PTE, 41572 KMAP_D(16) KM_IRQ_PTE,
41165 KMAP_D(17) KM_NMI, 41573 KMAP_D(17) KM_NMI,
@@ -41170,9 +41578,9 @@ diff -urNp linux-2.6.32.8/include/asm-generic/kmap_types.h linux-2.6.32.8/includ
41170 }; 41578 };
41171 41579
41172 #undef KMAP_D 41580 #undef KMAP_D
41173diff -urNp linux-2.6.32.8/include/asm-generic/pgtable.h linux-2.6.32.8/include/asm-generic/pgtable.h 41581diff -urNp linux-2.6.32.9/include/asm-generic/pgtable.h linux-2.6.32.9/include/asm-generic/pgtable.h
41174--- linux-2.6.32.8/include/asm-generic/pgtable.h 2010-02-09 07:57:19.000000000 -0500 41582--- linux-2.6.32.9/include/asm-generic/pgtable.h 2010-02-09 07:57:19.000000000 -0500
41175+++ linux-2.6.32.8/include/asm-generic/pgtable.h 2010-02-13 21:45:10.744996520 -0500 41583+++ linux-2.6.32.9/include/asm-generic/pgtable.h 2010-02-23 17:09:53.308131663 -0500
41176@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar 41584@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
41177 unsigned long size); 41585 unsigned long size);
41178 #endif 41586 #endif
@@ -41188,9 +41596,9 @@ diff -urNp linux-2.6.32.8/include/asm-generic/pgtable.h linux-2.6.32.8/include/a
41188 #endif /* !__ASSEMBLY__ */ 41596 #endif /* !__ASSEMBLY__ */
41189 41597
41190 #endif /* _ASM_GENERIC_PGTABLE_H */ 41598 #endif /* _ASM_GENERIC_PGTABLE_H */
41191diff -urNp linux-2.6.32.8/include/asm-generic/vmlinux.lds.h linux-2.6.32.8/include/asm-generic/vmlinux.lds.h 41599diff -urNp linux-2.6.32.9/include/asm-generic/vmlinux.lds.h linux-2.6.32.9/include/asm-generic/vmlinux.lds.h
41192--- linux-2.6.32.8/include/asm-generic/vmlinux.lds.h 2010-02-09 07:57:19.000000000 -0500 41600--- linux-2.6.32.9/include/asm-generic/vmlinux.lds.h 2010-02-09 07:57:19.000000000 -0500
41193+++ linux-2.6.32.8/include/asm-generic/vmlinux.lds.h 2010-02-13 21:45:10.745996414 -0500 41601+++ linux-2.6.32.9/include/asm-generic/vmlinux.lds.h 2010-02-23 17:09:53.308131663 -0500
41194@@ -199,6 +199,7 @@ 41602@@ -199,6 +199,7 @@
41195 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ 41603 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
41196 VMLINUX_SYMBOL(__start_rodata) = .; \ 41604 VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -41229,9 +41637,9 @@ diff -urNp linux-2.6.32.8/include/asm-generic/vmlinux.lds.h linux-2.6.32.8/inclu
41229 41637
41230 /** 41638 /**
41231 * PERCPU - define output section for percpu area, simple version 41639 * PERCPU - define output section for percpu area, simple version
41232diff -urNp linux-2.6.32.8/include/drm/drm_pciids.h linux-2.6.32.8/include/drm/drm_pciids.h 41640diff -urNp linux-2.6.32.9/include/drm/drm_pciids.h linux-2.6.32.9/include/drm/drm_pciids.h
41233--- linux-2.6.32.8/include/drm/drm_pciids.h 2010-02-09 07:57:19.000000000 -0500 41641--- linux-2.6.32.9/include/drm/drm_pciids.h 2010-02-09 07:57:19.000000000 -0500
41234+++ linux-2.6.32.8/include/drm/drm_pciids.h 2010-02-13 21:45:10.745996414 -0500 41642+++ linux-2.6.32.9/include/drm/drm_pciids.h 2010-02-23 17:09:53.308131663 -0500
41235@@ -375,7 +375,7 @@ 41643@@ -375,7 +375,7 @@
41236 {0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 41644 {0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
41237 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 41645 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -41335,9 +41743,9 @@ diff -urNp linux-2.6.32.8/include/drm/drm_pciids.h linux-2.6.32.8/include/drm/dr
41335 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 41743 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
41336- {0, 0, 0} 41744- {0, 0, 0}
41337+ {0, 0, 0, 0, 0, 0} 41745+ {0, 0, 0, 0, 0, 0}
41338diff -urNp linux-2.6.32.8/include/drm/drmP.h linux-2.6.32.8/include/drm/drmP.h 41746diff -urNp linux-2.6.32.9/include/drm/drmP.h linux-2.6.32.9/include/drm/drmP.h
41339--- linux-2.6.32.8/include/drm/drmP.h 2010-02-09 07:57:19.000000000 -0500 41747--- linux-2.6.32.9/include/drm/drmP.h 2010-02-09 07:57:19.000000000 -0500
41340+++ linux-2.6.32.8/include/drm/drmP.h 2010-02-13 21:45:10.746929114 -0500 41748+++ linux-2.6.32.9/include/drm/drmP.h 2010-02-23 17:09:53.308131663 -0500
41341@@ -814,7 +814,7 @@ struct drm_driver { 41749@@ -814,7 +814,7 @@ struct drm_driver {
41342 void (*vgaarb_irq)(struct drm_device *dev, bool state); 41750 void (*vgaarb_irq)(struct drm_device *dev, bool state);
41343 41751
@@ -41365,9 +41773,9 @@ diff -urNp linux-2.6.32.8/include/drm/drmP.h linux-2.6.32.8/include/drm/drmP.h
41365 /*@} */ 41773 /*@} */
41366 41774
41367 struct list_head filelist; 41775 struct list_head filelist;
41368diff -urNp linux-2.6.32.8/include/linux/a.out.h linux-2.6.32.8/include/linux/a.out.h 41776diff -urNp linux-2.6.32.9/include/linux/a.out.h linux-2.6.32.9/include/linux/a.out.h
41369--- linux-2.6.32.8/include/linux/a.out.h 2010-02-09 07:57:19.000000000 -0500 41777--- linux-2.6.32.9/include/linux/a.out.h 2010-02-09 07:57:19.000000000 -0500
41370+++ linux-2.6.32.8/include/linux/a.out.h 2010-02-13 21:45:10.746929114 -0500 41778+++ linux-2.6.32.9/include/linux/a.out.h 2010-02-23 17:09:53.308131663 -0500
41371@@ -39,6 +39,14 @@ enum machine_type { 41779@@ -39,6 +39,14 @@ enum machine_type {
41372 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ 41780 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
41373 }; 41781 };
@@ -41383,9 +41791,9 @@ diff -urNp linux-2.6.32.8/include/linux/a.out.h linux-2.6.32.8/include/linux/a.o
41383 #if !defined (N_MAGIC) 41791 #if !defined (N_MAGIC)
41384 #define N_MAGIC(exec) ((exec).a_info & 0xffff) 41792 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
41385 #endif 41793 #endif
41386diff -urNp linux-2.6.32.8/include/linux/atmdev.h linux-2.6.32.8/include/linux/atmdev.h 41794diff -urNp linux-2.6.32.9/include/linux/atmdev.h linux-2.6.32.9/include/linux/atmdev.h
41387--- linux-2.6.32.8/include/linux/atmdev.h 2010-02-09 07:57:19.000000000 -0500 41795--- linux-2.6.32.9/include/linux/atmdev.h 2010-02-09 07:57:19.000000000 -0500
41388+++ linux-2.6.32.8/include/linux/atmdev.h 2010-02-13 21:45:10.746929114 -0500 41796+++ linux-2.6.32.9/include/linux/atmdev.h 2010-02-23 17:09:53.308131663 -0500
41389@@ -237,7 +237,7 @@ struct compat_atm_iobuf { 41797@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
41390 #endif 41798 #endif
41391 41799
@@ -41395,9 +41803,9 @@ diff -urNp linux-2.6.32.8/include/linux/atmdev.h linux-2.6.32.8/include/linux/at
41395 __AAL_STAT_ITEMS 41803 __AAL_STAT_ITEMS
41396 #undef __HANDLE_ITEM 41804 #undef __HANDLE_ITEM
41397 }; 41805 };
41398diff -urNp linux-2.6.32.8/include/linux/backlight.h linux-2.6.32.8/include/linux/backlight.h 41806diff -urNp linux-2.6.32.9/include/linux/backlight.h linux-2.6.32.9/include/linux/backlight.h
41399--- linux-2.6.32.8/include/linux/backlight.h 2010-02-09 07:57:19.000000000 -0500 41807--- linux-2.6.32.9/include/linux/backlight.h 2010-02-09 07:57:19.000000000 -0500
41400+++ linux-2.6.32.8/include/linux/backlight.h 2010-02-13 21:45:10.746929114 -0500 41808+++ linux-2.6.32.9/include/linux/backlight.h 2010-02-23 17:09:53.308131663 -0500
41401@@ -36,18 +36,18 @@ struct backlight_device; 41809@@ -36,18 +36,18 @@ struct backlight_device;
41402 struct fb_info; 41810 struct fb_info;
41403 41811
@@ -41439,9 +41847,9 @@ diff -urNp linux-2.6.32.8/include/linux/backlight.h linux-2.6.32.8/include/linux
41439 extern void backlight_device_unregister(struct backlight_device *bd); 41847 extern void backlight_device_unregister(struct backlight_device *bd);
41440 extern void backlight_force_update(struct backlight_device *bd, 41848 extern void backlight_force_update(struct backlight_device *bd,
41441 enum backlight_update_reason reason); 41849 enum backlight_update_reason reason);
41442diff -urNp linux-2.6.32.8/include/linux/binfmts.h linux-2.6.32.8/include/linux/binfmts.h 41850diff -urNp linux-2.6.32.9/include/linux/binfmts.h linux-2.6.32.9/include/linux/binfmts.h
41443--- linux-2.6.32.8/include/linux/binfmts.h 2010-02-09 07:57:19.000000000 -0500 41851--- linux-2.6.32.9/include/linux/binfmts.h 2010-02-09 07:57:19.000000000 -0500
41444+++ linux-2.6.32.8/include/linux/binfmts.h 2010-02-13 21:45:10.746929114 -0500 41852+++ linux-2.6.32.9/include/linux/binfmts.h 2010-02-23 17:09:53.311553777 -0500
41445@@ -78,6 +78,7 @@ struct linux_binfmt { 41853@@ -78,6 +78,7 @@ struct linux_binfmt {
41446 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); 41854 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
41447 int (*load_shlib)(struct file *); 41855 int (*load_shlib)(struct file *);
@@ -41450,9 +41858,9 @@ diff -urNp linux-2.6.32.8/include/linux/binfmts.h linux-2.6.32.8/include/linux/b
41450 unsigned long min_coredump; /* minimal dump size */ 41858 unsigned long min_coredump; /* minimal dump size */
41451 int hasvdso; 41859 int hasvdso;
41452 }; 41860 };
41453diff -urNp linux-2.6.32.8/include/linux/blkdev.h linux-2.6.32.8/include/linux/blkdev.h 41861diff -urNp linux-2.6.32.9/include/linux/blkdev.h linux-2.6.32.9/include/linux/blkdev.h
41454--- linux-2.6.32.8/include/linux/blkdev.h 2010-02-09 07:57:19.000000000 -0500 41862--- linux-2.6.32.9/include/linux/blkdev.h 2010-02-09 07:57:19.000000000 -0500
41455+++ linux-2.6.32.8/include/linux/blkdev.h 2010-02-13 21:45:10.748000653 -0500 41863+++ linux-2.6.32.9/include/linux/blkdev.h 2010-02-23 17:09:53.311553777 -0500
41456@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc 41864@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc
41457 #endif /* CONFIG_BLK_DEV_INTEGRITY */ 41865 #endif /* CONFIG_BLK_DEV_INTEGRITY */
41458 41866
@@ -41484,9 +41892,9 @@ diff -urNp linux-2.6.32.8/include/linux/blkdev.h linux-2.6.32.8/include/linux/bl
41484 }; 41892 };
41485 41893
41486 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, 41894 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
41487diff -urNp linux-2.6.32.8/include/linux/cache.h linux-2.6.32.8/include/linux/cache.h 41895diff -urNp linux-2.6.32.9/include/linux/cache.h linux-2.6.32.9/include/linux/cache.h
41488--- linux-2.6.32.8/include/linux/cache.h 2010-02-09 07:57:19.000000000 -0500 41896--- linux-2.6.32.9/include/linux/cache.h 2010-02-09 07:57:19.000000000 -0500
41489+++ linux-2.6.32.8/include/linux/cache.h 2010-02-13 21:45:10.748000653 -0500 41897+++ linux-2.6.32.9/include/linux/cache.h 2010-02-23 17:09:53.311553777 -0500
41490@@ -16,6 +16,10 @@ 41898@@ -16,6 +16,10 @@
41491 #define __read_mostly 41899 #define __read_mostly
41492 #endif 41900 #endif
@@ -41498,9 +41906,9 @@ diff -urNp linux-2.6.32.8/include/linux/cache.h linux-2.6.32.8/include/linux/cac
41498 #ifndef ____cacheline_aligned 41906 #ifndef ____cacheline_aligned
41499 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) 41907 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
41500 #endif 41908 #endif
41501diff -urNp linux-2.6.32.8/include/linux/capability.h linux-2.6.32.8/include/linux/capability.h 41909diff -urNp linux-2.6.32.9/include/linux/capability.h linux-2.6.32.9/include/linux/capability.h
41502--- linux-2.6.32.8/include/linux/capability.h 2010-02-09 07:57:19.000000000 -0500 41910--- linux-2.6.32.9/include/linux/capability.h 2010-02-09 07:57:19.000000000 -0500
41503+++ linux-2.6.32.8/include/linux/capability.h 2010-02-13 21:45:10.748000653 -0500 41911+++ linux-2.6.32.9/include/linux/capability.h 2010-02-23 17:09:53.311553777 -0500
41504@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff 41912@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
41505 (security_real_capable_noaudit((t), (cap)) == 0) 41913 (security_real_capable_noaudit((t), (cap)) == 0)
41506 41914
@@ -41509,9 +41917,9 @@ diff -urNp linux-2.6.32.8/include/linux/capability.h linux-2.6.32.8/include/linu
41509 41917
41510 /* audit system wants to get cap info from files as well */ 41918 /* audit system wants to get cap info from files as well */
41511 struct dentry; 41919 struct dentry;
41512diff -urNp linux-2.6.32.8/include/linux/compiler-gcc4.h linux-2.6.32.8/include/linux/compiler-gcc4.h 41920diff -urNp linux-2.6.32.9/include/linux/compiler-gcc4.h linux-2.6.32.9/include/linux/compiler-gcc4.h
41513--- linux-2.6.32.8/include/linux/compiler-gcc4.h 2010-02-09 07:57:19.000000000 -0500 41921--- linux-2.6.32.9/include/linux/compiler-gcc4.h 2010-02-09 07:57:19.000000000 -0500
41514+++ linux-2.6.32.8/include/linux/compiler-gcc4.h 2010-02-13 21:45:10.748000653 -0500 41922+++ linux-2.6.32.9/include/linux/compiler-gcc4.h 2010-02-23 17:09:53.311553777 -0500
41515@@ -36,4 +36,8 @@ 41923@@ -36,4 +36,8 @@
41516 the kernel context */ 41924 the kernel context */
41517 #define __cold __attribute__((__cold__)) 41925 #define __cold __attribute__((__cold__))
@@ -41521,9 +41929,9 @@ diff -urNp linux-2.6.32.8/include/linux/compiler-gcc4.h linux-2.6.32.8/include/l
41521+#define __bos0(ptr) __bos((ptr), 0) 41929+#define __bos0(ptr) __bos((ptr), 0)
41522+#define __bos1(ptr) __bos((ptr), 1) 41930+#define __bos1(ptr) __bos((ptr), 1)
41523 #endif 41931 #endif
41524diff -urNp linux-2.6.32.8/include/linux/compiler.h linux-2.6.32.8/include/linux/compiler.h 41932diff -urNp linux-2.6.32.9/include/linux/compiler.h linux-2.6.32.9/include/linux/compiler.h
41525--- linux-2.6.32.8/include/linux/compiler.h 2010-02-09 07:57:19.000000000 -0500 41933--- linux-2.6.32.9/include/linux/compiler.h 2010-02-09 07:57:19.000000000 -0500
41526+++ linux-2.6.32.8/include/linux/compiler.h 2010-02-13 21:45:10.748000653 -0500 41934+++ linux-2.6.32.9/include/linux/compiler.h 2010-02-23 17:09:53.311553777 -0500
41527@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ 41935@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
41528 #define __cold 41936 #define __cold
41529 #endif 41937 #endif
@@ -41547,9 +41955,9 @@ diff -urNp linux-2.6.32.8/include/linux/compiler.h linux-2.6.32.8/include/linux/
41547 /* Simple shorthand for a section definition */ 41955 /* Simple shorthand for a section definition */
41548 #ifndef __section 41956 #ifndef __section
41549 # define __section(S) __attribute__ ((__section__(#S))) 41957 # define __section(S) __attribute__ ((__section__(#S)))
41550diff -urNp linux-2.6.32.8/include/linux/decompress/mm.h linux-2.6.32.8/include/linux/decompress/mm.h 41958diff -urNp linux-2.6.32.9/include/linux/decompress/mm.h linux-2.6.32.9/include/linux/decompress/mm.h
41551--- linux-2.6.32.8/include/linux/decompress/mm.h 2010-02-09 07:57:19.000000000 -0500 41959--- linux-2.6.32.9/include/linux/decompress/mm.h 2010-02-09 07:57:19.000000000 -0500
41552+++ linux-2.6.32.8/include/linux/decompress/mm.h 2010-02-13 21:45:10.749010298 -0500 41960+++ linux-2.6.32.9/include/linux/decompress/mm.h 2010-02-23 17:09:53.311553777 -0500
41553@@ -68,7 +68,7 @@ static void free(void *where) 41961@@ -68,7 +68,7 @@ static void free(void *where)
41554 * warnings when not needed (indeed large_malloc / large_free are not 41962 * warnings when not needed (indeed large_malloc / large_free are not
41555 * needed by inflate */ 41963 * needed by inflate */
@@ -41559,9 +41967,9 @@ diff -urNp linux-2.6.32.8/include/linux/decompress/mm.h linux-2.6.32.8/include/l
41559 #define free(a) kfree(a) 41967 #define free(a) kfree(a)
41560 41968
41561 #define large_malloc(a) vmalloc(a) 41969 #define large_malloc(a) vmalloc(a)
41562diff -urNp linux-2.6.32.8/include/linux/dma-mapping.h linux-2.6.32.8/include/linux/dma-mapping.h 41970diff -urNp linux-2.6.32.9/include/linux/dma-mapping.h linux-2.6.32.9/include/linux/dma-mapping.h
41563--- linux-2.6.32.8/include/linux/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500 41971--- linux-2.6.32.9/include/linux/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500
41564+++ linux-2.6.32.8/include/linux/dma-mapping.h 2010-02-13 21:45:10.749010298 -0500 41972+++ linux-2.6.32.9/include/linux/dma-mapping.h 2010-02-23 17:09:53.311553777 -0500
41565@@ -16,50 +16,50 @@ enum dma_data_direction { 41973@@ -16,50 +16,50 @@ enum dma_data_direction {
41566 }; 41974 };
41567 41975
@@ -41620,18 +42028,17 @@ diff -urNp linux-2.6.32.8/include/linux/dma-mapping.h linux-2.6.32.8/include/lin
41620 enum dma_data_direction dir); 42028 enum dma_data_direction dir);
41621- int (*mapping_error)(struct device *dev, dma_addr_t dma_addr); 42029- int (*mapping_error)(struct device *dev, dma_addr_t dma_addr);
41622- int (*dma_supported)(struct device *dev, u64 mask); 42030- int (*dma_supported)(struct device *dev, u64 mask);
41623- int (*set_dma_mask)(struct device *dev, u64 mask);
41624- int is_phys;
41625+ int (* const mapping_error)(struct device *dev, dma_addr_t dma_addr); 42031+ int (* const mapping_error)(struct device *dev, dma_addr_t dma_addr);
41626+ int (* const dma_supported)(struct device *dev, u64 mask); 42032+ int (* const dma_supported)(struct device *dev, u64 mask);
41627+ int (* const set_dma_mask)(struct device *dev, u64 mask); 42033 int (*set_dma_mask)(struct device *dev, u64 mask);
42034- int is_phys;
41628+ const int is_phys; 42035+ const int is_phys;
41629 }; 42036 };
41630 42037
41631 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) 42038 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
41632diff -urNp linux-2.6.32.8/include/linux/dst.h linux-2.6.32.8/include/linux/dst.h 42039diff -urNp linux-2.6.32.9/include/linux/dst.h linux-2.6.32.9/include/linux/dst.h
41633--- linux-2.6.32.8/include/linux/dst.h 2010-02-09 07:57:19.000000000 -0500 42040--- linux-2.6.32.9/include/linux/dst.h 2010-02-09 07:57:19.000000000 -0500
41634+++ linux-2.6.32.8/include/linux/dst.h 2010-02-13 21:45:10.749010298 -0500 42041+++ linux-2.6.32.9/include/linux/dst.h 2010-02-23 17:09:53.311553777 -0500
41635@@ -380,7 +380,7 @@ struct dst_node 42042@@ -380,7 +380,7 @@ struct dst_node
41636 struct thread_pool *pool; 42043 struct thread_pool *pool;
41637 42044
@@ -41641,9 +42048,9 @@ diff -urNp linux-2.6.32.8/include/linux/dst.h linux-2.6.32.8/include/linux/dst.h
41641 42048
41642 /* 42049 /*
41643 * How frequently and how many times transaction 42050 * How frequently and how many times transaction
41644diff -urNp linux-2.6.32.8/include/linux/elf.h linux-2.6.32.8/include/linux/elf.h 42051diff -urNp linux-2.6.32.9/include/linux/elf.h linux-2.6.32.9/include/linux/elf.h
41645--- linux-2.6.32.8/include/linux/elf.h 2010-02-09 07:57:19.000000000 -0500 42052--- linux-2.6.32.9/include/linux/elf.h 2010-02-09 07:57:19.000000000 -0500
41646+++ linux-2.6.32.8/include/linux/elf.h 2010-02-13 21:45:10.749010298 -0500 42053+++ linux-2.6.32.9/include/linux/elf.h 2010-02-23 17:09:53.311553777 -0500
41647@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; 42054@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
41648 #define PT_GNU_EH_FRAME 0x6474e550 42055 #define PT_GNU_EH_FRAME 0x6474e550
41649 42056
@@ -41716,9 +42123,9 @@ diff -urNp linux-2.6.32.8/include/linux/elf.h linux-2.6.32.8/include/linux/elf.h
41716 42123
41717 #endif 42124 #endif
41718 42125
41719diff -urNp linux-2.6.32.8/include/linux/fs.h linux-2.6.32.8/include/linux/fs.h 42126diff -urNp linux-2.6.32.9/include/linux/fs.h linux-2.6.32.9/include/linux/fs.h
41720--- linux-2.6.32.8/include/linux/fs.h 2010-02-09 07:57:19.000000000 -0500 42127--- linux-2.6.32.9/include/linux/fs.h 2010-02-09 07:57:19.000000000 -0500
41721+++ linux-2.6.32.8/include/linux/fs.h 2010-02-13 21:45:10.749996132 -0500 42128+++ linux-2.6.32.9/include/linux/fs.h 2010-02-23 17:09:53.311553777 -0500
41722@@ -87,6 +87,10 @@ struct inodes_stat_t { 42129@@ -87,6 +87,10 @@ struct inodes_stat_t {
41723 */ 42130 */
41724 #define FMODE_NOCMTIME ((__force fmode_t)2048) 42131 #define FMODE_NOCMTIME ((__force fmode_t)2048)
@@ -41879,9 +42286,9 @@ diff -urNp linux-2.6.32.8/include/linux/fs.h linux-2.6.32.8/include/linux/fs.h
41879 }; 42286 };
41880 42287
41881 /* 42288 /*
41882diff -urNp linux-2.6.32.8/include/linux/fs_struct.h linux-2.6.32.8/include/linux/fs_struct.h 42289diff -urNp linux-2.6.32.9/include/linux/fs_struct.h linux-2.6.32.9/include/linux/fs_struct.h
41883--- linux-2.6.32.8/include/linux/fs_struct.h 2010-02-09 07:57:19.000000000 -0500 42290--- linux-2.6.32.9/include/linux/fs_struct.h 2010-02-09 07:57:19.000000000 -0500
41884+++ linux-2.6.32.8/include/linux/fs_struct.h 2010-02-13 21:45:10.751807127 -0500 42291+++ linux-2.6.32.9/include/linux/fs_struct.h 2010-02-23 17:09:53.311553777 -0500
41885@@ -4,7 +4,7 @@ 42292@@ -4,7 +4,7 @@
41886 #include <linux/path.h> 42293 #include <linux/path.h>
41887 42294
@@ -41891,9 +42298,9 @@ diff -urNp linux-2.6.32.8/include/linux/fs_struct.h linux-2.6.32.8/include/linux
41891 rwlock_t lock; 42298 rwlock_t lock;
41892 int umask; 42299 int umask;
41893 int in_exec; 42300 int in_exec;
41894diff -urNp linux-2.6.32.8/include/linux/genhd.h linux-2.6.32.8/include/linux/genhd.h 42301diff -urNp linux-2.6.32.9/include/linux/genhd.h linux-2.6.32.9/include/linux/genhd.h
41895--- linux-2.6.32.8/include/linux/genhd.h 2010-02-09 07:57:19.000000000 -0500 42302--- linux-2.6.32.9/include/linux/genhd.h 2010-02-09 07:57:19.000000000 -0500
41896+++ linux-2.6.32.8/include/linux/genhd.h 2010-02-13 21:45:10.751807127 -0500 42303+++ linux-2.6.32.9/include/linux/genhd.h 2010-02-23 17:09:53.311553777 -0500
41897@@ -161,7 +161,7 @@ struct gendisk { 42304@@ -161,7 +161,7 @@ struct gendisk {
41898 42305
41899 struct timer_rand_state *random; 42306 struct timer_rand_state *random;
@@ -41903,9 +42310,9 @@ diff -urNp linux-2.6.32.8/include/linux/genhd.h linux-2.6.32.8/include/linux/gen
41903 struct work_struct async_notify; 42310 struct work_struct async_notify;
41904 #ifdef CONFIG_BLK_DEV_INTEGRITY 42311 #ifdef CONFIG_BLK_DEV_INTEGRITY
41905 struct blk_integrity *integrity; 42312 struct blk_integrity *integrity;
41906diff -urNp linux-2.6.32.8/include/linux/gracl.h linux-2.6.32.8/include/linux/gracl.h 42313diff -urNp linux-2.6.32.9/include/linux/gracl.h linux-2.6.32.9/include/linux/gracl.h
41907--- linux-2.6.32.8/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 42314--- linux-2.6.32.9/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
41908+++ linux-2.6.32.8/include/linux/gracl.h 2010-02-13 21:45:10.752856831 -0500 42315+++ linux-2.6.32.9/include/linux/gracl.h 2010-02-23 17:09:53.311553777 -0500
41909@@ -0,0 +1,309 @@ 42316@@ -0,0 +1,309 @@
41910+#ifndef GR_ACL_H 42317+#ifndef GR_ACL_H
41911+#define GR_ACL_H 42318+#define GR_ACL_H
@@ -42216,9 +42623,9 @@ diff -urNp linux-2.6.32.8/include/linux/gracl.h linux-2.6.32.8/include/linux/gra
42216+ 42623+
42217+#endif 42624+#endif
42218+ 42625+
42219diff -urNp linux-2.6.32.8/include/linux/gralloc.h linux-2.6.32.8/include/linux/gralloc.h 42626diff -urNp linux-2.6.32.9/include/linux/gralloc.h linux-2.6.32.9/include/linux/gralloc.h
42220--- linux-2.6.32.8/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 42627--- linux-2.6.32.9/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
42221+++ linux-2.6.32.8/include/linux/gralloc.h 2010-02-13 21:45:10.752856831 -0500 42628+++ linux-2.6.32.9/include/linux/gralloc.h 2010-02-23 17:09:53.311553777 -0500
42222@@ -0,0 +1,9 @@ 42629@@ -0,0 +1,9 @@
42223+#ifndef __GRALLOC_H 42630+#ifndef __GRALLOC_H
42224+#define __GRALLOC_H 42631+#define __GRALLOC_H
@@ -42229,9 +42636,9 @@ diff -urNp linux-2.6.32.8/include/linux/gralloc.h linux-2.6.32.8/include/linux/g
42229+void *acl_alloc_num(unsigned long num, unsigned long len); 42636+void *acl_alloc_num(unsigned long num, unsigned long len);
42230+ 42637+
42231+#endif 42638+#endif
42232diff -urNp linux-2.6.32.8/include/linux/grdefs.h linux-2.6.32.8/include/linux/grdefs.h 42639diff -urNp linux-2.6.32.9/include/linux/grdefs.h linux-2.6.32.9/include/linux/grdefs.h
42233--- linux-2.6.32.8/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 42640--- linux-2.6.32.9/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
42234+++ linux-2.6.32.8/include/linux/grdefs.h 2010-02-13 21:45:10.752856831 -0500 42641+++ linux-2.6.32.9/include/linux/grdefs.h 2010-02-23 17:09:53.311553777 -0500
42235@@ -0,0 +1,136 @@ 42642@@ -0,0 +1,136 @@
42236+#ifndef GRDEFS_H 42643+#ifndef GRDEFS_H
42237+#define GRDEFS_H 42644+#define GRDEFS_H
@@ -42369,9 +42776,9 @@ diff -urNp linux-2.6.32.8/include/linux/grdefs.h linux-2.6.32.8/include/linux/gr
42369+}; 42776+};
42370+ 42777+
42371+#endif 42778+#endif
42372diff -urNp linux-2.6.32.8/include/linux/grinternal.h linux-2.6.32.8/include/linux/grinternal.h 42779diff -urNp linux-2.6.32.9/include/linux/grinternal.h linux-2.6.32.9/include/linux/grinternal.h
42373--- linux-2.6.32.8/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 42780--- linux-2.6.32.9/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
42374+++ linux-2.6.32.8/include/linux/grinternal.h 2010-02-13 21:45:10.752856831 -0500 42781+++ linux-2.6.32.9/include/linux/grinternal.h 2010-02-23 17:09:53.311553777 -0500
42375@@ -0,0 +1,212 @@ 42782@@ -0,0 +1,212 @@
42376+#ifndef __GRINTERNAL_H 42783+#ifndef __GRINTERNAL_H
42377+#define __GRINTERNAL_H 42784+#define __GRINTERNAL_H
@@ -42585,9 +42992,9 @@ diff -urNp linux-2.6.32.8/include/linux/grinternal.h linux-2.6.32.8/include/linu
42585+#endif 42992+#endif
42586+ 42993+
42587+#endif 42994+#endif
42588diff -urNp linux-2.6.32.8/include/linux/grmsg.h linux-2.6.32.8/include/linux/grmsg.h 42995diff -urNp linux-2.6.32.9/include/linux/grmsg.h linux-2.6.32.9/include/linux/grmsg.h
42589--- linux-2.6.32.8/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 42996--- linux-2.6.32.9/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
42590+++ linux-2.6.32.8/include/linux/grmsg.h 2010-02-13 21:45:10.752856831 -0500 42997+++ linux-2.6.32.9/include/linux/grmsg.h 2010-02-23 17:09:53.311553777 -0500
42591@@ -0,0 +1,107 @@ 42998@@ -0,0 +1,107 @@
42592+#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" 42999+#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"
42593+#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" 43000+#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"
@@ -42696,9 +43103,9 @@ diff -urNp linux-2.6.32.8/include/linux/grmsg.h linux-2.6.32.8/include/linux/grm
42696+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by " 43103+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
42697+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " 43104+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
42698+#define GR_VM86_MSG "denied use of vm86 by " 43105+#define GR_VM86_MSG "denied use of vm86 by "
42699diff -urNp linux-2.6.32.8/include/linux/grsecurity.h linux-2.6.32.8/include/linux/grsecurity.h 43106diff -urNp linux-2.6.32.9/include/linux/grsecurity.h linux-2.6.32.9/include/linux/grsecurity.h
42700--- linux-2.6.32.8/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 43107--- linux-2.6.32.9/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
42701+++ linux-2.6.32.8/include/linux/grsecurity.h 2010-02-13 21:45:10.753997066 -0500 43108+++ linux-2.6.32.9/include/linux/grsecurity.h 2010-02-23 17:09:53.311553777 -0500
42702@@ -0,0 +1,200 @@ 43109@@ -0,0 +1,200 @@
42703+#ifndef GR_SECURITY_H 43110+#ifndef GR_SECURITY_H
42704+#define GR_SECURITY_H 43111+#define GR_SECURITY_H
@@ -42900,9 +43307,9 @@ diff -urNp linux-2.6.32.8/include/linux/grsecurity.h linux-2.6.32.8/include/linu
42900+#endif 43307+#endif
42901+ 43308+
42902+#endif 43309+#endif
42903diff -urNp linux-2.6.32.8/include/linux/hdpu_features.h linux-2.6.32.8/include/linux/hdpu_features.h 43310diff -urNp linux-2.6.32.9/include/linux/hdpu_features.h linux-2.6.32.9/include/linux/hdpu_features.h
42904--- linux-2.6.32.8/include/linux/hdpu_features.h 2010-02-09 07:57:19.000000000 -0500 43311--- linux-2.6.32.9/include/linux/hdpu_features.h 2010-02-09 07:57:19.000000000 -0500
42905+++ linux-2.6.32.8/include/linux/hdpu_features.h 2010-02-13 21:45:10.753997066 -0500 43312+++ linux-2.6.32.9/include/linux/hdpu_features.h 2010-02-23 17:09:53.311553777 -0500
42906@@ -3,7 +3,7 @@ 43313@@ -3,7 +3,7 @@
42907 struct cpustate_t { 43314 struct cpustate_t {
42908 spinlock_t lock; 43315 spinlock_t lock;
@@ -42912,9 +43319,9 @@ diff -urNp linux-2.6.32.8/include/linux/hdpu_features.h linux-2.6.32.8/include/l
42912 unsigned char cached_val; 43319 unsigned char cached_val;
42913 int inited; 43320 int inited;
42914 unsigned long *set_addr; 43321 unsigned long *set_addr;
42915diff -urNp linux-2.6.32.8/include/linux/highmem.h linux-2.6.32.8/include/linux/highmem.h 43322diff -urNp linux-2.6.32.9/include/linux/highmem.h linux-2.6.32.9/include/linux/highmem.h
42916--- linux-2.6.32.8/include/linux/highmem.h 2010-02-09 07:57:19.000000000 -0500 43323--- linux-2.6.32.9/include/linux/highmem.h 2010-02-09 07:57:19.000000000 -0500
42917+++ linux-2.6.32.8/include/linux/highmem.h 2010-02-13 21:45:10.753997066 -0500 43324+++ linux-2.6.32.9/include/linux/highmem.h 2010-02-23 17:09:53.311553777 -0500
42918@@ -137,6 +137,18 @@ static inline void clear_highpage(struct 43325@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
42919 kunmap_atomic(kaddr, KM_USER0); 43326 kunmap_atomic(kaddr, KM_USER0);
42920 } 43327 }
@@ -42934,9 +43341,9 @@ diff -urNp linux-2.6.32.8/include/linux/highmem.h linux-2.6.32.8/include/linux/h
42934 static inline void zero_user_segments(struct page *page, 43341 static inline void zero_user_segments(struct page *page,
42935 unsigned start1, unsigned end1, 43342 unsigned start1, unsigned end1,
42936 unsigned start2, unsigned end2) 43343 unsigned start2, unsigned end2)
42937diff -urNp linux-2.6.32.8/include/linux/init_task.h linux-2.6.32.8/include/linux/init_task.h 43344diff -urNp linux-2.6.32.9/include/linux/init_task.h linux-2.6.32.9/include/linux/init_task.h
42938--- linux-2.6.32.8/include/linux/init_task.h 2010-02-09 07:57:19.000000000 -0500 43345--- linux-2.6.32.9/include/linux/init_task.h 2010-02-09 07:57:19.000000000 -0500
42939+++ linux-2.6.32.8/include/linux/init_task.h 2010-02-13 21:45:10.753997066 -0500 43346+++ linux-2.6.32.9/include/linux/init_task.h 2010-02-23 17:09:53.311553777 -0500
42940@@ -115,6 +115,13 @@ extern struct cred init_cred; 43347@@ -115,6 +115,13 @@ extern struct cred init_cred;
42941 # define INIT_PERF_EVENTS(tsk) 43348 # define INIT_PERF_EVENTS(tsk)
42942 #endif 43349 #endif
@@ -42959,9 +43366,9 @@ diff -urNp linux-2.6.32.8/include/linux/init_task.h linux-2.6.32.8/include/linux
42959 } 43366 }
42960 43367
42961 43368
42962diff -urNp linux-2.6.32.8/include/linux/interrupt.h linux-2.6.32.8/include/linux/interrupt.h 43369diff -urNp linux-2.6.32.9/include/linux/interrupt.h linux-2.6.32.9/include/linux/interrupt.h
42963--- linux-2.6.32.8/include/linux/interrupt.h 2010-02-09 07:57:19.000000000 -0500 43370--- linux-2.6.32.9/include/linux/interrupt.h 2010-02-09 07:57:19.000000000 -0500
42964+++ linux-2.6.32.8/include/linux/interrupt.h 2010-02-13 21:45:10.753997066 -0500 43371+++ linux-2.6.32.9/include/linux/interrupt.h 2010-02-23 17:09:53.311553777 -0500
42965@@ -357,7 +357,7 @@ enum 43372@@ -357,7 +357,7 @@ enum
42966 /* map softirq index to softirq name. update 'softirq_to_name' in 43373 /* map softirq index to softirq name. update 'softirq_to_name' in
42967 * kernel/softirq.c when adding a new softirq. 43374 * kernel/softirq.c when adding a new softirq.
@@ -42971,9 +43378,24 @@ diff -urNp linux-2.6.32.8/include/linux/interrupt.h linux-2.6.32.8/include/linux
42971 43378
42972 /* softirq mask and active fields moved to irq_cpustat_t in 43379 /* softirq mask and active fields moved to irq_cpustat_t in
42973 * asm/hardirq.h to get better cache usage. KAO 43380 * asm/hardirq.h to get better cache usage. KAO
42974diff -urNp linux-2.6.32.8/include/linux/jbd2.h linux-2.6.32.8/include/linux/jbd2.h 43381@@ -365,12 +365,12 @@ extern char *softirq_to_name[NR_SOFTIRQS
42975--- linux-2.6.32.8/include/linux/jbd2.h 2010-02-09 07:57:19.000000000 -0500 43382
42976+++ linux-2.6.32.8/include/linux/jbd2.h 2010-02-13 21:45:10.754965648 -0500 43383 struct softirq_action
43384 {
43385- void (*action)(struct softirq_action *);
43386+ void (*action)(void);
43387 };
43388
43389 asmlinkage void do_softirq(void);
43390 asmlinkage void __do_softirq(void);
43391-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
43392+extern void open_softirq(int nr, void (*action)(void));
43393 extern void softirq_init(void);
43394 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
43395 extern void raise_softirq_irqoff(unsigned int nr);
43396diff -urNp linux-2.6.32.9/include/linux/jbd2.h linux-2.6.32.9/include/linux/jbd2.h
43397--- linux-2.6.32.9/include/linux/jbd2.h 2010-02-09 07:57:19.000000000 -0500
43398+++ linux-2.6.32.9/include/linux/jbd2.h 2010-02-23 17:09:53.311553777 -0500
42977@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; 43399@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
42978 } \ 43400 } \
42979 } while (0) 43401 } while (0)
@@ -42983,9 +43405,9 @@ diff -urNp linux-2.6.32.8/include/linux/jbd2.h linux-2.6.32.8/include/linux/jbd2
42983 #endif 43405 #endif
42984 43406
42985 static inline void *jbd2_alloc(size_t size, gfp_t flags) 43407 static inline void *jbd2_alloc(size_t size, gfp_t flags)
42986diff -urNp linux-2.6.32.8/include/linux/jbd.h linux-2.6.32.8/include/linux/jbd.h 43408diff -urNp linux-2.6.32.9/include/linux/jbd.h linux-2.6.32.9/include/linux/jbd.h
42987--- linux-2.6.32.8/include/linux/jbd.h 2010-02-09 07:57:19.000000000 -0500 43409--- linux-2.6.32.9/include/linux/jbd.h 2010-02-09 07:57:19.000000000 -0500
42988+++ linux-2.6.32.8/include/linux/jbd.h 2010-02-13 21:45:10.754965648 -0500 43410+++ linux-2.6.32.9/include/linux/jbd.h 2010-02-23 17:09:53.311553777 -0500
42989@@ -66,7 +66,7 @@ extern u8 journal_enable_debug; 43411@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
42990 } \ 43412 } \
42991 } while (0) 43413 } while (0)
@@ -42995,9 +43417,9 @@ diff -urNp linux-2.6.32.8/include/linux/jbd.h linux-2.6.32.8/include/linux/jbd.h
42995 #endif 43417 #endif
42996 43418
42997 static inline void *jbd_alloc(size_t size, gfp_t flags) 43419 static inline void *jbd_alloc(size_t size, gfp_t flags)
42998diff -urNp linux-2.6.32.8/include/linux/kallsyms.h linux-2.6.32.8/include/linux/kallsyms.h 43420diff -urNp linux-2.6.32.9/include/linux/kallsyms.h linux-2.6.32.9/include/linux/kallsyms.h
42999--- linux-2.6.32.8/include/linux/kallsyms.h 2010-02-09 07:57:19.000000000 -0500 43421--- linux-2.6.32.9/include/linux/kallsyms.h 2010-02-09 07:57:19.000000000 -0500
43000+++ linux-2.6.32.8/include/linux/kallsyms.h 2010-02-13 21:45:10.754965648 -0500 43422+++ linux-2.6.32.9/include/linux/kallsyms.h 2010-02-23 17:09:53.316454635 -0500
43001@@ -15,7 +15,8 @@ 43423@@ -15,7 +15,8 @@
43002 43424
43003 struct module; 43425 struct module;
@@ -43018,9 +43440,9 @@ diff -urNp linux-2.6.32.8/include/linux/kallsyms.h linux-2.6.32.8/include/linux/
43018 43440
43019 /* This macro allows us to keep printk typechecking */ 43441 /* This macro allows us to keep printk typechecking */
43020 static void __check_printsym_format(const char *fmt, ...) 43442 static void __check_printsym_format(const char *fmt, ...)
43021diff -urNp linux-2.6.32.8/include/linux/kgdb.h linux-2.6.32.8/include/linux/kgdb.h 43443diff -urNp linux-2.6.32.9/include/linux/kgdb.h linux-2.6.32.9/include/linux/kgdb.h
43022--- linux-2.6.32.8/include/linux/kgdb.h 2010-02-09 07:57:19.000000000 -0500 43444--- linux-2.6.32.9/include/linux/kgdb.h 2010-02-09 07:57:19.000000000 -0500
43023+++ linux-2.6.32.8/include/linux/kgdb.h 2010-02-13 21:45:10.755925856 -0500 43445+++ linux-2.6.32.9/include/linux/kgdb.h 2010-02-23 17:09:53.316454635 -0500
43024@@ -251,20 +251,20 @@ struct kgdb_arch { 43446@@ -251,20 +251,20 @@ struct kgdb_arch {
43025 */ 43447 */
43026 struct kgdb_io { 43448 struct kgdb_io {
@@ -43051,9 +43473,9 @@ diff -urNp linux-2.6.32.8/include/linux/kgdb.h linux-2.6.32.8/include/linux/kgdb
43051 43473
43052 extern int kgdb_hex2long(char **ptr, unsigned long *long_val); 43474 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
43053 extern int kgdb_mem2hex(char *mem, char *buf, int count); 43475 extern int kgdb_mem2hex(char *mem, char *buf, int count);
43054diff -urNp linux-2.6.32.8/include/linux/kobject.h linux-2.6.32.8/include/linux/kobject.h 43476diff -urNp linux-2.6.32.9/include/linux/kobject.h linux-2.6.32.9/include/linux/kobject.h
43055--- linux-2.6.32.8/include/linux/kobject.h 2010-02-09 07:57:19.000000000 -0500 43477--- linux-2.6.32.9/include/linux/kobject.h 2010-02-09 07:57:19.000000000 -0500
43056+++ linux-2.6.32.8/include/linux/kobject.h 2010-02-13 21:45:10.755925856 -0500 43478+++ linux-2.6.32.9/include/linux/kobject.h 2010-02-23 17:09:53.316454635 -0500
43057@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob 43479@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
43058 43480
43059 struct kobj_type { 43481 struct kobj_type {
@@ -43102,9 +43524,9 @@ diff -urNp linux-2.6.32.8/include/linux/kobject.h linux-2.6.32.8/include/linux/k
43102 struct kobject *parent_kobj); 43524 struct kobject *parent_kobj);
43103 43525
43104 static inline struct kset *to_kset(struct kobject *kobj) 43526 static inline struct kset *to_kset(struct kobject *kobj)
43105diff -urNp linux-2.6.32.8/include/linux/kvm_host.h linux-2.6.32.8/include/linux/kvm_host.h 43527diff -urNp linux-2.6.32.9/include/linux/kvm_host.h linux-2.6.32.9/include/linux/kvm_host.h
43106--- linux-2.6.32.8/include/linux/kvm_host.h 2010-02-09 07:57:19.000000000 -0500 43528--- linux-2.6.32.9/include/linux/kvm_host.h 2010-02-09 07:57:19.000000000 -0500
43107+++ linux-2.6.32.8/include/linux/kvm_host.h 2010-02-13 21:45:10.755925856 -0500 43529+++ linux-2.6.32.9/include/linux/kvm_host.h 2010-02-23 17:09:53.316454635 -0500
43108@@ -205,7 +205,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc 43530@@ -205,7 +205,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
43109 void vcpu_load(struct kvm_vcpu *vcpu); 43531 void vcpu_load(struct kvm_vcpu *vcpu);
43110 void vcpu_put(struct kvm_vcpu *vcpu); 43532 void vcpu_put(struct kvm_vcpu *vcpu);
@@ -43123,9 +43545,9 @@ diff -urNp linux-2.6.32.8/include/linux/kvm_host.h linux-2.6.32.8/include/linux/
43123 void kvm_arch_exit(void); 43545 void kvm_arch_exit(void);
43124 43546
43125 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); 43547 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
43126diff -urNp linux-2.6.32.8/include/linux/libata.h linux-2.6.32.8/include/linux/libata.h 43548diff -urNp linux-2.6.32.9/include/linux/libata.h linux-2.6.32.9/include/linux/libata.h
43127--- linux-2.6.32.8/include/linux/libata.h 2010-02-09 07:57:19.000000000 -0500 43549--- linux-2.6.32.9/include/linux/libata.h 2010-02-09 07:57:19.000000000 -0500
43128+++ linux-2.6.32.8/include/linux/libata.h 2010-02-13 21:45:10.756946201 -0500 43550+++ linux-2.6.32.9/include/linux/libata.h 2010-02-23 17:09:53.316454635 -0500
43129@@ -64,11 +64,11 @@ 43551@@ -64,11 +64,11 @@
43130 #ifdef ATA_VERBOSE_DEBUG 43552 #ifdef ATA_VERBOSE_DEBUG
43131 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) 43553 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -43191,9 +43613,9 @@ diff -urNp linux-2.6.32.8/include/linux/libata.h linux-2.6.32.8/include/linux/li
43191 extern int ata_scsi_detect(struct scsi_host_template *sht); 43613 extern int ata_scsi_detect(struct scsi_host_template *sht);
43192 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); 43614 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
43193 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); 43615 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
43194diff -urNp linux-2.6.32.8/include/linux/lockd/bind.h linux-2.6.32.8/include/linux/lockd/bind.h 43616diff -urNp linux-2.6.32.9/include/linux/lockd/bind.h linux-2.6.32.9/include/linux/lockd/bind.h
43195--- linux-2.6.32.8/include/linux/lockd/bind.h 2010-02-09 07:57:19.000000000 -0500 43617--- linux-2.6.32.9/include/linux/lockd/bind.h 2010-02-09 07:57:19.000000000 -0500
43196+++ linux-2.6.32.8/include/linux/lockd/bind.h 2010-02-13 21:45:10.756946201 -0500 43618+++ linux-2.6.32.9/include/linux/lockd/bind.h 2010-02-23 17:09:53.316454635 -0500
43197@@ -23,13 +23,13 @@ struct svc_rqst; 43619@@ -23,13 +23,13 @@ struct svc_rqst;
43198 * This is the set of functions for lockd->nfsd communication 43620 * This is the set of functions for lockd->nfsd communication
43199 */ 43621 */
@@ -43211,9 +43633,9 @@ diff -urNp linux-2.6.32.8/include/linux/lockd/bind.h linux-2.6.32.8/include/linu
43211 43633
43212 /* 43634 /*
43213 * Similar to nfs_client_initdata, but without the NFS-specific 43635 * Similar to nfs_client_initdata, but without the NFS-specific
43214diff -urNp linux-2.6.32.8/include/linux/mm.h linux-2.6.32.8/include/linux/mm.h 43636diff -urNp linux-2.6.32.9/include/linux/mm.h linux-2.6.32.9/include/linux/mm.h
43215--- linux-2.6.32.8/include/linux/mm.h 2010-02-09 07:57:19.000000000 -0500 43637--- linux-2.6.32.9/include/linux/mm.h 2010-02-09 07:57:19.000000000 -0500
43216+++ linux-2.6.32.8/include/linux/mm.h 2010-02-13 21:45:10.756946201 -0500 43638+++ linux-2.6.32.9/include/linux/mm.h 2010-02-23 17:09:53.316454635 -0500
43217@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void 43639@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void
43218 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ 43640 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
43219 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ 43641 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
@@ -43276,9 +43698,9 @@ diff -urNp linux-2.6.32.8/include/linux/mm.h linux-2.6.32.8/include/linux/mm.h
43276 43698
43277 #endif /* __KERNEL__ */ 43699 #endif /* __KERNEL__ */
43278 #endif /* _LINUX_MM_H */ 43700 #endif /* _LINUX_MM_H */
43279diff -urNp linux-2.6.32.8/include/linux/mm_types.h linux-2.6.32.8/include/linux/mm_types.h 43701diff -urNp linux-2.6.32.9/include/linux/mm_types.h linux-2.6.32.9/include/linux/mm_types.h
43280--- linux-2.6.32.8/include/linux/mm_types.h 2010-02-09 07:57:19.000000000 -0500 43702--- linux-2.6.32.9/include/linux/mm_types.h 2010-02-09 07:57:19.000000000 -0500
43281+++ linux-2.6.32.8/include/linux/mm_types.h 2010-02-13 21:45:10.758003169 -0500 43703+++ linux-2.6.32.9/include/linux/mm_types.h 2010-02-23 17:09:53.316454635 -0500
43282@@ -186,6 +186,8 @@ struct vm_area_struct { 43704@@ -186,6 +186,8 @@ struct vm_area_struct {
43283 #ifdef CONFIG_NUMA 43705 #ifdef CONFIG_NUMA
43284 struct mempolicy *vm_policy; /* NUMA policy for the VMA */ 43706 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -43313,9 +43735,9 @@ diff -urNp linux-2.6.32.8/include/linux/mm_types.h linux-2.6.32.8/include/linux/
43313 }; 43735 };
43314 43736
43315 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ 43737 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
43316diff -urNp linux-2.6.32.8/include/linux/mmu_notifier.h linux-2.6.32.8/include/linux/mmu_notifier.h 43738diff -urNp linux-2.6.32.9/include/linux/mmu_notifier.h linux-2.6.32.9/include/linux/mmu_notifier.h
43317--- linux-2.6.32.8/include/linux/mmu_notifier.h 2010-02-09 07:57:19.000000000 -0500 43739--- linux-2.6.32.9/include/linux/mmu_notifier.h 2010-02-09 07:57:19.000000000 -0500
43318+++ linux-2.6.32.8/include/linux/mmu_notifier.h 2010-02-13 21:45:10.758003169 -0500 43740+++ linux-2.6.32.9/include/linux/mmu_notifier.h 2010-02-23 17:09:53.316454635 -0500
43319@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr 43741@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
43320 */ 43742 */
43321 #define ptep_clear_flush_notify(__vma, __address, __ptep) \ 43743 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -43332,9 +43754,9 @@ diff -urNp linux-2.6.32.8/include/linux/mmu_notifier.h linux-2.6.32.8/include/li
43332 }) 43754 })
43333 43755
43334 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ 43756 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
43335diff -urNp linux-2.6.32.8/include/linux/mod_devicetable.h linux-2.6.32.8/include/linux/mod_devicetable.h 43757diff -urNp linux-2.6.32.9/include/linux/mod_devicetable.h linux-2.6.32.9/include/linux/mod_devicetable.h
43336--- linux-2.6.32.8/include/linux/mod_devicetable.h 2010-02-09 07:57:19.000000000 -0500 43758--- linux-2.6.32.9/include/linux/mod_devicetable.h 2010-02-09 07:57:19.000000000 -0500
43337+++ linux-2.6.32.8/include/linux/mod_devicetable.h 2010-02-13 21:45:10.758003169 -0500 43759+++ linux-2.6.32.9/include/linux/mod_devicetable.h 2010-02-23 17:09:53.316454635 -0500
43338@@ -12,7 +12,7 @@ 43760@@ -12,7 +12,7 @@
43339 typedef unsigned long kernel_ulong_t; 43761 typedef unsigned long kernel_ulong_t;
43340 #endif 43762 #endif
@@ -43353,9 +43775,9 @@ diff -urNp linux-2.6.32.8/include/linux/mod_devicetable.h linux-2.6.32.8/include
43353 43775
43354 struct hid_device_id { 43776 struct hid_device_id {
43355 __u16 bus; 43777 __u16 bus;
43356diff -urNp linux-2.6.32.8/include/linux/module.h linux-2.6.32.8/include/linux/module.h 43778diff -urNp linux-2.6.32.9/include/linux/module.h linux-2.6.32.9/include/linux/module.h
43357--- linux-2.6.32.8/include/linux/module.h 2010-02-09 07:57:19.000000000 -0500 43779--- linux-2.6.32.9/include/linux/module.h 2010-02-09 07:57:19.000000000 -0500
43358+++ linux-2.6.32.8/include/linux/module.h 2010-02-13 21:45:10.758003169 -0500 43780+++ linux-2.6.32.9/include/linux/module.h 2010-02-23 17:09:53.316454635 -0500
43359@@ -287,16 +287,16 @@ struct module 43781@@ -287,16 +287,16 @@ struct module
43360 int (*init)(void); 43782 int (*init)(void);
43361 43783
@@ -43428,9 +43850,9 @@ diff -urNp linux-2.6.32.8/include/linux/module.h linux-2.6.32.8/include/linux/mo
43428 } 43850 }
43429 43851
43430 /* Search for module by name: must hold module_mutex. */ 43852 /* Search for module by name: must hold module_mutex. */
43431diff -urNp linux-2.6.32.8/include/linux/moduleloader.h linux-2.6.32.8/include/linux/moduleloader.h 43853diff -urNp linux-2.6.32.9/include/linux/moduleloader.h linux-2.6.32.9/include/linux/moduleloader.h
43432--- linux-2.6.32.8/include/linux/moduleloader.h 2010-02-09 07:57:19.000000000 -0500 43854--- linux-2.6.32.9/include/linux/moduleloader.h 2010-02-09 07:57:19.000000000 -0500
43433+++ linux-2.6.32.8/include/linux/moduleloader.h 2010-02-13 21:45:10.758003169 -0500 43855+++ linux-2.6.32.9/include/linux/moduleloader.h 2010-02-23 17:09:53.316454635 -0500
43434@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st 43856@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
43435 sections. Returns NULL on failure. */ 43857 sections. Returns NULL on failure. */
43436 void *module_alloc(unsigned long size); 43858 void *module_alloc(unsigned long size);
@@ -43447,15 +43869,15 @@ diff -urNp linux-2.6.32.8/include/linux/moduleloader.h linux-2.6.32.8/include/li
43447+#ifdef CONFIG_PAX_KERNEXEC 43869+#ifdef CONFIG_PAX_KERNEXEC
43448+void module_free_exec(struct module *mod, void *module_region); 43870+void module_free_exec(struct module *mod, void *module_region);
43449+#else 43871+#else
43450+#define module_free_exec(x, y) module_free(x, y) 43872+#define module_free_exec(x, y) module_free((x), (y))
43451+#endif 43873+#endif
43452+ 43874+
43453 /* Apply the given relocation to the (simplified) ELF. Return -error 43875 /* Apply the given relocation to the (simplified) ELF. Return -error
43454 or 0. */ 43876 or 0. */
43455 int apply_relocate(Elf_Shdr *sechdrs, 43877 int apply_relocate(Elf_Shdr *sechdrs,
43456diff -urNp linux-2.6.32.8/include/linux/namei.h linux-2.6.32.8/include/linux/namei.h 43878diff -urNp linux-2.6.32.9/include/linux/namei.h linux-2.6.32.9/include/linux/namei.h
43457--- linux-2.6.32.8/include/linux/namei.h 2010-02-09 07:57:19.000000000 -0500 43879--- linux-2.6.32.9/include/linux/namei.h 2010-02-09 07:57:19.000000000 -0500
43458+++ linux-2.6.32.8/include/linux/namei.h 2010-02-13 21:45:10.758999633 -0500 43880+++ linux-2.6.32.9/include/linux/namei.h 2010-02-23 17:09:53.316454635 -0500
43459@@ -22,7 +22,7 @@ struct nameidata { 43881@@ -22,7 +22,7 @@ struct nameidata {
43460 unsigned int flags; 43882 unsigned int flags;
43461 int last_type; 43883 int last_type;
@@ -43480,9 +43902,9 @@ diff -urNp linux-2.6.32.8/include/linux/namei.h linux-2.6.32.8/include/linux/nam
43480 { 43902 {
43481 return nd->saved_names[nd->depth]; 43903 return nd->saved_names[nd->depth];
43482 } 43904 }
43483diff -urNp linux-2.6.32.8/include/linux/nodemask.h linux-2.6.32.8/include/linux/nodemask.h 43905diff -urNp linux-2.6.32.9/include/linux/nodemask.h linux-2.6.32.9/include/linux/nodemask.h
43484--- linux-2.6.32.8/include/linux/nodemask.h 2010-02-09 07:57:19.000000000 -0500 43906--- linux-2.6.32.9/include/linux/nodemask.h 2010-02-09 07:57:19.000000000 -0500
43485+++ linux-2.6.32.8/include/linux/nodemask.h 2010-02-13 21:45:10.758999633 -0500 43907+++ linux-2.6.32.9/include/linux/nodemask.h 2010-02-23 17:09:53.316454635 -0500
43486@@ -464,11 +464,11 @@ static inline int num_node_state(enum no 43908@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
43487 43909
43488 #define any_online_node(mask) \ 43910 #define any_online_node(mask) \
@@ -43499,9 +43921,9 @@ diff -urNp linux-2.6.32.8/include/linux/nodemask.h linux-2.6.32.8/include/linux/
43499 }) 43921 })
43500 43922
43501 #define num_online_nodes() num_node_state(N_ONLINE) 43923 #define num_online_nodes() num_node_state(N_ONLINE)
43502diff -urNp linux-2.6.32.8/include/linux/oprofile.h linux-2.6.32.8/include/linux/oprofile.h 43924diff -urNp linux-2.6.32.9/include/linux/oprofile.h linux-2.6.32.9/include/linux/oprofile.h
43503--- linux-2.6.32.8/include/linux/oprofile.h 2010-02-09 07:57:19.000000000 -0500 43925--- linux-2.6.32.9/include/linux/oprofile.h 2010-02-09 07:57:19.000000000 -0500
43504+++ linux-2.6.32.8/include/linux/oprofile.h 2010-02-13 21:45:10.758999633 -0500 43926+++ linux-2.6.32.9/include/linux/oprofile.h 2010-02-23 17:09:53.316454635 -0500
43505@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super 43927@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
43506 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, 43928 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
43507 char const * name, ulong * val); 43929 char const * name, ulong * val);
@@ -43514,9 +43936,9 @@ diff -urNp linux-2.6.32.8/include/linux/oprofile.h linux-2.6.32.8/include/linux/
43514 43936
43515 /** create a directory */ 43937 /** create a directory */
43516 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, 43938 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
43517diff -urNp linux-2.6.32.8/include/linux/pipe_fs_i.h linux-2.6.32.8/include/linux/pipe_fs_i.h 43939diff -urNp linux-2.6.32.9/include/linux/pipe_fs_i.h linux-2.6.32.9/include/linux/pipe_fs_i.h
43518--- linux-2.6.32.8/include/linux/pipe_fs_i.h 2010-02-09 07:57:19.000000000 -0500 43940--- linux-2.6.32.9/include/linux/pipe_fs_i.h 2010-02-09 07:57:19.000000000 -0500
43519+++ linux-2.6.32.8/include/linux/pipe_fs_i.h 2010-02-13 21:45:10.758999633 -0500 43941+++ linux-2.6.32.9/include/linux/pipe_fs_i.h 2010-02-23 17:09:53.316454635 -0500
43520@@ -46,9 +46,9 @@ struct pipe_inode_info { 43942@@ -46,9 +46,9 @@ struct pipe_inode_info {
43521 wait_queue_head_t wait; 43943 wait_queue_head_t wait;
43522 unsigned int nrbufs, curbuf; 43944 unsigned int nrbufs, curbuf;
@@ -43530,9 +43952,9 @@ diff -urNp linux-2.6.32.8/include/linux/pipe_fs_i.h linux-2.6.32.8/include/linux
43530 unsigned int r_counter; 43952 unsigned int r_counter;
43531 unsigned int w_counter; 43953 unsigned int w_counter;
43532 struct fasync_struct *fasync_readers; 43954 struct fasync_struct *fasync_readers;
43533diff -urNp linux-2.6.32.8/include/linux/poison.h linux-2.6.32.8/include/linux/poison.h 43955diff -urNp linux-2.6.32.9/include/linux/poison.h linux-2.6.32.9/include/linux/poison.h
43534--- linux-2.6.32.8/include/linux/poison.h 2010-02-09 07:57:19.000000000 -0500 43956--- linux-2.6.32.9/include/linux/poison.h 2010-02-09 07:57:19.000000000 -0500
43535+++ linux-2.6.32.8/include/linux/poison.h 2010-02-13 21:45:10.758999633 -0500 43957+++ linux-2.6.32.9/include/linux/poison.h 2010-02-23 17:09:53.316454635 -0500
43536@@ -7,8 +7,8 @@ 43958@@ -7,8 +7,8 @@
43537 * under normal circumstances, used to verify that nobody uses 43959 * under normal circumstances, used to verify that nobody uses
43538 * non-initialized list entries. 43960 * non-initialized list entries.
@@ -43544,9 +43966,9 @@ diff -urNp linux-2.6.32.8/include/linux/poison.h linux-2.6.32.8/include/linux/po
43544 43966
43545 /********** include/linux/timer.h **********/ 43967 /********** include/linux/timer.h **********/
43546 /* 43968 /*
43547diff -urNp linux-2.6.32.8/include/linux/proc_fs.h linux-2.6.32.8/include/linux/proc_fs.h 43969diff -urNp linux-2.6.32.9/include/linux/proc_fs.h linux-2.6.32.9/include/linux/proc_fs.h
43548--- linux-2.6.32.8/include/linux/proc_fs.h 2010-02-09 07:57:19.000000000 -0500 43970--- linux-2.6.32.9/include/linux/proc_fs.h 2010-02-09 07:57:19.000000000 -0500
43549+++ linux-2.6.32.8/include/linux/proc_fs.h 2010-02-13 21:45:10.758999633 -0500 43971+++ linux-2.6.32.9/include/linux/proc_fs.h 2010-02-23 17:09:53.316454635 -0500
43550@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro 43972@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
43551 return proc_create_data(name, mode, parent, proc_fops, NULL); 43973 return proc_create_data(name, mode, parent, proc_fops, NULL);
43552 } 43974 }
@@ -43567,9 +43989,9 @@ diff -urNp linux-2.6.32.8/include/linux/proc_fs.h linux-2.6.32.8/include/linux/p
43567 static inline struct proc_dir_entry *create_proc_read_entry(const char *name, 43989 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
43568 mode_t mode, struct proc_dir_entry *base, 43990 mode_t mode, struct proc_dir_entry *base,
43569 read_proc_t *read_proc, void * data) 43991 read_proc_t *read_proc, void * data)
43570diff -urNp linux-2.6.32.8/include/linux/random.h linux-2.6.32.8/include/linux/random.h 43992diff -urNp linux-2.6.32.9/include/linux/random.h linux-2.6.32.9/include/linux/random.h
43571--- linux-2.6.32.8/include/linux/random.h 2010-02-09 07:57:19.000000000 -0500 43993--- linux-2.6.32.9/include/linux/random.h 2010-02-09 07:57:19.000000000 -0500
43572+++ linux-2.6.32.8/include/linux/random.h 2010-02-13 21:45:10.759932710 -0500 43994+++ linux-2.6.32.9/include/linux/random.h 2010-02-23 17:09:53.316454635 -0500
43573@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l 43995@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
43574 u32 random32(void); 43996 u32 random32(void);
43575 void srandom32(u32 seed); 43997 void srandom32(u32 seed);
@@ -43582,9 +44004,9 @@ diff -urNp linux-2.6.32.8/include/linux/random.h linux-2.6.32.8/include/linux/ra
43582 #endif /* __KERNEL___ */ 44004 #endif /* __KERNEL___ */
43583 44005
43584 #endif /* _LINUX_RANDOM_H */ 44006 #endif /* _LINUX_RANDOM_H */
43585diff -urNp linux-2.6.32.8/include/linux/reiserfs_fs.h linux-2.6.32.8/include/linux/reiserfs_fs.h 44007diff -urNp linux-2.6.32.9/include/linux/reiserfs_fs.h linux-2.6.32.9/include/linux/reiserfs_fs.h
43586--- linux-2.6.32.8/include/linux/reiserfs_fs.h 2010-02-09 07:57:19.000000000 -0500 44008--- linux-2.6.32.9/include/linux/reiserfs_fs.h 2010-02-09 07:57:19.000000000 -0500
43587+++ linux-2.6.32.8/include/linux/reiserfs_fs.h 2010-02-13 21:45:10.759932710 -0500 44009+++ linux-2.6.32.9/include/linux/reiserfs_fs.h 2010-02-23 17:09:53.316454635 -0500
43588@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset 44010@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
43589 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ 44011 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
43590 44012
@@ -43631,9 +44053,9 @@ diff -urNp linux-2.6.32.8/include/linux/reiserfs_fs.h linux-2.6.32.8/include/lin
43631 44053
43632 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) 44054 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
43633 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) 44055 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
43634diff -urNp linux-2.6.32.8/include/linux/reiserfs_fs_sb.h linux-2.6.32.8/include/linux/reiserfs_fs_sb.h 44056diff -urNp linux-2.6.32.9/include/linux/reiserfs_fs_sb.h linux-2.6.32.9/include/linux/reiserfs_fs_sb.h
43635--- linux-2.6.32.8/include/linux/reiserfs_fs_sb.h 2010-02-09 07:57:19.000000000 -0500 44057--- linux-2.6.32.9/include/linux/reiserfs_fs_sb.h 2010-02-09 07:57:19.000000000 -0500
43636+++ linux-2.6.32.8/include/linux/reiserfs_fs_sb.h 2010-02-13 21:45:10.759932710 -0500 44058+++ linux-2.6.32.9/include/linux/reiserfs_fs_sb.h 2010-02-23 17:09:53.320537081 -0500
43637@@ -377,7 +377,7 @@ struct reiserfs_sb_info { 44059@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
43638 /* Comment? -Hans */ 44060 /* Comment? -Hans */
43639 wait_queue_head_t s_wait; 44061 wait_queue_head_t s_wait;
@@ -43643,9 +44065,9 @@ diff -urNp linux-2.6.32.8/include/linux/reiserfs_fs_sb.h linux-2.6.32.8/include/
43643 // tree gets re-balanced 44065 // tree gets re-balanced
43644 unsigned long s_properties; /* File system properties. Currently holds 44066 unsigned long s_properties; /* File system properties. Currently holds
43645 on-disk FS format */ 44067 on-disk FS format */
43646diff -urNp linux-2.6.32.8/include/linux/sched.h linux-2.6.32.8/include/linux/sched.h 44068diff -urNp linux-2.6.32.9/include/linux/sched.h linux-2.6.32.9/include/linux/sched.h
43647--- linux-2.6.32.8/include/linux/sched.h 2010-02-09 07:57:19.000000000 -0500 44069--- linux-2.6.32.9/include/linux/sched.h 2010-02-23 17:04:12.651619895 -0500
43648+++ linux-2.6.32.8/include/linux/sched.h 2010-02-13 21:45:44.096688557 -0500 44070+++ linux-2.6.32.9/include/linux/sched.h 2010-02-23 17:09:53.320537081 -0500
43649@@ -101,6 +101,7 @@ struct bio; 44071@@ -101,6 +101,7 @@ struct bio;
43650 struct fs_struct; 44072 struct fs_struct;
43651 struct bts_context; 44073 struct bts_context;
@@ -43894,9 +44316,9 @@ diff -urNp linux-2.6.32.8/include/linux/sched.h linux-2.6.32.8/include/linux/sch
43894 extern void thread_info_cache_init(void); 44316 extern void thread_info_cache_init(void);
43895 44317
43896 #ifdef CONFIG_DEBUG_STACK_USAGE 44318 #ifdef CONFIG_DEBUG_STACK_USAGE
43897diff -urNp linux-2.6.32.8/include/linux/screen_info.h linux-2.6.32.8/include/linux/screen_info.h 44319diff -urNp linux-2.6.32.9/include/linux/screen_info.h linux-2.6.32.9/include/linux/screen_info.h
43898--- linux-2.6.32.8/include/linux/screen_info.h 2010-02-09 07:57:19.000000000 -0500 44320--- linux-2.6.32.9/include/linux/screen_info.h 2010-02-09 07:57:19.000000000 -0500
43899+++ linux-2.6.32.8/include/linux/screen_info.h 2010-02-13 21:45:10.760998020 -0500 44321+++ linux-2.6.32.9/include/linux/screen_info.h 2010-02-23 17:09:53.320537081 -0500
43900@@ -42,7 +42,8 @@ struct screen_info { 44322@@ -42,7 +42,8 @@ struct screen_info {
43901 __u16 pages; /* 0x32 */ 44323 __u16 pages; /* 0x32 */
43902 __u16 vesa_attributes; /* 0x34 */ 44324 __u16 vesa_attributes; /* 0x34 */
@@ -43907,9 +44329,9 @@ diff -urNp linux-2.6.32.8/include/linux/screen_info.h linux-2.6.32.8/include/lin
43907 } __attribute__((packed)); 44329 } __attribute__((packed));
43908 44330
43909 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ 44331 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
43910diff -urNp linux-2.6.32.8/include/linux/security.h linux-2.6.32.8/include/linux/security.h 44332diff -urNp linux-2.6.32.9/include/linux/security.h linux-2.6.32.9/include/linux/security.h
43911--- linux-2.6.32.8/include/linux/security.h 2010-02-09 07:57:19.000000000 -0500 44333--- linux-2.6.32.9/include/linux/security.h 2010-02-09 07:57:19.000000000 -0500
43912+++ linux-2.6.32.8/include/linux/security.h 2010-02-13 21:45:10.761790439 -0500 44334+++ linux-2.6.32.9/include/linux/security.h 2010-02-23 17:09:53.320537081 -0500
43913@@ -34,6 +34,7 @@ 44335@@ -34,6 +34,7 @@
43914 #include <linux/key.h> 44336 #include <linux/key.h>
43915 #include <linux/xfrm.h> 44337 #include <linux/xfrm.h>
@@ -43918,9 +44340,9 @@ diff -urNp linux-2.6.32.8/include/linux/security.h linux-2.6.32.8/include/linux/
43918 #include <net/flow.h> 44340 #include <net/flow.h>
43919 44341
43920 /* Maximum number of letters for an LSM name string */ 44342 /* Maximum number of letters for an LSM name string */
43921diff -urNp linux-2.6.32.8/include/linux/shm.h linux-2.6.32.8/include/linux/shm.h 44343diff -urNp linux-2.6.32.9/include/linux/shm.h linux-2.6.32.9/include/linux/shm.h
43922--- linux-2.6.32.8/include/linux/shm.h 2010-02-09 07:57:19.000000000 -0500 44344--- linux-2.6.32.9/include/linux/shm.h 2010-02-09 07:57:19.000000000 -0500
43923+++ linux-2.6.32.8/include/linux/shm.h 2010-02-13 21:45:10.761790439 -0500 44345+++ linux-2.6.32.9/include/linux/shm.h 2010-02-23 17:09:53.320537081 -0500
43924@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke 44346@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
43925 pid_t shm_cprid; 44347 pid_t shm_cprid;
43926 pid_t shm_lprid; 44348 pid_t shm_lprid;
@@ -43932,9 +44354,9 @@ diff -urNp linux-2.6.32.8/include/linux/shm.h linux-2.6.32.8/include/linux/shm.h
43932 }; 44354 };
43933 44355
43934 /* shm_mode upper byte flags */ 44356 /* shm_mode upper byte flags */
43935diff -urNp linux-2.6.32.8/include/linux/slab.h linux-2.6.32.8/include/linux/slab.h 44357diff -urNp linux-2.6.32.9/include/linux/slab.h linux-2.6.32.9/include/linux/slab.h
43936--- linux-2.6.32.8/include/linux/slab.h 2010-02-09 07:57:19.000000000 -0500 44358--- linux-2.6.32.9/include/linux/slab.h 2010-02-09 07:57:19.000000000 -0500
43937+++ linux-2.6.32.8/include/linux/slab.h 2010-02-13 21:45:10.761790439 -0500 44359+++ linux-2.6.32.9/include/linux/slab.h 2010-02-23 17:09:53.320537081 -0500
43938@@ -11,6 +11,7 @@ 44360@@ -11,6 +11,7 @@
43939 44361
43940 #include <linux/gfp.h> 44362 #include <linux/gfp.h>
@@ -44006,9 +44428,9 @@ diff -urNp linux-2.6.32.8/include/linux/slab.h linux-2.6.32.8/include/linux/slab
44006+}) 44428+})
44007+ 44429+
44008 #endif /* _LINUX_SLAB_H */ 44430 #endif /* _LINUX_SLAB_H */
44009diff -urNp linux-2.6.32.8/include/linux/slub_def.h linux-2.6.32.8/include/linux/slub_def.h 44431diff -urNp linux-2.6.32.9/include/linux/slub_def.h linux-2.6.32.9/include/linux/slub_def.h
44010--- linux-2.6.32.8/include/linux/slub_def.h 2010-02-09 07:57:19.000000000 -0500 44432--- linux-2.6.32.9/include/linux/slub_def.h 2010-02-09 07:57:19.000000000 -0500
44011+++ linux-2.6.32.8/include/linux/slub_def.h 2010-02-13 21:45:10.761790439 -0500 44433+++ linux-2.6.32.9/include/linux/slub_def.h 2010-02-23 17:09:53.320537081 -0500
44012@@ -86,7 +86,7 @@ struct kmem_cache { 44434@@ -86,7 +86,7 @@ struct kmem_cache {
44013 struct kmem_cache_order_objects max; 44435 struct kmem_cache_order_objects max;
44014 struct kmem_cache_order_objects min; 44436 struct kmem_cache_order_objects min;
@@ -44018,9 +44440,9 @@ diff -urNp linux-2.6.32.8/include/linux/slub_def.h linux-2.6.32.8/include/linux/
44018 void (*ctor)(void *); 44440 void (*ctor)(void *);
44019 int inuse; /* Offset to metadata */ 44441 int inuse; /* Offset to metadata */
44020 int align; /* Alignment */ 44442 int align; /* Alignment */
44021diff -urNp linux-2.6.32.8/include/linux/sonet.h linux-2.6.32.8/include/linux/sonet.h 44443diff -urNp linux-2.6.32.9/include/linux/sonet.h linux-2.6.32.9/include/linux/sonet.h
44022--- linux-2.6.32.8/include/linux/sonet.h 2010-02-09 07:57:19.000000000 -0500 44444--- linux-2.6.32.9/include/linux/sonet.h 2010-02-09 07:57:19.000000000 -0500
44023+++ linux-2.6.32.8/include/linux/sonet.h 2010-02-13 21:45:10.762998102 -0500 44445+++ linux-2.6.32.9/include/linux/sonet.h 2010-02-23 17:09:53.320537081 -0500
44024@@ -61,7 +61,7 @@ struct sonet_stats { 44446@@ -61,7 +61,7 @@ struct sonet_stats {
44025 #include <asm/atomic.h> 44447 #include <asm/atomic.h>
44026 44448
@@ -44030,9 +44452,9 @@ diff -urNp linux-2.6.32.8/include/linux/sonet.h linux-2.6.32.8/include/linux/son
44030 __SONET_ITEMS 44452 __SONET_ITEMS
44031 #undef __HANDLE_ITEM 44453 #undef __HANDLE_ITEM
44032 }; 44454 };
44033diff -urNp linux-2.6.32.8/include/linux/suspend.h linux-2.6.32.8/include/linux/suspend.h 44455diff -urNp linux-2.6.32.9/include/linux/suspend.h linux-2.6.32.9/include/linux/suspend.h
44034--- linux-2.6.32.8/include/linux/suspend.h 2010-02-09 07:57:19.000000000 -0500 44456--- linux-2.6.32.9/include/linux/suspend.h 2010-02-09 07:57:19.000000000 -0500
44035+++ linux-2.6.32.8/include/linux/suspend.h 2010-02-13 21:45:10.762998102 -0500 44457+++ linux-2.6.32.9/include/linux/suspend.h 2010-02-23 17:09:53.320537081 -0500
44036@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; 44458@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
44037 * which require special recovery actions in that situation. 44459 * which require special recovery actions in that situation.
44038 */ 44460 */
@@ -44121,9 +44543,9 @@ diff -urNp linux-2.6.32.8/include/linux/suspend.h linux-2.6.32.8/include/linux/s
44121 static inline int hibernate(void) { return -ENOSYS; } 44543 static inline int hibernate(void) { return -ENOSYS; }
44122 static inline bool system_entering_hibernation(void) { return false; } 44544 static inline bool system_entering_hibernation(void) { return false; }
44123 #endif /* CONFIG_HIBERNATION */ 44545 #endif /* CONFIG_HIBERNATION */
44124diff -urNp linux-2.6.32.8/include/linux/sysctl.h linux-2.6.32.8/include/linux/sysctl.h 44546diff -urNp linux-2.6.32.9/include/linux/sysctl.h linux-2.6.32.9/include/linux/sysctl.h
44125--- linux-2.6.32.8/include/linux/sysctl.h 2010-02-09 07:57:19.000000000 -0500 44547--- linux-2.6.32.9/include/linux/sysctl.h 2010-02-09 07:57:19.000000000 -0500
44126+++ linux-2.6.32.8/include/linux/sysctl.h 2010-02-13 21:45:10.762998102 -0500 44548+++ linux-2.6.32.9/include/linux/sysctl.h 2010-02-23 17:09:53.320537081 -0500
44127@@ -164,7 +164,11 @@ enum 44549@@ -164,7 +164,11 @@ enum
44128 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ 44550 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
44129 }; 44551 };
@@ -44137,9 +44559,9 @@ diff -urNp linux-2.6.32.8/include/linux/sysctl.h linux-2.6.32.8/include/linux/sy
44137 44559
44138 /* CTL_VM names: */ 44560 /* CTL_VM names: */
44139 enum 44561 enum
44140diff -urNp linux-2.6.32.8/include/linux/sysfs.h linux-2.6.32.8/include/linux/sysfs.h 44562diff -urNp linux-2.6.32.9/include/linux/sysfs.h linux-2.6.32.9/include/linux/sysfs.h
44141--- linux-2.6.32.8/include/linux/sysfs.h 2010-02-09 07:57:19.000000000 -0500 44563--- linux-2.6.32.9/include/linux/sysfs.h 2010-02-09 07:57:19.000000000 -0500
44142+++ linux-2.6.32.8/include/linux/sysfs.h 2010-02-13 21:45:10.762998102 -0500 44564+++ linux-2.6.32.9/include/linux/sysfs.h 2010-02-23 17:09:53.320537081 -0500
44143@@ -75,8 +75,8 @@ struct bin_attribute { 44565@@ -75,8 +75,8 @@ struct bin_attribute {
44144 }; 44566 };
44145 44567
@@ -44151,9 +44573,9 @@ diff -urNp linux-2.6.32.8/include/linux/sysfs.h linux-2.6.32.8/include/linux/sys
44151 }; 44573 };
44152 44574
44153 struct sysfs_dirent; 44575 struct sysfs_dirent;
44154diff -urNp linux-2.6.32.8/include/linux/thread_info.h linux-2.6.32.8/include/linux/thread_info.h 44576diff -urNp linux-2.6.32.9/include/linux/thread_info.h linux-2.6.32.9/include/linux/thread_info.h
44155--- linux-2.6.32.8/include/linux/thread_info.h 2010-02-09 07:57:19.000000000 -0500 44577--- linux-2.6.32.9/include/linux/thread_info.h 2010-02-09 07:57:19.000000000 -0500
44156+++ linux-2.6.32.8/include/linux/thread_info.h 2010-02-13 21:45:10.762998102 -0500 44578+++ linux-2.6.32.9/include/linux/thread_info.h 2010-02-23 17:09:53.320537081 -0500
44157@@ -23,7 +23,7 @@ struct restart_block { 44579@@ -23,7 +23,7 @@ struct restart_block {
44158 }; 44580 };
44159 /* For futex_wait and futex_wait_requeue_pi */ 44581 /* For futex_wait and futex_wait_requeue_pi */
@@ -44163,9 +44585,9 @@ diff -urNp linux-2.6.32.8/include/linux/thread_info.h linux-2.6.32.8/include/lin
44163 u32 val; 44585 u32 val;
44164 u32 flags; 44586 u32 flags;
44165 u32 bitset; 44587 u32 bitset;
44166diff -urNp linux-2.6.32.8/include/linux/tty.h linux-2.6.32.8/include/linux/tty.h 44588diff -urNp linux-2.6.32.9/include/linux/tty.h linux-2.6.32.9/include/linux/tty.h
44167--- linux-2.6.32.8/include/linux/tty.h 2010-02-09 07:57:19.000000000 -0500 44589--- linux-2.6.32.9/include/linux/tty.h 2010-02-09 07:57:19.000000000 -0500
44168+++ linux-2.6.32.8/include/linux/tty.h 2010-02-13 21:45:10.763999343 -0500 44590+++ linux-2.6.32.9/include/linux/tty.h 2010-02-23 17:09:53.320537081 -0500
44169@@ -13,6 +13,7 @@ 44591@@ -13,6 +13,7 @@
44170 #include <linux/tty_driver.h> 44592 #include <linux/tty_driver.h>
44171 #include <linux/tty_ldisc.h> 44593 #include <linux/tty_ldisc.h>
@@ -44201,9 +44623,9 @@ diff -urNp linux-2.6.32.8/include/linux/tty.h linux-2.6.32.8/include/linux/tty.h
44201 44623
44202 /* n_tty.c */ 44624 /* n_tty.c */
44203 extern struct tty_ldisc_ops tty_ldisc_N_TTY; 44625 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
44204diff -urNp linux-2.6.32.8/include/linux/tty_ldisc.h linux-2.6.32.8/include/linux/tty_ldisc.h 44626diff -urNp linux-2.6.32.9/include/linux/tty_ldisc.h linux-2.6.32.9/include/linux/tty_ldisc.h
44205--- linux-2.6.32.8/include/linux/tty_ldisc.h 2010-02-09 07:57:19.000000000 -0500 44627--- linux-2.6.32.9/include/linux/tty_ldisc.h 2010-02-09 07:57:19.000000000 -0500
44206+++ linux-2.6.32.8/include/linux/tty_ldisc.h 2010-02-13 21:45:10.763999343 -0500 44628+++ linux-2.6.32.9/include/linux/tty_ldisc.h 2010-02-23 17:09:53.320537081 -0500
44207@@ -139,7 +139,7 @@ struct tty_ldisc_ops { 44629@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
44208 44630
44209 struct module *owner; 44631 struct module *owner;
@@ -44213,9 +44635,9 @@ diff -urNp linux-2.6.32.8/include/linux/tty_ldisc.h linux-2.6.32.8/include/linux
44213 }; 44635 };
44214 44636
44215 struct tty_ldisc { 44637 struct tty_ldisc {
44216diff -urNp linux-2.6.32.8/include/linux/types.h linux-2.6.32.8/include/linux/types.h 44638diff -urNp linux-2.6.32.9/include/linux/types.h linux-2.6.32.9/include/linux/types.h
44217--- linux-2.6.32.8/include/linux/types.h 2010-02-09 07:57:19.000000000 -0500 44639--- linux-2.6.32.9/include/linux/types.h 2010-02-09 07:57:19.000000000 -0500
44218+++ linux-2.6.32.8/include/linux/types.h 2010-02-13 21:45:10.763999343 -0500 44640+++ linux-2.6.32.9/include/linux/types.h 2010-02-23 17:09:53.320537081 -0500
44219@@ -191,10 +191,26 @@ typedef struct { 44641@@ -191,10 +191,26 @@ typedef struct {
44220 volatile int counter; 44642 volatile int counter;
44221 } atomic_t; 44643 } atomic_t;
@@ -44243,9 +44665,9 @@ diff -urNp linux-2.6.32.8/include/linux/types.h linux-2.6.32.8/include/linux/typ
44243 #endif 44665 #endif
44244 44666
44245 struct ustat { 44667 struct ustat {
44246diff -urNp linux-2.6.32.8/include/linux/uaccess.h linux-2.6.32.8/include/linux/uaccess.h 44668diff -urNp linux-2.6.32.9/include/linux/uaccess.h linux-2.6.32.9/include/linux/uaccess.h
44247--- linux-2.6.32.8/include/linux/uaccess.h 2010-02-09 07:57:19.000000000 -0500 44669--- linux-2.6.32.9/include/linux/uaccess.h 2010-02-09 07:57:19.000000000 -0500
44248+++ linux-2.6.32.8/include/linux/uaccess.h 2010-02-13 21:45:10.763999343 -0500 44670+++ linux-2.6.32.9/include/linux/uaccess.h 2010-02-23 17:09:53.324062460 -0500
44249@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ 44671@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
44250 long ret; \ 44672 long ret; \
44251 mm_segment_t old_fs = get_fs(); \ 44673 mm_segment_t old_fs = get_fs(); \
@@ -44277,9 +44699,9 @@ diff -urNp linux-2.6.32.8/include/linux/uaccess.h linux-2.6.32.8/include/linux/u
44277+extern long probe_kernel_write(void *dst, const void *src, size_t size); 44699+extern long probe_kernel_write(void *dst, const void *src, size_t size);
44278 44700
44279 #endif /* __LINUX_UACCESS_H__ */ 44701 #endif /* __LINUX_UACCESS_H__ */
44280diff -urNp linux-2.6.32.8/include/linux/vmalloc.h linux-2.6.32.8/include/linux/vmalloc.h 44702diff -urNp linux-2.6.32.9/include/linux/vmalloc.h linux-2.6.32.9/include/linux/vmalloc.h
44281--- linux-2.6.32.8/include/linux/vmalloc.h 2010-02-09 07:57:19.000000000 -0500 44703--- linux-2.6.32.9/include/linux/vmalloc.h 2010-02-09 07:57:19.000000000 -0500
44282+++ linux-2.6.32.8/include/linux/vmalloc.h 2010-02-13 21:45:10.763999343 -0500 44704+++ linux-2.6.32.9/include/linux/vmalloc.h 2010-02-23 17:09:53.324062460 -0500
44283@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining 44705@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
44284 #define VM_MAP 0x00000004 /* vmap()ed pages */ 44706 #define VM_MAP 0x00000004 /* vmap()ed pages */
44285 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ 44707 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
@@ -44374,9 +44796,9 @@ diff -urNp linux-2.6.32.8/include/linux/vmalloc.h linux-2.6.32.8/include/linux/v
44374+}) 44796+})
44375+ 44797+
44376 #endif /* _LINUX_VMALLOC_H */ 44798 #endif /* _LINUX_VMALLOC_H */
44377diff -urNp linux-2.6.32.8/include/net/irda/ircomm_tty.h linux-2.6.32.8/include/net/irda/ircomm_tty.h 44799diff -urNp linux-2.6.32.9/include/net/irda/ircomm_tty.h linux-2.6.32.9/include/net/irda/ircomm_tty.h
44378--- linux-2.6.32.8/include/net/irda/ircomm_tty.h 2010-02-09 07:57:19.000000000 -0500 44800--- linux-2.6.32.9/include/net/irda/ircomm_tty.h 2010-02-09 07:57:19.000000000 -0500
44379+++ linux-2.6.32.8/include/net/irda/ircomm_tty.h 2010-02-13 21:45:10.764905108 -0500 44801+++ linux-2.6.32.9/include/net/irda/ircomm_tty.h 2010-02-23 17:09:53.324062460 -0500
44380@@ -105,8 +105,8 @@ struct ircomm_tty_cb { 44802@@ -105,8 +105,8 @@ struct ircomm_tty_cb {
44381 unsigned short close_delay; 44803 unsigned short close_delay;
44382 unsigned short closing_wait; /* time to wait before closing */ 44804 unsigned short closing_wait; /* time to wait before closing */
@@ -44388,9 +44810,9 @@ diff -urNp linux-2.6.32.8/include/net/irda/ircomm_tty.h linux-2.6.32.8/include/n
44388 44810
44389 /* Protect concurent access to : 44811 /* Protect concurent access to :
44390 * o self->open_count 44812 * o self->open_count
44391diff -urNp linux-2.6.32.8/include/net/neighbour.h linux-2.6.32.8/include/net/neighbour.h 44813diff -urNp linux-2.6.32.9/include/net/neighbour.h linux-2.6.32.9/include/net/neighbour.h
44392--- linux-2.6.32.8/include/net/neighbour.h 2010-02-09 07:57:19.000000000 -0500 44814--- linux-2.6.32.9/include/net/neighbour.h 2010-02-09 07:57:19.000000000 -0500
44393+++ linux-2.6.32.8/include/net/neighbour.h 2010-02-13 21:45:10.764905108 -0500 44815+++ linux-2.6.32.9/include/net/neighbour.h 2010-02-23 17:09:53.324062460 -0500
44394@@ -125,12 +125,12 @@ struct neighbour 44816@@ -125,12 +125,12 @@ struct neighbour
44395 struct neigh_ops 44817 struct neigh_ops
44396 { 44818 {
@@ -44410,9 +44832,9 @@ diff -urNp linux-2.6.32.8/include/net/neighbour.h linux-2.6.32.8/include/net/nei
44410 }; 44832 };
44411 44833
44412 struct pneigh_entry 44834 struct pneigh_entry
44413diff -urNp linux-2.6.32.8/include/net/sctp/sctp.h linux-2.6.32.8/include/net/sctp/sctp.h 44835diff -urNp linux-2.6.32.9/include/net/sctp/sctp.h linux-2.6.32.9/include/net/sctp/sctp.h
44414--- linux-2.6.32.8/include/net/sctp/sctp.h 2010-02-09 07:57:19.000000000 -0500 44836--- linux-2.6.32.9/include/net/sctp/sctp.h 2010-02-09 07:57:19.000000000 -0500
44415+++ linux-2.6.32.8/include/net/sctp/sctp.h 2010-02-13 21:45:10.764905108 -0500 44837+++ linux-2.6.32.9/include/net/sctp/sctp.h 2010-02-23 17:09:53.324062460 -0500
44416@@ -305,8 +305,8 @@ extern int sctp_debug_flag; 44838@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
44417 44839
44418 #else /* SCTP_DEBUG */ 44840 #else /* SCTP_DEBUG */
@@ -44424,9 +44846,9 @@ diff -urNp linux-2.6.32.8/include/net/sctp/sctp.h linux-2.6.32.8/include/net/sct
44424 #define SCTP_ENABLE_DEBUG 44846 #define SCTP_ENABLE_DEBUG
44425 #define SCTP_DISABLE_DEBUG 44847 #define SCTP_DISABLE_DEBUG
44426 #define SCTP_ASSERT(expr, str, func) 44848 #define SCTP_ASSERT(expr, str, func)
44427diff -urNp linux-2.6.32.8/include/net/tcp.h linux-2.6.32.8/include/net/tcp.h 44849diff -urNp linux-2.6.32.9/include/net/tcp.h linux-2.6.32.9/include/net/tcp.h
44428--- linux-2.6.32.8/include/net/tcp.h 2010-02-09 07:57:19.000000000 -0500 44850--- linux-2.6.32.9/include/net/tcp.h 2010-02-09 07:57:19.000000000 -0500
44429+++ linux-2.6.32.8/include/net/tcp.h 2010-02-13 21:45:10.765842705 -0500 44851+++ linux-2.6.32.9/include/net/tcp.h 2010-02-23 17:09:53.324062460 -0500
44430@@ -1420,6 +1420,7 @@ enum tcp_seq_states { 44852@@ -1420,6 +1420,7 @@ enum tcp_seq_states {
44431 struct tcp_seq_afinfo { 44853 struct tcp_seq_afinfo {
44432 char *name; 44854 char *name;
@@ -44435,9 +44857,9 @@ diff -urNp linux-2.6.32.8/include/net/tcp.h linux-2.6.32.8/include/net/tcp.h
44435 struct file_operations seq_fops; 44857 struct file_operations seq_fops;
44436 struct seq_operations seq_ops; 44858 struct seq_operations seq_ops;
44437 }; 44859 };
44438diff -urNp linux-2.6.32.8/include/net/udp.h linux-2.6.32.8/include/net/udp.h 44860diff -urNp linux-2.6.32.9/include/net/udp.h linux-2.6.32.9/include/net/udp.h
44439--- linux-2.6.32.8/include/net/udp.h 2010-02-09 07:57:19.000000000 -0500 44861--- linux-2.6.32.9/include/net/udp.h 2010-02-09 07:57:19.000000000 -0500
44440+++ linux-2.6.32.8/include/net/udp.h 2010-02-13 21:45:10.765842705 -0500 44862+++ linux-2.6.32.9/include/net/udp.h 2010-02-23 17:09:53.324062460 -0500
44441@@ -187,6 +187,7 @@ struct udp_seq_afinfo { 44863@@ -187,6 +187,7 @@ struct udp_seq_afinfo {
44442 char *name; 44864 char *name;
44443 sa_family_t family; 44865 sa_family_t family;
@@ -44446,9 +44868,9 @@ diff -urNp linux-2.6.32.8/include/net/udp.h linux-2.6.32.8/include/net/udp.h
44446 struct file_operations seq_fops; 44868 struct file_operations seq_fops;
44447 struct seq_operations seq_ops; 44869 struct seq_operations seq_ops;
44448 }; 44870 };
44449diff -urNp linux-2.6.32.8/include/sound/ac97_codec.h linux-2.6.32.8/include/sound/ac97_codec.h 44871diff -urNp linux-2.6.32.9/include/sound/ac97_codec.h linux-2.6.32.9/include/sound/ac97_codec.h
44450--- linux-2.6.32.8/include/sound/ac97_codec.h 2010-02-09 07:57:19.000000000 -0500 44872--- linux-2.6.32.9/include/sound/ac97_codec.h 2010-02-09 07:57:19.000000000 -0500
44451+++ linux-2.6.32.8/include/sound/ac97_codec.h 2010-02-13 21:45:10.765842705 -0500 44873+++ linux-2.6.32.9/include/sound/ac97_codec.h 2010-02-23 17:09:53.324062460 -0500
44452@@ -419,15 +419,15 @@ 44874@@ -419,15 +419,15 @@
44453 struct snd_ac97; 44875 struct snd_ac97;
44454 44876
@@ -44481,9 +44903,48 @@ diff -urNp linux-2.6.32.8/include/sound/ac97_codec.h linux-2.6.32.8/include/soun
44481 void *private_data; 44903 void *private_data;
44482 void (*private_free) (struct snd_ac97 *ac97); 44904 void (*private_free) (struct snd_ac97 *ac97);
44483 /* --- */ 44905 /* --- */
44484diff -urNp linux-2.6.32.8/include/video/uvesafb.h linux-2.6.32.8/include/video/uvesafb.h 44906diff -urNp linux-2.6.32.9/include/trace/events/irq.h linux-2.6.32.9/include/trace/events/irq.h
44485--- linux-2.6.32.8/include/video/uvesafb.h 2010-02-09 07:57:19.000000000 -0500 44907--- linux-2.6.32.9/include/trace/events/irq.h 2010-02-09 07:57:19.000000000 -0500
44486+++ linux-2.6.32.8/include/video/uvesafb.h 2010-02-13 21:45:10.765842705 -0500 44908+++ linux-2.6.32.9/include/trace/events/irq.h 2010-02-23 17:09:53.324062460 -0500
44909@@ -34,7 +34,7 @@
44910 */
44911 TRACE_EVENT(irq_handler_entry,
44912
44913- TP_PROTO(int irq, struct irqaction *action),
44914+ TP_PROTO(int irq, const struct irqaction *action),
44915
44916 TP_ARGS(irq, action),
44917
44918@@ -64,7 +64,7 @@ TRACE_EVENT(irq_handler_entry,
44919 */
44920 TRACE_EVENT(irq_handler_exit,
44921
44922- TP_PROTO(int irq, struct irqaction *action, int ret),
44923+ TP_PROTO(int irq, const struct irqaction *action, int ret),
44924
44925 TP_ARGS(irq, action, ret),
44926
44927@@ -95,7 +95,7 @@ TRACE_EVENT(irq_handler_exit,
44928 */
44929 TRACE_EVENT(softirq_entry,
44930
44931- TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
44932+ TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec),
44933
44934 TP_ARGS(h, vec),
44935
44936@@ -124,7 +124,7 @@ TRACE_EVENT(softirq_entry,
44937 */
44938 TRACE_EVENT(softirq_exit,
44939
44940- TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
44941+ TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec),
44942
44943 TP_ARGS(h, vec),
44944
44945diff -urNp linux-2.6.32.9/include/video/uvesafb.h linux-2.6.32.9/include/video/uvesafb.h
44946--- linux-2.6.32.9/include/video/uvesafb.h 2010-02-09 07:57:19.000000000 -0500
44947+++ linux-2.6.32.9/include/video/uvesafb.h 2010-02-23 17:09:53.324062460 -0500
44487@@ -177,6 +177,7 @@ struct uvesafb_par { 44948@@ -177,6 +177,7 @@ struct uvesafb_par {
44488 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ 44949 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
44489 u8 pmi_setpal; /* PMI for palette changes */ 44950 u8 pmi_setpal; /* PMI for palette changes */
@@ -44492,9 +44953,9 @@ diff -urNp linux-2.6.32.8/include/video/uvesafb.h linux-2.6.32.8/include/video/u
44492 void *pmi_start; 44953 void *pmi_start;
44493 void *pmi_pal; 44954 void *pmi_pal;
44494 u8 *vbe_state_orig; /* 44955 u8 *vbe_state_orig; /*
44495diff -urNp linux-2.6.32.8/init/do_mounts.c linux-2.6.32.8/init/do_mounts.c 44956diff -urNp linux-2.6.32.9/init/do_mounts.c linux-2.6.32.9/init/do_mounts.c
44496--- linux-2.6.32.8/init/do_mounts.c 2010-02-09 07:57:19.000000000 -0500 44957--- linux-2.6.32.9/init/do_mounts.c 2010-02-09 07:57:19.000000000 -0500
44497+++ linux-2.6.32.8/init/do_mounts.c 2010-02-13 21:45:10.784313218 -0500 44958+++ linux-2.6.32.9/init/do_mounts.c 2010-02-23 17:09:53.324062460 -0500
44498@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa 44959@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
44499 44960
44500 static int __init do_mount_root(char *name, char *fs, int flags, void *data) 44961 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -44540,9 +45001,9 @@ diff -urNp linux-2.6.32.8/init/do_mounts.c linux-2.6.32.8/init/do_mounts.c
44540+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); 45001+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
44541+ sys_chroot((__force char __user *)"."); 45002+ sys_chroot((__force char __user *)".");
44542 } 45003 }
44543diff -urNp linux-2.6.32.8/init/do_mounts.h linux-2.6.32.8/init/do_mounts.h 45004diff -urNp linux-2.6.32.9/init/do_mounts.h linux-2.6.32.9/init/do_mounts.h
44544--- linux-2.6.32.8/init/do_mounts.h 2010-02-09 07:57:19.000000000 -0500 45005--- linux-2.6.32.9/init/do_mounts.h 2010-02-09 07:57:19.000000000 -0500
44545+++ linux-2.6.32.8/init/do_mounts.h 2010-02-13 21:45:10.787011020 -0500 45006+++ linux-2.6.32.9/init/do_mounts.h 2010-02-23 17:09:53.324062460 -0500
44546@@ -15,15 +15,15 @@ extern int root_mountflags; 45007@@ -15,15 +15,15 @@ extern int root_mountflags;
44547 45008
44548 static inline int create_dev(char *name, dev_t dev) 45009 static inline int create_dev(char *name, dev_t dev)
@@ -44562,9 +45023,9 @@ diff -urNp linux-2.6.32.8/init/do_mounts.h linux-2.6.32.8/init/do_mounts.h
44562 return 0; 45023 return 0;
44563 if (!S_ISBLK(stat.st_mode)) 45024 if (!S_ISBLK(stat.st_mode))
44564 return 0; 45025 return 0;
44565diff -urNp linux-2.6.32.8/init/do_mounts_initrd.c linux-2.6.32.8/init/do_mounts_initrd.c 45026diff -urNp linux-2.6.32.9/init/do_mounts_initrd.c linux-2.6.32.9/init/do_mounts_initrd.c
44566--- linux-2.6.32.8/init/do_mounts_initrd.c 2010-02-09 07:57:19.000000000 -0500 45027--- linux-2.6.32.9/init/do_mounts_initrd.c 2010-02-09 07:57:19.000000000 -0500
44567+++ linux-2.6.32.8/init/do_mounts_initrd.c 2010-02-13 21:45:10.807878515 -0500 45028+++ linux-2.6.32.9/init/do_mounts_initrd.c 2010-02-23 17:09:53.324062460 -0500
44568@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel 45029@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
44569 sys_close(old_fd);sys_close(root_fd); 45030 sys_close(old_fd);sys_close(root_fd);
44570 sys_close(0);sys_close(1);sys_close(2); 45031 sys_close(0);sys_close(1);sys_close(2);
@@ -44648,9 +45109,9 @@ diff -urNp linux-2.6.32.8/init/do_mounts_initrd.c linux-2.6.32.8/init/do_mounts_
44648+ sys_unlink((__force const char __user *)"/initrd.image"); 45109+ sys_unlink((__force const char __user *)"/initrd.image");
44649 return 0; 45110 return 0;
44650 } 45111 }
44651diff -urNp linux-2.6.32.8/init/do_mounts_md.c linux-2.6.32.8/init/do_mounts_md.c 45112diff -urNp linux-2.6.32.9/init/do_mounts_md.c linux-2.6.32.9/init/do_mounts_md.c
44652--- linux-2.6.32.8/init/do_mounts_md.c 2010-02-09 07:57:19.000000000 -0500 45113--- linux-2.6.32.9/init/do_mounts_md.c 2010-02-09 07:57:19.000000000 -0500
44653+++ linux-2.6.32.8/init/do_mounts_md.c 2010-02-13 21:45:10.822699556 -0500 45114+++ linux-2.6.32.9/init/do_mounts_md.c 2010-02-23 17:09:53.324062460 -0500
44654@@ -170,7 +170,7 @@ static void __init md_setup_drive(void) 45115@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
44655 partitioned ? "_d" : "", minor, 45116 partitioned ? "_d" : "", minor,
44656 md_setup_args[ent].device_names); 45117 md_setup_args[ent].device_names);
@@ -44678,9 +45139,9 @@ diff -urNp linux-2.6.32.8/init/do_mounts_md.c linux-2.6.32.8/init/do_mounts_md.c
44678 if (fd >= 0) { 45139 if (fd >= 0) {
44679 sys_ioctl(fd, RAID_AUTORUN, raid_autopart); 45140 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
44680 sys_close(fd); 45141 sys_close(fd);
44681diff -urNp linux-2.6.32.8/init/initramfs.c linux-2.6.32.8/init/initramfs.c 45142diff -urNp linux-2.6.32.9/init/initramfs.c linux-2.6.32.9/init/initramfs.c
44682--- linux-2.6.32.8/init/initramfs.c 2010-02-09 07:57:19.000000000 -0500 45143--- linux-2.6.32.9/init/initramfs.c 2010-02-09 07:57:19.000000000 -0500
44683+++ linux-2.6.32.8/init/initramfs.c 2010-02-13 21:45:10.825527800 -0500 45144+++ linux-2.6.32.9/init/initramfs.c 2010-02-23 17:09:53.324062460 -0500
44684@@ -74,7 +74,7 @@ static void __init free_hash(void) 45145@@ -74,7 +74,7 @@ static void __init free_hash(void)
44685 } 45146 }
44686 } 45147 }
@@ -44789,9 +45250,9 @@ diff -urNp linux-2.6.32.8/init/initramfs.c linux-2.6.32.8/init/initramfs.c
44789 state = SkipIt; 45250 state = SkipIt;
44790 next_state = Reset; 45251 next_state = Reset;
44791 return 0; 45252 return 0;
44792diff -urNp linux-2.6.32.8/init/Kconfig linux-2.6.32.8/init/Kconfig 45253diff -urNp linux-2.6.32.9/init/Kconfig linux-2.6.32.9/init/Kconfig
44793--- linux-2.6.32.8/init/Kconfig 2010-02-09 07:57:19.000000000 -0500 45254--- linux-2.6.32.9/init/Kconfig 2010-02-09 07:57:19.000000000 -0500
44794+++ linux-2.6.32.8/init/Kconfig 2010-02-13 21:45:10.826573225 -0500 45255+++ linux-2.6.32.9/init/Kconfig 2010-02-23 17:09:53.324062460 -0500
44795@@ -1026,7 +1026,7 @@ config SLUB_DEBUG 45256@@ -1026,7 +1026,7 @@ config SLUB_DEBUG
44796 45257
44797 config COMPAT_BRK 45258 config COMPAT_BRK
@@ -44813,9 +45274,9 @@ diff -urNp linux-2.6.32.8/init/Kconfig linux-2.6.32.8/init/Kconfig
44813 45274
44814 config RT_MUTEXES 45275 config RT_MUTEXES
44815 boolean 45276 boolean
44816diff -urNp linux-2.6.32.8/init/main.c linux-2.6.32.8/init/main.c 45277diff -urNp linux-2.6.32.9/init/main.c linux-2.6.32.9/init/main.c
44817--- linux-2.6.32.8/init/main.c 2010-02-09 07:57:19.000000000 -0500 45278--- linux-2.6.32.9/init/main.c 2010-02-09 07:57:19.000000000 -0500
44818+++ linux-2.6.32.8/init/main.c 2010-02-13 21:45:10.827626340 -0500 45279+++ linux-2.6.32.9/init/main.c 2010-02-23 17:09:53.324062460 -0500
44819@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) 45280@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
44820 #ifdef CONFIG_TC 45281 #ifdef CONFIG_TC
44821 extern void tc_init(void); 45282 extern void tc_init(void);
@@ -44945,9 +45406,9 @@ diff -urNp linux-2.6.32.8/init/main.c linux-2.6.32.8/init/main.c
44945 /* 45406 /*
44946 * Ok, we have completed the initial bootup, and 45407 * Ok, we have completed the initial bootup, and
44947 * we're essentially up and running. Get rid of the 45408 * we're essentially up and running. Get rid of the
44948diff -urNp linux-2.6.32.8/init/noinitramfs.c linux-2.6.32.8/init/noinitramfs.c 45409diff -urNp linux-2.6.32.9/init/noinitramfs.c linux-2.6.32.9/init/noinitramfs.c
44949--- linux-2.6.32.8/init/noinitramfs.c 2010-02-09 07:57:19.000000000 -0500 45410--- linux-2.6.32.9/init/noinitramfs.c 2010-02-09 07:57:19.000000000 -0500
44950+++ linux-2.6.32.8/init/noinitramfs.c 2010-02-13 21:45:10.828546413 -0500 45411+++ linux-2.6.32.9/init/noinitramfs.c 2010-02-23 17:09:53.324062460 -0500
44951@@ -29,7 +29,7 @@ static int __init default_rootfs(void) 45412@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
44952 { 45413 {
44953 int err; 45414 int err;
@@ -44966,9 +45427,9 @@ diff -urNp linux-2.6.32.8/init/noinitramfs.c linux-2.6.32.8/init/noinitramfs.c
44966 if (err < 0) 45427 if (err < 0)
44967 goto out; 45428 goto out;
44968 45429
44969diff -urNp linux-2.6.32.8/ipc/ipc_sysctl.c linux-2.6.32.8/ipc/ipc_sysctl.c 45430diff -urNp linux-2.6.32.9/ipc/ipc_sysctl.c linux-2.6.32.9/ipc/ipc_sysctl.c
44970--- linux-2.6.32.8/ipc/ipc_sysctl.c 2010-02-09 07:57:19.000000000 -0500 45431--- linux-2.6.32.9/ipc/ipc_sysctl.c 2010-02-09 07:57:19.000000000 -0500
44971+++ linux-2.6.32.8/ipc/ipc_sysctl.c 2010-02-13 21:45:10.828546413 -0500 45432+++ linux-2.6.32.9/ipc/ipc_sysctl.c 2010-02-23 17:09:53.324062460 -0500
44972@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] 45433@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
44973 .extra1 = &zero, 45434 .extra1 = &zero,
44974 .extra2 = &one, 45435 .extra2 = &one,
@@ -44987,9 +45448,9 @@ diff -urNp linux-2.6.32.8/ipc/ipc_sysctl.c linux-2.6.32.8/ipc/ipc_sysctl.c
44987 }; 45448 };
44988 45449
44989 static int __init ipc_sysctl_init(void) 45450 static int __init ipc_sysctl_init(void)
44990diff -urNp linux-2.6.32.8/ipc/mqueue.c linux-2.6.32.8/ipc/mqueue.c 45451diff -urNp linux-2.6.32.9/ipc/mqueue.c linux-2.6.32.9/ipc/mqueue.c
44991--- linux-2.6.32.8/ipc/mqueue.c 2010-02-09 07:57:19.000000000 -0500 45452--- linux-2.6.32.9/ipc/mqueue.c 2010-02-09 07:57:19.000000000 -0500
44992+++ linux-2.6.32.8/ipc/mqueue.c 2010-02-13 21:45:10.828546413 -0500 45453+++ linux-2.6.32.9/ipc/mqueue.c 2010-02-23 17:09:53.324062460 -0500
44993@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st 45454@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
44994 mq_bytes = (mq_msg_tblsz + 45455 mq_bytes = (mq_msg_tblsz +
44995 (info->attr.mq_maxmsg * info->attr.mq_msgsize)); 45456 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -44998,9 +45459,9 @@ diff -urNp linux-2.6.32.8/ipc/mqueue.c linux-2.6.32.8/ipc/mqueue.c
44998 spin_lock(&mq_lock); 45459 spin_lock(&mq_lock);
44999 if (u->mq_bytes + mq_bytes < u->mq_bytes || 45460 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
45000 u->mq_bytes + mq_bytes > 45461 u->mq_bytes + mq_bytes >
45001diff -urNp linux-2.6.32.8/ipc/shm.c linux-2.6.32.8/ipc/shm.c 45462diff -urNp linux-2.6.32.9/ipc/shm.c linux-2.6.32.9/ipc/shm.c
45002--- linux-2.6.32.8/ipc/shm.c 2010-02-09 07:57:19.000000000 -0500 45463--- linux-2.6.32.9/ipc/shm.c 2010-02-09 07:57:19.000000000 -0500
45003+++ linux-2.6.32.8/ipc/shm.c 2010-02-13 21:45:10.829552044 -0500 45464+++ linux-2.6.32.9/ipc/shm.c 2010-02-23 17:09:53.324062460 -0500
45004@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name 45465@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
45005 static int sysvipc_shm_proc_show(struct seq_file *s, void *it); 45466 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
45006 #endif 45467 #endif
@@ -45053,9 +45514,9 @@ diff -urNp linux-2.6.32.8/ipc/shm.c linux-2.6.32.8/ipc/shm.c
45053 size = i_size_read(path.dentry->d_inode); 45514 size = i_size_read(path.dentry->d_inode);
45054 shm_unlock(shp); 45515 shm_unlock(shp);
45055 45516
45056diff -urNp linux-2.6.32.8/kernel/acct.c linux-2.6.32.8/kernel/acct.c 45517diff -urNp linux-2.6.32.9/kernel/acct.c linux-2.6.32.9/kernel/acct.c
45057--- linux-2.6.32.8/kernel/acct.c 2010-02-09 07:57:19.000000000 -0500 45518--- linux-2.6.32.9/kernel/acct.c 2010-02-09 07:57:19.000000000 -0500
45058+++ linux-2.6.32.8/kernel/acct.c 2010-02-13 21:45:10.829552044 -0500 45519+++ linux-2.6.32.9/kernel/acct.c 2010-02-23 17:09:53.328047341 -0500
45059@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a 45520@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
45060 */ 45521 */
45061 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; 45522 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -45065,9 +45526,9 @@ diff -urNp linux-2.6.32.8/kernel/acct.c linux-2.6.32.8/kernel/acct.c
45065 sizeof(acct_t), &file->f_pos); 45526 sizeof(acct_t), &file->f_pos);
45066 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; 45527 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
45067 set_fs(fs); 45528 set_fs(fs);
45068diff -urNp linux-2.6.32.8/kernel/capability.c linux-2.6.32.8/kernel/capability.c 45529diff -urNp linux-2.6.32.9/kernel/capability.c linux-2.6.32.9/kernel/capability.c
45069--- linux-2.6.32.8/kernel/capability.c 2010-02-09 07:57:19.000000000 -0500 45530--- linux-2.6.32.9/kernel/capability.c 2010-02-09 07:57:19.000000000 -0500
45070+++ linux-2.6.32.8/kernel/capability.c 2010-02-13 21:45:10.829552044 -0500 45531+++ linux-2.6.32.9/kernel/capability.c 2010-02-23 17:09:53.328047341 -0500
45071@@ -306,10 +306,21 @@ int capable(int cap) 45532@@ -306,10 +306,21 @@ int capable(int cap)
45072 BUG(); 45533 BUG();
45073 } 45534 }
@@ -45091,9 +45552,9 @@ diff -urNp linux-2.6.32.8/kernel/capability.c linux-2.6.32.8/kernel/capability.c
45091+ 45552+
45092 EXPORT_SYMBOL(capable); 45553 EXPORT_SYMBOL(capable);
45093+EXPORT_SYMBOL(capable_nolog); 45554+EXPORT_SYMBOL(capable_nolog);
45094diff -urNp linux-2.6.32.8/kernel/configs.c linux-2.6.32.8/kernel/configs.c 45555diff -urNp linux-2.6.32.9/kernel/configs.c linux-2.6.32.9/kernel/configs.c
45095--- linux-2.6.32.8/kernel/configs.c 2010-02-09 07:57:19.000000000 -0500 45556--- linux-2.6.32.9/kernel/configs.c 2010-02-09 07:57:19.000000000 -0500
45096+++ linux-2.6.32.8/kernel/configs.c 2010-02-13 21:45:10.829552044 -0500 45557+++ linux-2.6.32.9/kernel/configs.c 2010-02-23 17:09:53.328047341 -0500
45097@@ -73,8 +73,19 @@ static int __init ikconfig_init(void) 45558@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
45098 struct proc_dir_entry *entry; 45559 struct proc_dir_entry *entry;
45099 45560
@@ -45114,9 +45575,9 @@ diff -urNp linux-2.6.32.8/kernel/configs.c linux-2.6.32.8/kernel/configs.c
45114 if (!entry) 45575 if (!entry)
45115 return -ENOMEM; 45576 return -ENOMEM;
45116 45577
45117diff -urNp linux-2.6.32.8/kernel/cpu.c linux-2.6.32.8/kernel/cpu.c 45578diff -urNp linux-2.6.32.9/kernel/cpu.c linux-2.6.32.9/kernel/cpu.c
45118--- linux-2.6.32.8/kernel/cpu.c 2010-02-09 07:57:19.000000000 -0500 45579--- linux-2.6.32.9/kernel/cpu.c 2010-02-09 07:57:19.000000000 -0500
45119+++ linux-2.6.32.8/kernel/cpu.c 2010-02-13 21:45:10.830561427 -0500 45580+++ linux-2.6.32.9/kernel/cpu.c 2010-02-23 17:09:53.328047341 -0500
45120@@ -19,7 +19,7 @@ 45581@@ -19,7 +19,7 @@
45121 /* Serializes the updates to cpu_online_mask, cpu_present_mask */ 45582 /* Serializes the updates to cpu_online_mask, cpu_present_mask */
45122 static DEFINE_MUTEX(cpu_add_remove_lock); 45583 static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -45126,9 +45587,9 @@ diff -urNp linux-2.6.32.8/kernel/cpu.c linux-2.6.32.8/kernel/cpu.c
45126 45587
45127 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. 45588 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
45128 * Should always be manipulated under cpu_add_remove_lock 45589 * Should always be manipulated under cpu_add_remove_lock
45129diff -urNp linux-2.6.32.8/kernel/cred.c linux-2.6.32.8/kernel/cred.c 45590diff -urNp linux-2.6.32.9/kernel/cred.c linux-2.6.32.9/kernel/cred.c
45130--- linux-2.6.32.8/kernel/cred.c 2010-02-09 07:57:19.000000000 -0500 45591--- linux-2.6.32.9/kernel/cred.c 2010-02-09 07:57:19.000000000 -0500
45131+++ linux-2.6.32.8/kernel/cred.c 2010-02-13 21:45:10.830561427 -0500 45592+++ linux-2.6.32.9/kernel/cred.c 2010-02-23 17:09:53.328047341 -0500
45132@@ -520,6 +520,8 @@ int commit_creds(struct cred *new) 45593@@ -520,6 +520,8 @@ int commit_creds(struct cred *new)
45133 45594
45134 get_cred(new); /* we will require a ref for the subj creds too */ 45595 get_cred(new); /* we will require a ref for the subj creds too */
@@ -45138,9 +45599,9 @@ diff -urNp linux-2.6.32.8/kernel/cred.c linux-2.6.32.8/kernel/cred.c
45138 /* dumpability changes */ 45599 /* dumpability changes */
45139 if (old->euid != new->euid || 45600 if (old->euid != new->euid ||
45140 old->egid != new->egid || 45601 old->egid != new->egid ||
45141diff -urNp linux-2.6.32.8/kernel/exit.c linux-2.6.32.8/kernel/exit.c 45602diff -urNp linux-2.6.32.9/kernel/exit.c linux-2.6.32.9/kernel/exit.c
45142--- linux-2.6.32.8/kernel/exit.c 2010-02-09 07:57:19.000000000 -0500 45603--- linux-2.6.32.9/kernel/exit.c 2010-02-09 07:57:19.000000000 -0500
45143+++ linux-2.6.32.8/kernel/exit.c 2010-02-13 21:45:10.830561427 -0500 45604+++ linux-2.6.32.9/kernel/exit.c 2010-02-23 17:09:53.328047341 -0500
45144@@ -56,6 +56,10 @@ 45605@@ -56,6 +56,10 @@
45145 #include <asm/mmu_context.h> 45606 #include <asm/mmu_context.h>
45146 #include "cred-internals.h" 45607 #include "cred-internals.h"
@@ -45230,9 +45691,9 @@ diff -urNp linux-2.6.32.8/kernel/exit.c linux-2.6.32.8/kernel/exit.c
45230 45691
45231 get_task_struct(p); 45692 get_task_struct(p);
45232 read_unlock(&tasklist_lock); 45693 read_unlock(&tasklist_lock);
45233diff -urNp linux-2.6.32.8/kernel/fork.c linux-2.6.32.8/kernel/fork.c 45694diff -urNp linux-2.6.32.9/kernel/fork.c linux-2.6.32.9/kernel/fork.c
45234--- linux-2.6.32.8/kernel/fork.c 2010-02-09 07:57:19.000000000 -0500 45695--- linux-2.6.32.9/kernel/fork.c 2010-02-09 07:57:19.000000000 -0500
45235+++ linux-2.6.32.8/kernel/fork.c 2010-02-13 21:45:10.831839630 -0500 45696+++ linux-2.6.32.9/kernel/fork.c 2010-02-23 17:09:53.328047341 -0500
45236@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru 45697@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
45237 *stackend = STACK_END_MAGIC; /* for overflow detection */ 45698 *stackend = STACK_END_MAGIC; /* for overflow detection */
45238 45699
@@ -45385,9 +45846,9 @@ diff -urNp linux-2.6.32.8/kernel/fork.c linux-2.6.32.8/kernel/fork.c
45385 } 45846 }
45386 45847
45387 if (new_mm) { 45848 if (new_mm) {
45388diff -urNp linux-2.6.32.8/kernel/futex.c linux-2.6.32.8/kernel/futex.c 45849diff -urNp linux-2.6.32.9/kernel/futex.c linux-2.6.32.9/kernel/futex.c
45389--- linux-2.6.32.8/kernel/futex.c 2010-02-09 07:57:19.000000000 -0500 45850--- linux-2.6.32.9/kernel/futex.c 2010-02-23 17:04:12.667616804 -0500
45390+++ linux-2.6.32.8/kernel/futex.c 2010-02-13 21:45:10.831839630 -0500 45851+++ linux-2.6.32.9/kernel/futex.c 2010-02-23 17:09:53.328047341 -0500
45391@@ -54,6 +54,7 @@ 45852@@ -54,6 +54,7 @@
45392 #include <linux/mount.h> 45853 #include <linux/mount.h>
45393 #include <linux/pagemap.h> 45854 #include <linux/pagemap.h>
@@ -45408,7 +45869,7 @@ diff -urNp linux-2.6.32.8/kernel/futex.c linux-2.6.32.8/kernel/futex.c
45408 /* 45869 /*
45409 * The futex address must be "naturally" aligned. 45870 * The futex address must be "naturally" aligned.
45410 */ 45871 */
45411@@ -1828,7 +1834,7 @@ retry: 45872@@ -1852,7 +1858,7 @@ retry:
45412 45873
45413 restart = &current_thread_info()->restart_block; 45874 restart = &current_thread_info()->restart_block;
45414 restart->fn = futex_wait_restart; 45875 restart->fn = futex_wait_restart;
@@ -45417,7 +45878,7 @@ diff -urNp linux-2.6.32.8/kernel/futex.c linux-2.6.32.8/kernel/futex.c
45417 restart->futex.val = val; 45878 restart->futex.val = val;
45418 restart->futex.time = abs_time->tv64; 45879 restart->futex.time = abs_time->tv64;
45419 restart->futex.bitset = bitset; 45880 restart->futex.bitset = bitset;
45420@@ -2361,7 +2367,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pi 45881@@ -2385,7 +2391,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
45421 { 45882 {
45422 struct robust_list_head __user *head; 45883 struct robust_list_head __user *head;
45423 unsigned long ret; 45884 unsigned long ret;
@@ -45429,7 +45890,7 @@ diff -urNp linux-2.6.32.8/kernel/futex.c linux-2.6.32.8/kernel/futex.c
45429 45890
45430 if (!futex_cmpxchg_enabled) 45891 if (!futex_cmpxchg_enabled)
45431 return -ENOSYS; 45892 return -ENOSYS;
45432@@ -2377,11 +2386,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi 45893@@ -2401,11 +2410,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
45433 if (!p) 45894 if (!p)
45434 goto err_unlock; 45895 goto err_unlock;
45435 ret = -EPERM; 45896 ret = -EPERM;
@@ -45446,7 +45907,7 @@ diff -urNp linux-2.6.32.8/kernel/futex.c linux-2.6.32.8/kernel/futex.c
45446 head = p->robust_list; 45907 head = p->robust_list;
45447 rcu_read_unlock(); 45908 rcu_read_unlock();
45448 } 45909 }
45449@@ -2443,7 +2457,7 @@ retry: 45910@@ -2467,7 +2481,7 @@ retry:
45450 */ 45911 */
45451 static inline int fetch_robust_entry(struct robust_list __user **entry, 45912 static inline int fetch_robust_entry(struct robust_list __user **entry,
45452 struct robust_list __user * __user *head, 45913 struct robust_list __user * __user *head,
@@ -45455,9 +45916,9 @@ diff -urNp linux-2.6.32.8/kernel/futex.c linux-2.6.32.8/kernel/futex.c
45455 { 45916 {
45456 unsigned long uentry; 45917 unsigned long uentry;
45457 45918
45458diff -urNp linux-2.6.32.8/kernel/futex_compat.c linux-2.6.32.8/kernel/futex_compat.c 45919diff -urNp linux-2.6.32.9/kernel/futex_compat.c linux-2.6.32.9/kernel/futex_compat.c
45459--- linux-2.6.32.8/kernel/futex_compat.c 2010-02-09 07:57:19.000000000 -0500 45920--- linux-2.6.32.9/kernel/futex_compat.c 2010-02-09 07:57:19.000000000 -0500
45460+++ linux-2.6.32.8/kernel/futex_compat.c 2010-02-13 21:45:10.831839630 -0500 45921+++ linux-2.6.32.9/kernel/futex_compat.c 2010-02-23 17:09:53.328047341 -0500
45461@@ -10,6 +10,7 @@ 45922@@ -10,6 +10,7 @@
45462 #include <linux/compat.h> 45923 #include <linux/compat.h>
45463 #include <linux/nsproxy.h> 45924 #include <linux/nsproxy.h>
@@ -45495,9 +45956,9 @@ diff -urNp linux-2.6.32.8/kernel/futex_compat.c linux-2.6.32.8/kernel/futex_comp
45495 head = p->compat_robust_list; 45956 head = p->compat_robust_list;
45496 read_unlock(&tasklist_lock); 45957 read_unlock(&tasklist_lock);
45497 } 45958 }
45498diff -urNp linux-2.6.32.8/kernel/gcov/base.c linux-2.6.32.8/kernel/gcov/base.c 45959diff -urNp linux-2.6.32.9/kernel/gcov/base.c linux-2.6.32.9/kernel/gcov/base.c
45499--- linux-2.6.32.8/kernel/gcov/base.c 2010-02-09 07:57:19.000000000 -0500 45960--- linux-2.6.32.9/kernel/gcov/base.c 2010-02-09 07:57:19.000000000 -0500
45500+++ linux-2.6.32.8/kernel/gcov/base.c 2010-02-13 21:45:10.833034889 -0500 45961+++ linux-2.6.32.9/kernel/gcov/base.c 2010-02-23 17:09:53.328047341 -0500
45501@@ -102,11 +102,6 @@ void gcov_enable_events(void) 45962@@ -102,11 +102,6 @@ void gcov_enable_events(void)
45502 } 45963 }
45503 45964
@@ -45519,9 +45980,21 @@ diff -urNp linux-2.6.32.8/kernel/gcov/base.c linux-2.6.32.8/kernel/gcov/base.c
45519 if (prev) 45980 if (prev)
45520 prev->next = info->next; 45981 prev->next = info->next;
45521 else 45982 else
45522diff -urNp linux-2.6.32.8/kernel/kallsyms.c linux-2.6.32.8/kernel/kallsyms.c 45983diff -urNp linux-2.6.32.9/kernel/hrtimer.c linux-2.6.32.9/kernel/hrtimer.c
45523--- linux-2.6.32.8/kernel/kallsyms.c 2010-02-09 07:57:19.000000000 -0500 45984--- linux-2.6.32.9/kernel/hrtimer.c 2010-02-09 07:57:19.000000000 -0500
45524+++ linux-2.6.32.8/kernel/kallsyms.c 2010-02-13 21:45:10.833034889 -0500 45985+++ linux-2.6.32.9/kernel/hrtimer.c 2010-02-23 17:09:53.328047341 -0500
45986@@ -1364,7 +1364,7 @@ void hrtimer_peek_ahead_timers(void)
45987 local_irq_restore(flags);
45988 }
45989
45990-static void run_hrtimer_softirq(struct softirq_action *h)
45991+static void run_hrtimer_softirq(void)
45992 {
45993 hrtimer_peek_ahead_timers();
45994 }
45995diff -urNp linux-2.6.32.9/kernel/kallsyms.c linux-2.6.32.9/kernel/kallsyms.c
45996--- linux-2.6.32.9/kernel/kallsyms.c 2010-02-09 07:57:19.000000000 -0500
45997+++ linux-2.6.32.9/kernel/kallsyms.c 2010-02-23 17:09:53.328047341 -0500
45525@@ -11,6 +11,9 @@ 45998@@ -11,6 +11,9 @@
45526 * Changed the compression method from stem compression to "table lookup" 45999 * Changed the compression method from stem compression to "table lookup"
45527 * compression (see scripts/kallsyms.c for a more complete description) 46000 * compression (see scripts/kallsyms.c for a more complete description)
@@ -45596,9 +46069,9 @@ diff -urNp linux-2.6.32.8/kernel/kallsyms.c linux-2.6.32.8/kernel/kallsyms.c
45596 if (!iter) 46069 if (!iter)
45597 return -ENOMEM; 46070 return -ENOMEM;
45598 reset_iter(iter, 0); 46071 reset_iter(iter, 0);
45599diff -urNp linux-2.6.32.8/kernel/kgdb.c linux-2.6.32.8/kernel/kgdb.c 46072diff -urNp linux-2.6.32.9/kernel/kgdb.c linux-2.6.32.9/kernel/kgdb.c
45600--- linux-2.6.32.8/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500 46073--- linux-2.6.32.9/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500
45601+++ linux-2.6.32.8/kernel/kgdb.c 2010-02-13 21:45:10.833538724 -0500 46074+++ linux-2.6.32.9/kernel/kgdb.c 2010-02-23 17:09:53.331561124 -0500
45602@@ -86,7 +86,7 @@ static int kgdb_io_module_registered; 46075@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
45603 /* Guard for recursive entry */ 46076 /* Guard for recursive entry */
45604 static int exception_level; 46077 static int exception_level;
@@ -45626,9 +46099,9 @@ diff -urNp linux-2.6.32.8/kernel/kgdb.c linux-2.6.32.8/kernel/kgdb.c
45626 { 46099 {
45627 BUG_ON(kgdb_connected); 46100 BUG_ON(kgdb_connected);
45628 46101
45629diff -urNp linux-2.6.32.8/kernel/kmod.c linux-2.6.32.8/kernel/kmod.c 46102diff -urNp linux-2.6.32.9/kernel/kmod.c linux-2.6.32.9/kernel/kmod.c
45630--- linux-2.6.32.8/kernel/kmod.c 2010-02-09 07:57:19.000000000 -0500 46103--- linux-2.6.32.9/kernel/kmod.c 2010-02-09 07:57:19.000000000 -0500
45631+++ linux-2.6.32.8/kernel/kmod.c 2010-02-13 21:45:10.833538724 -0500 46104+++ linux-2.6.32.9/kernel/kmod.c 2010-02-23 17:09:53.331561124 -0500
45632@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch 46105@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
45633 if (ret >= MODULE_NAME_LEN) 46106 if (ret >= MODULE_NAME_LEN)
45634 return -ENAMETOOLONG; 46107 return -ENAMETOOLONG;
@@ -45648,9 +46121,9 @@ diff -urNp linux-2.6.32.8/kernel/kmod.c linux-2.6.32.8/kernel/kmod.c
45648 /* If modprobe needs a service that is in a module, we get a recursive 46121 /* If modprobe needs a service that is in a module, we get a recursive
45649 * loop. Limit the number of running kmod threads to max_threads/2 or 46122 * loop. Limit the number of running kmod threads to max_threads/2 or
45650 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method 46123 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
45651diff -urNp linux-2.6.32.8/kernel/kprobes.c linux-2.6.32.8/kernel/kprobes.c 46124diff -urNp linux-2.6.32.9/kernel/kprobes.c linux-2.6.32.9/kernel/kprobes.c
45652--- linux-2.6.32.8/kernel/kprobes.c 2010-02-09 07:57:19.000000000 -0500 46125--- linux-2.6.32.9/kernel/kprobes.c 2010-02-09 07:57:19.000000000 -0500
45653+++ linux-2.6.32.8/kernel/kprobes.c 2010-02-13 21:45:10.833538724 -0500 46126+++ linux-2.6.32.9/kernel/kprobes.c 2010-02-23 17:09:53.331561124 -0500
45654@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ 46127@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
45655 * kernel image and loaded module images reside. This is required 46128 * kernel image and loaded module images reside. This is required
45656 * so x86_64 can correctly handle the %rip-relative fixups. 46129 * so x86_64 can correctly handle the %rip-relative fixups.
@@ -45669,9 +46142,9 @@ diff -urNp linux-2.6.32.8/kernel/kprobes.c linux-2.6.32.8/kernel/kprobes.c
45669 kfree(kip); 46142 kfree(kip);
45670 } 46143 }
45671 return 1; 46144 return 1;
45672diff -urNp linux-2.6.32.8/kernel/lockdep.c linux-2.6.32.8/kernel/lockdep.c 46145diff -urNp linux-2.6.32.9/kernel/lockdep.c linux-2.6.32.9/kernel/lockdep.c
45673--- linux-2.6.32.8/kernel/lockdep.c 2010-02-09 07:57:19.000000000 -0500 46146--- linux-2.6.32.9/kernel/lockdep.c 2010-02-09 07:57:19.000000000 -0500
45674+++ linux-2.6.32.8/kernel/lockdep.c 2010-02-13 21:45:10.834810591 -0500 46147+++ linux-2.6.32.9/kernel/lockdep.c 2010-02-23 17:09:53.331561124 -0500
45675@@ -577,6 +577,10 @@ static int static_obj(void *obj) 46148@@ -577,6 +577,10 @@ static int static_obj(void *obj)
45676 int i; 46149 int i;
45677 #endif 46150 #endif
@@ -45701,9 +46174,9 @@ diff -urNp linux-2.6.32.8/kernel/lockdep.c linux-2.6.32.8/kernel/lockdep.c
45701 printk("the code is fine but needs lockdep annotation.\n"); 46174 printk("the code is fine but needs lockdep annotation.\n");
45702 printk("turning off the locking correctness validator.\n"); 46175 printk("turning off the locking correctness validator.\n");
45703 dump_stack(); 46176 dump_stack();
45704diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c 46177diff -urNp linux-2.6.32.9/kernel/module.c linux-2.6.32.9/kernel/module.c
45705--- linux-2.6.32.8/kernel/module.c 2010-02-09 07:57:19.000000000 -0500 46178--- linux-2.6.32.9/kernel/module.c 2010-02-09 07:57:19.000000000 -0500
45706+++ linux-2.6.32.8/kernel/module.c 2010-02-13 21:45:10.835856182 -0500 46179+++ linux-2.6.32.9/kernel/module.c 2010-02-23 17:09:53.331561124 -0500
45707@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq 46180@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
45708 static BLOCKING_NOTIFIER_HEAD(module_notify_list); 46181 static BLOCKING_NOTIFIER_HEAD(module_notify_list);
45709 46182
@@ -45741,19 +46214,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45741 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n", 46214 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
45742 name, align, PAGE_SIZE); 46215 name, align, PAGE_SIZE);
45743 align = PAGE_SIZE; 46216 align = PAGE_SIZE;
45744@@ -555,7 +556,11 @@ static void percpu_modcopy(void *pcpudes 46217@@ -1543,7 +1544,8 @@ static void free_module(struct module *m
45745 int cpu;
45746
45747 for_each_possible_cpu(cpu)
45748+#ifdef CONFIG_X86_32
45749+ memcpy(pcpudest + __per_cpu_offset[cpu], from, size);
45750+#else
45751 memcpy(pcpudest + per_cpu_offset(cpu), from, size);
45752+#endif
45753 }
45754
45755 #else /* ... !CONFIG_SMP */
45756@@ -1543,7 +1548,8 @@ static void free_module(struct module *m
45757 destroy_params(mod->kp, mod->num_kp); 46218 destroy_params(mod->kp, mod->num_kp);
45758 46219
45759 /* This may be NULL, but that's OK */ 46220 /* This may be NULL, but that's OK */
@@ -45763,7 +46224,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45763 kfree(mod->args); 46224 kfree(mod->args);
45764 if (mod->percpu) 46225 if (mod->percpu)
45765 percpu_modfree(mod->percpu); 46226 percpu_modfree(mod->percpu);
45766@@ -1552,10 +1558,12 @@ static void free_module(struct module *m 46227@@ -1552,10 +1554,12 @@ static void free_module(struct module *m
45767 percpu_modfree(mod->refptr); 46228 percpu_modfree(mod->refptr);
45768 #endif 46229 #endif
45769 /* Free lock-classes: */ 46230 /* Free lock-classes: */
@@ -45778,7 +46239,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45778 46239
45779 #ifdef CONFIG_MPU 46240 #ifdef CONFIG_MPU
45780 update_protections(current->mm); 46241 update_protections(current->mm);
45781@@ -1649,7 +1657,9 @@ static int simplify_symbols(Elf_Shdr *se 46242@@ -1649,7 +1653,9 @@ static int simplify_symbols(Elf_Shdr *se
45782 strtab + sym[i].st_name, mod); 46243 strtab + sym[i].st_name, mod);
45783 /* Ok if resolved. */ 46244 /* Ok if resolved. */
45784 if (ksym) { 46245 if (ksym) {
@@ -45788,7 +46249,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45788 break; 46249 break;
45789 } 46250 }
45790 46251
45791@@ -1668,7 +1678,9 @@ static int simplify_symbols(Elf_Shdr *se 46252@@ -1668,7 +1674,9 @@ static int simplify_symbols(Elf_Shdr *se
45792 secbase = (unsigned long)mod->percpu; 46253 secbase = (unsigned long)mod->percpu;
45793 else 46254 else
45794 secbase = sechdrs[sym[i].st_shndx].sh_addr; 46255 secbase = sechdrs[sym[i].st_shndx].sh_addr;
@@ -45798,7 +46259,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45798 break; 46259 break;
45799 } 46260 }
45800 } 46261 }
45801@@ -1729,11 +1741,12 @@ static void layout_sections(struct modul 46262@@ -1729,11 +1737,12 @@ static void layout_sections(struct modul
45802 || s->sh_entsize != ~0UL 46263 || s->sh_entsize != ~0UL
45803 || strstarts(secstrings + s->sh_name, ".init")) 46264 || strstarts(secstrings + s->sh_name, ".init"))
45804 continue; 46265 continue;
@@ -45814,7 +46275,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45814 } 46275 }
45815 46276
45816 DEBUGP("Init section allocation order:\n"); 46277 DEBUGP("Init section allocation order:\n");
45817@@ -1746,12 +1759,13 @@ static void layout_sections(struct modul 46278@@ -1746,12 +1755,13 @@ static void layout_sections(struct modul
45818 || s->sh_entsize != ~0UL 46279 || s->sh_entsize != ~0UL
45819 || !strstarts(secstrings + s->sh_name, ".init")) 46280 || !strstarts(secstrings + s->sh_name, ".init"))
45820 continue; 46281 continue;
@@ -45832,7 +46293,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45832 } 46293 }
45833 } 46294 }
45834 46295
45835@@ -1855,9 +1869,8 @@ static int is_exported(const char *name, 46296@@ -1855,9 +1865,8 @@ static int is_exported(const char *name,
45836 46297
45837 /* As per nm */ 46298 /* As per nm */
45838 static char elf_type(const Elf_Sym *sym, 46299 static char elf_type(const Elf_Sym *sym,
@@ -45844,7 +46305,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45844 { 46305 {
45845 if (ELF_ST_BIND(sym->st_info) == STB_WEAK) { 46306 if (ELF_ST_BIND(sym->st_info) == STB_WEAK) {
45846 if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT) 46307 if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT)
45847@@ -1932,7 +1945,7 @@ static unsigned long layout_symtab(struc 46308@@ -1932,7 +1941,7 @@ static unsigned long layout_symtab(struc
45848 46309
45849 /* Put symbol section at end of init part of module. */ 46310 /* Put symbol section at end of init part of module. */
45850 symsect->sh_flags |= SHF_ALLOC; 46311 symsect->sh_flags |= SHF_ALLOC;
@@ -45853,7 +46314,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45853 symindex) | INIT_OFFSET_MASK; 46314 symindex) | INIT_OFFSET_MASK;
45854 DEBUGP("\t%s\n", secstrings + symsect->sh_name); 46315 DEBUGP("\t%s\n", secstrings + symsect->sh_name);
45855 46316
45856@@ -1949,19 +1962,19 @@ static unsigned long layout_symtab(struc 46317@@ -1949,19 +1958,19 @@ static unsigned long layout_symtab(struc
45857 } 46318 }
45858 46319
45859 /* Append room for core symbols at end of core part. */ 46320 /* Append room for core symbols at end of core part. */
@@ -45878,7 +46339,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45878 46339
45879 return symoffs; 46340 return symoffs;
45880 } 46341 }
45881@@ -1985,12 +1998,14 @@ static void add_kallsyms(struct module * 46342@@ -1985,12 +1994,14 @@ static void add_kallsyms(struct module *
45882 mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym); 46343 mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym);
45883 mod->strtab = (void *)sechdrs[strindex].sh_addr; 46344 mod->strtab = (void *)sechdrs[strindex].sh_addr;
45884 46345
@@ -45895,7 +46356,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45895 src = mod->symtab; 46356 src = mod->symtab;
45896 *dst = *src; 46357 *dst = *src;
45897 for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) { 46358 for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
45898@@ -2002,10 +2017,12 @@ static void add_kallsyms(struct module * 46359@@ -2002,10 +2013,12 @@ static void add_kallsyms(struct module *
45899 } 46360 }
45900 mod->core_num_syms = ndst; 46361 mod->core_num_syms = ndst;
45901 46362
@@ -45909,7 +46370,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45909 } 46370 }
45910 #else 46371 #else
45911 static inline unsigned long layout_symtab(struct module *mod, 46372 static inline unsigned long layout_symtab(struct module *mod,
45912@@ -2042,16 +2059,30 @@ static void dynamic_debug_setup(struct _ 46373@@ -2042,16 +2055,30 @@ static void dynamic_debug_setup(struct _
45913 #endif 46374 #endif
45914 } 46375 }
45915 46376
@@ -45945,7 +46406,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45945 } 46406 }
45946 return ret; 46407 return ret;
45947 } 46408 }
45948@@ -2063,8 +2094,8 @@ static void kmemleak_load_module(struct 46409@@ -2063,8 +2090,8 @@ static void kmemleak_load_module(struct
45949 unsigned int i; 46410 unsigned int i;
45950 46411
45951 /* only scan the sections containing data */ 46412 /* only scan the sections containing data */
@@ -45956,7 +46417,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45956 sizeof(struct module), GFP_KERNEL); 46417 sizeof(struct module), GFP_KERNEL);
45957 46418
45958 for (i = 1; i < hdr->e_shnum; i++) { 46419 for (i = 1; i < hdr->e_shnum; i++) {
45959@@ -2074,8 +2105,8 @@ static void kmemleak_load_module(struct 46420@@ -2074,8 +2101,8 @@ static void kmemleak_load_module(struct
45960 && strncmp(secstrings + sechdrs[i].sh_name, ".bss", 4) != 0) 46421 && strncmp(secstrings + sechdrs[i].sh_name, ".bss", 4) != 0)
45961 continue; 46422 continue;
45962 46423
@@ -45967,7 +46428,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45967 sechdrs[i].sh_size, GFP_KERNEL); 46428 sechdrs[i].sh_size, GFP_KERNEL);
45968 } 46429 }
45969 } 46430 }
45970@@ -2261,7 +2292,7 @@ static noinline struct module *load_modu 46431@@ -2261,7 +2288,7 @@ static noinline struct module *load_modu
45971 secstrings, &stroffs, strmap); 46432 secstrings, &stroffs, strmap);
45972 46433
45973 /* Do the allocs. */ 46434 /* Do the allocs. */
@@ -45976,7 +46437,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45976 /* 46437 /*
45977 * The pointer to this block is stored in the module structure 46438 * The pointer to this block is stored in the module structure
45978 * which is inside the block. Just mark it as not being a 46439 * which is inside the block. Just mark it as not being a
45979@@ -2272,23 +2303,47 @@ static noinline struct module *load_modu 46440@@ -2272,23 +2299,47 @@ static noinline struct module *load_modu
45980 err = -ENOMEM; 46441 err = -ENOMEM;
45981 goto free_percpu; 46442 goto free_percpu;
45982 } 46443 }
@@ -46006,9 +46467,12 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46006+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx); 46467+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
46007+ kmemleak_not_leak(ptr); 46468+ kmemleak_not_leak(ptr);
46008+ if (!ptr) { 46469+ if (!ptr) {
46009+ err = -ENOMEM; 46470 err = -ENOMEM;
46471- goto free_core;
46010+ goto free_init_rw; 46472+ goto free_init_rw;
46011+ } 46473 }
46474- memset(ptr, 0, mod->init_size);
46475- mod->module_init = ptr;
46012+ 46476+
46013+ pax_open_kernel(); 46477+ pax_open_kernel();
46014+ memset(ptr, 0, mod->core_size_rx); 46478+ memset(ptr, 0, mod->core_size_rx);
@@ -46018,12 +46482,9 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46018+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx); 46482+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
46019+ kmemleak_not_leak(ptr); 46483+ kmemleak_not_leak(ptr);
46020+ if (!ptr && mod->init_size_rx) { 46484+ if (!ptr && mod->init_size_rx) {
46021 err = -ENOMEM; 46485+ err = -ENOMEM;
46022- goto free_core;
46023+ goto free_core_rx; 46486+ goto free_core_rx;
46024 } 46487+ }
46025- memset(ptr, 0, mod->init_size);
46026- mod->module_init = ptr;
46027+ 46488+
46028+ pax_open_kernel(); 46489+ pax_open_kernel();
46029+ memset(ptr, 0, mod->init_size_rx); 46490+ memset(ptr, 0, mod->init_size_rx);
@@ -46032,7 +46493,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46032 46493
46033 /* Transfer each section which specifies SHF_ALLOC */ 46494 /* Transfer each section which specifies SHF_ALLOC */
46034 DEBUGP("final section addresses:\n"); 46495 DEBUGP("final section addresses:\n");
46035@@ -2298,17 +2353,41 @@ static noinline struct module *load_modu 46496@@ -2298,17 +2349,41 @@ static noinline struct module *load_modu
46036 if (!(sechdrs[i].sh_flags & SHF_ALLOC)) 46497 if (!(sechdrs[i].sh_flags & SHF_ALLOC))
46037 continue; 46498 continue;
46038 46499
@@ -46056,10 +46517,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46056+ } 46517+ }
46057+ 46518+
46058+ if (sechdrs[i].sh_type != SHT_NOBITS) { 46519+ if (sechdrs[i].sh_type != SHT_NOBITS) {
46059 46520+
46060- if (sechdrs[i].sh_type != SHT_NOBITS)
46061- memcpy(dest, (void *)sechdrs[i].sh_addr,
46062- sechdrs[i].sh_size);
46063+#ifdef CONFIG_PAX_KERNEXEC 46521+#ifdef CONFIG_PAX_KERNEXEC
46064+ if (!(sechdrs[i].sh_flags & SHF_WRITE) && (sechdrs[i].sh_flags & SHF_ALLOC)) { 46522+ if (!(sechdrs[i].sh_flags & SHF_WRITE) && (sechdrs[i].sh_flags & SHF_ALLOC)) {
46065+ pax_open_kernel(); 46523+ pax_open_kernel();
@@ -46067,7 +46525,10 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46067+ pax_close_kernel(); 46525+ pax_close_kernel();
46068+ } else 46526+ } else
46069+#endif 46527+#endif
46070+ 46528
46529- if (sechdrs[i].sh_type != SHT_NOBITS)
46530- memcpy(dest, (void *)sechdrs[i].sh_addr,
46531- sechdrs[i].sh_size);
46071+ memcpy(dest, (void *)sechdrs[i].sh_addr, sechdrs[i].sh_size); 46532+ memcpy(dest, (void *)sechdrs[i].sh_addr, sechdrs[i].sh_size);
46072+ } 46533+ }
46073 /* Update sh_addr to point to copy in image. */ 46534 /* Update sh_addr to point to copy in image. */
@@ -46083,7 +46544,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46083 DEBUGP("\t0x%lx %s\n", sechdrs[i].sh_addr, secstrings + sechdrs[i].sh_name); 46544 DEBUGP("\t0x%lx %s\n", sechdrs[i].sh_addr, secstrings + sechdrs[i].sh_name);
46084 } 46545 }
46085 /* Module has been moved. */ 46546 /* Module has been moved. */
46086@@ -2320,7 +2399,7 @@ static noinline struct module *load_modu 46547@@ -2320,7 +2395,7 @@ static noinline struct module *load_modu
46087 mod->name); 46548 mod->name);
46088 if (!mod->refptr) { 46549 if (!mod->refptr) {
46089 err = -ENOMEM; 46550 err = -ENOMEM;
@@ -46092,7 +46553,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46092 } 46553 }
46093 #endif 46554 #endif
46094 /* Now we've moved module, initialize linked lists, etc. */ 46555 /* Now we've moved module, initialize linked lists, etc. */
46095@@ -2429,8 +2508,8 @@ static noinline struct module *load_modu 46556@@ -2429,8 +2504,8 @@ static noinline struct module *load_modu
46096 46557
46097 /* Now do relocations. */ 46558 /* Now do relocations. */
46098 for (i = 1; i < hdr->e_shnum; i++) { 46559 for (i = 1; i < hdr->e_shnum; i++) {
@@ -46102,7 +46563,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46102 46563
46103 /* Not a valid relocation section? */ 46564 /* Not a valid relocation section? */
46104 if (info >= hdr->e_shnum) 46565 if (info >= hdr->e_shnum)
46105@@ -2491,12 +2570,12 @@ static noinline struct module *load_modu 46566@@ -2491,12 +2566,12 @@ static noinline struct module *load_modu
46106 * Do it before processing of module parameters, so the module 46567 * Do it before processing of module parameters, so the module
46107 * can provide parameter accessor functions of its own. 46568 * can provide parameter accessor functions of its own.
46108 */ 46569 */
@@ -46121,7 +46582,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46121 46582
46122 set_fs(old_fs); 46583 set_fs(old_fs);
46123 46584
46124@@ -2544,12 +2623,16 @@ static noinline struct module *load_modu 46585@@ -2544,12 +2619,16 @@ static noinline struct module *load_modu
46125 free_unload: 46586 free_unload:
46126 module_unload_free(mod); 46587 module_unload_free(mod);
46127 #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP) 46588 #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP)
@@ -46142,7 +46603,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46142 /* mod will be freed with core. Don't access it beyond this line! */ 46603 /* mod will be freed with core. Don't access it beyond this line! */
46143 free_percpu: 46604 free_percpu:
46144 if (percpu) 46605 if (percpu)
46145@@ -2651,10 +2734,12 @@ SYSCALL_DEFINE3(init_module, void __user 46606@@ -2651,10 +2730,12 @@ SYSCALL_DEFINE3(init_module, void __user
46146 mod->symtab = mod->core_symtab; 46607 mod->symtab = mod->core_symtab;
46147 mod->strtab = mod->core_strtab; 46608 mod->strtab = mod->core_strtab;
46148 #endif 46609 #endif
@@ -46159,7 +46620,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46159 mutex_unlock(&module_mutex); 46620 mutex_unlock(&module_mutex);
46160 46621
46161 return 0; 46622 return 0;
46162@@ -2685,10 +2770,16 @@ static const char *get_ksymbol(struct mo 46623@@ -2685,10 +2766,16 @@ static const char *get_ksymbol(struct mo
46163 unsigned long nextval; 46624 unsigned long nextval;
46164 46625
46165 /* At worse, next value is at end of module */ 46626 /* At worse, next value is at end of module */
@@ -46179,7 +46640,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46179 46640
46180 /* Scan for closest preceeding symbol, and next symbol. (ELF 46641 /* Scan for closest preceeding symbol, and next symbol. (ELF
46181 starts real symbols at 1). */ 46642 starts real symbols at 1). */
46182@@ -2934,7 +3025,7 @@ static int m_show(struct seq_file *m, vo 46643@@ -2934,7 +3021,7 @@ static int m_show(struct seq_file *m, vo
46183 char buf[8]; 46644 char buf[8];
46184 46645
46185 seq_printf(m, "%s %u", 46646 seq_printf(m, "%s %u",
@@ -46188,7 +46649,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46188 print_unload_info(m, mod); 46649 print_unload_info(m, mod);
46189 46650
46190 /* Informative for users. */ 46651 /* Informative for users. */
46191@@ -2943,7 +3034,7 @@ static int m_show(struct seq_file *m, vo 46652@@ -2943,7 +3030,7 @@ static int m_show(struct seq_file *m, vo
46192 mod->state == MODULE_STATE_COMING ? "Loading": 46653 mod->state == MODULE_STATE_COMING ? "Loading":
46193 "Live"); 46654 "Live");
46194 /* Used by oprofile and other similar tools. */ 46655 /* Used by oprofile and other similar tools. */
@@ -46197,7 +46658,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46197 46658
46198 /* Taints info */ 46659 /* Taints info */
46199 if (mod->taints) 46660 if (mod->taints)
46200@@ -2979,7 +3070,17 @@ static const struct file_operations proc 46661@@ -2979,7 +3066,17 @@ static const struct file_operations proc
46201 46662
46202 static int __init proc_modules_init(void) 46663 static int __init proc_modules_init(void)
46203 { 46664 {
@@ -46215,7 +46676,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46215 return 0; 46676 return 0;
46216 } 46677 }
46217 module_init(proc_modules_init); 46678 module_init(proc_modules_init);
46218@@ -3038,12 +3139,12 @@ struct module *__module_address(unsigned 46679@@ -3038,12 +3135,12 @@ struct module *__module_address(unsigned
46219 { 46680 {
46220 struct module *mod; 46681 struct module *mod;
46221 46682
@@ -46231,7 +46692,7 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46231 return mod; 46692 return mod;
46232 return NULL; 46693 return NULL;
46233 } 46694 }
46234@@ -3077,11 +3178,20 @@ bool is_module_text_address(unsigned lon 46695@@ -3077,11 +3174,20 @@ bool is_module_text_address(unsigned lon
46235 */ 46696 */
46236 struct module *__module_text_address(unsigned long addr) 46697 struct module *__module_text_address(unsigned long addr)
46237 { 46698 {
@@ -46255,9 +46716,9 @@ diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
46255 mod = NULL; 46716 mod = NULL;
46256 } 46717 }
46257 return mod; 46718 return mod;
46258diff -urNp linux-2.6.32.8/kernel/panic.c linux-2.6.32.8/kernel/panic.c 46719diff -urNp linux-2.6.32.9/kernel/panic.c linux-2.6.32.9/kernel/panic.c
46259--- linux-2.6.32.8/kernel/panic.c 2010-02-09 07:57:19.000000000 -0500 46720--- linux-2.6.32.9/kernel/panic.c 2010-02-09 07:57:19.000000000 -0500
46260+++ linux-2.6.32.8/kernel/panic.c 2010-02-13 21:45:10.836559099 -0500 46721+++ linux-2.6.32.9/kernel/panic.c 2010-02-23 17:09:53.331561124 -0500
46261@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); 46722@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
46262 */ 46723 */
46263 void __stack_chk_fail(void) 46724 void __stack_chk_fail(void)
@@ -46268,9 +46729,9 @@ diff -urNp linux-2.6.32.8/kernel/panic.c linux-2.6.32.8/kernel/panic.c
46268 __builtin_return_address(0)); 46729 __builtin_return_address(0));
46269 } 46730 }
46270 EXPORT_SYMBOL(__stack_chk_fail); 46731 EXPORT_SYMBOL(__stack_chk_fail);
46271diff -urNp linux-2.6.32.8/kernel/params.c linux-2.6.32.8/kernel/params.c 46732diff -urNp linux-2.6.32.9/kernel/params.c linux-2.6.32.9/kernel/params.c
46272--- linux-2.6.32.8/kernel/params.c 2010-02-09 07:57:19.000000000 -0500 46733--- linux-2.6.32.9/kernel/params.c 2010-02-09 07:57:19.000000000 -0500
46273+++ linux-2.6.32.8/kernel/params.c 2010-02-13 21:45:10.836559099 -0500 46734+++ linux-2.6.32.9/kernel/params.c 2010-02-23 17:09:53.331561124 -0500
46274@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct 46735@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
46275 return ret; 46736 return ret;
46276 } 46737 }
@@ -46289,9 +46750,9 @@ diff -urNp linux-2.6.32.8/kernel/params.c linux-2.6.32.8/kernel/params.c
46289 .filter = uevent_filter, 46750 .filter = uevent_filter,
46290 }; 46751 };
46291 46752
46292diff -urNp linux-2.6.32.8/kernel/pid.c linux-2.6.32.8/kernel/pid.c 46753diff -urNp linux-2.6.32.9/kernel/pid.c linux-2.6.32.9/kernel/pid.c
46293--- linux-2.6.32.8/kernel/pid.c 2010-02-09 07:57:19.000000000 -0500 46754--- linux-2.6.32.9/kernel/pid.c 2010-02-09 07:57:19.000000000 -0500
46294+++ linux-2.6.32.8/kernel/pid.c 2010-02-13 21:45:10.836559099 -0500 46755+++ linux-2.6.32.9/kernel/pid.c 2010-02-23 17:09:53.331561124 -0500
46295@@ -33,6 +33,7 @@ 46756@@ -33,6 +33,7 @@
46296 #include <linux/rculist.h> 46757 #include <linux/rculist.h>
46297 #include <linux/bootmem.h> 46758 #include <linux/bootmem.h>
@@ -46325,9 +46786,9 @@ diff -urNp linux-2.6.32.8/kernel/pid.c linux-2.6.32.8/kernel/pid.c
46325 } 46786 }
46326 46787
46327 struct task_struct *find_task_by_vpid(pid_t vnr) 46788 struct task_struct *find_task_by_vpid(pid_t vnr)
46328diff -urNp linux-2.6.32.8/kernel/posix-cpu-timers.c linux-2.6.32.8/kernel/posix-cpu-timers.c 46789diff -urNp linux-2.6.32.9/kernel/posix-cpu-timers.c linux-2.6.32.9/kernel/posix-cpu-timers.c
46329--- linux-2.6.32.8/kernel/posix-cpu-timers.c 2010-02-09 07:57:19.000000000 -0500 46790--- linux-2.6.32.9/kernel/posix-cpu-timers.c 2010-02-09 07:57:19.000000000 -0500
46330+++ linux-2.6.32.8/kernel/posix-cpu-timers.c 2010-02-13 21:45:10.836559099 -0500 46791+++ linux-2.6.32.9/kernel/posix-cpu-timers.c 2010-02-23 17:09:53.331561124 -0500
46331@@ -6,6 +6,7 @@ 46792@@ -6,6 +6,7 @@
46332 #include <linux/posix-timers.h> 46793 #include <linux/posix-timers.h>
46333 #include <linux/errno.h> 46794 #include <linux/errno.h>
@@ -46352,9 +46813,9 @@ diff -urNp linux-2.6.32.8/kernel/posix-cpu-timers.c linux-2.6.32.8/kernel/posix-
46352 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { 46813 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) {
46353 /* 46814 /*
46354 * At the soft limit, send a SIGXCPU every second. 46815 * At the soft limit, send a SIGXCPU every second.
46355diff -urNp linux-2.6.32.8/kernel/power/hibernate.c linux-2.6.32.8/kernel/power/hibernate.c 46816diff -urNp linux-2.6.32.9/kernel/power/hibernate.c linux-2.6.32.9/kernel/power/hibernate.c
46356--- linux-2.6.32.8/kernel/power/hibernate.c 2010-02-09 07:57:19.000000000 -0500 46817--- linux-2.6.32.9/kernel/power/hibernate.c 2010-02-09 07:57:19.000000000 -0500
46357+++ linux-2.6.32.8/kernel/power/hibernate.c 2010-02-13 21:45:10.837813262 -0500 46818+++ linux-2.6.32.9/kernel/power/hibernate.c 2010-02-23 17:09:53.331561124 -0500
46358@@ -48,14 +48,14 @@ enum { 46819@@ -48,14 +48,14 @@ enum {
46359 46820
46360 static int hibernation_mode = HIBERNATION_SHUTDOWN; 46821 static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -46372,9 +46833,9 @@ diff -urNp linux-2.6.32.8/kernel/power/hibernate.c linux-2.6.32.8/kernel/power/h
46372 { 46833 {
46373 if (ops && !(ops->begin && ops->end && ops->pre_snapshot 46834 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
46374 && ops->prepare && ops->finish && ops->enter && ops->pre_restore 46835 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
46375diff -urNp linux-2.6.32.8/kernel/power/poweroff.c linux-2.6.32.8/kernel/power/poweroff.c 46836diff -urNp linux-2.6.32.9/kernel/power/poweroff.c linux-2.6.32.9/kernel/power/poweroff.c
46376--- linux-2.6.32.8/kernel/power/poweroff.c 2010-02-09 07:57:19.000000000 -0500 46837--- linux-2.6.32.9/kernel/power/poweroff.c 2010-02-09 07:57:19.000000000 -0500
46377+++ linux-2.6.32.8/kernel/power/poweroff.c 2010-02-13 21:45:10.837813262 -0500 46838+++ linux-2.6.32.9/kernel/power/poweroff.c 2010-02-23 17:09:53.336191874 -0500
46378@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof 46839@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
46379 .enable_mask = SYSRQ_ENABLE_BOOT, 46840 .enable_mask = SYSRQ_ENABLE_BOOT,
46380 }; 46841 };
@@ -46384,9 +46845,9 @@ diff -urNp linux-2.6.32.8/kernel/power/poweroff.c linux-2.6.32.8/kernel/power/po
46384 { 46845 {
46385 register_sysrq_key('o', &sysrq_poweroff_op); 46846 register_sysrq_key('o', &sysrq_poweroff_op);
46386 return 0; 46847 return 0;
46387diff -urNp linux-2.6.32.8/kernel/power/process.c linux-2.6.32.8/kernel/power/process.c 46848diff -urNp linux-2.6.32.9/kernel/power/process.c linux-2.6.32.9/kernel/power/process.c
46388--- linux-2.6.32.8/kernel/power/process.c 2010-02-09 07:57:19.000000000 -0500 46849--- linux-2.6.32.9/kernel/power/process.c 2010-02-09 07:57:19.000000000 -0500
46389+++ linux-2.6.32.8/kernel/power/process.c 2010-02-13 21:45:10.837813262 -0500 46850+++ linux-2.6.32.9/kernel/power/process.c 2010-02-23 17:09:53.336191874 -0500
46390@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ 46851@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
46391 struct timeval start, end; 46852 struct timeval start, end;
46392 u64 elapsed_csecs64; 46853 u64 elapsed_csecs64;
@@ -46426,9 +46887,9 @@ diff -urNp linux-2.6.32.8/kernel/power/process.c linux-2.6.32.8/kernel/power/pro
46426 46887
46427 do_gettimeofday(&end); 46888 do_gettimeofday(&end);
46428 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); 46889 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
46429diff -urNp linux-2.6.32.8/kernel/power/suspend.c linux-2.6.32.8/kernel/power/suspend.c 46890diff -urNp linux-2.6.32.9/kernel/power/suspend.c linux-2.6.32.9/kernel/power/suspend.c
46430--- linux-2.6.32.8/kernel/power/suspend.c 2010-02-09 07:57:19.000000000 -0500 46891--- linux-2.6.32.9/kernel/power/suspend.c 2010-02-09 07:57:19.000000000 -0500
46431+++ linux-2.6.32.8/kernel/power/suspend.c 2010-02-13 21:45:10.837813262 -0500 46892+++ linux-2.6.32.9/kernel/power/suspend.c 2010-02-23 17:09:53.336191874 -0500
46432@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M 46893@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
46433 [PM_SUSPEND_MEM] = "mem", 46894 [PM_SUSPEND_MEM] = "mem",
46434 }; 46895 };
@@ -46445,9 +46906,9 @@ diff -urNp linux-2.6.32.8/kernel/power/suspend.c linux-2.6.32.8/kernel/power/sus
46445 { 46906 {
46446 mutex_lock(&pm_mutex); 46907 mutex_lock(&pm_mutex);
46447 suspend_ops = ops; 46908 suspend_ops = ops;
46448diff -urNp linux-2.6.32.8/kernel/printk.c linux-2.6.32.8/kernel/printk.c 46909diff -urNp linux-2.6.32.9/kernel/printk.c linux-2.6.32.9/kernel/printk.c
46449--- linux-2.6.32.8/kernel/printk.c 2010-02-09 07:57:19.000000000 -0500 46910--- linux-2.6.32.9/kernel/printk.c 2010-02-09 07:57:19.000000000 -0500
46450+++ linux-2.6.32.8/kernel/printk.c 2010-02-13 21:45:10.838544634 -0500 46911+++ linux-2.6.32.9/kernel/printk.c 2010-02-23 17:09:53.336191874 -0500
46451@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf 46912@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
46452 char c; 46913 char c;
46453 int error = 0; 46914 int error = 0;
@@ -46460,9 +46921,9 @@ diff -urNp linux-2.6.32.8/kernel/printk.c linux-2.6.32.8/kernel/printk.c
46460 error = security_syslog(type); 46921 error = security_syslog(type);
46461 if (error) 46922 if (error)
46462 return error; 46923 return error;
46463diff -urNp linux-2.6.32.8/kernel/ptrace.c linux-2.6.32.8/kernel/ptrace.c 46924diff -urNp linux-2.6.32.9/kernel/ptrace.c linux-2.6.32.9/kernel/ptrace.c
46464--- linux-2.6.32.8/kernel/ptrace.c 2010-02-09 07:57:19.000000000 -0500 46925--- linux-2.6.32.9/kernel/ptrace.c 2010-02-09 07:57:19.000000000 -0500
46465+++ linux-2.6.32.8/kernel/ptrace.c 2010-02-13 21:45:10.838544634 -0500 46926+++ linux-2.6.32.9/kernel/ptrace.c 2010-02-23 17:09:53.336191874 -0500
46466@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru 46927@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
46467 cred->gid != tcred->egid || 46928 cred->gid != tcred->egid ||
46468 cred->gid != tcred->sgid || 46929 cred->gid != tcred->sgid ||
@@ -46533,9 +46994,21 @@ diff -urNp linux-2.6.32.8/kernel/ptrace.c linux-2.6.32.8/kernel/ptrace.c
46533 } 46994 }
46534 46995
46535 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) 46996 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
46536diff -urNp linux-2.6.32.8/kernel/relay.c linux-2.6.32.8/kernel/relay.c 46997diff -urNp linux-2.6.32.9/kernel/rcutree.c linux-2.6.32.9/kernel/rcutree.c
46537--- linux-2.6.32.8/kernel/relay.c 2010-02-09 07:57:19.000000000 -0500 46998--- linux-2.6.32.9/kernel/rcutree.c 2010-02-09 07:57:19.000000000 -0500
46538+++ linux-2.6.32.8/kernel/relay.c 2010-02-13 21:45:10.839541719 -0500 46999+++ linux-2.6.32.9/kernel/rcutree.c 2010-02-23 17:09:53.336191874 -0500
47000@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
47001 /*
47002 * Do softirq processing for the current CPU.
47003 */
47004-static void rcu_process_callbacks(struct softirq_action *unused)
47005+static void rcu_process_callbacks(void)
47006 {
47007 /*
47008 * Memory references from any prior RCU read-side critical sections
47009diff -urNp linux-2.6.32.9/kernel/relay.c linux-2.6.32.9/kernel/relay.c
47010--- linux-2.6.32.9/kernel/relay.c 2010-02-09 07:57:19.000000000 -0500
47011+++ linux-2.6.32.9/kernel/relay.c 2010-02-23 17:09:53.336191874 -0500
46539@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi 47012@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi
46540 return 0; 47013 return 0;
46541 47014
@@ -46545,9 +47018,9 @@ diff -urNp linux-2.6.32.8/kernel/relay.c linux-2.6.32.8/kernel/relay.c
46545 return ret; 47018 return ret;
46546 47019
46547 if (read_start + ret == nonpad_end) 47020 if (read_start + ret == nonpad_end)
46548diff -urNp linux-2.6.32.8/kernel/resource.c linux-2.6.32.8/kernel/resource.c 47021diff -urNp linux-2.6.32.9/kernel/resource.c linux-2.6.32.9/kernel/resource.c
46549--- linux-2.6.32.8/kernel/resource.c 2010-02-09 07:57:19.000000000 -0500 47022--- linux-2.6.32.9/kernel/resource.c 2010-02-09 07:57:19.000000000 -0500
46550+++ linux-2.6.32.8/kernel/resource.c 2010-02-13 21:45:10.839541719 -0500 47023+++ linux-2.6.32.9/kernel/resource.c 2010-02-23 17:09:53.336191874 -0500
46551@@ -132,8 +132,18 @@ static const struct file_operations proc 47024@@ -132,8 +132,18 @@ static const struct file_operations proc
46552 47025
46553 static int __init ioresources_init(void) 47026 static int __init ioresources_init(void)
@@ -46567,9 +47040,18 @@ diff -urNp linux-2.6.32.8/kernel/resource.c linux-2.6.32.8/kernel/resource.c
46567 return 0; 47040 return 0;
46568 } 47041 }
46569 __initcall(ioresources_init); 47042 __initcall(ioresources_init);
46570diff -urNp linux-2.6.32.8/kernel/sched.c linux-2.6.32.8/kernel/sched.c 47043diff -urNp linux-2.6.32.9/kernel/sched.c linux-2.6.32.9/kernel/sched.c
46571--- linux-2.6.32.8/kernel/sched.c 2010-02-09 07:57:19.000000000 -0500 47044--- linux-2.6.32.9/kernel/sched.c 2010-02-09 07:57:19.000000000 -0500
46572+++ linux-2.6.32.8/kernel/sched.c 2010-02-13 21:45:10.841542770 -0500 47045+++ linux-2.6.32.9/kernel/sched.c 2010-02-23 17:09:53.336191874 -0500
47046@@ -4822,7 +4822,7 @@ out:
47047 * In CONFIG_NO_HZ case, the idle load balance owner will do the
47048 * rebalancing for all the cpus for whom scheduler ticks are stopped.
47049 */
47050-static void run_rebalance_domains(struct softirq_action *h)
47051+static void run_rebalance_domains(void)
47052 {
47053 int this_cpu = smp_processor_id();
47054 struct rq *this_rq = cpu_rq(this_cpu);
46573@@ -6090,6 +6090,8 @@ int can_nice(const struct task_struct *p 47055@@ -6090,6 +6090,8 @@ int can_nice(const struct task_struct *p
46574 /* convert nice value [19,-20] to rlimit style value [1,40] */ 47056 /* convert nice value [19,-20] to rlimit style value [1,40] */
46575 int nice_rlim = 20 - nice; 47057 int nice_rlim = 20 - nice;
@@ -46616,9 +47098,9 @@ diff -urNp linux-2.6.32.8/kernel/sched.c linux-2.6.32.8/kernel/sched.c
46616 }; 47098 };
46617 47099
46618 static struct ctl_table *sd_alloc_ctl_entry(int n) 47100 static struct ctl_table *sd_alloc_ctl_entry(int n)
46619diff -urNp linux-2.6.32.8/kernel/signal.c linux-2.6.32.8/kernel/signal.c 47101diff -urNp linux-2.6.32.9/kernel/signal.c linux-2.6.32.9/kernel/signal.c
46620--- linux-2.6.32.8/kernel/signal.c 2010-02-09 07:57:19.000000000 -0500 47102--- linux-2.6.32.9/kernel/signal.c 2010-02-09 07:57:19.000000000 -0500
46621+++ linux-2.6.32.8/kernel/signal.c 2010-02-13 21:45:10.842542466 -0500 47103+++ linux-2.6.32.9/kernel/signal.c 2010-02-23 17:09:53.340074701 -0500
46622@@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc 47104@@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc
46623 */ 47105 */
46624 user = get_uid(__task_cred(t)->user); 47106 user = get_uid(__task_cred(t)->user);
@@ -46671,9 +47153,9 @@ diff -urNp linux-2.6.32.8/kernel/signal.c linux-2.6.32.8/kernel/signal.c
46671 47153
46672 return ret; 47154 return ret;
46673 } 47155 }
46674diff -urNp linux-2.6.32.8/kernel/smp.c linux-2.6.32.8/kernel/smp.c 47156diff -urNp linux-2.6.32.9/kernel/smp.c linux-2.6.32.9/kernel/smp.c
46675--- linux-2.6.32.8/kernel/smp.c 2010-02-09 07:57:19.000000000 -0500 47157--- linux-2.6.32.9/kernel/smp.c 2010-02-09 07:57:19.000000000 -0500
46676+++ linux-2.6.32.8/kernel/smp.c 2010-02-13 21:45:10.842542466 -0500 47158+++ linux-2.6.32.9/kernel/smp.c 2010-02-23 17:09:53.340074701 -0500
46677@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void 47159@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void
46678 } 47160 }
46679 EXPORT_SYMBOL(smp_call_function); 47161 EXPORT_SYMBOL(smp_call_function);
@@ -46701,9 +47183,9 @@ diff -urNp linux-2.6.32.8/kernel/smp.c linux-2.6.32.8/kernel/smp.c
46701 { 47183 {
46702 spin_unlock_irq(&call_function.lock); 47184 spin_unlock_irq(&call_function.lock);
46703 } 47185 }
46704diff -urNp linux-2.6.32.8/kernel/softirq.c linux-2.6.32.8/kernel/softirq.c 47186diff -urNp linux-2.6.32.9/kernel/softirq.c linux-2.6.32.9/kernel/softirq.c
46705--- linux-2.6.32.8/kernel/softirq.c 2010-02-09 07:57:19.000000000 -0500 47187--- linux-2.6.32.9/kernel/softirq.c 2010-02-09 07:57:19.000000000 -0500
46706+++ linux-2.6.32.8/kernel/softirq.c 2010-02-13 21:45:10.843549351 -0500 47188+++ linux-2.6.32.9/kernel/softirq.c 2010-02-23 17:09:53.340074701 -0500
46707@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec 47189@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
46708 47190
46709 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); 47191 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -46713,9 +47195,54 @@ diff -urNp linux-2.6.32.8/kernel/softirq.c linux-2.6.32.8/kernel/softirq.c
46713 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL", 47195 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
46714 "TASKLET", "SCHED", "HRTIMER", "RCU" 47196 "TASKLET", "SCHED", "HRTIMER", "RCU"
46715 }; 47197 };
46716diff -urNp linux-2.6.32.8/kernel/sys.c linux-2.6.32.8/kernel/sys.c 47198@@ -190,7 +190,7 @@ EXPORT_SYMBOL(local_bh_enable_ip);
46717--- linux-2.6.32.8/kernel/sys.c 2010-02-09 07:57:19.000000000 -0500 47199
46718+++ linux-2.6.32.8/kernel/sys.c 2010-02-13 21:45:10.843549351 -0500 47200 asmlinkage void __do_softirq(void)
47201 {
47202- struct softirq_action *h;
47203+ const struct softirq_action *h;
47204 __u32 pending;
47205 int max_restart = MAX_SOFTIRQ_RESTART;
47206 int cpu;
47207@@ -216,7 +216,7 @@ restart:
47208 kstat_incr_softirqs_this_cpu(h - softirq_vec);
47209
47210 trace_softirq_entry(h, softirq_vec);
47211- h->action(h);
47212+ h->action();
47213 trace_softirq_exit(h, softirq_vec);
47214 if (unlikely(prev_count != preempt_count())) {
47215 printk(KERN_ERR "huh, entered softirq %td %s %p"
47216@@ -340,7 +340,7 @@ void raise_softirq(unsigned int nr)
47217 local_irq_restore(flags);
47218 }
47219
47220-void open_softirq(int nr, void (*action)(struct softirq_action *))
47221+void open_softirq(int nr, void (*action)(void))
47222 {
47223 softirq_vec[nr].action = action;
47224 }
47225@@ -396,7 +396,7 @@ void __tasklet_hi_schedule_first(struct
47226
47227 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
47228
47229-static void tasklet_action(struct softirq_action *a)
47230+static void tasklet_action(void)
47231 {
47232 struct tasklet_struct *list;
47233
47234@@ -431,7 +431,7 @@ static void tasklet_action(struct softir
47235 }
47236 }
47237
47238-static void tasklet_hi_action(struct softirq_action *a)
47239+static void tasklet_hi_action(void)
47240 {
47241 struct tasklet_struct *list;
47242
47243diff -urNp linux-2.6.32.9/kernel/sys.c linux-2.6.32.9/kernel/sys.c
47244--- linux-2.6.32.9/kernel/sys.c 2010-02-09 07:57:19.000000000 -0500
47245+++ linux-2.6.32.9/kernel/sys.c 2010-02-23 17:09:53.340074701 -0500
46719@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru 47246@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
46720 error = -EACCES; 47247 error = -EACCES;
46721 goto out; 47248 goto out;
@@ -46851,9 +47378,9 @@ diff -urNp linux-2.6.32.8/kernel/sys.c linux-2.6.32.8/kernel/sys.c
46851 error = -EINVAL; 47378 error = -EINVAL;
46852 break; 47379 break;
46853 } 47380 }
46854diff -urNp linux-2.6.32.8/kernel/sysctl.c linux-2.6.32.8/kernel/sysctl.c 47381diff -urNp linux-2.6.32.9/kernel/sysctl.c linux-2.6.32.9/kernel/sysctl.c
46855--- linux-2.6.32.8/kernel/sysctl.c 2010-02-09 07:57:19.000000000 -0500 47382--- linux-2.6.32.9/kernel/sysctl.c 2010-02-09 07:57:19.000000000 -0500
46856+++ linux-2.6.32.8/kernel/sysctl.c 2010-02-13 21:45:10.844608657 -0500 47383+++ linux-2.6.32.9/kernel/sysctl.c 2010-02-23 17:09:53.340074701 -0500
46857@@ -63,6 +63,13 @@ 47384@@ -63,6 +63,13 @@
46858 static int deprecated_sysctl_warning(struct __sysctl_args *args); 47385 static int deprecated_sysctl_warning(struct __sysctl_args *args);
46859 47386
@@ -46975,9 +47502,9 @@ diff -urNp linux-2.6.32.8/kernel/sysctl.c linux-2.6.32.8/kernel/sysctl.c
46975 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); 47502 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
46976 if (error) 47503 if (error)
46977 return error; 47504 return error;
46978diff -urNp linux-2.6.32.8/kernel/taskstats.c linux-2.6.32.8/kernel/taskstats.c 47505diff -urNp linux-2.6.32.9/kernel/taskstats.c linux-2.6.32.9/kernel/taskstats.c
46979--- linux-2.6.32.8/kernel/taskstats.c 2010-02-09 07:57:19.000000000 -0500 47506--- linux-2.6.32.9/kernel/taskstats.c 2010-02-09 07:57:19.000000000 -0500
46980+++ linux-2.6.32.8/kernel/taskstats.c 2010-02-13 21:45:10.844608657 -0500 47507+++ linux-2.6.32.9/kernel/taskstats.c 2010-02-23 17:09:53.340074701 -0500
46981@@ -26,9 +26,12 @@ 47508@@ -26,9 +26,12 @@
46982 #include <linux/cgroup.h> 47509 #include <linux/cgroup.h>
46983 #include <linux/fs.h> 47510 #include <linux/fs.h>
@@ -47001,9 +47528,9 @@ diff -urNp linux-2.6.32.8/kernel/taskstats.c linux-2.6.32.8/kernel/taskstats.c
47001 if (!alloc_cpumask_var(&mask, GFP_KERNEL)) 47528 if (!alloc_cpumask_var(&mask, GFP_KERNEL))
47002 return -ENOMEM; 47529 return -ENOMEM;
47003 47530
47004diff -urNp linux-2.6.32.8/kernel/time/tick-broadcast.c linux-2.6.32.8/kernel/time/tick-broadcast.c 47531diff -urNp linux-2.6.32.9/kernel/time/tick-broadcast.c linux-2.6.32.9/kernel/time/tick-broadcast.c
47005--- linux-2.6.32.8/kernel/time/tick-broadcast.c 2010-02-09 07:57:19.000000000 -0500 47532--- linux-2.6.32.9/kernel/time/tick-broadcast.c 2010-02-09 07:57:19.000000000 -0500
47006+++ linux-2.6.32.8/kernel/time/tick-broadcast.c 2010-02-13 21:45:10.844608657 -0500 47533+++ linux-2.6.32.9/kernel/time/tick-broadcast.c 2010-02-23 17:09:53.340074701 -0500
47007@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl 47534@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
47008 * then clear the broadcast bit. 47535 * then clear the broadcast bit.
47009 */ 47536 */
@@ -47013,9 +47540,9 @@ diff -urNp linux-2.6.32.8/kernel/time/tick-broadcast.c linux-2.6.32.8/kernel/tim
47013 47540
47014 cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); 47541 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
47015 tick_broadcast_clear_oneshot(cpu); 47542 tick_broadcast_clear_oneshot(cpu);
47016diff -urNp linux-2.6.32.8/kernel/time.c linux-2.6.32.8/kernel/time.c 47543diff -urNp linux-2.6.32.9/kernel/time.c linux-2.6.32.9/kernel/time.c
47017--- linux-2.6.32.8/kernel/time.c 2010-02-09 07:57:19.000000000 -0500 47544--- linux-2.6.32.9/kernel/time.c 2010-02-09 07:57:19.000000000 -0500
47018+++ linux-2.6.32.8/kernel/time.c 2010-02-13 21:45:10.845532966 -0500 47545+++ linux-2.6.32.9/kernel/time.c 2010-02-23 17:09:53.340074701 -0500
47019@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, 47546@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *,
47020 return err; 47547 return err;
47021 47548
@@ -47053,9 +47580,21 @@ diff -urNp linux-2.6.32.8/kernel/time.c linux-2.6.32.8/kernel/time.c
47053 { 47580 {
47054 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) 47581 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
47055 return (USEC_PER_SEC / HZ) * j; 47582 return (USEC_PER_SEC / HZ) * j;
47056diff -urNp linux-2.6.32.8/kernel/trace/ftrace.c linux-2.6.32.8/kernel/trace/ftrace.c 47583diff -urNp linux-2.6.32.9/kernel/timer.c linux-2.6.32.9/kernel/timer.c
47057--- linux-2.6.32.8/kernel/trace/ftrace.c 2010-02-09 07:57:19.000000000 -0500 47584--- linux-2.6.32.9/kernel/timer.c 2010-02-09 07:57:19.000000000 -0500
47058+++ linux-2.6.32.8/kernel/trace/ftrace.c 2010-02-13 21:45:10.845532966 -0500 47585+++ linux-2.6.32.9/kernel/timer.c 2010-02-23 17:09:53.340074701 -0500
47586@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick)
47587 /*
47588 * This function runs timers and the timer-tq in bottom half context.
47589 */
47590-static void run_timer_softirq(struct softirq_action *h)
47591+static void run_timer_softirq(void)
47592 {
47593 struct tvec_base *base = __get_cpu_var(tvec_bases);
47594
47595diff -urNp linux-2.6.32.9/kernel/trace/ftrace.c linux-2.6.32.9/kernel/trace/ftrace.c
47596--- linux-2.6.32.9/kernel/trace/ftrace.c 2010-02-09 07:57:19.000000000 -0500
47597+++ linux-2.6.32.9/kernel/trace/ftrace.c 2010-02-23 17:09:53.340074701 -0500
47059@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, 47598@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod,
47060 47599
47061 ip = rec->ip; 47600 ip = rec->ip;
@@ -47077,9 +47616,9 @@ diff -urNp linux-2.6.32.8/kernel/trace/ftrace.c linux-2.6.32.8/kernel/trace/ftra
47077 } 47616 }
47078 47617
47079 /* 47618 /*
47080diff -urNp linux-2.6.32.8/kernel/trace/Kconfig linux-2.6.32.8/kernel/trace/Kconfig 47619diff -urNp linux-2.6.32.9/kernel/trace/Kconfig linux-2.6.32.9/kernel/trace/Kconfig
47081--- linux-2.6.32.8/kernel/trace/Kconfig 2010-02-09 07:57:19.000000000 -0500 47620--- linux-2.6.32.9/kernel/trace/Kconfig 2010-02-09 07:57:19.000000000 -0500
47082+++ linux-2.6.32.8/kernel/trace/Kconfig 2010-02-13 21:45:10.846539326 -0500 47621+++ linux-2.6.32.9/kernel/trace/Kconfig 2010-02-23 17:09:53.340074701 -0500
47083@@ -126,6 +126,7 @@ if FTRACE 47622@@ -126,6 +126,7 @@ if FTRACE
47084 config FUNCTION_TRACER 47623 config FUNCTION_TRACER
47085 bool "Kernel Function Tracer" 47624 bool "Kernel Function Tracer"
@@ -47096,9 +47635,9 @@ diff -urNp linux-2.6.32.8/kernel/trace/Kconfig linux-2.6.32.8/kernel/trace/Kconf
47096 select FUNCTION_TRACER 47635 select FUNCTION_TRACER
47097 select STACKTRACE 47636 select STACKTRACE
47098 select KALLSYMS 47637 select KALLSYMS
47099diff -urNp linux-2.6.32.8/kernel/trace/trace.c linux-2.6.32.8/kernel/trace/trace.c 47638diff -urNp linux-2.6.32.9/kernel/trace/trace.c linux-2.6.32.9/kernel/trace/trace.c
47100--- linux-2.6.32.8/kernel/trace/trace.c 2010-02-09 07:57:19.000000000 -0500 47639--- linux-2.6.32.9/kernel/trace/trace.c 2010-02-09 07:57:19.000000000 -0500
47101+++ linux-2.6.32.8/kernel/trace/trace.c 2010-02-13 21:45:10.847537100 -0500 47640+++ linux-2.6.32.9/kernel/trace/trace.c 2010-02-23 17:09:53.343560823 -0500
47102@@ -3792,10 +3792,9 @@ static const struct file_operations trac 47641@@ -3792,10 +3792,9 @@ static const struct file_operations trac
47103 }; 47642 };
47104 #endif 47643 #endif
@@ -47123,9 +47662,9 @@ diff -urNp linux-2.6.32.8/kernel/trace/trace.c linux-2.6.32.8/kernel/trace/trace
47123 static int once; 47662 static int once;
47124 struct dentry *d_tracer; 47663 struct dentry *d_tracer;
47125 47664
47126diff -urNp linux-2.6.32.8/kernel/trace/trace_events.c linux-2.6.32.8/kernel/trace/trace_events.c 47665diff -urNp linux-2.6.32.9/kernel/trace/trace_events.c linux-2.6.32.9/kernel/trace/trace_events.c
47127--- linux-2.6.32.8/kernel/trace/trace_events.c 2010-02-09 07:57:19.000000000 -0500 47666--- linux-2.6.32.9/kernel/trace/trace_events.c 2010-02-09 07:57:19.000000000 -0500
47128+++ linux-2.6.32.8/kernel/trace/trace_events.c 2010-02-13 21:45:10.847537100 -0500 47667+++ linux-2.6.32.9/kernel/trace/trace_events.c 2010-02-23 17:09:53.343560823 -0500
47129@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list 47668@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
47130 * Modules must own their file_operations to keep up with 47669 * Modules must own their file_operations to keep up with
47131 * reference counting. 47670 * reference counting.
@@ -47135,9 +47674,9 @@ diff -urNp linux-2.6.32.8/kernel/trace/trace_events.c linux-2.6.32.8/kernel/trac
47135 struct ftrace_module_file_ops { 47674 struct ftrace_module_file_ops {
47136 struct list_head list; 47675 struct list_head list;
47137 struct module *mod; 47676 struct module *mod;
47138diff -urNp linux-2.6.32.8/kernel/trace/trace_output.c linux-2.6.32.8/kernel/trace/trace_output.c 47677diff -urNp linux-2.6.32.9/kernel/trace/trace_output.c linux-2.6.32.9/kernel/trace/trace_output.c
47139--- linux-2.6.32.8/kernel/trace/trace_output.c 2010-02-09 07:57:19.000000000 -0500 47678--- linux-2.6.32.9/kernel/trace/trace_output.c 2010-02-09 07:57:19.000000000 -0500
47140+++ linux-2.6.32.8/kernel/trace/trace_output.c 2010-02-13 21:45:10.847537100 -0500 47679+++ linux-2.6.32.9/kernel/trace/trace_output.c 2010-02-23 17:09:53.343560823 -0500
47141@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, 47680@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,
47142 return 0; 47681 return 0;
47143 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); 47682 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -47147,9 +47686,9 @@ diff -urNp linux-2.6.32.8/kernel/trace/trace_output.c linux-2.6.32.8/kernel/trac
47147 if (p) { 47686 if (p) {
47148 s->len = p - s->buffer; 47687 s->len = p - s->buffer;
47149 return 1; 47688 return 1;
47150diff -urNp linux-2.6.32.8/kernel/trace/trace_stack.c linux-2.6.32.8/kernel/trace/trace_stack.c 47689diff -urNp linux-2.6.32.9/kernel/trace/trace_stack.c linux-2.6.32.9/kernel/trace/trace_stack.c
47151--- linux-2.6.32.8/kernel/trace/trace_stack.c 2010-02-09 07:57:19.000000000 -0500 47690--- linux-2.6.32.9/kernel/trace/trace_stack.c 2010-02-09 07:57:19.000000000 -0500
47152+++ linux-2.6.32.8/kernel/trace/trace_stack.c 2010-02-13 21:45:10.847537100 -0500 47691+++ linux-2.6.32.9/kernel/trace/trace_stack.c 2010-02-23 17:09:53.343560823 -0500
47153@@ -50,7 +50,7 @@ static inline void check_stack(void) 47692@@ -50,7 +50,7 @@ static inline void check_stack(void)
47154 return; 47693 return;
47155 47694
@@ -47159,9 +47698,9 @@ diff -urNp linux-2.6.32.8/kernel/trace/trace_stack.c linux-2.6.32.8/kernel/trace
47159 return; 47698 return;
47160 47699
47161 local_irq_save(flags); 47700 local_irq_save(flags);
47162diff -urNp linux-2.6.32.8/kernel/utsname_sysctl.c linux-2.6.32.8/kernel/utsname_sysctl.c 47701diff -urNp linux-2.6.32.9/kernel/utsname_sysctl.c linux-2.6.32.9/kernel/utsname_sysctl.c
47163--- linux-2.6.32.8/kernel/utsname_sysctl.c 2010-02-09 07:57:19.000000000 -0500 47702--- linux-2.6.32.9/kernel/utsname_sysctl.c 2010-02-09 07:57:19.000000000 -0500
47164+++ linux-2.6.32.8/kernel/utsname_sysctl.c 2010-02-13 21:45:10.847537100 -0500 47703+++ linux-2.6.32.9/kernel/utsname_sysctl.c 2010-02-23 17:09:53.343560823 -0500
47165@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] 47704@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
47166 .proc_handler = proc_do_uts_string, 47705 .proc_handler = proc_do_uts_string,
47167 .strategy = sysctl_uts_string, 47706 .strategy = sysctl_uts_string,
@@ -47180,9 +47719,9 @@ diff -urNp linux-2.6.32.8/kernel/utsname_sysctl.c linux-2.6.32.8/kernel/utsname_
47180 }; 47719 };
47181 47720
47182 static int __init utsname_sysctl_init(void) 47721 static int __init utsname_sysctl_init(void)
47183diff -urNp linux-2.6.32.8/lib/bug.c linux-2.6.32.8/lib/bug.c 47722diff -urNp linux-2.6.32.9/lib/bug.c linux-2.6.32.9/lib/bug.c
47184--- linux-2.6.32.8/lib/bug.c 2010-02-09 07:57:19.000000000 -0500 47723--- linux-2.6.32.9/lib/bug.c 2010-02-09 07:57:19.000000000 -0500
47185+++ linux-2.6.32.8/lib/bug.c 2010-02-13 21:45:10.847537100 -0500 47724+++ linux-2.6.32.9/lib/bug.c 2010-02-23 17:09:53.343560823 -0500
47186@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l 47725@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
47187 return BUG_TRAP_TYPE_NONE; 47726 return BUG_TRAP_TYPE_NONE;
47188 47727
@@ -47192,9 +47731,9 @@ diff -urNp linux-2.6.32.8/lib/bug.c linux-2.6.32.8/lib/bug.c
47192 47731
47193 printk(KERN_EMERG "------------[ cut here ]------------\n"); 47732 printk(KERN_EMERG "------------[ cut here ]------------\n");
47194 47733
47195diff -urNp linux-2.6.32.8/lib/debugobjects.c linux-2.6.32.8/lib/debugobjects.c 47734diff -urNp linux-2.6.32.9/lib/debugobjects.c linux-2.6.32.9/lib/debugobjects.c
47196--- linux-2.6.32.8/lib/debugobjects.c 2010-02-09 07:57:19.000000000 -0500 47735--- linux-2.6.32.9/lib/debugobjects.c 2010-02-09 07:57:19.000000000 -0500
47197+++ linux-2.6.32.8/lib/debugobjects.c 2010-02-13 21:45:10.849050890 -0500 47736+++ linux-2.6.32.9/lib/debugobjects.c 2010-02-23 17:09:53.343560823 -0500
47198@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi 47737@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
47199 if (limit > 4) 47738 if (limit > 4)
47200 return; 47739 return;
@@ -47204,9 +47743,9 @@ diff -urNp linux-2.6.32.8/lib/debugobjects.c linux-2.6.32.8/lib/debugobjects.c
47204 if (is_on_stack == onstack) 47743 if (is_on_stack == onstack)
47205 return; 47744 return;
47206 47745
47207diff -urNp linux-2.6.32.8/lib/dma-debug.c linux-2.6.32.8/lib/dma-debug.c 47746diff -urNp linux-2.6.32.9/lib/dma-debug.c linux-2.6.32.9/lib/dma-debug.c
47208--- linux-2.6.32.8/lib/dma-debug.c 2010-02-09 07:57:19.000000000 -0500 47747--- linux-2.6.32.9/lib/dma-debug.c 2010-02-09 07:57:19.000000000 -0500
47209+++ linux-2.6.32.8/lib/dma-debug.c 2010-02-13 21:45:10.849050890 -0500 47748+++ linux-2.6.32.9/lib/dma-debug.c 2010-02-23 17:09:53.343560823 -0500
47210@@ -861,7 +861,7 @@ out: 47749@@ -861,7 +861,7 @@ out:
47211 47750
47212 static void check_for_stack(struct device *dev, void *addr) 47751 static void check_for_stack(struct device *dev, void *addr)
@@ -47216,9 +47755,26 @@ diff -urNp linux-2.6.32.8/lib/dma-debug.c linux-2.6.32.8/lib/dma-debug.c
47216 err_printk(dev, NULL, "DMA-API: device driver maps memory from" 47755 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
47217 "stack [addr=%p]\n", addr); 47756 "stack [addr=%p]\n", addr);
47218 } 47757 }
47219diff -urNp linux-2.6.32.8/lib/inflate.c linux-2.6.32.8/lib/inflate.c 47758diff -urNp linux-2.6.32.9/lib/idr.c linux-2.6.32.9/lib/idr.c
47220--- linux-2.6.32.8/lib/inflate.c 2010-02-09 07:57:19.000000000 -0500 47759--- linux-2.6.32.9/lib/idr.c 2010-02-09 07:57:19.000000000 -0500
47221+++ linux-2.6.32.8/lib/inflate.c 2010-02-13 21:45:10.849050890 -0500 47760+++ linux-2.6.32.9/lib/idr.c 2010-02-23 17:10:38.011844955 -0500
47761@@ -156,10 +156,12 @@ static int sub_alloc(struct idr *idp, in
47762 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
47763
47764 /* if already at the top layer, we need to grow */
47765- if (!(p = pa[l])) {
47766+ if (id >= (1 << (idp->layers * IDR_BITS))) {
47767 *starting_id = id;
47768 return IDR_NEED_TO_GROW;
47769 }
47770+ p = pa[l];
47771+ BUG_ON(!p);
47772
47773 /* If we need to go up one layer, continue the
47774 * loop; otherwise, restart from the top.
47775diff -urNp linux-2.6.32.9/lib/inflate.c linux-2.6.32.9/lib/inflate.c
47776--- linux-2.6.32.9/lib/inflate.c 2010-02-09 07:57:19.000000000 -0500
47777+++ linux-2.6.32.9/lib/inflate.c 2010-02-23 17:09:53.343560823 -0500
47222@@ -266,7 +266,7 @@ static void free(void *where) 47778@@ -266,7 +266,7 @@ static void free(void *where)
47223 malloc_ptr = free_mem_ptr; 47779 malloc_ptr = free_mem_ptr;
47224 } 47780 }
@@ -47228,9 +47784,9 @@ diff -urNp linux-2.6.32.8/lib/inflate.c linux-2.6.32.8/lib/inflate.c
47228 #define free(a) kfree(a) 47784 #define free(a) kfree(a)
47229 #endif 47785 #endif
47230 47786
47231diff -urNp linux-2.6.32.8/lib/Kconfig.debug linux-2.6.32.8/lib/Kconfig.debug 47787diff -urNp linux-2.6.32.9/lib/Kconfig.debug linux-2.6.32.9/lib/Kconfig.debug
47232--- linux-2.6.32.8/lib/Kconfig.debug 2010-02-09 07:57:19.000000000 -0500 47788--- linux-2.6.32.9/lib/Kconfig.debug 2010-02-09 07:57:19.000000000 -0500
47233+++ linux-2.6.32.8/lib/Kconfig.debug 2010-02-13 21:45:10.850011588 -0500 47789+++ linux-2.6.32.9/lib/Kconfig.debug 2010-02-23 17:09:53.343560823 -0500
47234@@ -905,7 +905,7 @@ config LATENCYTOP 47790@@ -905,7 +905,7 @@ config LATENCYTOP
47235 select STACKTRACE 47791 select STACKTRACE
47236 select SCHEDSTATS 47792 select SCHEDSTATS
@@ -47240,9 +47796,9 @@ diff -urNp linux-2.6.32.8/lib/Kconfig.debug linux-2.6.32.8/lib/Kconfig.debug
47240 help 47796 help
47241 Enable this option if you want to use the LatencyTOP tool 47797 Enable this option if you want to use the LatencyTOP tool
47242 to find out which userspace is blocking on what kernel operations. 47798 to find out which userspace is blocking on what kernel operations.
47243diff -urNp linux-2.6.32.8/lib/kobject.c linux-2.6.32.8/lib/kobject.c 47799diff -urNp linux-2.6.32.9/lib/kobject.c linux-2.6.32.9/lib/kobject.c
47244--- linux-2.6.32.8/lib/kobject.c 2010-02-09 07:57:19.000000000 -0500 47800--- linux-2.6.32.9/lib/kobject.c 2010-02-09 07:57:19.000000000 -0500
47245+++ linux-2.6.32.8/lib/kobject.c 2010-02-13 21:45:10.850011588 -0500 47801+++ linux-2.6.32.9/lib/kobject.c 2010-02-23 17:09:53.343560823 -0500
47246@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko 47802@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
47247 return ret; 47803 return ret;
47248 } 47804 }
@@ -47270,9 +47826,9 @@ diff -urNp linux-2.6.32.8/lib/kobject.c linux-2.6.32.8/lib/kobject.c
47270 struct kobject *parent_kobj) 47826 struct kobject *parent_kobj)
47271 { 47827 {
47272 struct kset *kset; 47828 struct kset *kset;
47273diff -urNp linux-2.6.32.8/lib/kobject_uevent.c linux-2.6.32.8/lib/kobject_uevent.c 47829diff -urNp linux-2.6.32.9/lib/kobject_uevent.c linux-2.6.32.9/lib/kobject_uevent.c
47274--- linux-2.6.32.8/lib/kobject_uevent.c 2010-02-09 07:57:19.000000000 -0500 47830--- linux-2.6.32.9/lib/kobject_uevent.c 2010-02-09 07:57:19.000000000 -0500
47275+++ linux-2.6.32.8/lib/kobject_uevent.c 2010-02-13 21:45:10.850011588 -0500 47831+++ linux-2.6.32.9/lib/kobject_uevent.c 2010-02-23 17:09:53.343560823 -0500
47276@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k 47832@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
47277 const char *subsystem; 47833 const char *subsystem;
47278 struct kobject *top_kobj; 47834 struct kobject *top_kobj;
@@ -47282,9 +47838,9 @@ diff -urNp linux-2.6.32.8/lib/kobject_uevent.c linux-2.6.32.8/lib/kobject_uevent
47282 u64 seq; 47838 u64 seq;
47283 int i = 0; 47839 int i = 0;
47284 int retval = 0; 47840 int retval = 0;
47285diff -urNp linux-2.6.32.8/lib/parser.c linux-2.6.32.8/lib/parser.c 47841diff -urNp linux-2.6.32.9/lib/parser.c linux-2.6.32.9/lib/parser.c
47286--- linux-2.6.32.8/lib/parser.c 2010-02-09 07:57:19.000000000 -0500 47842--- linux-2.6.32.9/lib/parser.c 2010-02-09 07:57:19.000000000 -0500
47287+++ linux-2.6.32.8/lib/parser.c 2010-02-13 21:45:10.850011588 -0500 47843+++ linux-2.6.32.9/lib/parser.c 2010-02-23 17:09:53.343560823 -0500
47288@@ -126,7 +126,7 @@ static int match_number(substring_t *s, 47844@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
47289 char *buf; 47845 char *buf;
47290 int ret; 47846 int ret;
@@ -47294,9 +47850,9 @@ diff -urNp linux-2.6.32.8/lib/parser.c linux-2.6.32.8/lib/parser.c
47294 if (!buf) 47850 if (!buf)
47295 return -ENOMEM; 47851 return -ENOMEM;
47296 memcpy(buf, s->from, s->to - s->from); 47852 memcpy(buf, s->from, s->to - s->from);
47297diff -urNp linux-2.6.32.8/lib/radix-tree.c linux-2.6.32.8/lib/radix-tree.c 47853diff -urNp linux-2.6.32.9/lib/radix-tree.c linux-2.6.32.9/lib/radix-tree.c
47298--- linux-2.6.32.8/lib/radix-tree.c 2010-02-09 07:57:19.000000000 -0500 47854--- linux-2.6.32.9/lib/radix-tree.c 2010-02-09 07:57:19.000000000 -0500
47299+++ linux-2.6.32.8/lib/radix-tree.c 2010-02-13 21:45:10.851012521 -0500 47855+++ linux-2.6.32.9/lib/radix-tree.c 2010-02-23 17:09:53.343560823 -0500
47300@@ -81,7 +81,7 @@ struct radix_tree_preload { 47856@@ -81,7 +81,7 @@ struct radix_tree_preload {
47301 int nr; 47857 int nr;
47302 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; 47858 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -47306,9 +47862,9 @@ diff -urNp linux-2.6.32.8/lib/radix-tree.c linux-2.6.32.8/lib/radix-tree.c
47306 47862
47307 static inline gfp_t root_gfp_mask(struct radix_tree_root *root) 47863 static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
47308 { 47864 {
47309diff -urNp linux-2.6.32.8/lib/random32.c linux-2.6.32.8/lib/random32.c 47865diff -urNp linux-2.6.32.9/lib/random32.c linux-2.6.32.9/lib/random32.c
47310--- linux-2.6.32.8/lib/random32.c 2010-02-09 07:57:19.000000000 -0500 47866--- linux-2.6.32.9/lib/random32.c 2010-02-09 07:57:19.000000000 -0500
47311+++ linux-2.6.32.8/lib/random32.c 2010-02-13 21:45:10.851012521 -0500 47867+++ linux-2.6.32.9/lib/random32.c 2010-02-23 17:09:53.343560823 -0500
47312@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * 47868@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
47313 */ 47869 */
47314 static inline u32 __seed(u32 x, u32 m) 47870 static inline u32 __seed(u32 x, u32 m)
@@ -47318,14 +47874,14 @@ diff -urNp linux-2.6.32.8/lib/random32.c linux-2.6.32.8/lib/random32.c
47318 } 47874 }
47319 47875
47320 /** 47876 /**
47321diff -urNp linux-2.6.32.8/localversion-grsec linux-2.6.32.8/localversion-grsec 47877diff -urNp linux-2.6.32.9/localversion-grsec linux-2.6.32.9/localversion-grsec
47322--- linux-2.6.32.8/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 47878--- linux-2.6.32.9/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
47323+++ linux-2.6.32.8/localversion-grsec 2010-02-13 21:45:10.851012521 -0500 47879+++ linux-2.6.32.9/localversion-grsec 2010-02-23 17:09:53.343560823 -0500
47324@@ -0,0 +1 @@ 47880@@ -0,0 +1 @@
47325+-grsec 47881+-grsec
47326diff -urNp linux-2.6.32.8/Makefile linux-2.6.32.8/Makefile 47882diff -urNp linux-2.6.32.9/Makefile linux-2.6.32.9/Makefile
47327--- linux-2.6.32.8/Makefile 2010-02-09 07:57:19.000000000 -0500 47883--- linux-2.6.32.9/Makefile 2010-02-23 17:04:11.556067453 -0500
47328+++ linux-2.6.32.8/Makefile 2010-02-13 21:45:10.851012521 -0500 47884+++ linux-2.6.32.9/Makefile 2010-02-23 17:09:53.343560823 -0500
47329@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" 47885@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
47330 47886
47331 HOSTCC = gcc 47887 HOSTCC = gcc
@@ -47346,9 +47902,9 @@ diff -urNp linux-2.6.32.8/Makefile linux-2.6.32.8/Makefile
47346 47902
47347 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ 47903 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
47348 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ 47904 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
47349diff -urNp linux-2.6.32.8/mm/filemap.c linux-2.6.32.8/mm/filemap.c 47905diff -urNp linux-2.6.32.9/mm/filemap.c linux-2.6.32.9/mm/filemap.c
47350--- linux-2.6.32.8/mm/filemap.c 2010-02-09 07:57:19.000000000 -0500 47906--- linux-2.6.32.9/mm/filemap.c 2010-02-09 07:57:19.000000000 -0500
47351+++ linux-2.6.32.8/mm/filemap.c 2010-02-13 21:45:10.852012832 -0500 47907+++ linux-2.6.32.9/mm/filemap.c 2010-02-23 17:09:53.343560823 -0500
47352@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file 47908@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file
47353 struct address_space *mapping = file->f_mapping; 47909 struct address_space *mapping = file->f_mapping;
47354 47910
@@ -47366,9 +47922,9 @@ diff -urNp linux-2.6.32.8/mm/filemap.c linux-2.6.32.8/mm/filemap.c
47366 if (*pos >= limit) { 47922 if (*pos >= limit) {
47367 send_sig(SIGXFSZ, current, 0); 47923 send_sig(SIGXFSZ, current, 0);
47368 return -EFBIG; 47924 return -EFBIG;
47369diff -urNp linux-2.6.32.8/mm/fremap.c linux-2.6.32.8/mm/fremap.c 47925diff -urNp linux-2.6.32.9/mm/fremap.c linux-2.6.32.9/mm/fremap.c
47370--- linux-2.6.32.8/mm/fremap.c 2010-02-09 07:57:19.000000000 -0500 47926--- linux-2.6.32.9/mm/fremap.c 2010-02-09 07:57:19.000000000 -0500
47371+++ linux-2.6.32.8/mm/fremap.c 2010-02-13 21:45:10.852012832 -0500 47927+++ linux-2.6.32.9/mm/fremap.c 2010-02-23 17:09:53.343560823 -0500
47372@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign 47928@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
47373 retry: 47929 retry:
47374 vma = find_vma(mm, start); 47930 vma = find_vma(mm, start);
@@ -47381,9 +47937,9 @@ diff -urNp linux-2.6.32.8/mm/fremap.c linux-2.6.32.8/mm/fremap.c
47381 /* 47937 /*
47382 * Make sure the vma is shared, that it supports prefaulting, 47938 * Make sure the vma is shared, that it supports prefaulting,
47383 * and that the remapped range is valid and fully within 47939 * and that the remapped range is valid and fully within
47384diff -urNp linux-2.6.32.8/mm/highmem.c linux-2.6.32.8/mm/highmem.c 47940diff -urNp linux-2.6.32.9/mm/highmem.c linux-2.6.32.9/mm/highmem.c
47385--- linux-2.6.32.8/mm/highmem.c 2010-02-09 07:57:19.000000000 -0500 47941--- linux-2.6.32.9/mm/highmem.c 2010-02-09 07:57:19.000000000 -0500
47386+++ linux-2.6.32.8/mm/highmem.c 2010-02-13 21:45:10.852012832 -0500 47942+++ linux-2.6.32.9/mm/highmem.c 2010-02-23 17:09:53.343560823 -0500
47387@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) 47943@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
47388 * So no dangers, even with speculative execution. 47944 * So no dangers, even with speculative execution.
47389 */ 47945 */
@@ -47409,9 +47965,9 @@ diff -urNp linux-2.6.32.8/mm/highmem.c linux-2.6.32.8/mm/highmem.c
47409 pkmap_count[last_pkmap_nr] = 1; 47965 pkmap_count[last_pkmap_nr] = 1;
47410 set_page_address(page, (void *)vaddr); 47966 set_page_address(page, (void *)vaddr);
47411 47967
47412diff -urNp linux-2.6.32.8/mm/hugetlb.c linux-2.6.32.8/mm/hugetlb.c 47968diff -urNp linux-2.6.32.9/mm/hugetlb.c linux-2.6.32.9/mm/hugetlb.c
47413--- linux-2.6.32.8/mm/hugetlb.c 2010-02-09 07:57:19.000000000 -0500 47969--- linux-2.6.32.9/mm/hugetlb.c 2010-02-09 07:57:19.000000000 -0500
47414+++ linux-2.6.32.8/mm/hugetlb.c 2010-02-13 21:45:10.853009135 -0500 47970+++ linux-2.6.32.9/mm/hugetlb.c 2010-02-23 17:09:53.348068268 -0500
47415@@ -1924,6 +1924,26 @@ static int unmap_ref_private(struct mm_s 47971@@ -1924,6 +1924,26 @@ static int unmap_ref_private(struct mm_s
47416 return 1; 47972 return 1;
47417 } 47973 }
@@ -47491,9 +48047,9 @@ diff -urNp linux-2.6.32.8/mm/hugetlb.c linux-2.6.32.8/mm/hugetlb.c
47491 ptep = huge_pte_alloc(mm, address, huge_page_size(h)); 48047 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
47492 if (!ptep) 48048 if (!ptep)
47493 return VM_FAULT_OOM; 48049 return VM_FAULT_OOM;
47494diff -urNp linux-2.6.32.8/mm/Kconfig linux-2.6.32.8/mm/Kconfig 48050diff -urNp linux-2.6.32.9/mm/Kconfig linux-2.6.32.9/mm/Kconfig
47495--- linux-2.6.32.8/mm/Kconfig 2010-02-09 07:57:19.000000000 -0500 48051--- linux-2.6.32.9/mm/Kconfig 2010-02-09 07:57:19.000000000 -0500
47496+++ linux-2.6.32.8/mm/Kconfig 2010-02-13 21:45:10.853009135 -0500 48052+++ linux-2.6.32.9/mm/Kconfig 2010-02-23 17:09:53.348068268 -0500
47497@@ -228,7 +228,7 @@ config KSM 48053@@ -228,7 +228,7 @@ config KSM
47498 config DEFAULT_MMAP_MIN_ADDR 48054 config DEFAULT_MMAP_MIN_ADDR
47499 int "Low address space to protect from user allocation" 48055 int "Low address space to protect from user allocation"
@@ -47503,9 +48059,9 @@ diff -urNp linux-2.6.32.8/mm/Kconfig linux-2.6.32.8/mm/Kconfig
47503 help 48059 help
47504 This is the portion of low virtual memory which should be protected 48060 This is the portion of low virtual memory which should be protected
47505 from userspace allocation. Keeping a user from writing to low pages 48061 from userspace allocation. Keeping a user from writing to low pages
47506diff -urNp linux-2.6.32.8/mm/maccess.c linux-2.6.32.8/mm/maccess.c 48062diff -urNp linux-2.6.32.9/mm/maccess.c linux-2.6.32.9/mm/maccess.c
47507--- linux-2.6.32.8/mm/maccess.c 2010-02-09 07:57:19.000000000 -0500 48063--- linux-2.6.32.9/mm/maccess.c 2010-02-09 07:57:19.000000000 -0500
47508+++ linux-2.6.32.8/mm/maccess.c 2010-02-13 21:45:10.853009135 -0500 48064+++ linux-2.6.32.9/mm/maccess.c 2010-02-23 17:09:53.348068268 -0500
47509@@ -14,7 +14,7 @@ 48065@@ -14,7 +14,7 @@
47510 * Safely read from address @src to the buffer at @dst. If a kernel fault 48066 * Safely read from address @src to the buffer at @dst. If a kernel fault
47511 * happens, handle that and return -EFAULT. 48067 * happens, handle that and return -EFAULT.
@@ -47524,9 +48080,9 @@ diff -urNp linux-2.6.32.8/mm/maccess.c linux-2.6.32.8/mm/maccess.c
47524 { 48080 {
47525 long ret; 48081 long ret;
47526 mm_segment_t old_fs = get_fs(); 48082 mm_segment_t old_fs = get_fs();
47527diff -urNp linux-2.6.32.8/mm/madvise.c linux-2.6.32.8/mm/madvise.c 48083diff -urNp linux-2.6.32.9/mm/madvise.c linux-2.6.32.9/mm/madvise.c
47528--- linux-2.6.32.8/mm/madvise.c 2010-02-09 07:57:19.000000000 -0500 48084--- linux-2.6.32.9/mm/madvise.c 2010-02-09 07:57:19.000000000 -0500
47529+++ linux-2.6.32.8/mm/madvise.c 2010-02-13 21:45:10.853009135 -0500 48085+++ linux-2.6.32.9/mm/madvise.c 2010-02-23 17:09:53.348068268 -0500
47530@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a 48086@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
47531 pgoff_t pgoff; 48087 pgoff_t pgoff;
47532 unsigned long new_flags = vma->vm_flags; 48088 unsigned long new_flags = vma->vm_flags;
@@ -47603,9 +48159,9 @@ diff -urNp linux-2.6.32.8/mm/madvise.c linux-2.6.32.8/mm/madvise.c
47603 error = 0; 48159 error = 0;
47604 if (end == start) 48160 if (end == start)
47605 goto out; 48161 goto out;
47606diff -urNp linux-2.6.32.8/mm/memory.c linux-2.6.32.8/mm/memory.c 48162diff -urNp linux-2.6.32.9/mm/memory.c linux-2.6.32.9/mm/memory.c
47607--- linux-2.6.32.8/mm/memory.c 2010-02-09 07:57:19.000000000 -0500 48163--- linux-2.6.32.9/mm/memory.c 2010-02-09 07:57:19.000000000 -0500
47608+++ linux-2.6.32.8/mm/memory.c 2010-02-13 21:45:10.854964243 -0500 48164+++ linux-2.6.32.9/mm/memory.c 2010-02-23 17:09:53.348068268 -0500
47609@@ -48,6 +48,7 @@ 48165@@ -48,6 +48,7 @@
47610 #include <linux/ksm.h> 48166 #include <linux/ksm.h>
47611 #include <linux/rmap.h> 48167 #include <linux/rmap.h>
@@ -48010,9 +48566,9 @@ diff -urNp linux-2.6.32.8/mm/memory.c linux-2.6.32.8/mm/memory.c
48010 /* 48566 /*
48011 * Make sure the vDSO gets into every core dump. 48567 * Make sure the vDSO gets into every core dump.
48012 * Dumping its contents makes post-mortem fully interpretable later 48568 * Dumping its contents makes post-mortem fully interpretable later
48013diff -urNp linux-2.6.32.8/mm/memory-failure.c linux-2.6.32.8/mm/memory-failure.c 48569diff -urNp linux-2.6.32.9/mm/memory-failure.c linux-2.6.32.9/mm/memory-failure.c
48014--- linux-2.6.32.8/mm/memory-failure.c 2010-02-09 07:57:19.000000000 -0500 48570--- linux-2.6.32.9/mm/memory-failure.c 2010-02-09 07:57:19.000000000 -0500
48015+++ linux-2.6.32.8/mm/memory-failure.c 2010-02-13 21:45:10.855988002 -0500 48571+++ linux-2.6.32.9/mm/memory-failure.c 2010-02-23 17:09:53.348068268 -0500
48016@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r 48572@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
48017 48573
48018 int sysctl_memory_failure_recovery __read_mostly = 1; 48574 int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -48031,9 +48587,9 @@ diff -urNp linux-2.6.32.8/mm/memory-failure.c linux-2.6.32.8/mm/memory-failure.c
48031 48587
48032 /* 48588 /*
48033 * We need/can do nothing about count=0 pages. 48589 * We need/can do nothing about count=0 pages.
48034diff -urNp linux-2.6.32.8/mm/mempolicy.c linux-2.6.32.8/mm/mempolicy.c 48590diff -urNp linux-2.6.32.9/mm/mempolicy.c linux-2.6.32.9/mm/mempolicy.c
48035--- linux-2.6.32.8/mm/mempolicy.c 2010-02-09 07:57:19.000000000 -0500 48591--- linux-2.6.32.9/mm/mempolicy.c 2010-02-09 07:57:19.000000000 -0500
48036+++ linux-2.6.32.8/mm/mempolicy.c 2010-02-13 21:45:10.856574655 -0500 48592+++ linux-2.6.32.9/mm/mempolicy.c 2010-02-23 17:09:53.348068268 -0500
48037@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st 48593@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
48038 struct vm_area_struct *next; 48594 struct vm_area_struct *next;
48039 int err; 48595 int err;
@@ -48114,20 +48670,10 @@ diff -urNp linux-2.6.32.8/mm/mempolicy.c linux-2.6.32.8/mm/mempolicy.c
48114 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { 48670 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
48115 seq_printf(m, " heap"); 48671 seq_printf(m, " heap");
48116 } else if (vma->vm_start <= mm->start_stack && 48672 } else if (vma->vm_start <= mm->start_stack &&
48117diff -urNp linux-2.6.32.8/mm/migrate.c linux-2.6.32.8/mm/migrate.c 48673diff -urNp linux-2.6.32.9/mm/migrate.c linux-2.6.32.9/mm/migrate.c
48118--- linux-2.6.32.8/mm/migrate.c 2010-02-09 07:57:19.000000000 -0500 48674--- linux-2.6.32.9/mm/migrate.c 2010-02-23 17:04:12.687619162 -0500
48119+++ linux-2.6.32.8/mm/migrate.c 2010-02-13 21:45:10.856574655 -0500 48675+++ linux-2.6.32.9/mm/migrate.c 2010-02-23 17:36:13.156353174 -0500
48120@@ -953,6 +953,9 @@ static int do_pages_move(struct mm_struc 48676@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
48121 goto out_pm;
48122
48123 err = -ENODEV;
48124+ if (node < 0 || node >= MAX_NUMNODES)
48125+ goto out_pm;
48126+
48127 if (!node_state(node, N_HIGH_MEMORY))
48128 goto out_pm;
48129
48130@@ -1103,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
48131 if (!mm) 48677 if (!mm)
48132 return -EINVAL; 48678 return -EINVAL;
48133 48679
@@ -48142,7 +48688,7 @@ diff -urNp linux-2.6.32.8/mm/migrate.c linux-2.6.32.8/mm/migrate.c
48142 /* 48688 /*
48143 * Check if this process has the right to modify the specified 48689 * Check if this process has the right to modify the specified
48144 * process. The right exists if the process has administrative 48690 * process. The right exists if the process has administrative
48145@@ -1112,8 +1123,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 48691@@ -1115,8 +1123,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
48146 rcu_read_lock(); 48692 rcu_read_lock();
48147 tcred = __task_cred(task); 48693 tcred = __task_cred(task);
48148 if (cred->euid != tcred->suid && cred->euid != tcred->uid && 48694 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
@@ -48152,9 +48698,9 @@ diff -urNp linux-2.6.32.8/mm/migrate.c linux-2.6.32.8/mm/migrate.c
48152 rcu_read_unlock(); 48698 rcu_read_unlock();
48153 err = -EPERM; 48699 err = -EPERM;
48154 goto out; 48700 goto out;
48155diff -urNp linux-2.6.32.8/mm/mlock.c linux-2.6.32.8/mm/mlock.c 48701diff -urNp linux-2.6.32.9/mm/mlock.c linux-2.6.32.9/mm/mlock.c
48156--- linux-2.6.32.8/mm/mlock.c 2010-02-09 07:57:19.000000000 -0500 48702--- linux-2.6.32.9/mm/mlock.c 2010-02-09 07:57:19.000000000 -0500
48157+++ linux-2.6.32.8/mm/mlock.c 2010-02-13 21:45:10.856574655 -0500 48703+++ linux-2.6.32.9/mm/mlock.c 2010-02-23 17:09:56.652716557 -0500
48158@@ -13,6 +13,7 @@ 48704@@ -13,6 +13,7 @@
48159 #include <linux/pagemap.h> 48705 #include <linux/pagemap.h>
48160 #include <linux/mempolicy.h> 48706 #include <linux/mempolicy.h>
@@ -48223,9 +48769,9 @@ diff -urNp linux-2.6.32.8/mm/mlock.c linux-2.6.32.8/mm/mlock.c
48223 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || 48769 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
48224 capable(CAP_IPC_LOCK)) 48770 capable(CAP_IPC_LOCK))
48225 ret = do_mlockall(flags); 48771 ret = do_mlockall(flags);
48226diff -urNp linux-2.6.32.8/mm/mmap.c linux-2.6.32.8/mm/mmap.c 48772diff -urNp linux-2.6.32.9/mm/mmap.c linux-2.6.32.9/mm/mmap.c
48227--- linux-2.6.32.8/mm/mmap.c 2010-02-09 07:57:19.000000000 -0500 48773--- linux-2.6.32.9/mm/mmap.c 2010-02-09 07:57:19.000000000 -0500
48228+++ linux-2.6.32.8/mm/mmap.c 2010-02-13 21:45:10.857591578 -0500 48774+++ linux-2.6.32.9/mm/mmap.c 2010-02-23 17:09:56.652716557 -0500
48229@@ -45,6 +45,16 @@ 48775@@ -45,6 +45,16 @@
48230 #define arch_rebalance_pgtables(addr, len) (addr) 48776 #define arch_rebalance_pgtables(addr, len) (addr)
48231 #endif 48777 #endif
@@ -49314,9 +49860,9 @@ diff -urNp linux-2.6.32.8/mm/mmap.c linux-2.6.32.8/mm/mmap.c
49314 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; 49860 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
49315 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 49861 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
49316 49862
49317diff -urNp linux-2.6.32.8/mm/mprotect.c linux-2.6.32.8/mm/mprotect.c 49863diff -urNp linux-2.6.32.9/mm/mprotect.c linux-2.6.32.9/mm/mprotect.c
49318--- linux-2.6.32.8/mm/mprotect.c 2010-02-09 07:57:19.000000000 -0500 49864--- linux-2.6.32.9/mm/mprotect.c 2010-02-09 07:57:19.000000000 -0500
49319+++ linux-2.6.32.8/mm/mprotect.c 2010-02-13 21:45:10.857591578 -0500 49865+++ linux-2.6.32.9/mm/mprotect.c 2010-02-23 17:09:56.652716557 -0500
49320@@ -24,10 +24,16 @@ 49866@@ -24,10 +24,16 @@
49321 #include <linux/mmu_notifier.h> 49867 #include <linux/mmu_notifier.h>
49322 #include <linux/migrate.h> 49868 #include <linux/migrate.h>
@@ -49507,9 +50053,9 @@ diff -urNp linux-2.6.32.8/mm/mprotect.c linux-2.6.32.8/mm/mprotect.c
49507 nstart = tmp; 50053 nstart = tmp;
49508 50054
49509 if (nstart < prev->vm_end) 50055 if (nstart < prev->vm_end)
49510diff -urNp linux-2.6.32.8/mm/mremap.c linux-2.6.32.8/mm/mremap.c 50056diff -urNp linux-2.6.32.9/mm/mremap.c linux-2.6.32.9/mm/mremap.c
49511--- linux-2.6.32.8/mm/mremap.c 2010-02-09 07:57:19.000000000 -0500 50057--- linux-2.6.32.9/mm/mremap.c 2010-02-09 07:57:19.000000000 -0500
49512+++ linux-2.6.32.8/mm/mremap.c 2010-02-13 21:45:10.857591578 -0500 50058+++ linux-2.6.32.9/mm/mremap.c 2010-02-23 17:09:56.652716557 -0500
49513@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str 50059@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
49514 continue; 50060 continue;
49515 pte = ptep_clear_flush(vma, old_addr, old_pte); 50061 pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -49610,9 +50156,9 @@ diff -urNp linux-2.6.32.8/mm/mremap.c linux-2.6.32.8/mm/mremap.c
49610 } 50156 }
49611 out: 50157 out:
49612 if (ret & ~PAGE_MASK) 50158 if (ret & ~PAGE_MASK)
49613diff -urNp linux-2.6.32.8/mm/nommu.c linux-2.6.32.8/mm/nommu.c 50159diff -urNp linux-2.6.32.9/mm/nommu.c linux-2.6.32.9/mm/nommu.c
49614--- linux-2.6.32.8/mm/nommu.c 2010-02-09 07:57:19.000000000 -0500 50160--- linux-2.6.32.9/mm/nommu.c 2010-02-09 07:57:19.000000000 -0500
49615+++ linux-2.6.32.8/mm/nommu.c 2010-02-13 21:45:10.859009520 -0500 50161+++ linux-2.6.32.9/mm/nommu.c 2010-02-23 17:09:56.652716557 -0500
49616@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m 50162@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m
49617 EXPORT_SYMBOL(find_vma); 50163 EXPORT_SYMBOL(find_vma);
49618 50164
@@ -49629,9 +50175,9 @@ diff -urNp linux-2.6.32.8/mm/nommu.c linux-2.6.32.8/mm/nommu.c
49629 * expand a stack to a given address 50175 * expand a stack to a given address
49630 * - not supported under NOMMU conditions 50176 * - not supported under NOMMU conditions
49631 */ 50177 */
49632diff -urNp linux-2.6.32.8/mm/page_alloc.c linux-2.6.32.8/mm/page_alloc.c 50178diff -urNp linux-2.6.32.9/mm/page_alloc.c linux-2.6.32.9/mm/page_alloc.c
49633--- linux-2.6.32.8/mm/page_alloc.c 2010-02-09 07:57:19.000000000 -0500 50179--- linux-2.6.32.9/mm/page_alloc.c 2010-02-09 07:57:19.000000000 -0500
49634+++ linux-2.6.32.8/mm/page_alloc.c 2010-02-13 21:45:10.860010936 -0500 50180+++ linux-2.6.32.9/mm/page_alloc.c 2010-02-23 17:09:56.652716557 -0500
49635@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page 50181@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page
49636 int bad = 0; 50182 int bad = 0;
49637 int wasMlocked = __TestClearPageMlocked(page); 50183 int wasMlocked = __TestClearPageMlocked(page);
@@ -49679,9 +50225,9 @@ diff -urNp linux-2.6.32.8/mm/page_alloc.c linux-2.6.32.8/mm/page_alloc.c
49679 arch_free_page(page, 0); 50225 arch_free_page(page, 0);
49680 kernel_map_pages(page, 1, 0); 50226 kernel_map_pages(page, 1, 0);
49681 50227
49682diff -urNp linux-2.6.32.8/mm/percpu.c linux-2.6.32.8/mm/percpu.c 50228diff -urNp linux-2.6.32.9/mm/percpu.c linux-2.6.32.9/mm/percpu.c
49683--- linux-2.6.32.8/mm/percpu.c 2010-02-09 07:57:19.000000000 -0500 50229--- linux-2.6.32.9/mm/percpu.c 2010-02-09 07:57:19.000000000 -0500
49684+++ linux-2.6.32.8/mm/percpu.c 2010-02-13 21:45:10.860010936 -0500 50230+++ linux-2.6.32.9/mm/percpu.c 2010-02-23 17:09:56.652716557 -0500
49685@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu 50231@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
49686 static unsigned int pcpu_last_unit_cpu __read_mostly; 50232 static unsigned int pcpu_last_unit_cpu __read_mostly;
49687 50233
@@ -49691,9 +50237,9 @@ diff -urNp linux-2.6.32.8/mm/percpu.c linux-2.6.32.8/mm/percpu.c
49691 EXPORT_SYMBOL_GPL(pcpu_base_addr); 50237 EXPORT_SYMBOL_GPL(pcpu_base_addr);
49692 50238
49693 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ 50239 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
49694diff -urNp linux-2.6.32.8/mm/rmap.c linux-2.6.32.8/mm/rmap.c 50240diff -urNp linux-2.6.32.9/mm/rmap.c linux-2.6.32.9/mm/rmap.c
49695--- linux-2.6.32.8/mm/rmap.c 2010-02-09 07:57:19.000000000 -0500 50241--- linux-2.6.32.9/mm/rmap.c 2010-02-09 07:57:19.000000000 -0500
49696+++ linux-2.6.32.8/mm/rmap.c 2010-02-13 21:45:10.860931119 -0500 50242+++ linux-2.6.32.9/mm/rmap.c 2010-02-23 17:09:56.656790635 -0500
49697@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru 50243@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru
49698 struct mm_struct *mm = vma->vm_mm; 50244 struct mm_struct *mm = vma->vm_mm;
49699 struct anon_vma *allocated; 50245 struct anon_vma *allocated;
@@ -49721,9 +50267,9 @@ diff -urNp linux-2.6.32.8/mm/rmap.c linux-2.6.32.8/mm/rmap.c
49721 vma->anon_vma = anon_vma; 50267 vma->anon_vma = anon_vma;
49722 list_add_tail(&vma->anon_vma_node, &anon_vma->head); 50268 list_add_tail(&vma->anon_vma_node, &anon_vma->head);
49723 allocated = NULL; 50269 allocated = NULL;
49724diff -urNp linux-2.6.32.8/mm/shmem.c linux-2.6.32.8/mm/shmem.c 50270diff -urNp linux-2.6.32.9/mm/shmem.c linux-2.6.32.9/mm/shmem.c
49725--- linux-2.6.32.8/mm/shmem.c 2010-02-09 07:57:19.000000000 -0500 50271--- linux-2.6.32.9/mm/shmem.c 2010-02-09 07:57:19.000000000 -0500
49726+++ linux-2.6.32.8/mm/shmem.c 2010-02-13 21:45:10.860931119 -0500 50272+++ linux-2.6.32.9/mm/shmem.c 2010-02-23 17:09:56.656790635 -0500
49727@@ -31,7 +31,7 @@ 50273@@ -31,7 +31,7 @@
49728 #include <linux/swap.h> 50274 #include <linux/swap.h>
49729 #include <linux/ima.h> 50275 #include <linux/ima.h>
@@ -49733,9 +50279,9 @@ diff -urNp linux-2.6.32.8/mm/shmem.c linux-2.6.32.8/mm/shmem.c
49733 50279
49734 #ifdef CONFIG_SHMEM 50280 #ifdef CONFIG_SHMEM
49735 /* 50281 /*
49736diff -urNp linux-2.6.32.8/mm/slab.c linux-2.6.32.8/mm/slab.c 50282diff -urNp linux-2.6.32.9/mm/slab.c linux-2.6.32.9/mm/slab.c
49737--- linux-2.6.32.8/mm/slab.c 2010-02-09 07:57:19.000000000 -0500 50283--- linux-2.6.32.9/mm/slab.c 2010-02-09 07:57:19.000000000 -0500
49738+++ linux-2.6.32.8/mm/slab.c 2010-02-13 21:45:10.862011691 -0500 50284+++ linux-2.6.32.9/mm/slab.c 2010-02-23 17:09:56.656790635 -0500
49739@@ -308,7 +308,7 @@ struct kmem_list3 { 50285@@ -308,7 +308,7 @@ struct kmem_list3 {
49740 * Need this for bootstrapping a per node allocator. 50286 * Need this for bootstrapping a per node allocator.
49741 */ 50287 */
@@ -49833,9 +50379,9 @@ diff -urNp linux-2.6.32.8/mm/slab.c linux-2.6.32.8/mm/slab.c
49833 /** 50379 /**
49834 * ksize - get the actual amount of memory allocated for a given object 50380 * ksize - get the actual amount of memory allocated for a given object
49835 * @objp: Pointer to the object 50381 * @objp: Pointer to the object
49836diff -urNp linux-2.6.32.8/mm/slob.c linux-2.6.32.8/mm/slob.c 50382diff -urNp linux-2.6.32.9/mm/slob.c linux-2.6.32.9/mm/slob.c
49837--- linux-2.6.32.8/mm/slob.c 2010-02-09 07:57:19.000000000 -0500 50383--- linux-2.6.32.9/mm/slob.c 2010-02-09 07:57:19.000000000 -0500
49838+++ linux-2.6.32.8/mm/slob.c 2010-02-13 21:45:10.862011691 -0500 50384+++ linux-2.6.32.9/mm/slob.c 2010-02-23 17:09:56.713257424 -0500
49839@@ -29,7 +29,7 @@ 50385@@ -29,7 +29,7 @@
49840 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls 50386 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
49841 * alloc_pages() directly, allocating compound pages so the page order 50387 * alloc_pages() directly, allocating compound pages so the page order
@@ -50156,9 +50702,9 @@ diff -urNp linux-2.6.32.8/mm/slob.c linux-2.6.32.8/mm/slob.c
50156 } 50702 }
50157 50703
50158 trace_kmem_cache_free(_RET_IP_, b); 50704 trace_kmem_cache_free(_RET_IP_, b);
50159diff -urNp linux-2.6.32.8/mm/slub.c linux-2.6.32.8/mm/slub.c 50705diff -urNp linux-2.6.32.9/mm/slub.c linux-2.6.32.9/mm/slub.c
50160--- linux-2.6.32.8/mm/slub.c 2010-02-09 07:57:19.000000000 -0500 50706--- linux-2.6.32.9/mm/slub.c 2010-02-09 07:57:19.000000000 -0500
50161+++ linux-2.6.32.8/mm/slub.c 2010-02-13 21:53:12.351590932 -0500 50707+++ linux-2.6.32.9/mm/slub.c 2010-02-23 17:09:56.713257424 -0500
50162@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * 50708@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache *
50163 50709
50164 page = virt_to_head_page(x); 50710 page = virt_to_head_page(x);
@@ -50315,9 +50861,9 @@ diff -urNp linux-2.6.32.8/mm/slub.c linux-2.6.32.8/mm/slub.c
50315 static void print_slabinfo_header(struct seq_file *m) 50861 static void print_slabinfo_header(struct seq_file *m)
50316 { 50862 {
50317 seq_puts(m, "slabinfo - version: 2.1\n"); 50863 seq_puts(m, "slabinfo - version: 2.1\n");
50318diff -urNp linux-2.6.32.8/mm/util.c linux-2.6.32.8/mm/util.c 50864diff -urNp linux-2.6.32.9/mm/util.c linux-2.6.32.9/mm/util.c
50319--- linux-2.6.32.8/mm/util.c 2010-02-09 07:57:19.000000000 -0500 50865--- linux-2.6.32.9/mm/util.c 2010-02-09 07:57:19.000000000 -0500
50320+++ linux-2.6.32.8/mm/util.c 2010-02-13 21:45:10.863790825 -0500 50866+++ linux-2.6.32.9/mm/util.c 2010-02-23 17:09:56.713257424 -0500
50321@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); 50867@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
50322 void arch_pick_mmap_layout(struct mm_struct *mm) 50868 void arch_pick_mmap_layout(struct mm_struct *mm)
50323 { 50869 {
@@ -50331,9 +50877,9 @@ diff -urNp linux-2.6.32.8/mm/util.c linux-2.6.32.8/mm/util.c
50331 mm->get_unmapped_area = arch_get_unmapped_area; 50877 mm->get_unmapped_area = arch_get_unmapped_area;
50332 mm->unmap_area = arch_unmap_area; 50878 mm->unmap_area = arch_unmap_area;
50333 } 50879 }
50334diff -urNp linux-2.6.32.8/mm/vmalloc.c linux-2.6.32.8/mm/vmalloc.c 50880diff -urNp linux-2.6.32.9/mm/vmalloc.c linux-2.6.32.9/mm/vmalloc.c
50335--- linux-2.6.32.8/mm/vmalloc.c 2010-02-09 07:57:19.000000000 -0500 50881--- linux-2.6.32.9/mm/vmalloc.c 2010-02-09 07:57:19.000000000 -0500
50336+++ linux-2.6.32.8/mm/vmalloc.c 2010-02-13 21:45:10.863790825 -0500 50882+++ linux-2.6.32.9/mm/vmalloc.c 2010-02-23 17:09:56.713257424 -0500
50337@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, 50883@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
50338 50884
50339 pte = pte_offset_kernel(pmd, addr); 50885 pte = pte_offset_kernel(pmd, addr);
@@ -50544,9 +51090,9 @@ diff -urNp linux-2.6.32.8/mm/vmalloc.c linux-2.6.32.8/mm/vmalloc.c
50544 void *vmalloc_32_user(unsigned long size) 51090 void *vmalloc_32_user(unsigned long size)
50545 { 51091 {
50546 struct vm_struct *area; 51092 struct vm_struct *area;
50547diff -urNp linux-2.6.32.8/net/atm/atm_misc.c linux-2.6.32.8/net/atm/atm_misc.c 51093diff -urNp linux-2.6.32.9/net/atm/atm_misc.c linux-2.6.32.9/net/atm/atm_misc.c
50548--- linux-2.6.32.8/net/atm/atm_misc.c 2010-02-09 07:57:19.000000000 -0500 51094--- linux-2.6.32.9/net/atm/atm_misc.c 2010-02-09 07:57:19.000000000 -0500
50549+++ linux-2.6.32.8/net/atm/atm_misc.c 2010-02-13 21:45:10.863790825 -0500 51095+++ linux-2.6.32.9/net/atm/atm_misc.c 2010-02-23 17:09:56.713257424 -0500
50550@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t 51096@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
50551 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) 51097 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
50552 return 1; 51098 return 1;
@@ -50583,9 +51129,9 @@ diff -urNp linux-2.6.32.8/net/atm/atm_misc.c linux-2.6.32.8/net/atm/atm_misc.c
50583 __SONET_ITEMS 51129 __SONET_ITEMS
50584 #undef __HANDLE_ITEM 51130 #undef __HANDLE_ITEM
50585 } 51131 }
50586diff -urNp linux-2.6.32.8/net/atm/proc.c linux-2.6.32.8/net/atm/proc.c 51132diff -urNp linux-2.6.32.9/net/atm/proc.c linux-2.6.32.9/net/atm/proc.c
50587--- linux-2.6.32.8/net/atm/proc.c 2010-02-09 07:57:19.000000000 -0500 51133--- linux-2.6.32.9/net/atm/proc.c 2010-02-09 07:57:19.000000000 -0500
50588+++ linux-2.6.32.8/net/atm/proc.c 2010-02-13 21:45:10.864691981 -0500 51134+++ linux-2.6.32.9/net/atm/proc.c 2010-02-23 17:09:56.713257424 -0500
50589@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s 51135@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
50590 const struct k_atm_aal_stats *stats) 51136 const struct k_atm_aal_stats *stats)
50591 { 51137 {
@@ -50599,9 +51145,9 @@ diff -urNp linux-2.6.32.8/net/atm/proc.c linux-2.6.32.8/net/atm/proc.c
50599 } 51145 }
50600 51146
50601 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) 51147 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
50602diff -urNp linux-2.6.32.8/net/atm/resources.c linux-2.6.32.8/net/atm/resources.c 51148diff -urNp linux-2.6.32.9/net/atm/resources.c linux-2.6.32.9/net/atm/resources.c
50603--- linux-2.6.32.8/net/atm/resources.c 2010-02-09 07:57:19.000000000 -0500 51149--- linux-2.6.32.9/net/atm/resources.c 2010-02-09 07:57:19.000000000 -0500
50604+++ linux-2.6.32.8/net/atm/resources.c 2010-02-13 21:45:10.864691981 -0500 51150+++ linux-2.6.32.9/net/atm/resources.c 2010-02-23 17:09:56.716220139 -0500
50605@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * 51151@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
50606 static void copy_aal_stats(struct k_atm_aal_stats *from, 51152 static void copy_aal_stats(struct k_atm_aal_stats *from,
50607 struct atm_aal_stats *to) 51153 struct atm_aal_stats *to)
@@ -50620,9 +51166,9 @@ diff -urNp linux-2.6.32.8/net/atm/resources.c linux-2.6.32.8/net/atm/resources.c
50620 __AAL_STAT_ITEMS 51166 __AAL_STAT_ITEMS
50621 #undef __HANDLE_ITEM 51167 #undef __HANDLE_ITEM
50622 } 51168 }
50623diff -urNp linux-2.6.32.8/net/bridge/br_private.h linux-2.6.32.8/net/bridge/br_private.h 51169diff -urNp linux-2.6.32.9/net/bridge/br_private.h linux-2.6.32.9/net/bridge/br_private.h
50624--- linux-2.6.32.8/net/bridge/br_private.h 2010-02-09 07:57:19.000000000 -0500 51170--- linux-2.6.32.9/net/bridge/br_private.h 2010-02-09 07:57:19.000000000 -0500
50625+++ linux-2.6.32.8/net/bridge/br_private.h 2010-02-13 21:45:10.864691981 -0500 51171+++ linux-2.6.32.9/net/bridge/br_private.h 2010-02-23 17:09:56.716220139 -0500
50626@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, 51172@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,
50627 51173
50628 #ifdef CONFIG_SYSFS 51174 #ifdef CONFIG_SYSFS
@@ -50632,9 +51178,9 @@ diff -urNp linux-2.6.32.8/net/bridge/br_private.h linux-2.6.32.8/net/bridge/br_p
50632 extern int br_sysfs_addif(struct net_bridge_port *p); 51178 extern int br_sysfs_addif(struct net_bridge_port *p);
50633 51179
50634 /* br_sysfs_br.c */ 51180 /* br_sysfs_br.c */
50635diff -urNp linux-2.6.32.8/net/bridge/br_stp_if.c linux-2.6.32.8/net/bridge/br_stp_if.c 51181diff -urNp linux-2.6.32.9/net/bridge/br_stp_if.c linux-2.6.32.9/net/bridge/br_stp_if.c
50636--- linux-2.6.32.8/net/bridge/br_stp_if.c 2010-02-09 07:57:19.000000000 -0500 51182--- linux-2.6.32.9/net/bridge/br_stp_if.c 2010-02-09 07:57:19.000000000 -0500
50637+++ linux-2.6.32.8/net/bridge/br_stp_if.c 2010-02-13 21:45:10.864691981 -0500 51183+++ linux-2.6.32.9/net/bridge/br_stp_if.c 2010-02-23 17:09:56.716220139 -0500
50638@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg 51184@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
50639 char *envp[] = { NULL }; 51185 char *envp[] = { NULL };
50640 51186
@@ -50644,9 +51190,9 @@ diff -urNp linux-2.6.32.8/net/bridge/br_stp_if.c linux-2.6.32.8/net/bridge/br_st
50644 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", 51190 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
50645 br->dev->name, r); 51191 br->dev->name, r);
50646 51192
50647diff -urNp linux-2.6.32.8/net/bridge/br_sysfs_if.c linux-2.6.32.8/net/bridge/br_sysfs_if.c 51193diff -urNp linux-2.6.32.9/net/bridge/br_sysfs_if.c linux-2.6.32.9/net/bridge/br_sysfs_if.c
50648--- linux-2.6.32.8/net/bridge/br_sysfs_if.c 2010-02-09 07:57:19.000000000 -0500 51194--- linux-2.6.32.9/net/bridge/br_sysfs_if.c 2010-02-09 07:57:19.000000000 -0500
50649+++ linux-2.6.32.8/net/bridge/br_sysfs_if.c 2010-02-13 21:45:10.864691981 -0500 51195+++ linux-2.6.32.9/net/bridge/br_sysfs_if.c 2010-02-23 17:09:56.716220139 -0500
50650@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje 51196@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
50651 return ret; 51197 return ret;
50652 } 51198 }
@@ -50656,9 +51202,30 @@ diff -urNp linux-2.6.32.8/net/bridge/br_sysfs_if.c linux-2.6.32.8/net/bridge/br_
50656 .show = brport_show, 51202 .show = brport_show,
50657 .store = brport_store, 51203 .store = brport_store,
50658 }; 51204 };
50659diff -urNp linux-2.6.32.8/net/core/flow.c linux-2.6.32.8/net/core/flow.c 51205diff -urNp linux-2.6.32.9/net/core/dev.c linux-2.6.32.9/net/core/dev.c
50660--- linux-2.6.32.8/net/core/flow.c 2010-02-09 07:57:19.000000000 -0500 51206--- linux-2.6.32.9/net/core/dev.c 2010-02-09 07:57:19.000000000 -0500
50661+++ linux-2.6.32.8/net/core/flow.c 2010-02-13 21:45:10.864691981 -0500 51207+++ linux-2.6.32.9/net/core/dev.c 2010-02-23 17:09:56.716220139 -0500
51208@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb)
51209 }
51210 EXPORT_SYMBOL(netif_rx_ni);
51211
51212-static void net_tx_action(struct softirq_action *h)
51213+static void net_tx_action(void)
51214 {
51215 struct softnet_data *sd = &__get_cpu_var(softnet_data);
51216
51217@@ -2808,7 +2808,7 @@ void netif_napi_del(struct napi_struct *
51218 EXPORT_SYMBOL(netif_napi_del);
51219
51220
51221-static void net_rx_action(struct softirq_action *h)
51222+static void net_rx_action(void)
51223 {
51224 struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
51225 unsigned long time_limit = jiffies + 2;
51226diff -urNp linux-2.6.32.9/net/core/flow.c linux-2.6.32.9/net/core/flow.c
51227--- linux-2.6.32.9/net/core/flow.c 2010-02-09 07:57:19.000000000 -0500
51228+++ linux-2.6.32.9/net/core/flow.c 2010-02-23 17:09:56.716220139 -0500
50662@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( 51229@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
50663 51230
50664 static u32 flow_hash_shift; 51231 static u32 flow_hash_shift;
@@ -50686,9 +51253,9 @@ diff -urNp linux-2.6.32.8/net/core/flow.c linux-2.6.32.8/net/core/flow.c
50686 51253
50687 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) 51254 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
50688 51255
50689diff -urNp linux-2.6.32.8/net/dccp/ccids/ccid3.c linux-2.6.32.8/net/dccp/ccids/ccid3.c 51256diff -urNp linux-2.6.32.9/net/dccp/ccids/ccid3.c linux-2.6.32.9/net/dccp/ccids/ccid3.c
50690--- linux-2.6.32.8/net/dccp/ccids/ccid3.c 2010-02-09 07:57:19.000000000 -0500 51257--- linux-2.6.32.9/net/dccp/ccids/ccid3.c 2010-02-09 07:57:19.000000000 -0500
50691+++ linux-2.6.32.8/net/dccp/ccids/ccid3.c 2010-02-13 21:45:10.866010784 -0500 51258+++ linux-2.6.32.9/net/dccp/ccids/ccid3.c 2010-02-23 17:09:56.716220139 -0500
50692@@ -41,7 +41,7 @@ 51259@@ -41,7 +41,7 @@
50693 static int ccid3_debug; 51260 static int ccid3_debug;
50694 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) 51261 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -50698,9 +51265,9 @@ diff -urNp linux-2.6.32.8/net/dccp/ccids/ccid3.c linux-2.6.32.8/net/dccp/ccids/c
50698 #endif 51265 #endif
50699 51266
50700 /* 51267 /*
50701diff -urNp linux-2.6.32.8/net/dccp/dccp.h linux-2.6.32.8/net/dccp/dccp.h 51268diff -urNp linux-2.6.32.9/net/dccp/dccp.h linux-2.6.32.9/net/dccp/dccp.h
50702--- linux-2.6.32.8/net/dccp/dccp.h 2010-02-09 07:57:19.000000000 -0500 51269--- linux-2.6.32.9/net/dccp/dccp.h 2010-02-09 07:57:19.000000000 -0500
50703+++ linux-2.6.32.8/net/dccp/dccp.h 2010-02-13 21:45:10.866010784 -0500 51270+++ linux-2.6.32.9/net/dccp/dccp.h 2010-02-23 17:09:56.716220139 -0500
50704@@ -44,9 +44,9 @@ extern int dccp_debug; 51271@@ -44,9 +44,9 @@ extern int dccp_debug;
50705 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) 51272 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
50706 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) 51273 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
@@ -50714,9 +51281,9 @@ diff -urNp linux-2.6.32.8/net/dccp/dccp.h linux-2.6.32.8/net/dccp/dccp.h
50714 #endif 51281 #endif
50715 51282
50716 extern struct inet_hashinfo dccp_hashinfo; 51283 extern struct inet_hashinfo dccp_hashinfo;
50717diff -urNp linux-2.6.32.8/net/ipv4/inet_hashtables.c linux-2.6.32.8/net/ipv4/inet_hashtables.c 51284diff -urNp linux-2.6.32.9/net/ipv4/inet_hashtables.c linux-2.6.32.9/net/ipv4/inet_hashtables.c
50718--- linux-2.6.32.8/net/ipv4/inet_hashtables.c 2010-02-09 07:57:19.000000000 -0500 51285--- linux-2.6.32.9/net/ipv4/inet_hashtables.c 2010-02-09 07:57:19.000000000 -0500
50719+++ linux-2.6.32.8/net/ipv4/inet_hashtables.c 2010-02-13 21:45:10.866010784 -0500 51286+++ linux-2.6.32.9/net/ipv4/inet_hashtables.c 2010-02-23 17:09:56.720158253 -0500
50720@@ -18,11 +18,14 @@ 51287@@ -18,11 +18,14 @@
50721 #include <linux/sched.h> 51288 #include <linux/sched.h>
50722 #include <linux/slab.h> 51289 #include <linux/slab.h>
@@ -50741,9 +51308,9 @@ diff -urNp linux-2.6.32.8/net/ipv4/inet_hashtables.c linux-2.6.32.8/net/ipv4/ine
50741 if (tw) { 51308 if (tw) {
50742 inet_twsk_deschedule(tw, death_row); 51309 inet_twsk_deschedule(tw, death_row);
50743 inet_twsk_put(tw); 51310 inet_twsk_put(tw);
50744diff -urNp linux-2.6.32.8/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.8/net/ipv4/netfilter/nf_nat_snmp_basic.c 51311diff -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
50745--- linux-2.6.32.8/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-02-09 07:57:19.000000000 -0500 51312--- linux-2.6.32.9/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-02-09 07:57:19.000000000 -0500
50746+++ linux-2.6.32.8/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-02-13 21:45:10.866708013 -0500 51313+++ linux-2.6.32.9/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-02-23 17:09:56.720158253 -0500
50747@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( 51314@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
50748 51315
50749 *len = 0; 51316 *len = 0;
@@ -50753,9 +51320,9 @@ diff -urNp linux-2.6.32.8/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.8/
50753 if (*octets == NULL) { 51320 if (*octets == NULL) {
50754 if (net_ratelimit()) 51321 if (net_ratelimit())
50755 printk("OOM in bsalg (%d)\n", __LINE__); 51322 printk("OOM in bsalg (%d)\n", __LINE__);
50756diff -urNp linux-2.6.32.8/net/ipv4/tcp_ipv4.c linux-2.6.32.8/net/ipv4/tcp_ipv4.c 51323diff -urNp linux-2.6.32.9/net/ipv4/tcp_ipv4.c linux-2.6.32.9/net/ipv4/tcp_ipv4.c
50757--- linux-2.6.32.8/net/ipv4/tcp_ipv4.c 2010-02-09 07:57:19.000000000 -0500 51324--- linux-2.6.32.9/net/ipv4/tcp_ipv4.c 2010-02-09 07:57:19.000000000 -0500
50758+++ linux-2.6.32.8/net/ipv4/tcp_ipv4.c 2010-02-13 21:45:10.866708013 -0500 51325+++ linux-2.6.32.9/net/ipv4/tcp_ipv4.c 2010-02-23 17:09:56.720158253 -0500
50759@@ -1542,6 +1542,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc 51326@@ -1542,6 +1542,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc
50760 return 0; 51327 return 0;
50761 51328
@@ -50776,9 +51343,9 @@ diff -urNp linux-2.6.32.8/net/ipv4/tcp_ipv4.c linux-2.6.32.8/net/ipv4/tcp_ipv4.c
50776 tcp_v4_send_reset(NULL, skb); 51343 tcp_v4_send_reset(NULL, skb);
50777 } 51344 }
50778 51345
50779diff -urNp linux-2.6.32.8/net/ipv4/tcp_minisocks.c linux-2.6.32.8/net/ipv4/tcp_minisocks.c 51346diff -urNp linux-2.6.32.9/net/ipv4/tcp_minisocks.c linux-2.6.32.9/net/ipv4/tcp_minisocks.c
50780--- linux-2.6.32.8/net/ipv4/tcp_minisocks.c 2010-02-09 07:57:19.000000000 -0500 51347--- linux-2.6.32.9/net/ipv4/tcp_minisocks.c 2010-02-09 07:57:19.000000000 -0500
50781+++ linux-2.6.32.8/net/ipv4/tcp_minisocks.c 2010-02-13 21:45:10.866708013 -0500 51348+++ linux-2.6.32.9/net/ipv4/tcp_minisocks.c 2010-02-23 17:09:56.720158253 -0500
50782@@ -672,8 +672,11 @@ listen_overflow: 51349@@ -672,8 +672,11 @@ listen_overflow:
50783 51350
50784 embryonic_reset: 51351 embryonic_reset:
@@ -50791,9 +51358,9 @@ diff -urNp linux-2.6.32.8/net/ipv4/tcp_minisocks.c linux-2.6.32.8/net/ipv4/tcp_m
50791 51358
50792 inet_csk_reqsk_queue_drop(sk, req, prev); 51359 inet_csk_reqsk_queue_drop(sk, req, prev);
50793 return NULL; 51360 return NULL;
50794diff -urNp linux-2.6.32.8/net/ipv4/udp.c linux-2.6.32.8/net/ipv4/udp.c 51361diff -urNp linux-2.6.32.9/net/ipv4/udp.c linux-2.6.32.9/net/ipv4/udp.c
50795--- linux-2.6.32.8/net/ipv4/udp.c 2010-02-09 07:57:19.000000000 -0500 51362--- linux-2.6.32.9/net/ipv4/udp.c 2010-02-09 07:57:19.000000000 -0500
50796+++ linux-2.6.32.8/net/ipv4/udp.c 2010-02-13 21:45:10.867866359 -0500 51363+++ linux-2.6.32.9/net/ipv4/udp.c 2010-02-23 17:09:56.720158253 -0500
50797@@ -86,6 +86,7 @@ 51364@@ -86,6 +86,7 @@
50798 #include <linux/types.h> 51365 #include <linux/types.h>
50799 #include <linux/fcntl.h> 51366 #include <linux/fcntl.h>
@@ -50852,9 +51419,9 @@ diff -urNp linux-2.6.32.8/net/ipv4/udp.c linux-2.6.32.8/net/ipv4/udp.c
50852 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); 51419 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
50853 51420
50854 /* 51421 /*
50855diff -urNp linux-2.6.32.8/net/ipv6/exthdrs.c linux-2.6.32.8/net/ipv6/exthdrs.c 51422diff -urNp linux-2.6.32.9/net/ipv6/exthdrs.c linux-2.6.32.9/net/ipv6/exthdrs.c
50856--- linux-2.6.32.8/net/ipv6/exthdrs.c 2010-02-09 07:57:19.000000000 -0500 51423--- linux-2.6.32.9/net/ipv6/exthdrs.c 2010-02-09 07:57:19.000000000 -0500
50857+++ linux-2.6.32.8/net/ipv6/exthdrs.c 2010-02-13 21:45:10.867866359 -0500 51424+++ linux-2.6.32.9/net/ipv6/exthdrs.c 2010-02-23 17:09:56.720158253 -0500
50858@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt 51425@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
50859 .type = IPV6_TLV_JUMBO, 51426 .type = IPV6_TLV_JUMBO,
50860 .func = ipv6_hop_jumbo, 51427 .func = ipv6_hop_jumbo,
@@ -50864,9 +51431,9 @@ diff -urNp linux-2.6.32.8/net/ipv6/exthdrs.c linux-2.6.32.8/net/ipv6/exthdrs.c
50864 }; 51431 };
50865 51432
50866 int ipv6_parse_hopopts(struct sk_buff *skb) 51433 int ipv6_parse_hopopts(struct sk_buff *skb)
50867diff -urNp linux-2.6.32.8/net/ipv6/raw.c linux-2.6.32.8/net/ipv6/raw.c 51434diff -urNp linux-2.6.32.9/net/ipv6/raw.c linux-2.6.32.9/net/ipv6/raw.c
50868--- linux-2.6.32.8/net/ipv6/raw.c 2010-02-09 07:57:19.000000000 -0500 51435--- linux-2.6.32.9/net/ipv6/raw.c 2010-02-09 07:57:19.000000000 -0500
50869+++ linux-2.6.32.8/net/ipv6/raw.c 2010-02-13 21:45:10.867866359 -0500 51436+++ linux-2.6.32.9/net/ipv6/raw.c 2010-02-23 17:09:56.720158253 -0500
50870@@ -600,7 +600,7 @@ out: 51437@@ -600,7 +600,7 @@ out:
50871 return err; 51438 return err;
50872 } 51439 }
@@ -50876,9 +51443,9 @@ diff -urNp linux-2.6.32.8/net/ipv6/raw.c linux-2.6.32.8/net/ipv6/raw.c
50876 struct flowi *fl, struct rt6_info *rt, 51443 struct flowi *fl, struct rt6_info *rt,
50877 unsigned int flags) 51444 unsigned int flags)
50878 { 51445 {
50879diff -urNp linux-2.6.32.8/net/ipv6/tcp_ipv6.c linux-2.6.32.8/net/ipv6/tcp_ipv6.c 51446diff -urNp linux-2.6.32.9/net/ipv6/tcp_ipv6.c linux-2.6.32.9/net/ipv6/tcp_ipv6.c
50880--- linux-2.6.32.8/net/ipv6/tcp_ipv6.c 2010-02-09 07:57:19.000000000 -0500 51447--- linux-2.6.32.9/net/ipv6/tcp_ipv6.c 2010-02-09 07:57:19.000000000 -0500
50881+++ linux-2.6.32.8/net/ipv6/tcp_ipv6.c 2010-02-13 21:45:10.868957557 -0500 51448+++ linux-2.6.32.9/net/ipv6/tcp_ipv6.c 2010-02-23 17:09:56.720158253 -0500
50882@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk 51449@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk
50883 return 0; 51450 return 0;
50884 51451
@@ -50899,9 +51466,9 @@ diff -urNp linux-2.6.32.8/net/ipv6/tcp_ipv6.c linux-2.6.32.8/net/ipv6/tcp_ipv6.c
50899 tcp_v6_send_reset(NULL, skb); 51466 tcp_v6_send_reset(NULL, skb);
50900 } 51467 }
50901 51468
50902diff -urNp linux-2.6.32.8/net/ipv6/udp.c linux-2.6.32.8/net/ipv6/udp.c 51469diff -urNp linux-2.6.32.9/net/ipv6/udp.c linux-2.6.32.9/net/ipv6/udp.c
50903--- linux-2.6.32.8/net/ipv6/udp.c 2010-02-09 07:57:19.000000000 -0500 51470--- linux-2.6.32.9/net/ipv6/udp.c 2010-02-09 07:57:19.000000000 -0500
50904+++ linux-2.6.32.8/net/ipv6/udp.c 2010-02-13 21:45:10.868957557 -0500 51471+++ linux-2.6.32.9/net/ipv6/udp.c 2010-02-23 17:09:56.720158253 -0500
50905@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, 51472@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb,
50906 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, 51473 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
50907 proto == IPPROTO_UDPLITE); 51474 proto == IPPROTO_UDPLITE);
@@ -50912,9 +51479,9 @@ diff -urNp linux-2.6.32.8/net/ipv6/udp.c linux-2.6.32.8/net/ipv6/udp.c
50912 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); 51479 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
50913 51480
50914 kfree_skb(skb); 51481 kfree_skb(skb);
50915diff -urNp linux-2.6.32.8/net/irda/ircomm/ircomm_tty.c linux-2.6.32.8/net/irda/ircomm/ircomm_tty.c 51482diff -urNp linux-2.6.32.9/net/irda/ircomm/ircomm_tty.c linux-2.6.32.9/net/irda/ircomm/ircomm_tty.c
50916--- linux-2.6.32.8/net/irda/ircomm/ircomm_tty.c 2010-02-09 07:57:19.000000000 -0500 51483--- linux-2.6.32.9/net/irda/ircomm/ircomm_tty.c 2010-02-09 07:57:19.000000000 -0500
50917+++ linux-2.6.32.8/net/irda/ircomm/ircomm_tty.c 2010-02-13 21:45:10.868957557 -0500 51484+++ linux-2.6.32.9/net/irda/ircomm/ircomm_tty.c 2010-02-23 17:09:56.720158253 -0500
50918@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st 51485@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
50919 add_wait_queue(&self->open_wait, &wait); 51486 add_wait_queue(&self->open_wait, &wait);
50920 51487
@@ -51037,9 +51604,9 @@ diff -urNp linux-2.6.32.8/net/irda/ircomm/ircomm_tty.c linux-2.6.32.8/net/irda/i
51037 seq_printf(m, "Max data size: %d\n", self->max_data_size); 51604 seq_printf(m, "Max data size: %d\n", self->max_data_size);
51038 seq_printf(m, "Max header size: %d\n", self->max_header_size); 51605 seq_printf(m, "Max header size: %d\n", self->max_header_size);
51039 51606
51040diff -urNp linux-2.6.32.8/net/mac80211/ieee80211_i.h linux-2.6.32.8/net/mac80211/ieee80211_i.h 51607diff -urNp linux-2.6.32.9/net/mac80211/ieee80211_i.h linux-2.6.32.9/net/mac80211/ieee80211_i.h
51041--- linux-2.6.32.8/net/mac80211/ieee80211_i.h 2010-02-09 07:57:19.000000000 -0500 51608--- linux-2.6.32.9/net/mac80211/ieee80211_i.h 2010-02-09 07:57:19.000000000 -0500
51042+++ linux-2.6.32.8/net/mac80211/ieee80211_i.h 2010-02-13 21:45:10.870009419 -0500 51609+++ linux-2.6.32.9/net/mac80211/ieee80211_i.h 2010-02-23 17:09:56.720158253 -0500
51043@@ -634,7 +634,7 @@ struct ieee80211_local { 51610@@ -634,7 +634,7 @@ struct ieee80211_local {
51044 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ 51611 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
51045 spinlock_t queue_stop_reason_lock; 51612 spinlock_t queue_stop_reason_lock;
@@ -51049,9 +51616,9 @@ diff -urNp linux-2.6.32.8/net/mac80211/ieee80211_i.h linux-2.6.32.8/net/mac80211
51049 int monitors, cooked_mntrs; 51616 int monitors, cooked_mntrs;
51050 /* number of interfaces with corresponding FIF_ flags */ 51617 /* number of interfaces with corresponding FIF_ flags */
51051 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; 51618 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
51052diff -urNp linux-2.6.32.8/net/mac80211/iface.c linux-2.6.32.8/net/mac80211/iface.c 51619diff -urNp linux-2.6.32.9/net/mac80211/iface.c linux-2.6.32.9/net/mac80211/iface.c
51053--- linux-2.6.32.8/net/mac80211/iface.c 2010-02-09 07:57:19.000000000 -0500 51620--- linux-2.6.32.9/net/mac80211/iface.c 2010-02-09 07:57:19.000000000 -0500
51054+++ linux-2.6.32.8/net/mac80211/iface.c 2010-02-13 21:45:10.870556107 -0500 51621+++ linux-2.6.32.9/net/mac80211/iface.c 2010-02-23 17:09:56.720158253 -0500
51055@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev 51622@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
51056 break; 51623 break;
51057 } 51624 }
@@ -51106,9 +51673,9 @@ diff -urNp linux-2.6.32.8/net/mac80211/iface.c linux-2.6.32.8/net/mac80211/iface
51106 ieee80211_clear_tx_pending(local); 51673 ieee80211_clear_tx_pending(local);
51107 ieee80211_stop_device(local); 51674 ieee80211_stop_device(local);
51108 51675
51109diff -urNp linux-2.6.32.8/net/mac80211/main.c linux-2.6.32.8/net/mac80211/main.c 51676diff -urNp linux-2.6.32.9/net/mac80211/main.c linux-2.6.32.9/net/mac80211/main.c
51110--- linux-2.6.32.8/net/mac80211/main.c 2010-02-09 07:57:19.000000000 -0500 51677--- linux-2.6.32.9/net/mac80211/main.c 2010-02-09 07:57:19.000000000 -0500
51111+++ linux-2.6.32.8/net/mac80211/main.c 2010-02-13 21:45:10.870556107 -0500 51678+++ linux-2.6.32.9/net/mac80211/main.c 2010-02-23 17:09:56.736738853 -0500
51112@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 51679@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
51113 local->hw.conf.power_level = power; 51680 local->hw.conf.power_level = power;
51114 } 51681 }
@@ -51118,9 +51685,9 @@ diff -urNp linux-2.6.32.8/net/mac80211/main.c linux-2.6.32.8/net/mac80211/main.c
51118 ret = drv_config(local, changed); 51685 ret = drv_config(local, changed);
51119 /* 51686 /*
51120 * Goal: 51687 * Goal:
51121diff -urNp linux-2.6.32.8/net/mac80211/pm.c linux-2.6.32.8/net/mac80211/pm.c 51688diff -urNp linux-2.6.32.9/net/mac80211/pm.c linux-2.6.32.9/net/mac80211/pm.c
51122--- linux-2.6.32.8/net/mac80211/pm.c 2010-02-09 07:57:19.000000000 -0500 51689--- linux-2.6.32.9/net/mac80211/pm.c 2010-02-09 07:57:19.000000000 -0500
51123+++ linux-2.6.32.8/net/mac80211/pm.c 2010-02-13 21:45:10.870556107 -0500 51690+++ linux-2.6.32.9/net/mac80211/pm.c 2010-02-23 17:09:56.736738853 -0500
51124@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 51691@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
51125 } 51692 }
51126 51693
@@ -51130,9 +51697,9 @@ diff -urNp linux-2.6.32.8/net/mac80211/pm.c linux-2.6.32.8/net/mac80211/pm.c
51130 ieee80211_stop_device(local); 51697 ieee80211_stop_device(local);
51131 51698
51132 local->suspended = true; 51699 local->suspended = true;
51133diff -urNp linux-2.6.32.8/net/mac80211/rate.c linux-2.6.32.8/net/mac80211/rate.c 51700diff -urNp linux-2.6.32.9/net/mac80211/rate.c linux-2.6.32.9/net/mac80211/rate.c
51134--- linux-2.6.32.8/net/mac80211/rate.c 2010-02-09 07:57:19.000000000 -0500 51701--- linux-2.6.32.9/net/mac80211/rate.c 2010-02-09 07:57:19.000000000 -0500
51135+++ linux-2.6.32.8/net/mac80211/rate.c 2010-02-13 21:45:10.870556107 -0500 51702+++ linux-2.6.32.9/net/mac80211/rate.c 2010-02-23 17:09:56.736738853 -0500
51136@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct 51703@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
51137 struct rate_control_ref *ref, *old; 51704 struct rate_control_ref *ref, *old;
51138 51705
@@ -51142,9 +51709,9 @@ diff -urNp linux-2.6.32.8/net/mac80211/rate.c linux-2.6.32.8/net/mac80211/rate.c
51142 return -EBUSY; 51709 return -EBUSY;
51143 51710
51144 ref = rate_control_alloc(name, local); 51711 ref = rate_control_alloc(name, local);
51145diff -urNp linux-2.6.32.8/net/mac80211/util.c linux-2.6.32.8/net/mac80211/util.c 51712diff -urNp linux-2.6.32.9/net/mac80211/util.c linux-2.6.32.9/net/mac80211/util.c
51146--- linux-2.6.32.8/net/mac80211/util.c 2010-02-09 07:57:19.000000000 -0500 51713--- linux-2.6.32.9/net/mac80211/util.c 2010-02-09 07:57:19.000000000 -0500
51147+++ linux-2.6.32.8/net/mac80211/util.c 2010-02-13 21:45:10.870556107 -0500 51714+++ linux-2.6.32.9/net/mac80211/util.c 2010-02-23 17:09:56.736738853 -0500
51148@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ 51715@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_
51149 local->resuming = true; 51716 local->resuming = true;
51150 51717
@@ -51162,9 +51729,9 @@ diff -urNp linux-2.6.32.8/net/mac80211/util.c linux-2.6.32.8/net/mac80211/util.c
51162 if (res) { 51729 if (res) {
51163 WARN(local->suspended, "Harware became unavailable " 51730 WARN(local->suspended, "Harware became unavailable "
51164 "upon resume. This is could be a software issue" 51731 "upon resume. This is could be a software issue"
51165diff -urNp linux-2.6.32.8/net/sctp/socket.c linux-2.6.32.8/net/sctp/socket.c 51732diff -urNp linux-2.6.32.9/net/sctp/socket.c linux-2.6.32.9/net/sctp/socket.c
51166--- linux-2.6.32.8/net/sctp/socket.c 2010-02-09 07:57:19.000000000 -0500 51733--- linux-2.6.32.9/net/sctp/socket.c 2010-02-09 07:57:19.000000000 -0500
51167+++ linux-2.6.32.8/net/sctp/socket.c 2010-02-13 21:45:10.871626716 -0500 51734+++ linux-2.6.32.9/net/sctp/socket.c 2010-02-23 17:09:56.748973675 -0500
51168@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc 51735@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
51169 struct sctp_sndrcvinfo *sinfo; 51736 struct sctp_sndrcvinfo *sinfo;
51170 struct sctp_initmsg *sinit; 51737 struct sctp_initmsg *sinit;
@@ -51182,9 +51749,9 @@ diff -urNp linux-2.6.32.8/net/sctp/socket.c linux-2.6.32.8/net/sctp/socket.c
51182 51749
51183 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); 51750 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
51184 if (pp->fastreuse && sk->sk_reuse && 51751 if (pp->fastreuse && sk->sk_reuse &&
51185diff -urNp linux-2.6.32.8/net/socket.c linux-2.6.32.8/net/socket.c 51752diff -urNp linux-2.6.32.9/net/socket.c linux-2.6.32.9/net/socket.c
51186--- linux-2.6.32.8/net/socket.c 2010-02-09 07:57:19.000000000 -0500 51753--- linux-2.6.32.9/net/socket.c 2010-02-09 07:57:19.000000000 -0500
51187+++ linux-2.6.32.8/net/socket.c 2010-02-13 21:45:10.873014270 -0500 51754+++ linux-2.6.32.9/net/socket.c 2010-02-23 17:09:56.748973675 -0500
51188@@ -87,6 +87,7 @@ 51755@@ -87,6 +87,7 @@
51189 #include <linux/wireless.h> 51756 #include <linux/wireless.h>
51190 #include <linux/nsproxy.h> 51757 #include <linux/nsproxy.h>
@@ -51339,9 +51906,9 @@ diff -urNp linux-2.6.32.8/net/socket.c linux-2.6.32.8/net/socket.c
51339 err = 51906 err =
51340 security_socket_connect(sock, (struct sockaddr *)&address, addrlen); 51907 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
51341 if (err) 51908 if (err)
51342diff -urNp linux-2.6.32.8/net/sysctl_net.c linux-2.6.32.8/net/sysctl_net.c 51909diff -urNp linux-2.6.32.9/net/sysctl_net.c linux-2.6.32.9/net/sysctl_net.c
51343--- linux-2.6.32.8/net/sysctl_net.c 2010-02-09 07:57:19.000000000 -0500 51910--- linux-2.6.32.9/net/sysctl_net.c 2010-02-09 07:57:19.000000000 -0500
51344+++ linux-2.6.32.8/net/sysctl_net.c 2010-02-13 21:45:10.873014270 -0500 51911+++ linux-2.6.32.9/net/sysctl_net.c 2010-02-23 17:09:56.748973675 -0500
51345@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct 51912@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
51346 struct ctl_table *table) 51913 struct ctl_table *table)
51347 { 51914 {
@@ -51351,9 +51918,9 @@ diff -urNp linux-2.6.32.8/net/sysctl_net.c linux-2.6.32.8/net/sysctl_net.c
51351 int mode = (table->mode >> 6) & 7; 51918 int mode = (table->mode >> 6) & 7;
51352 return (mode << 6) | (mode << 3) | mode; 51919 return (mode << 6) | (mode << 3) | mode;
51353 } 51920 }
51354diff -urNp linux-2.6.32.8/net/unix/af_unix.c linux-2.6.32.8/net/unix/af_unix.c 51921diff -urNp linux-2.6.32.9/net/unix/af_unix.c linux-2.6.32.9/net/unix/af_unix.c
51355--- linux-2.6.32.8/net/unix/af_unix.c 2010-02-09 07:57:19.000000000 -0500 51922--- linux-2.6.32.9/net/unix/af_unix.c 2010-02-09 07:57:19.000000000 -0500
51356+++ linux-2.6.32.8/net/unix/af_unix.c 2010-02-13 21:45:10.873014270 -0500 51923+++ linux-2.6.32.9/net/unix/af_unix.c 2010-02-23 17:09:56.748973675 -0500
51357@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru 51924@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru
51358 err = -ECONNREFUSED; 51925 err = -ECONNREFUSED;
51359 if (!S_ISSOCK(inode->i_mode)) 51926 if (!S_ISSOCK(inode->i_mode))
@@ -51411,9 +51978,9 @@ diff -urNp linux-2.6.32.8/net/unix/af_unix.c linux-2.6.32.8/net/unix/af_unix.c
51411 list = &unix_socket_table[addr->hash]; 51978 list = &unix_socket_table[addr->hash];
51412 } else { 51979 } else {
51413 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; 51980 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
51414diff -urNp linux-2.6.32.8/samples/kobject/kset-example.c linux-2.6.32.8/samples/kobject/kset-example.c 51981diff -urNp linux-2.6.32.9/samples/kobject/kset-example.c linux-2.6.32.9/samples/kobject/kset-example.c
51415--- linux-2.6.32.8/samples/kobject/kset-example.c 2010-02-09 07:57:19.000000000 -0500 51982--- linux-2.6.32.9/samples/kobject/kset-example.c 2010-02-09 07:57:19.000000000 -0500
51416+++ linux-2.6.32.8/samples/kobject/kset-example.c 2010-02-13 21:45:10.874025155 -0500 51983+++ linux-2.6.32.9/samples/kobject/kset-example.c 2010-02-23 17:09:56.748973675 -0500
51417@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob 51984@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
51418 } 51985 }
51419 51986
@@ -51423,9 +51990,9 @@ diff -urNp linux-2.6.32.8/samples/kobject/kset-example.c linux-2.6.32.8/samples/
51423 .show = foo_attr_show, 51990 .show = foo_attr_show,
51424 .store = foo_attr_store, 51991 .store = foo_attr_store,
51425 }; 51992 };
51426diff -urNp linux-2.6.32.8/scripts/basic/fixdep.c linux-2.6.32.8/scripts/basic/fixdep.c 51993diff -urNp linux-2.6.32.9/scripts/basic/fixdep.c linux-2.6.32.9/scripts/basic/fixdep.c
51427--- linux-2.6.32.8/scripts/basic/fixdep.c 2010-02-09 07:57:19.000000000 -0500 51994--- linux-2.6.32.9/scripts/basic/fixdep.c 2010-02-09 07:57:19.000000000 -0500
51428+++ linux-2.6.32.8/scripts/basic/fixdep.c 2010-02-13 21:45:10.874025155 -0500 51995+++ linux-2.6.32.9/scripts/basic/fixdep.c 2010-02-23 17:09:56.748973675 -0500
51429@@ -222,9 +222,9 @@ static void use_config(char *m, int slen 51996@@ -222,9 +222,9 @@ static void use_config(char *m, int slen
51430 51997
51431 static void parse_config_file(char *map, size_t len) 51998 static void parse_config_file(char *map, size_t len)
@@ -51447,9 +52014,9 @@ diff -urNp linux-2.6.32.8/scripts/basic/fixdep.c linux-2.6.32.8/scripts/basic/fi
51447 52014
51448 if (*p != INT_CONF) { 52015 if (*p != INT_CONF) {
51449 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", 52016 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
51450diff -urNp linux-2.6.32.8/scripts/kallsyms.c linux-2.6.32.8/scripts/kallsyms.c 52017diff -urNp linux-2.6.32.9/scripts/kallsyms.c linux-2.6.32.9/scripts/kallsyms.c
51451--- linux-2.6.32.8/scripts/kallsyms.c 2010-02-09 07:57:19.000000000 -0500 52018--- linux-2.6.32.9/scripts/kallsyms.c 2010-02-09 07:57:19.000000000 -0500
51452+++ linux-2.6.32.8/scripts/kallsyms.c 2010-02-13 21:45:10.874025155 -0500 52019+++ linux-2.6.32.9/scripts/kallsyms.c 2010-02-23 17:09:56.748973675 -0500
51453@@ -43,10 +43,10 @@ struct text_range { 52020@@ -43,10 +43,10 @@ struct text_range {
51454 52021
51455 static unsigned long long _text; 52022 static unsigned long long _text;
@@ -51465,9 +52032,9 @@ diff -urNp linux-2.6.32.8/scripts/kallsyms.c linux-2.6.32.8/scripts/kallsyms.c
51465 }; 52032 };
51466 #define text_range_text (&text_ranges[0]) 52033 #define text_range_text (&text_ranges[0])
51467 #define text_range_inittext (&text_ranges[1]) 52034 #define text_range_inittext (&text_ranges[1])
51468diff -urNp linux-2.6.32.8/scripts/mod/file2alias.c linux-2.6.32.8/scripts/mod/file2alias.c 52035diff -urNp linux-2.6.32.9/scripts/mod/file2alias.c linux-2.6.32.9/scripts/mod/file2alias.c
51469--- linux-2.6.32.8/scripts/mod/file2alias.c 2010-02-09 07:57:19.000000000 -0500 52036--- linux-2.6.32.9/scripts/mod/file2alias.c 2010-02-09 07:57:19.000000000 -0500
51470+++ linux-2.6.32.8/scripts/mod/file2alias.c 2010-02-13 21:45:10.874025155 -0500 52037+++ linux-2.6.32.9/scripts/mod/file2alias.c 2010-02-23 17:09:56.748973675 -0500
51471@@ -72,7 +72,7 @@ static void device_id_check(const char * 52038@@ -72,7 +72,7 @@ static void device_id_check(const char *
51472 unsigned long size, unsigned long id_size, 52039 unsigned long size, unsigned long id_size,
51473 void *symval) 52040 void *symval)
@@ -51522,9 +52089,9 @@ diff -urNp linux-2.6.32.8/scripts/mod/file2alias.c linux-2.6.32.8/scripts/mod/fi
51522 52089
51523 sprintf(alias, "dmi*"); 52090 sprintf(alias, "dmi*");
51524 52091
51525diff -urNp linux-2.6.32.8/scripts/mod/modpost.c linux-2.6.32.8/scripts/mod/modpost.c 52092diff -urNp linux-2.6.32.9/scripts/mod/modpost.c linux-2.6.32.9/scripts/mod/modpost.c
51526--- linux-2.6.32.8/scripts/mod/modpost.c 2010-02-09 07:57:19.000000000 -0500 52093--- linux-2.6.32.9/scripts/mod/modpost.c 2010-02-09 07:57:19.000000000 -0500
51527+++ linux-2.6.32.8/scripts/mod/modpost.c 2010-02-13 21:45:10.875018114 -0500 52094+++ linux-2.6.32.9/scripts/mod/modpost.c 2010-02-23 17:09:56.748973675 -0500
51528@@ -835,6 +835,7 @@ enum mismatch { 52095@@ -835,6 +835,7 @@ enum mismatch {
51529 INIT_TO_EXIT, 52096 INIT_TO_EXIT,
51530 EXIT_TO_INIT, 52097 EXIT_TO_INIT,
@@ -51592,9 +52159,9 @@ diff -urNp linux-2.6.32.8/scripts/mod/modpost.c linux-2.6.32.8/scripts/mod/modpo
51592 goto close_write; 52159 goto close_write;
51593 52160
51594 tmp = NOFAIL(malloc(b->pos)); 52161 tmp = NOFAIL(malloc(b->pos));
51595diff -urNp linux-2.6.32.8/scripts/mod/modpost.h linux-2.6.32.8/scripts/mod/modpost.h 52162diff -urNp linux-2.6.32.9/scripts/mod/modpost.h linux-2.6.32.9/scripts/mod/modpost.h
51596--- linux-2.6.32.8/scripts/mod/modpost.h 2010-02-09 07:57:19.000000000 -0500 52163--- linux-2.6.32.9/scripts/mod/modpost.h 2010-02-09 07:57:19.000000000 -0500
51597+++ linux-2.6.32.8/scripts/mod/modpost.h 2010-02-13 21:45:10.875018114 -0500 52164+++ linux-2.6.32.9/scripts/mod/modpost.h 2010-02-23 17:09:56.748973675 -0500
51598@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e 52165@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
51599 52166
51600 struct buffer { 52167 struct buffer {
@@ -51614,9 +52181,9 @@ diff -urNp linux-2.6.32.8/scripts/mod/modpost.h linux-2.6.32.8/scripts/mod/modpo
51614 52181
51615 struct module { 52182 struct module {
51616 struct module *next; 52183 struct module *next;
51617diff -urNp linux-2.6.32.8/scripts/mod/sumversion.c linux-2.6.32.8/scripts/mod/sumversion.c 52184diff -urNp linux-2.6.32.9/scripts/mod/sumversion.c linux-2.6.32.9/scripts/mod/sumversion.c
51618--- linux-2.6.32.8/scripts/mod/sumversion.c 2010-02-09 07:57:19.000000000 -0500 52185--- linux-2.6.32.9/scripts/mod/sumversion.c 2010-02-09 07:57:19.000000000 -0500
51619+++ linux-2.6.32.8/scripts/mod/sumversion.c 2010-02-13 21:45:10.875018114 -0500 52186+++ linux-2.6.32.9/scripts/mod/sumversion.c 2010-02-23 17:09:56.748973675 -0500
51620@@ -455,7 +455,7 @@ static void write_version(const char *fi 52187@@ -455,7 +455,7 @@ static void write_version(const char *fi
51621 goto out; 52188 goto out;
51622 } 52189 }
@@ -51626,9 +52193,9 @@ diff -urNp linux-2.6.32.8/scripts/mod/sumversion.c linux-2.6.32.8/scripts/mod/su
51626 warn("writing sum in %s failed: %s\n", 52193 warn("writing sum in %s failed: %s\n",
51627 filename, strerror(errno)); 52194 filename, strerror(errno));
51628 goto out; 52195 goto out;
51629diff -urNp linux-2.6.32.8/scripts/pnmtologo.c linux-2.6.32.8/scripts/pnmtologo.c 52196diff -urNp linux-2.6.32.9/scripts/pnmtologo.c linux-2.6.32.9/scripts/pnmtologo.c
51630--- linux-2.6.32.8/scripts/pnmtologo.c 2010-02-09 07:57:19.000000000 -0500 52197--- linux-2.6.32.9/scripts/pnmtologo.c 2010-02-09 07:57:19.000000000 -0500
51631+++ linux-2.6.32.8/scripts/pnmtologo.c 2010-02-13 21:45:10.875018114 -0500 52198+++ linux-2.6.32.9/scripts/pnmtologo.c 2010-02-23 17:09:56.748973675 -0500
51632@@ -237,14 +237,14 @@ static void write_header(void) 52199@@ -237,14 +237,14 @@ static void write_header(void)
51633 fprintf(out, " * Linux logo %s\n", logoname); 52200 fprintf(out, " * Linux logo %s\n", logoname);
51634 fputs(" */\n\n", out); 52201 fputs(" */\n\n", out);
@@ -51655,9 +52222,9 @@ diff -urNp linux-2.6.32.8/scripts/pnmtologo.c linux-2.6.32.8/scripts/pnmtologo.c
51655 logoname); 52222 logoname);
51656 write_hex_cnt = 0; 52223 write_hex_cnt = 0;
51657 for (i = 0; i < logo_clutsize; i++) { 52224 for (i = 0; i < logo_clutsize; i++) {
51658diff -urNp linux-2.6.32.8/security/commoncap.c linux-2.6.32.8/security/commoncap.c 52225diff -urNp linux-2.6.32.9/security/commoncap.c linux-2.6.32.9/security/commoncap.c
51659--- linux-2.6.32.8/security/commoncap.c 2010-02-09 07:57:19.000000000 -0500 52226--- linux-2.6.32.9/security/commoncap.c 2010-02-09 07:57:19.000000000 -0500
51660+++ linux-2.6.32.8/security/commoncap.c 2010-02-13 21:45:10.876017609 -0500 52227+++ linux-2.6.32.9/security/commoncap.c 2010-02-23 17:09:56.752223260 -0500
51661@@ -27,7 +27,7 @@ 52228@@ -27,7 +27,7 @@
51662 #include <linux/sched.h> 52229 #include <linux/sched.h>
51663 #include <linux/prctl.h> 52230 #include <linux/prctl.h>
@@ -51680,9 +52247,9 @@ diff -urNp linux-2.6.32.8/security/commoncap.c linux-2.6.32.8/security/commoncap
51680 return 0; 52247 return 0;
51681 } 52248 }
51682 52249
51683diff -urNp linux-2.6.32.8/security/integrity/ima/ima_api.c linux-2.6.32.8/security/integrity/ima/ima_api.c 52250diff -urNp linux-2.6.32.9/security/integrity/ima/ima_api.c linux-2.6.32.9/security/integrity/ima/ima_api.c
51684--- linux-2.6.32.8/security/integrity/ima/ima_api.c 2010-02-09 07:57:19.000000000 -0500 52251--- linux-2.6.32.9/security/integrity/ima/ima_api.c 2010-02-09 07:57:19.000000000 -0500
51685+++ linux-2.6.32.8/security/integrity/ima/ima_api.c 2010-02-13 21:45:10.876017609 -0500 52252+++ linux-2.6.32.9/security/integrity/ima/ima_api.c 2010-02-23 17:09:56.752223260 -0500
51686@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino 52253@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
51687 int result; 52254 int result;
51688 52255
@@ -51692,9 +52259,9 @@ diff -urNp linux-2.6.32.8/security/integrity/ima/ima_api.c linux-2.6.32.8/securi
51692 52259
51693 entry = kmalloc(sizeof(*entry), GFP_KERNEL); 52260 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
51694 if (!entry) { 52261 if (!entry) {
51695diff -urNp linux-2.6.32.8/security/integrity/ima/ima_fs.c linux-2.6.32.8/security/integrity/ima/ima_fs.c 52262diff -urNp linux-2.6.32.9/security/integrity/ima/ima_fs.c linux-2.6.32.9/security/integrity/ima/ima_fs.c
51696--- linux-2.6.32.8/security/integrity/ima/ima_fs.c 2010-02-09 07:57:19.000000000 -0500 52263--- linux-2.6.32.9/security/integrity/ima/ima_fs.c 2010-02-09 07:57:19.000000000 -0500
51697+++ linux-2.6.32.8/security/integrity/ima/ima_fs.c 2010-02-13 21:45:10.876017609 -0500 52264+++ linux-2.6.32.9/security/integrity/ima/ima_fs.c 2010-02-23 17:09:56.752223260 -0500
51698@@ -27,12 +27,12 @@ 52265@@ -27,12 +27,12 @@
51699 static int valid_policy = 1; 52266 static int valid_policy = 1;
51700 #define TMPBUFLEN 12 52267 #define TMPBUFLEN 12
@@ -51710,9 +52277,9 @@ diff -urNp linux-2.6.32.8/security/integrity/ima/ima_fs.c linux-2.6.32.8/securit
51710 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); 52277 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
51711 } 52278 }
51712 52279
51713diff -urNp linux-2.6.32.8/security/integrity/ima/ima.h linux-2.6.32.8/security/integrity/ima/ima.h 52280diff -urNp linux-2.6.32.9/security/integrity/ima/ima.h linux-2.6.32.9/security/integrity/ima/ima.h
51714--- linux-2.6.32.8/security/integrity/ima/ima.h 2010-02-09 07:57:19.000000000 -0500 52281--- linux-2.6.32.9/security/integrity/ima/ima.h 2010-02-09 07:57:19.000000000 -0500
51715+++ linux-2.6.32.8/security/integrity/ima/ima.h 2010-02-13 21:45:10.876017609 -0500 52282+++ linux-2.6.32.9/security/integrity/ima/ima.h 2010-02-23 17:09:56.752223260 -0500
51716@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino 52283@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
51717 extern spinlock_t ima_queue_lock; 52284 extern spinlock_t ima_queue_lock;
51718 52285
@@ -51724,9 +52291,9 @@ diff -urNp linux-2.6.32.8/security/integrity/ima/ima.h linux-2.6.32.8/security/i
51724 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; 52291 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
51725 }; 52292 };
51726 extern struct ima_h_table ima_htable; 52293 extern struct ima_h_table ima_htable;
51727diff -urNp linux-2.6.32.8/security/integrity/ima/ima_queue.c linux-2.6.32.8/security/integrity/ima/ima_queue.c 52294diff -urNp linux-2.6.32.9/security/integrity/ima/ima_queue.c linux-2.6.32.9/security/integrity/ima/ima_queue.c
51728--- linux-2.6.32.8/security/integrity/ima/ima_queue.c 2010-02-09 07:57:19.000000000 -0500 52295--- linux-2.6.32.9/security/integrity/ima/ima_queue.c 2010-02-09 07:57:19.000000000 -0500
51729+++ linux-2.6.32.8/security/integrity/ima/ima_queue.c 2010-02-13 21:45:10.876017609 -0500 52296+++ linux-2.6.32.9/security/integrity/ima/ima_queue.c 2010-02-23 17:09:56.752223260 -0500
51730@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i 52297@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
51731 INIT_LIST_HEAD(&qe->later); 52298 INIT_LIST_HEAD(&qe->later);
51732 list_add_tail_rcu(&qe->later, &ima_measurements); 52299 list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -51736,10 +52303,10 @@ diff -urNp linux-2.6.32.8/security/integrity/ima/ima_queue.c linux-2.6.32.8/secu
51736 key = ima_hash_key(entry->digest); 52303 key = ima_hash_key(entry->digest);
51737 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); 52304 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
51738 return 0; 52305 return 0;
51739diff -urNp linux-2.6.32.8/security/Kconfig linux-2.6.32.8/security/Kconfig 52306diff -urNp linux-2.6.32.9/security/Kconfig linux-2.6.32.9/security/Kconfig
51740--- linux-2.6.32.8/security/Kconfig 2010-02-09 07:57:19.000000000 -0500 52307--- linux-2.6.32.9/security/Kconfig 2010-02-09 07:57:19.000000000 -0500
51741+++ linux-2.6.32.8/security/Kconfig 2010-02-13 21:45:10.877017753 -0500 52308+++ linux-2.6.32.9/security/Kconfig 2010-02-23 17:09:56.752223260 -0500
51742@@ -4,6 +4,465 @@ 52309@@ -4,6 +4,488 @@
51743 52310
51744 menu "Security options" 52311 menu "Security options"
51745 52312
@@ -51760,6 +52327,7 @@ diff -urNp linux-2.6.32.8/security/Kconfig linux-2.6.32.8/security/Kconfig
51760+ 52327+
51761+config PAX_SOFTMODE 52328+config PAX_SOFTMODE
51762+ bool 'Support soft mode' 52329+ bool 'Support soft mode'
52330+ select PAX_PT_PAX_FLAGS
51763+ help 52331+ help
51764+ Enabling this option will allow you to run PaX in soft mode, that 52332+ Enabling this option will allow you to run PaX in soft mode, that
51765+ is, PaX features will not be enforced by default, only on executables 52333+ is, PaX features will not be enforced by default, only on executables
@@ -51837,7 +52405,7 @@ diff -urNp linux-2.6.32.8/security/Kconfig linux-2.6.32.8/security/Kconfig
51837+ 52405+
51838+config PAX_NOEXEC 52406+config PAX_NOEXEC
51839+ bool "Enforce non-executable pages" 52407+ bool "Enforce non-executable pages"
51840+ 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 || SPARC32 || SPARC64 || X86) 52408+ 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)
51841+ help 52409+ help
51842+ By design some architectures do not allow for protecting memory 52410+ By design some architectures do not allow for protecting memory
51843+ pages against execution or even if they do, Linux does not make 52411+ pages against execution or even if they do, Linux does not make
@@ -51866,6 +52434,8 @@ diff -urNp linux-2.6.32.8/security/Kconfig linux-2.6.32.8/security/Kconfig
51866+config PAX_PAGEEXEC 52434+config PAX_PAGEEXEC
51867+ bool "Paging based non-executable pages" 52435+ bool "Paging based non-executable pages"
51868+ depends on PAX_NOEXEC && (!X86_32 || M586 || M586TSC || M586MMX || M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC || MK7 || MK8 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MVIAC3_2 || MVIAC7) 52436+ depends on PAX_NOEXEC && (!X86_32 || M586 || M586TSC || M586MMX || M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC || MK7 || MK8 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MVIAC3_2 || MVIAC7)
52437+ select S390_SWITCH_AMODE if S390
52438+ select S390_EXEC_PROTECT if S390
51869+ help 52439+ help
51870+ This implementation is based on the paging feature of the CPU. 52440+ This implementation is based on the paging feature of the CPU.
51871+ On i386 without hardware non-executable bit support there is a 52441+ On i386 without hardware non-executable bit support there is a
@@ -52028,12 +52598,32 @@ diff -urNp linux-2.6.32.8/security/Kconfig linux-2.6.32.8/security/Kconfig
52028+ 52598+
52029+config PAX_KERNEXEC 52599+config PAX_KERNEXEC
52030+ bool "Enforce non-executable kernel pages" 52600+ bool "Enforce non-executable kernel pages"
52031+ depends on PAX_NOEXEC && X86 && (!X86_32 || X86_WP_WORKS_OK) && !XEN 52601+ depends on PAX_NOEXEC && (PPC32 || PPC64 || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN
52032+ help 52602+ help
52033+ This is the kernel land equivalent of PAGEEXEC and MPROTECT, 52603+ This is the kernel land equivalent of PAGEEXEC and MPROTECT,
52034+ that is, enabling this option will make it harder to inject 52604+ that is, enabling this option will make it harder to inject
52035+ and execute 'foreign' code in kernel memory itself. 52605+ and execute 'foreign' code in kernel memory itself.
52036+ 52606+
52607+config PAX_KERNEXEC_MODULE_TEXT
52608+ int "Minimum amount of memory reserved for module code"
52609+ default "4"
52610+ depends on PAX_KERNEXEC && X86_32 && MODULES
52611+ help
52612+ Due to implementation details the kernel must reserve a fixed
52613+ amount of memory for module code at compile time that cannot be
52614+ changed at runtime. Here you can specify the minimum amount
52615+ in MB that will be reserved. Due to the same implementation
52616+ details this size will always be rounded up to the next 2/4 MB
52617+ boundary (depends on PAE) so the actually available memory for
52618+ module code will usually be more than this minimum.
52619+
52620+ The default 4 MB should be enough for most users but if you have
52621+ an excessive number of modules (e.g., most distribution configs
52622+ compile many drivers as modules) or use huge modules such as
52623+ nvidia's kernel driver, you will need to adjust this amount.
52624+ A good rule of thumb is to look at your currently loaded kernel
52625+ modules and add up their sizes.
52626+
52037+endmenu 52627+endmenu
52038+ 52628+
52039+menu "Address Space Layout Randomization" 52629+menu "Address Space Layout Randomization"
@@ -52205,7 +52795,7 @@ diff -urNp linux-2.6.32.8/security/Kconfig linux-2.6.32.8/security/Kconfig
52205 config KEYS 52795 config KEYS
52206 bool "Enable access key retention support" 52796 bool "Enable access key retention support"
52207 help 52797 help
52208@@ -146,7 +605,7 @@ config INTEL_TXT 52798@@ -146,7 +628,7 @@ config INTEL_TXT
52209 config LSM_MMAP_MIN_ADDR 52799 config LSM_MMAP_MIN_ADDR
52210 int "Low address space for LSM to protect from user allocation" 52800 int "Low address space for LSM to protect from user allocation"
52211 depends on SECURITY && SECURITY_SELINUX 52801 depends on SECURITY && SECURITY_SELINUX
@@ -52214,9 +52804,9 @@ diff -urNp linux-2.6.32.8/security/Kconfig linux-2.6.32.8/security/Kconfig
52214 help 52804 help
52215 This is the portion of low virtual memory which should be protected 52805 This is the portion of low virtual memory which should be protected
52216 from userspace allocation. Keeping a user from writing to low pages 52806 from userspace allocation. Keeping a user from writing to low pages
52217diff -urNp linux-2.6.32.8/security/min_addr.c linux-2.6.32.8/security/min_addr.c 52807diff -urNp linux-2.6.32.9/security/min_addr.c linux-2.6.32.9/security/min_addr.c
52218--- linux-2.6.32.8/security/min_addr.c 2010-02-09 07:57:19.000000000 -0500 52808--- linux-2.6.32.9/security/min_addr.c 2010-02-09 07:57:19.000000000 -0500
52219+++ linux-2.6.32.8/security/min_addr.c 2010-02-13 21:45:10.877017753 -0500 52809+++ linux-2.6.32.9/security/min_addr.c 2010-02-23 17:09:56.752223260 -0500
52220@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG 52810@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
52221 */ 52811 */
52222 static void update_mmap_min_addr(void) 52812 static void update_mmap_min_addr(void)
@@ -52243,9 +52833,9 @@ diff -urNp linux-2.6.32.8/security/min_addr.c linux-2.6.32.8/security/min_addr.c
52243 ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos); 52833 ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
52244 52834
52245 update_mmap_min_addr(); 52835 update_mmap_min_addr();
52246diff -urNp linux-2.6.32.8/sound/aoa/codecs/onyx.c linux-2.6.32.8/sound/aoa/codecs/onyx.c 52836diff -urNp linux-2.6.32.9/sound/aoa/codecs/onyx.c linux-2.6.32.9/sound/aoa/codecs/onyx.c
52247--- linux-2.6.32.8/sound/aoa/codecs/onyx.c 2010-02-09 07:57:19.000000000 -0500 52837--- linux-2.6.32.9/sound/aoa/codecs/onyx.c 2010-02-09 07:57:19.000000000 -0500
52248+++ linux-2.6.32.8/sound/aoa/codecs/onyx.c 2010-02-13 21:45:10.887672522 -0500 52838+++ linux-2.6.32.9/sound/aoa/codecs/onyx.c 2010-02-23 17:09:56.752223260 -0500
52249@@ -53,7 +53,7 @@ struct onyx { 52839@@ -53,7 +53,7 @@ struct onyx {
52250 spdif_locked:1, 52840 spdif_locked:1,
52251 analog_locked:1, 52841 analog_locked:1,
@@ -52274,9 +52864,9 @@ diff -urNp linux-2.6.32.8/sound/aoa/codecs/onyx.c linux-2.6.32.8/sound/aoa/codec
52274 onyx->spdif_locked = onyx->analog_locked = 0; 52864 onyx->spdif_locked = onyx->analog_locked = 0;
52275 mutex_unlock(&onyx->mutex); 52865 mutex_unlock(&onyx->mutex);
52276 52866
52277diff -urNp linux-2.6.32.8/sound/core/oss/pcm_oss.c linux-2.6.32.8/sound/core/oss/pcm_oss.c 52867diff -urNp linux-2.6.32.9/sound/core/oss/pcm_oss.c linux-2.6.32.9/sound/core/oss/pcm_oss.c
52278--- linux-2.6.32.8/sound/core/oss/pcm_oss.c 2010-02-09 07:57:19.000000000 -0500 52868--- linux-2.6.32.9/sound/core/oss/pcm_oss.c 2010-02-09 07:57:19.000000000 -0500
52279+++ linux-2.6.32.8/sound/core/oss/pcm_oss.c 2010-02-13 21:45:10.910847144 -0500 52869+++ linux-2.6.32.9/sound/core/oss/pcm_oss.c 2010-02-23 17:09:56.752223260 -0500
52280@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct 52870@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
52281 } 52871 }
52282 } 52872 }
@@ -52288,9 +52878,9 @@ diff -urNp linux-2.6.32.8/sound/core/oss/pcm_oss.c linux-2.6.32.8/sound/core/oss
52288 #endif /* CONFIG_SND_VERBOSE_PROCFS */ 52878 #endif /* CONFIG_SND_VERBOSE_PROCFS */
52289 52879
52290 /* 52880 /*
52291diff -urNp linux-2.6.32.8/sound/core/seq/seq_lock.h linux-2.6.32.8/sound/core/seq/seq_lock.h 52881diff -urNp linux-2.6.32.9/sound/core/seq/seq_lock.h linux-2.6.32.9/sound/core/seq/seq_lock.h
52292--- linux-2.6.32.8/sound/core/seq/seq_lock.h 2010-02-09 07:57:19.000000000 -0500 52882--- linux-2.6.32.9/sound/core/seq/seq_lock.h 2010-02-09 07:57:19.000000000 -0500
52293+++ linux-2.6.32.8/sound/core/seq/seq_lock.h 2010-02-13 21:45:10.919865441 -0500 52883+++ linux-2.6.32.9/sound/core/seq/seq_lock.h 2010-02-23 17:09:56.752223260 -0500
52294@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo 52884@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
52295 #else /* SMP || CONFIG_SND_DEBUG */ 52885 #else /* SMP || CONFIG_SND_DEBUG */
52296 52886
@@ -52306,9 +52896,9 @@ diff -urNp linux-2.6.32.8/sound/core/seq/seq_lock.h linux-2.6.32.8/sound/core/se
52306 52896
52307 #endif /* SMP || CONFIG_SND_DEBUG */ 52897 #endif /* SMP || CONFIG_SND_DEBUG */
52308 52898
52309diff -urNp linux-2.6.32.8/sound/drivers/mts64.c linux-2.6.32.8/sound/drivers/mts64.c 52899diff -urNp linux-2.6.32.9/sound/drivers/mts64.c linux-2.6.32.9/sound/drivers/mts64.c
52310--- linux-2.6.32.8/sound/drivers/mts64.c 2010-02-09 07:57:19.000000000 -0500 52900--- linux-2.6.32.9/sound/drivers/mts64.c 2010-02-09 07:57:19.000000000 -0500
52311+++ linux-2.6.32.8/sound/drivers/mts64.c 2010-02-13 21:45:10.931642664 -0500 52901+++ linux-2.6.32.9/sound/drivers/mts64.c 2010-02-23 17:09:56.752223260 -0500
52312@@ -65,7 +65,7 @@ struct mts64 { 52902@@ -65,7 +65,7 @@ struct mts64 {
52313 struct pardevice *pardev; 52903 struct pardevice *pardev;
52314 int pardev_claimed; 52904 int pardev_claimed;
@@ -52357,9 +52947,9 @@ diff -urNp linux-2.6.32.8/sound/drivers/mts64.c linux-2.6.32.8/sound/drivers/mts
52357 52947
52358 return 0; 52948 return 0;
52359 } 52949 }
52360diff -urNp linux-2.6.32.8/sound/drivers/portman2x4.c linux-2.6.32.8/sound/drivers/portman2x4.c 52950diff -urNp linux-2.6.32.9/sound/drivers/portman2x4.c linux-2.6.32.9/sound/drivers/portman2x4.c
52361--- linux-2.6.32.8/sound/drivers/portman2x4.c 2010-02-09 07:57:19.000000000 -0500 52951--- linux-2.6.32.9/sound/drivers/portman2x4.c 2010-02-09 07:57:19.000000000 -0500
52362+++ linux-2.6.32.8/sound/drivers/portman2x4.c 2010-02-13 21:45:10.940739783 -0500 52952+++ linux-2.6.32.9/sound/drivers/portman2x4.c 2010-02-23 17:09:56.752223260 -0500
52363@@ -83,7 +83,7 @@ struct portman { 52953@@ -83,7 +83,7 @@ struct portman {
52364 struct pardevice *pardev; 52954 struct pardevice *pardev;
52365 int pardev_claimed; 52955 int pardev_claimed;
@@ -52369,9 +52959,9 @@ diff -urNp linux-2.6.32.8/sound/drivers/portman2x4.c linux-2.6.32.8/sound/driver
52369 int mode[PORTMAN_NUM_INPUT_PORTS]; 52959 int mode[PORTMAN_NUM_INPUT_PORTS];
52370 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; 52960 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
52371 }; 52961 };
52372diff -urNp linux-2.6.32.8/sound/pci/ac97/ac97_codec.c linux-2.6.32.8/sound/pci/ac97/ac97_codec.c 52962diff -urNp linux-2.6.32.9/sound/pci/ac97/ac97_codec.c linux-2.6.32.9/sound/pci/ac97/ac97_codec.c
52373--- linux-2.6.32.8/sound/pci/ac97/ac97_codec.c 2010-02-09 07:57:19.000000000 -0500 52963--- linux-2.6.32.9/sound/pci/ac97/ac97_codec.c 2010-02-09 07:57:19.000000000 -0500
52374+++ linux-2.6.32.8/sound/pci/ac97/ac97_codec.c 2010-02-13 21:45:10.968693550 -0500 52964+++ linux-2.6.32.9/sound/pci/ac97/ac97_codec.c 2010-02-23 17:09:56.752223260 -0500
52375@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc 52965@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
52376 } 52966 }
52377 52967
@@ -52381,9 +52971,9 @@ diff -urNp linux-2.6.32.8/sound/pci/ac97/ac97_codec.c linux-2.6.32.8/sound/pci/a
52381 52971
52382 #ifdef CONFIG_SND_AC97_POWER_SAVE 52972 #ifdef CONFIG_SND_AC97_POWER_SAVE
52383 static void do_update_power(struct work_struct *work) 52973 static void do_update_power(struct work_struct *work)
52384diff -urNp linux-2.6.32.8/sound/pci/ac97/ac97_patch.c linux-2.6.32.8/sound/pci/ac97/ac97_patch.c 52974diff -urNp linux-2.6.32.9/sound/pci/ac97/ac97_patch.c linux-2.6.32.9/sound/pci/ac97/ac97_patch.c
52385--- linux-2.6.32.8/sound/pci/ac97/ac97_patch.c 2010-02-09 07:57:19.000000000 -0500 52975--- linux-2.6.32.9/sound/pci/ac97/ac97_patch.c 2010-02-09 07:57:19.000000000 -0500
52386+++ linux-2.6.32.8/sound/pci/ac97/ac97_patch.c 2010-02-13 21:45:10.974536860 -0500 52976+++ linux-2.6.32.9/sound/pci/ac97/ac97_patch.c 2010-02-23 17:09:56.762371914 -0500
52387@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd 52977@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
52388 return 0; 52978 return 0;
52389 } 52979 }
@@ -52690,9 +53280,9 @@ diff -urNp linux-2.6.32.8/sound/pci/ac97/ac97_patch.c linux-2.6.32.8/sound/pci/a
52690 .build_specific = patch_ucb1400_specific, 53280 .build_specific = patch_ucb1400_specific,
52691 }; 53281 };
52692 53282
52693diff -urNp linux-2.6.32.8/sound/pci/ens1370.c linux-2.6.32.8/sound/pci/ens1370.c 53283diff -urNp linux-2.6.32.9/sound/pci/ens1370.c linux-2.6.32.9/sound/pci/ens1370.c
52694--- linux-2.6.32.8/sound/pci/ens1370.c 2010-02-09 07:57:19.000000000 -0500 53284--- linux-2.6.32.9/sound/pci/ens1370.c 2010-02-09 07:57:19.000000000 -0500
52695+++ linux-2.6.32.8/sound/pci/ens1370.c 2010-02-13 21:45:10.997773975 -0500 53285+++ linux-2.6.32.9/sound/pci/ens1370.c 2010-02-23 17:09:56.764228986 -0500
52696@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci 53286@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
52697 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ 53287 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
52698 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ 53288 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
@@ -52702,9 +53292,9 @@ diff -urNp linux-2.6.32.8/sound/pci/ens1370.c linux-2.6.32.8/sound/pci/ens1370.c
52702 }; 53292 };
52703 53293
52704 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); 53294 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
52705diff -urNp linux-2.6.32.8/sound/pci/intel8x0.c linux-2.6.32.8/sound/pci/intel8x0.c 53295diff -urNp linux-2.6.32.9/sound/pci/intel8x0.c linux-2.6.32.9/sound/pci/intel8x0.c
52706--- linux-2.6.32.8/sound/pci/intel8x0.c 2010-02-09 07:57:19.000000000 -0500 53296--- linux-2.6.32.9/sound/pci/intel8x0.c 2010-02-09 07:57:19.000000000 -0500
52707+++ linux-2.6.32.8/sound/pci/intel8x0.c 2010-02-13 21:45:11.013863921 -0500 53297+++ linux-2.6.32.9/sound/pci/intel8x0.c 2010-02-23 17:09:56.764228986 -0500
52708@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 53298@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
52709 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 53299 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
52710 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ 53300 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
@@ -52723,9 +53313,9 @@ diff -urNp linux-2.6.32.8/sound/pci/intel8x0.c linux-2.6.32.8/sound/pci/intel8x0
52723 }; 53313 };
52724 53314
52725 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, 53315 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
52726diff -urNp linux-2.6.32.8/sound/pci/intel8x0m.c linux-2.6.32.8/sound/pci/intel8x0m.c 53316diff -urNp linux-2.6.32.9/sound/pci/intel8x0m.c linux-2.6.32.9/sound/pci/intel8x0m.c
52727--- linux-2.6.32.8/sound/pci/intel8x0m.c 2010-02-09 07:57:19.000000000 -0500 53317--- linux-2.6.32.9/sound/pci/intel8x0m.c 2010-02-09 07:57:19.000000000 -0500
52728+++ linux-2.6.32.8/sound/pci/intel8x0m.c 2010-02-13 21:45:11.025655610 -0500 53318+++ linux-2.6.32.9/sound/pci/intel8x0m.c 2010-02-23 17:09:56.764228986 -0500
52729@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 53319@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
52730 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 53320 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
52731 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ 53321 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
@@ -52744,9 +53334,9 @@ diff -urNp linux-2.6.32.8/sound/pci/intel8x0m.c linux-2.6.32.8/sound/pci/intel8x
52744 }; 53334 };
52745 53335
52746 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, 53336 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
52747diff -urNp linux-2.6.32.8/usr/gen_init_cpio.c linux-2.6.32.8/usr/gen_init_cpio.c 53337diff -urNp linux-2.6.32.9/usr/gen_init_cpio.c linux-2.6.32.9/usr/gen_init_cpio.c
52748--- linux-2.6.32.8/usr/gen_init_cpio.c 2010-02-09 07:57:19.000000000 -0500 53338--- linux-2.6.32.9/usr/gen_init_cpio.c 2010-02-09 07:57:19.000000000 -0500
52749+++ linux-2.6.32.8/usr/gen_init_cpio.c 2010-02-13 21:45:11.025655610 -0500 53339+++ linux-2.6.32.9/usr/gen_init_cpio.c 2010-02-23 17:09:56.764228986 -0500
52750@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, 53340@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
52751 int retval; 53341 int retval;
52752 int rc = -1; 53342 int rc = -1;
@@ -52769,9 +53359,9 @@ diff -urNp linux-2.6.32.8/usr/gen_init_cpio.c linux-2.6.32.8/usr/gen_init_cpio.c
52769 } else 53359 } else
52770 break; 53360 break;
52771 } 53361 }
52772diff -urNp linux-2.6.32.8/virt/kvm/kvm_main.c linux-2.6.32.8/virt/kvm/kvm_main.c 53362diff -urNp linux-2.6.32.9/virt/kvm/kvm_main.c linux-2.6.32.9/virt/kvm/kvm_main.c
52773--- linux-2.6.32.8/virt/kvm/kvm_main.c 2010-02-09 07:57:19.000000000 -0500 53363--- linux-2.6.32.9/virt/kvm/kvm_main.c 2010-02-09 07:57:19.000000000 -0500
52774+++ linux-2.6.32.8/virt/kvm/kvm_main.c 2010-02-13 21:45:11.026532731 -0500 53364+++ linux-2.6.32.9/virt/kvm/kvm_main.c 2010-02-23 17:09:56.764228986 -0500
52775@@ -1745,6 +1745,7 @@ static int kvm_vcpu_release(struct inode 53365@@ -1745,6 +1745,7 @@ static int kvm_vcpu_release(struct inode
52776 return 0; 53366 return 0;
52777 } 53367 }
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index a0b44d4889..f52e8e557d 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32.6 3# Linux kernel version: 2.6.32.9
4# Fri Jan 29 10:27:23 2010 4# Wed Mar 3 11:01:05 2010
5# 5#
6# CONFIG_64BIT is not set 6# CONFIG_64BIT is not set
7CONFIG_X86_32=y 7CONFIG_X86_32=y
@@ -291,7 +291,6 @@ CONFIG_MICROCODE_AMD=y
291CONFIG_MICROCODE_OLD_INTERFACE=y 291CONFIG_MICROCODE_OLD_INTERFACE=y
292CONFIG_X86_MSR=m 292CONFIG_X86_MSR=m
293CONFIG_X86_CPUID=m 293CONFIG_X86_CPUID=m
294CONFIG_X86_CPU_DEBUG=m
295# CONFIG_NOHIGHMEM is not set 294# CONFIG_NOHIGHMEM is not set
296CONFIG_HIGHMEM4G=y 295CONFIG_HIGHMEM4G=y
297# CONFIG_HIGHMEM64G is not set 296# CONFIG_HIGHMEM64G is not set
@@ -4413,6 +4412,7 @@ CONFIG_PAX_EMUTRAMP=y
4413CONFIG_PAX_MPROTECT=y 4412CONFIG_PAX_MPROTECT=y
4414CONFIG_PAX_NOELFRELOCS=y 4413CONFIG_PAX_NOELFRELOCS=y
4415CONFIG_PAX_KERNEXEC=y 4414CONFIG_PAX_KERNEXEC=y
4415CONFIG_PAX_KERNEXEC_MODULE_TEXT=4
4416 4416
4417# 4417#
4418# Address Space Layout Randomization 4418# Address Space Layout Randomization
© 2015 Mike Crute